s390x/tcg: Vector Instruction Support Part 3
v2 cover s390x/tcg: Vector Instruction Support Part 3
This is the third part of vector instruction support for s390x. It is based on part 2, which is will send a pull-request for to Conny soon.
Part 1: Vector Support Instructions
Part 2: Vector Integer Instructions
Part 3: Vector String Instructions
Part 4: Vector Floating-Point Instructions
The current state can be found at (kept updated):
https://github.com/davidhildenbrand/qemu/tree/vx
With the current state I can boot Linux kernel + user space compiled with SIMD support. This allows to boot distributions compiled exclusively for z13, requiring SIMD support. Also, it is now possible to build a complete kernel using rpmbuild as quite some issues have been sorted out.
In this part, all Vector String Instructions introduced with the "Vector Facility" are added.
v1 -> v2:
- Use the fancy bit-tricks from Richard to rewrite most string instructions
- Create specialized variants for "VECTOR STRING RANGE COMPARE", so the compiler can optimize out the rt/!rt handling code.
David Hildenbrand (5):
s390x/tcg: Implement VECTOR FIND ANY ELEMENT EQUAL s390x/tcg: Implement VECTOR FIND ELEMENT EQUAL s390x/tcg: Implement VECTOR FIND ELEMENT NOT EQUAL s390x/tcg: Implement VECTOR ISOLATE STRING s390x/tcg: Implement VECTOR STRING RANGE COMPARE
target/s390x/Makefile.objs | 2 +- target/s390x/helper.h | 38 +++ target/s390x/insn-data.def | 13 + target/s390x/translate_vx.inc.c | 185 ++++++++++++ target/s390x/vec.h | 40 +++ target/s390x/vec_string_helper.c | 473 +++++++++++++++++++++++++++++++ 6 files changed, 750 insertions(+), 1 deletion(-) create mode 100644 target/s390x/vec_string_helper.c
Signature · 1 line
2.20.1
PATCH v2 1/5 s390x/tcg: Implement VECTOR FIND ANY ELEMENT EQUAL
Complicated stuff. Provide two different helpers for CC an !CC handling. We might want to add more helpers later.
zero_search() and match_index() are courtesy of Richard H.
--- target/s390x/Makefile.objs | 2 +- target/s390x/helper.h | 8 ++ target/s390x/insn-data.def | 5 + target/s390x/translate_vx.inc.c | 30 ++++++ target/s390x/vec_string_helper.c | 154 +++++++++++++++++++++++++++++++ 5 files changed, 198 insertions(+), 1 deletion(-) create mode 100644 target/s390x/vec_string_helper.c
target/s390x/Makefile.objs +1 -1
@@ -1,7 +1,7 @@ obj-y += cpu.o cpu_models.o cpu_features.o gdbstub.o interrupt.o helper.o obj-$(CONFIG_TCG) += translate.o cc_helper.o excp_helper.o fpu_helper.o obj-$(CONFIG_TCG) += int_helper.o mem_helper.o misc_helper.o crypto_helper.o -obj-$(CONFIG_TCG) += vec_helper.o vec_int_helper.o +obj-$(CONFIG_TCG) += vec_helper.o vec_int_helper.o vec_string_helper.o obj-$(CONFIG_SOFTMMU) += machine.o ioinst.o arch_dump.o mmu_helper.o diag.o obj-$(CONFIG_SOFTMMU) += sigp.o obj-$(CONFIG_KVM) += kvm.o
target/s390x/helper.h +8 -0
@@ -211,6 +211,14 @@ 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) +/* === Vector String Instructions === */ +DEF_HELPER_FLAGS_4(gvec_vfae8, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) +DEF_HELPER_FLAGS_4(gvec_vfae16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) +DEF_HELPER_FLAGS_4(gvec_vfae32, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) +DEF_HELPER_5(gvec_vfae_cc8, void, ptr, cptr, cptr, env, i32) +DEF_HELPER_5(gvec_vfae_cc16, void, ptr, cptr, cptr, env, i32) +DEF_HELPER_5(gvec_vfae_cc32, void, ptr, cptr, cptr, env, i32) +#ifndef CONFIG_USER_ONLY DEF_HELPER_3(servc, i32, env, i64, i64)DEF_HELPER_4 (diag, void, env, i32, i32, i32)
target/s390x/insn-data.def +5 -0
@@ -1191,6 +1191,11 @@ /* VECTOR TEST UNDER MASK */ F(0xe7d8, VTM, VRR_a, V, 0, 0, 0, 0, vtm, 0, IF_VEC) +/* === Vector String Instructions === */ + +/* VECTOR FIND ANY ELEMENT EQUAL */ + F(0xe782, VFAE, VRR_b, V, 0, 0, 0, 0, vfae, 0, IF_VEC) + #ifndef CONFIG_USER_ONLY /* COMPARE AND SWAP AND PURGE */ E(0xb250, CSP, RRE, Z, r1_32u, ra2, r1_P, 0, csp, 0, MO_TEUL, IF_PRIV)
target/s390x/translate_vx.inc.c +30 -0
@@ -2353,3 +2353,33 @@ static DisasJumpType op_vtm(DisasContext *s, DisasOps *o)set_cc_static (s);return DISAS_NEXT ; } + +static DisasJumpType op_vfae (DisasContext *s,DisasOps *o) +{ +const uint8_t es =get_field (s->fields, m4); +const uint8_t m5 =get_field (s->fields, m5); +static gen_helper_gvec_3 *const g[3 ] = { + gen_helper_gvec_vfae8, + gen_helper_gvec_vfae16, + gen_helper_gvec_vfae32, + }; +static gen_helper_gvec_3_ptr *const g_cc[3 ] = { + gen_helper_gvec_vfae_cc8, + gen_helper_gvec_vfae_cc16, + gen_helper_gvec_vfae_cc32, + }; +if (es >ES_32 ) { +gen_program_exception (s,PGM_SPECIFICATION ); +return DISAS_NORETURN ; + } + +if (extract32 (m5,0 ,1 )) { +gen_gvec_3_ptr (get_field (s->fields, v1),get_field (s->fields, v2), +get_field (s->fields, v3), cpu_env, m5, g_cc[es]); +set_cc_static (s); + }else { +gen_gvec_3_ool (get_field (s->fields, v1),get_field (s->fields, v2), +get_field (s->fields, v3), m5, g[es]); + } +return DISAS_NEXT ; +}
target/s390x/vec_string_helper.c new file +154 -0
154 lines not on this page · raw message
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH v2 1/5] s390x/tcg: Implement VECTOR FIND ANY ELEMENT EQUAL
Quoted 6 lines · David Hildenbrand
Complicated stuff. Provide two different helpers for CC an !CC handling. We might want to add more helpers later.
zero_search()andmatch_index()are courtesy of Richard H.Signed-off-by David Hildenbrand <[email protected]>
Quoted 8 lines
--- target/s390x/Makefile.objs | 2 +- target/s390x/helper.h | 8 ++ target/s390x/insn-data.def | 5 + target/s390x/translate_vx.inc.c | 30 ++++++ target/s390x/vec_string_helper.c | 154 +++++++++++++++++++++++++++++++ 5 files changed, 198 insertions(+), 1 deletion(-) create mode 100644 target/s390x/vec_string_helper.c
r~
PATCH v2 2/5 s390x/tcg: Implement VECTOR FIND ELEMENT EQUAL
In reply to David HildenbrandCore logic courtesy of Richard H.
--- target/s390x/helper.h | 6 ++++ target/s390x/insn-data.def | 2 ++ target/s390x/translate_vx.inc.c | 31 +++++++++++++++++ target/s390x/vec_string_helper.c | 57 ++++++++++++++++++++++++++++++++ 4 files changed, 96 insertions(+)
target/s390x/helper.h +6 -0
@@ -218,6 +218,12 @@ DEF_HELPER_FLAGS_4(gvec_vfae32, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) DEF_HELPER_5(gvec_vfae_cc8, void, ptr, cptr, cptr, env, i32) DEF_HELPER_5(gvec_vfae_cc16, void, ptr, cptr, cptr, env, i32) DEF_HELPER_5(gvec_vfae_cc32, void, ptr, cptr, cptr, env, i32) +DEF_HELPER_FLAGS_4(gvec_vfee8, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) +DEF_HELPER_FLAGS_4(gvec_vfee16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) +DEF_HELPER_FLAGS_4(gvec_vfee32, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) +DEF_HELPER_5(gvec_vfee_cc8, void, ptr, cptr, cptr, env, i32) +DEF_HELPER_5(gvec_vfee_cc16, void, ptr, cptr, cptr, env, i32) +DEF_HELPER_5(gvec_vfee_cc32, void, ptr, cptr, cptr, env, i32)#ifndef CONFIG_USER_ONLY DEF_HELPER_3 (servc, i32, env, i64, i64)
target/s390x/insn-data.def +2 -0
@@ -1195,6 +1195,8 @@ /* VECTOR FIND ANY ELEMENT EQUAL */ F(0xe782, VFAE, VRR_b, V, 0, 0, 0, 0, vfae, 0, IF_VEC) +/* VECTOR FIND ELEMENT EQUAL */ + F(0xe780, VFEE, VRR_b, V, 0, 0, 0, 0, vfee, 0, IF_VEC) #ifndef CONFIG_USER_ONLY /* COMPARE AND SWAP AND PURGE */
target/s390x/translate_vx.inc.c +31 -0
@@ -2383,3 +2383,34 @@ static DisasJumpType op_vfae(DisasContext *s, DisasOps *o) }return DISAS_NEXT ; } + +static DisasJumpType op_vfee (DisasContext *s,DisasOps *o) +{ +const uint8_t es =get_field (s->fields, m4); +const uint8_t m5 =get_field (s->fields, m5); +static gen_helper_gvec_3 *const g[3 ] = { + gen_helper_gvec_vfee8, + gen_helper_gvec_vfee16, + gen_helper_gvec_vfee32, + }; +static gen_helper_gvec_3_ptr *const g_cc[3 ] = { + gen_helper_gvec_vfee_cc8, + gen_helper_gvec_vfee_cc16, + gen_helper_gvec_vfee_cc32, + }; + +if (es >ES_32 || m5 & ~0x3 ) { +gen_program_exception (s,PGM_SPECIFICATION ); +return DISAS_NORETURN ; + } + +if (extract32 (m5,0 ,1 )) { +gen_gvec_3_ptr (get_field (s->fields, v1),get_field (s->fields, v2), +get_field (s->fields, v3), cpu_env, m5, g_cc[es]); +set_cc_static (s); + }else { +gen_gvec_3_ool (get_field (s->fields, v1),get_field (s->fields, v2), +get_field (s->fields, v3), m5, g[es]); + } +return DISAS_NEXT ; +}
target/s390x/vec_string_helper.c +57 -0
60 lines not on this page · raw message
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH v2 2/5] s390x/tcg: Implement VECTOR FIND ELEMENT EQUAL
Quoted 9 lines · David Hildenbrand
Core logic courtesy of Richard H.
Signed-off-by David Hildenbrand <[email protected]>--- target/s390x/helper.h | 6 ++++ target/s390x/insn-data.def | 2 ++ target/s390x/translate_vx.inc.c | 31 +++++++++++++++++ target/s390x/vec_string_helper.c | 57 ++++++++++++++++++++++++++++++++ 4 files changed, 96 insertions(+)
r~
PATCH v2 3/5 s390x/tcg: Implement VECTOR FIND ELEMENT NOT EQUAL
In reply to David HildenbrandSimilar to VECTOR FIND ELEMENT EQUAL. Core logic courtesy of Richard H.
Add s390_vec_read_element() that can deal with element sizes.
--- target/s390x/helper.h | 6 +++ target/s390x/insn-data.def | 2 + target/s390x/translate_vx.inc.c | 31 +++++++++++++ target/s390x/vec.h | 19 ++++++++ target/s390x/vec_string_helper.c | 74 ++++++++++++++++++++++++++++++++ 5 files changed, 132 insertions(+)
target/s390x/helper.h +6 -0
@@ -224,6 +224,12 @@ DEF_HELPER_FLAGS_4(gvec_vfee32, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) DEF_HELPER_5(gvec_vfee_cc8, void, ptr, cptr, cptr, env, i32) DEF_HELPER_5(gvec_vfee_cc16, void, ptr, cptr, cptr, env, i32) DEF_HELPER_5(gvec_vfee_cc32, void, ptr, cptr, cptr, env, i32) +DEF_HELPER_FLAGS_4(gvec_vfene8, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) +DEF_HELPER_FLAGS_4(gvec_vfene16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) +DEF_HELPER_FLAGS_4(gvec_vfene32, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) +DEF_HELPER_5(gvec_vfene_cc8, void, ptr, cptr, cptr, env, i32) +DEF_HELPER_5(gvec_vfene_cc16, void, ptr, cptr, cptr, env, i32) +DEF_HELPER_5(gvec_vfene_cc32, void, ptr, cptr, cptr, env, i32)#ifndef CONFIG_USER_ONLY DEF_HELPER_3 (servc, i32, env, i64, i64)
target/s390x/insn-data.def +2 -0
@@ -1197,6 +1197,8 @@ F(0xe782, VFAE, VRR_b, V, 0, 0, 0, 0, vfae, 0, IF_VEC) /* VECTOR FIND ELEMENT EQUAL */ F(0xe780, VFEE, VRR_b, V, 0, 0, 0, 0, vfee, 0, IF_VEC) +/* VECTOR FIND ELEMENT NOT EQUAL */ + F(0xe781, VFENE, VRR_b, V, 0, 0, 0, 0, vfene, 0, IF_VEC) #ifndef CONFIG_USER_ONLY /* COMPARE AND SWAP AND PURGE */
target/s390x/translate_vx.inc.c +31 -0
@@ -2414,3 +2414,34 @@ static DisasJumpType op_vfee(DisasContext *s, DisasOps *o) }return DISAS_NEXT ; } + +static DisasJumpType op_vfene (DisasContext *s,DisasOps *o) +{ +const uint8_t es =get_field (s->fields, m4); +const uint8_t m5 =get_field (s->fields, m5); +static gen_helper_gvec_3 *const g[3 ] = { + gen_helper_gvec_vfene8, + gen_helper_gvec_vfene16, + gen_helper_gvec_vfene32, + }; +static gen_helper_gvec_3_ptr *const g_cc[3 ] = { + gen_helper_gvec_vfene_cc8, + gen_helper_gvec_vfene_cc16, + gen_helper_gvec_vfene_cc32, + }; + +if (es >ES_32 || m5 & ~0x3 ) { +gen_program_exception (s,PGM_SPECIFICATION ); +return DISAS_NORETURN ; + } + +if (extract32 (m5,0 ,1 )) { +gen_gvec_3_ptr (get_field (s->fields, v1),get_field (s->fields, v2), +get_field (s->fields, v3), cpu_env, m5, g_cc[es]); +set_cc_static (s); + }else { +gen_gvec_3_ool (get_field (s->fields, v1),get_field (s->fields, v2), +get_field (s->fields, v3), m5, g[es]); + } +return DISAS_NEXT ; +}
target/s390x/vec.h +19 -0
@@ -12,6 +12,8 @@ #ifndef S390X_VEC_H #define S390X_VEC_H +#include "tcg/tcg.h" + typedef union S390Vector { uint64_t doubleword[2]; uint32_t word[4];
@@ -70,6 +72,23 @@ static inline uint64_t s390_vec_read_element64(const S390Vector *v, uint8_t enr)return v->doubleword[enr]; } +static inline uint64_t s390_vec_read_element (const S390Vector *v,uint8_t enr, +uint8_t es) +{ +switch (es) { +case MO_8 : +return s390_vec_read_element8 (v, enr); +case MO_16 : +return s390_vec_read_element16 (v, enr); +case MO_32 : +return s390_vec_read_element32 (v, enr); +case MO_64 : +return s390_vec_read_element64 (v, enr); +default : +g_assert_not_reached (); + } +} +static inline void s390_vec_write_element8 (S390Vector *v,uint8_t enr,uint8_t data) {
target/s390x/vec_string_helper.c +74 -0
83 lines not on this page · raw message
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH v2 3/5] s390x/tcg: Implement VECTOR FIND ELEMENT NOT EQUAL
Quoted 13 lines · David Hildenbrand
target/s390x/vec_string_helper.c +13
-0+/* identify the smaller element */ +if (first_inequal <16 ) { +uint8_t enr = first_inequal / (1 << es); +uint32_t a =s390_vec_read_element (v2, enr, es); +uint32_t b =s390_vec_read_element (v3, enr, es); + + smaller = a < b; + } + +if (zs) { + z0 =zero_search (a0, mask); + z1 =zero_search (a1, mask); + first_zero =match_index (z0, z1);
target/s390x/vec_string_helper.c void HELPER(gvec_vfee_cc##BITS)(void *v1, const void *v2, const void *v3, \ · line 260
Quoted 10 lines
target/s390x/vec_string_helper.c +10
-0+ } + +s390_vec_write_element64 (v1,0 ,MIN (first_inequal, first_zero)); +s390_vec_write_element64 (v1,1 ,0 ); +if (first_zero ==16 && first_inequal ==16 ) { +return 3 ; + }else if (first_zero < first_inequal) { +return 0 ; + } +return smaller ?1 :2 ;
Perhaps move the computation of smaller down here where it is used.
Otherwise,
r~
Re: [Qemu-devel] [PATCH v2 3/5] s390x/tcg: Implement VECTOR FIND ELEMENT NOT EQUAL
Quoted 18 lines · Richard Henderson
Quoted 17 lines · David Hildenbrand
target/s390x/vec_string_helper.c +17
-0+/* identify the smaller element */ +if (first_inequal <16 ) { +uint8_t enr = first_inequal / (1 << es); +uint32_t a =s390_vec_read_element (v2, enr, es); +uint32_t b =s390_vec_read_element (v3, enr, es); + + smaller = a < b; + } + +if (zs) { + z0 =zero_search (a0, mask); + z1 =zero_search (a1, mask); + first_zero =match_index (z0, z1); + } + +s390_vec_write_element64 (v1,0 ,MIN (first_inequal, first_zero)); +s390_vec_write_element64 (v1,1 ,0 );
Quoted 8 lines
target/s390x/vec_string_helper.c void HELPER(gvec_vfee_cc##BITS)(void *v1, const void *v2, const void *v3, \ · line 260
Quoted 6 lines
target/s390x/vec_string_helper.c +6
-0+if (first_zero ==16 && first_inequal ==16 ) { +return 3 ; + }else if (first_zero < first_inequal) { +return 0 ; + } +return smaller ?1 :2 ;Perhaps move the computation of smaller down here where it is used.
Wanted to do that but then I realized that I would have to move s390_vec_write_element64() as well, because v1 and v2/v3 could overlap.
Thanks!
Quoted 7 lines
Otherwise,
Reviewed-by Richard Henderson <[email protected]>r~
Signature · 3 lines
Thanks, David / dhildenb
Re: [Qemu-devel] [PATCH v2 3/5] s390x/tcg: Implement VECTOR FIND ELEMENT NOT EQUAL
Quoted 28 lines · David Hildenbrand
Quoted 18 lines · Richard Henderson
Quoted 17 lines · David Hildenbrand
target/s390x/vec_string_helper.c +17
-0+/* identify the smaller element */ +if (first_inequal <16 ) { +uint8_t enr = first_inequal / (1 << es); +uint32_t a =s390_vec_read_element (v2, enr, es); +uint32_t b =s390_vec_read_element (v3, enr, es); + + smaller = a < b; + } + +if (zs) { + z0 =zero_search (a0, mask); + z1 =zero_search (a1, mask); + first_zero =match_index (z0, z1); + } + +s390_vec_write_element64 (v1,0 ,MIN (first_inequal, first_zero)); +s390_vec_write_element64 (v1,1 ,0 );Quoted 8 lines
target/s390x/vec_string_helper.c void HELPER(gvec_vfee_cc##BITS)(void *v1, const void *v2, const void *v3, \ · line 260
Quoted 6 lines
target/s390x/vec_string_helper.c +6
-0+if (first_zero ==16 && first_inequal ==16 ) { +return 3 ; + }else if (first_zero < first_inequal) { +return 0 ; + } +return smaller ?1 :2 ;Perhaps move the computation of smaller down here where it is used.
Quoted 2 lines
Wanted to do that but then I realized that I would have to move
s390_vec_write_element64()as well, because v1 and v2/v3 could overlap.
Oh, yes of course. R-B without any changes. ;-)
r~
Re: [Qemu-devel] [PATCH v2 3/5] s390x/tcg: Implement VECTOR FIND ELEMENT NOT EQUAL
Quoted 29 lines · Richard Henderson
Quoted 28 lines · David Hildenbrand
Quoted 26 lines · Richard Henderson
Quoted 13 lines · David Hildenbrand
target/s390x/vec_string_helper.c +13
-0+/* identify the smaller element */ +if (first_inequal <16 ) { +uint8_t enr = first_inequal / (1 << es); +uint32_t a =s390_vec_read_element (v2, enr, es); +uint32_t b =s390_vec_read_element (v3, enr, es); + + smaller = a < b; + } + +if (zs) { + z0 =zero_search (a0, mask); + z1 =zero_search (a1, mask); + first_zero =match_index (z0, z1);target/s390x/vec_string_helper.c void HELPER(gvec_vfee_cc##BITS)(void *v1, const void *v2, const void *v3, \ · line 260
Quoted 10 lines
target/s390x/vec_string_helper.c +10
-0+ } + +s390_vec_write_element64 (v1,0 ,MIN (first_inequal, first_zero)); +s390_vec_write_element64 (v1,1 ,0 ); +if (first_zero ==16 && first_inequal ==16 ) { +return 3 ; + }else if (first_zero < first_inequal) { +return 0 ; + } +return smaller ?1 :2 ;Perhaps move the computation of smaller down here where it is used.
Quoted 5 lines
Quoted 2 lines
Wanted to do that but then I realized that I would have to move
s390_vec_write_element64()as well, because v1 and v2/v3 could overlap.Oh, yes of course. R-B without any changes. ;-)
Thanks Richard, will send a pull request to Conny for this part soon. I'll start getting the vector floating-point instruction into shape this week. So don't start to relax ;)
Cheers!
Quoted 3 lines
r~
Signature · 3 lines
Thanks, David / dhildenb
PATCH v2 4/5 s390x/tcg: Implement VECTOR ISOLATE STRING
In reply to David HildenbrandLogic mostly courtesy of Richard H.
--- target/s390x/helper.h | 6 +++++ target/s390x/insn-data.def | 2 ++ target/s390x/translate_vx.inc.c | 34 ++++++++++++++++++++++++ target/s390x/vec_string_helper.c | 45 ++++++++++++++++++++++++++++++++ 4 files changed, 87 insertions(+)
target/s390x/helper.h +6 -0
@@ -230,6 +230,12 @@ DEF_HELPER_FLAGS_4(gvec_vfene32, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) DEF_HELPER_5(gvec_vfene_cc8, void, ptr, cptr, cptr, env, i32) DEF_HELPER_5(gvec_vfene_cc16, void, ptr, cptr, cptr, env, i32) DEF_HELPER_5(gvec_vfene_cc32, void, ptr, cptr, cptr, env, i32) +DEF_HELPER_FLAGS_3(gvec_vistr8, TCG_CALL_NO_RWG, void, ptr, cptr, i32) +DEF_HELPER_FLAGS_3(gvec_vistr16, TCG_CALL_NO_RWG, void, ptr, cptr, i32) +DEF_HELPER_FLAGS_3(gvec_vistr32, TCG_CALL_NO_RWG, void, ptr, cptr, i32) +DEF_HELPER_4(gvec_vistr_cc8, void, ptr, cptr, env, i32) +DEF_HELPER_4(gvec_vistr_cc16, void, ptr, cptr, env, i32) +DEF_HELPER_4(gvec_vistr_cc32, void, ptr, cptr, env, i32)#ifndef CONFIG_USER_ONLY DEF_HELPER_3 (servc, i32, env, i64, i64)
target/s390x/insn-data.def +2 -0
@@ -1199,6 +1199,8 @@ F(0xe780, VFEE, VRR_b, V, 0, 0, 0, 0, vfee, 0, IF_VEC) /* VECTOR FIND ELEMENT NOT EQUAL */ F(0xe781, VFENE, VRR_b, V, 0, 0, 0, 0, vfene, 0, IF_VEC) +/* VECTOR ISOLATE STRING */ + F(0xe75c, VISTR, VRR_a, V, 0, 0, 0, 0, vistr, 0, IF_VEC) #ifndef CONFIG_USER_ONLY /* COMPARE AND SWAP AND PURGE */
target/s390x/translate_vx.inc.c +34 -0
@@ -188,6 +188,9 @@ static void get_vec_element_ptr_i64(TCGv_ptr ptr, uint8_t reg, TCGv_i64 enr,#define gen_gvec_2s (v1, v2, c, gen) \ tcg_gen_gvec_2s(vec_full_reg_offset(v1), vec_full_reg_offset(v2), \ 16, 16, c, gen) +#define gen_gvec_2_ool (v1, v2, data, fn) \ + tcg_gen_gvec_2_ool(vec_full_reg_offset(v1), vec_full_reg_offset(v2), \ + 16, 16, data, fn)#define gen_gvec_2i_ool (v1, v2, c, data, fn) \ tcg_gen_gvec_2i_ool(vec_full_reg_offset(v1), vec_full_reg_offset(v2), \ c, 16, 16, data, fn)
@@ -2445,3 +2448,34 @@ static DisasJumpType op_vfene(DisasContext *s, DisasOps *o) }return DISAS_NEXT ; } + +static DisasJumpType op_vistr (DisasContext *s,DisasOps *o) +{ +const uint8_t es =get_field (s->fields, m4); +const uint8_t m5 =get_field (s->fields, m5); +static gen_helper_gvec_2 *const g[3 ] = { + gen_helper_gvec_vistr8, + gen_helper_gvec_vistr16, + gen_helper_gvec_vistr32, + }; +static gen_helper_gvec_2_ptr *const g_cc[3 ] = { + gen_helper_gvec_vistr_cc8, + gen_helper_gvec_vistr_cc16, + gen_helper_gvec_vistr_cc32, + }; + +if (es >ES_32 || m5 & ~0x1 ) { +gen_program_exception (s,PGM_SPECIFICATION ); +return DISAS_NORETURN ; + } + +if (extract32 (m5,0 ,1 )) { +gen_gvec_2_ptr (get_field (s->fields, v1),get_field (s->fields, v2), + cpu_env,0 , g_cc[es]); +set_cc_static (s); + }else { +gen_gvec_2_ool (get_field (s->fields, v1),get_field (s->fields, v2),0 , + g[es]); + } +return DISAS_NEXT ; +}
target/s390x/vec_string_helper.c +45 -0
48 lines not on this page · raw message
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH v2 4/5] s390x/tcg: Implement VECTOR ISOLATE STRING
Quoted 9 lines · David Hildenbrand
Logic mostly courtesy of Richard H.
Signed-off-by David Hildenbrand <[email protected]>--- target/s390x/helper.h | 6 +++++ target/s390x/insn-data.def | 2 ++ target/s390x/translate_vx.inc.c | 34 ++++++++++++++++++++++++ target/s390x/vec_string_helper.c | 45 ++++++++++++++++++++++++++++++++ 4 files changed, 87 insertions(+)
r~
PATCH v2 5/5 s390x/tcg: Implement VECTOR STRING RANGE COMPARE
In reply to David HildenbrandUnfortunately, there is no easy way to avoid looping over all elements in v2. Provide specialized variants for !cc,!rt/!cc,rt/cc,!rt/cc,rt and all element types. Especially for different values of rt, the compiler might be able to optimize the code a lot.
Add s390_vec_write_element().
--- target/s390x/helper.h | 12 +++ target/s390x/insn-data.def | 2 + target/s390x/translate_vx.inc.c | 59 +++++++++++++ target/s390x/vec.h | 21 +++++ target/s390x/vec_string_helper.c | 143 +++++++++++++++++++++++++++++++ 5 files changed, 237 insertions(+)
target/s390x/helper.h +12 -0
@@ -236,6 +236,18 @@ DEF_HELPER_FLAGS_3(gvec_vistr32, TCG_CALL_NO_RWG, void, ptr, cptr, i32) DEF_HELPER_4(gvec_vistr_cc8, void, ptr, cptr, env, i32) DEF_HELPER_4(gvec_vistr_cc16, void, ptr, cptr, env, i32) DEF_HELPER_4(gvec_vistr_cc32, void, ptr, cptr, env, i32) +DEF_HELPER_FLAGS_5(gvec_vstrc8, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, cptr, i32) +DEF_HELPER_FLAGS_5(gvec_vstrc16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, cptr, i32) +DEF_HELPER_FLAGS_5(gvec_vstrc32, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, cptr, i32) +DEF_HELPER_FLAGS_5(gvec_vstrc_rt8, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, cptr, i32) +DEF_HELPER_FLAGS_5(gvec_vstrc_rt16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, cptr, i32) +DEF_HELPER_FLAGS_5(gvec_vstrc_rt32, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, cptr, i32) +DEF_HELPER_6(gvec_vstrc_cc8, void, ptr, cptr, cptr, cptr, env, i32) +DEF_HELPER_6(gvec_vstrc_cc16, void, ptr, cptr, cptr, cptr, env, i32) +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)#ifndef CONFIG_USER_ONLY DEF_HELPER_3 (servc, i32, env, i64, i64)
target/s390x/insn-data.def +2 -0
@@ -1201,6 +1201,8 @@ F(0xe781, VFENE, VRR_b, V, 0, 0, 0, 0, vfene, 0, IF_VEC) /* VECTOR ISOLATE STRING */ 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) #ifndef CONFIG_USER_ONLY /* COMPARE AND SWAP AND PURGE */
target/s390x/translate_vx.inc.c +59 -0
68 lines not on this page · raw message
target/s390x/vec.h +21 -0
@@ -117,4 +117,25 @@ static inline void s390_vec_write_element64(S390Vector *v, uint8_t enr, v->doubleword[enr] = data; } +static inline void s390_vec_write_element (S390Vector *v,uint8_t enr, +uint8_t es,uint64_t data) +{ +switch (es) { +case MO_8 : +s390_vec_write_element8 (v, enr, data); +break ; +case MO_16 : +s390_vec_write_element16 (v, enr, data); +break ; +case MO_32 : +s390_vec_write_element32 (v, enr, data); +break ; +case MO_64 : +s390_vec_write_element64 (v, enr, data); +break ; +default : +g_assert_not_reached (); + } +} +#endif /* S390X_VEC_H */
target/s390x/vec_string_helper.c +143 -0
146 lines not on this page · raw message
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH v2 5/5] s390x/tcg: Implement VECTOR STRING RANGE COMPARE
Quoted 7 lines · David Hildenbrand
Unfortunately, there is no easy way to avoid looping over all elements in v2. Provide specialized variants for !cc,!rt/!cc,rt/cc,!rt/cc,rt and all element types. Especially for different values of rt, the compiler might be able to optimize the code a lot.
Add
s390_vec_write_element().
Quoted 8 lines
Signed-off-by David Hildenbrand <[email protected]>--- target/s390x/helper.h | 12 +++ target/s390x/insn-data.def | 2 + target/s390x/translate_vx.inc.c | 59 +++++++++++++ target/s390x/vec.h | 21 +++++ target/s390x/vec_string_helper.c | 143 +++++++++++++++++++++++++++++++ 5 files changed, 237 insertions(+)
r~