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

Fix bugs with offsetting for varying values with gathers/scatters.

Browse Source 
Fixes issue #134.
This commit is contained in:
Matt Pharr
2011-12-12 14:13:46 -08:00
parent ddcdfff3ae
commit 6f26ae9801
2 changed files with 42 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ctx.cpp
View File

@@ -1644,14 +1644,14 @@ FunctionEmitContext::AddElementOffset(llvm::Value *basePtr, int elementNum,
// us the offset in bytes to the given element of the structure
offset = g->target.StructOffset(st->LLVMType(g->ctx), elementNum);
else {
// Otherwise we should have a vector here and the offset is given
// by the element number times the size of the element type of the
// vector.
const VectorType *vt =
dynamic_cast<const VectorType *>(ptrType->GetBaseType());
assert(vt != NULL);
// Otherwise we should have a vector or array here and the offset
// is given by the element number times the size of the element
// type of the vector.
const SequentialType *st =
dynamic_cast<const SequentialType *>(ptrType->GetBaseType());
assert(st != NULL);
llvm::Value *size =
g->target.SizeOf(vt->GetElementType()->LLVMType(g->ctx));
g->target.SizeOf(st->GetElementType()->LLVMType(g->ctx));
llvm::Value *scale = (g->target.is32Bit || g->opt.force32BitAddressing) ?
LLVMInt32(elementNum) : LLVMInt64(elementNum);
offset = BinaryOperator(llvm::Instruction::Mul, size, scale);
@@ -2542,9 +2542,10 @@ FunctionEmitContext::addVaryingOffsetsIfNeeded(llvm::Value *ptr,
assert(pt && pt->IsVaryingType());
const Type *baseType = ptrType->GetBaseType();
assert(dynamic_cast<const AtomicType *>(baseType) != NULL ||
dynamic_cast<const EnumType *>(baseType) != NULL ||
dynamic_cast<const PointerType *>(baseType));
if (dynamic_cast<const AtomicType *>(baseType) == NULL &&
dynamic_cast<const EnumType *>(baseType) == NULL &&
dynamic_cast<const PointerType *>(baseType) == NULL)
return ptr;
if (baseType->IsUniformType())
return ptr;

31
tests/gather-struct-vector.ispc Normal file
View File

@@ -0,0 +1,31 @@
struct Ray {
float<3> v;
};
export uniform int width() { return programCount; }
export void f_f(uniform float RET[], uniform float aFOO[]) {
Ray r[programCount];
for (uniform int i = 0; i < programCount; ++i) {
r[i].v.x = 100*i + programIndex;
r[i].v.y = 200*i + 2*programIndex;
r[i].v.z = 300*i + 3*programIndex;
}
Ray *rp = &r[programIndex/2];
RET[programIndex] = rp->v.z;
}
export void result(uniform float RET[]) {
uniform int d0 = 0;
uniform int d1 = 0;
for (uniform int i = 0; i < programCount; i += 2) {
RET[i] = d0+d1;
d1 += 3;
RET[i+1] = d0+d1;
d0 += 300;
d1 += 3;
}
}