This is an archive of the discontinued LLVM Phabricator instance.

Differential D100747

[Greedy RA] Last Split point for invoke statepoint should be statepoint itself
ClosedPublic

Authored by skatkov on Apr 19 2021, 2:49 AM.

Details

Reviewers
reames
rnk
void
MatzeB
wmi
qcolombet
Summary

If statepoint has a def it is a relocated gc pointer and it should be available in landing pad.
So we cannot split interval after statepoint at end of basic block.

The option -use-registers-for-gc-values-in-landing-pad which introduces invoke statepoint
with tied-def operands is off by default and we should switch it on to reproduce a verifier error.

After this fix "Register not marked live out of predecessor" verifier assert is fixed but Greedy RA
breaks tied-def property of statepoint instruction. This will be fixed by follow-up patches.

Diff Detail

Unit TestsFailed

TimeTest
80 msx64 debian > Clang.Driver::debug-pass-structure.c
600 msx64 debian > MemProfiler-x86_64-linux-dynamic.TestCases::test_new_load_store.cpp

Revision Contents

PathSize
llvm/
lib/
CodeGen/
7 lines
test/
CodeGen/
X86/
21 lines

Diff 341444

llvm/lib/CodeGen/SplitKit.cpp

Show First 20 Lines • Show All 112 Lines • ▼ Show 20 Lines if (none_of(ExceptionalSuccessors, [&](const MachineBasicBlock *EHPad) {
})) }))
return LIP.first; return LIP.first;
// Find the value leaving MBB. // Find the value leaving MBB.
const VNInfo *VNI = CurLI.getVNInfoBefore(MBBEnd); const VNInfo *VNI = CurLI.getVNInfoBefore(MBBEnd);
if (!VNI) if (!VNI)
return LIP.first; return LIP.first;
// The def of statepoint instruction is a gc relocation and it should be alive
// in landing pad. So we cannot split interval after statepoint instruction.
if (SlotIndex::isSameInstr(VNI->def, LIP.second))
if (auto *I = LIS.getInstructionFromIndex(LIP.second))
if (I->getOpcode() == TargetOpcode::STATEPOINT)
return LIP.second;
// If the value leaving MBB was defined after the call in MBB, it can't // If the value leaving MBB was defined after the call in MBB, it can't
// really be live-in to the landing pad. This can happen if the landing pad // really be live-in to the landing pad. This can happen if the landing pad
// has a PHI, and this register is undef on the exceptional edge. // has a PHI, and this register is undef on the exceptional edge.
// <rdar://problem/10664933> // <rdar://problem/10664933>
if (!SlotIndex::isEarlierInstr(VNI->def, LIP.second) && VNI->def < MBBEnd) if (!SlotIndex::isEarlierInstr(VNI->def, LIP.second) && VNI->def < MBBEnd)
return LIP.first; return LIP.first;
// Value is properly live-in to the landing pad. // Value is properly live-in to the landing pad.
▲ Show 20 Lines • Show All 1,697 Lines • Show Last 20 Lines

llvm/test/CodeGen/X86/statepoint-invoke-ra.mir

Show All 37 Lines
# CHECK: 312B MOV32mr %stack.7, 1, $noreg, 0, $noreg, %38:gr32 :: (store 4 into %stack.7) # CHECK: 312B MOV32mr %stack.7, 1, $noreg, 0, $noreg, %38:gr32 :: (store 4 into %stack.7)
# CHECK: 320B MOV32mr %stack.5, 1, $noreg, 0, $noreg, %38:gr32 :: (store 4 into %stack.5) # CHECK: 320B MOV32mr %stack.5, 1, $noreg, 0, $noreg, %38:gr32 :: (store 4 into %stack.5)
# CHECK: 336B EH_LABEL <mcsymbol .Ltmp0> # CHECK: 336B EH_LABEL <mcsymbol .Ltmp0>
# CHECK: 352B ADJCALLSTACKDOWN64 0, 0, 0, implicit-def dead $rsp, implicit-def dead $eflags, implicit-def dead $ssp, implicit $rsp, implicit $ssp # CHECK: 352B ADJCALLSTACKDOWN64 0, 0, 0, implicit-def dead $rsp, implicit-def dead $eflags, implicit-def dead $ssp, implicit $rsp, implicit $ssp
# CHECK: 400B $edi = MOV32r0 implicit-def dead $eflags # CHECK: 400B $edi = MOV32r0 implicit-def dead $eflags
# CHECK: 416B dead $esi = MOV32r0 implicit-def dead $eflags, implicit-def $rsi # CHECK: 416B dead $esi = MOV32r0 implicit-def dead $eflags, implicit-def $rsi
# CHECK: 432B $ecx = COPY %7:gr32 # CHECK: 432B $ecx = COPY %7:gr32
# CHECK: 448B $r8d = MOV32r0 implicit-def dead $eflags # CHECK: 448B $r8d = MOV32r0 implicit-def dead $eflags
# CHECK: 528B %32:gr64, %31:gr64, %30:gr64, %41:gr64 = STATEPOINT 1, 16, 5, undef %23:gr64, $edi, $rsi, undef $edx, $ecx, $r8d, 2, 0, 2, 0, 2, 11, 1, 4, %stack.0, 0, %30:gr64, 1, 4, %stack.1, 0, 1, 4, %stack.2, 0, 1, 4, %stack.3, 0, 1, 4, %stack.4, 0, 1, 4, %stack.2, 0, %41:gr64, 1, 4, %stack.5, 0, %31:gr64, %32:gr64, 2, 4, %32:gr64(tied-def 0), %31:gr64(tied-def 1), %30:gr64(tied-def 2), %41:gr64(tied-def 3), 2, 0, 2, 4, 0, 0, 1, 1, 2, 2, 3, 3, <regmask $bh $bl $bp $bph $bpl $bx $ebp $ebx $hbp $hbx $rbp $rbx $r12 $r13 $r14 $r15 $r12b $r13b $r14b $r15b $r12bh $r13bh $r14bh $r15bh $r12d $r13d $r14d $r15d $r12w $r13w $r14w $r15w $r12wh and 3 more...>, implicit-def $rsp, implicit-def $ssp, implicit-def dead $eax :: (volatile load store 4 on %stack.0), (volatile load store 4 on %stack.1), (volatile load store 4 on %stack.2), (volatile load store 4 on %stack.3), (volatile load store 4 on %stack.4), (volatile load store 4 on %stack.5) # CHECK: 456B %40:gr64 = COPY %41:gr64
# CHECK: 536B %40:gr64 = COPY %41:gr64 # CHECK: 528B %32:gr64, %31:gr64, %30:gr64, %42:gr64 = STATEPOINT 1, 16, 5, undef %23:gr64, $edi, $rsi, undef $edx, $ecx, $r8d, 2, 0, 2, 0, 2, 11, 1, 4, %stack.0, 0, %30:gr64, 1, 4, %stack.1, 0, 1, 4, %stack.2, 0, 1, 4, %stack.3, 0, 1, 4, %stack.4, 0, 1, 4, %stack.2, 0, %41:gr64, 1, 4, %stack.5, 0, %31:gr64, %32:gr64, 2, 4, %32:gr64(tied-def 0), %31:gr64(tied-def 1), %30:gr64(tied-def 2), %41:gr64(tied-def 3), 2, 0, 2, 4, 0, 0, 1, 1, 2, 2, 3, 3, <regmask $bh $bl $bp $bph $bpl $bx $ebp $ebx $hbp $hbx $rbp $rbx $r12 $r13 $r14 $r15 $r12b $r13b $r14b $r15b $r12bh $r13bh $r14bh $r15bh $r12d $r13d $r14d $r15d $r12w $r13w $r14w $r15w $r12wh and 3 more...>, implicit-def $rsp, implicit-def $ssp, implicit-def dead $eax :: (volatile load store 4 on %stack.0), (volatile load store 4 on %stack.1), (volatile load store 4 on %stack.2), (volatile load store 4 on %stack.3), (volatile load store 4 on %stack.4), (volatile load store 4 on %stack.5)
# CHECK: 544B ADJCALLSTACKUP64 0, 0, implicit-def dead $rsp, implicit-def dead $eflags, implicit-def dead $ssp, implicit $rsp, implicit $ssp # CHECK: 544B ADJCALLSTACKUP64 0, 0, implicit-def dead $rsp, implicit-def dead $eflags, implicit-def dead $ssp, implicit $rsp, implicit $ssp
# CHECK: 560B EH_LABEL <mcsymbol .Ltmp1> # CHECK: 560B EH_LABEL <mcsymbol .Ltmp1>
# CHECK: 576B JMP_1 %bb.1 # CHECK: 576B JMP_1 %bb.1
# CHECK: 592B bb.1.bb21: # CHECK: 592B bb.1.bb21:
# CHECK: ; predecessors: %bb.0 # CHECK: ; predecessors: %bb.0
# CHECK: 608B ADJCALLSTACKDOWN64 0, 0, 0, implicit-def dead $rsp, implicit-def dead $eflags, implicit-def dead $ssp, implicit $rsp, implicit $ssp # CHECK: 608B ADJCALLSTACKDOWN64 0, 0, 0, implicit-def dead $rsp, implicit-def dead $eflags, implicit-def dead $ssp, implicit $rsp, implicit $ssp
# CHECK: 640B $edi = MOV32ri 10 # CHECK: 640B $edi = MOV32ri 10
# CHECK: 704B dead %30:gr64, dead %31:gr64, dead %32:gr64 = STATEPOINT 2882400000, 0, 1, target-flags(x86-plt) @quux, $edi, 2, 0, 2, 2, 2, 10, %5:gr32, %30:gr64, %7:gr32, %33.sub_32bit:gr64_nosp, 1, 4, %stack.6, 0, %2:gr32, %33.sub_32bit:gr64_nosp, 1, 4, %stack.7, 0, %31:gr64, %32:gr64, 2, 3, %30:gr64(tied-def 0), %31:gr64(tied-def 1), %32:gr64(tied-def 2), 2, 0, 2, 3, 0, 0, 1, 1, 2, 2, <regmask $bh $bl $bp $bph $bpl $bx $ebp $ebx $hbp $hbx $rbp $rbx $r12 $r13 $r14 $r15 $r12b $r13b $r14b $r15b $r12bh $r13bh $r14bh $r15bh $r12d $r13d $r14d $r15d $r12w $r13w $r14w $r15w $r12wh and 3 more...>, implicit-def $rsp, implicit-def $ssp :: (load 4 from %stack.6), (load 4 from %stack.7) # CHECK: 704B dead %30:gr64, dead %31:gr64, dead %32:gr64 = STATEPOINT 2882400000, 0, 1, target-flags(x86-plt) @quux, $edi, 2, 0, 2, 2, 2, 10, %5:gr32, %30:gr64, %7:gr32, %33.sub_32bit:gr64_nosp, 1, 4, %stack.6, 0, %2:gr32, %33.sub_32bit:gr64_nosp, 1, 4, %stack.7, 0, %31:gr64, %32:gr64, 2, 3, %30:gr64(tied-def 0), %31:gr64(tied-def 1), %32:gr64(tied-def 2), 2, 0, 2, 3, 0, 0, 1, 1, 2, 2, <regmask $bh $bl $bp $bph $bpl $bx $ebp $ebx $hbp $hbx $rbp $rbx $r12 $r13 $r14 $r15 $r12b $r13b $r14b $r15b $r12bh $r13bh $r14bh $r15bh $r12d $r13d $r14d $r15d $r12w $r13w $r14w $r15w $r12wh and 3 more...>, implicit-def $rsp, implicit-def $ssp :: (load 4 from %stack.6), (load 4 from %stack.7)
# CHECK: 720B ADJCALLSTACKUP64 0, 0, implicit-def dead $rsp, implicit-def dead $eflags, implicit-def dead $ssp, implicit $rsp, implicit $ssp # CHECK: 720B ADJCALLSTACKUP64 0, 0, implicit-def dead $rsp, implicit-def dead $eflags, implicit-def dead $ssp, implicit $rsp, implicit $ssp
# CHECK: 736B RET 0 # CHECK: 736B RET 0
# CHECK: 752B bb.2.bb26 (landing-pad): # CHECK: 752B bb.2.bb26 (landing-pad):
# CHECK: ; predecessors: %bb.0 # CHECK: ; predecessors: %bb.0
# CHECK: liveins: $rax, $rdx # CHECK: liveins: $rax, $rdx
# CHECK: 768B EH_LABEL <mcsymbol .Ltmp2> # CHECK: 768B EH_LABEL <mcsymbol .Ltmp2>
# CHECK: 784B MOV32mr %stack.1, 1, $noreg, 0, $noreg, %33.sub_32bit:gr64_nosp :: (store 4 into %stack.1) # CHECK: 784B MOV32mr %stack.1, 1, $noreg, 0, $noreg, %33.sub_32bit:gr64_nosp :: (store 4 into %stack.1)
# CHECK: 800B MOV32mr %stack.0, 1, $noreg, 0, $noreg, %7:gr32 :: (store 4 into %stack.0) # CHECK: 800B MOV32mr %stack.0, 1, $noreg, 0, $noreg, %7:gr32 :: (store 4 into %stack.0)
# CHECK: 808B %36:gr32 = MOV32rm %stack.6, 1, $noreg, 0, $noreg :: (load 4 from %stack.6) # CHECK: 808B %36:gr32 = MOV32rm %stack.6, 1, $noreg, 0, $noreg :: (load 4 from %stack.6)
# CHECK: 816B MOV32mr %stack.2, 1, $noreg, 0, $noreg, %36:gr32 :: (store 4 into %stack.2) # CHECK: 816B MOV32mr %stack.2, 1, $noreg, 0, $noreg, %36:gr32 :: (store 4 into %stack.2)
# CHECK: 832B MOV32mr %stack.3, 1, $noreg, 0, $noreg, %33.sub_32bit:gr64_nosp :: (store 4 into %stack.3) # CHECK: 832B MOV32mr %stack.3, 1, $noreg, 0, $noreg, %33.sub_32bit:gr64_nosp :: (store 4 into %stack.3)
# CHECK: 840B %39:gr32 = MOV32rm %stack.7, 1, $noreg, 0, $noreg :: (load 4 from %stack.7) # CHECK: 840B %39:gr32 = MOV32rm %stack.7, 1, $noreg, 0, $noreg :: (load 4 from %stack.7)
# CHECK: 848B MOV32mr %stack.4, 1, $noreg, 0, $noreg, %39:gr32 :: (store 4 into %stack.4) # CHECK: 848B MOV32mr %stack.4, 1, $noreg, 0, $noreg, %39:gr32 :: (store 4 into %stack.4)
# CHECK: 864B ADJCALLSTACKDOWN64 0, 0, 0, implicit-def dead $rsp, implicit-def dead $eflags, implicit-def dead $ssp, implicit $rsp, implicit $ssp # CHECK: 864B ADJCALLSTACKDOWN64 0, 0, 0, implicit-def dead $rsp, implicit-def dead $eflags, implicit-def dead $ssp, implicit $rsp, implicit $ssp
# CHECK: 896B $edi = MOV32ri -271 # CHECK: 896B $edi = MOV32ri -271
# CHECK: 928B dead %40:gr64 = STATEPOINT 2882400000, 0, 1, target-flags(x86-plt) @quux, $edi, 2, 0, 2, 0, 2, 6, 1, 4, %stack.0, 0, 1, 4, %stack.1, 0, 1, 4, %stack.2, 0, 1, 4, %stack.3, 0, %40:gr64, 1, 4, %stack.4, 0, 2, 1, %40:gr64(tied-def 0), 2, 0, 2, 1, 0, 0, <regmask $bh $bl $bp $bph $bpl $bx $ebp $ebx $hbp $hbx $rbp $rbx $r12 $r13 $r14 $r15 $r12b $r13b $r14b $r15b $r12bh $r13bh $r14bh $r15bh $r12d $r13d $r14d $r15d $r12w $r13w $r14w $r15w $r12wh and 3 more...>, implicit-def $rsp, implicit-def $ssp :: (volatile load store 4 on %stack.0), (volatile load store 4 on %stack.1), (volatile load store 4 on %stack.2), (volatile load store 4 on %stack.3), (volatile load store 4 on %stack.4) # CHECK: 928B dead %42:gr64 = STATEPOINT 2882400000, 0, 1, target-flags(x86-plt) @quux, $edi, 2, 0, 2, 0, 2, 6, 1, 4, %stack.0, 0, 1, 4, %stack.1, 0, 1, 4, %stack.2, 0, 1, 4, %stack.3, 0, %42:gr64, 1, 4, %stack.4, 0, 2, 1, %42:gr64(tied-def 0), 2, 0, 2, 1, 0, 0, <regmask $bh $bl $bp $bph $bpl $bx $ebp $ebx $hbp $hbx $rbp $rbx $r12 $r13 $r14 $r15 $r12b $r13b $r14b $r15b $r12bh $r13bh $r14bh $r15bh $r12d $r13d $r14d $r15d $r12w $r13w $r14w $r15w $r12wh and 3 more...>, implicit-def $rsp, implicit-def $ssp :: (volatile load store 4 on %stack.0), (volatile load store 4 on %stack.1), (volatile load store 4 on %stack.2), (volatile load store 4 on %stack.3), (volatile load store 4 on %stack.4)
# CHECK: 944B ADJCALLSTACKUP64 0, 0, implicit-def dead $rsp, implicit-def dead $eflags, implicit-def dead $ssp, implicit $rsp, implicit $ssp # CHECK: 944B ADJCALLSTACKUP64 0, 0, implicit-def dead $rsp, implicit-def dead $eflags, implicit-def dead $ssp, implicit $rsp, implicit $ssp
# CHECK: # End machine code for function wombat. # CHECK: # End machine code for function wombat.
# CHECK: *** Bad machine code: Register not marked live out of predecessor *** # CHECK: *** Bad machine code: Two-address instruction operands must be identical ***
# CHECK: - function: wombat # CHECK: - function: wombat
# CHECK: - basic block: %bb.0 bb # CHECK: - basic block: %bb.0 bb
# CHECK: - liverange: [536r,592B:0)[752B,928r:0)[928r,928d:1) 0@536r 1@928r # CHECK: - instruction: 528B %32:gr64, %31:gr64, %30:gr64, %42:gr64 = STATEPOINT 1, 16, 5, undef %23:gr64, $edi, $rsi, undef $edx, $ecx, $r8d, 2, 0, 2, 0, 2, 11, 1, 4, %stack.0, 0, %30:gr64, 1, 4, %stack.1, 0, 1, 4, %stack.2, 0, 1, 4, %stack.3, 0, 1, 4, %stack.4, 0, 1, 4, %stack.2, 0, %41:gr64, 1, 4, %stack.5, 0, %31:gr64, %32:gr64, 2, 4, %32:gr64(tied-def 0), %31:gr64(tied-def 1), %30:gr64(tied-def 2), %41:gr64(tied-def 3), 2, 0, 2, 4, 0, 0, 1, 1, 2, 2, 3, 3, <regmask $bh $bl $bp $bph $bpl $bx $ebp $ebx $hbp $hbx $rbp $rbx $r12 $r13 $r14 $r15 $r12b $r13b $r14b $r15b $r12bh $r13bh $r14bh $r15bh $r12d $r13d $r14d $r15d $r12w $r13w $r14w $r15w $r12wh and 3 more...>, implicit-def $rsp, implicit-def $ssp, implicit-def dead $eax :: (volatile load store 4 on %stack.0), (volatile load store 4 on %stack.1), (volatile load store 4 on %stack.2), (volatile load store 4 on %stack.3), (volatile load store 4 on %stack.4), (volatile load store 4 on %stack.5)
# CHECK: - operand 56: %41:gr64(tied-def 0)
# CHECK: *** Bad machine code: Instruction ending live segment on dead slot has no dead flag ***
# CHECK: - function: wombat
# CHECK: - basic block: %bb.0 bb
# CHECK: - instruction: 456B %40:gr64 = COPY %41:gr64
# CHECK: - liverange: [456r,456d:0) 0@456r
# CHECK: - v. register: %40 # CHECK: - v. register: %40
# CHECK: - ValNo: 0 (def 536r) # CHECK: - segment: [456r,456d:0)
# CHECK: live into %bb.2@752B, not live before 528d # CHECK: LLVM ERROR: Found 2 machine code errors.
# CHECK: LLVM ERROR: Found 1 machine code errors.
--- | --- |
; ModuleID = './statepoint-invoke-ra1.ll' ; ModuleID = './statepoint-invoke-ra1.ll'
source_filename = "./statepoint-invoke-ra1.ll" source_filename = "./statepoint-invoke-ra1.ll"
target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu" target triple = "x86_64-unknown-linux-gnu"
define void @wombat(i8 addrspace(1)* %arg, i32 %arg1, i32 addrspace(1)* %arg2) gc "statepoint-example" personality i32* ()* @widget { define void @wombat(i8 addrspace(1)* %arg, i32 %arg1, i32 addrspace(1)* %arg2) gc "statepoint-example" personality i32* ()* @widget {
bb: bb:
▲ Show 20 Lines • Show All 205 Lines • Show Last 20 Lines