target/s390x: Miscellaneous TCG fixes, part 2
PATCH v2 8/14 tests/tcg/s390x: Test CKSM
In reply to Ilya LeoshkevichAdd a small test to prevent regressions.
--- tests/tcg/s390x/Makefile.softmmu-target | 1 + tests/tcg/s390x/cksm.S | 29 +++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 tests/tcg/s390x/cksm.S
tests/tcg/s390x/Makefile.softmmu-target +1 -0
@@ -16,6 +16,7 @@ LDFLAGS=-nostdlib -static ASM_TESTS = \ bal \ + cksm \ exrl-ssm-early \ sam \ lpsw \
tests/tcg/s390x/cksm.S new file +29 -0
@@ -0,0 +1,29 @@ + .org 0x8e +program_interruption_code: + .org 0x1d0 /* program new PSW */ + .quad 0,pgm + .org 0x200 /* lowcore padding */ + .globl _start +_start: + lmg %r0,%r1,cksm_args + cksm %r2,%r0 + c %r2,cksm_exp + jne failure + cksm %r2,%r15 +failure: + lpswe failure_psw +pgm: + chhsi program_interruption_code,6 /* specification exception? */ + jne failure + lpswe success_psw +cksm_args: + .quad cksm_buf, 16 +cksm_buf: + .quad 0xaaaabbbbcccc0000, 0x12345678 +cksm_exp: + .long 0x89ab1234 + .align 8 +success_psw: + .quad 0x2000000000000,0xfff /* see is_special_wait_psw() */ +failure_psw: + .quad 0x2000000000000,0 /* disabled wait */
Signature · 1 line
2.41.0
PATCH v2 4/14 target/s390x: Fix ICM with M3=0
In reply to Ilya LeoshkevichWhen the mask is zero, access exceptions should still be recognized for 1 byte at the second-operand address. CC should be set to 0.
--- target/s390x/tcg/translate.c | 6 ++++++ 1 file changed, 6 insertions(+)
target/s390x/tcg/translate.c +6 -0
@@ -2522,6 +2522,12 @@ static DisasJumpType op_icm(DisasContext *s, DisasOps *o) ccm = ((1ull << len) -1 ) << pos;break ; +case 0 : +/* Recognize access exceptions for the first byte. */ +tcg_gen_qemu_ld_i64 (tmp, o->in2,get_mem_index (s),MO_UB ); +gen_op_movi_cc (s,0 ); +return DISAS_NEXT ; +default :/* This is going to be a sequence of loads and inserts. */ pos = base +32 -8 ;
Signature · 1 line
2.41.0
PATCH v2 14/14 tests/tcg/s390x: Test VCKSM
In reply to Ilya LeoshkevichAdd a small test to prevent regressions.
--- tests/tcg/s390x/Makefile.target | 1 + tests/tcg/s390x/vcksm.c | 31 +++++++++++++++++++++++++++++++ tests/tcg/s390x/vx.h | 2 ++ 3 files changed, 34 insertions(+) create mode 100644 tests/tcg/s390x/vcksm.c
tests/tcg/s390x/Makefile.target +1 -0
@@ -58,6 +58,7 @@ TESTS += $(PGM_SPECIFICATION_TESTS) Z13_TESTS=vistr Z13_TESTS+=lcbb Z13_TESTS+=locfhr +Z13_TESTS+=vcksm $(Z13_TESTS): CFLAGS+=-march=z13 -O2 TESTS+=$(Z13_TESTS)
tests/tcg/s390x/vcksm.c new file +31 -0
@@ -0,0 +1,31 @@ +/* +* Test the VCKSM instruction. +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ +#include <assert.h> +#include <stdlib.h> +#include <string.h> +#include "vx.h" + +int main (void ) +{ +S390Vector v1; +S390Vector v2 = { + .d[0 ] =0xb2261c8140edce49ULL , + .d[1 ] =0x387bf5a433af39d1ULL , + }; +S390Vector v3 = { + .d[0 ] =0x73b03d2c7f9e654eULL , + .d[1 ] =0x23d74e51fb479877ULL , + }; +S390Vector exp = {.d[0 ] =0xdedd7f8eULL , .d[1 ] =0ULL }; + + asmvolatile ("vcksm %[v1],%[v2],%[v3]" + : [v1]"=v" (v1.v) + : [v2]"v" (v2.v) + , [v3]"v" (v3.v)); +assert (memcmp (&v1, &exp,sizeof (v1)) ==0 ); + +return EXIT_SUCCESS ; +}
tests/tcg/s390x/vx.h +2 -0
@@ -1,6 +1,8 @@ #ifndef QEMU_TESTS_S390X_VX_H #define QEMU_TESTS_S390X_VX_H +#include <stdint.h> + typedef union S390Vector { uint64_t d[2]; /* doubleword */ uint32_t w[4]; /* word */
Signature · 1 line
2.41.0
PATCH v2 10/14 tests/tcg/s390x: Test CLM
In reply to Ilya LeoshkevichAdd a small test to prevent regressions.
--- tests/tcg/s390x/Makefile.softmmu-target | 1 + tests/tcg/s390x/clm.S | 29 +++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 tests/tcg/s390x/clm.S
tests/tcg/s390x/Makefile.softmmu-target +1 -0
@@ -17,6 +17,7 @@ LDFLAGS=-nostdlib -static ASM_TESTS = \ bal \ cksm \ + clm \ exrl-ssm-early \ sam \ lpsw \
tests/tcg/s390x/clm.S new file +29 -0
@@ -0,0 +1,29 @@ + .org 0x8e +program_interruption_code: + .org 0x1d0 /* program new PSW */ + .quad 0,pgm + .org 0x200 /* lowcore padding */ + .globl _start +_start: + lgrl %r0,op1 + clm %r0,6,op2 + jle failure + lgrl %r1,bad_addr + clm %r0,0,0(%r1) +failure: + lpswe failure_psw +pgm: + chhsi program_interruption_code,5 /* addressing exception? */ + jne failure + lpswe success_psw + .align 8 +op1: + .quad 0x1234567887654321 +op2: + .quad 0x3456789abcdef012 +bad_addr: + .quad 0xffffffff00000000 +success_psw: + .quad 0x2000000000000,0xfff /* see is_special_wait_psw() */ +failure_psw: + .quad 0x2000000000000,0 /* disabled wait */
Signature · 1 line
2.41.0
PATCH v2 12/14 tests/tcg/s390x: Test MC
In reply to Ilya LeoshkevichAdd a small test to prevent regressions.
--- tests/tcg/s390x/Makefile.softmmu-target | 1 + tests/tcg/s390x/mc.S | 56 +++++++++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 tests/tcg/s390x/mc.S
tests/tcg/s390x/Makefile.softmmu-target +1 -0
@@ -24,6 +24,7 @@ ASM_TESTS = \ lpsw \ lpswe-early \ lra \ + mc \ ssm-early \ stosm-early \ unaligned-lowcore
tests/tcg/s390x/mc.S new file +56 -0
56 lines not on this page · raw message
Signature · 1 line
2.41.0
PATCH v2 13/14 tests/tcg/s390x: Test STPQ
In reply to Ilya LeoshkevichAdd a small test to prevent regressions.
--- tests/tcg/s390x/Makefile.softmmu-target | 1 + tests/tcg/s390x/stpq.S | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 tests/tcg/s390x/stpq.S
tests/tcg/s390x/Makefile.softmmu-target +1 -0
@@ -27,6 +27,7 @@ ASM_TESTS = \ mc \ ssm-early \ stosm-early \ + stpq \ unaligned-lowcore include $(S390X_SRC)/pgm-specification.mak
tests/tcg/s390x/stpq.S new file +20 -0
@@ -0,0 +1,20 @@ + .org 0x200 /* lowcore padding */ + .globl _start +_start: + lgrl %r0,value + lgrl %r1,value+8 + stpq %r0,stored_value + clc stored_value(16),value + jne failure + lpswe success_psw +failure: + lpswe failure_psw + .align 16 +value: + .quad 0x1234567887654321, 0x8765432112345678 +stored_value: + .quad 0, 0 +success_psw: + .quad 0x2000000000000,0xfff /* see is_special_wait_psw() */ +failure_psw: + .quad 0x2000000000000,0 /* disabled wait */
Signature · 1 line
2.41.0
PATCH v2 3/14 target/s390x: Fix CONVERT TO LOGICAL/FIXED with out-of-range inputs
In reply to Ilya LeoshkevichCONVERT TO LOGICAL/FIXED deviate from IEEE 754 in that they raise an inexact exception on out-of-range inputs. float_flag_invalid_cvti aligns nicely with that behavior, so convert it to S390_IEEE_MASK_INEXACT.
--- target/s390x/tcg/fpu_helper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
target/s390x/tcg/fpu_helper.c +2 -1
@@ -52,7 +52,8 @@ uint8_t s390_softfloat_exc_to_ieee(unsigned int exc) s390_exc |= (exc & float_flag_divbyzero) ?S390_IEEE_MASK_DIVBYZERO :0 ; s390_exc |= (exc & float_flag_overflow) ?S390_IEEE_MASK_OVERFLOW :0 ; s390_exc |= (exc & float_flag_underflow) ?S390_IEEE_MASK_UNDERFLOW :0 ; - s390_exc |= (exc & float_flag_inexact) ?S390_IEEE_MASK_INEXACT :0 ; + s390_exc |= (exc & (float_flag_inexact | float_flag_invalid_cvti)) ? +S390_IEEE_MASK_INEXACT :0 ;return s390_exc; }
Signature · 1 line
2.41.0
PATCH v2 6/14 tcg/{i386, s390x}: Add earlyclobber to the op_add2's first output
In reply to Ilya Leoshkevichi386 and s390x implementations of op_add2 require an earlyclobber, which is currently missing. This breaks VCKSM in s390x guests. E.g., on x86_64 the following op:
add2_i32 tmp2,tmp3,tmp2,tmp3,tmp3,tmp2 dead: 0 2 3 4 5 pref=none,0xffff
is translated to:
addl %ebx, %r12d
adcl %r12d, %ebx
Introduce a new C_N1_O1_I4 constraint, and make sure that earlyclobber of aliased outputs is honored.
--- tcg/i386/tcg-target-con-set.h | 2 +- tcg/i386/tcg-target.c.inc | 2 +- tcg/s390x/tcg-target-con-set.h | 5 ++--- tcg/s390x/tcg-target.c.inc | 4 ++-- tcg/tcg.c | 8 +++++++- 5 files changed, 13 insertions(+), 8 deletions(-)
tcg/i386/tcg-target-con-set.h +1 -1
@@ -53,4 +53,4 @@ C_O2_I1(r, r, L) C_O2_I2(a, d, a, r) C_O2_I2(r, r, L, L) C_O2_I3(a, d, 0, 1, r) -C_O2_I4 (r, r,0 ,1 , re, re) +C_N1_O1_I4 (r, r,0 ,1 , re, re)
tcg/i386/tcg-target.c.inc +1 -1
@@ -3335,7 +3335,7 @@ static TCGConstraintSetIndex tcg_target_op_def(TCGOpcode op) case INDEX_op_add2_i64: case INDEX_op_sub2_i32: case INDEX_op_sub2_i64: - return C_O2_I4(r, r, 0, 1, re, re); + return C_N1_O1_I4(r, r, 0, 1, re, re); case INDEX_op_ctz_i32: case INDEX_op_ctz_i64:
tcg/s390x/tcg-target-con-set.h +2 -3
@@ -41,6 +41,5 @@ C_O2_I1(o, m, r) C_O2_I2(o, m, 0, r) C_O2_I2(o, m, r, r) C_O2_I3(o, m, 0, 1, r) -C_O2_I4(r, r, 0, 1, rA, r) -C_O2_I4(r, r, 0, 1, ri, r) -C_O2_I4 (r, r,0 ,1 , r, r) +C_N1_O1_I4(r, r, 0, 1, ri, r) +C_N1_O1_I4 (r, r,0 ,1 , rA, r)
tcg/s390x/tcg-target.c.inc +2 -2
@@ -3229,11 +3229,11 @@ static TCGConstraintSetIndex tcg_target_op_def(TCGOpcode op) case INDEX_op_add2_i32: case INDEX_op_sub2_i32: - return C_O2_I4(r, r, 0, 1, ri, r); + return C_N1_O1_I4(r, r, 0, 1, ri, r); case INDEX_op_add2_i64: case INDEX_op_sub2_i64: - return C_O2_I4(r, r, 0, 1, rA, r); + return C_N1_O1_I4(r, r, 0, 1, rA, r); case INDEX_op_st_vec: return C_O0_I2(v, r);
tcg/tcg.c +7 -1
@@ -648,6 +648,7 @@ static void tcg_out_movext3(TCGContext *s, const TCGMovExtend *i1,#define C_O2_I2 (O1 ,O2 ,I1 ,I2 ) C_PFX4(c_o2_i2_, O1, O2, I1, I2),#define C_O2_I3 (O1 ,O2 ,I1 ,I2 ,I3 ) C_PFX5(c_o2_i3_, O1, O2, I1, I2, I3),#define C_O2_I4 (O1 ,O2 ,I1 ,I2 ,I3 ,I4 ) C_PFX6(c_o2_i4_, O1, O2, I1, I2, I3, I4), +#define C_N1_O1_I4 (O1 ,O2 ,I1 ,I2 ,I3 ,I4 ) C_PFX6(c_n1_o1_i4_, O1, O2, I1, I2, I3, I4), typedef enum { #include "tcg-target-con-set.h"
@@ -668,6 +669,7 @@ static TCGConstraintSetIndex tcg_target_op_def(TCGOpcode);#undef C_O2_I2#undef C_O2_I3#undef C_O2_I4 +#undef C_N1_O1_I4/* Put all of the constraint sets into an array, indexed by the enum. */
@@ -687,6 +689,7 @@ static TCGConstraintSetIndex tcg_target_op_def(TCGOpcode);#define C_O2_I2 (O1 ,O2 ,I1 ,I2 ) { .args_ct_str = { #O1, #O2, #I1, #I2 } },#define C_O2_I3 (O1 ,O2 ,I1 ,I2 ,I3 ) { .args_ct_str = { #O1, #O2, #I1, #I2, #I3 } },#define C_O2_I4 (O1 ,O2 ,I1 ,I2 ,I3 ,I4 ) { .args_ct_str = { #O1, #O2, #I1, #I2, #I3, #I4 } }, +#define C_N1_O1_I4 (O1 ,O2 ,I1 ,I2 ,I3 ,I4 ) { .args_ct_str = { "&" #O1, #O2, #I1, #I2, #I3, #I4 } },static const TCGTargetOpDef constraint_sets[] = { #include "tcg-target-con-set.h"
@@ -706,6 +709,7 @@ static const TCGTargetOpDef constraint_sets[] = {#undef C_O2_I2#undef C_O2_I3#undef C_O2_I4 +#undef C_N1_O1_I4/* Expand the enumerator to be returned from tcg_target_op_def(). */
@@ -725,6 +729,7 @@ static const TCGTargetOpDef constraint_sets[] = {#define C_O2_I2 (O1 ,O2 ,I1 ,I2 ) C_PFX4(c_o2_i2_, O1, O2, I1, I2)#define C_O2_I3 (O1 ,O2 ,I1 ,I2 ,I3 ) C_PFX5(c_o2_i3_, O1, O2, I1, I2, I3)#define C_O2_I4 (O1 ,O2 ,I1 ,I2 ,I3 ,I4 ) C_PFX6(c_o2_i4_, O1, O2, I1, I2, I3, I4) +#define C_N1_O1_I4 (O1 ,O2 ,I1 ,I2 ,I3 ,I4 ) C_PFX6(c_n1_o1_i4_, O1, O2, I1, I2, I3, I4)#include "tcg-target.c.inc"
@@ -4703,7 +4708,8 @@ static void tcg_reg_alloc_op(TCGContext *s, const TCGOp *op)* dead after the instruction, we must allocate a new * register and move it. */ -if (temp_readonly (ts) || !IS_DEAD_ARG (i)) { +if (temp_readonly (ts) || !IS_DEAD_ARG (i) + || def->args_ct[arg_ct->alias_index].newreg) { allocate_new_reg = true; }else if (ts->val_type ==TEMP_VAL_REG ) {/*
Signature · 1 line
2.41.0
PATCH v2 5/14 target/s390x: Make MC raise specification exception when class >= 16
In reply to Ilya LeoshkevichMC requires bit positions 8-11 (upper 4 bits of class) to be zeros, otherwise it must raise a specification exception.
--- target/s390x/tcg/excp_helper.c | 2 +- target/s390x/tcg/translate.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
target/s390x/tcg/excp_helper.c +1 -1
@@ -639,7 +639,7 @@ void monitor_event(CPUS390XState *env,void HELPER (monitor_call )(CPUS390XState *env,uint64_t monitor_code,uint32_t monitor_class) { -g_assert (monitor_class <=0xff ); +g_assert (monitor_class <=0xf );if (env->cregs[8 ] & (0x8000 >> monitor_class)) {monitor_event (env, monitor_code, monitor_class,GETPC ());
target/s390x/tcg/translate.c +2 -2
@@ -3184,9 +3184,9 @@ static DisasJumpType op_lcbb(DisasContext *s, DisasOps *o)static DisasJumpType op_mc (DisasContext *s,DisasOps *o) { -const uint16_t monitor_class =get_field (s, i2); +const uint8_t monitor_class =get_field (s, i2); -if (monitor_class &0xff00 ) { +if (monitor_class &0xf0 ) {gen_program_exception (s,PGM_SPECIFICATION );return DISAS_NORETURN ; }
Signature · 1 line
2.41.0
PATCH v2 7/14 target/s390x: Fix assertion failure in VFMIN/VFMAX with type 13
In reply to Ilya LeoshkevichType 13 is reserved, so using it should result in specification exception. Due to an off-by-1 error the code triggers an assertion at a later point in time instead.
--- target/s390x/tcg/translate_vx.c.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
target/s390x/tcg/translate_vx.c.inc +1 -1
@@ -3047,7 +3047,7 @@ static DisasJumpType op_vfmax(DisasContext *s, DisasOps *o) const uint8_t m5 = get_field(s, m5); gen_helper_gvec_3_ptr *fn; - if (m6 == 5 || m6 == 6 || m6 == 7 || m6 > 13) { + if (m6 == 5 || m6 == 6 || m6 == 7 || m6 >= 13) { gen_program_exception(s, PGM_SPECIFICATION); return DISAS_NORETURN; }
Signature · 1 line
2.41.0
v2 cover target/s390x: Miscellaneous TCG fixes, part 2
v1: https://lists.gnu.org/archive/html/qemu-devel/2023-07/msg03648.html
v1 -> v2: Move the case in 04/14 (David).
Simplify the reserved type checking in 07/14 (David). Add R-bs.
Hi,
Here is another set of fixes for issues found by randomized testing.
Most of them have to do with simple insufficient error handling or corner cases, but 3/14 and 6/14 took a while to figure out, and hopefully I got the fixes right. 13/14 is a test for an issue that Richard has already fixed, but I thought it would be helpful to have it anyway.
Best regards,
Ilya
Ilya Leoshkevich (14):
target/s390x: Make CKSM raise an exception if R2 is odd target/s390x: Fix CLM with M3=0
target/s390x: Fix CONVERT TO LOGICAL/FIXED with out-of-range inputs target/s390x: Fix ICM with M3=0
target/s390x: Make MC raise specification exception when class >= 16 tcg/{i386,s390x}: Add earlyclobber to the op_add2's first output target/s390x: Fix assertion failure in VFMIN/VFMAX with type 13 tests/tcg/s390x: Test CKSM
tests/tcg/s390x: Test CLGEBR and CGEBRA
tests/tcg/s390x: Test CLM
tests/tcg/s390x: Test ICM
tests/tcg/s390x: Test MC
tests/tcg/s390x: Test STPQ
tests/tcg/s390x: Test VCKSM
target/s390x/tcg/excp_helper.c | 2 +- target/s390x/tcg/fpu_helper.c | 3 +- target/s390x/tcg/mem_helper.c | 5 +++ target/s390x/tcg/translate.c | 21 ++++++++-- target/s390x/tcg/translate_vx.c.inc | 2 +- tcg/i386/tcg-target-con-set.h | 2 +- tcg/i386/tcg-target.c.inc | 2 +- tcg/s390x/tcg-target-con-set.h | 5 +-- tcg/s390x/tcg-target.c.inc | 4 +- tcg/tcg.c | 8 +++- tests/tcg/s390x/Makefile.softmmu-target | 5 +++ tests/tcg/s390x/Makefile.target | 6 +++ tests/tcg/s390x/cgebra.c | 32 ++++++++++++++ tests/tcg/s390x/cksm.S | 29 +++++++++++++ tests/tcg/s390x/clgebr.c | 32 ++++++++++++++ tests/tcg/s390x/clm.S | 29 +++++++++++++ tests/tcg/s390x/icm.S | 32 ++++++++++++++ tests/tcg/s390x/mc.S | 56 +++++++++++++++++++++++++ tests/tcg/s390x/stpq.S | 20 +++++++++ tests/tcg/s390x/vcksm.c | 31 ++++++++++++++ tests/tcg/s390x/vx.h | 2 + 21 files changed, 313 insertions(+), 15 deletions(-) create mode 100644 tests/tcg/s390x/cgebra.c create mode 100644 tests/tcg/s390x/cksm.S create mode 100644 tests/tcg/s390x/clgebr.c create mode 100644 tests/tcg/s390x/clm.S create mode 100644 tests/tcg/s390x/icm.S create mode 100644 tests/tcg/s390x/mc.S create mode 100644 tests/tcg/s390x/stpq.S create mode 100644 tests/tcg/s390x/vcksm.c
Signature · 1 line
2.41.0
PATCH v2 1/14 target/s390x: Make CKSM raise an exception if R2 is odd
R2 designates an even-odd register pair; the instruction should raise a specification exception when R2 is not even.
--- target/s390x/tcg/translate.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
target/s390x/tcg/translate.c +9 -2
@@ -1991,11 +1991,18 @@ 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 (); +TCGv_i128 pair; +TCGv_i64 len; + +if (r2 &1 ) { +gen_program_exception (s,PGM_SPECIFICATION ); +return DISAS_NORETURN ; + } + pair =tcg_temp_new_i128 ();gen_helper_cksm (pair, cpu_env, o->in1, o->in2, regs[r2 +1 ]);set_cc_static (s); + len =tcg_temp_new_i64 ();tcg_gen_extr_i128_i64 (o->out, len, pair);tcg_gen_add_i64 (regs[r2], regs[r2], len);
Signature · 1 line
2.41.0
PATCH v2 2/14 target/s390x: Fix CLM with M3=0
In reply to Ilya LeoshkevichWhen the mask is zero, access exceptions should still be recognized for 1 byte at the second-operand address. CC should be set to 0.
--- target/s390x/tcg/mem_helper.c | 5 +++++ 1 file changed, 5 insertions(+)
target/s390x/tcg/mem_helper.c +5 -0
@@ -667,6 +667,11 @@ uint32_t HELPER(clm)(CPUS390XState *env, uint32_t r1, uint32_t mask,HELPER_LOG ("%s: r1 0x%x mask 0x%x addr 0x%" PRIx64"\n" , __func__, r1, mask, addr); +if (!mask) { +/* Recognize access exceptions for the first byte */ +cpu_ldub_data_ra (env, addr, ra); + } +while (mask) {if (mask &8 ) {uint8_t d =cpu_ldub_data_ra (env, addr, ra);
Signature · 1 line
2.41.0
Re: [PATCH v2 07/14] target/s390x: Fix assertion failure in VFMIN/VFMAX with type 13
In reply to Ilya LeoshkevichQuoted 16 lines · Ilya Leoshkevich
Type 13 is reserved, so using it should result in specification exception. Due to an off-by-1 error the code triggers an assertion at a later point in time instead.
Fixes da4807527f3b ("s390x/tcg: Implement VECTOR FP (MAXIMUM|MINIMUM)")Signed-off-by Ilya Leoshkevich <[email protected]>--- target/s390x/tcg/translate_vx.c.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)target/s390x/tcg/translate_vx.c.inc +0
-0
target/s390x/tcg/translate_vx.c.inc static DisasJumpType op_vfmax(DisasContext *s, DisasOps *o) · line 3053
Quoted 8 lines
target/s390x/tcg/translate_vx.c.inc +1
-1@@ -3047,7 +3047,7 @@ static DisasJumpType op_vfmax(DisasContext *s, DisasOps *o) const uint8_t m5 = get_field(s, m5); gen_helper_gvec_3_ptr *fn; - if (m6 == 5 || m6 == 6 || m6 == 7 || m6 > 13) { + if (m6 == 5 || m6 == 6 || m6 == 7 || m6 >= 13) { gen_program_exception(s, PGM_SPECIFICATION); return DISAS_NORETURN; }
Signature · 3 lines
Cheers, David / dhildenb
PATCH v2 11/14 tests/tcg/s390x: Test ICM
In reply to Ilya LeoshkevichAdd a small test to prevent regressions.
--- tests/tcg/s390x/Makefile.softmmu-target | 1 + tests/tcg/s390x/icm.S | 32 +++++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 tests/tcg/s390x/icm.S
tests/tcg/s390x/Makefile.softmmu-target +1 -0
@@ -19,6 +19,7 @@ ASM_TESTS = \ cksm \ clm \ exrl-ssm-early \ + icm \ sam \ lpsw \ lpswe-early \
tests/tcg/s390x/icm.S new file +32 -0
@@ -0,0 +1,32 @@ + .org 0x8e +program_interruption_code: + .org 0x1d0 /* program new PSW */ + .quad 0,pgm + .org 0x200 /* lowcore padding */ + .globl _start +_start: + lgrl %r0,op1 + icm %r0,10,op2 + cg %r0,exp + jne failure + lgrl %r1,bad_addr + icm %r0,0,0(%r1) +failure: + lpswe failure_psw +pgm: + chhsi program_interruption_code,5 /* addressing exception? */ + jne failure + lpswe success_psw + .align 8 +op1: + .quad 0x1234567887654321 +op2: + .quad 0x0011223344556677 +exp: + .quad 0x1234567800651121 +bad_addr: + .quad 0xffffffff00000000 +success_psw: + .quad 0x2000000000000,0xfff /* see is_special_wait_psw() */ +failure_psw: + .quad 0x2000000000000,0 /* disabled wait */
Signature · 1 line
2.41.0
PATCH v2 9/14 tests/tcg/s390x: Test CLGEBR and CGEBRA
In reply to Ilya LeoshkevichAdd a small test to prevent regressions.
--- tests/tcg/s390x/Makefile.target | 5 +++++ tests/tcg/s390x/cgebra.c | 32 ++++++++++++++++++++++++++++++++ tests/tcg/s390x/clgebr.c | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+) create mode 100644 tests/tcg/s390x/cgebra.c create mode 100644 tests/tcg/s390x/clgebr.c
tests/tcg/s390x/Makefile.target +5 -0
@@ -39,12 +39,17 @@ TESTS+=mxdb TESTS+=epsw TESTS+=larl TESTS+=mdeb +TESTS+=cgebra +TESTS+=clgebr cdsg: CFLAGS+=-pthread cdsg: LDFLAGS+=-pthread rxsbg: CFLAGS+=-O2 +cgebra: LDFLAGS+=-lm +clgebr: LDFLAGS+=-lm + include $(S390X_SRC)/pgm-specification.mak $(PGM_SPECIFICATION_TESTS): pgm-specification-user.o $(PGM_SPECIFICATION_TESTS): LDFLAGS+=pgm-specification-user.o
tests/tcg/s390x/cgebra.c new file +32 -0
@@ -0,0 +1,32 @@ +/* +* Test the CGEBRA instruction. +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ +#include <assert.h> +#include <fenv.h> +#include <stdlib.h> + +int main (void ) +{ +float r2 =1E+300 ; +long long r1; +int cc; + +feclearexcept (FE_ALL_EXCEPT ); + asm("cgebra %[r1],%[m3],%[r2],%[m4]\n" +"ipm %[cc]\n" + : [r1]"=r" (r1) + , [cc]"=r" (cc) + : [m3]"i" (5 )/* round toward 0 */ + , [r2]"f" (r2) + , [m4]"i" (8 )/* bit 0 is set, but must be ignored; XxC is not set */ + :"cc" ); + cc >>=28 ; + +assert (r1 ==0x7fffffffffffffffLL ); +assert (cc ==3 ); +assert (fetestexcept (FE_ALL_EXCEPT ) == (FE_INVALID |FE_INEXACT )); + +return EXIT_SUCCESS ; +}
tests/tcg/s390x/clgebr.c new file +32 -0
@@ -0,0 +1,32 @@ +/* +* Test the CLGEBR instruction. +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ +#include <assert.h> +#include <fenv.h> +#include <stdlib.h> + +int main (void ) +{ +float r2 =-1 ; +long long r1; +int cc; + +feclearexcept (FE_ALL_EXCEPT ); + asm("clgebr %[r1],%[m3],%[r2],%[m4]\n" +"ipm %[cc]\n" + : [r1]"=r" (r1) + , [cc]"=r" (cc) + : [m3]"i" (5 )/* round toward 0 */ + , [r2]"f" (r2) + , [m4]"i" (8 )/* bit 0 is set, but must be ignored; XxC is not set */ + :"cc" ); + cc >>=28 ; + +assert (r1 ==0 ); +assert (cc ==3 ); +assert (fetestexcept (FE_ALL_EXCEPT ) == (FE_INVALID |FE_INEXACT )); + +return EXIT_SUCCESS ; +}
Signature · 1 line
2.41.0
Re: [PATCH v2 06/14] tcg/{i386, s390x}: Add earlyclobber to the op_add2's first output
In reply to Ilya LeoshkevichHi Ilya,
Quoted 31 lines · Ilya Leoshkevich
i386 and s390x implementations of
op_add2require an earlyclobber, which is currently missing. This breaks VCKSM in s390x guests. E.g., onx86_64the following op:add2_i32 tmp2,tmp3,tmp2,tmp3,tmp3,tmp2 dead: 0 2 3 4 5 pref=none,0xffffis translated to:
addl %ebx, %r12d
adcl %r12d, %ebxIntroduce a new
C_N1_O1_I4constraint, and make sure that earlyclobber of aliased outputs is honored.Fixes 82790a870992 ("tcg: Add markup for output requires new register")Signed-off-by Ilya Leoshkevich <[email protected]>--- tcg/i386/tcg-target-con-set.h | 2 +- tcg/i386/tcg-target.c.inc | 2 +- tcg/s390x/tcg-target-con-set.h | 5 ++--- tcg/s390x/tcg-target.c.inc | 4 ++-- tcg/tcg.c | 8 +++++++- 5 files changed, 13 insertions(+), 8 deletions(-)tcg/tcg.c +0
-0
tcg/tcg.c static void tcg_out_movext3(TCGContext *s, const TCGMovExtend *i1, · line 651
Quoted 4 lines
tcg/tcg.c +1
-0@@ -648,6 +648,7 @@ static void tcg_out_movext3(TCGContext *s, const TCGMovExtend *i1,#define C_O2_I2 (O1 ,O2 ,I1 ,I2 ) C_PFX4(c_o2_i2_, O1, O2, I1, I2),#define C_O2_I3 (O1 ,O2 ,I1 ,I2 ,I3 ) C_PFX5(c_o2_i3_, O1, O2, I1, I2, I3),#define C_O2_I4 (O1 ,O2 ,I1 ,I2 ,I3 ,I4 ) C_PFX6(c_o2_i4_, O1, O2, I1, I2, I3, I4), +#define C_N1_O1_I4 (O1 ,O2 ,I1 ,I2 ,I3 ,I4 ) C_PFX6(c_n1_o1_i4_, O1, O2, I1, I2, I3, I4),
No need for O2. Also can you place it earlier just after C_N1_I2?
-- >8 --
@@ -643,6 +643,7 @@ static void tcg_out_movext3(TCGContext *s, const TCGMovExtend *i1,
#define C_O1_I4(O1, I1, I2, I3, I4) C_PFX5(c_o1_i4_, O1, I1, I2,
I3, I4),
#define C_N1_I2(O1, I1, I2) C_PFX3(c_n1_i2_, O1, I1, I2),
+#define C_N1_O1_I4(O1, I1, I2, I3, I4) C_PFX5(c_n1_o1_i4_, O1, I1, I2, I3, I4),
#define C_O2_I1(O1, O2, I1) C_PFX3(c_o2_i1_, O1, O2, I1),
#define C_O2_I2(O1, O2, I1, I2) C_PFX4(c_o2_i2_, O1, O2, I1, I2),
---
Thanks,
Phil.
Re: [PATCH v2 06/14] tcg/{i386, s390x}: Add earlyclobber to the op_add2's first output
Quoted 33 lines · Philippe Mathieu-Daudé
Hi Ilya,
Quoted 28 lines · Ilya Leoshkevich
i386 and s390x implementations of
op_add2require an earlyclobber, which is currently missing. This breaks VCKSM in s390x guests. E.g., onx86_64the following op:
add2_i32tmp2,tmp3,tmp2,tmp3,tmp3,tmp2 dead: 0 2 3 4 5 pref=none,0xffffis translated to:
addl %ebx, %r12d
adcl %r12d, %ebxIntroduce a new
C_N1_O1_I4constraint, and make sure that earlyclobber
of aliased outputs is honored.Fixes 82790a870992 ("tcg: Add markup for output requires newregister")
Signed-off-by Ilya Leoshkevich <[email protected]>---
tcg/i386/tcg-target-con-set.h | 2 +-
tcg/i386/tcg-target.c.inc | 2 +-
tcg/s390x/tcg-target-con-set.h| 5 ++---
tcg/s390x/tcg-target.c.inc | 4 ++--
tcg/tcg.c | 8 +++++++-5 files changed, 13 insertions(+), 8 deletions(-)
Quoted 16 lines
Quoted 11 lines
tcg/tcg.c +0
-0@@ -648,6 +648,7 @@ static void tcg_out_movext3(TCGContext *s, const TCGMovExtend *i1, #define C_O2_I2(O1, O2, I1, I2) C_PFX4(c_o2_i2_, O1, O2, I1, I2), #define C_O2_I3(O1, O2, I1, I2, I3) C_PFX5(c_o2_i3_, O1, O2, I1, I2, I3), #define C_O2_I4(O1, O2, I1, I2, I3, I4) C_PFX6(c_o2_i4_, O1, O2,Quoted 3 lines
I1, I2, I3, I4),
+#defineC_N1_O1_I4(O1, O2, I1, I2, I3, I4)C_PFX6(c_n1_o1_i4_, O1, O2, I1, I2, I3, I4),No need for O2. Also can you place it earlier just after
C_N1_I2?
Shouldn't it still be a 6-argument constraint? INDEX_op_add2_i32 and friends take 6 arguments after all.
Quoted 22 lines
-- >8 --
(quoted diff) +0
-0@@ -643,6 +643,7 @@ static void tcg_out_movext3(TCGContext *s, const TCGMovExtend *i1, #define C_O1_I4(O1, I1, I2, I3, I4) C_PFX5(c_o1_i4_, O1, I1, I2, I3, I4), #define C_N1_I2(O1, I1, I2) C_PFX3(c_n1_i2_, O1, I1,I2),
+#defineC_N1_O1_I4(O1, I1, I2, I3, I4)C_PFX5(c_n1_o1_i4_, O1, I1, I2,
I3, I4),#define
C_O2_I1(O1, O2, I1)C_PFX3(c_o2_i1_, O1, O2, I1),
#defineC_O2_I2(O1, O2, I1, I2)C_PFX4(c_o2_i2_, O1, O2, I1, I2),
---Thanks,
Phil.
Re: [PATCH v2 06/14] tcg/{i386, s390x}: Add earlyclobber to the op_add2's first output
Quoted 51 lines · Ilya Leoshkevich
Quoted 33 lines · Philippe Mathieu-Daudé
Hi Ilya,
Quoted 28 lines · Ilya Leoshkevich
i386 and s390x implementations of
op_add2require an earlyclobber, which is currently missing. This breaks VCKSM in s390x guests. E.g., onx86_64the following op:
add2_i32tmp2,tmp3,tmp2,tmp3,tmp3,tmp2 dead: 0 2 3 4 5
pref=none,0xffffis translated to:
addl %ebx, %r12d
adcl %r12d, %ebxIntroduce a new
C_N1_O1_I4constraint, and make sure that earlyclobber
of aliased outputs is honored.Fixes 82790a870992 ("tcg: Add markup for output requires newregister")
Signed-off-by Ilya Leoshkevich <[email protected]>--- tcg/i386/tcg-target-con-set.h | 2 +- tcg/i386/tcg-target.c.inc | 2 +- tcg/s390x/tcg-target-con-set.h | 5 ++--- tcg/s390x/tcg-target.c.inc | 4 ++-- tcg/tcg.c | 8 +++++++- 5 files changed, 13 insertions(+), 8 deletions(-)Quoted 16 lines
Quoted 11 lines
tcg/tcg.c +0
-0@@ -648,6 +648,7 @@ static void tcg_out_movext3(TCGContext *s, const TCGMovExtend *i1, #define C_O2_I2(O1, O2, I1, I2) C_PFX4(c_o2_i2_, O1, O2, I1, I2), #define C_O2_I3(O1, O2, I1, I2, I3) C_PFX5(c_o2_i3_, O1, O2, I1, I2, I3), #define C_O2_I4(O1, O2, I1, I2, I3, I4) C_PFX6(c_o2_i4_, O1, O2,Quoted 3 lines
I1, I2, I3, I4),
+#defineC_N1_O1_I4(O1, O2, I1, I2, I3, I4)C_PFX6(c_n1_o1_i4_, O1, O2, I1, I2, I3, I4),No need for O2. Also can you place it earlier just after
C_N1_I2?
Quoted 2 lines
Shouldn't it still be a 6-argument constraint?
INDEX_op_add2_i32and friends take 6 arguments after all.
Oops sorry, you are right.
Re: [PATCH v2 06/14] tcg/{i386, s390x}: Add earlyclobber to the op_add2's first output
In reply to Ilya LeoshkevichQuoted 30 lines · Ilya Leoshkevich
i386 and s390x implementations of
op_add2require an earlyclobber, which is currently missing. This breaks VCKSM in s390x guests. E.g., onx86_64the following op:add2_i32 tmp2,tmp3,tmp2,tmp3,tmp3,tmp2 dead: 0 2 3 4 5 pref=none,0xffffis translated to:
addl %ebx, %r12d
adcl %r12d, %ebxIntroduce a new
C_N1_O1_I4constraint, and make sure that earlyclobber of aliased outputs is honored.Fixes 82790a870992 ("tcg: Add markup for output requires new register")Signed-off-by Ilya Leoshkevich <[email protected]>--- tcg/i386/tcg-target-con-set.h | 2 +- tcg/i386/tcg-target.c.inc | 2 +- tcg/s390x/tcg-target-con-set.h | 5 ++--- tcg/s390x/tcg-target.c.inc | 4 ++-- tcg/tcg.c | 8 +++++++- 5 files changed, 13 insertions(+), 8 deletions(-)tcg/i386/tcg-target-con-set.h +0
-0
tcg/i386/tcg-target-con-set.h C_O2_I1(r, r, L) · line 56
Quoted 5 lines
tcg/i386/tcg-target-con-set.h +1
-1@@ -53,4 +53,4 @@ C_O2_I1(r, r, L) C_O2_I2(a, d, a, r) C_O2_I2(r, r, L, L) C_O2_I3(a, d, 0, 1, r) -C_O2_I4 (r, r,0 ,1 , re, re) +C_N1_O1_I4 (r, r,0 ,1 , re, re)
While here, please update the comment in header. Although the description is not arch-specific; include/tcg/tcg.h or tcg/tcg.c could hold it.
The patch LGTM but I don't feel confident enough to add a R-b tag. If it still miss a R-b tag in a pair of days I'll have a deeper look at it.
Regards,
Phil.
Re: [PATCH v2 08/14] tests/tcg/s390x: Test CKSM
In reply to Ilya LeoshkevichQuoted 29 lines · Ilya Leoshkevich
Add a small test to prevent regressions.
Signed-off-by Ilya Leoshkevich <[email protected]>--- tests/tcg/s390x/Makefile.softmmu-target | 1 + tests/tcg/s390x/cksm.S | 29 +++++++++++++++++++++++++ 2 files changed, 30 insertions(+)create mode 100644
tests/tcg/s390x/cksm.Stests/tcg/s390x/Makefile.softmmu-target +1
-0@@ -16,6 +16,7 @@ LDFLAGS=-nostdlib -static ASM_TESTS = \ bal \ + cksm \ exrl-ssm-early \ sam \ lpsw \tests/tcg/s390x/cksm.S new file +2
-0@@ -0,0 +1,29 @@ + .org 0x8e +program_interruption_code:
tests/tcg/s390x/cksm.S line 12
Quoted 10 lines
tests/tcg/s390x/cksm.S new file +10
-0+ .org 0x1d0 /* program new PSW */ + .quad 0,pgm + .org 0x200 /* lowcore padding */ + .globl _start +_start: + lmg %r0,%r1,cksm_args + cksm %r2,%r0 + c %r2,cksm_exp + jne failure + cksm %r2,%r15
Clang is smart enough to detect that this is a bad instruction:
$ make check-tcg
BUILD s390x-softmmu guest-tests
tests/tcg/s390x/cksm.S:12:14: error: invalid register pair
cksm %r2,%r15
^I guess you have to manually create the opcode here?
Thomas
Re: [PATCH v2 08/14] tests/tcg/s390x: Test CKSM
Quoted 62 lines · Thomas Huth
Quoted 42 lines · Ilya Leoshkevich
Add a small test to prevent regressions.
Signed-off-by Ilya Leoshkevich <[email protected]>---
tests/tcg/s390x/Makefile.softmmu-target | 1 +
tests/tcg/s390x/cksm.S | 29
+++++++++++++++++++++++++2 files changed, 30 insertions(+)create mode 100644
tests/tcg/s390x/cksm.Stests/tcg/s390x/Makefile.softmmu-target +0
-0@@ -16,6 +16,7 @@ LDFLAGS=-nostdlib -static
ASM_TESTS
=
\
bal
\
+
cksm
\
exrl-ssm-
early \
sam
\
lpsw
\tests/tcg/s390x/cksm.S new file +2
-0@@ -0,0 +1,29 @@ + .org 0x8e +program_interruption_code:tests/tcg/s390x/cksm.S line 12
Quoted 10 lines
tests/tcg/s390x/cksm.S new file +10
-0+ .org 0x1d0 /* program new PSW */ + .quad 0,pgm + .org 0x200 /* lowcore padding */ + .globl _start +_start: + lmg %r0,%r1,cksm_args + cksm %r2,%r0 + c %r2,cksm_exp + jne failure + cksm %r2,%r15Clang is smart enough to detect that this is a bad instruction:
$ make check-tcg BUILD s390x-softmmu guest-tests tests/tcg/s390x/cksm.S:12:14: error: invalid register pair cksm %r2,%r15 ^
Quoted 3 lines
I guess you have to manually create the opcode here?
Thomas
Argh, I really need to start testing my submissions with clang. Thanks for noticing, I will fix this.
Re: [PATCH v2 09/14] tests/tcg/s390x: Test CLGEBR and CGEBRA
In reply to Ilya LeoshkevichQuoted 10 lines · Ilya Leoshkevich
Add a small test to prevent regressions.
Signed-off-by Ilya Leoshkevich <[email protected]>--- tests/tcg/s390x/Makefile.target | 5 +++++ tests/tcg/s390x/cgebra.c | 32 ++++++++++++++++++++++++++++++++ tests/tcg/s390x/clgebr.c | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+)create mode 100644
tests/tcg/s390x/cgebra.c
create mode 100644tests/tcg/s390x/clgebr.c
Re: [PATCH v2 10/14] tests/tcg/s390x: Test CLM
In reply to Ilya LeoshkevichQuoted 8 lines · Ilya Leoshkevich
Add a small test to prevent regressions.
Signed-off-by Ilya Leoshkevich <[email protected]>--- tests/tcg/s390x/Makefile.softmmu-target | 1 + tests/tcg/s390x/clm.S | 29 +++++++++++++++++++++++++ 2 files changed, 30 insertions(+)create mode 100644
tests/tcg/s390x/clm.S
Re: [PATCH v2 11/14] tests/tcg/s390x: Test ICM
In reply to Ilya LeoshkevichQuoted 8 lines · Ilya Leoshkevich
Add a small test to prevent regressions.
Signed-off-by Ilya Leoshkevich <[email protected]>--- tests/tcg/s390x/Makefile.softmmu-target | 1 + tests/tcg/s390x/icm.S | 32 +++++++++++++++++++++++++ 2 files changed, 33 insertions(+)create mode 100644
tests/tcg/s390x/icm.S
Re: [PATCH v2 12/14] tests/tcg/s390x: Test MC
In reply to Ilya LeoshkevichQuoted 8 lines · Ilya Leoshkevich
Add a small test to prevent regressions.
Signed-off-by Ilya Leoshkevich <[email protected]>--- tests/tcg/s390x/Makefile.softmmu-target | 1 + tests/tcg/s390x/mc.S | 56 +++++++++++++++++++++++++ 2 files changed, 57 insertions(+)create mode 100644
tests/tcg/s390x/mc.S
Re: [PATCH v2 13/14] tests/tcg/s390x: Test STPQ
In reply to Ilya LeoshkevichQuoted 8 lines · Ilya Leoshkevich
Add a small test to prevent regressions.
Signed-off-by Ilya Leoshkevich <[email protected]>--- tests/tcg/s390x/Makefile.softmmu-target | 1 + tests/tcg/s390x/stpq.S | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+)create mode 100644
tests/tcg/s390x/stpq.S
Re: [PATCH v2 14/14] tests/tcg/s390x: Test VCKSM
In reply to Ilya LeoshkevichQuoted 9 lines · Ilya Leoshkevich
Add a small test to prevent regressions.
Signed-off-by Ilya Leoshkevich <[email protected]>--- tests/tcg/s390x/Makefile.target | 1 + tests/tcg/s390x/vcksm.c | 31 +++++++++++++++++++++++++++++++ tests/tcg/s390x/vx.h | 2 ++ 3 files changed, 34 insertions(+)create mode 100644
tests/tcg/s390x/vcksm.c