pocl

Merge lp:~schnetter/pocl/pocl into lp:~pocl/pocl/trunk

  1. pocl
  2. Merge into trunk
Proposed by Erik Schnetter
Status: Merged
Merged at revision: 474
Proposed branch: lp:~schnetter/pocl/pocl
Merge into: lp:~pocl/pocl/trunk
Diff against target: 57 lines (+7/-7)
3 files modified
examples/EinsteinToolkit/EinsteinToolkit.c (+5/-5)
examples/EinsteinToolkit/ML_BSSN_CL_RHS1.cl (+1/-1)
examples/EinsteinToolkit/ML_BSSN_CL_RHS2.cl (+1/-1)
To merge this branch: bzr merge lp:~schnetter/pocl/pocl
Reviewer Review Type Date Requested Status
pocl maintaners Pending
Review via email: mp+139275@code.launchpad.net

Description of the change

Correct errors in EinsteinToolkit benchmark

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'examples/EinsteinToolkit/EinsteinToolkit.c'
--- examples/EinsteinToolkit/EinsteinToolkit.c 2012-12-09 00:24:42 +0000
+++ examples/EinsteinToolkit/EinsteinToolkit.c 2012-12-11 17:54:33 +0000
@@ -32,7 +32,7 @@
32 * Redshift, laptop, OSX, Intel(R) Core(TM) i7-3820QM CPU @ 2.70GHz:32 * Redshift, laptop, OSX, Intel(R) Core(TM) i7-3820QM CPU @ 2.70GHz:
33 * Theoretical best: 0.0393519 usec per gpu33 * Theoretical best: 0.0393519 usec per gpu
34 * Apple's OpenCL: 0.213103 usec per gpu (with VECTOR_SIZE_I=2)34 * Apple's OpenCL: 0.213103 usec per gpu (with VECTOR_SIZE_I=2)
35 * pocl: 0.55614 usec per gpu (with THREAD_COUNT_ENV=4)35 * pocl: 0.543815 usec per gpu (with THREAD_COUNT_ENV=4)
36 *36 *
37 * Nvidia, workstation, Intel(R) Xeon(R) CPU X5675 @ 3.07GHz37 * Nvidia, workstation, Intel(R) Xeon(R) CPU X5675 @ 3.07GHz
38 * Theoretical best: 0.0230727 usec per gpu38 * Theoretical best: 0.0230727 usec per gpu
@@ -1059,14 +1059,14 @@
1059 static int did_print = 0;1059 static int did_print = 0;
1060 if (!did_print) {1060 if (!did_print) {
1061 did_print = 1;1061 did_print = 1;
1062 printf("Local work group size: %4d %4d %4d\n",
1063 (int)local_work_size[0],
1064 (int)local_work_size[1],
1065 (int)local_work_size[2]);
1062 printf("Global work group size: %4d %4d %4d\n",1066 printf("Global work group size: %4d %4d %4d\n",
1063 (int)global_work_size[0],1067 (int)global_work_size[0],
1064 (int)global_work_size[1],1068 (int)global_work_size[1],
1065 (int)global_work_size[2]);1069 (int)global_work_size[2]);
1066 printf("Local work group size: %4d %4d %4d\n",
1067 (int)local_work_size[0],
1068 (int)local_work_size[1],
1069 (int)local_work_size[2]);
1070 }1070 }
1071 }1071 }
1072 1072
10731073
=== modified file 'examples/EinsteinToolkit/ML_BSSN_CL_RHS1.cl'
--- examples/EinsteinToolkit/ML_BSSN_CL_RHS1.cl 2012-12-09 00:01:01 +0000
+++ examples/EinsteinToolkit/ML_BSSN_CL_RHS1.cl 2012-12-11 17:54:33 +0000
@@ -187,7 +187,7 @@
187#define kcosh(x) cosh(x)187#define kcosh(x) cosh(x)
188#define kexp(x) exp(x)188#define kexp(x) exp(x)
189#define klog(x) log(x)189#define klog(x) log(x)
190#define kpow(x,a) pow(x,a)190#define kpow(x,a) pow(x,(CCTK_REAL_VEC)(a))
191#define ksin(x) sin(x)191#define ksin(x) sin(x)
192#define ksinh(x) sinh(x)192#define ksinh(x) sinh(x)
193#define ktan(x) tan(x)193#define ktan(x) tan(x)
194194
=== modified file 'examples/EinsteinToolkit/ML_BSSN_CL_RHS2.cl'
--- examples/EinsteinToolkit/ML_BSSN_CL_RHS2.cl 2012-12-09 00:01:01 +0000
+++ examples/EinsteinToolkit/ML_BSSN_CL_RHS2.cl 2012-12-11 17:54:33 +0000
@@ -187,7 +187,7 @@
187#define kcosh(x) cosh(x)187#define kcosh(x) cosh(x)
188#define kexp(x) exp(x)188#define kexp(x) exp(x)
189#define klog(x) log(x)189#define klog(x) log(x)
190#define kpow(x,a) pow(x,a)190#define kpow(x,a) pow(x,(CCTK_REAL)(a))
191#define ksin(x) sin(x)191#define ksin(x) sin(x)
192#define ksinh(x) sinh(x)192#define ksinh(x) sinh(x)
193#define ktan(x) tan(x)193#define ktan(x) tan(x)