From patchwork Wed Feb 1 08:04:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Krebbel X-Patchwork-Id: 64069 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 271F0385559F for ; Wed, 1 Feb 2023 08:06:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 271F0385559F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1675238796; bh=N2DCASXgVaIsg3HuT4GoQRcYMYiCQEtkOiCc/OPxhls=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=xjwHSxMXCSlEKIREF59KKT6j+aU6kpr0eQ3nG+IAh2Nao7pE8vrLHZRnaAxYcJEpM f2hoC1xEDPydmJxArdsSZlagYdiqwrPENFLZ15G6bkS9YiQH2XxXYJQiwqaXmDXD5B IKzGs0Q6/wS3niBZXErkBJ51O2QJFWkrsfV0SvJg= 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 4826C3858CDA for ; Wed, 1 Feb 2023 08:04:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4826C3858CDA Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3117gljJ011281 for ; Wed, 1 Feb 2023 08:04:51 GMT Received: from ppma02fra.de.ibm.com (47.49.7a9f.ip4.static.sl-reverse.com [159.122.73.71]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3nfkx70gye-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 01 Feb 2023 08:04:51 +0000 Received: from pps.filterd (ppma02fra.de.ibm.com [127.0.0.1]) by ppma02fra.de.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3110l6t9011409 for ; Wed, 1 Feb 2023 08:04:48 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma02fra.de.ibm.com (PPS) with ESMTPS id 3ncvv6b7v0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 01 Feb 2023 08:04:48 +0000 Received: from smtpav07.fra02v.mail.ibm.com (smtpav07.fra02v.mail.ibm.com [10.20.54.106]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 31184kwO26149424 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 1 Feb 2023 08:04:46 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 00A482004E for ; Wed, 1 Feb 2023 08:04:46 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D5A7E20065 for ; Wed, 1 Feb 2023 08:04:45 +0000 (GMT) Received: from li-ecc9ffcc-3485-11b2-a85c-e633c5126265.ibm.com (unknown [9.152.224.239]) by smtpav07.fra02v.mail.ibm.com (Postfix) with ESMTP for ; Wed, 1 Feb 2023 08:04:45 +0000 (GMT) To: gcc-patches@gcc.gnu.org Subject: [PATCH 2/3] IBM zSystems: Make stack_tie to work with hard frame-pointer Date: Wed, 1 Feb 2023 09:04:44 +0100 Message-Id: <20230201080445.10135-3-krebbel@linux.ibm.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230201080445.10135-1-krebbel@linux.ibm.com> References: <20230201080445.10135-1-krebbel@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: 7L1NMWlug4ZJvs-Rq0t4ZyD2Hno8hAz6 X-Proofpoint-ORIG-GUID: 7L1NMWlug4ZJvs-Rq0t4ZyD2Hno8hAz6 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-02-01_03,2023-01-31_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 phishscore=0 mlxlogscore=910 impostorscore=0 lowpriorityscore=0 bulkscore=0 malwarescore=0 mlxscore=0 adultscore=0 clxscore=1015 spamscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2302010070 X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, GIT_PATCH_0, 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+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" With this patch a scheduling barrier is created to prevent the insn setting up the frame-pointer and instructions which save GPRs to the stack to be swapped. Otherwise broken CFI information would be generated since the stack save insns would use a base register which is not currently declared as holding the CFA. Without -mpreserve-args this did not happen because the store multiple we used for saving the GPRs would also cover the frame-pointer register and therefore creates a dependency on the frame-pointer hardreg. However, with this patch the stack_tie is emitted regardless of -mpreserve-args since this in general appears to be the safer approach. * config/s390/s390.cc (save_gprs): Use gen_frame_mem. (restore_gprs): Likewise. (s390_emit_stack_tie): Make the stack_tie to be dependent on the frame pointer if a frame-pointer is used. (s390_emit_prologue): Emit stack_tie when frame-pointer is needed. * config/s390/s390.md (stack_tie): Add a register operand and rename to ... (@stack_tie): ... this. --- gcc/config/s390/s390.cc | 17 ++++++++--------- gcc/config/s390/s390.md | 5 +++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gcc/config/s390/s390.cc b/gcc/config/s390/s390.cc index a9bb610385b..4db5677ce29 100644 --- a/gcc/config/s390/s390.cc +++ b/gcc/config/s390/s390.cc @@ -10898,9 +10898,7 @@ save_gprs (rtx base, int offset, int first, int last) int i; addr = plus_constant (Pmode, base, offset); - addr = gen_rtx_MEM (Pmode, addr); - - set_mem_alias_set (addr, get_frame_alias_set ()); + addr = gen_frame_mem (Pmode, addr); /* Special-case single register. */ if (first == last) @@ -11012,8 +11010,7 @@ restore_gprs (rtx base, int offset, int first, int last) rtx addr, insn; addr = plus_constant (Pmode, base, offset); - addr = gen_rtx_MEM (Pmode, addr); - set_mem_alias_set (addr, get_frame_alias_set ()); + addr = gen_frame_mem (Pmode, addr); /* Special-case single register. */ if (first == last) @@ -11062,10 +11059,11 @@ s390_load_got (void) static void s390_emit_stack_tie (void) { - rtx mem = gen_frame_mem (BLKmode, - gen_rtx_REG (Pmode, STACK_POINTER_REGNUM)); - - emit_insn (gen_stack_tie (mem)); + rtx mem = gen_frame_mem (BLKmode, stack_pointer_rtx); + if (frame_pointer_needed) + emit_insn (gen_stack_tie (Pmode, mem, hard_frame_pointer_rtx)); + else + emit_insn (gen_stack_tie (Pmode, mem, stack_pointer_rtx)); } /* Copy GPRS into FPR save slots. */ @@ -11676,6 +11674,7 @@ s390_emit_prologue (void) if (frame_pointer_needed) { + s390_emit_stack_tie (); insn = emit_move_insn (hard_frame_pointer_rtx, stack_pointer_rtx); RTX_FRAME_RELATED_P (insn) = 1; } diff --git a/gcc/config/s390/s390.md b/gcc/config/s390/s390.md index 4828aa08be6..00d39608e1d 100644 --- a/gcc/config/s390/s390.md +++ b/gcc/config/s390/s390.md @@ -11590,9 +11590,10 @@ ; This is used in s390_emit_prologue in order to prevent insns ; adjusting the stack pointer to be moved over insns writing stack ; slots using a copy of the stack pointer in a different register. -(define_insn "stack_tie" +(define_insn "@stack_tie" [(set (match_operand:BLK 0 "memory_operand" "+m") - (unspec:BLK [(match_dup 0)] UNSPEC_TIE))] + (unspec:BLK [(match_dup 0) + (match_operand:P 1 "register_operand" "r")] UNSPEC_TIE))] "" "" [(set_attr "length" "0")])