From patchwork Mon Dec 18 17:17:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 122259 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp3116115qgn; Mon, 18 Dec 2017 09:34:37 -0800 (PST) X-Google-Smtp-Source: ACJfBov4kXp4/k1J1BS3VbFiMlq6RcNosSGYCegEgbsPRaiE6ouuFyoTrqtKrs9tYl0TQukSsRFs X-Received: by 10.129.160.194 with SMTP id x185mr413377ywg.39.1513618477268; Mon, 18 Dec 2017 09:34:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513618477; cv=none; d=google.com; s=arc-20160816; b=dOPaqg6YR5fRha1JH6EYqqOMhx1+XYCJNOAdkwTsffwMcQjghPF0QzMQJwLtg98IlE l/t0qoGFh8/uiwJKT9zf3H5n5l3VQDVbYGFu/0SaykHD2vyYD2jTQLA1T+HX/dzXnyNF VIa1t0uPzsh+MEJaWFFY14R2VZ8HQ23GjtXRyvTTuilTeJo42YOnI9NT3QxZOCe5EIje qSAfENqxn0qkv+yyKWX9OauRZtNWENfZkfpaOmCT2LvEfAjeKAigqBEdFOWSWJr67qfH WkACRSS4tc+XyPmMIIsSbFyi/eu+5PhXzFaXIp5fxgKgRJ+QzYOxEZ6EuhK+oRowNwfq W/Mg== 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=cM2dlrybJfMe8tAwWH5AbSc/+9BwG8aOe2MOv/DJn6A=; b=x4IfdZEs7DRQfgN8krZ6l+1YuGx3jOxrgaALOSapDbrdqthUhHuhcRPiZKUSJ4FnNs /NSUHVdf9cCjmGZRz1lPFsqlf4lTdBQ8Xs3E517fSKHJlc2M7ZiZRXEZqLqiEfLlv/2E Y8ubX7l+SuJij82MKCiWl1u5qGBDi5qeilsu8ue3b3EJbd/PZlOW5ePoaLzeODNf1sFf 6Lel2RjTQeZna6++xNAfmKIgLBTsLdCFWdevacntEAWryMWkIpIytDc2xw7ogSzMsdRC POkD5ozdKclPwIzGqyWiTvnodnp9TddXh2LhrH85dDbMHfEMGrEbBziU9Ztb2IDvi/5Z rpxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=QvI91Kgn; 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 w134si2486796ywd.801.2017.12.18.09.34.37 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 18 Dec 2017 09:34:37 -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=QvI91Kgn; 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]:58617 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQzJE-0004g1-Lq for patch@linaro.org; Mon, 18 Dec 2017 12:34:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37303) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQz3d-0000Xd-Tn for qemu-devel@nongnu.org; Mon, 18 Dec 2017 12:18:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eQz3Z-0001EI-Ri for qemu-devel@nongnu.org; Mon, 18 Dec 2017 12:18:29 -0500 Received: from mail-pl0-x244.google.com ([2607:f8b0:400e:c01::244]:40222) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eQz3Z-0001DN-J9 for qemu-devel@nongnu.org; Mon, 18 Dec 2017 12:18:25 -0500 Received: by mail-pl0-x244.google.com with SMTP id 62so3753503pld.7 for ; Mon, 18 Dec 2017 09:18:25 -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=cM2dlrybJfMe8tAwWH5AbSc/+9BwG8aOe2MOv/DJn6A=; b=QvI91KgnIbaymMtJw+Qj3Dpt4BY2CW6KFHFF0kKtRticA33Wh7YHst1MnU+ag81YBp eWifADbaKuuAEwEzPREFXFhp67U6PwWTjZ9J0h4tzAOdfB9bDCh6/H9yWpeWeJXbfn0v i/NEXpqezfytY5VQoT4cj0RtXO6mFO24TloFs= 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=cM2dlrybJfMe8tAwWH5AbSc/+9BwG8aOe2MOv/DJn6A=; b=cHDKNAycdOXmust5qu565HwGnai6tkQ6PY4k2p+1opYY1+Ansl4hyCWr3Vq3BVSMGf S8OTuLhrPpCgCwrbP4echFyVc0XLDiE6E5ztbSC481YnarTOZcxrOjQTtfxCM15LTeJB h4mm1EcUQl/WhtKC8LJRk34MjmLyYrdTaEUwy+X1tNNg8z28lgbN/ejwPYly6AvWHc+y xTDMq5k1sdtdARV9Gj8OUIFi1djvEmhkcytC+dmA4W0foXk/2M3rpQhxnE13Deqffvnm QGuhVTD9ZYbzdBdFFg7enH0AO57X5+vEdRDwYo7+K9Hwfo1pGMEfw7Shc/yrzYbaNORO zT9Q== X-Gm-Message-State: AKGB3mI6yKJnrdrTsb/vjr0ZIdirJ8EMdGQb5Wv8B2gKZLR2z3kxAs8X sibHednXrgRl9UbaHW3AwrqZveDNNyg= X-Received: by 10.84.137.169 with SMTP id 38mr422714pln.36.1513617504291; Mon, 18 Dec 2017 09:18:24 -0800 (PST) Received: from cloudburst.twiddle.net (174-21-7-63.tukw.qwest.net. [174.21.7.63]) by smtp.gmail.com with ESMTPSA id y19sm21050272pgv.19.2017.12.18.09.18.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Dec 2017 09:18:23 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 18 Dec 2017 09:17:47 -0800 Message-Id: <20171218171758.16964-16-richard.henderson@linaro.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171218171758.16964-1-richard.henderson@linaro.org> References: <20171218171758.16964-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::244 Subject: [Qemu-devel] [PATCH v7 15/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 c47faa5633..1ea7e37b03 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 */