From nobody Fri Apr 26 22:47:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1557952396; cv=none; d=zoho.com; s=zohoarc; b=AaxIXawVG4pzvFezCDCNyRJXO2p3dsNvI1G8NbZhFFzL8c2GhUlmHoE/xkkEX2KJAlsl7oi6jtN2w2srPTIUwItn0vhGDbvjUxZIXBAFCzJ/ou3m6L2HzN7zE3X7mEkacWw/yuM4w5LQkmk0NmproLDjofOzL/6UAHE1Hft4U5E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557952396; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=b8toI40dwpyV2dGveGZg9Y3XaPpVdGQyCibFosiqjf8=; b=kHH/fOYLvFl6PbYJDWz5VtXaNbhBn7vel5vnAh9hnVvZE5hoy3k7eNgnR82SAhqFnd3MmSwKBbQGvHVGVwyzbnsoE28LzwRvC8l0bdijwxRChAo/muZRaW5fFPblHkEwD9TT56q254rZB2hs5ptfbNnO9PYOh3SgwAfFIJGI1IE= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1557952396226858.6030347488994; Wed, 15 May 2019 13:33:16 -0700 (PDT) Received: from localhost ([127.0.0.1]:42094 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hR0aL-0006h4-Py for importer@patchew.org; Wed, 15 May 2019 16:33:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47936) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hR0Yf-0005oF-Np for qemu-devel@nongnu.org; Wed, 15 May 2019 16:31:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hR0Yd-0002By-OC for qemu-devel@nongnu.org; Wed, 15 May 2019 16:31:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40830) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hR0Yb-0002AH-QU; Wed, 15 May 2019 16:31:23 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 96EC030B32DD; Wed, 15 May 2019 20:31:19 +0000 (UTC) Received: from t460s.redhat.com (ovpn-116-133.ams2.redhat.com [10.36.116.133]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D5D66266C; Wed, 15 May 2019 20:31:17 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Wed, 15 May 2019 22:31:08 +0200 Message-Id: <20190515203112.506-2-david@redhat.com> In-Reply-To: <20190515203112.506-1-david@redhat.com> References: <20190515203112.506-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Wed, 15 May 2019 20:31:19 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v1 1/5] s390x/tcg: Implement VECTOR FIND ANY ELEMENT EQUAL X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-s390x@nongnu.org, Cornelia Huck , David Hildenbrand , Thomas Huth , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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 --- 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 +=3D cpu.o cpu_models.o cpu_features.o gdbstub.o interrupt.o helper.o obj-$(CONFIG_TCG) +=3D translate.o cc_helper.o excp_helper.o fpu_helper.o obj-$(CONFIG_TCG) +=3D int_helper.o mem_helper.o misc_helper.o crypto_help= er.o -obj-$(CONFIG_TCG) +=3D vec_helper.o vec_int_helper.o +obj-$(CONFIG_TCG) +=3D vec_helper.o vec_int_helper.o vec_string_helper.o obj-$(CONFIG_SOFTMMU) +=3D machine.o ioinst.o arch_dump.o mmu_helper.o dia= g.o obj-$(CONFIG_SOFTMMU) +=3D sigp.o obj-$(CONFIG_KVM) +=3D 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, i= 32) DEF_HELPER_4(gvec_vtm, void, ptr, cptr, env, i32) =20 +/* =3D=3D=3D Vector String Instructions =3D=3D=3D */ +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, i3= 2) +DEF_HELPER_FLAGS_4(gvec_vfae32, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i3= 2) +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) =20 +/* =3D=3D=3D Vector String Instructions =3D=3D=3D */ + +/* 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.in= c.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, DisasOp= s *o) set_cc_static(s); return DISAS_NEXT; } + +static DisasJumpType op_vfae(DisasContext *s, DisasOps *o) +{ + const uint8_t es =3D get_field(s->fields, m4); + const uint8_t m5 =3D get_field(s->fields, m5); + static gen_helper_gvec_3_ptr * const cc[3] =3D { + gen_helper_gvec_vfae_cc8, + gen_helper_gvec_vfae_cc16, + gen_helper_gvec_vfae_cc32, + }; + static gen_helper_gvec_3 * const nocc[3] =3D { + 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_hel= per.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 + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * 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 =3D extract32(m5, 3, 1); = \ + const bool rt =3D extract32(m5, 2, 1); = \ + const bool zs =3D extract32(m5, 1, 1); = \ + S390Vector tmp =3D {}; = \ + int first_byte =3D 16; = \ + int cc =3D 3; /* no match */ = \ + int i, j; = \ + = \ + for (i =3D 0; i < (128 / BITS); i++) { = \ + const uint##BITS##_t data =3D s390_vec_read_element##BITS(v2, i); = \ + bool any_equal =3D false; = \ + = \ + if (zs && !data) { = \ + if (cc =3D=3D 3) { = \ + first_byte =3D i * (BITS / 8); = \ + cc =3D 0; /* match for zero */ = \ + } else if (cc !=3D 0) { = \ + cc =3D 2; /* matching elements before match for zero */ = \ + } = \ + if (!rt) { = \ + break; = \ + } = \ + } = \ + = \ + /* try to match with any other element from the other vector */ = \ + for (j =3D 0; j < (128 / BITS); j++) { = \ + if (data =3D=3D s390_vec_read_element##BITS(v3, j)) { = \ + any_equal =3D true; = \ + break; = \ + } = \ + } = \ + = \ + /* invert the result if requested */ = \ + any_equal =3D in ^ any_equal; = \ + if (cc =3D=3D 3 && any_equal) { = \ + first_byte =3D i * (BITS / 8); = \ + cc =3D 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 =3D 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 =3D vfae##BITS(v1, v2, v3, simd_data(desc)); = \ +} +DEF_VFAE_CC_HELPER(8) +DEF_VFAE_CC_HELPER(16) +DEF_VFAE_CC_HELPER(32) --=20 2.20.1 From nobody Fri Apr 26 22:47:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1557952401; cv=none; d=zoho.com; s=zohoarc; b=fq+51eHahICk4fideBpi/zcW4A/OF3sR+Emkvp2HIQDZk8cbyHK82eWwBZI9IKrtj7qzbC3XyO0Nr4rnys6DwrMGn7Fgcff9EkrOWnIxz/Dqn2SVvKQOWU8RfcHavMZwW6DPFqCxjgIbnAnn4Xanzqyv+alCAcl3XI9JfZI/Nqo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557952401; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=JShv5SHq3KicnvvVLAcavX8Z9TVvMXZp8+xT8D3aPPk=; b=U7k08zcxcKt2Q8uniNRT7EomI1BP9Td/NyYhs1n4PxO4y31tscm943kwK5kHxpioqY8YNJiXL3KuOMN2uBtYBvKfLCSvQRX6m36NLNlJ6Ir+ResCIa683nUDRDvLXskgDzJeaOg6HO18KGP+tVTt8aEDHkABWcAA9lPXJLHt3Qk= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1557952401268595.0912646015227; Wed, 15 May 2019 13:33:21 -0700 (PDT) Received: from localhost ([127.0.0.1]:42096 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hR0aN-0006j4-RP for importer@patchew.org; Wed, 15 May 2019 16:33:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47949) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hR0Yh-0005oI-EH for qemu-devel@nongnu.org; Wed, 15 May 2019 16:31:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hR0Yf-0002Cj-IG for qemu-devel@nongnu.org; Wed, 15 May 2019 16:31:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46088) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hR0Yd-0002Ag-KP; Wed, 15 May 2019 16:31:23 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3B43DF0D14; Wed, 15 May 2019 20:31:21 +0000 (UTC) Received: from t460s.redhat.com (ovpn-116-133.ams2.redhat.com [10.36.116.133]) by smtp.corp.redhat.com (Postfix) with ESMTP id DDA2E6266C; Wed, 15 May 2019 20:31:19 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Wed, 15 May 2019 22:31:09 +0200 Message-Id: <20190515203112.506-3-david@redhat.com> In-Reply-To: <20190515203112.506-1-david@redhat.com> References: <20190515203112.506-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 15 May 2019 20:31:21 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v1 2/5] s390x/tcg: Implement VECTOR FIND ELEMENT EQUAL X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-s390x@nongnu.org, Cornelia Huck , David Hildenbrand , Thomas Huth , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Implement it similar to VECTOR FIND ANY ELEMENT EQUAL. The zero-check seems to have precedence in case we have "data1 =3D=3D data2 =3D=3D 0". The description in the PoP is a little bi confusing. Signed-off-by: David Hildenbrand --- target/s390x/helper.h | 6 ++++ target/s390x/insn-data.def | 2 ++ target/s390x/translate_vx.inc.c | 31 +++++++++++++++++ target/s390x/vec_string_helper.c | 59 ++++++++++++++++++++++++++++++++ 4 files changed, 98 insertions(+) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index c45328cf73..a1b169b666 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -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, i3= 2) +DEF_HELPER_FLAGS_4(gvec_vfee32, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i3= 2) +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) =20 #ifndef CONFIG_USER_ONLY DEF_HELPER_3(servc, i32, env, i64, i64) diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index 070ce2a471..d8907ef6a5 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1195,6 +1195,8 @@ =20 /* 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) =20 #ifndef CONFIG_USER_ONLY /* COMPARE AND SWAP AND PURGE */ diff --git a/target/s390x/translate_vx.inc.c b/target/s390x/translate_vx.in= c.c index 022990dda3..848f6d7163 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -2384,3 +2384,34 @@ static DisasJumpType op_vfae(DisasContext *s, DisasO= ps *o) } return DISAS_NEXT; } + +static DisasJumpType op_vfee(DisasContext *s, DisasOps *o) +{ + const uint8_t es =3D get_field(s->fields, m4); + const uint8_t m5 =3D get_field(s->fields, m5); + static gen_helper_gvec_3_ptr * const cc[3] =3D { + gen_helper_gvec_vfee_cc8, + gen_helper_gvec_vfee_cc16, + gen_helper_gvec_vfee_cc32, + }; + static gen_helper_gvec_3 * const nocc[3] =3D { + gen_helper_gvec_vfee8, + gen_helper_gvec_vfee16, + gen_helper_gvec_vfee32, + }; + + if (es > ES_32 || m5 & ~0x3) { + 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_hel= per.c index 8a4e65b70f..6a5d05271c 100644 --- a/target/s390x/vec_string_helper.c +++ b/target/s390x/vec_string_helper.c @@ -95,3 +95,62 @@ void HELPER(gvec_vfae_cc##BITS)(void *v1, const void *v2= , const void *v3, \ DEF_VFAE_CC_HELPER(8) DEF_VFAE_CC_HELPER(16) DEF_VFAE_CC_HELPER(32) + +#define DEF_VFEE(BITS) = \ +static int vfee##BITS(void *v1, const void *v2, const void *v3, uint8_t m5= ) \ +{ = \ + const bool zs =3D extract32(m5, 1, 1); = \ + S390Vector tmp =3D {}; = \ + int first_byte =3D 16; = \ + int cc =3D 3; /* no match */ = \ + int i; = \ + = \ + for (i =3D 0; i < (128 / BITS); i++) { = \ + const uint##BITS##_t data1 =3D s390_vec_read_element##BITS(v2, i);= \ + const uint##BITS##_t data2 =3D s390_vec_read_element##BITS(v3, i);= \ + = \ + if (zs && !data1) { = \ + if (cc =3D=3D 3) { = \ + first_byte =3D i * (BITS / 8); = \ + cc =3D 0; /* match for zero */ = \ + } else { = \ + cc =3D 2; /* matching elements before match for zero */ = \ + } = \ + break; = \ + } = \ + = \ + if (cc =3D=3D 3 && data1 =3D=3D data2) { = \ + first_byte =3D i * (BITS / 8); = \ + cc =3D 1; /* matching elements, no match for zero */ = \ + if (!zs) { = \ + break; = \ + } = \ + } = \ + } = \ + s390_vec_write_element8(&tmp, 7, first_byte); = \ + *(S390Vector *)v1 =3D tmp; = \ + return cc; = \ +} +DEF_VFEE(8) +DEF_VFEE(16) +DEF_VFEE(32) + +#define DEF_VFEE_HELPER(BITS) = \ +void HELPER(gvec_vfee##BITS)(void *v1, const void *v2, const void *v3, = \ + uint32_t desc) = \ +{ = \ + vfee##BITS(v1, v2, v3, simd_data(desc)); = \ +} +DEF_VFEE_HELPER(8) +DEF_VFEE_HELPER(16) +DEF_VFEE_HELPER(32) + +#define DEF_VFEE_CC_HELPER(BITS) = \ +void HELPER(gvec_vfee_cc##BITS)(void *v1, const void *v2, const void *v3, = \ + CPUS390XState *env, uint32_t desc) = \ +{ = \ + env->cc_op =3D vfee##BITS(v1, v2, v3, simd_data(desc)); = \ +} +DEF_VFEE_CC_HELPER(8) +DEF_VFEE_CC_HELPER(16) +DEF_VFEE_CC_HELPER(32) --=20 2.20.1 From nobody Fri Apr 26 22:47:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1557952407; cv=none; d=zoho.com; s=zohoarc; b=nUKinIn4TTbBAOSuHyQyAgjekq/5cIcIca5CoJJfVrvK7MSgOwVQ9tfOZgZG0lu+lpnfCa+LLUCJ0Ett7dmXiOhejIJ4HF7PEkCiWn3O3eHYMO2VdcX2CaNdUWgQVuTY2tTktS/QX6qy7dK2UflgX4KCHsNEu/xaEMmHAot4P+g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557952407; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=yl9BW0ZXpLVZivdMCNbQA+ZxEJu5a6OLRI4YwNg+8ro=; b=axdSckaNbEU16UIY6nBa2duDQIkgoWSzR7CDhp7VN3IxEb9Wl9gPwT1cyHHYSs+MOU58mHHTfYJdMzhn6ifG5+yjGxZF5/eF2cxzG8IztdIBIHSjqR/D4licB+d89FgulOaZFVMPXjePvrnWkPfUzKzU8jUmzN/4lGD4S1rYd0c= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1557952407127888.211068307707; Wed, 15 May 2019 13:33:27 -0700 (PDT) Received: from localhost ([127.0.0.1]:42098 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hR0aS-0006mM-1t for importer@patchew.org; Wed, 15 May 2019 16:33:16 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47965) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hR0Yj-0005os-B1 for qemu-devel@nongnu.org; Wed, 15 May 2019 16:31:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hR0Yh-0002Dl-Fi for qemu-devel@nongnu.org; Wed, 15 May 2019 16:31:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40864) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hR0Yf-0002CY-OR; Wed, 15 May 2019 16:31:27 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F010130B32DD; Wed, 15 May 2019 20:31:24 +0000 (UTC) Received: from t460s.redhat.com (ovpn-116-133.ams2.redhat.com [10.36.116.133]) by smtp.corp.redhat.com (Postfix) with ESMTP id 84A576266C; Wed, 15 May 2019 20:31:21 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Wed, 15 May 2019 22:31:10 +0200 Message-Id: <20190515203112.506-4-david@redhat.com> In-Reply-To: <20190515203112.506-1-david@redhat.com> References: <20190515203112.506-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Wed, 15 May 2019 20:31:25 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v1 3/5] s390x/tcg: Implement VECTOR FIND ELEMENT NOT EQUAL X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-s390x@nongnu.org, Cornelia Huck , David Hildenbrand , Thomas Huth , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Similar to VECTOR FIND ELEMENT EQUAL, however the search also stops on any inequality. A match for inequality seems to have precedence over a match for zero, because both elements have to be zero. Signed-off-by: David Hildenbrand --- target/s390x/helper.h | 6 ++++ target/s390x/insn-data.def | 2 ++ target/s390x/translate_vx.inc.c | 31 +++++++++++++++++++ target/s390x/vec_string_helper.c | 53 ++++++++++++++++++++++++++++++++ 4 files changed, 92 insertions(+) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index a1b169b666..fb50b404db 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -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, i3= 2) +DEF_HELPER_FLAGS_4(gvec_vfene16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i= 32) +DEF_HELPER_FLAGS_4(gvec_vfene32, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i= 32) +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) =20 #ifndef CONFIG_USER_ONLY DEF_HELPER_3(servc, i32, env, i64, i64) diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index d8907ef6a5..d03c1ee0b3 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -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) =20 #ifndef CONFIG_USER_ONLY /* COMPARE AND SWAP AND PURGE */ diff --git a/target/s390x/translate_vx.inc.c b/target/s390x/translate_vx.in= c.c index 848f6d7163..e36cc5c401 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -2415,3 +2415,34 @@ static DisasJumpType op_vfee(DisasContext *s, DisasO= ps *o) } return DISAS_NEXT; } + +static DisasJumpType op_vfene(DisasContext *s, DisasOps *o) +{ + const uint8_t es =3D get_field(s->fields, m4); + const uint8_t m5 =3D get_field(s->fields, m5); + static gen_helper_gvec_3_ptr * const cc[3] =3D { + gen_helper_gvec_vfene_cc8, + gen_helper_gvec_vfene_cc16, + gen_helper_gvec_vfene_cc32, + }; + static gen_helper_gvec_3 * const nocc[3] =3D { + gen_helper_gvec_vfene8, + gen_helper_gvec_vfene16, + gen_helper_gvec_vfene32, + }; + + if (es > ES_32 || m5 & ~0x3) { + 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_hel= per.c index 6a5d05271c..181f044fe5 100644 --- a/target/s390x/vec_string_helper.c +++ b/target/s390x/vec_string_helper.c @@ -154,3 +154,56 @@ void HELPER(gvec_vfee_cc##BITS)(void *v1, const void *= v2, const void *v3, \ DEF_VFEE_CC_HELPER(8) DEF_VFEE_CC_HELPER(16) DEF_VFEE_CC_HELPER(32) + +#define DEF_VFENE(BITS) = \ +static int vfene##BITS(void *v1, const void *v2, const void *v3, uint8_t m= 5) \ +{ = \ + const bool zs =3D extract32(m5, 1, 1); = \ + S390Vector tmp =3D {}; = \ + int first_byte =3D 16; = \ + int cc =3D 3; /* no match */ = \ + int i; = \ + = \ + for (i =3D 0; i < (128 / BITS); i++) { = \ + const uint##BITS##_t data1 =3D s390_vec_read_element##BITS(v2, i);= \ + const uint##BITS##_t data2 =3D s390_vec_read_element##BITS(v3, i);= \ + = \ + if (data1 !=3D data2) { = \ + first_byte =3D i * (BITS / 8); = \ + cc =3D data1 < data2 ? 1 : 2; /* inequality found */ = \ + break; = \ + } = \ + = \ + if (zs && !data1) { = \ + first_byte =3D i * (BITS / 8); = \ + cc =3D 0; /* match for zero */ = \ + break; = \ + } = \ + } = \ + s390_vec_write_element8(&tmp, 7, first_byte); = \ + *(S390Vector *)v1 =3D tmp; = \ + return cc; = \ +} +DEF_VFENE(8) +DEF_VFENE(16) +DEF_VFENE(32) + +#define DEF_VFENE_HELPER(BITS) = \ +void HELPER(gvec_vfene##BITS)(void *v1, const void *v2, const void *v3, = \ + uint32_t desc) = \ +{ = \ + vfene##BITS(v1, v2, v3, simd_data(desc)); = \ +} +DEF_VFENE_HELPER(8) +DEF_VFENE_HELPER(16) +DEF_VFENE_HELPER(32) + +#define DEF_VFENE_CC_HELPER(BITS) = \ +void HELPER(gvec_vfene_cc##BITS)(void *v1, const void *v2, const void *v3,= \ + CPUS390XState *env, uint32_t desc) = \ +{ = \ + env->cc_op =3D vfene##BITS(v1, v2, v3, simd_data(desc)); = \ +} +DEF_VFENE_CC_HELPER(8) +DEF_VFENE_CC_HELPER(16) +DEF_VFENE_CC_HELPER(32) --=20 2.20.1 From nobody Fri Apr 26 22:47:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1557952518; cv=none; d=zoho.com; s=zohoarc; b=SkNjwVxygWEbsM+1pHZIH+1+AMNSWYC0qFevOIhnLgFQBGvhZbBBV4IwvlzYLUyZqaBL1Kt5byAChAx/zVAEZ9DdaOPO2RvYwRz/QBrFYm0IBKBJkirZ+G266XGd2WElPiiHDn68KT0BUvec8KFYF3Pl06azSzhhr06XvHMLago= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557952518; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=sMQ8GFzGebXaHCCJPLreQ3b/uUnOLSJjxX9wh5gZ0xU=; b=lXFS3Sgg6YvnoBoOp5LbPsRN3dkWIbdNul6CIUtROj+mO+knoWZBSZZ0RoLUUlnjIEu4ey62dQZ6mkQxgVpi1ryM0WtMVqiY0PwSQQhnO2yvkrpu7l7wAxfLQqZp1Or/m0lbSb0NYeg3ZHFBOgsj5Aso5gbOtHT6uQqJixuJSA8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1557952518717385.31525214667397; Wed, 15 May 2019 13:35:18 -0700 (PDT) Received: from localhost ([127.0.0.1]:42116 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hR0cN-0008Jt-MT for importer@patchew.org; Wed, 15 May 2019 16:35:15 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48028) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hR0Ym-0005s2-M6 for qemu-devel@nongnu.org; Wed, 15 May 2019 16:31:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hR0Yl-0002FN-A9 for qemu-devel@nongnu.org; Wed, 15 May 2019 16:31:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47490) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hR0Yj-0002E5-Du; Wed, 15 May 2019 16:31:29 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 52C9130024A4; Wed, 15 May 2019 20:31:28 +0000 (UTC) Received: from t460s.redhat.com (ovpn-116-133.ams2.redhat.com [10.36.116.133]) by smtp.corp.redhat.com (Postfix) with ESMTP id 429E162926; Wed, 15 May 2019 20:31:25 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Wed, 15 May 2019 22:31:11 +0200 Message-Id: <20190515203112.506-5-david@redhat.com> In-Reply-To: <20190515203112.506-1-david@redhat.com> References: <20190515203112.506-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Wed, 15 May 2019 20:31:28 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v1 4/5] s390x/tcg: Implement VECTOR ISOLATE STRING X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-s390x@nongnu.org, Cornelia Huck , David Hildenbrand , Thomas Huth , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: David Hildenbrand --- target/s390x/helper.h | 6 +++++ target/s390x/insn-data.def | 2 ++ target/s390x/translate_vx.inc.c | 34 ++++++++++++++++++++++++++ target/s390x/vec_string_helper.c | 41 ++++++++++++++++++++++++++++++++ 4 files changed, 83 insertions(+) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index fb50b404db..1f9f0b463b 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -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) =20 #ifndef CONFIG_USER_ONLY DEF_HELPER_3(servc, i32, env, i64, i64) diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index d03c1ee0b3..b4a6b59608 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -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) =20 #ifndef CONFIG_USER_ONLY /* COMPARE AND SWAP AND PURGE */ diff --git a/target/s390x/translate_vx.inc.c b/target/s390x/translate_vx.in= c.c index e36cc5c401..437b416b4a 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -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) @@ -2446,3 +2449,34 @@ static DisasJumpType op_vfene(DisasContext *s, Disas= Ops *o) } return DISAS_NEXT; } + +static DisasJumpType op_vistr(DisasContext *s, DisasOps *o) +{ + const uint8_t es =3D get_field(s->fields, m4); + const uint8_t m5 =3D get_field(s->fields, m5); + static gen_helper_gvec_2_ptr * const cc[3] =3D { + gen_helper_gvec_vistr_cc8, + gen_helper_gvec_vistr_cc16, + gen_helper_gvec_vistr_cc32, + }; + static gen_helper_gvec_2 * const nocc[3] =3D { + gen_helper_gvec_vistr8, + gen_helper_gvec_vistr16, + gen_helper_gvec_vistr32, + }; + + if (es > ES_32 || m5 & ~0x1) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + + if (m5 & 1) { + gen_gvec_2_ptr(get_field(s->fields, v1), get_field(s->fields, v2), + cpu_env, 0, cc[es]); + set_cc_static(s); + } else { + gen_gvec_2_ool(get_field(s->fields, v1), get_field(s->fields, v2),= 0, + nocc[es]); + } + return DISAS_NEXT; +} diff --git a/target/s390x/vec_string_helper.c b/target/s390x/vec_string_hel= per.c index 181f044fe5..2e998c21a2 100644 --- a/target/s390x/vec_string_helper.c +++ b/target/s390x/vec_string_helper.c @@ -207,3 +207,44 @@ void HELPER(gvec_vfene_cc##BITS)(void *v1, const void = *v2, const void *v3, \ DEF_VFENE_CC_HELPER(8) DEF_VFENE_CC_HELPER(16) DEF_VFENE_CC_HELPER(32) + +#define DEF_VISTR(BITS) = \ +static int vistr##BITS(void *v1, const void *v2) = \ +{ = \ + S390Vector tmp =3D {}; = \ + int i, cc =3D 3; = \ + = \ + for (i =3D 0; i < (128 / BITS); i++) { = \ + const uint##BITS##_t data =3D s390_vec_read_element##BITS(v2, i); = \ + = \ + if (!data) { = \ + cc =3D 0; = \ + break; = \ + } = \ + s390_vec_write_element##BITS(&tmp, i, data); = \ + } = \ + *(S390Vector *)v1 =3D tmp; = \ + return cc; = \ +} +DEF_VISTR(8) +DEF_VISTR(16) +DEF_VISTR(32) + +#define DEF_VISTR_HELPER(BITS) = \ +void HELPER(gvec_vistr##BITS)(void *v1, const void *v2, uint32_t desc) = \ +{ = \ + vistr##BITS(v1, v2); = \ +} +DEF_VISTR_HELPER(8) +DEF_VISTR_HELPER(16) +DEF_VISTR_HELPER(32) + +#define DEF_VISTR_CC_HELPER(BITS) = \ +void HELPER(gvec_vistr_cc##BITS)(void *v1, const void *v2, = \ + CPUS390XState *env, uint32_t desc) = \ +{ = \ + env->cc_op =3D vistr##BITS(v1, v2); = \ +} +DEF_VISTR_CC_HELPER(8) +DEF_VISTR_CC_HELPER(16) +DEF_VISTR_CC_HELPER(32) --=20 2.20.1 From nobody Fri Apr 26 22:47:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1557952626; cv=none; d=zoho.com; s=zohoarc; b=h5UUG47ZL2DTSuERPtQwLJc72gPpV1O1s9C314oEbiswUw4BqNWpYbtMX/REmBcu/PiNVicv/GpKDrs5mMQOv/4Y8HSLp7m2e0d6D3V7gg0PtVj4UD/ei9xbGyD6O4c5pwG/otyJJFj5yI8vwuC2ezWDFD9jQXnIsL6s2kb+Tt4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557952626; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=tPnrasevI4E7FIthOxojp/vA4YJ61KFwNsTT3sqMscQ=; b=ICGlU78GsMLoU/gWaTthEFVnzka/7m6rwUWlqe0BE4mHZ5jlyuX5vNJYLT+xyCQX+UGSNfRQVYSPNtLETEf2ZKfesoCTav455VnxIsrLLWe4xEr53a3Lsz8fMXwtX23P3bcbv6/RTvFXFoSaTC0epej4DfipIu8w/wfEPRsOTXQ= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1557952626694799.6136247787249; Wed, 15 May 2019 13:37:06 -0700 (PDT) Received: from localhost ([127.0.0.1]:42170 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hR0e6-0001Bw-LO for importer@patchew.org; Wed, 15 May 2019 16:37:02 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48046) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hR0Yo-0005ty-H6 for qemu-devel@nongnu.org; Wed, 15 May 2019 16:31:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hR0Ym-0002Hg-Vu for qemu-devel@nongnu.org; Wed, 15 May 2019 16:31:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46470) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hR0Ym-0002Gi-Md; Wed, 15 May 2019 16:31:32 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0168F3001A77; Wed, 15 May 2019 20:31:32 +0000 (UTC) Received: from t460s.redhat.com (ovpn-116-133.ams2.redhat.com [10.36.116.133]) by smtp.corp.redhat.com (Postfix) with ESMTP id 983BF62926; Wed, 15 May 2019 20:31:28 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Wed, 15 May 2019 22:31:12 +0200 Message-Id: <20190515203112.506-6-david@redhat.com> In-Reply-To: <20190515203112.506-1-david@redhat.com> References: <20190515203112.506-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Wed, 15 May 2019 20:31:32 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v1 5/5] s390x/tcg: Implement VECTOR STRING RANGE COMPARE X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-s390x@nongnu.org, Cornelia Huck , David Hildenbrand , Thomas Huth , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Crazy stuff. Implement it similar to VECTOR FIND ANY ELEMENT EQUAL. Signed-off-by: David Hildenbrand --- target/s390x/helper.h | 6 ++ target/s390x/insn-data.def | 2 + target/s390x/translate_vx.inc.c | 37 +++++++++++ target/s390x/vec_string_helper.c | 108 +++++++++++++++++++++++++++++++ 4 files changed, 153 insertions(+) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index 1f9f0b463b..f2743ccd97 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -236,6 +236,12 @@ 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, cp= tr, i32) +DEF_HELPER_FLAGS_5(gvec_vstrc16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, c= ptr, i32) +DEF_HELPER_FLAGS_5(gvec_vstrc32, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, c= ptr, 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) =20 #ifndef CONFIG_USER_ONLY DEF_HELPER_3(servc, i32, env, i64, i64) diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index b4a6b59608..a2969fab58 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -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) =20 #ifndef CONFIG_USER_ONLY /* COMPARE AND SWAP AND PURGE */ diff --git a/target/s390x/translate_vx.inc.c b/target/s390x/translate_vx.in= c.c index 437b416b4a..62a8d4d738 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -217,6 +217,10 @@ static void get_vec_element_ptr_i64(TCGv_ptr ptr, uint= 8_t reg, TCGv_i64 enr, tcg_gen_gvec_4_ool(vec_full_reg_offset(v1), vec_full_reg_offset(v2), \ vec_full_reg_offset(v3), vec_full_reg_offset(v4), \ 16, 16, data, fn) +#define gen_gvec_4_ptr(v1, v2, v3, v4, ptr, data, fn) \ + tcg_gen_gvec_4_ptr(vec_full_reg_offset(v1), vec_full_reg_offset(v2), \ + vec_full_reg_offset(v3), vec_full_reg_offset(v4), \ + ptr, 16, 16, data, fn) #define gen_gvec_dup_i64(es, v1, c) \ tcg_gen_gvec_dup_i64(es, vec_full_reg_offset(v1), 16, 16, c) #define gen_gvec_mov(v1, v2) \ @@ -2480,3 +2484,36 @@ static DisasJumpType op_vistr(DisasContext *s, Disas= Ops *o) } return DISAS_NEXT; } + +static DisasJumpType op_vstrc(DisasContext *s, DisasOps *o) +{ + const uint8_t es =3D get_field(s->fields, m5); + const uint8_t m6 =3D get_field(s->fields, m6); + static gen_helper_gvec_4_ptr * const cc[3] =3D { + gen_helper_gvec_vstrc_cc8, + gen_helper_gvec_vstrc_cc16, + gen_helper_gvec_vstrc_cc32, + }; + static gen_helper_gvec_4 * const nocc[3] =3D { + gen_helper_gvec_vstrc8, + gen_helper_gvec_vstrc16, + gen_helper_gvec_vstrc32, + }; + + if (es > ES_32) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + + if (m6 & 1) { + gen_gvec_4_ptr(get_field(s->fields, v1), get_field(s->fields, v2), + get_field(s->fields, v3), get_field(s->fields, v4), + cpu_env, m6, cc[es]); + set_cc_static(s); + } else { + gen_gvec_4_ool(get_field(s->fields, v1), get_field(s->fields, v2), + get_field(s->fields, v3), get_field(s->fields, v4),= m6, + nocc[es]); + } + return DISAS_NEXT; +} diff --git a/target/s390x/vec_string_helper.c b/target/s390x/vec_string_hel= per.c index 2e998c21a2..6d6dbfa061 100644 --- a/target/s390x/vec_string_helper.c +++ b/target/s390x/vec_string_helper.c @@ -248,3 +248,111 @@ void HELPER(gvec_vistr_cc##BITS)(void *v1, const void= *v2, \ DEF_VISTR_CC_HELPER(8) DEF_VISTR_CC_HELPER(16) DEF_VISTR_CC_HELPER(32) + +#define DEF_ELEMENT_COMPARE(BITS) = \ +static bool element_compare##BITS(uint##BITS##_t data, uint##BITS##_t l, = \ + uint##BITS##_t c) = \ +{ = \ + const bool equal =3D extract32(c, BITS - 1, 1); = \ + const bool lower =3D extract32(c, BITS - 2, 1); = \ + const bool higher =3D extract32(c, BITS - 3, 1); = \ + = \ + if (equal && data =3D=3D l) { = \ + return true; = \ + } else if (lower && data < l) { = \ + return true; = \ + } else if (higher && data > l) { = \ + return true; = \ + } = \ + return false; = \ +} +DEF_ELEMENT_COMPARE(8) +DEF_ELEMENT_COMPARE(16) +DEF_ELEMENT_COMPARE(32) + +#define DEF_VSTRC(BITS) = \ +static int vstrc##BITS(void *v1, const void *v2, const void *v3, = \ + const void *v4, uint8_t m6) = \ +{ = \ + const bool in =3D extract32(m6, 3, 1); = \ + const bool rt =3D extract32(m6, 2, 1); = \ + const bool zs =3D extract32(m6, 1, 1); = \ + S390Vector tmp =3D {}; = \ + int first_byte =3D 16; = \ + int cc =3D 3; /* no match */ = \ + int i, j; = \ + = \ + for (i =3D 0; i < (128 / BITS); i++) { = \ + const uint##BITS##_t data =3D s390_vec_read_element##BITS(v2, i); = \ + bool any_comp =3D false; = \ + = \ + if (zs && !data) { = \ + if (cc =3D=3D 3) { = \ + first_byte =3D i * (BITS / 8); = \ + cc =3D 0; /* match for zero */ = \ + } else if (cc !=3D 0) { = \ + cc =3D 2; /* matching elements before match for zero */ = \ + } = \ + if (!rt) { = \ + break; = \ + } = \ + } = \ + = \ + /* compare against every even-odd range pair */ = \ + for (j =3D 0; j < (128 / BITS); j +=3D 2) { = \ + const uint##BITS##_t l1 =3D s390_vec_read_element##BITS(v3, j)= ; \ + const uint##BITS##_t c1 =3D s390_vec_read_element##BITS(v4, j)= ; \ + const uint##BITS##_t l2 =3D s390_vec_read_element##BITS(v3, j = + 1); \ + const uint##BITS##_t c2 =3D s390_vec_read_element##BITS(v4, j = + 1); \ + = \ + if (element_compare##BITS(data, l1, c1) && = \ + element_compare##BITS(data, l2, c2)) { = \ + any_comp =3D true; = \ + break; = \ + } = \ + } = \ + = \ + /* invert the result if requested */ = \ + any_comp =3D in ^ any_comp; = \ + if (cc =3D=3D 3 && any_comp) { = \ + first_byte =3D i * (BITS / 8); = \ + cc =3D 1; /* matching elements, no match for zero */ = \ + if (!zs && !rt) { = \ + break; = \ + } = \ + } = \ + /* indicate bit vector if requested */ = \ + if (rt && any_comp) { = \ + s390_vec_write_element##BITS(&tmp, i, (uint##BITS##_t)-1ull); = \ + } = \ + } = \ + if (!rt) { = \ + s390_vec_write_element8(&tmp, 7, first_byte); = \ + } = \ + *(S390Vector *)v1 =3D tmp; = \ + return cc; = \ +} +DEF_VSTRC(8) +DEF_VSTRC(16) +DEF_VSTRC(32) + +#define DEF_VSTRC_HELPER(BITS) = \ +void HELPER(gvec_vstrc##BITS)(void *v1, const void *v2, const void *v3, = \ + const void *v4, uint32_t desc) = \ +{ = \ + vstrc##BITS(v1, v2, v3, v4, simd_data(desc)); = \ +} +DEF_VSTRC_HELPER(8) +DEF_VSTRC_HELPER(16) +DEF_VSTRC_HELPER(32) + +#define DEF_VSTRC_CC_HELPER(BITS) = \ +void HELPER(gvec_vstrc_cc##BITS)(void *v1, const void *v2, const void *v3,= \ + const void *v4, CPUS390XState *env, = \ + uint32_t desc) = \ +{ = \ + env->cc_op =3D vstrc##BITS(v1, v2, v3, v4, simd_data(desc)); = \ +} +DEF_VSTRC_CC_HELPER(8) +DEF_VSTRC_CC_HELPER(16) +DEF_VSTRC_CC_HELPER(32) --=20 2.20.1