From patchwork Mon Jul 11 13:57:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 589375 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:bb16:0:0:0:0 with SMTP id jd22csp3305907mab; Mon, 11 Jul 2022 07:37:24 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sWAU7eHJ3W1guP/2S/6cblAHpXUnJqcEeiCYKNDfTUZoc430xnmm3Abny1I7JtT33L66Ec X-Received: by 2002:a05:620a:2b49:b0:6b5:87c7:ecd3 with SMTP id dp9-20020a05620a2b4900b006b587c7ecd3mr3510150qkb.100.1657550244612; Mon, 11 Jul 2022 07:37:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657550244; cv=none; d=google.com; s=arc-20160816; b=tlxj0kt2oirh0lAuK5SOFyICSnJKFxXK8eySpv7uCi1RYdspAKJkQBRCoHG8cPXmek hvUCRkrP4TA6rIxppWxbY1BiajuSul2rsJRM20YNj+KPmceUvcn82VGAp+zEuosojb9U /tVSS8cr4GN8EV3PzzrNVeSdaQ8oxh2cscaXe0z4l9z45FLmPgYBBt7qmoZ/VZx5qYZa 5riFDmV2S8ctBaJWc5JL9mbzmkK/v7VmKcDKcAzWnrE1PcNhEZUESM63+RhQY4QfDCNP fLXyrW7f7gOW8xQRvBIb6/z6jSsf+9owPt/VUWeEFVAWHr7lqJzu/fwIGacxtFGxCoqE QWeA== 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=9H4vayvC6P8HyxpZR8DvsdsTXJo88+HbItchv84O0iE=; b=l1JYmBomnM+VId7KMbLz9Rfm1CXx4n2YGElqfzjjwaR5lkkdv3Hv6BkE9coC8sRmpa Mtx1FdZ0ObPPbQ5uShHajuW/Nsh2IJxIfokK6DuKfd8ClVmd4te3SiO/VXYjtaaRQ6RF R2pIAbWe2711z0e2aOd7iAdSQrQ9vjeB7VTEN3oFeVpskw9ZifRbmycI7SXCAJZqBxlR ooF26u5pJ5AFzBaLtF/WwuKrKnVbxqu8e1Vh2vQxlPRg0/du3NjF2MsQjORDnJFKAurc e6NC7QpGFAs1RNexZXAcXMerbpwvLxivzgLsCksWZXSdvwy9k4AHgE4ugEbjdXWRET3U IYUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QmhX5Ai7; 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 de10-20020a05620a370a00b006af25ed312esi381316qkb.483.2022.07.11.07.37.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Jul 2022 07:37:24 -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=QmhX5Ai7; 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]:46496 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oAuXM-0002EU-4G for patch@linaro.org; Mon, 11 Jul 2022 10:37:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oAtvV-0006Yx-P8 for qemu-devel@nongnu.org; Mon, 11 Jul 2022 09:58:18 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:36550) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oAtvQ-0002pO-3t for qemu-devel@nongnu.org; Mon, 11 Jul 2022 09:58:15 -0400 Received: by mail-wr1-x430.google.com with SMTP id o4so7142332wrh.3 for ; Mon, 11 Jul 2022 06:58:03 -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=9H4vayvC6P8HyxpZR8DvsdsTXJo88+HbItchv84O0iE=; b=QmhX5Ai7AUKVLyGTlRPmwGEAaIUrljdejQgLrGmW97FuqF4Q1eEfOF+W+j/fIRxwXY Mpd9uAzG9ie9w0TLCzsh3oK1Dj+YeeolS3/PYkKG7yZpXwrist1j2TmB/XQo3sIYpWz1 8D5/4DkUK6MZQOM20L5eVZnYd4uheIof6Hva88kKuyuCHKTtxTl3fTHKNprRhWQmSO69 C94rVaKL3HZZjzmOT4uKh4/Gpr24DRnitwMdq8EP8E3XxmlWCFXPpXBAueskK7u6TYUi Hke+psH3o8wP2nlNYJK4EN9AljspYdn8dTJ4j8l1zwcUqlloamHJI0a0MdMko2kaACMa uGmw== 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=9H4vayvC6P8HyxpZR8DvsdsTXJo88+HbItchv84O0iE=; b=qnVPU4kJpyhbZM7lawAm+A98Ybbe9PKhXheLz3bN6vhF8GuPIZXjV+1eDuMZIkwPx7 AXsj5ClOJHi7LGfu/dWd5Av4YEVTnFIUCDW36Hbeg+c0BYI1MPxZHWH50/4AFBiQohzN Imnd+itDWaA+jccQZ8Acdv6b+H82usTLOVm9yiCxDmT0SmZJ5RmFkapBipqFZIWnSaXx 4fyUN6St7odeJd85qOPw+tRI3S/+x32T0rtMAITJGJEjXXSykqDEizVdHlDXZEqL+sN2 8bm1TSDWGwhzJS2Q56UlSGF9cqhsiZzLFy8Agt9I63IcZvBHGKFy4dOswlKu7/3193Kf nq8Q== X-Gm-Message-State: AJIora/w8uk67DMPL+Xllmd/HCv1Ju+5nLr/6Jpjtx50LYBxVgwaHkjg aUJhamoEnlVxIr/W8tdDAujsUSEn84YUKg== X-Received: by 2002:a5d:4aca:0:b0:21d:6793:1c11 with SMTP id y10-20020a5d4aca000000b0021d67931c11mr16516057wrs.202.1657547882128; Mon, 11 Jul 2022 06:58:02 -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.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Jul 2022 06:58:01 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 12/45] target/arm: Mark gather prefetch as non-streaming Date: Mon, 11 Jul 2022 14:57:17 +0100 Message-Id: <20220711135750.765803-13-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::430; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x430.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. In this case, introduce PRF_ns (prefetch non-streaming) to handle the checks. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20220708151540.18136-13-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/sme-fa64.decode | 3 --- target/arm/sve.decode | 10 +++++----- target/arm/translate-sve.c | 11 +++++++++++ 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/target/arm/sme-fa64.decode b/target/arm/sme-fa64.decode index 1acc3ae0809..7d4c33fb5b8 100644 --- a/target/arm/sme-fa64.decode +++ b/target/arm/sme-fa64.decode @@ -59,10 +59,7 @@ 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 1000 010- -00- ---- 111- ---- ---- ---- # SVE 32-bit gather prefetch (vector+imm) -FAIL 1000 0100 0-1- ---- 0--- ---- ---- ---- # SVE 32-bit gather prefetch (scalar+vector) FAIL 1010 010- ---- ---- 011- ---- ---- ---- # SVE contiguous FF load (scalar+scalar) FAIL 1010 010- ---1 ---- 101- ---- ---- ---- # SVE contiguous NF load (scalar+imm) FAIL 1010 010- -01- ---- 000- ---- ---- ---- # SVE load & replicate 32 bytes (scalar+scalar) FAIL 1010 010- -010 ---- 001- ---- ---- ---- # SVE load & replicate 32 bytes (scalar+imm) -FAIL 1100 010- ---- ---- ---- ---- ---- ---- # SVE 64-bit gather load/prefetch diff --git a/target/arm/sve.decode b/target/arm/sve.decode index a54feb2f61d..908643d7d90 100644 --- a/target/arm/sve.decode +++ b/target/arm/sve.decode @@ -1183,10 +1183,10 @@ LD1RO_zpri 1010010 .. 01 0.... 001 ... ..... ..... \ @rpri_load_msz nreg=0 # SVE 32-bit gather prefetch (scalar plus 32-bit scaled offsets) -PRF 1000010 00 -1 ----- 0-- --- ----- 0 ---- +PRF_ns 1000010 00 -1 ----- 0-- --- ----- 0 ---- # SVE 32-bit gather prefetch (vector plus immediate) -PRF 1000010 -- 00 ----- 111 --- ----- 0 ---- +PRF_ns 1000010 -- 00 ----- 111 --- ----- 0 ---- # SVE contiguous prefetch (scalar plus immediate) PRF 1000010 11 1- ----- 0-- --- ----- 0 ---- @@ -1223,13 +1223,13 @@ LD1_zpiz 1100010 .. 01 ..... 1.. ... ..... ..... \ @rpri_g_load esz=3 # SVE 64-bit gather prefetch (scalar plus 64-bit scaled offsets) -PRF 1100010 00 11 ----- 1-- --- ----- 0 ---- +PRF_ns 1100010 00 11 ----- 1-- --- ----- 0 ---- # SVE 64-bit gather prefetch (scalar plus unpacked 32-bit scaled offsets) -PRF 1100010 00 -1 ----- 0-- --- ----- 0 ---- +PRF_ns 1100010 00 -1 ----- 0-- --- ----- 0 ---- # SVE 64-bit gather prefetch (vector plus immediate) -PRF 1100010 -- 00 ----- 111 --- ----- 0 ---- +PRF_ns 1100010 -- 00 ----- 111 --- ----- 0 ---- ### SVE Memory Store Group diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c index b23c6aa0bfd..bbf3bf2119a 100644 --- a/target/arm/translate-sve.c +++ b/target/arm/translate-sve.c @@ -5971,6 +5971,17 @@ static bool trans_PRF_rr(DisasContext *s, arg_PRF_rr *a) return true; } +static bool trans_PRF_ns(DisasContext *s, arg_PRF_ns *a) +{ + if (!dc_isar_feature(aa64_sve, s)) { + return false; + } + /* Prefetch is a nop within QEMU. */ + s->is_nonstreaming = true; + (void)sve_access_check(s); + return true; +} + /* * Move Prefix *