From nobody Thu Dec 18 19:37:22 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1635483256; cv=none; d=zohomail.com; s=zohoarc; b=LJIQFHhcgcSLVhbXQuKHYtKT+yn0GIFEKUdmcNFRYXtn+ex8vRV+a+bOTI8zK9uyccGcLL/1H5bzatqojC81WtPzE42WYHpbafOihft8+8fh6QOGbdqQvckNGdaniW8VA1if0wM0LGsO0LovegZG0coVtCyuNNe5lbyJKEEwSmQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635483256; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=C2TgxQz1GB819hSkndrC8NaNVJWCUo0QsMgOlWylEw4=; b=LnB3JdtJM4wGaU0sTknOUkntBPdonpAXXRkWAlW8Z8o+5Z4xxE78CkBH43lF/AwK4Yv5NdLDvEHjNDrlAuCgU1GCBMIwjM0QZelBAHsRImue8Uh2kNPs4Xj7m40Cg/oeGtdu6iEzzsVVtyb9oAaPi+rSKpVkMHSq05dG3cZ29bM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16354832564963.316954472094608; Thu, 28 Oct 2021 21:54:16 -0700 (PDT) Received: from localhost ([::1]:60234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mgJuB-0001h8-48 for importer@patchew.org; Fri, 29 Oct 2021 00:54:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51334) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgJaX-0004Qs-QU for qemu-devel@nongnu.org; Fri, 29 Oct 2021 00:33:57 -0400 Received: from mail-pg1-x529.google.com ([2607:f8b0:4864:20::529]:38537) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mgJaU-0007yc-H2 for qemu-devel@nongnu.org; Fri, 29 Oct 2021 00:33:56 -0400 Received: by mail-pg1-x529.google.com with SMTP id e65so8694283pgc.5 for ; Thu, 28 Oct 2021 21:33:54 -0700 (PDT) Received: from localhost.localdomain (174-21-75-75.tukw.qwest.net. [174.21.75.75]) by smtp.gmail.com with ESMTPSA id i11sm4120257pgp.18.2021.10.28.21.33.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 21:33:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=C2TgxQz1GB819hSkndrC8NaNVJWCUo0QsMgOlWylEw4=; b=T9Ho4vprV8lqk46ruk7+f9vKtTBcDc2LhQrOfarf7gP7IT47UorqLgIaHu+HCLm7IK 1uBK0Pk0SrJOhiySsn3hk/ih14m9S4fhiULsP8KpaTNUtfbOpcg5sNRiwZx2G/Qt7lfZ YgjKuPYLoXUdP0vD4msRuZUoqkatVrGy9j5Y5cSLE/VQPy3zUf+DPzb84HW+l596x5OS SZ3eIByNZz12uuhJvJ4w5hUrFuu+j6FnzOGO8mFIbXVgbj5X0cuvJKMOQAUJPjUH/KxN S3VNu61OqcgjA/ucfXGGSQIFhMLKXiQLXG5mDMGc0QaWxZxYtw8gzWxhUWta7g+o1ePL 2bOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=C2TgxQz1GB819hSkndrC8NaNVJWCUo0QsMgOlWylEw4=; b=h6AchHXlUB4cLU37i2BxE1sEB+FXMd21pmJKJx7YFbgz7os+0WXhd1O+f4iPGupgwu 6imVh7DH2QICbZorugp26BQH4XlMpFDKhKyS47T+TwYc5ZVsodOmWvTmzG32QLVqK0+s EHJcDYR6AkrSUhX/MPe1WuArb3LKvUXo/IpgNqKyNjcKLa8S8AgBo094CeKSqpnJnZ8O f+yXixe3IdbIGHRr/Gh4e6TLyXRMvc5RUOoM8HKGvq3P/JQGVtHepNsWPKy1EuvO5qtB dW3VJz67e6V7XUdfNr0KCgasn4JC22f64BJEW3iv5Hg6AMDyaoXq3S9MdG7Jl79J2UJl knGg== X-Gm-Message-State: AOAM530bZznPEpQ4jHvpHT+k5eg4DblPvl9KNGrMtbYQH63vH5C3QOxj uIQFyGnxrKjFrYXNf0XZB9x5r9n008F6Ow== X-Google-Smtp-Source: ABdhPJwZlNsFrwXjpL4xkOE1u2NNeyoL2J7wl/xNHQzRwNSs8We7s0YPZI5qdprfaf8A6n9n/6NxNQ== X-Received: by 2002:a62:b606:0:b0:47b:e32f:9ca with SMTP id j6-20020a62b606000000b0047be32f09camr8504925pff.57.1635482033180; Thu, 28 Oct 2021 21:33:53 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL v2 27/60] tcg/optimize: Split out fold_movcond Date: Thu, 28 Oct 2021 21:32:56 -0700 Message-Id: <20211029043329.1518029-28-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211029043329.1518029-1-richard.henderson@linaro.org> References: <20211029043329.1518029-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::529; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x529.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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Luis Pires , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1635483257877100001 Reviewed-by: Luis Pires Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- tcg/optimize.c | 56 ++++++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 25 deletions(-) diff --git a/tcg/optimize.c b/tcg/optimize.c index 9d1d045363..110b3d1cc2 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -922,6 +922,34 @@ static bool fold_mb(OptContext *ctx, TCGOp *op) return true; } =20 +static bool fold_movcond(OptContext *ctx, TCGOp *op) +{ + TCGOpcode opc =3D op->opc; + TCGCond cond =3D op->args[5]; + int i =3D do_constant_folding_cond(opc, op->args[1], op->args[2], cond= ); + + if (i >=3D 0) { + return tcg_opt_gen_mov(ctx, op, op->args[0], op->args[4 - i]); + } + + if (arg_is_const(op->args[3]) && arg_is_const(op->args[4])) { + uint64_t tv =3D arg_info(op->args[3])->val; + uint64_t fv =3D arg_info(op->args[4])->val; + + opc =3D (opc =3D=3D INDEX_op_movcond_i32 + ? INDEX_op_setcond_i32 : INDEX_op_setcond_i64); + + if (tv =3D=3D 1 && fv =3D=3D 0) { + op->opc =3D opc; + op->args[3] =3D cond; + } else if (fv =3D=3D 1 && tv =3D=3D 0) { + op->opc =3D opc; + op->args[3] =3D tcg_invert_cond(cond); + } + } + return false; +} + static bool fold_mul(OptContext *ctx, TCGOp *op) { return fold_const2(ctx, op); @@ -1715,31 +1743,6 @@ void tcg_optimize(TCGContext *s) } break; =20 - CASE_OP_32_64(movcond): - i =3D do_constant_folding_cond(opc, op->args[1], - op->args[2], op->args[5]); - if (i >=3D 0) { - tcg_opt_gen_mov(&ctx, op, op->args[0], op->args[4 - i]); - continue; - } - if (arg_is_const(op->args[3]) && arg_is_const(op->args[4])) { - uint64_t tv =3D arg_info(op->args[3])->val; - uint64_t fv =3D arg_info(op->args[4])->val; - TCGCond cond =3D op->args[5]; - - if (fv =3D=3D 1 && tv =3D=3D 0) { - cond =3D tcg_invert_cond(cond); - } else if (!(tv =3D=3D 1 && fv =3D=3D 0)) { - break; - } - op->args[3] =3D cond; - op->opc =3D opc =3D (opc =3D=3D INDEX_op_movcond_i32 - ? INDEX_op_setcond_i32 - : INDEX_op_setcond_i64); - } - break; - - default: break; =20 @@ -1791,6 +1794,9 @@ void tcg_optimize(TCGContext *s) case INDEX_op_mb: done =3D fold_mb(&ctx, op); break; + CASE_OP_32_64(movcond): + done =3D fold_movcond(&ctx, op); + break; CASE_OP_32_64(mul): done =3D fold_mul(&ctx, op); break; --=20 2.25.1