From patchwork Thu Jul 4 15:52:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 809964 Delivered-To: patch@linaro.org Received: by 2002:adf:a199:0:b0:367:895a:4699 with SMTP id u25csp1234497wru; Thu, 4 Jul 2024 08:58:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXyDzjrvcvNePOAuQrvEYcCxd1RpJ79HvYC8hkgF2Feftvwfd0B9FyvKHqBAP7fHzSkzaWYHAbMPA+f3K0r+/VB X-Google-Smtp-Source: AGHT+IHPH2/SZbU71tb1ZXwvbqTB88q+vb5DY63n5zaGbsVF+llKgP40KGRa09NnLww3W9kOYgUP X-Received: by 2002:a25:d684:0:b0:e03:a227:6476 with SMTP id 3f1490d57ef6-e03c190e7admr2120849276.17.1720108683707; Thu, 04 Jul 2024 08:58:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720108683; cv=none; d=google.com; s=arc-20160816; b=bID0NMQp6tYDUb6zpVxsh8tafpZRVM0C2FnIuTnRe72yfyJHmxcOYEHYBmUuossYVY V95p42LojDIKRLOh+Rj+fOM6whBRA3S/xUe3e1L2WYyulMivLTsni/8Zc3fjF6WEGM+3 Yf7fPWjQvy2bAfWVGNScjlhXE3b0DS3re7C1Llgcsooe0qLY0ToIx+HzVumcw0jZo/RF Z6vP2om+VANQX3dFMsllbYii6Lnr3N1hKsBRvM9xQvhNCQrXvBKzf9UphAkWjStRdFyZ +hh59ERfhvr0wkisMWKOOoLNKhKppEfXxbrK64NHlSgVebH6hWi76UTZJnmy7JhNCinL ep2w== 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=dpa00ZWK0z3zWvsAxlTHsXonch8Y5l4laAm1UlBM0zs=; fh=NoJ7n5JVE2hviRF6uNBFRIJvWH7igafuy1AIwg26ToM=; b=XS/FdTu61Ta4UyCSMF3jkaEXXwAK7LkUf6npId1zC5SpubODCIceZqnyrvOVcKbsns 4BTay4pu3MvHGx5yQyVWNu8YiojwsO/8ViXf5yq1sK6EG4hLrvRWR9zUbhLD/kRcNkUW TCSUWdndQHoZ8Qtc81whLDJ6nvfJt1o5ZVB4XKl07OegWfq1mbOEcjYJJDlyx7xY36/V xdS6pE6eSdhsKfB93tWSbac183l5Gv6jRm5BYmglHuNlcIhHPPEJ2EGhc4XBqHj+GuSS Ks/9ByXmiGleK88MNGS6uVxoXeHEuwXUuZGtyD6uJ8knvsPuYLVC5ESn+yrgUXG6i9Y+ DVVA==; 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 6a1803df08f44-6b5e9f9f628si19957176d6.429.2024.07.04.08.58.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 04 Jul 2024 08:58:03 -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 1sPOmV-0001Og-EV; Thu, 04 Jul 2024 11:53:59 -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 1sPOmT-0001No-PU; Thu, 04 Jul 2024 11:53:57 -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 1sPOmR-00027e-OR; Thu, 04 Jul 2024 11:53:57 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 1D03C7749B; Thu, 4 Jul 2024 18:52:47 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id D94B6FEAE6; Thu, 4 Jul 2024 18:52:51 +0300 (MSK) Received: (nullmailer pid 1481708 invoked by uid 1000); Thu, 04 Jul 2024 15:52:51 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Richard Henderson , Peter Maydell , Michael Tokarev Subject: [Stable-8.2.6 13/18] target/arm: Fix VCMLA Dd, Dn, Dm[idx] Date: Thu, 4 Jul 2024 18:52:44 +0300 Message-Id: <20240704155251.1481617-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/tcg/vec_helper.c b/target/arm/tcg/vec_helper.c index 1f93510b85..cc7cab338c 100644 --- a/target/arm/tcg/vec_helper.c +++ b/target/arm/tcg/vec_helper.c @@ -843,7 +843,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. */ @@ -905,7 +905,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. */