From nobody Sat May 18 11:25:53 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=1683279156; cv=none; d=zohomail.com; s=zohoarc; b=PrC31TILtuUhvGGmGWoilA4dZ2wyKXIGtXNlvC1iYrT94zOBq990d2TOpvZJHgG1SJp5ILQ6L7RvYo0XhRPX2XZrJ+IV3yOWc0t1aszHy9h/U3W4QzT7vEFvisBOMoyNEyk5y9ckT1Mv7TfB3wkmXopVNP/YeBZyunOrByC639A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683279156; 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; bh=FgflLlsNpaFafvG+mFLhDkjnuS4+z7KUOt2Vv4P/EWU=; b=cdpnL1q0ZATDiTIlTir5v6GyiNUAjZojbepfjByLRSmkc2zSJyT3jrp6cIb0EWO/hKMMFjFAb+wzcW07wZI7MUU8MB4usGHUPDW7p5HdqGbCL3w5bU2mqZIyvExS8by9CCl7VFRtroWNuXu8ZuZO7boKK6jgqOSs0edXCXgECAE= 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 1683279156077228.23809960511403; Fri, 5 May 2023 02:32:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1purnH-0008TG-Uq; Fri, 05 May 2023 05:32:03 -0400 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 1purnF-0008SA-FW; Fri, 05 May 2023 05:32:01 -0400 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 1purnC-0008QP-FK; Fri, 05 May 2023 05:32:01 -0400 Received: from pps.filterd (m0353724.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3459QnhG008417; Fri, 5 May 2023 09:31:56 GMT Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3qcy5ug3bd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 05 May 2023 09:31:56 +0000 Received: from m0353724.ppops.net (m0353724.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3459Rh27010845; Fri, 5 May 2023 09:31:55 GMT Received: from ppma02fra.de.ibm.com (47.49.7a9f.ip4.static.sl-reverse.com [159.122.73.71]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3qcy5ug3ar-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 05 May 2023 09:31:55 +0000 Received: from pps.filterd (ppma02fra.de.ibm.com [127.0.0.1]) by ppma02fra.de.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 34536EsK006798; Fri, 5 May 2023 09:31:53 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma02fra.de.ibm.com (PPS) with ESMTPS id 3q8tv6tsvp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 05 May 2023 09:31:53 +0000 Received: from smtpav03.fra02v.mail.ibm.com (smtpav03.fra02v.mail.ibm.com [10.20.54.102]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3459VpW141943334 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 5 May 2023 09:31:51 GMT Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6B3932004B; Fri, 5 May 2023 09:31:51 +0000 (GMT) Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B9B4520040; Fri, 5 May 2023 09:31:50 +0000 (GMT) Received: from heavy.boeblingen.de.ibm.com (unknown [9.171.69.208]) by smtpav03.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 5 May 2023 09:31:50 +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=FgflLlsNpaFafvG+mFLhDkjnuS4+z7KUOt2Vv4P/EWU=; b=THI8SxtXu2eH7ydFRXOw4fbblJan4ocIVnSmbWugNzdgstqoaMdqK5C8URAEEDJ3c2xA oF1B+TWQ14sy71tHJlE7FNuq2GGCh98wsmOmBH0N6/PUSawDCqTI+L+0Kpq6laHvsXrX jOAGBN/B9lSE+r/ky8Lg4Ag5nIMBRS/QjCBCXzq58ddeqoGw6UunsuDfZ+QA5mPqPNtp GQ4QaQjPAcMb5M8Z1eEmHFl78YDGACSXm/EA9OHf0B0+vUSJQJERbkReVtOO0XKv4zjb ui/iT0Vy34qBe+jl5YtRWOSE89caIa1NexQ0fjQ3hILhgrulm67WsSgEYMLEZ+x/o+jZ IQ== From: Ilya Leoshkevich To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , "Richard Henderson" , "David Hildenbrand" Cc: qemu-devel@nongnu.org, qemu-s390x@nongnu.org, =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= , "Peter Maydell" , Ilya Leoshkevich Subject: [PATCH v4 1/2] tests/tcg/multiarch: Make the system memory test work on big-endian Date: Fri, 5 May 2023 11:31:46 +0200 Message-Id: <20230505093147.869913-2-iii@linux.ibm.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230505093147.869913-1-iii@linux.ibm.com> References: <20230505093147.869913-1-iii@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: eoPMl1BKszh2loZgykqPtH7c_LQSDUKT X-Proofpoint-ORIG-GUID: i-nSQQAf01emIOu9ea80S7ieLdCMEFkV X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-05-05_15,2023-05-04_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 bulkscore=0 priorityscore=1501 suspectscore=0 malwarescore=0 phishscore=0 mlxscore=0 impostorscore=0 clxscore=1015 spamscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2305050074 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_H2=-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: 1683279158597100001 Content-Type: text/plain; charset="utf-8" Store the bytes in descending order on big-endian. Invert the logic in the multi-byte signed tests on big-endian. Make the checks in the multi-byte signed tests stricter. Signed-off-by: Ilya Leoshkevich --- tests/tcg/multiarch/system/memory.c | 64 +++++++++++++++++++---------- 1 file changed, 42 insertions(+), 22 deletions(-) diff --git a/tests/tcg/multiarch/system/memory.c b/tests/tcg/multiarch/syst= em/memory.c index 214f7d4f54b..eaae6929cb3 100644 --- a/tests/tcg/multiarch/system/memory.c +++ b/tests/tcg/multiarch/system/memory.c @@ -40,18 +40,21 @@ static void pdot(int count) } =20 /* - * Helper macros for shift/extract so we can keep our endian handling - * in one place. + * Helper macros for endian handling. */ -#define BYTE_SHIFT(b, pos) ((uint64_t)b << (pos * 8)) -#define BYTE_EXTRACT(b, pos) ((b >> (pos * 8)) & 0xff) +#if __BYTE_ORDER__ =3D=3D __ORDER_LITTLE_ENDIAN__ +#define BYTE_SHIFT(b, pos) (b << (pos * 8)) +#define BYTE_NEXT(b) ((b)++) +#elif __BYTE_ORDER__ =3D=3D __ORDER_BIG_ENDIAN__ +#define BYTE_SHIFT(b, pos) (b << ((sizeof(b) - 1 - (pos)) * 8)) +#define BYTE_NEXT(b) ((b)--) +#else +#error Unsupported __BYTE_ORDER__ +#endif =20 /* - * Fill the data with ascending value bytes. - * - * Currently we only support Little Endian machines so write in - * ascending address order. When we read higher address bytes should - * either be zero or higher than the lower bytes. + * Fill the data with ascending (for little-endian) or descending (for + * big-endian) value bytes. */ =20 static void init_test_data_u8(int unused_offset) @@ -62,14 +65,14 @@ static void init_test_data_u8(int unused_offset) =20 ml_printf("Filling test area with u8:"); for (i =3D 0; i < TEST_SIZE; i++) { - *ptr++ =3D count++; + *ptr++ =3D BYTE_NEXT(count); pdot(i); } ml_printf("done\n"); } =20 /* - * Full the data with alternating positive and negative bytes. This + * Fill the data with alternating positive and negative bytes. This * should mean for reads larger than a byte all subsequent reads will * stay either negative or positive. We never write 0. */ @@ -119,7 +122,7 @@ static void init_test_data_u16(int offset) reset_start_data(offset); =20 for (i =3D 0; i < max; i++) { - uint8_t low =3D count++, high =3D count++; + uint16_t low =3D BYTE_NEXT(count), high =3D BYTE_NEXT(count); word =3D BYTE_SHIFT(high, 1) | BYTE_SHIFT(low, 0); *ptr++ =3D word; pdot(i); @@ -139,9 +142,10 @@ static void init_test_data_u32(int offset) reset_start_data(offset); =20 for (i =3D 0; i < max; i++) { - uint8_t b4 =3D count++, b3 =3D count++; - uint8_t b2 =3D count++, b1 =3D count++; - word =3D BYTE_SHIFT(b1, 3) | BYTE_SHIFT(b2, 2) | BYTE_SHIFT(b3, 1)= | b4; + uint32_t b4 =3D BYTE_NEXT(count), b3 =3D BYTE_NEXT(count); + uint32_t b2 =3D BYTE_NEXT(count), b1 =3D BYTE_NEXT(count); + word =3D BYTE_SHIFT(b1, 3) | BYTE_SHIFT(b2, 2) | BYTE_SHIFT(b3, 1)= | + BYTE_SHIFT(b4, 0); *ptr++ =3D word; pdot(i); } @@ -160,13 +164,13 @@ static void init_test_data_u64(int offset) reset_start_data(offset); =20 for (i =3D 0; i < max; i++) { - uint8_t b8 =3D count++, b7 =3D count++; - uint8_t b6 =3D count++, b5 =3D count++; - uint8_t b4 =3D count++, b3 =3D count++; - uint8_t b2 =3D count++, b1 =3D count++; + uint64_t b8 =3D BYTE_NEXT(count), b7 =3D BYTE_NEXT(count); + uint64_t b6 =3D BYTE_NEXT(count), b5 =3D BYTE_NEXT(count); + uint64_t b4 =3D BYTE_NEXT(count), b3 =3D BYTE_NEXT(count); + uint64_t b2 =3D BYTE_NEXT(count), b1 =3D BYTE_NEXT(count); word =3D BYTE_SHIFT(b1, 7) | BYTE_SHIFT(b2, 6) | BYTE_SHIFT(b3, 5)= | BYTE_SHIFT(b4, 4) | BYTE_SHIFT(b5, 3) | BYTE_SHIFT(b6, 2) | - BYTE_SHIFT(b7, 1) | b8; + BYTE_SHIFT(b7, 1) | BYTE_SHIFT(b8, 0); *ptr++ =3D word; pdot(i); } @@ -374,12 +378,20 @@ static bool read_test_data_s16(int offset, bool neg_f= irst) ml_printf("Reading s16 from %#lx (offset %d, %s):", ptr, offset, neg_first ? "neg" : "pos"); =20 + /* + * If the first byte is negative, then the last byte is positive. + * Therefore the logic below must be flipped for big-endian. + */ +#if __BYTE_ORDER__ =3D=3D __ORDER_BIG_ENDIAN__ + neg_first =3D !neg_first; +#endif + for (i =3D 0; i < max; i++) { int32_t data =3D *ptr++; =20 if (neg_first && data < 0) { pdot(i); - } else if (data > 0) { + } else if (!neg_first && data > 0) { pdot(i); } else { ml_printf("Error %d %c 0\n", data, neg_first ? '<' : '>'); @@ -399,12 +411,20 @@ static bool read_test_data_s32(int offset, bool neg_f= irst) ml_printf("Reading s32 from %#lx (offset %d, %s):", ptr, offset, neg_first ? "neg" : "pos"); =20 + /* + * If the first byte is negative, then the last byte is positive. + * Therefore the logic below must be flipped for big-endian. + */ +#if __BYTE_ORDER__ =3D=3D __ORDER_BIG_ENDIAN__ + neg_first =3D !neg_first; +#endif + for (i =3D 0; i < max; i++) { int64_t data =3D *ptr++; =20 if (neg_first && data < 0) { pdot(i); - } else if (data > 0) { + } else if (!neg_first && data > 0) { pdot(i); } else { ml_printf("Error %d %c 0\n", data, neg_first ? '<' : '>'); --=20 2.40.1 From nobody Sat May 18 11:25:53 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=1683279190; cv=none; d=zohomail.com; s=zohoarc; b=BGrfqP7r49h2jwKwxxpCBf/OK8C8JbPVxeubS8AaLpv+swfO9thj/GdPeqpepKBMHg4kWGnpWKzGu2dSfqUOjSlg65VyRYezqlIFZqRew14Lhha2V22GX4Ai0nCbFBDM4tAK6Y8Hkco7xqQrKcaAgYkUFkyK6MsWXKUhMZxsHwo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683279190; 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; bh=GflQnea0NiKhRg08bhzwW8Fte3GNyv8V6GpYLiFkID4=; b=CBHsDZqdUbDJdXOXxRIqWFvW1P2B9Kr3qo7udNdpQCuDPfhSWMIVTAyVC8Wbxf0EvUS/NOmBECmzhbEiuPWLjr23UzWCgEQtP9m05iz1mIg3DCMDfE8A6FVGgbHEURlbe8eEgahKh0NMcfIbJPFbKiTDwdXF09qfnfnmY/FKUzo= 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 1683279190181162.5748296544765; Fri, 5 May 2023 02:33:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1purnI-0008Te-10; Fri, 05 May 2023 05:32:04 -0400 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 1purnF-0008SP-Nq; Fri, 05 May 2023 05:32:01 -0400 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 1purnE-0008Ql-1I; Fri, 05 May 2023 05:32:01 -0400 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 3458hrMM020513; Fri, 5 May 2023 09:31:58 GMT Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3qcxhsh8k0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 05 May 2023 09:31:58 +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 345988e5008195; Fri, 5 May 2023 09:31:57 GMT Received: from ppma01fra.de.ibm.com (46.49.7a9f.ip4.static.sl-reverse.com [159.122.73.70]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3qcxhsh8je-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 05 May 2023 09:31:57 +0000 Received: from pps.filterd (ppma01fra.de.ibm.com [127.0.0.1]) by ppma01fra.de.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3457ZN8G002671; Fri, 5 May 2023 09:31:56 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma01fra.de.ibm.com (PPS) with ESMTPS id 3q8tv6tspx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 05 May 2023 09:31:55 +0000 Received: from smtpav03.fra02v.mail.ibm.com (smtpav03.fra02v.mail.ibm.com [10.20.54.102]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3459VrjE37028286 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 5 May 2023 09:31:53 GMT Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 98A3E20043; Fri, 5 May 2023 09:31:53 +0000 (GMT) Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E5F7D20040; Fri, 5 May 2023 09:31:52 +0000 (GMT) Received: from heavy.boeblingen.de.ibm.com (unknown [9.171.69.208]) by smtpav03.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 5 May 2023 09:31:52 +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=GflQnea0NiKhRg08bhzwW8Fte3GNyv8V6GpYLiFkID4=; b=ZFqoaoj6hNK7hZYVQYl8rLkbXeKodRpKRzfsQNQw57ftlbVXlXCOT+GJPam0izpzwEfe dFyTGUko/ufjUxf2fOBW9YryIrkCI8sb5Ss4winU0sjerVX0zCDcSFqtM/OJMMPRkGTf Q69LUAsrcUGpwPZgPPb88P4Lx45IJAue/0v0ZUjyiY3OsHw234Vf9Lzr9+frBTyYqYqc 9j45k0EMJstRWHM/VpssJlL1bzOxBvDExZHBALxcf0u0xc/55tGu2T4SYDUv0S+rtOWV eAktLVZKO9jgiN8xYZkAOXSrb3s2pEd68eOfRgyzag0EBXjLwuIwECxRvaPD8oip1jrc 8Q== From: Ilya Leoshkevich To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , "Richard Henderson" , "David Hildenbrand" Cc: qemu-devel@nongnu.org, qemu-s390x@nongnu.org, =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= , "Peter Maydell" , Ilya Leoshkevich Subject: [PATCH v4 2/2] tests/tcg/s390x: Enable the multiarch system tests Date: Fri, 5 May 2023 11:31:47 +0200 Message-Id: <20230505093147.869913-3-iii@linux.ibm.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230505093147.869913-1-iii@linux.ibm.com> References: <20230505093147.869913-1-iii@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: omXFnpLFIluRAegY8Pks2Klcfku3vO9u X-Proofpoint-GUID: a6ZjPfRWIwzYH12CAqCe7laHfS6qYIT5 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-05-05_15,2023-05-04_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 clxscore=1015 priorityscore=1501 malwarescore=0 mlxlogscore=999 spamscore=0 suspectscore=0 mlxscore=0 impostorscore=0 bulkscore=0 adultscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2305050074 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_H2=-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: 1683279190694100002 Content-Type: text/plain; charset="utf-8" Multiarch tests are written in C and need support for printing characters. Instead of implementing the runtime from scratch, just reuse the pc-bios/s390-ccw one. Run tests with -nographic in order to enable SCLP (enable this for the existing tests as well, since it does not hurt). Use the default linker script for the new tests. Signed-off-by: Ilya Leoshkevich Reviewed-by: Richard Henderson --- tests/tcg/s390x/Makefile.softmmu-target | 40 ++++++++++++++++--------- tests/tcg/s390x/console.c | 12 ++++++++ tests/tcg/s390x/head64.S | 31 +++++++++++++++++++ 3 files changed, 69 insertions(+), 14 deletions(-) create mode 100644 tests/tcg/s390x/console.c create mode 100644 tests/tcg/s390x/head64.S diff --git a/tests/tcg/s390x/Makefile.softmmu-target b/tests/tcg/s390x/Make= file.softmmu-target index 192315dd20a..44dfd716291 100644 --- a/tests/tcg/s390x/Makefile.softmmu-target +++ b/tests/tcg/s390x/Makefile.softmmu-target @@ -1,28 +1,40 @@ S390X_SRC=3D$(SRC_PATH)/tests/tcg/s390x VPATH+=3D$(S390X_SRC) -QEMU_OPTS=3D-action panic=3Dexit-failure -kernel +QEMU_OPTS=3D-action panic=3Dexit-failure -nographic -kernel LINK_SCRIPT=3D$(S390X_SRC)/softmmu.ld -LDFLAGS=3D-nostdlib -static -Wl,-T$(LINK_SCRIPT) -Wl,--build-id=3Dnone +CFLAGS+=3D-ggdb -O0 +LDFLAGS=3D-nostdlib -static =20 %.o: %.S $(CC) -march=3Dz13 -m64 -c $< -o $@ =20 -%: %.o $(LINK_SCRIPT) +%.o: %.c + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -march=3Dz13 -m64 -c $< -o $@ + +%: %.o $(CC) $< -o $@ $(LDFLAGS) =20 -TESTS +=3D unaligned-lowcore -TESTS +=3D bal -TESTS +=3D sam -TESTS +=3D lpsw -TESTS +=3D lpswe-early -TESTS +=3D ssm-early -TESTS +=3D stosm-early -TESTS +=3D exrl-ssm-early +ASM_TESTS =3D = \ + bal = \ + exrl-ssm-early = \ + sam = \ + lpsw = \ + lpswe-early = \ + ssm-early = \ + stosm-early = \ + unaligned-lowcore =20 include $(S390X_SRC)/pgm-specification.mak $(PGM_SPECIFICATION_TESTS): pgm-specification-softmmu.o $(PGM_SPECIFICATION_TESTS): LDFLAGS+=3Dpgm-specification-softmmu.o -TESTS +=3D $(PGM_SPECIFICATION_TESTS) +ASM_TESTS +=3D $(PGM_SPECIFICATION_TESTS) + +$(ASM_TESTS): LDFLAGS +=3D -Wl,-T$(LINK_SCRIPT) -Wl,--build-id=3Dnone +$(ASM_TESTS): $(LINK_SCRIPT) +TESTS +=3D $(ASM_TESTS) =20 -# We don't currently support the multiarch system tests -undefine MULTIARCH_TESTS +S390X_MULTIARCH_RUNTIME_OBJS =3D head64.o console.o $(MINILIB_OBJS) +$(MULTIARCH_TESTS): $(S390X_MULTIARCH_RUNTIME_OBJS) +$(MULTIARCH_TESTS): LDFLAGS +=3D $(S390X_MULTIARCH_RUNTIME_OBJS) +$(MULTIARCH_TESTS): CFLAGS +=3D $(MINILIB_INC) +memory: CFLAGS +=3D -DCHECK_UNALIGNED=3D0 diff --git a/tests/tcg/s390x/console.c b/tests/tcg/s390x/console.c new file mode 100644 index 00000000000..d43ce3f44b4 --- /dev/null +++ b/tests/tcg/s390x/console.c @@ -0,0 +1,12 @@ +/* + * Console code for multiarch tests. + * Reuses the pc-bios/s390-ccw implementation. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ +#include "../../../pc-bios/s390-ccw/sclp.c" + +void __sys_outc(char c) +{ + write(1, &c, sizeof(c)); +} diff --git a/tests/tcg/s390x/head64.S b/tests/tcg/s390x/head64.S new file mode 100644 index 00000000000..c6f36dfea4b --- /dev/null +++ b/tests/tcg/s390x/head64.S @@ -0,0 +1,31 @@ +/* + * Startup code for multiarch tests. + * Reuses the pc-bios/s390-ccw implementation. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ +#define main main_pre +#include "../../../pc-bios/s390-ccw/start.S" +#undef main + +main_pre: + aghi %r15,-160 /* reserve stack for C code */ + brasl %r14,sclp_setup + brasl %r14,main + larl %r1,success_psw /* check main() return code */ + ltgr %r2,%r2 + je 0f + larl %r1,failure_psw +0: + lpswe 0(%r1) + + .align 8 +success_psw: + .quad 0x2000180000000,0xfff /* see is_special_wait_psw() */ +failure_psw: + .quad 0x2000180000000,0 /* disabled wait */ + + .section .bss + .align 0x1000 +stack: + .skip 0x8000 --=20 2.40.1