From patchwork Fri Oct 29 04:32:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 516412 Delivered-To: patch@linaro.org Received: by 2002:ad5:5208:0:0:0:0:0 with SMTP id p8csp410500iml; Thu, 28 Oct 2021 22:06:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwJdEtondd0PFuZ8MGZK8a3LVVAsPoBLL+OkqoclHLWUryM24OaKYFeCV2wwHaL2MtkesT1 X-Received: by 2002:a05:6830:2a8c:: with SMTP id s12mr7122294otu.322.1635484005489; Thu, 28 Oct 2021 22:06:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635484005; cv=none; d=google.com; s=arc-20160816; b=gc88mzv7MzOcTB/DvCeOZ5BwVdzfV3TwW32cSfT+o5XZmhzYhQX6PwPqC4MH/jKw09 vLNGzSilAJzgxg1MHuCKgm7mCwbHB/e4V1oarDLvtX7vTiW9X76oy4ouhkS94cWgV/kg VGeMjWFXH158tOTnbiqQszQo9bvgalmwoBTjFcdOCnwoKa2UH4d+C8Eadf7gWhp4DrYO UE8+4ntCG3o91lIduAWYUj7VNJoVzFY+InpWtFTjIunJQ/E54BL0tHv0cvwwfLgrcYgh Dcc3dmq35BfwToFIDUYPxHiIUOKh997RlUtEjNQjZ+KGh0wQsAYk57Rq6GHn+oyW36G3 +BQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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=OJWu7yUFUqO6SxASLIr2hIPwbeHCDr8GBSl6LyJ/KfE=; b=VcF/XooUuDAbID/FFJpZzLPz1wU2y8VRoYtxG7ajhOlSa8dTZR4pbJcSKPd+AM93ZL xvsGBfF4kLiXkXdDxZAmuzrvp0Ihe71ocM8fR1b/f78K+2m2f9HkqttYrXaDTLBVo7Rv tkKhuLsRHv6O6WVMqkFOhEApwGwH9dysnQ4hYzREqGe3UvWE52MscCyrfO49h3CIRyOY sJPtcD+j2Uh0F3FL3Cj+jid6bvpOaJLgoQRaL1AJw34WtkoK5foy4c3SJeoEVlkV8n3w GeNRGEm7fTGyF/QIUkSFN7hKTfY+tFGh7jPwPq0wumLiL9scpw2RfkU5ljFbbMSskEk9 xn0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="jO+/9isJ"; 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 h9si5198881oof.47.2021.10.28.22.06.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Oct 2021 22:06:45 -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="jO+/9isJ"; 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]:56582 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mgK6G-0001f0-OE for patch@linaro.org; Fri, 29 Oct 2021 01:06:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51380) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgJaZ-0004aH-9Y for qemu-devel@nongnu.org; Fri, 29 Oct 2021 00:33:59 -0400 Received: from mail-pj1-x1030.google.com ([2607:f8b0:4864:20::1030]:34456) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mgJaX-0007zB-CQ for qemu-devel@nongnu.org; Fri, 29 Oct 2021 00:33:58 -0400 Received: by mail-pj1-x1030.google.com with SMTP id q2-20020a17090a2e0200b001a0fd4efd49so6616933pjd.1 for ; Thu, 28 Oct 2021 21:33:56 -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=OJWu7yUFUqO6SxASLIr2hIPwbeHCDr8GBSl6LyJ/KfE=; b=jO+/9isJq6dYfWURX+pnHUbSi0RnNmvqMczJZhrAhCzeRie279kgaAp4Q1/oQVZjvv 8LlRAvKQNVUHNjB6dU/Us/sWqgZDI6u+K+vE3rlf5X48sfbl2RCL+kYZRyym4Pwe8FTm RKIK3BD+S53MW9NMSchq1wPI1yShg0P3mxG7TtgY1RT+1PH0jBuQXB0qiG6TvELbovf8 nM7NFN2E0rA752v4OUTqyiTsAgtIUDrZDS1na9bxtrl4klb8UeJml4KQIHVTt1b4oOSb qa1UhduuodN7TFslRRV17tw6w830FwIH+48QESysLU1M226TTiIdaLivi/UNduP7g0or 2wPQ== 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=OJWu7yUFUqO6SxASLIr2hIPwbeHCDr8GBSl6LyJ/KfE=; b=r0gmAPlm7YzZSobIlv/IQg2IqJoFbl2xLYKtmh5o8ad91LPkcSPFxpLo8wLDHslrsp fdVY24XajiVKk3XgOFu3Ri4COxzEYvp3mRyi2Y+SM73eiInrKExtOR0IyQO1hq8/eC2E U32s37EwDg5uFV6rP0RpYe73tXcKcJz7LH81Cx9Nto1tcK/eO/ZYQeI5JQJeyvKk10/x Kn2V5U62u1WxPMY+VA68OBRhZjua8WOonDEqrL/HXMc05b5dFMDOKjtAqBGHxY3WLNNK Ov1RvtIf3ThkBN84J1J0oLTno/sFCZDtVbp3K+T5XEXz/aAuABQPzSI9Tm7DB0oKrFIc ajhw== X-Gm-Message-State: AOAM532929DS9YEiewwMfQojbBPKFB+EjHoLl6pPwB8+3nnXIzJGC1L7 9YYJOzfKvFGnx3Mu1joXbTkM3Sx/BDpSoA== X-Received: by 2002:a17:902:d395:b0:141:a913:1920 with SMTP id e21-20020a170902d39500b00141a9131920mr2390351pld.81.1635482036041; Thu, 28 Oct 2021 21:33:56 -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.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 21:33:55 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL v2 30/60] tcg/optimize: Split out fold_deposit Date: Thu, 28 Oct 2021 21:32:59 -0700 Message-Id: <20211029043329.1518029-31-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 Received-SPF: pass client-ip=2607:f8b0:4864:20::1030; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1030.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_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Luis Pires Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- tcg/optimize.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) -- 2.25.1 diff --git a/tcg/optimize.c b/tcg/optimize.c index 3bd5f043c8..2c57d08760 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -878,6 +878,18 @@ static bool fold_ctpop(OptContext *ctx, TCGOp *op) return fold_const1(ctx, op); } +static bool fold_deposit(OptContext *ctx, TCGOp *op) +{ + if (arg_is_const(op->args[1]) && arg_is_const(op->args[2])) { + uint64_t t1 = arg_info(op->args[1])->val; + uint64_t t2 = arg_info(op->args[2])->val; + + t1 = deposit64(t1, op->args[3], op->args[4], t2); + return tcg_opt_gen_movi(ctx, op, op->args[0], t1); + } + return false; +} + static bool fold_divide(OptContext *ctx, TCGOp *op) { return fold_const2(ctx, op); @@ -1741,16 +1753,6 @@ void tcg_optimize(TCGContext *s) } break; - CASE_OP_32_64(deposit): - if (arg_is_const(op->args[1]) && arg_is_const(op->args[2])) { - tmp = deposit64(arg_info(op->args[1])->val, - op->args[3], op->args[4], - arg_info(op->args[2])->val); - tcg_opt_gen_movi(&ctx, op, op->args[0], tmp); - continue; - } - break; - default: break; @@ -1778,6 +1780,9 @@ void tcg_optimize(TCGContext *s) CASE_OP_32_64(ctpop): done = fold_ctpop(&ctx, op); break; + CASE_OP_32_64(deposit): + done = fold_deposit(&ctx, op); + break; CASE_OP_32_64(div): CASE_OP_32_64(divu): done = fold_divide(&ctx, op);