From patchwork Thu Oct 21 21:04: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: 516075 Delivered-To: patch@linaro.org Received: by 2002:ac0:bf50:0:0:0:0:0 with SMTP id o16csp331770imj; Thu, 21 Oct 2021 14:15:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxnKK9eshkAk56fxKjQjBbV9/x2RkhcJp/Gew6lImIlfaZm1zSCyryEalIY4wwTc2IDSvWP X-Received: by 2002:aca:310e:: with SMTP id x14mr6113650oix.2.1634850912279; Thu, 21 Oct 2021 14:15:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634850912; cv=none; d=google.com; s=arc-20160816; b=GDM1csiO0DwV+WceS7pv0WNcPTgv8hpuZWcQJDsxVgJW61cypWdqd0C9Qx39RXC/Sz ZNCVsbqZiRS6eZkv9t34jT83I6hQsAorpxJWouNsv4ksKQic7vd1+IbiKWuNWwjjBdlS W1hSQvFqqjSSzRlrRP3su9tWr0WLK7N1QF9ZxI4gyYcymuIYaucS1SRcT71FR5Vakvs8 XGo5QgEOQf3N1vzSM8nk++gNu5mhIx1uFnOmNkeJU791Kuizq2goZu7A/xSw2m0dvr84 MYU1VVlKnCYg5l57dJ9BAoySPVKl5G4NRt0Q8AB226KsEGVEa/BmUjVJxq/TNweyt2ZS vgNA== 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=qA2L+rswn0bgEtnoIqL3DIT4FMCOfg4+ksSKsYoClOk=; b=pI81DTl3kMdKQ7kZtAdzWLy/nLyA5cKd0hDo6KdNluJ9qYqmaxCN5sSFyaBpLltblQ ZAN5UTWEMt9hz4lFUbjOFD2acbqnG1CglV6oJg6lV01EvqtzJKslhJsRlW3QkUYcMNhd j8ruZ0oPmRi0RhWzEatH2H2nWxLAHQNw29KHrsoDeNNxUqwb7v7+gOFxZI1uqL5bKIXX sDcxoRjbDXHQ+SbRJdbnu6jXtL9QTe2SlDNlwSnTv6r9RjPhTovPdqwp/YT9Jdqev72E MzuBCXiKiL/KcXUbrGiZeqrMMnumxD4enKdT/p0ePuinqn5UWDg7PHHr44bqMdEAAAOp 41vw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=NeP2VIx5; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id l7si9622751otv.258.2021.10.21.14.15.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 21 Oct 2021 14:15:12 -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=NeP2VIx5; 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 Received: from localhost ([::1]:34046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mdfP5-0002IN-HT for patch@linaro.org; Thu, 21 Oct 2021 17:15:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48242) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mdfG2-0007NQ-Sf for qemu-devel@nongnu.org; Thu, 21 Oct 2021 17:05:52 -0400 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]:36676) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mdfFz-0004BK-VV for qemu-devel@nongnu.org; Thu, 21 Oct 2021 17:05:50 -0400 Received: by mail-pf1-x436.google.com with SMTP id m26so1766613pff.3 for ; Thu, 21 Oct 2021 14:05:47 -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=qA2L+rswn0bgEtnoIqL3DIT4FMCOfg4+ksSKsYoClOk=; b=NeP2VIx5P0cmOxCWI+PLloHnu+FbcZF9CVoTbN66ltTpTCRwxpuynNZ8ihl/1ow7WM rFYoNYAQBgYn4ZucxHeyU7MNcOqx9pL5nYJ03jVJ3wNae59xAMZOv0oaoIogj3834cVc ftvcbpd5duiCnjRA5UBaqCnolP3vyckKBwJ3hIZxq6gTD6y0RqYZaCs5jWZXqiSkgo3o S3jpZ0dn7VrUJV+zF+bsGNu9kFgEMDYgoiyaqQIjU6JxNWl7o7wQLY6tIKfNYbHg8+2z 3cJOJBgiCHsrW2XOQwAHFplxZhX3HtzWLXohGg6hQuHjXty4Ze6g3xg8QVeFCAoZ6pRP 8LMQ== 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=qA2L+rswn0bgEtnoIqL3DIT4FMCOfg4+ksSKsYoClOk=; b=nlmLGAIqVLw6sjL4zQSS7ABf5KgO+cPkziiCUZBhQrnIZRfVHSTFYMG4ftgjvRNYO1 iTnpA9Iypj/6OHDQ+00LglpTBawYQYiCdmeVQd7OdOGgEfrXL8YhuAOhYlMoPxmrAWur CHhqHWGB2/EWfZ2WE6WwlnZUaJ+nDv5DIBkHTRAvAnoTkG5MNtMtEwpW1Mt+YpyRdmcy 3PDmXZM53/HGR5gb40RhaJUO0JkM62BNBAJA02sdXupSKmcQmNjl3opF8qLsut37JOE7 LQCOjG+YTUz7ifYNb5RKJFonDvvt0sAnT+BFSoERVTr9EZSx6m3OD7QdjjS31RGPzKI3 673g== X-Gm-Message-State: AOAM533FD6YMyiydguwmXePEJ4NtxQqEMbwv0H0PqknTlFWFsbHn5qbj k+CkjRpRXNanmaFVy891V+qzRi31vGVbSw== X-Received: by 2002:a62:7506:0:b0:44c:efe8:4167 with SMTP id q6-20020a627506000000b0044cefe84167mr8295959pfc.59.1634850346458; Thu, 21 Oct 2021 14:05:46 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id g7sm5981670pgp.17.2021.10.21.14.05.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Oct 2021 14:05:46 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 08/48] tcg/optimize: Split out fold_call Date: Thu, 21 Oct 2021 14:04:59 -0700 Message-Id: <20211021210539.825582-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211021210539.825582-1-richard.henderson@linaro.org> References: <20211021210539.825582-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::436; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x436.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@eldorado.org.br, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Calls are special in that they have a variable number of arguments, and need to be able to clobber globals. Reviewed-by: Alex Bennée Reviewed-by: Luis Pires Signed-off-by: Richard Henderson --- tcg/optimize.c | 63 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 41 insertions(+), 22 deletions(-) -- 2.25.1 diff --git a/tcg/optimize.c b/tcg/optimize.c index fad6f5de1f..74b9aa025a 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -624,10 +624,42 @@ static void copy_propagate(OptContext *ctx, TCGOp *op, } } +static bool fold_call(OptContext *ctx, TCGOp *op) +{ + TCGContext *s = ctx->tcg; + int nb_oargs = TCGOP_CALLO(op); + int nb_iargs = TCGOP_CALLI(op); + int flags, i; + + init_arguments(ctx, op, nb_oargs + nb_iargs); + copy_propagate(ctx, op, nb_oargs, nb_iargs); + + /* If the function reads or writes globals, reset temp data. */ + flags = tcg_call_flags(op); + if (!(flags & (TCG_CALL_NO_READ_GLOBALS | TCG_CALL_NO_WRITE_GLOBALS))) { + int nb_globals = s->nb_globals; + + for (i = 0; i < nb_globals; i++) { + if (test_bit(i, ctx->temps_used.l)) { + reset_ts(&ctx->tcg->temps[i]); + } + } + } + + /* Reset temp data for outputs. */ + for (i = 0; i < nb_oargs; i++) { + reset_temp(op->args[i]); + } + + /* Stop optimizing MB across calls. */ + ctx->prev_mb = NULL; + return true; +} + /* Propagate constants and copies, fold constant expressions. */ void tcg_optimize(TCGContext *s) { - int nb_temps, nb_globals, i; + int nb_temps, i; TCGOp *op, *op_next; OptContext ctx = { .tcg = s }; @@ -637,8 +669,6 @@ void tcg_optimize(TCGContext *s) available through the doubly linked circular list. */ nb_temps = s->nb_temps; - nb_globals = s->nb_globals; - for (i = 0; i < nb_temps; ++i) { s->temps[i].state_ptr = NULL; } @@ -647,17 +677,17 @@ void tcg_optimize(TCGContext *s) uint64_t z_mask, partmask, affected, tmp; int nb_oargs, nb_iargs; TCGOpcode opc = op->opc; - const TCGOpDef *def = &tcg_op_defs[opc]; + const TCGOpDef *def; - /* Count the arguments, and initialize the temps that are - going to be used */ + /* Calls are special. */ if (opc == INDEX_op_call) { - nb_oargs = TCGOP_CALLO(op); - nb_iargs = TCGOP_CALLI(op); - } else { - nb_oargs = def->nb_oargs; - nb_iargs = def->nb_iargs; + fold_call(&ctx, op); + continue; } + + def = &tcg_op_defs[opc]; + nb_oargs = def->nb_oargs; + nb_iargs = def->nb_iargs; init_arguments(&ctx, op, nb_oargs + nb_iargs); copy_propagate(&ctx, op, nb_oargs, nb_iargs); @@ -1549,16 +1579,6 @@ void tcg_optimize(TCGContext *s) if (def->flags & TCG_OPF_BB_END) { memset(&ctx.temps_used, 0, sizeof(ctx.temps_used)); } else { - if (opc == INDEX_op_call && - !(tcg_call_flags(op) - & (TCG_CALL_NO_READ_GLOBALS | TCG_CALL_NO_WRITE_GLOBALS))) { - for (i = 0; i < nb_globals; i++) { - if (test_bit(i, ctx.temps_used.l)) { - reset_ts(&s->temps[i]); - } - } - } - for (i = 0; i < nb_oargs; i++) { reset_temp(op->args[i]); /* Save the corresponding known-zero bits mask for the @@ -1599,7 +1619,6 @@ void tcg_optimize(TCGContext *s) case INDEX_op_qemu_st_i32: case INDEX_op_qemu_st8_i32: case INDEX_op_qemu_st_i64: - case INDEX_op_call: /* Opcodes that touch guest memory stop the optimization. */ ctx.prev_mb = NULL; break;