From patchwork Tue May 28 14:07:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 799495 Delivered-To: patch@linaro.org Received: by 2002:adf:e110:0:b0:35b:5a80:51b4 with SMTP id t16csp257880wrz; Tue, 28 May 2024 07:13:54 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVlIZ2Vrbf+1fnC1AbiM7yprcwVokN+xl/xLygj/tBMlfxLngqFsDfzkxANOW6Yd5xerEWSlj4dpYHuqBOEIU8P X-Google-Smtp-Source: AGHT+IEuGOSJIXQYsjFWdsSIPlAckUuo/rEBWIHONU5W7mqmKSBDed8rLjiaeP4mI2aQ3+OlYmmP X-Received: by 2002:a05:6820:1620:b0:5b8:80f1:8f3 with SMTP id 006d021491bc7-5b9bdcffb68mr3547355eaf.1.1716905634076; Tue, 28 May 2024 07:13:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716905634; cv=none; d=google.com; s=arc-20160816; b=WTY9RStLEceio9xG6jNy5PYJxyfvRDU4SfLZvrY0Dhs57pZblycw3gJq2NmX9MKSK7 E2VYx68esMqUklCqPhhk7/jvcL6iOHnIqG1KvSsoAEaKoU3xQTuqZL7TUf8nAMS4jcSo RgMHge5I64VL4Mc1T8nuCuLWGO3b4NYT2PuSwWJGqTCwHJ9O4uLgXPnoeIjXR7+ymZ7Y ijwVZRHhIt0aFUeJ/IT3Y8unkB57wvuVOp3SQYiN+vIOlghvqCUqLc3o29xJbGpj/c34 GYWbECsFgmttGNCPY6u16y+b6HFp3MREkvFvLpjJF/xphRxxBiZNTpd3EBFEobSmUvjm 9zyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=m26zEpA71QDIamA2ozgsiGZ5k+PMbcICXgXPxohnPH0=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=d8AaVTOiOazeJr6S3p/0vvcq+I0dKEVBWLHf13bdt0luIWa1zasMq1YfASdA68jT1g ty6YXWhgqbl0PEMJWVuS1UZMQEw19vZ17Zl8Ker3SGFqrBq89SwC7v2KjRmHhCst4NRj POPr000EiS8Pn6CCMQDgenFiyBuk1LWaHhLevQ++Ia7eMLhFbFCf8nWvIQSec47Sb//D lCmXg/INA+iTzQD2QeMhMmKS3wwVRSLujNgXFEBob9HEGDTekCpMX6t7DqYas3EcF2/G QaioE6WrbJIlJ4zXfLh1CLrwjONBROcbhsyRhz/C5Suv9rZyoHyOzyZemPaJ2Eqax2O+ JCmA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cbzXETg1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.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. [209.51.188.17]) by mx.google.com with ESMTPS id 71dfb90a1353d-4e65b81034bsi1213449e0c.71.2024.05.28.07.13.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 May 2024 07:13:54 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cbzXETg1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sBxUn-0001aY-JB; Tue, 28 May 2024 10:08:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sBxUm-0001Zr-Hp for qemu-devel@nongnu.org; Tue, 28 May 2024 10:08:08 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sBxUk-00073h-Hd for qemu-devel@nongnu.org; Tue, 28 May 2024 10:08:08 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-4211b3c0ef3so6336065e9.0 for ; Tue, 28 May 2024 07:08:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1716905284; x=1717510084; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=m26zEpA71QDIamA2ozgsiGZ5k+PMbcICXgXPxohnPH0=; b=cbzXETg1P9H3qPdRDlZhePbFUcdlypxwgCESorsbgix1/wtedfQ7M1TrsGykmPYJLF xXJsS+h3robptDieJaBlgvveYkXMRpIyJb9EET6y75d19q1fI9mPfcj5FQaLJZrooC8X UVhkNAhYLgEF/3f78a/zQUS+8LqmXrvv6t1T6voxAoIdp0i/U6Z49N8pDi41ktq+2cRS iERkVP5F0N8/mM+ODpB45I657MVptdml0kYI7HCgs2sFYEQsHeo7rdfhTYIy4zLGL7Br mRll90sLmLFihzwmd7IizPiGHPnedNTjONhVadbH1NqeWGlqpZ3CHqtFLISuB3f89Dga LDDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716905284; x=1717510084; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=m26zEpA71QDIamA2ozgsiGZ5k+PMbcICXgXPxohnPH0=; b=mTaRtnBL/9jTUMX5SAldiNcEN80MAyYvINFGiPk6A7HvY7VV6IwiHV5gobORDYotr2 8b17h5iVVyjTgUT/GFWVkV0MWGuRnfFu+by+1aRbXewgssBcqx2S1ayzMnMgVyXAdXfG XD9fXVlA9tEfpEesKNv7DWpGji6WjNlN2mC2viOoDwD6fyqKRMEsvYOIN0Li/SwXk+YK NGbeX/pqDtFVpmtZ8VARI0P6W2tP1yxci8MdumHCFggTY+WRB8+gsgaYqoV+NF5sUKdY KYr39i7ZYFuTZ6N/zW3SZj5mMIedp/KKJVcaeSUbw/9oBvUiPaYFX3gGlNT/+3gyslud hPtQ== X-Gm-Message-State: AOJu0Yyyc4R0mYb6sSP8fjIiW95bexOyr/xJgC8GQlA8R2We0DqKkXDU Ba92qMFBBRVHE/JvF/LXLFRuOM8fShul5w63ij8fg5JTacCKgK0yQYVVn+gVG4T2UbPXNgG2pg2 / X-Received: by 2002:a5d:4e43:0:b0:354:f9f0:a7ed with SMTP id ffacd0b85a97d-3552fdfa5d4mr7701946f8f.47.1716905284572; Tue, 28 May 2024 07:08:04 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3564afc3577sm11361473f8f.102.2024.05.28.07.08.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 May 2024 07:08:04 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 15/42] target/arm: Convert Cryptographic AES to decodetree Date: Tue, 28 May 2024 15:07:26 +0100 Message-Id: <20240528140753.3620597-16-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240528140753.3620597-1-peter.maydell@linaro.org> References: <20240528140753.3620597-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x334.google.com 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_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Richard Henderson Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20240524232121.284515-10-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/tcg/a64.decode | 21 +++++++-- target/arm/tcg/translate-a64.c | 86 +++++++++++++++------------------- 2 files changed, 54 insertions(+), 53 deletions(-) diff --git a/target/arm/tcg/a64.decode b/target/arm/tcg/a64.decode index 0e7656fd158..1de09903dc4 100644 --- a/target/arm/tcg/a64.decode +++ b/target/arm/tcg/a64.decode @@ -19,11 +19,17 @@ # This file is processed by scripts/decodetree.py # -&r rn -&ri rd imm -&rri_sf rd rn imm sf -&i imm +%rd 0:5 +&r rn +&ri rd imm +&rri_sf rd rn imm sf +&i imm +&qrr_e q rd rn esz +&qrrr_e q rd rn rm esz + +@rr_q1e0 ........ ........ ...... rn:5 rd:5 &qrr_e q=1 esz=0 +@r2r_q1e0 ........ ........ ...... rm:5 rd:5 &qrrr_e rn=%rd q=1 esz=0 ### Data Processing - Immediate @@ -590,3 +596,10 @@ CPYFE 00 011 0 01100 ..... .... 01 ..... ..... @cpy CPYP 00 011 1 01000 ..... .... 01 ..... ..... @cpy CPYM 00 011 1 01010 ..... .... 01 ..... ..... @cpy CPYE 00 011 1 01100 ..... .... 01 ..... ..... @cpy + +### Cryptographic AES + +AESE 01001110 00 10100 00100 10 ..... ..... @r2r_q1e0 +AESD 01001110 00 10100 00101 10 ..... ..... @r2r_q1e0 +AESMC 01001110 00 10100 00110 10 ..... ..... @rr_q1e0 +AESIMC 01001110 00 10100 00111 10 ..... ..... @rr_q1e0 diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index 8842ff634d5..3894db4bee2 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -1313,6 +1313,34 @@ bool sme_enabled_check_with_svcr(DisasContext *s, unsigned req) return true; } +/* + * Expanders for AdvSIMD translation functions. + */ + +static bool do_gvec_op2_ool(DisasContext *s, arg_qrr_e *a, int data, + gen_helper_gvec_2 *fn) +{ + if (!a->q && a->esz == MO_64) { + return false; + } + if (fp_access_check(s)) { + gen_gvec_op2_ool(s, a->q, a->rd, a->rn, data, fn); + } + return true; +} + +static bool do_gvec_op3_ool(DisasContext *s, arg_qrrr_e *a, int data, + gen_helper_gvec_3 *fn) +{ + if (!a->q && a->esz == MO_64) { + return false; + } + if (fp_access_check(s)) { + gen_gvec_op3_ool(s, a->q, a->rd, a->rn, a->rm, data, fn); + } + return true; +} + /* * This utility function is for doing register extension with an * optional shift. You will likely want to pass a temporary for the @@ -4560,6 +4588,15 @@ static bool trans_EXTR(DisasContext *s, arg_extract *a) return true; } +/* + * Cryptographic AES + */ + +TRANS_FEAT(AESE, aa64_aes, do_gvec_op3_ool, a, 0, gen_helper_crypto_aese) +TRANS_FEAT(AESD, aa64_aes, do_gvec_op3_ool, a, 0, gen_helper_crypto_aesd) +TRANS_FEAT(AESMC, aa64_aes, do_gvec_op2_ool, a, 0, gen_helper_crypto_aesmc) +TRANS_FEAT(AESIMC, aa64_aes, do_gvec_op2_ool, a, 0, gen_helper_crypto_aesimc) + /* Shift a TCGv src by TCGv shift_amount, put result in dst. * Note that it is the caller's responsibility to ensure that the * shift amount is in range (ie 0..31 or 0..63) and provide the ARM @@ -13460,54 +13497,6 @@ static void disas_simd_indexed(DisasContext *s, uint32_t insn) } } -/* Crypto AES - * 31 24 23 22 21 17 16 12 11 10 9 5 4 0 - * +-----------------+------+-----------+--------+-----+------+------+ - * | 0 1 0 0 1 1 1 0 | size | 1 0 1 0 0 | opcode | 1 0 | Rn | Rd | - * +-----------------+------+-----------+--------+-----+------+------+ - */ -static void disas_crypto_aes(DisasContext *s, uint32_t insn) -{ - int size = extract32(insn, 22, 2); - int opcode = extract32(insn, 12, 5); - int rn = extract32(insn, 5, 5); - int rd = extract32(insn, 0, 5); - gen_helper_gvec_2 *genfn2 = NULL; - gen_helper_gvec_3 *genfn3 = NULL; - - if (!dc_isar_feature(aa64_aes, s) || size != 0) { - unallocated_encoding(s); - return; - } - - switch (opcode) { - case 0x4: /* AESE */ - genfn3 = gen_helper_crypto_aese; - break; - case 0x6: /* AESMC */ - genfn2 = gen_helper_crypto_aesmc; - break; - case 0x5: /* AESD */ - genfn3 = gen_helper_crypto_aesd; - break; - case 0x7: /* AESIMC */ - genfn2 = gen_helper_crypto_aesimc; - break; - default: - unallocated_encoding(s); - return; - } - - if (!fp_access_check(s)) { - return; - } - if (genfn2) { - gen_gvec_op2_ool(s, true, rd, rn, 0, genfn2); - } else { - gen_gvec_op3_ool(s, true, rd, rd, rn, 0, genfn3); - } -} - /* Crypto three-reg SHA * 31 24 23 22 21 20 16 15 14 12 11 10 9 5 4 0 * +-----------------+------+---+------+---+--------+-----+------+------+ @@ -13917,7 +13906,6 @@ static const AArch64DecodeTable data_proc_simd[] = { { 0x5e000400, 0xdfe08400, disas_simd_scalar_copy }, { 0x5f000000, 0xdf000400, disas_simd_indexed }, /* scalar indexed */ { 0x5f000400, 0xdf800400, disas_simd_scalar_shift_imm }, - { 0x4e280800, 0xff3e0c00, disas_crypto_aes }, { 0x5e000000, 0xff208c00, disas_crypto_three_reg_sha }, { 0x5e280800, 0xff3e0c00, disas_crypto_two_reg_sha }, { 0xce608000, 0xffe0b000, disas_crypto_three_reg_sha512 },