[PULL,30/40] target/s390x: Use Int128 for return from CKSM

Message ID	20230204163310.815536-31-richard.henderson@linaro.org
State	Accepted
Commit	c91192245ac32c219ba698e3ca5e976cbed3359b
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; From: Richard Henderson <richard.henderson@linaro.org> To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Ilya Leoshkevich <iii@linux.ibm.com>, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <philmd@linaro.org> Subject: [PULL 30/40] target/s390x: Use Int128 for return from CKSM Date: Sat, 4 Feb 2023 06:33:00 -1000 Message-Id: <20230204163310.815536-31-richard.henderson@linaro.org> In-Reply-To: <20230204163310.815536-1-richard.henderson@linaro.org> References: <20230204163310.815536-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::102b; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action Precedence: list Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org
Series	[PULL,01/40] accel/tcg: Test CPUJumpCache in tb_jmp_cache_clear_page \| expand [PULL,01/40] accel/tcg: Test CPUJumpCache in tb_jmp_cache_clear_page [PULL,02/40] tcg: Init temp_subindex in liveness_pass_2 [PULL,03/40] tcg: Define TCG_TYPE_I128 and related helper macros [PULL,04/40] tcg: Handle dh_typecode_i128 with TCG_CALL_{RET, ARG}_NORMAL [PULL,05/40] tcg: Allocate objects contiguously in temp_allocate_frame [PULL,06/40] tcg: Introduce tcg_out_addi_ptr [PULL,07/40] tcg: Add TCG_CALL_{RET,ARG}_BY_REF [PULL,08/40] tcg: Introduce tcg_target_call_oarg_reg [PULL,09/40] tcg: Add TCG_CALL_RET_BY_VEC [PULL,10/40] include/qemu/int128: Use Int128 structure for TCI [PULL,11/40] tcg/i386: Add TCG_TARGET_CALL_{RET,ARG}_I128 [PULL,12/40] tcg/tci: Fix big-endian return register ordering [PULL,13/40] tcg/tci: Add TCG_TARGET_CALL_{RET,ARG}_I128 [PULL,14/40] tcg: Add TCG_TARGET_CALL_{RET,ARG}_I128 [PULL,15/40] tcg: Add temp allocation for TCGv_i128 [PULL,16/40] tcg: Add basic data movement for TCGv_i128 [PULL,17/40] tcg: Add guest load/store primitives for TCGv_i128 [PULL,18/40] tcg: Add tcg_gen_{non}atomic_cmpxchg_i128 [PULL,19/40] tcg: Split out tcg_gen_nonatomic_cmpxchg_i{32,64} [PULL,20/40] target/arm: Use tcg_gen_atomic_cmpxchg_i128 for STXP [PULL,21/40] target/arm: Use tcg_gen_atomic_cmpxchg_i128 for CASP [PULL,22/40] target/ppc: Use tcg_gen_atomic_cmpxchg_i128 for STQCX [PULL,23/40] tests/tcg/s390x: Add div.c [PULL,24/40] tests/tcg/s390x: Add clst.c [PULL,25/40] tests/tcg/s390x: Add long-double.c [PULL,26/40] tests/tcg/s390x: Add cdsg.c [PULL,27/40] target/s390x: Use a single return for helper_divs32/u32 [PULL,28/40] target/s390x: Use a single return for helper_divs64/u64 [PULL,29/40] target/s390x: Use Int128 for return from CLST [PULL,30/40] target/s390x: Use Int128 for return from CKSM [PULL,31/40] target/s390x: Use Int128 for return from TRE [PULL,32/40] target/s390x: Copy wout_x1 to wout_x1_P [PULL,33/40] target/s390x: Use Int128 for returning float128 [PULL,34/40] target/s390x: Use Int128 for passing float128 [PULL,35/40] target/s390x: Use tcg_gen_atomic_cmpxchg_i128 for CDSG [PULL,36/40] target/s390x: Implement CC_OP_NZ in gen_op_calc_cc [PULL,37/40] target/i386: Split out gen_cmpxchg8b, gen_cmpxchg16b [PULL,38/40] target/i386: Inline cmpxchg8b [PULL,39/40] target/i386: Inline cmpxchg16b [PULL,40/40] tcg/aarch64: Fix patching of LDR in tb_target_set_jmp_target

Message ID

20230204163310.815536-31-richard.henderson@linaro.org

State

Accepted

Commit

c91192245ac32c219ba698e3ca5e976cbed3359b

Headers

Received-SPF: pass (google.com: domain of
 qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as
 permitted sender) client-ip=209.51.188.17;
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, Ilya Leoshkevich <iii@linux.ibm.com>,
	=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <philmd@linaro.org>
Subject: [PULL 30/40] target/s390x: Use Int128 for return from CKSM
Date: Sat,  4 Feb 2023 06:33:00 -1000
Message-Id: <20230204163310.815536-31-richard.henderson@linaro.org>
In-Reply-To: <20230204163310.815536-1-richard.henderson@linaro.org>
References: <20230204163310.815536-1-richard.henderson@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2607:f8b0:4864:20::102b;
 envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102b.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
 RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
 SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
 <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
 <mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org
Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org

Series

[PULL,01/40] accel/tcg: Test CPUJumpCache in tb_jmp_cache_clear_page | expand

Commit Message

Richard Henderson Feb. 4, 2023, 4:33 p.m. UTC

Acked-by: Ilya Leoshkevich <iii@linux.ibm.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 target/s390x/helper.h         | 2 +-
 target/s390x/tcg/mem_helper.c | 7 +++----
 target/s390x/tcg/translate.c  | 6 ++++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/target/s390x/helper.h b/target/s390x/helper.h
index 25c2dd0b3c..03b29efa3e 100644
--- a/target/s390x/helper.h
+++ b/target/s390x/helper.h
@@ -103,7 +103,7 @@  DEF_HELPER_4(tre, i64, env, i64, i64, i64)
 DEF_HELPER_4(trt, i32, env, i32, i64, i64)
 DEF_HELPER_4(trtr, i32, env, i32, i64, i64)
 DEF_HELPER_5(trXX, i32, env, i32, i32, i32, i32)
-DEF_HELPER_4(cksm, i64, env, i64, i64, i64)
+DEF_HELPER_4(cksm, i128, env, i64, i64, i64)
 DEF_HELPER_FLAGS_5(calc_cc, TCG_CALL_NO_RWG_SE, i32, env, i32, i64, i64, i64)
 DEF_HELPER_FLAGS_2(sfpc, TCG_CALL_NO_WG, void, env, i64)
 DEF_HELPER_FLAGS_2(sfas, TCG_CALL_NO_WG, void, env, i64)
diff --git a/target/s390x/tcg/mem_helper.c b/target/s390x/tcg/mem_helper.c
index 9be42851d8..b0b403e23a 100644
--- a/target/s390x/tcg/mem_helper.c
+++ b/target/s390x/tcg/mem_helper.c
@@ -1350,8 +1350,8 @@  uint32_t HELPER(clclu)(CPUS390XState *env, uint32_t r1, uint64_t a2,
 }
 
 /* checksum */
-uint64_t HELPER(cksm)(CPUS390XState *env, uint64_t r1,
-                      uint64_t src, uint64_t src_len)
+Int128 HELPER(cksm)(CPUS390XState *env, uint64_t r1,
+                    uint64_t src, uint64_t src_len)
 {
     uintptr_t ra = GETPC();
     uint64_t max_len, len;
@@ -1392,8 +1392,7 @@  uint64_t HELPER(cksm)(CPUS390XState *env, uint64_t r1,
     env->cc_op = (len == src_len ? 0 : 3);
 
     /* Return both cksm and processed length.  */
-    env->retxl = cksm;
-    return len;
+    return int128_make128(cksm, len);
 }
 
 void HELPER(pack)(CPUS390XState *env, uint32_t len, uint64_t dest, uint64_t src)
diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c
index 8397fe2bd8..1a7aa9e4ae 100644
--- a/target/s390x/tcg/translate.c
+++ b/target/s390x/tcg/translate.c
@@ -2041,11 +2041,13 @@  static DisasJumpType op_cxlgb(DisasContext *s, DisasOps *o)
 static DisasJumpType op_cksm(DisasContext *s, DisasOps *o)
 {
     int r2 = get_field(s, r2);
+    TCGv_i128 pair = tcg_temp_new_i128();
     TCGv_i64 len = tcg_temp_new_i64();
 
-    gen_helper_cksm(len, cpu_env, o->in1, o->in2, regs[r2 + 1]);
+    gen_helper_cksm(pair, cpu_env, o->in1, o->in2, regs[r2 + 1]);
     set_cc_static(s);
-    return_low128(o->out);
+    tcg_gen_extr_i128_i64(o->out, len, pair);
+    tcg_temp_free_i128(pair);
 
     tcg_gen_add_i64(regs[r2], regs[r2], len);
     tcg_gen_sub_i64(regs[r2 + 1], regs[r2 + 1], len);

[PULL,30/40] target/s390x: Use Int128 for return from CKSM

Commit Message

Patch