From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: David Hildenbrand 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 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v1 05/41] s390x/tcg: Implement VECTOR ADD WITH CARRY COMPUTE CARRY List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, Thomas Huth , Cornelia Huck , Richard Henderson , David Hildenbrand 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, c= ptr, 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,= i32) +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.= inc.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, Disas= Ops *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, co= nst 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 mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BE40FC10F13 for ; Thu, 11 Apr 2019 11:00:15 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8C81E2133D for ; Thu, 11 Apr 2019 11:00:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8C81E2133D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:46353 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEXRF-0001Sp-VT for qemu-devel@archiver.kernel.org; Thu, 11 Apr 2019 07:00:14 -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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="UTF-8" Message-ID: <20190411100800.5yVihQsdsoSgDIT6y2L5M22KiHc0ASW6deiqTui3wp8@z> 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, c= ptr, 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,= i32) +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.= inc.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, Disas= Ops *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, co= nst 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