From patchwork Mon Jul 11 13:57:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 589352 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:bb16:0:0:0:0 with SMTP id jd22csp3275944mab; Mon, 11 Jul 2022 07:04:59 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uouIg4fPwN/JbY840W1pTQkIGrMb1BE8MwAlM7g4RwzMr5zDWPYNqtXuA3XuPKzqBxGgUu X-Received: by 2002:a05:6214:da5:b0:472:f95e:3efa with SMTP id h5-20020a0562140da500b00472f95e3efamr13302829qvh.91.1657548299289; Mon, 11 Jul 2022 07:04:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657548299; cv=none; d=google.com; s=arc-20160816; b=lpLLBQMLkdJzFwrFQawgpuvgNCdE8g9CWqUa9KusMdHiSv6Pyc4ADjg9A0biy/H16T PAHpfIj7BdgNOA7bz2SUKwYQ5fUw+8W327JZ5tS2wH9cvwjFfQQUCuJjQ/FfE5dx+Auh J86wjLINorwZa5usvj1i7cnVPyjKD/o7apHoLV1Co9kkdJ4GIxf7vfFHtK/EbGILY41e bY5uTR+tACChGWifHAR4Vlgtsh90AQlVulyO7hd3w7lypcXwYp3qw2hHVCIxQHFV2T6D 0iFz6vemYlghuijI00B4B7tmFawy0+sJXyIqcm/DQuXKyhBALhQozrLfX/xSKJ89dUIj 3VLw== 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=G70vVW74+p3/r9FWSpVODhv2PfvwQ8MRxKmUWAG1PNU=; b=hO1q+Tyd148aWDJbZ6qqoB4vaZo9mg51QaCAdiAIqN+tX/RWOnSgEoK/zqXLSX9B5e qZhAUvztas+VOmDMECWCLvlBRpzVVDyk7vwP1Fwk9rg5Vy8yEj9zgOe/oY91qM6PJ+vF nbJUTTB/o2XF4GTHMATEEEGL9Z4npd62/4mZotL7Nh4kpG7Nf0pN0Ytp8tXZdgT49h0p cxKYa462g1dUA32fOsNI8kb5yQ7njbIokLS9pYlk9/UAF9BFjmT3HsJDfz8N3zWzzQNb D21Z9KWPffx3U9WOMeemVOZpvb5IL/evOewpIS91IKdNKJcHRiKhH/83sb5HycqyMkau CjtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kAI2Rjy2; 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 cn10-20020a05622a248a00b003188bd8a8c8si4091938qtb.629.2022.07.11.07.04.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Jul 2022 07:04:59 -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=kAI2Rjy2; 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]:48924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oAu1y-0004Td-MU for patch@linaro.org; Mon, 11 Jul 2022 10:04:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42642) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oAtvT-0006XB-Qj for qemu-devel@nongnu.org; Mon, 11 Jul 2022 09:58:17 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:38728) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oAtvQ-0002p0-3Y for qemu-devel@nongnu.org; Mon, 11 Jul 2022 09:58:14 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 9-20020a1c0209000000b003a2dfdebe47so2267349wmc.3 for ; Mon, 11 Jul 2022 06:58:01 -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=G70vVW74+p3/r9FWSpVODhv2PfvwQ8MRxKmUWAG1PNU=; b=kAI2Rjy2hL7WJpDv7wJGGHrRY/8j7tjDz2EPGXLN9mfFrdLlv7Jikb05Oug0JOfmuh vYDdqTN8BqEoJ2U4B6SIMK83AtwSCDKS6tUgCYtRv04t7dtDY5IELRX8gsfxqcWsLVyQ le7a7nfAudolPydqfsPjYmw5HIaErJQd+Hc7SPMvUxoxgs4Du2uSg5n9fwlNsRs7vsr+ Y+/wtKBuahtlD8HKR8Vo3KsEHPc1zyzofEV38n2KeWIZaZCkiYrdDHCtgI5szT8Ei5/R adaE1xNcz+bJbEyYhN9vxmf4pmVbd9hs8CZaG/9Y3LixDI4ZKRbS3g5FeY5ryCkiF1Pj J81w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=G70vVW74+p3/r9FWSpVODhv2PfvwQ8MRxKmUWAG1PNU=; b=qZ79JF4+SueJybvC02TFXwOelX2rszPe0LqCxNN9BXhWBZts32avKt4he7y5HRlXeU CjPNLM2qYOplJwLuDoKbP/o9xJdXM1vHwXNKEhni0/7SmwPOzz8DygmW7dKr/vOSmyzE agv6lnD1/qSGGec9l2158mRKxuM0qXFBhgkTCBbobwgO9WvV9lJ8j3Lxp9glW1rgm7S6 S5yMXYoZGLXL75Cb16sz/WtQxnxaXJv2tnOQBUb3TRSWP8K81yXYlI7iKfbkPnKKQ4nJ gkECxcIAEG7F36dK9MSw7tN2dlNZCnu6oeXIxprrdbxbzK53guqyAKalz+lT5nKgZr/I frIA== X-Gm-Message-State: AJIora++dUsmFHS/wHxruTqzR8Tf9Mqp+zurWNElD5FKxwoBfNCFzTcD 6GqprN7ZyDN5iC8vFdlDfqD8T3wL0+PrZQ== X-Received: by 2002:a05:600c:ce:b0:3a2:e02b:bd8e with SMTP id u14-20020a05600c00ce00b003a2e02bbd8emr14561789wmm.123.1657547880608; Mon, 11 Jul 2022 06:58:00 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id q123-20020a1c4381000000b00397402ae674sm7595596wma.11.2022.07.11.06.58.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Jul 2022 06:58:00 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 10/45] target/arm: Mark string/histo/crypto as non-streaming Date: Mon, 11 Jul 2022 14:57:15 +0100 Message-Id: <20220711135750.765803-11-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220711135750.765803-1-peter.maydell@linaro.org> References: <20220711135750.765803-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32f.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" From: Richard Henderson Mark these as non-streaming instructions, which should trap if full a64 support is not enabled in streaming mode. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20220708151540.18136-11-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/sme-fa64.decode | 1 - target/arm/translate-sve.c | 35 ++++++++++++++++++----------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/target/arm/sme-fa64.decode b/target/arm/sme-fa64.decode index 3260ea2d64c..fe462d2ccce 100644 --- a/target/arm/sme-fa64.decode +++ b/target/arm/sme-fa64.decode @@ -59,7 +59,6 @@ FAIL 0001 1110 0111 1110 0000 00-- ---- ---- # FJCVTZS # --11 1100 --1- ---- ---- ---- ---- --10 # Load/store FP register (register offset) # --11 1101 ---- ---- ---- ---- ---- ---- # Load/store FP register (scaled imm) -FAIL 0100 0101 --1- ---- 1--- ---- ---- ---- # SVE2 string/histo/crypto instructions FAIL 1000 010- -00- ---- 10-- ---- ---- ---- # SVE2 32-bit gather NT load (vector+scalar) FAIL 1000 010- -00- ---- 111- ---- ---- ---- # SVE 32-bit gather prefetch (vector+imm) FAIL 1000 0100 0-1- ---- 0--- ---- ---- ---- # SVE 32-bit gather prefetch (scalar+vector) diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c index 9bbf44f0082..f8e07164748 100644 --- a/target/arm/translate-sve.c +++ b/target/arm/translate-sve.c @@ -7110,21 +7110,21 @@ DO_SVE2_ZZZ_NARROW(RSUBHNT, rsubhnt) static gen_helper_gvec_flags_4 * const match_fns[4] = { gen_helper_sve2_match_ppzz_b, gen_helper_sve2_match_ppzz_h, NULL, NULL }; -TRANS_FEAT(MATCH, aa64_sve2, do_ppzz_flags, a, match_fns[a->esz]) +TRANS_FEAT_NONSTREAMING(MATCH, aa64_sve2, do_ppzz_flags, a, match_fns[a->esz]) static gen_helper_gvec_flags_4 * const nmatch_fns[4] = { gen_helper_sve2_nmatch_ppzz_b, gen_helper_sve2_nmatch_ppzz_h, NULL, NULL }; -TRANS_FEAT(NMATCH, aa64_sve2, do_ppzz_flags, a, nmatch_fns[a->esz]) +TRANS_FEAT_NONSTREAMING(NMATCH, aa64_sve2, do_ppzz_flags, a, nmatch_fns[a->esz]) static gen_helper_gvec_4 * const histcnt_fns[4] = { NULL, NULL, gen_helper_sve2_histcnt_s, gen_helper_sve2_histcnt_d }; -TRANS_FEAT(HISTCNT, aa64_sve2, gen_gvec_ool_arg_zpzz, - histcnt_fns[a->esz], a, 0) +TRANS_FEAT_NONSTREAMING(HISTCNT, aa64_sve2, gen_gvec_ool_arg_zpzz, + histcnt_fns[a->esz], a, 0) -TRANS_FEAT(HISTSEG, aa64_sve2, gen_gvec_ool_arg_zzz, - a->esz == 0 ? gen_helper_sve2_histseg : NULL, a, 0) +TRANS_FEAT_NONSTREAMING(HISTSEG, aa64_sve2, gen_gvec_ool_arg_zzz, + a->esz == 0 ? gen_helper_sve2_histseg : NULL, a, 0) DO_ZPZZ_FP(FADDP, aa64_sve2, sve2_faddp_zpzz) DO_ZPZZ_FP(FMAXNMP, aa64_sve2, sve2_fmaxnmp_zpzz) @@ -7238,20 +7238,21 @@ TRANS_FEAT(SQRDCMLAH_zzzz, aa64_sve2, gen_gvec_ool_zzzz, TRANS_FEAT(USDOT_zzzz, aa64_sve_i8mm, gen_gvec_ool_arg_zzzz, a->esz == 2 ? gen_helper_gvec_usdot_b : NULL, a, 0) -TRANS_FEAT(AESMC, aa64_sve2_aes, gen_gvec_ool_zz, - gen_helper_crypto_aesmc, a->rd, a->rd, a->decrypt) +TRANS_FEAT_NONSTREAMING(AESMC, aa64_sve2_aes, gen_gvec_ool_zz, + gen_helper_crypto_aesmc, a->rd, a->rd, a->decrypt) -TRANS_FEAT(AESE, aa64_sve2_aes, gen_gvec_ool_arg_zzz, - gen_helper_crypto_aese, a, false) -TRANS_FEAT(AESD, aa64_sve2_aes, gen_gvec_ool_arg_zzz, - gen_helper_crypto_aese, a, true) +TRANS_FEAT_NONSTREAMING(AESE, aa64_sve2_aes, gen_gvec_ool_arg_zzz, + gen_helper_crypto_aese, a, false) +TRANS_FEAT_NONSTREAMING(AESD, aa64_sve2_aes, gen_gvec_ool_arg_zzz, + gen_helper_crypto_aese, a, true) -TRANS_FEAT(SM4E, aa64_sve2_sm4, gen_gvec_ool_arg_zzz, - gen_helper_crypto_sm4e, a, 0) -TRANS_FEAT(SM4EKEY, aa64_sve2_sm4, gen_gvec_ool_arg_zzz, - gen_helper_crypto_sm4ekey, a, 0) +TRANS_FEAT_NONSTREAMING(SM4E, aa64_sve2_sm4, gen_gvec_ool_arg_zzz, + gen_helper_crypto_sm4e, a, 0) +TRANS_FEAT_NONSTREAMING(SM4EKEY, aa64_sve2_sm4, gen_gvec_ool_arg_zzz, + gen_helper_crypto_sm4ekey, a, 0) -TRANS_FEAT(RAX1, aa64_sve2_sha3, gen_gvec_fn_arg_zzz, gen_gvec_rax1, a) +TRANS_FEAT_NONSTREAMING(RAX1, aa64_sve2_sha3, gen_gvec_fn_arg_zzz, + gen_gvec_rax1, a) TRANS_FEAT(FCVTNT_sh, aa64_sve2, gen_gvec_fpst_arg_zpz, gen_helper_sve2_fcvtnt_sh, a, 0, FPST_FPCR)