From nobody Sat Nov 15 09:10:30 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1753443865; cv=none; d=zohomail.com; s=zohoarc; b=FeIGMWLhTlQ8PoCOyqIYeSv4+notzxx21HJo6p0SwR7xHoqJJ5d4Wkluq/DyGM7CzyWmGuUuEeIg9DJhEdQhcdd8s39piEaY7zqu6+/YFdtPRgkn7J9fMehVSKgK8a8N706FfyXowmKvvPOntuWfFxldVoi8BnbyS+pOntdI9Yk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1753443865; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=joH5QJPR9Dqhnl/Inaiug79sSZYzaxfyN/Ram2YAOXo=; b=PeFqNpfKvkM0UxA0ixBIwIoq1Rjlxv6QrCjNgQ90wENu8ki5BMbFOGTRPF98No6uvP2kxV1glAJRmDY/WlIwIr+OEQ2GMCv7OEglp09YS1oq/ifH/TF32EOSTr9H8ughnkSNgfFhY2qH9Ur+1nmZaVTTvpyeealPRhHUyJTQ7AA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1753443865142102.97531739912574; Fri, 25 Jul 2025 04:44:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufGol-0002et-BA; Fri, 25 Jul 2025 07:42:27 -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 1ufGoV-0004mA-TP for qemu-devel@nongnu.org; Fri, 25 Jul 2025 07:42:12 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ufGoS-0000N0-29 for qemu-devel@nongnu.org; Fri, 25 Jul 2025 07:42:10 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-3a4fd1ba177so1337779f8f.0 for ; Fri, 25 Jul 2025 04:42:07 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45870568fb1sm51230105e9.27.2025.07.25.04.42.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jul 2025 04:42:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1753443726; x=1754048526; 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=joH5QJPR9Dqhnl/Inaiug79sSZYzaxfyN/Ram2YAOXo=; b=vw9mXqFXjCBUPjotWrgRVnqNgQKB37l9p6UoMCyIAphWn45229AE4lWM8WTTDwiKJr 3+h41U7d0XnU/cjOGeZWOWM1mKK0CBI5tFE72Pf6jAgHi+0a3yAZ/BdXkf2cqH0UUvkD h4/Rexfrwhj0gUgmUYWPv0+YwHjple/QrCuu95IM1aSbKZBWmCoATUoeuw8JmK71ltuu j4DJpOEOh/uDwgkbMx/irI4OBFjaG9oK0iCWexwH1yuXLdPPrTVPtlQOVUtp3MpoWSvp 06LNET2YX8dkBVVuPeNmEVx0/lYTlPICFMpw44T4JUzEygH4cui2HDHaZG9slx1tVvZ5 +5GA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753443726; x=1754048526; 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=joH5QJPR9Dqhnl/Inaiug79sSZYzaxfyN/Ram2YAOXo=; b=HGTcFWt8XizzySy8k3GSwY+GbnUXUQSzSDkh9jm/g+Jl9KovuX8ULTC7sYbH1gpCQT SH02T0M8arGPIINixQKvVkfOCLSXFG18ejqkUiykq0us97s0XaQ6lH6OGCeae/LEkfAt doXyOOGCBBc1tcLjY9gQ+nhSTIWWwIglylPZiwzaW5ww2vKTJTptBp/PCD1uqg8TZlBG LUtA0c5ejlsiRmevahEYCA34ejd5f/GYb4tWE6bb+TU6QoBVi7MUW80t+0PBkZKICWwP pES2HlksmEsGxlOpOl79kX8GE3w+df1KBa1uy0OL90wgqdiNBGkLlGwykJIY9dx/Whmm k1Rw== X-Gm-Message-State: AOJu0Yy4vWiVN+nTQ6L3iY8xOJCMCziczObNzKxF9f1mWcE+hvE4pyNM nYXQ489bttV+HLiyXScccqEyBmqIWyGzwcQ3nEXaNbSXb1E/4d1uNWcZSoDeybta/JltbiSNrQX dkIYv X-Gm-Gg: ASbGncu0VAa7wgOVp8r+p8TzL/+bAkTqyOhVdFyh/E2cG/NYOKEI0IxtPRvSTK2p5qt lmmuP+P7ssPBpC7ewqAOBYdPKpIm4HBy4a+AAyX7NanxomI61J+97eZFLm+3kWk7FQHux2QHf8l jwo1PEqsTblK1jlRdkK3nYoi2CaSD00Flv8j0g75ACWEb9C2sKyoGj2qRae+ybug8dVmOGwcaHP RVcsBANoh5w03tgxRSUPNoZdQXX9rPRclxSD1NOEyF8Cz674Anfv8e8deNR9DmP6cY44MMgqU65 e7J6jnzziXJej9AL8kHOuxL8D1lxzcwJIIdXbfEbGqoBK9+BRUpxNsSUwGXOFS0DjVGeHmLLQiL Npp0QnJjeysCGfNDmXlnH+VcNphcrYHQ1AF4DsrE= X-Google-Smtp-Source: AGHT+IHPxDqsyJNjavE3MeOUPGdSDNdxdlEBCw81+XgwkOxh8SVLACIplhQthmAgUA3BEm9bWIQl8w== X-Received: by 2002:a05:6000:2002:b0:3b7:6e64:bed8 with SMTP id ffacd0b85a97d-3b77137d611mr5140966f8f.28.1753443725849; Fri, 25 Jul 2025 04:42:05 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 4/8] target/arm: LD1Q, ST1Q are vector + scalar, not scalar + vector Date: Fri, 25 Jul 2025 12:41:54 +0100 Message-ID: <20250725114158.3703254-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250725114158.3703254-1-peter.maydell@linaro.org> References: <20250725114158.3703254-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42f.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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1753443866589116600 Content-Type: text/plain; charset="utf-8" Unlike the "LD1D (scalar + vector)" etc instructions, LD1Q is vector + scalar. This means that: * the vector and the scalar register are in opposite fields in the encoding * 31 in the scalar register field is XZR, not XSP The same applies for ST1Q. This means we can't reuse the trans_LD1_zprz() and trans_ST1_zprz() functions for LD1Q and ST1Q. Split them out to use their own trans functions. Note that the change made here to sve.decode requires the decodetree bugfix "decodetree: Infer argument set before inferring format" to avoid a spurious compile-time error about "dtype". Fixes: d2aa9a804ee678f ("target/arm: Implement LD1Q, ST1Q for SVE2p1") Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20250723165458.3509150-5-peter.maydell@linaro.org --- target/arm/tcg/sve.decode | 12 +++---- target/arm/tcg/translate-sve.c | 65 ++++++++++++++++++++++++++-------- 2 files changed, 57 insertions(+), 20 deletions(-) diff --git a/target/arm/tcg/sve.decode b/target/arm/tcg/sve.decode index aea7f519730..ab63cfaa0f0 100644 --- a/target/arm/tcg/sve.decode +++ b/target/arm/tcg/sve.decode @@ -1343,9 +1343,9 @@ LD1_zprz 1100010 10 1. ..... 1.. ... ..... ...= .. \ LD1_zprz 1100010 11 1. ..... 11. ... ..... ..... \ @rprr_g_load_sc esz=3D3 msz=3D3 u=3D1 =20 -# LD1Q -LD1_zprz 1100 0100 000 rm:5 101 pg:3 rn:5 rd:5 \ - &rprr_gather_load u=3D1 ff=3D0 xs=3D2 esz=3D4 msz=3D4 scal= e=3D0 +# LD1Q. Note that this is subtly different from LD1_zprz because +# it is vector + scalar, not scalar + vector. +LD1Q 1100 0100 000 rm:5 101 pg:3 rn:5 rd:5 =20 # SVE 64-bit gather load (vector plus immediate) LD1_zpiz 1100010 .. 01 ..... 1.. ... ..... ..... \ @@ -1450,9 +1450,9 @@ ST1_zprz 1110010 .. 01 ..... 101 ... ..... ...= .. \ ST1_zprz 1110010 .. 00 ..... 101 ... ..... ..... \ @rprr_scatter_store xs=3D2 esz=3D3 scale=3D0 =20 -# ST1Q -ST1_zprz 1110 0100 001 rm:5 001 pg:3 rn:5 rd:5 \ - &rprr_scatter_store xs=3D2 msz=3D4 esz=3D4 scale=3D0 +# ST1Q. Note that this is subtly different from ST1_zprz because +# it is vector + scalar, not scalar + vector. +ST1Q 1110 0100 001 rm:5 001 pg:3 rn:5 rd:5 =20 # SVE 64-bit scatter store (vector plus immediate) ST1_zpiz 1110010 .. 10 ..... 101 ... ..... ..... \ diff --git a/target/arm/tcg/translate-sve.c b/target/arm/tcg/translate-sve.c index 5cba7b87bdc..07b827fa8e8 100644 --- a/target/arm/tcg/translate-sve.c +++ b/target/arm/tcg/translate-sve.c @@ -6179,9 +6179,7 @@ static bool trans_LD1_zprz(DisasContext *s, arg_LD1_z= prz *a) bool be =3D s->be_data =3D=3D MO_BE; bool mte =3D s->mte_active[0]; =20 - if (a->esz < MO_128 - ? !dc_isar_feature(aa64_sve, s) - : !dc_isar_feature(aa64_sve2p1, s)) { + if (!dc_isar_feature(aa64_sve, s)) { return false; } s->is_nonstreaming =3D true; @@ -6196,10 +6194,6 @@ static bool trans_LD1_zprz(DisasContext *s, arg_LD1_= zprz *a) case MO_64: fn =3D gather_load_fn64[mte][be][a->ff][a->xs][a->u][a->msz]; break; - case MO_128: - assert(!a->ff && a->u && a->xs =3D=3D 2 && a->msz =3D=3D MO_128); - fn =3D gather_load_fn128[mte][be]; - break; default: g_assert_not_reached(); } @@ -6210,6 +6204,32 @@ static bool trans_LD1_zprz(DisasContext *s, arg_LD1_= zprz *a) return true; } =20 +static bool trans_LD1Q(DisasContext *s, arg_LD1Q *a) +{ + gen_helper_gvec_mem_scatter *fn =3D NULL; + bool be =3D s->be_data =3D=3D MO_BE; + bool mte =3D s->mte_active[0]; + + if (!dc_isar_feature(aa64_sve2p1, s)) { + return false; + } + s->is_nonstreaming =3D true; + if (!sve_access_check(s)) { + return true; + } + + fn =3D gather_load_fn128[mte][be]; + assert(fn !=3D NULL); + + /* + * Unlike LD1_zprz, a->rm is the scalar register and it can be XZR, no= t XSP. + * a->rn is the vector register. + */ + do_mem_zpz(s, a->rd, a->pg, a->rn, 0, + cpu_reg(s, a->rm), MO_128, false, fn); + return true; +} + static bool trans_LD1_zpiz(DisasContext *s, arg_LD1_zpiz *a) { gen_helper_gvec_mem_scatter *fn =3D NULL; @@ -6386,9 +6406,7 @@ static bool trans_ST1_zprz(DisasContext *s, arg_ST1_z= prz *a) if (a->esz < a->msz || (a->msz =3D=3D 0 && a->scale)) { return false; } - if (a->esz < MO_128 - ? !dc_isar_feature(aa64_sve, s) - : !dc_isar_feature(aa64_sve2p1, s)) { + if (!dc_isar_feature(aa64_sve, s)) { return false; } s->is_nonstreaming =3D true; @@ -6402,10 +6420,6 @@ static bool trans_ST1_zprz(DisasContext *s, arg_ST1_= zprz *a) case MO_64: fn =3D scatter_store_fn64[mte][be][a->xs][a->msz]; break; - case MO_128: - assert(a->xs =3D=3D 2 && a->msz =3D=3D MO_128); - fn =3D scatter_store_fn128[mte][be]; - break; default: g_assert_not_reached(); } @@ -6414,6 +6428,29 @@ static bool trans_ST1_zprz(DisasContext *s, arg_ST1_= zprz *a) return true; } =20 +static bool trans_ST1Q(DisasContext *s, arg_ST1Q *a) +{ + gen_helper_gvec_mem_scatter *fn; + bool be =3D s->be_data =3D=3D MO_BE; + bool mte =3D s->mte_active[0]; + + if (!dc_isar_feature(aa64_sve2p1, s)) { + return false; + } + s->is_nonstreaming =3D true; + if (!sve_access_check(s)) { + return true; + } + fn =3D scatter_store_fn128[mte][be]; + /* + * Unlike ST1_zprz, a->rm is the scalar register, and it + * can be XZR, not XSP. a->rn is the vector register. + */ + do_mem_zpz(s, a->rd, a->pg, a->rn, 0, + cpu_reg(s, a->rm), MO_128, true, fn); + return true; +} + static bool trans_ST1_zpiz(DisasContext *s, arg_ST1_zpiz *a) { gen_helper_gvec_mem_scatter *fn =3D NULL; --=20 2.43.0