workgroups: fix -Wsign-compare warnings (#1774)

In preparation of re-enabling -Wsign-compare globally, fix some
instances of this warning.

Signed-off-by: Sven van Haastregt <sven.vanhaastregt@arm.com>
This commit is contained in:
Sven van Haastregt
2023-06-29 12:20:15 +01:00
committed by GitHub
parent 729cd8b7a9
commit 845ec694bb
4 changed files with 8 additions and 13 deletions

View File

@@ -75,7 +75,6 @@ test_work_group_all(cl_device_id device, cl_context context, cl_command_queue qu
size_t wg_size[1]; size_t wg_size[1];
size_t num_elements; size_t num_elements;
int err; int err;
int i;
MTdata d; MTdata d;
err = create_single_kernel_helper(context, &program, &kernel, 1, err = create_single_kernel_helper(context, &program, &kernel, 1,
@@ -110,7 +109,7 @@ test_work_group_all(cl_device_id device, cl_context context, cl_command_queue qu
p = input_ptr[0]; p = input_ptr[0];
d = init_genrand( gRandomSeed ); d = init_genrand( gRandomSeed );
for (i=0; i<(num_elements+1); i++) for (size_t i = 0; i < (num_elements + 1); i++)
{ {
p[i] = get_random_float((float)(-100000.f * M_PI), (float)(100000.f * M_PI) ,d); p[i] = get_random_float((float)(-100000.f * M_PI), (float)(100000.f * M_PI) ,d);
} }

View File

@@ -75,7 +75,6 @@ test_work_group_any(cl_device_id device, cl_context context, cl_command_queue qu
size_t wg_size[1]; size_t wg_size[1];
size_t num_elements; size_t num_elements;
int err; int err;
int i;
MTdata d; MTdata d;
err = create_single_kernel_helper(context, &program, &kernel, 1, err = create_single_kernel_helper(context, &program, &kernel, 1,
@@ -110,7 +109,7 @@ test_work_group_any(cl_device_id device, cl_context context, cl_command_queue qu
p = input_ptr[0]; p = input_ptr[0];
d = init_genrand( gRandomSeed ); d = init_genrand( gRandomSeed );
for (i=0; i<(num_elements+1); i++) for (size_t i = 0; i < (num_elements + 1); i++)
{ {
p[i] = get_random_float((float)(-100000.f * M_PI), (float)(100000.f * M_PI) ,d); p[i] = get_random_float((float)(-100000.f * M_PI), (float)(100000.f * M_PI) ,d);
} }

View File

@@ -70,7 +70,7 @@ verify_wg_broadcast_1D(float *inptr, float *outptr, size_t n, size_t wg_size)
for (i=0,group_id=0; i<n; i+=wg_size,group_id++) for (i=0,group_id=0; i<n; i+=wg_size,group_id++)
{ {
int local_size = (n-i) > wg_size ? wg_size : (n-i); size_t local_size = (n - i) > wg_size ? wg_size : (n - i);
float broadcast_result = inptr[i + (group_id % local_size)]; float broadcast_result = inptr[i + (group_id % local_size)];
for (j=0; j<local_size; j++) for (j=0; j<local_size; j++)
{ {
@@ -172,7 +172,6 @@ test_work_group_broadcast_1D(cl_device_id device, cl_context context, cl_command
size_t wg_size[1]; size_t wg_size[1];
size_t num_elements; size_t num_elements;
int err; int err;
int i;
MTdata d; MTdata d;
err = create_single_kernel_helper(context, &program, &kernel, 1, err = create_single_kernel_helper(context, &program, &kernel, 1,
@@ -207,7 +206,7 @@ test_work_group_broadcast_1D(cl_device_id device, cl_context context, cl_command
p = input_ptr[0]; p = input_ptr[0];
d = init_genrand( gRandomSeed ); d = init_genrand( gRandomSeed );
for (i=0; i<num_elements; i++) for (size_t i = 0; i < num_elements; i++)
{ {
p[i] = get_random_float((float)(-100000.f * M_PI), (float)(100000.f * M_PI) ,d); p[i] = get_random_float((float)(-100000.f * M_PI), (float)(100000.f * M_PI) ,d);
} }
@@ -278,7 +277,6 @@ test_work_group_broadcast_2D(cl_device_id device, cl_context context, cl_command
size_t num_workgroups; size_t num_workgroups;
size_t num_elements; size_t num_elements;
int err; int err;
int i;
MTdata d; MTdata d;
err = create_single_kernel_helper(context, &program, &kernel, 1, err = create_single_kernel_helper(context, &program, &kernel, 1,
@@ -333,7 +331,7 @@ test_work_group_broadcast_2D(cl_device_id device, cl_context context, cl_command
p = input_ptr[0]; p = input_ptr[0];
d = init_genrand( gRandomSeed ); d = init_genrand( gRandomSeed );
for (i=0; i<num_elements; i++) for (size_t i = 0; i < num_elements; i++)
{ {
p[i] = get_random_float((float)(-100000.f * M_PI), (float)(100000.f * M_PI) ,d); p[i] = get_random_float((float)(-100000.f * M_PI), (float)(100000.f * M_PI) ,d);
} }
@@ -402,7 +400,6 @@ test_work_group_broadcast_3D(cl_device_id device, cl_context context, cl_command
size_t num_workgroups; size_t num_workgroups;
size_t num_elements; size_t num_elements;
int err; int err;
int i;
MTdata d; MTdata d;
err = create_single_kernel_helper(context, &program, &kernel, 1, err = create_single_kernel_helper(context, &program, &kernel, 1,
@@ -458,7 +455,7 @@ test_work_group_broadcast_3D(cl_device_id device, cl_context context, cl_command
p = input_ptr[0]; p = input_ptr[0];
d = init_genrand( gRandomSeed ); d = init_genrand( gRandomSeed );
for (i=0; i<num_elements; i++) for (size_t i = 0; i < num_elements; i++)
{ {
p[i] = get_random_float((float)(-100000.f * M_PI), (float)(100000.f * M_PI) ,d); p[i] = get_random_float((float)(-100000.f * M_PI), (float)(100000.f * M_PI) ,d);
} }

View File

@@ -219,7 +219,7 @@ int do_test(cl_device_id device, cl_context context, cl_command_queue queue,
int do_test_work_group_suggested_local_size( int do_test_work_group_suggested_local_size(
cl_device_id device, cl_context context, cl_command_queue queue, cl_device_id device, cl_context context, cl_command_queue queue,
bool (*skip_cond)(size_t), size_t start, size_t end, size_t incr, bool (*skip_cond)(size_t), size_t start, size_t end, size_t incr,
cl_long max_local_mem_size, size_t global_work_offset[], num_dims dim) cl_ulong max_local_mem_size, size_t global_work_offset[], num_dims dim)
{ {
clProgramWrapper scan_program; clProgramWrapper scan_program;
clKernelWrapper scan_kernel; clKernelWrapper scan_kernel;
@@ -300,7 +300,7 @@ int test_work_group_suggested_local_size_1D(cl_device_id device,
"Skipping the test.\n"); "Skipping the test.\n");
return TEST_SKIPPED_ITSELF; return TEST_SKIPPED_ITSELF;
} }
cl_long max_local_mem_size; cl_ulong max_local_mem_size;
cl_int err = cl_int err =
clGetDeviceInfo(device, CL_DEVICE_LOCAL_MEM_SIZE, clGetDeviceInfo(device, CL_DEVICE_LOCAL_MEM_SIZE,
sizeof(max_local_mem_size), &max_local_mem_size, NULL); sizeof(max_local_mem_size), &max_local_mem_size, NULL);