forked from OSchip/llvm-project
[LAA] Remove RuntimeCheckingPtrGroup::RtCheck member (NFC).
This patch removes RtCheck from RuntimeCheckingPtrGroup to make it possible to construct RuntimeCheckingPtrGroup objects without a RuntimePointerChecking object. This should make it easier to re-use the code to generate runtime checks, e.g. in D102834. RtCheck was only used to access the pointer info for a given index. Instead, the start and end expressions can be passed directly. For code-gen, we also need to know the address space to use. This can also be explicitly passed at construction. Reviewed By: efriedma Differential Revision: https://reviews.llvm.org/D105481
This commit is contained in:
parent
31e7551217
commit
6d753b0751
|
@ -341,17 +341,21 @@ struct RuntimeCheckingPtrGroup {
|
||||||
/// pointer, with index \p Index in RtCheck.
|
/// pointer, with index \p Index in RtCheck.
|
||||||
RuntimeCheckingPtrGroup(unsigned Index, RuntimePointerChecking &RtCheck);
|
RuntimeCheckingPtrGroup(unsigned Index, RuntimePointerChecking &RtCheck);
|
||||||
|
|
||||||
|
RuntimeCheckingPtrGroup(unsigned Index, const SCEV *Start, const SCEV *End,
|
||||||
|
unsigned AS)
|
||||||
|
: High(End), Low(Start), AddressSpace(AS) {
|
||||||
|
Members.push_back(Index);
|
||||||
|
}
|
||||||
|
|
||||||
/// Tries to add the pointer recorded in RtCheck at index
|
/// Tries to add the pointer recorded in RtCheck at index
|
||||||
/// \p Index to this pointer checking group. We can only add a pointer
|
/// \p Index to this pointer checking group. We can only add a pointer
|
||||||
/// to a checking group if we will still be able to get
|
/// to a checking group if we will still be able to get
|
||||||
/// the upper and lower bounds of the check. Returns true in case
|
/// the upper and lower bounds of the check. Returns true in case
|
||||||
/// of success, false otherwise.
|
/// of success, false otherwise.
|
||||||
bool addPointer(unsigned Index);
|
bool addPointer(unsigned Index, RuntimePointerChecking &RtCheck);
|
||||||
|
bool addPointer(unsigned Index, const SCEV *Start, const SCEV *End,
|
||||||
|
unsigned AS, ScalarEvolution &SE);
|
||||||
|
|
||||||
/// Constitutes the context of this pointer checking group. For each
|
|
||||||
/// pointer that is a member of this group we will retain the index
|
|
||||||
/// at which it appears in RtCheck.
|
|
||||||
RuntimePointerChecking &RtCheck;
|
|
||||||
/// The SCEV expression which represents the upper bound of all the
|
/// The SCEV expression which represents the upper bound of all the
|
||||||
/// pointers in this group.
|
/// pointers in this group.
|
||||||
const SCEV *High;
|
const SCEV *High;
|
||||||
|
@ -360,6 +364,8 @@ struct RuntimeCheckingPtrGroup {
|
||||||
const SCEV *Low;
|
const SCEV *Low;
|
||||||
/// Indices of all the pointers that constitute this grouping.
|
/// Indices of all the pointers that constitute this grouping.
|
||||||
SmallVector<unsigned, 2> Members;
|
SmallVector<unsigned, 2> Members;
|
||||||
|
/// Address space of the involved pointers.
|
||||||
|
unsigned AddressSpace;
|
||||||
};
|
};
|
||||||
|
|
||||||
/// A memcheck which made up of a pair of grouped pointers.
|
/// A memcheck which made up of a pair of grouped pointers.
|
||||||
|
|
|
@ -170,8 +170,10 @@ const SCEV *llvm::replaceSymbolicStrideSCEV(PredicatedScalarEvolution &PSE,
|
||||||
|
|
||||||
RuntimeCheckingPtrGroup::RuntimeCheckingPtrGroup(
|
RuntimeCheckingPtrGroup::RuntimeCheckingPtrGroup(
|
||||||
unsigned Index, RuntimePointerChecking &RtCheck)
|
unsigned Index, RuntimePointerChecking &RtCheck)
|
||||||
: RtCheck(RtCheck), High(RtCheck.Pointers[Index].End),
|
: High(RtCheck.Pointers[Index].End), Low(RtCheck.Pointers[Index].Start),
|
||||||
Low(RtCheck.Pointers[Index].Start) {
|
AddressSpace(RtCheck.Pointers[Index]
|
||||||
|
.PointerValue->getType()
|
||||||
|
->getPointerAddressSpace()) {
|
||||||
Members.push_back(Index);
|
Members.push_back(Index);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -279,18 +281,28 @@ static const SCEV *getMinFromExprs(const SCEV *I, const SCEV *J,
|
||||||
return I;
|
return I;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool RuntimeCheckingPtrGroup::addPointer(unsigned Index) {
|
bool RuntimeCheckingPtrGroup::addPointer(unsigned Index,
|
||||||
const SCEV *Start = RtCheck.Pointers[Index].Start;
|
RuntimePointerChecking &RtCheck) {
|
||||||
const SCEV *End = RtCheck.Pointers[Index].End;
|
return addPointer(
|
||||||
|
Index, RtCheck.Pointers[Index].Start, RtCheck.Pointers[Index].End,
|
||||||
|
RtCheck.Pointers[Index].PointerValue->getType()->getPointerAddressSpace(),
|
||||||
|
*RtCheck.SE);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool RuntimeCheckingPtrGroup::addPointer(unsigned Index, const SCEV *Start,
|
||||||
|
const SCEV *End, unsigned AS,
|
||||||
|
ScalarEvolution &SE) {
|
||||||
|
assert(AddressSpace == AS &&
|
||||||
|
"all pointers in a checking group must be in the same address space");
|
||||||
|
|
||||||
// Compare the starts and ends with the known minimum and maximum
|
// Compare the starts and ends with the known minimum and maximum
|
||||||
// of this set. We need to know how we compare against the min/max
|
// of this set. We need to know how we compare against the min/max
|
||||||
// of the set in order to be able to emit memchecks.
|
// of the set in order to be able to emit memchecks.
|
||||||
const SCEV *Min0 = getMinFromExprs(Start, Low, RtCheck.SE);
|
const SCEV *Min0 = getMinFromExprs(Start, Low, &SE);
|
||||||
if (!Min0)
|
if (!Min0)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
const SCEV *Min1 = getMinFromExprs(End, High, RtCheck.SE);
|
const SCEV *Min1 = getMinFromExprs(End, High, &SE);
|
||||||
if (!Min1)
|
if (!Min1)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
@ -410,7 +422,7 @@ void RuntimePointerChecking::groupChecks(
|
||||||
|
|
||||||
TotalComparisons++;
|
TotalComparisons++;
|
||||||
|
|
||||||
if (Group.addPointer(Pointer)) {
|
if (Group.addPointer(Pointer, *this)) {
|
||||||
Merged = true;
|
Merged = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1524,14 +1524,8 @@ struct PointerBounds {
|
||||||
static PointerBounds expandBounds(const RuntimeCheckingPtrGroup *CG,
|
static PointerBounds expandBounds(const RuntimeCheckingPtrGroup *CG,
|
||||||
Loop *TheLoop, Instruction *Loc,
|
Loop *TheLoop, Instruction *Loc,
|
||||||
SCEVExpander &Exp) {
|
SCEVExpander &Exp) {
|
||||||
// TODO: Add helper to retrieve pointers to CG.
|
|
||||||
Value *Ptr = CG->RtCheck.Pointers[CG->Members[0]].PointerValue;
|
|
||||||
|
|
||||||
unsigned AS = Ptr->getType()->getPointerAddressSpace();
|
|
||||||
LLVMContext &Ctx = Loc->getContext();
|
LLVMContext &Ctx = Loc->getContext();
|
||||||
|
Type *PtrArithTy = Type::getInt8PtrTy(Ctx, CG->AddressSpace);
|
||||||
// Use this type for pointer arithmetic.
|
|
||||||
Type *PtrArithTy = Type::getInt8PtrTy(Ctx, AS);
|
|
||||||
|
|
||||||
Value *Start = nullptr, *End = nullptr;
|
Value *Start = nullptr, *End = nullptr;
|
||||||
LLVM_DEBUG(dbgs() << "LAA: Adding RT check for range:\n");
|
LLVM_DEBUG(dbgs() << "LAA: Adding RT check for range:\n");
|
||||||
|
|
Loading…
Reference in New Issue