From patchwork Thu Apr 18 17:49:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 789813 Delivered-To: patch@linaro.org Received: by 2002:adf:e6ca:0:b0:346:15ad:a2a with SMTP id y10csp695395wrm; Thu, 18 Apr 2024 10:52:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVUDcVBIbPSn5df6yPQAZIhHf7a7K1LM4Aj1pSzxQ6i1jVgs5twdUMbMogYrLl+Ygxoo8Sb2YnPPFyY2PdxFayi X-Google-Smtp-Source: AGHT+IHJQo3KOK7ULZNCGsrjJ5ud/90jHKlbUWmp1eSXNaXMmeQKUdto/pMxo1LjA5hg7CP8CHGK X-Received: by 2002:a05:6358:7290:b0:183:9a25:848a with SMTP id w16-20020a056358729000b001839a25848amr4997568rwf.2.1713462766702; Thu, 18 Apr 2024 10:52:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713462766; cv=none; d=google.com; s=arc-20160816; b=VTRpDkjSve0TCCBvc5XeGoG5XW8Yo47RX7HfmnH+VMWPLDb2tni1JDO/EVDJy1tbYs 73McvMVN2uHBj5WFin2JerQBNGgXGDruuyRxOy6cPEehiSe9wvpzQfcLnff2MLax93Ak JADoXyQRl+JOOVngJeYGWCH0UJB1QpJBBrjJHh3ANKpexPCoDu7Q4dUgwehsp6F13XPS pZulU0vMr+FHeBTJSXuiwDDxbR4/xRIUBx4r/lmTtNkWK0plbUUblE5Ur1Mrq5I9wTN6 srbaASaeeoTF+Jgi4WkvFdw9McjCk/BMyKi34/N3R68y/d813l/xV6ZKMxqybwubghQ5 3wzA== 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=zW86xpumTwEW6quDKnKk9sNhgs+teHMYX6SAItgWVuA=; fh=bMaafE1clBtiBaCrlbrbcY1DSEPhhFUklUk4XoVHiPU=; b=xm9s+zpN/YHbOoGt2CHe0Do8FLBARz0vV2BEsi0UJNPD6ma4tfQzyLToGCwuSPFQom anpP38inxc5BW1aDjZWsubTqhf27HC6pyKNosfp2ajhniwMoP/8YtAfaVY3EAagN/go3 LVeB2LR7CHUj82KGvLHfr6/AI800P1XLcQdL7ZWb5od3ElYiEI7JPj6JukdkUBCeC91H pnGN+juIBXtEZd7mSuBjCs/HtPbfabhMtX7PzvQHQ8aetWCPCqE6V5WGlGIeAPCFth+y nQ7o8BfcVMxtUAQwWbj14vYHOkfDvD3xcWMbfajRblcVb5pgQ6lKuWdPvw2JiM4eUipM 6CXQ==; 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 k17-20020a05622a03d100b00434ba49a73bsi1994438qtx.114.2024.04.18.10.52.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 Apr 2024 10:52:46 -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 1rxVtd-00088P-6b; Thu, 18 Apr 2024 13:50:05 -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 1rxVtb-00087l-8R; Thu, 18 Apr 2024 13:50:03 -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 1rxVtY-0007I4-VE; Thu, 18 Apr 2024 13:50:02 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id B29495FD61; Thu, 18 Apr 2024 20:49:58 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 16EC1B9337; Thu, 18 Apr 2024 20:49:56 +0300 (MSK) Received: (nullmailer pid 947806 invoked by uid 1000); Thu, 18 Apr 2024 17:49:55 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Richard Henderson , Michael Tokarev Subject: [Stable-8.2.3 088/116] tcg/optimize: Do not attempt to constant fold neg_vec Date: Thu, 18 Apr 2024 20:49:18 +0300 Message-Id: <20240418174955.947730-1-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 Split out the tail of fold_neg to fold_neg_no_const so that we can avoid attempting to constant fold vector negate. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2150 Signed-off-by: Richard Henderson (cherry picked from commit e25fe886b89a396bae5847520b70c148587d490a) Signed-off-by: Michael Tokarev diff --git a/tcg/optimize.c b/tcg/optimize.c index 6fcdda68ef..5ead14972a 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -1830,16 +1830,10 @@ static bool fold_nand(OptContext *ctx, TCGOp *op) return false; } -static bool fold_neg(OptContext *ctx, TCGOp *op) +static bool fold_neg_no_const(OptContext *ctx, TCGOp *op) { - uint64_t z_mask; - - if (fold_const1(ctx, op)) { - return true; - } - /* Set to 1 all bits to the left of the rightmost. */ - z_mask = arg_info(op->args[1])->z_mask; + uint64_t z_mask = arg_info(op->args[1])->z_mask; ctx->z_mask = -(z_mask & -z_mask); /* @@ -1850,6 +1844,11 @@ static bool fold_neg(OptContext *ctx, TCGOp *op) return true; } +static bool fold_neg(OptContext *ctx, TCGOp *op) +{ + return fold_const1(ctx, op) || fold_neg_no_const(ctx, op); +} + static bool fold_nor(OptContext *ctx, TCGOp *op) { if (fold_const2_commutative(ctx, op) || @@ -2165,7 +2164,7 @@ static bool fold_sub_to_neg(OptContext *ctx, TCGOp *op) if (have_neg) { op->opc = neg_op; op->args[1] = op->args[2]; - return fold_neg(ctx, op); + return fold_neg_no_const(ctx, op); } return false; } diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile.target index 0efd565f05..70d728ae9a 100644 --- a/tests/tcg/aarch64/Makefile.target +++ b/tests/tcg/aarch64/Makefile.target @@ -10,7 +10,7 @@ VPATH += $(AARCH64_SRC) # Base architecture tests AARCH64_TESTS=fcvt pcalign-a64 lse2-fault -AARCH64_TESTS += test-2248 +AARCH64_TESTS += test-2248 test-2150 fcvt: LDFLAGS+=-lm diff --git a/tests/tcg/aarch64/test-2150.c b/tests/tcg/aarch64/test-2150.c new file mode 100644 index 0000000000..fb86c11958 --- /dev/null +++ b/tests/tcg/aarch64/test-2150.c @@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* See https://gitlab.com/qemu-project/qemu/-/issues/2150 */ + +int main() +{ + asm volatile( + "movi v6.4s, #1\n" + "movi v7.4s, #0\n" + "sub v6.2d, v7.2d, v6.2d\n" + : : : "v6", "v7"); + return 0; +}