[PULL 0/1] tcg patch queue

[PULL 0/1] tcg patch queue

[Richard Henderson]

The following changes since commit 6d00c6f982562222adbd0613966285792125abe5:

  Merge tag 'for-upstream' of https://repo.or.cz/qemu/kevin into staging (2024-08-07 07:09:37 +1000)

are available in the Git repository at:

  https://gitlab.com/rth7680/qemu.git tags/pull-tcg-20240808

for you to fetch changes up to 682a05280504d2fab32e16096b58d7ea068435c2:

  tcg/ppc: Sync tcg_out_test and constraints (2024-08-08 09:03:35 +1000)

----------------------------------------------------------------
tcg/ppc: Sync tcg_out_test and constraints

----------------------------------------------------------------
Richard Henderson (1):
      tcg/ppc: Sync tcg_out_test and constraints

 tcg/ppc/tcg-target.c.inc | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

[PULL 1/1] tcg/ppc: Sync tcg_out_test and constraints

[Richard Henderson]

Ensure the code structure is the same for matching constraints
and emitting code, lest we allow constants that cannot be
trivially tested.

Cc: qemu-stable@nongnu.org
Fixes: ad788aebbab ("tcg/ppc: Support TCG_COND_TST{EQ,NE}")
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2487
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <44328324-af73-4439-9d2b-d414e0e13dd7@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 tcg/ppc/tcg-target.c.inc | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/tcg/ppc/tcg-target.c.inc b/tcg/ppc/tcg-target.c.inc
index 7f3829beeb..3553a47ba9 100644
--- a/tcg/ppc/tcg-target.c.inc
+++ b/tcg/ppc/tcg-target.c.inc
@@ -325,9 +325,11 @@ static bool tcg_target_const_match(int64_t sval, int ct,
             if ((uval & ~0xffff) == 0 || (uval & ~0xffff0000ull) == 0) {
                 return 1;
             }
-            if (TCG_TARGET_REG_BITS == 32 || type == TCG_TYPE_I32
-                ? mask_operand(uval, &mb, &me)
-                : mask64_operand(uval << clz64(uval), &mb, &me)) {
+            if (uval == (uint32_t)uval && mask_operand(uval, &mb, &me)) {
+                return 1;
+            }
+            if (TCG_TARGET_REG_BITS == 64 &&
+                mask64_operand(uval << clz64(uval), &mb, &me)) {
                 return 1;
             }
             return 0;
@@ -1749,8 +1751,6 @@ static void tcg_out_test(TCGContext *s, TCGReg dest, TCGReg arg1, TCGArg arg2,
 
     if (type == TCG_TYPE_I32) {
         arg2 = (uint32_t)arg2;
-    } else if (arg2 == (uint32_t)arg2) {
-        type = TCG_TYPE_I32;
     }
 
     if ((arg2 & ~0xffff) == 0) {
@@ -1761,12 +1761,11 @@ static void tcg_out_test(TCGContext *s, TCGReg dest, TCGReg arg1, TCGArg arg2,
         tcg_out32(s, ANDIS | SAI(arg1, dest, arg2 >> 16));
         return;
     }
-    if (TCG_TARGET_REG_BITS == 32 || type == TCG_TYPE_I32) {
-        if (mask_operand(arg2, &mb, &me)) {
-            tcg_out_rlw_rc(s, RLWINM, dest, arg1, 0, mb, me, rc);
-            return;
-        }
-    } else {
+    if (arg2 == (uint32_t)arg2 && mask_operand(arg2, &mb, &me)) {
+        tcg_out_rlw_rc(s, RLWINM, dest, arg1, 0, mb, me, rc);
+        return;
+    }
+    if (TCG_TARGET_REG_BITS == 64) {
         int sh = clz64(arg2);
         if (mask64_operand(arg2 << sh, &mb, &me)) {
             tcg_out_rld_rc(s, RLDICR, dest, arg1, sh, me, rc);
-- 
2.43.0

Re: [PULL 0/1] tcg patch queue

[Richard Henderson]

On 8/8/24 09:06, Richard Henderson wrote:
> The following changes since commit 6d00c6f982562222adbd0613966285792125abe5:
> 
>    Merge tag 'for-upstream' of https://repo.or.cz/qemu/kevin into staging (2024-08-07 07:09:37 +1000)
> 
> are available in the Git repository at:
> 
>    https://gitlab.com/rth7680/qemu.git tags/pull-tcg-20240808
> 
> for you to fetch changes up to 682a05280504d2fab32e16096b58d7ea068435c2:
> 
>    tcg/ppc: Sync tcg_out_test and constraints (2024-08-08 09:03:35 +1000)
> 
> ----------------------------------------------------------------
> tcg/ppc: Sync tcg_out_test and constraints
> 
> ----------------------------------------------------------------
> Richard Henderson (1):
>        tcg/ppc: Sync tcg_out_test and constraints
> 
>   tcg/ppc/tcg-target.c.inc | 21 ++++++++++-----------
>   1 file changed, 10 insertions(+), 11 deletions(-)


Applied, thanks.  Please update https://wiki.qemu.org/ChangeLog/9.1 as appropriate.

r~

[PULL 0/1] tcg patch queue

[Richard Henderson]

The following changes since commit 6d00c6f982562222adbd0613966285792125abe5:

  Merge tag 'for-upstream' of https://repo.or.cz/qemu/kevin into staging (2024-08-07 07:09:37 +1000)

are available in the Git repository at:

  https://gitlab.com/rth7680/qemu.git tags/pull-tcg-20240808

for you to fetch changes up to 682a05280504d2fab32e16096b58d7ea068435c2:

  tcg/ppc: Sync tcg_out_test and constraints (2024-08-08 09:03:35 +1000)

----------------------------------------------------------------
tcg/ppc: Sync tcg_out_test and constraints

----------------------------------------------------------------
Richard Henderson (1):
      tcg/ppc: Sync tcg_out_test and constraints

 tcg/ppc/tcg-target.c.inc | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

[PULL 0/1] tcg patch queue

[Richard Henderson]

The following changes since commit 56a3033abcfcf72a2f4f1376a605a0b1ad526b67:

  Merge tag 'pull-request-2025-07-21' of https://gitlab.com/thuth/qemu into staging (2025-07-21 06:34:56 -0400)

are available in the Git repository at:

  https://gitlab.com/rth7680/qemu.git tags/pull-tcg-20250721

for you to fetch changes up to 2c047bdb77e8f636936edd9ac5000521c9580477:

  tcg/optimize: Don't fold INDEX_op_and_vec to extract (2025-07-21 08:09:04 -0700)

----------------------------------------------------------------
tcg/optimize: Don't fold INDEX_op_and_vec to extract

----------------------------------------------------------------
Richard Henderson (1):
      tcg/optimize: Don't fold INDEX_op_and_vec to extract

 tcg/optimize.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Re: [PULL 0/1] tcg patch queue

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 116 bytes --]

Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/10.1 for any user-visible changes.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]