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

Merge branch 'nvptx' of github.com:egaburov/ispc into nvptx

Browse Source
This commit is contained in:
Evghenii
2013-11-09 20:56:55 +01:00
parent 8f6f6d10e7 3a549e5c2f
commit 946530019a
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
examples_cuda/rt/rt.cpp
View File

@@ -133,10 +133,12 @@ int main(int argc, char *argv[]) {
if (filename == NULL) if (filename == NULL)
usage(); usage();
fprintf(stderr, " --- 1 --- \n");
#define READ(var, n) \ #define READ(var, n) \
if (fread(&(var), sizeof(var), n, f) != (unsigned int)n) { \ if (fread(&(var), sizeof(var), n, f) != (unsigned int)n) { \
fprintf(stderr, "Unexpected EOF reading scene file\n"); \ fprintf(stderr, "Unexpected EOF reading scene file\n"); \
return 1; \ assert(0); \
} else /* eat ; */ } else /* eat ; */
// //
@@ -149,6 +151,7 @@ int main(int argc, char *argv[]) {
perror(fnbuf); perror(fnbuf);
return 1; return 1;
} }
fprintf(stderr, " --- 2 --- \n");
// //
// Nothing fancy, and trouble if we run on a big-endian system, just // Nothing fancy, and trouble if we run on a big-endian system, just
@@ -170,6 +173,7 @@ int main(int argc, char *argv[]) {
perror(fnbuf); perror(fnbuf);
return 1; return 1;
} }
fprintf(stderr, " --- 3 --- \n");
// The BVH file starts with an int that gives the total number of BVH // The BVH file starts with an int that gives the total number of BVH
// nodes // nodes
@@ -195,6 +199,8 @@ int main(int argc, char *argv[]) {
READ(nodes[i].pad, 1); READ(nodes[i].pad, 1);
} }
fprintf(stderr, " --- 4 --- \n");
// And then read the triangles // And then read the triangles
uint nTris; uint nTris;
READ(nTris, 1); READ(nTris, 1);
@@ -214,6 +220,7 @@ int main(int argc, char *argv[]) {
} }
fclose(f); fclose(f);
fprintf(stderr, " --- 5 --- \n");
int height = int(baseHeight * scale); int height = int(baseHeight * scale);
int width = int(baseWidth * scale); int width = int(baseWidth * scale);
@@ -246,19 +253,26 @@ int main(int argc, char *argv[]) {
// //
// Run 3 iterations with ispc + 1 core, record the minimum time // Run 3 iterations with ispc + 1 core, record the minimum time
// //
fprintf(stderr, " --- 6 --- \n");
fflush(stderr);
double minTimeISPCtasks = 1e30; double minTimeISPCtasks = 1e30;
for (int i = 0; i < 3; ++i) { for (int i = 0; i < 3; ++i)
reset_and_start_timer(); {
// reset_and_start_timer();
const double t0 = rtc(); const double t0 = rtc();
raytrace_ispc_tasks(width, height, baseWidth, baseHeight, raster2camera, raytrace_ispc_tasks(width, height, baseWidth, baseHeight, raster2camera,
camera2world, image, id, nodes, triangles); camera2world, image, id, nodes, triangles);
double dt = rtc() - t0; //get_elapsed_mcycles(); double dt = rtc() - t0; //get_elapsed_mcycles();
minTimeISPCtasks = std::min(dt, minTimeISPCtasks); minTimeISPCtasks = std::min(dt, minTimeISPCtasks);
} }
printf("[rt ispc + tasks]:\t\t[%.3f] million cycles for %d x %d image\n", fprintf(stderr, "[rt ispc + tasks]:\t\t[%.3f] million cycles for %d x %d image\n",
minTimeISPCtasks, width, height); minTimeISPCtasks, width, height);
fflush(stderr);
fprintf(stderr, " --- 7 --- \n");
fflush(stderr);
writeImage(id, image, width, height, "rt-ispc-tasks.ppm"); writeImage(id, image, width, height, "rt-ispc-tasks.ppm");
return 0;
memset(id, 0, width*height*sizeof(int)); memset(id, 0, width*height*sizeof(int));
memset(image, 0, width*height*sizeof(float)); memset(image, 0, width*height*sizeof(float));

2
examples_cuda/tasksys.cpp
View File

@@ -59,7 +59,9 @@
#define ISPC_USE_PTHREADS #define ISPC_USE_PTHREADS
#define ISPC_USE_PTHREADS_FULLY_SUBSCRIBED #define ISPC_USE_PTHREADS_FULLY_SUBSCRIBED
#define ISPC_USE_CILK #define ISPC_USE_CILK
*/
#define ISPC_USE_OMP #define ISPC_USE_OMP
/*
#define ISPC_USE_TBB_TASK_GROUP #define ISPC_USE_TBB_TASK_GROUP
#define ISPC_USE_TBB_PARALLEL_FOR #define ISPC_USE_TBB_PARALLEL_FOR