From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PATCH v2 08/48] tcg/optimize: Split out fold_call
Date: Thu, 7 Oct 2021 12:54:16 -0700 [thread overview]
Message-ID: <20211007195456.1168070-9-richard.henderson@linaro.org> (raw)
In-Reply-To: <20211007195456.1168070-1-richard.henderson@linaro.org>
Calls are special in that they have a variable number
of arguments, and need to be able to clobber globals.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
tcg/optimize.c | 63 ++++++++++++++++++++++++++++++++------------------
1 file changed, 41 insertions(+), 22 deletions(-)
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;
--
2.25.1
next prev parent reply other threads:[~2021-10-07 20:09 UTC|newest]
Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-07 19:54 [PATCH v2 00/48] tcg: optimize redundant sign extensions Richard Henderson
2021-10-07 19:54 ` [PATCH v2 01/48] tcg/optimize: Rename "mask" to "z_mask" Richard Henderson
2021-10-19 15:23 ` Alex Bennée
2021-10-20 22:26 ` Luis Fernando Fujita Pires
2021-10-07 19:54 ` [PATCH v2 02/48] tcg/optimize: Split out OptContext Richard Henderson
2021-10-19 15:25 ` Alex Bennée
2021-10-19 15:37 ` Richard Henderson
2021-10-20 22:26 ` Luis Fernando Fujita Pires
2021-10-07 19:54 ` [PATCH v2 03/48] tcg/optimize: Remove do_default label Richard Henderson
2021-10-19 15:37 ` Alex Bennée
2021-10-20 22:26 ` Luis Fernando Fujita Pires
2021-10-07 19:54 ` [PATCH v2 04/48] tcg/optimize: Change tcg_opt_gen_{mov, movi} interface Richard Henderson
2021-10-19 15:38 ` Alex Bennée
2021-10-20 22:26 ` Luis Fernando Fujita Pires
2021-10-07 19:54 ` [PATCH v2 05/48] tcg/optimize: Move prev_mb into OptContext Richard Henderson
2021-10-19 15:44 ` Alex Bennée
2021-10-19 15:59 ` Richard Henderson
2021-10-20 22:27 ` Luis Fernando Fujita Pires
2021-10-07 19:54 ` [PATCH v2 06/48] tcg/optimize: Split out init_arguments Richard Henderson
2021-10-19 16:13 ` Alex Bennée
2021-10-20 22:27 ` Luis Fernando Fujita Pires
2021-10-07 19:54 ` [PATCH v2 07/48] tcg/optimize: Split out copy_propagate Richard Henderson
2021-10-20 16:01 ` Alex Bennée
2021-10-20 22:27 ` Luis Fernando Fujita Pires
2021-10-07 19:54 ` Richard Henderson [this message]
2021-10-20 16:05 ` [PATCH v2 08/48] tcg/optimize: Split out fold_call Alex Bennée
2021-10-21 2:04 ` Richard Henderson
2021-10-20 22:27 ` Luis Fernando Fujita Pires
2021-10-07 19:54 ` [PATCH v2 09/48] tcg/optimize: Drop nb_oargs, nb_iargs locals Richard Henderson
2021-10-20 16:17 ` Alex Bennée
2021-10-21 2:09 ` Richard Henderson
2021-10-20 22:27 ` Luis Fernando Fujita Pires
2021-10-07 19:54 ` [PATCH v2 10/48] tcg/optimize: Change fail return for do_constant_folding_cond* Richard Henderson
2021-10-20 22:27 ` Luis Fernando Fujita Pires
2021-10-07 19:54 ` [PATCH v2 11/48] tcg/optimize: Return true from tcg_opt_gen_{mov, movi} Richard Henderson
2021-10-20 22:27 ` Luis Fernando Fujita Pires
2021-10-07 19:54 ` [PATCH v2 12/48] tcg/optimize: Split out finish_folding Richard Henderson
2021-10-20 22:27 ` Luis Fernando Fujita Pires
2021-10-07 19:54 ` [PATCH v2 13/48] tcg/optimize: Use a boolean to avoid a mass of continues Richard Henderson
2021-10-20 22:27 ` Luis Fernando Fujita Pires
2021-10-07 19:54 ` [PATCH v2 14/48] tcg/optimize: Split out fold_mb, fold_qemu_{ld,st} Richard Henderson
2021-10-20 22:27 ` Luis Fernando Fujita Pires
2021-10-07 19:54 ` [PATCH v2 15/48] tcg/optimize: Split out fold_const{1,2} Richard Henderson
2021-10-20 22:27 ` Luis Fernando Fujita Pires
2021-10-07 19:54 ` [PATCH v2 16/48] tcg/optimize: Split out fold_setcond2 Richard Henderson
2021-10-20 22:27 ` Luis Fernando Fujita Pires
2021-10-07 19:54 ` [PATCH v2 17/48] tcg/optimize: Split out fold_brcond2 Richard Henderson
2021-10-20 22:27 ` Luis Fernando Fujita Pires
2021-10-21 2:32 ` Richard Henderson
2021-10-07 19:54 ` [PATCH v2 18/48] tcg/optimize: Split out fold_brcond Richard Henderson
2021-10-20 22:27 ` Luis Fernando Fujita Pires
2021-10-07 19:54 ` [PATCH v2 19/48] tcg/optimize: Split out fold_setcond Richard Henderson
2021-10-20 22:27 ` Luis Fernando Fujita Pires
2021-10-07 19:54 ` [PATCH v2 20/48] tcg/optimize: Split out fold_mulu2_i32 Richard Henderson
2021-10-07 19:54 ` [PATCH v2 21/48] tcg/optimize: Split out fold_addsub2_i32 Richard Henderson
2021-10-07 19:54 ` [PATCH v2 22/48] tcg/optimize: Split out fold_movcond Richard Henderson
2021-10-07 19:54 ` [PATCH v2 23/48] tcg/optimize: Split out fold_extract2 Richard Henderson
2021-10-07 19:54 ` [PATCH v2 24/48] tcg/optimize: Split out fold_extract, fold_sextract Richard Henderson
2021-10-07 19:54 ` [PATCH v2 25/48] tcg/optimize: Split out fold_deposit Richard Henderson
2021-10-07 19:54 ` [PATCH v2 26/48] tcg/optimize: Split out fold_count_zeros Richard Henderson
2021-10-07 19:54 ` [PATCH v2 27/48] tcg/optimize: Split out fold_bswap Richard Henderson
2021-10-07 19:54 ` [PATCH v2 28/48] tcg/optimize: Split out fold_dup, fold_dup2 Richard Henderson
2021-10-07 19:54 ` [PATCH v2 29/48] tcg/optimize: Split out fold_mov Richard Henderson
2021-10-07 19:54 ` [PATCH v2 30/48] tcg/optimize: Split out fold_xx_to_i Richard Henderson
2021-10-07 19:54 ` [PATCH v2 31/48] tcg/optimize: Split out fold_xx_to_x Richard Henderson
2021-10-07 19:54 ` [PATCH v2 32/48] tcg/optimize: Split out fold_xi_to_i Richard Henderson
2021-10-07 19:54 ` [PATCH v2 33/48] tcg/optimize: Add type to OptContext Richard Henderson
2021-10-07 19:54 ` [PATCH v2 34/48] tcg/optimize: Split out fold_to_not Richard Henderson
2021-10-07 19:54 ` [PATCH v2 35/48] tcg/optimize: Split out fold_sub_to_neg Richard Henderson
2021-10-07 19:54 ` [PATCH v2 36/48] tcg/optimize: Split out fold_xi_to_x Richard Henderson
2021-10-07 19:54 ` [PATCH v2 37/48] tcg/optimize: Split out fold_ix_to_i Richard Henderson
2021-10-07 19:54 ` [PATCH v2 38/48] tcg/optimize: Split out fold_masks Richard Henderson
2021-10-07 19:54 ` [PATCH v2 39/48] tcg/optimize: Expand fold_mulu2_i32 to all 4-arg multiplies Richard Henderson
2021-10-07 19:54 ` [PATCH v2 40/48] tcg/optimize: Expand fold_addsub2_i32 to 64-bit ops Richard Henderson
2021-10-19 15:34 ` Alex Bennée
2021-10-19 16:01 ` Richard Henderson
2021-10-07 19:54 ` [PATCH v2 41/48] tcg/optimize: Sink commutative operand swapping into fold functions Richard Henderson
2021-10-07 19:54 ` [PATCH v2 42/48] tcg/optimize: Add more simplifications for orc Richard Henderson
2021-10-07 19:54 ` [PATCH v2 43/48] tcg/optimize: Stop forcing z_mask to "garbage" for 32-bit values Richard Henderson
2021-10-07 19:54 ` [PATCH v2 44/48] tcg/optimize: Optimize sign extensions Richard Henderson
2021-10-07 19:54 ` [PATCH v2 45/48] tcg/optimize: Propagate sign info for logical operations Richard Henderson
2021-10-07 19:54 ` [PATCH v2 46/48] tcg/optimize: Propagate sign info for setcond Richard Henderson
2021-10-07 19:54 ` [PATCH v2 47/48] tcg/optimize: Propagate sign info for bit counting Richard Henderson
2021-10-07 19:54 ` [PATCH v2 48/48] tcg/optimize: Propagate sign info for shifting Richard Henderson
2021-10-15 23:41 ` [PATCH v2 00/48] tcg: optimize redundant sign extensions Richard Henderson
2021-10-20 16:13 ` Alex Bennée
2021-10-20 23:50 ` Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211007195456.1168070-9-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).