From patchwork Thu Feb 7 11:53:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 157718 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp555467jaa; Thu, 7 Feb 2019 04:00:45 -0800 (PST) X-Google-Smtp-Source: AHgI3IZYKr41lHk82OslDIX4aXnXguviBnZxtSDsnNSWf6dxpZQlhpNNP7pnkTnNUBXcdPa5Yh0s X-Received: by 2002:a1c:7304:: with SMTP id d4mr1940866wmb.136.1549540845143; Thu, 07 Feb 2019 04:00:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549540845; cv=none; d=google.com; s=arc-20160816; b=SfXBYytLwVkSsWCF5Oy1K3kyk/2KEYfFC5s1ojaiwGDS21+ctXMU6QeIjyVmVOKoll X9dUNNTphFeVWuXsqJyvIlGyj5vkTGjxMGgdEGdbZgrm9QhoR+3sL8UklREf2B8iXPSC KC5Ole+xBZQG7myi5AfcBwvAkweaw93fjclooVKqVVqfMiPoesrXbR3WU3i2O+yjmpoB 2n+aw08HqLjDcaQaV420VLBNb3bonkPf2IbvI4HttLWm4JpUJEsjIRaSnrPSc/TpBolF C5xrRKuI9bAUuSq5MoLB8AZxX5R7vlHzhTI1Vf7JYbahz/QjTXQANet7IaIfC/U2IbFc Y2EA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=o8GtGkBeh0ezXN8riVaDSi1cAb2wD2UG0qKG89zWOoQ=; b=z3Ebo0gNd6kW+W7OZEnuXUz1YuY9Ktnp/jXDJ4CEs/8+lt8cug5+X6yQhbQ4grINn8 ZSzFSpmoEqyDU3gMbgBnPFtoLUYJfxOCiYOYtxqX6RzuKBPzFMxpU2YV/27L9iLSFVPM FYeMe5zoqoRry+/NKdwcmQY1LTTR9R+DFBPRHAsJ+oCw1gD1n3f/+DOqJPUgLW9dPzEA OaoEvTsmLJts1sHTjTRNS5YZ3z+99VWTpcrLKwpn8y8NFeq9ewCyMea7AtIrRolzjh3G W8GdzI2n1Cyoy4+JBy4P/l0PiWrJbTDOJmM4DLm5XBFW/Wm0uZW9dsx4do/hx70+fVqt xBqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gvvim1yA; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id z6si16881419wrh.223.2019.02.07.04.00.44 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 07 Feb 2019 04:00:45 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gvvim1yA; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:38484 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1griMF-0004PA-SE for patch@linaro.org; Thu, 07 Feb 2019 07:00:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58238) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1griG5-0007Kj-2B for qemu-devel@nongnu.org; Thu, 07 Feb 2019 06:54:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1griG0-0001S7-1g for qemu-devel@nongnu.org; Thu, 07 Feb 2019 06:54:17 -0500 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:37474) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1griFz-0001Rf-PT for qemu-devel@nongnu.org; Thu, 07 Feb 2019 06:54:15 -0500 Received: by mail-wr1-x42a.google.com with SMTP id c8so4413056wrs.4 for ; Thu, 07 Feb 2019 03:54:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=o8GtGkBeh0ezXN8riVaDSi1cAb2wD2UG0qKG89zWOoQ=; b=gvvim1yApd26OXQ1rq0SBCnGuxNMl1FsCWOPeKbAFaELyd7jVIKi05J25E0DqsN6bC ipLKWgTAQtrC6cZM9A7cSfQGCg+/W0OXbxxEunshAUJ2K0WXCHh7L0yp3dkr7F0fV1OU R/W/dEb5nqYBQdiu3sWlKOeR2XkqOrQwXnjoK7iVKDmVfPU+BpcM+3u6o87w1fM1Hrx3 99/C6PetHEKUQYV/mfXwGOGjrCm2bvlfijRQafh3ZqxpDhaP+Gy27ZPO7RYGbZwB+xqU bUV+M2vC26ag+LzOycWmO17HRrneklWEhqbaHe42tT0/+hLneYUn3EI1/wBHhs+5MNAd AdNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=o8GtGkBeh0ezXN8riVaDSi1cAb2wD2UG0qKG89zWOoQ=; b=LS5YTG4UKOjRdToFG/T8SgAiWDkodkVH/NN+1j+wUHXhinHdkLNfhg2W9gKfjV+K29 O1OmQMrQ0ErceoIm089vtKkSLuw5xCO5w+Xz+WnRzQ4mJo9TULBT8xK0qXevdzZsQOB5 fTF/TEvj5HjG3IPe7k5t51O1U85zRS/H0VkTI2rVP1TJbF4x1cA02sYWIyoBFQEuPJ4A pCTJQvZIIKI9fCEOWrWQWv6+YRnfHi7SyI9kT9mwt6Xutyyw0GRjzRQhlx1CtaaaXp0r LntMhlY37D0kpVnnl8gugQ6R8R6vi4kJJCeOKRfNQIUoRGGQhM2jtte18GhHJrQtDuOe rp7w== X-Gm-Message-State: AHQUAuYOm9yBt2DmM8pe/QOvQHL3a/3kAFpRy37fvvwCc9cdVol5JYS0 AiOrmiHkbDkgkF3K94swh537Stu0qhksdQ== X-Received: by 2002:adf:f181:: with SMTP id h1mr9959481wro.95.1549540454409; Thu, 07 Feb 2019 03:54:14 -0800 (PST) Received: from cloudburst.twiddle.net ([37.205.61.206]) by smtp.gmail.com with ESMTPSA id w16sm34030016wrp.1.2019.02.07.03.54.13 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Feb 2019 03:54:13 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 11:53:50 +0000 Message-Id: <20190207115400.647-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190207115400.647-1-richard.henderson@linaro.org> References: <20190207115400.647-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42a Subject: [Qemu-devel] [PATCH 09/19] target/hppa: Convert fp multiply-add X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: deller@gmx.de, svens@stackframe.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson --- target/hppa/translate.c | 69 +++++++++++++++++++++++----------------- target/hppa/insns.decode | 12 +++++++ 2 files changed, 52 insertions(+), 29 deletions(-) -- 2.17.2 diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 822d93fb23..2f4a50e113 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -4255,37 +4255,54 @@ static inline int fmpyadd_s_reg(unsigned r) return (r & 16) * 2 + 16 + (r & 15); } -static bool trans_fmpyadd(DisasContext *ctx, uint32_t insn, bool is_sub) +static bool do_fmpyadd_s(DisasContext *ctx, arg_mpyadd *a, bool is_sub) { - unsigned tm = extract32(insn, 0, 5); - unsigned f = extract32(insn, 5, 1); - unsigned ra = extract32(insn, 6, 5); - unsigned ta = extract32(insn, 11, 5); - unsigned rm2 = extract32(insn, 16, 5); - unsigned rm1 = extract32(insn, 21, 5); + int tm = fmpyadd_s_reg(a->tm); + int ra = fmpyadd_s_reg(a->ra); + int ta = fmpyadd_s_reg(a->ta); + int rm2 = fmpyadd_s_reg(a->rm2); + int rm1 = fmpyadd_s_reg(a->rm1); nullify_over(ctx); - /* Independent multiply & add/sub, with undefined behaviour - if outputs overlap inputs. */ - if (f == 0) { - tm = fmpyadd_s_reg(tm); - ra = fmpyadd_s_reg(ra); - ta = fmpyadd_s_reg(ta); - rm2 = fmpyadd_s_reg(rm2); - rm1 = fmpyadd_s_reg(rm1); - do_fop_weww(ctx, tm, rm1, rm2, gen_helper_fmpy_s); - do_fop_weww(ctx, ta, ta, ra, - is_sub ? gen_helper_fsub_s : gen_helper_fadd_s); - } else { - do_fop_dedd(ctx, tm, rm1, rm2, gen_helper_fmpy_d); - do_fop_dedd(ctx, ta, ta, ra, - is_sub ? gen_helper_fsub_d : gen_helper_fadd_d); - } + do_fop_weww(ctx, tm, rm1, rm2, gen_helper_fmpy_s); + do_fop_weww(ctx, ta, ta, ra, + is_sub ? gen_helper_fsub_s : gen_helper_fadd_s); return nullify_end(ctx); } +static bool trans_fmpyadd_f(DisasContext *ctx, arg_mpyadd *a) +{ + return do_fmpyadd_s(ctx, a, false); +} + +static bool trans_fmpysub_f(DisasContext *ctx, arg_mpyadd *a) +{ + return do_fmpyadd_s(ctx, a, true); +} + +static bool do_fmpyadd_d(DisasContext *ctx, arg_mpyadd *a, bool is_sub) +{ + nullify_over(ctx); + + do_fop_dedd(ctx, a->tm, a->rm1, a->rm2, gen_helper_fmpy_d); + do_fop_dedd(ctx, a->ta, a->ta, a->ra, + is_sub ? gen_helper_fsub_d : gen_helper_fadd_d); + + return nullify_end(ctx); +} + +static bool trans_fmpyadd_d(DisasContext *ctx, arg_mpyadd *a) +{ + return do_fmpyadd_d(ctx, a, false); +} + +static bool trans_fmpysub_d(DisasContext *ctx, arg_mpyadd *a) +{ + return do_fmpyadd_d(ctx, a, true); +} + static bool trans_fmpyfadd_s(DisasContext *ctx, uint32_t insn, const DisasInsn *di) { @@ -4376,9 +4393,6 @@ static void translate_one(DisasContext *ctx, uint32_t insn) opc = extract32(insn, 26, 6); switch (opc) { - case 0x06: - trans_fmpyadd(ctx, insn, false); - return; case 0x08: trans_ldil(ctx, insn); return; @@ -4456,9 +4470,6 @@ static void translate_one(DisasContext *ctx, uint32_t insn) case 0x25: trans_subi(ctx, insn); return; - case 0x26: - trans_fmpyadd(ctx, insn, true); - return; case 0x27: trans_cmpb(ctx, insn, true, false, true); return; diff --git a/target/hppa/insns.decode b/target/hppa/insns.decode index 38f5fb6be2..16a999b05f 100644 --- a/target/hppa/insns.decode +++ b/target/hppa/insns.decode @@ -153,3 +153,15 @@ lda 000011 ..... ..... .. . 1 -- 0110 ...... @ldim5 size=2 lda 000011 ..... ..... .. . 0 -- 0110 ...... @ldstx size=2 sta 000011 ..... ..... .. . 1 -- 1110 ...... @stim5 size=2 stby 000011 b:5 r:5 sp:2 a:1 1 -- 1100 m:1 ..... disp=%im5_0 + +#### +# Floating-point Multiply Add +#### + +&mpyadd rm1 rm2 ta ra tm +@mpyadd ...... rm1:5 rm2:5 ta:5 ra:5 . tm:5 &mpyadd + +fmpyadd_f 000110 ..... ..... ..... ..... 0 ..... @mpyadd +fmpyadd_d 000110 ..... ..... ..... ..... 1 ..... @mpyadd +fmpysub_f 100110 ..... ..... ..... ..... 0 ..... @mpyadd +fmpysub_d 100110 ..... ..... ..... ..... 1 ..... @mpyadd