From nobody Fri May 9 16:24:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1591376609; cv=none; d=zohomail.com; s=zohoarc; b=krQfheqWOmlqLxgTTtbfIEUat0eoFOpMWbYdMKnhmgzPTv5UXRpdUqhC8qYqqzIdTR9usgrjJm0XqY+7yShaAiQVU1CwzErA4NGQJAYOk3aPdxsb6+naGVJM6U2VmnXDb+mFAw0bFnAdtAVNBIEBoaybyqi6TcBE76/fFBRopvk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591376609; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DFrbUa8GdjKLGEn1BB40fx9lav1zTysEnNJcYX3tT5k=; b=FdvdjMkFIzlYg9KoN7P2QQS2BB8KpT8nHctXEJN4UookaYtVGG6Vp77pHloxL2guJHnh8oa6bG1IQAF0hPfn9hH4FzCwDd5HSOXu8RHozw1Q3Ccv8qNlRUcIQ9uPpWtmkWA4Zx/a4OxdrYLOw+FNohPvyRKpcHpmH2h6mNqcDxU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from=<peter.maydell@linaro.org> (p=none dis=none) header.from=<peter.maydell@linaro.org> Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1591376609512938.1596076855092; Fri, 5 Jun 2020 10:03:29 -0700 (PDT) Received: from localhost ([::1]:51432 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>) id 1jhFkd-0002GQ-NW for importer@patchew.org; Fri, 05 Jun 2020 13:03:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40642) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>) id 1jhFYH-0002DG-JV for qemu-devel@nongnu.org; Fri, 05 Jun 2020 12:50:41 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:39654) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>) id 1jhFYG-0001kq-9b for qemu-devel@nongnu.org; Fri, 05 Jun 2020 12:50:41 -0400 Received: by mail-wr1-x429.google.com with SMTP id t18so10455550wru.6 for <qemu-devel@nongnu.org>; Fri, 05 Jun 2020 09:50:39 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id c140sm12272724wmd.18.2020.06.05.09.50.37 for <qemu-devel@nongnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jun 2020 09:50:37 -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=DFrbUa8GdjKLGEn1BB40fx9lav1zTysEnNJcYX3tT5k=; b=XLQQuQUthmY1ttkCDnpWRgIQoer6VnyUn/FYDSLkHyKXJnetDq1kvI8bpPWhVugj4a 160plrLiCRNTnQhEUwevsccKG2ghpn+s6uePSwxTaYQhBi+CvRuhfY4OCgeGLzXO4hvq ckWvh1ACKh31BFzgPexkMdgi/1M5n25GWnf6xOKLKLLrVpod8h2AF7CNMqkdHItIKemH TxmlVHPUqYuBXDOK4KvOq0DEan5jUtXGJtGbAacDwe/tnZirbJJwi+bEyd3w8zid7utP Iy46A63xITHxM81VNDkJwQyQ0HGMPXcq/rYBte8vDjH8xCsqdtecynwf1UJ7A1Ht8hk6 kYww== 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=DFrbUa8GdjKLGEn1BB40fx9lav1zTysEnNJcYX3tT5k=; b=KYnxKWx5j5VtlANl5ABDGAqj+WkH6GRPKAbak5Q13Utvn+54jZGoMpzN/IOOCzoWwN aBeDQDZDtpkmzhI79EwMxvBe7D13NmrvdHmI7/HKsfPinbQWKNkuyPhU+sfRRWbs4MKx FbC8PVTpnwbcRzQaXvC/j8i3so0u+bJe/3Gjehu6Ns+PzI47JRSWjuhKyBYnbuWE1vFh AjHH+3v4DqKVAA5ylmIV5yyCRM0oNkF0oJgiXh283MC2feuXO4FzZ8hQwyRIoQ+oO09y 7Pr1QR2YJqY+tZuOTu8YV8UB3rkiSUgUGVCxVs8wgdQR2wwhBEopKGX4vxnPCoiVk8Vs n9gQ== X-Gm-Message-State: AOAM530R4o0OdgzWzNKY9CWb6mJE597p/YrkJGkj3HmLLmi9SA6A+Y7Q N1JQ32Q5j+/68wUxlWrtf45LVaR9+Rbz6g== X-Google-Smtp-Source: ABdhPJyq7vm4PpbBlOHQGxItpMYRkO3r0bwry8cULwyfyU91VWjaUVOCpe+F8UHiiY3msbpnC+fE1g== X-Received: by 2002:adf:8b0c:: with SMTP id n12mr11438995wra.340.1591375838379; Fri, 05 Jun 2020 09:50:38 -0700 (PDT) From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Subject: [PULL 26/29] target/arm: Convert Neon narrowing shifts with op==9 to decodetree Date: Fri, 5 Jun 2020 17:50:04 +0100 Message-Id: <20200605165007.12095-27-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200605165007.12095-1-peter.maydell@linaro.org> References: <20200605165007.12095-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x429.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org> X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Convert the remaining Neon narrowing shifts to decodetree: * VQSHRN * VQRSHRN Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20200522145520.6778-7-peter.maydell@linaro.org --- target/arm/neon-dp.decode | 20 ++++++ target/arm/translate-neon.inc.c | 15 +++++ target/arm/translate.c | 110 +------------------------------- 3 files changed, 37 insertions(+), 108 deletions(-) diff --git a/target/arm/neon-dp.decode b/target/arm/neon-dp.decode index 8161995aee8..79d0bfdd70e 100644 --- a/target/arm/neon-dp.decode +++ b/target/arm/neon-dp.decode @@ -328,3 +328,23 @@ VQSHRUN_16_2sh 1111 001 1 1 . ...... .... 1000 . 0 .= 1 .... @2reg_shrn_h VQRSHRUN_64_2sh 1111 001 1 1 . ...... .... 1000 . 1 . 1 .... @2reg_shrn_d VQRSHRUN_32_2sh 1111 001 1 1 . ...... .... 1000 . 1 . 1 .... @2reg_shrn_s VQRSHRUN_16_2sh 1111 001 1 1 . ...... .... 1000 . 1 . 1 .... @2reg_shrn_h + +# VQSHRN with signed input +VQSHRN_S64_2sh 1111 001 0 1 . ...... .... 1001 . 0 . 1 .... @2reg_shrn_d +VQSHRN_S32_2sh 1111 001 0 1 . ...... .... 1001 . 0 . 1 .... @2reg_shrn_s +VQSHRN_S16_2sh 1111 001 0 1 . ...... .... 1001 . 0 . 1 .... @2reg_shrn_h + +# VQRSHRN with signed input +VQRSHRN_S64_2sh 1111 001 0 1 . ...... .... 1001 . 1 . 1 .... @2reg_shrn_d +VQRSHRN_S32_2sh 1111 001 0 1 . ...... .... 1001 . 1 . 1 .... @2reg_shrn_s +VQRSHRN_S16_2sh 1111 001 0 1 . ...... .... 1001 . 1 . 1 .... @2reg_shrn_h + +# VQSHRN with unsigned input +VQSHRN_U64_2sh 1111 001 1 1 . ...... .... 1001 . 0 . 1 .... @2reg_shrn_d +VQSHRN_U32_2sh 1111 001 1 1 . ...... .... 1001 . 0 . 1 .... @2reg_shrn_s +VQSHRN_U16_2sh 1111 001 1 1 . ...... .... 1001 . 0 . 1 .... @2reg_shrn_h + +# VQRSHRN with unsigned input +VQRSHRN_U64_2sh 1111 001 1 1 . ...... .... 1001 . 1 . 1 .... @2reg_shrn_d +VQRSHRN_U32_2sh 1111 001 1 1 . ...... .... 1001 . 1 . 1 .... @2reg_shrn_s +VQRSHRN_U16_2sh 1111 001 1 1 . ...... .... 1001 . 1 . 1 .... @2reg_shrn_h diff --git a/target/arm/translate-neon.inc.c b/target/arm/translate-neon.in= c.c index fe3fb7f62f3..562470ca08c 100644 --- a/target/arm/translate-neon.inc.c +++ b/target/arm/translate-neon.inc.c @@ -1563,3 +1563,18 @@ DO_2SN_32(VQSHRUN_16, gen_helper_neon_shl_s16, gen_h= elper_neon_unarrow_sat8) DO_2SN_64(VQRSHRUN_64, gen_helper_neon_rshl_s64, gen_helper_neon_unarrow_s= at32) DO_2SN_32(VQRSHRUN_32, gen_helper_neon_rshl_s32, gen_helper_neon_unarrow_s= at16) DO_2SN_32(VQRSHRUN_16, gen_helper_neon_rshl_s16, gen_helper_neon_unarrow_s= at8) +DO_2SN_64(VQSHRN_S64, gen_sshl_i64, gen_helper_neon_narrow_sat_s32) +DO_2SN_32(VQSHRN_S32, gen_sshl_i32, gen_helper_neon_narrow_sat_s16) +DO_2SN_32(VQSHRN_S16, gen_helper_neon_shl_s16, gen_helper_neon_narrow_sat_= s8) + +DO_2SN_64(VQRSHRN_S64, gen_helper_neon_rshl_s64, gen_helper_neon_narrow_sa= t_s32) +DO_2SN_32(VQRSHRN_S32, gen_helper_neon_rshl_s32, gen_helper_neon_narrow_sa= t_s16) +DO_2SN_32(VQRSHRN_S16, gen_helper_neon_rshl_s16, gen_helper_neon_narrow_sa= t_s8) + +DO_2SN_64(VQSHRN_U64, gen_ushl_i64, gen_helper_neon_narrow_sat_u32) +DO_2SN_32(VQSHRN_U32, gen_ushl_i32, gen_helper_neon_narrow_sat_u16) +DO_2SN_32(VQSHRN_U16, gen_helper_neon_shl_u16, gen_helper_neon_narrow_sat_= u8) + +DO_2SN_64(VQRSHRN_U64, gen_helper_neon_rshl_u64, gen_helper_neon_narrow_sa= t_u32) +DO_2SN_32(VQRSHRN_U32, gen_helper_neon_rshl_u32, gen_helper_neon_narrow_sa= t_u16) +DO_2SN_32(VQRSHRN_U16, gen_helper_neon_rshl_u16, gen_helper_neon_narrow_sa= t_u8) diff --git a/target/arm/translate.c b/target/arm/translate.c index 11330b92966..883c1a29c7b 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -3201,40 +3201,6 @@ static inline void gen_neon_unarrow_sats(int size, T= CGv_i32 dest, TCGv_i64 src) } } =20 -static inline void gen_neon_shift_narrow(int size, TCGv_i32 var, TCGv_i32 = shift, - int q, int u) -{ - if (q) { - if (u) { - switch (size) { - case 1: gen_helper_neon_rshl_u16(var, var, shift); break; - case 2: gen_helper_neon_rshl_u32(var, var, shift); break; - default: abort(); - } - } else { - switch (size) { - case 1: gen_helper_neon_rshl_s16(var, var, shift); break; - case 2: gen_helper_neon_rshl_s32(var, var, shift); break; - default: abort(); - } - } - } else { - if (u) { - switch (size) { - case 1: gen_helper_neon_shl_u16(var, var, shift); break; - case 2: gen_ushl_i32(var, var, shift); break; - default: abort(); - } - } else { - switch (size) { - case 1: gen_helper_neon_shl_s16(var, var, shift); break; - case 2: gen_sshl_i32(var, var, shift); break; - default: abort(); - } - } - } -} - static inline void gen_neon_widen(TCGv_i64 dest, TCGv_i32 src, int size, i= nt u) { if (u) { @@ -5281,6 +5247,7 @@ static int disas_neon_data_insn(DisasContext *s, uint= 32_t insn) case 6: /* VQSHLU */ case 7: /* VQSHL */ case 8: /* VSHRN, VRSHRN, VQSHRUN, VQRSHRUN */ + case 9: /* VQSHRN, VQRSHRN */ return 1; /* handled by decodetree */ default: break; @@ -5298,80 +5265,7 @@ static int disas_neon_data_insn(DisasContext *s, uin= t32_t insn) size--; } shift =3D (insn >> 16) & ((1 << (3 + size)) - 1); - if (op < 10) { - /* Shift by immediate and narrow: - VSHRN, VRSHRN, VQSHRN, VQRSHRN. */ - int input_unsigned =3D (op =3D=3D 8) ? !u : u; - if (rm & 1) { - return 1; - } - shift =3D shift - (1 << (size + 3)); - size++; - if (size =3D=3D 3) { - tmp64 =3D tcg_const_i64(shift); - neon_load_reg64(cpu_V0, rm); - neon_load_reg64(cpu_V1, rm + 1); - for (pass =3D 0; pass < 2; pass++) { - TCGv_i64 in; - if (pass =3D=3D 0) { - in =3D cpu_V0; - } else { - in =3D cpu_V1; - } - if (q) { - if (input_unsigned) { - gen_helper_neon_rshl_u64(cpu_V0, in, tmp64= ); - } else { - gen_helper_neon_rshl_s64(cpu_V0, in, tmp64= ); - } - } else { - if (input_unsigned) { - gen_ushl_i64(cpu_V0, in, tmp64); - } else { - gen_sshl_i64(cpu_V0, in, tmp64); - } - } - tmp =3D tcg_temp_new_i32(); - gen_neon_narrow_op(op =3D=3D 8, u, size - 1, tmp, = cpu_V0); - neon_store_reg(rd, pass, tmp); - } /* for pass */ - tcg_temp_free_i64(tmp64); - } else { - if (size =3D=3D 1) { - imm =3D (uint16_t)shift; - imm |=3D imm << 16; - } else { - /* size =3D=3D 2 */ - imm =3D (uint32_t)shift; - } - tmp2 =3D tcg_const_i32(imm); - tmp4 =3D neon_load_reg(rm + 1, 0); - tmp5 =3D neon_load_reg(rm + 1, 1); - for (pass =3D 0; pass < 2; pass++) { - if (pass =3D=3D 0) { - tmp =3D neon_load_reg(rm, 0); - } else { - tmp =3D tmp4; - } - gen_neon_shift_narrow(size, tmp, tmp2, q, - input_unsigned); - if (pass =3D=3D 0) { - tmp3 =3D neon_load_reg(rm, 1); - } else { - tmp3 =3D tmp5; - } - gen_neon_shift_narrow(size, tmp3, tmp2, q, - input_unsigned); - tcg_gen_concat_i32_i64(cpu_V0, tmp, tmp3); - tcg_temp_free_i32(tmp); - tcg_temp_free_i32(tmp3); - tmp =3D tcg_temp_new_i32(); - gen_neon_narrow_op(op =3D=3D 8, u, size - 1, tmp, = cpu_V0); - neon_store_reg(rd, pass, tmp); - } /* for pass */ - tcg_temp_free_i32(tmp2); - } - } else if (op =3D=3D 10) { + if (op =3D=3D 10) { /* VSHLL, VMOVL */ if (q || (rd & 1)) { return 1; --=20 2.20.1