From patchwork Tue Jan 16 03:33:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 124602 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp878882lje; Mon, 15 Jan 2018 19:52:45 -0800 (PST) X-Google-Smtp-Source: ACJfBovY/BVi+an0Mxg6g3HsE5EaxGRSQI9xaXUReo6P0hMpkRt/Nw/PypZtIFYGuBDmW92+Sc89 X-Received: by 10.37.4.10 with SMTP id 10mr33532761ybe.473.1516074764975; Mon, 15 Jan 2018 19:52:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516074764; cv=none; d=google.com; s=arc-20160816; b=YOkJDCOr07f2gOShwl40PwbrbIRMIzg8sCjdEI4fJJ3l5DZD9rUXKurpGAWeOml6+D YP6/kSiasr6MrGPMAmM1bG18x9/QTwDuUqH3EvQQME5q2xf145AgYevxtdjdJbVYwXOD Ojz8BCmoujy0+pKP4/Dq0IFVhU0sbfYjV8cc/+SlM7yYW0CX0qIV6PypDer0kaScWt2A 62c+UYNsDWzdECIe/hM4UrA3A73B9AdLz5ZbEEeaz7trwMpF1VDwTiPhmXztqaWhWft6 UhspSv3fgDYTJb4UszEFgzp03TFYK5KVVY39wihCNl3WF+Rwjg2xTuTj7ivFte5/M72F 5Z6g== 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:arc-authentication-results; bh=gzhPOh2O6PV97dzBZo/zSpmop9UKLGT2Pv0pLxPSWwQ=; b=vIiLki5Re/Epd6OXK3nryRPqnQ9n+lATg7e5CkodNl0xqj7EBXTQAlkjrEigoB2Dl1 df6q3H5jYD3l6scBJsovrr2Mbv+cgwuSROssR6z9zItVZ5covH3Y6sqpBckTYV387IAK vIDFA6tTEFLgWBJ5G4xD6C+wqkQLbqweWn96YlpTANQIERxRBxt9Sv9RqFnB0pMYn1VB jJnXLhXZFPZmimnjjCVO8uhn6AcXDMtobQLcNbcnLe91HcsAozTabTgFMtr+6mNLW2H6 KMUdCBr4FdstIpRk5fXFWKgLlqN2Li7pMfMBJnqWbBQUrPeil4DhLrVNV4b3raNJpoKW GmOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ZMaZ9G3d; 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 s190si276843ywd.273.2018.01.15.19.52.44 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 15 Jan 2018 19:52:44 -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=ZMaZ9G3d; 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]:59245 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebIIm-00035Q-AL for patch@linaro.org; Mon, 15 Jan 2018 22:52:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59825) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebI1h-0005TL-9B for qemu-devel@nongnu.org; Mon, 15 Jan 2018 22:35:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ebI1f-0003Qc-Gb for qemu-devel@nongnu.org; Mon, 15 Jan 2018 22:35:05 -0500 Received: from mail-pl0-x243.google.com ([2607:f8b0:400e:c01::243]:34016) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ebI1f-0003QJ-8w for qemu-devel@nongnu.org; Mon, 15 Jan 2018 22:35:03 -0500 Received: by mail-pl0-x243.google.com with SMTP id d21so5119501pll.1 for ; Mon, 15 Jan 2018 19:35:03 -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=gzhPOh2O6PV97dzBZo/zSpmop9UKLGT2Pv0pLxPSWwQ=; b=ZMaZ9G3dGP0D/N1oZEH7dYIi9tH+//n6FPtlGnQlXSm072uEPx++KurIJG2ftWctGx 6FaAbxpiyntEQiEsfba3WcCgPEvnfysB4YQL+DrQsIjDa7DKXPTk3KbQh/Cubn0wplcT KF68wc/WLP7rVDfUye25HkJnGv/pRRvQyd94k= 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=gzhPOh2O6PV97dzBZo/zSpmop9UKLGT2Pv0pLxPSWwQ=; b=q2iyQfVn/YYUHEgyslaOcCXOWMxLB2L5GCBiqYi7/IRdI45pTsAWjXYSKyKRtDrpaB AgemUiWw69dhCgTM3wjx1QvsCoiwqHty4nha43k2BZBVYiTfHooVH+PCwoOj/HQgobIW mVNld8CPXXVFzYfk2A4Yz6owP8RsjoZayHezXco1Nn5kvhoaBmYmBIDvEqbCLjlhh9d7 RQZYAPG2wHaG688/h4b1sSsZPmx4jOKbjCep5WtkETTmbiRnVcHGy7CQ0AJI1ukGQNwT j9cv+aKGlUpbtP2BxYzluvwLEdweuh2PuaUThRfhmBC+APd2Wxw9BcNUEMkfD/k0DJd3 Dubg== X-Gm-Message-State: AKwxytfCAdIKkBh0dEe360AqDsHnzHMSZutIOQCqcmOodFF506UY5zoW VqjLRC0deRD7YPo8GXMG/XcZe2H/8Kw= X-Received: by 10.84.235.195 with SMTP id m3mr21635130plt.442.1516073702006; Mon, 15 Jan 2018 19:35:02 -0800 (PST) Received: from cloudburst.twiddle.net.com (24-181-135-57.dhcp.knwc.wa.charter.com. [24.181.135.57]) by smtp.gmail.com with ESMTPSA id c83sm1281024pfk.8.2018.01.15.19.35.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Jan 2018 19:35:01 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 15 Jan 2018 19:33:59 -0800 Message-Id: <20180116033404.31532-22-richard.henderson@linaro.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180116033404.31532-1-richard.henderson@linaro.org> References: <20180116033404.31532-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:c01::243 Subject: [Qemu-devel] [PATCH v9 21/26] 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: , Cc: peter.maydell@linaro.org 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 */