[qemu-s390x] [PATCH v1 1/5] s390x/tcg: Implement VECTOR FIND ANY ELEMENT EQUAL

[David Hildenbrand]

Complicated stuff. Provide two variants, one for the CC and one without
the CC. The CC is returned via cpu_env.

Signed-off-by: David Hildenbrand <address@hidden>
---
 target/s390x/Makefile.objs       |  2 +-
 target/s390x/helper.h            |  8 +++
 target/s390x/insn-data.def       |  5 ++
 target/s390x/translate_vx.inc.c  | 31 ++++++++++
 target/s390x/vec_string_helper.c | 97 ++++++++++++++++++++++++++++++++
 5 files changed, 142 insertions(+), 1 deletion(-)
 create mode 100644 target/s390x/vec_string_helper.c

diff --git a/target/s390x/Makefile.objs b/target/s390x/Makefile.objs
index 993ac93ed6..0a38281a14 100644
--- a/target/s390x/Makefile.objs
+++ b/target/s390x/Makefile.objs
@@ -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
diff --git a/target/s390x/helper.h b/target/s390x/helper.h
index 7755a96c33..c45328cf73 100644
--- a/target/s390x/helper.h
+++ b/target/s390x/helper.h
@@ -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)
diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def
index e61475bdc4..070ce2a471 100644
--- a/target/s390x/insn-data.def
+++ b/target/s390x/insn-data.def
@@ -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)
diff --git a/target/s390x/translate_vx.inc.c b/target/s390x/translate_vx.inc.c
index 7e0bfcb190..022990dda3 100644
--- a/target/s390x/translate_vx.inc.c
+++ b/target/s390x/translate_vx.inc.c
@@ -2353,3 +2353,34 @@ 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_ptr * const cc[3] = {
+        gen_helper_gvec_vfae_cc8,
+        gen_helper_gvec_vfae_cc16,
+        gen_helper_gvec_vfae_cc32,
+    };
+    static gen_helper_gvec_3 * const nocc[3] = {
+        gen_helper_gvec_vfae8,
+        gen_helper_gvec_vfae16,
+        gen_helper_gvec_vfae32,
+    };
+
+    if (es > ES_32) {
+        gen_program_exception(s, PGM_SPECIFICATION);
+        return DISAS_NORETURN;
+    }
+
+    if (m5 & 1) {
+        gen_gvec_3_ptr(get_field(s->fields, v1), get_field(s->fields, v2),
+                       get_field(s->fields, v3), cpu_env, m5, 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, nocc[es]);
+    }
+    return DISAS_NEXT;
+}
diff --git a/target/s390x/vec_string_helper.c b/target/s390x/vec_string_helper.c
new file mode 100644
index 0000000000..8a4e65b70f
--- /dev/null
+++ b/target/s390x/vec_string_helper.c
@@ -0,0 +1,97 @@
+/*
+ * QEMU TCG support -- s390x vector string instruction support
+ *
+ * Copyright (C) 2019 Red Hat Inc
+ *
+ * Authors:
+ *   David Hildenbrand <address@hidden>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+#include "qemu/osdep.h"
+#include "qemu-common.h"
+#include "cpu.h"
+#include "internal.h"
+#include "vec.h"
+#include "tcg/tcg-gvec-desc.h"
+#include "exec/helper-proto.h"
+
+#define DEF_VFAE(BITS)                                                         
\
+static int vfae##BITS(void *v1, const void *v2, const void *v3, uint8_t m5)    
\
+{                                                                              
\
+    const bool in = extract32(m5, 3, 1);                                       
\
+    const bool rt = extract32(m5, 2, 1);                                       
\
+    const bool zs = extract32(m5, 1, 1);                                       
\
+    S390Vector tmp = {};                                                       
\
+    int first_byte = 16;                                                       
\
+    int cc = 3; /* no match */                                                 
\
+    int i, j;                                                                  
\
+                                                                               
\
+    for (i = 0; i < (128 / BITS); i++) {                                       
\
+        const uint##BITS##_t data = s390_vec_read_element##BITS(v2, i);        
\
+        bool any_equal = false;                                                
\
+                                                                               
\
+        if (zs && !data) {                                                     
\
+            if (cc == 3) {                                                     
\
+                first_byte = i * (BITS / 8);                                   
\
+                cc = 0; /* match for zero */                                   
\
+            } else if (cc != 0) {                                              
\
+                cc = 2; /* matching elements before match for zero */          
\
+            }                                                                  
\
+            if (!rt) {                                                         
\
+                break;                                                         
\
+            }                                                                  
\
+        }                                                                      
\
+                                                                               
\
+        /* try to match with any other element from the other vector */        
\
+        for (j = 0; j < (128 / BITS); j++) {                                   
\
+            if (data == s390_vec_read_element##BITS(v3, j)) {                  
\
+                any_equal = true;                                              
\
+                break;                                                         
\
+            }                                                                  
\
+        }                                                                      
\
+                                                                               
\
+        /* invert the result if requested */                                   
\
+        any_equal = in ^ any_equal;                                            
\
+        if (cc == 3 && any_equal) {                                            
\
+            first_byte = i * (BITS / 8);                                       
\
+            cc = 1; /* matching elements, no match for zero */                 
\
+            if (!zs && !rt) {                                                  
\
+                break;                                                         
\
+            }                                                                  
\
+        }                                                                      
\
+        /* indicate bit vector if requested */                                 
\
+        if (rt && any_equal) {                                                 
\
+            s390_vec_write_element##BITS(&tmp, i, (uint##BITS##_t)-1ull);      
\
+        }                                                                      
\
+    }                                                                          
\
+    if (!rt) {                                                                 
\
+        s390_vec_write_element8(&tmp, 7, first_byte);                          
\
+    }                                                                          
\
+    *(S390Vector *)v1 = tmp;                                                   
\
+    return cc;                                                                 
\
+}
+DEF_VFAE(8)
+DEF_VFAE(16)
+DEF_VFAE(32)
+
+#define DEF_VFAE_HELPER(BITS)                                                  
\
+void HELPER(gvec_vfae##BITS)(void *v1, const void *v2, const void *v3,         
\
+                             uint32_t desc)                                    
\
+{                                                                              
\
+    vfae##BITS(v1, v2, v3, simd_data(desc));                                   
\
+}
+DEF_VFAE_HELPER(8)
+DEF_VFAE_HELPER(16)
+DEF_VFAE_HELPER(32)
+
+#define DEF_VFAE_CC_HELPER(BITS)                                               
\
+void HELPER(gvec_vfae_cc##BITS)(void *v1, const void *v2, const void *v3,      
\
+                                CPUS390XState *env, uint32_t desc)             
\
+{                                                                              
\
+    env->cc_op = vfae##BITS(v1, v2, v3, simd_data(desc));                      
\
+}
+DEF_VFAE_CC_HELPER(8)
+DEF_VFAE_CC_HELPER(16)
+DEF_VFAE_CC_HELPER(32)
-- 
2.20.1