mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-22 02:33:06 +01:00
[RegAlloc] Fix "ran out of regs" with uses in statepoint
Statepoint instruction is known to have a variable and big number of operands. It is possible that Register Allocator will split live intervals in the way that all physical registers are occupied by "zero-length" live intervals which are marked as not-spillable. While intervals are marked as not-spillable in the moment of creation when they are really zero-length it is possible that in future as part of re-materialization there will need for physical register between def and use of such tiny interval (the use is not related to this interval at all). As all physical registers are assigned to not-spillable intervals there is not avaialbe registers and RA reports an error. The idea of the fix is avoid marking tiny live intervals where there is a use in statepoint instruction in var args section. Such interval may be perfectly spilled and folded to operand of statepoint. Reviewers: reames, dantrushin, qcolombet, dsanders, dmgreen Reviewed By: reames Subscribers: llvm-commits Differential Revision: https://reviews.llvm.org/D98766
This commit is contained in:
Serguei Katkov
parent
7d88bdafb9
commit
c9a1c9ca92
@ -50,6 +50,10 @@ class VirtRegMap;
|
|||||||
const MachineLoopInfo &Loops;
|
const MachineLoopInfo &Loops;
|
||||||
const MachineBlockFrequencyInfo &MBFI;
|
const MachineBlockFrequencyInfo &MBFI;
|
||||||
|
|
||||||
|
/// Returns true if Reg of live interval LI is used in instruction with many
|
||||||
|
/// operands like STATEPOINT.
|
||||||
|
bool isLiveAtStatepointVarArg(LiveInterval &LI);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
VirtRegAuxInfo(MachineFunction &MF, LiveIntervals &LIS,
|
VirtRegAuxInfo(MachineFunction &MF, LiveIntervals &LIS,
|
||||||
const VirtRegMap &VRM, const MachineLoopInfo &Loops,
|
const VirtRegMap &VRM, const MachineLoopInfo &Loops,
|
||||||
|
|||||||
@ -21,6 +21,7 @@
|
|||||||
#include "llvm/CodeGen/VirtRegMap.h"
|
#include "llvm/CodeGen/VirtRegMap.h"
|
||||||
#include "llvm/Support/Debug.h"
|
#include "llvm/Support/Debug.h"
|
||||||
#include "llvm/Support/raw_ostream.h"
|
#include "llvm/Support/raw_ostream.h"
|
||||||
|
#include "llvm/CodeGen/StackMaps.h"
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
#include <tuple>
|
#include <tuple>
|
||||||
|
|
||||||
@ -125,6 +126,16 @@ static bool isRematerializable(const LiveInterval &LI, const LiveIntervals &LIS,
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool VirtRegAuxInfo::isLiveAtStatepointVarArg(LiveInterval &LI) {
|
||||||
|
return any_of(VRM.getRegInfo().reg_operands(LI.reg()),
|
||||||
|
[](MachineOperand &MO) {
|
||||||
|
MachineInstr *MI = MO.getParent();
|
||||||
|
if (MI->getOpcode() != TargetOpcode::STATEPOINT)
|
||||||
|
return false;
|
||||||
|
return StatepointOpers(MI).getVarIdx() <= MI->getOperandNo(&MO);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
void VirtRegAuxInfo::calculateSpillWeightAndHint(LiveInterval &LI) {
|
void VirtRegAuxInfo::calculateSpillWeightAndHint(LiveInterval &LI) {
|
||||||
float Weight = weightCalcHelper(LI);
|
float Weight = weightCalcHelper(LI);
|
||||||
// Check if unspillable.
|
// Check if unspillable.
|
||||||
@ -290,9 +301,15 @@ float VirtRegAuxInfo::weightCalcHelper(LiveInterval &LI, SlotIndex *Start,
|
|||||||
|
|
||||||
// Mark li as unspillable if all live ranges are tiny and the interval
|
// Mark li as unspillable if all live ranges are tiny and the interval
|
||||||
// is not live at any reg mask. If the interval is live at a reg mask
|
// is not live at any reg mask. If the interval is live at a reg mask
|
||||||
// spilling may be required.
|
// spilling may be required. If li is live as use in statepoint instruction
|
||||||
|
// spilling may be required due to if we mark interval with use in statepoint
|
||||||
|
// as not spillable we are risky to end up with no register to allocate.
|
||||||
|
// At the same time STATEPOINT instruction is perfectly fine to have this
|
||||||
|
// operand on stack, so spilling such interval and folding its load from stack
|
||||||
|
// into instruction itself makes perfect sense.
|
||||||
if (ShouldUpdateLI && LI.isZeroLength(LIS.getSlotIndexes()) &&
|
if (ShouldUpdateLI && LI.isZeroLength(LIS.getSlotIndexes()) &&
|
||||||
!LI.isLiveAtIndexes(LIS.getRegMaskSlots())) {
|
!LI.isLiveAtIndexes(LIS.getRegMaskSlots()) &&
|
||||||
|
!isLiveAtStatepointVarArg(LI)) {
|
||||||
LI.markNotSpillable();
|
LI.markNotSpillable();
|
||||||
return -1.0;
|
return -1.0;
|
||||||
}
|
}
|
||||||
|
|||||||
48
test/CodeGen/X86/statepoint-ra.ll
Normal file
48
test/CodeGen/X86/statepoint-ra.ll
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
|
||||||
|
; RUN: llc -verify-machineinstrs -O3 -use-registers-for-deopt-values -restrict-statepoint-remat=true < %s 2>&1 | FileCheck %s
|
||||||
|
|
||||||
|
target triple = "x86_64-unknown-linux-gnu"
|
||||||
|
|
||||||
|
; CHECK-NOT: error: ran out of registers during register allocation
|
||||||
|
|
||||||
|
define void @barney(i8 addrspace(1)* %arg, double %arg1, double %arg2, double %arg3, double %arg4, double %arg5, double %arg6, double %arg7, double %arg8, double %arg9, double %arg10, double %arg11, double %arg12) gc "statepoint-example" personality i32* ()* @widget {
|
||||||
|
bb:
|
||||||
|
%tmp = call coldcc token (i64, i32, void ()*, i32, i32, ...) @llvm.experimental.gc.statepoint.p0f_isVoidf(i64 2882400000, i32 0, void ()* nonnull @blam, i32 0, i32 0, i32 0, i32 0) [ "deopt"(i32 0, i32 1, i32 0, i32 0, i32 0, i32 26, i32 0, i32 0, i8 addrspace(1)* %arg, i32 4, double %arg1, i32 7, i8* null, i32 4, double %arg2, i32 7, i8* null, i32 4, double %arg3, i32 7, i8* null, i32 4, double %arg4, i32 7, i8* null, i32 4, double %arg5, i32 7, i8* null, i32 4, double %arg6, i32 7, i8* null, i32 4, double %arg7, i32 7, i8* null, i32 4, double %arg8, i32 7, i8* null, i32 4, double %arg9, i32 7, i8* null, i32 4, double %arg10, i32 7, i8* null, i32 4, double %arg11, i32 7, i8* null, i32 4, double %arg12, i32 7, i8* null, i32 7, i8* null), "gc-live"(i8 addrspace(1)* %arg) ]
|
||||||
|
br i1 undef, label %bb13, label %bb15
|
||||||
|
|
||||||
|
bb13: ; preds = %bb
|
||||||
|
%tmp14 = call token (i64, i32, i32 (i8 addrspace(1)*, double, double, double, double, double, double, double, double, double)*, i32, i32, ...) @llvm.experimental.gc.statepoint.p0f_i32p1i8f64f64f64f64f64f64f64f64f64f(i64 2, i32 5, i32 (i8 addrspace(1)*, double, double, double, double, double, double, double, double, double)* nonnull @quux, i32 10, i32 0, i8 addrspace(1)* nonnull null, double %arg1, double %arg2, double %arg3, double %arg5, double %arg6, double %arg7, double %arg9, double %arg10, double %arg11, i32 0, i32 0) [ "deopt"(i32 0, i32 2, i32 0, i32 70, i32 0, i32 26, i32 0, i32 0, i8 addrspace(1)* null, i32 4, double %arg1, i32 7, i8* null, i32 4, double %arg2, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 4, double %arg4, i32 7, i8* null, i32 4, double %arg5, i32 7, i8* null, i32 4, double %arg6, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 4, double %arg8, i32 7, i8* null, i32 4, double %arg9, i32 7, i8* null, i32 4, double %arg10, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 4, double %arg12, i32 7, i8* null, i32 7, i8* null), "gc-live"(i8 addrspace(1)* null) ]
|
||||||
|
br label %bb15
|
||||||
|
|
||||||
|
bb15: ; preds = %bb13, %bb
|
||||||
|
%tmp16 = phi double [ %arg4, %bb13 ], [ 1.000000e+00, %bb ]
|
||||||
|
%tmp17 = phi double [ %arg8, %bb13 ], [ 1.000000e+00, %bb ]
|
||||||
|
%tmp18 = phi double [ %arg12, %bb13 ], [ 1.000000e+00, %bb ]
|
||||||
|
br i1 undef, label %bb25, label %bb19
|
||||||
|
|
||||||
|
bb19: ; preds = %bb15
|
||||||
|
%tmp20 = invoke token (i64, i32, i32 (i32, i8 addrspace(1)*, i32)*, i32, i32, ...) @llvm.experimental.gc.statepoint.p0f_i32i32p1i8i32f(i64 1, i32 16, i32 (i32, i8 addrspace(1)*, i32)* nonnull @eggs, i32 3, i32 0, i32 undef, i8 addrspace(1)* nonnull undef, i32 0, i32 0, i32 0) [ "deopt"(i32 0, i32 2, i32 0, i32 97, i32 0, i32 26, i32 0, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 0, i32 2, i32 3, i32 0, i32 20, i32 0, i32 0, i8 addrspace(1)* undef, i32 4, double %arg1, i32 7, i8* null, i32 4, double %arg2, i32 7, i8* null, i32 4, double %tmp16, i32 7, i8* null, i32 4, double %arg5, i32 7, i8* null, i32 4, double %arg6, i32 7, i8* null, i32 4, double %tmp17, i32 7, i8* null, i32 4, double %arg9, i32 7, i8* null, i32 4, double %arg10, i32 7, i8* null, i32 4, double %tmp18, i32 7, i8* null, i32 7, i8* null), "gc-live"(i8 addrspace(1)* undef) ]
|
||||||
|
to label %bb21 unwind label %bb23
|
||||||
|
|
||||||
|
bb21: ; preds = %bb19
|
||||||
|
%tmp22 = call token (i64, i32, void (i8 addrspace(1)*, double, double, double, double, double, double, double, double, double, i32)*, i32, i32, ...) @llvm.experimental.gc.statepoint.p0f_isVoidp1i8f64f64f64f64f64f64f64f64f64i32f(i64 2, i32 5, void (i8 addrspace(1)*, double, double, double, double, double, double, double, double, double, i32)* nonnull @ham, i32 11, i32 0, i8 addrspace(1)* nonnull undef, double %arg1, double %arg2, double %tmp16, double %arg5, double %arg6, double %tmp17, double %arg9, double %arg10, double %tmp18, i32 51, i32 0, i32 0) [ "deopt"(i32 0, i32 2, i32 0, i32 97, i32 0, i32 26, i32 0, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 7, i8* null, i32 2, i32 2, i32 46, i32 0, i32 20, i32 0, i32 0, i8 addrspace(1)* undef, i32 4, double %arg1, i32 7, i8* null, i32 4, double %arg2, i32 7, i8* null, i32 4, double %tmp16, i32 7, i8* null, i32 4, double %arg5, i32 7, i8* null, i32 4, double %arg6, i32 7, i8* null, i32 4, double %tmp17, i32 7, i8* null, i32 4, double %arg9, i32 7, i8* null, i32 4, double %arg10, i32 7, i8* null, i32 4, double %tmp18, i32 7, i8* null, i32 3, i32 51), "gc-live"(i8 addrspace(1)* undef) ]
|
||||||
|
unreachable
|
||||||
|
|
||||||
|
bb23: ; preds = %bb19
|
||||||
|
%tmp24 = landingpad token
|
||||||
|
cleanup
|
||||||
|
ret void
|
||||||
|
|
||||||
|
bb25: ; preds = %bb15
|
||||||
|
ret void
|
||||||
|
}
|
||||||
|
|
||||||
|
declare i32* @widget()
|
||||||
|
declare i32 @quux(i8 addrspace(1)*, double, double, double, double, double, double, double, double, double)
|
||||||
|
declare void @blam()
|
||||||
|
declare i32 @eggs(i32, i8 addrspace(1)*, i32)
|
||||||
|
declare void @ham(i8 addrspace(1)*, double, double, double, double, double, double, double, double, double, i32)
|
||||||
|
declare token @llvm.experimental.gc.statepoint.p0f_isVoidf(i64 , i32 , void ()*, i32 , i32 , ...)
|
||||||
|
declare token @llvm.experimental.gc.statepoint.p0f_i32p1i8f64f64f64f64f64f64f64f64f64f(i64 , i32 , i32 (i8 addrspace(1)*, double, double, double, double, double, double, double, double, double)*, i32 , i32 , ...)
|
||||||
|
declare token @llvm.experimental.gc.statepoint.p0f_i32i32p1i8i32f(i64 , i32 , i32 (i32, i8 addrspace(1)*, i32)*, i32 , i32 , ...)
|
||||||
|
declare token @llvm.experimental.gc.statepoint.p0f_isVoidp1i8f64f64f64f64f64f64f64f64f64i32f(i64 , i32 , void (i8 addrspace(1)*, double, double, double, double, double, double, double, double, double, i32)*, i32 , i32 , ...)
|
||||||
Loading…
Reference in New Issue
Block a user