From patchwork Tue Jan 16 03:33:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 124595 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp878204lje; Mon, 15 Jan 2018 19:49:05 -0800 (PST) X-Google-Smtp-Source: ACJfBotYey+XiJTINv0+erRiScULJ9j1GiW0xBuDRcSNPD03z1uQiiRg979RjPxpACZrPqYo6cZo X-Received: by 10.37.135.18 with SMTP id a18mr4571464ybl.442.1516074545342; Mon, 15 Jan 2018 19:49:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516074545; cv=none; d=google.com; s=arc-20160816; b=mxAUtA1pxYKWs44vFgpc458T9ol2Yrka+jq0khWs3EJE1HCHIyPvKvXe9bNH34j50x H15vgDClNxrKLpm0DDg7XWGFaQWarYV5n/RG9vlxFAhbuVOwgpmLY3sXIgOGAClQtGfJ oZePMFhOPuEWpyPRRPHGPKSiEl5SQN8cTNnDJigCL1Y+ggI/sVhYYHUonb7LXr8QB3JQ KaWyN30sEygy+1/Sp0rsi1/DXy3we0byrzsc2jUO+Cs27rOR0JBOOgS7uoD3zTNgO2/j 7xnOVDRf7uawJE0ZGCi2x3CViFaHZ8X6h6ZZohid6ET8WYHvBC8Wn1ZcvPwP34S8QJke LZfA== 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=fglbqt0ZZi+UTUzzw2VU5fDhQFOJREmbY828m0tqWIs=; b=rPgRtdLsFJAb8anmRvqmU9GjpEMe4bQb9HF+9n5lPcb4nAd7zn4eELUa99NHI7ZI5E pFHndqlG07ZmmLEHp42X804ESFBsMGD6sc9eVNyV8mCoHPWrw4c386G4KG1GVeHoAIvK Zz+g8/kW8IiYoRiFX4HYIx6sE30Rp1erm4dpVFkLGX5CcVJ3iZSlaHlnvWyoT+aGuL9l 5P+vObqKIGmMyS3VFbEbcsxD69RQL0NMw4Auwcw4eHhCJKmq8SEQrHtcggIvMY6aqH0r CGk+lGhjePAkcX9ThkO+gUxO0T/8eLrRAvcn7Y0AxBuOkLDD1AtsW/Ll7FJZI0nb3mPa GwOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=keYbwxSS; 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 t16si286626ybb.333.2018.01.15.19.49.05 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 15 Jan 2018 19:49:05 -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=keYbwxSS; 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]:59199 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebIFE-0007f0-Ja for patch@linaro.org; Mon, 15 Jan 2018 22:49:04 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59785) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebI1c-0005OV-K7 for qemu-devel@nongnu.org; Mon, 15 Jan 2018 22:35:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ebI1b-0003Oo-Gf for qemu-devel@nongnu.org; Mon, 15 Jan 2018 22:35:00 -0500 Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]:42086) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ebI1b-0003Ob-86 for qemu-devel@nongnu.org; Mon, 15 Jan 2018 22:34:59 -0500 Received: by mail-pf0-x241.google.com with SMTP id b25so2706004pfd.9 for ; Mon, 15 Jan 2018 19:34:59 -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=fglbqt0ZZi+UTUzzw2VU5fDhQFOJREmbY828m0tqWIs=; b=keYbwxSShXSBjIOFtqswmSLFuynqkDfcteR2RIsWESbE1dZmXUdkroM3adiWrCOOeY Ioe1htjRsm+FF/WAjDoheX4e0f6tqZAnyEmfinUYXv84oBtpQFMwWFJP3gXmqnX4CLr9 ihuDxIJnpzFE+TJFfpw+ZxAVyQgrNGlggB11M= 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=fglbqt0ZZi+UTUzzw2VU5fDhQFOJREmbY828m0tqWIs=; b=qLFRhDkhNdswtVnYnOE9eAB7YLjkzNDGoZe7UgWW2/16MrNPljZ/rWl8W0W0AxDsr8 YEnje2EhI2bXizrIg1jdYPkcrjY9/+hF65FZcYQqPoJVGvfu54yVnMqGW34wTspM1W8f MZ/w946s/b40FYikqTDA5TPxThNp2bCMZC7vuRgdNnzbOCNhSTtgSzYmk+pAwxewjdf+ fPFXCuXUq9FeHDo8Su68GY5r9mZZd3rBHG6B3cVfOIXA2OS7LhBDMiJO25HSDm4sZWev 2McdtjRPvSrfLOzsGNDxMJWjuCIjHeVp1Zc3ZgEM9xHGigKVdt/Rbn/xfKc/tMcuHFpw C+9g== X-Gm-Message-State: AKGB3mKZ7Ubo520oM+JfG2L3rbNFNroHhsUbXXxVBd4DBRO5h21K+vdx 6V5EHbHJfEdMHqohV7s9tFKDPAQVPC8= X-Received: by 10.99.114.28 with SMTP id n28mr20047896pgc.86.1516073697907; Mon, 15 Jan 2018 19:34:57 -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.34.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Jan 2018 19:34:57 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 15 Jan 2018 19:33:57 -0800 Message-Id: <20180116033404.31532-20-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:c00::241 Subject: [Qemu-devel] [PATCH v9 19/26] target/arm: Use vector infrastructure for aa64 zip/uzp/trn/xtn 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 | 103 +++++++++++++++------------------------------ 1 file changed, 35 insertions(+), 68 deletions(-) -- 2.14.3 diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 55a4902fc2..8769b4505a 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -5576,11 +5576,7 @@ static void disas_simd_zip_trn(DisasContext *s, uint32_t insn) int opcode = extract32(insn, 12, 2); bool part = extract32(insn, 14, 1); bool is_q = extract32(insn, 30, 1); - int esize = 8 << size; - int i, ofs; - int datasize = is_q ? 128 : 64; - int elements = datasize / esize; - TCGv_i64 tcg_res, tcg_resl, tcg_resh; + GVecGen3Fn *gvec_fn; if (opcode == 0 || (size == 3 && !is_q)) { unallocated_encoding(s); @@ -5591,60 +5587,24 @@ static void disas_simd_zip_trn(DisasContext *s, uint32_t insn) return; } - tcg_resl = tcg_const_i64(0); - tcg_resh = tcg_const_i64(0); - tcg_res = tcg_temp_new_i64(); - - for (i = 0; i < elements; i++) { - switch (opcode) { - case 1: /* UZP1/2 */ - { - int midpoint = elements / 2; - if (i < midpoint) { - read_vec_element(s, tcg_res, rn, 2 * i + part, size); - } else { - read_vec_element(s, tcg_res, rm, - 2 * (i - midpoint) + part, size); - } - break; - } - case 2: /* TRN1/2 */ - if (i & 1) { - read_vec_element(s, tcg_res, rm, (i & ~1) + part, size); - } else { - read_vec_element(s, tcg_res, rn, (i & ~1) + part, size); - } - break; - case 3: /* ZIP1/2 */ - { - int base = part * elements / 2; - if (i & 1) { - read_vec_element(s, tcg_res, rm, base + (i >> 1), size); - } else { - read_vec_element(s, tcg_res, rn, base + (i >> 1), size); - } - break; - } - default: - g_assert_not_reached(); - } - - ofs = i * esize; - if (ofs < 64) { - tcg_gen_shli_i64(tcg_res, tcg_res, ofs); - tcg_gen_or_i64(tcg_resl, tcg_resl, tcg_res); - } else { - tcg_gen_shli_i64(tcg_res, tcg_res, ofs - 64); - tcg_gen_or_i64(tcg_resh, tcg_resh, tcg_res); - } + switch (opcode) { + case 1: /* UZP1/2 */ + gvec_fn = part ? tcg_gen_gvec_uzpo : tcg_gen_gvec_uzpe; + break; + case 2: /* TRN1/2 */ + gvec_fn = part ? tcg_gen_gvec_trno : tcg_gen_gvec_trne; + break; + case 3: /* ZIP1/2 */ + gvec_fn = part ? tcg_gen_gvec_ziph : tcg_gen_gvec_zipl; + break; + default: + g_assert_not_reached(); } - tcg_temp_free_i64(tcg_res); - - write_vec_element(s, tcg_resl, rd, 0, MO_64); - tcg_temp_free_i64(tcg_resl); - write_vec_element(s, tcg_resh, rd, 1, MO_64); - tcg_temp_free_i64(tcg_resh); + gvec_fn(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)); } static void do_minmaxop(DisasContext *s, TCGv_i32 tcg_elt1, TCGv_i32 tcg_elt2, @@ -7922,6 +7882,22 @@ static void handle_2misc_narrow(DisasContext *s, bool scalar, int destelt = is_q ? 2 : 0; int passes = scalar ? 1 : 2; + if (opcode == 0x12 && !u) { /* XTN, XTN2 */ + tcg_debug_assert(!scalar); + if (is_q) { /* XTN2 */ + tcg_gen_gvec_uzpe(size, vec_reg_offset(s, rd, 1, MO_64), + vec_reg_offset(s, rn, 0, MO_64), + vec_reg_offset(s, rn, 1, MO_64), + 8, vec_full_reg_size(s) - 8); + } else { + tcg_gen_gvec_uzpe(size, vec_reg_offset(s, rd, 0, MO_64), + vec_reg_offset(s, rn, 0, MO_64), + vec_reg_offset(s, rn, 1, MO_64), + 8, vec_full_reg_size(s)); + } + return; + } + if (scalar) { tcg_res[1] = tcg_const_i32(0); } @@ -7939,23 +7915,14 @@ static void handle_2misc_narrow(DisasContext *s, bool scalar, tcg_res[pass] = tcg_temp_new_i32(); switch (opcode) { - case 0x12: /* XTN, SQXTUN */ + case 0x12: /* , SQXTUN */ { - static NeonGenNarrowFn * const xtnfns[3] = { - gen_helper_neon_narrow_u8, - gen_helper_neon_narrow_u16, - tcg_gen_extrl_i64_i32, - }; static NeonGenNarrowEnvFn * const sqxtunfns[3] = { gen_helper_neon_unarrow_sat8, gen_helper_neon_unarrow_sat16, gen_helper_neon_unarrow_sat32, }; - if (u) { - genenvfn = sqxtunfns[size]; - } else { - genfn = xtnfns[size]; - } + genenvfn = sqxtunfns[size]; break; } case 0x14: /* SQXTN, UQXTN */