changed CK_GPGPU_* to CK_COMPUTE_*

gfursin · gfursin · commit 540987ceb20f · 2016-09-24T09:43:04.000+02:00
diff --git a/program/polybench-cuda-2dconv/.cm/meta.json b/program/polybench-cuda-2dconv/.cm/meta.json
@@ -50,7 +50,7 @@
       ], 
       "ignore_return_code": "no", 
       "run_time": {
-        "need_gpgpu_device":"cuda",
+        "need_compute_device":"cuda",
         "fine_grain_timer_file": "tmp-ck-timer.json", 
         "run_cmd_main": "$#BIN_FILE#$ ", 
         "run_cmd_out1": "tmp-output1.tmp", 
diff --git a/program/polybench-cuda-2dconv/2DConvolution.cu b/program/polybench-cuda-2dconv/2DConvolution.cu
@@ -130,7 +130,7 @@ void GPU_argv_init()
   cudaDeviceProp deviceProp;
   error = cudaGetDevice(&devID);
 
-  if (getenv("CK_GPGPU_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_GPGPU_DEVICE_ID"));
+  if (getenv("CK_COMPUTE_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_COMPUTE_DEVICE_ID"));
 
   cudaGetDeviceProperties(&deviceProp, gpgpu_device_id);
 
diff --git a/program/polybench-cuda-2mm/.cm/meta.json b/program/polybench-cuda-2mm/.cm/meta.json
@@ -51,7 +51,7 @@
       ], 
       "ignore_return_code": "no", 
       "run_time": {
-        "need_gpgpu_device":"cuda",
+        "need_compute_device":"cuda",
         "fine_grain_timer_file": "tmp-ck-timer.json", 
         "run_cmd_main": "$#BIN_FILE#$ ", 
         "run_cmd_out1": "tmp-output1.tmp", 
diff --git a/program/polybench-cuda-2mm/2mm.cu b/program/polybench-cuda-2mm/2mm.cu
@@ -134,7 +134,7 @@ void GPU_argv_init()
   cudaDeviceProp deviceProp;
   error = cudaGetDevice(&devID);
 
-  if (getenv("CK_GPGPU_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_GPGPU_DEVICE_ID"));
+  if (getenv("CK_COMPUTE_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_COMPUTE_DEVICE_ID"));
 
   cudaGetDeviceProperties(&deviceProp, gpgpu_device_id);
 
diff --git a/program/polybench-cuda-3dconv/.cm/meta.json b/program/polybench-cuda-3dconv/.cm/meta.json
@@ -50,7 +50,7 @@
       ], 
       "ignore_return_code": "no", 
       "run_time": {
-        "need_gpgpu_device":"cuda",
+        "need_compute_device":"cuda",
         "fine_grain_timer_file": "tmp-ck-timer.json", 
         "run_cmd_main": "$#BIN_FILE#$ ", 
         "run_cmd_out1": "tmp-output1.tmp", 
diff --git a/program/polybench-cuda-3dconv/3DConvolution.cu b/program/polybench-cuda-3dconv/3DConvolution.cu
@@ -144,7 +144,7 @@ void GPU_argv_init()
   cudaDeviceProp deviceProp;
   error = cudaGetDevice(&devID);
 
-  if (getenv("CK_GPGPU_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_GPGPU_DEVICE_ID"));
+  if (getenv("CK_COMPUTE_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_COMPUTE_DEVICE_ID"));
 
   cudaGetDeviceProperties(&deviceProp, gpgpu_device_id);
 
diff --git a/program/polybench-cuda-3mm/.cm/meta.json b/program/polybench-cuda-3mm/.cm/meta.json
@@ -52,7 +52,7 @@
       ], 
       "ignore_return_code": "no", 
       "run_time": {
-        "need_gpgpu_device":"cuda",
+        "need_compute_device":"cuda",
         "fine_grain_timer_file": "tmp-ck-timer.json", 
         "run_cmd_main": "$#BIN_FILE#$ ", 
         "run_cmd_out1": "tmp-output1.tmp", 
diff --git a/program/polybench-cuda-3mm/3mm.cu b/program/polybench-cuda-3mm/3mm.cu
@@ -137,7 +137,7 @@ void GPU_argv_init()
   cudaDeviceProp deviceProp;
   error = cudaGetDevice(&devID);
 
-  if (getenv("CK_GPGPU_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_GPGPU_DEVICE_ID"));
+  if (getenv("CK_COMPUTE_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_COMPUTE_DEVICE_ID"));
 
   cudaGetDeviceProperties(&deviceProp, gpgpu_device_id);
 
diff --git a/program/polybench-cuda-atax/.cm/meta.json b/program/polybench-cuda-atax/.cm/meta.json
@@ -49,7 +49,7 @@
       ], 
       "ignore_return_code": "no", 
       "run_time": {
-        "need_gpgpu_device":"cuda",
+        "need_compute_device":"cuda",
         "fine_grain_timer_file": "tmp-ck-timer.json", 
         "run_cmd_main": "$#BIN_FILE#$ ", 
         "run_cmd_out1": "tmp-output1.tmp", 
diff --git a/program/polybench-cuda-atax/atax.cu b/program/polybench-cuda-atax/atax.cu
@@ -106,7 +106,7 @@ void GPU_argv_init()
   cudaDeviceProp deviceProp;
   error = cudaGetDevice(&devID);
 
-  if (getenv("CK_GPGPU_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_GPGPU_DEVICE_ID"));
+  if (getenv("CK_COMPUTE_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_COMPUTE_DEVICE_ID"));
 
   cudaGetDeviceProperties(&deviceProp, gpgpu_device_id);
 
diff --git a/program/polybench-cuda-bicg/.cm/meta.json b/program/polybench-cuda-bicg/.cm/meta.json
@@ -49,7 +49,7 @@
       ], 
       "ignore_return_code": "no", 
       "run_time": {
-        "need_gpgpu_device":"cuda",
+        "need_compute_device":"cuda",
         "fine_grain_timer_file": "tmp-ck-timer.json", 
         "run_cmd_main": "$#BIN_FILE#$ ", 
         "run_cmd_out1": "tmp-output1.tmp", 
diff --git a/program/polybench-cuda-bicg/bicg.cu b/program/polybench-cuda-bicg/bicg.cu
@@ -121,7 +121,7 @@ void GPU_argv_init()
   cudaDeviceProp deviceProp;
   error = cudaGetDevice(&devID);
 
-  if (getenv("CK_GPGPU_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_GPGPU_DEVICE_ID"));
+  if (getenv("CK_COMPUTE_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_COMPUTE_DEVICE_ID"));
 
   cudaGetDeviceProperties(&deviceProp, gpgpu_device_id);
 
diff --git a/program/polybench-cuda-corr/.cm/meta.json b/program/polybench-cuda-corr/.cm/meta.json
@@ -55,7 +55,7 @@
       ], 
       "ignore_return_code": "no", 
       "run_time": {
-        "need_gpgpu_device":"cuda",
+        "need_compute_device":"cuda",
         "fine_grain_timer_file": "tmp-ck-timer.json", 
         "run_cmd_main": "$#BIN_FILE#$ ", 
         "run_cmd_out1": "tmp-output1.tmp", 
diff --git a/program/polybench-cuda-corr/correlation.cu b/program/polybench-cuda-corr/correlation.cu
@@ -199,7 +199,7 @@ void GPU_argv_init()
   cudaDeviceProp deviceProp;
   error = cudaGetDevice(&devID);
 
-  if (getenv("CK_GPGPU_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_GPGPU_DEVICE_ID"));
+  if (getenv("CK_COMPUTE_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_COMPUTE_DEVICE_ID"));
 
   cudaGetDeviceProperties(&deviceProp, gpgpu_device_id);
 
diff --git a/program/polybench-cuda-covar/.cm/meta.json b/program/polybench-cuda-covar/.cm/meta.json
@@ -53,7 +53,7 @@
       ], 
       "ignore_return_code": "no", 
       "run_time": {
-        "need_gpgpu_device":"cuda",
+        "need_compute_device":"cuda",
         "fine_grain_timer_file": "tmp-ck-timer.json", 
         "run_cmd_main": "$#BIN_FILE#$ ", 
         "run_cmd_out1": "tmp-output1.tmp", 
diff --git a/program/polybench-cuda-covar/covariance.cu b/program/polybench-cuda-covar/covariance.cu
@@ -162,7 +162,7 @@ void GPU_argv_init()
   cudaDeviceProp deviceProp;
   error = cudaGetDevice(&devID);
 
-  if (getenv("CK_GPGPU_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_GPGPU_DEVICE_ID"));
+  if (getenv("CK_COMPUTE_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_COMPUTE_DEVICE_ID"));
 
   cudaGetDeviceProperties(&deviceProp, gpgpu_device_id);
 
diff --git a/program/polybench-cuda-fdtd-2d/.cm/meta.json b/program/polybench-cuda-fdtd-2d/.cm/meta.json
@@ -49,7 +49,7 @@
       ], 
       "ignore_return_code": "no", 
       "run_time": {
-        "need_gpgpu_device":"cuda",
+        "need_compute_device":"cuda",
         "fine_grain_timer_file": "tmp-ck-timer.json", 
         "run_cmd_main": "$#BIN_FILE#$ ", 
         "run_cmd_out1": "tmp-output1.tmp", 
diff --git a/program/polybench-cuda-fdtd-2d/fdtd2d.cu b/program/polybench-cuda-fdtd-2d/fdtd2d.cu
@@ -152,7 +152,7 @@ void GPU_argv_init()
   cudaDeviceProp deviceProp;
   error = cudaGetDevice(&devID);
 
-  if (getenv("CK_GPGPU_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_GPGPU_DEVICE_ID"));
+  if (getenv("CK_COMPUTE_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_COMPUTE_DEVICE_ID"));
 
   cudaGetDeviceProperties(&deviceProp, gpgpu_device_id);
 
diff --git a/program/polybench-cuda-gemm/.cm/meta.json b/program/polybench-cuda-gemm/.cm/meta.json
@@ -50,7 +50,7 @@
       ], 
       "ignore_return_code": "no", 
       "run_time": {
-        "need_gpgpu_device":"cuda",
+        "need_compute_device":"cuda",
         "fine_grain_timer_file": "tmp-ck-timer.json", 
         "run_cmd_main": "$#BIN_FILE#$ ", 
         "run_cmd_out1": "tmp-output1.tmp", 
diff --git a/program/polybench-cuda-gemm/gemm.cu b/program/polybench-cuda-gemm/gemm.cu
@@ -147,7 +147,7 @@ void GPU_argv_init()
   cudaDeviceProp deviceProp;
   error = cudaGetDevice(&devID);
 
-  if (getenv("CK_GPGPU_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_GPGPU_DEVICE_ID"));
+  if (getenv("CK_COMPUTE_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_COMPUTE_DEVICE_ID"));
 
   cudaGetDeviceProperties(&deviceProp, gpgpu_device_id);
 
diff --git a/program/polybench-cuda-gesummv/.cm/meta.json b/program/polybench-cuda-gesummv/.cm/meta.json
@@ -48,7 +48,7 @@
       ], 
       "ignore_return_code": "no", 
       "run_time": {
-        "need_gpgpu_device":"cuda",
+        "need_compute_device":"cuda",
         "fine_grain_timer_file": "tmp-ck-timer.json", 
         "run_cmd_main": "$#BIN_FILE#$ ", 
         "run_cmd_out1": "tmp-output1.tmp", 
diff --git a/program/polybench-cuda-gesummv/gesummv.cu b/program/polybench-cuda-gesummv/gesummv.cu
@@ -123,7 +123,7 @@ void GPU_argv_init()
   cudaDeviceProp deviceProp;
   error = cudaGetDevice(&devID);
 
-  if (getenv("CK_GPGPU_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_GPGPU_DEVICE_ID"));
+  if (getenv("CK_COMPUTE_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_COMPUTE_DEVICE_ID"));
 
   cudaGetDeviceProperties(&deviceProp, gpgpu_device_id);
 
diff --git a/program/polybench-cuda-gramschm/.cm/meta.json b/program/polybench-cuda-gramschm/.cm/meta.json
@@ -49,7 +49,7 @@
       ], 
       "ignore_return_code": "no", 
       "run_time": {
-        "need_gpgpu_device":"cuda",
+        "need_compute_device":"cuda",
         "fine_grain_timer_file": "tmp-ck-timer.json", 
         "run_cmd_main": "$#BIN_FILE#$ ", 
         "run_cmd_out1": "tmp-output1.tmp", 
diff --git a/program/polybench-cuda-gramschm/gramschmidt.cu b/program/polybench-cuda-gramschm/gramschmidt.cu
@@ -139,7 +139,7 @@ void GPU_argv_init()
   cudaDeviceProp deviceProp;
   error = cudaGetDevice(&devID);
 
-  if (getenv("CK_GPGPU_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_GPGPU_DEVICE_ID"));
+  if (getenv("CK_COMPUTE_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_COMPUTE_DEVICE_ID"));
 
   cudaGetDeviceProperties(&deviceProp, gpgpu_device_id);
 
diff --git a/program/polybench-cuda-mvt/.cm/meta.json b/program/polybench-cuda-mvt/.cm/meta.json
@@ -48,7 +48,7 @@
       ], 
       "ignore_return_code": "no", 
       "run_time": {
-        "need_gpgpu_device":"cuda",
+        "need_compute_device":"cuda",
         "fine_grain_timer_file": "tmp-ck-timer.json", 
         "run_cmd_main": "$#BIN_FILE#$ ", 
         "run_cmd_out1": "tmp-output1.tmp", 
diff --git a/program/polybench-cuda-mvt/mvt.cu b/program/polybench-cuda-mvt/mvt.cu
@@ -132,7 +132,7 @@ void GPU_argv_init()
   cudaDeviceProp deviceProp;
   error = cudaGetDevice(&devID);
 
-  if (getenv("CK_GPGPU_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_GPGPU_DEVICE_ID"));
+  if (getenv("CK_COMPUTE_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_COMPUTE_DEVICE_ID"));
 
   cudaGetDeviceProperties(&deviceProp, gpgpu_device_id);
 
diff --git a/program/polybench-cuda-syr2k/.cm/meta.json b/program/polybench-cuda-syr2k/.cm/meta.json
@@ -49,7 +49,7 @@
       ], 
       "ignore_return_code": "no", 
       "run_time": {
-        "need_gpgpu_device":"cuda",
+        "need_compute_device":"cuda",
         "fine_grain_timer_file": "tmp-ck-timer.json", 
         "run_cmd_main": "$#BIN_FILE#$ ", 
         "run_cmd_out1": "tmp-output1.tmp", 
diff --git a/program/polybench-cuda-syr2k/syr2k.cu b/program/polybench-cuda-syr2k/syr2k.cu
@@ -141,7 +141,7 @@ void GPU_argv_init()
   cudaDeviceProp deviceProp;
   error = cudaGetDevice(&devID);
 
-  if (getenv("CK_GPGPU_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_GPGPU_DEVICE_ID"));
+  if (getenv("CK_COMPUTE_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_COMPUTE_DEVICE_ID"));
 
   cudaGetDeviceProperties(&deviceProp, gpgpu_device_id);
 
diff --git a/program/polybench-cuda-syrk/.cm/meta.json b/program/polybench-cuda-syrk/.cm/meta.json
@@ -49,7 +49,7 @@
       ], 
       "ignore_return_code": "no", 
       "run_time": {
-        "need_gpgpu_device":"cuda",
+        "need_compute_device":"cuda",
         "fine_grain_timer_file": "tmp-ck-timer.json", 
         "run_cmd_main": "$#BIN_FILE#$ ", 
         "run_cmd_out1": "tmp-output1.tmp", 
diff --git a/program/polybench-cuda-syrk/syrk.cu b/program/polybench-cuda-syrk/syrk.cu
@@ -140,7 +140,7 @@ void GPU_argv_init()
   cudaDeviceProp deviceProp;
   error = cudaGetDevice(&devID);
 
-  if (getenv("CK_GPGPU_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_GPGPU_DEVICE_ID"));
+  if (getenv("CK_COMPUTE_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_COMPUTE_DEVICE_ID"));
 
   cudaGetDeviceProperties(&deviceProp, gpgpu_device_id);
 
diff --git a/program/polybench-opencl-2dconv/.cm/meta.json b/program/polybench-opencl-2dconv/.cm/meta.json
@@ -50,7 +50,7 @@
       ], 
       "ignore_return_code": "no", 
       "run_time": {
-        "need_gpgpu_device":"opencl",
+        "need_compute_device":"opencl",
         "fine_grain_timer_file": "tmp-ck-timer.json", 
         "run_cmd_main": "$#BIN_FILE#$ \"$#src_path#$2DConvolution.cl\"", 
         "run_cmd_out1": "tmp-output1.tmp", 
diff --git a/program/polybench-opencl-2dconv/2DConvolution.c b/program/polybench-opencl-2dconv/2DConvolution.c
@@ -148,8 +148,8 @@ void cl_initialization()
 
   cl_device_id device;   
 
-  if (getenv("CK_GPGPU_PLATFORM_ID")!=NULL) gpgpu_platform_id=atol(getenv("CK_GPGPU_PLATFORM_ID"));
-  if (getenv("CK_GPGPU_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_GPGPU_DEVICE_ID"));
+  if (getenv("CK_COMPUTE_PLATFORM_ID")!=NULL) gpgpu_platform_id=atol(getenv("CK_COMPUTE_PLATFORM_ID"));
+  if (getenv("CK_COMPUTE_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_COMPUTE_DEVICE_ID"));
 
   platforms = (cl_platform_id*) malloc(sizeof(cl_platform_id) * gpgpu_platform_id+1);
   devices = (cl_device_id*) malloc(sizeof(cl_device_id) * gpgpu_device_id+1);
diff --git a/program/polybench-opencl-2mm/.cm/meta.json b/program/polybench-opencl-2mm/.cm/meta.json
@@ -52,7 +52,7 @@
       ], 
       "ignore_return_code": "no", 
       "run_time": {
-        "need_gpgpu_device":"opencl",
+        "need_compute_device":"opencl",
         "fine_grain_timer_file": "tmp-ck-timer.json", 
         "run_cmd_main": "$#BIN_FILE#$ \"$#src_path#$2mm.cl\"", 
         "run_cmd_out1": "tmp-output1.tmp", 
diff --git a/program/polybench-opencl-2mm/2mm.c b/program/polybench-opencl-2mm/2mm.c
@@ -182,8 +182,8 @@ void cl_initialization()
 
   cl_device_id device;   
 
-  if (getenv("CK_GPGPU_PLATFORM_ID")!=NULL) gpgpu_platform_id=atol(getenv("CK_GPGPU_PLATFORM_ID"));
-  if (getenv("CK_GPGPU_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_GPGPU_DEVICE_ID"));
+  if (getenv("CK_COMPUTE_PLATFORM_ID")!=NULL) gpgpu_platform_id=atol(getenv("CK_COMPUTE_PLATFORM_ID"));
+  if (getenv("CK_COMPUTE_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_COMPUTE_DEVICE_ID"));
 
   platforms = (cl_platform_id*) malloc(sizeof(cl_platform_id) * gpgpu_platform_id+1);
   devices = (cl_device_id*) malloc(sizeof(cl_device_id) * gpgpu_device_id+1);
diff --git a/program/polybench-opencl-3dconv/.cm/meta.json b/program/polybench-opencl-3dconv/.cm/meta.json
@@ -51,7 +51,7 @@
       ], 
       "ignore_return_code": "no", 
       "run_time": {
-        "need_gpgpu_device":"opencl",
+        "need_compute_device":"opencl",
         "fine_grain_timer_file": "tmp-ck-timer.json", 
         "run_cmd_main": "$#BIN_FILE#$ \"$#src_path#$3DConvolution.cl\"", 
         "run_cmd_out1": "tmp-output1.tmp", 
diff --git a/program/polybench-opencl-3dconv/3DConvolution.c b/program/polybench-opencl-3dconv/3DConvolution.c
@@ -130,8 +130,8 @@ void cl_initialization()
 
   cl_device_id device;   
 
-  if (getenv("CK_GPGPU_PLATFORM_ID")!=NULL) gpgpu_platform_id=atol(getenv("CK_GPGPU_PLATFORM_ID"));
-  if (getenv("CK_GPGPU_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_GPGPU_DEVICE_ID"));
+  if (getenv("CK_COMPUTE_PLATFORM_ID")!=NULL) gpgpu_platform_id=atol(getenv("CK_COMPUTE_PLATFORM_ID"));
+  if (getenv("CK_COMPUTE_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_COMPUTE_DEVICE_ID"));
 
   platforms = (cl_platform_id*) malloc(sizeof(cl_platform_id) * gpgpu_platform_id+1);
   devices = (cl_device_id*) malloc(sizeof(cl_device_id) * gpgpu_device_id+1);
diff --git a/program/polybench-opencl-3mm/.cm/meta.json b/program/polybench-opencl-3mm/.cm/meta.json
@@ -53,7 +53,7 @@
       ], 
       "ignore_return_code": "no", 
       "run_time": {
-        "need_gpgpu_device":"opencl",
+        "need_compute_device":"opencl",
         "fine_grain_timer_file": "tmp-ck-timer.json", 
         "run_cmd_main": "$#BIN_FILE#$ \"$#src_path#$3mm.cl\"", 
         "run_cmd_out1": "tmp-output1.tmp", 
diff --git a/program/polybench-opencl-3mm/3mm.c b/program/polybench-opencl-3mm/3mm.c
@@ -185,8 +185,8 @@ void cl_initialization()
 
   cl_device_id device;   
 
-  if (getenv("CK_GPGPU_PLATFORM_ID")!=NULL) gpgpu_platform_id=atol(getenv("CK_GPGPU_PLATFORM_ID"));
-  if (getenv("CK_GPGPU_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_GPGPU_DEVICE_ID"));
+  if (getenv("CK_COMPUTE_PLATFORM_ID")!=NULL) gpgpu_platform_id=atol(getenv("CK_COMPUTE_PLATFORM_ID"));
+  if (getenv("CK_COMPUTE_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_COMPUTE_DEVICE_ID"));
 
   platforms = (cl_platform_id*) malloc(sizeof(cl_platform_id) * gpgpu_platform_id+1);
   devices = (cl_device_id*) malloc(sizeof(cl_device_id) * gpgpu_device_id+1);
diff --git a/program/polybench-opencl-atax/.cm/meta.json b/program/polybench-opencl-atax/.cm/meta.json
@@ -50,7 +50,7 @@
       ], 
       "ignore_return_code": "no", 
       "run_time": {
-        "need_gpgpu_device":"opencl",
+        "need_compute_device":"opencl",
         "fine_grain_timer_file": "tmp-ck-timer.json", 
         "run_cmd_main": "$#BIN_FILE#$ \"$#src_path#$atax.cl\"", 
         "run_cmd_out1": "tmp-output1.tmp", 
diff --git a/program/polybench-opencl-atax/atax.c b/program/polybench-opencl-atax/atax.c
@@ -151,8 +151,8 @@ void cl_initialization()
 
   cl_device_id device;   
 
-  if (getenv("CK_GPGPU_PLATFORM_ID")!=NULL) gpgpu_platform_id=atol(getenv("CK_GPGPU_PLATFORM_ID"));
-  if (getenv("CK_GPGPU_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_GPGPU_DEVICE_ID"));
+  if (getenv("CK_COMPUTE_PLATFORM_ID")!=NULL) gpgpu_platform_id=atol(getenv("CK_COMPUTE_PLATFORM_ID"));
+  if (getenv("CK_COMPUTE_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_COMPUTE_DEVICE_ID"));
 
   platforms = (cl_platform_id*) malloc(sizeof(cl_platform_id) * gpgpu_platform_id+1);
   devices = (cl_device_id*) malloc(sizeof(cl_device_id) * gpgpu_device_id+1);
diff --git a/program/polybench-opencl-bicg/.cm/meta.json b/program/polybench-opencl-bicg/.cm/meta.json
@@ -50,7 +50,7 @@
       ], 
       "ignore_return_code": "no", 
       "run_time": {
-        "need_gpgpu_device":"opencl",
+        "need_compute_device":"opencl",
         "fine_grain_timer_file": "tmp-ck-timer.json", 
         "run_cmd_main": "$#BIN_FILE#$ \"$#src_path#$bicg.cl\"", 
         "run_cmd_out1": "tmp-output1.tmp", 
diff --git a/program/polybench-opencl-bicg/bicg.c b/program/polybench-opencl-bicg/bicg.c
@@ -168,8 +168,8 @@ void cl_initialization()
 
   cl_device_id device;   
 
-  if (getenv("CK_GPGPU_PLATFORM_ID")!=NULL) gpgpu_platform_id=atol(getenv("CK_GPGPU_PLATFORM_ID"));
-  if (getenv("CK_GPGPU_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_GPGPU_DEVICE_ID"));
+  if (getenv("CK_COMPUTE_PLATFORM_ID")!=NULL) gpgpu_platform_id=atol(getenv("CK_COMPUTE_PLATFORM_ID"));
+  if (getenv("CK_COMPUTE_DEVICE_ID")!=NULL) gpgpu_device_id=atol(getenv("CK_COMPUTE_DEVICE_ID"));
 
   platforms = (cl_platform_id*) malloc(sizeof(cl_platform_id) * gpgpu_platform_id+1);
   devices = (cl_device_id*) malloc(sizeof(cl_device_id) * gpgpu_device_id+1);
diff --git a/program/polybench-opencl-corr/.cm/meta.json b/program/polybench-opencl-corr/.cm/meta.json
@@ -56,7 +56,7 @@
       ], 
       "ignore_return_code": "no", 
       "run_time": {
-        "need_gpgpu_device":"opencl",
+        "need_compute_device":"opencl",
         "fine_grain_timer_file": "tmp-ck-timer.json", 
         "run_cmd_main": "$#BIN_FILE#$ \"$#src_path#$correlation.cl\"", 
         "run_cmd_out1": "tmp-output1.tmp", 
diff --git a/program/polybench-opencl-corr/correlation.c b/program/polybench-opencl-corr/correlation.c
diff --git a/program/polybench-opencl-covar/.cm/meta.json b/program/polybench-opencl-covar/.cm/meta.json
diff --git a/program/polybench-opencl-covar/covariance.c b/program/polybench-opencl-covar/covariance.c
diff --git a/program/polybench-opencl-fdtd-2d/.cm/meta.json b/program/polybench-opencl-fdtd-2d/.cm/meta.json
diff --git a/program/polybench-opencl-fdtd-2d/fdtd2d.c b/program/polybench-opencl-fdtd-2d/fdtd2d.c
diff --git a/program/polybench-opencl-gemm/.cm/meta.json b/program/polybench-opencl-gemm/.cm/meta.json
diff --git a/program/polybench-opencl-gemm/gemm.c b/program/polybench-opencl-gemm/gemm.c
diff --git a/program/polybench-opencl-gesummv/.cm/meta.json b/program/polybench-opencl-gesummv/.cm/meta.json
diff --git a/program/polybench-opencl-gesummv/gesummv.c b/program/polybench-opencl-gesummv/gesummv.c
diff --git a/program/polybench-opencl-gramschm/.cm/meta.json b/program/polybench-opencl-gramschm/.cm/meta.json
diff --git a/program/polybench-opencl-gramschm/gramschmidt.c b/program/polybench-opencl-gramschm/gramschmidt.c
diff --git a/program/polybench-opencl-mvt/.cm/meta.json b/program/polybench-opencl-mvt/.cm/meta.json
diff --git a/program/polybench-opencl-mvt/mvt.c b/program/polybench-opencl-mvt/mvt.c
diff --git a/program/polybench-opencl-syr2k/.cm/meta.json b/program/polybench-opencl-syr2k/.cm/meta.json
diff --git a/program/polybench-opencl-syr2k/syr2k.c b/program/polybench-opencl-syr2k/syr2k.c
diff --git a/program/polybench-opencl-syrk/.cm/meta.json b/program/polybench-opencl-syrk/.cm/meta.json
diff --git a/program/polybench-opencl-syrk/syrk.c b/program/polybench-opencl-syrk/syrk.c
