[v1] tcg: Remove in-flight mask data from OptContext

[PATCH 24/46] tcg/optimize: Use fold_masks_zs in fold_not

Posted by Richard Henderson 5 months ago

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 tcg/optimize.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/tcg/optimize.c b/tcg/optimize.c
index aa5242a380..ae1386c681 100644
--- a/tcg/optimize.c
+++ b/tcg/optimize.c
@@ -2056,12 +2056,7 @@ static bool fold_not(OptContext *ctx, TCGOp *op)
     if (fold_const1(ctx, op)) {
         return true;
     }
-
-    ctx->s_mask = arg_info(op->args[1])->s_mask;
-
-    /* Because of fold_to_not, we want to always return true, via finish. */
-    finish_folding(ctx, op);
-    return true;
+    return fold_masks_zs(ctx, op, -1, arg_info(op->args[1])->s_mask);
 }
 
 static bool fold_or(OptContext *ctx, TCGOp *op)
-- 
2.43.0

Re: [PATCH 24/46] tcg/optimize: Use fold_masks_zs in fold_not

Posted by Pierrick Bouvier 4 months, 3 weeks ago

On 12/10/24 07:23, Richard Henderson wrote:
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>   tcg/optimize.c | 7 +------
>   1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/tcg/optimize.c b/tcg/optimize.c
> index aa5242a380..ae1386c681 100644
> --- a/tcg/optimize.c
> +++ b/tcg/optimize.c
> @@ -2056,12 +2056,7 @@ static bool fold_not(OptContext *ctx, TCGOp *op)
>       if (fold_const1(ctx, op)) {
>           return true;
>       }
> -
> -    ctx->s_mask = arg_info(op->args[1])->s_mask;
> -
> -    /* Because of fold_to_not, we want to always return true, via finish. */
> -    finish_folding(ctx, op);
> -    return true;
> +    return fold_masks_zs(ctx, op, -1, arg_info(op->args[1])->s_mask);
>   }
>   
>   static bool fold_or(OptContext *ctx, TCGOp *op)

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>