From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1448) id 826DA385800C; Wed, 1 Feb 2023 08:00:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 826DA385800C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1675238403; bh=Z6vkyNJrOChyg1OU9QrLy9FAX+wK54hiNRLsUBz2nWU=; h=From:To:Subject:Date:From; b=tXiIreWLzhi5PzfCMT7gQKXfkvOiPSV3h4wo9RorKc6GEeFZp+N8rWKYp7Ga4/EAs TWvVk4MYwXs/L+yJWkE2aAdZEcuXBFq/bjvOd0+IvNnuOywb6r/aEmMRSfiw0L11XU 689ac3j/taGTEEQeWygBjN8WHEaNpCGUSNolxndY= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Andreas Krebbel To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-5619] IBM zSystems: Make stack_tie to work with hard frame pointer X-Act-Checkin: gcc X-Git-Author: Andreas Krebbel X-Git-Refname: refs/heads/master X-Git-Oldrev: ef5f7b89bbc352255595069eb870d6f30f1f9134 X-Git-Newrev: 36ffb2e0293d1bbef30e3553a431679de00549b9 Message-Id: <20230201080003.826DA385800C@sourceware.org> Date: Wed, 1 Feb 2023 08:00:03 +0000 (GMT) List-Id: https://gcc.gnu.org/g:36ffb2e0293d1bbef30e3553a431679de00549b9 commit r13-5619-g36ffb2e0293d1bbef30e3553a431679de00549b9 Author: Andreas Krebbel Date: Wed Feb 1 08:59:42 2023 +0100 IBM zSystems: Make stack_tie to work with hard frame pointer 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. Diff: --- 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")])