From nobody Mon Feb 9 08:56:07 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=1623064343; cv=none; d=zohomail.com; s=zohoarc; b=CeBBLz4DxlSjLn55uAi7fGUIJ1IiSnaHS/pMA/u8+1PIZukrTx9o93y/elXr3ym/2nZtonZxta9wbJDUmQASoGWtmSH3OOvRawvf5whejd0kY5giZCxbd+ksO9JhWx2MH4MiDIn3VQ3AkMDymOr6jCVFXlBLfeXkv+F0G6DVS6o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623064343; h=Content-Type: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; bh=9eHwDhIQlY2zC34nPHmk2oGU8m0OZn+4XDCmQU6jaL4=; b=C9sQGaYg4V2/mmgl8lQcYYGWEnIMivFxywfqucKKBSr7wko+xpjvotvvugweA9x6hJkvLGrzL4ZcWGGUnQEofU6C98PKrQfKJ++ncZ7K+voupVqnqdD4J7yx0wyaqCbI06ThDkfWeOZQDOTbvbj5nY+ejNAZWbQcFNYbFcFEwBI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1623064343608558.6970548356585; Mon, 7 Jun 2021 04:12:23 -0700 (PDT) Received: from localhost ([::1]:47410 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqDB8-0000ep-6F for importer@patchew.org; Mon, 07 Jun 2021 07:12:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47144) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqD3O-0001hg-Ay for qemu-devel@nongnu.org; Mon, 07 Jun 2021 07:04:22 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:40518) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqD3K-0004co-Q2 for qemu-devel@nongnu.org; Mon, 07 Jun 2021 07:04:22 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-499-I9xG_IQPP0iwcI9jtQ7HIA-1; Mon, 07 Jun 2021 07:04:17 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A0FA4801AF1; Mon, 7 Jun 2021 11:04:15 +0000 (UTC) Received: from t480s.redhat.com (ovpn-114-176.ams2.redhat.com [10.36.114.176]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0635660C17; Mon, 7 Jun 2021 11:04:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623063858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9eHwDhIQlY2zC34nPHmk2oGU8m0OZn+4XDCmQU6jaL4=; b=YLwKBUfqZ5TBZqmDLRphx5NqcX8OWa0ilyLd1wFZ5UrxQukUMiU5okAxtI+j3AERojOhBt l0H9wuVCRojeZtRsE9iQ9v+BzSWv1QV4Hh05QQEh72BWIQ3L7hXCegh3R0vcWMZ/YZNqIJ pEBuJe7AGXZqy5pnp+ud1EoRnGyisSk= X-MC-Unique: I9xG_IQPP0iwcI9jtQ7HIA-1 From: David Hildenbrand To: qemu-devel@nongnu.org Subject: [PATCH v3 06/26] s390x/tcg: Simplify vftci64() handling Date: Mon, 7 Jun 2021 13:03:18 +0200 Message-Id: <20210607110338.31058-7-david@redhat.com> In-Reply-To: <20210607110338.31058-1-david@redhat.com> References: <20210607110338.31058-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=david@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=216.205.24.124; envelope-from=david@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.2, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , David Hildenbrand , Cornelia Huck , Richard Henderson , Laurent Vivier , Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Reviewed-by: Richard Henderson Signed-off-by: David Hildenbrand --- target/s390x/helper.h | 1 - target/s390x/translate_vx.c.inc | 7 ++----- target/s390x/vec_fpu_helper.c | 29 +++++++++++------------------ 3 files changed, 13 insertions(+), 24 deletions(-) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index 02a16924a7..e832680236 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -273,7 +273,6 @@ DEF_HELPER_FLAGS_6(gvec_vfms64s, TCG_CALL_NO_WG, void, = ptr, cptr, cptr, cptr, en DEF_HELPER_FLAGS_4(gvec_vfsq64, TCG_CALL_NO_WG, void, ptr, cptr, env, i32) DEF_HELPER_FLAGS_5(gvec_vfs64, TCG_CALL_NO_WG, void, ptr, cptr, cptr, env,= i32) DEF_HELPER_4(gvec_vftci64, void, ptr, cptr, env, i32) -DEF_HELPER_4(gvec_vftci64s, void, ptr, cptr, env, i32) =20 #ifndef CONFIG_USER_ONLY DEF_HELPER_3(servc, i32, env, i64, i64) diff --git a/target/s390x/translate_vx.c.inc b/target/s390x/translate_vx.c.= inc index 604ae11024..1404471881 100644 --- a/target/s390x/translate_vx.c.inc +++ b/target/s390x/translate_vx.c.inc @@ -2680,17 +2680,14 @@ static DisasJumpType op_vftci(DisasContext *s, Disa= sOps *o) const uint16_t i3 =3D get_field(s, i3); const uint8_t fpf =3D get_field(s, m4); const uint8_t m5 =3D get_field(s, m5); - gen_helper_gvec_2_ptr *fn =3D gen_helper_gvec_vftci64; =20 if (fpf !=3D FPF_LONG || extract32(m5, 0, 3)) { gen_program_exception(s, PGM_SPECIFICATION); return DISAS_NORETURN; } =20 - if (extract32(m5, 3, 1)) { - fn =3D gen_helper_gvec_vftci64s; - } - gen_gvec_2_ptr(get_field(s, v1), get_field(s, v2), cpu_env, i3, fn); + gen_gvec_2_ptr(get_field(s, v1), get_field(s, v2), cpu_env, + deposit32(m5, 4, 12, i3), gen_helper_gvec_vftci64); set_cc_static(s); return DISAS_NEXT; } diff --git a/target/s390x/vec_fpu_helper.c b/target/s390x/vec_fpu_helper.c index 01ee41d154..2ced6fcfaf 100644 --- a/target/s390x/vec_fpu_helper.c +++ b/target/s390x/vec_fpu_helper.c @@ -413,13 +413,15 @@ void HELPER(gvec_vfms64s)(void *v1, const void *v2, c= onst void *v3, vfma64(v1, v2, v3, v4, env, true, float_muladd_negate_c, GETPC()); } =20 -static int vftci64(S390Vector *v1, const S390Vector *v2, CPUS390XState *en= v, - bool s, uint16_t i3) +void HELPER(gvec_vftci64)(void *v1, const void *v2, CPUS390XState *env, + uint32_t desc) { + const uint16_t i3 =3D extract32(simd_data(desc), 4, 12); + const bool s =3D extract32(simd_data(desc), 3, 1); int i, match =3D 0; =20 for (i =3D 0; i < 2; i++) { - float64 a =3D s390_vec_read_element64(v2, i); + const float64 a =3D s390_vec_read_float64(v2, i); =20 if (float64_dcmask(env, a) & i3) { match++; @@ -432,20 +434,11 @@ static int vftci64(S390Vector *v1, const S390Vector *= v2, CPUS390XState *env, } } =20 - if (match) { - return s || match =3D=3D 2 ? 0 : 1; + if (match =3D=3D 2 || (s && match)) { + env->cc_op =3D 0; + } else if (match) { + env->cc_op =3D 1; + } else { + env->cc_op =3D 3; } - return 3; -} - -void HELPER(gvec_vftci64)(void *v1, const void *v2, CPUS390XState *env, - uint32_t desc) -{ - env->cc_op =3D vftci64(v1, v2, env, false, simd_data(desc)); -} - -void HELPER(gvec_vftci64s)(void *v1, const void *v2, CPUS390XState *env, - uint32_t desc) -{ - env->cc_op =3D vftci64(v1, v2, env, true, simd_data(desc)); } --=20 2.31.1