From nobody Sat May 18 17:15:55 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=1554980279; cv=none; d=zoho.com; s=zohoarc; b=OBk4dv19T7cXQd62SGDetSZbwKu85uB5o1wwBMLLBo2YGa5jJgHQbk/mbHvyXr1zbHWcGO3d5xOSWya5Qfoa4ybsfmlORh54MDEKHuCDBiT8VHb3pzAZ5lRsN9Ec8/+t2W6Zfsmw0zJc8HTuelneUOSBXdhwEqf6bim1JjiFMfE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554980279; 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=nbtf4e+1/rc47ojLE1/QPdtbm4QpgTQlm5hxqAqdYvc=; b=hs7J/NBwVeOEGyz2FwrCAd7cMhLKBGVVS/tocnKY7tERvzORUkdpoirQAFzUljQhYRhLntfnepxvKQZtq8/fdTaIp+GWECOqcieLuQilJFQk4RHjxKDgxc+oh6Qm4CFGY40Stp/xJFXVifxHWD6kFrOWIGdTUCkMIRmxd1YPtd8= 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 1554980279150163.03391464665776; Thu, 11 Apr 2019 03:57:59 -0700 (PDT) Received: from localhost ([127.0.0.1]:46284 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEXP1-0007Zb-1W for importer@patchew.org; Thu, 11 Apr 2019 06:57:55 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54552) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWsj-0002dl-Tj for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:24:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWdP-000767-3G for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:08:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55134) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWdO-00075t-P7; Thu, 11 Apr 2019 06:08:43 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F0C943082133; Thu, 11 Apr 2019 10:08:41 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id A34BA1001E82; Thu, 11 Apr 2019 10:08:40 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:07:56 +0200 Message-Id: <20190411100836.646-2-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Thu, 11 Apr 2019 10:08:42 +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 01/41] tcg: Implement tcg_gen_gvec_3i() 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" Let's add tcg_gen_gvec_3i(), similar to tcg_gen_gvec_2i(), however without introducing "gen_helper_gvec_3i *fnoi", as it isn't needed for now. Signed-off-by: David Hildenbrand --- tcg/tcg-op-gvec.c | 139 ++++++++++++++++++++++++++++++++++++++++++++++ tcg/tcg-op-gvec.h | 24 ++++++++ 2 files changed, 163 insertions(+) diff --git a/tcg/tcg-op-gvec.c b/tcg/tcg-op-gvec.c index 0996ef0812..f831adb4e7 100644 --- a/tcg/tcg-op-gvec.c +++ b/tcg/tcg-op-gvec.c @@ -663,6 +663,29 @@ static void expand_3_i32(uint32_t dofs, uint32_t aofs, tcg_temp_free_i32(t0); } =20 +static void expand_3i_i32(uint32_t dofs, uint32_t aofs, uint32_t bofs, + uint32_t oprsz, int32_t c, bool load_dest, + void (*fni)(TCGv_i32, TCGv_i32, TCGv_i32, int32_= t)) +{ + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); + TCGv_i32 t2 =3D tcg_temp_new_i32(); + uint32_t i; + + for (i =3D 0; i < oprsz; i +=3D 4) { + tcg_gen_ld_i32(t0, cpu_env, aofs + i); + tcg_gen_ld_i32(t1, cpu_env, bofs + i); + if (load_dest) { + tcg_gen_ld_i32(t2, cpu_env, dofs + i); + } + fni(t2, t0, t1, c); + tcg_gen_st_i32(t2, cpu_env, dofs + i); + } + tcg_temp_free_i32(t0); + tcg_temp_free_i32(t1); + tcg_temp_free_i32(t2); +} + /* Expand OPSZ bytes worth of three-operand operations using i32 elements.= */ static void expand_4_i32(uint32_t dofs, uint32_t aofs, uint32_t bofs, uint32_t cofs, uint32_t oprsz, bool write_aofs, @@ -770,6 +793,29 @@ static void expand_3_i64(uint32_t dofs, uint32_t aofs, tcg_temp_free_i64(t0); } =20 +static void expand_3i_i64(uint32_t dofs, uint32_t aofs, uint32_t bofs, + uint32_t oprsz, int64_t c, bool load_dest, + void (*fni)(TCGv_i64, TCGv_i64, TCGv_i64, int64_= t)) +{ + TCGv_i64 t0 =3D tcg_temp_new_i64(); + TCGv_i64 t1 =3D tcg_temp_new_i64(); + TCGv_i64 t2 =3D tcg_temp_new_i64(); + uint32_t i; + + for (i =3D 0; i < oprsz; i +=3D 8) { + tcg_gen_ld_i64(t0, cpu_env, aofs + i); + tcg_gen_ld_i64(t1, cpu_env, bofs + i); + if (load_dest) { + tcg_gen_ld_i64(t2, cpu_env, dofs + i); + } + fni(t2, t0, t1, c); + tcg_gen_st_i64(t2, cpu_env, dofs + i); + } + tcg_temp_free_i64(t0); + tcg_temp_free_i64(t1); + tcg_temp_free_i64(t2); +} + /* Expand OPSZ bytes worth of three-operand operations using i64 elements.= */ static void expand_4_i64(uint32_t dofs, uint32_t aofs, uint32_t bofs, uint32_t cofs, uint32_t oprsz, bool write_aofs, @@ -883,6 +929,35 @@ static void expand_3_vec(unsigned vece, uint32_t dofs,= uint32_t aofs, tcg_temp_free_vec(t0); } =20 +/* + * Expand OPSZ bytes worth of three-vector operands and an immediate opera= nd + * using host vectors. + */ +static void expand_3i_vec(unsigned vece, uint32_t dofs, uint32_t aofs, + uint32_t bofs, uint32_t oprsz, uint32_t tysz, + TCGType type, int64_t c, bool load_dest, + void (*fni)(unsigned, TCGv_vec, TCGv_vec, TCGv_v= ec, + int64_t)) +{ + TCGv_vec t0 =3D tcg_temp_new_vec(type); + TCGv_vec t1 =3D tcg_temp_new_vec(type); + TCGv_vec t2 =3D tcg_temp_new_vec(type); + uint32_t i; + + for (i =3D 0; i < oprsz; i +=3D tysz) { + tcg_gen_ld_vec(t0, cpu_env, aofs + i); + tcg_gen_ld_vec(t1, cpu_env, bofs + i); + if (load_dest) { + tcg_gen_ld_vec(t2, cpu_env, dofs + i); + } + fni(vece, t2, t0, t1, c); + tcg_gen_st_vec(t2, cpu_env, dofs + i); + } + tcg_temp_free_vec(t0); + tcg_temp_free_vec(t1); + tcg_temp_free_vec(t2); +} + /* Expand OPSZ bytes worth of four-operand operations using host vectors. = */ static void expand_4_vec(unsigned vece, uint32_t dofs, uint32_t aofs, uint32_t bofs, uint32_t cofs, uint32_t oprsz, @@ -1174,6 +1249,70 @@ void tcg_gen_gvec_3(uint32_t dofs, uint32_t aofs, ui= nt32_t bofs, } } =20 +/* Expand a vector operation with three vectors and an immediate. */ +void tcg_gen_gvec_3i(uint32_t dofs, uint32_t aofs, uint32_t bofs, + uint32_t oprsz, uint32_t maxsz, int64_t c, + const GVecGen3i *g) +{ + TCGType type; + uint32_t some; + + check_size_align(oprsz, maxsz, dofs | aofs | bofs); + check_overlap_3(dofs, aofs, bofs, maxsz); + + type =3D 0; + if (g->fniv) { + type =3D choose_vector_type(g->opc, g->vece, oprsz, g->prefer_i64); + } + switch (type) { + case TCG_TYPE_V256: + /* + * Recall that ARM SVE allows vector sizes that are not a + * power of 2, but always a multiple of 16. The intent is + * that e.g. size =3D=3D 80 would be expanded with 2x32 + 1x16. + */ + some =3D QEMU_ALIGN_DOWN(oprsz, 32); + expand_3i_vec(g->vece, dofs, aofs, bofs, some, 32, TCG_TYPE_V256, + c, g->load_dest, g->fniv); + if (some =3D=3D oprsz) { + break; + } + dofs +=3D some; + aofs +=3D some; + bofs +=3D some; + oprsz -=3D some; + maxsz -=3D some; + /* fallthru */ + case TCG_TYPE_V128: + expand_3i_vec(g->vece, dofs, aofs, bofs, oprsz, 16, TCG_TYPE_V128, + c, g->load_dest, g->fniv); + break; + case TCG_TYPE_V64: + expand_3i_vec(g->vece, dofs, aofs, bofs, oprsz, 8, TCG_TYPE_V64, + c, g->load_dest, g->fniv); + break; + + case 0: + if (g->fni8 && check_size_impl(oprsz, 8)) { + expand_3i_i64(dofs, aofs, bofs, oprsz, c, g->load_dest, g->fni= 8); + } else if (g->fni4 && check_size_impl(oprsz, 4)) { + expand_3i_i32(dofs, aofs, bofs, oprsz, c, g->load_dest, g->fni= 4); + } else { + assert(g->fno !=3D NULL); + tcg_gen_gvec_3_ool(dofs, aofs, bofs, oprsz, maxsz, c, g->fno); + return; + } + break; + + default: + g_assert_not_reached(); + } + + if (oprsz < maxsz) { + expand_clr(dofs + oprsz, maxsz - oprsz); + } +} + /* Expand a vector four-operand operation. */ void tcg_gen_gvec_4(uint32_t dofs, uint32_t aofs, uint32_t bofs, uint32_t = cofs, uint32_t oprsz, uint32_t maxsz, const GVecGen4 *g) diff --git a/tcg/tcg-op-gvec.h b/tcg/tcg-op-gvec.h index 850da32ded..c093243c4c 100644 --- a/tcg/tcg-op-gvec.h +++ b/tcg/tcg-op-gvec.h @@ -164,6 +164,27 @@ typedef struct { bool load_dest; } GVecGen3; =20 +typedef struct { + /* + * Expand inline as a 64-bit or 32-bit integer. Only one of these will= be + * non-NULL. + */ + void (*fni8)(TCGv_i64, TCGv_i64, TCGv_i64, int64_t); + void (*fni4)(TCGv_i32, TCGv_i32, TCGv_i32, int32_t); + /* Expand inline with a host vector type. */ + void (*fniv)(unsigned, TCGv_vec, TCGv_vec, TCGv_vec, int64_t); + /* Expand out-of-line helper w/descriptor, data in descriptor. */ + gen_helper_gvec_3 *fno; + /* The opcode, if any, to which this corresponds. */ + TCGOpcode opc; + /* The vector element size, if applicable. */ + uint8_t vece; + /* Prefer i64 to v64. */ + bool prefer_i64; + /* Load dest as a 3rd source operand. */ + bool load_dest; +} GVecGen3i; + typedef struct { /* Expand inline as a 64-bit or 32-bit integer. Only one of these will be non-NULL. */ @@ -193,6 +214,9 @@ void tcg_gen_gvec_2s(uint32_t dofs, uint32_t aofs, uint= 32_t oprsz, uint32_t maxsz, TCGv_i64 c, const GVecGen2s *); void tcg_gen_gvec_3(uint32_t dofs, uint32_t aofs, uint32_t bofs, uint32_t oprsz, uint32_t maxsz, const GVecGen3 *); +void tcg_gen_gvec_3i(uint32_t dofs, uint32_t aofs, uint32_t bofs, + uint32_t oprsz, uint32_t maxsz, int64_t c, + const GVecGen3i *); void tcg_gen_gvec_4(uint32_t dofs, uint32_t aofs, uint32_t bofs, uint32_t = cofs, uint32_t oprsz, uint32_t maxsz, const GVecGen4 *); =20 --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554980098; cv=none; d=zoho.com; s=zohoarc; b=Xns4IsskDVZI63DGqCkJOGVFRtF1msvyZ4q4/clH3dfVEInYtwiWuCjdGpnOP4ZkwcBJX5mA1L70qmMZQPaGFdjx3H1DapYYcJUdp9f8lyw9VvIX4WQatj3gX6YVY2uzpMuk6YH2yutySzepEkdhIYmq1/BR9u6RBSHsqvfdawQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554980098; 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=cPXttefSFkR6Alqd3NSpRKmTmL01+RMQLI64j2dQB1k=; b=lHVQR0cLuOTL8PUJAzIuMtlMaQ545opw3CbuTN+rFHow+uQ/ka0A8t8RvosJB7c1Kaqcl3L+t+PEwVaIp2dPVBj+dT7i2yj+X5f3x6y9FgDVw4B570kE0gzmZB4bEDL0bEc5jDFTJPqvxZfES8C/2ie1BvDjgInpak6MmK/UVTc= 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 1554980098277958.2487247773937; Thu, 11 Apr 2019 03:54:58 -0700 (PDT) Received: from localhost ([127.0.0.1]:46197 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEXM1-0004ij-3i for importer@patchew.org; Thu, 11 Apr 2019 06:54:49 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54884) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWsi-000390-0l for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:24:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWdR-00077C-Rv for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:08:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44212) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWdR-00076r-G7; Thu, 11 Apr 2019 06:08:45 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C041AF74B7; Thu, 11 Apr 2019 10:08:44 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 436B31001E71; Thu, 11 Apr 2019 10:08:42 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:07:57 +0200 Message-Id: <20190411100836.646-3-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 11 Apr 2019 10:08:44 +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 02/41] s390x/tcg: Implement VECTOR ADD 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" Introduce two types of fancy new helpers that will be reused a couple of times 1. gen_gvec_fn_3: Call an existing tcg_gen_gvec_X function with 3 parameters, simplifying parameter passing 2. gen_gvec128_3_i64: Call a function that performs 128 bit calculations using two 64 bit values per vector. Luckily, for VECTOR ADD we already have everything we need. Signed-off-by: David Hildenbrand Reviewed-by: Richard Henderson --- target/s390x/insn-data.def | 5 ++++ target/s390x/translate_vx.inc.c | 52 +++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index 71fa9b8d6c..74a0ccc770 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1054,6 +1054,11 @@ /* VECTOR UNPACK LOGICAL LOW */ F(0xe7d4, VUPLL, VRR_a, V, 0, 0, 0, 0, vup, 0, IF_VEC) =20 +/* =3D=3D=3D Vector Integer Instructions =3D=3D=3D */ + +/* VECTOR ADD */ + F(0xe7f3, VA, VRR_c, V, 0, 0, 0, 0, va, 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 76f9a5d939..2f84ea0511 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -157,6 +157,41 @@ static void get_vec_element_ptr_i64(TCGv_ptr ptr, uint= 8_t reg, TCGv_i64 enr, 16) #define gen_gvec_dup64i(v1, c) \ tcg_gen_gvec_dup64i(vec_full_reg_offset(v1), 16, 16, c) +#define gen_gvec_fn_3(fn, es, v1, v2, v3) \ + tcg_gen_gvec_##fn(es, vec_full_reg_offset(v1), vec_full_reg_offset(v2)= , \ + vec_full_reg_offset(v3), 16, 16) + +/* + * Helper to carry out a 128 bit vector computation using 2 i64 values per + * vector. + */ +typedef void (*gen_gvec128_3_i64_fn)(TCGv_i64 dl, TCGv_i64 dh, TCGv_i64 al, + TCGv_i64 ah, TCGv_i64 bl, TCGv_i64 bh= ); +static void gen_gvec128_3_i64(gen_gvec128_3_i64_fn fn, uint8_t d, uint8_t = a, + uint8_t b) +{ + TCGv_i64 dh =3D tcg_temp_new_i64(); + TCGv_i64 dl =3D tcg_temp_new_i64(); + TCGv_i64 ah =3D tcg_temp_new_i64(); + TCGv_i64 al =3D tcg_temp_new_i64(); + TCGv_i64 bh =3D tcg_temp_new_i64(); + TCGv_i64 bl =3D tcg_temp_new_i64(); + + read_vec_element_i64(ah, a, 0, ES_64); + read_vec_element_i64(al, a, 1, ES_64); + read_vec_element_i64(bh, b, 0, ES_64); + read_vec_element_i64(bl, b, 1, ES_64); + fn(dl, dh, al, ah, bl, bh); + write_vec_element_i64(dh, d, 0, ES_64); + write_vec_element_i64(dl, d, 1, ES_64); + + tcg_temp_free_i64(dh); + tcg_temp_free_i64(dl); + tcg_temp_free_i64(ah); + tcg_temp_free_i64(al); + tcg_temp_free_i64(bh); + tcg_temp_free_i64(bl); +} =20 static void gen_gvec_dupi(uint8_t es, uint8_t reg, uint64_t c) { @@ -933,3 +968,20 @@ static DisasJumpType op_vup(DisasContext *s, DisasOps = *o) tcg_temp_free_i64(tmp); return DISAS_NEXT; } + +static DisasJumpType op_va(DisasContext *s, DisasOps *o) +{ + const uint8_t es =3D get_field(s->fields, m4); + + if (es > ES_128) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } else if (es =3D=3D ES_128) { + gen_gvec128_3_i64(tcg_gen_add2_i64, get_field(s->fields, v1), + get_field(s->fields, v2), get_field(s->fields, v= 3)); + return DISAS_NEXT; + } + gen_gvec_fn_3(add, es, get_field(s->fields, v1), get_field(s->fields, = v2), + get_field(s->fields, v3)); + return DISAS_NEXT; +} --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554980149; cv=none; d=zoho.com; s=zohoarc; b=FSnMQSZQci3Nx4CVnoTUBOitRQM8MFMDr4VuRYW966dOTZBquu9MYfceMsQtOy/+PCafqPcQyIeHh7byFY7AyeOMgidMav2ott1WvKk2e0sDHBP68BGDE5eYGgtXMi4SCjEaFvhBd7Ij9uwqvvaOCWwPWDfytxJHG+IMZxLqmq4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554980149; 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=71Wr9ZgsqE/0uslVyPi9eoUBDMR7Dv83VF7HOBtFE+Q=; b=eJvqXWOs45QTkCAEUTqv/dR9OjEwH3CkrwdWKqo/nn0s8R+tdLOVY+9AgB17xPik+uRGUqeU+NC5RanDDuoL3siYsdMhErd8P6TgU9rUW939I3Ux26akAKfD7Qjr7JXhy2KvkSor2mLwS2TjcdLQgLO8p/Xpse+RGKZwqz6Pl6Q= 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 1554980149883740.3905944077648; Thu, 11 Apr 2019 03:55:49 -0700 (PDT) Received: from localhost ([127.0.0.1]:46203 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEXMu-0005al-RI for importer@patchew.org; Thu, 11 Apr 2019 06:55:44 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55085) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWsh-0003L1-Vi for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:24:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWdU-00078C-LB for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:08:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47494) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWdU-00077t-Al; Thu, 11 Apr 2019 06:08:48 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9AF9083F51; Thu, 11 Apr 2019 10:08:47 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 14A7A1001E84; Thu, 11 Apr 2019 10:08:44 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:07:58 +0200 Message-Id: <20190411100836.646-4-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 11 Apr 2019 10:08:47 +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 03/41] s390x/tcg: Implement VECTOR ADD COMPUTE CARRY 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" Only 64 bit handling is really easy. 128 bit handling is performed via an ool handler, introducing s390_vec_add() that will be reused later. 8/16/32 bit handling is black magic inspired by gen_addv_mask(). If there is every a bug detected in there, throw it away and simply use ool helpers for 8/16 bit handling and something like 64 bit handling for 32 bit handling. Signed-off-by: David Hildenbrand --- target/s390x/Makefile.objs | 2 +- target/s390x/helper.h | 3 ++ target/s390x/insn-data.def | 2 + target/s390x/translate_vx.inc.c | 74 +++++++++++++++++++++++++++++++++ target/s390x/vec_int_helper.c | 47 +++++++++++++++++++++ 5 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 target/s390x/vec_int_helper.c diff --git a/target/s390x/Makefile.objs b/target/s390x/Makefile.objs index 68eeee3d2f..993ac93ed6 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 +obj-$(CONFIG_TCG) +=3D vec_helper.o vec_int_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 0b494a2fd2..2c1b223248 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -145,6 +145,9 @@ DEF_HELPER_5(gvec_vpkls_cc64, void, ptr, cptr, cptr, en= v, i32) DEF_HELPER_FLAGS_5(gvec_vperm, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, cpt= r, i32) DEF_HELPER_FLAGS_4(vstl, TCG_CALL_NO_WG, void, env, cptr, i64, i64) =20 +/* =3D=3D=3D Vector Integer Instructions =3D=3D=3D */ +DEF_HELPER_FLAGS_4(gvec_vacc128, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i= 32) + #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 74a0ccc770..f0e62b9aa8 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1058,6 +1058,8 @@ =20 /* VECTOR ADD */ F(0xe7f3, VA, VRR_c, V, 0, 0, 0, 0, va, 0, IF_VEC) +/* VECTOR ADD COMPUTE CARRY */ + F(0xe7f1, VACC, VRR_c, V, 0, 0, 0, 0, vacc, 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 2f84ea0511..c3bc47f1a9 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -136,6 +136,9 @@ static void get_vec_element_ptr_i64(TCGv_ptr ptr, uint8= _t reg, TCGv_i64 enr, tcg_temp_free_i64(tmp); } =20 +#define gen_gvec_3(v1, v2, v3, gen) \ + tcg_gen_gvec_3(vec_full_reg_offset(v1), vec_full_reg_offset(v2), \ + vec_full_reg_offset(v3), 16, 16, gen) #define gen_gvec_3_ool(v1, v2, v3, data, fn) \ tcg_gen_gvec_3_ool(vec_full_reg_offset(v1), vec_full_reg_offset(v2), \ vec_full_reg_offset(v3), 16, 16, data, fn) @@ -985,3 +988,74 @@ static DisasJumpType op_va(DisasContext *s, DisasOps *= o) get_field(s->fields, v3)); return DISAS_NEXT; } + +static void gen_acc(TCGv_i64 d, TCGv_i64 a, TCGv_i64 b, uint8_t es) +{ + const uint8_t msb_bit_nr =3D NUM_VEC_ELEMENT_BITS(es) - 1; + TCGv_i64 msb_mask =3D tcg_const_i64(dup_const(es, 1ull << msb_bit_nr)); + TCGv_i64 t1 =3D tcg_temp_new_i64(); + TCGv_i64 t2 =3D tcg_temp_new_i64(); + TCGv_i64 t3 =3D tcg_temp_new_i64(); + + /* Calculate the carry into the MSB, ignoring the old MSBs */ + tcg_gen_andc_i64(t1, a, msb_mask); + tcg_gen_andc_i64(t2, b, msb_mask); + tcg_gen_add_i64(t1, t1, t2); + /* Calculate the MSB without any carry into it */ + tcg_gen_xor_i64(t3, a, b); + /* Calculate the carry out of the MSB in the MSB bit position */ + tcg_gen_and_i64(d, a, b); + tcg_gen_and_i64(t1, t1, t3); + tcg_gen_or_i64(d, d, t1); + /* Isolate and shift the carry into position */ + tcg_gen_and_i64(d, d, msb_mask); + tcg_gen_shri_i64(d, d, msb_bit_nr); + + tcg_temp_free_i64(t1); + tcg_temp_free_i64(t2); + tcg_temp_free_i64(t3); +} + +static void gen_acc8_i64(TCGv_i64 d, TCGv_i64 a, TCGv_i64 b) +{ + gen_acc(d, a, b, ES_8); +} + +static void gen_acc16_i64(TCGv_i64 d, TCGv_i64 a, TCGv_i64 b) +{ + gen_acc(d, a, b, ES_16); +} + +static void gen_acc32_i64(TCGv_i64 d, TCGv_i64 a, TCGv_i64 b) +{ + gen_acc(d, a, b, ES_32); +} + +static void gen_acc_i64(TCGv_i64 d, TCGv_i64 a, TCGv_i64 b) +{ + TCGv_i64 t =3D tcg_temp_new_i64(); + + tcg_gen_add_i64(t, a, b); + tcg_gen_setcond_i64(TCG_COND_LTU, d, t, b); + tcg_temp_free_i64(t); +} + +static DisasJumpType op_vacc(DisasContext *s, DisasOps *o) +{ + const uint8_t es =3D get_field(s->fields, m4); + static const GVecGen3 g[5] =3D { + { .fni8 =3D gen_acc8_i64, }, + { .fni8 =3D gen_acc16_i64, }, + { .fni8 =3D gen_acc32_i64, }, + { .fni8 =3D gen_acc_i64, }, + { .fno =3D gen_helper_gvec_vacc128, }, + }; + + if (es > ES_128) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + gen_gvec_3(get_field(s->fields, v1), get_field(s->fields, v2), + get_field(s->fields, v3), &g[es]); + return DISAS_NEXT; +} diff --git a/target/s390x/vec_int_helper.c b/target/s390x/vec_int_helper.c new file mode 100644 index 0000000000..0b232571bc --- /dev/null +++ b/target/s390x/vec_int_helper.c @@ -0,0 +1,47 @@ +/* + * QEMU TCG support -- s390x vector integer 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 "vec.h" +#include "exec/helper-proto.h" + +/* + * Add two 128 bit vectors, returning the carry. + */ +static bool s390_vec_add(S390Vector *d, const S390Vector *a, + const S390Vector *b) +{ + bool low_carry =3D false, high_carry =3D false; + + if (a->doubleword[0] + b->doubleword[0] < a->doubleword[0]) { + high_carry =3D true; + } + if (a->doubleword[1] + b->doubleword[1] < a->doubleword[1]) { + low_carry =3D true; + if (a->doubleword[0] =3D=3D b->doubleword[0]) { + high_carry =3D true; + } + } + d->doubleword[0] =3D a->doubleword[0] + b->doubleword[0] + low_carry; + d->doubleword[1] =3D a->doubleword[1] + b->doubleword[1]; + return high_carry; +} + +void HELPER(gvec_vacc128)(void *v1, const void *v2, const void *v3, + uint32_t desc) +{ + S390Vector tmp, *dst =3D v1; + + dst->doubleword[0] =3D 0; + dst->doubleword[1] =3D s390_vec_add(&tmp, v2, v3); +} --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554980124; cv=none; d=zoho.com; s=zohoarc; b=ipDMQURLDZvvZLLY1hGHoz+d8zCRmz+SDHZGMcua2k8Wj0qiNEe/H2bOyMg+OFhTihTmv+WyDrt2hT972z0bNeEiBSipFyAgtLJibmJMjCmKIrxAgUmbmqwUfTbiPzNsZt35xatqV5ybDEtjweFv1yjrVQKTKQ4MV4ZWvg3//Rc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554980124; 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=CKSaK+Qnl8WiNwUfGXncYUp4dw9Ph3mjA3qToOJMzPM=; b=CadNCMtbmCpYIQBmjaD7XHzP8PFMJk+IgzOvMBuZPC8XjEEQXKx+nqhL64WcnySy9MorobKc4M2d1p4QM0FNZyDG/1AbIZfpFk1i2dm55KzbTNImROUcQKceK2zhiPbNysjn573laFr1UdCSlI40HdtBmTBNwE6cNhg+KyRjPJ0= 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 1554980124679670.3762572960143; Thu, 11 Apr 2019 03:55:24 -0700 (PDT) Received: from localhost ([127.0.0.1]:46199 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEXMX-0005El-NK for importer@patchew.org; Thu, 11 Apr 2019 06:55:21 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54895) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWsh-00039p-VW for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:24:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWdW-00078e-9V for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:08:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:16001) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWdV-00078L-Uf; Thu, 11 Apr 2019 06:08:50 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3ED6A3097063; Thu, 11 Apr 2019 10:08:49 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id E36FB1001E71; Thu, 11 Apr 2019 10:08:47 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:07:59 +0200 Message-Id: <20190411100836.646-5-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Thu, 11 Apr 2019 10:08:49 +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 04/41] s390x/tcg: Implement VECTOR ADD WITH CARRY 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" Only slightly ugly, perform two additions. At least it is only supported for 128 bit elements. Introduce gen_gvec128_4_i64() similar to gen_gvec128_3_i64(). Signed-off-by: David Hildenbrand Reviewed-by: Richard Henderson --- target/s390x/insn-data.def | 2 ++ target/s390x/translate_vx.inc.c | 63 +++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index f0e62b9aa8..38d1e22a6d 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1060,6 +1060,8 @@ F(0xe7f3, VA, VRR_c, V, 0, 0, 0, 0, va, 0, IF_VEC) /* VECTOR ADD COMPUTE CARRY */ F(0xe7f1, VACC, VRR_c, V, 0, 0, 0, 0, vacc, 0, IF_VEC) +/* VECTOR ADD WITH CARRY */ + F(0xe7bb, VAC, VRR_d, V, 0, 0, 0, 0, vac, 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 c3bc47f1a9..111b0b7c69 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -196,6 +196,41 @@ static void gen_gvec128_3_i64(gen_gvec128_3_i64_fn fn,= uint8_t d, uint8_t a, tcg_temp_free_i64(bl); } =20 +typedef void (*gen_gvec128_4_i64_fn)(TCGv_i64 dl, TCGv_i64 dh, TCGv_i64 al, + TCGv_i64 ah, TCGv_i64 bl, TCGv_i64 bh, + TCGv_i64 cl, TCGv_i64 ch); +static void gen_gvec128_4_i64(gen_gvec128_4_i64_fn fn, uint8_t d, uint8_t = a, + uint8_t b, uint8_t c) +{ + TCGv_i64 dh =3D tcg_temp_new_i64(); + TCGv_i64 dl =3D tcg_temp_new_i64(); + TCGv_i64 ah =3D tcg_temp_new_i64(); + TCGv_i64 al =3D tcg_temp_new_i64(); + TCGv_i64 bh =3D tcg_temp_new_i64(); + TCGv_i64 bl =3D tcg_temp_new_i64(); + TCGv_i64 ch =3D tcg_temp_new_i64(); + TCGv_i64 cl =3D tcg_temp_new_i64(); + + read_vec_element_i64(ah, a, 0, ES_64); + read_vec_element_i64(al, a, 1, ES_64); + read_vec_element_i64(bh, b, 0, ES_64); + read_vec_element_i64(bl, b, 1, ES_64); + read_vec_element_i64(ch, c, 0, ES_64); + read_vec_element_i64(cl, c, 1, ES_64); + fn(dl, dh, al, ah, bl, bh, cl, ch); + write_vec_element_i64(dh, d, 0, ES_64); + write_vec_element_i64(dl, d, 1, ES_64); + + tcg_temp_free_i64(dh); + tcg_temp_free_i64(dl); + tcg_temp_free_i64(ah); + tcg_temp_free_i64(al); + tcg_temp_free_i64(bh); + tcg_temp_free_i64(bl); + tcg_temp_free_i64(ch); + tcg_temp_free_i64(cl); +} + static void gen_gvec_dupi(uint8_t es, uint8_t reg, uint64_t c) { switch (es) { @@ -1059,3 +1094,31 @@ static DisasJumpType op_vacc(DisasContext *s, DisasO= ps *o) get_field(s->fields, v3), &g[es]); return DISAS_NEXT; } + +static void gen_ac2_i64(TCGv_i64 dl, TCGv_i64 dh, TCGv_i64 al, TCGv_i64 ah, + TCGv_i64 bl, TCGv_i64 bh, TCGv_i64 cl, TCGv_i64 ch) +{ + TCGv_i64 tl =3D tcg_temp_new_i64(); + TCGv_i64 th =3D tcg_const_i64(0); + + /* extract the carry only */ + tcg_gen_extract_i64(tl, cl, 0, 1); + tcg_gen_add2_i64(dl, dh, al, ah, bl, bh); + tcg_gen_add2_i64(dl, dh, dl, dh, tl, th); + + tcg_temp_free_i64(tl); + tcg_temp_free_i64(th); +} + +static DisasJumpType op_vac(DisasContext *s, DisasOps *o) +{ + if (get_field(s->fields, m5) !=3D ES_128) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + + gen_gvec128_4_i64(gen_ac2_i64, get_field(s->fields, v1), + get_field(s->fields, v2), get_field(s->fields, v3), + get_field(s->fields, v4)); + return DISAS_NEXT; +} --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554980427; cv=none; d=zoho.com; s=zohoarc; b=SiaMcIoxehzs3hJ2vhjQxcVLYeQvq9xJqAyCM7dJz8oGaJJ8vsd0D2BnrIIowyGKOA140aOplxtcTbZc3xpcuKMzE0H3wxBBUg2Sq8RGzPmwQytiur49QLh77fq8HIMH1NXSFig2+IvaKctTs9xAi7uuEUqcOpEEfwxQoJksn70= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554980427; 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=8TZPwWU02R1pr6SW3fGkCO95+VP0/0WHqa6r/PVUN9Q=; b=ThjWqyW408yr6VCUKYUzbR2IaOybGXy9MtCV2wO+9tNcwlAEebey87RF4J4FtaDpkzK5TpZvadUpaLxjmd1hC81h7Dp/Z+9DqvfKO+5eLXxrp7vYkdK1K2/wxjb0ILtR0Vj6RI5tpDSwfe0p36pw03VKSgTNu9Jv9P7wbnF2UDw= 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 1554980427077535.9036488358804; Thu, 11 Apr 2019 04:00:27 -0700 (PDT) Received: from localhost ([127.0.0.1]:46353 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEXRK-0001Sp-7x for importer@patchew.org; Thu, 11 Apr 2019 07:00:18 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54552) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWsh-0002dl-U2 for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:24:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWdX-00079O-Vm for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:08:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55878) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWdX-00078t-KF; Thu, 11 Apr 2019 06:08:51 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D4C57308CFA9; Thu, 11 Apr 2019 10:08:50 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8683C1001E71; Thu, 11 Apr 2019 10:08:49 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:08:00 +0200 Message-Id: <20190411100836.646-6-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Thu, 11 Apr 2019 10:08:50 +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 05/41] s390x/tcg: Implement VECTOR ADD WITH CARRY COMPUTE CARRY 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" Again, use a helper as calculating the carry is even more involved than for VECTOR ADD COMPUTE CARRY. Signed-off-by: David Hildenbrand --- target/s390x/helper.h | 1 + target/s390x/insn-data.def | 2 ++ target/s390x/translate_vx.inc.c | 13 +++++++++++++ target/s390x/vec_int_helper.c | 16 ++++++++++++++++ 4 files changed, 32 insertions(+) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index 2c1b223248..e1847e8877 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -147,6 +147,7 @@ DEF_HELPER_FLAGS_4(vstl, TCG_CALL_NO_WG, void, env, cpt= r, i64, i64) =20 /* =3D=3D=3D Vector Integer Instructions =3D=3D=3D */ DEF_HELPER_FLAGS_4(gvec_vacc128, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i= 32) +DEF_HELPER_FLAGS_5(gvec_vaccc128, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, = cptr, 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 38d1e22a6d..a531b21908 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1062,6 +1062,8 @@ F(0xe7f1, VACC, VRR_c, V, 0, 0, 0, 0, vacc, 0, IF_VEC) /* VECTOR ADD WITH CARRY */ F(0xe7bb, VAC, VRR_d, V, 0, 0, 0, 0, vac, 0, IF_VEC) +/* VECTOR ADD WITH CARRY COMPUTE CARRY */ + F(0xe7b9, VACCC, VRR_d, V, 0, 0, 0, 0, vaccc, 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 111b0b7c69..a264aa0c5a 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -1122,3 +1122,16 @@ static DisasJumpType op_vac(DisasContext *s, DisasOp= s *o) get_field(s->fields, v4)); return DISAS_NEXT; } + +static DisasJumpType op_vaccc(DisasContext *s, DisasOps *o) +{ + if (get_field(s->fields, m5) !=3D ES_128) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + + gen_gvec_4_ool(get_field(s->fields, v1), get_field(s->fields, v2), + get_field(s->fields, v3), get_field(s->fields, v4), 0, + gen_helper_gvec_vaccc128); + return DISAS_NEXT; +} diff --git a/target/s390x/vec_int_helper.c b/target/s390x/vec_int_helper.c index 0b232571bc..97fc559da0 100644 --- a/target/s390x/vec_int_helper.c +++ b/target/s390x/vec_int_helper.c @@ -45,3 +45,19 @@ void HELPER(gvec_vacc128)(void *v1, const void *v2, cons= t void *v3, dst->doubleword[0] =3D 0; dst->doubleword[1] =3D s390_vec_add(&tmp, v2, v3); } + +void HELPER(gvec_vaccc128)(void *v1, const void *v2, const void *v3, + const void *v4, uint32_t desc) +{ + const S390Vector old_carry =3D { + .doubleword[0] =3D 0, + .doubleword[1] =3D ((S390Vector *)v4)->doubleword[1] & 1, + }; + S390Vector tmp, *dst =3D v1; + bool carry; + + carry =3D s390_vec_add(&tmp, v2, v3); + carry |=3D s390_vec_add(&tmp, &tmp, &old_carry); + dst->doubleword[0] =3D 0; + dst->doubleword[1] =3D carry; +} --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554980142; cv=none; d=zoho.com; s=zohoarc; b=WVfDsAl07i77HOerw3EO9xkXiPrucNDA7zqxGR/rq3QmGbMqSgl1Lhb4HqkHghfpqydoBEwtDtt7t3WzuOcHt2Win6GsKqJJEK+FZ/m/9aXZhZJI4im+AZrGwR1UNlHfhWRfFUUn2PI2Ax1JDVzkgE8JTq43f5bH1RPlB/jp5Rs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554980142; 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=rpYMTHCoCNcTpFBgskfL2XnadZNrb+I6NjI6pRRHa2I=; b=BkXeqI9v1QBCAqIYgHjeb7DvKPoX4hSM75XHgRJenEjjbViPOVlYjQwR1h/5AgWv9y1vo0tkG5WgZdaHOyATUSd1Rh59lTI/LaYCnvK3SmDZ6t/cLUW4IGC6MRSnyM1t7Kf3L4s1D0hZUryWD7aYGpsx5Hj7YF8bfNQgsgmhbjU= 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 1554980142625202.67536114132736; Thu, 11 Apr 2019 03:55:42 -0700 (PDT) Received: from localhost ([127.0.0.1]:46201 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEXMn-0005VR-Ja for importer@patchew.org; Thu, 11 Apr 2019 06:55:37 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54395) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWse-0002Xe-8e for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:24:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWdZ-0007A4-IG for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:08:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55894) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWdZ-00079c-9d; Thu, 11 Apr 2019 06:08:53 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7E4A8308CFA2; Thu, 11 Apr 2019 10:08:52 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 28A171001E71; Thu, 11 Apr 2019 10:08:51 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:08:01 +0200 Message-Id: <20190411100836.646-7-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Thu, 11 Apr 2019 10:08:52 +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 06/41] s390x/tcg: Implement VECTOR AND (WITH COMPLEMENT) 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" Easy, as we can reuse existing gvec helpers. Signed-off-by: David Hildenbrand Reviewed-by: Richard Henderson --- target/s390x/insn-data.def | 4 ++++ target/s390x/translate_vx.inc.c | 14 ++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index a531b21908..456d5597ca 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1064,6 +1064,10 @@ F(0xe7bb, VAC, VRR_d, V, 0, 0, 0, 0, vac, 0, IF_VEC) /* VECTOR ADD WITH CARRY COMPUTE CARRY */ F(0xe7b9, VACCC, VRR_d, V, 0, 0, 0, 0, vaccc, 0, IF_VEC) +/* VECTOR AND */ + F(0xe768, VN, VRR_c, V, 0, 0, 0, 0, vn, 0, IF_VEC) +/* VECTOR AND WITH COMPLEMENT */ + F(0xe769, VNC, VRR_c, V, 0, 0, 0, 0, vnc, 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 a264aa0c5a..aaa247e855 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -1135,3 +1135,17 @@ static DisasJumpType op_vaccc(DisasContext *s, Disas= Ops *o) gen_helper_gvec_vaccc128); return DISAS_NEXT; } + +static DisasJumpType op_vn(DisasContext *s, DisasOps *o) +{ + gen_gvec_fn_3(and, ES_8, get_field(s->fields, v1), get_field(s->fields= , v2), + get_field(s->fields, v3)); + return DISAS_NEXT; +} + +static DisasJumpType op_vnc(DisasContext *s, DisasOps *o) +{ + gen_gvec_fn_3(andc, ES_8, get_field(s->fields, v1), + get_field(s->fields, v2), get_field(s->fields, v3)); + return DISAS_NEXT; +} --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554979958; cv=none; d=zoho.com; s=zohoarc; b=IA+mEN0Bz6eaxyPIGVXzXzYQzL+ov6r4KxNmz82+jnhSgBSOQLljv+6AnSHv7d6ZMfFh6WgKf+CqKeZWTFEV53ltTs2mXjRwdsJrBay00z6xZNSaFQUkuKjdD0DUhgd/4Fi+gDtyhq+JkmGRv1aaYOI60EV73R0PbvjCUwPED4E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554979958; 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=aa/UUf+X6vyl617ntdZTcZ8zD9mivfba2gRQeD3gTek=; b=MxL3sZ6FXZqWbxSu6oyTj59wh/rtcIIZcb/krB/fBoGpJgm/xEVQNxE9tHGnuxsVu+etcb+Ti4O5bni26idEhsGQRqb3s1kJcJSNXwtB+LKivrCBS3u4tFp3a9qo1JQr0x5Wj746MeE5gr/v1jCnOOFGRK745HRQVi247INoFSY= 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 1554979958273142.7455658370751; Thu, 11 Apr 2019 03:52:38 -0700 (PDT) Received: from localhost ([127.0.0.1]:46163 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEXJj-0002f5-WB for importer@patchew.org; Thu, 11 Apr 2019 06:52:28 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55085) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWse-0003L1-36 for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:24:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWdc-0007BD-4P for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:08:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59758) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWdb-0007Au-PP; Thu, 11 Apr 2019 06:08:56 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0A72B30018C6; Thu, 11 Apr 2019 10:08:55 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id C1B131001E71; Thu, 11 Apr 2019 10:08:52 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:08:02 +0200 Message-Id: <20190411100836.646-8-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Thu, 11 Apr 2019 10:08:55 +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 07/41] s390x/tcg: Implement VECTOR AVERAGE 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" Handle 32/64-bit elements via gvec expansion and the 8/16 bits via ool helpers. Signed-off-by: David Hildenbrand Reviewed-by: Richard Henderson --- target/s390x/helper.h | 2 ++ target/s390x/insn-data.def | 2 ++ target/s390x/translate_vx.inc.c | 63 +++++++++++++++++++++++++++++++++ target/s390x/vec_int_helper.c | 16 +++++++++ 4 files changed, 83 insertions(+) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index e1847e8877..2b6b716909 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -148,6 +148,8 @@ DEF_HELPER_FLAGS_4(vstl, TCG_CALL_NO_WG, void, env, cpt= r, i64, i64) /* =3D=3D=3D Vector Integer Instructions =3D=3D=3D */ DEF_HELPER_FLAGS_4(gvec_vacc128, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i= 32) DEF_HELPER_FLAGS_5(gvec_vaccc128, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, = cptr, i32) +DEF_HELPER_FLAGS_4(gvec_vavg8, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) +DEF_HELPER_FLAGS_4(gvec_vavg16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i3= 2) =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 456d5597ca..6f8b42e327 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1068,6 +1068,8 @@ F(0xe768, VN, VRR_c, V, 0, 0, 0, 0, vn, 0, IF_VEC) /* VECTOR AND WITH COMPLEMENT */ F(0xe769, VNC, VRR_c, V, 0, 0, 0, 0, vnc, 0, IF_VEC) +/* VECTOR AVERAGE */ + F(0xe7f2, VAVG, VRR_c, V, 0, 0, 0, 0, vavg, 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 aaa247e855..50e03bf151 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -256,6 +256,17 @@ static void zero_vec(uint8_t reg) tcg_gen_gvec_dup8i(vec_full_reg_offset(reg), 16, 16, 0); } =20 +static void gen_addi2_i64(TCGv_i64 dl, TCGv_i64 dh, TCGv_i64 al, TCGv_i64 = ah, + uint64_t b) +{ + TCGv_i64 bl =3D tcg_const_i64(b); + TCGv_i64 bh =3D tcg_const_i64(0); + + tcg_gen_add2_i64(dl, dh, al, ah, bl, bh); + tcg_temp_free_i64(bl); + tcg_temp_free_i64(bh); +} + static DisasJumpType op_vge(DisasContext *s, DisasOps *o) { const uint8_t es =3D s->insn->data; @@ -1149,3 +1160,55 @@ static DisasJumpType op_vnc(DisasContext *s, DisasOp= s *o) get_field(s->fields, v2), get_field(s->fields, v3)); return DISAS_NEXT; } + +static void gen_avg_i32(TCGv_i32 d, TCGv_i32 a, TCGv_i32 b) +{ + TCGv_i64 t0 =3D tcg_temp_new_i64(); + TCGv_i64 t1 =3D tcg_temp_new_i64(); + + tcg_gen_ext_i32_i64(t0, a); + tcg_gen_ext_i32_i64(t1, b); + tcg_gen_add_i64(t0, t0, t1); + tcg_gen_addi_i64(t0, t0, 1); + tcg_gen_shri_i64(t0, t0, 1); + tcg_gen_extrl_i64_i32(d, t0); + + tcg_temp_free(t0); + tcg_temp_free(t1); +} + +static void gen_avg_i64(TCGv_i64 dl, TCGv_i64 al, TCGv_i64 bl) +{ + TCGv_i64 dh =3D tcg_temp_new_i64(); + TCGv_i64 ah =3D tcg_temp_new_i64(); + TCGv_i64 bh =3D tcg_temp_new_i64(); + + /* extending the sign by one bit is sufficient */ + tcg_gen_extract_i64(ah, al, 63, 1); + tcg_gen_extract_i64(bh, bl, 63, 1); + tcg_gen_add2_i64(dl, dh, al, ah, bl, bh); + gen_addi2_i64(dl, dh, dl, dh, 1); + tcg_gen_extract2_i64(dl, dl, dh, 1); + + tcg_temp_free_i64(dh); + tcg_temp_free_i64(ah); + tcg_temp_free_i64(bh); +} +static DisasJumpType op_vavg(DisasContext *s, DisasOps *o) +{ + const uint8_t es =3D get_field(s->fields, m4); + static const GVecGen3 g[4] =3D { + { .fno =3D gen_helper_gvec_vavg8, }, + { .fno =3D gen_helper_gvec_vavg16, }, + { .fni4 =3D gen_avg_i32, }, + { .fni8 =3D gen_avg_i64, }, + }; + + if (es > ES_64) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + gen_gvec_3(get_field(s->fields, v1), get_field(s->fields, v2), + get_field(s->fields, v3), &g[es]); + return DISAS_NEXT; +} diff --git a/target/s390x/vec_int_helper.c b/target/s390x/vec_int_helper.c index 97fc559da0..149cfaaeae 100644 --- a/target/s390x/vec_int_helper.c +++ b/target/s390x/vec_int_helper.c @@ -61,3 +61,19 @@ void HELPER(gvec_vaccc128)(void *v1, const void *v2, con= st void *v3, dst->doubleword[0] =3D 0; dst->doubleword[1] =3D carry; } + +#define DEF_VAVG(BITS) = \ +void HELPER(gvec_vavg##BITS)(void *v1, const void *v2, const void *v3, = \ + uint32_t desc) = \ +{ = \ + int i; = \ + = \ + for (i =3D 0; i < (128 / BITS); i++) { = \ + const int32_t a =3D (int##BITS##_t)s390_vec_read_element##BITS(v2,= i); \ + const int32_t b =3D (int##BITS##_t)s390_vec_read_element##BITS(v3,= i); \ + = \ + s390_vec_write_element##BITS(v1, i, (a + b + 1) >> 1); = \ + } = \ +} +DEF_VAVG(8) +DEF_VAVG(16) --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554979111; cv=none; d=zoho.com; s=zohoarc; b=GBfkRHJClqEtXxFUPguzyznNy/uapUMOQUCnZbRAk7xnRYnkrEZpYNGObAHqU6wwYNesYIB3q8//b2krwVHGXgBejHrm9JpQDVdTWWaF1G70EzGRq1gc6LiuJerEQROieHNoIRpM8yckiz2u28tZ9DGvn97lH9kZnBX9ZZHmplo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554979111; 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=wUjKW1pBPYvnRbVUJydmDj0gfGcH4KHDUu0zUyHUlZI=; b=izq48LdDFizKCdxqcdkrZ2Ggzu+OBseObLFn1NZhmc4tsMYcxrtMIAk7A433W03ESPDXbUEyQDPW3lYYa6hxNm4Y6X62ujNznqYpZtqXoFkeehH3+6pYfd4aKWX7ksMzMKev+6Mv/DTZWfDhbnpXp5OjdHRfwyqxaiAil5snLkQ= 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 1554979111282913.3689741055091; Thu, 11 Apr 2019 03:38:31 -0700 (PDT) Received: from localhost ([127.0.0.1]:45918 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEX6B-00070v-99 for importer@patchew.org; Thu, 11 Apr 2019 06:38:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54895) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWsR-00039p-Lz for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:24:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWdf-0007CU-QT for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:09:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60716) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWdf-0007CA-Fa; Thu, 11 Apr 2019 06:08:59 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C1433308792B; Thu, 11 Apr 2019 10:08:58 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 51F811001E71; Thu, 11 Apr 2019 10:08:55 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:08:03 +0200 Message-Id: <20190411100836.646-9-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Thu, 11 Apr 2019 10:08:58 +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 08/41] s390x/tcg: Implement VECTOR AVERAGE LOGICAL 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 AVERAGE but without sign extension. Signed-off-by: David Hildenbrand Reviewed-by: Richard Henderson --- target/s390x/helper.h | 2 ++ target/s390x/insn-data.def | 2 ++ target/s390x/translate_vx.inc.c | 48 +++++++++++++++++++++++++++++++++ target/s390x/vec_int_helper.c | 16 +++++++++++ 4 files changed, 68 insertions(+) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index 2b6b716909..04a3f5fb2e 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -150,6 +150,8 @@ DEF_HELPER_FLAGS_4(gvec_vacc128, TCG_CALL_NO_RWG, void,= ptr, cptr, cptr, i32) DEF_HELPER_FLAGS_5(gvec_vaccc128, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, = cptr, i32) DEF_HELPER_FLAGS_4(gvec_vavg8, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) DEF_HELPER_FLAGS_4(gvec_vavg16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i3= 2) +DEF_HELPER_FLAGS_4(gvec_vavgl8, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i3= 2) +DEF_HELPER_FLAGS_4(gvec_vavgl16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i= 32) =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 6f8b42e327..9889dc0b01 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1070,6 +1070,8 @@ F(0xe769, VNC, VRR_c, V, 0, 0, 0, 0, vnc, 0, IF_VEC) /* VECTOR AVERAGE */ F(0xe7f2, VAVG, VRR_c, V, 0, 0, 0, 0, vavg, 0, IF_VEC) +/* VECTOR AVERAGE LOGICAL */ + F(0xe7f0, VAVGL, VRR_c, V, 0, 0, 0, 0, vavgl, 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 50e03bf151..a190ac57ee 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -1212,3 +1212,51 @@ static DisasJumpType op_vavg(DisasContext *s, DisasO= ps *o) get_field(s->fields, v3), &g[es]); return DISAS_NEXT; } + +static void gen_avgl_i32(TCGv_i32 d, TCGv_i32 a, TCGv_i32 b) +{ + TCGv_i64 t0 =3D tcg_temp_new_i64(); + TCGv_i64 t1 =3D tcg_temp_new_i64(); + + tcg_gen_extu_i32_i64(t0, a); + tcg_gen_extu_i32_i64(t1, b); + tcg_gen_add_i64(t0, t0, t1); + tcg_gen_addi_i64(t0, t0, 1); + tcg_gen_shri_i64(t0, t0, 1); + tcg_gen_extrl_i64_i32(d, t0); + + tcg_temp_free(t0); + tcg_temp_free(t1); +} + +static void gen_avgl_i64(TCGv_i64 dl, TCGv_i64 al, TCGv_i64 bl) +{ + TCGv_i64 dh =3D tcg_temp_new_i64(); + TCGv_i64 zero =3D tcg_const_i64(0); + + tcg_gen_add2_i64(dl, dh, al, zero, bl, zero); + gen_addi2_i64(dl, dh, dl, dh, 1); + tcg_gen_extract2_i64(dl, dl, dh, 1); + + tcg_temp_free_i64(dh); + tcg_temp_free_i64(zero); +} + +static DisasJumpType op_vavgl(DisasContext *s, DisasOps *o) +{ + const uint8_t es =3D get_field(s->fields, m4); + static const GVecGen3 g[4] =3D { + { .fno =3D gen_helper_gvec_vavgl8, }, + { .fno =3D gen_helper_gvec_vavgl16, }, + { .fni4 =3D gen_avgl_i32, }, + { .fni8 =3D gen_avgl_i64, }, + }; + + if (es > ES_64) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + gen_gvec_3(get_field(s->fields, v1), get_field(s->fields, v2), + get_field(s->fields, v3), &g[es]); + return DISAS_NEXT; +} diff --git a/target/s390x/vec_int_helper.c b/target/s390x/vec_int_helper.c index 149cfaaeae..c2aeb12108 100644 --- a/target/s390x/vec_int_helper.c +++ b/target/s390x/vec_int_helper.c @@ -77,3 +77,19 @@ void HELPER(gvec_vavg##BITS)(void *v1, const void *v2, c= onst void *v3, \ } DEF_VAVG(8) DEF_VAVG(16) + +#define DEF_VAVGL(BITS) = \ +void HELPER(gvec_vavgl##BITS)(void *v1, const void *v2, const void *v3, = \ + uint32_t desc) = \ +{ = \ + int i; = \ + = \ + for (i =3D 0; i < (128 / BITS); i++) { = \ + const uint##BITS##_t a =3D s390_vec_read_element##BITS(v2, i); = \ + const uint##BITS##_t b =3D s390_vec_read_element##BITS(v3, i); = \ + = \ + s390_vec_write_element##BITS(v1, i, (a + b + 1) >> 1); = \ + } = \ +} +DEF_VAVGL(8) +DEF_VAVGL(16) --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554980296; cv=none; d=zoho.com; s=zohoarc; b=IC1+kczxLejCzrqsT4y8nwV4xhcRrvT/Ww8Rg8Mh855f0i/gLaaf2B7XVZrgWoMxCdhXexgIZ+lVI48DhrH57Yru+Yllcr0wQsGodrxocNjwE0hSReU6PnfS9LzTiNkhDEnt93vttm7vVo+Dv2sKa+CgdAbmRo2ZI6GBcmAMCZo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554980296; 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=nqkGqoQklyV1tsWeVM4SHa7s5NDpTiNgEJhJidL2xkY=; b=evkDjMrRHvg+Y+kl1lm07qkXsafQr0iAHanZz0AQ8G54ESdYkcr04pTBCl/oyUhOBBJW2wabHpcQb4VFQp7IARhX1XCRIufgwtFjdqGD7dqee4mheLRzyQMtdCGHuRgHBBQ+eoMBbwXFj7/DzhWdTUnB67Akg3SwuwDjydoDNsY= 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 15549802963681018.6501071888371; Thu, 11 Apr 2019 03:58:16 -0700 (PDT) Received: from localhost ([127.0.0.1]:46304 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEXPD-0007nU-2m for importer@patchew.org; Thu, 11 Apr 2019 06:58:07 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54895) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWse-00039p-2D for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:24:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWdh-0007Cw-EU for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:09:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55382) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWdh-0007Cf-3s; Thu, 11 Apr 2019 06:09:01 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 640243082128; Thu, 11 Apr 2019 10:09:00 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 15C661001E71; Thu, 11 Apr 2019 10:08:58 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:08:04 +0200 Message-Id: <20190411100836.646-10-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Thu, 11 Apr 2019 10:09:00 +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 09/41] s390x/tcg: Implement VECTOR CHECKSUM 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" Time to introduce read_vec_element_i32 and write_vec_element_i32. Take proper care of properly adding the carry. Signed-off-by: David Hildenbrand Reviewed-by: Richard Henderson --- target/s390x/insn-data.def | 2 + target/s390x/translate_vx.inc.c | 67 +++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index 9889dc0b01..64459465c5 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1072,6 +1072,8 @@ F(0xe7f2, VAVG, VRR_c, V, 0, 0, 0, 0, vavg, 0, IF_VEC) /* VECTOR AVERAGE LOGICAL */ F(0xe7f0, VAVGL, VRR_c, V, 0, 0, 0, 0, vavgl, 0, IF_VEC) +/* VECTOR CHECKSUM */ + F(0xe766, VCKSM, VRR_c, V, 0, 0, 0, 0, vcksm, 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 a190ac57ee..7a7e185d43 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -90,6 +90,33 @@ static void read_vec_element_i64(TCGv_i64 dst, uint8_t r= eg, uint8_t enr, } } =20 +static void read_vec_element_i32(TCGv_i32 dst, uint8_t reg, uint8_t enr, + TCGMemOp memop) +{ + const int offs =3D vec_reg_offset(reg, enr, memop & MO_SIZE); + + switch (memop) { + case ES_8: + tcg_gen_ld8u_i32(dst, cpu_env, offs); + break; + case ES_16: + tcg_gen_ld16u_i32(dst, cpu_env, offs); + break; + case ES_8 | MO_SIGN: + tcg_gen_ld8s_i32(dst, cpu_env, offs); + break; + case ES_16 | MO_SIGN: + tcg_gen_ld16s_i32(dst, cpu_env, offs); + break; + case ES_32: + case ES_32 | MO_SIGN: + tcg_gen_ld_i32(dst, cpu_env, offs); + break; + default: + g_assert_not_reached(); + } +} + static void write_vec_element_i64(TCGv_i64 src, int reg, uint8_t enr, TCGMemOp memop) { @@ -113,6 +140,25 @@ static void write_vec_element_i64(TCGv_i64 src, int re= g, uint8_t enr, } } =20 +static void write_vec_element_i32(TCGv_i32 src, int reg, uint8_t enr, + TCGMemOp memop) +{ + const int offs =3D vec_reg_offset(reg, enr, memop & MO_SIZE); + + switch (memop) { + case ES_8: + tcg_gen_st8_i32(src, cpu_env, offs); + break; + case ES_16: + tcg_gen_st16_i32(src, cpu_env, offs); + break; + case ES_32: + tcg_gen_st_i32(src, cpu_env, offs); + break; + default: + g_assert_not_reached(); + } +} =20 static void get_vec_element_ptr_i64(TCGv_ptr ptr, uint8_t reg, TCGv_i64 en= r, uint8_t es) @@ -1260,3 +1306,24 @@ static DisasJumpType op_vavgl(DisasContext *s, Disas= Ops *o) get_field(s->fields, v3), &g[es]); return DISAS_NEXT; } + +static DisasJumpType op_vcksm(DisasContext *s, DisasOps *o) +{ + TCGv_i32 tmp =3D tcg_temp_new_i32(); + TCGv_i32 sum =3D tcg_temp_new_i32(); + int i; + + read_vec_element_i32(sum, get_field(s->fields, v3), 1, ES_32); + for (i =3D 0; i < 4; i++) { + read_vec_element_i32(tmp, get_field(s->fields, v2), i, ES_32); + tcg_gen_add_i32(sum, sum, tmp); + tcg_gen_setcond_i32(TCG_COND_LTU, tmp, sum, tmp); + tcg_gen_add_i32(sum, sum, tmp); + } + zero_vec(get_field(s->fields, v1)); + write_vec_element_i32(sum, get_field(s->fields, v1), 1, ES_32); + + tcg_temp_free_i32(tmp); + tcg_temp_free_i32(sum); + return DISAS_NEXT; +} --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554979919; cv=none; d=zoho.com; s=zohoarc; b=axBeJ+CmV8vp0K5gdRePp2hLDkvJTmrwC4YAi+Wf2fZ7es66tLDTAX+B5CG/gtz80v4dUIpkA8TqmlLFp+CuotxlVpTOukN9qR6DCICx/S//6eJ6mM9OWRVCsd/fMWGWkeWpizEgxd/XOg6SSvOMOOdzBGHBBCixE37ze8/fe0g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554979919; 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=QY7ROhN6+hufhj27GEoKJTafTeL8F5wy/KJqu834BwY=; b=SKfRuuvCfwkQgBtU3UNwGOlON1zmC7ZNS+DqRHvSGUkfezIpeU1izdx8fvjxapZ999hqR+hOpbiULUyw7iioB4KI3VEQvxry0yf3YF/tjJ2T2vP4Isi7tX8lyg1Zwb7kuRA+J2jnnMmY03s+LSUaKnf8K7s7ObFL/X2RiZvCwAw= 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 15549799191031019.0889956416282; Thu, 11 Apr 2019 03:51:59 -0700 (PDT) Received: from localhost ([127.0.0.1]:46160 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEXJ2-0002Dm-LT for importer@patchew.org; Thu, 11 Apr 2019 06:51:44 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54895) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWsc-00039p-7d for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:24:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWdi-0007DU-Ub for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:09:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53628) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWdi-0007DA-Ne; Thu, 11 Apr 2019 06:09:02 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 09E2DC00733A; Thu, 11 Apr 2019 10:09:02 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id AC4D81001E71; Thu, 11 Apr 2019 10:09:00 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:08:05 +0200 Message-Id: <20190411100836.646-11-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 11 Apr 2019 10:09:02 +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 10/41] s390x/tcg: Implement VECTOR ELEMENT 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" Fairly easy to implement, we can make use of the existing CC helpers cmps64 and cmpu64 - we siply have to sign extend the elements. Signed-off-by: David Hildenbrand Reviewed-by: Richard Henderson --- target/s390x/insn-data.def | 4 ++++ target/s390x/translate_vx.inc.c | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index 64459465c5..52e398f515 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1074,6 +1074,10 @@ F(0xe7f0, VAVGL, VRR_c, V, 0, 0, 0, 0, vavgl, 0, IF_VEC) /* VECTOR CHECKSUM */ F(0xe766, VCKSM, VRR_c, V, 0, 0, 0, 0, vcksm, 0, IF_VEC) +/* VECTOR ELEMENT COMPARE */ + F(0xe7db, VEC, VRR_a, V, 0, 0, 0, 0, vec, cmps64, IF_VEC) +/* VECTOR ELEMENT COMPARE LOGICAL */ + F(0xe7d9, VECL, VRR_a, V, 0, 0, 0, 0, vec, cmpu64, 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 7a7e185d43..c7462d1bb1 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -1327,3 +1327,23 @@ static DisasJumpType op_vcksm(DisasContext *s, Disas= Ops *o) tcg_temp_free_i32(sum); return DISAS_NEXT; } + +static DisasJumpType op_vec(DisasContext *s, DisasOps *o) +{ + const uint8_t es =3D get_field(s->fields, m3); + const uint8_t enr =3D NUM_VEC_ELEMENTS(es) / 2 - 1; + const bool logical =3D s->fields->op2 =3D=3D 0xd9; + + if (es > ES_64) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + + o->in1 =3D tcg_temp_new_i64(); + o->in2 =3D tcg_temp_new_i64(); + read_vec_element_i64(o->in1, get_field(s->fields, v1), enr, + es | logical ? 0 : MO_SIGN); + read_vec_element_i64(o->in2, get_field(s->fields, v2), enr, + es | logical ? 0 : MO_SIGN); + return DISAS_NEXT; +} --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554979971; cv=none; d=zoho.com; s=zohoarc; b=jmA7SVQnuq64mi3ywkw24DY3QNrwYPRgbYSaDXd/RHa6RGI3RMDmgL8xlXB8gIAl0K21LBrCFlv7txySjqZVgCRizIqdYeQqwk4S72pjd3NtuOx5Ql9SqTsZ6DMZ2PFiqUqm31uBNMFbpcYdCCfRkImKF4NmH3TiAH/C5Raj4n0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554979971; 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=B1jX2oTSiaRY1QzHLVUbA5VF2hsB8gQn6e7wCs++mQE=; b=J1XCkOxK59IjXr589uEtBjvYau7I47ipxKKXJE6BsfVsm25teNQvHb+hGEsZzOCRQgt+RZifEihhByKo0XAkxptLUm97QQ5gFJhNRUCBU6dhCj+VTke1ugGcRL0ew+grVXxJOfGlncEA816xqelMHoM0lT4qhRJ5KEvjArs1ruA= 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 1554979971267842.1930642239422; Thu, 11 Apr 2019 03:52:51 -0700 (PDT) Received: from localhost ([127.0.0.1]:46167 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEXK3-00033P-7B for importer@patchew.org; Thu, 11 Apr 2019 06:52:47 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54552) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWsc-0002dl-54 for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:24:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWdk-0007EC-NB for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:09:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55392) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWdk-0007Dt-BW; Thu, 11 Apr 2019 06:09:04 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9E03C3082128; Thu, 11 Apr 2019 10:09:03 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 507251001E71; Thu, 11 Apr 2019 10:09:02 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:08:06 +0200 Message-Id: <20190411100836.646-12-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Thu, 11 Apr 2019 10:09:03 +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 11/41] s390x/tcg: Implement VECTOR 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" To carry out the comparison, we can reuse the existing gvec comparison function. In case the CC is to be computed, save the result vector and compute the CC lazily. The result is a vector consisting of all 1's for elements that matched and 0's for elements that didn't match. Signed-off-by: David Hildenbrand Reviewed-by: Richard Henderson --- target/s390x/cc_helper.c | 17 +++++++++++++++++ target/s390x/helper.c | 1 + target/s390x/insn-data.def | 6 ++++++ target/s390x/internal.h | 1 + target/s390x/translate.c | 1 + target/s390x/translate_vx.inc.c | 28 ++++++++++++++++++++++++++++ 6 files changed, 54 insertions(+) diff --git a/target/s390x/cc_helper.c b/target/s390x/cc_helper.c index 0e467bf2b6..a00294f183 100644 --- a/target/s390x/cc_helper.c +++ b/target/s390x/cc_helper.c @@ -402,6 +402,20 @@ static uint32_t cc_calc_lcbb(uint64_t dst) return dst =3D=3D 16 ? 0 : 3; } =20 +static uint32_t cc_calc_vc(uint64_t low, uint64_t high) +{ + if (high =3D=3D -1ull && low =3D=3D -1ull) { + /* all elements match */ + return 0; + } else if (high =3D=3D 0 && low =3D=3D 0) { + /* no elements match */ + return 3; + } else { + /* some elements but not all match */ + return 1; + } +} + static uint32_t do_calc_cc(CPUS390XState *env, uint32_t cc_op, uint64_t src, uint64_t dst, uint64_t vr) { @@ -514,6 +528,9 @@ static uint32_t do_calc_cc(CPUS390XState *env, uint32_t= cc_op, case CC_OP_LCBB: r =3D cc_calc_lcbb(dst); break; + case CC_OP_VC: + r =3D cc_calc_vc(src, dst); + break; =20 case CC_OP_NZ_F32: r =3D set_cc_nz_f32(dst); diff --git a/target/s390x/helper.c b/target/s390x/helper.c index 8e9573221c..946de15503 100644 --- a/target/s390x/helper.c +++ b/target/s390x/helper.c @@ -418,6 +418,7 @@ const char *cc_name(enum cc_op cc_op) [CC_OP_SLA_64] =3D "CC_OP_SLA_64", [CC_OP_FLOGR] =3D "CC_OP_FLOGR", [CC_OP_LCBB] =3D "CC_OP_LCBB", + [CC_OP_VC] =3D "CC_OP_VC", }; =20 return cc_names[cc_op]; diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index 52e398f515..1d159cb201 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1078,6 +1078,12 @@ F(0xe7db, VEC, VRR_a, V, 0, 0, 0, 0, vec, cmps64, IF_VEC) /* VECTOR ELEMENT COMPARE LOGICAL */ F(0xe7d9, VECL, VRR_a, V, 0, 0, 0, 0, vec, cmpu64, IF_VEC) +/* VECTOR COMPARE EQUAL */ + E(0xe7f8, VCEQ, VRR_b, V, 0, 0, 0, 0, vc, 0, TCG_COND_EQ, IF_VEC) +/* VECTOR COMPARE HIGH */ + E(0xe7fb, VCH, VRR_b, V, 0, 0, 0, 0, vc, 0, TCG_COND_GT, IF_VEC) +/* VECTOR COMPARE HIGH LOGICAL */ + E(0xe7f9, VCHL, VRR_b, V, 0, 0, 0, 0, vc, 0, TCG_COND_GTU, IF_VEC) =20 #ifndef CONFIG_USER_ONLY /* COMPARE AND SWAP AND PURGE */ diff --git a/target/s390x/internal.h b/target/s390x/internal.h index 3b4855c175..00b00fece5 100644 --- a/target/s390x/internal.h +++ b/target/s390x/internal.h @@ -200,6 +200,7 @@ enum cc_op { CC_OP_SLA_64, /* Calculate shift left signed (64bit) */ CC_OP_FLOGR, /* find leftmost one */ CC_OP_LCBB, /* load count to block boundary */ + CC_OP_VC, /* vector compare result */ CC_OP_MAX }; =20 diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 0afa8f7ca5..a800aa9dc9 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -572,6 +572,7 @@ static void gen_op_calc_cc(DisasContext *s) case CC_OP_SLA_32: case CC_OP_SLA_64: case CC_OP_NZ_F128: + case CC_OP_VC: /* 2 arguments */ gen_helper_calc_cc(cc_op, cpu_env, local_cc_op, cc_src, cc_dst, du= mmy); break; diff --git a/target/s390x/translate_vx.inc.c b/target/s390x/translate_vx.in= c.c index c7462d1bb1..ceb805a406 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -1347,3 +1347,31 @@ static DisasJumpType op_vec(DisasContext *s, DisasOp= s *o) es | logical ? 0 : MO_SIGN); return DISAS_NEXT; } + +static DisasJumpType op_vc(DisasContext *s, DisasOps *o) +{ + const uint8_t es =3D get_field(s->fields, m4); + TCGCond cond =3D s->insn->data; + + if (es > ES_64) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + + tcg_gen_gvec_cmp(cond, es, + vec_full_reg_offset(get_field(s->fields, v1)), + vec_full_reg_offset(get_field(s->fields, v2)), + vec_full_reg_offset(get_field(s->fields, v3)), 16, 16= ); + if (get_field(s->fields, m5) & 0x1) { + TCGv_i64 low =3D tcg_temp_new_i64(); + TCGv_i64 high =3D tcg_temp_new_i64(); + + read_vec_element_i64(high, get_field(s->fields, v1), 0, ES_64); + read_vec_element_i64(low, get_field(s->fields, v1), 1, ES_64); + gen_op_update2_cc_i64(s, CC_OP_VC, low, high); + + tcg_temp_free_i64(low); + tcg_temp_free_i64(high); + } + return DISAS_NEXT; +} --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554979965; cv=none; d=zoho.com; s=zohoarc; b=I8EEQa6/bVAxJQCPkCsZvWUxi54hDMbLi5M9TBTA99TdeW5YBJUp5TCQG6Gv8TPyEd5oxuwqhLIvsXhnuwoOyLjUl1rdnPj3DWsML/Sh6c1I36yU5ZPiRITmM22kHSf2g663xeN9VDZZbsyEtJbSMy/Zd4voi+CBVVRTY/+2pZs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554979965; 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=0tFU9ibah1pe5a9a/FyXdv0x6wmvgqS10W8YMNCSxgE=; b=bIec9veBdXLKE1as8HJ+6TNVIZ8N8lXTycD76wxBKJu8l3OOuSNkY1PViQRRJezOFckOAicN1LKoWMhBrHTZBDaOUvAPzDodHLKVfHDr0xtS7UCfKN1fg28jSSu4vrUmKI/KabjjMc7OUb/CGc2ZHdGYqrFITC+OLrgMjauVRqc= 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 1554979965630548.4182274036326; Thu, 11 Apr 2019 03:52:45 -0700 (PDT) Received: from localhost ([127.0.0.1]:46165 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEXJy-0002yW-JU for importer@patchew.org; Thu, 11 Apr 2019 06:52:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54388) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWsc-0002Us-3Y for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:24:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWdm-0007F3-9q for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:09:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55402) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWdl-0007EV-VT; Thu, 11 Apr 2019 06:09:06 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3F3363082133; Thu, 11 Apr 2019 10:09:05 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id E55B81001E82; Thu, 11 Apr 2019 10:09:03 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:08:07 +0200 Message-Id: <20190411100836.646-13-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Thu, 11 Apr 2019 10:09:05 +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 12/41] s390x/tcg: Implement VECTOR COUNT LEADING ZEROS 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" For 8/16, use the 32 bit variant and properly subtract the added leading zero bits. Signed-off-by: David Hildenbrand Reviewed-by: Richard Henderson --- target/s390x/helper.h | 2 ++ target/s390x/insn-data.def | 2 ++ target/s390x/translate_vx.inc.c | 31 +++++++++++++++++++++++++++++++ target/s390x/vec_int_helper.c | 14 ++++++++++++++ 4 files changed, 49 insertions(+) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index 04a3f5fb2e..e25e1467ae 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -152,6 +152,8 @@ DEF_HELPER_FLAGS_4(gvec_vavg8, TCG_CALL_NO_RWG, void, p= tr, cptr, cptr, i32) DEF_HELPER_FLAGS_4(gvec_vavg16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i3= 2) DEF_HELPER_FLAGS_4(gvec_vavgl8, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i3= 2) DEF_HELPER_FLAGS_4(gvec_vavgl16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i= 32) +DEF_HELPER_FLAGS_3(gvec_vclz8, TCG_CALL_NO_RWG, void, ptr, cptr, i32) +DEF_HELPER_FLAGS_3(gvec_vclz16, TCG_CALL_NO_RWG, void, ptr, cptr, 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 1d159cb201..be3c07aafb 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1084,6 +1084,8 @@ E(0xe7fb, VCH, VRR_b, V, 0, 0, 0, 0, vc, 0, TCG_COND_GT, IF_VEC) /* VECTOR COMPARE HIGH LOGICAL */ E(0xe7f9, VCHL, VRR_b, V, 0, 0, 0, 0, vc, 0, TCG_COND_GTU, IF_VEC) +/* VECTOR COUNT LEADING ZEROS */ + F(0xe753, VCLZ, VRR_a, V, 0, 0, 0, 0, vclz, 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 ceb805a406..299924a7cc 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -182,6 +182,9 @@ static void get_vec_element_ptr_i64(TCGv_ptr ptr, uint8= _t reg, TCGv_i64 enr, tcg_temp_free_i64(tmp); } =20 +#define gen_gvec_2(v1, v2, gen) \ + tcg_gen_gvec_2(vec_full_reg_offset(v1), vec_full_reg_offset(v2), \ + 16, 16, gen) #define gen_gvec_3(v1, v2, v3, gen) \ tcg_gen_gvec_3(vec_full_reg_offset(v1), vec_full_reg_offset(v2), \ vec_full_reg_offset(v3), 16, 16, gen) @@ -1375,3 +1378,31 @@ static DisasJumpType op_vc(DisasContext *s, DisasOps= *o) } return DISAS_NEXT; } + +static void gen_clz_i32(TCGv_i32 d, TCGv_i32 a) +{ + tcg_gen_clzi_i32(d, a, 32); +} + +static void gen_clz_i64(TCGv_i64 d, TCGv_i64 a) +{ + tcg_gen_clzi_i64(d, a, 64); +} + +static DisasJumpType op_vclz(DisasContext *s, DisasOps *o) +{ + const uint8_t es =3D get_field(s->fields, m3); + static const GVecGen2 g[4] =3D { + { .fno =3D gen_helper_gvec_vclz8, }, + { .fno =3D gen_helper_gvec_vclz16, }, + { .fni4 =3D gen_clz_i32, }, + { .fni8 =3D gen_clz_i64, }, + }; + + if (es > ES_64) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + gen_gvec_2(get_field(s->fields, v1), get_field(s->fields, v2), &g[es]); + return DISAS_NEXT; +} diff --git a/target/s390x/vec_int_helper.c b/target/s390x/vec_int_helper.c index c2aeb12108..366962cfbe 100644 --- a/target/s390x/vec_int_helper.c +++ b/target/s390x/vec_int_helper.c @@ -93,3 +93,17 @@ void HELPER(gvec_vavgl##BITS)(void *v1, const void *v2, = const void *v3, \ } DEF_VAVGL(8) DEF_VAVGL(16) + +#define DEF_VCLZ(BITS) = \ +void HELPER(gvec_vclz##BITS)(void *v1, const void *v2, uint32_t desc) = \ +{ = \ + int i; = \ + = \ + for (i =3D 0; i < (128 / BITS); i++) { = \ + const uint##BITS##_t a =3D s390_vec_read_element##BITS(v2, i); = \ + = \ + s390_vec_write_element##BITS(v1, i, clz32(a) - 32 + BITS); = \ + } = \ +} +DEF_VCLZ(8) +DEF_VCLZ(16) --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554979786; cv=none; d=zoho.com; s=zohoarc; b=Eg6JSgk3bFIzjV5diAKkNZlF8RZw8glZD7Ta46HwcI7F2Ps9IOPX9mtMiZB0P/mwmEivqRQ8uTVN54hYnou/TJurDgqDrAHSwE29200gJgcGgXqvNp+au9KyUuu1jhESDr/MXMC0RD0H0sbHazL9rHxVefyiYKjk1fbExiYB4pI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554979786; 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=MM0mi1Q59ngMfIvjrl8/xH9frbKvfAmbF1BS8cmRJVc=; b=a/+FJYyVU6/xRARC/3Q4b5LvzqXOcFuOO7C7Km+NtBq44pjhMVnxy11xMKNuEfl4KcSa4YvPbPBip2u0Sg3CAZMqauk/IV7AKf/1arCSprdG63N3LxgmRDWrrguYsvmQfznaF65bOpUdnPf0obEu0bsq0PBR2+45M81qTQih5uo= 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 1554979786500417.34122685065495; Thu, 11 Apr 2019 03:49:46 -0700 (PDT) Received: from localhost ([127.0.0.1]:46086 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEXH4-0000aY-5N for importer@patchew.org; Thu, 11 Apr 2019 06:49:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54884) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWsa-000390-97 for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:24:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWdn-0007Fg-Tq for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:09:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56024) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWdn-0007FJ-In; Thu, 11 Apr 2019 06:09:07 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D7A6E308CFAF; Thu, 11 Apr 2019 10:09:06 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 86DF71001E71; Thu, 11 Apr 2019 10:09:05 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:08:08 +0200 Message-Id: <20190411100836.646-14-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Thu, 11 Apr 2019 10:09:06 +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 13/41] s390x/tcg: Implement VECTOR COUNT TRAILING ZEROS 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 COUNT LEADING ZEROS. Signed-off-by: David Hildenbrand --- target/s390x/helper.h | 2 ++ target/s390x/insn-data.def | 2 ++ target/s390x/translate_vx.inc.c | 28 ++++++++++++++++++++++++++++ target/s390x/vec_int_helper.c | 14 ++++++++++++++ 4 files changed, 46 insertions(+) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index e25e1467ae..83e5070821 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -154,6 +154,8 @@ DEF_HELPER_FLAGS_4(gvec_vavgl8, TCG_CALL_NO_RWG, void, = ptr, cptr, cptr, i32) DEF_HELPER_FLAGS_4(gvec_vavgl16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i= 32) DEF_HELPER_FLAGS_3(gvec_vclz8, TCG_CALL_NO_RWG, void, ptr, cptr, i32) DEF_HELPER_FLAGS_3(gvec_vclz16, TCG_CALL_NO_RWG, void, ptr, cptr, i32) +DEF_HELPER_FLAGS_3(gvec_vctz8, TCG_CALL_NO_RWG, void, ptr, cptr, i32) +DEF_HELPER_FLAGS_3(gvec_vctz16, TCG_CALL_NO_RWG, void, ptr, cptr, 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 be3c07aafb..a355b7f62f 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1086,6 +1086,8 @@ E(0xe7f9, VCHL, VRR_b, V, 0, 0, 0, 0, vc, 0, TCG_COND_GTU, IF_VEC) /* VECTOR COUNT LEADING ZEROS */ F(0xe753, VCLZ, VRR_a, V, 0, 0, 0, 0, vclz, 0, IF_VEC) +/* VECTOR COUNT TRAILING ZEROS */ + F(0xe752, VCTZ, VRR_a, V, 0, 0, 0, 0, vctz, 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 299924a7cc..23d5870dc5 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -1406,3 +1406,31 @@ static DisasJumpType op_vclz(DisasContext *s, DisasO= ps *o) gen_gvec_2(get_field(s->fields, v1), get_field(s->fields, v2), &g[es]); return DISAS_NEXT; } + +static void gen_ctz_i32(TCGv_i32 d, TCGv_i32 a) +{ + tcg_gen_ctzi_i32(d, a, 32); +} + +static void gen_ctz_i64(TCGv_i64 d, TCGv_i64 a) +{ + tcg_gen_ctzi_i64(d, a, 64); +} + +static DisasJumpType op_vctz(DisasContext *s, DisasOps *o) +{ + const uint8_t es =3D get_field(s->fields, m3); + static const GVecGen2 g[4] =3D { + { .fno =3D gen_helper_gvec_vctz8, }, + { .fno =3D gen_helper_gvec_vctz16, }, + { .fni4 =3D gen_ctz_i32, }, + { .fni8 =3D gen_ctz_i64, }, + }; + + if (es > ES_64) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + gen_gvec_2(get_field(s->fields, v1), get_field(s->fields, v2), &g[es]); + return DISAS_NEXT; +} diff --git a/target/s390x/vec_int_helper.c b/target/s390x/vec_int_helper.c index 366962cfbe..c589f92765 100644 --- a/target/s390x/vec_int_helper.c +++ b/target/s390x/vec_int_helper.c @@ -107,3 +107,17 @@ void HELPER(gvec_vclz##BITS)(void *v1, const void *v2,= uint32_t desc) \ } DEF_VCLZ(8) DEF_VCLZ(16) + +#define DEF_VCTZ(BITS) = \ +void HELPER(gvec_vctz##BITS)(void *v1, const void *v2, uint32_t desc) = \ +{ = \ + int i; = \ + = \ + for (i =3D 0; i < (128 / BITS); i++) { = \ + const uint##BITS##_t a =3D s390_vec_read_element##BITS(v2, i); = \ + = \ + s390_vec_write_element##BITS(v1, i, ctz32(a)); = \ + } = \ +} +DEF_VCTZ(8) +DEF_VCTZ(16) --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554979562; cv=none; d=zoho.com; s=zohoarc; b=ijs3WYJ7HrfUXwM9jgBMJ18D/4NMUcDwp9A7qKT19p23xdBFo3T2Hbaye1O2btXSLfFyhpFJzn63DNoPDVC/ssVrgHC2jgd6xm7smladJYNxnYIaOuhryBWH894ZyNUgCE74dFtDCyD8/vgoDfDjQhwdaax4C3rfrRV/FtgnKiw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554979562; 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=uQwfedpuCxJnHF3/d7K7pmTWFNtaXB7Nv/5+8sOuIII=; b=QFNujj0LUy/TS2jr+4Vm8dSLbOwZPMpOEVkTDn5n9gO5BcVPAOGJ7Rn7R7cliCyjkgG8WGcnyMD4tgtrpWeCSMQtP0R6CjiORGSQATeqrYO4/q17w8k+6uQievh8OPnjdEraS1ha9DZehzvKiFuHvrComruA+/27T7arbsah+Dc= 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 1554979562710738.7575188237366; Thu, 11 Apr 2019 03:46:02 -0700 (PDT) Received: from localhost ([127.0.0.1]:46058 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEXDT-0005Rw-OE for importer@patchew.org; Thu, 11 Apr 2019 06:45:59 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54953) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWsa-0003CZ-8h for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:24:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWdp-0007GC-EQ for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:09:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37634) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWdp-0007Fw-6D; Thu, 11 Apr 2019 06:09:09 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7ABE3C01EE87; Thu, 11 Apr 2019 10:09:08 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2C7F71001E71; Thu, 11 Apr 2019 10:09:07 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:08:09 +0200 Message-Id: <20190411100836.646-15-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 11 Apr 2019 10:09:08 +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 14/41] s390x/tcg: Implement VECTOR EXCLUSIVE OR 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" Easy, we can reuse an existing gvec helper. Signed-off-by: David Hildenbrand Reviewed-by: Richard Henderson --- target/s390x/insn-data.def | 2 ++ target/s390x/translate_vx.inc.c | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index a355b7f62f..b8400c191a 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1088,6 +1088,8 @@ F(0xe753, VCLZ, VRR_a, V, 0, 0, 0, 0, vclz, 0, IF_VEC) /* VECTOR COUNT TRAILING ZEROS */ F(0xe752, VCTZ, VRR_a, V, 0, 0, 0, 0, vctz, 0, IF_VEC) +/* VECTOR EXCLUSIVE OR */ + F(0xe76d, VX, VRR_c, V, 0, 0, 0, 0, vx, 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 23d5870dc5..85a0f20b90 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -1434,3 +1434,10 @@ static DisasJumpType op_vctz(DisasContext *s, DisasO= ps *o) gen_gvec_2(get_field(s->fields, v1), get_field(s->fields, v2), &g[es]); return DISAS_NEXT; } + +static DisasJumpType op_vx(DisasContext *s, DisasOps *o) +{ + gen_gvec_fn_3(xor, ES_8, get_field(s->fields, v1), get_field(s->fields= , v2), + get_field(s->fields, v3)); + return DISAS_NEXT; +} --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554979754; cv=none; d=zoho.com; s=zohoarc; b=YQNLCFQ+Pu4go7H8DChtdKtyHGggNL9or/1jfzE/u0+Z7iy7cqMe9eg4Y+BjjnvNpresocmpWtsK2VrClWDAhjGfxhErVKVQobuvVqBdv1jaEG8V1CF51ZwHn4r+pJ7+EApyNvZm7EYBvndOXhvyr0atZvX5m9hwVVmI0/zOx+o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554979754; 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=63FQD4ekKRRmpxjQcxyBKF3nvmmjCNfKJHtN8vKvtJ0=; b=W1F6Jnn9EQ5uGLsImrwHf5cbiNV5H67aFI+I5C+c5sh/63cvcfqNu1WJLItIex3chlId4tVIHuQn1KupCo4hqXV8qc4eEZVqlFOrl43ccRVKCdInCd6QiJp0r4PXBzEIx35XJQt+mqgk//imJDHWEJH8zSEJ0DzYcqfX8daFhh0= 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 1554979754666818.2079912391683; Thu, 11 Apr 2019 03:49:14 -0700 (PDT) Received: from localhost ([127.0.0.1]:46082 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEXGZ-0000Bp-K1 for importer@patchew.org; Thu, 11 Apr 2019 06:49:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54895) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWsa-00039p-6A for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:24:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWdr-0007HB-86 for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:09:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57654) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWdq-0007Gp-So; Thu, 11 Apr 2019 06:09:11 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 261C33680A; Thu, 11 Apr 2019 10:09:10 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id C511F1001E71; Thu, 11 Apr 2019 10:09:08 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:08:10 +0200 Message-Id: <20190411100836.646-16-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 11 Apr 2019 10:09:10 +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 15/41] s390x/tcg: Implement VECTOR GALOIS FIELD MULTIPLY SUM (AND ACCUMULATE) 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" A galois field multiplication in field 2 is like binary multiplication, however instead of doing ordinary binary additions, xor's are performed. So no carries are considered. Implement all variants via helpers. s390_vec_sar() and s390_vec_shr() will be reused later on. Signed-off-by: David Hildenbrand Reviewed-by: Richard Henderson --- target/s390x/helper.h | 8 ++ target/s390x/insn-data.def | 4 + target/s390x/translate_vx.inc.c | 38 ++++++++ target/s390x/vec_int_helper.c | 168 ++++++++++++++++++++++++++++++++ 4 files changed, 218 insertions(+) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index 83e5070821..18a3df6b07 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -156,6 +156,14 @@ DEF_HELPER_FLAGS_3(gvec_vclz8, TCG_CALL_NO_RWG, void, = ptr, cptr, i32) DEF_HELPER_FLAGS_3(gvec_vclz16, TCG_CALL_NO_RWG, void, ptr, cptr, i32) DEF_HELPER_FLAGS_3(gvec_vctz8, TCG_CALL_NO_RWG, void, ptr, cptr, i32) DEF_HELPER_FLAGS_3(gvec_vctz16, TCG_CALL_NO_RWG, void, ptr, cptr, i32) +DEF_HELPER_FLAGS_4(gvec_vgfm8, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) +DEF_HELPER_FLAGS_4(gvec_vgfm16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i3= 2) +DEF_HELPER_FLAGS_4(gvec_vgfm32, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i3= 2) +DEF_HELPER_FLAGS_4(gvec_vgfm64, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i3= 2) +DEF_HELPER_FLAGS_5(gvec_vgfma8, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, cp= tr, i32) +DEF_HELPER_FLAGS_5(gvec_vgfma16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, c= ptr, i32) +DEF_HELPER_FLAGS_5(gvec_vgfma32, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, c= ptr, i32) +DEF_HELPER_FLAGS_5(gvec_vgfma64, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, c= ptr, 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 b8400c191a..add174b793 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1090,6 +1090,10 @@ F(0xe752, VCTZ, VRR_a, V, 0, 0, 0, 0, vctz, 0, IF_VEC) /* VECTOR EXCLUSIVE OR */ F(0xe76d, VX, VRR_c, V, 0, 0, 0, 0, vx, 0, IF_VEC) +/* VECTOR GALOIS FIELD MULTIPLY SUM */ + F(0xe7b4, VGFM, VRR_c, V, 0, 0, 0, 0, vgfm, 0, IF_VEC) +/* VECTOR GALOIS FIELD MULTIPLY SUM AND ACCUMULATE */ + F(0xe7bc, VGFMA, VRR_d, V, 0, 0, 0, 0, vgfma, 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 85a0f20b90..fe36d027b6 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -1441,3 +1441,41 @@ static DisasJumpType op_vx(DisasContext *s, DisasOps= *o) get_field(s->fields, v3)); return DISAS_NEXT; } + +static DisasJumpType op_vgfm(DisasContext *s, DisasOps *o) +{ + const uint8_t es =3D get_field(s->fields, m4); + static const GVecGen3 g[4] =3D { + { .fno =3D gen_helper_gvec_vgfm8, }, + { .fno =3D gen_helper_gvec_vgfm16, }, + { .fno =3D gen_helper_gvec_vgfm32, }, + { .fno =3D gen_helper_gvec_vgfm64, }, + }; + + if (es > ES_64) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + gen_gvec_3(get_field(s->fields, v1), get_field(s->fields, v2), + get_field(s->fields, v3), &g[es]); + return DISAS_NEXT; +} + +static DisasJumpType op_vgfma(DisasContext *s, DisasOps *o) +{ + const uint8_t es =3D get_field(s->fields, m5); + static const GVecGen4 g[4] =3D { + { .fno =3D gen_helper_gvec_vgfma8, }, + { .fno =3D gen_helper_gvec_vgfma16, }, + { .fno =3D gen_helper_gvec_vgfma32, }, + { .fno =3D gen_helper_gvec_vgfma64, }, + }; + + if (es > ES_64) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + gen_gvec_4(get_field(s->fields, v1), get_field(s->fields, v2), + get_field(s->fields, v3), get_field(s->fields, v4), &g[es]); + return DISAS_NEXT; +} diff --git a/target/s390x/vec_int_helper.c b/target/s390x/vec_int_helper.c index c589f92765..99dd0653f6 100644 --- a/target/s390x/vec_int_helper.c +++ b/target/s390x/vec_int_helper.c @@ -37,6 +37,60 @@ static bool s390_vec_add(S390Vector *d, const S390Vector= *a, return high_carry; } =20 +static bool s390_vec_is_zero(const S390Vector *v) +{ + return !v->doubleword[0] && !v->doubleword[1]; +} + +static void s390_vec_xor(S390Vector *res, const S390Vector *a, + const S390Vector *b) +{ + res->doubleword[0] =3D a->doubleword[0] ^ b->doubleword[0]; + res->doubleword[1] =3D a->doubleword[1] ^ b->doubleword[1]; +} + +static void s390_vec_shl(S390Vector *d, const S390Vector *a, uint64_t coun= t) +{ + uint64_t tmp; + + g_assert(count < 128); + if (count =3D=3D 0) { + d->doubleword[0] =3D a->doubleword[0]; + d->doubleword[1] =3D a->doubleword[1]; + } else if (count =3D=3D 64) { + d->doubleword[0] =3D a->doubleword[1]; + d->doubleword[1] =3D 0; + } else if (count < 64) { + tmp =3D extract64(a->doubleword[1], 64 - count, count); + d->doubleword[1] =3D a->doubleword[1] << count; + d->doubleword[0] =3D (a->doubleword[0] << count) | tmp; + } else { + d->doubleword[0] =3D a->doubleword[1] << (count - 64); + d->doubleword[1] =3D 0; + } +} + +static void s390_vec_shr(S390Vector *d, const S390Vector *a, uint64_t coun= t) +{ + uint64_t tmp; + + g_assert(count < 128); + if (count =3D=3D 0) { + d->doubleword[0] =3D a->doubleword[0]; + d->doubleword[1] =3D a->doubleword[1]; + } else if (count =3D=3D 64) { + d->doubleword[1] =3D a->doubleword[0]; + d->doubleword[0] =3D 0; + } else if (count < 64) { + tmp =3D a->doubleword[1] >> count; + d->doubleword[1] =3D deposit64(tmp, 64 - count, count, a->doublewo= rd[0]); + d->doubleword[0] =3D a->doubleword[0] >> count; + } else { + d->doubleword[1] =3D a->doubleword[0] >> (count - 64); + d->doubleword[0] =3D 0; + } +} + void HELPER(gvec_vacc128)(void *v1, const void *v2, const void *v3, uint32_t desc) { @@ -121,3 +175,117 @@ void HELPER(gvec_vctz##BITS)(void *v1, const void *v2= , uint32_t desc) \ } DEF_VCTZ(8) DEF_VCTZ(16) + +/* like binary multiplication, but XOR instead of addition */ +#define DEF_GALOIS_MULTIPLY(BITS, TBITS) = \ +static uint##TBITS##_t galois_multiply##BITS(uint##TBITS##_t a, = \ + uint##TBITS##_t b) = \ +{ = \ + uint##TBITS##_t res =3D 0; = \ + = \ + while (b) { = \ + if (b & 0x1) { = \ + res =3D res ^ a; = \ + } = \ + a =3D a << 1; = \ + b =3D b >> 1; = \ + } = \ + return res; = \ +} +DEF_GALOIS_MULTIPLY(8, 16) +DEF_GALOIS_MULTIPLY(16, 32) +DEF_GALOIS_MULTIPLY(32, 64) + +static S390Vector galois_multiply64(uint64_t a, uint64_t b) +{ + S390Vector res =3D {}; + S390Vector va =3D { + .doubleword[1] =3D a, + }; + S390Vector vb =3D { + .doubleword[1] =3D b, + }; + + while (!s390_vec_is_zero(&vb)) { + if (vb.doubleword[1] & 0x1) { + s390_vec_xor(&res, &res, &va); + } + s390_vec_shl(&va, &va, 1); + s390_vec_shr(&vb, &vb, 1); + } + return res; +} + +#define DEF_VGFM(BITS, TBITS) = \ +void HELPER(gvec_vgfm##BITS)(void *v1, const void *v2, const void *v3, = \ + uint32_t desc) = \ +{ = \ + int i; = \ + = \ + for (i =3D 0; i < (128 / TBITS); i++) { = \ + uint##BITS##_t a =3D s390_vec_read_element##BITS(v2, i * 2); = \ + uint##BITS##_t b =3D s390_vec_read_element##BITS(v3, i * 2); = \ + uint##TBITS##_t d =3D galois_multiply##BITS(a, b); = \ + = \ + a =3D s390_vec_read_element##BITS(v2, i * 2 + 1); = \ + b =3D s390_vec_read_element##BITS(v3, i * 2 + 1); = \ + d =3D d ^ galois_multiply32(a, b); = \ + s390_vec_write_element##TBITS(v1, i, d); = \ + } = \ +} +DEF_VGFM(8, 16) +DEF_VGFM(16, 32) +DEF_VGFM(32, 64) + +void HELPER(gvec_vgfm64)(void *v1, const void *v2, const void *v3, + uint32_t desc) +{ + S390Vector tmp1, tmp2; + uint64_t a, b; + + a =3D s390_vec_read_element64(v2, 0); + b =3D s390_vec_read_element64(v3, 0); + tmp1 =3D galois_multiply64(a, b); + a =3D s390_vec_read_element64(v2, 1); + b =3D s390_vec_read_element64(v3, 1); + tmp2 =3D galois_multiply64(a, b); + s390_vec_xor(v1, &tmp1, &tmp2); +} + +#define DEF_VGFMA(BITS, TBITS) = \ +void HELPER(gvec_vgfma##BITS)(void *v1, const void *v2, const void *v3, = \ + const void *v4, uint32_t desc) = \ +{ = \ + int i; = \ + = \ + for (i =3D 0; i < (128 / TBITS); i++) { = \ + uint##BITS##_t a =3D s390_vec_read_element##BITS(v2, i * 2); = \ + uint##BITS##_t b =3D s390_vec_read_element##BITS(v3, i * 2); = \ + uint##TBITS##_t d =3D galois_multiply##BITS(a, b); = \ + = \ + a =3D s390_vec_read_element##BITS(v2, i * 2 + 1); = \ + b =3D s390_vec_read_element##BITS(v3, i * 2 + 1); = \ + d =3D d ^ galois_multiply32(a, b); = \ + d =3D d ^ s390_vec_read_element##TBITS(v4, i); = \ + s390_vec_write_element##TBITS(v1, i, d); = \ + } = \ +} +DEF_VGFMA(8, 16) +DEF_VGFMA(16, 32) +DEF_VGFMA(32, 64) + +void HELPER(gvec_vgfma64)(void *v1, const void *v2, const void *v3, + const void *v4, uint32_t desc) +{ + S390Vector tmp1, tmp2; + uint64_t a, b; + + a =3D s390_vec_read_element64(v2, 0); + b =3D s390_vec_read_element64(v3, 0); + tmp1 =3D galois_multiply64(a, b); + a =3D s390_vec_read_element64(v2, 1); + b =3D s390_vec_read_element64(v3, 1); + tmp2 =3D galois_multiply64(a, b); + s390_vec_xor(&tmp1, &tmp1, &tmp2); + s390_vec_xor(v1, &tmp1, v4); +} --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554979772; cv=none; d=zoho.com; s=zohoarc; b=izhfTBja63pdc4b5HNGXGzimTcJEl79FSMxHWRqu9u1nDGUZWtia4ZmikzDmiwX9JoC3QQoMBpgK3sKLohn+Yo5G0pU59v9SAYmer+OEktoWs3s9llNhPNw5GsHFU4b4RjDclBK+mGIckE0x8pZijCR/eH+6MinLixUzDJiXx+k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554979772; 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=uE1dyQb08Tt/0p4aPfFLxqIg+PD/ChEvJ0P8MiHMuco=; b=ICwh75qdQwB7JJUVOYN2vHPxEUbSIPdU38O9a4O0q7RCm0Y+DpEP3kV/Eiy0s/sUF8Izdsu6N64vtialFWQfnjm/rM773wrVcYL0DQT1MTGtVIjXRSsjCk0Cxzscjz7lxl+pV0Y+LFu+T8qcaRbdKnJXiGv3T8UqYAi091/XAYU= 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 1554979772940859.5145942038391; Thu, 11 Apr 2019 03:49:32 -0700 (PDT) Received: from localhost ([127.0.0.1]:46084 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEXGr-0000Pr-TP for importer@patchew.org; Thu, 11 Apr 2019 06:49:29 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54395) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWsY-0002Xe-DE for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:24:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWdy-0007KJ-Cq for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:09:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60802) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWdw-0007Je-F5; Thu, 11 Apr 2019 06:09:18 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A0EA4308793D; Thu, 11 Apr 2019 10:09:15 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 690431001E71; Thu, 11 Apr 2019 10:09:10 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:08:11 +0200 Message-Id: <20190411100836.646-17-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Thu, 11 Apr 2019 10:09:15 +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 16/41] s390x/tcg: Implement VECTOR LOAD COMPLEMENT 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" We can reuse an existing gvec helper for negating the values. Signed-off-by: David Hildenbrand Reviewed-by: Richard Henderson --- target/s390x/insn-data.def | 2 ++ target/s390x/translate_vx.inc.c | 17 +++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index add174b793..07868ff082 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1094,6 +1094,8 @@ F(0xe7b4, VGFM, VRR_c, V, 0, 0, 0, 0, vgfm, 0, IF_VEC) /* VECTOR GALOIS FIELD MULTIPLY SUM AND ACCUMULATE */ F(0xe7bc, VGFMA, VRR_d, V, 0, 0, 0, 0, vgfma, 0, IF_VEC) +/* VECTOR LOAD COMPLEMENT */ + F(0xe7de, VLC, VRR_a, V, 0, 0, 0, 0, vlc, 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 fe36d027b6..28436cb01a 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -209,6 +209,9 @@ static void get_vec_element_ptr_i64(TCGv_ptr ptr, uint8= _t reg, TCGv_i64 enr, 16) #define gen_gvec_dup64i(v1, c) \ tcg_gen_gvec_dup64i(vec_full_reg_offset(v1), 16, 16, c) +#define gen_gvec_fn_2(fn, es, v1, v2) \ + tcg_gen_gvec_##fn(es, vec_full_reg_offset(v1), vec_full_reg_offset(v2)= , \ + 16, 16) #define gen_gvec_fn_3(fn, es, v1, v2, v3) \ tcg_gen_gvec_##fn(es, vec_full_reg_offset(v1), vec_full_reg_offset(v2)= , \ vec_full_reg_offset(v3), 16, 16) @@ -1479,3 +1482,17 @@ static DisasJumpType op_vgfma(DisasContext *s, Disas= Ops *o) get_field(s->fields, v3), get_field(s->fields, v4), &g[es]); return DISAS_NEXT; } + +static DisasJumpType op_vlc(DisasContext *s, DisasOps *o) +{ + const uint8_t es =3D get_field(s->fields, m3); + + if (es > ES_64) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + + gen_gvec_fn_2(neg, ES_8, get_field(s->fields, v1), + get_field(s->fields, v2)); + return DISAS_NEXT; +} --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554979403; cv=none; d=zoho.com; s=zohoarc; b=KK1krVL99MXwF+GpU3UTCkxe/Mh7MPvMn5QQRi8Q74QMbsjMxsOAYEtzHm/nLcpmFIMTZV6k1IhrmEu/zNQxZ4kNYFVbTDx0bd9OXuRLrr16qwjtVU0/TmVzEJ1WeLsPv9FBa3wWZOisgDxX3dfyrHrNktqx2PvW89ZUH5g5V2k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554979403; 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=Yqq5NqLdFIVbKlHyS/hqmCrzkmHPKhDKBsJpQyAp2Og=; b=HO2y4wjwGhTtD6v1filRJeoCPBsp2rJwdqIQO6Gp85pxSCz13sRLMkMKIhdv/RaAluQAD8UVLK/XbcRSpCWF1yLJqb5QmXnpjMGQFs/WzoNcqMXGZ4xFdX5Lku6zh1JsC0DFhnss9FpCrbCB1VU8MI5ugXQOVuACO0ckB3nlNZQ= 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 1554979403808202.703091955187; Thu, 11 Apr 2019 03:43:23 -0700 (PDT) Received: from localhost ([127.0.0.1]:45997 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEXAr-00039o-O8 for importer@patchew.org; Thu, 11 Apr 2019 06:43:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54552) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWsY-0002dl-9n for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:24:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWe8-0007PE-0I for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:09:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42498) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWe4-0007Lv-3m; Thu, 11 Apr 2019 06:09:26 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AFBFE5AFF4; Thu, 11 Apr 2019 10:09:21 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id E8C601001E82; Thu, 11 Apr 2019 10:09:15 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:08:12 +0200 Message-Id: <20190411100836.646-18-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 11 Apr 2019 10:09: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 17/41] s390x/tcg: Implement VECTOR LOAD POSITIVE 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 LOAD COMPLEMENT but unfortunately we don't have a gvec helper. Signed-off-by: David Hildenbrand Reviewed-by: Richard Henderson --- target/s390x/helper.h | 2 ++ target/s390x/insn-data.def | 2 ++ target/s390x/translate_vx.inc.c | 40 +++++++++++++++++++++++++++++++++ target/s390x/vec_int_helper.c | 14 ++++++++++++ 4 files changed, 58 insertions(+) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index 18a3df6b07..065c4c6ea3 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -164,6 +164,8 @@ DEF_HELPER_FLAGS_5(gvec_vgfma8, TCG_CALL_NO_RWG, void, = ptr, cptr, cptr, cptr, i3 DEF_HELPER_FLAGS_5(gvec_vgfma16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, c= ptr, i32) DEF_HELPER_FLAGS_5(gvec_vgfma32, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, c= ptr, i32) DEF_HELPER_FLAGS_5(gvec_vgfma64, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, c= ptr, i32) +DEF_HELPER_FLAGS_3(gvec_vlp8, TCG_CALL_NO_RWG, void, ptr, cptr, i32) +DEF_HELPER_FLAGS_3(gvec_vlp16, TCG_CALL_NO_RWG, void, ptr, cptr, 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 07868ff082..fc8886ff42 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1096,6 +1096,8 @@ F(0xe7bc, VGFMA, VRR_d, V, 0, 0, 0, 0, vgfma, 0, IF_VEC) /* VECTOR LOAD COMPLEMENT */ F(0xe7de, VLC, VRR_a, V, 0, 0, 0, 0, vlc, 0, IF_VEC) +/* VECTOR LOAD POSITIVE */ + F(0xe7df, VLP, VRR_a, V, 0, 0, 0, 0, vlp, 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 28436cb01a..8cab3f876a 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -1496,3 +1496,43 @@ static DisasJumpType op_vlc(DisasContext *s, DisasOp= s *o) get_field(s->fields, v2)); return DISAS_NEXT; } + +static void gen_lp_i32(TCGv_i32 d, TCGv_i32 a) +{ + TCGv_i32 zero =3D tcg_const_i32(0); + TCGv_i32 neg =3D tcg_temp_new_i32(); + + tcg_gen_neg_i32(neg, a); + tcg_gen_movcond_i32(TCG_COND_LT, d, a, zero, neg, a); + tcg_temp_free_i32(neg); + tcg_temp_free_i32(zero); +} + +static void gen_lp_i64(TCGv_i64 d, TCGv_i64 a) +{ + TCGv_i64 zero =3D tcg_const_i64(0); + TCGv_i64 neg =3D tcg_temp_new_i64(); + + tcg_gen_neg_i64(neg, a); + tcg_gen_movcond_i64(TCG_COND_LT, d, a, zero, neg, a); + tcg_temp_free_i64(neg); + tcg_temp_free_i64(zero); +} + +static DisasJumpType op_vlp(DisasContext *s, DisasOps *o) +{ + const uint8_t es =3D get_field(s->fields, m3); + static const GVecGen2 g[4] =3D { + { .fno =3D gen_helper_gvec_vlp8, }, + { .fno =3D gen_helper_gvec_vlp16, }, + { .fni4 =3D gen_lp_i32, }, + { .fni8 =3D gen_lp_i64, }, + }; + + if (es > ES_64) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + gen_gvec_2(get_field(s->fields, v1), get_field(s->fields, v2), &g[es]); + return DISAS_NEXT; +} diff --git a/target/s390x/vec_int_helper.c b/target/s390x/vec_int_helper.c index 99dd0653f6..574f707abf 100644 --- a/target/s390x/vec_int_helper.c +++ b/target/s390x/vec_int_helper.c @@ -289,3 +289,17 @@ void HELPER(gvec_vgfma64)(void *v1, const void *v2, co= nst void *v3, s390_vec_xor(&tmp1, &tmp1, &tmp2); s390_vec_xor(v1, &tmp1, v4); } + +#define DEF_VLP(BITS) = \ +void HELPER(gvec_vlp##BITS)(void *v1, const void *v2, uint32_t desc) = \ +{ = \ + int i; = \ + = \ + for (i =3D 0; i < (128 / BITS); i++) { = \ + const int##BITS##_t a =3D s390_vec_read_element##BITS(v2, i); = \ + = \ + s390_vec_write_element##BITS(v1, i, a < 0 ? -a : a); = \ + } = \ +} +DEF_VLP(8) +DEF_VLP(16) --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554979585; cv=none; d=zoho.com; s=zohoarc; b=GZ23e28mt0U2aROOyZUw4RwCFrF0bvbmaLF7fqy1S3NUa0aDhYeXUGk/0Q2eDmdWWYHnGPsNFIwPm86o9RfyDycrTD8eQ1w7ckWvHs4sZKJQU3DGcDpxnptxTcQLYnisXcMH41jnwHXJDhuRPfiQ1wIMLcsqLTjdYh9wlUgMZiw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554979585; 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=nB5AOAMNe7nadN8/gVOdIjxWDYOyTmA1cbNYzAIwBqc=; b=OHU8Pdtg7uX+f0ZywnfEO3mVa++gD6G7KP4ZzYu5H6bf+MeLndy8MKjoCE1w0SPM3bBaPLAqNc0Ku7kC9zXi7CthuZr9TlSEKJuYPPlaeWM4dgHRP+7QLem3eKcljotfFT5xEaJZPJOH6JvVDSwVbtNwIwKJpRNq7NTWPciMQjM= 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 1554979585307595.0572395692528; Thu, 11 Apr 2019 03:46:25 -0700 (PDT) Received: from localhost ([127.0.0.1]:46062 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEXDp-0005r3-3T for importer@patchew.org; Thu, 11 Apr 2019 06:46:21 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54953) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWsY-0003CZ-AM for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:24:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWe6-0007N4-28 for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:09:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56206) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWe4-0007MN-4D; Thu, 11 Apr 2019 06:09:25 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 51178308CFAB; Thu, 11 Apr 2019 10:09:23 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 007C81001E82; Thu, 11 Apr 2019 10:09:21 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:08:13 +0200 Message-Id: <20190411100836.646-19-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Thu, 11 Apr 2019 10:09:23 +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 18/41] s390x/tcg: Implement VECTOR (MAXIMUM|MINIMUM) (LOGICAL) 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" Luckily, we already have gvec helpers for all four cases. Signed-off-by: David Hildenbrand Reviewed-by: Richard Henderson --- target/s390x/insn-data.def | 8 ++++++++ target/s390x/translate_vx.inc.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index fc8886ff42..b22d9f0f6a 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1098,6 +1098,14 @@ F(0xe7de, VLC, VRR_a, V, 0, 0, 0, 0, vlc, 0, IF_VEC) /* VECTOR LOAD POSITIVE */ F(0xe7df, VLP, VRR_a, V, 0, 0, 0, 0, vlp, 0, IF_VEC) +/* VECTOR MAXIMUM */ + F(0xe7ff, VMX, VRR_c, V, 0, 0, 0, 0, vmx, 0, IF_VEC) +/* VECTOR MAXIMUM LOGICAL */ + F(0xe7fd, VMXL, VRR_c, V, 0, 0, 0, 0, vmx, 0, IF_VEC) +/* VECTOR MINIMUM */ + F(0xe7fe, VMN, VRR_c, V, 0, 0, 0, 0, vmx, 0, IF_VEC) +/* VECTOR MINIMUM LOGICAL */ + F(0xe7fc, VMNL, VRR_c, V, 0, 0, 0, 0, vmx, 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 8cab3f876a..aae1ff107a 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -1536,3 +1536,34 @@ static DisasJumpType op_vlp(DisasContext *s, DisasOp= s *o) gen_gvec_2(get_field(s->fields, v1), get_field(s->fields, v2), &g[es]); return DISAS_NEXT; } + +static DisasJumpType op_vmx(DisasContext *s, DisasOps *o) +{ + const uint8_t v1 =3D get_field(s->fields, v1); + const uint8_t v2 =3D get_field(s->fields, v2); + const uint8_t v3 =3D get_field(s->fields, v3); + const uint8_t es =3D get_field(s->fields, m4); + + if (es > ES_64) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + + switch (s->fields->op2) { + case 0xff: + gen_gvec_fn_3(smax, es, v1, v2, v3); + break; + case 0xfd: + gen_gvec_fn_3(umax, es, v1, v2, v3); + break; + case 0xfe: + gen_gvec_fn_3(smin, es, v1, v2, v3); + break; + case 0xfc: + gen_gvec_fn_3(umin, es, v1, v2, v3); + break; + default: + g_assert_not_reached(); + } + return DISAS_NEXT; +} --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554979721; cv=none; d=zoho.com; s=zohoarc; b=DinS+X6Xr9tCoQutpbSc3gwCFh3oviTb+C8IPToWHaU+lHMLeflgSHyb3SJh28qtct7Tm6N5JArNB6Y5/rwDjuofcrfFJH4bx9bv4kSLy8fKtoY5n1CNu/UFgVdH8Kpw0XZOeCnrxR1GkZHDp922R43mEZKi5Fqz2rd/VP8S/1w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554979721; 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=voCCKtpA6kig8tn5L3MkTtAbJu1LvkX81UXRPMwB8/0=; b=FP33Z2NQK9zob1dcX0kvTBSOubZPDeVg9W9W72ZG+QZEFqC7Ji2RBTdECgi2eAZlXxEvpTbUldeepWjIboCAcx+2cVJf2/whlsKINiD+blw4afDrz6h7Wu6Aaw6FsYlMaoqVAXMQY2M/PcC1iJRxPNsNkvAhKjNd6v+Eg86cxAY= 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 1554979721139540.1766634334775; Thu, 11 Apr 2019 03:48:41 -0700 (PDT) Received: from localhost ([127.0.0.1]:46080 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEXFr-00084Y-La for importer@patchew.org; Thu, 11 Apr 2019 06:48:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54388) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWsW-0002Us-Je for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:24:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWe8-0007PM-5q for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:09:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53162) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWe6-0007Mu-3c; Thu, 11 Apr 2019 06:09:28 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1AA84301899D; Thu, 11 Apr 2019 10:09:25 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 978721001E82; Thu, 11 Apr 2019 10:09:23 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:08:14 +0200 Message-Id: <20190411100836.646-20-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Thu, 11 Apr 2019 10:09: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 19/41] s390x/tcg: Implement VECTOR MULTIPLY AND ADD * 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" Quite some variants to handle. At least handle some 32-bit element variants via gvec expansion (we could also handle 16/32-bit variants for ODD and EVEN easily via gvec expansion, but let's keep it simple for now). Signed-off-by: David Hildenbrand Reviewed-by: Richard Henderson --- target/s390x/helper.h | 18 +++++ target/s390x/insn-data.def | 14 ++++ target/s390x/translate_vx.inc.c | 122 +++++++++++++++++++++++++++++++ target/s390x/vec_int_helper.c | 123 ++++++++++++++++++++++++++++++++ 4 files changed, 277 insertions(+) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index 065c4c6ea3..b73a35107e 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -166,6 +166,24 @@ DEF_HELPER_FLAGS_5(gvec_vgfma32, TCG_CALL_NO_RWG, void= , ptr, cptr, cptr, cptr, i DEF_HELPER_FLAGS_5(gvec_vgfma64, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, c= ptr, i32) DEF_HELPER_FLAGS_3(gvec_vlp8, TCG_CALL_NO_RWG, void, ptr, cptr, i32) DEF_HELPER_FLAGS_3(gvec_vlp16, TCG_CALL_NO_RWG, void, ptr, cptr, i32) +DEF_HELPER_FLAGS_5(gvec_vmal8, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, cpt= r, i32) +DEF_HELPER_FLAGS_5(gvec_vmal16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, cp= tr, i32) +DEF_HELPER_FLAGS_5(gvec_vmah8, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, cpt= r, i32) +DEF_HELPER_FLAGS_5(gvec_vmah16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, cp= tr, i32) +DEF_HELPER_FLAGS_5(gvec_vmalh8, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, cp= tr, i32) +DEF_HELPER_FLAGS_5(gvec_vmalh16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, c= ptr, i32) +DEF_HELPER_FLAGS_5(gvec_vmae8, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, cpt= r, i32) +DEF_HELPER_FLAGS_5(gvec_vmae16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, cp= tr, i32) +DEF_HELPER_FLAGS_5(gvec_vmae32, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, cp= tr, i32) +DEF_HELPER_FLAGS_5(gvec_vmale8, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, cp= tr, i32) +DEF_HELPER_FLAGS_5(gvec_vmale16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, c= ptr, i32) +DEF_HELPER_FLAGS_5(gvec_vmale32, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, c= ptr, i32) +DEF_HELPER_FLAGS_5(gvec_vmao8, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, cpt= r, i32) +DEF_HELPER_FLAGS_5(gvec_vmao16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, cp= tr, i32) +DEF_HELPER_FLAGS_5(gvec_vmao32, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, cp= tr, i32) +DEF_HELPER_FLAGS_5(gvec_vmalo8, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, cp= tr, i32) +DEF_HELPER_FLAGS_5(gvec_vmalo16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, c= ptr, i32) +DEF_HELPER_FLAGS_5(gvec_vmalo32, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, c= ptr, 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 b22d9f0f6a..7ccec0544f 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1106,6 +1106,20 @@ F(0xe7fe, VMN, VRR_c, V, 0, 0, 0, 0, vmx, 0, IF_VEC) /* VECTOR MINIMUM LOGICAL */ F(0xe7fc, VMNL, VRR_c, V, 0, 0, 0, 0, vmx, 0, IF_VEC) +/* VECTOR MULTIPLY AND ADD LOW */ + F(0xe7aa, VMAL, VRR_d, V, 0, 0, 0, 0, vma, 0, IF_VEC) +/* VECTOR MULTIPLY AND ADD HIGH */ + F(0xe7ab, VMAH, VRR_d, V, 0, 0, 0, 0, vma, 0, IF_VEC) +/* VECTOR MULTIPLY AND ADD LOGICAL HIGH */ + F(0xe7a9, VMALH, VRR_d, V, 0, 0, 0, 0, vma, 0, IF_VEC) +/* VECTOR MULTIPLY AND ADD EVEN */ + F(0xe7ae, VMAE, VRR_d, V, 0, 0, 0, 0, vma, 0, IF_VEC) +/* VECTOR MULTIPLY AND ADD LOGICAL EVEN */ + F(0xe7ac, VMALE, VRR_d, V, 0, 0, 0, 0, vma, 0, IF_VEC) +/* VECTOR MULTIPLY AND ADD ODD */ + F(0xe7af, VMAO, VRR_d, V, 0, 0, 0, 0, vma, 0, IF_VEC) +/* VECTOR MULTIPLY AND ADD LOGICAL ODD */ + F(0xe7ad, VMALO, VRR_d, V, 0, 0, 0, 0, vma, 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 aae1ff107a..4967af6a07 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -1567,3 +1567,125 @@ static DisasJumpType op_vmx(DisasContext *s, DisasO= ps *o) } return DISAS_NEXT; } + +static void gen_mal_i32(TCGv_i32 d, TCGv_i32 a, TCGv_i32 b, TCGv_i32 c) +{ + TCGv_i32 t0 =3D tcg_temp_new_i32(); + + tcg_gen_mul_i32(t0, a, b); + tcg_gen_add_i32(d, t0, c); + + tcg_temp_free_i32(t0); +} + +static void gen_mah_i32(TCGv_i32 d, TCGv_i32 a, TCGv_i32 b, TCGv_i32 c) +{ + TCGv_i64 t0 =3D tcg_temp_new_i64(); + TCGv_i64 t1 =3D tcg_temp_new_i64(); + TCGv_i64 t2 =3D tcg_temp_new_i64(); + + tcg_gen_ext_i32_i64(t0, a); + tcg_gen_ext_i32_i64(t1, b); + tcg_gen_ext_i32_i64(t2, c); + tcg_gen_mul_i64(t0, t0, t1); + tcg_gen_add_i64(t0, t0, t2); + tcg_gen_extrh_i64_i32(d, t0); + + tcg_temp_free(t0); + tcg_temp_free(t1); + tcg_temp_free(t2); +} + +static void gen_malh_i32(TCGv_i32 d, TCGv_i32 a, TCGv_i32 b, TCGv_i32 c) +{ + TCGv_i64 t0 =3D tcg_temp_new_i64(); + TCGv_i64 t1 =3D tcg_temp_new_i64(); + TCGv_i64 t2 =3D tcg_temp_new_i64(); + + tcg_gen_extu_i32_i64(t0, a); + tcg_gen_extu_i32_i64(t1, b); + tcg_gen_extu_i32_i64(t2, c); + tcg_gen_mul_i64(t0, t0, t1); + tcg_gen_add_i64(t0, t0, t2); + tcg_gen_extrh_i64_i32(d, t0); + + tcg_temp_free(t0); + tcg_temp_free(t1); + tcg_temp_free(t2); +} + +static DisasJumpType op_vma(DisasContext *s, DisasOps *o) +{ + const uint8_t es =3D get_field(s->fields, m5); + static const GVecGen4 g_vmal[3] =3D { + { .fno =3D gen_helper_gvec_vmal8, }, + { .fno =3D gen_helper_gvec_vmal16, }, + { .fni4 =3D gen_mal_i32, }, + }; + static const GVecGen4 g_vmah[3] =3D { + { .fno =3D gen_helper_gvec_vmah8, }, + { .fno =3D gen_helper_gvec_vmah16, }, + { .fni4 =3D gen_mah_i32, }, + }; + static const GVecGen4 g_vmalh[3] =3D { + { .fno =3D gen_helper_gvec_vmalh8, }, + { .fno =3D gen_helper_gvec_vmalh16, }, + { .fni4 =3D gen_malh_i32, }, + }; + static const GVecGen4 g_vmae[3] =3D { + { .fno =3D gen_helper_gvec_vmae8, }, + { .fno =3D gen_helper_gvec_vmae16, }, + { .fno =3D gen_helper_gvec_vmae32, }, + }; + static const GVecGen4 g_vmale[3] =3D { + { .fno =3D gen_helper_gvec_vmale8, }, + { .fno =3D gen_helper_gvec_vmale16, }, + { .fno =3D gen_helper_gvec_vmale32, }, + }; + static const GVecGen4 g_vmao[3] =3D { + { .fno =3D gen_helper_gvec_vmao8, }, + { .fno =3D gen_helper_gvec_vmao16, }, + { .fno =3D gen_helper_gvec_vmao32, }, + }; + static const GVecGen4 g_vmalo[3] =3D { + { .fno =3D gen_helper_gvec_vmalo8, }, + { .fno =3D gen_helper_gvec_vmalo16, }, + { .fno =3D gen_helper_gvec_vmalo32, }, + }; + const GVecGen4 *fn; + + if (es > ES_32) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + + switch (s->fields->op2) { + case 0xaa: + fn =3D &g_vmal[es]; + break; + case 0xab: + fn =3D &g_vmah[es]; + break; + case 0xa9: + fn =3D &g_vmalh[es]; + break; + case 0xae: + fn =3D &g_vmae[es]; + break; + case 0xac: + fn =3D &g_vmale[es]; + break; + case 0xaf: + fn =3D &g_vmao[es]; + break; + case 0xad: + fn =3D &g_vmalo[es]; + break; + default: + g_assert_not_reached(); + } + + gen_gvec_4(get_field(s->fields, v1), get_field(s->fields, v2), + get_field(s->fields, v3), get_field(s->fields, v4), fn); + return DISAS_NEXT; +} diff --git a/target/s390x/vec_int_helper.c b/target/s390x/vec_int_helper.c index 574f707abf..424f248325 100644 --- a/target/s390x/vec_int_helper.c +++ b/target/s390x/vec_int_helper.c @@ -303,3 +303,126 @@ void HELPER(gvec_vlp##BITS)(void *v1, const void *v2,= uint32_t desc) \ } DEF_VLP(8) DEF_VLP(16) + +#define DEF_VMAL(BITS) = \ +void HELPER(gvec_vmal##BITS)(void *v1, const void *v2, const void *v3, = \ + const void *v4, uint32_t desc) = \ +{ = \ + int i; = \ + = \ + for (i =3D 0; i < (128 / BITS); i++) { = \ + const uint##BITS##_t a =3D s390_vec_read_element##BITS(v2, i); = \ + const uint##BITS##_t b =3D s390_vec_read_element##BITS(v3, i); = \ + const uint##BITS##_t c =3D s390_vec_read_element##BITS(v4, i); = \ + = \ + s390_vec_write_element##BITS(v1, i, a * b + c); = \ + } = \ +} +DEF_VMAL(8) +DEF_VMAL(16) + +#define DEF_VMAH(BITS) = \ +void HELPER(gvec_vmah##BITS)(void *v1, const void *v2, const void *v3, = \ + const void *v4, uint32_t desc) = \ +{ = \ + int i; = \ + = \ + for (i =3D 0; i < (128 / BITS); i++) { = \ + const int32_t a =3D (int##BITS##_t)s390_vec_read_element##BITS(v2,= i); \ + const int32_t b =3D (int##BITS##_t)s390_vec_read_element##BITS(v3,= i); \ + const int32_t c =3D (int##BITS##_t)s390_vec_read_element##BITS(v4,= i); \ + = \ + s390_vec_write_element##BITS(v1, i, (a * b + c) >> BITS); = \ + } = \ +} +DEF_VMAH(8) +DEF_VMAH(16) + +#define DEF_VMALH(BITS) = \ +void HELPER(gvec_vmalh##BITS)(void *v1, const void *v2, const void *v3, = \ + const void *v4, uint32_t desc) = \ +{ = \ + int i; = \ + = \ + for (i =3D 0; i < (128 / BITS); i++) { = \ + const uint##BITS##_t a =3D s390_vec_read_element##BITS(v2, i); = \ + const uint##BITS##_t b =3D s390_vec_read_element##BITS(v3, i); = \ + const uint##BITS##_t c =3D s390_vec_read_element##BITS(v4, i); = \ + = \ + s390_vec_write_element##BITS(v1, i, (a * b + c) >> BITS); = \ + } = \ +} +DEF_VMALH(8) +DEF_VMALH(16) + +#define DEF_VMAE(BITS, TBITS) = \ +void HELPER(gvec_vmae##BITS)(void *v1, const void *v2, const void *v3, = \ + const void *v4, uint32_t desc) = \ +{ = \ + int i, j; = \ + = \ + for (i =3D 0, j =3D 0; i < (128 / TBITS); i++, j +=3D 2) { = \ + int##TBITS##_t a =3D (int##BITS##_t)s390_vec_read_element##BITS(v2= , j); \ + int##TBITS##_t b =3D (int##BITS##_t)s390_vec_read_element##BITS(v3= , j); \ + int##TBITS##_t c =3D (int##BITS##_t)s390_vec_read_element##BITS(v4= , j); \ + = \ + s390_vec_write_element##TBITS(v1, i, a * b + c); = \ + } = \ +} +DEF_VMAE(8, 16) +DEF_VMAE(16, 32) +DEF_VMAE(32, 64) + +#define DEF_VMALE(BITS, TBITS) = \ +void HELPER(gvec_vmale##BITS)(void *v1, const void *v2, const void *v3, = \ + const void *v4, uint32_t desc) = \ +{ = \ + int i, j; = \ + = \ + for (i =3D 0, j =3D 0; i < (128 / TBITS); i++, j +=3D 2) { = \ + uint##TBITS##_t a =3D s390_vec_read_element##BITS(v2, j); = \ + uint##TBITS##_t b =3D s390_vec_read_element##BITS(v3, j); = \ + uint##TBITS##_t c =3D s390_vec_read_element##BITS(v4, j); = \ + = \ + s390_vec_write_element##TBITS(v1, i, a * b + c); = \ + } = \ +} +DEF_VMALE(8, 16) +DEF_VMALE(16, 32) +DEF_VMALE(32, 64) + +#define DEF_VMAO(BITS, TBITS) = \ +void HELPER(gvec_vmao##BITS)(void *v1, const void *v2, const void *v3, = \ + const void *v4, uint32_t desc) = \ +{ = \ + int i, j; = \ + = \ + for (i =3D 0, j =3D 1; i < (128 / TBITS); i++, j +=3D 2) { = \ + int##TBITS##_t a =3D (int##BITS##_t)s390_vec_read_element##BITS(v2= , j); \ + int##TBITS##_t b =3D (int##BITS##_t)s390_vec_read_element##BITS(v3= , j); \ + int##TBITS##_t c =3D (int##BITS##_t)s390_vec_read_element##BITS(v4= , j); \ + = \ + s390_vec_write_element##TBITS(v1, i, a * b + c); = \ + } = \ +} +DEF_VMAO(8, 16) +DEF_VMAO(16, 32) +DEF_VMAO(32, 64) + +#define DEF_VMALO(BITS, TBITS) = \ +void HELPER(gvec_vmalo##BITS)(void *v1, const void *v2, const void *v3, = \ + const void *v4, uint32_t desc) = \ +{ = \ + int i, j; = \ + = \ + for (i =3D 0, j =3D 1; i < (128 / TBITS); i++, j +=3D 2) { = \ + uint##TBITS##_t a =3D s390_vec_read_element##BITS(v2, j); = \ + uint##TBITS##_t b =3D s390_vec_read_element##BITS(v3, j); = \ + uint##TBITS##_t c =3D s390_vec_read_element##BITS(v4, j); = \ + = \ + s390_vec_write_element##TBITS(v1, i, a * b + c); = \ + } = \ +} +DEF_VMALO(8, 16) +DEF_VMALO(16, 32) +DEF_VMALO(32, 64) --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554979354; cv=none; d=zoho.com; s=zohoarc; b=VesdzoOxqMBerMShEKnsGip3/fldEtsAP/kLoO43uYO8UmtNm79G9eZv3iY5JW//JsaUduygzX+ujUD2GqddNDj62OBIyY0fDQwk12E67PkV/TNCmxHAdudXv2GJ5/+xgP5eDmznGn16Ebb16Vtni+1QGDh+e+b7XCm2lW81ONU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554979354; 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=NR6U+Eut0LxuK5izM+3N/ktSAvEgM53UYl6jN/bNqEU=; b=FG6mM2JF0z21MdDi46VjRTH9ASmrcFGbeA6kejZ3QzZb6NTqu4BmMeMLQyikV1+IsGTMinw3uyE/UOlzdBEfPWFi6kccEIp/lzZmm2nJdGCxewm8P1mKhrWq4VH38W5sAkhen6DLvZbBNz2v46EKmmTuHwl4MYijLohrwLU5YjQ= 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 1554979354607283.0247584125193; Thu, 11 Apr 2019 03:42:34 -0700 (PDT) Received: from localhost ([127.0.0.1]:45986 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEXA7-0002Us-Fk for importer@patchew.org; Thu, 11 Apr 2019 06:42:31 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54395) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWsW-0002Xe-FC for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:24:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWe8-0007PX-DN for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:09:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60358) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWe7-0007OQ-Vj; Thu, 11 Apr 2019 06:09:28 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B3EA130018C6; Thu, 11 Apr 2019 10:09:26 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 629001001E82; Thu, 11 Apr 2019 10:09:25 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:08:15 +0200 Message-Id: <20190411100836.646-21-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Thu, 11 Apr 2019 10:09:26 +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 20/41] s390x/tcg: Implement VECTOR MULTIPLY * 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" Yet another set of variants. Implement it similar to VECTOR MULTIPLY AND ADD *. At least for one variant we have a gvec helper we can reuse. Signed-off-by: David Hildenbrand Reviewed-by: Richard Henderson --- target/s390x/helper.h | 16 +++++ target/s390x/insn-data.def | 14 +++++ target/s390x/translate_vx.inc.c | 100 ++++++++++++++++++++++++++++++++ target/s390x/vec_int_helper.c | 100 ++++++++++++++++++++++++++++++++ 4 files changed, 230 insertions(+) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index b73a35107e..a44cc462ae 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -184,6 +184,22 @@ DEF_HELPER_FLAGS_5(gvec_vmao32, TCG_CALL_NO_RWG, void,= ptr, cptr, cptr, cptr, i3 DEF_HELPER_FLAGS_5(gvec_vmalo8, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, cp= tr, i32) DEF_HELPER_FLAGS_5(gvec_vmalo16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, c= ptr, i32) DEF_HELPER_FLAGS_5(gvec_vmalo32, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, c= ptr, i32) +DEF_HELPER_FLAGS_4(gvec_vmh8, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) +DEF_HELPER_FLAGS_4(gvec_vmh16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) +DEF_HELPER_FLAGS_4(gvec_vmlh8, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) +DEF_HELPER_FLAGS_4(gvec_vmlh16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i3= 2) +DEF_HELPER_FLAGS_4(gvec_vme8, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) +DEF_HELPER_FLAGS_4(gvec_vme16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) +DEF_HELPER_FLAGS_4(gvec_vme32, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) +DEF_HELPER_FLAGS_4(gvec_vmle8, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) +DEF_HELPER_FLAGS_4(gvec_vmle16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i3= 2) +DEF_HELPER_FLAGS_4(gvec_vmle32, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i3= 2) +DEF_HELPER_FLAGS_4(gvec_vmo8, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) +DEF_HELPER_FLAGS_4(gvec_vmo16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) +DEF_HELPER_FLAGS_4(gvec_vmo32, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) +DEF_HELPER_FLAGS_4(gvec_vmlo8, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) +DEF_HELPER_FLAGS_4(gvec_vmlo16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i3= 2) +DEF_HELPER_FLAGS_4(gvec_vmlo32, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i3= 2) =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 7ccec0544f..2c794a2744 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1120,6 +1120,20 @@ F(0xe7af, VMAO, VRR_d, V, 0, 0, 0, 0, vma, 0, IF_VEC) /* VECTOR MULTIPLY AND ADD LOGICAL ODD */ F(0xe7ad, VMALO, VRR_d, V, 0, 0, 0, 0, vma, 0, IF_VEC) +/* VECTOR MULTIPLY HIGH */ + F(0xe7a3, VMH, VRR_c, V, 0, 0, 0, 0, vm, 0, IF_VEC) +/* VECTOR MULTIPLY LOGICAL HIGH */ + F(0xe7a1, VMLH, VRR_c, V, 0, 0, 0, 0, vm, 0, IF_VEC) +/* VECTOR MULTIPLY LOW */ + F(0xe7a2, VML, VRR_c, V, 0, 0, 0, 0, vm, 0, IF_VEC) +/* VECTOR MULTIPLY EVEN */ + F(0xe7a6, VME, VRR_c, V, 0, 0, 0, 0, vm, 0, IF_VEC) +/* VECTOR MULTIPLY LOGICAL EVEN */ + F(0xe7a4, VMLE, VRR_c, V, 0, 0, 0, 0, vm, 0, IF_VEC) +/* VECTOR MULTIPLY ODD */ + F(0xe7a7, VMO, VRR_c, V, 0, 0, 0, 0, vm, 0, IF_VEC) +/* VECTOR MULTIPLY LOGICAL ODD */ + F(0xe7a5, VMLO, VRR_c, V, 0, 0, 0, 0, vm, 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 4967af6a07..53bbb4a2ce 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -1689,3 +1689,103 @@ static DisasJumpType op_vma(DisasContext *s, DisasO= ps *o) get_field(s->fields, v3), get_field(s->fields, v4), fn); return DISAS_NEXT; } + +static void gen_mh_i32(TCGv_i32 d, TCGv_i32 a, TCGv_i32 b) +{ + TCGv_i64 t0 =3D tcg_temp_new_i64(); + TCGv_i64 t1 =3D tcg_temp_new_i64(); + + tcg_gen_ext_i32_i64(t0, a); + tcg_gen_ext_i32_i64(t1, b); + tcg_gen_mul_i64(t0, t0, t1); + tcg_gen_extrh_i64_i32(d, t0); + + tcg_temp_free(t0); + tcg_temp_free(t1); +} + +static void gen_mlh_i32(TCGv_i32 d, TCGv_i32 a, TCGv_i32 b) +{ + TCGv_i64 t0 =3D tcg_temp_new_i64(); + TCGv_i64 t1 =3D tcg_temp_new_i64(); + + tcg_gen_extu_i32_i64(t0, a); + tcg_gen_extu_i32_i64(t1, b); + tcg_gen_mul_i64(t0, t0, t1); + tcg_gen_extrh_i64_i32(d, t0); + + tcg_temp_free(t0); + tcg_temp_free(t1); +} + +static DisasJumpType op_vm(DisasContext *s, DisasOps *o) +{ + const uint8_t es =3D get_field(s->fields, m4); + static const GVecGen3 g_vmh[3] =3D { + { .fno =3D gen_helper_gvec_vmh8, }, + { .fno =3D gen_helper_gvec_vmh16, }, + { .fni4 =3D gen_mh_i32, }, + }; + static const GVecGen3 g_vmlh[3] =3D { + { .fno =3D gen_helper_gvec_vmlh8, }, + { .fno =3D gen_helper_gvec_vmlh16, }, + { .fni4 =3D gen_mlh_i32, }, + }; + static const GVecGen3 g_vme[3] =3D { + { .fno =3D gen_helper_gvec_vme8, }, + { .fno =3D gen_helper_gvec_vme16, }, + { .fno =3D gen_helper_gvec_vme32, }, + }; + static const GVecGen3 g_vmle[3] =3D { + { .fno =3D gen_helper_gvec_vmle8, }, + { .fno =3D gen_helper_gvec_vmle16, }, + { .fno =3D gen_helper_gvec_vmle32, }, + }; + static const GVecGen3 g_vmo[3] =3D { + { .fno =3D gen_helper_gvec_vmo8, }, + { .fno =3D gen_helper_gvec_vmo16, }, + { .fno =3D gen_helper_gvec_vmo32, }, + }; + static const GVecGen3 g_vmlo[3] =3D { + { .fno =3D gen_helper_gvec_vmlo8, }, + { .fno =3D gen_helper_gvec_vmlo16, }, + { .fno =3D gen_helper_gvec_vmlo32, }, + }; + const GVecGen3 *fn; + + if (es > ES_32) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + + switch (s->fields->op2) { + case 0xa2: + gen_gvec_fn_3(mul, es, get_field(s->fields, v1), + get_field(s->fields, v2), get_field(s->fields, v3)); + return DISAS_NEXT; + case 0xa3: + fn =3D &g_vmh[es]; + break; + case 0xa1: + fn =3D &g_vmlh[es]; + break; + case 0xa6: + fn =3D &g_vme[es]; + break; + case 0xa4: + fn =3D &g_vmle[es]; + break; + case 0xa7: + fn =3D &g_vmo[es]; + break; + case 0xa5: + fn =3D &g_vmlo[es]; + break; + default: + g_assert_not_reached(); + } + + gen_gvec_3(get_field(s->fields, v1), get_field(s->fields, v2), + get_field(s->fields, v3), fn); + return DISAS_NEXT; +} diff --git a/target/s390x/vec_int_helper.c b/target/s390x/vec_int_helper.c index 424f248325..b818c513a9 100644 --- a/target/s390x/vec_int_helper.c +++ b/target/s390x/vec_int_helper.c @@ -426,3 +426,103 @@ void HELPER(gvec_vmalo##BITS)(void *v1, const void *v= 2, const void *v3, \ DEF_VMALO(8, 16) DEF_VMALO(16, 32) DEF_VMALO(32, 64) + +#define DEF_VMH(BITS) = \ +void HELPER(gvec_vmh##BITS)(void *v1, const void *v2, const void *v3, = \ + uint32_t desc) = \ +{ = \ + int i; = \ + = \ + for (i =3D 0; i < (128 / BITS); i++) { = \ + const int32_t a =3D (int##BITS##_t)s390_vec_read_element##BITS(v2,= i); \ + const int32_t b =3D (int##BITS##_t)s390_vec_read_element##BITS(v3,= i); \ + = \ + s390_vec_write_element##BITS(v1, i, (a * b) >> BITS); = \ + } = \ +} +DEF_VMH(8) +DEF_VMH(16) + +#define DEF_VMLH(BITS) = \ +void HELPER(gvec_vmlh##BITS)(void *v1, const void *v2, const void *v3, = \ + uint32_t desc) = \ +{ = \ + int i; = \ + = \ + for (i =3D 0; i < (128 / BITS); i++) { = \ + const uint##BITS##_t a =3D s390_vec_read_element##BITS(v2, i); = \ + const uint##BITS##_t b =3D s390_vec_read_element##BITS(v3, i); = \ + = \ + s390_vec_write_element##BITS(v1, i, (a * b) >> BITS); = \ + } = \ +} +DEF_VMLH(8) +DEF_VMLH(16) + +#define DEF_VME(BITS, TBITS) = \ +void HELPER(gvec_vme##BITS)(void *v1, const void *v2, const void *v3, = \ + uint32_t desc) = \ +{ = \ + int i, j; = \ + = \ + for (i =3D 0, j =3D 0; i < (128 / TBITS); i++, j +=3D 2) { = \ + int##TBITS##_t a =3D (int##BITS##_t)s390_vec_read_element##BITS(v2= , j); \ + int##TBITS##_t b =3D (int##BITS##_t)s390_vec_read_element##BITS(v3= , j); \ + = \ + s390_vec_write_element##TBITS(v1, i, a * b); = \ + } = \ +} +DEF_VME(8, 16) +DEF_VME(16, 32) +DEF_VME(32, 64) + +#define DEF_VMLE(BITS, TBITS) = \ +void HELPER(gvec_vmle##BITS)(void *v1, const void *v2, const void *v3, = \ + uint32_t desc) = \ +{ = \ + int i, j; = \ + = \ + for (i =3D 0, j =3D 0; i < (128 / TBITS); i++, j +=3D 2) { = \ + const uint##TBITS##_t a =3D s390_vec_read_element##BITS(v2, j); = \ + const uint##TBITS##_t b =3D s390_vec_read_element##BITS(v3, j); = \ + = \ + s390_vec_write_element##TBITS(v1, i, a * b); = \ + } = \ +} +DEF_VMLE(8, 16) +DEF_VMLE(16, 32) +DEF_VMLE(32, 64) + +#define DEF_VMO(BITS, TBITS) = \ +void HELPER(gvec_vmo##BITS)(void *v1, const void *v2, const void *v3, = \ + uint32_t desc) = \ +{ = \ + int i, j; = \ + = \ + for (i =3D 0, j =3D 1; i < (128 / TBITS); i++, j +=3D 2) { = \ + int##TBITS##_t a =3D (int##BITS##_t)s390_vec_read_element##BITS(v2= , j); \ + int##TBITS##_t b =3D (int##BITS##_t)s390_vec_read_element##BITS(v3= , j); \ + = \ + s390_vec_write_element##TBITS(v1, i, a * b); = \ + } = \ +} +DEF_VMO(8, 16) +DEF_VMO(16, 32) +DEF_VMO(32, 64) + +#define DEF_VMLO(BITS, TBITS) = \ +void HELPER(gvec_vmlo##BITS)(void *v1, const void *v2, const void *v3, = \ + uint32_t desc) = \ +{ = \ + int i, j; = \ + = \ + for (i =3D 0, j =3D 0; i < (128 / TBITS); i++, j +=3D 2) { = \ + const uint##TBITS##_t a =3D s390_vec_read_element##BITS(v2, j); = \ + const uint##TBITS##_t b =3D s390_vec_read_element##BITS(v3, j); = \ + = \ + s390_vec_write_element##TBITS(v1, i, a * b); = \ + } = \ +} +DEF_VMLO(8, 16) +DEF_VMLO(16, 32) +DEF_VMLO(32, 64) --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554979183; cv=none; d=zoho.com; s=zohoarc; b=S6/2Y6DUe7asBSk5zDtCSEbXX2HyZPXnh6lskzXLSkl8JDbeaQwxNksZMoiUKN94DAwDWm3XYjpb1AvAP5f4SvUKZ24UH4AVJ0Ee65WSPk2n1R5tuufUsYxGF40JABDv2YJMjhqUKuexs/2giV7pFD4nRl2LRZYkv2hNwbdwdjw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554979183; 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=ALGBf1qUUiOk6t0gmuSTisXp3KziNm1XOJjdLZD33yk=; b=XCoHrUOwDpIvzWx4ssazBWXRr4NrYl4oWXrKvDA/hg9w/XVo0S6ibLrgTAoDxv7Y+rBaB0wK4sbyhDmVeQk98eajqnDJ3+iGWiMux0jzGPvrF2T+s6ckmbXHT3wC/O5fO1uqQBxGMzpHXKs4AUC5znGp7vunYAq4oStpUEaZSC8= 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 155497918357642.68109452852423; Thu, 11 Apr 2019 03:39:43 -0700 (PDT) Received: from localhost ([127.0.0.1]:45924 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEX7K-0007vE-F9 for importer@patchew.org; Thu, 11 Apr 2019 06:39:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54895) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWsW-00039p-Eb for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:24:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWe9-0007QC-Bz for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:09:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53978) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWe9-0007Ph-2F; Thu, 11 Apr 2019 06:09:29 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5B90BC0828A1; Thu, 11 Apr 2019 10:09:28 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 06C531001E82; Thu, 11 Apr 2019 10:09:26 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:08:16 +0200 Message-Id: <20190411100836.646-22-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 11 Apr 2019 10:09: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 21/41] s390x/tcg: Implement VECTOR NAND 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" Part of vector enhancements facility 1, but easy to implement. Signed-off-by: David Hildenbrand Reviewed-by: Richard Henderson --- target/s390x/insn-data.def | 2 ++ target/s390x/translate.c | 1 + target/s390x/translate_vx.inc.c | 7 +++++++ 3 files changed, 10 insertions(+) diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index 2c794a2744..bc8b84e1c2 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1134,6 +1134,8 @@ F(0xe7a7, VMO, VRR_c, V, 0, 0, 0, 0, vm, 0, IF_VEC) /* VECTOR MULTIPLY LOGICAL ODD */ F(0xe7a5, VMLO, VRR_c, V, 0, 0, 0, 0, vm, 0, IF_VEC) +/* VECTOR NAND */ + F(0xe76e, VNN, VRR_c, VE, 0, 0, 0, 0, vnn, 0, IF_VEC) =20 #ifndef CONFIG_USER_ONLY /* COMPARE AND SWAP AND PURGE */ diff --git a/target/s390x/translate.c b/target/s390x/translate.c index a800aa9dc9..c6378b2b53 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -6099,6 +6099,7 @@ 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 facili= ty 1 */ =20 static const DisasInsn insn_info[] =3D { #include "insn-data.def" diff --git a/target/s390x/translate_vx.inc.c b/target/s390x/translate_vx.in= c.c index 53bbb4a2ce..aa01d6274c 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -1789,3 +1789,10 @@ static DisasJumpType op_vm(DisasContext *s, DisasOps= *o) get_field(s->fields, v3), fn); return DISAS_NEXT; } + +static DisasJumpType op_vnn(DisasContext *s, DisasOps *o) +{ + gen_gvec_fn_3(nand, ES_8, get_field(s->fields, v1), + get_field(s->fields, v2), get_field(s->fields, v3)); + return DISAS_NEXT; +} --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554979455; cv=none; d=zoho.com; s=zohoarc; b=ZnKfePb0850tmnQFs5ryHQdCcEZGf6IWO3JgKIiXPiR5vjE1t6EbwhleBySdZjCLhx+mhTmn46D+TebO91BE1RzrZLJm6uywgu4ecS4QSJ3aQI1+8MU9nYt+D/gRgKoyh4H9tuxYnZh+NbAFbfcMF9Ffc3HaUapHvaekkOZw1E8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554979455; 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=5WCuFEhVUpd+5/O1Uk0sTsMK5Ni04I8EwKWotPpVpXQ=; b=lW6nQbpGa1xGQxOQd5Yo+1zQTxT0FrPbTPuV+hC5glerdScg83cl/KV8TK6Ie+ii9AdDe+VkjdIkKsOHPML/A60Yw/4gVGJaQBFBo95Anvhgz6rflkuIQemCfRfQD7dLtu9xUoy0a5CWNcUC9wRub0mxwB3QoJb04MPE+/AdADQ= 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 1554979455945893.620943084125; Thu, 11 Apr 2019 03:44:15 -0700 (PDT) Received: from localhost ([127.0.0.1]:46005 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEXBj-0003ur-Sh for importer@patchew.org; Thu, 11 Apr 2019 06:44:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54895) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWsU-00039p-IT for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:24:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWeA-0007R4-V4 for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:09:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48038) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWeA-0007Qa-Mh; Thu, 11 Apr 2019 06:09:30 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F1C727D7D9; Thu, 11 Apr 2019 10:09:29 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id A21DA1001E82; Thu, 11 Apr 2019 10:09:28 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:08:17 +0200 Message-Id: <20190411100836.646-23-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 11 Apr 2019 10:09:30 +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 22/41] s390x/tcg: Implement VECTOR NOR 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 Reviewed-by: Richard Henderson --- target/s390x/insn-data.def | 2 ++ target/s390x/translate_vx.inc.c | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index bc8b84e1c2..4983867a44 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1136,6 +1136,8 @@ F(0xe7a5, VMLO, VRR_c, V, 0, 0, 0, 0, vm, 0, IF_VEC) /* VECTOR NAND */ F(0xe76e, VNN, VRR_c, VE, 0, 0, 0, 0, vnn, 0, IF_VEC) +/* VECTOR NOR */ + F(0xe76b, VNO, VRR_c, V, 0, 0, 0, 0, vno, 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 aa01d6274c..b78f1bb604 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -1796,3 +1796,10 @@ static DisasJumpType op_vnn(DisasContext *s, DisasOp= s *o) get_field(s->fields, v2), get_field(s->fields, v3)); return DISAS_NEXT; } + +static DisasJumpType op_vno(DisasContext *s, DisasOps *o) +{ + gen_gvec_fn_3(nor, ES_8, get_field(s->fields, v1), get_field(s->fields= , v2), + get_field(s->fields, v3)); + return DISAS_NEXT; +} --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554979287; cv=none; d=zoho.com; s=zohoarc; b=Jj0OOvuwAxw5lO1IO2S++1aQBcqf1+ON0wKejP3n2s2r8o4eeSuajCzhRsDK0/aRU8ulbqus8e5MkKg/EdV40rYqkv55RFo6r9SPhxV0jZOjBymGCKQuBvpJqwgooVp9FSRQ6jB1+EpEzrBzk0gXsWfgqeaVfljFaBrVwsy9AjY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554979287; 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=+lTEUxVJSna3oAephqb0i0sDotr7w9u3M25QUrnRkkY=; b=Gug/bXOCjs7qkbJzV3U1a/HeVMIMnUmbxIhD8S0NyIHn2Ol4KfMMc8ry702s/gNRKgjdsmkT6Y1XIdQf5ZOL3p9YocrcJqNyGRQEjyk0AI+bDJDWFsCSE5Jzlie7YSgXoterX2F7uoYTpt4D72YC/zyWogH8yTU5gRCQeffQRlo= 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 15549792873191011.8261336049046; Thu, 11 Apr 2019 03:41:27 -0700 (PDT) Received: from localhost ([127.0.0.1]:45978 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEX92-0001D9-8V for importer@patchew.org; Thu, 11 Apr 2019 06:41:24 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54892) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWsU-00039j-1m for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:24:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWeC-0007S7-U0 for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:09:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37964) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWeC-0007Ri-Ky; Thu, 11 Apr 2019 06:09:32 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DE708C0AD405; Thu, 11 Apr 2019 10:09:31 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 909441001E82; Thu, 11 Apr 2019 10:09:30 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:08:18 +0200 Message-Id: <20190411100836.646-24-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 11 Apr 2019 10:09:31 +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 23/41] s390x/tcg: Implement VECTOR NOT EXCLUSIVE OR 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" Again, part of vector enhancement facility 1. The operation corresponds to an bitwise equality check. Signed-off-by: David Hildenbrand Reviewed-by: Richard Henderson --- target/s390x/insn-data.def | 2 ++ target/s390x/translate_vx.inc.c | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index 4983867a44..b549b76b96 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1138,6 +1138,8 @@ F(0xe76e, VNN, VRR_c, VE, 0, 0, 0, 0, vnn, 0, IF_VEC) /* VECTOR NOR */ F(0xe76b, VNO, VRR_c, V, 0, 0, 0, 0, vno, 0, IF_VEC) +/* VECTOR NOT EXCLUSIVE OR */ + F(0xe76c, VNX, VRR_c, VE, 0, 0, 0, 0, vnx, 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 b78f1bb604..df6cf514b2 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -1803,3 +1803,10 @@ static DisasJumpType op_vno(DisasContext *s, DisasOp= s *o) get_field(s->fields, v3)); return DISAS_NEXT; } + +static DisasJumpType op_vnx(DisasContext *s, DisasOps *o) +{ + gen_gvec_fn_3(eqv, ES_8, get_field(s->fields, v1), get_field(s->fields= , v2), + get_field(s->fields, v3)); + return DISAS_NEXT; +} --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554979443; cv=none; d=zoho.com; s=zohoarc; b=FgYjedd43XxpDKcHXGU6WTuFIw7UitV/O98EnOwov+745WC9R33VixkVQM1XD2FsYVWAa6AboSsk53oubYJ84APIJXaYSwboa5uxb5YYJe1u7n3QXyjY6NiSsbqnomc2qpf3KsLFJhPJtp7qN5r143JKk0OVpAHDREHlJVJW+VY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554979443; 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=nsGCvRRJZ1vbmQHg1q1h/MbVCP0fjkYnIom2/Nwf9C4=; b=gpsZO5z12vvXgT5RfzRAOh1ID9jW4ZlGXwOaFuodzYCSbRZ8LA1++XUNpPpmxHjLH5nJLPhHCt3fbp7DxPfc6XN6xJtFdBz74Dy3ZyQa2d+HLJrSTGeI32zdXqW9X+Y8HW6djus5+zpZTO6DKJhRL75pAR95AdpYdYCE+IYkhu4= 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 1554979443858351.3406563858773; Thu, 11 Apr 2019 03:44:03 -0700 (PDT) Received: from localhost ([127.0.0.1]:46003 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEXBa-0003lu-IR for importer@patchew.org; Thu, 11 Apr 2019 06:44:02 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54895) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWsT-00039p-Fm for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:24:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWeF-0007Tq-K6 for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:09:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56446) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWeF-0007TM-Ak; Thu, 11 Apr 2019 06:09:35 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9D426307D846; Thu, 11 Apr 2019 10:09:34 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 32D551001E82; Thu, 11 Apr 2019 10:09:32 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:08:19 +0200 Message-Id: <20190411100836.646-25-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Thu, 11 Apr 2019 10:09:34 +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 24/41] s390x/tcg: Implement VECTOR OR 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" Reuse a gvec helper. Signed-off-by: David Hildenbrand Reviewed-by: Richard Henderson --- target/s390x/insn-data.def | 2 ++ target/s390x/translate_vx.inc.c | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index b549b76b96..fb74374a0a 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1140,6 +1140,8 @@ F(0xe76b, VNO, VRR_c, V, 0, 0, 0, 0, vno, 0, IF_VEC) /* VECTOR NOT EXCLUSIVE OR */ F(0xe76c, VNX, VRR_c, VE, 0, 0, 0, 0, vnx, 0, IF_VEC) +/* VECTOR OR */ + F(0xe76a, VO, VRR_c, V, 0, 0, 0, 0, vo, 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 df6cf514b2..b0b54a49a3 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -1810,3 +1810,10 @@ static DisasJumpType op_vnx(DisasContext *s, DisasOp= s *o) get_field(s->fields, v3)); return DISAS_NEXT; } + +static DisasJumpType op_vo(DisasContext *s, DisasOps *o) +{ + gen_gvec_fn_3(or, ES_8, get_field(s->fields, v1), get_field(s->fields,= v2), + get_field(s->fields, v3)); + return DISAS_NEXT; +} --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554979000; cv=none; d=zoho.com; s=zohoarc; b=lVH9Ji8FCglpCUIenSmjl/4vJmN+mnZyfb250rMwPuFmYycC79XPZIGWc/bInmBFKyT54oJho6pYfCThVxtQ62d77LXkF+xeRBg7vgL2xTMVQronGJcKZ4OO874GC8FSKOioO3BIRBRIk+7K4DO0WkGIBvw7Lhgr5+WkjmogRtA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554979000; 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=zm9CQUK5wbCHChPSvTEPZB4yGN0J0mltW5lIYLJo2bM=; b=CIkAdEF3aIN7h08OabdN8BlhJ3rjdvbQXWCSyEfA8x1BQ3kFzVgwbw6oXKqXyo8gUkvNFS48OydmRTsWiyDAX7FZzHAu1+qWxSkEIfJeKlg3EUMpF6lcS6TEa6N8OCs2cl9+oZEJD514qoRWTuTCkN1Zt3K96Kfhck3BlXiCNss= 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 1554979000771986.801614878318; Thu, 11 Apr 2019 03:36:40 -0700 (PDT) Received: from localhost ([127.0.0.1]:45894 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEX4I-00056J-LH for importer@patchew.org; Thu, 11 Apr 2019 06:36:30 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54552) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWsT-0002dl-6k for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:24:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWeK-0007Vz-Pn for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:09:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56268) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWeK-0007Vd-FV; Thu, 11 Apr 2019 06:09:40 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BC63F820FF; Thu, 11 Apr 2019 10:09:39 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id E57101001E82; Thu, 11 Apr 2019 10:09:34 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:08:20 +0200 Message-Id: <20190411100836.646-26-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 11 Apr 2019 10:09:39 +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 25/41] s390x/tcg: Implement VECTOR OR WITH COMPLEMENT 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" Again, vector enhancements facility 1 material. Signed-off-by: David Hildenbrand Reviewed-by: Richard Henderson --- target/s390x/insn-data.def | 2 ++ target/s390x/translate_vx.inc.c | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index fb74374a0a..52171252be 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1142,6 +1142,8 @@ F(0xe76c, VNX, VRR_c, VE, 0, 0, 0, 0, vnx, 0, IF_VEC) /* VECTOR OR */ F(0xe76a, VO, VRR_c, V, 0, 0, 0, 0, vo, 0, IF_VEC) +/* VECTOR OR WITH COMPLEMENT */ + F(0xe76f, VOC, VRR_c, VE, 0, 0, 0, 0, voc, 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 b0b54a49a3..08ebc7fc4c 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -1817,3 +1817,10 @@ static DisasJumpType op_vo(DisasContext *s, DisasOps= *o) get_field(s->fields, v3)); return DISAS_NEXT; } + +static DisasJumpType op_voc(DisasContext *s, DisasOps *o) +{ + gen_gvec_fn_3(orc, ES_8, get_field(s->fields, v1), get_field(s->fields= , v2), + get_field(s->fields, v3)); + return DISAS_NEXT; +} --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554979278; cv=none; d=zoho.com; s=zohoarc; b=MKGyjRqOjYKZbV6tYL3sVY2RoJCL7IUZfWwlZVDGM6kFJuAphsfid2YiicUhQdh3HJ2nkT/Xm9qervFL+cH1PbunkM0fVrwl5GN3vYJbhSAta7n217hrcgctlQ8pBbt5r6N4W6e+fj2KEq5jmRNly8Bmu78mNPGS9k7i/D1ZowU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554979278; 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=In4EcnQ/cMv0JANV9QabwruYVjGeArL7/cbv5QKHzPE=; b=Tjk07x6d+9uMs5eFTKDvZt6jJW5GOR55bWMTDyvzOOtSJJgC2+smMFg1vv6c5sLj/kO758ve6VXPMF5oVgxghVVzSy2iP9z+3/Nu6/Twe1ch4pk5KDMQwJ2N2UmeLReew5ztsp/RLFhLjNqtzhIe/g8CsMn8fWpxx59+HYjZZdo= 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 1554979278783890.1082527545798; Thu, 11 Apr 2019 03:41:18 -0700 (PDT) Received: from localhost ([127.0.0.1]:45976 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEX8s-0000v5-Kh for importer@patchew.org; Thu, 11 Apr 2019 06:41:14 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54884) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWsS-000390-D9 for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:24:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWeM-0007Wi-G5 for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:09:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45252) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWeM-0007WJ-2h; Thu, 11 Apr 2019 06:09:42 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6165030BB366; Thu, 11 Apr 2019 10:09:41 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 11A571001E82; Thu, 11 Apr 2019 10:09:39 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:08:21 +0200 Message-Id: <20190411100836.646-27-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Thu, 11 Apr 2019 10:09:41 +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 26/41] s390x/tcg: Implement VECTOR POPULATION COUNT 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 COUNT TRAILING ZEROES. Signed-off-by: David Hildenbrand Reviewed-by: Richard Henderson --- target/s390x/helper.h | 2 ++ target/s390x/insn-data.def | 2 ++ target/s390x/translate_vx.inc.c | 19 +++++++++++++++++++ target/s390x/vec_int_helper.c | 14 ++++++++++++++ 4 files changed, 37 insertions(+) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index a44cc462ae..a306378950 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -200,6 +200,8 @@ DEF_HELPER_FLAGS_4(gvec_vmo32, TCG_CALL_NO_RWG, void, p= tr, cptr, cptr, i32) DEF_HELPER_FLAGS_4(gvec_vmlo8, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) DEF_HELPER_FLAGS_4(gvec_vmlo16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i3= 2) DEF_HELPER_FLAGS_4(gvec_vmlo32, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i3= 2) +DEF_HELPER_FLAGS_3(gvec_vpopct8, TCG_CALL_NO_RWG, void, ptr, cptr, i32) +DEF_HELPER_FLAGS_3(gvec_vpopct16, TCG_CALL_NO_RWG, void, ptr, cptr, 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 52171252be..0f786d6ab1 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1144,6 +1144,8 @@ F(0xe76a, VO, VRR_c, V, 0, 0, 0, 0, vo, 0, IF_VEC) /* VECTOR OR WITH COMPLEMENT */ F(0xe76f, VOC, VRR_c, VE, 0, 0, 0, 0, voc, 0, IF_VEC) +/* VECTOR POPULATION COUNT */ + F(0xe750, VPOPCT, VRR_a, V, 0, 0, 0, 0, vpopct, 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 08ebc7fc4c..df17b8242d 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -1824,3 +1824,22 @@ static DisasJumpType op_voc(DisasContext *s, DisasOp= s *o) get_field(s->fields, v3)); return DISAS_NEXT; } + +static DisasJumpType op_vpopct(DisasContext *s, DisasOps *o) +{ + const uint8_t es =3D get_field(s->fields, m3); + static const GVecGen2 g[4] =3D { + { .fno =3D gen_helper_gvec_vpopct8, }, + { .fno =3D gen_helper_gvec_vpopct16, }, + { .fni4 =3D tcg_gen_ctpop_i32, }, + { .fni8 =3D tcg_gen_ctpop_i64, }, + }; + + if (es > ES_64 || (es !=3D ES_8 && !s390_has_feat(S390_FEAT_VECTOR_ENH= ))) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + + gen_gvec_2(get_field(s->fields, v1), get_field(s->fields, v2), &g[es]); + return DISAS_NEXT; +} diff --git a/target/s390x/vec_int_helper.c b/target/s390x/vec_int_helper.c index b818c513a9..f49d5c2ffb 100644 --- a/target/s390x/vec_int_helper.c +++ b/target/s390x/vec_int_helper.c @@ -526,3 +526,17 @@ void HELPER(gvec_vmlo##BITS)(void *v1, const void *v2,= const void *v3, \ DEF_VMLO(8, 16) DEF_VMLO(16, 32) DEF_VMLO(32, 64) + +#define DEF_VPOPCT(BITS) = \ +void HELPER(gvec_vpopct##BITS)(void *v1, const void *v2, uint32_t desc) = \ +{ = \ + int i; = \ + = \ + for (i =3D 0; i < (128 / BITS); i++) { = \ + const uint##BITS##_t a =3D s390_vec_read_element##BITS(v2, i); = \ + = \ + s390_vec_write_element##BITS(v1, i, ctpop32(a)); = \ + } = \ +} +DEF_VPOPCT(8) +DEF_VPOPCT(16) --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554978924; cv=none; d=zoho.com; s=zohoarc; b=DekT0gTYN52LUlYU0IL+jnAhJwGMS3W+afRA4vhyG2J5AXxiVOwKqBhjqgxu6PGPNQgXO2HMjj0yCV2KdX3cWLWsHspjqwqLHzk8bf5Ya0MRJvuOopCUAt2kaYevfdfGgvJjj7+DZQp2TTVHtssuLV3uJHMBgMpfwXb6m/lJhwg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554978924; 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=SeVVjkbEJsWmkD3S3SHGpTgtdIcWS2M19sG0ZKHzAuM=; b=UyaSU1j81SMWkxY6jQ+P/jF1EhffguF6HttQyWDc8rYRWOBXeXVe+5lPh60Ox+au7N5ZalEiOBemst/zh/VwmyvIEJFXSUKjeB+mDGLqZqA1GcJYRyU5lo+EzmFGkOs+2srhqACa3eB6zr4CgCxcJ2isrnaBlCNUdIW7wvB/ODQ= 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 155497892489269.93313964077458; Thu, 11 Apr 2019 03:35:24 -0700 (PDT) Received: from localhost ([127.0.0.1]:45852 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEX3D-00049e-Oy for importer@patchew.org; Thu, 11 Apr 2019 06:35:23 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54388) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWsR-0002Us-8D for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:24:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWeO-0007Xa-0q for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:09:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45262) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWeN-0007X9-NZ; Thu, 11 Apr 2019 06:09:43 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0354D3086258; Thu, 11 Apr 2019 10:09:43 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id A82BA1001E82; Thu, 11 Apr 2019 10:09:41 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:08:22 +0200 Message-Id: <20190411100836.646-28-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Thu, 11 Apr 2019 10:09:43 +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 27/41] s390x/tcg: Implement VECTOR ELEMENT ROTATE LEFT LOGICAL 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" Take care of properly taking the modulo of the count. We might later want to come back and create a variant of VERLL where the base register is 0, resulting in an immediate. Signed-off-by: David Hildenbrand Reviewed-by: Richard Henderson --- target/s390x/helper.h | 4 +++ target/s390x/insn-data.def | 3 ++ target/s390x/translate_vx.inc.c | 60 +++++++++++++++++++++++++++++++++ target/s390x/vec_int_helper.c | 40 ++++++++++++++++++++++ 4 files changed, 107 insertions(+) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index a306378950..f0efaf9cd5 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -202,6 +202,10 @@ DEF_HELPER_FLAGS_4(gvec_vmlo16, TCG_CALL_NO_RWG, void,= ptr, cptr, cptr, i32) DEF_HELPER_FLAGS_4(gvec_vmlo32, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i3= 2) DEF_HELPER_FLAGS_3(gvec_vpopct8, TCG_CALL_NO_RWG, void, ptr, cptr, i32) DEF_HELPER_FLAGS_3(gvec_vpopct16, TCG_CALL_NO_RWG, void, ptr, cptr, i32) +DEF_HELPER_FLAGS_4(gvec_verllv8, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i= 32) +DEF_HELPER_FLAGS_4(gvec_verllv16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, = i32) +DEF_HELPER_FLAGS_4(gvec_verll8, TCG_CALL_NO_RWG, void, ptr, cptr, i64, i32) +DEF_HELPER_FLAGS_4(gvec_verll16, TCG_CALL_NO_RWG, void, ptr, cptr, i64, i3= 2) =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 0f786d6ab1..e765c15941 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1146,6 +1146,9 @@ F(0xe76f, VOC, VRR_c, VE, 0, 0, 0, 0, voc, 0, IF_VEC) /* VECTOR POPULATION COUNT */ F(0xe750, VPOPCT, VRR_a, V, 0, 0, 0, 0, vpopct, 0, IF_VEC) +/* VECTOR ELEMENT ROTATE LEFT LOGICAL */ + F(0xe773, VERLLV, VRR_c, V, 0, 0, 0, 0, verllv, 0, IF_VEC) + F(0xe733, VERLL, VRS_a, V, la2, 0, 0, 0, verll, 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 df17b8242d..92c14174da 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -185,6 +185,9 @@ static void get_vec_element_ptr_i64(TCGv_ptr ptr, uint8= _t reg, TCGv_i64 enr, #define gen_gvec_2(v1, v2, gen) \ tcg_gen_gvec_2(vec_full_reg_offset(v1), vec_full_reg_offset(v2), \ 16, 16, gen) +#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_3(v1, v2, v3, gen) \ tcg_gen_gvec_3(vec_full_reg_offset(v1), vec_full_reg_offset(v2), \ vec_full_reg_offset(v3), 16, 16, gen) @@ -1843,3 +1846,60 @@ static DisasJumpType op_vpopct(DisasContext *s, Disa= sOps *o) gen_gvec_2(get_field(s->fields, v1), get_field(s->fields, v2), &g[es]); return DISAS_NEXT; } + +static void gen_rll_i32(TCGv_i32 d, TCGv_i32 a, TCGv_i32 b) +{ + TCGv_i32 t0 =3D tcg_temp_new_i32(); + + tcg_gen_andi_i32(t0, b, 31); + tcg_gen_rotl_i32(d, a, t0); + tcg_temp_free_i32(t0); +} + +static void gen_rll_i64(TCGv_i64 d, TCGv_i64 a, TCGv_i64 b) +{ + TCGv_i64 t0 =3D tcg_temp_new_i64(); + + tcg_gen_andi_i64(t0, b, 63); + tcg_gen_rotl_i64(d, a, t0); + tcg_temp_free_i64(t0); +} + +static DisasJumpType op_verllv(DisasContext *s, DisasOps *o) +{ + const uint8_t es =3D get_field(s->fields, m4); + static const GVecGen3 g[4] =3D { + { .fno =3D gen_helper_gvec_verllv8, }, + { .fno =3D gen_helper_gvec_verllv16, }, + { .fni4 =3D gen_rll_i32, }, + { .fni8 =3D gen_rll_i64, }, + }; + + if (es > ES_64) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + + gen_gvec_3(get_field(s->fields, v1), get_field(s->fields, v2), + get_field(s->fields, v3), &g[es]); + return DISAS_NEXT; +} + +static DisasJumpType op_verll(DisasContext *s, DisasOps *o) +{ + const uint8_t es =3D get_field(s->fields, m4); + static const GVecGen2s g[4] =3D { + { .fno =3D gen_helper_gvec_verll8, }, + { .fno =3D gen_helper_gvec_verll16, }, + { .fni4 =3D gen_rll_i32, }, + { .fni8 =3D gen_rll_i64, }, + }; + + if (es > ES_64) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + gen_gvec_2s(get_field(s->fields, v1), get_field(s->fields, v3), o->add= r1, + &g[es]); + return DISAS_NEXT; +} diff --git a/target/s390x/vec_int_helper.c b/target/s390x/vec_int_helper.c index f49d5c2ffb..ed67fa73fb 100644 --- a/target/s390x/vec_int_helper.c +++ b/target/s390x/vec_int_helper.c @@ -540,3 +540,43 @@ void HELPER(gvec_vpopct##BITS)(void *v1, const void *v= 2, uint32_t desc) \ } DEF_VPOPCT(8) DEF_VPOPCT(16) + +#define DEF_ROTL(BITS) = \ +static uint##BITS##_t rotl##BITS(uint##BITS##_t a, uint8_t count) = \ +{ = \ + count &=3D BITS - 1; = \ + return (a << count) | (a >> (BITS - count)); = \ +} +DEF_ROTL(8) +DEF_ROTL(16) + +#define DEF_VERLLV(BITS) = \ +void HELPER(gvec_verllv##BITS)(void *v1, const void *v2, const void *v3, = \ + uint32_t desc) = \ +{ = \ + int i; = \ + = \ + for (i =3D 0; i < (128 / BITS); i++) { = \ + const uint##BITS##_t a =3D s390_vec_read_element##BITS(v2, i); = \ + const uint##BITS##_t b =3D s390_vec_read_element##BITS(v3, i); = \ + = \ + s390_vec_write_element##BITS(v1, i, rotl##BITS(a, b)); = \ + } = \ +} +DEF_VERLLV(8) +DEF_VERLLV(16) + +#define DEF_VERLL(BITS) = \ +void HELPER(gvec_verll##BITS)(void *v1, const void *v2, uint64_t count, = \ + uint32_t desc) = \ +{ = \ + int i; = \ + = \ + for (i =3D 0; i < (128 / BITS); i++) { = \ + const uint##BITS##_t a =3D s390_vec_read_element##BITS(v2, i); = \ + = \ + s390_vec_write_element##BITS(v1, i, rotl##BITS(a, count)); = \ + } = \ +} +DEF_VERLL(8) +DEF_VERLL(16) --=20 2.20.1 From nobody Sat May 18 17:15:55 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) 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=1554979093; cv=none; d=zoho.com; s=zohoarc; b=Kn9alynkLSl0/nEX/Q20tBokexMp5zvZIWEdeLPsxlwQ7LFRYrn20gnyWyFtYESRzWxDBCnhuJ2aPX6fNy/9RwlQL/CAAxwyl9cqJbSFS6Ij4X5RBV5Bdh9enhYOjvzTzbIqWSZ5DPWh2BDcCQyidjTx4PaxyWE+AjE8O5EpkmQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554979093; 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=MCI9czFA3JOQ0ItqulNcNaShC9q2Q826aRRI/JcNtI4=; b=jvoy9AHr96WAVliWLYR+JKoJHrAEa97ae/vfL6laktKVLUt5YiK1bggvAnVhG2c1h/nJ/jJVlIhxsdl2gcNsRihSp7vrzjhxKGQGAiKhSYek2F294a4cwqmMk/48zMPGJSSJZ9ca7NdhH6FcLp3z7RLBxP24YzO7IGvfAZ0ygFk= ARC-Authentication-Results: i=1; mx.zoho.com; spf=temperror (zoho.com: Error in retrieving data from DNS) 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 1554979093475887.9328257786874; Thu, 11 Apr 2019 03:38:13 -0700 (PDT) Received: from localhost ([127.0.0.1]:45916 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEX5w-0006r7-DO for importer@patchew.org; Thu, 11 Apr 2019 06:38:12 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54388) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWsN-0002Us-E7 for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:24:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWeP-0007YC-M5 for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:09:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56342) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWeP-0007Xp-BG; Thu, 11 Apr 2019 06:09:45 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9CE6F806B5; Thu, 11 Apr 2019 10:09:44 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 49E731001E82; Thu, 11 Apr 2019 10:09:43 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:08:23 +0200 Message-Id: <20190411100836.646-29-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 11 Apr 2019 10:09:44 +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 28/41] s390x/tcg: Implement VECTOR ELEMENT ROTATE AND INSERT UNDER MASK 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" Use the new vector expansion for GVecGen3i. In the ool helpers, reuse the rotation funvtions introduced with VECTOR ELEMENT ROTATE LEFT LOGICAL. Signed-off-by: David Hildenbrand --- target/s390x/helper.h | 2 ++ target/s390x/insn-data.def | 2 ++ target/s390x/translate_vx.inc.c | 53 +++++++++++++++++++++++++++++++++ target/s390x/vec_int_helper.c | 19 ++++++++++++ 4 files changed, 76 insertions(+) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index f0efaf9cd5..bfde7e3cc6 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -206,6 +206,8 @@ DEF_HELPER_FLAGS_4(gvec_verllv8, TCG_CALL_NO_RWG, void,= ptr, cptr, cptr, i32) DEF_HELPER_FLAGS_4(gvec_verllv16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, = i32) DEF_HELPER_FLAGS_4(gvec_verll8, TCG_CALL_NO_RWG, void, ptr, cptr, i64, i32) DEF_HELPER_FLAGS_4(gvec_verll16, TCG_CALL_NO_RWG, void, ptr, cptr, i64, i3= 2) +DEF_HELPER_FLAGS_4(gvec_verim8, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i3= 2) +DEF_HELPER_FLAGS_4(gvec_verim16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i= 32) =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 e765c15941..59c323a796 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1149,6 +1149,8 @@ /* VECTOR ELEMENT ROTATE LEFT LOGICAL */ F(0xe773, VERLLV, VRR_c, V, 0, 0, 0, 0, verllv, 0, IF_VEC) F(0xe733, VERLL, VRS_a, V, la2, 0, 0, 0, verll, 0, IF_VEC) +/* VECTOR ELEMENT ROTATE AND INSERT UNDER MASK */ + F(0xe772, VERIM, VRI_d, V, 0, 0, 0, 0, verim, 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 92c14174da..a6169b9827 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -197,6 +197,9 @@ static void get_vec_element_ptr_i64(TCGv_ptr ptr, uint8= _t reg, TCGv_i64 enr, #define gen_gvec_3_ptr(v1, v2, v3, ptr, data, fn) \ tcg_gen_gvec_3_ptr(vec_full_reg_offset(v1), vec_full_reg_offset(v2), \ vec_full_reg_offset(v3), ptr, 16, 16, data, fn) +#define gen_gvec_3i(v1, v2, v3, c, gen) \ + tcg_gen_gvec_3i(vec_full_reg_offset(v1), vec_full_reg_offset(v2), \ + vec_full_reg_offset(v3), c, 16, 16, gen) #define gen_gvec_4(v1, v2, v3, v4, gen) \ tcg_gen_gvec_4(vec_full_reg_offset(v1), vec_full_reg_offset(v2), \ vec_full_reg_offset(v3), vec_full_reg_offset(v4), \ @@ -1903,3 +1906,53 @@ static DisasJumpType op_verll(DisasContext *s, Disas= Ops *o) &g[es]); return DISAS_NEXT; } + +static void gen_rim_i32(TCGv_i32 d, TCGv_i32 a, TCGv_i32 b, int32_t c) +{ + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); + + tcg_gen_andc_i32(t0, a, b); + tcg_gen_rotli_i32(t1, a, c & 31); + tcg_gen_and_i32(t1, t1, b); + tcg_gen_or_i32(d, t0, t1); + + tcg_temp_free_i32(t0); + tcg_temp_free_i32(t1); +} + +static void gen_rim_i64(TCGv_i64 d, TCGv_i64 a, TCGv_i64 b, int64_t c) +{ + TCGv_i64 t0 =3D tcg_temp_new_i64(); + TCGv_i64 t1 =3D tcg_temp_new_i64(); + + tcg_gen_andc_i64(t0, a, b); + tcg_gen_rotli_i64(t1, a, c & 63); + tcg_gen_and_i64(t1, t1, b); + tcg_gen_or_i64(d, t0, t1); + + tcg_temp_free_i64(t0); + tcg_temp_free_i64(t1); +} + +static DisasJumpType op_verim(DisasContext *s, DisasOps *o) +{ + const uint8_t es =3D get_field(s->fields, m5); + const uint8_t i4 =3D get_field(s->fields, i4) & + (NUM_VEC_ELEMENT_BITS(es) - 1); + static const GVecGen3i g[4] =3D { + { .fno =3D gen_helper_gvec_verim8, }, + { .fno =3D gen_helper_gvec_verim16, }, + { .fni4 =3D gen_rim_i32, }, + { .fni8 =3D gen_rim_i64, }, + }; + + if (es > ES_64) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + + gen_gvec_3i(get_field(s->fields, v1), get_field(s->fields, v2), + get_field(s->fields, v3), i4, &g[es]); + return DISAS_NEXT; +} diff --git a/target/s390x/vec_int_helper.c b/target/s390x/vec_int_helper.c index ed67fa73fb..6dc31003b9 100644 --- a/target/s390x/vec_int_helper.c +++ b/target/s390x/vec_int_helper.c @@ -14,6 +14,7 @@ #include "cpu.h" #include "vec.h" #include "exec/helper-proto.h" +#include "tcg/tcg-gvec-desc.h" =20 /* * Add two 128 bit vectors, returning the carry. @@ -580,3 +581,21 @@ void HELPER(gvec_verll##BITS)(void *v1, const void *v2= , uint64_t count, \ } DEF_VERLL(8) DEF_VERLL(16) + +#define DEF_VERIM(BITS) = \ +void HELPER(gvec_verim##BITS)(void *v1, const void *v2, const void *v3, = \ + uint32_t desc) = \ +{ = \ + const uint8_t count =3D simd_data(desc); = \ + int i; = \ + = \ + for (i =3D 0; i < (128 / BITS); i++) { = \ + const uint##BITS##_t a =3D s390_vec_read_element##BITS(v2, i); = \ + const uint##BITS##_t mask =3D s390_vec_read_element##BITS(v3, i); = \ + const uint##BITS##_t d =3D (a & ~mask) | (rotl##BITS(a, count) & m= ask); \ + = \ + s390_vec_write_element##BITS(v1, i, d); = \ + } = \ +} +DEF_VERIM(8) +DEF_VERIM(16) --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554979225; cv=none; d=zoho.com; s=zohoarc; b=iNppIqm5cmd89gbhwJCk3uecS4shp9kUOru+neURRCVQ2yVdIaXpOjrbMowR/jdOMdZTGdXP5mTyUMgXC88p0d+FRp4tXwQpc3cneQI7KvfMTdfdjJSpGeasphMlglx3Crxs/EzzuhDf9FYLqEUCdn6ua9GIU+pJNqnjYPvLsP8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554979225; 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=xXBEwsYqoacYaNegQ3VjkwQoDeqmCG0og3abmouVPvA=; b=IfHKOxCo1+uJQaIY/pUEngxXxl53ed14R5k11q5g1tUnXR+qwm0ZloQ2HZBxjMuMrMHRP8LIreJMAVDh3sk2jXl7/BZ+2PmrIhONgNEVfQPYk1nAx6JOXuTGWmoEaQKVqYuMFQEvP8Sjbqw10iz5bd+5OsdFiXizTJoDu/Yk7MI= 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 1554979225018829.3844365118969; Thu, 11 Apr 2019 03:40:25 -0700 (PDT) Received: from localhost ([127.0.0.1]:45940 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEX81-0008Vt-Uq for importer@patchew.org; Thu, 11 Apr 2019 06:40:21 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54552) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWsN-0002dl-0j for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:24:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWeR-0007Yi-Aw for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:09:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45322) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWeQ-0007YN-VQ; Thu, 11 Apr 2019 06:09:47 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3F686308FE9F; Thu, 11 Apr 2019 10:09:46 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id E4E6B1001E71; Thu, 11 Apr 2019 10:09:44 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:08:24 +0200 Message-Id: <20190411100836.646-30-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Thu, 11 Apr 2019 10:09:46 +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 29/41] s390x/tcg: Implement VECTOR ELEMENT SHIFT 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" Only for one special case we can reuse real gvec helpers. Mostly rely on oom helpers. One important thing to take care of is always to properly mask of unused bits from the shift count. Signed-off-by: David Hildenbrand Reviewed-by: Richard Henderson --- target/s390x/helper.h | 18 +++++ target/s390x/insn-data.def | 9 +++ target/s390x/translate_vx.inc.c | 113 ++++++++++++++++++++++++++++++++ target/s390x/vec_int_helper.c | 99 ++++++++++++++++++++++++++++ 4 files changed, 239 insertions(+) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index bfde7e3cc6..a04d1d8948 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -208,6 +208,24 @@ DEF_HELPER_FLAGS_4(gvec_verll8, TCG_CALL_NO_RWG, void,= ptr, cptr, i64, i32) DEF_HELPER_FLAGS_4(gvec_verll16, TCG_CALL_NO_RWG, void, ptr, cptr, i64, i3= 2) DEF_HELPER_FLAGS_4(gvec_verim8, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i3= 2) DEF_HELPER_FLAGS_4(gvec_verim16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i= 32) +DEF_HELPER_FLAGS_4(gvec_veslv8, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i3= 2) +DEF_HELPER_FLAGS_4(gvec_veslv16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i= 32) +DEF_HELPER_FLAGS_4(gvec_veslv32, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i= 32) +DEF_HELPER_FLAGS_4(gvec_veslv64, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i= 32) +DEF_HELPER_FLAGS_4(gvec_vesrav8, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i= 32) +DEF_HELPER_FLAGS_4(gvec_vesrav16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, = i32) +DEF_HELPER_FLAGS_4(gvec_vesrav32, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, = i32) +DEF_HELPER_FLAGS_4(gvec_vesrav64, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, = i32) +DEF_HELPER_FLAGS_4(gvec_vesrlv8, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i= 32) +DEF_HELPER_FLAGS_4(gvec_vesrlv16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, = i32) +DEF_HELPER_FLAGS_4(gvec_vesrlv32, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, = i32) +DEF_HELPER_FLAGS_4(gvec_vesrlv64, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, = i32) +DEF_HELPER_FLAGS_4(gvec_vesl8, TCG_CALL_NO_RWG, void, ptr, cptr, i64, i32) +DEF_HELPER_FLAGS_4(gvec_vesl16, TCG_CALL_NO_RWG, void, ptr, cptr, i64, i32) +DEF_HELPER_FLAGS_4(gvec_vesra8, TCG_CALL_NO_RWG, void, ptr, cptr, i64, i32) +DEF_HELPER_FLAGS_4(gvec_vesra16, TCG_CALL_NO_RWG, void, ptr, cptr, i64, i3= 2) +DEF_HELPER_FLAGS_4(gvec_vesrl8, TCG_CALL_NO_RWG, void, ptr, cptr, i64, i32) +DEF_HELPER_FLAGS_4(gvec_vesrl16, TCG_CALL_NO_RWG, void, ptr, cptr, i64, i3= 2) =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 59c323a796..f4b67bda7e 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1151,6 +1151,15 @@ F(0xe733, VERLL, VRS_a, V, la2, 0, 0, 0, verll, 0, IF_VEC) /* VECTOR ELEMENT ROTATE AND INSERT UNDER MASK */ F(0xe772, VERIM, VRI_d, V, 0, 0, 0, 0, verim, 0, IF_VEC) +/* VECTOR ELEMENT SHIFT LEFT */ + F(0xe770, VESLV, VRR_c, V, 0, 0, 0, 0, vesv, 0, IF_VEC) + F(0xe730, VESL, VRS_a, V, la2, 0, 0, 0, ves, 0, IF_VEC) +/* VECTOR ELEMENT SHIFT RIGHT ARITHMETIC */ + F(0xe77a, VESRAV, VRR_c, V, 0, 0, 0, 0, vesv, 0, IF_VEC) + F(0xe73a, VESRA, VRS_a, V, la2, 0, 0, 0, ves, 0, IF_VEC) +/* VECTOR ELEMENT SHIFT RIGHT LOGICAL */ + F(0xe778, VESRLV, VRR_c, V, 0, 0, 0, 0, vesv, 0, IF_VEC) + F(0xe738, VESRL, VRS_a, V, la2, 0, 0, 0, ves, 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 a6169b9827..7553e4069e 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -218,6 +218,9 @@ static void get_vec_element_ptr_i64(TCGv_ptr ptr, uint8= _t reg, TCGv_i64 enr, #define gen_gvec_fn_2(fn, es, v1, v2) \ tcg_gen_gvec_##fn(es, vec_full_reg_offset(v1), vec_full_reg_offset(v2)= , \ 16, 16) +#define gen_gvec_fn_2i(fn, es, v1, v2, c) \ + tcg_gen_gvec_##fn(es, vec_full_reg_offset(v1), vec_full_reg_offset(v2)= , \ + c, 16, 16) #define gen_gvec_fn_3(fn, es, v1, v2, v3) \ tcg_gen_gvec_##fn(es, vec_full_reg_offset(v1), vec_full_reg_offset(v2)= , \ vec_full_reg_offset(v3), 16, 16) @@ -1956,3 +1959,113 @@ static DisasJumpType op_verim(DisasContext *s, Disa= sOps *o) get_field(s->fields, v3), i4, &g[es]); return DISAS_NEXT; } + +static DisasJumpType op_vesv(DisasContext *s, DisasOps *o) +{ + const uint8_t es =3D get_field(s->fields, m4); + static const GVecGen3 g_veslv[4] =3D { + { .fno =3D gen_helper_gvec_veslv8, }, + { .fno =3D gen_helper_gvec_veslv16, }, + { .fno =3D gen_helper_gvec_veslv32, }, + { .fno =3D gen_helper_gvec_veslv64, }, + }; + static const GVecGen3 g_vesrav[4] =3D { + { .fno =3D gen_helper_gvec_vesrav8, }, + { .fno =3D gen_helper_gvec_vesrav16, }, + { .fno =3D gen_helper_gvec_vesrav32, }, + { .fno =3D gen_helper_gvec_vesrav64, }, + }; + static const GVecGen3 g_vesrlv[4] =3D { + { .fno =3D gen_helper_gvec_vesrlv8, }, + { .fno =3D gen_helper_gvec_vesrlv16, }, + { .fno =3D gen_helper_gvec_vesrlv32, }, + { .fno =3D gen_helper_gvec_vesrlv64, }, + }; + const GVecGen3 *fn; + + if (es > ES_64) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + + switch (s->fields->op2) { + case 0x70: + fn =3D &g_veslv[es]; + break; + case 0x7a: + fn =3D &g_vesrav[es]; + break; + case 0x78: + fn =3D &g_vesrlv[es]; + break; + default: + g_assert_not_reached(); + } + + gen_gvec_3(get_field(s->fields, v1), get_field(s->fields, v2), + get_field(s->fields, v3), fn); + return DISAS_NEXT; +} + +static DisasJumpType op_ves(DisasContext *s, DisasOps *o) +{ + const uint8_t es =3D get_field(s->fields, m4); + const uint8_t d2 =3D get_field(s->fields, d2) & + (NUM_VEC_ELEMENT_BITS(es) - 1); + const uint8_t v1 =3D get_field(s->fields, v1); + const uint8_t v3 =3D get_field(s->fields, v3); + static const GVecGen2s g_vesl[4] =3D { + { .fno =3D gen_helper_gvec_vesl8, }, + { .fno =3D gen_helper_gvec_vesl16, }, + { .fni4 =3D tcg_gen_shl_i32, }, + { .fni8 =3D tcg_gen_shl_i64, }, + }; + static const GVecGen2s g_vesra[4] =3D { + { .fno =3D gen_helper_gvec_vesra8, }, + { .fno =3D gen_helper_gvec_vesra16, }, + { .fni4 =3D tcg_gen_sar_i32, }, + { .fni8 =3D tcg_gen_sar_i64, }, + }; + static const GVecGen2s g_vesrl[4] =3D { + { .fno =3D gen_helper_gvec_vesrl8, }, + { .fno =3D gen_helper_gvec_vesrl16, }, + { .fni4 =3D tcg_gen_shr_i32, }, + { .fni8 =3D tcg_gen_shr_i64, }, + }; + const GVecGen2s *fn; + + if (es > ES_64) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + + switch (s->fields->op2) { + case 0x30: + if (likely(!get_field(s->fields, b2))) { + gen_gvec_fn_2i(shli, es, v1, v3, d2); + return DISAS_NEXT; + } + fn =3D &g_vesl[es]; + break; + case 0x3a: + if (likely(!get_field(s->fields, b2))) { + gen_gvec_fn_2i(sari, es, v1, v3, d2); + return DISAS_NEXT; + } + fn =3D &g_vesra[es]; + break; + case 0x38: + if (likely(!get_field(s->fields, b2))) { + gen_gvec_fn_2i(shri, es, v1, v3, d2); + return DISAS_NEXT; + } + fn =3D &g_vesrl[es]; + break; + default: + g_assert_not_reached(); + } + + tcg_gen_andi_i64(o->addr1, o->addr1, NUM_VEC_ELEMENT_BITS(es) - 1); + gen_gvec_2s(v1, v3, o->addr1, fn); + return DISAS_NEXT; +} diff --git a/target/s390x/vec_int_helper.c b/target/s390x/vec_int_helper.c index 6dc31003b9..8cc736b287 100644 --- a/target/s390x/vec_int_helper.c +++ b/target/s390x/vec_int_helper.c @@ -599,3 +599,102 @@ void HELPER(gvec_verim##BITS)(void *v1, const void *v= 2, const void *v3, \ } DEF_VERIM(8) DEF_VERIM(16) + +#define DEF_VESLV(BITS) = \ +void HELPER(gvec_veslv##BITS)(void *v1, const void *v2, const void *v3, = \ + uint32_t desc) = \ +{ = \ + int i; = \ + = \ + for (i =3D 0; i < (128 / BITS); i++) { = \ + const uint##BITS##_t a =3D s390_vec_read_element##BITS(v2, i); = \ + const uint8_t shift =3D s390_vec_read_element##BITS(v3, i) & (BITS= - 1); \ + = \ + s390_vec_write_element##BITS(v1, i, a << shift); = \ + } = \ +} +DEF_VESLV(8) +DEF_VESLV(16) +DEF_VESLV(32) +DEF_VESLV(64) + +#define DEF_VESRAV(BITS) = \ +void HELPER(gvec_vesrav##BITS)(void *v1, const void *v2, const void *v3, = \ + uint32_t desc) = \ +{ = \ + int i; = \ + = \ + for (i =3D 0; i < (128 / BITS); i++) { = \ + const int##BITS##_t a =3D s390_vec_read_element##BITS(v2, i); = \ + const uint8_t shift =3D s390_vec_read_element##BITS(v3, i) & (BITS= - 1); \ + = \ + s390_vec_write_element##BITS(v1, i, a >> shift); = \ + } = \ +} +DEF_VESRAV(8) +DEF_VESRAV(16) +DEF_VESRAV(32) +DEF_VESRAV(64) + +#define DEF_VESRLV(BITS) = \ +void HELPER(gvec_vesrlv##BITS)(void *v1, const void *v2, const void *v3, = \ + uint32_t desc) = \ +{ = \ + int i; = \ + = \ + for (i =3D 0; i < (128 / BITS); i++) { = \ + const uint##BITS##_t a =3D s390_vec_read_element##BITS(v2, i); = \ + const uint8_t shift =3D s390_vec_read_element##BITS(v3, i) & (BITS= - 1); \ + = \ + s390_vec_write_element##BITS(v1, i, a >> shift); = \ + } = \ +} +DEF_VESRLV(8) +DEF_VESRLV(16) +DEF_VESRLV(32) +DEF_VESRLV(64) + +#define DEF_VESL(BITS) = \ +void HELPER(gvec_vesl##BITS)(void *v1, const void *v3, uint64_t shift, = \ + uint32_t desc) = \ +{ = \ + int i; = \ + = \ + for (i =3D 0; i < (128 / BITS); i++) { = \ + const uint##BITS##_t a =3D s390_vec_read_element##BITS(v3, i); = \ + = \ + s390_vec_write_element##BITS(v1, i, a << shift); = \ + } = \ +} +DEF_VESL(8) +DEF_VESL(16) + +#define DEF_VESRA(BITS) = \ +void HELPER(gvec_vesra##BITS)(void *v1, const void *v3, uint64_t shift, = \ + uint32_t desc) = \ +{ = \ + int i; = \ + = \ + for (i =3D 0; i < (128 / BITS); i++) { = \ + const int##BITS##_t a =3D s390_vec_read_element##BITS(v3, i); = \ + = \ + s390_vec_write_element##BITS(v1, i, a >> shift); = \ + } = \ +} +DEF_VESRA(8) +DEF_VESRA(16) + +#define DEF_VESRL(BITS) = \ +void HELPER(gvec_vesrl##BITS)(void *v1, const void *v3, uint64_t shift, = \ + uint32_t desc) = \ +{ = \ + int i; = \ + = \ + for (i =3D 0; i < (128 / BITS); i++) { = \ + const uint##BITS##_t a =3D s390_vec_read_element##BITS(v3, i); = \ + = \ + s390_vec_write_element##BITS(v1, i, a >> shift); = \ + } = \ +} +DEF_VESRL(8) +DEF_VESRL(16) --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554978613; cv=none; d=zoho.com; s=zohoarc; b=NXIFg4jYuKODK+pEIHfCGknTpqOOaT4n7kX3aCIyvRnOl1CeXrvmum88NM16YadhnX9O0+JJxTWtUCzt0yNjHhXwpdBFiug2ZUiUNaRQlw09xtyJyU1agaLr97fr+Vk2tib51+iTkOM8TD3vw5GhZGO2TqjsnedlEs1ibZCfaFw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554978613; 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=C5JJsWYMABICU1yM6t1bza8sinExGtp7SHNpb+VzjEU=; b=Vr5/hRcvvuti84RUJkclXYNd//UnSUIPFVN5GyDrTn27fbGCafW0pVou6NOXwDvYbHSIYudktbEZIa3/UAR89FiOvQmrONMAN6oUWD7piUDCnCrAmUz5OSuL1n6Fx0JfmvunEjBNFQJONIHY3yH8zOANj7z7GnCUWxxr53tOvkk= 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 1554978613637394.0463067632096; Thu, 11 Apr 2019 03:30:13 -0700 (PDT) Received: from localhost ([127.0.0.1]:45747 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWyA-00089e-HC for importer@patchew.org; Thu, 11 Apr 2019 06:30:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54395) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWsL-0002Xe-CR for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:24:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWeS-0007Z8-TT for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:09:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60738) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWeS-0007Yq-IR; Thu, 11 Apr 2019 06:09:48 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D648E3082E03; Thu, 11 Apr 2019 10:09:47 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 86E451001E71; Thu, 11 Apr 2019 10:09:46 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:08:25 +0200 Message-Id: <20190411100836.646-31-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Thu, 11 Apr 2019 10:09:47 +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 30/41] s390x/tcg: Implement VECTOR SHIFT LEFT (BY BYTE) 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" We can reuse the existing 128-bit shift utility function. Signed-off-by: David Hildenbrand Reviewed-by: Richard Henderson --- target/s390x/helper.h | 1 + target/s390x/insn-data.def | 4 ++++ target/s390x/translate_vx.inc.c | 20 ++++++++++++++++++++ target/s390x/vec_int_helper.c | 6 ++++++ 4 files changed, 31 insertions(+) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index a04d1d8948..67037f6de6 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -226,6 +226,7 @@ DEF_HELPER_FLAGS_4(gvec_vesra8, TCG_CALL_NO_RWG, void, = ptr, cptr, i64, i32) DEF_HELPER_FLAGS_4(gvec_vesra16, TCG_CALL_NO_RWG, void, ptr, cptr, i64, i3= 2) DEF_HELPER_FLAGS_4(gvec_vesrl8, TCG_CALL_NO_RWG, void, ptr, cptr, i64, i32) DEF_HELPER_FLAGS_4(gvec_vesrl16, TCG_CALL_NO_RWG, void, ptr, cptr, i64, i3= 2) +DEF_HELPER_FLAGS_4(gvec_vsl, TCG_CALL_NO_RWG, void, ptr, cptr, i64, 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 f4b67bda7e..2621e433cd 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1160,6 +1160,10 @@ /* VECTOR ELEMENT SHIFT RIGHT LOGICAL */ F(0xe778, VESRLV, VRR_c, V, 0, 0, 0, 0, vesv, 0, IF_VEC) F(0xe738, VESRL, VRS_a, V, la2, 0, 0, 0, ves, 0, IF_VEC) +/* VECTOR SHIFT LEFT */ + 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) =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 7553e4069e..c08710fd45 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_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) #define gen_gvec_3(v1, v2, v3, gen) \ tcg_gen_gvec_3(vec_full_reg_offset(v1), vec_full_reg_offset(v2), \ vec_full_reg_offset(v3), 16, 16, gen) @@ -2069,3 +2072,20 @@ static DisasJumpType op_ves(DisasContext *s, DisasOp= s *o) gen_gvec_2s(v1, v3, o->addr1, fn); return DISAS_NEXT; } + +static DisasJumpType op_vsl(DisasContext *s, DisasOps *o) +{ + TCGv_i64 shift =3D tcg_temp_new_i64(); + + read_vec_element_i64(shift, get_field(s->fields, v3), 7, ES_8); + if (s->fields->op2 =3D=3D 0x74) { + tcg_gen_andi_i64(shift, shift, 0x7); + } else { + tcg_gen_andi_i64(shift, shift, 0x78); + } + + gen_gvec_2i_ool(get_field(s->fields, v1), get_field(s->fields, v2), + shift, 0, gen_helper_gvec_vsl); + tcg_temp_free_i64(shift); + return DISAS_NEXT; +} diff --git a/target/s390x/vec_int_helper.c b/target/s390x/vec_int_helper.c index 8cc736b287..b1a3a25f9f 100644 --- a/target/s390x/vec_int_helper.c +++ b/target/s390x/vec_int_helper.c @@ -698,3 +698,9 @@ void HELPER(gvec_vesrl##BITS)(void *v1, const void *v3,= uint64_t shift, \ } DEF_VESRL(8) DEF_VESRL(16) + +void HELPER(gvec_vsl)(void *v1, const void *v2, uint64_t count, + uint32_t desc) +{ + s390_vec_shl(v1, v2, count); +} --=20 2.20.1 From nobody Sat May 18 17:15:55 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) 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=1554979045; cv=none; d=zoho.com; s=zohoarc; b=TvtakHohmURaVD8vDge7nthJUIK7z/LfInkIiHUHtFnGDQ91f4jVdMH9oLE3c1pPjTQuNk91YvcvnQTKYPLj0WO7Uu6vjbS64g/f4JKKz5nE0/NxOG260sKsRuAQ3EdSRE78dZd8GJet9QNCC5xqcFfrVcjvenwa3AgCSwtoFNg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554979045; 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=p9CU4k+2aUceVNYDWIX/DAKW1rp/uqs0m/2FSsxq1YI=; b=iNdqRpO+0NaUt4lEQFS7pITY1Cy7BgIjDAYVXjY7SM1IlSxis8opOnSS2xTOm88hRKyxvcefwl1v4Vs9Z/Lh/o75SHcTvkMyR7UkCRNGvz391GoHcbrXRTqtcgHLr2+hhMoTz2q1X6lxyzamSyIx2ZNDlvf3fNOedqM63DQRrSs= ARC-Authentication-Results: i=1; mx.zoho.com; spf=temperror (zoho.com: Error in retrieving data from DNS) 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 1554979045947188.25378975860644; Thu, 11 Apr 2019 03:37:25 -0700 (PDT) Received: from localhost ([127.0.0.1]:45906 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEX58-0006CR-Vb for importer@patchew.org; Thu, 11 Apr 2019 06:37:23 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54395) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWsJ-0002Xe-FI for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:24:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWeU-0007Zq-Gs for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:09:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55782) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWeU-0007ZQ-5a; Thu, 11 Apr 2019 06:09:50 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 75DAB3082128; Thu, 11 Apr 2019 10:09:49 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 29C681001E71; Thu, 11 Apr 2019 10:09:48 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:08:26 +0200 Message-Id: <20190411100836.646-32-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Thu, 11 Apr 2019 10:09:49 +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 31/41] s390x/tcg: Implement VECTOR SHIFT LEFT DOUBLE BY BYTE 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 via an ool helper. reusing the existing shift helpers. In case the starting index is 0, it is basically a copy of v2 to v1. Signed-off-by: David Hildenbrand --- target/s390x/helper.h | 1 + target/s390x/insn-data.def | 2 ++ target/s390x/translate_vx.inc.c | 15 +++++++++++++++ target/s390x/vec_int_helper.c | 20 ++++++++++++++++++++ 4 files changed, 38 insertions(+) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index 67037f6de6..a433f57009 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -227,6 +227,7 @@ DEF_HELPER_FLAGS_4(gvec_vesra16, TCG_CALL_NO_RWG, void,= ptr, cptr, i64, i32) DEF_HELPER_FLAGS_4(gvec_vesrl8, TCG_CALL_NO_RWG, void, ptr, cptr, i64, i32) DEF_HELPER_FLAGS_4(gvec_vesrl16, TCG_CALL_NO_RWG, void, ptr, cptr, i64, i3= 2) DEF_HELPER_FLAGS_4(gvec_vsl, TCG_CALL_NO_RWG, void, ptr, cptr, i64, i32) +DEF_HELPER_FLAGS_4(gvec_vsldb, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, 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 2621e433cd..76aec5a21f 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1164,6 +1164,8 @@ 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 BYTE */ + F(0xe777, VSLDB, VRI_d, V, 0, 0, 0, 0, vsldb, 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 c08710fd45..221b729ee0 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -2089,3 +2089,18 @@ static DisasJumpType op_vsl(DisasContext *s, DisasOp= s *o) tcg_temp_free_i64(shift); return DISAS_NEXT; } + +static DisasJumpType op_vsldb(DisasContext *s, DisasOps *o) +{ + int src_idx =3D get_field(s->fields, i4) & 0xf; + + if (src_idx =3D=3D 0) { + gen_gvec_mov(get_field(s->fields, v1), get_field(s->fields, v2)); + } else { + gen_gvec_3_ool(get_field(s->fields, v1), get_field(s->fields, v2), + get_field(s->fields, v3), src_idx, + gen_helper_gvec_vsldb); + return DISAS_NEXT; + } + return DISAS_NEXT; +} diff --git a/target/s390x/vec_int_helper.c b/target/s390x/vec_int_helper.c index b1a3a25f9f..8b922e717f 100644 --- a/target/s390x/vec_int_helper.c +++ b/target/s390x/vec_int_helper.c @@ -43,6 +43,13 @@ static bool s390_vec_is_zero(const S390Vector *v) return !v->doubleword[0] && !v->doubleword[1]; } =20 +static void s390_vec_or(S390Vector *res, const S390Vector *a, + const S390Vector *b) +{ + res->doubleword[0] =3D a->doubleword[0] | b->doubleword[0]; + res->doubleword[1] =3D a->doubleword[1] | b->doubleword[1]; +} + static void s390_vec_xor(S390Vector *res, const S390Vector *a, const S390Vector *b) { @@ -704,3 +711,16 @@ void HELPER(gvec_vsl)(void *v1, const void *v2, uint64= _t count, { s390_vec_shl(v1, v2, count); } + +void HELPER(gvec_vsldb)(void *v1, const void *v2, const void *v3, + uint32_t desc) +{ + const uint8_t src_idx =3D simd_data(desc); + S390Vector t0; + S390Vector t1; + + g_assert(src_idx > 0 && src_idx < 16); + s390_vec_shl(&t0, v2, src_idx * 8); + s390_vec_shr(&t1, v3, 128 - src_idx * 8); + s390_vec_or(v1, &t0, &t1); +} --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554978908; cv=none; d=zoho.com; s=zohoarc; b=IH9LkbyouRV64H0GWE1zf3TyY3IBIQJsqn+SU6QcVnz8kzvhMN68C5y0ICfT3eqiTThsnsbBVgVSV4kLCFinP6i057wnqnjgoOleMDsPAH6lUfZ/2JpWaD9wB8C/eMLWxy350mfEeb+I0UJ7eDRpCS6lxvWpoh4nhWG/t8NS2vM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554978908; 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=W7TM9safeunrDUXejRuLhnIssh9ZY6Kj19ekN0BsOhQ=; b=bDLNof35es/JKigIA/dCLQQ96e6IkAM7MkebtVojsbMik3GOzkCB7Gfe8yjNtr305PjKjDvLEygM1gajL/jdGBsu24NGcxPXONbzh5T28CAMf+rGByWwmlsUVNakxMQObI++nXDWTWxI6vxIY5yIoucEDoJyAZmDJ6RbjBScs5M= 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 1554978908745647.8814621729823; Thu, 11 Apr 2019 03:35:08 -0700 (PDT) Received: from localhost ([127.0.0.1]:45850 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEX2v-0003u6-Mr for importer@patchew.org; Thu, 11 Apr 2019 06:35:05 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54552) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWsJ-0002dl-8X for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:24:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWeW-0007aT-5I for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:09:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45804) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWeV-0007aA-Qt; Thu, 11 Apr 2019 06:09:52 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 181893084294; Thu, 11 Apr 2019 10:09:51 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id BEAD11001E71; Thu, 11 Apr 2019 10:09:49 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:08:27 +0200 Message-Id: <20190411100836.646-33-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Thu, 11 Apr 2019 10:09:51 +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 32/41] s390x/tcg: Implement VECTOR SHIFT RIGHT ARITHMETIC 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 SHIFT LEFT ARITHMETIC. Add s390_vec_sar() similar to s390_vec_shr(). Signed-off-by: David Hildenbrand Reviewed-by: Richard Henderson --- target/s390x/helper.h | 1 + target/s390x/insn-data.def | 4 ++++ target/s390x/translate_vx.inc.c | 17 +++++++++++++++++ target/s390x/vec_int_helper.c | 26 ++++++++++++++++++++++++++ 4 files changed, 48 insertions(+) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index a433f57009..54a861c179 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -228,6 +228,7 @@ DEF_HELPER_FLAGS_4(gvec_vesrl8, TCG_CALL_NO_RWG, void, = ptr, cptr, i64, i32) DEF_HELPER_FLAGS_4(gvec_vesrl16, TCG_CALL_NO_RWG, void, ptr, cptr, i64, i3= 2) DEF_HELPER_FLAGS_4(gvec_vsl, TCG_CALL_NO_RWG, void, ptr, cptr, i64, i32) DEF_HELPER_FLAGS_4(gvec_vsldb, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i32) +DEF_HELPER_FLAGS_4(gvec_vsra, TCG_CALL_NO_RWG, void, ptr, cptr, i64, 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 76aec5a21f..587de3eaac 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1166,6 +1166,10 @@ F(0xe775, VSLB, VRR_c, V, 0, 0, 0, 0, vsl, 0, IF_VEC) /* VECTOR SHIFT LEFT DOUBLE BY BYTE */ F(0xe777, VSLDB, VRI_d, V, 0, 0, 0, 0, vsldb, 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) =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 221b729ee0..8c44dcf471 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -2104,3 +2104,20 @@ static DisasJumpType op_vsldb(DisasContext *s, Disas= Ops *o) } return DISAS_NEXT; } + +static DisasJumpType op_vsra(DisasContext *s, DisasOps *o) +{ + TCGv_i64 shift =3D tcg_temp_new_i64(); + + read_vec_element_i64(shift, get_field(s->fields, v3), 7, ES_8); + if (s->fields->op2 =3D=3D 0x7e) { + tcg_gen_andi_i64(shift, shift, 0x7); + } else { + tcg_gen_andi_i64(shift, shift, 0x78); + } + + gen_gvec_2i_ool(get_field(s->fields, v1), get_field(s->fields, v2), + shift, 0, gen_helper_gvec_vsra); + tcg_temp_free_i64(shift); + return DISAS_NEXT; +} diff --git a/target/s390x/vec_int_helper.c b/target/s390x/vec_int_helper.c index 8b922e717f..220e6647ff 100644 --- a/target/s390x/vec_int_helper.c +++ b/target/s390x/vec_int_helper.c @@ -78,6 +78,26 @@ static void s390_vec_shl(S390Vector *d, const S390Vector= *a, uint64_t count) } } =20 +static void s390_vec_sar(S390Vector *d, const S390Vector *a, uint64_t coun= t) +{ + uint64_t tmp; + + if (count =3D=3D 0) { + d->doubleword[0] =3D a->doubleword[0]; + d->doubleword[1] =3D a->doubleword[1]; + } else if (count =3D=3D 64) { + d->doubleword[1] =3D a->doubleword[0]; + d->doubleword[0] =3D 0; + } else if (count < 64) { + tmp =3D a->doubleword[1] >> count; + d->doubleword[1] =3D deposit64(tmp, 64 - count, count, a->doublewo= rd[0]); + d->doubleword[0] =3D (int64_t)a->doubleword[0] >> count; + } else { + d->doubleword[1] =3D (int64_t)a->doubleword[0] >> (count - 64); + d->doubleword[0] =3D 0; + } +} + static void s390_vec_shr(S390Vector *d, const S390Vector *a, uint64_t coun= t) { uint64_t tmp; @@ -724,3 +744,9 @@ void HELPER(gvec_vsldb)(void *v1, const void *v2, const= void *v3, s390_vec_shr(&t1, v3, 128 - src_idx * 8); s390_vec_or(v1, &t0, &t1); } + +void HELPER(gvec_vsra)(void *v1, const void *v2, uint64_t count, + uint32_t desc) +{ + s390_vec_sar(v1, v2, count); +} --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554978327; cv=none; d=zoho.com; s=zohoarc; b=Zqppqt9MylPw9iX6G0InaNo5VS5SNRxzTzwmx/ii3GmT/rBPbtP30LBFhdjBTp6UW39gpL1vK4c/Ymbmr3/POfbI1eO0ulVrTyoIP+fa/PQx/28/lOgmYDdso+cNnC/8wZR57oYlQLG7uOIDytd8pWzErZ/cBO+yfpXTP3me4i0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554978327; 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=ZcwXjhJHjc51B8FLHKwyIkReOzvd4hW5RO5pLhzBv3Q=; b=jtniKPKRUfOQoHoAfZVk7rXgeTF5/WnM76eI/C7nTquU0kIOKQ1YLKLbanKXVkCZZ0Ov8+MF7ttdTYaW1n38kpv0ZccF9uwMH0b1VI8O1SsiTLIJAO+Y7l9j9gyYb28pYTFWHoFoaAbpERJO0Yzsul6DWYcM8fqXFX4qQQhNaDY= 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 1554978327425407.7740952742454; Thu, 11 Apr 2019 03:25:27 -0700 (PDT) Received: from localhost ([127.0.0.1]:45665 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWtR-0003fk-JK for importer@patchew.org; Thu, 11 Apr 2019 06:25:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54388) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWrc-0002Us-A6 for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:23:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWeX-0007bD-Py for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:09:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54944) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWeX-0007af-D6; Thu, 11 Apr 2019 06:09:53 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AFE2023E6C5; Thu, 11 Apr 2019 10:09:52 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6033C1001E71; Thu, 11 Apr 2019 10:09:51 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:08:28 +0200 Message-Id: <20190411100836.646-34-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 11 Apr 2019 10:09:52 +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 33/41] s390x/tcg: Implement VECTOR SHIFT RIGHT LOGICAL * 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 SHIFT RIGHT ARITHMETICAL. Signed-off-by: David Hildenbrand Reviewed-by: Richard Henderson --- target/s390x/helper.h | 1 + target/s390x/insn-data.def | 4 ++++ target/s390x/translate_vx.inc.c | 17 +++++++++++++++++ target/s390x/vec_int_helper.c | 6 ++++++ 4 files changed, 28 insertions(+) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index 54a861c179..af7fb10f76 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -229,6 +229,7 @@ DEF_HELPER_FLAGS_4(gvec_vesrl16, TCG_CALL_NO_RWG, void,= ptr, cptr, i64, i32) DEF_HELPER_FLAGS_4(gvec_vsl, TCG_CALL_NO_RWG, void, ptr, cptr, i64, i32) DEF_HELPER_FLAGS_4(gvec_vsldb, 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_vsrl, TCG_CALL_NO_RWG, void, ptr, cptr, i64, 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 587de3eaac..f3bf9edfca 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1170,6 +1170,10 @@ 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 LOGICAL */ + F(0xe77c, VSRL, VRR_c, V, 0, 0, 0, 0, vsrl, 0, IF_VEC) +/* VECTOR SHIFT RIGHT LOGICAL BY BYTE */ + F(0xe77d, VSRLB, VRR_c, V, 0, 0, 0, 0, vsrl, 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 8c44dcf471..af8ad71084 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -2121,3 +2121,20 @@ static DisasJumpType op_vsra(DisasContext *s, DisasO= ps *o) tcg_temp_free_i64(shift); return DISAS_NEXT; } + +static DisasJumpType op_vsrl(DisasContext *s, DisasOps *o) +{ + TCGv_i64 shift =3D tcg_temp_new_i64(); + + read_vec_element_i64(shift, get_field(s->fields, v3), 7, ES_8); + if (s->fields->op2 =3D=3D 0x7c) { + tcg_gen_andi_i64(shift, shift, 0x7); + } else { + tcg_gen_andi_i64(shift, shift, 0x78); + } + + gen_gvec_2i_ool(get_field(s->fields, v1), get_field(s->fields, v2), + shift, 0, gen_helper_gvec_vsrl); + tcg_temp_free_i64(shift); + return DISAS_NEXT; +} diff --git a/target/s390x/vec_int_helper.c b/target/s390x/vec_int_helper.c index 220e6647ff..12502b48e8 100644 --- a/target/s390x/vec_int_helper.c +++ b/target/s390x/vec_int_helper.c @@ -750,3 +750,9 @@ void HELPER(gvec_vsra)(void *v1, const void *v2, uint64= _t count, { s390_vec_sar(v1, v2, count); } + +void HELPER(gvec_vsrl)(void *v1, const void *v2, uint64_t count, + uint32_t desc) +{ + s390_vec_shr(v1, v2, count); +} --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554978856; cv=none; d=zoho.com; s=zohoarc; b=GYjVtduA5hYtznR33ukluk3KEdHsdwTg+jnMGxgSOnn3fLn5ZKBFwwfu58sdEfycA1CwR5lSPYBqYRkvq4dLpU6B8kHC/gBtRgmD75EPM3l8Y95qQ5jzYPE7St7uA9klgbejimQaxMqVvhAtOgbiP0KXqUOKg5cX42WUkszI2V8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554978856; 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=ZoS3uIIE8fDBTxjXVnTN/EK3bCuEGJzuuWnAWa39xSk=; b=dimPhbzyH4l4y2jcEaKKW7YFzn0VEaGcIKhJqAJKvZ1pLZrWjpD5gcIYbMBq4YZftXlbrH4zQ/h2yBeptj3drZQz/37Pcktj9JyuLWH1lkGcQ6DtfQ7EvKZklKbrnkLdY1LmQkW97OkMuNo7x4wDszXhOEgY1d8MEbzXcKE+0es= 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 1554978856131480.2165649420591; Thu, 11 Apr 2019 03:34:16 -0700 (PDT) Received: from localhost ([127.0.0.1]:45843 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEX25-0003IM-10 for importer@patchew.org; Thu, 11 Apr 2019 06:34:13 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54388) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWsH-0002Us-8G for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:24:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWeZ-0007bj-9m for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:09:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45828) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWeZ-0007bT-1W; Thu, 11 Apr 2019 06:09:55 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 55AB73084289; Thu, 11 Apr 2019 10:09:54 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 049541001E71; Thu, 11 Apr 2019 10:09:52 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:08:29 +0200 Message-Id: <20190411100836.646-35-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Thu, 11 Apr 2019 10:09:54 +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 34/41] s390x/tcg: Implement VECTOR SUBTRACT 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" We can use tcg_gen_sub2_i64() to do 128-bit subtraction and otherwise existing gvec helpers. Signed-off-by: David Hildenbrand Reviewed-by: Richard Henderson --- target/s390x/insn-data.def | 2 ++ target/s390x/translate_vx.inc.c | 17 +++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index f3bf9edfca..58a61f41ef 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1174,6 +1174,8 @@ F(0xe77c, VSRL, VRR_c, V, 0, 0, 0, 0, vsrl, 0, IF_VEC) /* VECTOR SHIFT RIGHT LOGICAL BY BYTE */ F(0xe77d, VSRLB, VRR_c, V, 0, 0, 0, 0, vsrl, 0, IF_VEC) +/* VECTOR SUBTRACT */ + F(0xe7f7, VS, VRR_c, V, 0, 0, 0, 0, vs, 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 af8ad71084..83463155f6 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -2138,3 +2138,20 @@ static DisasJumpType op_vsrl(DisasContext *s, DisasO= ps *o) tcg_temp_free_i64(shift); return DISAS_NEXT; } + +static DisasJumpType op_vs(DisasContext *s, DisasOps *o) +{ + const uint8_t es =3D get_field(s->fields, m4); + + if (es > ES_128) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } else if (es =3D=3D ES_128) { + gen_gvec128_3_i64(tcg_gen_sub2_i64, get_field(s->fields, v1), + get_field(s->fields, v2), get_field(s->fields, v= 3)); + return DISAS_NEXT; + } + gen_gvec_fn_3(sub, es, get_field(s->fields, v1), get_field(s->fields, = v2), + get_field(s->fields, v3)); + return DISAS_NEXT; +} --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554978672; cv=none; d=zoho.com; s=zohoarc; b=NAZFUPh2Pk8cwdH+jbkyn0MRc7nfJ3J5/4RkSMG1nv4LfekAhqmBBfws9oe3TAdTPGk1KfZtUaXrZ/mYO5GDvFw9mCpv+dTHCxdKlj11v/CMPQtpQkjldNWi37u+AFhftBvsx17IWfS3yrOwPmmOik3qJRoypzHgM/HY57C4BD4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554978672; 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=kTTqhmhzxI3lF5YI7iZ7gG2qBFpRamqU/yTBxkqSQ+I=; b=G7Ja5mUs5mYipvcrW8bVcig/90gtE5bKxg7DM/ClwuzWEkHPh2LPUJ1/oZox/eLNtIMyFEeaG7B7GMOFHinOKPHs/GlxtqLZUt+CoD70Lsf66LFJGSAx8n9OUxyTujOxzdPsvzbnUbvzFVsw36nXpVBkrE9gbkAe+Ls7HBN8Vp0= 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 1554978672308650.6671235612529; Thu, 11 Apr 2019 03:31:12 -0700 (PDT) Received: from localhost ([127.0.0.1]:45806 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWz0-0000Vl-SD for importer@patchew.org; Thu, 11 Apr 2019 06:31:02 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54552) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWsD-0002dl-Cu for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:24:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWed-0007dN-BN for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:10:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:20446) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWec-0007d1-VG; Thu, 11 Apr 2019 06:09:59 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 44ADF70D6A; Thu, 11 Apr 2019 10:09:58 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9BEAA1001E71; Thu, 11 Apr 2019 10:09:54 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:08:30 +0200 Message-Id: <20190411100836.646-36-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 11 Apr 2019 10:09:58 +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 35/41] s390x/tcg: Implement VECTOR SUBTRACT COMPUTE BORROW INDICATION 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" Let's keep it simple for now and handle 8/16/128 bit elements via helpers. Especially for 8/16, we could come up with some bit tricks. Signed-off-by: David Hildenbrand Reviewed-by: Richard Henderson --- target/s390x/helper.h | 3 +++ target/s390x/insn-data.def | 2 ++ target/s390x/translate_vx.inc.c | 30 +++++++++++++++++++++ target/s390x/vec_int_helper.c | 47 +++++++++++++++++++++++++++++++++ 4 files changed, 82 insertions(+) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index af7fb10f76..33e3e003f8 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -230,6 +230,9 @@ DEF_HELPER_FLAGS_4(gvec_vsl, TCG_CALL_NO_RWG, void, ptr= , cptr, i64, i32) DEF_HELPER_FLAGS_4(gvec_vsldb, 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_vsrl, TCG_CALL_NO_RWG, void, ptr, cptr, i64, i32) +DEF_HELPER_FLAGS_4(gvec_vscbi8, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i3= 2) +DEF_HELPER_FLAGS_4(gvec_vscbi16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i= 32) +DEF_HELPER_FLAGS_4(gvec_vscbi128, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, = 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 58a61f41ef..94de3c9c7d 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1176,6 +1176,8 @@ F(0xe77d, VSRLB, VRR_c, V, 0, 0, 0, 0, vsrl, 0, IF_VEC) /* VECTOR SUBTRACT */ F(0xe7f7, VS, VRR_c, V, 0, 0, 0, 0, vs, 0, IF_VEC) +/* VECTOR SUBTRACT COMPUTE BORROW INDICATION */ + F(0xe7f5, VSCBI, VRR_c, V, 0, 0, 0, 0, vscbi, 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 83463155f6..7770ca4101 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -2155,3 +2155,33 @@ static DisasJumpType op_vs(DisasContext *s, DisasOps= *o) get_field(s->fields, v3)); return DISAS_NEXT; } + +static void gen_scbi_i32(TCGv_i32 d, TCGv_i32 a, TCGv_i32 b) +{ + tcg_gen_setcond_i32(TCG_COND_LTU, d, a, b); +} + +static void gen_scbi_i64(TCGv_i64 d, TCGv_i64 a, TCGv_i64 b) +{ + tcg_gen_setcond_i64(TCG_COND_LTU, d, a, b); +} + +static DisasJumpType op_vscbi(DisasContext *s, DisasOps *o) +{ + const uint8_t es =3D get_field(s->fields, m4); + static const GVecGen3 g[5] =3D { + { .fno =3D gen_helper_gvec_vscbi8, }, + { .fno =3D gen_helper_gvec_vscbi16, }, + { .fni4 =3D gen_scbi_i32, }, + { .fni8 =3D gen_scbi_i64, }, + { .fno =3D gen_helper_gvec_vscbi128, }, + }; + + if (es > ES_128) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + gen_gvec_3(get_field(s->fields, v1), get_field(s->fields, v2), + get_field(s->fields, v3), &g[es]); + return DISAS_NEXT; +} diff --git a/target/s390x/vec_int_helper.c b/target/s390x/vec_int_helper.c index 12502b48e8..699b399a26 100644 --- a/target/s390x/vec_int_helper.c +++ b/target/s390x/vec_int_helper.c @@ -38,6 +38,27 @@ static bool s390_vec_add(S390Vector *d, const S390Vector= *a, return high_carry; } =20 +/* + * Subtract two 128 bit vectors, returning the borrow. + */ +static bool s390_vec_sub(S390Vector *d, const S390Vector *a, + const S390Vector *b) +{ + bool low_borrow =3D false, high_borrow =3D false; + + if (a->doubleword[0] < b->doubleword[0]) { + high_borrow =3D true; + } else if (a->doubleword[1] < b->doubleword[0]) { + low_borrow =3D true; + if (a->doubleword[0] =3D=3D b->doubleword[0]) { + high_borrow =3D true; + } + } + d->doubleword[0] =3D a->doubleword[0] - b->doubleword[0] - low_borrow; + d->doubleword[1] =3D a->doubleword[1] - b->doubleword[1]; + return high_borrow; +} + static bool s390_vec_is_zero(const S390Vector *v) { return !v->doubleword[0] && !v->doubleword[1]; @@ -756,3 +777,29 @@ void HELPER(gvec_vsrl)(void *v1, const void *v2, uint6= 4_t count, { s390_vec_shr(v1, v2, count); } + +#define DEF_VSCBI(BITS) = \ +void HELPER(gvec_vscbi##BITS)(void *v1, const void *v2, const void *v3, = \ + uint32_t desc) = \ +{ = \ + int i; = \ + = \ + for (i =3D 0; i < (128 / BITS); i++) { = \ + const uint##BITS##_t a =3D s390_vec_read_element##BITS(v2, i); = \ + const uint##BITS##_t b =3D s390_vec_read_element##BITS(v3, i); = \ + = \ + s390_vec_write_element##BITS(v1, i, a < b); = \ + } = \ +} +DEF_VSCBI(8) +DEF_VSCBI(16) + +void HELPER(gvec_vscbi128)(void *v1, const void *v2, const void *v3, + uint32_t desc) +{ + S390Vector *dst =3D v1; + S390Vector tmp; + + dst->doubleword[0] =3D 0; + dst->doubleword[1] =3D s390_vec_sub(&tmp, v2, v3); +} --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554978733; cv=none; d=zoho.com; s=zohoarc; b=lf/jx2IwNFyy5blDuHP1dc38P3RX22bYhCYAVOVjIla5LzvgdXn2fK5IT7Fh9KHq4bVS9snwaKRs3ESflUhSiD63nlg32ExP0Ubjeg61COMKDG/r4fhuz8NJvSz2SO4ilAgplbRjKrvjWRCxR0QT5z5vNiijMZs23WVppv8xEIQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554978733; 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=TazEbaQeXLznAPbriNqGbk6AMjPyXL6GgSKBkY6PzVY=; b=fkV7ImA9IEXLnpC84TrpRpnxmpyezCntXaP9D3CTrAF1+GpBwJXaaene6549RCJ0hXzg8E8Q1SoPcD500kfd31RGK543g5TzIIREUahp7K1N+hDrtRF7+jr/+I4Bcvr9P04f+4IFIHo2IUKRIwPowKRvfSsqbaj+fiCtVXUypyw= 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 1554978733001730.2143562271613; Thu, 11 Apr 2019 03:32:13 -0700 (PDT) Received: from localhost ([127.0.0.1]:45820 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEX07-0001lh-Uq for importer@patchew.org; Thu, 11 Apr 2019 06:32:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54388) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWsC-0002Us-NT for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:24:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWeg-0007g9-Jw for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:10:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56434) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWeg-0007ec-CX; Thu, 11 Apr 2019 06:10:02 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9A5BC8666E; Thu, 11 Apr 2019 10:10:01 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8C6531001E71; Thu, 11 Apr 2019 10:09:58 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:08:31 +0200 Message-Id: <20190411100836.646-37-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 11 Apr 2019 10:10:01 +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 36/41] s390x/tcg: Implement VECTOR SUBTRACT WITH BORROW INDICATION 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" Fairly easy as only 128-bit handling is required. Simply perform the subtraction and then subtract the borrow. Signed-off-by: David Hildenbrand Reviewed-by: Richard Henderson --- target/s390x/insn-data.def | 2 ++ target/s390x/translate_vx.inc.c | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index 94de3c9c7d..a60d8531dc 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1178,6 +1178,8 @@ F(0xe7f7, VS, VRR_c, V, 0, 0, 0, 0, vs, 0, IF_VEC) /* VECTOR SUBTRACT COMPUTE BORROW INDICATION */ F(0xe7f5, VSCBI, VRR_c, V, 0, 0, 0, 0, vscbi, 0, IF_VEC) +/* VECTOR SUBTRACT WITH BORROW INDICATION */ + F(0xe7bf, VSBI, VRR_d, V, 0, 0, 0, 0, vsbi, 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 7770ca4101..3f60b97654 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -2185,3 +2185,30 @@ static DisasJumpType op_vscbi(DisasContext *s, Disas= Ops *o) get_field(s->fields, v3), &g[es]); return DISAS_NEXT; } + +static void gen_sbi2_i64(TCGv_i64 dl, TCGv_i64 dh, TCGv_i64 al, TCGv_i64 a= h, + TCGv_i64 bl, TCGv_i64 bh, TCGv_i64 cl, TCGv_i64 c= h) +{ + TCGv_i64 tl =3D tcg_temp_new_i64(); + TCGv_i64 th =3D tcg_const_i64(0); + + /* extract the borrow only */ + tcg_gen_extract_i64(tl, cl, 0, 1); + tcg_gen_sub2_i64(dl, dh, al, ah, bl, bh); + tcg_gen_sub2_i64(dl, dh, dl, dh, tl, th); + tcg_temp_free_i64(tl); + tcg_temp_free_i64(th); +} + +static DisasJumpType op_vsbi(DisasContext *s, DisasOps *o) +{ + if (get_field(s->fields, m5) !=3D ES_128) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + + gen_gvec128_4_i64(gen_sbi2_i64, get_field(s->fields, v1), + get_field(s->fields, v2), get_field(s->fields, v3), + get_field(s->fields, v4)); + return DISAS_NEXT; +} --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554978726; cv=none; d=zoho.com; s=zohoarc; b=N8/LOjDTjf+0LZz0WyBNTO6SPd4xAykxZwhTQgrjGNW8xa9xhSW+GJHhe6sQQk6mtRzgoHTgLE0klkwX3HNicYil9rZI+vcV6xJKghDf4oFGk4CzVLsgBm4jtczAbLLipUfa2pqyfWvc92MKkD8uz5C648eqFsWvYp68yLEjVJ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554978726; 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=sZ3d6nfwXs6wZm3XSZjBYl8Il5rgQYH+i1KxcKyU1qA=; b=OV7F8oOIj0ngGI3YQzMZb2Z9G/EDvkMULFrP6zN4Wh9+erGD862pPYT+HSRLK4kPAeWBi5Kb+utXpAelsaNsR/dmzwA5gyFkRey+d762Igdbq24v1e0VnP+eGCI9FcUrDGq6FWd3kltb2I5seXx0uY/UMI+EmumNl6XwSvrB7yQ= 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 1554978726705722.2580861802585; Thu, 11 Apr 2019 03:32:06 -0700 (PDT) Received: from localhost ([127.0.0.1]:45818 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWzv-0001au-LF for importer@patchew.org; Thu, 11 Apr 2019 06:31:59 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54395) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWsB-0002Xe-T0 for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:24:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWek-0007hl-0j for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:10:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54976) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWej-0007hZ-L8; Thu, 11 Apr 2019 06:10:05 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E6298A77F; Thu, 11 Apr 2019 10:10:04 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id DEA921001E71; Thu, 11 Apr 2019 10:10:01 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:08:32 +0200 Message-Id: <20190411100836.646-38-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 11 Apr 2019 10:10:04 +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 37/41] s390x/tcg: Implement VECTOR SUBTRACT WITH BORROW COMPUTE BORROW INDICATION 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" Reuse s390_vec_sub() to perform two 128-bit subtraction, calculating the borrow. Signed-off-by: David Hildenbrand Reviewed-by: Richard Henderson --- target/s390x/helper.h | 1 + target/s390x/insn-data.def | 2 ++ target/s390x/translate_vx.inc.c | 13 +++++++++++++ target/s390x/vec_int_helper.c | 16 ++++++++++++++++ 4 files changed, 32 insertions(+) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index 33e3e003f8..d040e4cd07 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -233,6 +233,7 @@ DEF_HELPER_FLAGS_4(gvec_vsrl, TCG_CALL_NO_RWG, void, pt= r, cptr, i64, i32) DEF_HELPER_FLAGS_4(gvec_vscbi8, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i3= 2) DEF_HELPER_FLAGS_4(gvec_vscbi16, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, i= 32) DEF_HELPER_FLAGS_4(gvec_vscbi128, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, = i32) +DEF_HELPER_FLAGS_5(gvec_vsbcbi128, TCG_CALL_NO_RWG, void, ptr, cptr, cptr,= cptr, 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 a60d8531dc..a8d90517f6 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1180,6 +1180,8 @@ F(0xe7f5, VSCBI, VRR_c, V, 0, 0, 0, 0, vscbi, 0, IF_VEC) /* VECTOR SUBTRACT WITH BORROW INDICATION */ F(0xe7bf, VSBI, VRR_d, V, 0, 0, 0, 0, vsbi, 0, IF_VEC) +/* VECTOR SUBTRACT WITH BORROW COMPUTE BORROW INDICATION */ + F(0xe7bd, VSBCBI, VRR_d, V, 0, 0, 0, 0, vsbcbi, 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 3f60b97654..fd232ba6c3 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -2212,3 +2212,16 @@ static DisasJumpType op_vsbi(DisasContext *s, DisasO= ps *o) get_field(s->fields, v4)); return DISAS_NEXT; } + +static DisasJumpType op_vsbcbi(DisasContext *s, DisasOps *o) +{ + if (get_field(s->fields, m5) !=3D ES_128) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + + gen_gvec_4_ool(get_field(s->fields, v1), get_field(s->fields, v2), + get_field(s->fields, v3), get_field(s->fields, v4), 0, + gen_helper_gvec_vsbcbi128); + return DISAS_NEXT; +} diff --git a/target/s390x/vec_int_helper.c b/target/s390x/vec_int_helper.c index 699b399a26..95686e79fd 100644 --- a/target/s390x/vec_int_helper.c +++ b/target/s390x/vec_int_helper.c @@ -803,3 +803,19 @@ void HELPER(gvec_vscbi128)(void *v1, const void *v2, c= onst void *v3, dst->doubleword[0] =3D 0; dst->doubleword[1] =3D s390_vec_sub(&tmp, v2, v3); } + +void HELPER(gvec_vsbcbi128)(void *v1, const void *v2, const void *v3, + const void *v4, uint32_t desc) +{ + const S390Vector old_borrow =3D { + .doubleword[0] =3D 0, + .doubleword[1] =3D ((S390Vector *)v4)->doubleword[1] & 1, + }; + S390Vector tmp, *dst =3D v1; + bool borrow; + + borrow =3D s390_vec_sub(&tmp, v2, v3); + borrow |=3D s390_vec_sub(&tmp, &tmp, &old_borrow); + dst->doubleword[0] =3D 0; + dst->doubleword[1] =3D borrow; +} --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554978497; cv=none; d=zoho.com; s=zohoarc; b=ANU1WG4zC9v4DDf7mq+TxY8EHtrVsH3K8puyT8xdEa/TzzQNaBnfhK0F/Rh7ZrLgRe96mCadaS4me0D/5b8yI+fh506lOAd76mjaZbqti2MrC7j5K5KBJXyByxcVtUbbv/UlKhCUQRsGQYQfyGNvN68oSIaJtfqbJCqyLZji2gU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554978497; 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=Nb2b+Defr9h1xb+12llyNcS3B2CdE36rLzgt24DqcDg=; b=UbqKks9uMRiQrS+d/KywgE7svbFPgEAZayn9mlgXuo91QzJGw4B+GbOV4/p3ZqTHMiXrx+ogtC32FK7gSxN6X0+3oQ1/cThuwuaIgG5ZJEZMDIAcZnv7L1P/jbNnr9EE+fsqamRtD39IXXlgZCvBRgVhM7rMuNVS7yteKMi5YY8= 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 1554978497173666.5577037045374; Thu, 11 Apr 2019 03:28:17 -0700 (PDT) Received: from localhost ([127.0.0.1]:45730 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWwI-0006aG-5b for importer@patchew.org; Thu, 11 Apr 2019 06:28:14 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54552) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWsB-0002dl-2H for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:24:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWet-0007kz-IU for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:10:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56736) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWet-0007kq-9y; Thu, 11 Apr 2019 06:10:15 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 77DC0308CFAB; Thu, 11 Apr 2019 10:10:14 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 381351001E71; Thu, 11 Apr 2019 10:10:05 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:08:33 +0200 Message-Id: <20190411100836.646-39-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Thu, 11 Apr 2019 10:10:14 +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 38/41] s390x/tcg: Implement VECTOR SUM ACROSS DOUBLEWORD 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" Perform the calculations without a helper. Only 16 bit or 32 bit values have to be added. Signed-off-by: David Hildenbrand Reviewed-by: Richard Henderson --- target/s390x/insn-data.def | 2 ++ target/s390x/translate_vx.inc.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index a8d90517f6..dd37003082 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1182,6 +1182,8 @@ F(0xe7bf, VSBI, VRR_d, V, 0, 0, 0, 0, vsbi, 0, IF_VEC) /* VECTOR SUBTRACT WITH BORROW COMPUTE BORROW INDICATION */ F(0xe7bd, VSBCBI, VRR_d, V, 0, 0, 0, 0, vsbcbi, 0, IF_VEC) +/* VECTOR SUM ACROSS DOUBLEWORD */ + F(0xe765, VSUMG, VRR_c, V, 0, 0, 0, 0, vsumg, 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 fd232ba6c3..2168a519fa 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -2225,3 +2225,32 @@ static DisasJumpType op_vsbcbi(DisasContext *s, Disa= sOps *o) gen_helper_gvec_vsbcbi128); return DISAS_NEXT; } + +static DisasJumpType op_vsumg(DisasContext *s, DisasOps *o) +{ + const uint8_t es =3D get_field(s->fields, m4); + TCGv_i64 sum, tmp; + uint8_t dst_idx; + + if (es =3D=3D ES_8 || es > ES_32) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + + sum =3D tcg_temp_new_i64(); + tmp =3D tcg_temp_new_i64(); + for (dst_idx =3D 0; dst_idx < 2; dst_idx++) { + uint8_t idx =3D dst_idx * NUM_VEC_ELEMENTS(es) / 2; + const uint8_t max_idx =3D idx + NUM_VEC_ELEMENTS(es) / 2 - 1; + + read_vec_element_i64(sum, get_field(s->fields, v3), max_idx, es); + for (; idx <=3D max_idx; idx++) { + read_vec_element_i64(tmp, get_field(s->fields, v2), idx, es); + tcg_gen_add_i64(sum, sum, tmp); + } + write_vec_element_i64(sum, get_field(s->fields, v1), dst_idx, ES_6= 4); + } + tcg_temp_free_i64(sum); + tcg_temp_free_i64(tmp); + return DISAS_NEXT; +} --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554978541; cv=none; d=zoho.com; s=zohoarc; b=Lw7wsvFRB/8ijvvtZiFS0WrfCZJGdLGplrxAMLMsZLXhb+3nTVVu+E6yLmRHmj3rJMCUJUH9aC14PxKkopO1bbzDdO6AWlSerRNPaZccd6Jk2CY75kCL3dWZoX0l2vTCsejm5ZcxOAagmf+9EhWNSeM5iuMWhxMDkU/5chooXng= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554978541; 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=xc2+zGSAPvlaFNgG1h054r9jGpt9FyjZh4F80jWAYVc=; b=AgDAq0IJJ8gOXHYUg4e3PoOmWgsbSHizgvwLrTow2b1KHwStgXK+tEzi8RuwOVgIyQ8qIEGgREGf+B2U20rwLtFQvJKPj/4iwzSxYDWlwJegibddLubHqaCryj0OJWovT+huHNuq8PPt9oVPfWUcPCMko0CJVLKwDrcHM/CGtkA= 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 1554978541972606.9885539395992; Thu, 11 Apr 2019 03:29:01 -0700 (PDT) Received: from localhost ([127.0.0.1]:45741 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWx0-000772-V7 for importer@patchew.org; Thu, 11 Apr 2019 06:28:59 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54388) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWsA-0002Us-1d for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:23:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWex-0007nh-3e for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:10:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46207) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWew-0007nS-RO; Thu, 11 Apr 2019 06:10:19 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 223B02C9A6; Thu, 11 Apr 2019 10:10:18 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id BD1811001E82; Thu, 11 Apr 2019 10:10:14 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:08:34 +0200 Message-Id: <20190411100836.646-40-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 11 Apr 2019 10:10:18 +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 39/41] s390x/tcg: Implement VECTOR SUM ACROSS QUADWORD 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 SUM ACROSS DOUBLEWORD, however without a loop and using 128-bit calculations. Signed-off-by: David Hildenbrand Reviewed-by: Richard Henderson --- target/s390x/insn-data.def | 2 ++ target/s390x/translate_vx.inc.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index dd37003082..2483ee01d7 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1184,6 +1184,8 @@ F(0xe7bd, VSBCBI, VRR_d, V, 0, 0, 0, 0, vsbcbi, 0, IF_VEC) /* VECTOR SUM ACROSS DOUBLEWORD */ F(0xe765, VSUMG, VRR_c, V, 0, 0, 0, 0, vsumg, 0, IF_VEC) +/* VECTOR SUM ACROSS QUADWORD */ + F(0xe767, VSUMQ, VRR_c, V, 0, 0, 0, 0, vsumq, 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 2168a519fa..995c2b4461 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -2254,3 +2254,35 @@ static DisasJumpType op_vsumg(DisasContext *s, Disas= Ops *o) tcg_temp_free_i64(tmp); return DISAS_NEXT; } + +static DisasJumpType op_vsumq(DisasContext *s, DisasOps *o) +{ + const uint8_t es =3D get_field(s->fields, m4); + const uint8_t max_idx =3D NUM_VEC_ELEMENTS(es) - 1; + TCGv_i64 sumh, suml, zero, tmpl; + uint8_t idx; + + if (es < ES_32 || es > ES_64) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + + sumh =3D tcg_const_i64(0); + suml =3D tcg_temp_new_i64(); + zero =3D tcg_const_i64(0); + tmpl =3D tcg_temp_new_i64(); + + read_vec_element_i64(suml, get_field(s->fields, v3), max_idx, es); + for (idx =3D 0; idx <=3D max_idx; idx++) { + read_vec_element_i64(tmpl, get_field(s->fields, v2), idx, es); + tcg_gen_add2_i64(suml, sumh, suml, sumh, tmpl, zero); + } + write_vec_element_i64(sumh, get_field(s->fields, v1), 0, ES_64); + write_vec_element_i64(suml, get_field(s->fields, v1), 1, ES_64); + + tcg_temp_free_i64(sumh); + tcg_temp_free_i64(suml); + tcg_temp_free_i64(zero); + tcg_temp_free_i64(tmpl); + return DISAS_NEXT; +} --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554978375; cv=none; d=zoho.com; s=zohoarc; b=as2JQZclBrtX1f6ivk2iwzMmGuRw6MFuiPTyJWQmJ01/HfZEHgn1HdT+kkh+LfXedeFugITdLFIrkEvMUPQL8691x/d4CNt5pQXy8GwYgmvTvzuI2Hq4nSS2n8TpMeVg8sJa9t6hrpQD16acbMko8bkqmXHmb9wRkKlSeNzUTsE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554978375; 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=h65fjhJJ5aUixXg1IGQUrHThbuZMacdgG7T+eX4Grlo=; b=gOA31ApiYQaUm1M5H9yq0099m9Xr0HDHBIaZ95w2k9sphRSjUZfCuc1rnSLf6n0u6f6yCArsAN68mYUX3ONfrr7L6yzyNu9/vayfB/sskPPjq7VAAzce+5EOB6v9mF3lko/L++Tc4N3EC+lA6KUp79BvRuMZWzMg3bZBPuvr+x8= 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 1554978375660774.1704490780029; Thu, 11 Apr 2019 03:26:15 -0700 (PDT) Received: from localhost ([127.0.0.1]:45702 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWuH-0004Uo-Af for importer@patchew.org; Thu, 11 Apr 2019 06:26:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54395) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWs9-0002Xe-QY for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:23:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWey-0007oC-Nw for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:10:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35573) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWey-0007ns-F2; Thu, 11 Apr 2019 06:10:20 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B8A21368FF; Thu, 11 Apr 2019 10:10:19 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6B07E1001E71; Thu, 11 Apr 2019 10:10:18 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:08:35 +0200 Message-Id: <20190411100836.646-41-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 11 Apr 2019 10:10: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 40/41] s390x/tcg: Implement VECTOR SUM ACROSS WORD 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 SUM ACROSS DOUBLEWORD. Signed-off-by: David Hildenbrand Reviewed-by: Richard Henderson --- target/s390x/insn-data.def | 2 ++ target/s390x/translate_vx.inc.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index 2483ee01d7..a52db41388 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1186,6 +1186,8 @@ F(0xe765, VSUMG, VRR_c, V, 0, 0, 0, 0, vsumg, 0, IF_VEC) /* VECTOR SUM ACROSS QUADWORD */ F(0xe767, VSUMQ, VRR_c, V, 0, 0, 0, 0, vsumq, 0, IF_VEC) +/* VECTOR SUM ACROSS WORD */ + F(0xe764, VSUM, VRR_c, V, 0, 0, 0, 0, vsum, 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 995c2b4461..59a9885892 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -2286,3 +2286,32 @@ static DisasJumpType op_vsumq(DisasContext *s, Disas= Ops *o) tcg_temp_free_i64(tmpl); return DISAS_NEXT; } + +static DisasJumpType op_vsum(DisasContext *s, DisasOps *o) +{ + const uint8_t es =3D get_field(s->fields, m4); + TCGv_i32 sum, tmp; + uint8_t dst_idx; + + if (es > ES_16) { + gen_program_exception(s, PGM_SPECIFICATION); + return DISAS_NORETURN; + } + + sum =3D tcg_temp_new_i32(); + tmp =3D tcg_temp_new_i32(); + for (dst_idx =3D 0; dst_idx < 4; dst_idx++) { + uint8_t idx =3D dst_idx * NUM_VEC_ELEMENTS(es) / 4; + const uint8_t max_idx =3D idx + NUM_VEC_ELEMENTS(es) / 4 - 1; + + read_vec_element_i32(sum, get_field(s->fields, v3), max_idx, es); + for (; idx <=3D max_idx; idx++) { + read_vec_element_i32(tmp, get_field(s->fields, v2), idx, es); + tcg_gen_add_i32(sum, sum, tmp); + } + write_vec_element_i32(sum, get_field(s->fields, v1), dst_idx, ES_3= 2); + } + tcg_temp_free_i32(sum); + tcg_temp_free_i32(tmp); + return DISAS_NEXT; +} --=20 2.20.1 From nobody Sat May 18 17:15:55 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=1554978368; cv=none; d=zoho.com; s=zohoarc; b=E+yj6dlF6AnEgdtgOmTNJyvRGwtNcCtQQwljzKKAc/eMw+c4mrvluVTidwQwP7omttj6XNRbuOyEsEYHs8t3p+wVTv3KQdr9Y4lDuvT1n5bNRXMit8506Xb4tF3YAHMy1NourC6OGVRZ0CwykNXshR4AgYZ8tmsxfSBnoG4QU3g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554978368; 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=vM5pMHLbAbYOFrSJHUT/jX6A55X5BC7MZl6b2ss28YM=; b=MgBPFu4ePnuhZ5cTKqHQL32ukcDZkETWMA7VYAkvI8kWgAI0DjxxppVHHoHNs3turDW1yIehcNbh8AHJn0RRwvmHDi8aAHA0WCnBfZcSDqruNroFW4BCA1yHWNOcOiu5VdsY6/qFAtZmFajHNkc2k6YYaH43oEgiLDD62w8bgzs= 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 1554978368840658.8701479313008; Thu, 11 Apr 2019 03:26:08 -0700 (PDT) Received: from localhost ([127.0.0.1]:45700 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWuD-0004R9-R0 for importer@patchew.org; Thu, 11 Apr 2019 06:26:05 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54552) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEWs8-0002dl-NG for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:23:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEWf0-0007oi-En for qemu-devel@nongnu.org; Thu, 11 Apr 2019 06:10:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40418) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEWf0-0007oS-3v; Thu, 11 Apr 2019 06:10:22 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 62D663091740; Thu, 11 Apr 2019 10:10:21 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0D8E21001E71; Thu, 11 Apr 2019 10:10:19 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2019 12:08:36 +0200 Message-Id: <20190411100836.646-42-david@redhat.com> In-Reply-To: <20190411100836.646-1-david@redhat.com> References: <20190411100836.646-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Thu, 11 Apr 2019 10:10: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 41/41] s390x/tcg: Implement VECTOR TEST UNDER MASK 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" Let's return the cc value directly via cpu_env. Unfortunately there isn't a simple way to calculate the value lazily - one would have to calculate and store e.g. the population count of the mask and the result so it can be evaluated in a cc helper. But as VTM only sets the cc, we can assume the value will be needed soon either way. Signed-off-by: David Hildenbrand Reviewed-by: Richard Henderson --- target/s390x/helper.h | 1 + target/s390x/insn-data.def | 2 ++ target/s390x/translate_vx.inc.c | 11 +++++++++++ target/s390x/vec_int_helper.c | 18 ++++++++++++++++++ 4 files changed, 32 insertions(+) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index d040e4cd07..200d1730f4 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -234,6 +234,7 @@ 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_FLAGS_4(gvec_vscbi128, TCG_CALL_NO_RWG, void, ptr, cptr, cptr, = i32) DEF_HELPER_FLAGS_5(gvec_vsbcbi128, TCG_CALL_NO_RWG, void, ptr, cptr, cptr,= cptr, i32) +DEF_HELPER_4(gvec_vtm, 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 a52db41388..e61475bdc4 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1188,6 +1188,8 @@ F(0xe767, VSUMQ, VRR_c, V, 0, 0, 0, 0, vsumq, 0, IF_VEC) /* VECTOR SUM ACROSS WORD */ F(0xe764, VSUM, VRR_c, V, 0, 0, 0, 0, vsum, 0, IF_VEC) +/* VECTOR TEST UNDER MASK */ + F(0xe7d8, VTM, VRR_a, V, 0, 0, 0, 0, vtm, 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 59a9885892..eacf68ec28 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -191,6 +191,9 @@ static void get_vec_element_ptr_i64(TCGv_ptr ptr, uint8= _t reg, TCGv_i64 enr, #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) +#define gen_gvec_2_ptr(v1, v2, ptr, data, fn) \ + tcg_gen_gvec_2_ptr(vec_full_reg_offset(v1), vec_full_reg_offset(v2), \ + ptr, 16, 16, data, fn) #define gen_gvec_3(v1, v2, v3, gen) \ tcg_gen_gvec_3(vec_full_reg_offset(v1), vec_full_reg_offset(v2), \ vec_full_reg_offset(v3), 16, 16, gen) @@ -2315,3 +2318,11 @@ static DisasJumpType op_vsum(DisasContext *s, DisasO= ps *o) tcg_temp_free_i32(tmp); return DISAS_NEXT; } + +static DisasJumpType op_vtm(DisasContext *s, DisasOps *o) +{ + gen_gvec_2_ptr(get_field(s->fields, v1), get_field(s->fields, v2), + cpu_env, 0, gen_helper_gvec_vtm); + set_cc_static(s); + return DISAS_NEXT; +} diff --git a/target/s390x/vec_int_helper.c b/target/s390x/vec_int_helper.c index 95686e79fd..f5bdaff633 100644 --- a/target/s390x/vec_int_helper.c +++ b/target/s390x/vec_int_helper.c @@ -819,3 +819,21 @@ void HELPER(gvec_vsbcbi128)(void *v1, const void *v2, = const void *v3, dst->doubleword[0] =3D 0; dst->doubleword[1] =3D borrow; } + +void HELPER(gvec_vtm)(void *v1, const void *v2, CPUS390XState *env, + uint32_t desc) +{ + S390Vector tmp; + + s390_vec_and(&tmp, v1, v2); + if (s390_vec_is_zero(&tmp)) { + /* Selected bits all zeros; or all mask bits zero */ + env->cc_op =3D 0; + } else if (s390_vec_equal(&tmp, v2)) { + /* Selected bits all ones */ + env->cc_op =3D 3; + } else { + /* Selected bits a mix of zeros and ones */ + env->cc_op =3D 1; + } +} --=20 2.20.1