tcg/optimize: Split out arg_is_const_val

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2023-10-23 11:38:00 -07:00
parent caf3eacc8f
commit 27cdb85d06
1 changed files with 23 additions and 15 deletions

View File

@ -124,11 +124,22 @@ static inline bool ts_is_const(TCGTemp *ts)
return ts_info(ts)->is_const; return ts_info(ts)->is_const;
} }
static inline bool ts_is_const_val(TCGTemp *ts, uint64_t val)
{
TempOptInfo *ti = ts_info(ts);
return ti->is_const && ti->val == val;
}
static inline bool arg_is_const(TCGArg arg) static inline bool arg_is_const(TCGArg arg)
{ {
return ts_is_const(arg_temp(arg)); return ts_is_const(arg_temp(arg));
} }
static inline bool arg_is_const_val(TCGArg arg, uint64_t val)
{
return ts_is_const_val(arg_temp(arg), val);
}
static inline bool ts_is_copy(TCGTemp *ts) static inline bool ts_is_copy(TCGTemp *ts)
{ {
return ts_info(ts)->next_copy != ts; return ts_info(ts)->next_copy != ts;
@ -689,7 +700,7 @@ static int do_constant_folding_cond(TCGType type, TCGArg x,
} }
} else if (args_are_copies(x, y)) { } else if (args_are_copies(x, y)) {
return do_constant_folding_cond_eq(c); return do_constant_folding_cond_eq(c);
} else if (arg_is_const(y) && arg_info(y)->val == 0) { } else if (arg_is_const_val(y, 0)) {
switch (c) { switch (c) {
case TCG_COND_LTU: case TCG_COND_LTU:
return 0; return 0;
@ -954,7 +965,7 @@ static bool fold_to_not(OptContext *ctx, TCGOp *op, int idx)
/* If the binary operation has first argument @i, fold to @i. */ /* If the binary operation has first argument @i, fold to @i. */
static bool fold_ix_to_i(OptContext *ctx, TCGOp *op, uint64_t i) static bool fold_ix_to_i(OptContext *ctx, TCGOp *op, uint64_t i)
{ {
if (arg_is_const(op->args[1]) && arg_info(op->args[1])->val == i) { if (arg_is_const_val(op->args[1], i)) {
return tcg_opt_gen_movi(ctx, op, op->args[0], i); return tcg_opt_gen_movi(ctx, op, op->args[0], i);
} }
return false; return false;
@ -963,7 +974,7 @@ static bool fold_ix_to_i(OptContext *ctx, TCGOp *op, uint64_t i)
/* If the binary operation has first argument @i, fold to NOT. */ /* If the binary operation has first argument @i, fold to NOT. */
static bool fold_ix_to_not(OptContext *ctx, TCGOp *op, uint64_t i) static bool fold_ix_to_not(OptContext *ctx, TCGOp *op, uint64_t i)
{ {
if (arg_is_const(op->args[1]) && arg_info(op->args[1])->val == i) { if (arg_is_const_val(op->args[1], i)) {
return fold_to_not(ctx, op, 2); return fold_to_not(ctx, op, 2);
} }
return false; return false;
@ -972,7 +983,7 @@ static bool fold_ix_to_not(OptContext *ctx, TCGOp *op, uint64_t i)
/* If the binary operation has second argument @i, fold to @i. */ /* If the binary operation has second argument @i, fold to @i. */
static bool fold_xi_to_i(OptContext *ctx, TCGOp *op, uint64_t i) static bool fold_xi_to_i(OptContext *ctx, TCGOp *op, uint64_t i)
{ {
if (arg_is_const(op->args[2]) && arg_info(op->args[2])->val == i) { if (arg_is_const_val(op->args[2], i)) {
return tcg_opt_gen_movi(ctx, op, op->args[0], i); return tcg_opt_gen_movi(ctx, op, op->args[0], i);
} }
return false; return false;
@ -981,7 +992,7 @@ static bool fold_xi_to_i(OptContext *ctx, TCGOp *op, uint64_t i)
/* If the binary operation has second argument @i, fold to identity. */ /* If the binary operation has second argument @i, fold to identity. */
static bool fold_xi_to_x(OptContext *ctx, TCGOp *op, uint64_t i) static bool fold_xi_to_x(OptContext *ctx, TCGOp *op, uint64_t i)
{ {
if (arg_is_const(op->args[2]) && arg_info(op->args[2])->val == i) { if (arg_is_const_val(op->args[2], i)) {
return tcg_opt_gen_mov(ctx, op, op->args[0], op->args[1]); return tcg_opt_gen_mov(ctx, op, op->args[0], op->args[1]);
} }
return false; return false;
@ -990,7 +1001,7 @@ static bool fold_xi_to_x(OptContext *ctx, TCGOp *op, uint64_t i)
/* If the binary operation has second argument @i, fold to NOT. */ /* If the binary operation has second argument @i, fold to NOT. */
static bool fold_xi_to_not(OptContext *ctx, TCGOp *op, uint64_t i) static bool fold_xi_to_not(OptContext *ctx, TCGOp *op, uint64_t i)
{ {
if (arg_is_const(op->args[2]) && arg_info(op->args[2])->val == i) { if (arg_is_const_val(op->args[2], i)) {
return fold_to_not(ctx, op, 1); return fold_to_not(ctx, op, 1);
} }
return false; return false;
@ -1223,8 +1234,8 @@ static bool fold_brcond2(OptContext *ctx, TCGOp *op)
* Simplify LT/GE comparisons vs zero to a single compare * Simplify LT/GE comparisons vs zero to a single compare
* vs the high word of the input. * vs the high word of the input.
*/ */
if (arg_is_const(op->args[2]) && arg_info(op->args[2])->val == 0 && if (arg_is_const_val(op->args[2], 0) &&
arg_is_const(op->args[3]) && arg_info(op->args[3])->val == 0) { arg_is_const_val(op->args[3], 0)) {
goto do_brcond_high; goto do_brcond_high;
} }
break; break;
@ -1448,9 +1459,7 @@ static bool fold_deposit(OptContext *ctx, TCGOp *op)
} }
/* Inserting a value into zero at offset 0. */ /* Inserting a value into zero at offset 0. */
if (arg_is_const(op->args[1]) if (arg_is_const_val(op->args[1], 0) && op->args[3] == 0) {
&& arg_info(op->args[1])->val == 0
&& op->args[3] == 0) {
uint64_t mask = MAKE_64BIT_MASK(0, op->args[4]); uint64_t mask = MAKE_64BIT_MASK(0, op->args[4]);
op->opc = and_opc; op->opc = and_opc;
@ -1461,8 +1470,7 @@ static bool fold_deposit(OptContext *ctx, TCGOp *op)
} }
/* Inserting zero into a value. */ /* Inserting zero into a value. */
if (arg_is_const(op->args[2]) if (arg_is_const_val(op->args[2], 0)) {
&& arg_info(op->args[2])->val == 0) {
uint64_t mask = deposit64(-1, op->args[3], op->args[4], 0); uint64_t mask = deposit64(-1, op->args[3], op->args[4], 0);
op->opc = and_opc; op->opc = and_opc;
@ -2000,8 +2008,8 @@ static bool fold_setcond2(OptContext *ctx, TCGOp *op)
* Simplify LT/GE comparisons vs zero to a single compare * Simplify LT/GE comparisons vs zero to a single compare
* vs the high word of the input. * vs the high word of the input.
*/ */
if (arg_is_const(op->args[3]) && arg_info(op->args[3])->val == 0 && if (arg_is_const_val(op->args[3], 0) &&
arg_is_const(op->args[4]) && arg_info(op->args[4])->val == 0) { arg_is_const_val(op->args[4], 0)) {
goto do_setcond_high; goto do_setcond_high;
} }
break; break;