From patchwork Thu Feb 29 12:14:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schulze Frielinghaus X-Patchwork-Id: 86589 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 33BAB3858C31 for ; Thu, 29 Feb 2024 12:15:13 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by sourceware.org (Postfix) with ESMTPS id A9CCE385841D for ; Thu, 29 Feb 2024 12:14:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A9CCE385841D 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 ARC-Filter: OpenARC Filter v1.0.0 sourceware.org A9CCE385841D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709208884; cv=none; b=YBadFVpZn1Sy3yDrfkldY4NpD5hMnyIcPvLnh7S2le3+VF0NhJftkEbFMPVGoBSz0nVF0Rn2C3tEiIc/95N4Kff+nPKue1MwB2Sm4IyHdoCjPXQCvwlmBJ1TKUuTlE8J0/9X9BKGC0IxYXL8twexL6XYNhOm9cTjk+1KkzxrM+s= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709208884; c=relaxed/simple; bh=TRHh2uMMEhW1foSRv08Wy2B+G/ZDl4aKrqxqmjAlNYU=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=F3/ES5pXsZfe1WdYTmwvwmtVs18fGxtMgM9vEZovO3bL0AVP78RvMGSNS+vefJnxOQPlQZrMQfaOCoJICY52qGSjvUCw+0lJMZ595YdkS1nehF9UDHQbri0EAyptPzWWeCsx0qnbUeq87Vpmb7nhdGDcongLetxJhKXIJ8iqI4I= ARC-Authentication-Results: i=1; server2.sourceware.org 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 41TCD4h7003512 for ; Thu, 29 Feb 2024 12:14:42 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding; s=pp1; bh=JLiC7PNIJZY8EN9ApzvuobkgoOKte22cvUkhID6tuHM=; b=LKS1E51O9TiXfPiIiZTBbjpGmbCI1BJo8a7ECF76eL5nAU98cGUgzLa0kBDqd0bKtEIQ y/K6Z8fxx0oWH3Ssxq+WZwYKaBUcUSZimegJWXbZsKe2jEzNsFVDSXg4UluOutKflFgs m4a39IJGaQw6VOcGZ1ebC90NUUeDn/YQlD1yDKhbXVOF7V8IxwnV6HR76HuU5lVSUCfT N94qBsEyQzR6tFsrPNrIfa5nvLGbEgSdYEZO5jtsXJmSDaCW6UW8ciCGY7VdnosHYbZ9 uEFK0a4vYbHituVhNqV/DrJsEchyfFWZx9cALV2FFvjmq4IX/Sy8Kjb7WkOQidGLPDoF dw== Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3wjsqug1wp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 29 Feb 2024 12:14:41 +0000 Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 41TB4qDR021792 for ; Thu, 29 Feb 2024 12:14:41 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3wfu60daba-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 29 Feb 2024 12:14:41 +0000 Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 41TCEZnE18219586 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 29 Feb 2024 12:14:37 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A92862006B; Thu, 29 Feb 2024 12:14:35 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8C5BA20063; Thu, 29 Feb 2024 12:14:35 +0000 (GMT) Received: from a8345010.lnxne.boe (unknown [9.152.108.100]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTPS; Thu, 29 Feb 2024 12:14:35 +0000 (GMT) From: Stefan Schulze Frielinghaus To: krebbel@linux.ibm.com, gcc-patches@gcc.gnu.org Cc: Stefan Schulze Frielinghaus Subject: [PATCH] s390: Fix tests rosbg_si_srl and rxsbg_si_srl Date: Thu, 29 Feb 2024 13:14:27 +0100 Message-ID: <20240229121427.1200023-1-stefansf@linux.ibm.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: hsJG4i5VADQ0lkE_bkeK6I-h2Zb8DZju X-Proofpoint-GUID: hsJG4i5VADQ0lkE_bkeK6I-h2Zb8DZju X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-29_02,2024-02-29_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 clxscore=1015 spamscore=0 malwarescore=0 adultscore=0 bulkscore=0 phishscore=0 mlxlogscore=820 mlxscore=0 lowpriorityscore=0 suspectscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402290094 X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Starting with r14-2047-gd0e891406b16dc two SI mode tests are optimized into DI mode. Thus, the scan-assembler directives fail. For example RTL expression (ior:SI (subreg:SI (lshiftrt:DI (reg:DI 69) (const_int 2 [0x2])) 4) (subreg:SI (reg:DI 68) 4)) is optimized into (ior:DI (lshiftrt:DI (reg:DI 69) (const_int 2 [0x2])) (reg:DI 68)) Fixed by moving operands into memory in order to enforce SI mode computation. Furthermore, in r9-6056-g290dfd9bc7bea2 the starting bit position of the scan-assembler directive for rosbg was incorrectly set to 32 which actually should be 32+SHIFT_AMOUNT, i.e., in this particular case 34. gcc/testsuite/ChangeLog: * gcc.target/s390/md/rXsbg_mode_sXl.c: Fix tests rosbg_si_srl and rxsbg_si_srl. --- .../gcc.target/s390/md/rXsbg_mode_sXl.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/gcc/testsuite/gcc.target/s390/md/rXsbg_mode_sXl.c b/gcc/testsuite/gcc.target/s390/md/rXsbg_mode_sXl.c index ede813818ff..cf454d2783c 100644 --- a/gcc/testsuite/gcc.target/s390/md/rXsbg_mode_sXl.c +++ b/gcc/testsuite/gcc.target/s390/md/rXsbg_mode_sXl.c @@ -22,6 +22,8 @@ { dg-skip-if "" { *-*-* } { "*" } { "-march=*" } } */ +unsigned int a, b; + __attribute__ ((noinline)) unsigned int si_sll (unsigned int x) { @@ -42,11 +44,11 @@ rosbg_si_sll (unsigned int a, unsigned int b) /* { dg-final { scan-assembler-times "rosbg\t%r.,%r.,32,62,1" 1 } } */ __attribute__ ((noinline)) unsigned int -rosbg_si_srl (unsigned int a, unsigned int b) +rosbg_si_srl (void) { return a | (b >> 2); } -/* { dg-final { scan-assembler-times "rosbg\t%r.,%r.,32,63,62" 1 } } */ +/* { dg-final { scan-assembler-times "rosbg\t%r.,%r.,34,63,62" 1 } } */ __attribute__ ((noinline)) unsigned int rxsbg_si_sll (unsigned int a, unsigned int b) @@ -56,11 +58,11 @@ rxsbg_si_sll (unsigned int a, unsigned int b) /* { dg-final { scan-assembler-times "rxsbg\t%r.,%r.,32,62,1" 1 } } */ __attribute__ ((noinline)) unsigned int -rxsbg_si_srl (unsigned int a, unsigned int b) +rxsbg_si_srl (void) { return a ^ (b >> 2); } -/* { dg-final { scan-assembler-times "rxsbg\t%r.,%r.,32,63,62" 1 } } */ +/* { dg-final { scan-assembler-times "rxsbg\t%r.,%r.,34,63,62" 1 } } */ __attribute__ ((noinline)) unsigned long long di_sll (unsigned long long x) @@ -108,21 +110,21 @@ main (void) /* SIMode */ { unsigned int r; - unsigned int a = 0x12488421u; - unsigned int b = 0x88881111u; + a = 0x12488421u; + b = 0x88881111u; unsigned int csll = si_sll (b); unsigned int csrl = si_srl (b); r = rosbg_si_sll (a, b); if (r != (a | csll)) __builtin_abort (); - r = rosbg_si_srl (a, b); + r = rosbg_si_srl (); if (r != (a | csrl)) __builtin_abort (); r = rxsbg_si_sll (a, b); if (r != (a ^ csll)) __builtin_abort (); - r = rxsbg_si_srl (a, b); + r = rxsbg_si_srl (); if (r != (a ^ csrl)) __builtin_abort (); }