From nobody Tue Nov 26 13:34:59 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1706883514; cv=none; d=zohomail.com; s=zohoarc; b=iTLTNxv2lIA5QP8g2OGJt5mUpMofCZgcz8KdIRoU46DHKl8EXZLFGb+SFu1SaSAgzNxQ+FJF2y65hI0vbOohWUiPtf206ZXW+AkamKmxLmKerN9h2YZ5eEIZkCUrwMdey55/je7pAwSMsJrFdDoJiWGwfnFXXNcLaiR+pforLcM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1706883514; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=TWaAYzedoDmwSo+VdLBPaFxuqPcfOVTInVXJb7c9NXw=; b=ZnkKRh93w70CfBdkRmQPQlk1SCHCvcZ3+3tBUIVA4T1/FWRYsBEq7nxoUkIxxuRLqa5oA1PDSdKrojYekP9TuXV1KtkjvSkMlzb8GeR0tOS6eeJTvSfCdsRjJTnIiY3Q4tG/ZIDZo2YPXWV4FJIDWLRbqu+BY0dQhCcY2cOHL7A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1706883514893124.52421819349729; Fri, 2 Feb 2024 06:18:34 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rVuMW-0002NM-LO; Fri, 02 Feb 2024 09:17:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rVuMU-0002N3-Ai; Fri, 02 Feb 2024 09:17:46 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rVuMS-00056U-M7; Fri, 02 Feb 2024 09:17:46 -0500 Received: from pps.filterd (m0353726.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 412DaCsb020042; Fri, 2 Feb 2024 14:17:42 GMT Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3w0yhecawt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 02 Feb 2024 14:17:41 +0000 Received: from m0353726.ppops.net (m0353726.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 412E1ZxI027349; Fri, 2 Feb 2024 14:17:41 GMT Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3w0yhecavu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 02 Feb 2024 14:17:41 +0000 Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 412DSENQ007955; Fri, 2 Feb 2024 14:13:25 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3vwdnmkk70-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 02 Feb 2024 14:13:25 +0000 Received: from smtpav07.fra02v.mail.ibm.com (smtpav07.fra02v.mail.ibm.com [10.20.54.106]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 412EDNW640764046 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 2 Feb 2024 14:13:23 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0BABD2004B; Fri, 2 Feb 2024 14:13:23 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D282620040; Fri, 2 Feb 2024 14:13:22 +0000 (GMT) Received: from black.boeblingen.de.ibm.com (unknown [9.155.200.166]) by smtpav07.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 2 Feb 2024 14:13:22 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=TWaAYzedoDmwSo+VdLBPaFxuqPcfOVTInVXJb7c9NXw=; b=MO+hB+d3cyBff3QB8zoWveKm+CTsmcVFnjVoNzTXn34FhU8dBsBs0eLMVbjWJkvIM+8I BDnn6MdlN28hUyLhlHBxRetjvCwfgYAOcGpzAW5yjFcD68H95epw+IqXVtIT/bijVyrk +Js2ILmLyjau2EAARJI8zmDvK5CQfK5zK4+JY8m4IZt+tYo8Vd2zBEUo+2T9CqGa6vsx fpqNbqodXGjXRTFo/i+HgOLvombYKIAfAmKaXODxJuHUTtNzElVyOjIv8CVEUtdDbpJv QFYUKtgxPDgaldB8cpVyk/R+lb+KfF7e43CWBsB+83Efedw3g4NGTiduaiBL0MW+IJ9i 6Q== From: Ilya Leoshkevich To: Richard Henderson , David Hildenbrand , Thomas Huth Cc: qemu-s390x@nongnu.org, qemu-devel@nongnu.org, Ilya Leoshkevich , Ido Plat Subject: [PATCH v4 1/4] target/s390x: Emulate CVDG Date: Fri, 2 Feb 2024 15:11:57 +0100 Message-ID: <20240202141318.95962-2-iii@linux.ibm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240202141318.95962-1-iii@linux.ibm.com> References: <20240202141318.95962-1-iii@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: CQdebTMC6BlUO0aGJzOAgzMVccDa2DtL X-Proofpoint-ORIG-GUID: 1FHVPn4Kij0nPHISUUTtrjQUlC85acHB X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-02_08,2024-01-31_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 mlxscore=0 adultscore=0 phishscore=0 lowpriorityscore=0 bulkscore=0 malwarescore=0 spamscore=0 impostorscore=0 clxscore=1015 mlxlogscore=531 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402020104 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=148.163.156.1; envelope-from=iii@linux.ibm.com; helo=mx0a-001b2d01.pphosted.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ibm.com) X-ZM-MESSAGEID: 1706883515816100001 Content-Type: text/plain; charset="utf-8" CVDG is the same as CVD, except that it converts 64 bits into 128, rather than 32 into 64. Create a new helper, which uses Int128 wrappers. Reported-by: Ido Plat Reviewed-by: Richard Henderson Signed-off-by: Ilya Leoshkevich --- target/s390x/helper.h | 1 + target/s390x/tcg/insn-data.h.inc | 1 + target/s390x/tcg/int_helper.c | 21 +++++++++++++++++++++ target/s390x/tcg/translate.c | 8 ++++++++ 4 files changed, 31 insertions(+) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index 05102578fc9..332a9a9c632 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -89,6 +89,7 @@ DEF_HELPER_FLAGS_2(sqeb, TCG_CALL_NO_WG, i64, env, i64) DEF_HELPER_FLAGS_2(sqdb, TCG_CALL_NO_WG, i64, env, i64) DEF_HELPER_FLAGS_2(sqxb, TCG_CALL_NO_WG, i128, env, i128) DEF_HELPER_FLAGS_1(cvd, TCG_CALL_NO_RWG_SE, i64, s32) +DEF_HELPER_FLAGS_1(cvdg, TCG_CALL_NO_RWG_SE, i128, s64) DEF_HELPER_FLAGS_4(pack, TCG_CALL_NO_WG, void, env, i32, i64, i64) DEF_HELPER_FLAGS_4(pka, TCG_CALL_NO_WG, void, env, i64, i64, i32) DEF_HELPER_FLAGS_4(pku, TCG_CALL_NO_WG, void, env, i64, i64, i32) diff --git a/target/s390x/tcg/insn-data.h.inc b/target/s390x/tcg/insn-data.= h.inc index 2f07f39d9cb..388dcb8dbbc 100644 --- a/target/s390x/tcg/insn-data.h.inc +++ b/target/s390x/tcg/insn-data.h.inc @@ -296,6 +296,7 @@ /* CONVERT TO DECIMAL */ C(0x4e00, CVD, RX_a, Z, r1_o, a2, 0, 0, cvd, 0) C(0xe326, CVDY, RXY_a, LD, r1_o, a2, 0, 0, cvd, 0) + C(0xe32e, CVDG, RXY_a, Z, r1_o, a2, 0, 0, cvdg, 0) /* CONVERT TO FIXED */ F(0xb398, CFEBR, RRF_e, Z, 0, e2, new, r1_32, cfeb, 0, IF_BFP) F(0xb399, CFDBR, RRF_e, Z, 0, f2, new, r1_32, cfdb, 0, IF_BFP) diff --git a/target/s390x/tcg/int_helper.c b/target/s390x/tcg/int_helper.c index eb8e6dd1b57..121e3006a65 100644 --- a/target/s390x/tcg/int_helper.c +++ b/target/s390x/tcg/int_helper.c @@ -118,6 +118,27 @@ uint64_t HELPER(cvd)(int32_t reg) return dec; } =20 +Int128 HELPER(cvdg)(int64_t reg) +{ + /* positive 0 */ + Int128 dec =3D int128_make64(0x0c); + Int128 bin =3D int128_makes64(reg); + Int128 base =3D int128_make64(10); + int shift; + + if (!int128_nonneg(bin)) { + bin =3D int128_neg(bin); + dec =3D int128_make64(0x0d); + } + + for (shift =3D 4; (shift < 128) && int128_nz(bin); shift +=3D 4) { + dec =3D int128_or(dec, int128_lshift(int128_remu(bin, base), shift= )); + bin =3D int128_divu(bin, base); + } + + return dec; +} + uint64_t HELPER(popcnt)(uint64_t val) { /* Note that we don't fold past bytes. */ diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index a5fd9cccaa5..c2fdc920a50 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -2233,6 +2233,14 @@ static DisasJumpType op_cvd(DisasContext *s, DisasOp= s *o) return DISAS_NEXT; } =20 +static DisasJumpType op_cvdg(DisasContext *s, DisasOps *o) +{ + TCGv_i128 t =3D tcg_temp_new_i128(); + gen_helper_cvdg(t, o->in1); + tcg_gen_qemu_st_i128(t, o->in2, get_mem_index(s), MO_TE | MO_128); + return DISAS_NEXT; +} + static DisasJumpType op_ct(DisasContext *s, DisasOps *o) { int m3 =3D get_field(s, m3); --=20 2.43.0 From nobody Tue Nov 26 13:34:59 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1706883289; cv=none; d=zohomail.com; s=zohoarc; b=kDQS23IrLyMlmhhKwBCOG7uUKndEp+htUNyJ0OOdbX18IZmwtBP2fQrLJKw5OlCV+bV31I9PUQRgVAwO4jt194s6c+r8q6dhyjU9J60oVuZxgU04ArGLsuuQAbWnyCPnYkatcY3g9A7h3zoc5F1t5tDY9AC+/80yuA7qBd+5PNA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1706883289; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=JHGGu5VK0Qk9ffsN0tt8P10AYR/ZYGJq76N48EeA1yE=; b=io6PkEt0xA/v9Z6n8MIxPMomEYAOivzDPNlSm0QNMFOk60/1b+MIseTHK9q2cKciKMmtxhYU+C+sVFwWTWxdKofxoOrBPMfqUefODyNUIA7xf4fuSqazH9wqX2c4LRD6my6QAnBwV0OmNxSNpGw+m+gbHUAnfwIQXpdrcBtoQrg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1706883289658162.8719834916336; Fri, 2 Feb 2024 06:14:49 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rVuIU-0007mA-Fv; Fri, 02 Feb 2024 09:13:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rVuIO-0007kf-04; Fri, 02 Feb 2024 09:13:33 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rVuIM-00048M-1j; Fri, 02 Feb 2024 09:13:31 -0500 Received: from pps.filterd (m0353722.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 412DoVKa030823; Fri, 2 Feb 2024 14:13:28 GMT Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3w11mh0j3f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 02 Feb 2024 14:13:27 +0000 Received: from m0353722.ppops.net (m0353722.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 412Dqx75004260; Fri, 2 Feb 2024 14:13:27 GMT Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3w11mh0j2e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 02 Feb 2024 14:13:27 +0000 Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 412CpGUN010569; Fri, 2 Feb 2024 14:13:26 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3vwd5pbq90-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 02 Feb 2024 14:13:25 +0000 Received: from smtpav07.fra02v.mail.ibm.com (smtpav07.fra02v.mail.ibm.com [10.20.54.106]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 412EDN1o38208106 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 2 Feb 2024 14:13:24 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CEE4A2004B; Fri, 2 Feb 2024 14:13:23 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A163F20043; Fri, 2 Feb 2024 14:13:23 +0000 (GMT) Received: from black.boeblingen.de.ibm.com (unknown [9.155.200.166]) by smtpav07.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 2 Feb 2024 14:13:23 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=JHGGu5VK0Qk9ffsN0tt8P10AYR/ZYGJq76N48EeA1yE=; b=r4n3mWquKK69NNvqv3xYBMiWTl76Z0cA1rIjCJamweUo5UuHrGFOubHGG/2qLl9aojGc otWufgf3j9rRiXvDkzG+qLEvZgxhpDOQxRfgpwREq0BUk7r7JvZW40QtFH/K9mtRkE3k zgRFDFWqrkx4L5u3aAnsoRbvxZBIGWK7xcNVliXTDnASV/WkfmdPnsNwevWYBC1nGrGs 5G/lVJtl2wsEtZqtir9zQemUrxZaf/5I7AAVELheiNrykYmWtRrP70U4awq5d7/6qj+j m0ZvUqZYTFuyHHrGzRXGAnqVLAMvTtnhJA5OpMTxSS+6RxptpNWfmzv9EarZF2nHGR5I ig== From: Ilya Leoshkevich To: Richard Henderson , David Hildenbrand , Thomas Huth Cc: qemu-s390x@nongnu.org, qemu-devel@nongnu.org, Ilya Leoshkevich , Pavel Zbitskiy Subject: [PATCH v4 2/4] target/s390x: Emulate CVB, CVBY and CVBG Date: Fri, 2 Feb 2024 15:11:58 +0100 Message-ID: <20240202141318.95962-3-iii@linux.ibm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240202141318.95962-1-iii@linux.ibm.com> References: <20240202141318.95962-1-iii@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: H8cO1kBfneb5W71r6yYvBeSeGziXa1PJ X-Proofpoint-GUID: By-ew7AgQAcRkeAxtmFkrjsWux4WHplP X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-02_08,2024-01-31_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 adultscore=0 mlxlogscore=786 phishscore=0 spamscore=0 lowpriorityscore=0 clxscore=1015 mlxscore=0 malwarescore=0 bulkscore=0 impostorscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402020104 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=148.163.158.5; envelope-from=iii@linux.ibm.com; helo=mx0b-001b2d01.pphosted.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ibm.com) X-ZM-MESSAGEID: 1706883290489100001 Content-Type: text/plain; charset="utf-8" Convert to Binary - counterparts of the already implemented Convert to Decimal (CVD*) instructions. Example from the Principles of Operation: 25594C becomes 63FA. Co-developed-by: Pavel Zbitskiy Signed-off-by: Ilya Leoshkevich --- target/s390x/helper.h | 2 + target/s390x/tcg/insn-data.h.inc | 4 ++ target/s390x/tcg/int_helper.c | 72 ++++++++++++++++++++++++++++++++ target/s390x/tcg/translate.c | 16 +++++++ 4 files changed, 94 insertions(+) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index 332a9a9c632..cc1c20e9e3f 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -88,6 +88,8 @@ DEF_HELPER_FLAGS_3(tcxb, TCG_CALL_NO_RWG_SE, i32, env, i1= 28, i64) DEF_HELPER_FLAGS_2(sqeb, TCG_CALL_NO_WG, i64, env, i64) DEF_HELPER_FLAGS_2(sqdb, TCG_CALL_NO_WG, i64, env, i64) DEF_HELPER_FLAGS_2(sqxb, TCG_CALL_NO_WG, i128, env, i128) +DEF_HELPER_3(cvb, void, env, i32, i64) +DEF_HELPER_FLAGS_2(cvbg, TCG_CALL_NO_WG, i64, env, i128) DEF_HELPER_FLAGS_1(cvd, TCG_CALL_NO_RWG_SE, i64, s32) DEF_HELPER_FLAGS_1(cvdg, TCG_CALL_NO_RWG_SE, i128, s64) DEF_HELPER_FLAGS_4(pack, TCG_CALL_NO_WG, void, env, i32, i64, i64) diff --git a/target/s390x/tcg/insn-data.h.inc b/target/s390x/tcg/insn-data.= h.inc index 388dcb8dbbc..e7d61cdec28 100644 --- a/target/s390x/tcg/insn-data.h.inc +++ b/target/s390x/tcg/insn-data.h.inc @@ -293,6 +293,10 @@ D(0xec73, CLFIT, RIE_a, GIE, r1_32u, i2_16u, 0, 0, ct, 0, 1) D(0xec71, CLGIT, RIE_a, GIE, r1_o, i2_16u, 0, 0, ct, 0, 1) =20 +/* CONVERT TO BINARY */ + C(0x4f00, CVB, RX_a, Z, la2, 0, 0, 0, cvb, 0) + C(0xe306, CVBY, RXY_a, LD, la2, 0, 0, 0, cvb, 0) + C(0xe30e, CVBG, RXY_a, Z, la2, 0, r1, 0, cvbg, 0) /* CONVERT TO DECIMAL */ C(0x4e00, CVD, RX_a, Z, r1_o, a2, 0, 0, cvd, 0) C(0xe326, CVDY, RXY_a, LD, r1_o, a2, 0, 0, cvd, 0) diff --git a/target/s390x/tcg/int_helper.c b/target/s390x/tcg/int_helper.c index 121e3006a65..17974375e98 100644 --- a/target/s390x/tcg/int_helper.c +++ b/target/s390x/tcg/int_helper.c @@ -25,6 +25,7 @@ #include "exec/exec-all.h" #include "qemu/host-utils.h" #include "exec/helper-proto.h" +#include "exec/cpu_ldst.h" =20 /* #define DEBUG_HELPER */ #ifdef DEBUG_HELPER @@ -98,6 +99,77 @@ Int128 HELPER(divu64)(CPUS390XState *env, uint64_t ah, u= int64_t al, uint64_t b) tcg_s390_program_interrupt(env, PGM_FIXPT_DIVIDE, GETPC()); } =20 +void HELPER(cvb)(CPUS390XState *env, uint32_t r1, uint64_t dec) +{ + int64_t pow10 =3D 1, bin =3D 0; + int digit, sign; + + sign =3D dec & 0xf; + if (sign < 0xa) { + tcg_s390_data_exception(env, 0, GETPC()); + } + dec >>=3D 4; + + while (dec) { + digit =3D dec & 0xf; + if (digit > 0x9) { + tcg_s390_data_exception(env, 0, GETPC()); + } + dec >>=3D 4; + bin +=3D digit * pow10; + pow10 *=3D 10; + } + + if (sign =3D=3D 0xb || sign =3D=3D 0xd) { + bin =3D -bin; + } + + /* R1 is updated even on fixed-point-divide exception. */ + env->regs[r1] =3D (env->regs[r1] & 0xffffffff00000000ULL) | (uint32_t)= bin; + if (bin !=3D (int32_t)bin) { + tcg_s390_program_interrupt(env, PGM_FIXPT_DIVIDE, GETPC()); + } +} + +uint64_t HELPER(cvbg)(CPUS390XState *env, Int128 dec) +{ + uint64_t dec64[] =3D {int128_getlo(dec), int128_gethi(dec)}; + int64_t bin =3D 0, pow10, tmp; + int digit, i, sign; + + sign =3D dec64[0] & 0xf; + if (sign < 0xa) { + tcg_s390_data_exception(env, 0, GETPC()); + } + dec64[0] >>=3D 4; + pow10 =3D (sign =3D=3D 0xb || sign =3D=3D 0xd) ? -1 : 1; + + for (i =3D 1; i < 20; i++) { + digit =3D dec64[i >> 4] & 0xf; + if (digit > 0x9) { + tcg_s390_data_exception(env, 0, GETPC()); + } + dec64[i >> 4] >>=3D 4; + tmp =3D pow10 * digit; + if (digit && ((tmp ^ pow10) < 0)) { + tcg_s390_program_interrupt(env, PGM_FIXPT_DIVIDE, GETPC()); + } + tmp =3D bin + tmp; + if (bin && ((tmp ^ bin) < 0)) { + tcg_s390_program_interrupt(env, PGM_FIXPT_DIVIDE, GETPC()); + } + bin =3D tmp; + pow10 *=3D 10; + } + + g_assert(!dec64[0]); + if (dec64[1]) { + tcg_s390_program_interrupt(env, PGM_FIXPT_DIVIDE, GETPC()); + } + + return bin; +} + uint64_t HELPER(cvd)(int32_t reg) { /* positive 0 */ diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index c2fdc920a50..325b25959d3 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -2223,6 +2223,22 @@ static DisasJumpType op_csp(DisasContext *s, DisasOp= s *o) } #endif =20 +static DisasJumpType op_cvb(DisasContext *s, DisasOps *o) +{ + TCGv_i64 t =3D tcg_temp_new_i64(); + tcg_gen_qemu_ld_i64(t, o->addr1, get_mem_index(s), MO_TEUQ); + gen_helper_cvb(tcg_env, tcg_constant_i32(get_field(s, r1)), t); + return DISAS_NEXT; +} + +static DisasJumpType op_cvbg(DisasContext *s, DisasOps *o) +{ + TCGv_i128 t =3D tcg_temp_new_i128(); + tcg_gen_qemu_ld_i128(t, o->addr1, get_mem_index(s), MO_TE | MO_128); + gen_helper_cvbg(o->out, tcg_env, t); + return DISAS_NEXT; +} + static DisasJumpType op_cvd(DisasContext *s, DisasOps *o) { TCGv_i64 t1 =3D tcg_temp_new_i64(); --=20 2.43.0 From nobody Tue Nov 26 13:34:59 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1706883290; cv=none; d=zohomail.com; s=zohoarc; b=lWol7n9YTMjf3zU/1/edXHKoO4J44Zc2bmJSPXmxYFl8iAVlBEVHvPPfChzI0brAqehi3FmoRvokvkt4M26qQAnM4H1qvKvCSsx5x/uPFcpIYCdD60xCxSnotKxJ27yvsNYzo0CIEk4nLL3+JZLKQBdpqw0f39Ik7NoPxDfM0R8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1706883290; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Mall8/7U/KxaObqeJMQxA2Lek59OoFWUm2+zR62Ttw8=; b=mq/Ed93EoGCvyL81YyH7y3q5gdDMwlhqsptrXaBafumWhzYb3oRdHBm8XM+f7RuwP9W11I5dpOV/c7g9dMrZZGiDSfY4QGHwIUGrC1EC8qEfXYxR+xNP9d9Vwl81lC7957gMY1KjhwQiNL8+SsVUHnOcS2Af0HidqZjr/Y5VntA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1706883290001645.3641544304801; Fri, 2 Feb 2024 06:14:50 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rVuIl-0007pf-Gq; Fri, 02 Feb 2024 09:13:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rVuIk-0007pJ-1v; Fri, 02 Feb 2024 09:13:54 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rVuIM-00048K-2X; Fri, 02 Feb 2024 09:13:45 -0500 Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 412EDQwG012008; Fri, 2 Feb 2024 14:13:27 GMT Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3w11ybg016-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 02 Feb 2024 14:13:27 +0000 Received: from m0356516.ppops.net (m0356516.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 412EDQZU012027; Fri, 2 Feb 2024 14:13:26 GMT Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3w11ybg00v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 02 Feb 2024 14:13:26 +0000 Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 412DwHlm010887; Fri, 2 Feb 2024 14:13:26 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 3vwecm3dsh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 02 Feb 2024 14:13:26 +0000 Received: from smtpav07.fra02v.mail.ibm.com (smtpav07.fra02v.mail.ibm.com [10.20.54.106]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 412EDO0P26739348 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 2 Feb 2024 14:13:24 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 794A020043; Fri, 2 Feb 2024 14:13:24 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4F65D20040; Fri, 2 Feb 2024 14:13:24 +0000 (GMT) Received: from black.boeblingen.de.ibm.com (unknown [9.155.200.166]) by smtpav07.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 2 Feb 2024 14:13:24 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=Mall8/7U/KxaObqeJMQxA2Lek59OoFWUm2+zR62Ttw8=; b=RweEOzqqDvTEOQpvPtLRGr8BU1jZSbEIlc3XN+aOwi0wy0w9p0qVt9rThOOxBJUJdXM9 iStb/C0H4j1c8MnxYWDE8hil1FBcaanbmdYTPQcXI91ChJYqmuhTtqUQ+htI+xyGj1tJ 1FDNrbfzmxSFrqPsqzfDrIX9zFP1O96SQPDJkQqIqWK+fHN+rktqnsVr1vHhEHjYF0ke JvrbR0BsPTae1ppjhtwJfrxZKEBNVVa80cohN4s9kgRmzik67yfmyzf+2zzN9rz607Ml ylNZkByHlPcdO4FuipRbCnGijriKDg93lAwQvlvSoLvD1VapG+lE9bnvK8rulPvrHIy9 eg== From: Ilya Leoshkevich To: Richard Henderson , David Hildenbrand , Thomas Huth Cc: qemu-s390x@nongnu.org, qemu-devel@nongnu.org, Ilya Leoshkevich Subject: [PATCH v4 3/4] tests/tcg/s390x: Test CONVERT TO DECIMAL Date: Fri, 2 Feb 2024 15:11:59 +0100 Message-ID: <20240202141318.95962-4-iii@linux.ibm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240202141318.95962-1-iii@linux.ibm.com> References: <20240202141318.95962-1-iii@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: LSPvf4fVg7hrDV_kqKZCbET1Z27slOvV X-Proofpoint-ORIG-GUID: K6vP0QCeEafx72jikF9lnq5RLkOaXRGW X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-02_08,2024-01-31_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=766 phishscore=0 clxscore=1015 lowpriorityscore=0 adultscore=0 malwarescore=0 spamscore=0 suspectscore=0 impostorscore=0 priorityscore=1501 bulkscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402020104 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=148.163.158.5; envelope-from=iii@linux.ibm.com; helo=mx0b-001b2d01.pphosted.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ibm.com) X-ZM-MESSAGEID: 1706883290495100002 Content-Type: text/plain; charset="utf-8" Check the CVD's, CVDY's, and CVDG's corner cases. Signed-off-by: Ilya Leoshkevich Reviewed-by: Thomas Huth --- tests/tcg/s390x/Makefile.target | 1 + tests/tcg/s390x/cvd.c | 63 +++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 tests/tcg/s390x/cvd.c diff --git a/tests/tcg/s390x/Makefile.target b/tests/tcg/s390x/Makefile.tar= get index 30994dcf9c2..04e4bddd83d 100644 --- a/tests/tcg/s390x/Makefile.target +++ b/tests/tcg/s390x/Makefile.target @@ -45,6 +45,7 @@ TESTS+=3Dclc TESTS+=3Dlaalg TESTS+=3Dadd-logical-with-carry TESTS+=3Dlae +TESTS+=3Dcvd =20 cdsg: CFLAGS+=3D-pthread cdsg: LDFLAGS+=3D-pthread diff --git a/tests/tcg/s390x/cvd.c b/tests/tcg/s390x/cvd.c new file mode 100644 index 00000000000..d776688985e --- /dev/null +++ b/tests/tcg/s390x/cvd.c @@ -0,0 +1,63 @@ +/* + * Test the CONVERT TO DECIMAL instruction. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ +#include +#include +#include + +static uint64_t cvd(int32_t x) +{ + uint64_t ret; + + asm("cvd %[x],%[ret]" : [ret] "=3DR" (ret) : [x] "r" (x)); + + return ret; +} + +static uint64_t cvdy(int32_t x) +{ + uint64_t ret; + + asm("cvdy %[x],%[ret]" : [ret] "=3DT" (ret) : [x] "r" (x)); + + return ret; +} + +static __uint128_t cvdg(int64_t x) +{ + __uint128_t ret; + + asm("cvdg %[x],%[ret]" : [ret] "=3DT" (ret) : [x] "r" (x)); + + return ret; +} + +int main(void) +{ + __uint128_t m =3D (((__uint128_t)0x9223372036854775) << 16) | 0x8070; + + assert(cvd(0) =3D=3D 0xc); + assert(cvd(1) =3D=3D 0x1c); + assert(cvd(25594) =3D=3D 0x25594c); + assert(cvd(-1) =3D=3D 0x1d); + assert(cvd(0x7fffffff) =3D=3D 0x2147483647c); + assert(cvd(-0x80000000) =3D=3D 0x2147483648d); + + assert(cvdy(0) =3D=3D 0xc); + assert(cvdy(1) =3D=3D 0x1c); + assert(cvdy(25594) =3D=3D 0x25594c); + assert(cvdy(-1) =3D=3D 0x1d); + assert(cvdy(0x7fffffff) =3D=3D 0x2147483647c); + assert(cvdy(-0x80000000) =3D=3D 0x2147483648d); + + assert(cvdg(0) =3D=3D 0xc); + assert(cvdg(1) =3D=3D 0x1c); + assert(cvdg(25594) =3D=3D 0x25594c); + assert(cvdg(-1) =3D=3D 0x1d); + assert(cvdg(0x7fffffffffffffff) =3D=3D (m + 0xc)); + assert(cvdg(-0x8000000000000000) =3D=3D (m + 0x1d)); + + return EXIT_SUCCESS; +} --=20 2.43.0 From nobody Tue Nov 26 13:34:59 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1706883294; cv=none; d=zohomail.com; s=zohoarc; b=n+WaW/k5XA500sRD6G+wxFeza79qxRjDPB8rPtJ1SttuLjoQnWpMVyAbcyGCm30FkACtGPEWKlPc/VMv35CIYWPt5DtN7OHSbxcA5BvfouVbAK1h/ZKbeL/f8HCn+nWMfypiiBcz94bqk5cfIgL5L8/J84F71YipFXrrnu8fQ3E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1706883294; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=fAScaTNRMCZarWKXn2J2iMtXgXaYIfZjQ8qJiL/ahYY=; b=CCjwKFdWV3iEgFLg77DKKr5jNQfItSVE1wNXjTyV+wP4dgcNDWjlwdhKLVerLY+IUR7juaCL5Snd4b5d5qQMUgYg77Cwi5BtVnUk2gjV4u4lRkZ9L5bQ5P/uJauOEANJaHJhNPEblzuSKnfBuNPSVKoflrB9+xViXofEiDrqfrQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1706883294073710.6157165762107; Fri, 2 Feb 2024 06:14:54 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rVuIT-0007lU-Dw; Fri, 02 Feb 2024 09:13:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rVuIQ-0007ky-TJ; Fri, 02 Feb 2024 09:13:35 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rVuIO-00048a-No; Fri, 02 Feb 2024 09:13:34 -0500 Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 412Dqe9C026143; Fri, 2 Feb 2024 14:13:28 GMT Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3w11ng0jt7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 02 Feb 2024 14:13:28 +0000 Received: from m0360083.ppops.net (m0360083.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 412Dr6aN027608; Fri, 2 Feb 2024 14:13:28 GMT Received: from ppma12.dal12v.mail.ibm.com (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3w11ng0jsp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 02 Feb 2024 14:13:27 +0000 Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 412BaP4X002223; Fri, 2 Feb 2024 14:13:27 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 3vwc5tuyd7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 02 Feb 2024 14:13:26 +0000 Received: from smtpav07.fra02v.mail.ibm.com (smtpav07.fra02v.mail.ibm.com [10.20.54.106]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 412EDPwA14549642 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 2 Feb 2024 14:13:25 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 12A7B20043; Fri, 2 Feb 2024 14:13:25 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D9DD720040; Fri, 2 Feb 2024 14:13:24 +0000 (GMT) Received: from black.boeblingen.de.ibm.com (unknown [9.155.200.166]) by smtpav07.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 2 Feb 2024 14:13:24 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=fAScaTNRMCZarWKXn2J2iMtXgXaYIfZjQ8qJiL/ahYY=; b=I8yYEOAiqxnWRZL5TW3SydgZz6FqSiDheMAS5xdXSNOlgeYQy3vAwutTTjIOBG4bsPMS UNXgsJqL9WBY2Z072tLs/Sbf0m1zhmdsrKd7Pjxk3F2kdNTyO9yZh6gOexHW0Jcq//0n 0A8+iNAFU637lWqOfSuzYKdwYto+npjSltc9iuzcLJi4cWlFg1q/RGG9yoj9qUOCaBLg 6LCux+Gucj8iZ7HXkYM59DlS5sSyhpP7riaUgBYHUc1eHRc4mK+ZAY1EBiQChbfEmAw4 RqJOj0mer23sJoGxNgORK3+32vK/Hvthue7/MLczE9kxOhesTuoY0/wG7z/NkMokKfll Xg== From: Ilya Leoshkevich To: Richard Henderson , David Hildenbrand , Thomas Huth Cc: qemu-s390x@nongnu.org, qemu-devel@nongnu.org, Ilya Leoshkevich , Pavel Zbitskiy Subject: [PATCH v4 4/4] tests/tcg/s390x: Test CONVERT TO BINARY Date: Fri, 2 Feb 2024 15:12:00 +0100 Message-ID: <20240202141318.95962-5-iii@linux.ibm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240202141318.95962-1-iii@linux.ibm.com> References: <20240202141318.95962-1-iii@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: eCmjBOpOqXv3n3xdx9856kkdkPpBO6xv X-Proofpoint-ORIG-GUID: 6O-T1QDB-wMfa-a1nmCEy94nAFviShlJ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-02_08,2024-01-31_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 phishscore=0 impostorscore=0 malwarescore=0 suspectscore=0 bulkscore=0 spamscore=0 clxscore=1015 mlxlogscore=723 lowpriorityscore=0 priorityscore=1501 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402020104 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=148.163.156.1; envelope-from=iii@linux.ibm.com; helo=mx0a-001b2d01.pphosted.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ibm.com) X-ZM-MESSAGEID: 1706883294475100001 Content-Type: text/plain; charset="utf-8" Check the CVB's, CVBY's, and CVBG's corner cases. Co-developed-by: Pavel Zbitskiy Signed-off-by: Ilya Leoshkevich Reviewed-by: Thomas Huth Tested-by: Thomas Huth --- tests/tcg/s390x/Makefile.target | 1 + tests/tcg/s390x/cvb.c | 102 ++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+) create mode 100644 tests/tcg/s390x/cvb.c diff --git a/tests/tcg/s390x/Makefile.target b/tests/tcg/s390x/Makefile.tar= get index 04e4bddd83d..e2aba2ec274 100644 --- a/tests/tcg/s390x/Makefile.target +++ b/tests/tcg/s390x/Makefile.target @@ -46,6 +46,7 @@ TESTS+=3Dlaalg TESTS+=3Dadd-logical-with-carry TESTS+=3Dlae TESTS+=3Dcvd +TESTS+=3Dcvb =20 cdsg: CFLAGS+=3D-pthread cdsg: LDFLAGS+=3D-pthread diff --git a/tests/tcg/s390x/cvb.c b/tests/tcg/s390x/cvb.c new file mode 100644 index 00000000000..e1735f6b81c --- /dev/null +++ b/tests/tcg/s390x/cvb.c @@ -0,0 +1,102 @@ +/* + * Test the CONVERT TO BINARY instruction. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ +#include +#include +#include +#include +#include + +static int signum; + +static void signal_handler(int n) +{ + signum =3D n; +} + +#define FAIL 0x1234567887654321 +#define OK32(x) (0x1234567800000000 | (uint32_t)(x)) + +static int64_t cvb(uint64_t x) +{ + int64_t ret =3D FAIL; + + signum =3D -1; + asm("cvb %[ret],%[x]" : [ret] "+r" (ret) : [x] "R" (x)); + + return ret; +} + +static int64_t cvby(uint64_t x) +{ + int64_t ret =3D FAIL; + + signum =3D -1; + asm("cvby %[ret],%[x]" : [ret] "+r" (ret) : [x] "T" (x)); + + return ret; +} + +static int64_t cvbg(__uint128_t x) +{ + int64_t ret =3D FAIL; + + signum =3D -1; + asm("cvbg %[ret],%[x]" : [ret] "+r" (ret) : [x] "T" (x)); + + return ret; +} + +int main(void) +{ + __uint128_t m =3D (((__uint128_t)0x9223372036854775) << 16) | 0x8070; + struct sigaction act; + int err; + + memset(&act, 0, sizeof(act)); + act.sa_handler =3D signal_handler; + err =3D sigaction(SIGFPE, &act, NULL); + assert(err =3D=3D 0); + err =3D sigaction(SIGILL, &act, NULL); + assert(err =3D=3D 0); + + assert(cvb(0xc) =3D=3D OK32(0) && signum =3D=3D -1); + assert(cvb(0x1c) =3D=3D OK32(1) && signum =3D=3D -1); + assert(cvb(0x25594c) =3D=3D OK32(25594) && signum =3D=3D -1); + assert(cvb(0x1d) =3D=3D OK32(-1) && signum =3D=3D -1); + assert(cvb(0x2147483647c) =3D=3D OK32(0x7fffffff) && signum =3D=3D -1); + assert(cvb(0x2147483648d) =3D=3D OK32(-0x80000000) && signum =3D=3D -1= ); + assert(cvb(0x7) =3D=3D FAIL && signum =3D=3D SIGILL); + assert(cvb(0x2147483648c) =3D=3D OK32(0x80000000) && signum =3D=3D SIG= FPE); + assert(cvb(0x3000000000c) =3D=3D OK32(0xb2d05e00) && signum =3D=3D SIG= FPE); + assert(cvb(0x2147483649d) =3D=3D OK32(0x7fffffff) && signum =3D=3D SIG= FPE); + assert(cvb(0x3000000000d) =3D=3D OK32(0x4d2fa200) && signum =3D=3D SIG= FPE); + + assert(cvby(0xc) =3D=3D OK32(0)); + assert(cvby(0x1c) =3D=3D OK32(1)); + assert(cvby(0x25594c) =3D=3D OK32(25594)); + assert(cvby(0x1d) =3D=3D OK32(-1)); + assert(cvby(0x2147483647c) =3D=3D OK32(0x7fffffff)); + assert(cvby(0x2147483648d) =3D=3D OK32(-0x80000000)); + assert(cvby(0x7) =3D=3D FAIL && signum =3D=3D SIGILL); + assert(cvby(0x2147483648c) =3D=3D OK32(0x80000000) && signum =3D=3D SI= GFPE); + assert(cvby(0x3000000000c) =3D=3D OK32(0xb2d05e00) && signum =3D=3D SI= GFPE); + assert(cvby(0x2147483649d) =3D=3D OK32(0x7fffffff) && signum =3D=3D SI= GFPE); + assert(cvby(0x3000000000d) =3D=3D OK32(0x4d2fa200) && signum =3D=3D SI= GFPE); + + assert(cvbg(0xc) =3D=3D 0); + assert(cvbg(0x1c) =3D=3D 1); + assert(cvbg(0x25594c) =3D=3D 25594); + assert(cvbg(0x1d) =3D=3D -1); + assert(cvbg(m + 0xc) =3D=3D 0x7fffffffffffffff); + assert(cvbg(m + 0x1d) =3D=3D -0x8000000000000000); + assert(cvbg(0x7) =3D=3D FAIL && signum =3D=3D SIGILL); + assert(cvbg(m + 0x1c) =3D=3D FAIL && signum =3D=3D SIGFPE); + assert(cvbg(m + 0x2d) =3D=3D FAIL && signum =3D=3D SIGFPE); + assert(cvbg(((__uint128_t)1 << 80) + 0xc) =3D=3D FAIL && signum =3D=3D= SIGFPE); + assert(cvbg(((__uint128_t)1 << 80) + 0xd) =3D=3D FAIL && signum =3D=3D= SIGFPE); + + return EXIT_SUCCESS; +} --=20 2.43.0