From patchwork Thu Feb 7 11:53:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 157724 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp562064jaa; Thu, 7 Feb 2019 04:06:03 -0800 (PST) X-Google-Smtp-Source: AHgI3IYGZtXY05mM07rrShz+fFKvn9nN7+cvA9eXpgWjj+oKUrB0PAcaPNdLXwP4/pSFfFVlXXy/ X-Received: by 2002:a1c:1d8e:: with SMTP id d136mr6983207wmd.98.1549541163500; Thu, 07 Feb 2019 04:06:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549541163; cv=none; d=google.com; s=arc-20160816; b=fAF14GgVLlqXN7jwow9EWSEN0KWGNetu2KQvU2qE4b7BKv8W/p2eAcF2l7TsvpbuuW XbQzXXFzjq0VZqzYg6ZAN+9UCuP/CG0T+PD8cAkZQ5pxgi7qhk3puAEj44h6Vixdfc3f CYBvUiMopS1psBaScscROFqy2dnyx0K7frvI5IpxS0EnyFTI1wHPEkXVjs0TYpJzM2B+ FgKDjnNVOKg4iH1YvTdtfA7I4iV9Hc1ABy2yYiKOWk2ZNgNwA+sZjFilsPknGvyNkc3Q +86mp1V13PfzxKExK99vKG3AXRyDCwY3OF/jxrxTgpSk/DmgVlKsvcm0Ht0fvbRxyIWA lPVg== 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=sGHREpaBuY4zSGR4UvSRHaEl0x41OILr7P5XSIYkX3o=; b=D+fTEIFSWjvC58gwLD759enIFfywEHkeygnsnNmROOe6glbE1lbbkuulvvGiKaLRsW HFgajA4u0ptuTFxQmvlnQ970xzs3EyNBD4IJGNEezeTbIsbaac5RI7X2NE6bB2GBKd8C TB7woD7c/zO+VCuvHLDPNoA7eqRf/CnRozk/NfAB+eicYFdibOR+2qkjk7rXP/N4in8h ZXh+CdMZ1cRKbqOq5x5kVWZpyP/Frk20G3ARWEeRWpMUILv0oUDKcs38QVAUt6Nu8AJW TJl1aw583iUSedmQe3Ig8zqEAmdAUQOm4EBoFKH7XSjdEwgugPE5tUk7sDm8U1RYP5mX zcIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=uBLzSXy5; 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 s3si18238547wre.290.2019.02.07.04.06.03 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 07 Feb 2019 04:06:03 -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=uBLzSXy5; 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]:38592 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1griRO-00006P-Cr for patch@linaro.org; Thu, 07 Feb 2019 07:06:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58388) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1griGL-0007c5-Lx for qemu-devel@nongnu.org; Thu, 07 Feb 2019 06:54:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1griGI-0001YR-KO for qemu-devel@nongnu.org; Thu, 07 Feb 2019 06:54:37 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:43382) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1griGI-0001Ur-9v for qemu-devel@nongnu.org; Thu, 07 Feb 2019 06:54:34 -0500 Received: by mail-wr1-x444.google.com with SMTP id r2so11173002wrv.10 for ; Thu, 07 Feb 2019 03:54:24 -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=sGHREpaBuY4zSGR4UvSRHaEl0x41OILr7P5XSIYkX3o=; b=uBLzSXy5IexcrNAY/cAznjgnO09qZELqwlB9JhakP1rqYeMJ/MStsXpk69rSoKRUF6 JgraH/C/P+4VAv6Dj9ZUCjPhjKLbrvqOGF4jUZVr85iewNYDOFHeblJckQsee7yHsd6i oqnbccpny0EIgqC8PdxAEZ/skC/i60xDGzrabZSHGhc5WoDbOoGLQC2vRCldabzqLNpL i2jz4KxI48Z0GO2qh1+VPQFbLZAH2Wb7iZeHlHtgT2ug9A1BENT71T+W0yVIJoxweOFW fHPoKJ7pYG4CvWm2CQxiiMXD2JHJ2+zBbV8Gy/tY/0jke4dzPh6tXPLMSuTMzkRPvPxI ZXfw== 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=sGHREpaBuY4zSGR4UvSRHaEl0x41OILr7P5XSIYkX3o=; b=Ec5ixgsqmdzCSu8mVmn3EobgiDG5sqZtIcTD3Avo3tXAndR5Fl8j3dBQ+XSK7dukgf zDtH57CGd3YZBQGF1DwxJ93IdUcRywveoDVOrcd8yunLuj5IddUgWDWumxaVTpF7nk6S Jpv487XcIknPFrQVY5JcTLTnf3wmhvSNJVCvU8rl/0O/feO3k1Y8e9/cwbyW5GIcZaZS NKWsJ3oMYKtvYJ5gU2c+FrDaJLZGM+mgDMS0AbVC795ZlYYE9cZVyyuxD3fNp5QoSHKe 1J+tVYlkNQhfN5wuJbaCtmcP68DCjahB+W6qjsaUnqCed2DsSPW20td0VFqAszdX5XE8 SXhw== X-Gm-Message-State: AHQUAuY4nsNHIbZKBCAq8PnH6UJCQcmbJ+EMsekbYqWZStEVkXi7FHZh tI/A/cXqXazAP+ZGqcoiTCu6LPk+YIIQ1g== X-Received: by 2002:adf:ee46:: with SMTP id w6mr12313868wro.261.1549540463673; Thu, 07 Feb 2019 03:54:23 -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.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Feb 2019 03:54:23 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 11:53:58 +0000 Message-Id: <20190207115400.647-18-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::444 Subject: [Qemu-devel] [PATCH 17/19] target/hppa: Convert fp fused multiply-add insns 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 | 77 +++++++++++++--------------------------- target/hppa/insns.decode | 12 +++++++ 2 files changed, 36 insertions(+), 53 deletions(-) -- 2.17.2 diff --git a/target/hppa/translate.c b/target/hppa/translate.c index c73a7ab3db..3889851109 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -876,14 +876,6 @@ static unsigned assemble_rb64(uint32_t insn) return r1 * 32 + r0; } -static unsigned assemble_rc64(uint32_t insn) -{ - unsigned r2 = extract32(insn, 8, 1); - unsigned r1 = extract32(insn, 13, 3); - unsigned r0 = extract32(insn, 9, 2); - return r2 * 32 + r1 * 4 + r0; -} - static inline unsigned assemble_sr3(uint32_t insn) { unsigned s2 = extract32(insn, 13, 1); @@ -4041,67 +4033,50 @@ 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) +static bool trans_fmpyfadd_f(DisasContext *ctx, arg_fmpyfadd_f *a) { - unsigned rt = assemble_rt64(insn); - unsigned neg = extract32(insn, 5, 1); - unsigned rm1 = assemble_ra64(insn); - unsigned rm2 = assemble_rb64(insn); - unsigned ra3 = assemble_rc64(insn); - TCGv_i32 a, b, c; + TCGv_i32 x, y, z; nullify_over(ctx); - a = load_frw0_i32(rm1); - b = load_frw0_i32(rm2); - c = load_frw0_i32(ra3); + x = load_frw0_i32(a->rm1); + y = load_frw0_i32(a->rm2); + z = load_frw0_i32(a->ra3); - if (neg) { - gen_helper_fmpynfadd_s(a, cpu_env, a, b, c); + if (a->neg) { + gen_helper_fmpynfadd_s(x, cpu_env, x, y, z); } else { - gen_helper_fmpyfadd_s(a, cpu_env, a, b, c); + gen_helper_fmpyfadd_s(x, cpu_env, x, y, z); } - tcg_temp_free_i32(b); - tcg_temp_free_i32(c); - save_frw_i32(rt, a); - tcg_temp_free_i32(a); + tcg_temp_free_i32(y); + tcg_temp_free_i32(z); + save_frw_i32(a->t, x); + tcg_temp_free_i32(x); return nullify_end(ctx); } -static bool trans_fmpyfadd_d(DisasContext *ctx, uint32_t insn, - const DisasInsn *di) +static bool trans_fmpyfadd_d(DisasContext *ctx, arg_fmpyfadd_d *a) { - unsigned rt = extract32(insn, 0, 5); - unsigned neg = extract32(insn, 5, 1); - unsigned rm1 = extract32(insn, 21, 5); - unsigned rm2 = extract32(insn, 16, 5); - unsigned ra3 = assemble_rc64(insn); - TCGv_i64 a, b, c; + TCGv_i64 x, y, z; nullify_over(ctx); - a = load_frd0(rm1); - b = load_frd0(rm2); - c = load_frd0(ra3); + x = load_frd0(a->rm1); + y = load_frd0(a->rm2); + z = load_frd0(a->ra3); - if (neg) { - gen_helper_fmpynfadd_d(a, cpu_env, a, b, c); + if (a->neg) { + gen_helper_fmpynfadd_d(x, cpu_env, x, y, z); } else { - gen_helper_fmpyfadd_d(a, cpu_env, a, b, c); + gen_helper_fmpyfadd_d(x, cpu_env, x, y, z); } - tcg_temp_free_i64(b); - tcg_temp_free_i64(c); - save_frd(rt, a); - tcg_temp_free_i64(a); + tcg_temp_free_i64(y); + tcg_temp_free_i64(z); + save_frd(a->t, x); + tcg_temp_free_i64(x); return nullify_end(ctx); } -static const DisasInsn table_fp_fused[] = { - { 0xb8000000u, 0xfc000800u, trans_fmpyfadd_s }, - { 0xb8000800u, 0xfc0019c0u, trans_fmpyfadd_d } -}; - static void translate_table_int(DisasContext *ctx, uint32_t insn, const DisasInsn table[], size_t n) { @@ -4137,10 +4112,6 @@ static void translate_one(DisasContext *ctx, uint32_t insn) case 0x0E: translate_table(ctx, insn, table_float_0e); return; - - case 0x2E: - translate_table(ctx, insn, table_fp_fused); - return; } gen_illegal(ctx); } diff --git a/target/hppa/insns.decode b/target/hppa/insns.decode index f564e54f1d..1c8102f76e 100644 --- a/target/hppa/insns.decode +++ b/target/hppa/insns.decode @@ -39,6 +39,10 @@ %rm64 1:1 16:5 %rt64 6:1 0:5 +%ra64 7:1 21:5 +%rb64 12:1 16:5 +%rc64 8:1 13:3 9:2 +%rc32 13:3 9:2 %im5_0 0:s1 1:4 %im5_16 16:s1 17:4 @@ -338,3 +342,11 @@ blr 111010 l:5 x:5 010 00000000000 n:1 0 bv 111010 b:5 x:5 110 00000000000 n:1 0 bve 111010 b:5 00000 110 10000000000 n:1 - l=0 bve 111010 b:5 00000 111 10000000000 n:1 - l=2 + +#### +# FP Fused Multiple-Add +#### + +fmpyfadd_f 101110 ..... ..... ... . 0 ... . . neg:1 ..... \ + rm1=%ra64 rm2=%rb64 ra3=%rc64 t=%rt64 +fmpyfadd_d 101110 rm1:5 rm2:5 ... 0 1 ..0 0 0 neg:1 t:5 ra3=%rc32