From patchwork Mon Apr 4 11:52:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robin Dapp X-Patchwork-Id: 52618 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C306B385800E for ; Mon, 4 Apr 2022 11:54:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C306B385800E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1649073262; bh=7DbL2QFH5Ts/J5mIIHGvdM+cDsfews/5ZokfeOLxp4Q=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=Jm/343cfOuFCv2762nsZEgHnukXHjgcHd/w/QXGslkwvMwC4SWpv9JEmelwnoa0IZ yVC1gEUDr/QVhk+PDm/7UOihuqMIKU7rrjU7odAV2caSJ/YR2GG9/9QrrKxoJl2mK8 hpcZats6LU+yvJQPvmmcyfnItC0RXgY8HzLt5KJk= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by sourceware.org (Postfix) with ESMTPS id C2B8D3857C43 for ; Mon, 4 Apr 2022 11:52:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C2B8D3857C43 Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 234Bj4L3022249 for ; Mon, 4 Apr 2022 11:52:07 GMT Received: from ppma03ams.nl.ibm.com (62.31.33a9.ip4.static.sl-reverse.com [169.51.49.98]) by mx0a-001b2d01.pphosted.com with ESMTP id 3f6yyds9mf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 04 Apr 2022 11:52:07 +0000 Received: from pps.filterd (ppma03ams.nl.ibm.com [127.0.0.1]) by ppma03ams.nl.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 234BhUmj025858 for ; Mon, 4 Apr 2022 11:52:05 GMT Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by ppma03ams.nl.ibm.com with ESMTP id 3f6e48ujp1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 04 Apr 2022 11:52:05 +0000 Received: from b06wcsmtp001.portsmouth.uk.ibm.com (b06wcsmtp001.portsmouth.uk.ibm.com [9.149.105.160]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 234Bq2HC20381964 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 4 Apr 2022 11:52:02 GMT Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1C62AA4054; Mon, 4 Apr 2022 11:52:02 +0000 (GMT) Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id ED33AA405C; Mon, 4 Apr 2022 11:52:01 +0000 (GMT) Received: from [9.171.81.155] (unknown [9.171.81.155]) by b06wcsmtp001.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Mon, 4 Apr 2022 11:52:01 +0000 (GMT) Message-ID: <9c253c2d-ea33-fd62-03ca-caf60c5902d5@linux.ibm.com> Date: Mon, 4 Apr 2022 13:52:01 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Content-Language: en-US To: GCC Patches , Andreas Krebbel Subject: [PATCH] testsuite/s390: Adapt test expections. X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: 6FT-cb2Z_W-CXzqe9I76pG-oSDccaxOn X-Proofpoint-GUID: 6FT-cb2Z_W-CXzqe9I76pG-oSDccaxOn X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.850,Hydra:6.0.425,FMLib:17.11.64.514 definitions=2022-04-04_03,2022-03-31_01,2022-02-23_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 bulkscore=0 adultscore=0 mlxscore=0 spamscore=0 clxscore=1015 mlxlogscore=999 impostorscore=0 phishscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2204040065 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_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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-Patchwork-Original-From: Robin Dapp via Gcc-patches From: Robin Dapp Reply-To: Robin Dapp Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Hi, some tests expect a convert instruction but nowadays the conversion is already done at compile time. This results in a literal-pool load. Change the tests accordingly. OK for trunk? Regards Robin gcc/testsuite/ChangeLog: * gcc.target/s390/zvector/vec-double-compile.c: Expect vl instead of vc*. * gcc.target/s390/zvector/vec-float-compile.c: Dito. * gcc.target/s390/zvector/vec-signed-compile.c: Dito. * gcc.target/s390/zvector/vec-unsigned-compile.c: Dito. --- { @@ -43,5 +48,5 @@ vclgdb_imm () return vec_unsigned ((vector double){ 1.0, 2.0 }); } -/* { dg-final { scan-assembler-times "vclfeb\t" 3 } } */ -/* { dg-final { scan-assembler-times "vclgdb\t" 3 } } */ +/* { dg-final { scan-assembler-times "vclfeb\t" 2 } } */ +/* { dg-final { scan-assembler-times "vclgdb\t" 2 } } */ diff --git a/gcc/testsuite/gcc.target/s390/zvector/vec-double-compile.c b/gcc/testsuite/gcc.target/s390/zvector/vec-double-compile.c index 0a70b095b88..24a49474e38 100644 --- a/gcc/testsuite/gcc.target/s390/zvector/vec-double-compile.c +++ b/gcc/testsuite/gcc.target/s390/zvector/vec-double-compile.c @@ -31,6 +31,11 @@ vcdlgb_mem (vector unsigned long long *a) return vec_double (*a); } +/* Since r12-4475-g247c407c83f001 the following immediates are being + converted and directly stored in the literal pool so no explicit + conversion is necessary. */ +/* { dg-final { scan-assembler-times "vl\t%v\[0-9\]+,\.L\[0-9\]+\-\.L\[0-9\]+\\(%r\[0-9\]+\\)" 2 } } */ + vector double vcdgb_imm () { @@ -43,5 +48,5 @@ vcdlgb_imm () return vec_double ((vector unsigned long long){ 1, 2 }); } -/* { dg-final { scan-assembler-times "vcdgb\t" 3 } } */ -/* { dg-final { scan-assembler-times "vcdlgb\t" 3 } } */ +/* { dg-final { scan-assembler-times "vcdgb\t" 2 } } */ +/* { dg-final { scan-assembler-times "vcdlgb\t" 2 } } */ diff --git a/gcc/testsuite/gcc.target/s390/zvector/vec-float-compile.c b/gcc/testsuite/gcc.target/s390/zvector/vec-float-compile.c index a591e23872e..bf5cebb34f5 100644 --- a/gcc/testsuite/gcc.target/s390/zvector/vec-float-compile.c +++ b/gcc/testsuite/gcc.target/s390/zvector/vec-float-compile.c @@ -31,6 +31,11 @@ vcelfb_mem (vector unsigned int *a) return vec_float (*a); } +/* Since r12-4475-g247c407c83f001 the following immediates are being + converted and directly stored in the literal pool so no explicit + conversion is necessary. */ +/* { dg-final { scan-assembler-times "vl\t%v\[0-9\]+,\.L\[0-9\]+\-\.L\[0-9\]+\\(%r\[0-9\]+\\)" 2 } } */ + vector float vcefb_imm () { @@ -43,5 +48,5 @@ vcelfb_imm () return vec_float ((vector unsigned int){ 1, 2 }); } -/* { dg-final { scan-assembler-times "vcefb\t" 3 } } */ -/* { dg-final { scan-assembler-times "vcelfb\t" 3 } } */ +/* { dg-final { scan-assembler-times "vcefb\t" 2 } } */ +/* { dg-final { scan-assembler-times "vcelfb\t" 2 } } */ diff --git a/gcc/testsuite/gcc.target/s390/zvector/vec-signed-compile.c b/gcc/testsuite/gcc.target/s390/zvector/vec-signed-compile.c index 9814cc5d74d..1d30ba3a9ad 100644 --- a/gcc/testsuite/gcc.target/s390/zvector/vec-signed-compile.c +++ b/gcc/testsuite/gcc.target/s390/zvector/vec-signed-compile.c @@ -31,6 +31,11 @@ vcgdb_mem (vector double *a) return vec_signed (*a); } +/* Since r12-4475-g247c407c83f001 the following immediates are being + converted and directly stored in the literal pool so no explicit + conversion is necessary. */ +/* { dg-final { scan-assembler-times "vl\t%v\[0-9\]+,\.L\[0-9\]+\-\.L\[0-9\]+\\(%r\[0-9\]+\\)" 2 } } */ + vector signed int vcfeb_imm () { @@ -43,5 +48,5 @@ vcgdb_imm () return vec_signed ((vector double){ 1.0, 2.0 }); } -/* { dg-final { scan-assembler-times "vcfeb\t" 3 } } */ -/* { dg-final { scan-assembler-times "vcgdb\t" 3 } } */ +/* { dg-final { scan-assembler-times "vcfeb\t" 2 } } */ +/* { dg-final { scan-assembler-times "vcgdb\t" 2 } } */ diff --git a/gcc/testsuite/gcc.target/s390/zvector/vec-unsigned-compile.c b/gcc/testsuite/gcc.target/s390/zvector/vec-unsigned-compile.c index 1eed284adff..90347e618c1 100644 --- a/gcc/testsuite/gcc.target/s390/zvector/vec-unsigned-compile.c +++ b/gcc/testsuite/gcc.target/s390/zvector/vec-unsigned-compile.c @@ -31,6 +31,11 @@ vclgdb_mem (vector double *a) return vec_unsigned (*a); } +/* Since r12-4475-g247c407c83f001 the following immediates are being + converted and directly stored in the literal pool so no explicit + conversion is necessary. */ +/* { dg-final { scan-assembler-times "vl\t%v\[0-9\]+,\.L\[0-9\]+\-\.L\[0-9\]+\\(%r\[0-9\]+\\)" 2 } } */ + vector unsigned int vclfeb_imm ()