From nobody Sat May 18 12:30:07 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=1683805640; cv=none; d=zohomail.com; s=zohoarc; b=i6rxGlm6eQd3w3QK1GY21ogA3A0umILEpObOV7G1NZglOyRNytuOpVOynRJ8VkkrXsMzs8SM/jXFkhuB1an6TzhrBxEZV7XGx679F2o8+iC2sM512kiytE5K4ghyTR7uHN3KsJ2iDTRED9wP23auMryTlZSOqv15DrtrNEJsA64= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683805640; 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=fI+6G89R4+TwOY8g1LVbhz+kgI5ZTj3L+LeVjphJIo0=; b=aVKYrK9ulx4WLhUmBHxYocss+LJElZmGQiWDx9TNxZGpeYDoscy73L85kryR6GekLKQ7gLYwxqcP9oxVp5uVYW6QBMDeGYj2Oc/hX3bAcs3HEepbU48bKP12ewYAwLrijgvrkXyeIW1vW1OOIUHDAeVpFePBrcf0Wei4n/b0uec= 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 1683805640298975.214341334895; Thu, 11 May 2023 04:47:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1px4lJ-0005e2-8J; Thu, 11 May 2023 07:47:14 -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 1px4lH-0005dQ-IN; Thu, 11 May 2023 07:47:07 -0400 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 1px4lF-0006zG-Nu; Thu, 11 May 2023 07:47:07 -0400 Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34BBgAjW008865; Thu, 11 May 2023 11:47:02 GMT Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3qgyqdg57h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 11 May 2023 11:47:02 +0000 Received: from m0356517.ppops.net (m0356517.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 34BBgOG5009400; Thu, 11 May 2023 11:47:02 GMT Received: from ppma04fra.de.ibm.com (6a.4a.5195.ip4.static.sl-reverse.com [149.81.74.106]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3qgyqdg569-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 11 May 2023 11:47:01 +0000 Received: from pps.filterd (ppma04fra.de.ibm.com [127.0.0.1]) by ppma04fra.de.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 34B7Y2MO013391; Thu, 11 May 2023 11:46:59 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma04fra.de.ibm.com (PPS) with ESMTPS id 3qf7d1sc9r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 11 May 2023 11:46:59 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 34BBkuFn56426968 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 11 May 2023 11:46:56 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C6ED020049; Thu, 11 May 2023 11:46:56 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3C17220040; Thu, 11 May 2023 11:46:56 +0000 (GMT) Received: from heavy.boeblingen.de.ibm.com (unknown [9.171.14.79]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 11 May 2023 11:46:56 +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-type : content-transfer-encoding; s=pp1; bh=fI+6G89R4+TwOY8g1LVbhz+kgI5ZTj3L+LeVjphJIo0=; b=IVfXdVTuTJIvVjXEbNvHowrRqz/Xo1/wsA4Dcl4iS2QCJtMxsQxpNsHa3OLnqURS338q PWqJWqmx10ZDIxVNZAIjfq4sRi7asKjjpq79+C/DPA7UGIKsw3OgymYMrJTr55YDsYDE In050c1meunylgMfVbbyGJMjOB4F0lekFHyxP+35rajOrIAPmHCpBO0h70QCx+dXl4W1 o9qFlxBNAFEvO1Xr03y78fD3PH+tQ7cTEMlTAo25IayJKXJYRNR0UvZvEwVYvOSjBnMf 5C6PopwSS6nTpskFMJm6VLkLKBwqmP8QBon/wnncP0FfdOUGRd8muE4A1wREO2uMU9ka Gg== 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 v5 1/2] tests/tcg/multiarch: Make the system memory test work on big-endian Date: Thu, 11 May 2023 13:46:50 +0200 Message-Id: <20230511114651.439872-2-iii@linux.ibm.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230511114651.439872-1-iii@linux.ibm.com> References: <20230511114651.439872-1-iii@linux.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: Hk8epc7K0zawtYlfoLXFh1ESOtAxe6-6 X-Proofpoint-GUID: 9bTNOxPvhAnJTSTCRQZdzW6eb1FD2Ybn 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-11_08,2023-05-05_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 spamscore=0 clxscore=1015 bulkscore=0 priorityscore=1501 adultscore=0 suspectscore=0 lowpriorityscore=0 impostorscore=0 malwarescore=0 mlxscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305110099 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_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: 1683805642062100007 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. Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Ilya Leoshkevich --- tests/tcg/multiarch/system/memory.c | 67 ++++++++++++++++++----------- 1 file changed, 43 insertions(+), 24 deletions(-) diff --git a/tests/tcg/multiarch/system/memory.c b/tests/tcg/multiarch/syst= em/memory.c index 214f7d4f54b..e29786ae559 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 ? '<' : '>'); @@ -419,8 +439,7 @@ static bool read_test_data_s32(int offset, bool neg_fir= st) * Read the test data and verify at various offsets * * For everything except bytes all our reads should be either positive - * or negative depending on what offset we are reading from. Currently - * we only handle LE systems. + * or negative depending on what offset we are reading from. */ read_sfn read_sfns[] =3D { read_test_data_s8, read_test_data_s16, --=20 2.40.1 From nobody Sat May 18 12:30:07 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=1683805660; cv=none; d=zohomail.com; s=zohoarc; b=l+XjbvDSHTTgp32kofEhjXMda+KVtQZTCVVlB5AgKXZZuSrxWGZqfesp/qV+L6ckual3fFYAIpa4U7+CPzELzJNql2ywB/44o8HaP+rdXBvvqNHzK3vdUxMpqgbMxt1CPczTSdku0c0ns78lCH3uJrCcNTTlslzyzZd5AvVpNYY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683805660; 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=fNnUgAbu40T9UwYnZ1jp1Oijt566KlWLMPgXf+HaFLSXTmInlEjGaG2MhaVJ2OzG0Jb8igN3s5/d+DQBV0HSFw1ImmLG4Ivt4GVzbx+GL1mgRlj8yrlJpXPI3IS0HC7D93kFV2nBRflVvj+jOf/BpO7BIJ2idaxFR0JCx129FDc= 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 1683805660798728.4949408295294; Thu, 11 May 2023 04:47:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1px4lR-0005pQ-78; Thu, 11 May 2023 07:47:17 -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 1px4lJ-0005eG-CZ; Thu, 11 May 2023 07:47:14 -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 1px4lH-0006zW-JZ; Thu, 11 May 2023 07:47:09 -0400 Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34BBduCv012326; Thu, 11 May 2023 11:47:06 GMT Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3qgygcrf76-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 11 May 2023 11:47:05 +0000 Received: from m0353725.ppops.net (m0353725.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 34BBeIX4015214; Thu, 11 May 2023 11:47:05 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 3qgygcrf6a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 11 May 2023 11:47:04 +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 34B3PNNK000991; Thu, 11 May 2023 11:47:03 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma01fra.de.ibm.com (PPS) with ESMTPS id 3qf7e0sc3p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 11 May 2023 11:47:03 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 34BBl08i918186 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 11 May 2023 11:47:00 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9D3F52004B; Thu, 11 May 2023 11:47:00 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id F108020040; Thu, 11 May 2023 11:46:59 +0000 (GMT) Received: from heavy.boeblingen.de.ibm.com (unknown [9.171.14.79]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 11 May 2023 11:46:59 +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=RfFt086ByHDE622ij7LM+0tFckzyzHJfz4PhELEBC3B8k8IdOV+6UnEowuus6TpbLVhm 0f5PccuasVBXfRYS2XXtsRgISy3qnZst1U3bJq49nR3fDPIFgaIGUrzockzTghJTK/Qw ISxMaR0TWItdTpO5MOZ0CDEozjPYE6fWSX4GC50S51rnRAvTojni47TudaVeuQA89UGi C0bOKTzPMeaAZ4XxJUDb40p2vPFvDpBDSEo3I1B4cWxNHWgOCfi1kzwrf4ZFRAB3JWJr ia7rNRoYvCVr8HisFol6kijkEz5i4//1rS0wF0HHD33vDmUrj+Z3GVMMBQLfXHmJBUtg UA== 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 v5 2/2] tests/tcg/s390x: Enable the multiarch system tests Date: Thu, 11 May 2023 13:46:51 +0200 Message-Id: <20230511114651.439872-3-iii@linux.ibm.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230511114651.439872-1-iii@linux.ibm.com> References: <20230511114651.439872-1-iii@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: fpKiB_FJrr3rDgls87T13nA5cJL1R2oO X-Proofpoint-ORIG-GUID: HJyIuW4jpiR-Tz2rjK_bJXzZ4F-VnB3O 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-11_08,2023-05-05_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 mlxlogscore=999 bulkscore=0 phishscore=0 adultscore=0 mlxscore=0 spamscore=0 impostorscore=0 priorityscore=1501 clxscore=1015 malwarescore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305110099 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: 1683805662768100003 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