From nobody Mon Nov 10 19:10:44 2025 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=1558373117; cv=none; d=zoho.com; s=zohoarc; b=AZNi3yxJTCPd2AoqAdlnzzDw/bGSxg5lKLjCaTSxEej0AmssafyTAlA9mEOz1FIRi1h0kCF7RyinNWWTVPDQOi2ZAmP/kZcce+vzB/MO3Z4XGDO1Cb1OYw5tLtMRmrFW6XAhCtETEWcycuM59uU4nHeh3KrRUbzam6kfZ1Cwmpo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558373117; 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=XkBRseMigVkf0sNmT2FUkT/c6ubOs/920uxKzlw+UQE=; b=XK2FVxKEg3MUbATXfdUqHV3HfvpqNd6wzShSlTTHJUcMmnVgCjgrmiWkBzv+EUiVIRbYJUK4RTvDjefBQQWurlo0IDLXHXBDZlu4S7ByT7HOQoUDWNyCpqRDRhfciwJYadvSJioxV3z0JHWdsGOyNViGnBXkth223tSmpDyDrzA= 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 1558373117181965.5907922298314; Mon, 20 May 2019 10:25:17 -0700 (PDT) Received: from localhost ([127.0.0.1]:39090 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hSm29-0001mt-PR for importer@patchew.org; Mon, 20 May 2019 13:25:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53779) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hSlkN-0002hP-M6 for qemu-devel@nongnu.org; Mon, 20 May 2019 13:06:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hSlkL-0003kS-H9 for qemu-devel@nongnu.org; Mon, 20 May 2019 13:06:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45284) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hSlkL-0003jv-91; Mon, 20 May 2019 13:06:45 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C01603680B; Mon, 20 May 2019 17:06:43 +0000 (UTC) Received: from localhost (ovpn-204-110.brq.redhat.com [10.40.204.110]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A61EB27BAC; Mon, 20 May 2019 17:06:39 +0000 (UTC) From: Cornelia Huck To: Peter Maydell Date: Mon, 20 May 2019 19:02:27 +0200 Message-Id: <20190520170302.13643-20-cohuck@redhat.com> In-Reply-To: <20190520170302.13643-1-cohuck@redhat.com> References: <20190520170302.13643-1-cohuck@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 20 May 2019 17:06: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] [PULL 19/54] 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, Richard Henderson , qemu-devel@nongnu.org, David Hildenbrand Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: David Hildenbrand 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. Reviewed-by: Richard Henderson Signed-off-by: David Hildenbrand --- target/s390x/helper.h | 8 ++ target/s390x/insn-data.def | 4 + target/s390x/translate_vx.inc.c | 38 ++++++++ target/s390x/vec_int_helper.c | 167 ++++++++++++++++++++++++++++++++ 4 files changed, 217 insertions(+) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index 60b8bd3c431a..6e6ba9bf32a2 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -154,6 +154,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 b8400c191a7f..add174b79381 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 0935857eff09..1db5d6d152c6 100644 --- a/target/s390x/translate_vx.inc.c +++ b/target/s390x/translate_vx.inc.c @@ -1483,3 +1483,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 d1b1f2850990..20a1034dd83e 100644 --- a/target/s390x/vec_int_helper.c +++ b/target/s390x/vec_int_helper.c @@ -15,6 +15,59 @@ #include "vec.h" #include "exec/helper-proto.h" =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; + } +} #define DEF_VAVG(BITS) = \ void HELPER(gvec_vavg##BITS)(void *v1, const void *v2, const void *v3, = \ uint32_t desc) = \ @@ -74,3 +127,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