From patchwork Wed Apr 22 10:20:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schulze Frielinghaus X-Patchwork-Id: 1274908 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gcc.gnu.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=gB5MGXqe; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 496bzx4B1jz9sSJ for ; Wed, 22 Apr 2020 20:20:44 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 00A643870859; Wed, 22 Apr 2020 10:20:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 00A643870859 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1587550841; bh=4O0tBrhGSn5mWulZaCmj+Tm/yw0h8RJENnsPixm41Xc=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=gB5MGXqeEfoCTrXkBGSsqSHV9wvS898AV1MiRUx8rz4KlRPbnsXBKvjAbdSIrAzCw fQxd0roDiFwsHuHNBzJHwNLGnGp613wwrtDTVuyYMUxXenkZbjBOyTQTzA88nrZDBl Rm02Y1LDBJIv5R+oyOAnlkEawXMlSQUHiebjJBn8= 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 1A274386F828 for ; Wed, 22 Apr 2020 10:20:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 1A274386F828 Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 03MA3P0l023599 for ; Wed, 22 Apr 2020 06:20:36 -0400 Received: from e06smtp01.uk.ibm.com (e06smtp01.uk.ibm.com [195.75.94.97]) by mx0a-001b2d01.pphosted.com with ESMTP id 30gfeck8wf-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 22 Apr 2020 06:20:35 -0400 Received: from localhost by e06smtp01.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 22 Apr 2020 11:19:48 +0100 Received: from b06cxnps4076.portsmouth.uk.ibm.com (9.149.109.198) by e06smtp01.uk.ibm.com (192.168.101.131) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Wed, 22 Apr 2020 11:19:46 +0100 Received: from b06wcsmtp001.portsmouth.uk.ibm.com (b06wcsmtp001.portsmouth.uk.ibm.com [9.149.105.160]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 03MAKT0256754416 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 22 Apr 2020 10:20:29 GMT Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id ACD58A405B; Wed, 22 Apr 2020 10:20:29 +0000 (GMT) Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8FD02A4060; Wed, 22 Apr 2020 10:20:29 +0000 (GMT) Received: from m35lp38.lnxne.boe (unknown [9.152.108.100]) by b06wcsmtp001.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Wed, 22 Apr 2020 10:20:29 +0000 (GMT) To: Andreas Krebbel Subject: [PATCH] S/390: Fix several test cases Date: Wed, 22 Apr 2020 12:20:13 +0200 X-Mailer: git-send-email 2.25.3 MIME-Version: 1.0 X-TM-AS-GCONF: 00 x-cbid: 20042210-4275-0000-0000-000003C48193 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 20042210-4276-0000-0000-000038DA08BC Message-Id: <20200422102013.3208479-1-stefansf@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.676 definitions=2020-04-22_03:2020-04-22, 2020-04-22 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 priorityscore=1501 adultscore=0 lowpriorityscore=0 mlxlogscore=999 spamscore=0 phishscore=0 malwarescore=0 bulkscore=0 impostorscore=0 suspectscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2004220078 X-Spam-Status: No, score=-23.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_DMARC_STATUS, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: Stefan Schulze Frielinghaus via Gcc-patches From: Stefan Schulze Frielinghaus Reply-To: Stefan Schulze Frielinghaus Cc: gcc-patches@gcc.gnu.org Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Hi, The attached patch fixes several test cases. Successfully bootstrapped and regtested on S/390. Ok for master? Cheers, Stefan gcc/ChangeLog: 2020-04-21 Stefan Schulze Frielinghaus * config/s390/s390.md ("*_ior_and_sr_ze"): lift from SI mode to DSI ("*trunc_sidi_and_subreg_ze"): new insn pattern gcc/testsuite/ChangeLog: 2020-04-21 Stefan Schulze Frielinghaus * gcc.target/s390/addsub-signed-overflow-1.c: fix options * gcc.target/s390/addsub-signed-overflow-2.c: fix options * gcc.target/s390/bswap-1.c: fix scan assembler regex * gcc.target/s390/global-array-element-pic2.c: fix scan assembler regex * gcc.target/s390/load-relative-check.c: fix options * gcc.target/s390/morestack.c: fix options * gcc.target/s390/nobp-return-mem-z900.c: temporarily silence this case * gcc.target/s390/risbg-ll-1.c: fix scan assembler regex * gcc.target/s390/risbg-ll-2.c: fix scan assembler regex * gcc.target/s390/risbg-ll-3.c: fix scan assembler regex * gcc.target/s390/target-attribute/pr82012.c: fix error message --- gcc/config/s390/s390.md | 39 ++++++++++++------- .../s390/addsub-signed-overflow-1.c | 2 +- .../s390/addsub-signed-overflow-2.c | 2 +- gcc/testsuite/gcc.target/s390/bswap-1.c | 8 ++-- .../s390/global-array-element-pic2.c | 4 +- .../gcc.target/s390/load-relative-check.c | 2 +- gcc/testsuite/gcc.target/s390/morestack.c | 2 +- .../gcc.target/s390/nobp-return-mem-z900.c | 17 ++++++-- gcc/testsuite/gcc.target/s390/risbg-ll-1.c | 13 +++---- gcc/testsuite/gcc.target/s390/risbg-ll-2.c | 6 +-- gcc/testsuite/gcc.target/s390/risbg-ll-3.c | 2 +- .../s390/target-attribute/pr82012.c | 2 +- 12 files changed, 59 insertions(+), 40 deletions(-) diff --git a/gcc/config/s390/s390.md b/gcc/config/s390/s390.md index 44b59659e20..cf53ef1b791 100644 --- a/gcc/config/s390/s390.md +++ b/gcc/config/s390/s390.md @@ -3970,22 +3970,21 @@ [(set_attr "op_type" "RIE") (set_attr "z10prop" "z10_super_E1")]) -; 32 bit: (a & -16) | ((b >> 8) & 15) -(define_insn "*_ior_and_sr_ze" - [(set (match_operand:SI 0 "register_operand" "=d") - (ior:SI (and:SI - (match_operand:SI 1 "register_operand" "0") - (match_operand:SI 2 "const_int_operand" "")) - (subreg:SI - (zero_extract:DI - (match_operand:DI 3 "register_operand" "d") - (match_operand 4 "const_int_operand" "") ; size +; (a & -16) | ((b >> 8) & 15) +(define_insn "*_ior_and_sr_ze" + [(set (match_operand:DSI 0 "register_operand" "=d") + (ior:DSI (and:DSI + (match_operand:DSI 1 "register_operand" "0") + (match_operand:DSI 2 "const_int_operand" "")) + (zero_extract:DSI + (match_operand:DSI 3 "register_operand" "d") + (match_operand 4 "const_int_operand" "") ; size (match_operand 5 "const_int_operand" "")) ; start - 4)))] + ))] " - && EXTRACT_ARGS_IN_RANGE (INTVAL (operands[4]), INTVAL (operands[5]), 64) + && EXTRACT_ARGS_IN_RANGE (INTVAL (operands[4]), INTVAL (operands[5]), ) && UINTVAL (operands[2]) == (HOST_WIDE_INT_M1U << UINTVAL (operands[4]))" - "\t%0,%3,64-%4,63,%4+%5" + "\t%0,%3,64-%4,63,(64-)+%4+%5" [(set_attr "op_type" "RIE") (set_attr "z10prop" "z10_super_E1")]) @@ -4237,6 +4236,20 @@ [(set_attr "op_type" "RIE") (set_attr "z10prop" "z10_super_E1")]) +; (ui32)(((ui64)x) >> 12) & -4 +(define_insn "*trunc_sidi_and_subreg_ze" + [(set (match_operand:SI 0 "register_operand" "=d") + (and:SI + (subreg:SI (zero_extract:DI + (match_operand:DI 1 "register_operand" "d") + (const_int 32) + (match_operand:SI 2 "nonzero_shift_count_operand" "")) 4) + (match_operand:SI 3 "contiguous_bitmask_nowrap_operand" "")))] + "" + "\t%0,%1,%t3,128+%f3,32+%2" + [(set_attr "op_type" "RIE") + (set_attr "z10prop" "z10_super_E1")]) + ; z = (x << c) | (y >> d) with (x << c) and (y >> d) not overlapping after shifting ; -> z = y >> d; z = (x << c) | (z & ((1 << c) - 1)) ; -> z = y >> d; z = risbg; diff --git a/gcc/testsuite/gcc.target/s390/addsub-signed-overflow-1.c b/gcc/testsuite/gcc.target/s390/addsub-signed-overflow-1.c index 143220d5541..d43acba91d3 100644 --- a/gcc/testsuite/gcc.target/s390/addsub-signed-overflow-1.c +++ b/gcc/testsuite/gcc.target/s390/addsub-signed-overflow-1.c @@ -1,5 +1,5 @@ /* { dg-do run } */ -/* { dg-options "-O3 -mzarch --save-temps" } */ +/* { dg-options "-O3 -march=z13 -mzarch" } */ #include #include diff --git a/gcc/testsuite/gcc.target/s390/addsub-signed-overflow-2.c b/gcc/testsuite/gcc.target/s390/addsub-signed-overflow-2.c index 798e489cece..0c3df5c4b3a 100644 --- a/gcc/testsuite/gcc.target/s390/addsub-signed-overflow-2.c +++ b/gcc/testsuite/gcc.target/s390/addsub-signed-overflow-2.c @@ -1,5 +1,5 @@ /* { dg-do run } */ -/* { dg-options "-O3 -mzarch --save-temps" } */ +/* { dg-options "-O3 -march=z13 -mzarch" } */ #include #include diff --git a/gcc/testsuite/gcc.target/s390/bswap-1.c b/gcc/testsuite/gcc.target/s390/bswap-1.c index edfcdf888c0..c11a0ea780b 100644 --- a/gcc/testsuite/gcc.target/s390/bswap-1.c +++ b/gcc/testsuite/gcc.target/s390/bswap-1.c @@ -19,14 +19,14 @@ foo64b () { return __builtin_bswap64 (u64); } -/* { dg-final { scan-assembler-times "lrvg\t%r2,0\\(%r\[0-9\]*\\)" 1 { target lp64 } } } */ +/* { dg-final { scan-assembler-times "lrvg\t%r2,\[0-9\]+\\(%r\[0-9\]*\\)" 1 { target lp64 } } } */ void foo64c (uint64_t a) { u64 = __builtin_bswap64 (a); } -/* { dg-final { scan-assembler-times "strvg\t%r2,0\\(%r\[0-9\]*\\)" 1 { target lp64 } } } */ +/* { dg-final { scan-assembler-times "strvg\t%r2,\[0-9\]+\\(%r\[0-9\]*\\)" 1 { target lp64 } } } */ @@ -42,11 +42,11 @@ foo32b () { return __builtin_bswap32 (u32); } -/* { dg-final { scan-assembler-times "lrv\t%r2,0\\(%r\[0-9\]*\\)" 1 } } */ +/* { dg-final { scan-assembler-times "lrv\t%r2,\[0-9\]+\\(%r\[0-9\]*\\)" 1 } } */ void foo32c (uint32_t a) { u32 = __builtin_bswap32 (a); } -/* { dg-final { scan-assembler-times "strv\t%r2,0\\(%r\[0-9\]*\\)" 1 } } */ +/* { dg-final { scan-assembler-times "strv\t%r2,\[0-9\]+\\(%r\[0-9\]*\\)" 1 } } */ 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 b9398a8042f..72b87d40b85 100644 --- a/gcc/testsuite/gcc.target/s390/global-array-element-pic2.c +++ b/gcc/testsuite/gcc.target/s390/global-array-element-pic2.c @@ -8,6 +8,6 @@ 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-not {(?n)\n\tlarl\t%r\d+,a[^@]} } } */ + /* { dg-final { scan-assembler "(?n)\n\tlgrl\t%r\\d+,a@GOTENT\n" } } */ + /* { dg-final { scan-assembler-not "(?n)\n\tlarl\t%r\\d+,a\[^@\]" } } */ } diff --git a/gcc/testsuite/gcc.target/s390/load-relative-check.c b/gcc/testsuite/gcc.target/s390/load-relative-check.c index 3d4671a6b3f..a55bc2442f1 100644 --- a/gcc/testsuite/gcc.target/s390/load-relative-check.c +++ b/gcc/testsuite/gcc.target/s390/load-relative-check.c @@ -1,6 +1,6 @@ /* Check if load-relative instructions are created */ /* { dg-do compile { target { s390*-*-* } } } */ -/* { dg-options "-O2 -march=z10 -mzarch" } */ +/* { dg-options "-O2 -march=z10 -mzarch -fno-section-anchors" } */ /* { dg-final { scan-assembler "lgfrl\t%r.?,b.4" { target { lp64 } } } } */ /* { dg-final { scan-assembler "lgfrl\t%r.?,s.12" { target { lp64 } } } } */ diff --git a/gcc/testsuite/gcc.target/s390/morestack.c b/gcc/testsuite/gcc.target/s390/morestack.c index aa28b72aa6c..4cfa220e737 100644 --- a/gcc/testsuite/gcc.target/s390/morestack.c +++ b/gcc/testsuite/gcc.target/s390/morestack.c @@ -3,7 +3,7 @@ pointer being correct. */ /* { dg-do run } */ -/* { dg-options "" } */ +/* { dg-options "-O2 -fsplit-stack" } */ #include diff --git a/gcc/testsuite/gcc.target/s390/nobp-return-mem-z900.c b/gcc/testsuite/gcc.target/s390/nobp-return-mem-z900.c index 0b318115a8f..3d6aca1f95f 100644 --- a/gcc/testsuite/gcc.target/s390/nobp-return-mem-z900.c +++ b/gcc/testsuite/gcc.target/s390/nobp-return-mem-z900.c @@ -21,6 +21,15 @@ foo (int a) gl += bar (i); } +void __attribute__((noinline,noclone)) +baz (int a) +{ + int i; + + for (i = 0; i < a; i++) + gl += bar (i); +} + int main () { @@ -31,13 +40,13 @@ main () return 0; } -/* 1 x foo, 1 x main -/* { dg-final { scan-assembler-times "jg\t__s390_indirect_jump" 2 } } */ +/* 1 x foo, 1 x baz, 1 x main */ +/* { dg-final { scan-assembler-times "jg\t__s390_indirect_jump" 3 } } */ -/* 1 x foo, conditional return, shrink wrapped +/* 1 x foo, conditional return, shrink wrapped */ /* { dg-final { scan-assembler "jge\t__s390_indirect_jump" } } */ -/* 1 x foo, conditional return, shrink wrapped +/* 1 x baz, conditional return, shrink wrapped */ /* { dg-final { scan-assembler "jgle\t__s390_indirect_jump" } } */ /* { dg-final { scan-assembler "ex\t" } } */ diff --git a/gcc/testsuite/gcc.target/s390/risbg-ll-1.c b/gcc/testsuite/gcc.target/s390/risbg-ll-1.c index 30350d04c45..1cac15820c0 100644 --- a/gcc/testsuite/gcc.target/s390/risbg-ll-1.c +++ b/gcc/testsuite/gcc.target/s390/risbg-ll-1.c @@ -214,14 +214,11 @@ i64 f18 (i64 v_foo) } // Test an arithmetic shift right in which some of the sign bits are kept. -// This needs a separate shift and mask. +// This needs a separate shift and mask on 31 bit. i32 f19 (i32 v_foo) { - /* Should be - { dg-final { scan-assembler "f19:\n\tsra\t%r2,28\n\tnilf\t%r2,30" { xfail { lp64 } } } } - but because a zeroextend is merged into the pattern it is actually - { dg-final { scan-assembler "f19:\n\tsra\t%r2,28\n\trisbg\t%r2,%r2,59,128\\\+62,0" { target { lp64 } } } } - { dg-final { scan-assembler "f19:\n\tsra\t%r2,28\n\tnilf\t%r2,30" { target { ! lp64 } } } } */ + /* { dg-final { scan-assembler "f19:\n\trisbg\t%r2,%r2,59,128\\+62,64-28" { target { lp64 } } } } */ + /* { dg-final { scan-assembler "f19:\n\tsra\t%r2,28\n\tnilf\t%r2,30" { target { ! lp64 } } } } */ i32 v_shr = v_foo >> 28; i32 v_and = v_shr & 30; return v_and; @@ -273,7 +270,7 @@ i64 f23 (i64 v_foo) // mask and rotate. i32 f24 (i32 v_foo) { - /* { dg-final { scan-assembler "f24:\n\tnilf\t%r2,254\n\trll\t%r2,%r2,29" } } */ + /* { dg-final { scan-assembler "f24:\n\tnilf\t%r2,254\n\trll\t%r2,%r2,29\n" } } */ i32 v_and = v_foo & 254; i32 v_parta = ((ui32)v_and) >> 3; i32 v_partb = v_and << 29; @@ -478,7 +475,7 @@ i64 f42 (t42 v_x) // Check that we get the case where a 64-bit shift is used by a 32-bit and. i32 f43 (i64 v_x) { - /* { dg-final { scan-assembler "f43:\n\trisbg\t%r2,%r2,32,128\\\+61,64-12" { target { lp64 } } } } */ + /* { dg-final { scan-assembler "f43:\n\trisbg\t%r2,%r2,32,128\\+61,32\\+20\n\tlgfr\t%r2,%r2" { target { lp64 } } } } */ /* { dg-final { scan-assembler "f43:\n\trisbg\t%r3,%r2,0,0\\\+32-1,64-0-32\n\trisbg\t%r2,%r3,32,128\\\+61,64-12" { target { ! lp64 } } } } */ i64 v_shr3 = ((ui64)v_x) >> 12; i32 v_shr3_tr = (ui32)v_shr3; diff --git a/gcc/testsuite/gcc.target/s390/risbg-ll-2.c b/gcc/testsuite/gcc.target/s390/risbg-ll-2.c index 754c17311dd..8bf1a0ff88b 100644 --- a/gcc/testsuite/gcc.target/s390/risbg-ll-2.c +++ b/gcc/testsuite/gcc.target/s390/risbg-ll-2.c @@ -34,7 +34,7 @@ i64 f2 (i64 v_a, i64 v_b) // Test a case with two ANDs and a shift. i32 f3 (i32 v_a, i32 v_b) { - /* { dg-final { scan-assembler "f3:\n\trisbg\t%r2,%r3,64-4,63,4\\\+52" } } */ + /* { dg-final { scan-assembler "f3:\n\trisbg\t%r2,%r3,64-4,63,\\(64-32\\)\\+4\\+20\n\tlgfr\t%r2,%r2" } } */ i32 v_anda = v_a & -16; i32 v_shr = ((ui32)v_b) >> 8; i32 v_andb = v_shr & 15; @@ -45,8 +45,8 @@ i32 f3 (i32 v_a, i32 v_b) // ...and again with i64. i64 f4 (i64 v_a, i64 v_b) { - /* { dg-final { scan-assembler "f4:\n\trisbg\t%r2,%r3,60,60\\\+4-1,128-60-4-8" { target { lp64 } } } } */ - /* { dg-final { scan-assembler "f4:\n\(\t.*\n\)*\trisbg\t%r5,%r5,64-4,128\\\+63,52\\\+4" { target { ! lp64 } } } } */ + /* { dg-final { scan-assembler "f4:\n\trisbg\t%r2,%r3,64-4,63,\\(64-64\\)\\+4\\+52" { target { lp64 } } } } */ + /* { dg-final { scan-assembler "f4:\n\(\t.*\n\)*\trisbg\t%r5,%r5,64-4,128\\+63,\\(64-64\\)\\+52\\+4" { target { ! lp64 } } } } */ i64 v_anda = v_a & -16; i64 v_shr = ((ui64)v_b) >> 8; i64 v_andb = v_shr & 15; diff --git a/gcc/testsuite/gcc.target/s390/risbg-ll-3.c b/gcc/testsuite/gcc.target/s390/risbg-ll-3.c index 2a2db543cd9..90d37f2c1ce 100644 --- a/gcc/testsuite/gcc.target/s390/risbg-ll-3.c +++ b/gcc/testsuite/gcc.target/s390/risbg-ll-3.c @@ -11,7 +11,7 @@ // On zEC12, we generally prefer RISBGN. i64 f1 (i64 v_a, i64 v_b) { -/* { dg-final { scan-assembler "f1:\n\trisbgn\t%r2,%r3,60,60\\\+3-1,128-60-3-1" { target { lp64 } } } } */ +/* { dg-final { scan-assembler "f1:\n\trisbgn\t%r2,%r3,60,62,0" { target { lp64 } } } } */ /* { dg-final { scan-assembler "f1:\n\trisbgn\t%r3,%r2,0,0\\\+32-1,64-0-32\n\trisbgn\t%r3,%r5,60,62,0\n" { target { ! lp64 } } } } */ i64 v_anda = v_a & -15; i64 v_andb = v_b & 14; diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/pr82012.c b/gcc/testsuite/gcc.target/s390/target-attribute/pr82012.c index 2e1f7ae57be..ad1bf76d4d2 100644 --- a/gcc/testsuite/gcc.target/s390/target-attribute/pr82012.c +++ b/gcc/testsuite/gcc.target/s390/target-attribute/pr82012.c @@ -34,7 +34,7 @@ int __attribute__ ((target ("soft-float"))) test2 (int a) /* Inlining needs to be rejected. foo3 performs HW FP operation. */ -int __attribute__ ((always_inline)) foo3 (int a) /* { dg-error "inlining failed in call to always_inline" } */ +int __attribute__ ((always_inline)) foo3 (int a) /* { dg-error "inlining failed in call to 'always_inline'" } */ { g = (double) a / 2.0; return 0;