From patchwork Thu Oct 26 00:13:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 738184 Delivered-To: patch@linaro.org Received: by 2002:adf:f842:0:b0:32d:baff:b0ca with SMTP id d2csp552158wrq; Wed, 25 Oct 2023 17:17:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHTo9Pl7WRtHMkqYzKn3CYG0asvsk9GpmZKAPDdwaqj8kP0lwZ7Q+7m9s/uD837I/kQy0CG X-Received: by 2002:a05:651c:1541:b0:2c5:2fa8:716a with SMTP id y1-20020a05651c154100b002c52fa8716amr17542307ljp.9.1698279456446; Wed, 25 Oct 2023 17:17:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698279456; cv=none; d=google.com; s=arc-20160816; b=BBEy/MRGU6vQ6cgPIyzPNI1HPJ9H61aASf8VvdR2oQuNMvgKZcdDPNeIXXet+zhknu T3csnch+EDVBU+yarJdULEhe+KEm0pnd7lkujuE4dWjP/Ou/c8moqzG7T1RN2WkM4l7S rSaMbdV8wfCO2ODmnOtPPeV6uay8a4xWgzfxijkiVt+0PvE2i6FWHSSQ7QKEf4LIp3K0 9WpbGlvnJf2se0RvbH+WkjKtDB8ogWoN+UBHCHGvBw/Gb5w2svHr3nbv+Y1A32w1Mt1O jMit7S8G92DIOi9fLDeZ2i9C+qldSLlzO/k6drReh3bpU/nUcylFA+RTGj/d9G4T1/ba JzUA== 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:to:from :dkim-signature; bh=9eXocbu34bghBLrSPFKvIsugn7thygfTREC245booiE=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=naGbTXYzfP9mIqZUFuqs3XkL6gLCpofbMzDuMSnI6vJJIIZUXOR/aL2it3LpbgkfHI YqTLaCeq+GV3V+6HqT4/uZeDQ5wEr/Ag9rpZAw95lX16s5oHB5Qse1WiTeA7UJa1CAan sxj15oXtEJYS16WwnedfRAAKYlG9wEYycqfJX/5FyZPGCa6IelUL+zFPkKcysCYAV+ek K+RPa5RvxWfXV/PpdsvdQWdFrmW305XHaOHmPKjVYzRB3+11Bn+Dv9aza5gNizZpIk5k 2rc9CPDecorq3vcMN0CeoDFGS/7FIfYlvT0ae+o/VBN5P9dei7B8ge1G9OLFoG3Py/LK p5IQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ViFPoTpY; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p33-20020a05600c1da100b0040674f9f514si774780wms.64.2023.10.25.17.17.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Oct 2023 17:17:36 -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=pass header.i=@linaro.org header.s=google header.b=ViFPoTpY; 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 Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qvo2q-00074U-0k; Wed, 25 Oct 2023 20:16:16 -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 1qvo2g-0006zb-V8 for qemu-devel@nongnu.org; Wed, 25 Oct 2023 20:16:07 -0400 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qvo2S-0004po-2I for qemu-devel@nongnu.org; Wed, 25 Oct 2023 20:16:05 -0400 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-1caa7597af9so2153765ad.1 for ; Wed, 25 Oct 2023 17:15:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698279349; x=1698884149; 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=9eXocbu34bghBLrSPFKvIsugn7thygfTREC245booiE=; b=ViFPoTpYbs8TzCeDyeQsbyRwCeKZfUkn+Wue5Tzr/LderAgydYhYiw1BdYQu1qYS6n hBFbb6M/lqMQGPyNWDHgIYr/cfz9mJbQwRWs3+JcvQfZ7f6oOjootgdvAfpIQ4CoMDgJ 2hMRglDA+515UftG6PPJU4iIyPIJHxruCQxhdC1U58uDaRn3prcZM1nLQ6SECx6LtvTe JAz7jkMEhtIBiOJ4/LK/sPMRPr0RXm4H7feROP6/ZEq2KXNc+LjdvOorGRG8Sw+A1oOs mY1N2FF3u4/jUwQYzZ2VcDFBRlWivVHP9XQ48cUKq0GLCrYv/WTE4jgi5lKQEWs2Cxhn gDIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698279349; x=1698884149; 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=9eXocbu34bghBLrSPFKvIsugn7thygfTREC245booiE=; b=LBa4OLcaE5BFFV/xGVVkwOyrh+LoToGFiEtN/ZIEMwY3GeF+6Z4UMJzWdKISC+gz9F F228i2e//MwjJNX2tkK+m2jPrvnsv0VvN8BbTpBtgYuJB8IslKf77WoVERHM6NCogZDe ZDKMaNBg/kqTt7WhivOl8RdC7AgxmomuI39wueTBM73KP14zXSiMe5kcbfuJBs+jJfnO YwEgdcAaviPM7LvKQQVMA8oC7Cygr7zBo4UjIYp/61mCIl0RVmd9dSqJmdKJ94N1Is6s ioJercjAy2iDXBjiKSieHpnoDzFnMmD6/ZGGpl9++ndpch8f81DzEu6e9Tm1rGMMKJ69 40ZQ== X-Gm-Message-State: AOJu0YwcQLDzCHX5J9donQ7bLwmw7sawuIvvmz3RfFg09q6OHKHFH5xJ N2PiOMAzyWKR4KJLSGh0kic50xN2MU3WA5jz9c8= X-Received: by 2002:a17:903:268c:b0:1c9:b207:d40b with SMTP id jf12-20020a170903268c00b001c9b207d40bmr13726537plb.38.1698279349169; Wed, 25 Oct 2023 17:15:49 -0700 (PDT) Received: from stoup.. ([71.212.149.95]) by smtp.gmail.com with ESMTPSA id ij23-20020a170902ab5700b001c582de968dsm10038433plb.72.2023.10.25.17.15.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 17:15:48 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 03/29] tcg/optimize: Split out do_constant_folding_cond1 Date: Wed, 25 Oct 2023 17:13:45 -0700 Message-Id: <20231026001542.1141412-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231026001542.1141412-1-richard.henderson@linaro.org> References: <20231026001542.1141412-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62b; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62b.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 Handle modifications to the arguments and condition in a single place. Signed-off-by: Richard Henderson --- tcg/optimize.c | 57 ++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/tcg/optimize.c b/tcg/optimize.c index e8a13fedb5..89cc794d24 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -672,6 +672,23 @@ static bool swap_commutative2(TCGArg *p1, TCGArg *p2) return false; } +static int do_constant_folding_cond1(OptContext *ctx, TCGArg dest, + TCGArg *p1, TCGArg *p2, TCGArg *pcond) +{ + TCGCond cond; + bool swap; + int r; + + swap = swap_commutative(dest, p1, p2); + cond = *pcond; + if (swap) { + *pcond = cond = tcg_swap_cond(cond); + } + + r = do_constant_folding_cond(ctx->type, *p1, *p2, cond); + return r; +} + static void init_arguments(OptContext *ctx, TCGOp *op, int nb_args) { for (int i = 0; i < nb_args; i++) { @@ -1053,14 +1070,8 @@ static bool fold_andc(OptContext *ctx, TCGOp *op) static bool fold_brcond(OptContext *ctx, TCGOp *op) { - TCGCond cond = op->args[2]; - int i; - - if (swap_commutative(NO_DEST, &op->args[0], &op->args[1])) { - op->args[2] = cond = tcg_swap_cond(cond); - } - - i = do_constant_folding_cond(ctx->type, op->args[0], op->args[1], cond); + int i = do_constant_folding_cond1(ctx, NO_DEST, &op->args[0], + &op->args[1], &op->args[2]); if (i == 0) { tcg_op_remove(ctx->tcg, op); return true; @@ -1550,21 +1561,18 @@ static bool fold_mov(OptContext *ctx, TCGOp *op) static bool fold_movcond(OptContext *ctx, TCGOp *op) { - TCGCond cond = op->args[5]; int i; - if (swap_commutative(NO_DEST, &op->args[1], &op->args[2])) { - op->args[5] = cond = tcg_swap_cond(cond); - } /* * Canonicalize the "false" input reg to match the destination reg so * that the tcg backend can implement a "move if true" operation. */ if (swap_commutative(op->args[0], &op->args[4], &op->args[3])) { - op->args[5] = cond = tcg_invert_cond(cond); + op->args[5] = tcg_invert_cond(op->args[5]); } - i = do_constant_folding_cond(ctx->type, op->args[1], op->args[2], cond); + i = do_constant_folding_cond1(ctx, NO_DEST, &op->args[1], + &op->args[2], &op->args[5]); if (i >= 0) { return tcg_opt_gen_mov(ctx, op, op->args[0], op->args[4 - i]); } @@ -1578,6 +1586,7 @@ static bool fold_movcond(OptContext *ctx, TCGOp *op) uint64_t tv = arg_info(op->args[3])->val; uint64_t fv = arg_info(op->args[4])->val; TCGOpcode opc, negopc = 0; + TCGCond cond = op->args[5]; switch (ctx->type) { case TCG_TYPE_I32: @@ -1805,14 +1814,8 @@ static bool fold_remainder(OptContext *ctx, TCGOp *op) static bool fold_setcond(OptContext *ctx, TCGOp *op) { - TCGCond cond = op->args[3]; - int i; - - if (swap_commutative(op->args[0], &op->args[1], &op->args[2])) { - op->args[3] = cond = tcg_swap_cond(cond); - } - - i = do_constant_folding_cond(ctx->type, op->args[1], op->args[2], cond); + int i = do_constant_folding_cond1(ctx, op->args[0], &op->args[1], + &op->args[2], &op->args[3]); if (i >= 0) { return tcg_opt_gen_movi(ctx, op, op->args[0], i); } @@ -1824,14 +1827,8 @@ static bool fold_setcond(OptContext *ctx, TCGOp *op) static bool fold_negsetcond(OptContext *ctx, TCGOp *op) { - TCGCond cond = op->args[3]; - int i; - - if (swap_commutative(op->args[0], &op->args[1], &op->args[2])) { - op->args[3] = cond = tcg_swap_cond(cond); - } - - i = do_constant_folding_cond(ctx->type, op->args[1], op->args[2], cond); + int i = do_constant_folding_cond1(ctx, op->args[0], &op->args[1], + &op->args[2], &op->args[3]); if (i >= 0) { return tcg_opt_gen_movi(ctx, op, op->args[0], -i); }