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
1=== modified file 'examples/EinsteinToolkit/EinsteinToolkit.c'
2--- examples/EinsteinToolkit/EinsteinToolkit.c 2012-12-09 00:24:42 +0000
3+++ examples/EinsteinToolkit/EinsteinToolkit.c 2012-12-11 17:54:33 +0000
4@@ -32,7 +32,7 @@
5 * Redshift, laptop, OSX, Intel(R) Core(TM) i7-3820QM CPU @ 2.70GHz:
6 * Theoretical best: 0.0393519 usec per gpu
7 * Apple's OpenCL: 0.213103 usec per gpu (with VECTOR_SIZE_I=2)
8- * pocl: 0.55614 usec per gpu (with THREAD_COUNT_ENV=4)
9+ * pocl: 0.543815 usec per gpu (with THREAD_COUNT_ENV=4)
10 *
11 * Nvidia, workstation, Intel(R) Xeon(R) CPU X5675 @ 3.07GHz
12 * Theoretical best: 0.0230727 usec per gpu
13@@ -1059,14 +1059,14 @@
14 static int did_print = 0;
15 if (!did_print) {
16 did_print = 1;
17+ printf("Local work group size: %4d %4d %4d\n",
18+ (int)local_work_size[0],
19+ (int)local_work_size[1],
20+ (int)local_work_size[2]);
21 printf("Global work group size: %4d %4d %4d\n",
22 (int)global_work_size[0],
23 (int)global_work_size[1],
24 (int)global_work_size[2]);
25- printf("Local work group size: %4d %4d %4d\n",
26- (int)local_work_size[0],
27- (int)local_work_size[1],
28- (int)local_work_size[2]);
29 }
30 }
31
32
33=== modified file 'examples/EinsteinToolkit/ML_BSSN_CL_RHS1.cl'
34--- examples/EinsteinToolkit/ML_BSSN_CL_RHS1.cl 2012-12-09 00:01:01 +0000
35+++ examples/EinsteinToolkit/ML_BSSN_CL_RHS1.cl 2012-12-11 17:54:33 +0000
36@@ -187,7 +187,7 @@
37 #define kcosh(x) cosh(x)
38 #define kexp(x) exp(x)
39 #define klog(x) log(x)
40-#define kpow(x,a) pow(x,a)
41+#define kpow(x,a) pow(x,(CCTK_REAL_VEC)(a))
42 #define ksin(x) sin(x)
43 #define ksinh(x) sinh(x)
44 #define ktan(x) tan(x)
45
46=== modified file 'examples/EinsteinToolkit/ML_BSSN_CL_RHS2.cl'
47--- examples/EinsteinToolkit/ML_BSSN_CL_RHS2.cl 2012-12-09 00:01:01 +0000
48+++ examples/EinsteinToolkit/ML_BSSN_CL_RHS2.cl 2012-12-11 17:54:33 +0000
49@@ -187,7 +187,7 @@
50 #define kcosh(x) cosh(x)
51 #define kexp(x) exp(x)
52 #define klog(x) log(x)
53-#define kpow(x,a) pow(x,a)
54+#define kpow(x,a) pow(x,(CCTK_REAL)(a))
55 #define ksin(x) sin(x)
56 #define ksinh(x) sinh(x)
57 #define ktan(x) tan(x)