SOCL: minor renaming in matmul example

socl/examples/matmul/matmul.c

@@ -115,10 +115,8 @@ static void __attribute__((unused)) parse_args(int argc, char **argv)
 	}
 }
 
-#define shrLog(...) fprintf(stderr, __VA_ARGS__);
-
 // Round Up Division function
-size_t shrRoundUp(int group_size, int global_size) {
+size_t roundUp(int group_size, int global_size) {
 	int r = global_size % group_size;
 	if(r == 0) {
 		return global_size;
@@ -127,18 +125,18 @@ size_t shrRoundUp(int group_size, int global_size) {
 	}
 }
 
-void fillArray(TYPE* pfData, int iSize) {
+void fillArray(TYPE* data, int size) {
 	int i;
 	const TYPE fScale = (TYPE)(1.0f / (float)RAND_MAX);
-	for (i = 0; i < iSize; ++i) {
-		pfData[i] = fScale * rand();
+	for (i = 0; i < size; ++i) {
+		data[i] = fScale * rand();
 	}
 }
 
-void shrPrintArray(float* pfData, int iSize) {
+void printArray(float* data, int size) {
 	int i;
-	for (i = 0; i < iSize; ++i) {
-		shrLog("%d: %.3f\n", i, pfData[i]);
+	for (i = 0; i < size; ++i) {
+		printf("%d: %.3f\n", i, data[i]);
 	}
 }
 
@@ -352,7 +350,7 @@ int main(int argc, const char** argv) {
 		check(clSetKernelArg(multiplicationKernel[p], 4, sizeof(cl_mem), (void *) &d_B[d]));
 		check(clSetKernelArg(multiplicationKernel[p], 5, sizeof(cl_mem), (void *) &d_C[i]));
 
-		size_t globalWorkSize[] = {shrRoundUp(BLOCK_SIZE,WC), shrRoundUp(BLOCK_SIZE,workSize[i])};
+		size_t globalWorkSize[] = {roundUp(BLOCK_SIZE,WC), roundUp(BLOCK_SIZE,workSize[i])};
 
 		check(clEnqueueNDRangeKernel(commandQueue[p][dev], multiplicationKernel[p], 2, NULL, globalWorkSize, localWorkSize, 0, NULL, &GPUExecution[i]));
 
@@ -432,26 +430,26 @@ int main(int argc, const char** argv) {
 	return 0;
 }
 
-void printDiff(TYPE *data1, TYPE *data2, int width, int height, int iListLength, TYPE fListTol) {
-	shrLog("Listing first %d Differences > %.6f...\n", iListLength, fListTol);
+void printDiff(TYPE *data1, TYPE *data2, int width, int height, int listLength, TYPE listTol) {
+	printf("Listing first %d Differences > %.6f...\n", listLength, listTol);
 	int i,j,k;
 	int error_count=0;
 	for (j = 0; j < height; j++) {
-		if (error_count < iListLength) {
-			shrLog("\n  Row %d:\n", j);
+		if (error_count < listLength) {
+			printf("\n  Row %d:\n", j);
 		}
 		for (i = 0; i < width; i++) {
 			k = j * width + i;
-			float fDiff = fabs(data1[k] - data2[k]);
-			if (fDiff > fListTol) {                
-				if (error_count < iListLength) {
-					shrLog("    Loc(%d,%d)\tCPU=%.5f\tGPU=%.5f\tDiff=%.6f\n", i, j, data1[k], data2[k], fDiff);
+			float diff = fabs(data1[k] - data2[k]);
+			if (diff > listTol) {                
+				if (error_count < listLength) {
+					printf("    Loc(%d,%d)\tCPU=%.5f\tGPU=%.5f\tDiff=%.6f\n", i, j, data1[k], data2[k], diff);
 				}
 				error_count++;
 			}
 		}
 	}
-	shrLog(" \n  Total Errors = %d\n\n", error_count);
+	printf(" \n  Total Errors = %d\n\n", error_count);
 }
 
 /**