From patchwork Thu Jun 13 12:14:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 166646 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp746086ilk; Thu, 13 Jun 2019 06:13:20 -0700 (PDT) X-Google-Smtp-Source: APXvYqxcWK/5HL9GORC3t+hlMINKbvQA0AZto4yJEK9cgR+pt38OPEmrGRwjpEzjd36uRLLxYAOs X-Received: by 2002:a05:620a:141a:: with SMTP id d26mr70428254qkj.32.1560431600765; Thu, 13 Jun 2019 06:13:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560431600; cv=none; d=google.com; s=arc-20160816; b=SYTbJVKFX1Wzw1jO01Kmihx01p4oDaU6SZgrX0vaR9Dk/BthtUpChBT4I8ymdT6RuE eyZQPxC/c9XbVDEKJdWO5RXQ+odXSXqIBsrfsOVLe47uEoUi5XXlXFWLC4czbX0tnOLn /gFCqLQLFcZorEr7KP23O7F2W/iMMR6ZM57B3tYnre2imNgXJsn70G0MdESwCBm1Q9Vx 7tEW4HqrER9YIZrFM9yUaBc0Zqm8N8xez+3UYn3QlJ65piWthJFLFnY6NL0GUgllUFDx +XD2jhwN65IGdZXsU4DSWCfMQ7SNKmUeI633YDrWU/wN7IogwO04xaOfU4vGd5GzrRev qDFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=fpGsIWOoUsjHLITABC3kThd/MgC+CdV/FGLa2lIHkA8=; b=FgOiUadAGpF/+O7ylfLxuCS1R7+Lal/UjIBPmaCUCZo8yYSuawW3Kuiy8an1OX5qS4 XoDA5ryFYbz2Oy2Y8Qv8Y97GzJs0jaZWpedhYCufKrZlGy9ucLMhFo03rCfB1WuLhksp XWZKr/V/JVTDnRo5GfIgrfPV/Aoouw9H0uk45yljsomXji2aA04oRbDdYGy4JFsaZOH8 TjQTz8UXuhSk767EO+EqaIq5SDFYkbY6RfcrIX+Y4FinIfGfDCEuuykfuDM6QM6VmZuu K0yWKs32Ad7FOHytUQYj1XVF4aCjA446McTfs5vYN9trAIpF78DRlbKRUfp4bXBewWKY kAnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=qsdLSz0u; 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 k127si1765761qkf.93.2019.06.13.06.13.20 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 13 Jun 2019 06:13:20 -0700 (PDT) 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=qsdLSz0u; 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 ([::1]:39610 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbPXc-0007eF-CV for patch@linaro.org; Thu, 13 Jun 2019 09:13:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59691) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbOdr-0008Qz-Rt for qemu-devel@nongnu.org; Thu, 13 Jun 2019 08:15:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hbOdW-0004gn-UE for qemu-devel@nongnu.org; Thu, 13 Jun 2019 08:15:36 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:52242) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hbOdW-0004VA-9M for qemu-devel@nongnu.org; Thu, 13 Jun 2019 08:15:22 -0400 Received: by mail-wm1-x342.google.com with SMTP id s3so9967539wms.2 for ; Thu, 13 Jun 2019 05:15:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=fpGsIWOoUsjHLITABC3kThd/MgC+CdV/FGLa2lIHkA8=; b=qsdLSz0u4mT+V1h1NAwSNTlKVSsQF1OGTRacJpxq8jLD9NECCB/FeBziIRMcxVCNqD 5eniX2Ga0NkIbH8uCJGVq7fXK5iiEvD6bq5f32hQ8WimiIayDBfuYeGGP6PKzUIqKaw2 iQsAkv6nCl0Bxmkoe8CrlGRuQVZgRza5O5baKDhE7HEQt0O0cYbkopXEzZUIRDBPJtEz LnXma1BNu/WcziIHv2AYCWFk9BGOURVfj29EbHLiN2WpeO0wjKwAMok4hbgAw7gukTBB vkyPZ+cJzUqmCZP8YwL4VAOFZOTz38Daamavd96xDBdVQgq2Ff/TqDxl6D4DLKXG+fGH qFbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fpGsIWOoUsjHLITABC3kThd/MgC+CdV/FGLa2lIHkA8=; b=WaM7Hwqqw05znW3MsGRbMJPQvNncFZveLTYBsZgeFth2Iob4z1Z7z7IeY9mjYonbqc /NtrYsrlNDryQtjWUtSOkc9eILeNXVhqpWv+Ru1yBBEE91TQ9sqA5PkJ8t8sfv4Tvmwx oianitBsOytPB1MVpPQkd7DCcRkOnpgAK0TksQbpKkPCI5AQZFjjFmxX1AfSP3YUyEnF jLieIveC3nE9fBUg5rehWDPiSzrUnDO78MOBlwsugVPYpEKC1wR34VC+/36P8i5mb17e Wh1vY579UtoNbs3K6vQAOYw+vAHpACOEqfISS1Za2FhUwTe9onMcpuu8AzcYD1GcttgW hOVw== X-Gm-Message-State: APjAAAUJkjWoiedUlbtVH83VBEcTNEDZ07yIxN27imwfNwGhemj7TQhJ Qz5OpuOEObV3wWLoBmTDVkdW745sTT/lhw== X-Received: by 2002:a1c:3:: with SMTP id 3mr3729120wma.44.1560428117341; Thu, 13 Jun 2019 05:15:17 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id y6sm2010576wrp.12.2019.06.13.05.15.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jun 2019 05:15:16 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 13 Jun 2019 13:14:24 +0100 Message-Id: <20190613121433.5246-40-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190613121433.5246-1-peter.maydell@linaro.org> References: <20190613121433.5246-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PULL 39/48] target/arm: Convert VFP comparison insns to decodetree X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Convert the VFP comparison instructions to decodetree. Note that comparison instructions should not honour the VFP short-vector length and stride information: they are scalar-only operations. This applies to all the 2-operand instructions except for VMOV, VABS, VNEG and VSQRT. (In the old decoder this is implemented via the "if (op == 15 && rn > 3) { veclen = 0; }" check.) Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson --- target/arm/translate-vfp.inc.c | 75 ++++++++++++++++++++++++++++++++++ target/arm/translate.c | 51 +---------------------- target/arm/vfp.decode | 5 +++ 3 files changed, 81 insertions(+), 50 deletions(-) -- 2.20.1 diff --git a/target/arm/translate-vfp.inc.c b/target/arm/translate-vfp.inc.c index a7e4ae31985..ebde86210a6 100644 --- a/target/arm/translate-vfp.inc.c +++ b/target/arm/translate-vfp.inc.c @@ -1938,3 +1938,78 @@ static bool trans_VSQRT_dp(DisasContext *s, arg_VSQRT_dp *a) { return do_vfp_2op_dp(s, gen_VSQRT_dp, a->vd, a->vm); } + +static bool trans_VCMP_sp(DisasContext *s, arg_VCMP_sp *a) +{ + TCGv_i32 vd, vm; + + /* Vm/M bits must be zero for the Z variant */ + if (a->z && a->vm != 0) { + return false; + } + + if (!vfp_access_check(s)) { + return true; + } + + vd = tcg_temp_new_i32(); + vm = tcg_temp_new_i32(); + + neon_load_reg32(vd, a->vd); + if (a->z) { + tcg_gen_movi_i32(vm, 0); + } else { + neon_load_reg32(vm, a->vm); + } + + if (a->e) { + gen_helper_vfp_cmpes(vd, vm, cpu_env); + } else { + gen_helper_vfp_cmps(vd, vm, cpu_env); + } + + tcg_temp_free_i32(vd); + tcg_temp_free_i32(vm); + + return true; +} + +static bool trans_VCMP_dp(DisasContext *s, arg_VCMP_dp *a) +{ + TCGv_i64 vd, vm; + + /* Vm/M bits must be zero for the Z variant */ + if (a->z && a->vm != 0) { + return false; + } + + /* UNDEF accesses to D16-D31 if they don't exist. */ + if (!dc_isar_feature(aa32_fp_d32, s) && ((a->vd | a->vm) & 0x10)) { + return false; + } + + if (!vfp_access_check(s)) { + return true; + } + + vd = tcg_temp_new_i64(); + vm = tcg_temp_new_i64(); + + neon_load_reg64(vd, a->vd); + if (a->z) { + tcg_gen_movi_i64(vm, 0); + } else { + neon_load_reg64(vm, a->vm); + } + + if (a->e) { + gen_helper_vfp_cmped(vd, vm, cpu_env); + } else { + gen_helper_vfp_cmpd(vd, vm, cpu_env); + } + + tcg_temp_free_i64(vd); + tcg_temp_free_i64(vm); + + return true; +} diff --git a/target/arm/translate.c b/target/arm/translate.c index b26242d3498..af1d01c49b7 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -1390,30 +1390,6 @@ static inline void gen_vfp_neg(int dp) gen_helper_vfp_negs(cpu_F0s, cpu_F0s); } -static inline void gen_vfp_cmp(int dp) -{ - if (dp) - gen_helper_vfp_cmpd(cpu_F0d, cpu_F1d, cpu_env); - else - gen_helper_vfp_cmps(cpu_F0s, cpu_F1s, cpu_env); -} - -static inline void gen_vfp_cmpe(int dp) -{ - if (dp) - gen_helper_vfp_cmped(cpu_F0d, cpu_F1d, cpu_env); - else - gen_helper_vfp_cmpes(cpu_F0s, cpu_F1s, cpu_env); -} - -static inline void gen_vfp_F1_ld0(int dp) -{ - if (dp) - tcg_gen_movi_i64(cpu_F1d, 0); - else - tcg_gen_movi_i32(cpu_F1s, 0); -} - #define VFP_GEN_ITOF(name) \ static inline void gen_vfp_##name(int dp, int neon) \ { \ @@ -3091,6 +3067,7 @@ static int disas_vfp_insn(DisasContext *s, uint32_t insn) case 15: switch (rn) { case 0 ... 3: + case 8 ... 11: /* Already handled by decodetree */ return 1; default: @@ -3135,11 +3112,6 @@ static int disas_vfp_insn(DisasContext *s, uint32_t insn) rd_is_dp = false; break; - case 0x08: case 0x0a: /* vcmp, vcmpz */ - case 0x09: case 0x0b: /* vcmpe, vcmpez */ - no_output = true; - break; - case 0x0c: /* vrintr */ case 0x0d: /* vrintz */ case 0x0e: /* vrintx */ @@ -3240,14 +3212,6 @@ static int disas_vfp_insn(DisasContext *s, uint32_t insn) /* Load the initial operands. */ if (op == 15) { switch (rn) { - case 0x08: case 0x09: /* Compare */ - gen_mov_F0_vreg(dp, rd); - gen_mov_F1_vreg(dp, rm); - break; - case 0x0a: case 0x0b: /* Compare with zero */ - gen_mov_F0_vreg(dp, rd); - gen_vfp_F1_ld0(dp); - break; case 0x14: /* vcvt fp <-> fixed */ case 0x15: case 0x16: @@ -3357,19 +3321,6 @@ static int disas_vfp_insn(DisasContext *s, uint32_t insn) gen_vfp_msr(tmp); break; } - case 8: /* cmp */ - gen_vfp_cmp(dp); - break; - case 9: /* cmpe */ - gen_vfp_cmpe(dp); - break; - case 10: /* cmpz */ - gen_vfp_cmp(dp); - break; - case 11: /* cmpez */ - gen_vfp_F1_ld0(dp); - gen_vfp_cmpe(dp); - break; case 12: /* vrintr */ { TCGv_ptr fpst = get_fpstatus_ptr(0); diff --git a/target/arm/vfp.decode b/target/arm/vfp.decode index b72ab8b8067..9db7aa7021a 100644 --- a/target/arm/vfp.decode +++ b/target/arm/vfp.decode @@ -176,3 +176,8 @@ VSQRT_sp ---- 1110 1.11 0001 .... 1010 11.0 .... \ vd=%vd_sp vm=%vm_sp VSQRT_dp ---- 1110 1.11 0001 .... 1011 11.0 .... \ vd=%vd_dp vm=%vm_dp + +VCMP_sp ---- 1110 1.11 010 z:1 .... 1010 e:1 1.0 .... \ + vd=%vd_sp vm=%vm_sp +VCMP_dp ---- 1110 1.11 010 z:1 .... 1011 e:1 1.0 .... \ + vd=%vd_dp vm=%vm_dp