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

Fix warnings treated as errors in Vulkan tests. (#2461)

Browse Source 
Unused variables and mismatched sign comparisons.

Signed-off-by: Ahmed Hesham <ahmed.hesham@arm.com>
This commit is contained in:
Ahmed Hesham
2025-08-04 11:06:18 +01:00
committed by GitHub
parent 2507f7de84
commit 9ca0126c54
6 changed files with 43 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test_conformance/vulkan/main.cpp
View File

@@ -50,7 +50,7 @@ static void printUsage(const char *execName)
log_info("Usage: %s [test_names] [options]\n", execName); log_info("Usage: %s [test_names] [options]\n", execName);
log_info("Test names:\n"); log_info("Test names:\n");
for (int i = 0; i < test_registry::getInstance().num_tests(); i++) for (unsigned int i = 0; i < test_registry::getInstance().num_tests(); i++)
{ {
log_info("\t%s\n", test_registry::getInstance().definitions()[i].name); log_info("\t%s\n", test_registry::getInstance().definitions()[i].name);
} }

14
test_conformance/vulkan/test_vulkan_api_consistency.cpp
View File

@@ -84,8 +84,8 @@ struct ConsistencyExternalBufferTest : public VulkanTestBase
vkDeviceMem->bindBuffer(vkBufferList[0], 0); vkDeviceMem->bindBuffer(vkBufferList[0], 0);
void* handle = NULL; [[maybe_unused]] void* handle = NULL;
int fd; [[maybe_unused]] int fd;
std::vector<cl_mem_properties> extMemProperties{ std::vector<cl_mem_properties> extMemProperties{
(cl_mem_properties)CL_MEM_DEVICE_HANDLE_LIST_KHR, (cl_mem_properties)CL_MEM_DEVICE_HANDLE_LIST_KHR,
@@ -243,8 +243,8 @@ struct ConsistencyExternalImageTest : public VulkanTestBase
vkExternalMemoryHandleType); vkExternalMemoryHandleType);
vkDeviceMem->bindImage(vkImage2D, 0); vkDeviceMem->bindImage(vkImage2D, 0);
void* handle = NULL; [[maybe_unused]] void* handle = NULL;
int fd; [[maybe_unused]] int fd;
std::vector<cl_mem_properties> extMemProperties{ std::vector<cl_mem_properties> extMemProperties{
(cl_mem_properties)CL_MEM_DEVICE_HANDLE_LIST_KHR, (cl_mem_properties)CL_MEM_DEVICE_HANDLE_LIST_KHR,
(cl_mem_properties)device, (cl_mem_properties)device,
@@ -386,9 +386,9 @@ struct ConsistencyExternalSemaphoreTest : public VulkanTestBase
VulkanSemaphore vkCl2Vksemaphore(*vkDevice, semaphoreHandleType); VulkanSemaphore vkCl2Vksemaphore(*vkDevice, semaphoreHandleType);
cl_semaphore_khr clCl2Vksemaphore; cl_semaphore_khr clCl2Vksemaphore;
cl_semaphore_khr clVk2Clsemaphore; cl_semaphore_khr clVk2Clsemaphore;
void* handle1 = NULL; [[maybe_unused]] void* handle1 = NULL;
void* handle2 = NULL; [[maybe_unused]] void* handle2 = NULL;
int fd1, fd2; [[maybe_unused]] int fd1, fd2;
std::vector<cl_semaphore_properties_khr> sema_props1{ std::vector<cl_semaphore_properties_khr> sema_props1{
(cl_semaphore_properties_khr)CL_SEMAPHORE_TYPE_KHR, (cl_semaphore_properties_khr)CL_SEMAPHORE_TYPE_KHR,
(cl_semaphore_properties_khr)CL_SEMAPHORE_TYPE_BINARY_KHR, (cl_semaphore_properties_khr)CL_SEMAPHORE_TYPE_BINARY_KHR,

4
test_conformance/vulkan/test_vulkan_api_consistency_for_1dimages.cpp
View File

@@ -101,8 +101,8 @@ struct ConsistencyExternalImage1DTest : public VulkanTestBase
vkExternalMemoryHandleType); vkExternalMemoryHandleType);
vkDeviceMem->bindImage(vkImage1D, 0); vkDeviceMem->bindImage(vkImage1D, 0);
void* handle = NULL; [[maybe_unused]] void* handle = NULL;
int fd; [[maybe_unused]] int fd;
std::vector<cl_mem_properties> extMemProperties{ std::vector<cl_mem_properties> extMemProperties{
(cl_mem_properties)CL_MEM_DEVICE_HANDLE_LIST_KHR, (cl_mem_properties)CL_MEM_DEVICE_HANDLE_LIST_KHR,
(cl_mem_properties)device, (cl_mem_properties)device,

4
test_conformance/vulkan/test_vulkan_api_consistency_for_3dimages.cpp
View File

@@ -103,8 +103,8 @@ struct ConsistencyExternalImage3DTest : public VulkanTestBase
vkExternalMemoryHandleType); vkExternalMemoryHandleType);
vkDeviceMem->bindImage(vkImage3D, 0); vkDeviceMem->bindImage(vkImage3D, 0);
void* handle = NULL; [[maybe_unused]] void* handle = NULL;
int fd; [[maybe_unused]] int fd;
std::vector<cl_mem_properties> extMemProperties{ std::vector<cl_mem_properties> extMemProperties{
(cl_mem_properties)CL_MEM_DEVICE_HANDLE_LIST_KHR, (cl_mem_properties)CL_MEM_DEVICE_HANDLE_LIST_KHR,
(cl_mem_properties)device, (cl_mem_properties)device,

40
test_conformance/vulkan/test_vulkan_interop_buffer.cpp
View File

@@ -272,7 +272,7 @@ int run_test_with_two_queue(
err |= clSetKernelArg(kernel_cq, 1, sizeof(cl_mem), err |= clSetKernelArg(kernel_cq, 1, sizeof(cl_mem),
(void *)&(buffers[0])); (void *)&(buffers[0]));
for (int i = 0; i < vkBufferList.size() - 1; i++) for (size_t i = 0; i < vkBufferList.size() - 1; i++)
{ {
err |= err |=
clSetKernelArg(update_buffer_kernel, i + 1, clSetKernelArg(update_buffer_kernel, i + 1,
@@ -352,7 +352,7 @@ int run_test_with_two_queue(
"Error: Failed read output, error\n"); "Error: Failed read output, error\n");
int calc_max_iter; int calc_max_iter;
for (int i = 0; i < vkBufferList.size(); i++) for (size_t i = 0; i < vkBufferList.size(); i++)
{ {
if (i == 0) if (i == 0)
calc_max_iter = (maxIter * 3); calc_max_iter = (maxIter * 3);
@@ -602,7 +602,7 @@ int run_test_with_one_queue(
err = clSetKernelArg(update_buffer_kernel, 0, sizeof(uint32_t), err = clSetKernelArg(update_buffer_kernel, 0, sizeof(uint32_t),
(void *)&bufferSize); (void *)&bufferSize);
for (int i = 0; i < vkBufferList.size(); i++) for (size_t i = 0; i < vkBufferList.size(); i++)
{ {
err |= err |=
clSetKernelArg(update_buffer_kernel, i + 1, clSetKernelArg(update_buffer_kernel, i + 1,
@@ -662,7 +662,7 @@ int run_test_with_one_queue(
"Error: clEnqueueWriteBuffer \n"); "Error: clEnqueueWriteBuffer \n");
int calc_max_iter = (maxIter * 2); int calc_max_iter = (maxIter * 2);
for (int i = 0; i < vkBufferList.size(); i++) for (size_t i = 0; i < vkBufferList.size(); i++)
{ {
err = clSetKernelArg(verify_kernel, 0, sizeof(cl_mem), err = clSetKernelArg(verify_kernel, 0, sizeof(cl_mem),
(void *)&(buffers[i])); (void *)&(buffers[i]));
@@ -836,7 +836,7 @@ int run_test_with_multi_import_same_ctx(
vkExternalMemoryHandleType)); vkExternalMemoryHandleType));
std::vector<clExternalMemory *> pExternalMemory; std::vector<clExternalMemory *> pExternalMemory;
for (size_t cl_bIdx = 0; cl_bIdx < numImports; cl_bIdx++) for (int cl_bIdx = 0; cl_bIdx < numImports; cl_bIdx++)
{ {
pExternalMemory.push_back( pExternalMemory.push_back(
new clExternalMemory(vkBufferListDeviceMemory[bIdx], new clExternalMemory(vkBufferListDeviceMemory[bIdx],
@@ -857,7 +857,7 @@ int run_test_with_multi_import_same_ctx(
{ {
vkBufferListDeviceMemory[bIdx]->bindBuffer(vkBufferList[bIdx], vkBufferListDeviceMemory[bIdx]->bindBuffer(vkBufferList[bIdx],
0); 0);
for (size_t cl_bIdx = 0; cl_bIdx < numImports; cl_bIdx++) for (int cl_bIdx = 0; cl_bIdx < numImports; cl_bIdx++)
{ {
buffers[bIdx][cl_bIdx] = externalMemory[bIdx][cl_bIdx] buffers[bIdx][cl_bIdx] = externalMemory[bIdx][cl_bIdx]
->getExternalMemoryBuffer(); ->getExternalMemoryBuffer();
@@ -916,7 +916,7 @@ int run_test_with_multi_import_same_ctx(
{ {
err = clSetKernelArg(update_buffer_kernel, 0, err = clSetKernelArg(update_buffer_kernel, 0,
sizeof(uint32_t), (void *)&bufferSize); sizeof(uint32_t), (void *)&bufferSize);
for (int i = 0; i < numBuffers; i++) for (uint32_t i = 0; i < numBuffers; i++)
{ {
err |= clSetKernelArg( err |= clSetKernelArg(
update_buffer_kernel, i + 1, sizeof(cl_mem), update_buffer_kernel, i + 1, sizeof(cl_mem),
@@ -939,7 +939,7 @@ int run_test_with_multi_import_same_ctx(
"Error: Failed to launch " "Error: Failed to launch "
"update_buffer_kernel, error\n "); "update_buffer_kernel, error\n ");
for (int i = 0; i < numBuffers; i++) for (uint32_t i = 0; i < numBuffers; i++)
{ {
err = clEnqueueReleaseExternalMemObjectsKHRptr( err = clEnqueueReleaseExternalMemObjectsKHRptr(
cmd_queue1, 1, &buffers[i][launchIter], 0, nullptr, cmd_queue1, 1, &buffers[i][launchIter], 0, nullptr,
@@ -979,7 +979,7 @@ int run_test_with_multi_import_same_ctx(
calc_max_iter = maxIter * (numImports + 1); calc_max_iter = maxIter * (numImports + 1);
for (int i = 0; i < vkBufferList.size(); i++) for (size_t i = 0; i < vkBufferList.size(); i++)
{ {
err = clSetKernelArg(verify_kernel, 0, sizeof(cl_mem), err = clSetKernelArg(verify_kernel, 0, sizeof(cl_mem),
(void *)&(buffers[i][0])); (void *)&(buffers[i][0]));
@@ -1014,7 +1014,7 @@ int run_test_with_multi_import_same_ctx(
} }
for (size_t i = 0; i < vkBufferList.size(); i++) for (size_t i = 0; i < vkBufferList.size(); i++)
{ {
for (size_t j = 0; j < numImports; j++) for (int j = 0; j < numImports; j++)
{ {
delete externalMemory[i][j]; delete externalMemory[i][j];
} }
@@ -1184,7 +1184,7 @@ int run_test_with_multi_import_diff_ctx(
vkExternalMemoryHandleType)); vkExternalMemoryHandleType));
std::vector<clExternalMemory *> pExternalMemory1; std::vector<clExternalMemory *> pExternalMemory1;
std::vector<clExternalMemory *> pExternalMemory2; std::vector<clExternalMemory *> pExternalMemory2;
for (size_t cl_bIdx = 0; cl_bIdx < numImports; cl_bIdx++) for (int cl_bIdx = 0; cl_bIdx < numImports; cl_bIdx++)
{ {
pExternalMemory1.push_back( pExternalMemory1.push_back(
new clExternalMemory(vkBufferListDeviceMemory[bIdx], new clExternalMemory(vkBufferListDeviceMemory[bIdx],
@@ -1209,7 +1209,7 @@ int run_test_with_multi_import_diff_ctx(
{ {
vkBufferListDeviceMemory[bIdx]->bindBuffer(vkBufferList[bIdx], vkBufferListDeviceMemory[bIdx]->bindBuffer(vkBufferList[bIdx],
0); 0);
for (size_t cl_bIdx = 0; cl_bIdx < numImports; cl_bIdx++) for (int cl_bIdx = 0; cl_bIdx < numImports; cl_bIdx++)
{ {
buffers1[bIdx][cl_bIdx] = externalMemory1[bIdx][cl_bIdx] buffers1[bIdx][cl_bIdx] = externalMemory1[bIdx][cl_bIdx]
->getExternalMemoryBuffer(); ->getExternalMemoryBuffer();
@@ -1226,7 +1226,7 @@ int run_test_with_multi_import_diff_ctx(
vkCommandBuffer.dispatch(512, 1, 1); vkCommandBuffer.dispatch(512, 1, 1);
vkCommandBuffer.end(); vkCommandBuffer.end();
for (int i = 0; i < numImports; i++) for (uint32_t i = 0; i < numImports; i++)
{ {
update_buffer_kernel1[i] = (numBuffers == 1) update_buffer_kernel1[i] = (numBuffers == 1)
? kernel1[0] ? kernel1[0]
@@ -1282,7 +1282,7 @@ int run_test_with_multi_import_diff_ctx(
test_error_and_cleanup(err, CLEANUP, test_error_and_cleanup(err, CLEANUP,
"Failed to set kernel arg"); "Failed to set kernel arg");
for (int i = 0; i < numBuffers; i++) for (uint32_t i = 0; i < numBuffers; i++)
{ {
err = clSetKernelArg( err = clSetKernelArg(
update_buffer_kernel1[launchIter], i + 1, update_buffer_kernel1[launchIter], i + 1,
@@ -1307,7 +1307,7 @@ int run_test_with_multi_import_diff_ctx(
test_error_and_cleanup(err, CLEANUP, test_error_and_cleanup(err, CLEANUP,
"Error: Failed to launch " "Error: Failed to launch "
"update_buffer_kernel, error\n"); "update_buffer_kernel, error\n");
for (int i = 0; i < numBuffers; i++) for (uint32_t i = 0; i < numBuffers; i++)
{ {
err = clEnqueueReleaseExternalMemObjectsKHRptr( err = clEnqueueReleaseExternalMemObjectsKHRptr(
cmd_queue1, 1, &buffers1[i][launchIter], 0, nullptr, cmd_queue1, 1, &buffers1[i][launchIter], 0, nullptr,
@@ -1369,7 +1369,7 @@ int run_test_with_multi_import_diff_ctx(
test_error_and_cleanup(err, CLEANUP, test_error_and_cleanup(err, CLEANUP,
"Failed to set kernel arg"); "Failed to set kernel arg");
for (int i = 0; i < numBuffers; i++) for (uint32_t i = 0; i < numBuffers; i++)
{ {
err = clSetKernelArg( err = clSetKernelArg(
update_buffer_kernel2[launchIter], i + 1, update_buffer_kernel2[launchIter], i + 1,
@@ -1394,7 +1394,7 @@ int run_test_with_multi_import_diff_ctx(
test_error_and_cleanup(err, CLEANUP, test_error_and_cleanup(err, CLEANUP,
"Error: Failed to launch " "Error: Failed to launch "
"update_buffer_kernel, error\n "); "update_buffer_kernel, error\n ");
for (int i = 0; i < numBuffers; i++) for (uint32_t i = 0; i < numBuffers; i++)
{ {
err = clEnqueueReleaseExternalMemObjectsKHRptr( err = clEnqueueReleaseExternalMemObjectsKHRptr(
cmd_queue2, 1, &buffers2[i][launchIter], 0, nullptr, cmd_queue2, 1, &buffers2[i][launchIter], 0, nullptr,
@@ -1442,7 +1442,7 @@ int run_test_with_multi_import_diff_ctx(
"Error: Failed read output, error \n"); "Error: Failed read output, error \n");
calc_max_iter = maxIter * 2 * (numBuffers + 1); calc_max_iter = maxIter * 2 * (numBuffers + 1);
for (int i = 0; i < numBuffers; i++) for (uint32_t i = 0; i < numBuffers; i++)
{ {
err = clSetKernelArg(verify_kernel, 0, sizeof(cl_mem), err = clSetKernelArg(verify_kernel, 0, sizeof(cl_mem),
(void *)&(buffers1[i][0])); (void *)&(buffers1[i][0]));
@@ -1477,7 +1477,7 @@ int run_test_with_multi_import_diff_ctx(
} }
} }
*error_3 = 0; *error_3 = 0;
for (int i = 0; i < vkBufferList.size(); i++) for (size_t i = 0; i < vkBufferList.size(); i++)
{ {
err = clSetKernelArg(verify_kernel2, 0, sizeof(cl_mem), err = clSetKernelArg(verify_kernel2, 0, sizeof(cl_mem),
(void *)&(buffers2[i][0])); (void *)&(buffers2[i][0]));
@@ -1513,7 +1513,7 @@ int run_test_with_multi_import_diff_ctx(
} }
for (size_t i = 0; i < vkBufferList.size(); i++) for (size_t i = 0; i < vkBufferList.size(); i++)
{ {
for (size_t j = 0; j < numImports; j++) for (int j = 0; j < numImports; j++)
{ {
delete externalMemory1[i][j]; delete externalMemory1[i][j];
delete externalMemory2[i][j]; delete externalMemory2[i][j];

21
test_conformance/vulkan/test_vulkan_interop_image.cpp
View File

@@ -463,7 +463,7 @@ int run_test_with_two_queue(
cl_mem external_mem_image1[5]; cl_mem external_mem_image1[5];
cl_mem external_mem_image2[5]; cl_mem external_mem_image2[5];
for (int i = 0; i < num2DImages; i++) for (uint32_t i = 0; i < num2DImages; i++)
{ {
external_mem_image1[i] = external_mem_image1[i] =
externalMemory1[i] externalMemory1[i]
@@ -631,7 +631,8 @@ int run_test_with_two_queue(
err |= clSetKernelArg(updateKernelCQ2, 7, err |= clSetKernelArg(updateKernelCQ2, 7,
sizeof(unsigned int), sizeof(unsigned int),
&numMipLevels); &numMipLevels);
for (int i = 0; i < num2DImages - 1; i++, ++j) for (uint32_t i = 0; i < num2DImages - 1;
i++, ++j)
{ {
err = clSetKernelArg( err = clSetKernelArg(
updateKernelCQ1, j, sizeof(cl_mem), updateKernelCQ1, j, sizeof(cl_mem),
@@ -732,7 +733,7 @@ int run_test_with_two_queue(
} }
clFinish(cmd_queue2); clFinish(cmd_queue2);
for (int i = 0; i < num2DImages; i++) for (uint32_t i = 0; i < num2DImages; i++)
{ {
err = clEnqueueReadImage( err = clEnqueueReadImage(
cmd_queue1, external_mem_image2[i], CL_TRUE, cmd_queue1, external_mem_image2[i], CL_TRUE,
@@ -772,7 +773,7 @@ int run_test_with_two_queue(
break; break;
} }
} }
for (int i = 0; i < num2DImages; i++) for (uint32_t i = 0; i < num2DImages; i++)
{ {
delete vkImage2DListDeviceMemory1[i]; delete vkImage2DListDeviceMemory1[i];
delete vkImage2DListDeviceMemory2[i]; delete vkImage2DListDeviceMemory2[i];
@@ -1083,7 +1084,7 @@ int run_test_with_one_queue(
cl_mem external_mem_image1[4]; cl_mem external_mem_image1[4];
cl_mem external_mem_image2[4]; cl_mem external_mem_image2[4];
for (int i = 0; i < num2DImages; i++) for (uint32_t i = 0; i < num2DImages; i++)
{ {
external_mem_image1[i] = external_mem_image1[i] =
externalMemory1[i] externalMemory1[i]
@@ -1218,7 +1219,7 @@ int run_test_with_one_queue(
break; break;
} }
int j = 0; int j = 0;
for (int i = 0; i < num2DImages; i++, ++j) for (uint32_t i = 0; i < num2DImages; i++, ++j)
{ {
err = clSetKernelArg( err = clSetKernelArg(
updateKernelCQ1, j, sizeof(cl_mem), updateKernelCQ1, j, sizeof(cl_mem),
@@ -1284,7 +1285,7 @@ int run_test_with_one_queue(
"Failed to signal CL semaphore\n"); "Failed to signal CL semaphore\n");
} }
for (int i = 0; i < num2DImages; i++) for (uint32_t i = 0; i < num2DImages; i++)
{ {
err = clEnqueueReadImage( err = clEnqueueReadImage(
cmd_queue1, external_mem_image2[i], CL_TRUE, cmd_queue1, external_mem_image2[i], CL_TRUE,
@@ -1324,7 +1325,7 @@ int run_test_with_one_queue(
break; break;
} }
} }
for (int i = 0; i < num2DImages; i++) for (uint32_t i = 0; i < num2DImages; i++)
{ {
delete vkImage2DListDeviceMemory1[i]; delete vkImage2DListDeviceMemory1[i];
delete vkImage2DListDeviceMemory2[i]; delete vkImage2DListDeviceMemory2[i];
@@ -1423,7 +1424,7 @@ struct ImageCommonTest : public VulkanTestBase
log_info("clCreateCommandQueue2 successful \n"); log_info("clCreateCommandQueue2 successful \n");
for (int i = 0; i < num_kernels; i++) for (uint32_t i = 0; i < num_kernels; i++)
{ {
switch (i) switch (i)
{ {
@@ -1474,7 +1475,7 @@ struct ImageCommonTest : public VulkanTestBase
} }
const char *sourceTexts[num_kernel_types] = { source_1, source_2, const char *sourceTexts[num_kernel_types] = { source_1, source_2,
source_3 }; source_3 };
for (int k = 0; k < num_kernel_types; k++) for (uint32_t k = 0; k < num_kernel_types; k++)
{ {
program_source_length = strlen(sourceTexts[k]); program_source_length = strlen(sourceTexts[k]);
program[k] = clCreateProgramWithSource( program[k] = clCreateProgramWithSource(