* [PATCH v1 0/2] s390x: Add support for Vector Enhancements Facility 2 @ 2022-03-03 3:22 David Miller 2022-03-03 3:22 ` [PATCH v1 1/2] s390x/tcg: Implement Vector-Enhancements Facility 2 for s390x David Miller 2022-03-03 3:22 ` [PATCH v1 2/2] tests/tcg/s390x: Tests for Vector Enhancements Facility 2 David Miller 0 siblings, 2 replies; 9+ messages in thread From: David Miller @ 2022-03-03 3:22 UTC (permalink / raw) To: qemu-s390x, qemu-devel Cc: thuth, david, cohuck, richard.henderson, farman, David Miller, pasic, borntraeger Extend s390x z15 to support and test Vector Enhancements Facility 2 (vxeh2) David Miller (2): s390x/tcg: Implement Vector-Enhancements Facility 2 for s390x tests/tcg/s390x: Tests for Vector Enhancements Facility 2 include/qemu/bitops.h | 26 ++ target/s390x/gen-features.c | 2 +- target/s390x/helper.h | 12 +- target/s390x/tcg/insn-data.def | 30 ++- target/s390x/tcg/translate.c | 3 +- target/s390x/tcg/translate_vx.c.inc | 377 ++++++++++++++++++++++++--- target/s390x/tcg/vec.h | 30 +++ target/s390x/tcg/vec_fpu_helper.c | 33 +++ target/s390x/tcg/vec_helper.c | 33 +++ target/s390x/tcg/vec_int_helper.c | 59 +++++ target/s390x/tcg/vec_string_helper.c | 65 +++++ tests/tcg/s390x/Makefile.target | 8 + tests/tcg/s390x/vxeh2_vcvt.c | 97 +++++++ tests/tcg/s390x/vxeh2_vlstr.c | 146 +++++++++++ tests/tcg/s390x/vxeh2_vs.c | 91 +++++++ 15 files changed, 968 insertions(+), 44 deletions(-) create mode 100644 tests/tcg/s390x/vxeh2_vcvt.c create mode 100644 tests/tcg/s390x/vxeh2_vlstr.c create mode 100644 tests/tcg/s390x/vxeh2_vs.c -- 2.34.1 ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v1 1/2] s390x/tcg: Implement Vector-Enhancements Facility 2 for s390x 2022-03-03 3:22 [PATCH v1 0/2] s390x: Add support for Vector Enhancements Facility 2 David Miller @ 2022-03-03 3:22 ` David Miller 2022-03-03 8:58 ` Richard Henderson 2022-03-03 3:22 ` [PATCH v1 2/2] tests/tcg/s390x: Tests for Vector Enhancements Facility 2 David Miller 1 sibling, 1 reply; 9+ messages in thread From: David Miller @ 2022-03-03 3:22 UTC (permalink / raw) To: qemu-s390x, qemu-devel Cc: thuth, david, cohuck, richard.henderson, farman, David Miller, pasic, borntraeger resolves: https://gitlab.com/qemu-project/qemu/-/issues/738 implements: VECTOR LOAD ELEMENTS REVERSED (VLER) VECTOR LOAD BYTE REVERSED ELEMENTS (VLBR) VECTOR LOAD BYTE REVERSED ELEMENT (VLEBRH, VLEBRF, VLEBRG) VECTOR LOAD BYTE REVERSED ELEMENT AND ZERO (VLLEBRZ) VECTOR LOAD BYTE REVERSED ELEMENT AND REPLOCATE (VLBRREP) VECTOR STORE ELEMENTS REVERSED (VSTER) VECTOR STORE BYTE REVERSED ELEMENTS (VSTBR) VECTOR STORE BYTE REVERSED ELEMENTS (VSTEBRH, VSTEBRF, VSTEBRG) VECTOR SHIFT LEFT DOUBLE BY BIT (VSLD) VECTOR SHIFT RIGHT DOUBLE BY BIT (VSRD) VECTOR STRING SEARCH (VSTRS) modifies: VECTOR FP CONVERT FROM FIXED (VCFPS) VECTOR FP CONVERT FROM LOGICAL (VCFPL) VECTOR FP CONVERT TO FIXED (VCSFP) VECTOR FP CONVERT TO LOGICAL (VCLFP) VECTOR SHIFT LEFT (VSL) VECTOR SHIFT RIGHT ARITHMETIC (VSRA) VECTOR SHIFT RIGHT LOGICAL (VSRL) Signed-off-by: David Miller <dmiller423@gmail.com> --- include/qemu/bitops.h | 26 ++ target/s390x/gen-features.c | 2 +- target/s390x/helper.h | 12 +- target/s390x/tcg/insn-data.def | 30 ++- target/s390x/tcg/translate.c | 3 +- target/s390x/tcg/translate_vx.c.inc | 377 ++++++++++++++++++++++++--- target/s390x/tcg/vec.h | 30 +++ target/s390x/tcg/vec_fpu_helper.c | 33 +++ target/s390x/tcg/vec_helper.c | 33 +++ target/s390x/tcg/vec_int_helper.c | 59 +++++ target/s390x/tcg/vec_string_helper.c | 65 +++++ 11 files changed, 626 insertions(+), 44 deletions(-) diff --git a/include/qemu/bitops.h b/include/qemu/bitops.h index 03213ce952..9a955fc2f4 100644 --- a/include/qemu/bitops.h +++ b/include/qemu/bitops.h @@ -446,6 +446,32 @@ static inline int64_t sextract64(uint64_t value, int start, int length) return ((int64_t)(value << (64 - length - start))) >> (64 - length); } +/** + * deposit8: + * @value: initial value to insert bit field into + * @start: the lowest bit in the bit field (numbered from 0) + * @length: the length of the bit field + * @fieldval: the value to insert into the bit field + * + * Deposit @fieldval into the 8 bit @value at the bit field specified + * by the @start and @length parameters, and return the modified + * @value. Bits of @value outside the bit field are not modified. + * Bits of @fieldval above the least significant @length bits are + * ignored. The bit field must lie entirely within the 8 bit byte. + * It is valid to request that all 8 bits are modified (ie @length + * 8 and @start 0). + * + * Returns: the modified @value. + */ +static inline uint8_t deposit8(uint8_t value, int start, int length, + uint8_t fieldval) +{ + uint8_t mask; + assert(start >= 0 && length > 0 && length <= 8 - start); + mask = (~0ULL >> (8 - length)) << start; + return (value & ~mask) | ((fieldval << start) & mask); +} + /** * deposit32: * @value: initial value to insert bit field into diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c index 22846121c4..633891d59f 100644 --- a/target/s390x/gen-features.c +++ b/target/s390x/gen-features.c @@ -740,13 +740,13 @@ static uint16_t qemu_V6_2[] = { static uint16_t qemu_LATEST[] = { S390_FEAT_MISC_INSTRUCTION_EXT3, + S390_FEAT_VECTOR_ENH2, }; /* add all new definitions before this point */ static uint16_t qemu_MAX[] = { /* generates a dependency warning, leave it out for now */ S390_FEAT_MSA_EXT_5, }; - /****** END FEATURE DEFS ******/ #define _YEARS "2016" diff --git a/target/s390x/helper.h b/target/s390x/helper.h index 69f69cf718..dbafdba62d 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -129,6 +129,9 @@ DEF_HELPER_FLAGS_3(probe_write_access, TCG_CALL_NO_WG, void, env, i64, i64) /* === Vector Support Instructions === */ DEF_HELPER_FLAGS_4(gvec_vbperm, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) DEF_HELPER_FLAGS_4(vll, TCG_CALL_NO_WG, void, env, ptr, i64, i64) +DEF_HELPER_FLAGS_4(vstl, TCG_CALL_NO_WG, void, env, cptr, i64, i64) +DEF_HELPER_FLAGS_4(vler, TCG_CALL_NO_WG, void, env, ptr, i64, i64) +DEF_HELPER_FLAGS_4(vster, TCG_CALL_NO_WG, void, env, ptr, i64, i64) DEF_HELPER_FLAGS_4(gvec_vpk16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) DEF_HELPER_FLAGS_4(gvec_vpk32, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) DEF_HELPER_FLAGS_4(gvec_vpk64, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) @@ -145,7 +148,6 @@ DEF_HELPER_5(gvec_vpkls_cc16, void, ptr, cptr, cptr, env, i32) DEF_HELPER_5(gvec_vpkls_cc32, void, ptr, cptr, cptr, env, i32) DEF_HELPER_5(gvec_vpkls_cc64, void, ptr, cptr, cptr, env, i32) DEF_HELPER_FLAGS_5(gvec_vperm, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, cptr, i32) -DEF_HELPER_FLAGS_4(vstl, TCG_CALL_NO_WG, void, env, cptr, i64, i64) /* === Vector Integer Instructions === */ DEF_HELPER_FLAGS_4(gvec_vavg8, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) @@ -203,8 +205,11 @@ DEF_HELPER_FLAGS_3(gvec_vpopct16, TCG_CALL_NO_RWG, void, ptr, cptr, i32) DEF_HELPER_FLAGS_4(gvec_verim8, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) DEF_HELPER_FLAGS_4(gvec_verim16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) DEF_HELPER_FLAGS_4(gvec_vsl, TCG_CALL_NO_RWG, void, ptr, cptr, i64, i32) +DEF_HELPER_FLAGS_4(gvec_vsl_ve2, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) DEF_HELPER_FLAGS_4(gvec_vsra, TCG_CALL_NO_RWG, void, ptr, cptr, i64, i32) +DEF_HELPER_FLAGS_4(gvec_vsra_ve2, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) DEF_HELPER_FLAGS_4(gvec_vsrl, TCG_CALL_NO_RWG, void, ptr, cptr, i64, i32) +DEF_HELPER_FLAGS_4(gvec_vsrl_ve2, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) DEF_HELPER_FLAGS_4(gvec_vscbi8, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) DEF_HELPER_FLAGS_4(gvec_vscbi16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) DEF_HELPER_4(gvec_vtm, void, ptr, cptr, env, i32) @@ -246,6 +251,7 @@ DEF_HELPER_6(gvec_vstrc_cc32, void, ptr, cptr, cptr, cptr, env, i32) DEF_HELPER_6(gvec_vstrc_cc_rt8, void, ptr, cptr, cptr, cptr, env, i32) DEF_HELPER_6(gvec_vstrc_cc_rt16, void, ptr, cptr, cptr, cptr, env, i32) DEF_HELPER_6(gvec_vstrc_cc_rt32, void, ptr, cptr, cptr, cptr, env, i32) +DEF_HELPER_6(vstrs, void, ptr, cptr, cptr, ptr, env, i32) /* === Vector Floating-Point Instructions */ DEF_HELPER_FLAGS_5(gvec_vfa32, TCG_CALL_NO_WG, void, ptr, cptr, cptr, env, i32) @@ -275,6 +281,10 @@ DEF_HELPER_FLAGS_5(gvec_vfche64, TCG_CALL_NO_WG, void, ptr, cptr, cptr, env, i32 DEF_HELPER_5(gvec_vfche64_cc, void, ptr, cptr, cptr, env, i32) DEF_HELPER_FLAGS_5(gvec_vfche128, TCG_CALL_NO_WG, void, ptr, cptr, cptr, env, i32) DEF_HELPER_5(gvec_vfche128_cc, void, ptr, cptr, cptr, env, i32) +DEF_HELPER_FLAGS_4(gvec_vcdg32, TCG_CALL_NO_WG, void, ptr, cptr, env, i32) +DEF_HELPER_FLAGS_4(gvec_vcdlg32, TCG_CALL_NO_WG, void, ptr, cptr, env, i32) +DEF_HELPER_FLAGS_4(gvec_vcgd32, TCG_CALL_NO_WG, void, ptr, cptr, env, i32) +DEF_HELPER_FLAGS_4(gvec_vclgd32, TCG_CALL_NO_WG, void, ptr, cptr, env, i32) DEF_HELPER_FLAGS_4(gvec_vcdg64, TCG_CALL_NO_WG, void, ptr, cptr, env, i32) DEF_HELPER_FLAGS_4(gvec_vcdlg64, TCG_CALL_NO_WG, void, ptr, cptr, env, i32) DEF_HELPER_FLAGS_4(gvec_vcgd64, TCG_CALL_NO_WG, void, ptr, cptr, env, i32) diff --git a/target/s390x/tcg/insn-data.def b/target/s390x/tcg/insn-data.def index 35e55d454e..5e5e2656f0 100644 --- a/target/s390x/tcg/insn-data.def +++ b/target/s390x/tcg/insn-data.def @@ -1027,6 +1027,20 @@ F(0xe756, VLR, VRR_a, V, 0, 0, 0, 0, vlr, 0, IF_VEC) /* VECTOR LOAD AND REPLICATE */ F(0xe705, VLREP, VRX, V, la2, 0, 0, 0, vlrep, 0, IF_VEC) + +/* VECTOR LOAD BYTE REVERSED ELEMENTS */ + F(0xe601, VLEBRH, VRX, VE2, la2, 0, 0, 0, vlebr, 0, IF_VEC) + F(0xe603, VLEBRF, VRX, VE2, la2, 0, 0, 0, vlebr, 0, IF_VEC) + F(0xe602, VLEBRG, VRX, VE2, la2, 0, 0, 0, vlebr, 0, IF_VEC) +/* VECTOR LOAD BYTE REVERSED ELEMENT AND REPLOCATE */ + F(0xe605, VLBRREP, VRX, VE2, la2, 0, 0, 0, vlbrrep, 0, IF_VEC) +/* VECTOR LOAD BYTE REVERSED ELEMENT AND ZERO */ + F(0xe604, VLLEBRZ, VRX, VE2, la2, 0, 0, 0, vllebrz, 0, IF_VEC) +/* VECTOR LOAD BYTE REVERSED ELEMENTS */ + F(0xe606, VLBR, VRX, VE2, la2, 0, 0, 0, vlbr, 0, IF_VEC) +/* VECTOR LOAD ELEMENTS REVERSED */ + F(0xe607, VLER, VRX, VE2, la2, 0, 0, 0, vler, 0, IF_VEC) + /* VECTOR LOAD ELEMENT */ E(0xe700, VLEB, VRX, V, la2, 0, 0, 0, vle, 0, ES_8, IF_VEC) E(0xe701, VLEH, VRX, V, la2, 0, 0, 0, vle, 0, ES_16, IF_VEC) @@ -1077,11 +1091,19 @@ F(0xe75f, VSEG, VRR_a, V, 0, 0, 0, 0, vseg, 0, IF_VEC) /* VECTOR STORE */ F(0xe70e, VST, VRX, V, la2, 0, 0, 0, vst, 0, IF_VEC) +/* VECTOR STORE BYTE REVERSED ELEMENT */ + F(0xe609, VSTEBRH, VRX, VE2, la2, 0, 0, 0, vsteb, 0, IF_VEC) + F(0xe60b, VSTEBRF, VRX, VE2, la2, 0, 0, 0, vsteb, 0, IF_VEC) + F(0xe60a, VSTEBRG, VRX, VE2, la2, 0, 0, 0, vsteb, 0, IF_VEC) +/* VECTOR STORE BYTE REVERSED ELEMENTS */ + F(0xe60e, VSTBR, VRX, VE2, la2, 0, 0, 0, vstbr, 0, IF_VEC) /* VECTOR STORE ELEMENT */ E(0xe708, VSTEB, VRX, V, la2, 0, 0, 0, vste, 0, ES_8, IF_VEC) E(0xe709, VSTEH, VRX, V, la2, 0, 0, 0, vste, 0, ES_16, IF_VEC) E(0xe70b, VSTEF, VRX, V, la2, 0, 0, 0, vste, 0, ES_32, IF_VEC) E(0xe70a, VSTEG, VRX, V, la2, 0, 0, 0, vste, 0, ES_64, IF_VEC) +/* VECTOR STORE ELEMENTS REVERSED */ + F(0xe60f, VSTER, VRX, VE2, la2, 0, 0, 0, vster, 0, IF_VEC) /* VECTOR STORE MULTIPLE */ F(0xe73e, VSTM, VRS_a, V, la2, 0, 0, 0, vstm, 0, IF_VEC) /* VECTOR STORE WITH LENGTH */ @@ -1207,12 +1229,16 @@ F(0xe774, VSL, VRR_c, V, 0, 0, 0, 0, vsl, 0, IF_VEC) /* VECTOR SHIFT LEFT BY BYTE */ F(0xe775, VSLB, VRR_c, V, 0, 0, 0, 0, vsl, 0, IF_VEC) +/* VECTOR SHIFT LEFT DOUBLE BY BIT */ + F(0xe786, VSLD, VRI_d, VE2, 0, 0, 0, 0, vsld, 0, IF_VEC) /* VECTOR SHIFT LEFT DOUBLE BY BYTE */ - F(0xe777, VSLDB, VRI_d, V, 0, 0, 0, 0, vsldb, 0, IF_VEC) + F(0xe777, VSLDB, VRI_d, V, 0, 0, 0, 0, vsld, 0, IF_VEC) /* VECTOR SHIFT RIGHT ARITHMETIC */ F(0xe77e, VSRA, VRR_c, V, 0, 0, 0, 0, vsra, 0, IF_VEC) /* VECTOR SHIFT RIGHT ARITHMETIC BY BYTE */ F(0xe77f, VSRAB, VRR_c, V, 0, 0, 0, 0, vsra, 0, IF_VEC) +/* VECTOR SHIFT RIGHT DOUBLE BY BIT */ + F(0xe787, VSRD, VRI_d, VE2, 0, 0, 0, 0, vsrd, 0, IF_VEC) /* VECTOR SHIFT RIGHT LOGICAL */ F(0xe77c, VSRL, VRR_c, V, 0, 0, 0, 0, vsrl, 0, IF_VEC) /* VECTOR SHIFT RIGHT LOGICAL BY BYTE */ @@ -1246,6 +1272,8 @@ F(0xe75c, VISTR, VRR_a, V, 0, 0, 0, 0, vistr, 0, IF_VEC) /* VECTOR STRING RANGE COMPARE */ F(0xe78a, VSTRC, VRR_d, V, 0, 0, 0, 0, vstrc, 0, IF_VEC) +/* VECTOR STRING SEARCH */ + F(0xe78b, VSTRS, VRR_d, VE2, 0, 0, 0, 0, vstrs, 0, IF_VEC) /* === Vector Floating-Point Instructions */ diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index 92faa1b65f..f0f1f382e4 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -6223,7 +6223,8 @@ enum DisasInsnEnum { #define FAC_PCI S390_FEAT_ZPCI /* z/PCI facility */ #define FAC_AIS S390_FEAT_ADAPTER_INT_SUPPRESSION #define FAC_V S390_FEAT_VECTOR /* vector facility */ -#define FAC_VE S390_FEAT_VECTOR_ENH /* vector enhancements facility 1 */ +#define FAC_VE S390_FEAT_VECTOR_ENH /* vector enhancements facility 1 */ +#define FAC_VE2 S390_FEAT_VECTOR_ENH2 /* vector enhancements facility 2 */ #define FAC_MIE2 S390_FEAT_MISC_INSTRUCTION_EXT2 /* miscellaneous-instruction-extensions facility 2 */ #define FAC_MIE3 S390_FEAT_MISC_INSTRUCTION_EXT3 /* miscellaneous-instruction-extensions facility 3 */ diff --git a/target/s390x/tcg/translate_vx.c.inc b/target/s390x/tcg/translate_vx.c.inc index 98eb7710a4..d8a773f67c 100644 --- a/target/s390x/tcg/translate_vx.c.inc +++ b/target/s390x/tcg/translate_vx.c.inc @@ -457,6 +457,9 @@ static DisasJumpType op_vlrep(DisasContext *s, DisasOps *o) return DISAS_NEXT; } + + + static DisasJumpType op_vle(DisasContext *s, DisasOps *o) { const uint8_t es = s->insn->data; @@ -614,6 +617,192 @@ static DisasJumpType op_vlm(DisasContext *s, DisasOps *o) return DISAS_NEXT; } +static DisasJumpType op_vler(DisasContext *s, DisasOps *o) +{ + const uint8_t es = get_field(s, m3); + + if (es < ES_16 || es > ES_64) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + + TCGv_ptr a0 = tcg_temp_new_ptr(); + TCGv_i64 tes = tcg_const_i64(es & 0xf); + + tcg_gen_addi_ptr(a0, cpu_env, vec_full_reg_offset(get_field(s, v1))); + gen_helper_vler(cpu_env, a0, o->addr1, tes); + + tcg_temp_free_i64(tes); + tcg_temp_free_ptr(a0); + return DISAS_NEXT; +} + +static DisasJumpType op_vlebr(DisasContext *s, DisasOps *o) +{ + const uint8_t es = (1 == s->fields.op2) ? 1 : (1 ^ s->fields.op2); + const uint8_t enr = get_field(s, m3); + TCGv_i64 tmp; + + if (es < ES_16 || es > ES_64 || !valid_vec_element(enr, es)) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + + tmp = tcg_temp_new_i64(); + tcg_gen_qemu_ld_i64(tmp, o->addr1, get_mem_index(s), MO_TE | es); + + tcg_gen_bswap64_i64(tmp, tmp); + tcg_gen_rotri_i64(tmp, tmp, 64 - 8 * (1 << es)); + + write_vec_element_i64(tmp, get_field(s, v1), enr, es); + tcg_temp_free_i64(tmp); + return DISAS_NEXT; +} + +static DisasJumpType op_vlbrrep(DisasContext *s, DisasOps *o) +{ + const uint8_t es = get_field(s, m3); + TCGv_i64 tmp; + + if (es == ES_8 || es > ES_64) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + + tmp = tcg_temp_new_i64(); + tcg_gen_qemu_ld_i64(tmp, o->addr1, get_mem_index(s), MO_TE | es); + tcg_gen_bswap64_i64(tmp, tmp); + tcg_gen_rotri_i64(tmp, tmp, 64 - 8 * (1 << es)); + gen_gvec_dup_i64(es, get_field(s, v1), tmp); + tcg_temp_free_i64(tmp); + return DISAS_NEXT; +} + +static DisasJumpType op_vllebrz(DisasContext *s, DisasOps *o) +{ + const uint8_t m3 = get_field(s, m3); + const uint8_t es = m3 & 3; + const uint8_t enr = (m3 == 6) ? 0 : ((1 << (3 - es)) - 1); + + TCGv_i64 tmp, zero; + + if (m3 < ES_16 || (m3 > ES_64 && m3 != 6)) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + + zero = tcg_const_i64(0); + write_vec_element_i64(zero, get_field(s, v1), 1, ES_64); + write_vec_element_i64(zero, get_field(s, v1), 0, ES_64); + + tmp = tcg_temp_new_i64(); + tcg_gen_qemu_ld_i64(tmp, o->addr1, get_mem_index(s), MO_TE | es); + + tcg_gen_bswap64_i64(tmp, tmp); + tcg_gen_rotri_i64(tmp, tmp, 64 - 8 * (1 << es)); + + write_vec_element_i64(tmp, get_field(s, v1), enr, es); + tcg_temp_free_i64(tmp); + tcg_temp_free_i64(zero); + + return DISAS_NEXT; +} + +static DisasJumpType op_vlbr(DisasContext *s, DisasOps *o) +{ + const uint8_t es = get_field(s, m3); + const uint8_t bytes = 1 << es; + uint32_t dst_idx; + + if (es < ES_16 || es > ES_128) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + TCGv_i64 t0 = tcg_temp_new_i64(); + TCGv_i64 t1 = tcg_temp_new_i64(); + + if (es >= ES_64) { + tcg_gen_qemu_ld_i64(t0, o->addr1, get_mem_index(s), MO_TEUQ); + tcg_gen_bswap64_i64(t0, t0); + gen_addi_and_wrap_i64(s, o->addr1, o->addr1, 8); + tcg_gen_qemu_ld_i64(t1, o->addr1, get_mem_index(s), MO_TEUQ); + tcg_gen_bswap64_i64(t1, t1); + write_vec_element_i64(t0, get_field(s, v1), (es > ES_64) ? 1 : 0, ES_64); + write_vec_element_i64(t1, get_field(s, v1), (es > ES_64) ? 0 : 1, ES_64); + } else { + for (dst_idx = 0; dst_idx < NUM_VEC_ELEMENTS(es); dst_idx++) { + tcg_gen_qemu_ld_i64(t0, o->addr1, get_mem_index(s), MO_TEUQ); + tcg_gen_bswap64_i64(t0, t0); + write_vec_element_i64(t0, get_field(s, v1), dst_idx, es); + gen_addi_and_wrap_i64(s, o->addr1, o->addr1, bytes); + } + } + tcg_temp_free(t0); + tcg_temp_free(t1); + return DISAS_NEXT; +} + + + +static DisasJumpType op_vsteb(DisasContext *s, DisasOps *o) +{ + const uint8_t es = (9 == s->fields.op2) ? 1 : 1 ^ (s->fields.op2 & 3); + const uint8_t enr = get_field(s, m3); + const uint8_t bytes = 1 << es; + TCGv_i64 tmp; + + if (!valid_vec_element(enr, es)) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + tmp = tcg_temp_new_i64(); + read_vec_element_i64(tmp, get_field(s, v1), enr, es); + tcg_gen_bswap64_i64(tmp, tmp); + tcg_gen_rotri_i64(tmp, tmp, 64 - 8 * bytes); + tcg_gen_qemu_st_i64(tmp, o->addr1, get_mem_index(s), MO_TE | es); + tcg_temp_free_i64(tmp); + return DISAS_NEXT; +} + + +static DisasJumpType op_vstbr(DisasContext *s, DisasOps *o) +{ + const uint8_t v1 = get_field(s, v1); + const uint8_t es = get_field(s, m3); + const uint8_t bytes = 1 << es; + uint32_t src_idx; + + if (es == ES_8 || es > ES_128) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + TCGv_i64 t0 = tcg_const_i64(16); + gen_helper_probe_write_access(cpu_env, o->addr1, t0); + + if (es >= ES_64) { + read_vec_element_i64(t0, v1, (es > ES_64) ? 1 : 0, ES_64); + tcg_gen_bswap64_i64(t0, t0); + tcg_gen_qemu_st_i64(t0, o->addr1, get_mem_index(s), MO_TEUQ); + gen_addi_and_wrap_i64(s, o->addr1, o->addr1, 8); + read_vec_element_i64(t0, v1, (es > ES_64) ? 0 : 1, ES_64); + tcg_gen_bswap64_i64(t0, t0); + tcg_gen_qemu_st_i64(t0, o->addr1, get_mem_index(s), MO_TEUQ); + } else { + for (src_idx = 0; src_idx < NUM_VEC_ELEMENTS(es); src_idx++) { + read_vec_element_i64(t0, v1, src_idx, es); + tcg_gen_bswap64_i64(t0, t0); + tcg_gen_rotri_i64(t0, t0, 64 - 8 * bytes); + tcg_gen_qemu_st_i64(t0, o->addr1, get_mem_index(s), MO_TE | es); + gen_addi_and_wrap_i64(s, o->addr1, o->addr1, bytes); + } + } + + tcg_temp_free(t0); + return DISAS_NEXT; +} + + + static DisasJumpType op_vlbb(DisasContext *s, DisasOps *o) { const int64_t block_size = (1ull << (get_field(s, m3) + 6)); @@ -958,6 +1147,25 @@ static DisasJumpType op_vst(DisasContext *s, DisasOps *o) return DISAS_NEXT; } +static DisasJumpType op_vster(DisasContext *s, DisasOps *o) +{ + const uint8_t es = get_field(s, m3); + if (es < ES_16 || es > ES_64) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + + TCGv_ptr a0 = tcg_temp_new_ptr(); + TCGv_i64 tes = tcg_const_i64(es); + + tcg_gen_addi_ptr(a0, cpu_env, vec_full_reg_offset(get_field(s, v1))); + gen_helper_vster(cpu_env, a0, o->addr1, tes); + + tcg_temp_free_i64(tes); + tcg_temp_free_ptr(a0); + return DISAS_NEXT; +} + static DisasJumpType op_vste(DisasContext *s, DisasOps *o) { const uint8_t es = s->insn->data; @@ -2020,26 +2228,33 @@ static DisasJumpType op_ves(DisasContext *s, DisasOps *o) static DisasJumpType op_vsl(DisasContext *s, DisasOps *o) { - TCGv_i64 shift = tcg_temp_new_i64(); - - read_vec_element_i64(shift, get_field(s, v3), 7, ES_8); - if (s->fields.op2 == 0x74) { - tcg_gen_andi_i64(shift, shift, 0x7); + const bool B = 0x75 == s->fields.op2; + if (!B && s390_has_feat(S390_FEAT_VECTOR_ENH2)) { + gen_gvec_3_ool(get_field(s, v1), get_field(s, v2), + get_field(s, v3), 0, gen_helper_gvec_vsl_ve2); } else { - tcg_gen_andi_i64(shift, shift, 0x78); - } + TCGv_i64 shift = tcg_temp_new_i64(); - gen_gvec_2i_ool(get_field(s, v1), get_field(s, v2), - shift, 0, gen_helper_gvec_vsl); - tcg_temp_free_i64(shift); + read_vec_element_i64(shift, get_field(s, v3), 7, ES_8); + tcg_gen_andi_i64(shift, shift, B ? 0x78 : 7); + gen_gvec_2i_ool(get_field(s, v1), get_field(s, v2), + shift, 0, gen_helper_gvec_vsl); + tcg_temp_free_i64(shift); + } return DISAS_NEXT; } -static DisasJumpType op_vsldb(DisasContext *s, DisasOps *o) +static DisasJumpType op_vsld(DisasContext *s, DisasOps *o) { - const uint8_t i4 = get_field(s, i4) & 0xf; - const int left_shift = (i4 & 7) * 8; - const int right_shift = 64 - left_shift; + const uint8_t mask = (0x86 == s->fields.op2) ? 7 : 15; + const uint8_t mul = (0x86 == s->fields.op2) ? 1 : 8; + const uint8_t i4 = get_field(s, i4); + const int shift = 64 - (i4 & 7) * mul; + + if (i4 & ~mask) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } TCGv_i64 t0 = tcg_temp_new_i64(); TCGv_i64 t1 = tcg_temp_new_i64(); TCGv_i64 t2 = tcg_temp_new_i64(); @@ -2053,8 +2268,8 @@ static DisasJumpType op_vsldb(DisasContext *s, DisasOps *o) read_vec_element_i64(t1, get_field(s, v3), 0, ES_64); read_vec_element_i64(t2, get_field(s, v3), 1, ES_64); } - tcg_gen_extract2_i64(t0, t1, t0, right_shift); - tcg_gen_extract2_i64(t1, t2, t1, right_shift); + tcg_gen_extract2_i64(t0, t1, t0, shift); + tcg_gen_extract2_i64(t1, t2, t1, shift); write_vec_element_i64(t0, get_field(s, v1), 0, ES_64); write_vec_element_i64(t1, get_field(s, v1), 1, ES_64); @@ -2064,37 +2279,66 @@ static DisasJumpType op_vsldb(DisasContext *s, DisasOps *o) return DISAS_NEXT; } -static DisasJumpType op_vsra(DisasContext *s, DisasOps *o) +static DisasJumpType op_vsrd(DisasContext *s, DisasOps *o) { - TCGv_i64 shift = tcg_temp_new_i64(); + const uint8_t i4 = get_field(s, i4); + const int left_shift = (i4 & 7); + if (i4 & ~7) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + TCGv_i64 t0 = tcg_temp_new_i64(); + TCGv_i64 t1 = tcg_temp_new_i64(); + TCGv_i64 t2 = tcg_temp_new_i64(); + + read_vec_element_i64(t0, get_field(s, v2), 1, ES_64); + read_vec_element_i64(t1, get_field(s, v3), 0, ES_64); + read_vec_element_i64(t2, get_field(s, v3), 1, ES_64); + + tcg_gen_extract2_i64(t0, t1, t0, left_shift); + tcg_gen_extract2_i64(t1, t2, t1, left_shift); + write_vec_element_i64(t0, get_field(s, v1), 0, ES_64); + write_vec_element_i64(t1, get_field(s, v1), 1, ES_64); + + tcg_temp_free(t0); + tcg_temp_free(t1); + tcg_temp_free(t2); + return DISAS_NEXT; +} - read_vec_element_i64(shift, get_field(s, v3), 7, ES_8); - if (s->fields.op2 == 0x7e) { - tcg_gen_andi_i64(shift, shift, 0x7); +static DisasJumpType op_vsra(DisasContext *s, DisasOps *o) +{ + const bool B = 0x7f == s->fields.op2; + if (!B && s390_has_feat(S390_FEAT_VECTOR_ENH2)) { + gen_gvec_3_ool(get_field(s, v1), get_field(s, v2), + get_field(s, v3), 0, gen_helper_gvec_vsra_ve2); } else { - tcg_gen_andi_i64(shift, shift, 0x78); - } + TCGv_i64 shift = tcg_temp_new_i64(); - gen_gvec_2i_ool(get_field(s, v1), get_field(s, v2), - shift, 0, gen_helper_gvec_vsra); - tcg_temp_free_i64(shift); + read_vec_element_i64(shift, get_field(s, v3), 7, ES_8); + tcg_gen_andi_i64(shift, shift, B ? 0x78 : 7); + gen_gvec_2i_ool(get_field(s, v1), get_field(s, v2), + shift, 0, gen_helper_gvec_vsra); + tcg_temp_free_i64(shift); + } return DISAS_NEXT; } static DisasJumpType op_vsrl(DisasContext *s, DisasOps *o) { - TCGv_i64 shift = tcg_temp_new_i64(); - - read_vec_element_i64(shift, get_field(s, v3), 7, ES_8); - if (s->fields.op2 == 0x7c) { - tcg_gen_andi_i64(shift, shift, 0x7); + const bool B = 0x7d == s->fields.op2; + if (!B && s390_has_feat(S390_FEAT_VECTOR_ENH2)) { + gen_gvec_3_ool(get_field(s, v1), get_field(s, v2), + get_field(s, v3), 0, gen_helper_gvec_vsrl_ve2); } else { - tcg_gen_andi_i64(shift, shift, 0x78); - } + TCGv_i64 shift = tcg_temp_new_i64(); - gen_gvec_2i_ool(get_field(s, v1), get_field(s, v2), - shift, 0, gen_helper_gvec_vsrl); - tcg_temp_free_i64(shift); + read_vec_element_i64(shift, get_field(s, v3), 7, ES_8); + tcg_gen_andi_i64(shift, shift, B ? 0x78 : 7); + gen_gvec_2i_ool(get_field(s, v1), get_field(s, v2), + shift, 0, gen_helper_gvec_vsrl); + tcg_temp_free_i64(shift); + } return DISAS_NEXT; } @@ -2497,6 +2741,23 @@ static DisasJumpType op_vstrc(DisasContext *s, DisasOps *o) return DISAS_NEXT; } +static DisasJumpType op_vstrs(DisasContext *s, DisasOps *o) +{ + const uint8_t es = get_field(s, m5); + const uint32_t D = get_field(s, m6); + + if (es > ES_32) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + gen_gvec_4_ptr(get_field(s, v1), get_field(s, v2), + get_field(s, v3), get_field(s, v4), + cpu_env, (D << 16) | es, gen_helper_vstrs); + + set_cc_static(s); + return DISAS_NEXT; +} + static DisasJumpType op_vfa(DisasContext *s, DisasOps *o) { const uint8_t fpf = get_field(s, m4); @@ -2720,23 +2981,59 @@ static DisasJumpType op_vcdg(DisasContext *s, DisasOps *o) switch (s->fields.op2) { case 0xc3: - if (fpf == FPF_LONG) { + switch (fpf) { + case FPF_LONG: fn = gen_helper_gvec_vcdg64; + break; + case FPF_SHORT: + if (s390_has_feat(S390_FEAT_VECTOR_ENH2)) { + fn = gen_helper_gvec_vcdg32; + } + break; + default: + break; } break; case 0xc1: - if (fpf == FPF_LONG) { + switch (fpf) { + case FPF_LONG: fn = gen_helper_gvec_vcdlg64; + break; + case FPF_SHORT: + if (s390_has_feat(S390_FEAT_VECTOR_ENH2)) { + fn = gen_helper_gvec_vcdlg32; + } + break; + default: + break; } break; case 0xc2: - if (fpf == FPF_LONG) { + switch (fpf) { + case FPF_LONG: fn = gen_helper_gvec_vcgd64; + break; + case FPF_SHORT: + if (s390_has_feat(S390_FEAT_VECTOR_ENH2)) { + fn = gen_helper_gvec_vcgd32; + } + break; + default: + break; } break; case 0xc0: - if (fpf == FPF_LONG) { + switch (fpf) { + case FPF_LONG: fn = gen_helper_gvec_vclgd64; + break; + case FPF_SHORT: + if (s390_has_feat(S390_FEAT_VECTOR_ENH2)) { + fn = gen_helper_gvec_vclgd32; + } + break; + default: + break; } break; case 0xc7: diff --git a/target/s390x/tcg/vec.h b/target/s390x/tcg/vec.h index a6e361869b..92291982ec 100644 --- a/target/s390x/tcg/vec.h +++ b/target/s390x/tcg/vec.h @@ -138,4 +138,34 @@ static inline void s390_vec_write_element(S390Vector *v, uint8_t enr, } } +static inline void s390_vec_reverse(S390Vector *vdst, + S390Vector *vsrc, uint8_t es) +{ + const uint8_t elems = 1 << (4 - es); + uint32_t enr; + + for (enr = 0; enr < elems; enr++) { + switch (es) { + case MO_8: + s390_vec_write_element8(vdst, enr, + s390_vec_read_element8(vsrc, 15 ^ enr)); + break; + case MO_16: + s390_vec_write_element16(vdst, enr, + s390_vec_read_element16(vsrc, 7 ^ enr)); + break; + case MO_32: + s390_vec_write_element32(vdst, enr, + s390_vec_read_element32(vsrc, 3 ^ enr)); + break; + case MO_64: + s390_vec_write_element64(vdst, enr, + s390_vec_read_element64(vsrc, 1 ^ enr)); + break; + default: + g_assert_not_reached(); + } + } +} + #endif /* S390X_VEC_H */ diff --git a/target/s390x/tcg/vec_fpu_helper.c b/target/s390x/tcg/vec_fpu_helper.c index 1a77993471..4183dcdb52 100644 --- a/target/s390x/tcg/vec_fpu_helper.c +++ b/target/s390x/tcg/vec_fpu_helper.c @@ -176,6 +176,31 @@ static void vop128_2(S390Vector *v1, const S390Vector *v2, CPUS390XState *env, *v1 = tmp; } +static float32 vcdg32(float32 a, float_status *s) +{ + return int32_to_float32(a, s); +} + +static float32 vcdlg32(float32 a, float_status *s) +{ + return uint32_to_float32(a, s); +} + +static float32 vcgd32(float32 a, float_status *s) +{ + const float32 tmp = float32_to_int32(a, s); + + return float32_is_any_nan(a) ? INT32_MIN : tmp; +} + +static float32 vclgd32(float32 a, float_status *s) +{ + const float32 tmp = float32_to_uint32(a, s); + + return float32_is_any_nan(a) ? 0 : tmp; +} + + static float64 vcdg64(float64 a, float_status *s) { return int64_to_float64(a, s); @@ -211,6 +236,9 @@ void HELPER(gvec_##NAME##BITS)(void *v1, const void *v2, CPUS390XState *env, \ vop##BITS##_2(v1, v2, env, se, XxC, erm, FN, GETPC()); \ } +#define DEF_GVEC_VOP2_32(NAME) \ +DEF_GVEC_VOP2_FN(NAME, NAME##32, 32) + #define DEF_GVEC_VOP2_64(NAME) \ DEF_GVEC_VOP2_FN(NAME, NAME##64, 64) @@ -219,6 +247,11 @@ DEF_GVEC_VOP2_FN(NAME, float32_##OP, 32) \ DEF_GVEC_VOP2_FN(NAME, float64_##OP, 64) \ DEF_GVEC_VOP2_FN(NAME, float128_##OP, 128) +DEF_GVEC_VOP2_32(vcdg) +DEF_GVEC_VOP2_32(vcdlg) +DEF_GVEC_VOP2_32(vcgd) +DEF_GVEC_VOP2_32(vclgd) + DEF_GVEC_VOP2_64(vcdg) DEF_GVEC_VOP2_64(vcdlg) DEF_GVEC_VOP2_64(vcgd) diff --git a/target/s390x/tcg/vec_helper.c b/target/s390x/tcg/vec_helper.c index ededf13cf0..bc04005e10 100644 --- a/target/s390x/tcg/vec_helper.c +++ b/target/s390x/tcg/vec_helper.c @@ -212,3 +212,36 @@ void HELPER(vstl)(CPUS390XState *env, const void *v1, uint64_t addr, *(S390Vector *)v1 = tmp; } } + + +void HELPER(vler)(CPUS390XState *env, void *v1, uint64_t addr, uint64_t es) +{ + uint64_t t0, t1; + t0 = cpu_ldq_data_ra(env, addr, GETPC()); + addr = wrap_address(env, addr + 8); + t1 = cpu_ldq_data_ra(env, addr, GETPC()); + + if (MO_64 == es) { + s390_vec_write_element64(v1, 1, t0); + s390_vec_write_element64(v1, 0, t1); + } else { + S390Vector tmp = {}; + s390_vec_write_element64(&tmp, 0, t0); + s390_vec_write_element64(&tmp, 1, t1); + s390_vec_reverse(v1, &tmp, (uint8_t)es); + } +} + + +void HELPER(vster)(CPUS390XState *env, void *v1, uint64_t addr, uint64_t es) +{ + S390Vector tmp = {}; + /* Probe write access before actually modifying memory */ + probe_write_access(env, addr, 16, GETPC()); + + s390_vec_reverse(&tmp, v1, (uint8_t)es); + + cpu_stq_data_ra(env, addr, tmp.doubleword[0], GETPC()); + addr = wrap_address(env, addr + 8); + cpu_stq_data_ra(env, addr, tmp.doubleword[1], GETPC()); +} diff --git a/target/s390x/tcg/vec_int_helper.c b/target/s390x/tcg/vec_int_helper.c index 5561b3ed90..1823fd060d 100644 --- a/target/s390x/tcg/vec_int_helper.c +++ b/target/s390x/tcg/vec_int_helper.c @@ -540,18 +540,77 @@ void HELPER(gvec_vsl)(void *v1, const void *v2, uint64_t count, s390_vec_shl(v1, v2, count); } + +void HELPER(gvec_vsl_ve2)(void *v1, const void *v2, const void *v3, + uint32_t desc) +{ + uint8_t i, v; + S390Vector tmp = {}; + for (i = 0; i < 16; i++) { + const uint8_t shift = s390_vec_read_element8(v3, i) & 7; + v = s390_vec_read_element8(v2, i); + + if (shift) { + v <<= shift; + if (i < 15) { + v |= extract8(s390_vec_read_element8(v2, i + 1), + 8 - shift, shift); + } + } + s390_vec_write_element8(&tmp, i, v); + } + *(S390Vector *)v1 = tmp; +} + void HELPER(gvec_vsra)(void *v1, const void *v2, uint64_t count, uint32_t desc) { s390_vec_sar(v1, v2, count); } +void HELPER(gvec_vsra_ve2)(void *v1, const void *v2, const void *v3, + uint32_t desc) +{ + int i; + uint8_t t, v; + S390Vector tmp = {}; + for (i = 0; i < 16; i++) { + const uint8_t shift = s390_vec_read_element8(v3, i) & 7; + v = s390_vec_read_element8(v2, i); + if (shift) { + t = i > 0 ? s390_vec_read_element8(v2, i - 1) + : ((v & 0x80) ? ~0 : 0); + v = deposit8(v >> shift, 8 - shift, shift, t); + } + s390_vec_write_element8(&tmp, i, v); + } + *(S390Vector *)v1 = tmp; +} + void HELPER(gvec_vsrl)(void *v1, const void *v2, uint64_t count, uint32_t desc) { s390_vec_shr(v1, v2, count); } +void HELPER(gvec_vsrl_ve2)(void *v1, const void *v2, const void *v3, + uint32_t desc) +{ + int i; + uint8_t t, v; + S390Vector tmp = {}; + for (i = 0; i < 16; i++) { + const uint8_t shift = s390_vec_read_element8(v3, i) & 7; + v = s390_vec_read_element8(v2, i) >> shift; + if (shift) { + t = (0 == i ? 0 : s390_vec_read_element8(v2, i - 1)); + v = deposit8(v, 8 - shift, shift, t); + } + s390_vec_write_element8(&tmp, i, v); + } + *(S390Vector *)v1 = tmp; +} + #define DEF_VSCBI(BITS) \ void HELPER(gvec_vscbi##BITS)(void *v1, const void *v2, const void *v3, \ uint32_t desc) \ diff --git a/target/s390x/tcg/vec_string_helper.c b/target/s390x/tcg/vec_string_helper.c index ac315eb095..22c14c6925 100644 --- a/target/s390x/tcg/vec_string_helper.c +++ b/target/s390x/tcg/vec_string_helper.c @@ -471,3 +471,68 @@ void HELPER(gvec_vstrc_cc_rt##BITS)(void *v1, const void *v2, const void *v3, \ DEF_VSTRC_CC_RT_HELPER(8) DEF_VSTRC_CC_RT_HELPER(16) DEF_VSTRC_CC_RT_HELPER(32) + +void HELPER(vstrs)(void *v1, const void *v2, const void *v3, void *v4, + CPUS390XState *env, uint32_t desc) { + const bool zs = (desc >> 16); + const uint8_t es = desc & 16; + const uint8_t char_size = 1 << es; + + uint32_t str_len = 0, eos = 0; + uint32_t i = 0, j = 0, k = 0, cc = 0; + uint32_t substr_len = ((uint8_t *)v4)[H1(7)] & 31; + + for (i = 0; i < 16; i += char_size) { + if (0 == es && !((uint8_t *)v3)[H1(i >> es)]) { break; } + if (1 == es && !((uint16_t *)v3)[H2(i >> es)]) { break; } + if (2 == es && !((uint32_t *)v3)[H4(i >> es)]) { break; } + } + if (i < substr_len) { + substr_len = i; + } + if (substr_len) { + if (zs) { + for (k = 0; k < 16; k += char_size) { + if (0 == es && !((uint8_t *)v2)[H1(k >> es)]) { break; } + if (1 == es && !((uint16_t *)v2)[H2(k >> es)]) { break; } + if (2 == es && !((uint32_t *)v2)[H4(k >> es)]) { break; } + } + eos = (16 != k); + str_len = k; + } else { + str_len = 16; + } + + for (k = 0; k < str_len; k += char_size) { + if (0 == es && ((uint8_t *)v3)[H1(0)] + == ((uint8_t *)v2)[H1(k >> es)]) { break; } + if (1 == es && ((uint16_t *)v3)[H2(0)] + == ((uint16_t *)v2)[H2(k >> es)]) { break; } + if (2 == es && ((uint32_t *)v3)[H4(0)] + == ((uint32_t *)v2)[H4(k >> es)]) { break; } + } + + if (k < 16 && (!eos || (k + substr_len) <= str_len)) { + if ((k + substr_len) <= 16) { + for (j = 0; j < substr_len; j += char_size) { + if (0 == es && ((uint8_t *)v3)[H1(j >> es)] + != ((uint8_t *)v2)[H1((k + j) >> es)]) { break; } + if (1 == es && ((uint16_t *)v3)[H2(j >> es)] + != ((uint16_t *)v2)[H2((k + j) >> es)]) { break; } + if (2 == es && ((uint32_t *)v3)[H4(j >> es)] + != ((uint32_t *)v2)[H4((k + j) >> es)]) { break; } + } + } + cc = (j == substr_len) ? 2 : 3; + } else { + cc = eos ? 1 : 0; + k = 16; + } + } else { + cc = 2; + } + + ((uint64_t *)v1)[0] = ((uint64_t *)v1)[1] = 0; + ((uint8_t *)v1)[H1(7)] = k; + env->cc_op = cc; +} -- 2.34.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v1 1/2] s390x/tcg: Implement Vector-Enhancements Facility 2 for s390x 2022-03-03 3:22 ` [PATCH v1 1/2] s390x/tcg: Implement Vector-Enhancements Facility 2 for s390x David Miller @ 2022-03-03 8:58 ` Richard Henderson 2022-03-03 16:50 ` David Miller 0 siblings, 1 reply; 9+ messages in thread From: Richard Henderson @ 2022-03-03 8:58 UTC (permalink / raw) To: David Miller, qemu-s390x, qemu-devel Cc: thuth, david, cohuck, farman, pasic, borntraeger On 3/2/22 17:22, David Miller wrote: > resolves: https://gitlab.com/qemu-project/qemu/-/issues/738 > > implements: > VECTOR LOAD ELEMENTS REVERSED (VLER) > VECTOR LOAD BYTE REVERSED ELEMENTS (VLBR) > VECTOR LOAD BYTE REVERSED ELEMENT (VLEBRH, VLEBRF, VLEBRG) > VECTOR LOAD BYTE REVERSED ELEMENT AND ZERO (VLLEBRZ) > VECTOR LOAD BYTE REVERSED ELEMENT AND REPLOCATE (VLBRREP) > VECTOR STORE ELEMENTS REVERSED (VSTER) > VECTOR STORE BYTE REVERSED ELEMENTS (VSTBR) > VECTOR STORE BYTE REVERSED ELEMENTS (VSTEBRH, VSTEBRF, VSTEBRG) > VECTOR SHIFT LEFT DOUBLE BY BIT (VSLD) > VECTOR SHIFT RIGHT DOUBLE BY BIT (VSRD) > VECTOR STRING SEARCH (VSTRS) > > modifies: > VECTOR FP CONVERT FROM FIXED (VCFPS) > VECTOR FP CONVERT FROM LOGICAL (VCFPL) > VECTOR FP CONVERT TO FIXED (VCSFP) > VECTOR FP CONVERT TO LOGICAL (VCLFP) > VECTOR SHIFT LEFT (VSL) > VECTOR SHIFT RIGHT ARITHMETIC (VSRA) > VECTOR SHIFT RIGHT LOGICAL (VSRL) > > Signed-off-by: David Miller <dmiller423@gmail.com> Too many changes in one patch. You need to split these into smaller, logical units. > +/* VECTOR LOAD BYTE REVERSED ELEMENT AND ZERO */ > + F(0xe604, VLLEBRZ, VRX, VE2, la2, 0, 0, 0, vllebrz, 0, IF_VEC) > +/* VECTOR LOAD BYTE REVERSED ELEMENTS */ > + F(0xe606, VLBR, VRX, VE2, la2, 0, 0, 0, vlbr, 0, IF_VEC) > +/* VECTOR LOAD ELEMENTS REVERSED */ > + F(0xe607, VLER, VRX, VE2, la2, 0, 0, 0, vler, 0, IF_VEC) Tabs, and more later. > @@ -457,6 +457,9 @@ static DisasJumpType op_vlrep(DisasContext *s, DisasOps *o) > return DISAS_NEXT; > } > > + > + > + > static DisasJumpType op_vle(DisasContext *s, DisasOps *o) Do not add pointless whitespace. > +static DisasJumpType op_vlebr(DisasContext *s, DisasOps *o) > +{ > + const uint8_t es = (1 == s->fields.op2) ? 1 : (1 ^ s->fields.op2); > + const uint8_t enr = get_field(s, m3); > + TCGv_i64 tmp; > + > + if (es < ES_16 || es > ES_64 || !valid_vec_element(enr, es)) { > + gen_program_exception(s, PGM_SPECIFICATION); > + return DISAS_NORETURN; > + } > + > + tmp = tcg_temp_new_i64(); > + tcg_gen_qemu_ld_i64(tmp, o->addr1, get_mem_index(s), MO_TE | es); Just use a little-endian load: MO_LE | es. While we use MO_TE all over, it's no secret that it's always big-endian. And everywhere else you do load then swap, or swap then store. > +} > + > + > + > +static DisasJumpType op_vsteb(DisasContext *s, DisasOps *o) More care with spacing. > +static inline void s390_vec_reverse(S390Vector *vdst, > + S390Vector *vsrc, uint8_t es) > +{ > + const uint8_t elems = 1 << (4 - es); > + uint32_t enr; > + > + for (enr = 0; enr < elems; enr++) { > + switch (es) { > + case MO_8: > + s390_vec_write_element8(vdst, enr, > + s390_vec_read_element8(vsrc, 15 ^ enr)); > + break; > + case MO_16: > + s390_vec_write_element16(vdst, enr, > + s390_vec_read_element16(vsrc, 7 ^ enr)); > + break; > + case MO_32: > + s390_vec_write_element32(vdst, enr, > + s390_vec_read_element32(vsrc, 3 ^ enr)); > + break; > + case MO_64: > + s390_vec_write_element64(vdst, enr, > + s390_vec_read_element64(vsrc, 1 ^ enr)); > + break; > + default: > + g_assert_not_reached(); > + } > + } > +} This seems likely to go wrong for vdst == vsrc. In addition, swapping the order of elements is something that can be done in parallel. l = src[lo], h = src[hi]; switch (es) { case MO_64: dst[hi] = l, dst[lo] = h; break; case MO_8: dst[hi] = bswap64(l); dst[lo] = bswap64(h); break; case MO_16: dst[hi] = hswap64(l); dst[lo] = hswap64(h); break; case MO_32: dst[hi] = wswap64(l); dst[hi] = wswap64(h); break; } which, really, can all be generated inline. r~ ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v1 1/2] s390x/tcg: Implement Vector-Enhancements Facility 2 for s390x 2022-03-03 8:58 ` Richard Henderson @ 2022-03-03 16:50 ` David Miller 2022-03-03 17:42 ` Richard Henderson 0 siblings, 1 reply; 9+ messages in thread From: David Miller @ 2022-03-03 16:50 UTC (permalink / raw) To: Richard Henderson Cc: Thomas Huth, David Hildenbrand, farman, cohuck, qemu-devel, pasic, qemu-s390x, Christian Borntraeger [-- Attachment #1: Type: text/plain, Size: 5531 bytes --] > Too many changes in one patch. > You need to split these into smaller, logical units. Can you give some guideline on that? IE: change to two, the shifts and reversed loads into two patches or more on line count of each patch? . > Tabs, and more later. The tabs should not happen at all, I disabled them in editor will figure out how they've reappeared. > This seems likely to go wrong for vdst == vsrc. > In addition, swapping the order of elements is something that can be done in parallel. There is always an even number of elements. Will make the change there however, that code is more concise. > Just use a little-endian load: MO_LE | es. > While we use MO_TE all over, it's no secret that it's always big-endian. > And everywhere else you do load then swap, or swap then store. I wasn't sure if there was a reason MO_TE was used so just kept with the existing code flow. Thanks - David Miller On Thu, Mar 3, 2022 at 3:58 AM Richard Henderson < richard.henderson@linaro.org> wrote: > On 3/2/22 17:22, David Miller wrote: > > resolves: https://gitlab.com/qemu-project/qemu/-/issues/738 > > > > implements: > > VECTOR LOAD ELEMENTS REVERSED (VLER) > > VECTOR LOAD BYTE REVERSED ELEMENTS (VLBR) > > VECTOR LOAD BYTE REVERSED ELEMENT (VLEBRH, VLEBRF, VLEBRG) > > VECTOR LOAD BYTE REVERSED ELEMENT AND ZERO (VLLEBRZ) > > VECTOR LOAD BYTE REVERSED ELEMENT AND REPLOCATE (VLBRREP) > > VECTOR STORE ELEMENTS REVERSED (VSTER) > > VECTOR STORE BYTE REVERSED ELEMENTS (VSTBR) > > VECTOR STORE BYTE REVERSED ELEMENTS (VSTEBRH, VSTEBRF, VSTEBRG) > > VECTOR SHIFT LEFT DOUBLE BY BIT (VSLD) > > VECTOR SHIFT RIGHT DOUBLE BY BIT (VSRD) > > VECTOR STRING SEARCH (VSTRS) > > > > modifies: > > VECTOR FP CONVERT FROM FIXED (VCFPS) > > VECTOR FP CONVERT FROM LOGICAL (VCFPL) > > VECTOR FP CONVERT TO FIXED (VCSFP) > > VECTOR FP CONVERT TO LOGICAL (VCLFP) > > VECTOR SHIFT LEFT (VSL) > > VECTOR SHIFT RIGHT ARITHMETIC (VSRA) > > VECTOR SHIFT RIGHT LOGICAL (VSRL) > > > > Signed-off-by: David Miller <dmiller423@gmail.com> > > Too many changes in one patch. > You need to split these into smaller, logical units. > > > +/* VECTOR LOAD BYTE REVERSED ELEMENT AND ZERO */ > > + F(0xe604, VLLEBRZ, VRX, VE2, la2, 0, 0, 0, vllebrz, 0, IF_VEC) > > +/* VECTOR LOAD BYTE REVERSED ELEMENTS */ > > + F(0xe606, VLBR, VRX, VE2, la2, 0, 0, 0, vlbr, 0, IF_VEC) > > +/* VECTOR LOAD ELEMENTS REVERSED */ > > + F(0xe607, VLER, VRX, VE2, la2, 0, 0, 0, vler, 0, IF_VEC) > > Tabs, and more later. > > > @@ -457,6 +457,9 @@ static DisasJumpType op_vlrep(DisasContext *s, > DisasOps *o) > > return DISAS_NEXT; > > } > > > > + > > + > > + > > static DisasJumpType op_vle(DisasContext *s, DisasOps *o) > > Do not add pointless whitespace. > > > +static DisasJumpType op_vlebr(DisasContext *s, DisasOps *o) > > +{ > > + const uint8_t es = (1 == s->fields.op2) ? 1 : (1 ^ s->fields.op2); > > + const uint8_t enr = get_field(s, m3); > > + TCGv_i64 tmp; > > + > > + if (es < ES_16 || es > ES_64 || !valid_vec_element(enr, es)) { > > + gen_program_exception(s, PGM_SPECIFICATION); > > + return DISAS_NORETURN; > > + } > > + > > + tmp = tcg_temp_new_i64(); > > + tcg_gen_qemu_ld_i64(tmp, o->addr1, get_mem_index(s), MO_TE | es); > > Just use a little-endian load: MO_LE | es. > While we use MO_TE all over, it's no secret that it's always big-endian. > > And everywhere else you do load then swap, or swap then store. > > > +} > > + > > + > > + > > +static DisasJumpType op_vsteb(DisasContext *s, DisasOps *o) > > More care with spacing. > > > +static inline void s390_vec_reverse(S390Vector *vdst, > > + S390Vector *vsrc, uint8_t es) > > +{ > > + const uint8_t elems = 1 << (4 - es); > > + uint32_t enr; > > + > > + for (enr = 0; enr < elems; enr++) { > > + switch (es) { > > + case MO_8: > > + s390_vec_write_element8(vdst, enr, > > + s390_vec_read_element8(vsrc, 15 ^ enr)); > > + break; > > + case MO_16: > > + s390_vec_write_element16(vdst, enr, > > + s390_vec_read_element16(vsrc, 7 ^ enr)); > > + break; > > + case MO_32: > > + s390_vec_write_element32(vdst, enr, > > + s390_vec_read_element32(vsrc, 3 ^ enr)); > > + break; > > + case MO_64: > > + s390_vec_write_element64(vdst, enr, > > + s390_vec_read_element64(vsrc, 1 ^ enr)); > > + break; > > + default: > > + g_assert_not_reached(); > > + } > > + } > > +} > > This seems likely to go wrong for vdst == vsrc. > In addition, swapping the order of elements is something that can be done > in parallel. > > l = src[lo], h = src[hi]; > switch (es) { > case MO_64: > dst[hi] = l, dst[lo] = h; > break; > case MO_8: > dst[hi] = bswap64(l); > dst[lo] = bswap64(h); > break; > case MO_16: > dst[hi] = hswap64(l); > dst[lo] = hswap64(h); > break; > case MO_32: > dst[hi] = wswap64(l); > dst[hi] = wswap64(h); > break; > } > > which, really, can all be generated inline. > > > r~ > [-- Attachment #2: Type: text/html, Size: 8818 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v1 1/2] s390x/tcg: Implement Vector-Enhancements Facility 2 for s390x 2022-03-03 16:50 ` David Miller @ 2022-03-03 17:42 ` Richard Henderson 2022-03-03 18:01 ` David Miller 0 siblings, 1 reply; 9+ messages in thread From: Richard Henderson @ 2022-03-03 17:42 UTC (permalink / raw) To: David Miller Cc: Thomas Huth, David Hildenbrand, farman, cohuck, qemu-devel, pasic, qemu-s390x, Christian Borntraeger On 3/3/22 06:50, David Miller wrote: > > > Too many changes in one patch. > > You need to split these into smaller, logical units. > > Can you give some guideline on that? > IE: change to two, the shifts and reversed loads into two patches or more on line count > of each patch? Your best guide is line count: < 50 is ideal, though of course that can't always be done. For bug fixes or code reorg you may find yourself constrained by not breaking bisection. But for new code, like this, one patch per feature is easiest to review. In this case you've got: - load/store elements reversed, - load/store byte reversed elements, - shift double - string search - modify fp convert - modify shift > I wasn't sure if there was a reason MO_TE was used so just kept with the existing code flow. We have to put some indication of endianness there, and "target" endian was the easiest to replicate across all targets. Especially with those that are bi-endian. I've just noticed that we haven't propagated this to the integer load/store reversed. I presume that code pre-dates the existence of the feature. But it would be good to change C(0xe31f, LRVH, RXY_a, Z, 0, m2_16u, new, r1_16, rev16, 0) C(0xe31e, LRV, RXY_a, Z, 0, m2_32u, new, r1_32, rev32, 0) C(0xe30f, LRVG, RXY_a, Z, 0, m2_64, r1, 0, rev64, 0) ... C(0xe33f, STRVH, RXY_a, Z, la2, r1_16u, new, m1_16, rev16, 0) C(0xe33e, STRV, RXY_a, Z, la2, r1_32u, new, m1_32, rev32, 0) C(0xe32f, STRVG, RXY_a, Z, la2, r1_o, new, m1_64, rev64, 0) to use little-endian memory ops, rather than separately reversing the bytes. r~ ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v1 1/2] s390x/tcg: Implement Vector-Enhancements Facility 2 for s390x 2022-03-03 17:42 ` Richard Henderson @ 2022-03-03 18:01 ` David Miller 2022-03-03 18:04 ` David Hildenbrand 0 siblings, 1 reply; 9+ messages in thread From: David Miller @ 2022-03-03 18:01 UTC (permalink / raw) To: Richard Henderson Cc: Thomas Huth, David Hildenbrand, farman, cohuck, qemu-devel, pasic, qemu-s390x, Christian Borntraeger [-- Attachment #1: Type: text/plain, Size: 2069 bytes --] Makes sense, thanks for the quick reply. Last question, the patches can depend on others in the same set right? IE: all of the additions to insn-data.def in one, implementations in separate patches. Thanks - David Miller On Thu, Mar 3, 2022 at 12:42 PM Richard Henderson < richard.henderson@linaro.org> wrote: > On 3/3/22 06:50, David Miller wrote: > > > > > Too many changes in one patch. > > > You need to split these into smaller, logical units. > > > > Can you give some guideline on that? > > IE: change to two, the shifts and reversed loads into two patches or > more on line count > > of each patch? > > Your best guide is line count: < 50 is ideal, though of course that can't > always be done. > For bug fixes or code reorg you may find yourself constrained by not > breaking bisection. > > But for new code, like this, one patch per feature is easiest to review. > In this case > you've got: > > - load/store elements reversed, > - load/store byte reversed elements, > - shift double > - string search > - modify fp convert > - modify shift > > > I wasn't sure if there was a reason MO_TE was used so just kept with the > existing code flow. > > We have to put some indication of endianness there, and "target" endian > was the easiest to > replicate across all targets. Especially with those that are bi-endian. > > I've just noticed that we haven't propagated this to the integer > load/store reversed. I > presume that code pre-dates the existence of the feature. But it would be > good to change > > C(0xe31f, LRVH, RXY_a, Z, 0, m2_16u, new, r1_16, rev16, 0) > C(0xe31e, LRV, RXY_a, Z, 0, m2_32u, new, r1_32, rev32, 0) > C(0xe30f, LRVG, RXY_a, Z, 0, m2_64, r1, 0, rev64, 0) > ... > C(0xe33f, STRVH, RXY_a, Z, la2, r1_16u, new, m1_16, rev16, 0) > C(0xe33e, STRV, RXY_a, Z, la2, r1_32u, new, m1_32, rev32, 0) > C(0xe32f, STRVG, RXY_a, Z, la2, r1_o, new, m1_64, rev64, 0) > > to use little-endian memory ops, rather than separately reversing the > bytes. > > > r~ > [-- Attachment #2: Type: text/html, Size: 3011 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v1 1/2] s390x/tcg: Implement Vector-Enhancements Facility 2 for s390x 2022-03-03 18:01 ` David Miller @ 2022-03-03 18:04 ` David Hildenbrand 2022-03-07 2:02 ` David Miller 0 siblings, 1 reply; 9+ messages in thread From: David Hildenbrand @ 2022-03-03 18:04 UTC (permalink / raw) To: David Miller, Richard Henderson Cc: Thomas Huth, farman, cohuck, qemu-devel, pasic, qemu-s390x, Christian Borntraeger On 03.03.22 19:01, David Miller wrote: > > Makes sense, thanks for the quick reply. > Last question, the patches can depend on others in the same set right? > IE: all of the additions to insn-data.def in one, implementations in > separate patches. For bisectability, each patch should be self-contained and can only depend on earlier patches in the series. See my VX patches to get an idea of how it could look like, e.g., commit e58de341d948d12cb36bbc5aa4866b7412581880 Author: David Hildenbrand <david@redhat.com> Date: Wed Apr 10 22:45:35 2019 +0200 s390x/tcg: Implement VECTOR SUM ACROSS WORD Similar to VECTOR SUM ACROSS DOUBLEWORD. Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: David Hildenbrand <david@redhat.com> commit 8dc69a196eb2e3e8ab1d033b378e4f5a5efaa219 Author: David Hildenbrand <david@redhat.com> Date: Wed Apr 10 22:40:01 2019 +0200 s390x/tcg: Implement VECTOR SUM ACROSS QUADWORD Similar to VECTOR SUM ACROSS DOUBLEWORD, however without a loop and using 128-bit calculations. Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: David Hildenbrand <david@redhat.com> commit fe2be36d26b3d3e86246c88bb09a9613b99dc6c9 Author: David Hildenbrand <david@redhat.com> Date: Wed Apr 10 22:48:25 2019 +0200 s390x/tcg: Implement VECTOR SUM ACROSS DOUBLEWORD Perform the calculations without a helper. Only 16 bit or 32 bit values have to be added. Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: David Hildenbrand <david@redhat.com> commit bc725e65152c57d42f19eec134c99940114d6362 Author: David Hildenbrand <david@redhat.com> Date: Tue Apr 9 23:26:47 2019 +0200 s390x/tcg: Implement VECTOR SUBTRACT WITH BORROW COMPUTE BORROW INDICATION Mostly courtesy of Richard H. Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: David Hildenbrand <david@redhat.com> commit 48390a7c2716a128155b872d5316cda5f55dcfa9 Author: David Hildenbrand <david@redhat.com> Date: Wed Apr 10 22:15:07 2019 +0200 s390x/tcg: Implement VECTOR SUBTRACT WITH BORROW INDICATION Fairly easy as only 128-bit handling is required. Simply perform the subtraction and then subtract the borrow. Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: David Hildenbrand <david@redhat.com> -- Thanks, David / dhildenb ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v1 1/2] s390x/tcg: Implement Vector-Enhancements Facility 2 for s390x 2022-03-03 18:04 ` David Hildenbrand @ 2022-03-07 2:02 ` David Miller 0 siblings, 0 replies; 9+ messages in thread From: David Miller @ 2022-03-07 2:02 UTC (permalink / raw) To: David Hildenbrand Cc: Thomas Huth, farman, cohuck, Richard Henderson, qemu-devel, pasic, qemu-s390x, Christian Borntraeger [-- Attachment #1: Type: text/plain, Size: 3198 bytes --] > Just use a little-endian load: MO_LE | es. > While we use MO_TE all over, it's no secret that it's always big-endian. > And everywhere else you do load then swap, or swap then store. This is not working as expected... I tried it in two places, both with a swap [removed] after and the tests failed. I'm submitting the split patches with whitespace fixes. I hope it's not a dealbreaker, seeing as it matches the rest of the file this way anyhow. If it is, I will spend some more time looking into it tomorrow. Thanks, - David Miller On Thu, Mar 3, 2022 at 1:04 PM David Hildenbrand <david@redhat.com> wrote: > On 03.03.22 19:01, David Miller wrote: > > > > Makes sense, thanks for the quick reply. > > Last question, the patches can depend on others in the same set right? > > IE: all of the additions to insn-data.def in one, implementations in > > separate patches. > > For bisectability, each patch should be self-contained and can only > depend on earlier patches in the series. > > See my VX patches to get an idea of how it could look like, e.g., > > > commit e58de341d948d12cb36bbc5aa4866b7412581880 > Author: David Hildenbrand <david@redhat.com> > Date: Wed Apr 10 22:45:35 2019 +0200 > > s390x/tcg: Implement VECTOR SUM ACROSS WORD > > Similar to VECTOR SUM ACROSS DOUBLEWORD. > > Reviewed-by: Richard Henderson <richard.henderson@linaro.org> > Signed-off-by: David Hildenbrand <david@redhat.com> > > commit 8dc69a196eb2e3e8ab1d033b378e4f5a5efaa219 > Author: David Hildenbrand <david@redhat.com> > Date: Wed Apr 10 22:40:01 2019 +0200 > > s390x/tcg: Implement VECTOR SUM ACROSS QUADWORD > > Similar to VECTOR SUM ACROSS DOUBLEWORD, however without a loop and > using 128-bit calculations. > > Reviewed-by: Richard Henderson <richard.henderson@linaro.org> > Signed-off-by: David Hildenbrand <david@redhat.com> > > commit fe2be36d26b3d3e86246c88bb09a9613b99dc6c9 > Author: David Hildenbrand <david@redhat.com> > Date: Wed Apr 10 22:48:25 2019 +0200 > > s390x/tcg: Implement VECTOR SUM ACROSS DOUBLEWORD > > Perform the calculations without a helper. Only 16 bit or 32 bit values > have to be added. > > Reviewed-by: Richard Henderson <richard.henderson@linaro.org> > Signed-off-by: David Hildenbrand <david@redhat.com> > > commit bc725e65152c57d42f19eec134c99940114d6362 > Author: David Hildenbrand <david@redhat.com> > Date: Tue Apr 9 23:26:47 2019 +0200 > > s390x/tcg: Implement VECTOR SUBTRACT WITH BORROW COMPUTE BORROW > INDICATION > > Mostly courtesy of Richard H. > > Reviewed-by: Richard Henderson <richard.henderson@linaro.org> > Signed-off-by: David Hildenbrand <david@redhat.com> > > commit 48390a7c2716a128155b872d5316cda5f55dcfa9 > Author: David Hildenbrand <david@redhat.com> > Date: Wed Apr 10 22:15:07 2019 +0200 > > s390x/tcg: Implement VECTOR SUBTRACT WITH BORROW INDICATION > > Fairly easy as only 128-bit handling is required. Simply perform the > subtraction and then subtract the borrow. > > Reviewed-by: Richard Henderson <richard.henderson@linaro.org> > Signed-off-by: David Hildenbrand <david@redhat.com> > > > > -- > Thanks, > > David / dhildenb > > [-- Attachment #2: Type: text/html, Size: 6203 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v1 2/2] tests/tcg/s390x: Tests for Vector Enhancements Facility 2 2022-03-03 3:22 [PATCH v1 0/2] s390x: Add support for Vector Enhancements Facility 2 David Miller 2022-03-03 3:22 ` [PATCH v1 1/2] s390x/tcg: Implement Vector-Enhancements Facility 2 for s390x David Miller @ 2022-03-03 3:22 ` David Miller 1 sibling, 0 replies; 9+ messages in thread From: David Miller @ 2022-03-03 3:22 UTC (permalink / raw) To: qemu-s390x, qemu-devel Cc: thuth, david, cohuck, richard.henderson, farman, David Miller, pasic, borntraeger tests/tcg/s390x/vxeh2_vcvt.c tests/tcg/s390x/vxeh2_vs.c tests/tcg/s390x/vxeh2_vlstr.c Signed-off-by: David Miller <dmiller423@gmail.com> --- tests/tcg/s390x/Makefile.target | 8 ++ tests/tcg/s390x/vxeh2_vcvt.c | 97 +++++++++++++++++++++ tests/tcg/s390x/vxeh2_vlstr.c | 146 ++++++++++++++++++++++++++++++++ tests/tcg/s390x/vxeh2_vs.c | 91 ++++++++++++++++++++ 4 files changed, 342 insertions(+) create mode 100644 tests/tcg/s390x/vxeh2_vcvt.c create mode 100644 tests/tcg/s390x/vxeh2_vlstr.c create mode 100644 tests/tcg/s390x/vxeh2_vs.c diff --git a/tests/tcg/s390x/Makefile.target b/tests/tcg/s390x/Makefile.target index 54e67446aa..2a2b184056 100644 --- a/tests/tcg/s390x/Makefile.target +++ b/tests/tcg/s390x/Makefile.target @@ -16,6 +16,14 @@ TESTS+=shift TESTS+=trap TESTS+=signals-s390x +VECTOR_TESTS=vxeh2_vs +VECTOR_TESTS+=vxeh2_vcvt +VECTOR_TESTS+=vxeh2_vlstr + +TESTS+=$(VECTOR_TESTS) + +$(VECTOR_TESTS): CFLAGS+=-march=z15 -O2 + ifneq ($(HAVE_GDB_BIN),) GDB_SCRIPT=$(SRC_PATH)/tests/guest-debug/run-test.py diff --git a/tests/tcg/s390x/vxeh2_vcvt.c b/tests/tcg/s390x/vxeh2_vcvt.c new file mode 100644 index 0000000000..71ecbd77b0 --- /dev/null +++ b/tests/tcg/s390x/vxeh2_vcvt.c @@ -0,0 +1,97 @@ +/* + * vxeh2_vcvt: vector-enhancements facility 2 vector convert * + */ +#include <stdint.h> + +typedef union S390Vector { + uint64_t d[2]; /* doubleword */ + uint32_t w[4]; /* word */ + uint16_t h[8]; /* halfword */ + uint8_t b[16]; /* byte */ + float f[4]; + double fd[2]; + __uint128_t v; +} S390Vector; + +#define M_S 8 +#define M4_XxC 4 +#define M4_def M4_XxC + +static inline void vcfps(S390Vector *v1, S390Vector *v2, + const uint8_t m3, const uint8_t m4, const uint8_t m5) +{ + asm volatile("vcfps %[v1], %[v2], %[m3], %[m4], %[m5]\n" + : [v1] "=v" (v1->v) + : [v2] "v" (v2->v) + , [m3] "i" (m3) + , [m4] "i" (m4) + , [m5] "i" (m5)); +} + +static inline void vcfpl(S390Vector *v1, S390Vector *v2, + const uint8_t m3, const uint8_t m4, const uint8_t m5) +{ + asm volatile("vcfpl %[v1], %[v2], %[m3], %[m4], %[m5]\n" + : [v1] "=v" (v1->v) + : [v2] "v" (v2->v) + , [m3] "i" (m3) + , [m4] "i" (m4) + , [m5] "i" (m5)); +} + +static inline void vcsfp(S390Vector *v1, S390Vector *v2, + const uint8_t m3, const uint8_t m4, const uint8_t m5) +{ + asm volatile("vcsfp %[v1], %[v2], %[m3], %[m4], %[m5]\n" + : [v1] "=v" (v1->v) + : [v2] "v" (v2->v) + , [m3] "i" (m3) + , [m4] "i" (m4) + , [m5] "i" (m5)); +} + +static inline void vclfp(S390Vector *v1, S390Vector *v2, + const uint8_t m3, const uint8_t m4, const uint8_t m5) +{ + asm volatile("vclfp %[v1], %[v2], %[m3], %[m4], %[m5]\n" + : [v1] "=v" (v1->v) + : [v2] "v" (v2->v) + , [m3] "i" (m3) + , [m4] "i" (m4) + , [m5] "i" (m5)); +} + +int main(int argc, char *argv[]) +{ + S390Vector vd; + S390Vector vs_i32 = { .w[0] = 1, .w[1] = 64, .w[2] = 1024, .w[3] = -10 }; + S390Vector vs_u32 = { .w[0] = 2, .w[1] = 32, .w[2] = 4096, .w[3] = 8888 }; + S390Vector vs_f32 = { .f[0] = 3.987, .f[1] = 5.123, + .f[2] = 4.499, .f[3] = 0.512 }; + + vd.d[0] = vd.d[1] = 0; + vcfps(&vd, &vs_i32, 2, M4_def, 0); + if (1 != vd.f[0] || 1024 != vd.f[2] || 64 != vd.f[1] || -10 != vd.f[3]) { + return 1; + } + + vd.d[0] = vd.d[1] = 0; + vcfpl(&vd, &vs_u32, 2, M4_def, 0); + if (2 != vd.f[0] || 4096 != vd.f[2] || 32 != vd.f[1] || 8888 != vd.f[3]) { + return 1; + } + + vd.d[0] = vd.d[1] = 0; + vcsfp(&vd, &vs_f32, 2, M4_def, 0); + if (4 != vd.w[0] || 4 != vd.w[2] || 5 != vd.w[1] || 1 != vd.w[3]) { + return 1; + } + + vd.d[0] = vd.d[1] = 0; + vclfp(&vd, &vs_f32, 2, M4_def, 0); + if (4 != vd.w[0] || 4 != vd.w[2] || 5 != vd.w[1] || 1 != vd.w[3]) { + return 1; + } + + return 0; +} diff --git a/tests/tcg/s390x/vxeh2_vlstr.c b/tests/tcg/s390x/vxeh2_vlstr.c new file mode 100644 index 0000000000..bf2954e86d --- /dev/null +++ b/tests/tcg/s390x/vxeh2_vlstr.c @@ -0,0 +1,146 @@ +/* + * vxeh2_vlstr: vector-enhancements facility 2 vector load/store reversed * + */ +#include <stdint.h> + +typedef union S390Vector { + uint64_t d[2]; /* doubleword */ + uint32_t w[4]; /* word */ + uint16_t h[8]; /* halfword */ + uint8_t b[16]; /* byte */ + __uint128_t v; +} S390Vector; + +#define ES8 0 +#define ES16 1 +#define ES32 2 +#define ES64 3 + +#define vtst(v1, v2) \ + if (v1.d[0] != v2.d[0] || v1.d[1] != v2.d[1]) { \ + return 1; \ + } + +static inline void vler(S390Vector *v1, const void *va, uint8_t m3) +{ + asm volatile("vler %[v1], 0(%[va]), %[m3]\n" + : [v1] "+v" (v1->v) + : [va] "d" (va) + , [m3] "i" (m3) + : "memory"); +} + +static inline void vster(S390Vector *v1, const void *va, uint8_t m3) +{ + asm volatile("vster %[v1], 0(%[va]), %[m3]\n" + : [va] "+d" (va) + : [v1] "v" (v1->v) + , [m3] "i" (m3) + : "memory"); +} + +static inline void vlbr(S390Vector *v1, void *va, const uint8_t m3) +{ + asm volatile("vlbr %[v1], 0(%[va]), %[m3]\n" + : [v1] "+v" (v1->v) + : [va] "d" (va) + , [m3] "i" (m3) + : "memory"); +} + +static inline void vstbr(S390Vector *v1, void *va, const uint8_t m3) +{ + asm volatile("vstbr %[v1], 0(%[va]), %[m3]\n" + : [va] "+d" (va) + : [v1] "v" (v1->v) + , [m3] "i" (m3) + : "memory"); +} + + +static inline void vlebrh(S390Vector *v1, void *va, const uint8_t m3) +{ + asm volatile("vlebrh %[v1], 0(%[va]), %[m3]\n" + : [v1] "+v" (v1->v) + : [va] "d" (va) + , [m3] "i" (m3) + : "memory"); +} + +static inline void vstebrh(S390Vector *v1, void *va, const uint8_t m3) +{ + asm volatile("vstebrh %[v1], 0(%[va]), %[m3]\n" + : [va] "+d" (va) + : [v1] "v" (v1->v) + , [m3] "i" (m3) + : "memory"); +} + +static inline void vllebrz(S390Vector *v1, void *va, const uint8_t m3) +{ + asm volatile("vllebrz %[v1], 0(%[va]), %[m3]\n" + : [v1] "+v" (v1->v) + : [va] "d" (va) + , [m3] "i" (m3) + : "memory"); +} + +static inline void vlbrrep(S390Vector *v1, void *va, const uint8_t m3) +{ + asm volatile("vlbrrep %[v1], 0(%[va]), %[m3]\n" + : [v1] "+v" (v1->v) + : [va] "d" (va) + , [m3] "i" (m3) + : "memory"); +} + + +int main(int argc, char *argv[]) +{ + S390Vector vd = { .d[0] = 0, .d[1] = 0 }; + S390Vector vs = { .d[0] = 0x8FEEDDCCBBAA9988ull, + .d[1] = 0x7766554433221107ull }; + + const S390Vector vt_v_er16 = { + .h[0] = 0x1107, .h[1] = 0x3322, .h[2] = 0x5544, .h[3] = 0x7766, + .h[4] = 0x9988, .h[5] = 0xBBAA, .h[6] = 0xDDCC, .h[7] = 0x8FEE }; + + const S390Vector vt_v_br16 = { + .h[0] = 0xEE8F, .h[1] = 0xCCDD, .h[2] = 0xAABB, .h[3] = 0x8899, + .h[4] = 0x6677, .h[5] = 0x4455, .h[6] = 0x2233, .h[7] = 0x0711 }; + + int ix; + uint64_t ss64 = 0xFEEDFACE0BADBEEFull, sd64 = 0; + + vler (&vd, &vs, ES16); vtst(vd, vt_v_er16); + vster(&vs, &vd, ES16); vtst(vd, vt_v_er16); + + vlbr (&vd, &vs, ES16); vtst(vd, vt_v_br16); + vstbr(&vs, &vd, ES16); vtst(vd, vt_v_br16); + + vlebrh(&vd, &ss64, 5); + if (0xEDFE != vd.h[5]) { + return 1; + } + + vstebrh(&vs, (uint8_t *)&sd64 + 4, 7); + if (0x0000000007110000ull != sd64) { + return 1; + } + + vllebrz(&vd, (uint8_t *)&ss64 + 3, 2); + for (ix = 0; ix < 4; ix++) { + if (vd.w[ix] != (ix != 1 ? 0 : 0xBEAD0BCE)) { + return 1; + } + } + + vlbrrep(&vd, (uint8_t *)&ss64 + 4, 1); + for (ix = 0; ix < 8; ix++) { + if (0xAD0B != vd.h[ix]) { + return 1; + } + } + + return 0; +} diff --git a/tests/tcg/s390x/vxeh2_vs.c b/tests/tcg/s390x/vxeh2_vs.c new file mode 100644 index 0000000000..04a3d4d7bb --- /dev/null +++ b/tests/tcg/s390x/vxeh2_vs.c @@ -0,0 +1,91 @@ +/* + * vxeh2_vs: vector-enhancements facility 2 vector shift + */ +#include <stdint.h> + +typedef union S390Vector { + uint64_t d[2]; /* doubleword */ + uint32_t w[4]; /* word */ + uint16_t h[8]; /* halfword */ + uint8_t b[16]; /* byte */ + __uint128_t v; +} S390Vector; + +#define vtst(v1, v2) \ + if (v1.d[0] != v2.d[0] || v1.d[1] != v2.d[1]) { \ + return 1; \ + } + +static inline void vsl(S390Vector *v1, S390Vector *v2, S390Vector *v3) +{ + asm volatile("vsl %[v1], %[v2], %[v3]\n" + : [v1] "=v" (v1->v) + : [v2] "v" (v2->v) + , [v3] "v" (v3->v)); +} + +static inline void vsra(S390Vector *v1, S390Vector *v2, S390Vector *v3) +{ + asm volatile("vsra %[v1], %[v2], %[v3]\n" + : [v1] "=v" (v1->v) + : [v2] "v" (v2->v) + , [v3] "v" (v3->v)); +} + +static inline void vsrl(S390Vector *v1, S390Vector *v2, S390Vector *v3) +{ + asm volatile("vsrl %[v1], %[v2], %[v3]\n" + : [v1] "=v" (v1->v) + : [v2] "v" (v2->v) + , [v3] "v" (v3->v)); +} + +static inline void vsld(S390Vector *v1, S390Vector *v2, + S390Vector *v3, const uint8_t I) +{ + asm volatile("vsld %[v1], %[v2], %[v3], %[I]\n" + : [v1] "=v" (v1->v) + : [v2] "v" (v2->v) + , [v3] "v" (v3->v) + , [I] "i" (I & 7)); +} + +static inline void vsrd(S390Vector *v1, S390Vector *v2, + S390Vector *v3, const uint8_t I) +{ + asm volatile("vsrd %[v1], %[v2], %[v3], %[I]\n" + : [v1] "=v" (v1->v) + : [v2] "v" (v2->v) + , [v3] "v" (v3->v) + , [I] "i" (I & 7)); +} + +int main(int argc, char *argv[]) +{ + const S390Vector vt_vsl = { .d[0] = 0x7FEDBB32D5AA311Dull, + .d[1] = 0xBB65AA10912220C0ull }; + const S390Vector vt_vsra = { .d[0] = 0xF1FE6E7399AA5466ull, + .d[1] = 0x0E762A5188221044ull }; + const S390Vector vt_vsrl = { .d[0] = 0x11FE6E7399AA5466ull, + .d[1] = 0x0E762A5188221044ull }; + const S390Vector vt_vsld = { .d[0] = 0x7F76EE65DD54CC43ull, + .d[1] = 0xBB32AA2199108838ull }; + const S390Vector vt_vsrd = { .d[0] = 0x0E060802040E000Aull, + .d[1] = 0x0C060802040E000Aull }; + S390Vector vs = { .d[0] = 0x8FEEDDCCBBAA9988ull, + .d[1] = 0x7766554433221107ull }; + S390Vector vd = { .d[0] = 0, .d[1] = 0 }; + S390Vector vsi = { .d[0] = 0, .d[1] = 0 }; + + for (int ix = 0; ix < 16; ix++) { + vsi.b[ix] = (1 + (5 ^ ~ix)) & 7; + } + + vsl (&vd, &vs, &vsi); vtst(vd, vt_vsl); + vsra(&vd, &vs, &vsi); vtst(vd, vt_vsra); + vsrl(&vd, &vs, &vsi); vtst(vd, vt_vsrl); + vsld(&vd, &vs, &vsi, 3); vtst(vd, vt_vsld); + vsrd(&vd, &vs, &vsi, 15); vtst(vd, vt_vsrd); + + return 0; +} -- 2.34.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-03-07 2:03 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2022-03-03 3:22 [PATCH v1 0/2] s390x: Add support for Vector Enhancements Facility 2 David Miller 2022-03-03 3:22 ` [PATCH v1 1/2] s390x/tcg: Implement Vector-Enhancements Facility 2 for s390x David Miller 2022-03-03 8:58 ` Richard Henderson 2022-03-03 16:50 ` David Miller 2022-03-03 17:42 ` Richard Henderson 2022-03-03 18:01 ` David Miller 2022-03-03 18:04 ` David Hildenbrand 2022-03-07 2:02 ` David Miller 2022-03-03 3:22 ` [PATCH v1 2/2] tests/tcg/s390x: Tests for Vector Enhancements Facility 2 David Miller
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).