ahmed/OpenCL-CTS
1
0
Fork 0
mirror of https://github.com/KhronosGroup/OpenCL-CTS.git synced 2026-03-26 00:39:03 +00:00
Code Packages Projects Releases Wiki Activity

[NFC] Avoid mixing signed and unsigned in subhelpers run (#1505)

Browse Source 
Fix a `-Wsign-compare` warning in the `run()` function, which resulted
in many repeated warnings when compiling with `-Wall` due to the many
template instantiations.

Both `clGetKernelSubGroupInfo` queries return a `size_t`, so it is
unclear why the results of these queries were being cast to `int`.
The `dynsc` uses don't seem to work with negative values, so make the
field unsigned.

Signed-off-by: Sven van Haastregt <sven.vanhaastregt@arm.com>

Signed-off-by: Sven van Haastregt <sven.vanhaastregt@arm.com>
This commit is contained in:
Sven van Haastregt
2022-09-27 17:29:58 +01:00
committed by GitHub
parent 30500fba06
commit 9b21e9f06b
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
test_conformance/subgroups/subhelpers.h
View File

@@ -72,7 +72,7 @@ struct WorkGroupParams
size_t subgroup_size; size_t subgroup_size;
cl_uint cluster_size; cl_uint cluster_size;
bs128 work_items_mask; bs128 work_items_mask;
int dynsc; size_t dynsc;
bool use_core_subgroups; bool use_core_subgroups;
std::vector<bs128> all_work_item_masks; std::vector<bs128> all_work_item_masks;
int divergence_mask_arg; int divergence_mask_arg;
@@ -1495,7 +1495,7 @@ template <typename Ty, typename Fns, size_t TSIZE = 0> struct test
{ {
size_t tmp; size_t tmp;
cl_int error; cl_int error;
int subgroup_size, num_subgroups; size_t subgroup_size, num_subgroups;
size_t global = test_params.global_workgroup_size; size_t global = test_params.global_workgroup_size;
size_t local = test_params.local_workgroup_size; size_t local = test_params.local_workgroup_size;
clProgramWrapper program; clProgramWrapper program;
@@ -1580,7 +1580,7 @@ template <typename Ty, typename Fns, size_t TSIZE = 0> struct test
return TEST_FAIL; return TEST_FAIL;
} }
subgroup_size = (int)tmp; subgroup_size = tmp;
error = clGetKernelSubGroupInfo_ptr( error = clGetKernelSubGroupInfo_ptr(
kernel, device, CL_KERNEL_SUB_GROUP_COUNT_FOR_NDRANGE, kernel, device, CL_KERNEL_SUB_GROUP_COUNT_FOR_NDRANGE,
@@ -1593,11 +1593,11 @@ template <typename Ty, typename Fns, size_t TSIZE = 0> struct test
return TEST_FAIL; return TEST_FAIL;
} }
num_subgroups = (int)tmp; num_subgroups = tmp;
// Make sure the number of sub groups is what we expect // Make sure the number of sub groups is what we expect
if (num_subgroups != (local + subgroup_size - 1) / subgroup_size) if (num_subgroups != (local + subgroup_size - 1) / subgroup_size)
{ {
log_error("ERROR: unexpected number of subgroups (%d) returned\n", log_error("ERROR: unexpected number of subgroups (%zu) returned\n",
num_subgroups); num_subgroups);
return TEST_FAIL; return TEST_FAIL;
} }
@@ -1606,13 +1606,12 @@ template <typename Ty, typename Fns, size_t TSIZE = 0> struct test
std::vector<Ty> odata; std::vector<Ty> odata;
size_t input_array_size = global; size_t input_array_size = global;
size_t output_array_size = global; size_t output_array_size = global;
int dynscl = test_params.dynsc; size_t dynscl = test_params.dynsc;
if (dynscl != 0) if (dynscl != 0)
{ {
input_array_size = input_array_size = global / local * num_subgroups * dynscl;
(int)global / (int)local * num_subgroups * dynscl; output_array_size = global / local * dynscl;
output_array_size = (int)global / (int)local * dynscl;
} }
idata.resize(input_array_size); idata.resize(input_array_size);