From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by sourceware.org (Postfix) with ESMTPS id F27E839AD81A; Fri, 23 Jul 2021 12:47:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org F27E839AD81A Received: from pps.filterd (m0098416.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 16NCYEtf070416; Fri, 23 Jul 2021 08:47:54 -0400 Received: from ppma06ams.nl.ibm.com (66.31.33a9.ip4.static.sl-reverse.com [169.51.49.102]) by mx0b-001b2d01.pphosted.com with ESMTP id 39yw5s1ykv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 23 Jul 2021 08:47:54 -0400 Received: from pps.filterd (ppma06ams.nl.ibm.com [127.0.0.1]) by ppma06ams.nl.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 16NCbEJE016889; Fri, 23 Jul 2021 12:47:52 GMT Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by ppma06ams.nl.ibm.com with ESMTP id 39vng72npj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 23 Jul 2021 12:47:52 +0000 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 16NClnaa28377416 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 23 Jul 2021 12:47:49 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BE73C4C046; Fri, 23 Jul 2021 12:47:49 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 66E3C4C044; Fri, 23 Jul 2021 12:47:49 +0000 (GMT) Received: from vm.lan (unknown [9.145.77.113]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP; Fri, 23 Jul 2021 12:47:49 +0000 (GMT) From: Ilya Leoshkevich To: Andreas Krebbel Cc: gcc-patches@gcc.gnu.org, Ilya Leoshkevich Subject: [PATCH] IBM Z: Fix 5 tests in 31-bit mode Date: Fri, 23 Jul 2021 14:47:44 +0200 Message-Id: <20210723124744.106949-1-iii@linux.ibm.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: hSE8S0hYoWux5ICvBqULUgjrXn7Tdr4E X-Proofpoint-ORIG-GUID: hSE8S0hYoWux5ICvBqULUgjrXn7Tdr4E X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391, 18.0.790 definitions=2021-07-23_05:2021-07-23, 2021-07-23 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 mlxscore=0 lowpriorityscore=0 clxscore=1015 priorityscore=1501 adultscore=0 impostorscore=0 malwarescore=0 mlxlogscore=999 phishscore=0 suspectscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2107230074 X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Jul 2021 12:47:56 -0000 Bootstrapped and regtested on s390x-redhat-linux. Ok for master? gcc/testsuite/ChangeLog: * gcc.target/s390/global-array-element-pic2.c: Add -mzarch, add an expectation for 31-bit mode. * gcc.target/s390/load-imm64-1.c: Use unsigned long long. * gcc.target/s390/load-imm64-2.c: Likewise. * gcc.target/s390/vector/long-double-vx-macro-off-on.c: Use -mzarch. * gcc.target/s390/vector/long-double-vx-macro-on-off.c: Likewise. --- gcc/testsuite/gcc.target/s390/global-array-element-pic2.c | 5 +++-- gcc/testsuite/gcc.target/s390/load-imm64-1.c | 4 ++-- gcc/testsuite/gcc.target/s390/load-imm64-2.c | 4 ++-- .../gcc.target/s390/vector/long-double-vx-macro-off-on.c | 2 +- .../gcc.target/s390/vector/long-double-vx-macro-on-off.c | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/gcc/testsuite/gcc.target/s390/global-array-element-pic2.c b/gcc/testsuite/gcc.target/s390/global-array-element-pic2.c index 72b87d40b85..0ee10841cac 100644 --- a/gcc/testsuite/gcc.target/s390/global-array-element-pic2.c +++ b/gcc/testsuite/gcc.target/s390/global-array-element-pic2.c @@ -1,6 +1,6 @@ /* Test accesses to global array elements in PIC code. */ /* { dg-do compile } */ -/* { dg-options "-O1 -march=z10 -fPIC" } */ +/* { dg-options "-O1 -march=z10 -mzarch -fPIC" } */ extern char a[] __attribute__ ((aligned (2))); extern char *b; @@ -8,6 +8,7 @@ extern char *b; void c() { b = a + 4; - /* { dg-final { scan-assembler "(?n)\n\tlgrl\t%r\\d+,a@GOTENT\n" } } */ + /* { dg-final { scan-assembler "(?n)\n\tlgrl\t%r\\d+,a@GOTENT\n" { target lp64 } } } */ + /* { dg-final { scan-assembler "(?n)\n\tlrl\t%r\\d+,a@GOTENT\n" { target { ! lp64 } } } } */ /* { dg-final { scan-assembler-not "(?n)\n\tlarl\t%r\\d+,a\[^@\]" } } */ } diff --git a/gcc/testsuite/gcc.target/s390/load-imm64-1.c b/gcc/testsuite/gcc.target/s390/load-imm64-1.c index 03d17f59096..8e812f2f01d 100644 --- a/gcc/testsuite/gcc.target/s390/load-imm64-1.c +++ b/gcc/testsuite/gcc.target/s390/load-imm64-1.c @@ -4,10 +4,10 @@ /* { dg-do compile } */ /* { dg-options "-O3 -march=z9-109" } */ -unsigned long +unsigned long long magic (void) { - return 0x3f08c5392f756cd; + return 0x3f08c5392f756cdULL; } /* { dg-final { scan-assembler-times {\n\tllihf\t} 1 { target lp64 } } } */ diff --git a/gcc/testsuite/gcc.target/s390/load-imm64-2.c b/gcc/testsuite/gcc.target/s390/load-imm64-2.c index ee0ff3b0a91..c3536b4d031 100644 --- a/gcc/testsuite/gcc.target/s390/load-imm64-2.c +++ b/gcc/testsuite/gcc.target/s390/load-imm64-2.c @@ -4,10 +4,10 @@ /* { dg-do compile } */ /* { dg-options "-O3 -march=z10" } */ -unsigned long +unsigned long long magic (void) { - return 0x3f08c5392f756cd; + return 0x3f08c5392f756cdULL; } /* { dg-final { scan-assembler-times {\n\tllihf\t} 1 { target lp64 } } } */ diff --git a/gcc/testsuite/gcc.target/s390/vector/long-double-vx-macro-off-on.c b/gcc/testsuite/gcc.target/s390/vector/long-double-vx-macro-off-on.c index 2d67679bb11..513912e669d 100644 --- a/gcc/testsuite/gcc.target/s390/vector/long-double-vx-macro-off-on.c +++ b/gcc/testsuite/gcc.target/s390/vector/long-double-vx-macro-off-on.c @@ -1,6 +1,6 @@ /* { dg-do compile } */ /* { dg-require-effective-target target_attribute } */ -/* { dg-options "-march=z14" } */ +/* { dg-options "-march=z14 -mzarch" } */ #if !defined(__LONG_DOUBLE_VX__) #error #endif diff --git a/gcc/testsuite/gcc.target/s390/vector/long-double-vx-macro-on-off.c b/gcc/testsuite/gcc.target/s390/vector/long-double-vx-macro-on-off.c index 6f264313408..6b3cb321338 100644 --- a/gcc/testsuite/gcc.target/s390/vector/long-double-vx-macro-on-off.c +++ b/gcc/testsuite/gcc.target/s390/vector/long-double-vx-macro-on-off.c @@ -1,6 +1,6 @@ /* { dg-do compile } */ /* { dg-require-effective-target target_attribute } */ -/* { dg-options "-march=z13" } */ +/* { dg-options "-march=z13 -mzarch" } */ #if defined(__LONG_DOUBLE_VX__) #error #endif -- 2.31.1