From patchwork Sat Jan 6 03:13:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 123616 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp129052qgn; Fri, 5 Jan 2018 19:26:11 -0800 (PST) X-Google-Smtp-Source: ACJfBotBzyvq2xViG06PVZq9Qfva5Mj6N+XpNSWu1GkmTya/d1s/sAfOdwe/MR2/evkdMlmpxjse X-Received: by 10.129.172.28 with SMTP id k28mr4711148ywh.274.1515209171318; Fri, 05 Jan 2018 19:26:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515209171; cv=none; d=google.com; s=arc-20160816; b=MByTUSoiDN7Nkhu7txBW2cw6HTgnDCgUEqb/SNFmdpXIMu+0CrFzmb1WsPu5Sgmu9L vr+H14L8vfM7eEthck67ErS/OG1uuLcjjDKYNxu0FFdWrCbS9xYwk7xB/mrS5pmmtNs1 wI0F3cHx5L2gKyhwGSRTJuvIKhNDv/w+ASaCizy5CCWVGAeajR+QTdGZgrm137xwhGqu h7SEh6Idi7qkxfc28QqsIxpYVXEEJXP4wRqOSj+sUtLvfLVCuxgOvxSTcx2oD6WSMg6p Gmo8tTFIxWDBPGzTyyhnaNmfACR9E3TTTDp5YJR+L/0jeytE/ISicjtpxPBeCXnZOEFj ypNQ== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=gzhPOh2O6PV97dzBZo/zSpmop9UKLGT2Pv0pLxPSWwQ=; b=biQXrM+0nwiRlivBs11RIMuNsr2+FTL0Uax7F5x6qvpk/fHdhKQZssxlVlQEJp/PmN S6ao4DsUqavYPq93iElXz9bjvZPLSlJul6Bb1OikyzMnQIXI6clZbgA2aTan9NONhGNg PIb15HnVVD3tWMMw+Qi8jYZJHbLEFXmIfK8h+zREb+XcTOvIZh5dsVrA6QfmZJ1Idzs1 WiSIJQEHRvAbJtyK84c2/10Rf8LT+mA68F1FS/b6EzT7N88SJl2HbqVnmhYKPqg28i68 A0/gsuAj/EL6zhP7ECzgPhhTeicWpye7Hi6008eBOyfrNRZQJvH3bo6P1oy+v24h/Ydd n85w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Rt1E82bR; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id h124si1495842ywc.474.2018.01.05.19.26.11 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 05 Jan 2018 19:26:11 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Rt1E82bR; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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]:44102 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eXf7a-0000hL-P4 for patch@linaro.org; Fri, 05 Jan 2018 22:26:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48479) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eXewD-0007mS-4d for qemu-devel@nongnu.org; Fri, 05 Jan 2018 22:14:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eXew9-0005fN-3m for qemu-devel@nongnu.org; Fri, 05 Jan 2018 22:14:25 -0500 Received: from mail-pg0-x243.google.com ([2607:f8b0:400e:c05::243]:45388) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eXew8-0005dS-S7 for qemu-devel@nongnu.org; Fri, 05 Jan 2018 22:14:21 -0500 Received: by mail-pg0-x243.google.com with SMTP id c194so1735655pga.12 for ; Fri, 05 Jan 2018 19:14:20 -0800 (PST) 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; bh=gzhPOh2O6PV97dzBZo/zSpmop9UKLGT2Pv0pLxPSWwQ=; b=Rt1E82bRPHZMjQx6BOHZOv5FuHiRAQdNmN0Y9Wkytg3Vv+IvFTH1pATNskIJeuwe/B VCOEvbf2CjTXYL8Me67hrp54nzbl7kKqz7S6TbstnidJqPtcxdTL44e0LB1bLegyuybL 9NXb08VP3m6mdAF1sJmx9WBFeGstwnR7loEo8= 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; bh=gzhPOh2O6PV97dzBZo/zSpmop9UKLGT2Pv0pLxPSWwQ=; b=QusouDzcqILegSPMS7iPHxaJvz/ap+P9VnyRX1PkQePZxNFuAF1bSC+GjaQVgO/FC8 L1Biu27wtYXBpwh7cPBIHkyYkC0wRLihgSd0cDsOv/Ac61ABdp5pZ37tY0WHY15s9RFE X9WDVPss5TiFsrIUCQIXsu5xR/WMzG0B6QK4qQseC0xaxsyL2G/EtrvQsg1OzEVQ5umN OTDRgPoxEYGP4eaYj1qTcc6Cjl5/dCYe6+BIHqR9yLyoEga0tl8q4OxFcnZLs3cxGIVr S/ILfaxccJ8g5oPT8rzoFIL+0vYN6fHusHfxVezz4x46/rfSQqs4ZH6ayFwmkc8w4UTR t1Gw== X-Gm-Message-State: AKGB3mKbH2VTplJCfcCI1tL9PbrEIF3QF2Lgd39DaDRauI8k6aR6Paw2 42i61p0yd6rIHlkGx7UZ91GmV4hPTn0= X-Received: by 10.99.179.10 with SMTP id i10mr4109683pgf.41.1515208459591; Fri, 05 Jan 2018 19:14:19 -0800 (PST) Received: from cloudburst.twiddle.net (97-113-183-164.tukw.qwest.net. [97.113.183.164]) by smtp.gmail.com with ESMTPSA id g10sm17740595pfe.77.2018.01.05.19.14.18 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Jan 2018 19:14:18 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 5 Jan 2018 19:13:42 -0800 Message-Id: <20180106031346.6650-20-richard.henderson@linaro.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180106031346.6650-1-richard.henderson@linaro.org> References: <20180106031346.6650-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::243 Subject: [Qemu-devel] [PATCH v8 19/23] target/arm: Use vector infrastructure for aa64 compares 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson --- target/arm/translate-a64.c | 96 ++++++++++++++++++++++++++++++---------------- 1 file changed, 62 insertions(+), 34 deletions(-) -- 2.14.3 diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index d8bb3bbb25..44e44cc9f2 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -7115,6 +7115,28 @@ static void disas_simd_scalar_three_reg_diff(DisasContext *s, uint32_t insn) } } +/* CMTST : test is "if (X & Y != 0)". */ +static void gen_cmtst_i32(TCGv_i32 d, TCGv_i32 a, TCGv_i32 b) +{ + tcg_gen_and_i32(d, a, b); + tcg_gen_setcondi_i32(TCG_COND_NE, d, d, 0); + tcg_gen_neg_i32(d, d); +} + +static void gen_cmtst_i64(TCGv_i64 d, TCGv_i64 a, TCGv_i64 b) +{ + tcg_gen_and_i64(d, a, b); + tcg_gen_setcondi_i64(TCG_COND_NE, d, d, 0); + tcg_gen_neg_i64(d, d); +} + +static void gen_cmtst_vec(unsigned vece, TCGv_vec d, TCGv_vec a, TCGv_vec b) +{ + tcg_gen_and_vec(vece, d, a, b); + tcg_gen_dupi_vec(vece, a, 0); + tcg_gen_cmp_vec(TCG_COND_NE, vece, d, d, a); +} + static void handle_3same_64(DisasContext *s, int opcode, bool u, TCGv_i64 tcg_rd, TCGv_i64 tcg_rn, TCGv_i64 tcg_rm) { @@ -7158,10 +7180,7 @@ static void handle_3same_64(DisasContext *s, int opcode, bool u, cond = TCG_COND_EQ; goto do_cmop; } - /* CMTST : test is "if (X & Y != 0)". */ - tcg_gen_and_i64(tcg_rd, tcg_rn, tcg_rm); - tcg_gen_setcondi_i64(TCG_COND_NE, tcg_rd, tcg_rd, 0); - tcg_gen_neg_i64(tcg_rd, tcg_rd); + gen_cmtst_i64(tcg_rd, tcg_rn, tcg_rm); break; case 0x8: /* SSHL, USHL */ if (u) { @@ -9684,6 +9703,7 @@ static void disas_simd_3same_int(DisasContext *s, uint32_t insn) int rd = extract32(insn, 0, 5); int pass; GVecGen3Fn *gvec_op; + TCGCond cond; switch (opcode) { case 0x13: /* MUL, PMUL */ @@ -9731,6 +9751,44 @@ static void disas_simd_3same_int(DisasContext *s, uint32_t insn) vec_full_reg_offset(s, rm), is_q ? 16 : 8, vec_full_reg_size(s)); return; + case 0x11: + if (u) { /* CMEQ */ + cond = TCG_COND_EQ; + goto do_gvec_cmp; + } else { /* CMTST */ + static const GVecGen3 cmtst_op[4] = { + { .fni4 = gen_helper_neon_tst_u8, + .fniv = gen_cmtst_vec, + .vece = MO_8 }, + { .fni4 = gen_helper_neon_tst_u16, + .fniv = gen_cmtst_vec, + .vece = MO_16 }, + { .fni4 = gen_cmtst_i32, + .fniv = gen_cmtst_vec, + .vece = MO_32 }, + { .fni8 = gen_cmtst_i64, + .fniv = gen_cmtst_vec, + .prefer_i64 = TCG_TARGET_REG_BITS == 64, + .vece = MO_64 }, + }; + tcg_gen_gvec_3(vec_full_reg_offset(s, rd), + vec_full_reg_offset(s, rn), + vec_full_reg_offset(s, rm), + is_q ? 16 : 8, vec_full_reg_size(s), + &cmtst_op[size]); + } + return; + case 0x06: /* CMGT, CMHI */ + cond = u ? TCG_COND_GTU : TCG_COND_GT; + goto do_gvec_cmp; + case 0x07: /* CMGE, CMHS */ + cond = u ? TCG_COND_GEU : TCG_COND_GE; + do_gvec_cmp: + tcg_gen_gvec_cmp(cond, size, vec_full_reg_offset(s, rd), + vec_full_reg_offset(s, rn), + vec_full_reg_offset(s, rm), + is_q ? 16 : 8, vec_full_reg_size(s)); + return; } if (size == 3) { @@ -9813,26 +9871,6 @@ static void disas_simd_3same_int(DisasContext *s, uint32_t insn) genenvfn = fns[size][u]; break; } - case 0x6: /* CMGT, CMHI */ - { - static NeonGenTwoOpFn * const fns[3][2] = { - { gen_helper_neon_cgt_s8, gen_helper_neon_cgt_u8 }, - { gen_helper_neon_cgt_s16, gen_helper_neon_cgt_u16 }, - { gen_helper_neon_cgt_s32, gen_helper_neon_cgt_u32 }, - }; - genfn = fns[size][u]; - break; - } - case 0x7: /* CMGE, CMHS */ - { - static NeonGenTwoOpFn * const fns[3][2] = { - { gen_helper_neon_cge_s8, gen_helper_neon_cge_u8 }, - { gen_helper_neon_cge_s16, gen_helper_neon_cge_u16 }, - { gen_helper_neon_cge_s32, gen_helper_neon_cge_u32 }, - }; - genfn = fns[size][u]; - break; - } case 0x8: /* SSHL, USHL */ { static NeonGenTwoOpFn * const fns[3][2] = { @@ -9905,16 +9943,6 @@ static void disas_simd_3same_int(DisasContext *s, uint32_t insn) genfn = fns[size][u]; break; } - case 0x11: /* CMTST, CMEQ */ - { - static NeonGenTwoOpFn * const fns[3][2] = { - { gen_helper_neon_tst_u8, gen_helper_neon_ceq_u8 }, - { gen_helper_neon_tst_u16, gen_helper_neon_ceq_u16 }, - { gen_helper_neon_tst_u32, gen_helper_neon_ceq_u32 }, - }; - genfn = fns[size][u]; - break; - } case 0x13: /* MUL, PMUL */ if (u) { /* PMUL */