From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Luis Pires" <luis.pires@eldorado.org.br>,
"Alex Bennée" <alex.bennee@linaro.org>
Subject: [PULL v2 09/60] tcg/optimize: Change tcg_opt_gen_{mov, movi} interface
Date: Thu, 28 Oct 2021 21:32:38 -0700 [thread overview]
Message-ID: <20211029043329.1518029-10-richard.henderson@linaro.org> (raw)
In-Reply-To: <20211029043329.1518029-1-richard.henderson@linaro.org>
Adjust the interface to take the OptContext parameter instead
of TCGContext or both.
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Luis Pires <luis.pires@eldorado.org.br>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
tcg/optimize.c | 67 +++++++++++++++++++++++++-------------------------
1 file changed, 34 insertions(+), 33 deletions(-)
diff --git a/tcg/optimize.c b/tcg/optimize.c
index a37efff4d0..627a5b39f6 100644
--- a/tcg/optimize.c
+++ b/tcg/optimize.c
@@ -45,6 +45,7 @@ typedef struct TempOptInfo {
} TempOptInfo;
typedef struct OptContext {
+ TCGContext *tcg;
TCGTempSet temps_used;
} OptContext;
@@ -183,7 +184,7 @@ static bool args_are_copies(TCGArg arg1, TCGArg arg2)
return ts_are_copies(arg_temp(arg1), arg_temp(arg2));
}
-static void tcg_opt_gen_mov(TCGContext *s, TCGOp *op, TCGArg dst, TCGArg src)
+static void tcg_opt_gen_mov(OptContext *ctx, TCGOp *op, TCGArg dst, TCGArg src)
{
TCGTemp *dst_ts = arg_temp(dst);
TCGTemp *src_ts = arg_temp(src);
@@ -194,7 +195,7 @@ static void tcg_opt_gen_mov(TCGContext *s, TCGOp *op, TCGArg dst, TCGArg src)
TCGOpcode new_op;
if (ts_are_copies(dst_ts, src_ts)) {
- tcg_op_remove(s, op);
+ tcg_op_remove(ctx->tcg, op);
return;
}
@@ -233,8 +234,8 @@ static void tcg_opt_gen_mov(TCGContext *s, TCGOp *op, TCGArg dst, TCGArg src)
}
}
-static void tcg_opt_gen_movi(TCGContext *s, OptContext *ctx,
- TCGOp *op, TCGArg dst, uint64_t val)
+static void tcg_opt_gen_movi(OptContext *ctx, TCGOp *op,
+ TCGArg dst, uint64_t val)
{
const TCGOpDef *def = &tcg_op_defs[op->opc];
TCGType type;
@@ -251,7 +252,7 @@ static void tcg_opt_gen_movi(TCGContext *s, OptContext *ctx,
/* Convert movi to mov with constant temp. */
tv = tcg_constant_internal(type, val);
init_ts_info(ctx, tv);
- tcg_opt_gen_mov(s, op, dst, temp_arg(tv));
+ tcg_opt_gen_mov(ctx, op, dst, temp_arg(tv));
}
static uint64_t do_constant_folding_2(TCGOpcode op, uint64_t x, uint64_t y)
@@ -609,7 +610,7 @@ void tcg_optimize(TCGContext *s)
{
int nb_temps, nb_globals, i;
TCGOp *op, *op_next, *prev_mb = NULL;
- OptContext ctx = {};
+ OptContext ctx = { .tcg = s };
/* Array VALS has an element for each temp.
If this temp holds a constant then its value is kept in VALS' element.
@@ -723,7 +724,7 @@ void tcg_optimize(TCGContext *s)
CASE_OP_32_64(rotr):
if (arg_is_const(op->args[1])
&& arg_info(op->args[1])->val == 0) {
- tcg_opt_gen_movi(s, &ctx, op, op->args[0], 0);
+ tcg_opt_gen_movi(&ctx, op, op->args[0], 0);
continue;
}
break;
@@ -838,7 +839,7 @@ void tcg_optimize(TCGContext *s)
if (!arg_is_const(op->args[1])
&& arg_is_const(op->args[2])
&& arg_info(op->args[2])->val == 0) {
- tcg_opt_gen_mov(s, op, op->args[0], op->args[1]);
+ tcg_opt_gen_mov(&ctx, op, op->args[0], op->args[1]);
continue;
}
break;
@@ -848,7 +849,7 @@ void tcg_optimize(TCGContext *s)
if (!arg_is_const(op->args[1])
&& arg_is_const(op->args[2])
&& arg_info(op->args[2])->val == -1) {
- tcg_opt_gen_mov(s, op, op->args[0], op->args[1]);
+ tcg_opt_gen_mov(&ctx, op, op->args[0], op->args[1]);
continue;
}
break;
@@ -1088,12 +1089,12 @@ void tcg_optimize(TCGContext *s)
if (partmask == 0) {
tcg_debug_assert(nb_oargs == 1);
- tcg_opt_gen_movi(s, &ctx, op, op->args[0], 0);
+ tcg_opt_gen_movi(&ctx, op, op->args[0], 0);
continue;
}
if (affected == 0) {
tcg_debug_assert(nb_oargs == 1);
- tcg_opt_gen_mov(s, op, op->args[0], op->args[1]);
+ tcg_opt_gen_mov(&ctx, op, op->args[0], op->args[1]);
continue;
}
@@ -1105,7 +1106,7 @@ void tcg_optimize(TCGContext *s)
CASE_OP_32_64(mulsh):
if (arg_is_const(op->args[2])
&& arg_info(op->args[2])->val == 0) {
- tcg_opt_gen_movi(s, &ctx, op, op->args[0], 0);
+ tcg_opt_gen_movi(&ctx, op, op->args[0], 0);
continue;
}
break;
@@ -1118,7 +1119,7 @@ void tcg_optimize(TCGContext *s)
CASE_OP_32_64_VEC(or):
CASE_OP_32_64_VEC(and):
if (args_are_copies(op->args[1], op->args[2])) {
- tcg_opt_gen_mov(s, op, op->args[0], op->args[1]);
+ tcg_opt_gen_mov(&ctx, op, op->args[0], op->args[1]);
continue;
}
break;
@@ -1132,7 +1133,7 @@ void tcg_optimize(TCGContext *s)
CASE_OP_32_64_VEC(sub):
CASE_OP_32_64_VEC(xor):
if (args_are_copies(op->args[1], op->args[2])) {
- tcg_opt_gen_movi(s, &ctx, op, op->args[0], 0);
+ tcg_opt_gen_movi(&ctx, op, op->args[0], 0);
continue;
}
break;
@@ -1145,14 +1146,14 @@ void tcg_optimize(TCGContext *s)
allocator where needed and possible. Also detect copies. */
switch (opc) {
CASE_OP_32_64_VEC(mov):
- tcg_opt_gen_mov(s, op, op->args[0], op->args[1]);
+ tcg_opt_gen_mov(&ctx, op, op->args[0], op->args[1]);
continue;
case INDEX_op_dup_vec:
if (arg_is_const(op->args[1])) {
tmp = arg_info(op->args[1])->val;
tmp = dup_const(TCGOP_VECE(op), tmp);
- tcg_opt_gen_movi(s, &ctx, op, op->args[0], tmp);
+ tcg_opt_gen_movi(&ctx, op, op->args[0], tmp);
continue;
}
break;
@@ -1160,7 +1161,7 @@ void tcg_optimize(TCGContext *s)
case INDEX_op_dup2_vec:
assert(TCG_TARGET_REG_BITS == 32);
if (arg_is_const(op->args[1]) && arg_is_const(op->args[2])) {
- tcg_opt_gen_movi(s, &ctx, op, op->args[0],
+ tcg_opt_gen_movi(&ctx, op, op->args[0],
deposit64(arg_info(op->args[1])->val, 32, 32,
arg_info(op->args[2])->val));
continue;
@@ -1186,7 +1187,7 @@ void tcg_optimize(TCGContext *s)
case INDEX_op_extrh_i64_i32:
if (arg_is_const(op->args[1])) {
tmp = do_constant_folding(opc, arg_info(op->args[1])->val, 0);
- tcg_opt_gen_movi(s, &ctx, op, op->args[0], tmp);
+ tcg_opt_gen_movi(&ctx, op, op->args[0], tmp);
continue;
}
break;
@@ -1197,7 +1198,7 @@ void tcg_optimize(TCGContext *s)
if (arg_is_const(op->args[1])) {
tmp = do_constant_folding(opc, arg_info(op->args[1])->val,
op->args[2]);
- tcg_opt_gen_movi(s, &ctx, op, op->args[0], tmp);
+ tcg_opt_gen_movi(&ctx, op, op->args[0], tmp);
continue;
}
break;
@@ -1227,7 +1228,7 @@ void tcg_optimize(TCGContext *s)
if (arg_is_const(op->args[1]) && arg_is_const(op->args[2])) {
tmp = do_constant_folding(opc, arg_info(op->args[1])->val,
arg_info(op->args[2])->val);
- tcg_opt_gen_movi(s, &ctx, op, op->args[0], tmp);
+ tcg_opt_gen_movi(&ctx, op, op->args[0], tmp);
continue;
}
break;
@@ -1238,9 +1239,9 @@ void tcg_optimize(TCGContext *s)
TCGArg v = arg_info(op->args[1])->val;
if (v != 0) {
tmp = do_constant_folding(opc, v, 0);
- tcg_opt_gen_movi(s, &ctx, op, op->args[0], tmp);
+ tcg_opt_gen_movi(&ctx, op, op->args[0], tmp);
} else {
- tcg_opt_gen_mov(s, op, op->args[0], op->args[2]);
+ tcg_opt_gen_mov(&ctx, op, op->args[0], op->args[2]);
}
continue;
}
@@ -1251,7 +1252,7 @@ void tcg_optimize(TCGContext *s)
tmp = deposit64(arg_info(op->args[1])->val,
op->args[3], op->args[4],
arg_info(op->args[2])->val);
- tcg_opt_gen_movi(s, &ctx, op, op->args[0], tmp);
+ tcg_opt_gen_movi(&ctx, op, op->args[0], tmp);
continue;
}
break;
@@ -1260,7 +1261,7 @@ void tcg_optimize(TCGContext *s)
if (arg_is_const(op->args[1])) {
tmp = extract64(arg_info(op->args[1])->val,
op->args[2], op->args[3]);
- tcg_opt_gen_movi(s, &ctx, op, op->args[0], tmp);
+ tcg_opt_gen_movi(&ctx, op, op->args[0], tmp);
continue;
}
break;
@@ -1269,7 +1270,7 @@ void tcg_optimize(TCGContext *s)
if (arg_is_const(op->args[1])) {
tmp = sextract64(arg_info(op->args[1])->val,
op->args[2], op->args[3]);
- tcg_opt_gen_movi(s, &ctx, op, op->args[0], tmp);
+ tcg_opt_gen_movi(&ctx, op, op->args[0], tmp);
continue;
}
break;
@@ -1286,7 +1287,7 @@ void tcg_optimize(TCGContext *s)
tmp = (int32_t)(((uint32_t)v1 >> shr) |
((uint32_t)v2 << (32 - shr)));
}
- tcg_opt_gen_movi(s, &ctx, op, op->args[0], tmp);
+ tcg_opt_gen_movi(&ctx, op, op->args[0], tmp);
continue;
}
break;
@@ -1295,7 +1296,7 @@ void tcg_optimize(TCGContext *s)
tmp = do_constant_folding_cond(opc, op->args[1],
op->args[2], op->args[3]);
if (tmp != 2) {
- tcg_opt_gen_movi(s, &ctx, op, op->args[0], tmp);
+ tcg_opt_gen_movi(&ctx, op, op->args[0], tmp);
continue;
}
break;
@@ -1319,7 +1320,7 @@ void tcg_optimize(TCGContext *s)
tmp = do_constant_folding_cond(opc, op->args[1],
op->args[2], op->args[5]);
if (tmp != 2) {
- tcg_opt_gen_mov(s, op, op->args[0], op->args[4-tmp]);
+ tcg_opt_gen_mov(&ctx, op, op->args[0], op->args[4-tmp]);
continue;
}
if (arg_is_const(op->args[3]) && arg_is_const(op->args[4])) {
@@ -1361,8 +1362,8 @@ void tcg_optimize(TCGContext *s)
rl = op->args[0];
rh = op->args[1];
- tcg_opt_gen_movi(s, &ctx, op, rl, (int32_t)a);
- tcg_opt_gen_movi(s, &ctx, op2, rh, (int32_t)(a >> 32));
+ tcg_opt_gen_movi(&ctx, op, rl, (int32_t)a);
+ tcg_opt_gen_movi(&ctx, op2, rh, (int32_t)(a >> 32));
continue;
}
break;
@@ -1377,8 +1378,8 @@ void tcg_optimize(TCGContext *s)
rl = op->args[0];
rh = op->args[1];
- tcg_opt_gen_movi(s, &ctx, op, rl, (int32_t)r);
- tcg_opt_gen_movi(s, &ctx, op2, rh, (int32_t)(r >> 32));
+ tcg_opt_gen_movi(&ctx, op, rl, (int32_t)r);
+ tcg_opt_gen_movi(&ctx, op2, rh, (int32_t)(r >> 32));
continue;
}
break;
@@ -1466,7 +1467,7 @@ void tcg_optimize(TCGContext *s)
op->args[5]);
if (tmp != 2) {
do_setcond_const:
- tcg_opt_gen_movi(s, &ctx, op, op->args[0], tmp);
+ tcg_opt_gen_movi(&ctx, op, op->args[0], tmp);
continue;
}
if ((op->args[5] == TCG_COND_LT || op->args[5] == TCG_COND_GE)
--
2.25.1
next prev parent reply other threads:[~2021-10-29 4:48 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-29 4:32 [PULL v2 00/60] tcg patch queue Richard Henderson
2021-10-29 4:32 ` [PULL v2 01/60] qemu/int128: Add int128_{not,xor} Richard Henderson
2021-10-29 4:32 ` [PULL v2 02/60] host-utils: move checks out of divu128/divs128 Richard Henderson
2021-10-29 4:32 ` [PULL v2 03/60] host-utils: move udiv_qrnnd() to host-utils Richard Henderson
2021-10-29 4:32 ` [PULL v2 04/60] host-utils: add 128-bit quotient support to divu128/divs128 Richard Henderson
2021-10-29 4:32 ` [PULL v2 05/60] host-utils: add unit tests for divu128/divs128 Richard Henderson
2021-10-29 4:32 ` [PULL v2 06/60] tcg/optimize: Rename "mask" to "z_mask" Richard Henderson
2021-10-29 4:32 ` [PULL v2 07/60] tcg/optimize: Split out OptContext Richard Henderson
2021-10-29 4:32 ` [PULL v2 08/60] tcg/optimize: Remove do_default label Richard Henderson
2021-10-29 4:32 ` Richard Henderson [this message]
2021-10-29 4:32 ` [PULL v2 10/60] tcg/optimize: Move prev_mb into OptContext Richard Henderson
2021-10-29 4:32 ` [PULL v2 11/60] tcg/optimize: Split out init_arguments Richard Henderson
2021-10-29 4:32 ` [PULL v2 12/60] tcg/optimize: Split out copy_propagate Richard Henderson
2021-10-29 4:32 ` [PULL v2 13/60] tcg/optimize: Split out fold_call Richard Henderson
2021-10-29 4:32 ` [PULL v2 14/60] tcg/optimize: Drop nb_oargs, nb_iargs locals Richard Henderson
2021-10-29 4:32 ` [PULL v2 15/60] tcg/optimize: Change fail return for do_constant_folding_cond* Richard Henderson
2021-10-29 4:32 ` [PULL v2 16/60] tcg/optimize: Return true from tcg_opt_gen_{mov, movi} Richard Henderson
2021-10-29 4:32 ` [PULL v2 17/60] tcg/optimize: Split out finish_folding Richard Henderson
2021-10-29 4:32 ` [PULL v2 18/60] tcg/optimize: Use a boolean to avoid a mass of continues Richard Henderson
2021-10-29 4:32 ` [PULL v2 19/60] tcg/optimize: Split out fold_mb, fold_qemu_{ld,st} Richard Henderson
2021-10-29 4:32 ` [PULL v2 20/60] tcg/optimize: Split out fold_const{1,2} Richard Henderson
2021-10-29 4:32 ` [PULL v2 21/60] tcg/optimize: Split out fold_setcond2 Richard Henderson
2021-10-29 4:32 ` [PULL v2 22/60] tcg/optimize: Split out fold_brcond2 Richard Henderson
2021-10-29 4:32 ` [PULL v2 23/60] tcg/optimize: Split out fold_brcond Richard Henderson
2021-10-29 4:32 ` [PULL v2 24/60] tcg/optimize: Split out fold_setcond Richard Henderson
2021-10-29 4:32 ` [PULL v2 25/60] tcg/optimize: Split out fold_mulu2_i32 Richard Henderson
2021-10-29 4:32 ` [PULL v2 26/60] tcg/optimize: Split out fold_addsub2_i32 Richard Henderson
2021-10-29 4:32 ` [PULL v2 27/60] tcg/optimize: Split out fold_movcond Richard Henderson
2021-10-29 4:32 ` [PULL v2 28/60] tcg/optimize: Split out fold_extract2 Richard Henderson
2021-11-09 16:52 ` Peter Maydell
2021-11-09 17:22 ` Richard Henderson
2021-10-29 4:32 ` [PULL v2 29/60] tcg/optimize: Split out fold_extract, fold_sextract Richard Henderson
2021-10-29 4:32 ` [PULL v2 30/60] tcg/optimize: Split out fold_deposit Richard Henderson
2021-10-29 4:33 ` [PULL v2 31/60] tcg/optimize: Split out fold_count_zeros Richard Henderson
2021-10-29 4:33 ` [PULL v2 32/60] tcg/optimize: Split out fold_bswap Richard Henderson
2021-10-29 4:33 ` [PULL v2 33/60] tcg/optimize: Split out fold_dup, fold_dup2 Richard Henderson
2021-10-29 4:33 ` [PULL v2 34/60] tcg/optimize: Split out fold_mov Richard Henderson
2021-10-29 4:33 ` [PULL v2 35/60] tcg/optimize: Split out fold_xx_to_i Richard Henderson
2021-10-29 4:33 ` [PULL v2 36/60] tcg/optimize: Split out fold_xx_to_x Richard Henderson
2021-10-29 4:33 ` [PULL v2 37/60] tcg/optimize: Split out fold_xi_to_i Richard Henderson
2021-10-29 4:33 ` [PULL v2 38/60] tcg/optimize: Add type to OptContext Richard Henderson
2021-10-29 4:33 ` [PULL v2 39/60] tcg/optimize: Split out fold_to_not Richard Henderson
2021-10-29 4:33 ` [PULL v2 40/60] tcg/optimize: Split out fold_sub_to_neg Richard Henderson
2021-10-29 4:33 ` [PULL v2 41/60] tcg/optimize: Split out fold_xi_to_x Richard Henderson
2021-10-29 4:33 ` [PULL v2 42/60] tcg/optimize: Split out fold_ix_to_i Richard Henderson
2021-10-29 4:33 ` [PULL v2 43/60] tcg/optimize: Split out fold_masks Richard Henderson
2021-10-29 4:33 ` [PULL v2 44/60] tcg/optimize: Expand fold_mulu2_i32 to all 4-arg multiplies Richard Henderson
2021-10-29 4:33 ` [PULL v2 45/60] tcg/optimize: Expand fold_addsub2_i32 to 64-bit ops Richard Henderson
2021-10-29 4:33 ` [PULL v2 46/60] tcg/optimize: Sink commutative operand swapping into fold functions Richard Henderson
2021-10-29 4:33 ` [PULL v2 47/60] tcg: Extend call args using the correct opcodes Richard Henderson
2021-10-29 4:33 ` [PULL v2 48/60] tcg/optimize: Stop forcing z_mask to "garbage" for 32-bit values Richard Henderson
2021-10-29 4:33 ` [PULL v2 49/60] tcg/optimize: Use fold_xx_to_i for orc Richard Henderson
2021-10-29 4:33 ` [PULL v2 50/60] tcg/optimize: Use fold_xi_to_x for mul Richard Henderson
2021-10-29 4:33 ` [PULL v2 51/60] tcg/optimize: Use fold_xi_to_x for div Richard Henderson
2021-10-29 4:33 ` [PULL v2 52/60] tcg/optimize: Use fold_xx_to_i for rem Richard Henderson
2021-10-29 4:33 ` [PULL v2 53/60] tcg/optimize: Optimize sign extensions Richard Henderson
2021-10-29 4:33 ` [PULL v2 54/60] tcg/optimize: Propagate sign info for logical operations Richard Henderson
2021-10-29 4:33 ` [PULL v2 55/60] tcg/optimize: Propagate sign info for setcond Richard Henderson
2021-10-29 4:33 ` [PULL v2 56/60] tcg/optimize: Propagate sign info for bit counting Richard Henderson
2021-10-29 4:33 ` [PULL v2 57/60] tcg/optimize: Propagate sign info for shifting Richard Henderson
2021-10-29 4:33 ` [PULL v2 58/60] softmmu: fix watchpoint processing in icount mode Richard Henderson
2021-10-29 4:33 ` [PULL v2 59/60] softmmu: remove useless condition in watchpoint check Richard Henderson
2021-10-29 4:33 ` [PULL v2 60/60] softmmu: fix for "after access" watchpoints Richard Henderson
2021-10-29 17:58 ` [PULL v2 00/60] tcg patch queue 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=20211029043329.1518029-10-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=alex.bennee@linaro.org \
--cc=luis.pires@eldorado.org.br \
--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).