From patchwork Mon Jul 11 13:57:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 589360 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:bb16:0:0:0:0 with SMTP id jd22csp3286106mab; Mon, 11 Jul 2022 07:14:31 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vpL4t4c61T0OoiHoSzRi7Jz43wQTNKfvrZPLDbpEmH7zpYFAPJdlbp0tV/p4NU3SnI1uD9 X-Received: by 2002:ac8:5bc8:0:b0:31e:b643:e96c with SMTP id b8-20020ac85bc8000000b0031eb643e96cmr3087053qtb.671.1657548871343; Mon, 11 Jul 2022 07:14:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657548871; cv=none; d=google.com; s=arc-20160816; b=H/7crtqC8nZpvkvCB/cf2cCLUl9dbD7aSXEjtYt82Zeqbs7fGRVJ+F+eSj2OtJ6/Uk qDP+l+/2YVd3wxGk9OGUcuoSV2eXUtZT06o8vRd0TmVpkQubSTGPIYAMJ8OIHvFR22cG vkJGwwIbc3iM/hHUl9hX+y7cpL7Ltm0BzZlKsEfnTLTISlNEQzKbFXYXxVF4tijTWkSj ZOqE9bjGwOqOT68qnWVFYVDdJ6LSMcSi9P6hwvBz+2c4l8A75E4nCcOQmZQWdYEEhHNx GtE+RVD2vOTTtCpTSTNHeBAYU97BElZdOnoeKec2oOtYAZqQr81TDPCikiLaV7fXSsjt i/bg== 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=GiZFVh2F4B2LmzFGkdkJQAwP+jfXxKtCxSQAc8iRXro=; b=VVkEtSmjvSdZ+tiIfaOOhITJf0XrgOfvmqARF6OhYlytiUFk9YQu+NngTJf1Z911YP 0aaSZI4T0ilVUR95vqO0K1TGJgapQLfF2jdeSrvbfiqY0vun1aaI2yZzkG1RubVKWTGS Mk12Ii7FCYN4SfnQ4Sc+2fP/1xCLEwNee7nSTqMVmT7O3Uz5vWgqfxpXjWKKxSKGlcP+ 6+BfsAzu9aQVUSmoE040xiJ/P6c1MGon7KlN9H1XLnz03IQpXBnikOH93WBTseCxpCxD yizUlmwCOAkN1QD0SyODqJHPoyUtT784yZR3TSxr7WZX7/KJ57GctDPXbwbYlG/k8dt1 iZUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=j30pUtSP; 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 c6-20020a056214224600b00472ff4ff136si5067489qvc.409.2022.07.11.07.14.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Jul 2022 07:14:31 -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=j30pUtSP; 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]:41908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oAuBC-0002Fu-PN for patch@linaro.org; Mon, 11 Jul 2022 10:14:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42520) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oAtvQ-0006V5-Hx for qemu-devel@nongnu.org; Mon, 11 Jul 2022 09:58:12 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:43864) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oAtvE-0002om-DF for qemu-devel@nongnu.org; Mon, 11 Jul 2022 09:58:03 -0400 Received: by mail-wm1-x32f.google.com with SMTP id v10-20020a05600c15ca00b003a2db8aa2c4so3084813wmf.2 for ; Mon, 11 Jul 2022 06:58:00 -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=GiZFVh2F4B2LmzFGkdkJQAwP+jfXxKtCxSQAc8iRXro=; b=j30pUtSPxa2DbpiNdn77XHKOfc3EJxjy9jyWn/AogV2wmkpWvVKIh5Z/sKsUZMwv4u nbjvPxX+F2BrPuoL7MqhrQntSzlRl6znyjTyqaYMHNtLMG/Uh4jy/eULYqXZ/XwTIRtQ c2dNJ30AhuF8J5wr9HJZaOYW9yXJRlL7rxUaLnpwjLzif+cNHiabWnEFn6Oba+x7JSHQ T02W1theLx4RfW/QlVVgPF+BYxlsSYHmXA1lv+izctljsceWDPlYdQirXkNXRdeVc6f9 VpKpKI9A1ZvKhjc6qtP38Ltf4BjLeFLFeV5Jk35+qR6NMdnih7S06L+PvWR7KvW3NwFO 4Ppw== 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=GiZFVh2F4B2LmzFGkdkJQAwP+jfXxKtCxSQAc8iRXro=; b=eVLUM+m0TYWJJ6aj/PA2Kv7FnDL13vZjc+aCvdHlLHRIyLvwaGMDFL9StRM6Gdz8HO kWTT9j5NgY4PGoZtXu3Xval3mANp8o49s5zOIiWnXJ/FVNQe6mB+TbB9FG0Pcc+XoCzh 2HPYlFXDqxIwNI1Pk2PWMsxBKYzW2khb/lQtAm4EHjVBe2w8fxnIPCBb2lvH/emYzbyk M855pfG1JLjXtT2+ZdUavcSQVE7f+ZP2SixYqozVJYxOAXrwHDcgkXVEIQDR+w7JwOCK G9ihqSRN7GjlBg9WBgKhYqcxlJR6oK3QcxQW9iUGli8gpfh/ESKoewQlK0T9XRmgUtf6 AbeQ== X-Gm-Message-State: AJIora8+T1GYwKCGAHGuKsJ4tGF6oYS2qUbOuQfQxFV3FSUfRZrWBLuL onxNrqitgng6NxHfmf9bg/U8i9LnAhNW/Q== X-Received: by 2002:a05:600c:42d3:b0:3a2:e7b8:8430 with SMTP id j19-20020a05600c42d300b003a2e7b88430mr6371019wme.42.1657547879118; Mon, 11 Jul 2022 06:57:59 -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.57.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Jul 2022 06:57:58 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 08/45] target/arm: Mark FTSMUL, FTMAD, FADDA as non-streaming Date: Mon, 11 Jul 2022 14:57:13 +0100 Message-Id: <20220711135750.765803-9-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 a 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-9-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/sme-fa64.decode | 3 --- target/arm/translate-sve.c | 15 +++++++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/target/arm/sme-fa64.decode b/target/arm/sme-fa64.decode index 4ff2df82e5b..b5eaa2d0faa 100644 --- a/target/arm/sme-fa64.decode +++ b/target/arm/sme-fa64.decode @@ -59,9 +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 0110 0101 --0- ---- 0000 11-- ---- ---- # FTSMUL -FAIL 0110 0101 --01 0--- 100- ---- ---- ---- # FTMAD -FAIL 0110 0101 --01 1--- 001- ---- ---- ---- # FADDA FAIL 0100 0101 --0- ---- 1001 10-- ---- ---- # SMMLA, UMMLA, USMMLA FAIL 0100 0101 --1- ---- 1--- ---- ---- ---- # SVE2 string/histo/crypto instructions FAIL 1000 010- -00- ---- 10-- ---- ---- ---- # SVE2 32-bit gather NT load (vector+scalar) diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c index 4ff2102fc86..d5aad539235 100644 --- a/target/arm/translate-sve.c +++ b/target/arm/translate-sve.c @@ -3861,9 +3861,9 @@ static gen_helper_gvec_3_ptr * const ftmad_fns[4] = { NULL, gen_helper_sve_ftmad_h, gen_helper_sve_ftmad_s, gen_helper_sve_ftmad_d, }; -TRANS_FEAT(FTMAD, aa64_sve, gen_gvec_fpst_zzz, - ftmad_fns[a->esz], a->rd, a->rn, a->rm, a->imm, - a->esz == MO_16 ? FPST_FPCR_F16 : FPST_FPCR) +TRANS_FEAT_NONSTREAMING(FTMAD, aa64_sve, gen_gvec_fpst_zzz, + ftmad_fns[a->esz], a->rd, a->rn, a->rm, a->imm, + a->esz == MO_16 ? FPST_FPCR_F16 : FPST_FPCR) /* *** SVE Floating Point Accumulating Reduction Group @@ -3886,6 +3886,7 @@ static bool trans_FADDA(DisasContext *s, arg_rprr_esz *a) if (a->esz == 0 || !dc_isar_feature(aa64_sve, s)) { return false; } + s->is_nonstreaming = true; if (!sve_access_check(s)) { return true; } @@ -3923,12 +3924,18 @@ static bool trans_FADDA(DisasContext *s, arg_rprr_esz *a) DO_FP3(FADD_zzz, fadd) DO_FP3(FSUB_zzz, fsub) DO_FP3(FMUL_zzz, fmul) -DO_FP3(FTSMUL, ftsmul) DO_FP3(FRECPS, recps) DO_FP3(FRSQRTS, rsqrts) #undef DO_FP3 +static gen_helper_gvec_3_ptr * const ftsmul_fns[4] = { + NULL, gen_helper_gvec_ftsmul_h, + gen_helper_gvec_ftsmul_s, gen_helper_gvec_ftsmul_d +}; +TRANS_FEAT_NONSTREAMING(FTSMUL, aa64_sve, gen_gvec_fpst_arg_zzz, + ftsmul_fns[a->esz], a, 0) + /* *** SVE Floating Point Arithmetic - Predicated Group */