Fix parsing of 'launch' so that angle brackets can be removed.

Issue #6.
This commit is contained in:
Matt Pharr
2012-03-19 11:27:32 -07:00
parent 28ac016928
commit ddfe4932ac
19 changed files with 104 additions and 48 deletions

View File

@@ -15,7 +15,7 @@ task void x(float f) {
}
export void f_f(uniform float RET[], uniform float fFOO[]) {
float f = fFOO[programIndex];
launch[10000] < x(f) >;
launch[10000] x(f);
sync;
RET[programIndex] = array[9999];
}

View File

@@ -15,7 +15,7 @@ export void f_f(uniform float RET[], uniform float fFOO[]) {
float f = fFOO[programIndex];
uniform int i;
cfor (i = 0; i < 10000; ++i)
launch < x(i, f) >;
launch x(i, f);
sync;
RET[programIndex] = array[9999];
}

View File

@@ -8,7 +8,7 @@ task void x(uniform int i, float f) {
}
export void f_fu(uniform float RET[], uniform float fFOO[], uniform float fu) {
float f = fFOO[programIndex];
launch < x(fu, f) >;
launch x(fu, f);
sync;
RET[programIndex] = array[5];
}

View File

@@ -8,7 +8,7 @@ task void x(uniform int i, float f) {
}
export void f_fu(uniform float RET[], uniform float fFOO[], uniform float fu) {
float f = fFOO[programIndex];
launch[1] < x(fu, f) >;
launch[1] x(fu, f);
sync;
RET[programIndex] = array[5];
}

View File

@@ -15,7 +15,7 @@ export void f_f(uniform float RET[], uniform float fFOO[]) {
float f = fFOO[programIndex];
uniform int i;
for (i = 0; i < 10000; ++i)
launch < x(i, f) >;
launch x(i, f);
sync;
RET[programIndex] = array[9999];
}

View File

@@ -6,8 +6,8 @@ static uniform float array[10];
task void foo(uniform float f) { array[0] = f; }
task void foo(uniform float f, uniform int i) { array[i] = f; }
export void f_v(uniform float RET[]) {
launch < foo(12.) >;
launch < foo(-1., 1) >;
launch foo(12.);
launch foo(-1., 1);
sync;
RET[programIndex] = array[0] + array[1];
}

View File

@@ -7,8 +7,8 @@ task void foo(uniform float f) { array[0] = f; }
task void foo(uniform float f, uniform int i) { array[i] = f; }
export void f_v(uniform float RET[]) {
launch[1] < foo(12.) >;
launch[1] < foo(-1., 1) >;
launch[1] foo(12.);
launch[1] foo(-1., 1);
sync;
RET[programIndex] = array[0] + array[1];
}