From patchwork Thu Jul 4 12:48:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 809957 Delivered-To: patch@linaro.org Received: by 2002:adf:a199:0:b0:367:895a:4699 with SMTP id u25csp1149148wru; Thu, 4 Jul 2024 05:50:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW82TRUnCcKx3Dcu+V2DwSEi/N8XB6WzlsJeM45SXEg4O6MJdVmmJxTwLtv9Pji4Pze6JGAIbhdrvc+vwqqQqke X-Google-Smtp-Source: AGHT+IHGt2zQV0tmJIUgTCvxa2BdPBxx8h+1zi0ybnSyPW6eue0zGZExNJZlRUJ+ubMR14omnQeT X-Received: by 2002:ac8:5a05:0:b0:446:51fc:725e with SMTP id d75a77b69052e-447cbf774a3mr20830541cf.39.1720097417004; Thu, 04 Jul 2024 05:50:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720097416; cv=none; d=google.com; s=arc-20160816; b=GVWy7t2K9U1BH+IYFlnht24jyEpsB42EayeAnERGVqJlCsiQ/Xk2QccK3Pkv2oRk6M u0w7cUkofcO++ONXq2dMk8rd0Bi0yJMsLVwxoT8WBHjz78WCQhC/MhwjhHYygUtZWt1q xmTQkzm8prujlexnlWuFewKk3Fw0VxFXXxH+xr4czBPYYg6RQJYiuI3S41f1Q5K1vdL8 M1O2hULmsgcKtFe8wKQWSGj5o120NLrlhVeIWB6tP6EMjVYrjWAEyly8tCWMnt7/UFHK v+EG/693Nyb7pS8inV15lJxeOyH9q/+j+bzjMBDmxGSOAyUH1jAjDo8ejisLY+gWUAd3 IjwA== 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; bh=qCasKOkGqSxhwUlalA5uM8l4e36rVSeL7lP7AidxsEs=; fh=NoJ7n5JVE2hviRF6uNBFRIJvWH7igafuy1AIwg26ToM=; b=f6GHRMFF7zrkU1NrIRgAzGFmpdPwaUgIx1ROgg9t+/hx4RnfOD39cd8DwIhII7HjiR CeKSw8Hb3l6pIoljjwCCq8Xj/NLeZflM1PPglPPDSzpz5be0iV/ZCYbKCWTq9lC7M26j pC4ArtTf6SQxO/EA/IriUkGqT2fiVpshG2FKUqENfR+f2aoFjJ0vt+YgqMkfpzYOc02l vv7NhKiv7PhHsHjofZ4qLq2rjSmXke137uUCzpAuKTNoKUgHlhVAxGywTSt3cc/toj8r YzY+Zb1/9yngHWKKNqo/Nd92qh5wE8nKILbEuQip4cKpswGQB8EXuBYCgpnjvrF1xz9o Fe7w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4465148768dsi168209591cf.248.2024.07.04.05.50.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 04 Jul 2024 05:50:16 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sPLuJ-0005i3-5V; Thu, 04 Jul 2024 08:49:51 -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 1sPLu5-0005OJ-Ds; Thu, 04 Jul 2024 08:49:41 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sPLu3-0006Vn-Hs; Thu, 04 Jul 2024 08:49:37 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id B327F773A7; Thu, 4 Jul 2024 15:48:22 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 4C392FE78C; Thu, 4 Jul 2024 15:48:27 +0300 (MSK) Received: (nullmailer pid 1471804 invoked by uid 1000); Thu, 04 Jul 2024 12:48:26 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Richard Henderson , Peter Maydell , Michael Tokarev Subject: [Stable-7.2.13 13/17] target/arm: Fix VCMLA Dd, Dn, Dm[idx] Date: Thu, 4 Jul 2024 15:48:20 +0300 Message-Id: <20240704124826.1471715-13-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Richard Henderson The inner loop, bounded by eltspersegment, must not be larger than the outer loop, bounded by elements. Cc: qemu-stable@nongnu.org Fixes: 18fc2405781 ("target/arm: Implement SVE fp complex multiply add (indexed)") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2376 Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20240625183536.1672454-2-richard.henderson@linaro.org Signed-off-by: Peter Maydell (cherry picked from commit 76bccf3cb9d9383da0128bbc6d1300cddbe3ae8f) Signed-off-by: Michael Tokarev diff --git a/target/arm/vec_helper.c b/target/arm/vec_helper.c index f59d3b26ea..859366e264 100644 --- a/target/arm/vec_helper.c +++ b/target/arm/vec_helper.c @@ -842,7 +842,7 @@ void HELPER(gvec_fcmlah_idx)(void *vd, void *vn, void *vm, void *va, intptr_t index = extract32(desc, SIMD_DATA_SHIFT + 2, 2); uint32_t neg_real = flip ^ neg_imag; intptr_t elements = opr_sz / sizeof(float16); - intptr_t eltspersegment = 16 / sizeof(float16); + intptr_t eltspersegment = MIN(16 / sizeof(float16), elements); intptr_t i, j; /* Shift boolean to the sign bit so we can xor to negate. */ @@ -904,7 +904,7 @@ void HELPER(gvec_fcmlas_idx)(void *vd, void *vn, void *vm, void *va, intptr_t index = extract32(desc, SIMD_DATA_SHIFT + 2, 2); uint32_t neg_real = flip ^ neg_imag; intptr_t elements = opr_sz / sizeof(float32); - intptr_t eltspersegment = 16 / sizeof(float32); + intptr_t eltspersegment = MIN(16 / sizeof(float32), elements); intptr_t i, j; /* Shift boolean to the sign bit so we can xor to negate. */