From f151be94a0ef2c39b016e663b7158e6c4cf3a3f3 Mon Sep 17 00:00:00 2001 From: saurabhnv Date: Fri, 16 Aug 2024 18:34:08 +0530 Subject: [PATCH] Code formatting --- test_common/harness/testHarness.cpp | 6 +- test_common/harness/testHarness.h | 2 +- .../vulkan/test_vulkan_api_consistency.cpp | 7 +- .../test_vulkan_platform_device_info.cpp | 85 ++++++++++--------- 4 files changed, 56 insertions(+), 44 deletions(-) diff --git a/test_common/harness/testHarness.cpp b/test_common/harness/testHarness.cpp index 9da779246..99aaf7c6a 100644 --- a/test_common/harness/testHarness.cpp +++ b/test_common/harness/testHarness.cpp @@ -1323,9 +1323,11 @@ std::string get_platform_info_string(cl_platform_id platform, return std::string(info.data(), size - 1); } -bool is_platform_extension_available(cl_platform_id platform, const char* extensionName) +bool is_platform_extension_available(cl_platform_id platform, + const char *extensionName) { - std::string extString = get_platform_info_string(platform, CL_PLATFORM_EXTENSIONS); + std::string extString = + get_platform_info_string(platform, CL_PLATFORM_EXTENSIONS); return extString.find(extensionName) != std::string::npos; } diff --git a/test_common/harness/testHarness.h b/test_common/harness/testHarness.h index 46a9a0078..524e60479 100644 --- a/test_common/harness/testHarness.h +++ b/test_common/harness/testHarness.h @@ -188,7 +188,7 @@ extern cl_platform_id getPlatformFromDevice(cl_device_id deviceID); extern std::string get_platform_info_string(cl_platform_id platform, cl_platform_info param_name); extern bool is_platform_extension_available(cl_platform_id platform, - const char* extensionName); + const char *extensionName); #if !defined(__APPLE__) void memset_pattern4(void *, const void *, size_t); diff --git a/test_conformance/vulkan/test_vulkan_api_consistency.cpp b/test_conformance/vulkan/test_vulkan_api_consistency.cpp index f11e419c4..09e02981a 100644 --- a/test_conformance/vulkan/test_vulkan_api_consistency.cpp +++ b/test_conformance/vulkan/test_vulkan_api_consistency.cpp @@ -517,9 +517,10 @@ int test_consistency_external_semaphore(cl_device_id deviceID, // Pass invalid object to release call errNum = clReleaseSemaphoreKHRptr(NULL); - test_failure_error(errNum, CL_INVALID_SEMAPHORE_KHR, - "clReleaseSemaphoreKHRptr fails with " - "CL_INVALID_SEMAPHORE_KHR when NULL semaphore object is passed"); + test_failure_error( + errNum, CL_INVALID_SEMAPHORE_KHR, + "clReleaseSemaphoreKHRptr fails with " + "CL_INVALID_SEMAPHORE_KHR when NULL semaphore object is passed"); // Release both semaphore objects errNum = clReleaseSemaphoreKHRptr(clVk2Clsemaphore); diff --git a/test_conformance/vulkan/test_vulkan_platform_device_info.cpp b/test_conformance/vulkan/test_vulkan_platform_device_info.cpp index 56fc6dc20..1c25c0f58 100644 --- a/test_conformance/vulkan/test_vulkan_platform_device_info.cpp +++ b/test_conformance/vulkan/test_vulkan_platform_device_info.cpp @@ -54,24 +54,19 @@ int test_platform_info(cl_device_id deviceID, cl_context _context, cl_command_queue _queue, int num_elements) { cl_uint i; - cl_platform_id platform; + cl_platform_id platform = getPlatformFromDevice(deviceID); cl_int errNum; cl_uint *handle_type; size_t handle_type_size = 0; cl_uint num_handles = 0; - cl_bool external_mem_extn_available = false; - cl_bool external_sema_extn_available = false; - cl_bool supports_atleast_one_sema_query = false; - - platform = getPlatformFromDevice(deviceID); - - external_mem_extn_available = + cl_bool external_mem_extn_available = is_platform_extension_available(platform, "cl_khr_external_semaphore"); - external_sema_extn_available = + cl_bool external_sema_extn_available = is_platform_extension_available(platform, "cl_khr_external_memory"); - supports_atleast_one_sema_query = false; + cl_bool supports_atleast_one_sema_query = false; - if (!external_mem_extn_available && !external_sema_extn_available) { + if (!external_mem_extn_available && !external_sema_extn_available) + { log_info("Platform does not support 'cl_khr_external_semaphore' " "and 'cl_khr_external_memory'. Skipping the test.\n"); return TEST_SKIPPED_ITSELF; @@ -80,35 +75,39 @@ int test_platform_info(cl_device_id deviceID, cl_context _context, log_info("Platform (id %lu) info:\n", (unsigned long)platform); for (i = 0; - i < sizeof(platform_info_table) / sizeof(platform_info_table[0]); - i++) + i < sizeof(platform_info_table) / sizeof(platform_info_table[0]); i++) { - errNum = - clGetPlatformInfo(platform, platform_info_table[i].info, 0, - NULL, &handle_type_size); + errNum = clGetPlatformInfo(platform, platform_info_table[i].info, 0, + NULL, &handle_type_size); test_error(errNum, "clGetPlatformInfo failed"); - if (handle_type_size == 0) { - if (platform_info_table[i].info == CL_PLATFORM_EXTERNAL_MEMORY_IMPORT_HANDLE_TYPES_KHR - && external_mem_extn_available) { - test_fail("External memory import handle types should be reported if " - "cl_khr_external_memory is available.\n"); + if (handle_type_size == 0) + { + if (platform_info_table[i].info + == CL_PLATFORM_EXTERNAL_MEMORY_IMPORT_HANDLE_TYPES_KHR + && external_mem_extn_available) + { + test_fail( + "External memory import handle types should be reported if " + "cl_khr_external_memory is available.\n"); } log_info("%s not supported. Skipping the query.\n", - platform_info_table[i].name); + platform_info_table[i].name); continue; } - if ((platform_info_table[i].info == CL_PLATFORM_SEMAPHORE_EXPORT_HANDLE_TYPES_KHR) || - (platform_info_table[i].info == CL_PLATFORM_SEMAPHORE_IMPORT_HANDLE_TYPES_KHR)) { + if ((platform_info_table[i].info + == CL_PLATFORM_SEMAPHORE_EXPORT_HANDLE_TYPES_KHR) + || (platform_info_table[i].info + == CL_PLATFORM_SEMAPHORE_IMPORT_HANDLE_TYPES_KHR)) + { supports_atleast_one_sema_query = true; } num_handles = handle_type_size / sizeof(cl_uint); handle_type = (cl_uint *)malloc(handle_type_size); - errNum = - clGetPlatformInfo(platform, platform_info_table[i].info, - handle_type_size, handle_type, NULL); + errNum = clGetPlatformInfo(platform, platform_info_table[i].info, + handle_type_size, handle_type, NULL); test_error(errNum, "clGetPlatformInfo failed"); log_info("%s: \n", platform_info_table[i].name); @@ -122,7 +121,8 @@ int test_platform_info(cl_device_id deviceID, cl_context _context, } } - if (external_sema_extn_available && !supports_atleast_one_sema_query) { + if (external_sema_extn_available && !supports_atleast_one_sema_query) + { log_info("External semaphore import/export or both should be supported " "if cl_khr_external_semaphore is available.\n"); return TEST_FAIL; @@ -145,7 +145,8 @@ int test_device_info(cl_device_id deviceID, cl_context _context, is_extension_available(deviceID, "cl_khr_external_semaphore"); cl_bool supports_atleast_one_sema_query = false; - if (!external_mem_extn_available && !external_sema_extn_available) { + if (!external_mem_extn_available && !external_sema_extn_available) + { log_info("Device does not support 'cl_khr_external_semaphore' " "and 'cl_khr_external_memory'. Skipping the test.\n"); return TEST_SKIPPED_ITSELF; @@ -158,19 +159,26 @@ int test_device_info(cl_device_id deviceID, cl_context _context, &handle_type_size); test_error(errNum, "clGetDeviceInfo failed"); - if (handle_type_size == 0) { - if (device_info_table[j].info == CL_DEVICE_EXTERNAL_MEMORY_IMPORT_HANDLE_TYPES_KHR - && external_mem_extn_available) { - test_fail("External memory import handle types should be reported if " - "cl_khr_external_memory is available.\n"); + if (handle_type_size == 0) + { + if (device_info_table[j].info + == CL_DEVICE_EXTERNAL_MEMORY_IMPORT_HANDLE_TYPES_KHR + && external_mem_extn_available) + { + test_fail( + "External memory import handle types should be reported if " + "cl_khr_external_memory is available.\n"); } log_info("%s not supported. Skipping the query.\n", - device_info_table[j].name); + device_info_table[j].name); continue; } - if ((device_info_table[j].info == CL_DEVICE_SEMAPHORE_EXPORT_HANDLE_TYPES_KHR) || - (device_info_table[j].info == CL_DEVICE_SEMAPHORE_IMPORT_HANDLE_TYPES_KHR)) { + if ((device_info_table[j].info + == CL_DEVICE_SEMAPHORE_EXPORT_HANDLE_TYPES_KHR) + || (device_info_table[j].info + == CL_DEVICE_SEMAPHORE_IMPORT_HANDLE_TYPES_KHR)) + { supports_atleast_one_sema_query = true; } @@ -192,7 +200,8 @@ int test_device_info(cl_device_id deviceID, cl_context _context, } } - if (external_sema_extn_available && !supports_atleast_one_sema_query) { + if (external_sema_extn_available && !supports_atleast_one_sema_query) + { log_info("External semaphore import/export or both should be supported " "if cl_khr_external_semaphore is available.\n"); return TEST_FAIL;