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

it is illegal to pass varying parapamter to a task function with nvptx target

Browse Source
This commit is contained in:
Evghenii
2014-01-27 10:30:09 +01:00
parent 1c2dbd6a27
commit b7b5c9ad1d
3 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
module.cpp
View File

@@ -675,6 +675,21 @@ lCheckExportedParameterTypes(const Type *type, const std::string &name,
} }
} }
static void
lCheckTaskParameterTypes(const Type *type, const std::string &name,
SourcePos pos) {
if (g->target->getISA() != Target::NVPTX)
return;
if (lRecursiveCheckValidParamType(type, false) == false) {
if (CastType<VectorType>(type))
Error(pos, "Vector-typed parameter \"%s\" is illegal in a task "
"function with \"nvptx\" target.", name.c_str());
else
Error(pos, "Varying parameter \"%s\" is illegal in a task function with \"nvptx\" target.",
name.c_str());
}
}
/** Given a function type, loop through the function parameters and see if /** Given a function type, loop through the function parameters and see if
any are StructTypes. If so, issue an error; this is currently broken any are StructTypes. If so, issue an error; this is currently broken
@@ -881,6 +896,9 @@ Module::AddFunctionDeclaration(const std::string &name,
if (functionType->isExported) { if (functionType->isExported) {
lCheckExportedParameterTypes(argType, argName, argPos); lCheckExportedParameterTypes(argType, argName, argPos);
} }
if (functionType->isTask) {
lCheckTaskParameterTypes(argType, argName, argPos);
}
// ISPC assumes that no pointers alias. (It should be possible to // ISPC assumes that no pointers alias. (It should be possible to
// specify when this is not the case, but this should be the // specify when this is not the case, but this should be the

5
tests/launch-8.ispc
View File

@@ -7,7 +7,8 @@ export uniform int width() { return programCount; }
#define N2 50 #define N2 50
static uniform float array[N2][N1][N0]; static uniform float array[N2][N1][N0];
task void x(const float f) { task void x(const uniform float farray[]) {
const float f = farray[programIndex];
uniform int j; uniform int j;
assert(taskCount == (uniform int32)N0*N1*N2); assert(taskCount == (uniform int32)N0*N1*N2);
@@ -30,7 +31,7 @@ task void x(const float f) {
array[i2][i1][i0] = i; array[i2][i1][i0] = i;
} }
export void f_f(uniform float RET[], uniform float fFOO[]) { export void f_f(uniform float RET[], uniform float fFOO[]) {
float f = fFOO[programIndex]; uniform float * uniform f = fFOO;
launch[N2][N1][N0] x(f); launch[N2][N1][N0] x(f);
sync; sync;
RET[programIndex] = array[N2-1][N1-1][N0-1]; RET[programIndex] = array[N2-1][N1-1][N0-1];

7
tests/launch-9.ispc
View File

@@ -7,7 +7,8 @@ export uniform int width() { return programCount; }
#define N2 50 #define N2 50
static uniform float array[N2][N1][N0]; static uniform float array[N2][N1][N0];
task void x(const float f) { task void x(const uniform float farray[]) {
const float f = farray[programIndex];
uniform int j; uniform int j;
assert(taskCount == (int32)N0*N1*N2); assert(taskCount == (int32)N0*N1*N2);
@@ -30,8 +31,8 @@ task void x(const float f) {
array[i2][i1][i0] = i; array[i2][i1][i0] = i;
} }
export void f_f(uniform float RET[], uniform float fFOO[]) { export void f_f(uniform float RET[], uniform float fFOO[]) {
float f = fFOO[programIndex]; uniform float * uniform f = fFOO;
launch[N0,N1,N2] x(f); launch[N2][N1][N0] x(f);
sync; sync;
RET[programIndex] = array[N2-1][N1-1][N0-1]; RET[programIndex] = array[N2-1][N1-1][N0-1];
} }