commit 97218ae918b1504a63623130f3dc8f4b423b5f1b
author Richard Henderson <richard.henderson@linaro.org> Wed Jan 08 18:37:43 2025 -0800
committer Richard Henderson <richard.henderson@linaro.org> Mon Apr 28 13:40:16 2025 -0700
tree 5b41cd5d5b9cf1a86d18579823657354fc9d4988
parent f8fa1dae3db5493617ff42e8ccfd797058df243e

tcg: Merge INDEX_op_ctpop_{i32,i64}

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

tcg/optimize.c

diff --git a/tcg/optimize.c b/tcg/optimize.c
index af4e76e..bf625f7 100644
--- a/tcg/optimize.c
+++ b/tcg/optimize.c
@@ -515,11 +515,8 @@
         }
         return x ? ctz64(x) : y;
 
-    case INDEX_op_ctpop_i32:
-        return ctpop32(x);
-
-    case INDEX_op_ctpop_i64:
-        return ctpop64(x);
+    case INDEX_op_ctpop:
+        return type == TCG_TYPE_I32 ? ctpop32(x) : ctpop64(x);
 
     CASE_OP_32_64(bswap16):
         x = bswap16(x);
@@ -2902,7 +2899,7 @@
         case INDEX_op_ctz:
             done = fold_count_zeros(&ctx, op);
             break;
-        CASE_OP_32_64(ctpop):
+        case INDEX_op_ctpop:
             done = fold_ctpop(&ctx, op);
             break;
         CASE_OP_32_64(deposit):