From patchwork Fri Jul 8 15:15:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 588515 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:bb16:0:0:0:0 with SMTP id jd22csp754562mab; Fri, 8 Jul 2022 08:19:34 -0700 (PDT) X-Google-Smtp-Source: AGRyM1s6oFXRGudv/UdAXeN7/AZ0NBGZbp+8LLKtswjZewPxQ9s/5L0CbGDFqHyOTezP5ztDTiKv X-Received: by 2002:ac8:5d49:0:b0:31e:9b43:9366 with SMTP id g9-20020ac85d49000000b0031e9b439366mr3501026qtx.69.1657293574353; Fri, 08 Jul 2022 08:19:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657293574; cv=none; d=google.com; s=arc-20160816; b=uTbJi0ZQJLaYKERdcJZT/WpIFngQ7l7gJBl2oSXC0NgoberrvX3t4Ytmu3BW7JozWm v02d+nFJ8Q0ZRSu/IyPiuQXIdnt0OK0FudeciEO+jE5yvrBlGNRoINdTlsko5miPocPm Mke0FTuKe81+2dyEJqHxlY5M3P9ZIrVKlVEFM0onRJiwqPmsgnoY3Z3XLc/o3RtGFbnd 43jDn6klnRrbK/g53SjDKzrgZKGqbfOhSrAWQYijP6nTCAftNb6TtKmCYSnMrBOKTEoE EZ3si+OCJQFlsV55ThM6ABOIDG5RhvRKkxjNNvMZA0pRRoTvirgJXFPPAaM8quxpIEx2 Zm+w== 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:cc:to :from:dkim-signature; bh=1btQdC+wS4/yxekRBbxVZ7KHECPJ8mO9wBrq6XRLd5o=; b=AXZotaGcDyIao9eeekDTlfxeCvlJ97NMjBUUFV3avjYNNMa9tV7a4kBRuqff3J+wF/ x0Ycxl5g90zdGPc8xq8B/6mTUN9dlj89yJtR+2AXduEYj5QAzDfqDhDAnV2WiXLhoLoi 4IMmwc3Ori60R0leMasgAxKVuIx848/+l0yRn/Qu8ZF/7ZJlMy+GMEJ526fILxNtYk0n LD0QpYU+wM8K3UYBN+ymYql/4HweWvQpR7Y2fzlO5krhpUUR55tfSM000wUV69/GIShz SEBtuQv3iA0oWRXzzx/D4uKr/n7h31DD/+ZavBhv36BnGl0Ud53/w24ZUeowThZr7Hk7 idcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Y2cqkqQp; 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 a5-20020aed2785000000b00317cceca6b1si26614700qtd.489.2022.07.08.08.19.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Jul 2022 08:19:34 -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=Y2cqkqQp; 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]:50912 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o9plV-0006zn-TO for patch@linaro.org; Fri, 08 Jul 2022 11:19:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36786) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9piL-0002Gx-4d for qemu-devel@nongnu.org; Fri, 08 Jul 2022 11:16:17 -0400 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]:43696) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o9piJ-00028O-DK for qemu-devel@nongnu.org; Fri, 08 Jul 2022 11:16:16 -0400 Received: by mail-pl1-x634.google.com with SMTP id r1so16579535plo.10 for ; Fri, 08 Jul 2022 08:16:08 -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=1btQdC+wS4/yxekRBbxVZ7KHECPJ8mO9wBrq6XRLd5o=; b=Y2cqkqQprZjZ+NYRn8GL83vhWWxcMj3hSnUxtktqdGKMj1lqrMnXMkpbOHpFrwPEKy /2eOovz4LK/p+CTAExvCORH344VxMemi0l7e397ocTXBUFyveLvtsv5aEk0J3zJsE8o6 1wZjf4pXFE/ZvIomvriwt+tTYk/gknA+71ge8fYJOTlSKIkt4+2HmWThScQwSx5nPZrD +pFX7mHWwFk8joLyg3uJPg8/0mcnvf1lnYun9Z+4XLjYqxvzM5KVvePoPJ4/e8wzjhNN wHpRbkGakvoPTrQzUOzxcSDpQLg+dcBwuU3qTRYJ71SMNlBTo5oeLNJxkyI2Axy9ex7j 5Jwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1btQdC+wS4/yxekRBbxVZ7KHECPJ8mO9wBrq6XRLd5o=; b=IFQ0jCe+/Zy0CZnelIUtTn4BFoVB1ORJQt+8MVX/g/lg6N+suc2mtSaG1rM8iMfljh E0ohxjrRzzimsO52mmLZHxfoaSJhLzYVxdzpjwXtKh3lSe6nBmnTNgk9OjwxgV5MuBjG rslnuFmnzu7cevB6acN7Z3ZAywHZIAbZnWXn5L9ZSVXA6GGLYqVPFEEIlA0gjajNVjuS L9Gzw0SVUJ6AsukWp9YIu4FcyR89jNv91P3Kec9JyMAoIjttAeuSisykQoRSt1GzAjK6 hoDrYWkuH8muSdfCFjvmpOOn1wrOwk57jV4ovyH3RDhTkBuHf2rOaFFYkavFzaEeOZwz esew== X-Gm-Message-State: AJIora9bx2huyYTshA/5AQYM8/Dpcb0hHTSv4INuM27EW+zLiajIQNUU I9vzJ8kkv9Y0nJz0Z14sfuB6r6FUOzSIA48K X-Received: by 2002:a17:90a:9411:b0:1ef:9c3f:9a07 with SMTP id r17-20020a17090a941100b001ef9c3f9a07mr379692pjo.150.1657293367862; Fri, 08 Jul 2022 08:16:07 -0700 (PDT) Received: from stoup.. ([122.255.60.245]) by smtp.gmail.com with ESMTPSA id n17-20020a056a0007d100b0051bada81bc7sm29085774pfu.161.2022.07.08.08.16.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Jul 2022 08:16:07 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Peter Maydell Subject: [PATCH v6 07/45] target/arm: Mark PMULL, FMMLA as non-streaming Date: Fri, 8 Jul 2022 20:45:02 +0530 Message-Id: <20220708151540.18136-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220708151540.18136-1-richard.henderson@linaro.org> References: <20220708151540.18136-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::634; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x634.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" 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 --- target/arm/sme-fa64.decode | 2 -- target/arm/translate-sve.c | 24 +++++++++++++++--------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/target/arm/sme-fa64.decode b/target/arm/sme-fa64.decode index 4f515939d9..4ff2df82e5 100644 --- a/target/arm/sme-fa64.decode +++ b/target/arm/sme-fa64.decode @@ -59,8 +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 000- ---- 0110 1--- ---- ---- # PMULLB, PMULLT (128b result) -FAIL 0110 0100 --1- ---- 1110 01-- ---- ---- # FMMLA, BFMMLA FAIL 0110 0101 --0- ---- 0000 11-- ---- ---- # FTSMUL FAIL 0110 0101 --01 0--- 100- ---- ---- ---- # FTMAD FAIL 0110 0101 --01 1--- 001- ---- ---- ---- # FADDA diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c index ae48040aa4..4ff2102fc8 100644 --- a/target/arm/translate-sve.c +++ b/target/arm/translate-sve.c @@ -6186,9 +6186,13 @@ static bool do_trans_pmull(DisasContext *s, arg_rrr_esz *a, bool sel) gen_helper_gvec_pmull_q, gen_helper_sve2_pmull_h, NULL, gen_helper_sve2_pmull_d, }; - if (a->esz == 0 - ? !dc_isar_feature(aa64_sve2_pmull128, s) - : !dc_isar_feature(aa64_sve, s)) { + + if (a->esz == 0) { + if (!dc_isar_feature(aa64_sve2_pmull128, s)) { + return false; + } + s->is_nonstreaming = true; + } else if (!dc_isar_feature(aa64_sve, s)) { return false; } return gen_gvec_ool_arg_zzz(s, fns[a->esz], a, sel); @@ -7125,10 +7129,12 @@ DO_ZPZZ_FP(FMINP, aa64_sve2, sve2_fminp_zpzz) * SVE Integer Multiply-Add (unpredicated) */ -TRANS_FEAT(FMMLA_s, aa64_sve_f32mm, gen_gvec_fpst_zzzz, gen_helper_fmmla_s, - a->rd, a->rn, a->rm, a->ra, 0, FPST_FPCR) -TRANS_FEAT(FMMLA_d, aa64_sve_f64mm, gen_gvec_fpst_zzzz, gen_helper_fmmla_d, - a->rd, a->rn, a->rm, a->ra, 0, FPST_FPCR) +TRANS_FEAT_NONSTREAMING(FMMLA_s, aa64_sve_f32mm, gen_gvec_fpst_zzzz, + gen_helper_fmmla_s, a->rd, a->rn, a->rm, a->ra, + 0, FPST_FPCR) +TRANS_FEAT_NONSTREAMING(FMMLA_d, aa64_sve_f64mm, gen_gvec_fpst_zzzz, + gen_helper_fmmla_d, a->rd, a->rn, a->rm, a->ra, + 0, FPST_FPCR) static gen_helper_gvec_4 * const sqdmlal_zzzw_fns[] = { NULL, gen_helper_sve2_sqdmlal_zzzw_h, @@ -7301,8 +7307,8 @@ TRANS_FEAT(BFDOT_zzzz, aa64_sve_bf16, gen_gvec_ool_arg_zzzz, TRANS_FEAT(BFDOT_zzxz, aa64_sve_bf16, gen_gvec_ool_arg_zzxz, gen_helper_gvec_bfdot_idx, a) -TRANS_FEAT(BFMMLA, aa64_sve_bf16, gen_gvec_ool_arg_zzzz, - gen_helper_gvec_bfmmla, a, 0) +TRANS_FEAT_NONSTREAMING(BFMMLA, aa64_sve_bf16, gen_gvec_ool_arg_zzzz, + gen_helper_gvec_bfmmla, a, 0) static bool do_BFMLAL_zzzw(DisasContext *s, arg_rrrr_esz *a, bool sel) {