From patchwork Fri Apr 25 21:52:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 884451 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp4177450wrs; Fri, 25 Apr 2025 14:58:18 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXI7y+srVTVZLBQljnU2zd3MbhVwtIJJQXc2AdXQ9BeEht99A1cRTuceuxe64Su/SRbFxrhFA==@linaro.org X-Google-Smtp-Source: AGHT+IHc/LGpnYidqwWn21G/LOgY6xCygFpJWun3GovkVPGqGoQTj5lfsFJbzFt7SSDBOg8HduVs X-Received: by 2002:a05:6214:48f:b0:6e6:6713:3ea8 with SMTP id 6a1803df08f44-6f4cb9edae4mr80224536d6.23.1745618298760; Fri, 25 Apr 2025 14:58:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745618298; cv=none; d=google.com; s=arc-20240605; b=KeRXxCV/qq4gkF3svPzq+Iu1h3/sEKnq0kOQ7b6ueYNVYCZwKD39iZ+D+h+ZFlwmiE X4qWDvHaNLL2wIrirS54ikMzdpyLYRLVCsJCD7C71JzCSmilxlHde8Nnca3U/V1mC4Wm 2mO3Ecf7Pwf88ZFDupCYtyUfkdm5DJ1E7aMQAHehW6X6eBG5zegBD+H4C/Nw8kDDxWnC vjl1mUwPfsCYWGRZPWNXK1VvuCYC3miayysvUhGQ9nEf+r6qm3NF69FyVLmQig6EPqpw EE2QeNZNzArxmS/Bu1d4eRy4giIIKn/RHPanY4HR8kMfrixPNUg21rGZBxKyY5FmOv58 hpzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:dkim-signature; bh=UAtH+1PpQZHkmG6/gQci6ayiz88hBds6rMyA2khGNKQ=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=YTlTYv3Hbu+jmlbz3X2PR3HT/CRzMMBrsLd8xQ5yBis4NLh6fLYDk+IVgZbvCVt+9n CzPedCEFKUfvrlRXbLSCEtH9jOlmQrpiRXm8pQjUlFHuDtYPA0zEbXpzIuhVsj5N/gtX Im21XWHVDdpPRckzKTscLKaAZ7BA3m07xIigDRvgnQIdEriVDtUq/izE0ZlAxVvMQPmv mEztecMewqj4wmq3gMNEvENb7WrJeWRTpPAxeYql0du0qQ+jfOAp0ePpNwEfuTKJLSqR Cx3SoKpwxOiOp6XZw2szXS18wa23ueNg3ebuq2P0n5fKnmyHUfVidCq4Qcd4P1f+0wHm MqxQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=oitZMBLu; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=fail header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f4c0acb81fsi44872306d6.266.2025.04.25.14.58.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Apr 2025 14:58:18 -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=fail header.i=@linaro.org header.s=google header.b=oitZMBLu; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=fail header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8R0q-0007KV-Gr; Fri, 25 Apr 2025 17:55:12 -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 1u8R0n-0007I7-Qw for qemu-devel@nongnu.org; Fri, 25 Apr 2025 17:55:10 -0400 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u8R0l-0000VY-4o for qemu-devel@nongnu.org; Fri, 25 Apr 2025 17:55:09 -0400 Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-736aa9d0f2aso3514932b3a.0 for ; Fri, 25 Apr 2025 14:55:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745618105; x=1746222905; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UAtH+1PpQZHkmG6/gQci6ayiz88hBds6rMyA2khGNKQ=; b=oitZMBLuW9Khgm+tYKMsvKSv5gK6u1BDs++HGxJayPWws2mSA5kR9RhLdJUyjXAVvx qoCJRtCj1lV26nNIqQL/YDkJ4eKcof4Q3AyzIlIWiDAD9Ne7XIzzGKD4x/vA/QrTjRcy Vd7zgRZMiQROF//5e6PyYt2PvBfUheAdAu/GSB4dInuUBOo8F7VWPJmhnp0ogoGZShK0 th+6V+Ndj7TLXJU9mefbb1xcitJ2JartYGF9vqY/x5vjxHYda7TAiKnJ2R9Yyv0ElDsY 5uqdGDZYrodtXRmOzqFCLIQBwF2z9UUB4ECrVrobpfMvaZtEM1RkpIxYGDyNPdT3SwNw NJ1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745618105; x=1746222905; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UAtH+1PpQZHkmG6/gQci6ayiz88hBds6rMyA2khGNKQ=; b=eb/0leduxQIoXUcB3DVDbFXhRwl1G0SKnwEzVPaY9eSU3OmrNSgvuddSP9F66u/pbc 2y9oZy23+BMJtVj8F5YMWMNCBZSQHpeymS6rtsIfA32j4KX7zcwPptHP24JsXyoae56M IHR7UadVVdFnndwthghj5VSlMoy5yb5FgpuX/lTLT7JnII4KQiyTto0wnF1fGZHBw42a 1f1Iz5a0ibMw+Fom+Oxv9FI0yqdG2Xxj/wi1DlyyL3z7oONJJKXCktO+n4favw3c/Zet zBt/YNNA2dAaPTe8dAsbrJdpBjMnp12mQ7g3FOrBZ8nh/N6tHSOYZvC+UqISvLIN5hms n/5A== X-Gm-Message-State: AOJu0YyKdWUmD7MCumQrurqReTtjVu4H2xVYrm/gIGkSJKU1Ckn7l2Xh JJEHeg5hgiAPRWxfDMoeLVqQNAEZftycQTDqLvIVcg7fIB7piNjFOc3CaP/5kMGKaSyZY9T0Pcn A X-Gm-Gg: ASbGncv2Br0J0SsLb7a+j6nyxXqF3a6X6b3kwxORHCYAz8A6HPwzQ33TML6c2emk3ge xXU6zVQBmSulMK67U5yEYO6l/BzzbsIETgkz4MUuFfCd6k+pv59STcmNWafcaV7YBguDo8V6vT4 WHhh4V8w7B60TBk/8jGP6Quk+bvEGoIBeuNcEq6tbDqMfBaPAIQTSusLKSJittc8Vq6t+4zq56D Ur1s9NWcfiJHvUc9FTGJ8n7z3y2hH7LXJk298McRxRQCKckpVMR6Isl86ul3CReGhGN0Dqnv3xb bqVTHXIy/6+Go6ugdFRYBmCeBipfo86/kV9RE+jvSHAe/6oMYZSp+0JCiSynQROZaBZKyahBGYI = X-Received: by 2002:a05:6a00:1382:b0:736:6043:69f9 with SMTP id d2e1a72fcca58-73fd8977681mr5819114b3a.19.1745618105457; Fri, 25 Apr 2025 14:55:05 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73e259414b0sm3664392b3a.48.2025.04.25.14.55.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Apr 2025 14:55:05 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 014/159] tcg/optimize: Emit add r, r, -1 in fold_setcond_tst_pow2 Date: Fri, 25 Apr 2025 14:52:28 -0700 Message-ID: <20250425215454.886111-15-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250425215454.886111-1-richard.henderson@linaro.org> References: <20250425215454.886111-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::430; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-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 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 We canonicalize subtract with constant to add with constant. Fix this missed instance. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- tcg/optimize.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tcg/optimize.c b/tcg/optimize.c index 1f6fdee734..6c7b6af624 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -2301,7 +2301,7 @@ static int fold_setcond_zmask(OptContext *ctx, TCGOp *op, bool neg) static void fold_setcond_tst_pow2(OptContext *ctx, TCGOp *op, bool neg) { - TCGOpcode sub_opc, xor_opc, neg_opc, shr_opc; + TCGOpcode xor_opc, neg_opc, shr_opc; TCGOpcode uext_opc = 0, sext_opc = 0; TCGCond cond = op->args[3]; TCGArg ret, src1, src2; @@ -2323,7 +2323,6 @@ static void fold_setcond_tst_pow2(OptContext *ctx, TCGOp *op, bool neg) switch (ctx->type) { case TCG_TYPE_I32: - sub_opc = INDEX_op_sub_i32; xor_opc = INDEX_op_xor_i32; shr_opc = INDEX_op_shr_i32; neg_opc = INDEX_op_neg_i32; @@ -2335,7 +2334,6 @@ static void fold_setcond_tst_pow2(OptContext *ctx, TCGOp *op, bool neg) } break; case TCG_TYPE_I64: - sub_opc = INDEX_op_sub_i64; xor_opc = INDEX_op_xor_i64; shr_opc = INDEX_op_shr_i64; neg_opc = INDEX_op_neg_i64; @@ -2379,10 +2377,10 @@ static void fold_setcond_tst_pow2(OptContext *ctx, TCGOp *op, bool neg) } if (neg && inv) { - op2 = opt_insert_after(ctx, op, sub_opc, 3); + op2 = opt_insert_after(ctx, op, INDEX_op_add, 3); op2->args[0] = ret; op2->args[1] = ret; - op2->args[2] = arg_new_constant(ctx, 1); + op2->args[2] = arg_new_constant(ctx, -1); } else if (inv) { op2 = opt_insert_after(ctx, op, xor_opc, 3); op2->args[0] = ret;