aaron/ispc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix cases in coalesce opt where offsets would be truncated to 32 bits

Browse Source
This commit is contained in:
Matt Pharr
2012-02-14 10:05:07 -08:00
parent 52eb4c6014
commit a86b942730
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
opt.cpp
View File

@@ -2552,7 +2552,7 @@ GSToLoadStorePass::runOnBasicBlock(llvm::BasicBlock &bb) {
if (varyingOffsets->getType() == LLVMTypes::Int64VectorType) if (varyingOffsets->getType() == LLVMTypes::Int64VectorType)
scales.push_back(LLVMInt64(scaleValue)); scales.push_back(LLVMInt64(scaleValue));
else else
scales.push_back(LLVMInt32(scaleValue)); scales.push_back(LLVMInt32((int32_t)scaleValue));
} }
llvm::Constant *offsetScaleVec = llvm::ConstantVector::get(scales); llvm::Constant *offsetScaleVec = llvm::ConstantVector::get(scales);
@@ -2738,7 +2738,7 @@ lVectorLoadIsEfficient(std::set<int64_t>::iterator iter,
std::set<int64_t>::iterator *newIter, int vectorWidth) { std::set<int64_t>::iterator *newIter, int vectorWidth) {
// We're considering a vector load of width vectorWidth, starting at // We're considering a vector load of width vectorWidth, starting at
// the offset "start". // the offset "start".
int start = *iter; int64_t start = *iter;
// The basic idea is that we'll look at the subsequent elements in the // The basic idea is that we'll look at the subsequent elements in the
// load set after the initial one at start. As long as subsequent // load set after the initial one at start. As long as subsequent
@@ -2756,17 +2756,17 @@ lVectorLoadIsEfficient(std::set<int64_t>::iterator iter,
// lastAccepted holds the last offset we've processed and accepted as // lastAccepted holds the last offset we've processed and accepted as
// valid for the vector load underconsideration // valid for the vector load underconsideration
int lastAccepted = start; int64_t lastAccepted = start;
while (iter != end) { while (iter != end) {
// What is the separation in offset values from the last element we // What is the separation in offset values from the last element we
// added to the set for this load? // added to the set for this load?
int delta = *iter - lastAccepted; int64_t delta = *iter - lastAccepted;
if (delta > 3) if (delta > 3)
// If there's too big a gap, then we won't issue the load // If there's too big a gap, then we won't issue the load
return false; return false;
int span = *iter - start + 1; int64_t span = *iter - start + 1;
if (span == vectorWidth) { if (span == vectorWidth) {
// We've extended far enough that we have exactly filled up the // We've extended far enough that we have exactly filled up the
@@ -2954,7 +2954,7 @@ lCoalescePerfInfo(const std::vector<llvm::CallInst *> &coalesceGroup,
return *((type *)(basePtr + offset)) return *((type *)(basePtr + offset))
*/ */
llvm::Value * llvm::Value *
lGEPAndLoad(llvm::Value *basePtr, int offset, int align, lGEPAndLoad(llvm::Value *basePtr, int64_t offset, int align,
llvm::Instruction *insertBefore, LLVM_TYPE_CONST llvm::Type *type) { llvm::Instruction *insertBefore, LLVM_TYPE_CONST llvm::Type *type) {
llvm::Value *ptr = lGEPInst(basePtr, LLVMInt64(offset), "new_base", llvm::Value *ptr = lGEPInst(basePtr, LLVMInt64(offset), "new_base",
insertBefore); insertBefore);
@@ -2979,7 +2979,7 @@ lEmitLoads(llvm::Value *basePtr, std::vector<CoalescedLoadOp> &loadOps,
// basePtr is an i8 *, so the offset from it should be in terms of // basePtr is an i8 *, so the offset from it should be in terms of
// bytes, not underlying i32 elements. // bytes, not underlying i32 elements.
int start = loadOps[i].start * elementSize; int64_t start = loadOps[i].start * elementSize;
int align = 4; int align = 4;
switch (loadOps[i].count) { switch (loadOps[i].count) {
@@ -3204,7 +3204,7 @@ lApplyLoad4(llvm::Value *result, const CoalescedLoadOp &load,
// shuffle index that extracts the appropriate element from the // shuffle index that extracts the appropriate element from the
// load. // load.
Assert(set[elt] == false); Assert(set[elt] == false);
shuf[elt] = offsets[elt] - load.start; shuf[elt] = int32_t(offsets[elt] - load.start);
set[elt] = true; set[elt] = true;
} }
} }