merge fixes

benchmarks/opencl/mri-q/kernel.cl

@@ -0,0 +1,51 @@
+#include "macros.h"
+
+__kernel void
+ComputePhiMag_GPU(__global float* phiR, __global float* phiI, __global float* phiMag, int numK) {
+  int indexK = get_global_id(0);
+  float real = indexK;
+  float imag = indexK;
+  if (indexK < numK) {
+    /*float*/ real = phiR[indexK];
+    /*float*/ imag = phiI[indexK];
+    phiMag[indexK] = real*real + imag*imag;
+  }
+}
+
+__kernel void
+ComputeQ_GPU(int numK, int kGlobalIndex,
+	     __global float* x, __global float* y, __global float* z,
+	     __global float* Qr, __global float* Qi, __global struct kValues* ck) 
+{
+  float sX;
+  float sY;
+  float sZ;
+  float sQr;
+  float sQi;
+
+  // Determine the element of the X arrays computed by this thread
+  int xIndex = get_group_id(0)*KERNEL_Q_THREADS_PER_BLOCK + get_local_id(0);
+
+  // Read block's X values from global mem to shared mem
+  sX = x[xIndex];
+  sY = y[xIndex];
+  sZ = z[xIndex];
+  sQr = Qr[xIndex];
+  sQi = Qi[xIndex];
+
+  int kIndex = 0;
+  for (; (kIndex < KERNEL_Q_K_ELEMS_PER_GRID); kIndex++) {
+    if (kGlobalIndex < numK) {
+      float expArg;
+      expArg = PIx2 * (ck[kIndex].Kx * sX +
+			   ck[kIndex].Ky * sY +
+			   ck[kIndex].Kz * sZ);
+      sQr = sQr + ck[kIndex].PhiMag * cos(expArg); // native_cos(expArg);
+      sQi = sQi + ck[kIndex].PhiMag * sin(expArg); // native_sin(expArg);
+    }
+    kGlobalIndex++;
+  }
+
+  Qr[xIndex] = sQr;
+  Qi[xIndex] = sQi;
+}