[llvm] d00f598 - [SystemZ][z/OS] Fix the entry point marker for leaf functions

[Neumann Hon via llvm-commits]

Author: Neumann Hon
Date: 2023-08-23T09:50:01-04:00
New Revision: d00f59893e09aa37b43bfde590c66c9ee1f5d312

URL: https://github.com/llvm/llvm-project/commit/d00f59893e09aa37b43bfde590c66c9ee1f5d312
DIFF: https://github.com/llvm/llvm-project/commit/d00f59893e09aa37b43bfde590c66c9ee1f5d312.diff

LOG: [SystemZ][z/OS] Fix the entry point marker for leaf functions

The function emitFunctionEntryLabel does not look at whether or not a function is a leaf when setting the entry flags, and instead blindly marks all functions as non-leaf routines.

Differential Revision: https://reviews.llvm.org/D157701

Reviewed By: uweigand

Added: 
    

Modified: 
    llvm/lib/Target/SystemZ/SystemZAsmPrinter.cpp
    llvm/test/CodeGen/SystemZ/zos-prologue-epilog.ll
    llvm/test/MC/GOFF/ppa1.ll

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Target/SystemZ/SystemZAsmPrinter.cpp b/llvm/lib/Target/SystemZ/SystemZAsmPrinter.cpp
index b89d80453280ca..b3075c150ebb36 100644
--- a/llvm/lib/Target/SystemZ/SystemZAsmPrinter.cpp
+++ b/llvm/lib/Target/SystemZ/SystemZAsmPrinter.cpp
@@ -1315,14 +1315,16 @@ void SystemZAsmPrinter::emitFunctionEntryLabel() {
     // EntryPoint Marker
     const MachineFrameInfo &MFFrame = MF->getFrameInfo();
     bool IsUsingAlloca = MFFrame.hasVarSizedObjects();
+    uint32_t DSASize = MFFrame.getStackSize();
+    bool IsLeaf = DSASize == 0 && MFFrame.getCalleeSavedInfo().empty();
 
     // Set Flags
     uint8_t Flags = 0;
+    if (IsLeaf)
+      Flags |= 0x08;
     if (IsUsingAlloca)
       Flags |= 0x04;
 
-    uint32_t DSASize = MFFrame.getStackSize();
-
     // Combine into top 27 bits of DSASize and bottom 5 bits of Flags.
     uint32_t DSAAndFlags = DSASize & 0xFFFFFFE0; // (x/32) << 5
     DSAAndFlags |= Flags;
@@ -1340,6 +1342,10 @@ void SystemZAsmPrinter::emitFunctionEntryLabel() {
     if (OutStreamer->isVerboseAsm()) {
       OutStreamer->AddComment("DSA Size 0x" + Twine::utohexstr(DSASize));
       OutStreamer->AddComment("Entry Flags");
+      if (Flags & 0x08)
+        OutStreamer->AddComment("  Bit 1: 1 = Leaf function");
+      else
+        OutStreamer->AddComment("  Bit 1: 0 = Non-leaf function");
       if (Flags & 0x04)
         OutStreamer->AddComment("  Bit 2: 1 = Uses alloca");
       else

diff  --git a/llvm/test/CodeGen/SystemZ/zos-prologue-epilog.ll b/llvm/test/CodeGen/SystemZ/zos-prologue-epilog.ll
index 202162ed4dd8c8..8c0411629da7d2 100644
--- a/llvm/test/CodeGen/SystemZ/zos-prologue-epilog.ll
+++ b/llvm/test/CodeGen/SystemZ/zos-prologue-epilog.ll
@@ -380,6 +380,10 @@ define void @large_stack2(i64 %n1, i64 %n2, i64 %n3) {
 }
 
 ; CHECK-LABEL: leaf_func
+; CHECK: .long	8 * DSA Size 0x0
+; CHECK-NEXT:     * Entry Flags
+; CHECK-NEXT:     *   Bit 1: 1 = Leaf function
+; CHECK-NEXT:     *   Bit 2: 0 = Does not use alloca
 ; CHECK-NOT: aghi  4,
 ; CHECK-NOT: stmg
 ; CHECK: agr	1, 2

diff  --git a/llvm/test/MC/GOFF/ppa1.ll b/llvm/test/MC/GOFF/ppa1.ll
index 690db83a6d1f06..40fc9e93780db6 100644
--- a/llvm/test/MC/GOFF/ppa1.ll
+++ b/llvm/test/MC/GOFF/ppa1.ll
@@ -7,8 +7,9 @@
 ; CHECK: .short  197
 ; CHECK: .byte   0
 ; CHECK: .byte   241 * Mark Type C'1'
-; CHECK: .long   0 * DSA Size 0x0
+; CHECK: .long   8 * DSA Size 0x0
 ; CHECK: * Entry Flags
+; CHECK: *   Bit 1: 1 = Leaf function
 ; CHECK: *   Bit 2: 0 = Does not use alloca
 ; CHECK: @@func_end0:
 ; CHECK: .section        ".ppa1"