[MIRPrinter] Fix incorrect output of unnamed stack names

[ehjogab]

Summary

The MIRParser expects unnamed stack entries to have empty names ('').
In case of unnamed alloca instructions, the MIRPrinter would output
'<unnamed alloca>', which caused the MIRParser to reject the generated
code.

[arsenm]

The test isn't Generic since it uses aarch64, it should go under AArch64

llvm/test/CodeGen/MIR/Generic/unnamed-stack.ll

1 ↗

(On Diff #313282)

I didn't know && worked in run lines. Should either use a separate run line with the temp file, or just pipe directly to the second llc

5–6 ↗

(On Diff #313282)

Probably should check the frame object list too

[dfukalov]

It seems patch should include update for alloca-crspill.ll test (failed Unit Tests precheckin).

[ehjogab]

Moved testcase to correct location
Split RUN into multiple lines
Added check of frame object list
Fixed failing testcase

[dfukalov]

llvm/test/CodeGen/MIR/AArch64/unnamed-stack.ll

2–3

As I understand, you don't need the second run line, you can just use the output of the first one with "| FileCheck" and without storing a temporary file.

[arsenm]

llvm/test/CodeGen/MIR/AArch64/unnamed-stack.ll

4

Add a brief comment explaining that this checks round tripping anonymous allocas

[dfukalov]

llvm/test/CodeGen/MIR/AArch64/unnamed-stack.ll

4

Ok, for roundtrip it can be used like llc -O0 -march aarch64 -global-isel -stop-after=irtranslator -o - %s | llc -x mir llc -march aarch64 -run-pass=none -o - | FileCheck %s without creating a temporary file.

[ehjogab]

Removed use of temporary file.

[uabelho]

I submitted this for @ehjogab

llvm/lib/CodeGen/MIRPrinter.cpp

for (int I = 0; I < EndIdx; ++I, ++ID) {
     StackObjectsIdx.push_back(-1); // Fill index for possible dead.
     if (MFI.isDeadObjectIndex(I))
       continue;
 
     yaml::MachineStackObject YamlObject;
     YamlObject.ID = ID;
     if (const auto *Alloca = MFI.getObjectAllocation(I))
       YamlObject.Name.Value = std::string(
-          Alloca->hasName() ? Alloca->getName() : "<unnamed alloca>");
+          Alloca->hasName() ? Alloca->getName() : "");
     YamlObject.Type = MFI.isSpillSlotObjectIndex(I)
                           ? yaml::MachineStackObject::SpillSlot
                           : MFI.isVariableSizedObjectIndex(I)
                                 ? yaml::MachineStackObject::VariableSized
                                 : yaml::MachineStackObject::DefaultType;
     YamlObject.Offset = MFI.getObjectOffset(I);
     YamlObject.Size = MFI.getObjectSize(I);
     YamlObject.Alignment = MFI.getObjectAlign(I);

llvm/test/CodeGen/MIR/AArch64/unnamed-stack.ll

+; RUN: llc -O0 -march aarch64 -global-isel -stop-after=irtranslator -o - %s | llc -x mir -march aarch64 -run-pass=none -o - | FileCheck %s
+
+define i16 @unnamed_stack() {
+entry:
+  ; CHECK-NAME: unnamed_stack
+  ; CHECK:      stack:
+  ; CHECK-NEXT:   - { id: 0, name: '',
+  ; CHECK:      %0:_(p0) = G_FRAME_INDEX %stack.0
+  %0 = alloca i16
+  %1 = load i16, i16* %0
+  ret i16 %1
+}
+
+define i16 @named_stack() {
+entry:
+  ; CHECK-NAME: named_stack
+  ; CHECK:      stack:
+  ; CHECK-NEXT:   - { id: 0, name: ptr,
+  ; CHECK:      %0:_(p0) = G_FRAME_INDEX %stack.0.ptr
+  %ptr = alloca i16
+  %0 = load i16, i16* %ptr
+  ret i16 %0
+}

llvm/test/CodeGen/PowerPC/alloca-crspill.ll

 ; CHECK64-NEXT:       isImmutable: true, isAliased: false, callee-saved-register: '$cr2',
 ; CHECK64-NEXT:       callee-saved-restored: true, debug-info-variable: '', debug-info-expression: '',
 ; CHECK64-NEXT:       debug-info-location: '' }
 ; CHECK64-NEXT:   - { id: 1, type: default, offset: -8, size: 8, alignment: 8, stack-id: default,
 ; CHECK64-NEXT:       isImmutable: true, isAliased: false, callee-saved-register: '', callee-saved-restored: true,
 ; CHECK64-NEXT:       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
 
 ; CHECK64-NEXT: stack:
-; CHECK64-NEXT:   - { id: 0, name: '<unnamed alloca>', type: variable-sized, offset: -8,
-; CHECK64-NEXT:       alignment: 1, stack-id: default, callee-saved-register: '', callee-saved-restored: true,
+; CHECK64-NEXT:   - { id: 0, name: '', type: variable-sized, offset: -8, alignment: 1, 
+; CHECK64-NEXT:       stack-id: default, callee-saved-register: '', callee-saved-restored: true,
 ; CHECK64-NEXT:       local-offset: 0, debug-info-variable: '', debug-info-expression: '',
 ; CHECK64-NEXT:       debug-info-location: '' }
 ; CHECK64-NEXT:   - { id: 1, name: '', type: default, offset: -16, size: 8, alignment: 8,
 ; CHECK64-NEXT:       stack-id: default, callee-saved-register: '', callee-saved-restored: true,
 ; CHECK64-NEXT:       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
 
 
 ; CHECK32:      fixedStack:
 ; CHECK32-NEXT:   - { id: 0, type: default, offset: 4, size: 4, alignment: 4, stack-id: default,
 ; CHECK32-NEXT:       isImmutable: true, isAliased: false, callee-saved-register: '$cr2',
 ; CHECK32-NEXT:       callee-saved-restored: true, debug-info-variable: '', debug-info-expression: '',
 ; CHECK32-NEXT:       debug-info-location: '' }
 ; CHECK32-NEXT:   - { id: 1, type: default, offset: -4, size: 4, alignment: 4, stack-id: default,
 ; CHECK32-NEXT:       isImmutable: true, isAliased: false, callee-saved-register: '', callee-saved-restored: true,
 ; CHECK32-NEXT:       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
 
 ; CHECK32-NEXT: stack:
-; CHECK32-NEXT:   - { id: 0, name: '<unnamed alloca>', type: variable-sized, offset: -4,
-; CHECK32-NEXT:       alignment: 1, stack-id: default, callee-saved-register: '', callee-saved-restored: true,
+; CHECK32-NEXT:   - { id: 0, name: '', type: variable-sized, offset: -4, alignment: 1, 
+; CHECK32-NEXT:       stack-id: default, callee-saved-register: '', callee-saved-restored: true,
 ; CHECK32-NEXT:       local-offset: 0, debug-info-variable: '', debug-info-expression: '',
 ; CHECK32-NEXT:       debug-info-location: '' }
 ; CHECK32-NEXT:   - { id: 1, name: '', type: default, offset: -8, size: 4, alignment: 4,
 ; CHECK32-NEXT:       stack-id: default, callee-saved-register: '', callee-saved-restored: true,
 ; CHECK32-NEXT:       debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
 
 
 ; CHECK64:      bb.0.entry: