mirror of
https://github.com/KhronosGroup/OpenCL-CTS.git
synced 2026-03-22 15:19:02 +00:00
Synchronise with Khronos-private Gitlab branch
The maintenance of the conformance tests is moving to Github. This commit contains all the changes that have been done in Gitlab since the first public release of the conformance tests. Signed-off-by: Kevin Petit <kevin.petit@arm.com>
This commit is contained in:
@@ -928,15 +928,16 @@ static const char* block_barrier[] =
|
||||
NL, " size_t gid = get_group_id(0);"
|
||||
NL, " size_t idx = gid*lsz;"
|
||||
NL, ""
|
||||
NL, " res[tid]=lsz;"
|
||||
NL, " barrier(CLK_GLOBAL_MEM_FENCE);"
|
||||
NL, " int (^kernelBlock)(int) = ^(int a)"
|
||||
NL, " {"
|
||||
NL, " atomic_inc(res+idx);"
|
||||
NL, " atomic_dec(res+idx);"
|
||||
NL, " barrier(CLK_GLOBAL_MEM_FENCE);"
|
||||
NL, " return (int)abs(a - b) - (res[idx] != lsz ? 0 : 1);"
|
||||
NL, " return (int)abs(a - b) - (res[idx] != 0 ? 0 : 1);"
|
||||
NL, " };"
|
||||
NL, ""
|
||||
NL, " int d = kernelBlock(2);"
|
||||
NL, " barrier(CLK_GLOBAL_MEM_FENCE);"
|
||||
NL, " res[tid] = d;"
|
||||
NL, "}"
|
||||
NL
|
||||
|
||||
@@ -65,7 +65,7 @@ ct_assert(arr_size(commonfn_names) == arr_size(basefn_list))
|
||||
|
||||
static const int num_commonfns = arr_size(commonfn_names);
|
||||
|
||||
int deviceCheck(cl_device_id device)
|
||||
test_status deviceCheck(cl_device_id device)
|
||||
{
|
||||
static const char expected_cl[] = "OpenCL 2.0";
|
||||
static const char expected_clc[] = "OpenCL C 2.0";
|
||||
@@ -77,7 +77,7 @@ int deviceCheck(cl_device_id device)
|
||||
if(res != CL_SUCCESS || ret_len < strlen(expected_cl) || strncmp(version, expected_cl, strlen(expected_cl)))
|
||||
{
|
||||
log_info("Device does not support '%s'. Skipping the test.\n", expected_cl);
|
||||
return CL_INVALID_DEVICE;
|
||||
return TEST_FAIL;
|
||||
}
|
||||
|
||||
version[0] = 0;
|
||||
@@ -87,10 +87,10 @@ int deviceCheck(cl_device_id device)
|
||||
if(res != CL_SUCCESS || ret_len < strlen(expected_clc) || strncmp(version, expected_clc, strlen(expected_clc)))
|
||||
{
|
||||
log_info("Device does not support '%s'. Skipping the test.\n", expected_clc);
|
||||
return CL_INVALID_DEVICE;
|
||||
return TEST_FAIL;
|
||||
}
|
||||
|
||||
return CL_SUCCESS;
|
||||
return TEST_PASS;
|
||||
}
|
||||
|
||||
int
|
||||
|
||||
Reference in New Issue
Block a user