From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by sourceware.org (Postfix) with ESMTPS id 4D6623858D33 for ; Thu, 2 Mar 2023 18:14:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4D6623858D33 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linux.ibm.com Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 322ICAqV030584 for ; Thu, 2 Mar 2023 18:13:59 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=message-id : date : mime-version : to : from : subject : content-type : content-transfer-encoding; s=pp1; bh=6+cUOMJyXsplS7si09cxmAOnBAINbdsW2IERy3eYqYY=; b=tuBcOt/u10GwgICb54lInaDnPNKSxrq62l6Ow8mNWGjLTs8JH4qERDyDywH9IVdisGcc aL05YIan50Wt6GpEkmfBG9Bpr625DphhDVsj6cIglL7Brkv9w8peZty2wi7GlcydStT0 dY45eRNmKt4QUuEiVKv08L/nQvCQ68SKsiRQA0t30ExRY00jOpbwUVIrpsGKsZqEOPHn tZJjcd00KicjXsk/4LHPbqyp67p0xBFoEYw4E0Wuoy9dIGMPFS3lKyGIXYYnSD8+lZ57 w1FNc9B4IW3uN5hhfT3nWdUxlFd+VRP12qToLjdb+1Y4PYYqOLZ+Ohs8KduCsYbv4A1n Dw== Received: from ppma06ams.nl.ibm.com (66.31.33a9.ip4.static.sl-reverse.com [169.51.49.102]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3p30vd81gr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 02 Mar 2023 18:13:58 +0000 Received: from pps.filterd (ppma06ams.nl.ibm.com [127.0.0.1]) by ppma06ams.nl.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 322DKgEr014801 for ; Thu, 2 Mar 2023 18:13:57 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma06ams.nl.ibm.com (PPS) with ESMTPS id 3nybcq64vs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 02 Mar 2023 18:13:56 +0000 Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 322IDreN1507996 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 2 Mar 2023 18:13:53 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6FFDA20043; Thu, 2 Mar 2023 18:13:53 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3A9BE20040; Thu, 2 Mar 2023 18:13:53 +0000 (GMT) Received: from [9.179.14.44] (unknown [9.179.14.44]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTPS; Thu, 2 Mar 2023 18:13:53 +0000 (GMT) Message-ID: <3d239f06-9289-b54b-515f-f77ba69c07fe@linux.ibm.com> Date: Thu, 2 Mar 2023 19:13:52 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.7.1 Content-Language: en-US To: GCC Patches , Andreas Krebbel From: Robin Dapp Subject: [PATCH] s390: Fix ifcvt test cases Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: Gon_dWcpxNIU0S0PgirG_o6fdK88Hmau X-Proofpoint-ORIG-GUID: Gon_dWcpxNIU0S0PgirG_o6fdK88Hmau X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-02_10,2023-03-02_02,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 priorityscore=1501 malwarescore=0 bulkscore=0 impostorscore=0 adultscore=0 mlxscore=0 spamscore=0 suspectscore=0 mlxlogscore=930 phishscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2303020152 X-Spam-Status: No, score=-12.0 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.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Hi, we seem to flip flop between the "high" and "not low" variants of load on condition. Accept both in the affected test cases. Going to commit this as obvious. Regards Robin -- gcc/testsuite/ChangeLog: * gcc.target/s390/ifcvt-two-insns-bool.c: Allow "high" and "not low or equal" load on condition variant. * gcc.target/s390/ifcvt-two-insns-int.c: Dito. * gcc.target/s390/ifcvt-two-insns-long.c: Dito. --- gcc/testsuite/gcc.target/s390/ifcvt-two-insns-bool.c | 4 ++-- gcc/testsuite/gcc.target/s390/ifcvt-two-insns-int.c | 4 ++-- gcc/testsuite/gcc.target/s390/ifcvt-two-insns-long.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gcc/testsuite/gcc.target/s390/ifcvt-two-insns-bool.c b/gcc/testsuite/gcc.target/s390/ifcvt-two-insns-bool.c index 1027ddceb935..a56bc4676143 100644 --- a/gcc/testsuite/gcc.target/s390/ifcvt-two-insns-bool.c +++ b/gcc/testsuite/gcc.target/s390/ifcvt-two-insns-bool.c @@ -3,8 +3,8 @@ /* { dg-do run } */ /* { dg-options "-O2 -march=z13 -mzarch --save-temps" } */ -/* { dg-final { scan-assembler "lochih\t%r.?,1" } } */ -/* { dg-final { scan-assembler "locrh\t.*" } } */ +/* { dg-final { scan-assembler "lochi(?:h|nle)\t%r.?,1" } } */ +/* { dg-final { scan-assembler "locr(?:h|nle)\t.*" } } */ #include #include #include diff --git a/gcc/testsuite/gcc.target/s390/ifcvt-two-insns-int.c b/gcc/testsuite/gcc.target/s390/ifcvt-two-insns-int.c index fc6946f2466d..64b8a732290e 100644 --- a/gcc/testsuite/gcc.target/s390/ifcvt-two-insns-int.c +++ b/gcc/testsuite/gcc.target/s390/ifcvt-two-insns-int.c @@ -3,8 +3,8 @@ /* { dg-do run } */ /* { dg-options "-O2 -march=z13 -mzarch --save-temps" } */ -/* { dg-final { scan-assembler "lochih\t%r.?,1" } } */ -/* { dg-final { scan-assembler "locrh\t.*" } } */ +/* { dg-final { scan-assembler "lochi(h|nle)\t%r.?,1" } } */ +/* { dg-final { scan-assembler "locr(?:h|nle)\t.*" } } */ #include #include #include diff --git a/gcc/testsuite/gcc.target/s390/ifcvt-two-insns-long.c b/gcc/testsuite/gcc.target/s390/ifcvt-two-insns-long.c index 51af4985247a..f2d784e762a8 100644 --- a/gcc/testsuite/gcc.target/s390/ifcvt-two-insns-long.c +++ b/gcc/testsuite/gcc.target/s390/ifcvt-two-insns-long.c @@ -3,8 +3,8 @@ /* { dg-do run } */ /* { dg-options "-O2 -march=z13 -mzarch --save-temps" } */ -/* { dg-final { scan-assembler "locghih\t%r.?,1" } } */ -/* { dg-final { scan-assembler "locgrh\t.*" } } */ +/* { dg-final { scan-assembler "locghi(?:h|nle)\t%r.?,1" } } */ +/* { dg-final { scan-assembler "locgr(?:h|nle)\t.*" } } */ #include #include -- 2.39.1