math_brute_force: remove LogBuildError (#2233)

`LogBuildError` was only ever called after `clSetKernelArg`, but setting
a kernel argument has no impact on the program build log. Printing of
the actual build log in case of a build failure is already handled via
`create_single_kernel_helper`.

Signed-off-by: Sven van Haastregt <sven.vanhaastregt@arm.com>
This commit is contained in:
Sven van Haastregt
2025-02-06 19:43:00 +01:00
committed by GitHub
parent 2031e21a58
commit a8b32b2720
41 changed files with 324 additions and 727 deletions

View File

@@ -344,26 +344,15 @@ cl_int Test(cl_uint job_id, cl_uint thread_id, void *data)
(buffer_elements + sizeValues[j] - 1) / sizeValues[j]; (buffer_elements + sizeValues[j] - 1) / sizeValues[j];
cl_kernel kernel = job->k[j][thread_id]; // each worker thread has its cl_kernel kernel = job->k[j][thread_id]; // each worker thread has its
// own copy of the cl_kernel // own copy of the cl_kernel
cl_program program = job->programs[j];
if ((error = clSetKernelArg(kernel, 0, sizeof(tinfo->outBuf[j]), error = clSetKernelArg(kernel, 0, sizeof(tinfo->outBuf[j]),
&tinfo->outBuf[j]))) &tinfo->outBuf[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(program); error = clSetKernelArg(kernel, 1, sizeof(tinfo->inBuf), &tinfo->inBuf);
return error; test_error(error, "Failed to set kernel argument");
} error =
if ((error = clSetKernelArg(kernel, 1, sizeof(tinfo->inBuf), clSetKernelArg(kernel, 2, sizeof(tinfo->inBuf2), &tinfo->inBuf2);
&tinfo->inBuf))) test_error(error, "Failed to set kernel argument");
{
LogBuildError(program);
return error;
}
if ((error = clSetKernelArg(kernel, 2, sizeof(tinfo->inBuf2),
&tinfo->inBuf2)))
{
LogBuildError(program);
return error;
}
if ((error = clEnqueueNDRangeKernel(tinfo->tQueue, kernel, 1, NULL, if ((error = clEnqueueNDRangeKernel(tinfo->tQueue, kernel, 1, NULL,
&vectorCount, NULL, 0, NULL, NULL))) &vectorCount, NULL, 0, NULL, NULL)))

View File

@@ -349,26 +349,15 @@ cl_int Test(cl_uint job_id, cl_uint thread_id, void *data)
(buffer_elements + sizeValues[j] - 1) / sizeValues[j]; (buffer_elements + sizeValues[j] - 1) / sizeValues[j];
cl_kernel kernel = job->k[j][thread_id]; // each worker thread has its cl_kernel kernel = job->k[j][thread_id]; // each worker thread has its
// own copy of the cl_kernel // own copy of the cl_kernel
cl_program program = job->programs[j];
if ((error = clSetKernelArg(kernel, 0, sizeof(tinfo->outBuf[j]), error = clSetKernelArg(kernel, 0, sizeof(tinfo->outBuf[j]),
&tinfo->outBuf[j]))) &tinfo->outBuf[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(program); error = clSetKernelArg(kernel, 1, sizeof(tinfo->inBuf), &tinfo->inBuf);
return error; test_error(error, "Failed to set kernel argument");
} error =
if ((error = clSetKernelArg(kernel, 1, sizeof(tinfo->inBuf), clSetKernelArg(kernel, 2, sizeof(tinfo->inBuf2), &tinfo->inBuf2);
&tinfo->inBuf))) test_error(error, "Failed to set kernel argument");
{
LogBuildError(program);
return error;
}
if ((error = clSetKernelArg(kernel, 2, sizeof(tinfo->inBuf2),
&tinfo->inBuf2)))
{
LogBuildError(program);
return error;
}
if ((error = clEnqueueNDRangeKernel(tinfo->tQueue, kernel, 1, NULL, if ((error = clEnqueueNDRangeKernel(tinfo->tQueue, kernel, 1, NULL,
&vectorCount, NULL, 0, NULL, NULL))) &vectorCount, NULL, 0, NULL, NULL)))

View File

@@ -229,26 +229,15 @@ cl_int TestHalf(cl_uint job_id, cl_uint thread_id, void *data)
(buffer_elements + sizeValues[j] - 1) / sizeValues[j]; (buffer_elements + sizeValues[j] - 1) / sizeValues[j];
cl_kernel kernel = job->k[j][thread_id]; // each worker thread has its cl_kernel kernel = job->k[j][thread_id]; // each worker thread has its
// own copy of the cl_kernel // own copy of the cl_kernel
cl_program program = job->programs[j];
if ((error = clSetKernelArg(kernel, 0, sizeof(tinfo->outBuf[j]), error = clSetKernelArg(kernel, 0, sizeof(tinfo->outBuf[j]),
&tinfo->outBuf[j]))) &tinfo->outBuf[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(program); error = clSetKernelArg(kernel, 1, sizeof(tinfo->inBuf), &tinfo->inBuf);
return error; test_error(error, "Failed to set kernel argument");
} error =
if ((error = clSetKernelArg(kernel, 1, sizeof(tinfo->inBuf), clSetKernelArg(kernel, 2, sizeof(tinfo->inBuf2), &tinfo->inBuf2);
&tinfo->inBuf))) test_error(error, "Failed to set kernel argument");
{
LogBuildError(program);
return error;
}
if ((error = clSetKernelArg(kernel, 2, sizeof(tinfo->inBuf2),
&tinfo->inBuf2)))
{
LogBuildError(program);
return error;
}
if ((error = clEnqueueNDRangeKernel(tinfo->tQueue, kernel, 1, NULL, if ((error = clEnqueueNDRangeKernel(tinfo->tQueue, kernel, 1, NULL,
&vectorCount, NULL, 0, NULL, NULL))) &vectorCount, NULL, 0, NULL, NULL)))

View File

@@ -346,26 +346,15 @@ cl_int Test(cl_uint job_id, cl_uint thread_id, void *data)
(buffer_elements + sizeValues[j] - 1) / sizeValues[j]; (buffer_elements + sizeValues[j] - 1) / sizeValues[j];
cl_kernel kernel = job->k[j][thread_id]; // each worker thread has its cl_kernel kernel = job->k[j][thread_id]; // each worker thread has its
// own copy of the cl_kernel // own copy of the cl_kernel
cl_program program = job->programs[j];
if ((error = clSetKernelArg(kernel, 0, sizeof(tinfo->outBuf[j]), error = clSetKernelArg(kernel, 0, sizeof(tinfo->outBuf[j]),
&tinfo->outBuf[j]))) &tinfo->outBuf[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(program); error = clSetKernelArg(kernel, 1, sizeof(tinfo->inBuf), &tinfo->inBuf);
return error; test_error(error, "Failed to set kernel argument");
} error =
if ((error = clSetKernelArg(kernel, 1, sizeof(tinfo->inBuf), clSetKernelArg(kernel, 2, sizeof(tinfo->inBuf2), &tinfo->inBuf2);
&tinfo->inBuf))) test_error(error, "Failed to set kernel argument");
{
LogBuildError(program);
return error;
}
if ((error = clSetKernelArg(kernel, 2, sizeof(tinfo->inBuf2),
&tinfo->inBuf2)))
{
LogBuildError(program);
return error;
}
if ((error = clEnqueueNDRangeKernel(tinfo->tQueue, kernel, 1, NULL, if ((error = clEnqueueNDRangeKernel(tinfo->tQueue, kernel, 1, NULL,
&vectorCount, NULL, 0, NULL, NULL))) &vectorCount, NULL, 0, NULL, NULL)))

View File

@@ -337,26 +337,15 @@ cl_int Test(cl_uint job_id, cl_uint thread_id, void *data)
(buffer_elements + sizeValues[j] - 1) / sizeValues[j]; (buffer_elements + sizeValues[j] - 1) / sizeValues[j];
cl_kernel kernel = job->k[j][thread_id]; // each worker thread has its cl_kernel kernel = job->k[j][thread_id]; // each worker thread has its
// own copy of the cl_kernel // own copy of the cl_kernel
cl_program program = job->programs[j];
if ((error = clSetKernelArg(kernel, 0, sizeof(tinfo->outBuf[j]), error = clSetKernelArg(kernel, 0, sizeof(tinfo->outBuf[j]),
&tinfo->outBuf[j]))) &tinfo->outBuf[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(program); error = clSetKernelArg(kernel, 1, sizeof(tinfo->inBuf), &tinfo->inBuf);
return error; test_error(error, "Failed to set kernel argument");
} error =
if ((error = clSetKernelArg(kernel, 1, sizeof(tinfo->inBuf), clSetKernelArg(kernel, 2, sizeof(tinfo->inBuf2), &tinfo->inBuf2);
&tinfo->inBuf))) test_error(error, "Failed to set kernel argument");
{
LogBuildError(program);
return error;
}
if ((error = clSetKernelArg(kernel, 2, sizeof(tinfo->inBuf2),
&tinfo->inBuf2)))
{
LogBuildError(program);
return error;
}
if ((error = clEnqueueNDRangeKernel(tinfo->tQueue, kernel, 1, NULL, if ((error = clEnqueueNDRangeKernel(tinfo->tQueue, kernel, 1, NULL,
&vectorCount, NULL, 0, NULL, NULL))) &vectorCount, NULL, 0, NULL, NULL)))

View File

@@ -225,26 +225,15 @@ cl_int TestHalf(cl_uint job_id, cl_uint thread_id, void *data)
(buffer_elements + sizeValues[j] - 1) / sizeValues[j]; (buffer_elements + sizeValues[j] - 1) / sizeValues[j];
cl_kernel kernel = job->k[j][thread_id]; // each worker thread has its cl_kernel kernel = job->k[j][thread_id]; // each worker thread has its
// own copy of the cl_kernel // own copy of the cl_kernel
cl_program program = job->programs[j];
if ((error = clSetKernelArg(kernel, 0, sizeof(tinfo->outBuf[j]), error = clSetKernelArg(kernel, 0, sizeof(tinfo->outBuf[j]),
&tinfo->outBuf[j]))) &tinfo->outBuf[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(program); error = clSetKernelArg(kernel, 1, sizeof(tinfo->inBuf), &tinfo->inBuf);
return error; test_error(error, "Failed to set kernel argument");
} error =
if ((error = clSetKernelArg(kernel, 1, sizeof(tinfo->inBuf), clSetKernelArg(kernel, 2, sizeof(tinfo->inBuf2), &tinfo->inBuf2);
&tinfo->inBuf))) test_error(error, "Failed to set kernel argument");
{
LogBuildError(program);
return error;
}
if ((error = clSetKernelArg(kernel, 2, sizeof(tinfo->inBuf2),
&tinfo->inBuf2)))
{
LogBuildError(program);
return error;
}
if ((error = clEnqueueNDRangeKernel(tinfo->tQueue, kernel, 1, NULL, if ((error = clEnqueueNDRangeKernel(tinfo->tQueue, kernel, 1, NULL,
&vectorCount, NULL, 0, NULL, NULL))) &vectorCount, NULL, 0, NULL, NULL)))

View File

@@ -345,26 +345,15 @@ cl_int Test(cl_uint job_id, cl_uint thread_id, void *data)
(buffer_elements + sizeValues[j] - 1) / sizeValues[j]; (buffer_elements + sizeValues[j] - 1) / sizeValues[j];
cl_kernel kernel = job->k[j][thread_id]; // each worker thread has its cl_kernel kernel = job->k[j][thread_id]; // each worker thread has its
// own copy of the cl_kernel // own copy of the cl_kernel
cl_program program = job->programs[j];
if ((error = clSetKernelArg(kernel, 0, sizeof(tinfo->outBuf[j]), error = clSetKernelArg(kernel, 0, sizeof(tinfo->outBuf[j]),
&tinfo->outBuf[j]))) &tinfo->outBuf[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(program); error = clSetKernelArg(kernel, 1, sizeof(tinfo->inBuf), &tinfo->inBuf);
return error; test_error(error, "Failed to set kernel argument");
} error =
if ((error = clSetKernelArg(kernel, 1, sizeof(tinfo->inBuf), clSetKernelArg(kernel, 2, sizeof(tinfo->inBuf2), &tinfo->inBuf2);
&tinfo->inBuf))) test_error(error, "Failed to set kernel argument");
{
LogBuildError(program);
return error;
}
if ((error = clSetKernelArg(kernel, 2, sizeof(tinfo->inBuf2),
&tinfo->inBuf2)))
{
LogBuildError(program);
return error;
}
if ((error = clEnqueueNDRangeKernel(tinfo->tQueue, kernel, 1, NULL, if ((error = clEnqueueNDRangeKernel(tinfo->tQueue, kernel, 1, NULL,
&vectorCount, NULL, 0, NULL, NULL))) &vectorCount, NULL, 0, NULL, NULL)))

View File

@@ -367,26 +367,15 @@ cl_int Test(cl_uint job_id, cl_uint thread_id, void *data)
(buffer_elements + sizeValues[j] - 1) / sizeValues[j]; (buffer_elements + sizeValues[j] - 1) / sizeValues[j];
cl_kernel kernel = job->k[j][thread_id]; // each worker thread has its cl_kernel kernel = job->k[j][thread_id]; // each worker thread has its
// own copy of the cl_kernel // own copy of the cl_kernel
cl_program program = job->programs[j];
if ((error = clSetKernelArg(kernel, 0, sizeof(tinfo->outBuf[j]), error = clSetKernelArg(kernel, 0, sizeof(tinfo->outBuf[j]),
&tinfo->outBuf[j]))) &tinfo->outBuf[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(program); error = clSetKernelArg(kernel, 1, sizeof(tinfo->inBuf), &tinfo->inBuf);
return error; test_error(error, "Failed to set kernel argument");
} error =
if ((error = clSetKernelArg(kernel, 1, sizeof(tinfo->inBuf), clSetKernelArg(kernel, 2, sizeof(tinfo->inBuf2), &tinfo->inBuf2);
&tinfo->inBuf))) test_error(error, "Failed to set kernel argument");
{
LogBuildError(program);
return error;
}
if ((error = clSetKernelArg(kernel, 2, sizeof(tinfo->inBuf2),
&tinfo->inBuf2)))
{
LogBuildError(program);
return error;
}
if ((error = clEnqueueNDRangeKernel(tinfo->tQueue, kernel, 1, NULL, if ((error = clEnqueueNDRangeKernel(tinfo->tQueue, kernel, 1, NULL,
&vectorCount, NULL, 0, NULL, NULL))) &vectorCount, NULL, 0, NULL, NULL)))

View File

@@ -240,26 +240,15 @@ cl_int TestHalf(cl_uint job_id, cl_uint thread_id, void *data)
(buffer_elements + sizeValues[j] - 1) / sizeValues[j]; (buffer_elements + sizeValues[j] - 1) / sizeValues[j];
cl_kernel kernel = job->k[j][thread_id]; // each worker thread has its cl_kernel kernel = job->k[j][thread_id]; // each worker thread has its
// own copy of the cl_kernel // own copy of the cl_kernel
cl_program program = job->programs[j];
if ((error = clSetKernelArg(kernel, 0, sizeof(tinfo->outBuf[j]), error = clSetKernelArg(kernel, 0, sizeof(tinfo->outBuf[j]),
&tinfo->outBuf[j]))) &tinfo->outBuf[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(program); error = clSetKernelArg(kernel, 1, sizeof(tinfo->inBuf), &tinfo->inBuf);
return error; test_error(error, "Failed to set kernel argument");
} error =
if ((error = clSetKernelArg(kernel, 1, sizeof(tinfo->inBuf), clSetKernelArg(kernel, 2, sizeof(tinfo->inBuf2), &tinfo->inBuf2);
&tinfo->inBuf))) test_error(error, "Failed to set kernel argument");
{
LogBuildError(program);
return error;
}
if ((error = clSetKernelArg(kernel, 2, sizeof(tinfo->inBuf2),
&tinfo->inBuf2)))
{
LogBuildError(program);
return error;
}
if ((error = clEnqueueNDRangeKernel(tinfo->tQueue, kernel, 1, NULL, if ((error = clEnqueueNDRangeKernel(tinfo->tQueue, kernel, 1, NULL,
&vectorCount, NULL, 0, NULL, NULL))) &vectorCount, NULL, 0, NULL, NULL)))

View File

@@ -185,31 +185,18 @@ int TestFunc_DoubleI_Double_Double(const Func *f, MTdata d, bool relaxedMode)
size_t vectorSize = sizeof(cl_double) * sizeValues[j]; size_t vectorSize = sizeof(cl_double) * sizeValues[j];
size_t localCount = (BUFFER_SIZE + vectorSize - 1) size_t localCount = (BUFFER_SIZE + vectorSize - 1)
/ vectorSize; // BUFFER_SIZE / vectorSize rounded up / vectorSize; // BUFFER_SIZE / vectorSize rounded up
if ((error = clSetKernelArg(kernels[j][thread_id], 0, error = clSetKernelArg(kernels[j][thread_id], 0,
sizeof(gOutBuffer[j]), &gOutBuffer[j]))) sizeof(gOutBuffer[j]), &gOutBuffer[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(programs[j]); error = clSetKernelArg(kernels[j][thread_id], 1,
return error; sizeof(gOutBuffer2[j]), &gOutBuffer2[j]);
} test_error(error, "Failed to set kernel argument");
if ((error = error = clSetKernelArg(kernels[j][thread_id], 2, sizeof(gInBuffer),
clSetKernelArg(kernels[j][thread_id], 1, &gInBuffer);
sizeof(gOutBuffer2[j]), &gOutBuffer2[j]))) test_error(error, "Failed to set kernel argument");
{ error = clSetKernelArg(kernels[j][thread_id], 3, sizeof(gInBuffer2),
LogBuildError(programs[j]); &gInBuffer2);
return error; test_error(error, "Failed to set kernel argument");
}
if ((error = clSetKernelArg(kernels[j][thread_id], 2,
sizeof(gInBuffer), &gInBuffer)))
{
LogBuildError(programs[j]);
return error;
}
if ((error = clSetKernelArg(kernels[j][thread_id], 3,
sizeof(gInBuffer2), &gInBuffer2)))
{
LogBuildError(programs[j]);
return error;
}
if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id], if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id],
1, NULL, &localCount, NULL, 0, 1, NULL, &localCount, NULL, 0,

View File

@@ -187,31 +187,18 @@ int TestFunc_FloatI_Float_Float(const Func *f, MTdata d, bool relaxedMode)
size_t vectorSize = sizeof(cl_float) * sizeValues[j]; size_t vectorSize = sizeof(cl_float) * sizeValues[j];
size_t localCount = (BUFFER_SIZE + vectorSize - 1) size_t localCount = (BUFFER_SIZE + vectorSize - 1)
/ vectorSize; // BUFFER_SIZE / vectorSize rounded up / vectorSize; // BUFFER_SIZE / vectorSize rounded up
if ((error = clSetKernelArg(kernels[j][thread_id], 0, error = clSetKernelArg(kernels[j][thread_id], 0,
sizeof(gOutBuffer[j]), &gOutBuffer[j]))) sizeof(gOutBuffer[j]), &gOutBuffer[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(programs[j]); error = clSetKernelArg(kernels[j][thread_id], 1,
return error; sizeof(gOutBuffer2[j]), &gOutBuffer2[j]);
} test_error(error, "Failed to set kernel argument");
if ((error = error = clSetKernelArg(kernels[j][thread_id], 2, sizeof(gInBuffer),
clSetKernelArg(kernels[j][thread_id], 1, &gInBuffer);
sizeof(gOutBuffer2[j]), &gOutBuffer2[j]))) test_error(error, "Failed to set kernel argument");
{ error = clSetKernelArg(kernels[j][thread_id], 3, sizeof(gInBuffer2),
LogBuildError(programs[j]); &gInBuffer2);
return error; test_error(error, "Failed to set kernel argument");
}
if ((error = clSetKernelArg(kernels[j][thread_id], 2,
sizeof(gInBuffer), &gInBuffer)))
{
LogBuildError(programs[j]);
return error;
}
if ((error = clSetKernelArg(kernels[j][thread_id], 3,
sizeof(gInBuffer2), &gInBuffer2)))
{
LogBuildError(programs[j]);
return error;
}
if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id], if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id],
1, NULL, &localCount, NULL, 0, 1, NULL, &localCount, NULL, 0,

View File

@@ -179,31 +179,18 @@ int TestFunc_HalfI_Half_Half(const Func *f, MTdata d, bool relaxedMode)
// align working group size with the bigger output type // align working group size with the bigger output type
size_t vectorSize = sizeValues[j] * sizeof(int32_t); size_t vectorSize = sizeValues[j] * sizeof(int32_t);
size_t localCount = (BUFFER_SIZE + vectorSize - 1) / vectorSize; size_t localCount = (BUFFER_SIZE + vectorSize - 1) / vectorSize;
if ((error = clSetKernelArg(kernels[j][thread_id], 0, error = clSetKernelArg(kernels[j][thread_id], 0,
sizeof(gOutBuffer[j]), &gOutBuffer[j]))) sizeof(gOutBuffer[j]), &gOutBuffer[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(programs[j]); error = clSetKernelArg(kernels[j][thread_id], 1,
return error; sizeof(gOutBuffer2[j]), &gOutBuffer2[j]);
} test_error(error, "Failed to set kernel argument");
if ((error = error = clSetKernelArg(kernels[j][thread_id], 2, sizeof(gInBuffer),
clSetKernelArg(kernels[j][thread_id], 1, &gInBuffer);
sizeof(gOutBuffer2[j]), &gOutBuffer2[j]))) test_error(error, "Failed to set kernel argument");
{ error = clSetKernelArg(kernels[j][thread_id], 3, sizeof(gInBuffer2),
LogBuildError(programs[j]); &gInBuffer2);
return error; test_error(error, "Failed to set kernel argument");
}
if ((error = clSetKernelArg(kernels[j][thread_id], 2,
sizeof(gInBuffer), &gInBuffer)))
{
LogBuildError(programs[j]);
return error;
}
if ((error = clSetKernelArg(kernels[j][thread_id], 3,
sizeof(gInBuffer2), &gInBuffer2)))
{
LogBuildError(programs[j]);
return error;
}
if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id], if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id],
1, NULL, &localCount, NULL, 0, 1, NULL, &localCount, NULL, 0,

View File

@@ -122,18 +122,12 @@ int TestFunc_Int_Double(const Func *f, MTdata d, bool relaxedMode)
size_t vectorSize = sizeValues[j] * sizeof(cl_double); size_t vectorSize = sizeValues[j] * sizeof(cl_double);
size_t localCount = (BUFFER_SIZE + vectorSize - 1) size_t localCount = (BUFFER_SIZE + vectorSize - 1)
/ vectorSize; // BUFFER_SIZE / vectorSize rounded up / vectorSize; // BUFFER_SIZE / vectorSize rounded up
if ((error = clSetKernelArg(kernels[j][thread_id], 0, error = clSetKernelArg(kernels[j][thread_id], 0,
sizeof(gOutBuffer[j]), &gOutBuffer[j]))) sizeof(gOutBuffer[j]), &gOutBuffer[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(programs[j]); error = clSetKernelArg(kernels[j][thread_id], 1, sizeof(gInBuffer),
return error; &gInBuffer);
} test_error(error, "Failed to set kernel argument");
if ((error = clSetKernelArg(kernels[j][thread_id], 1,
sizeof(gInBuffer), &gInBuffer)))
{
LogBuildError(programs[j]);
return error;
}
if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id], if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id],
1, NULL, &localCount, NULL, 0, 1, NULL, &localCount, NULL, 0,

View File

@@ -121,18 +121,12 @@ int TestFunc_Int_Float(const Func *f, MTdata d, bool relaxedMode)
size_t vectorSize = sizeValues[j] * sizeof(cl_float); size_t vectorSize = sizeValues[j] * sizeof(cl_float);
size_t localCount = (BUFFER_SIZE + vectorSize - 1) size_t localCount = (BUFFER_SIZE + vectorSize - 1)
/ vectorSize; // BUFFER_SIZE / vectorSize rounded up / vectorSize; // BUFFER_SIZE / vectorSize rounded up
if ((error = clSetKernelArg(kernels[j][thread_id], 0, error = clSetKernelArg(kernels[j][thread_id], 0,
sizeof(gOutBuffer[j]), &gOutBuffer[j]))) sizeof(gOutBuffer[j]), &gOutBuffer[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(programs[j]); error = clSetKernelArg(kernels[j][thread_id], 1, sizeof(gInBuffer),
return error; &gInBuffer);
} test_error(error, "Failed to set kernel argument");
if ((error = clSetKernelArg(kernels[j][thread_id], 1,
sizeof(gInBuffer), &gInBuffer)))
{
LogBuildError(programs[j]);
return error;
}
if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id], if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id],
1, NULL, &localCount, NULL, 0, 1, NULL, &localCount, NULL, 0,

View File

@@ -118,18 +118,12 @@ int TestFunc_Int_Half(const Func *f, MTdata d, bool relaxedMode)
{ {
size_t vectorSize = sizeValues[j] * sizeof(cl_int); size_t vectorSize = sizeValues[j] * sizeof(cl_int);
size_t localCount = (bufferSizeOut + vectorSize - 1) / vectorSize; size_t localCount = (bufferSizeOut + vectorSize - 1) / vectorSize;
if ((error = clSetKernelArg(kernels[j][thread_id], 0, error = clSetKernelArg(kernels[j][thread_id], 0,
sizeof(gOutBuffer[j]), &gOutBuffer[j]))) sizeof(gOutBuffer[j]), &gOutBuffer[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(programs[j]); error = clSetKernelArg(kernels[j][thread_id], 1, sizeof(gInBuffer),
return error; &gInBuffer);
} test_error(error, "Failed to set kernel argument");
if ((error = clSetKernelArg(kernels[j][thread_id], 1,
sizeof(gInBuffer), &gInBuffer)))
{
LogBuildError(programs[j]);
return error;
}
if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id], if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id],
1, NULL, &localCount, NULL, 0, 1, NULL, &localCount, NULL, 0,

View File

@@ -327,26 +327,15 @@ cl_int Test(cl_uint job_id, cl_uint thread_id, void *data)
(buffer_elements + sizeValues[j] - 1) / sizeValues[j]; (buffer_elements + sizeValues[j] - 1) / sizeValues[j];
cl_kernel kernel = job->k[j][thread_id]; // each worker thread has its cl_kernel kernel = job->k[j][thread_id]; // each worker thread has its
// own copy of the cl_kernel // own copy of the cl_kernel
cl_program program = job->programs[j];
if ((error = clSetKernelArg(kernel, 0, sizeof(tinfo->outBuf[j]), error = clSetKernelArg(kernel, 0, sizeof(tinfo->outBuf[j]),
&tinfo->outBuf[j]))) &tinfo->outBuf[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(program); error = clSetKernelArg(kernel, 1, sizeof(tinfo->inBuf), &tinfo->inBuf);
return error; test_error(error, "Failed to set kernel argument");
} error =
if ((error = clSetKernelArg(kernel, 1, sizeof(tinfo->inBuf), clSetKernelArg(kernel, 2, sizeof(tinfo->inBuf2), &tinfo->inBuf2);
&tinfo->inBuf))) test_error(error, "Failed to set kernel argument");
{
LogBuildError(program);
return error;
}
if ((error = clSetKernelArg(kernel, 2, sizeof(tinfo->inBuf2),
&tinfo->inBuf2)))
{
LogBuildError(program);
return error;
}
if ((error = clEnqueueNDRangeKernel(tinfo->tQueue, kernel, 1, NULL, if ((error = clEnqueueNDRangeKernel(tinfo->tQueue, kernel, 1, NULL,
&vectorCount, NULL, 0, NULL, NULL))) &vectorCount, NULL, 0, NULL, NULL)))

View File

@@ -320,26 +320,15 @@ cl_int Test(cl_uint job_id, cl_uint thread_id, void *data)
(buffer_elements + sizeValues[j] - 1) / sizeValues[j]; (buffer_elements + sizeValues[j] - 1) / sizeValues[j];
cl_kernel kernel = job->k[j][thread_id]; // each worker thread has its cl_kernel kernel = job->k[j][thread_id]; // each worker thread has its
// own copy of the cl_kernel // own copy of the cl_kernel
cl_program program = job->programs[j];
if ((error = clSetKernelArg(kernel, 0, sizeof(tinfo->outBuf[j]), error = clSetKernelArg(kernel, 0, sizeof(tinfo->outBuf[j]),
&tinfo->outBuf[j]))) &tinfo->outBuf[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(program); error = clSetKernelArg(kernel, 1, sizeof(tinfo->inBuf), &tinfo->inBuf);
return error; test_error(error, "Failed to set kernel argument");
} error =
if ((error = clSetKernelArg(kernel, 1, sizeof(tinfo->inBuf), clSetKernelArg(kernel, 2, sizeof(tinfo->inBuf2), &tinfo->inBuf2);
&tinfo->inBuf))) test_error(error, "Failed to set kernel argument");
{
LogBuildError(program);
return error;
}
if ((error = clSetKernelArg(kernel, 2, sizeof(tinfo->inBuf2),
&tinfo->inBuf2)))
{
LogBuildError(program);
return error;
}
if ((error = clEnqueueNDRangeKernel(tinfo->tQueue, kernel, 1, NULL, if ((error = clEnqueueNDRangeKernel(tinfo->tQueue, kernel, 1, NULL,
&vectorCount, NULL, 0, NULL, NULL))) &vectorCount, NULL, 0, NULL, NULL)))

View File

@@ -210,26 +210,15 @@ cl_int TestHalf(cl_uint job_id, cl_uint thread_id, void *data)
(buffer_elements + sizeValues[j] - 1) / sizeValues[j]; (buffer_elements + sizeValues[j] - 1) / sizeValues[j];
cl_kernel kernel = job->k[j][thread_id]; // each worker thread has its cl_kernel kernel = job->k[j][thread_id]; // each worker thread has its
// own copy of the cl_kernel // own copy of the cl_kernel
cl_program program = job->programs[j];
if ((error = clSetKernelArg(kernel, 0, sizeof(tinfo->outBuf[j]), error = clSetKernelArg(kernel, 0, sizeof(tinfo->outBuf[j]),
&tinfo->outBuf[j]))) &tinfo->outBuf[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(program); error = clSetKernelArg(kernel, 1, sizeof(tinfo->inBuf), &tinfo->inBuf);
return error; test_error(error, "Failed to set kernel argument");
} error =
if ((error = clSetKernelArg(kernel, 1, sizeof(tinfo->inBuf), clSetKernelArg(kernel, 2, sizeof(tinfo->inBuf2), &tinfo->inBuf2);
&tinfo->inBuf))) test_error(error, "Failed to set kernel argument");
{
LogBuildError(program);
return error;
}
if ((error = clSetKernelArg(kernel, 2, sizeof(tinfo->inBuf2),
&tinfo->inBuf2)))
{
LogBuildError(program);
return error;
}
if ((error = clEnqueueNDRangeKernel(tinfo->tQueue, kernel, 1, NULL, if ((error = clEnqueueNDRangeKernel(tinfo->tQueue, kernel, 1, NULL,
&vectorCount, NULL, 0, NULL, NULL))) &vectorCount, NULL, 0, NULL, NULL)))

View File

@@ -168,20 +168,12 @@ cl_int Test(cl_uint job_id, cl_uint thread_id, void *data)
(buffer_elements + sizeValues[j] - 1) / sizeValues[j]; (buffer_elements + sizeValues[j] - 1) / sizeValues[j];
cl_kernel kernel = job->k[j][thread_id]; // each worker thread has its cl_kernel kernel = job->k[j][thread_id]; // each worker thread has its
// own copy of the cl_kernel // own copy of the cl_kernel
cl_program program = job->programs[j];
if ((error = clSetKernelArg(kernel, 0, sizeof(tinfo->outBuf[j]), error = clSetKernelArg(kernel, 0, sizeof(tinfo->outBuf[j]),
&tinfo->outBuf[j]))) &tinfo->outBuf[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(program); error = clSetKernelArg(kernel, 1, sizeof(tinfo->inBuf), &tinfo->inBuf);
return error; test_error(error, "Failed to set kernel argument");
}
if ((error = clSetKernelArg(kernel, 1, sizeof(tinfo->inBuf),
&tinfo->inBuf)))
{
LogBuildError(program);
return error;
}
if ((error = clEnqueueNDRangeKernel(tinfo->tQueue, kernel, 1, NULL, if ((error = clEnqueueNDRangeKernel(tinfo->tQueue, kernel, 1, NULL,
&vectorCount, NULL, 0, NULL, NULL))) &vectorCount, NULL, 0, NULL, NULL)))

View File

@@ -169,20 +169,12 @@ cl_int Test(cl_uint job_id, cl_uint thread_id, void *data)
(buffer_elements + sizeValues[j] - 1) / sizeValues[j]; (buffer_elements + sizeValues[j] - 1) / sizeValues[j];
cl_kernel kernel = job->k[j][thread_id]; // each worker thread has its cl_kernel kernel = job->k[j][thread_id]; // each worker thread has its
// own copy of the cl_kernel // own copy of the cl_kernel
cl_program program = job->programs[j];
if ((error = clSetKernelArg(kernel, 0, sizeof(tinfo->outBuf[j]), error = clSetKernelArg(kernel, 0, sizeof(tinfo->outBuf[j]),
&tinfo->outBuf[j]))) &tinfo->outBuf[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(program); error = clSetKernelArg(kernel, 1, sizeof(tinfo->inBuf), &tinfo->inBuf);
return error; test_error(error, "Failed to set kernel argument");
}
if ((error = clSetKernelArg(kernel, 1, sizeof(tinfo->inBuf),
&tinfo->inBuf)))
{
LogBuildError(program);
return error;
}
if ((error = clEnqueueNDRangeKernel(tinfo->tQueue, kernel, 1, NULL, if ((error = clEnqueueNDRangeKernel(tinfo->tQueue, kernel, 1, NULL,
&vectorCount, NULL, 0, NULL, NULL))) &vectorCount, NULL, 0, NULL, NULL)))

View File

@@ -151,20 +151,12 @@ cl_int TestHalf(cl_uint job_id, cl_uint thread_id, void *data)
(buffer_elements + sizeValues[j] - 1) / sizeValues[j]; (buffer_elements + sizeValues[j] - 1) / sizeValues[j];
cl_kernel kernel = job->k[j][thread_id]; // each worker thread has its cl_kernel kernel = job->k[j][thread_id]; // each worker thread has its
// own copy of the cl_kernel // own copy of the cl_kernel
cl_program program = job->programs[j];
if ((error = clSetKernelArg(kernel, 0, sizeof(tinfo->outBuf[j]), error = clSetKernelArg(kernel, 0, sizeof(tinfo->outBuf[j]),
&tinfo->outBuf[j]))) &tinfo->outBuf[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(program); error = clSetKernelArg(kernel, 1, sizeof(tinfo->inBuf), &tinfo->inBuf);
return error; test_error(error, "Failed to set kernel argument");
}
if ((error = clSetKernelArg(kernel, 1, sizeof(tinfo->inBuf),
&tinfo->inBuf)))
{
LogBuildError(program);
return error;
}
if ((error = clEnqueueNDRangeKernel(tinfo->tQueue, kernel, 1, NULL, if ((error = clEnqueueNDRangeKernel(tinfo->tQueue, kernel, 1, NULL,
&vectorCount, NULL, 0, NULL, NULL))) &vectorCount, NULL, 0, NULL, NULL)))

View File

@@ -131,30 +131,18 @@ int TestFunc_mad_Double(const Func *f, MTdata d, bool relaxedMode)
size_t vectorSize = sizeof(cl_double) * sizeValues[j]; size_t vectorSize = sizeof(cl_double) * sizeValues[j];
size_t localCount = (BUFFER_SIZE + vectorSize - 1) size_t localCount = (BUFFER_SIZE + vectorSize - 1)
/ vectorSize; // BUFFER_SIZE / vectorSize rounded up / vectorSize; // BUFFER_SIZE / vectorSize rounded up
if ((error = clSetKernelArg(kernels[j][thread_id], 0, error = clSetKernelArg(kernels[j][thread_id], 0,
sizeof(gOutBuffer[j]), &gOutBuffer[j]))) sizeof(gOutBuffer[j]), &gOutBuffer[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(programs[j]); error = clSetKernelArg(kernels[j][thread_id], 1, sizeof(gInBuffer),
return error; &gInBuffer);
} test_error(error, "Failed to set kernel argument");
if ((error = clSetKernelArg(kernels[j][thread_id], 1, error = clSetKernelArg(kernels[j][thread_id], 2, sizeof(gInBuffer2),
sizeof(gInBuffer), &gInBuffer))) &gInBuffer2);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(programs[j]); error = clSetKernelArg(kernels[j][thread_id], 3, sizeof(gInBuffer3),
return error; &gInBuffer3);
} test_error(error, "Failed to set kernel argument");
if ((error = clSetKernelArg(kernels[j][thread_id], 2,
sizeof(gInBuffer2), &gInBuffer2)))
{
LogBuildError(programs[j]);
return error;
}
if ((error = clSetKernelArg(kernels[j][thread_id], 3,
sizeof(gInBuffer3), &gInBuffer3)))
{
LogBuildError(programs[j]);
return error;
}
if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id], if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id],
1, NULL, &localCount, NULL, 0, 1, NULL, &localCount, NULL, 0,

View File

@@ -132,30 +132,18 @@ int TestFunc_mad_Float(const Func *f, MTdata d, bool relaxedMode)
size_t vectorSize = sizeof(cl_float) * sizeValues[j]; size_t vectorSize = sizeof(cl_float) * sizeValues[j];
size_t localCount = (BUFFER_SIZE + vectorSize - 1) size_t localCount = (BUFFER_SIZE + vectorSize - 1)
/ vectorSize; // BUFFER_SIZE / vectorSize rounded up / vectorSize; // BUFFER_SIZE / vectorSize rounded up
if ((error = clSetKernelArg(kernels[j][thread_id], 0, error = clSetKernelArg(kernels[j][thread_id], 0,
sizeof(gOutBuffer[j]), &gOutBuffer[j]))) sizeof(gOutBuffer[j]), &gOutBuffer[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(programs[j]); error = clSetKernelArg(kernels[j][thread_id], 1, sizeof(gInBuffer),
return error; &gInBuffer);
} test_error(error, "Failed to set kernel argument");
if ((error = clSetKernelArg(kernels[j][thread_id], 1, error = clSetKernelArg(kernels[j][thread_id], 2, sizeof(gInBuffer2),
sizeof(gInBuffer), &gInBuffer))) &gInBuffer2);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(programs[j]); error = clSetKernelArg(kernels[j][thread_id], 3, sizeof(gInBuffer3),
return error; &gInBuffer3);
} test_error(error, "Failed to set kernel argument");
if ((error = clSetKernelArg(kernels[j][thread_id], 2,
sizeof(gInBuffer2), &gInBuffer2)))
{
LogBuildError(programs[j]);
return error;
}
if ((error = clSetKernelArg(kernels[j][thread_id], 3,
sizeof(gInBuffer3), &gInBuffer3)))
{
LogBuildError(programs[j]);
return error;
}
if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id], if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id],
1, NULL, &localCount, NULL, 0, 1, NULL, &localCount, NULL, 0,

View File

@@ -126,30 +126,18 @@ int TestFunc_mad_Half(const Func *f, MTdata d, bool relaxedMode)
size_t vectorSize = sizeof(cl_half) * sizeValues[j]; size_t vectorSize = sizeof(cl_half) * sizeValues[j];
size_t localCount = (bufferSize + vectorSize - 1) size_t localCount = (bufferSize + vectorSize - 1)
/ vectorSize; // bufferSize / vectorSize rounded up / vectorSize; // bufferSize / vectorSize rounded up
if ((error = clSetKernelArg(kernels[j][thread_id], 0, error = clSetKernelArg(kernels[j][thread_id], 0,
sizeof(gOutBuffer[j]), &gOutBuffer[j]))) sizeof(gOutBuffer[j]), &gOutBuffer[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(programs[j]); error = clSetKernelArg(kernels[j][thread_id], 1, sizeof(gInBuffer),
return error; &gInBuffer);
} test_error(error, "Failed to set kernel argument");
if ((error = clSetKernelArg(kernels[j][thread_id], 1, error = clSetKernelArg(kernels[j][thread_id], 2, sizeof(gInBuffer2),
sizeof(gInBuffer), &gInBuffer))) &gInBuffer2);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(programs[j]); error = clSetKernelArg(kernels[j][thread_id], 3, sizeof(gInBuffer3),
return error; &gInBuffer3);
} test_error(error, "Failed to set kernel argument");
if ((error = clSetKernelArg(kernels[j][thread_id], 2,
sizeof(gInBuffer2), &gInBuffer2)))
{
LogBuildError(programs[j]);
return error;
}
if ((error = clSetKernelArg(kernels[j][thread_id], 3,
sizeof(gInBuffer3), &gInBuffer3)))
{
LogBuildError(programs[j]);
return error;
}
if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id], if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id],
1, NULL, &localCount, NULL, 0, 1, NULL, &localCount, NULL, 0,

View File

@@ -981,19 +981,6 @@ static void ReleaseCL(void)
} }
} }
void _LogBuildError(cl_program p, int line, const char *file)
{
char the_log[2048] = "";
vlog_error("%s:%d: Build Log:\n", file, line);
if (0
== clGetProgramBuildInfo(p, gDevice, CL_PROGRAM_BUILD_LOG,
sizeof(the_log), the_log, NULL))
vlog_error("%s", the_log);
else
vlog_error("*** Error getting build log for program %p\n", p);
}
int InitILogbConstants(void) int InitILogbConstants(void)
{ {
int error; int error;

View File

@@ -236,30 +236,18 @@ int TestFunc_Double_Double_Double_Double(const Func *f, MTdata d,
size_t vectorSize = sizeof(cl_double) * sizeValues[j]; size_t vectorSize = sizeof(cl_double) * sizeValues[j];
size_t localCount = (BUFFER_SIZE + vectorSize - 1) size_t localCount = (BUFFER_SIZE + vectorSize - 1)
/ vectorSize; // BUFFER_SIZE / vectorSize rounded up / vectorSize; // BUFFER_SIZE / vectorSize rounded up
if ((error = clSetKernelArg(kernels[j][thread_id], 0, error = clSetKernelArg(kernels[j][thread_id], 0,
sizeof(gOutBuffer[j]), &gOutBuffer[j]))) sizeof(gOutBuffer[j]), &gOutBuffer[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(programs[j]); error = clSetKernelArg(kernels[j][thread_id], 1, sizeof(gInBuffer),
return error; &gInBuffer);
} test_error(error, "Failed to set kernel argument");
if ((error = clSetKernelArg(kernels[j][thread_id], 1, error = clSetKernelArg(kernels[j][thread_id], 2, sizeof(gInBuffer2),
sizeof(gInBuffer), &gInBuffer))) &gInBuffer2);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(programs[j]); error = clSetKernelArg(kernels[j][thread_id], 3, sizeof(gInBuffer3),
return error; &gInBuffer3);
} test_error(error, "Failed to set kernel argument");
if ((error = clSetKernelArg(kernels[j][thread_id], 2,
sizeof(gInBuffer2), &gInBuffer2)))
{
LogBuildError(programs[j]);
return error;
}
if ((error = clSetKernelArg(kernels[j][thread_id], 3,
sizeof(gInBuffer3), &gInBuffer3)))
{
LogBuildError(programs[j]);
return error;
}
if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id], if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id],
1, NULL, &localCount, NULL, 0, 1, NULL, &localCount, NULL, 0,

View File

@@ -258,30 +258,18 @@ int TestFunc_Float_Float_Float_Float(const Func *f, MTdata d, bool relaxedMode)
size_t vectorSize = sizeof(cl_float) * sizeValues[j]; size_t vectorSize = sizeof(cl_float) * sizeValues[j];
size_t localCount = (BUFFER_SIZE + vectorSize - 1) size_t localCount = (BUFFER_SIZE + vectorSize - 1)
/ vectorSize; // BUFFER_SIZE / vectorSize rounded up / vectorSize; // BUFFER_SIZE / vectorSize rounded up
if ((error = clSetKernelArg(kernels[j][thread_id], 0, error = clSetKernelArg(kernels[j][thread_id], 0,
sizeof(gOutBuffer[j]), &gOutBuffer[j]))) sizeof(gOutBuffer[j]), &gOutBuffer[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(programs[j]); error = clSetKernelArg(kernels[j][thread_id], 1, sizeof(gInBuffer),
return error; &gInBuffer);
} test_error(error, "Failed to set kernel argument");
if ((error = clSetKernelArg(kernels[j][thread_id], 1, error = clSetKernelArg(kernels[j][thread_id], 2, sizeof(gInBuffer2),
sizeof(gInBuffer), &gInBuffer))) &gInBuffer2);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(programs[j]); error = clSetKernelArg(kernels[j][thread_id], 3, sizeof(gInBuffer3),
return error; &gInBuffer3);
} test_error(error, "Failed to set kernel argument");
if ((error = clSetKernelArg(kernels[j][thread_id], 2,
sizeof(gInBuffer2), &gInBuffer2)))
{
LogBuildError(programs[j]);
return error;
}
if ((error = clSetKernelArg(kernels[j][thread_id], 3,
sizeof(gInBuffer3), &gInBuffer3)))
{
LogBuildError(programs[j]);
return error;
}
if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id], if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id],
1, NULL, &localCount, NULL, 0, 1, NULL, &localCount, NULL, 0,

View File

@@ -191,30 +191,18 @@ int TestFunc_Half_Half_Half_Half(const Func *f, MTdata d, bool relaxedMode)
size_t vectorSize = sizeof(cl_half) * sizeValues[j]; size_t vectorSize = sizeof(cl_half) * sizeValues[j];
size_t localCount = (BUFFER_SIZE + vectorSize - 1) size_t localCount = (BUFFER_SIZE + vectorSize - 1)
/ vectorSize; // BUFFER_SIZE / vectorSize rounded up / vectorSize; // BUFFER_SIZE / vectorSize rounded up
if ((error = clSetKernelArg(kernels[j][thread_id], 0, error = clSetKernelArg(kernels[j][thread_id], 0,
sizeof(gOutBuffer[j]), &gOutBuffer[j]))) sizeof(gOutBuffer[j]), &gOutBuffer[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(programs[j]); error = clSetKernelArg(kernels[j][thread_id], 1, sizeof(gInBuffer),
return error; &gInBuffer);
} test_error(error, "Failed to set kernel argument");
if ((error = clSetKernelArg(kernels[j][thread_id], 1, error = clSetKernelArg(kernels[j][thread_id], 2, sizeof(gInBuffer2),
sizeof(gInBuffer), &gInBuffer))) &gInBuffer2);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(programs[j]); error = clSetKernelArg(kernels[j][thread_id], 3, sizeof(gInBuffer3),
return error; &gInBuffer3);
} test_error(error, "Failed to set kernel argument");
if ((error = clSetKernelArg(kernels[j][thread_id], 2,
sizeof(gInBuffer2), &gInBuffer2)))
{
LogBuildError(programs[j]);
return error;
}
if ((error = clSetKernelArg(kernels[j][thread_id], 3,
sizeof(gInBuffer3), &gInBuffer3)))
{
LogBuildError(programs[j]);
return error;
}
if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id], if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id],
1, NULL, &localCount, NULL, 0, 1, NULL, &localCount, NULL, 0,

View File

@@ -176,20 +176,12 @@ cl_int Test(cl_uint job_id, cl_uint thread_id, void *data)
(buffer_elements + sizeValues[j] - 1) / sizeValues[j]; (buffer_elements + sizeValues[j] - 1) / sizeValues[j];
cl_kernel kernel = job->k[j][thread_id]; // each worker thread has its cl_kernel kernel = job->k[j][thread_id]; // each worker thread has its
// own copy of the cl_kernel // own copy of the cl_kernel
cl_program program = job->programs[j];
if ((error = clSetKernelArg(kernel, 0, sizeof(tinfo->outBuf[j]), error = clSetKernelArg(kernel, 0, sizeof(tinfo->outBuf[j]),
&tinfo->outBuf[j]))) &tinfo->outBuf[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(program); error = clSetKernelArg(kernel, 1, sizeof(tinfo->inBuf), &tinfo->inBuf);
return error; test_error(error, "Failed to set kernel argument");
}
if ((error = clSetKernelArg(kernel, 1, sizeof(tinfo->inBuf),
&tinfo->inBuf)))
{
LogBuildError(program);
return error;
}
if ((error = clEnqueueNDRangeKernel(tinfo->tQueue, kernel, 1, NULL, if ((error = clEnqueueNDRangeKernel(tinfo->tQueue, kernel, 1, NULL,
&vectorCount, NULL, 0, NULL, NULL))) &vectorCount, NULL, 0, NULL, NULL)))

View File

@@ -205,20 +205,12 @@ cl_int Test(cl_uint job_id, cl_uint thread_id, void *data)
(buffer_elements + sizeValues[j] - 1) / sizeValues[j]; (buffer_elements + sizeValues[j] - 1) / sizeValues[j];
cl_kernel kernel = job->k[j][thread_id]; // each worker thread has its cl_kernel kernel = job->k[j][thread_id]; // each worker thread has its
// own copy of the cl_kernel // own copy of the cl_kernel
cl_program program = job->programs[j];
if ((error = clSetKernelArg(kernel, 0, sizeof(tinfo->outBuf[j]), error = clSetKernelArg(kernel, 0, sizeof(tinfo->outBuf[j]),
&tinfo->outBuf[j]))) &tinfo->outBuf[j]);
{ test_error(error, "Failed to set kernel argument 0");
LogBuildError(program); error = clSetKernelArg(kernel, 1, sizeof(tinfo->inBuf), &tinfo->inBuf);
return error; test_error(error, "Failed to set kernel argument 1");
}
if ((error = clSetKernelArg(kernel, 1, sizeof(tinfo->inBuf),
&tinfo->inBuf)))
{
LogBuildError(program);
return error;
}
if ((error = clEnqueueNDRangeKernel(tinfo->tQueue, kernel, 1, NULL, if ((error = clEnqueueNDRangeKernel(tinfo->tQueue, kernel, 1, NULL,
&vectorCount, NULL, 0, NULL, NULL))) &vectorCount, NULL, 0, NULL, NULL)))

View File

@@ -154,20 +154,12 @@ cl_int TestHalf(cl_uint job_id, cl_uint thread_id, void *data)
(buffer_elements + sizeValues[j] - 1) / sizeValues[j]; (buffer_elements + sizeValues[j] - 1) / sizeValues[j];
cl_kernel kernel = job->k[j][thread_id]; // each worker thread has its cl_kernel kernel = job->k[j][thread_id]; // each worker thread has its
// own copy of the cl_kernel // own copy of the cl_kernel
cl_program program = job->programs[j];
if ((error = clSetKernelArg(kernel, 0, sizeof(tinfo->outBuf[j]), error = clSetKernelArg(kernel, 0, sizeof(tinfo->outBuf[j]),
&tinfo->outBuf[j]))) &tinfo->outBuf[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(program); error = clSetKernelArg(kernel, 1, sizeof(tinfo->inBuf), &tinfo->inBuf);
return error; test_error(error, "Failed to set kernel argument");
}
if ((error = clSetKernelArg(kernel, 1, sizeof(tinfo->inBuf),
&tinfo->inBuf)))
{
LogBuildError(program);
return error;
}
if ((error = clEnqueueNDRangeKernel(tinfo->tQueue, kernel, 1, NULL, if ((error = clEnqueueNDRangeKernel(tinfo->tQueue, kernel, 1, NULL,
&vectorCount, NULL, 0, NULL, NULL))) &vectorCount, NULL, 0, NULL, NULL)))

View File

@@ -143,25 +143,15 @@ int TestFunc_Double2_Double(const Func *f, MTdata d, bool relaxedMode)
{ {
size_t vectorSize = sizeValues[j] * sizeof(cl_double); size_t vectorSize = sizeValues[j] * sizeof(cl_double);
size_t localCount = (BUFFER_SIZE + vectorSize - 1) / vectorSize; size_t localCount = (BUFFER_SIZE + vectorSize - 1) / vectorSize;
if ((error = clSetKernelArg(kernels[j][thread_id], 0, error = clSetKernelArg(kernels[j][thread_id], 0,
sizeof(gOutBuffer[j]), &gOutBuffer[j]))) sizeof(gOutBuffer[j]), &gOutBuffer[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(programs[j]); error = clSetKernelArg(kernels[j][thread_id], 1,
return error; sizeof(gOutBuffer2[j]), &gOutBuffer2[j]);
} test_error(error, "Failed to set kernel argument");
if ((error = error = clSetKernelArg(kernels[j][thread_id], 2, sizeof(gInBuffer),
clSetKernelArg(kernels[j][thread_id], 1, &gInBuffer);
sizeof(gOutBuffer2[j]), &gOutBuffer2[j]))) test_error(error, "Failed to set kernel argument");
{
LogBuildError(programs[j]);
return error;
}
if ((error = clSetKernelArg(kernels[j][thread_id], 2,
sizeof(gInBuffer), &gInBuffer)))
{
LogBuildError(programs[j]);
return error;
}
if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id], if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id],
1, NULL, &localCount, NULL, 0, 1, NULL, &localCount, NULL, 0,

View File

@@ -159,25 +159,15 @@ int TestFunc_Float2_Float(const Func *f, MTdata d, bool relaxedMode)
{ {
size_t vectorSize = sizeValues[j] * sizeof(cl_float); size_t vectorSize = sizeValues[j] * sizeof(cl_float);
size_t localCount = (BUFFER_SIZE + vectorSize - 1) / vectorSize; size_t localCount = (BUFFER_SIZE + vectorSize - 1) / vectorSize;
if ((error = clSetKernelArg(kernels[j][thread_id], 0, error = clSetKernelArg(kernels[j][thread_id], 0,
sizeof(gOutBuffer[j]), &gOutBuffer[j]))) sizeof(gOutBuffer[j]), &gOutBuffer[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(programs[j]); error = clSetKernelArg(kernels[j][thread_id], 1,
return error; sizeof(gOutBuffer2[j]), &gOutBuffer2[j]);
} test_error(error, "Failed to set kernel argument");
if ((error = error = clSetKernelArg(kernels[j][thread_id], 2, sizeof(gInBuffer),
clSetKernelArg(kernels[j][thread_id], 1, &gInBuffer);
sizeof(gOutBuffer2[j]), &gOutBuffer2[j]))) test_error(error, "Failed to set kernel argument");
{
LogBuildError(programs[j]);
return error;
}
if ((error = clSetKernelArg(kernels[j][thread_id], 2,
sizeof(gInBuffer), &gInBuffer)))
{
LogBuildError(programs[j]);
return error;
}
if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id], if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id],
1, NULL, &localCount, NULL, 0, 1, NULL, &localCount, NULL, 0,

View File

@@ -132,25 +132,15 @@ int TestFunc_Half2_Half(const Func *f, MTdata d, bool relaxedMode)
{ {
size_t vectorSize = sizeValues[j] * sizeof(cl_half); size_t vectorSize = sizeValues[j] * sizeof(cl_half);
size_t localCount = (bufferSize + vectorSize - 1) / vectorSize; size_t localCount = (bufferSize + vectorSize - 1) / vectorSize;
if ((error = clSetKernelArg(kernels[j][thread_id], 0, error = clSetKernelArg(kernels[j][thread_id], 0,
sizeof(gOutBuffer[j]), &gOutBuffer[j]))) sizeof(gOutBuffer[j]), &gOutBuffer[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(programs[j]); error = clSetKernelArg(kernels[j][thread_id], 1,
return error; sizeof(gOutBuffer2[j]), &gOutBuffer2[j]);
} test_error(error, "Failed to set kernel argument");
if ((error = error = clSetKernelArg(kernels[j][thread_id], 2, sizeof(gInBuffer),
clSetKernelArg(kernels[j][thread_id], 1, &gInBuffer);
sizeof(gOutBuffer2[j]), &gOutBuffer2[j]))) test_error(error, "Failed to set kernel argument");
{
LogBuildError(programs[j]);
return error;
}
if ((error = clSetKernelArg(kernels[j][thread_id], 2,
sizeof(gInBuffer), &gInBuffer)))
{
LogBuildError(programs[j]);
return error;
}
if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id], if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id],
1, NULL, &localCount, NULL, 0, 1, NULL, &localCount, NULL, 0,

View File

@@ -151,25 +151,15 @@ int TestFunc_DoubleI_Double(const Func *f, MTdata d, bool relaxedMode)
{ {
size_t vectorSize = sizeValues[j] * sizeof(cl_double); size_t vectorSize = sizeValues[j] * sizeof(cl_double);
size_t localCount = (BUFFER_SIZE + vectorSize - 1) / vectorSize; size_t localCount = (BUFFER_SIZE + vectorSize - 1) / vectorSize;
if ((error = clSetKernelArg(kernels[j][thread_id], 0, error = clSetKernelArg(kernels[j][thread_id], 0,
sizeof(gOutBuffer[j]), &gOutBuffer[j]))) sizeof(gOutBuffer[j]), &gOutBuffer[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(programs[j]); error = clSetKernelArg(kernels[j][thread_id], 1,
return error; sizeof(gOutBuffer2[j]), &gOutBuffer2[j]);
} test_error(error, "Failed to set kernel argument");
if ((error = error = clSetKernelArg(kernels[j][thread_id], 2, sizeof(gInBuffer),
clSetKernelArg(kernels[j][thread_id], 1, &gInBuffer);
sizeof(gOutBuffer2[j]), &gOutBuffer2[j]))) test_error(error, "Failed to set kernel argument");
{
LogBuildError(programs[j]);
return error;
}
if ((error = clSetKernelArg(kernels[j][thread_id], 2,
sizeof(gInBuffer), &gInBuffer)))
{
LogBuildError(programs[j]);
return error;
}
if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id], if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id],
1, NULL, &localCount, NULL, 0, 1, NULL, &localCount, NULL, 0,

View File

@@ -156,25 +156,15 @@ int TestFunc_FloatI_Float(const Func *f, MTdata d, bool relaxedMode)
{ {
size_t vectorSize = sizeValues[j] * sizeof(cl_float); size_t vectorSize = sizeValues[j] * sizeof(cl_float);
size_t localCount = (BUFFER_SIZE + vectorSize - 1) / vectorSize; size_t localCount = (BUFFER_SIZE + vectorSize - 1) / vectorSize;
if ((error = clSetKernelArg(kernels[j][thread_id], 0, error = clSetKernelArg(kernels[j][thread_id], 0,
sizeof(gOutBuffer[j]), &gOutBuffer[j]))) sizeof(gOutBuffer[j]), &gOutBuffer[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(programs[j]); error = clSetKernelArg(kernels[j][thread_id], 1,
return error; sizeof(gOutBuffer2[j]), &gOutBuffer2[j]);
} test_error(error, "Failed to set kernel argument");
if ((error = error = clSetKernelArg(kernels[j][thread_id], 2, sizeof(gInBuffer),
clSetKernelArg(kernels[j][thread_id], 1, &gInBuffer);
sizeof(gOutBuffer2[j]), &gOutBuffer2[j]))) test_error(error, "Failed to set kernel argument");
{
LogBuildError(programs[j]);
return error;
}
if ((error = clSetKernelArg(kernels[j][thread_id], 2,
sizeof(gInBuffer), &gInBuffer)))
{
LogBuildError(programs[j]);
return error;
}
if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id], if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id],
1, NULL, &localCount, NULL, 0, 1, NULL, &localCount, NULL, 0,

View File

@@ -145,25 +145,15 @@ int TestFunc_HalfI_Half(const Func *f, MTdata d, bool relaxedMode)
// align working group size with the bigger output type // align working group size with the bigger output type
size_t vectorSize = sizeValues[j] * sizeof(cl_int); size_t vectorSize = sizeValues[j] * sizeof(cl_int);
size_t localCount = (bufferSizeHi + vectorSize - 1) / vectorSize; size_t localCount = (bufferSizeHi + vectorSize - 1) / vectorSize;
if ((error = clSetKernelArg(kernels[j][thread_id], 0, error = clSetKernelArg(kernels[j][thread_id], 0,
sizeof(gOutBuffer[j]), &gOutBuffer[j]))) sizeof(gOutBuffer[j]), &gOutBuffer[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(programs[j]); error = clSetKernelArg(kernels[j][thread_id], 1,
return error; sizeof(gOutBuffer2[j]), &gOutBuffer2[j]);
} test_error(error, "Failed to set kernel argument");
if ((error = error = clSetKernelArg(kernels[j][thread_id], 2, sizeof(gInBuffer),
clSetKernelArg(kernels[j][thread_id], 1, &gInBuffer);
sizeof(gOutBuffer2[j]), &gOutBuffer2[j]))) test_error(error, "Failed to set kernel argument");
{
LogBuildError(programs[j]);
return error;
}
if ((error = clSetKernelArg(kernels[j][thread_id], 2,
sizeof(gInBuffer), &gInBuffer)))
{
LogBuildError(programs[j]);
return error;
}
if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id], if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id],
1, NULL, &localCount, NULL, 0, 1, NULL, &localCount, NULL, 0,

View File

@@ -116,18 +116,12 @@ int TestFunc_Double_ULong(const Func *f, MTdata d, bool relaxedMode)
{ {
size_t vectorSize = sizeValues[j] * sizeof(cl_double); size_t vectorSize = sizeValues[j] * sizeof(cl_double);
size_t localCount = (BUFFER_SIZE + vectorSize - 1) / vectorSize; size_t localCount = (BUFFER_SIZE + vectorSize - 1) / vectorSize;
if ((error = clSetKernelArg(kernels[j][thread_id], 0, error = clSetKernelArg(kernels[j][thread_id], 0,
sizeof(gOutBuffer[j]), &gOutBuffer[j]))) sizeof(gOutBuffer[j]), &gOutBuffer[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(programs[j]); error = clSetKernelArg(kernels[j][thread_id], 1, sizeof(gInBuffer),
return error; &gInBuffer);
} test_error(error, "Failed to set kernel argument");
if ((error = clSetKernelArg(kernels[j][thread_id], 1,
sizeof(gInBuffer), &gInBuffer)))
{
LogBuildError(programs[j]);
return error;
}
if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id], if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id],
1, NULL, &localCount, NULL, 0, 1, NULL, &localCount, NULL, 0,

View File

@@ -123,18 +123,12 @@ int TestFunc_Float_UInt(const Func *f, MTdata d, bool relaxedMode)
{ {
size_t vectorSize = sizeValues[j] * sizeof(cl_float); size_t vectorSize = sizeValues[j] * sizeof(cl_float);
size_t localCount = (BUFFER_SIZE + vectorSize - 1) / vectorSize; size_t localCount = (BUFFER_SIZE + vectorSize - 1) / vectorSize;
if ((error = clSetKernelArg(kernels[j][thread_id], 0, error = clSetKernelArg(kernels[j][thread_id], 0,
sizeof(gOutBuffer[j]), &gOutBuffer[j]))) sizeof(gOutBuffer[j]), &gOutBuffer[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(programs[j]); error = clSetKernelArg(kernels[j][thread_id], 1, sizeof(gInBuffer),
return error; &gInBuffer);
} test_error(error, "Failed to set kernel argument");
if ((error = clSetKernelArg(kernels[j][thread_id], 1,
sizeof(gInBuffer), &gInBuffer)))
{
LogBuildError(programs[j]);
return error;
}
if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id], if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id],
1, NULL, &localCount, NULL, 0, 1, NULL, &localCount, NULL, 0,

View File

@@ -111,18 +111,12 @@ int TestFunc_Half_UShort(const Func *f, MTdata d, bool relaxedMode)
{ {
size_t vectorSize = sizeValues[j] * sizeof(cl_half); size_t vectorSize = sizeValues[j] * sizeof(cl_half);
size_t localCount = (bufferSize + vectorSize - 1) / vectorSize; size_t localCount = (bufferSize + vectorSize - 1) / vectorSize;
if ((error = clSetKernelArg(kernels[j][thread_id], 0, error = clSetKernelArg(kernels[j][thread_id], 0,
sizeof(gOutBuffer[j]), &gOutBuffer[j]))) sizeof(gOutBuffer[j]), &gOutBuffer[j]);
{ test_error(error, "Failed to set kernel argument");
LogBuildError(programs[j]); error = clSetKernelArg(kernels[j][thread_id], 1, sizeof(gInBuffer),
return error; &gInBuffer);
} test_error(error, "Failed to set kernel argument");
if ((error = clSetKernelArg(kernels[j][thread_id], 1,
sizeof(gInBuffer), &gInBuffer)))
{
LogBuildError(programs[j]);
return error;
}
if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id], if ((error = clEnqueueNDRangeKernel(gQueue, kernels[j][thread_id],
1, NULL, &localCount, NULL, 0, 1, NULL, &localCount, NULL, 0,

View File

@@ -114,9 +114,6 @@ inline double DoubleFromUInt32(uint32_t bits)
return u.d; return u.d;
} }
void _LogBuildError(cl_program p, int line, const char *file);
#define LogBuildError(program) _LogBuildError(program, __LINE__, __FILE__)
// The spec is fairly clear that we may enforce a hard cutoff to prevent // The spec is fairly clear that we may enforce a hard cutoff to prevent
// premature flushing to zero. // premature flushing to zero.
// However, to avoid conflict for 1.0, we are letting results at TYPE_MIN + // However, to avoid conflict for 1.0, we are letting results at TYPE_MIN +