From patchwork Tue Apr 15 19:22:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 881225 Delivered-To: patch@linaro.org Received: by 2002:adf:f902:0:b0:38f:210b:807b with SMTP id b2csp623948wrr; Tue, 15 Apr 2025 12:29:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVOBBoKgGKkyTIQNBrlUiAlUA/+Tyl99FYVs8zlkDkm7EIH0QqNXtLT8b2Nw9jigKVgwERnwA==@linaro.org X-Google-Smtp-Source: AGHT+IHO6wF5msoQT2RuUbbRROK8idaCRq+jlyw3mSt5iIoIO8HkgTkT/kTRGmt5vxKK03cFRJcp X-Received: by 2002:a05:6214:f6c:b0:6d4:dae:6250 with SMTP id 6a1803df08f44-6f2ad9e17b4mr12617786d6.34.1744745386503; Tue, 15 Apr 2025 12:29:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744745386; cv=none; d=google.com; s=arc-20240605; b=Le+b24UjzTc9vdWCYng6ukv68eIVTL40/qMN8OWYdiL547+7D8alPQaGrqQeFD71qc C3FHHH158l6xiLOyU5zG1HTGS3svAR8Njsm37C4JDE/1t1hn/p8tCjJ7VgvrtoN1rQaK jMJDt0q+X/dpMhnIrsabHBOMuvLB08NOciRbe63RHJkxr7mbR8dpyv2HxPwDzpQGTeXx tNzVy5B2jF88JhLAspYtUekg4b9Npra83oZ3v6LbKBIqUn6Nt31f8kC0imH9tvZ69Wxb IBjQ3MTcrTz+tuYeCuawlbaCxOI9/9UT0DiPqSh9H5mg/oUoKAH3gnCPadfMwxES92S8 y4cQ== 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=e3efgV/pEu80aXE8j5/SUl3haOtWo5u+W7F4cNHVCaw=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=Fn5XwHS0I2LeKdADqkYw0DOq81zOgGoEtWftEUE3a8a7mG1XWCoJ/1k6lcW/X3Uizh iqZ2mCPHPE/QYnV6ASjJ+OpUkNwyqi2UZeUzUCGRQykzxncsRu+DPv+0BlGXQMIpVWUP 6oC0iXlXe6enW8fpU/r7bFV42XmJRHtL6nLGUmtQVsoms8OqggIJ31pXtWVR8gZvAjgV vSPTbMbJ4fXaXyrN8RMcE5UKMgzu0fYHjLhWQqDvc/7xmQPYFCxVLfCFlksyWQB4JGIC ExL09PUQpr9oSKFXBqAzeX6M2OZ505QJNnQG7EpTKjTPHPtm8pG/HQmoJLcpivBvk2kg iZhA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=SA0KeA4k; 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-6f0de9ecf20si136747876d6.346.2025.04.15.12.29.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 Apr 2025 12:29: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; dkim=fail header.i=@linaro.org header.s=google header.b=SA0KeA4k; 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 1u4luc-0008Uq-3C; Tue, 15 Apr 2025 15:25:38 -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 1u4luT-0008Qm-K6 for qemu-devel@nongnu.org; Tue, 15 Apr 2025 15:25:29 -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 1u4luP-0007wU-RB for qemu-devel@nongnu.org; Tue, 15 Apr 2025 15:25:27 -0400 Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-73bf1cef6ceso2715503b3a.0 for ; Tue, 15 Apr 2025 12:25:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744745124; x=1745349924; 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=e3efgV/pEu80aXE8j5/SUl3haOtWo5u+W7F4cNHVCaw=; b=SA0KeA4kUIH212msmuWsOvLD+skRRIrYDzkiXQjwXFVSMeZj5nnx3KFyv4GriLoRdm MJYtcp5crgS8G4lNscbu4l6hSNlxKWI3cEuKIHFu+n13hI6LpU2EKH5O9klj6YBg+O1x Lr0v3USDB78JXaInLk2Qs6GvKOgp8c5rcdvonF7q4j2YCmcEz1dbRF7J45Hf3Ng56yAh F+LOTvfiEsvuifYJU2EyvSMl2wp8INhqhCZak+TmxS5ZcvG2ux4aD7SfALXWQ3pK4tSg jFe2sUA/iGe+A+0rntcJcF6PM8bRg1N7rCHEqdtIlYJcgp4jW9fvJXr8RQbYKFsvhD5b 12SA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744745124; x=1745349924; 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=e3efgV/pEu80aXE8j5/SUl3haOtWo5u+W7F4cNHVCaw=; b=w+i9qLvG0mF/ewBSmRDcC51J0bWlF7zFqy+eMASyDZqImPGDzldiZCZmVB0JhgyUBz hRJC9yrb0EL5K4oDcsq5vUYe/L076okxXO0beSjK4nBgMSkTR9WsVb3Vmw7uPnQDeokC wNrnN23BeJFSIL4c3EWw25l2xtTI7qiHTLuCfbj7yHiWoP5HPDDesXB5x/rdtffQUe06 OL/AEGfE4r9d6vzd/S+jcQ05HvAYAB6a4oQr2RkVUCCwuiWdbox00BPHfgBe+iycyP51 rPFgjw+iy7RYT63aq+fdQGaE+NNj54VWpMGTAaCLXLGd7ZOF6Awzn29D812hOZvBg2p2 xxtQ== X-Gm-Message-State: AOJu0Yz5hWtbNF1erxJLTJ+TeaorhhGgHylr9FmVU/+xkkKZ3ezPbPJM yDQv0WdDkN/OiAr9A7HkL6Wnb8gyvkHBR93e7RRFqpYtCFAwiSm62iD7iipaX2/qecFLjcF0TgJ Z X-Gm-Gg: ASbGncu6bVvZeKO3hKglHmR74GCLMMyn3vZX32RZZZ40fIDfoKqOus50Oz8ga5fx++x QpnegvHEofAqx3YC5ToVslZMo0YRIFGSIwVvAdrsbwj/blJxIYvRjoTB6nEc3k+HKjEgjSbQ35y tQriGwFWqjDUEiAY7F2QI0YT32rVXkSp8i0DuZSC0pdOEdzZcCVoNh5cYVxZ160et5tcQN4dqt7 DV1vwSPdMQZZinO6wqR+63uPCsaD/l6wVjDNDBi3p1jo2G8Yd++0BIDfZTIcIuWpUwzEmtD9ER+ fYkaBQF/yTY3kQBHOrW3yKfQG855JeYjj2pb6RBDYEJfuZPQyZ9Nu/p82laRAq0+C3w0hMqxkN2 qaQe4agCzSA== X-Received: by 2002:a05:6a00:2309:b0:732:5276:4ac9 with SMTP id d2e1a72fcca58-73c1f905c9fmr758989b3a.9.1744745124178; Tue, 15 Apr 2025 12:25:24 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73bd22f82ebsm9225124b3a.92.2025.04.15.12.25.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Apr 2025 12:25:23 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v4 010/163] tcg/optimize: Emit add r, r, -1 in fold_setcond_tst_pow2 Date: Tue, 15 Apr 2025 12:22:41 -0700 Message-ID: <20250415192515.232910-11-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250415192515.232910-1-richard.henderson@linaro.org> References: <20250415192515.232910-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 0b84d97051..f0aeb10d07 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -2289,7 +2289,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; @@ -2311,7 +2311,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; @@ -2323,7 +2322,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; @@ -2367,10 +2365,10 @@ static void fold_setcond_tst_pow2(OptContext *ctx, TCGOp *op, bool neg) } if (neg && inv) { - op2 = tcg_op_insert_after(ctx->tcg, op, sub_opc, 3); + op2 = tcg_op_insert_after(ctx->tcg, 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 = tcg_op_insert_after(ctx->tcg, op, xor_opc, 3); op2->args[0] = ret;