This commit modifies the way the machine basic blocks are serialized - now the
machine basic blocks are serialized using a custom syntax instead of relying on
YAML primitives. Instead of using YAML mappings to represent the individual
machine basic blocks in a machine function's body, the new syntax uses a single
YAML block scalar which contains all of the machine basic blocks and
instructions for that function.
This is an example of a function's body that uses the old syntax:
body:
- id: 0
name: entry
instructions:
- '%eax = MOV32r0 implicit-def %eflags'
- 'RETQ %eax'
...
The same body is now written like this:
body: |
bb.0.entry:
%eax = MOV32r0 implicit-def %eflags
RETQ %eax
...
This syntax change is motivated by the fact that the bundled machine
instructions didn't map that well to the old syntax which was using a single
YAML sequence to store all of the machine instructions in a block. The bundled
machine instructions internally use flags like BundledPred and BundledSucc to
determine the bundles, and serializing them as MI flags using the old syntax
would have had a negative impact on the readability and the ease of editing
for MIR files. The new syntax allows me to serialize the bundled machine
instructions using a block construct without relying on the internal flags,
for example:
BUNDLE implicit-def dead %itstate, implicit-def %s1 ... {
t2IT 1, 24, implicit-def %itstate
%s1 = VMOVS killed %s0, 1, killed %cpsr, implicit killed %itstate
}
This commit also converts the MIR testcases to the new syntax. I developed
a script that can convert from the old syntax to the new one. I will post the
script on the llvm-commits mailing list in the thread for this commit.
llvm-svn: 244982
35 lines
836 B
YAML
35 lines
836 B
YAML
# RUN: not llc -march=x86-64 -start-after branch-folder -stop-after branch-folder -o /dev/null %s 2>&1 | FileCheck %s
|
|
--- |
|
|
|
|
define i32 @test(i32 %a) {
|
|
entry:
|
|
%b = alloca i32
|
|
%x = alloca i64
|
|
%y = alloca i32, i32 %a
|
|
store i32 %a, i32* %b
|
|
store i64 2, i64* %x
|
|
%c = load i32, i32* %b
|
|
ret i32 %c
|
|
}
|
|
|
|
...
|
|
---
|
|
name: test
|
|
frameInfo:
|
|
stackSize: 24
|
|
offsetAdjustment: -16
|
|
maxAlignment: 8
|
|
adjustsStack: true
|
|
stack:
|
|
- { id: 0, offset: -20, size: 4, alignment: 4 }
|
|
- { id: 1, offset: -32, size: 8, alignment: 8 }
|
|
# CHECK: [[@LINE+1]]:55: unknown key 'size'
|
|
- { id: 2, type: variable-sized, offset: -32, size: 42, alignment: 1 }
|
|
body: |
|
|
bb.0.entry:
|
|
MOV32mr %rsp, 1, _, -4, _, %edi
|
|
MOV64mi32 %rsp, 1, _, -16, _, 2
|
|
%eax = MOV32rm %rsp, 1, _, -4, _
|
|
RETQ %eax
|
|
...
|