mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-10-22 12:33:33 +02:00
c21c095194
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
151 lines
2.9 KiB
YAML
151 lines
2.9 KiB
YAML
# RUN: llc -march=x86-64 -start-after branch-folder -stop-after branch-folder -o /dev/null %s | FileCheck %s
|
|
# This test ensures that the MIR parser parses the jump table info and jump
|
|
# table operands correctly.
|
|
|
|
--- |
|
|
|
|
define i32 @test_jumptable(i32 %in) {
|
|
entry:
|
|
switch i32 %in, label %def [
|
|
i32 0, label %lbl1
|
|
i32 1, label %lbl2
|
|
i32 2, label %lbl3
|
|
i32 3, label %lbl4
|
|
]
|
|
|
|
def:
|
|
ret i32 0
|
|
|
|
lbl1:
|
|
ret i32 1
|
|
|
|
lbl2:
|
|
ret i32 2
|
|
|
|
lbl3:
|
|
ret i32 4
|
|
|
|
lbl4:
|
|
ret i32 8
|
|
}
|
|
|
|
define i32 @test_jumptable2(i32 %in) {
|
|
entry:
|
|
switch i32 %in, label %def [
|
|
i32 0, label %lbl1
|
|
i32 1, label %lbl2
|
|
i32 2, label %lbl3
|
|
i32 3, label %lbl4
|
|
]
|
|
|
|
def:
|
|
ret i32 0
|
|
|
|
lbl1:
|
|
ret i32 1
|
|
|
|
lbl2:
|
|
ret i32 2
|
|
|
|
lbl3:
|
|
ret i32 4
|
|
|
|
lbl4:
|
|
ret i32 8
|
|
}
|
|
|
|
...
|
|
---
|
|
name: test_jumptable
|
|
# CHECK: jumpTable:
|
|
# CHECK-NEXT: kind: label-difference32
|
|
# CHECK-NEXT: entries:
|
|
# CHECK-NEXT: - id: 0
|
|
# CHECK-NEXT: blocks: [ '%bb.3.lbl1', '%bb.4.lbl2', '%bb.5.lbl3', '%bb.6.lbl4' ]
|
|
# CHECK_NEXT: body:
|
|
jumpTable:
|
|
kind: label-difference32
|
|
entries:
|
|
- id: 0
|
|
blocks: [ '%bb.3.lbl1', '%bb.4.lbl2', '%bb.5.lbl3', '%bb.6.lbl4' ]
|
|
body: |
|
|
bb.0.entry:
|
|
successors: %bb.2.def, %bb.1.entry
|
|
|
|
%eax = MOV32rr %edi, implicit-def %rax
|
|
CMP32ri8 %edi, 3, implicit-def %eflags
|
|
JA_1 %bb.2.def, implicit %eflags
|
|
|
|
bb.1.entry:
|
|
successors: %bb.3.lbl1, %bb.4.lbl2, %bb.5.lbl3, %bb.6.lbl4
|
|
; CHECK: %rcx = LEA64r %rip, 1, _, %jump-table.0, _
|
|
%rcx = LEA64r %rip, 1, _, %jump-table.0, _
|
|
%rax = MOVSX64rm32 %rcx, 4, %rax, 0, _
|
|
%rax = ADD64rr %rax, %rcx, implicit-def %eflags
|
|
JMP64r %rax
|
|
|
|
bb.2.def:
|
|
%eax = MOV32r0 implicit-def %eflags
|
|
RETQ %eax
|
|
|
|
bb.3.lbl1:
|
|
%eax = MOV32ri 1
|
|
RETQ %eax
|
|
|
|
bb.4.lbl2:
|
|
%eax = MOV32ri 2
|
|
RETQ %eax
|
|
|
|
bb.5.lbl3:
|
|
%eax = MOV32ri 4
|
|
RETQ %eax
|
|
|
|
bb.6.lbl4:
|
|
%eax = MOV32ri 8
|
|
RETQ %eax
|
|
...
|
|
---
|
|
name: test_jumptable2
|
|
jumpTable:
|
|
kind: label-difference32
|
|
entries:
|
|
- id: 1
|
|
blocks: [ '%bb.3.lbl1', '%bb.4.lbl2', '%bb.5.lbl3', '%bb.6.lbl4' ]
|
|
body: |
|
|
bb.0.entry:
|
|
successors: %bb.2.def, %bb.1.entry
|
|
|
|
%eax = MOV32rr %edi, implicit-def %rax
|
|
CMP32ri8 %edi, 3, implicit-def %eflags
|
|
JA_1 %bb.2.def, implicit %eflags
|
|
|
|
bb.1.entry:
|
|
successors: %bb.3.lbl1, %bb.4.lbl2, %bb.5.lbl3, %bb.6.lbl4
|
|
; Verify that the printer will use an id of 0 for this jump table:
|
|
; CHECK: %rcx = LEA64r %rip, 1, _, %jump-table.0, _
|
|
%rcx = LEA64r %rip, 1, _, %jump-table.1, _
|
|
%rax = MOVSX64rm32 %rcx, 4, %rax, 0, _
|
|
%rax = ADD64rr %rax, %rcx, implicit-def %eflags
|
|
JMP64r %rax
|
|
|
|
bb.2.def:
|
|
%eax = MOV32r0 implicit-def %eflags
|
|
RETQ %eax
|
|
|
|
bb.3.lbl1:
|
|
%eax = MOV32ri 1
|
|
RETQ %eax
|
|
|
|
bb.4.lbl2:
|
|
%eax = MOV32ri 2
|
|
RETQ %eax
|
|
|
|
bb.5.lbl3:
|
|
%eax = MOV32ri 4
|
|
RETQ %eax
|
|
|
|
bb.6.lbl4:
|
|
%eax = MOV32ri 8
|
|
RETQ %eax
|
|
...
|