tcg/optimize: Use fold_masks_zs in fold_andc

Avoid the use of the OptContext slots.  Find TempOptInfo once.
Avoid double inversion of the value of second const operand.

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2024-12-08 18:56:55 -06:00
parent 1ca7372c03
commit 21e2b5f9fa

View file

@ -1330,7 +1330,8 @@ static bool fold_and(OptContext *ctx, TCGOp *op)
static bool fold_andc(OptContext *ctx, TCGOp *op) static bool fold_andc(OptContext *ctx, TCGOp *op)
{ {
uint64_t z1; uint64_t z_mask, s_mask;
TempOptInfo *t1, *t2;
if (fold_const2(ctx, op) || if (fold_const2(ctx, op) ||
fold_xx_to_i(ctx, op, 0) || fold_xx_to_i(ctx, op, 0) ||
@ -1339,24 +1340,24 @@ static bool fold_andc(OptContext *ctx, TCGOp *op)
return true; return true;
} }
z1 = arg_info(op->args[1])->z_mask; t1 = arg_info(op->args[1]);
t2 = arg_info(op->args[2]);
z_mask = t1->z_mask;
/* /*
* Known-zeros does not imply known-ones. Therefore unless * Known-zeros does not imply known-ones. Therefore unless
* arg2 is constant, we can't infer anything from it. * arg2 is constant, we can't infer anything from it.
*/ */
if (arg_is_const(op->args[2])) { if (ti_is_const(t2)) {
uint64_t z2 = ~arg_info(op->args[2])->z_mask; uint64_t v2 = ti_const_val(t2);
if (fold_affected_mask(ctx, op, z1 & ~z2)) { if (fold_affected_mask(ctx, op, z_mask & v2)) {
return true; return true;
} }
z1 &= z2; z_mask &= ~v2;
} }
ctx->z_mask = z1;
ctx->s_mask = arg_info(op->args[1])->s_mask s_mask = t1->s_mask & t2->s_mask;
& arg_info(op->args[2])->s_mask; return fold_masks_zs(ctx, op, z_mask, s_mask);
return fold_masks(ctx, op);
} }
static bool fold_brcond(OptContext *ctx, TCGOp *op) static bool fold_brcond(OptContext *ctx, TCGOp *op)