Improve stack object printing.

[madhur13490]

Summary

Need such verbosity while debugging large files which has several functions.

[madhur13490]

fix tests

[madhur13490]

@jlpeyton Any idea why the tests you added may be failing? I don't think it has anything related to my changes.

[arsenm]

llvm/lib/CodeGen/MachineFrameInfo.cpp

214

I think this should be removed

240

Don't see how this is an improvement

250

[spill] present or not maybe?

[evandro]

llvm/lib/CodeGen/MachineFrameInfo.cpp

214

I agree. It's redundant.

218

s/NumFixedObjects=/Fixed objects: /

227

s/stackid=/stack id: /

240

Agree.

250

s/isSplitSplot/Spill slot: / then yes or no.

[madhur13490]

rebase + address comments

[arsenm]

llvm/lib/CodeGen/MachineFrameInfo.cpp

218

Single quotes around \n

250

Switching from = to :, and capitalizing is inconsistent with the other fields

[madhur13490]

llvm/lib/CodeGen/MachineFrameInfo.cpp

250

This inconsistency is already present. "Frame objects:" and "size=". What are you suggesting, = or :? And why?

[evandro]

llvm/lib/CodeGen/MachineFrameInfo.cpp

240

s/fixed:/fixed/

250

Split or Spill?

[madhur13490]

llvm/lib/CodeGen/MachineFrameInfo.cpp

240

As I said earlier, there is inconsistency; at some place "=" and other ":". It depends on personal choice but we need to agree on one.

[evandro]

llvm/lib/CodeGen/MachineFrameInfo.cpp

240

Since the word fixed is followed by a comma, it should be followed by neither : nor =, as originally.

llvm/test/CodeGen/AArch64/tailcall_misched_graph.ll

26

E.g., fixed followed by : and , makes no sense.

llvm/include/llvm/CodeGen/MachineFrameInfo.h

public:
   /// but that must be preserved - they are callee saved registers that are not
   /// saved.
   ///
   /// Before the PrologueEpilogueInserter has placed the CSR spill code, this
   /// method always returns an empty set.
   BitVector getPristineRegs(const MachineFunction &MF) const;
 
   /// Used by the MachineFunction printer to print information about
-  /// stack objects. Implemented in MachineFunction.cpp.
+  /// stack objects.
   void print(const MachineFunction &MF, raw_ostream &OS) const;
 
   /// dump - Print the function to stderr.
   void dump(const MachineFunction &MF) const;
 };
 
 } // End llvm namespace
 
 #endif

llvm/lib/CodeGen/MachineFrameInfo.cpp

for (const MachineInstr &MI : MBB) {
           AdjustsStack = true;
       }
     }
   }
 }
 
 void MachineFrameInfo::print(const MachineFunction &MF, raw_ostream &OS) const{
   if (Objects.empty()) return;
 
   const TargetFrameLowering *FI = MF.getSubtarget().getFrameLowering();
   int ValOffset = (FI ? FI->getOffsetOfLocalArea() : 0);
 
+  OS << "Fixed Objects: " << static_cast<unsigned>(NumFixedObjects) << "\n";
+
   OS << "Frame Objects:\n";
 
   for (unsigned i = 0, e = Objects.size(); i != e; ++i) {
     const StackObject &SO = Objects[i];
     OS << "  fi#" << (int)(i-NumFixedObjects) << ": ";
 
     if (SO.StackID != 0)
-      OS << "id=" << static_cast<unsigned>(SO.StackID) << ' ';
+      OS << "stack id: " << static_cast<unsigned>(SO.StackID) << ", ";
 
     if (SO.Size == ~0ULL) {
       OS << "dead\n";
       continue;
     }
     if (SO.Size == 0)
       OS << "variable sized";
     else
       OS << "size=" << SO.Size;
     OS << ", align=" << SO.Alignment.value();
 
     if (i < NumFixedObjects)
-      OS << ", fixed";
+      OS << ", fixed:";
     if (i < NumFixedObjects || SO.SPOffset != -1) {
       int64_t Off = SO.SPOffset - ValOffset;
       OS << ", at location [SP";
       if (Off > 0)
         OS << "+" << Off;
       else if (Off < 0)
         OS << Off;
-      OS << "]";
+      OS << "], ";
     }
-    OS << "\n";
+    OS << "Split Slot: "
+       << (static_cast<bool>(SO.isSpillSlot) == true ? "Yes" : "No") << "\n";
   }
 }
 
 #if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
 LLVM_DUMP_METHOD void MachineFrameInfo::dump(const MachineFunction &MF) const {
   print(MF, dbgs());
 }
 #endif

llvm/test/CodeGen/AArch64/tailcall_misched_graph.ll

declare void @callee2(i8*, i8*, i8*, i8*, i8*,
                       i8*, i8*, i8*, i8*, i8*)
 
 ; Make sure there is a dependence between the load and store to the same stack
 ; location during a tail call. Tail calls clobber the incoming argument area and
 ; therefore it is not safe to assume argument locations are invariant.
 ; PR23459 has a test case that we where miscompiling because of this at the
 ; time.
 
-; COMMON: Frame Objects
-; COMMON:  fi#-4: {{.*}} fixed, at location [SP+8]
-; COMMON:  fi#-3: {{.*}} fixed, at location [SP]
-; COMMON:  fi#-2: {{.*}} fixed, at location [SP+8]
-; COMMON:  fi#-1: {{.*}} fixed, at location [SP]
+; COMMON: Fixed Objects: 4
+; COMMON: Frame Objects:
+; COMMON:  fi#-4: {{.*}} fixed:, at location [SP+8], Split Slot: No
+; COMMON:  fi#-3: {{.*}} fixed:, at location [SP], Split Slot: No
+; COMMON:  fi#-2: {{.*}} fixed:, at location [SP+8], Split Slot: No
+; COMMON:  fi#-1: {{.*}} fixed:, at location [SP], Split Slot: No
 
 ; The order that these appear in differes in GISel than SDAG, but the
 ; dependency relationship still holds.
 ; COMMON:  [[VRA:%.*]]:gpr64 = LDRXui %fixed-stack.3
 ; COMMON:  [[VRB:%.*]]:gpr64 = LDRXui %fixed-stack.2
 ; SDAG:  STRXui %{{.*}}, %fixed-stack.0
 ; SDAG:  STRXui [[VRB]]{{[^,]*}}, %fixed-stack.1
 ; GISEL:  STRXui [[VRB]]{{[^,]*}}, %fixed-stack.1