diff mbox series

[30/46] tcg/optimize: Distinguish simplification in fold_setcond_zmask

Message ID 20241210152401.1823648-31-richard.henderson@linaro.org
State Superseded
Headers show
Series tcg: Remove in-flight mask data from OptContext | expand

Commit Message

Richard Henderson Dec. 10, 2024, 3:23 p.m. UTC 
Change return from bool to int; distinguish between
complete folding, simplification, and no change.

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

Comments

Pierrick Bouvier Dec. 17, 2024, 8:38 p.m. UTC | #1 
On 12/10/24 07:23, Richard Henderson wrote:
> Change return from bool to int; distinguish between
> complete folding, simplification, and no change.
> 
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>   tcg/optimize.c | 22 ++++++++++++++--------
>   1 file changed, 14 insertions(+), 8 deletions(-)
> 
> diff --git a/tcg/optimize.c b/tcg/optimize.c
> index eac5ef5eec..7b1d437c27 100644
> --- a/tcg/optimize.c
> +++ b/tcg/optimize.c
> @@ -2137,7 +2137,8 @@ static bool fold_remainder(OptContext *ctx, TCGOp *op)
>       return finish_folding(ctx, op);
>   }
>   
> -static bool fold_setcond_zmask(OptContext *ctx, TCGOp *op, bool neg)
> +/* Return 1 if finished, -1 if simplified, 0 if unchanged. */
> +static int fold_setcond_zmask(OptContext *ctx, TCGOp *op, bool neg)
>   {
>       uint64_t a_zmask, b_val;
>       TCGCond cond;
> @@ -2232,11 +2233,10 @@ static bool fold_setcond_zmask(OptContext *ctx, TCGOp *op, bool neg)
>                   op->opc = xor_opc;
>                   op->args[2] = arg_new_constant(ctx, 1);
>               }
> -            return false;
> +            return -1;
>           }
>       }
> -
> -    return false;
> +    return 0;
>   }
>   
>   static void fold_setcond_tst_pow2(OptContext *ctx, TCGOp *op, bool neg)
> @@ -2341,10 +2341,13 @@ static bool fold_setcond(OptContext *ctx, TCGOp *op)
>           return tcg_opt_gen_movi(ctx, op, op->args[0], i);
>       }
>   
> -    if (fold_setcond_zmask(ctx, op, false)) {
> +    i = fold_setcond_zmask(ctx, op, false);
> +    if (i > 0) {
>           return true;
>       }
> -    fold_setcond_tst_pow2(ctx, op, false);
> +    if (i == 0) {
> +        fold_setcond_tst_pow2(ctx, op, false);
> +    }
>   
>       ctx->z_mask = 1;
>       ctx->s_mask = smask_from_zmask(1);
> @@ -2359,10 +2362,13 @@ static bool fold_negsetcond(OptContext *ctx, TCGOp *op)
>           return tcg_opt_gen_movi(ctx, op, op->args[0], -i);
>       }
>   
> -    if (fold_setcond_zmask(ctx, op, true)) {
> +    i = fold_setcond_zmask(ctx, op, true);
> +    if (i > 0) {
>           return true;
>       }
> -    fold_setcond_tst_pow2(ctx, op, true);
> +    if (i == 0) {
> +        fold_setcond_tst_pow2(ctx, op, true);
> +    }
>   
>       /* Value is {0,-1} so all bits are repetitions of the sign. */
>       ctx->s_mask = -1;

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

Patch

diff --git a/tcg/optimize.c b/tcg/optimize.c
index eac5ef5eec..7b1d437c27 100644
--- a/tcg/optimize.c
+++ b/tcg/optimize.c
@@ -2137,7 +2137,8 @@  static bool fold_remainder(OptContext *ctx, TCGOp *op)
     return finish_folding(ctx, op);
 }
 
-static bool fold_setcond_zmask(OptContext *ctx, TCGOp *op, bool neg)
+/* Return 1 if finished, -1 if simplified, 0 if unchanged. */
+static int fold_setcond_zmask(OptContext *ctx, TCGOp *op, bool neg)
 {
     uint64_t a_zmask, b_val;
     TCGCond cond;
@@ -2232,11 +2233,10 @@  static bool fold_setcond_zmask(OptContext *ctx, TCGOp *op, bool neg)
                 op->opc = xor_opc;
                 op->args[2] = arg_new_constant(ctx, 1);
             }
-            return false;
+            return -1;
         }
     }
-
-    return false;
+    return 0;
 }
 
 static void fold_setcond_tst_pow2(OptContext *ctx, TCGOp *op, bool neg)
@@ -2341,10 +2341,13 @@  static bool fold_setcond(OptContext *ctx, TCGOp *op)
         return tcg_opt_gen_movi(ctx, op, op->args[0], i);
     }
 
-    if (fold_setcond_zmask(ctx, op, false)) {
+    i = fold_setcond_zmask(ctx, op, false);
+    if (i > 0) {
         return true;
     }
-    fold_setcond_tst_pow2(ctx, op, false);
+    if (i == 0) {
+        fold_setcond_tst_pow2(ctx, op, false);
+    }
 
     ctx->z_mask = 1;
     ctx->s_mask = smask_from_zmask(1);
@@ -2359,10 +2362,13 @@  static bool fold_negsetcond(OptContext *ctx, TCGOp *op)
         return tcg_opt_gen_movi(ctx, op, op->args[0], -i);
     }
 
-    if (fold_setcond_zmask(ctx, op, true)) {
+    i = fold_setcond_zmask(ctx, op, true);
+    if (i > 0) {
         return true;
     }
-    fold_setcond_tst_pow2(ctx, op, true);
+    if (i == 0) {
+        fold_setcond_tst_pow2(ctx, op, true);
+    }
 
     /* Value is {0,-1} so all bits are repetitions of the sign. */
     ctx->s_mask = -1;