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

some changes

Browse Source
This commit is contained in:
Evghenii
2014-01-20 13:46:49 +01:00
parent 66faf8b4e4
commit 4581f10207
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
run_tests.py
View File

@@ -271,8 +271,8 @@ def run_test(testname):
print "Grepping: %s" % grep_cmd print "Grepping: %s" % grep_cmd
sp = subprocess.Popen(grep_cmd, shell=True) sp = subprocess.Popen(grep_cmd, shell=True)
sp.communicate() sp.communicate()
ispc_cmd = ispc_exe_rel + " --woff %s -o %s --arch=%s --emit-asm --target=%s" % \ ispc_cmd = ispc_exe_rel + " --woff %s -o %s --emit-asm --target=%s" % \
(filename4ptx, obj_name, options.arch, options.target) (filename4ptx, obj_name, options.target)
# compile the ispc code, make the executable, and run it... # compile the ispc code, make the executable, and run it...
(compile_error, run_error) = run_cmds([ispc_cmd, cc_cmd], (compile_error, run_error) = run_cmds([ispc_cmd, cc_cmd],

14
tests/cfor-gs-improve-multidim-struct-1.ispc
View File

@@ -4,19 +4,27 @@ export uniform int width() { return programCount; }
struct Foo { struct Foo {
uniform float udx[25][25]; uniform float udx[32][32];
}; };
export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) { export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
float a = aFOO[programIndex]; float a = aFOO[programIndex];
#ifndef __NVPTX__
uniform Foo f[5]; uniform Foo f[5];
#else __NVPTX__ /* too much shared memory allocated, nvcc fails to link */
uniform Foo * uniform f = uniform new uniform Foo[5];
#define _UNMALLOC
#endif
cfor (uniform int i = 0; i < 5; ++i) cfor (uniform int i = 0; i < 5; ++i)
cfor (uniform int j = 0; j < 25; ++j) cfor (uniform int j = 0; j < 32; ++j)
cfor (uniform int k = 0; k < 25; ++k) cfor (uniform int k = 0; k < 32; ++k)
f[i].udx[j][k] = 1000*i+100*j+k; f[i].udx[j][k] = 1000*i+100*j+k;
int x = 1; int x = 1;
RET[programIndex] = f[x+1].udx[b-4][programIndex]; RET[programIndex] = f[x+1].udx[b-4][programIndex];
#ifdef _UNMALLOC
delete f;
#endif
} }
export void result(uniform float RET[]) { RET[programIndex] = 2100 +programIndex; } export void result(uniform float RET[]) { RET[programIndex] = 2100 +programIndex; }