From patchwork Thu Apr 30 18:09:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 185976 Delivered-To: patch@linaro.org Received: by 2002:a92:3d9a:0:0:0:0:0 with SMTP id k26csp2454741ilf; Thu, 30 Apr 2020 11:29:43 -0700 (PDT) X-Google-Smtp-Source: APiQypLP95soo0X3eF8kWGXaCz4kiZ5DBvVzRNiSXmCnYivvAz2vixH39wPGgLOEuQEkz3O7K13N X-Received: by 2002:ac8:3488:: with SMTP id w8mr5264723qtb.378.1588271383108; Thu, 30 Apr 2020 11:29:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588271383; cv=none; d=google.com; s=arc-20160816; b=dd15Fn4P37jcw6wDkyjvLKkyZt8bgaWjnpv+6aY6/SNaqsGUcrvuyknC8/+wZDbhIH i2RcsuZTDfWxhMS1s/JQfzXnUUX5iJmg7ulbcYFEs+u5B5TT/VPNY8zykj6ydXhReB7p QEMh4FqnQ/Hv9w0iat6j4eN7V9FwIpWEgRGbjLFGhlOsWTZfLd15JRVfMNbnDjfg/NlL lgY2GfCi7grkaROaeNzDpcxHjf3hYGqMYuzcVlxGLhjqcjuHtwBRPrm3Uz5FgU3teUM1 dQFF0YRQecbwRSZDcooY1nXewdYTy48Jo8badF8/VWyEG3DDAWiaOL1F236u722zTgad NtLw== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=l8VA/iThXhnqkBkxtC9ELSbE+ekhmsnZea++PtUSqsg=; b=01RSrwezt41BFttcW8nSxTOmr9ynGDCoPkIEJ1nUleoXkGVuiVz+6DrrCvJEZSyu6R X2s7N+XWQUTRtQlt1Z+dx7A5ePbZA+DziqFY4ofi2PTeVprvzBp2IYk3IppZpZC6fk0J bNai4UCDA+ONCa6PTaoXQwuK6evr6P3fV4IqxIAqfGiBf13hb7Xrq1cGCuPhDRtNkdgv rsgesTl7ou1vZ9g3OYrahk9M3Fp3kqAGs/UwX2YNUvI7bgfZbx2BSC83MkQpTXi63p4C kphsSsZI95oK3+/mMJJFWOa4FN9pqUZSS/bLvi3dbLJefZ17HIi6Ogctb8tAkS+xZiSV +Hfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mJ5qRTTP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:470:142::17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:470:142::17]) by mx.google.com with ESMTPS id ep5si287451qvb.101.2020.04.30.11.29.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 30 Apr 2020 11:29:43 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:470:142::17 as permitted sender) client-ip=2001:470:142::17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mJ5qRTTP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:470:142::17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:57822 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUDwM-0003YM-JT for patch@linaro.org; Thu, 30 Apr 2020 14:29:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36366) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUDeN-00022l-5Y for qemu-devel@nongnu.org; Thu, 30 Apr 2020 14:11:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jUDdr-0001Gg-94 for qemu-devel@nongnu.org; Thu, 30 Apr 2020 14:11:06 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:38295) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jUDdq-0001FY-RW for qemu-devel@nongnu.org; Thu, 30 Apr 2020 14:10:34 -0400 Received: by mail-wr1-x443.google.com with SMTP id x17so8174724wrt.5 for ; Thu, 30 Apr 2020 11:10:34 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=l8VA/iThXhnqkBkxtC9ELSbE+ekhmsnZea++PtUSqsg=; b=mJ5qRTTPyxHrfVnMEqC/e5fum/vpMCPFljzQffSpAskEEg5Gs5ZrqidfFBoOjy65bZ HB1W2S5aFYAz5N3bt/IEuUaM/VeiSpL9Ke98lyAc/e7Z4cpZthMQwuYEJhTad3XGUDsJ 9ra+mbwCl/r29RdCjPFDX0BvAkX6aNaT+ayYWHir1mOcZDx6SoBwW1GjDPSvAbkZhmJi AfU7192QOu/JTOCSKDRz7yU+Sopj4QOQFWw+vmXeu+XejVvMq6W58AnFquXl3ViolNP2 HDgWFg1s0t79GRBD5pm1lLJo8ZuFjVT56hCZh+WNTXt6jlCew0HF60kuJW+I/iqEiwkc Frvg== 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:mime-version:content-transfer-encoding; bh=l8VA/iThXhnqkBkxtC9ELSbE+ekhmsnZea++PtUSqsg=; b=QlRn6Vi+9eWDFjxDshIvfw79N3Dlj9FE641gpnU1bC1dHkBJtNzWy+xWE7YX/LrmDV GS8Qv1oPGpwG9wwX5XvGCihaRotnHLgvW6t7ZyR49geplO+Zze6JZvQASrxEsUMTqTte JZtejfTM2jzuZMqiILvLGUgcVJTZB26d04W9K8iiOpAxmskKpDF+tpK8wsUNc6AWFx1g d9NXKUnMzi/L3DeAAEPTodFRQTS+z8bYvmIaEBgKnt8S++ypl8RRH6KGl+MzQ+ksw3Nl BA032NF+nQSC0qCDlhOF0N1dnfwaJl0wcD0AQvlOgj203xEGk/9fAH4V0f4zvoYVFS/n BXNg== X-Gm-Message-State: AGi0PuZzcK6ktrNC1M7ejVSaZtznfJ/eFDwQzb8r1u2zuAV25G8f/isH WfTBjJR1bMOKZW7d1MowNOpPMQ46kLuMpg== X-Received: by 2002:a5d:6a8b:: with SMTP id s11mr5255139wru.258.1588270233389; Thu, 30 Apr 2020 11:10:33 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id t8sm652421wrq.88.2020.04.30.11.10.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Apr 2020 11:10:32 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 21/36] target/arm: Convert Neon 3-reg-same SHA to decodetree Date: Thu, 30 Apr 2020 19:09:48 +0100 Message-Id: <20200430181003.21682-22-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200430181003.21682-1-peter.maydell@linaro.org> References: <20200430181003.21682-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::443; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x443.google.com X-detected-operating-system: by eggs.gnu.org: Error: [-] PROGRAM ABORT : Malformed IPv6 address (bad octet value). Location : parse_addr6(), p0f-client.c:67 X-Received-From: 2a00:1450:4864:20::443 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Convert the Neon SHA instructions in the 3-reg-same group to decodetree. Signed-off-by: Peter Maydell --- target/arm/translate-neon.inc.c | 139 ++++++++++++++++++++++++++++++++ target/arm/translate.c | 46 +---------- target/arm/neon-dp.decode | 10 +++ 3 files changed, 151 insertions(+), 44 deletions(-) -- 2.20.1 Reviewed-by: Richard Henderson diff --git a/target/arm/translate-neon.inc.c b/target/arm/translate-neon.inc.c index c8beb048fa2..161313ad879 100644 --- a/target/arm/translate-neon.inc.c +++ b/target/arm/translate-neon.inc.c @@ -769,3 +769,142 @@ static bool trans_VQRDMLSH_3s(DisasContext *s, arg_3same *a) }; return do_vqrdmlah(s, a, fns[a->size]); } + +static bool trans_SHA1_3s(DisasContext *s, arg_SHA1_3s *a) +{ + TCGv_ptr ptr1, ptr2, ptr3; + TCGv_i32 tmp; + + if (!arm_dc_feature(s, ARM_FEATURE_NEON) || + !dc_isar_feature(aa32_sha1, s)) { + return false; + } + + /* UNDEF accesses to D16-D31 if they don't exist. */ + if (!dc_isar_feature(aa32_simd_r32, s) && + ((a->vd | a->vn | a->vm) & 0x10)) { + return false; + } + + if ((a->vn | a->vm | a->vd) & 1) { + return false; + } + + if (!vfp_access_check(s)) { + return true; + } + + ptr1 = vfp_reg_ptr(true, a->vd); + ptr2 = vfp_reg_ptr(true, a->vn); + ptr3 = vfp_reg_ptr(true, a->vm); + tmp = tcg_const_i32(a->optype); + gen_helper_crypto_sha1_3reg(ptr1, ptr2, ptr3, tmp); + tcg_temp_free_i32(tmp); + tcg_temp_free_ptr(ptr1); + tcg_temp_free_ptr(ptr2); + tcg_temp_free_ptr(ptr3); + + return true; +} + +static bool trans_SHA256H_3s(DisasContext *s, arg_SHA256H_3s *a) +{ + TCGv_ptr ptr1, ptr2, ptr3; + + if (!arm_dc_feature(s, ARM_FEATURE_NEON) || + !dc_isar_feature(aa32_sha2, s)) { + return false; + } + + /* UNDEF accesses to D16-D31 if they don't exist. */ + if (!dc_isar_feature(aa32_simd_r32, s) && + ((a->vd | a->vn | a->vm) & 0x10)) { + return false; + } + + if ((a->vn | a->vm | a->vd) & 1) { + return false; + } + + if (!vfp_access_check(s)) { + return true; + } + + ptr1 = vfp_reg_ptr(true, a->vd); + ptr2 = vfp_reg_ptr(true, a->vn); + ptr3 = vfp_reg_ptr(true, a->vm); + gen_helper_crypto_sha256h(ptr1, ptr2, ptr3); + tcg_temp_free_ptr(ptr1); + tcg_temp_free_ptr(ptr2); + tcg_temp_free_ptr(ptr3); + + return true; +} + +static bool trans_SHA256H2_3s(DisasContext *s, arg_SHA256H2_3s *a) +{ + TCGv_ptr ptr1, ptr2, ptr3; + + if (!arm_dc_feature(s, ARM_FEATURE_NEON) || + !dc_isar_feature(aa32_sha2, s)) { + return false; + } + + /* UNDEF accesses to D16-D31 if they don't exist. */ + if (!dc_isar_feature(aa32_simd_r32, s) && + ((a->vd | a->vn | a->vm) & 0x10)) { + return false; + } + + if ((a->vn | a->vm | a->vd) & 1) { + return false; + } + + if (!vfp_access_check(s)) { + return true; + } + + ptr1 = vfp_reg_ptr(true, a->vd); + ptr2 = vfp_reg_ptr(true, a->vn); + ptr3 = vfp_reg_ptr(true, a->vm); + gen_helper_crypto_sha256h2(ptr1, ptr2, ptr3); + tcg_temp_free_ptr(ptr1); + tcg_temp_free_ptr(ptr2); + tcg_temp_free_ptr(ptr3); + + return true; +} + +static bool trans_SHA256SU1_3s(DisasContext *s, arg_SHA256SU1_3s *a) +{ + TCGv_ptr ptr1, ptr2, ptr3; + + if (!arm_dc_feature(s, ARM_FEATURE_NEON) || + !dc_isar_feature(aa32_sha2, s)) { + return false; + } + + /* UNDEF accesses to D16-D31 if they don't exist. */ + if (!dc_isar_feature(aa32_simd_r32, s) && + ((a->vd | a->vn | a->vm) & 0x10)) { + return false; + } + + if ((a->vn | a->vm | a->vd) & 1) { + return false; + } + + if (!vfp_access_check(s)) { + return true; + } + + ptr1 = vfp_reg_ptr(true, a->vd); + ptr2 = vfp_reg_ptr(true, a->vn); + ptr3 = vfp_reg_ptr(true, a->vm); + gen_helper_crypto_sha256su1(ptr1, ptr2, ptr3); + tcg_temp_free_ptr(ptr1); + tcg_temp_free_ptr(ptr2); + tcg_temp_free_ptr(ptr3); + + return true; +} diff --git a/target/arm/translate.c b/target/arm/translate.c index adc42362469..160638e2a7c 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -4711,7 +4711,7 @@ static int disas_neon_data_insn(DisasContext *s, uint32_t insn) int vec_size; uint32_t imm; TCGv_i32 tmp, tmp2, tmp3, tmp4, tmp5; - TCGv_ptr ptr1, ptr2, ptr3; + TCGv_ptr ptr1, ptr2; TCGv_i64 tmp64; if (!arm_dc_feature(s, ARM_FEATURE_NEON)) { @@ -4755,49 +4755,6 @@ static int disas_neon_data_insn(DisasContext *s, uint32_t insn) return 1; } switch (op) { - case NEON_3R_SHA: - /* The SHA-1/SHA-256 3-register instructions require special - * treatment here, as their size field is overloaded as an - * op type selector, and they all consume their input in a - * single pass. - */ - if (!q) { - return 1; - } - if (!u) { /* SHA-1 */ - if (!dc_isar_feature(aa32_sha1, s)) { - return 1; - } - ptr1 = vfp_reg_ptr(true, rd); - ptr2 = vfp_reg_ptr(true, rn); - ptr3 = vfp_reg_ptr(true, rm); - tmp4 = tcg_const_i32(size); - gen_helper_crypto_sha1_3reg(ptr1, ptr2, ptr3, tmp4); - tcg_temp_free_i32(tmp4); - } else { /* SHA-256 */ - if (!dc_isar_feature(aa32_sha2, s) || size == 3) { - return 1; - } - ptr1 = vfp_reg_ptr(true, rd); - ptr2 = vfp_reg_ptr(true, rn); - ptr3 = vfp_reg_ptr(true, rm); - switch (size) { - case 0: - gen_helper_crypto_sha256h(ptr1, ptr2, ptr3); - break; - case 1: - gen_helper_crypto_sha256h2(ptr1, ptr2, ptr3); - break; - case 2: - gen_helper_crypto_sha256su1(ptr1, ptr2, ptr3); - break; - } - } - tcg_temp_free_ptr(ptr1); - tcg_temp_free_ptr(ptr2); - tcg_temp_free_ptr(ptr3); - return 0; - case NEON_3R_VPADD_VQRDMLAH: if (!u) { break; /* VPADD */ @@ -4828,6 +4785,7 @@ static int disas_neon_data_insn(DisasContext *s, uint32_t insn) case NEON_3R_VMUL: case NEON_3R_VML: case NEON_3R_VSHL: + case NEON_3R_SHA: /* Already handled by decodetree */ return 1; } diff --git a/target/arm/neon-dp.decode b/target/arm/neon-dp.decode index ce0db476c88..f22606b2bd5 100644 --- a/target/arm/neon-dp.decode +++ b/target/arm/neon-dp.decode @@ -86,4 +86,14 @@ VMUL_3s 1111 001 0 0 . .. .... .... 1001 . . . 1 .... @3same VMUL_p_3s 1111 001 1 0 . .. .... .... 1001 . . . 1 .... @3same VQRDMLAH_3s 1111 001 1 0 . .. .... .... 1011 ... 1 .... @3same + +SHA1_3s 1111 001 0 0 . optype:2 .... .... 1100 . 1 . 0 .... \ + vm=%vm_dp vn=%vn_dp vd=%vd_dp +SHA256H_3s 1111 001 1 0 . 00 .... .... 1100 . 1 . 0 .... \ + vm=%vm_dp vn=%vn_dp vd=%vd_dp +SHA256H2_3s 1111 001 1 0 . 01 .... .... 1100 . 1 . 0 .... \ + vm=%vm_dp vn=%vn_dp vd=%vd_dp +SHA256SU1_3s 1111 001 1 0 . 10 .... .... 1100 . 1 . 0 .... \ + vm=%vm_dp vn=%vn_dp vd=%vd_dp + VQRDMLSH_3s 1111 001 1 0 . .. .... .... 1100 ... 1 .... @3same