diff options
author | Alex Lorenz <arphaman@gmail.com> | 2015-08-13 23:10:16 +0000 |
---|---|---|
committer | Alex Lorenz <arphaman@gmail.com> | 2015-08-13 23:10:16 +0000 |
commit | 5022f6bb817321c0e687ef9ce49df29e15d9c213 (patch) | |
tree | 6b9e04cc072b6041a75f25699a87f4fb582874b3 /llvm/test/CodeGen/MIR/Generic/machine-basic-block-redefinition-error.mir | |
parent | 2038b54eaec38824af90969d61e06f2d58a30c0c (diff) | |
download | bcm5719-llvm-5022f6bb817321c0e687ef9ce49df29e15d9c213.tar.gz bcm5719-llvm-5022f6bb817321c0e687ef9ce49df29e15d9c213.zip |
MIR Serialization: Change MIR syntax - use custom syntax for MBBs.
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
Diffstat (limited to 'llvm/test/CodeGen/MIR/Generic/machine-basic-block-redefinition-error.mir')
-rw-r--r-- | llvm/test/CodeGen/MIR/Generic/machine-basic-block-redefinition-error.mir | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/llvm/test/CodeGen/MIR/Generic/machine-basic-block-redefinition-error.mir b/llvm/test/CodeGen/MIR/Generic/machine-basic-block-redefinition-error.mir index deac3b0b69b..41747535c35 100644 --- a/llvm/test/CodeGen/MIR/Generic/machine-basic-block-redefinition-error.mir +++ b/llvm/test/CodeGen/MIR/Generic/machine-basic-block-redefinition-error.mir @@ -10,8 +10,9 @@ ... --- name: foo -body: - # CHECK: redefinition of machine basic block with id #0 - - id: 0 - - id: 0 +body: | + ; CHECK: [[@LINE+3]]:3: redefinition of machine basic block with id #0 + bb.0: + + bb.0: ... |