From patchwork Tue Jan 10 09:04:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Krebbel X-Patchwork-Id: 1723862 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: legolas.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=UGUYckXU; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NrlJF0TRGz23g8 for ; Tue, 10 Jan 2023 20:04:59 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DA6003858409 for ; Tue, 10 Jan 2023 09:04:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DA6003858409 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1673341491; bh=FvkNfyF14aqODlSdcDVGl4JyyXE0JKb6iZksMB9FtBs=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=UGUYckXU1sUGlDvuNM3e6k+rJj1tO/V8TVRP4zsZ56Qz4hwqq3V25+VXxv0vN3esn 34SxPvTziKsl1Tf/BLDeowxZu1LnWJuvBGdiTxXjeZpDGAf1UBMi6PKIDt/ULzYZpb w4NCLBr81m3s8HiH2Eou+Jh6J/Pz8IZUU+kt6kqA= 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 97D6C3858C78 for ; Tue, 10 Jan 2023 09:04:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 97D6C3858C78 Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30A8vqQS003479 for ; Tue, 10 Jan 2023 09:04:32 GMT Received: from ppma01fra.de.ibm.com (46.49.7a9f.ip4.static.sl-reverse.com [159.122.73.70]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3n0swwq7ps-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 10 Jan 2023 09:04:32 +0000 Received: from pps.filterd (ppma01fra.de.ibm.com [127.0.0.1]) by ppma01fra.de.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 309NjEXT012419 for ; Tue, 10 Jan 2023 09:04:29 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma01fra.de.ibm.com (PPS) with ESMTPS id 3my0c6b7nc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 10 Jan 2023 09:04:29 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 30A94REW46989702 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 10 Jan 2023 09:04:27 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4CD2520049 for ; Tue, 10 Jan 2023 09:04:27 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1A2AB2004D for ; Tue, 10 Jan 2023 09:04:27 +0000 (GMT) Received: from li-ecc9ffcc-3485-11b2-a85c-e633c5126265.ibm.com (unknown [9.179.3.190]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP for ; Tue, 10 Jan 2023 09:04:27 +0000 (GMT) To: gcc-patches@gcc.gnu.org Subject: [Committed] IBM zSystems: Make -fcall-saved-... work. Date: Tue, 10 Jan 2023 10:04:26 +0100 Message-Id: <20230110090426.11475-1-krebbel@linux.ibm.com> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: AFmMcVCdAiyMlsJ7rSYCTg-Sbnnzng02 X-Proofpoint-GUID: AFmMcVCdAiyMlsJ7rSYCTg-Sbnnzng02 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2023-01-10_02,2023-01-09_02,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 mlxscore=0 malwarescore=0 mlxlogscore=884 bulkscore=0 impostorscore=0 spamscore=0 suspectscore=0 phishscore=0 adultscore=0 lowpriorityscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2301100054 X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, 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 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: Andreas Krebbel via Gcc-patches From: Andreas Krebbel Reply-To: Andreas Krebbel Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Committed to mainline. Bootstrap and regression tests are clean. gcc/ChangeLog: * config/s390/s390.cc (s390_register_info): Check call_used_regs instead of hard-coding the register numbers for call saved registers. (s390_optimize_register_info): Likewise. gcc/testsuite/ChangeLog: * gcc.target/s390/fcall-saved.c: New test. --- gcc/config/s390/s390.cc | 10 ++++------ gcc/testsuite/gcc.target/s390/fcall-saved.c | 11 +++++++++++ 2 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 gcc/testsuite/gcc.target/s390/fcall-saved.c diff --git a/gcc/config/s390/s390.cc b/gcc/config/s390/s390.cc index 42177c204f6..a9bb610385b 100644 --- a/gcc/config/s390/s390.cc +++ b/gcc/config/s390/s390.cc @@ -10075,8 +10075,8 @@ s390_register_info () memset (cfun_frame_layout.gpr_save_slots, SAVE_SLOT_NONE, 16); - for (i = 6; i < 16; i++) - if (clobbered_regs[i]) + for (i = 0; i < 16; i++) + if (clobbered_regs[i] && !call_used_regs[i]) cfun_gpr_save_slot (i) = SAVE_SLOT_STACK; s390_register_info_stdarg_fpr (); @@ -10136,10 +10136,8 @@ s390_optimize_register_info () || cfun_frame_layout.save_return_addr_p || crtl->calls_eh_return); - memset (cfun_frame_layout.gpr_save_slots, SAVE_SLOT_NONE, 6); - - for (i = 6; i < 16; i++) - if (!clobbered_regs[i]) + for (i = 0; i < 16; i++) + if (!clobbered_regs[i] || call_used_regs[i]) cfun_gpr_save_slot (i) = SAVE_SLOT_NONE; s390_register_info_set_ranges (); diff --git a/gcc/testsuite/gcc.target/s390/fcall-saved.c b/gcc/testsuite/gcc.target/s390/fcall-saved.c new file mode 100644 index 00000000000..a08155372f9 --- /dev/null +++ b/gcc/testsuite/gcc.target/s390/fcall-saved.c @@ -0,0 +1,11 @@ +/* { dg-do compile } */ +/* { dg-options "-O3 -mzarch -fcall-saved-r4" } */ + +void test(void) { + asm volatile("nop" ::: "r4"); +} + +/* { dg-final { scan-assembler-times "\tstg\t" 1 { target { lp64 } } } } */ +/* { dg-final { scan-assembler-times "\tlg\t" 1 { target { lp64 } } } } */ +/* { dg-final { scan-assembler-times "\tst\t" 1 { target { ! lp64 } } } } */ +/* { dg-final { scan-assembler-times "\tl\t" 1 { target { ! lp64 } } } } */