From patchwork Tue Dec 10 15:23:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 848754 Delivered-To: patch@linaro.org Received: by 2002:adf:ec08:0:b0:385:e875:8a9e with SMTP id x8csp384481wrn; Tue, 10 Dec 2024 07:26:33 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWEEppQ+zytaGSgAW6aVvOg1PuoZ/T087Gz6zQ/VkVeqsRlJJX2Ve31/1RbR8LSD3VLRCZL+Q==@linaro.org X-Google-Smtp-Source: AGHT+IEpd0JqJFpxEwuY9uhs7bzuwmCkHbjgtfXGvGqjXd2EdihW/LChrNteYQ+VRt0ZepMhOPUF X-Received: by 2002:a05:6214:23c5:b0:6d8:94f4:d2aa with SMTP id 6a1803df08f44-6d9212c7c70mr64447266d6.13.1733844392882; Tue, 10 Dec 2024 07:26:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1733844392; cv=none; d=google.com; s=arc-20240605; b=Fg8tSiV8fSQ/rlGswc7s7T8sQXKV/3WYEHGu9k2NPwyV32VftJ2lwwCbfmuV8vWJ2O Ba9qKqdiv6hRd9pl5V33ddb9ei/TgMLHPkbJzUdGHF60uURRHCoD5k1XVSADzTD9KaTB 3Th7o0lJuRCEb8jRfUoh39kRu01b3UK3OIPuAajf/V2RG2vk9NoqBx/N4qtb7F6rXIhk Q/dnxRQTbolqsMQNDNRJulFtChRwxLgkzr2MI4knTiCvnwYbyJ28Wq3IHMX0N+NtHtyS ZF2dePUQuRk85EupOmgtj4Az4jk1L8IrPFadn6D4N4cK73J46jAawxJ15fAvFUxu6ZKS vByw== 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:to:from :dkim-signature; bh=puElikFFzv1lK2CkoPetqFbU1n+Bskb4VdjdC5Y/jYk=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=PtX1L7p85EkXhlE9QUdhUh5ZnFRBWHaR9Xhj9xBTZtETpIip67z+13/FD5+MfL+z2p Jz1/wouwUTUHmvlF+3a7X3/wuDsRb6JNIobKNiCxw15bfj9IDTjSY99Eg5Dgz5gmA1tT /BC27u3ZiItcIlIs5mixy2cwNolr1HY1wUYl4XMajuaZO2LiULBm5L+ZASg6IT+pN9iy 9I10rRtQHZwurCjuDglHwkzLixdtyM+NTRmuyvCn1Nxyf+9DXlNimSI1CZFlXtH7ZVQx 0nh4cLEL6wknpiZB2QoEGtkjsqnQk/CIF9R3ciKOKsXB7QO4n10uYLboJOBgeAOHyBmH eUBQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="T4YtC8/j"; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral 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-6d8dac29c0asi16911526d6.491.2024.12.10.07.26.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Dec 2024 07:26:32 -0800 (PST) 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=pass header.i=@linaro.org header.s=google header.b="T4YtC8/j"; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral 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 1tL26r-0004yI-UO; Tue, 10 Dec 2024 10:25:15 -0500 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 1tL26c-0004lP-E4 for qemu-devel@nongnu.org; Tue, 10 Dec 2024 10:24:58 -0500 Received: from mail-oi1-x232.google.com ([2607:f8b0:4864:20::232]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tL26a-0008Qd-RJ for qemu-devel@nongnu.org; Tue, 10 Dec 2024 10:24:58 -0500 Received: by mail-oi1-x232.google.com with SMTP id 5614622812f47-3eb3c143727so1239354b6e.1 for ; Tue, 10 Dec 2024 07:24:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1733844296; x=1734449096; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=puElikFFzv1lK2CkoPetqFbU1n+Bskb4VdjdC5Y/jYk=; b=T4YtC8/jEyAHGxS7iGqnX5s/QTMvFk6fH7QFS83DEd6Y4RVvKuz7/xT9uggyJdI5+i 6wgtFEdSdDLAy7yjvM+TmF58XvaYItma3vkZvBDo/rlvRteh4ZJN8fq61Qtf/bd8U0aS ktyvDzruFNXBe4iPproYj7AFEF+LVqbiW+hKo7G30G0o5OXorqSMzo9312oDaV1EhMGf jfucXXlJO0hvO1WbS2bX5DrLGW9j+nuSw2NFJJNzY+nt3MkLWPe5eGHLREL8dENvd0bA KyfpBZflVuCYIZ3DzGXj6aBqH+cpa3NhRpbKGD79WnmPfmHHjXQf5sB577tNB3cUMLZF T9FQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733844296; x=1734449096; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=puElikFFzv1lK2CkoPetqFbU1n+Bskb4VdjdC5Y/jYk=; b=grwGW26e53QpDGtvsh2uEuiQ0jetWRu0WIg5WGAZ2yiPZJrZr4MDOjJ/5oI07BK70S dgR8MT6tJP2Xw68gse8unR6g4oUrMyOYVYBRV5oYBHWVSE6lNrfZULkdN0iMW7AnukX3 HnR3uzbK/HA6haeAA3yO5pmeBvVdRJG4u1Aj4wzsE5gOISsoxBGVOpFRaN3I981bKM8D L9xwuw0+DY0E8azdNVstGpqp6R1EHD893CfNuI0op5ALYlWVrKZgJWWbJqAXIfO+/iY3 SI7NWZXNA0tkvhMdcMiBGCjJzrtsQSYmpOvehVNBq6twoweRzZTvZ/f/zLK5wSSs+xDa PD1g== X-Gm-Message-State: AOJu0YxCc59DDuwczOQmvqO3gd2rT3QBjZ4EsAbT0RES7tGtvanq1bVd vpJ3zjq5KVKnJTzBpk1iufyt61DBo5EI8VfYpWG5/7rtcL4Am1yYUnWkfXoynrkwqZhuEJyij4w 8d+4Oed+s X-Gm-Gg: ASbGncvdsJuW+WdbvmISeLaCSOWUbu5knTu0cnaSPCWDiMi/RvvCTZULlbK0/6NCsb+ yKQyPPE9nHILXtgEiqNJAOreQ2QfskrIFOY/Q75FHvcaQz86Jl9v1Zc3st0o6+yt6Qudtmjqs6f kSeMByzgeBEFLGNwas0vNeTj6cezFAvylRd4TSuUoyCc5b8wKDshOAOpkkzgQowrVrHxgo23olP q8UFs0zaobFd4NPMqIViMUBDJ0sUlvRXSdddMPWxYTBtl5CiRIlbci/NfRVUA== X-Received: by 2002:a05:6808:1b2b:b0:3e6:22d4:d2c8 with SMTP id 5614622812f47-3eb6b8c19bfmr2326781b6e.12.1733844295761; Tue, 10 Dec 2024 07:24:55 -0800 (PST) Received: from stoup.. ([187.217.227.247]) by smtp.gmail.com with ESMTPSA id 5614622812f47-3eb076b9168sm2776435b6e.14.2024.12.10.07.24.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Dec 2024 07:24:55 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 38/46] tcg/optimize: Use finish_folding in fold_sub, fold_sub_vec Date: Tue, 10 Dec 2024 09:23:53 -0600 Message-ID: <20241210152401.1823648-39-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241210152401.1823648-1-richard.henderson@linaro.org> References: <20241210152401.1823648-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::232; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x232.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 Duplicate fold_sub_vec into fold_sub instead of calling it, now that fold_sub_vec always returns true. Signed-off-by: Richard Henderson --- tcg/optimize.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tcg/optimize.c b/tcg/optimize.c index bec5a07288..6412d5df37 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -2606,12 +2606,15 @@ static bool fold_sub_vec(OptContext *ctx, TCGOp *op) fold_sub_to_neg(ctx, op)) { return true; } - return false; + return finish_folding(ctx, op); } static bool fold_sub(OptContext *ctx, TCGOp *op) { - if (fold_const2(ctx, op) || fold_sub_vec(ctx, op)) { + if (fold_const2(ctx, op) || + fold_xx_to_i(ctx, op, 0) || + fold_xi_to_x(ctx, op, 0) || + fold_sub_to_neg(ctx, op)) { return true; } @@ -2623,7 +2626,7 @@ static bool fold_sub(OptContext *ctx, TCGOp *op) ? INDEX_op_add_i32 : INDEX_op_add_i64); op->args[2] = arg_new_constant(ctx, -val); } - return false; + return finish_folding(ctx, op); } static bool fold_sub2(OptContext *ctx, TCGOp *op)