From e351a90f81f3d94b10da5957ae66bc61d47361b3 Mon Sep 17 00:00:00 2001 From: Fabian Zwolinski Date: Thu, 27 Apr 2023 09:50:55 +0000 Subject: [PATCH] refactor: Rename member variables to camelCase 2/n Signed-off-by: Fabian Zwolinski --- level_zero/api/core/ze_core_loader.cpp | 212 +++++++++--------- level_zero/api/sysman/ze_sysman_loader.cpp | 78 +++---- level_zero/api/tools/ze_tools_loader.cpp | 56 ++--- level_zero/core/source/cmdlist/cmdlist_hw.inl | 6 +- level_zero/core/source/device/device_imp.cpp | 4 +- level_zero/core/source/image/image_hw.inl | 12 +- level_zero/core/source/image/image_imp.h | 2 +- level_zero/core/source/kernel/kernel_imp.cpp | 2 +- .../aub_tests/debugger/debugger_aub_tests.cpp | 8 +- .../mocks/mock_gmm_resource_info_l0.cpp | 4 +- .../sources/context/test_context_drm.cpp | 4 +- .../context/test_context_drm_or_wddm.cpp | 10 +- .../sources/context/test_context_wddm.cpp | 4 +- .../test_l0_debugger_sba_tracking.cpp | 18 +- .../sources/device/test_l0_device.cpp | 2 +- .../unit_tests/sources/image/test_image.cpp | 4 +- .../unit_tests/sources/kernel/test_kernel.cpp | 2 +- .../memory/test_memory_drm_or_wddm.cpp | 2 +- .../sources/tracing/test_api_tracing_common.h | 4 +- .../tracing/test_barrier_api_tracing.cpp | 6 +- .../tracing/test_cmdlist_api_tracing.cpp | 18 +- .../tracing/test_cmdqueue_api_tracing.cpp | 10 +- .../sources/tracing/test_copy_api_tracing.cpp | 20 +- .../sources/tracing/test_core_api_tracing.cpp | 18 +- .../tracing/test_device_api_tracing.cpp | 32 +-- .../tracing/test_driver_api_tracing.cpp | 12 +- .../tracing/test_event_api_multi_tracing.cpp | 26 +-- .../tracing/test_event_api_tracing.cpp | 32 +-- .../tracing/test_fence_api_tracing.cpp | 20 +- .../tracing/test_global_api_tracing.cpp | 4 +- .../tracing/test_image_api_tracing.cpp | 12 +- .../tracing/test_memory_api_tracing.cpp | 38 ++-- .../tracing/test_module_api_multi_tracing.cpp | 6 +- .../tracing/test_module_api_tracing.cpp | 52 ++--- .../tracing/test_residency_api_tracing.cpp | 24 +- .../tracing/test_sampler_api_tracing.cpp | 8 +- level_zero/ddi/ze_ddi_tables.h | 12 +- .../source/tracing/tracing_barrier_imp.cpp | 10 +- .../source/tracing/tracing_cmdlist_imp.cpp | 30 +-- .../source/tracing/tracing_cmdqueue_imp.cpp | 18 +- .../source/tracing/tracing_copy_imp.cpp | 42 ++-- .../source/tracing/tracing_device_imp.cpp | 62 ++--- .../source/tracing/tracing_driver_imp.cpp | 22 +- .../source/tracing/tracing_event_imp.cpp | 62 ++--- .../source/tracing/tracing_fence_imp.cpp | 22 +- .../source/tracing/tracing_global_imp.cpp | 6 +- .../source/tracing/tracing_image_imp.cpp | 14 +- .../source/tracing/tracing_imp.cpp | 4 +- .../experimental/source/tracing/tracing_imp.h | 16 +- .../source/tracing/tracing_memory_imp.cpp | 74 +++--- .../source/tracing/tracing_module_imp.cpp | 102 ++++----- .../source/tracing/tracing_residency_imp.cpp | 34 +-- .../source/tracing/tracing_sampler_imp.cpp | 10 +- .../tools/source/debug/debug_session_imp.cpp | 20 +- .../sources/debug/debug_session_tests.cpp | 14 +- .../debug/linux/test_debug_api_linux.cpp | 50 ++--- .../debug/windows/test_debug_api_windows.cpp | 4 +- .../source/accelerators/intel_accelerator.h | 6 +- .../built_ins/builtins_dispatch_builder.cpp | 8 +- opencl/source/command_queue/enqueue_common.h | 2 +- .../source/command_queue/enqueue_read_image.h | 4 +- .../command_queue/enqueue_write_image.h | 2 +- opencl/source/context/context.cpp | 2 +- opencl/source/event/event.cpp | 22 +- opencl/source/helpers/cl_blit_properties.h | 2 +- opencl/source/helpers/gmm_types_converter.cpp | 4 +- opencl/source/helpers/mipmap.cpp | 2 +- opencl/source/helpers/surface_formats.h | 2 +- opencl/source/kernel/kernel.cpp | 2 +- opencl/source/mem_obj/buffer_base.inl | 10 +- opencl/source/mem_obj/image.cpp | 52 ++--- opencl/source/mem_obj/image.inl | 22 +- opencl/source/sharings/d3d/d3d_sharing.cpp | 6 +- opencl/source/sharings/gl/gl_sharing.h | 4 +- .../sharings/gl/linux/gl_sharing_linux.cpp | 4 +- .../gl/windows/gl_sharing_windows.cpp | 4 +- .../gl/windows/gl_texture_windows.cpp | 2 +- .../unit_test/api/cl_get_image_info_tests.inl | 2 +- .../aub_mem_dump/cl_aub_alloc_dump_tests.cpp | 50 ++--- .../command_stream/aub_mem_dump_tests.h | 18 +- .../aub_batch_buffer_tests_gen11.h | 18 +- .../aub_batch_buffer_tests_gen12lp.h | 20 +- .../batch_buffer/aub_batch_buffer_tests.h | 18 +- .../enqueue_command_without_kernel_tests.cpp | 24 +- .../command_queue/enqueue_map_image_tests.cpp | 2 +- .../enqueue_write_image_tests.cpp | 2 +- .../command_stream_receiver_hw_2_tests.cpp | 10 +- .../context/context_get_info_tests.cpp | 12 +- .../test/unit_test/context/context_tests.cpp | 2 +- .../driver_diagnostics_enqueue_tests.cpp | 2 +- .../context/driver_diagnostics_tests.h | 2 +- .../get_supported_image_formats_tests.cpp | 6 +- .../unit_test/context/gl/context_gl_tests.h | 4 +- .../unit_test/d3d_sharing/d3d_tests_part1.cpp | 34 +-- .../unit_test/d3d_sharing/d3d_tests_part2.cpp | 20 +- opencl/test/unit_test/event/event_tests.cpp | 28 +-- .../unit_test/fixtures/platform_fixture.cpp | 10 +- .../unit_test/fixtures/platform_fixture.h | 4 +- .../gen12lp/profiling_tests_gen12lp.inl | 12 +- .../unit_test/gmm_helper/gmm_helper_tests.cpp | 8 +- .../unit_test/helpers/cl_helper_tests.cpp | 2 +- .../test/unit_test/helpers/mipmap_tests.cpp | 4 +- .../kernel/kernel_image_arg_tests.cpp | 2 +- .../test/unit_test/mem_obj/buffer_tests.cpp | 6 +- .../create_image_in_local_memory_tests.cpp | 2 +- .../mem_obj/image_redescribe_tests.cpp | 24 +- .../unit_test/mem_obj/image_set_arg_tests.cpp | 18 +- .../unit_test/mem_obj/image_snorm_tests.cpp | 8 +- opencl/test/unit_test/mem_obj/image_tests.cpp | 20 +- .../unit_test/mem_obj/image_tiled_tests.cpp | 4 +- .../mem_obj/image_transfer_tests.cpp | 2 +- .../mem_obj/image_validate_tests.cpp | 26 +-- .../unit_test/mem_obj/nv12_image_tests.cpp | 2 +- .../memory_manager/memory_manager_tests.cpp | 14 +- .../mock_gl/windows/mock_opengl32.cpp | 4 +- .../test/unit_test/mocks/mock_command_queue.h | 8 +- .../mocks/mock_gmm_resource_info_ocl.cpp | 20 +- .../linux/cl_drm_memory_manager_tests.cpp | 2 +- .../os_interface/mock_performance_counters.h | 26 +-- .../unit_test/profiling/profiling_tests.cpp | 24 +- .../sharings/gl/windows/gl_texture_tests.cpp | 6 +- .../unified/unified_sharing_image_tests.cpp | 4 +- .../sharings/va/context_va_tests.cpp | 4 +- .../sharings/va/va_sharing_tests.cpp | 34 +-- shared/source/aub_mem_dump/aub_alloc_dump.inl | 50 ++--- shared/source/aub_mem_dump/aub_header.h | 104 ++++----- shared/source/aub_mem_dump/aub_mem_dump.h | 64 +++--- shared/source/aub_mem_dump/aub_mem_dump.inl | 46 ++-- .../aub_mem_dump/definitions/aub_services.h | 36 +-- .../aub_command_stream_receiver_hw_base.inl | 18 +- .../tbx_command_stream_receiver_hw.inl | 18 +- shared/source/debugger/debugger_l0.cpp | 4 +- shared/source/debugger/debugger_l0.h | 22 +- shared/source/debugger/debugger_l0.inl | 12 +- .../debugger/debugger_l0_tgllp_and_later.inl | 12 +- shared/source/device/device.cpp | 4 +- shared/source/gmm_helper/gmm.cpp | 18 +- shared/source/helpers/surface_format_info.h | 14 +- shared/source/image/image_surface_state.h | 4 +- .../source/memory_manager/memory_manager.cpp | 2 +- .../os_interface/linux/device_time_drm.cpp | 4 +- shared/source/os_interface/os_time.cpp | 4 +- shared/source/os_interface/os_time.h | 4 +- .../device_time_gpu_cpu_drm_or_wddm.cpp | 10 +- .../windows/device_time_gpu_cpu_wddm.cpp | 14 +- .../os_interface/windows/device_time_wddm.cpp | 6 +- .../os_interface/windows/device_time_wddm.h | 12 +- .../os_interface/windows/gdi_interface.cpp | 4 +- .../os_interface/windows/gdi_interface.h | 2 +- .../os_interface/windows/gfx_escape_wrapper.h | 6 +- .../configure_device_address_space_wddm.cpp | 4 +- shared/source/utilities/perf_profiler.cpp | 2 +- shared/source/utilities/perf_profiler.h | 18 +- shared/source/utilities/software_tags.cpp | 14 +- shared/source/utilities/software_tags.h | 16 +- .../common/helpers/custom_event_listener.h | 14 +- shared/test/common/mock_gdi/mock_gdi.cpp | 10 +- .../mocks/mock_gmm_resource_info_common.cpp | 6 +- .../test/common/mocks/mock_memory_manager.h | 4 +- shared/test/common/mocks/mock_ostime.h | 10 +- .../aub_command_stream_receiver_2_tests.cpp | 6 +- .../unit_test/debugger/test_l0_debugger.cpp | 40 ++-- .../execution_environment_tests.cpp | 4 +- .../image/image_surface_state_tests.cpp | 20 +- .../os_interface/linux/os_time_test.cpp | 24 +- .../windows/os_time_win_tests.cpp | 16 +- .../windows/wddm_windows_tests.cpp | 2 +- .../mtl/test_image_surface_state_mtl.cpp | 4 +- 168 files changed, 1421 insertions(+), 1423 deletions(-) diff --git a/level_zero/api/core/ze_core_loader.cpp b/level_zero/api/core/ze_core_loader.cpp index 88694cff9f..842d05f989 100644 --- a/level_zero/api/core/ze_core_loader.cpp +++ b/level_zero/api/core/ze_core_loader.cpp @@ -27,7 +27,7 @@ #include "ze_core_all_api_entrypoints.h" #include "ze_ddi_tables.h" -ze_gpu_driver_dditable_t driver_ddiTable; +ze_gpu_driver_dditable_t driverDdiTable; ZE_APIEXPORT ze_result_t ZE_APICALL zeGetDriverProcAddrTable( @@ -35,10 +35,10 @@ zeGetDriverProcAddrTable( ze_driver_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; - driver_ddiTable.enableTracing = getEnvToBool("ZET_ENABLE_API_TRACING_EXP"); + driverDdiTable.enableTracing = getEnvToBool("ZET_ENABLE_API_TRACING_EXP"); ze_result_t result = ZE_RESULT_SUCCESS; pDdiTable->pfnGet = L0::zeDriverGet; pDdiTable->pfnGetApiVersion = L0::zeDriverGetApiVersion; @@ -46,8 +46,8 @@ zeGetDriverProcAddrTable( pDdiTable->pfnGetIpcProperties = L0::zeDriverGetIpcProperties; pDdiTable->pfnGetExtensionProperties = L0::zeDriverGetExtensionProperties; pDdiTable->pfnGetExtensionFunctionAddress = L0::zeDriverGetExtensionFunctionAddress; - driver_ddiTable.core_ddiTable.Driver = *pDdiTable; - if (driver_ddiTable.enableTracing) { + driverDdiTable.coreDdiTable.Driver = *pDdiTable; + if (driverDdiTable.enableTracing) { pDdiTable->pfnGet = zeDriverGetTracing; pDdiTable->pfnGetApiVersion = zeDriverGetApiVersionTracing; pDdiTable->pfnGetProperties = zeDriverGetPropertiesTracing; @@ -63,10 +63,10 @@ zeGetMemProcAddrTable( ze_mem_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; - driver_ddiTable.enableTracing = getEnvToBool("ZET_ENABLE_API_TRACING_EXP"); + driverDdiTable.enableTracing = getEnvToBool("ZET_ENABLE_API_TRACING_EXP"); ze_result_t result = ZE_RESULT_SUCCESS; pDdiTable->pfnAllocShared = L0::zeMemAllocShared; @@ -80,8 +80,8 @@ zeGetMemProcAddrTable( pDdiTable->pfnOpenIpcHandle = L0::zeMemOpenIpcHandle; pDdiTable->pfnCloseIpcHandle = L0::zeMemCloseIpcHandle; pDdiTable->pfnPutIpcHandle = L0::zeMemPutIpcHandle; - driver_ddiTable.core_ddiTable.Mem = *pDdiTable; - if (driver_ddiTable.enableTracing) { + driverDdiTable.coreDdiTable.Mem = *pDdiTable; + if (driverDdiTable.enableTracing) { pDdiTable->pfnAllocShared = zeMemAllocSharedTracing; pDdiTable->pfnAllocDevice = zeMemAllocDeviceTracing; pDdiTable->pfnAllocHost = zeMemAllocHostTracing; @@ -101,11 +101,11 @@ zeGetContextProcAddrTable( ze_context_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; - driver_ddiTable.enableTracing = getEnvToBool("ZET_ENABLE_API_TRACING_EXP"); + driverDdiTable.enableTracing = getEnvToBool("ZET_ENABLE_API_TRACING_EXP"); ze_result_t result = ZE_RESULT_SUCCESS; pDdiTable->pfnCreate = L0::zeContextCreate; @@ -118,8 +118,8 @@ zeGetContextProcAddrTable( pDdiTable->pfnMakeImageResident = L0::zeContextMakeImageResident; pDdiTable->pfnEvictImage = L0::zeContextEvictImage; - driver_ddiTable.core_ddiTable.Context = *pDdiTable; - if (driver_ddiTable.enableTracing) { + driverDdiTable.coreDdiTable.Context = *pDdiTable; + if (driverDdiTable.enableTracing) { pDdiTable->pfnCreate = zeContextCreateTracing; pDdiTable->pfnDestroy = zeContextDestroyTracing; pDdiTable->pfnGetStatus = zeContextGetStatusTracing; @@ -138,18 +138,18 @@ zeGetPhysicalMemProcAddrTable( ze_physical_mem_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; - driver_ddiTable.enableTracing = getEnvToBool("ZET_ENABLE_API_TRACING_EXP"); + driverDdiTable.enableTracing = getEnvToBool("ZET_ENABLE_API_TRACING_EXP"); ze_result_t result = ZE_RESULT_SUCCESS; pDdiTable->pfnCreate = L0::zePhysicalMemCreate; pDdiTable->pfnDestroy = L0::zePhysicalMemDestroy; - driver_ddiTable.core_ddiTable.PhysicalMem = *pDdiTable; - if (driver_ddiTable.enableTracing) { + driverDdiTable.coreDdiTable.PhysicalMem = *pDdiTable; + if (driverDdiTable.enableTracing) { pDdiTable->pfnCreate = zePhysicalMemCreateTracing; pDdiTable->pfnDestroy = zePhysicalMemDestroyTracing; } @@ -162,10 +162,10 @@ zeGetVirtualMemProcAddrTable( ze_virtual_mem_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; - driver_ddiTable.enableTracing = getEnvToBool("ZET_ENABLE_API_TRACING_EXP"); + driverDdiTable.enableTracing = getEnvToBool("ZET_ENABLE_API_TRACING_EXP"); ze_result_t result = ZE_RESULT_SUCCESS; pDdiTable->pfnReserve = L0::zeVirtualMemReserve; @@ -176,8 +176,8 @@ zeGetVirtualMemProcAddrTable( pDdiTable->pfnSetAccessAttribute = L0::zeVirtualMemSetAccessAttribute; pDdiTable->pfnGetAccessAttribute = L0::zeVirtualMemGetAccessAttribute; - driver_ddiTable.core_ddiTable.VirtualMem = *pDdiTable; - if (driver_ddiTable.enableTracing) { + driverDdiTable.coreDdiTable.VirtualMem = *pDdiTable; + if (driverDdiTable.enableTracing) { pDdiTable->pfnReserve = zeVirtualMemReserveTracing; pDdiTable->pfnFree = zeVirtualMemFreeTracing; pDdiTable->pfnQueryPageSize = zeVirtualMemQueryPageSizeTracing; @@ -195,15 +195,15 @@ zeGetGlobalProcAddrTable( ze_global_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; - driver_ddiTable.enableTracing = getEnvToBool("ZET_ENABLE_API_TRACING_EXP"); + driverDdiTable.enableTracing = getEnvToBool("ZET_ENABLE_API_TRACING_EXP"); ze_result_t result = ZE_RESULT_SUCCESS; pDdiTable->pfnInit = L0::zeInit; - driver_ddiTable.core_ddiTable.Global = *pDdiTable; - if (driver_ddiTable.enableTracing) { + driverDdiTable.coreDdiTable.Global = *pDdiTable; + if (driverDdiTable.enableTracing) { pDdiTable->pfnInit = zeInitTracing; } return result; @@ -215,10 +215,10 @@ zeGetDeviceProcAddrTable( ze_device_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; - driver_ddiTable.enableTracing = getEnvToBool("ZET_ENABLE_API_TRACING_EXP"); + driverDdiTable.enableTracing = getEnvToBool("ZET_ENABLE_API_TRACING_EXP"); ze_result_t result = ZE_RESULT_SUCCESS; pDdiTable->pfnGet = L0::zeDeviceGet; @@ -239,8 +239,8 @@ zeGetDeviceProcAddrTable( pDdiTable->pfnReserveCacheExt = L0::zeDeviceReserveCacheExt; pDdiTable->pfnSetCacheAdviceExt = L0::zeDeviceSetCacheAdviceExt; pDdiTable->pfnPciGetPropertiesExt = L0::zeDevicePciGetPropertiesExt; - driver_ddiTable.core_ddiTable.Device = *pDdiTable; - if (driver_ddiTable.enableTracing) { + driverDdiTable.coreDdiTable.Device = *pDdiTable; + if (driverDdiTable.enableTracing) { pDdiTable->pfnGet = zeDeviceGetTracing; pDdiTable->pfnGetCommandQueueGroupProperties = zeDeviceGetCommandQueueGroupPropertiesTracing; pDdiTable->pfnGetSubDevices = zeDeviceGetSubDevicesTracing; @@ -265,13 +265,13 @@ zeGetDeviceExpProcAddrTable( ze_device_exp_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; pDdiTable->pfnGetFabricVertexExp = L0::zeDeviceGetFabricVertexExp; - driver_ddiTable.core_ddiTable.DeviceExp = *pDdiTable; + driverDdiTable.coreDdiTable.DeviceExp = *pDdiTable; return result; } @@ -281,18 +281,18 @@ zeGetCommandQueueProcAddrTable( ze_command_queue_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; - driver_ddiTable.enableTracing = getEnvToBool("ZET_ENABLE_API_TRACING_EXP"); + driverDdiTable.enableTracing = getEnvToBool("ZET_ENABLE_API_TRACING_EXP"); ze_result_t result = ZE_RESULT_SUCCESS; pDdiTable->pfnCreate = L0::zeCommandQueueCreate; pDdiTable->pfnDestroy = L0::zeCommandQueueDestroy; pDdiTable->pfnExecuteCommandLists = L0::zeCommandQueueExecuteCommandLists; pDdiTable->pfnSynchronize = L0::zeCommandQueueSynchronize; - driver_ddiTable.core_ddiTable.CommandQueue = *pDdiTable; - if (driver_ddiTable.enableTracing) { + driverDdiTable.coreDdiTable.CommandQueue = *pDdiTable; + if (driverDdiTable.enableTracing) { pDdiTable->pfnCreate = zeCommandQueueCreateTracing; pDdiTable->pfnDestroy = zeCommandQueueDestroyTracing; pDdiTable->pfnExecuteCommandLists = zeCommandQueueExecuteCommandListsTracing; @@ -307,10 +307,10 @@ zeGetCommandListProcAddrTable( ze_command_list_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; - driver_ddiTable.enableTracing = getEnvToBool("ZET_ENABLE_API_TRACING_EXP"); + driverDdiTable.enableTracing = getEnvToBool("ZET_ENABLE_API_TRACING_EXP"); ze_result_t result = ZE_RESULT_SUCCESS; pDdiTable->pfnAppendBarrier = L0::zeCommandListAppendBarrier; @@ -339,8 +339,8 @@ zeGetCommandListProcAddrTable( pDdiTable->pfnAppendWriteGlobalTimestamp = L0::zeCommandListAppendWriteGlobalTimestamp; pDdiTable->pfnAppendMemoryCopyFromContext = L0::zeCommandListAppendMemoryCopyFromContext; pDdiTable->pfnAppendQueryKernelTimestamps = L0::zeCommandListAppendQueryKernelTimestamps; - driver_ddiTable.core_ddiTable.CommandList = *pDdiTable; - if (driver_ddiTable.enableTracing) { + driverDdiTable.coreDdiTable.CommandList = *pDdiTable; + if (driverDdiTable.enableTracing) { pDdiTable->pfnAppendBarrier = zeCommandListAppendBarrierTracing; pDdiTable->pfnAppendMemoryRangesBarrier = zeCommandListAppendMemoryRangesBarrierTracing; pDdiTable->pfnCreate = zeCommandListCreateTracing; @@ -377,10 +377,10 @@ zeGetFenceProcAddrTable( ze_fence_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; - driver_ddiTable.enableTracing = getEnvToBool("ZET_ENABLE_API_TRACING_EXP"); + driverDdiTable.enableTracing = getEnvToBool("ZET_ENABLE_API_TRACING_EXP"); ze_result_t result = ZE_RESULT_SUCCESS; pDdiTable->pfnCreate = L0::zeFenceCreate; @@ -388,8 +388,8 @@ zeGetFenceProcAddrTable( pDdiTable->pfnHostSynchronize = L0::zeFenceHostSynchronize; pDdiTable->pfnQueryStatus = L0::zeFenceQueryStatus; pDdiTable->pfnReset = L0::zeFenceReset; - driver_ddiTable.core_ddiTable.Fence = *pDdiTable; - if (driver_ddiTable.enableTracing) { + driverDdiTable.coreDdiTable.Fence = *pDdiTable; + if (driverDdiTable.enableTracing) { pDdiTable->pfnCreate = zeFenceCreateTracing; pDdiTable->pfnDestroy = zeFenceDestroyTracing; pDdiTable->pfnHostSynchronize = zeFenceHostSynchronizeTracing; @@ -405,10 +405,10 @@ zeGetEventPoolProcAddrTable( ze_event_pool_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; - driver_ddiTable.enableTracing = getEnvToBool("ZET_ENABLE_API_TRACING_EXP"); + driverDdiTable.enableTracing = getEnvToBool("ZET_ENABLE_API_TRACING_EXP"); ze_result_t result = ZE_RESULT_SUCCESS; pDdiTable->pfnCreate = L0::zeEventPoolCreate; @@ -416,8 +416,8 @@ zeGetEventPoolProcAddrTable( pDdiTable->pfnGetIpcHandle = L0::zeEventPoolGetIpcHandle; pDdiTable->pfnOpenIpcHandle = L0::zeEventPoolOpenIpcHandle; pDdiTable->pfnCloseIpcHandle = L0::zeEventPoolCloseIpcHandle; - driver_ddiTable.core_ddiTable.EventPool = *pDdiTable; - if (driver_ddiTable.enableTracing) { + driverDdiTable.coreDdiTable.EventPool = *pDdiTable; + if (driverDdiTable.enableTracing) { pDdiTable->pfnCreate = zeEventPoolCreateTracing; pDdiTable->pfnDestroy = zeEventPoolDestroyTracing; pDdiTable->pfnGetIpcHandle = zeEventPoolGetIpcHandleTracing; @@ -433,10 +433,10 @@ zeGetEventProcAddrTable( ze_event_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; - driver_ddiTable.enableTracing = getEnvToBool("ZET_ENABLE_API_TRACING_EXP"); + driverDdiTable.enableTracing = getEnvToBool("ZET_ENABLE_API_TRACING_EXP"); ze_result_t result = ZE_RESULT_SUCCESS; pDdiTable->pfnCreate = L0::zeEventCreate; @@ -446,8 +446,8 @@ zeGetEventProcAddrTable( pDdiTable->pfnQueryStatus = L0::zeEventQueryStatus; pDdiTable->pfnHostReset = L0::zeEventHostReset; pDdiTable->pfnQueryKernelTimestamp = L0::zeEventQueryKernelTimestamp; - driver_ddiTable.core_ddiTable.Event = *pDdiTable; - if (driver_ddiTable.enableTracing) { + driverDdiTable.coreDdiTable.Event = *pDdiTable; + if (driverDdiTable.enableTracing) { pDdiTable->pfnCreate = zeEventCreateTracing; pDdiTable->pfnDestroy = zeEventDestroyTracing; pDdiTable->pfnHostSignal = zeEventHostSignalTracing; @@ -465,8 +465,8 @@ zeGetEventExpProcAddrTable( ze_event_exp_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; @@ -481,10 +481,10 @@ zeGetImageProcAddrTable( ze_image_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; - driver_ddiTable.enableTracing = getEnvToBool("ZET_ENABLE_API_TRACING_EXP"); + driverDdiTable.enableTracing = getEnvToBool("ZET_ENABLE_API_TRACING_EXP"); ze_result_t result = ZE_RESULT_SUCCESS; pDdiTable->pfnGetProperties = L0::zeImageGetProperties; @@ -492,8 +492,8 @@ zeGetImageProcAddrTable( pDdiTable->pfnDestroy = L0::zeImageDestroy; pDdiTable->pfnGetAllocPropertiesExt = L0::zeImageGetAllocPropertiesExt; pDdiTable->pfnViewCreateExt = L0::zeImageViewCreateExt; - driver_ddiTable.core_ddiTable.Image = *pDdiTable; - if (driver_ddiTable.enableTracing) { + driverDdiTable.coreDdiTable.Image = *pDdiTable; + if (driverDdiTable.enableTracing) { pDdiTable->pfnGetProperties = zeImageGetPropertiesTracing; pDdiTable->pfnCreate = zeImageCreateTracing; pDdiTable->pfnDestroy = zeImageDestroyTracing; @@ -508,10 +508,10 @@ zeGetModuleProcAddrTable( ze_module_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; - driver_ddiTable.enableTracing = getEnvToBool("ZET_ENABLE_API_TRACING_EXP"); + driverDdiTable.enableTracing = getEnvToBool("ZET_ENABLE_API_TRACING_EXP"); ze_result_t result = ZE_RESULT_SUCCESS; pDdiTable->pfnCreate = L0::zeModuleCreate; @@ -522,8 +522,8 @@ zeGetModuleProcAddrTable( pDdiTable->pfnGetKernelNames = L0::zeModuleGetKernelNames; pDdiTable->pfnGetFunctionPointer = L0::zeModuleGetFunctionPointer; pDdiTable->pfnGetProperties = L0::zeModuleGetProperties; - driver_ddiTable.core_ddiTable.Module = *pDdiTable; - if (driver_ddiTable.enableTracing) { + driverDdiTable.coreDdiTable.Module = *pDdiTable; + if (driverDdiTable.enableTracing) { pDdiTable->pfnCreate = zeModuleCreateTracing; pDdiTable->pfnDestroy = zeModuleDestroyTracing; pDdiTable->pfnGetNativeBinary = zeModuleGetNativeBinaryTracing; @@ -542,16 +542,16 @@ zeGetModuleBuildLogProcAddrTable( ze_module_build_log_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; - driver_ddiTable.enableTracing = getEnvToBool("ZET_ENABLE_API_TRACING_EXP"); + driverDdiTable.enableTracing = getEnvToBool("ZET_ENABLE_API_TRACING_EXP"); ze_result_t result = ZE_RESULT_SUCCESS; pDdiTable->pfnDestroy = L0::zeModuleBuildLogDestroy; pDdiTable->pfnGetString = L0::zeModuleBuildLogGetString; - driver_ddiTable.core_ddiTable.ModuleBuildLog = *pDdiTable; - if (driver_ddiTable.enableTracing) { + driverDdiTable.coreDdiTable.ModuleBuildLog = *pDdiTable; + if (driverDdiTable.enableTracing) { pDdiTable->pfnDestroy = zeModuleBuildLogDestroyTracing; pDdiTable->pfnGetString = zeModuleBuildLogGetStringTracing; } @@ -564,10 +564,10 @@ zeGetKernelProcAddrTable( ze_kernel_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; - driver_ddiTable.enableTracing = getEnvToBool("ZET_ENABLE_API_TRACING_EXP"); + driverDdiTable.enableTracing = getEnvToBool("ZET_ENABLE_API_TRACING_EXP"); ze_result_t result = ZE_RESULT_SUCCESS; pDdiTable->pfnCreate = L0::zeKernelCreate; @@ -582,8 +582,8 @@ zeGetKernelProcAddrTable( pDdiTable->pfnGetProperties = L0::zeKernelGetProperties; pDdiTable->pfnSetCacheConfig = L0::zeKernelSetCacheConfig; pDdiTable->pfnGetName = L0::zeKernelGetName; - driver_ddiTable.core_ddiTable.Kernel = *pDdiTable; - if (driver_ddiTable.enableTracing) { + driverDdiTable.coreDdiTable.Kernel = *pDdiTable; + if (driverDdiTable.enableTracing) { pDdiTable->pfnCreate = zeKernelCreateTracing; pDdiTable->pfnDestroy = zeKernelDestroyTracing; pDdiTable->pfnSetGroupSize = zeKernelSetGroupSizeTracing; @@ -606,16 +606,16 @@ zeGetSamplerProcAddrTable( ze_sampler_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; - driver_ddiTable.enableTracing = getEnvToBool("ZET_ENABLE_API_TRACING_EXP"); + driverDdiTable.enableTracing = getEnvToBool("ZET_ENABLE_API_TRACING_EXP"); ze_result_t result = ZE_RESULT_SUCCESS; pDdiTable->pfnCreate = L0::zeSamplerCreate; pDdiTable->pfnDestroy = L0::zeSamplerDestroy; - driver_ddiTable.core_ddiTable.Sampler = *pDdiTable; - if (driver_ddiTable.enableTracing) { + driverDdiTable.coreDdiTable.Sampler = *pDdiTable; + if (driverDdiTable.enableTracing) { pDdiTable->pfnCreate = zeSamplerCreateTracing; pDdiTable->pfnDestroy = zeSamplerDestroyTracing; } @@ -628,14 +628,14 @@ zeGetKernelExpProcAddrTable( ze_kernel_exp_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; pDdiTable->pfnSetGlobalOffsetExp = L0::zeKernelSetGlobalOffsetExp; pDdiTable->pfnSchedulingHintExp = L0::zeKernelSchedulingHintExp; - driver_ddiTable.core_ddiTable.KernelExp = *pDdiTable; + driverDdiTable.coreDdiTable.KernelExp = *pDdiTable; return result; } @@ -645,14 +645,14 @@ zeGetMemExpProcAddrTable( ze_mem_exp_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; pDdiTable->pfnGetIpcHandleFromFileDescriptorExp = L0::zeMemGetIpcHandleFromFileDescriptorExp; pDdiTable->pfnGetFileDescriptorFromIpcHandleExp = L0::zeMemGetFileDescriptorFromIpcHandleExp; - driver_ddiTable.core_ddiTable.MemExp = *pDdiTable; + driverDdiTable.coreDdiTable.MemExp = *pDdiTable; return result; } @@ -662,14 +662,14 @@ zeGetImageExpProcAddrTable( ze_image_exp_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; pDdiTable->pfnGetMemoryPropertiesExp = L0::zeImageGetMemoryPropertiesExp; pDdiTable->pfnViewCreateExp = L0::zeImageViewCreateExp; - driver_ddiTable.core_ddiTable.ImageExp = *pDdiTable; + driverDdiTable.coreDdiTable.ImageExp = *pDdiTable; return result; } @@ -680,8 +680,8 @@ zeGetFabricVertexExpProcAddrTable( if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; @@ -689,7 +689,7 @@ zeGetFabricVertexExpProcAddrTable( pDdiTable->pfnGetSubVerticesExp = L0::zeFabricVertexGetSubVerticesExp; pDdiTable->pfnGetPropertiesExp = L0::zeFabricVertexGetPropertiesExp; pDdiTable->pfnGetDeviceExp = L0::zeFabricVertexGetDeviceExp; - driver_ddiTable.core_ddiTable.FabricVertexExp = *pDdiTable; + driverDdiTable.coreDdiTable.FabricVertexExp = *pDdiTable; return result; } @@ -700,14 +700,14 @@ zeGetFabricEdgeExpProcAddrTable( if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; pDdiTable->pfnGetExp = L0::zeFabricEdgeGetExp; pDdiTable->pfnGetVerticesExp = L0::zeFabricEdgeGetVerticesExp; pDdiTable->pfnGetPropertiesExp = L0::zeFabricEdgeGetPropertiesExp; - driver_ddiTable.core_ddiTable.FabricEdgeExp = *pDdiTable; + driverDdiTable.coreDdiTable.FabricEdgeExp = *pDdiTable; return result; } \ No newline at end of file diff --git a/level_zero/api/sysman/ze_sysman_loader.cpp b/level_zero/api/sysman/ze_sysman_loader.cpp index d63445f1b0..b9a533aae0 100644 --- a/level_zero/api/sysman/ze_sysman_loader.cpp +++ b/level_zero/api/sysman/ze_sysman_loader.cpp @@ -18,7 +18,7 @@ #include "ze_ddi_tables.h" #include "zes_sysman_all_api_entrypoints.h" -extern ze_gpu_driver_dditable_t driver_ddiTable; +extern ze_gpu_driver_dditable_t driverDdiTable; ZE_DLLEXPORT ze_result_t ZE_APICALL zesGetDeviceProcAddrTable( @@ -26,8 +26,8 @@ zesGetDeviceProcAddrTable( zes_device_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; @@ -85,8 +85,8 @@ zesGetGlobalProcAddrTable( zes_global_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; @@ -108,8 +108,8 @@ zesGetDriverProcAddrTable( zes_driver_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; @@ -134,8 +134,8 @@ zesGetDiagnosticsProcAddrTable( zes_diagnostics_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; @@ -160,8 +160,8 @@ zesGetEngineProcAddrTable( zes_engine_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; @@ -186,8 +186,8 @@ zesGetFabricPortProcAddrTable( zes_fabric_port_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; @@ -215,8 +215,8 @@ zesGetFanProcAddrTable( zes_fan_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; @@ -244,8 +244,8 @@ zesGetFirmwareProcAddrTable( zes_firmware_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; @@ -269,8 +269,8 @@ zesGetFrequencyProcAddrTable( zes_frequency_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; @@ -310,8 +310,8 @@ zesGetLedProcAddrTable( zes_led_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; @@ -337,8 +337,8 @@ zesGetMemoryProcAddrTable( zes_memory_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; @@ -363,8 +363,8 @@ zesGetPerformanceFactorProcAddrTable( zes_performance_factor_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; @@ -389,8 +389,8 @@ zesGetPowerProcAddrTable( zes_power_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; @@ -420,8 +420,8 @@ zesGetPsuProcAddrTable( zes_psu_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; @@ -445,8 +445,8 @@ zesGetRasProcAddrTable( zes_ras_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; @@ -472,8 +472,8 @@ zesGetSchedulerProcAddrTable( zes_scheduler_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; @@ -503,8 +503,8 @@ zesGetStandbyProcAddrTable( zes_standby_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; @@ -529,8 +529,8 @@ zesGetTemperatureProcAddrTable( zes_temperature_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; @@ -557,8 +557,8 @@ zesGetOverclockProcAddrTable( ) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; diff --git a/level_zero/api/tools/ze_tools_loader.cpp b/level_zero/api/tools/ze_tools_loader.cpp index b79bde106b..f3beb226c1 100644 --- a/level_zero/api/tools/ze_tools_loader.cpp +++ b/level_zero/api/tools/ze_tools_loader.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -18,7 +18,7 @@ #include "ze_ddi_tables.h" #include "zet_tools_all_api_entrypoints.h" -extern ze_gpu_driver_dditable_t driver_ddiTable; +extern ze_gpu_driver_dditable_t driverDdiTable; ZE_DLLEXPORT ze_result_t ZE_APICALL zetGetContextProcAddrTable( @@ -27,8 +27,8 @@ zetGetContextProcAddrTable( ze_result_t result = ZE_RESULT_SUCCESS; if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; pDdiTable->pfnActivateMetricGroups = L0::zetContextActivateMetricGroups; return result; @@ -40,8 +40,8 @@ zetGetMetricStreamerProcAddrTable( zet_metric_streamer_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; @@ -58,8 +58,8 @@ zetGetTracerExpProcAddrTable( zet_tracer_exp_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; pDdiTable->pfnCreate = L0::zetTracerExpCreate; @@ -76,8 +76,8 @@ zetGetCommandListProcAddrTable( zet_command_list_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; pDdiTable->pfnAppendMetricStreamerMarker = L0::zetCommandListAppendMetricStreamerMarker; @@ -93,8 +93,8 @@ zetGetModuleProcAddrTable( zet_module_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; pDdiTable->pfnGetDebugInfo = L0::zetModuleGetDebugInfo; @@ -107,8 +107,8 @@ zetGetKernelProcAddrTable( zet_kernel_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; pDdiTable->pfnGetProfileInfo = L0::zetKernelGetProfileInfo; @@ -121,8 +121,8 @@ zetGetMetricGroupProcAddrTable( zet_metric_group_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; pDdiTable->pfnGet = L0::zetMetricGroupGet; @@ -137,8 +137,8 @@ zetGetMetricProcAddrTable( zet_metric_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; @@ -153,8 +153,8 @@ zetGetMetricQueryPoolProcAddrTable( zet_metric_query_pool_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; pDdiTable->pfnCreate = L0::zetMetricQueryPoolCreate; @@ -168,8 +168,8 @@ zetGetMetricQueryProcAddrTable( zet_metric_query_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; @@ -186,8 +186,8 @@ zetGetDeviceProcAddrTable( zet_device_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; @@ -201,8 +201,8 @@ zetGetDebugProcAddrTable( zet_debug_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; @@ -227,8 +227,8 @@ zetGetMetricGroupExpProcAddrTable( zet_metric_group_exp_dditable_t *pDdiTable) { if (nullptr == pDdiTable) return ZE_RESULT_ERROR_INVALID_ARGUMENT; - if (ZE_MAJOR_VERSION(driver_ddiTable.version) != ZE_MAJOR_VERSION(version) || - ZE_MINOR_VERSION(driver_ddiTable.version) > ZE_MINOR_VERSION(version)) + if (ZE_MAJOR_VERSION(driverDdiTable.version) != ZE_MAJOR_VERSION(version) || + ZE_MINOR_VERSION(driverDdiTable.version) > ZE_MINOR_VERSION(version)) return ZE_RESULT_ERROR_UNSUPPORTED_VERSION; ze_result_t result = ZE_RESULT_SUCCESS; diff --git a/level_zero/core/source/cmdlist/cmdlist_hw.inl b/level_zero/core/source/cmdlist/cmdlist_hw.inl index 6c0f671aac..a5bf799357 100644 --- a/level_zero/core/source/cmdlist/cmdlist_hw.inl +++ b/level_zero/core/source/cmdlist/cmdlist_hw.inl @@ -502,7 +502,7 @@ ze_result_t CommandListCoreFamily::appendImageCopyFromMemory(ze_i ze_event_handle_t *phWaitEvents, bool relaxedOrderingDispatch) { auto image = Image::fromHandle(hDstImage); - auto bytesPerPixel = static_cast(image->getImageInfo().surfaceFormat->ImageElementSizeInBytes); + auto bytesPerPixel = static_cast(image->getImageInfo().surfaceFormat->imageElementSizeInBytes); Vec3 imgSize = {image->getImageDesc().width, image->getImageDesc().height, @@ -645,7 +645,7 @@ ze_result_t CommandListCoreFamily::appendImageCopyToMemory(void * ze_event_handle_t *phWaitEvents, bool relaxedOrderingDispatch) { auto image = Image::fromHandle(hSrcImage); - auto bytesPerPixel = static_cast(image->getImageInfo().surfaceFormat->ImageElementSizeInBytes); + auto bytesPerPixel = static_cast(image->getImageInfo().surfaceFormat->imageElementSizeInBytes); Vec3 imgSize = {image->getImageDesc().width, image->getImageDesc().height, @@ -863,7 +863,7 @@ ze_result_t CommandListCoreFamily::appendImageCopyRegion(ze_image } if (isCopyOnly()) { - auto bytesPerPixel = static_cast(srcImage->getImageInfo().surfaceFormat->ImageElementSizeInBytes); + auto bytesPerPixel = static_cast(srcImage->getImageInfo().surfaceFormat->imageElementSizeInBytes); Vec3 srcImgSize = {srcImage->getImageInfo().imgDesc.imageWidth, srcImage->getImageInfo().imgDesc.imageHeight, diff --git a/level_zero/core/source/device/device_imp.cpp b/level_zero/core/source/device/device_imp.cpp index 1c50843219..6a1ba78046 100644 --- a/level_zero/core/source/device/device_imp.cpp +++ b/level_zero/core/source/device/device_imp.cpp @@ -882,8 +882,8 @@ ze_result_t DeviceImp::getGlobalTimestamps(uint64_t *hostTimestamp, uint64_t *de if (!retVal) return ZE_RESULT_ERROR_DEVICE_LOST; - *deviceTimestamp = queueTimeStamp.GPUTimeStamp; - *hostTimestamp = queueTimeStamp.CPUTimeinNS; + *deviceTimestamp = queueTimeStamp.gpuTimeStamp; + *hostTimestamp = queueTimeStamp.cpuTimeinNS; return ZE_RESULT_SUCCESS; } diff --git a/level_zero/core/source/image/image_hw.inl b/level_zero/core/source/image/image_hw.inl index 889d394826..175b8e7a7d 100644 --- a/level_zero/core/source/image/image_hw.inl +++ b/level_zero/core/source/image/image_hw.inl @@ -50,7 +50,7 @@ ze_result_t ImageCoreFamily::initialize(Device *device, const ze_ UNRECOVERABLE_IF(device == nullptr); this->device = device; - if (imgInfo.surfaceFormat->GMMSurfaceFormat == GMM_FORMAT_INVALID) { + if (imgInfo.surfaceFormat->gmmSurfaceFormat == GMM_FORMAT_INVALID) { return ZE_RESULT_ERROR_UNSUPPORTED_IMAGE_FORMAT; } @@ -151,7 +151,7 @@ ze_result_t ImageCoreFamily::initialize(Device *device, const ze_ } } { - const uint32_t exponent = Math::log2(imgInfo.surfaceFormat->ImageElementSizeInBytes); + const uint32_t exponent = Math::log2(imgInfo.surfaceFormat->imageElementSizeInBytes); DEBUG_BREAK_IF(exponent >= 5u); NEO::ImageInfo imgInfoRedescirebed; @@ -169,13 +169,13 @@ ze_result_t ImageCoreFamily::initialize(Device *device, const ze_ redescribedSurfaceState.setMipCountLod(0u); NEO::setMipTailStartLod(&redescribedSurfaceState, gmm); - if (imgInfoRedescirebed.surfaceFormat->GMMSurfaceFormat == GMM_FORMAT_R8_UINT_TYPE || - imgInfoRedescirebed.surfaceFormat->GMMSurfaceFormat == GMM_FORMAT_R16_UINT_TYPE || - imgInfoRedescirebed.surfaceFormat->GMMSurfaceFormat == GMM_FORMAT_R32_UINT_TYPE) { + if (imgInfoRedescirebed.surfaceFormat->gmmSurfaceFormat == GMM_FORMAT_R8_UINT_TYPE || + imgInfoRedescirebed.surfaceFormat->gmmSurfaceFormat == GMM_FORMAT_R16_UINT_TYPE || + imgInfoRedescirebed.surfaceFormat->gmmSurfaceFormat == GMM_FORMAT_R32_UINT_TYPE) { redescribedSurfaceState.setShaderChannelSelectRed(RENDER_SURFACE_STATE::SHADER_CHANNEL_SELECT_RED); redescribedSurfaceState.setShaderChannelSelectGreen(RENDER_SURFACE_STATE::SHADER_CHANNEL_SELECT_ZERO); redescribedSurfaceState.setShaderChannelSelectBlue(RENDER_SURFACE_STATE::SHADER_CHANNEL_SELECT_ZERO); - } else if (imgInfoRedescirebed.surfaceFormat->GMMSurfaceFormat == GMM_FORMAT_R32G32_UINT_TYPE) { + } else if (imgInfoRedescirebed.surfaceFormat->gmmSurfaceFormat == GMM_FORMAT_R32G32_UINT_TYPE) { redescribedSurfaceState.setShaderChannelSelectRed(RENDER_SURFACE_STATE::SHADER_CHANNEL_SELECT_RED); redescribedSurfaceState.setShaderChannelSelectGreen(RENDER_SURFACE_STATE::SHADER_CHANNEL_SELECT_GREEN); redescribedSurfaceState.setShaderChannelSelectBlue(RENDER_SURFACE_STATE::SHADER_CHANNEL_SELECT_ZERO); diff --git a/level_zero/core/source/image/image_imp.h b/level_zero/core/source/image/image_imp.h index 55426e5ade..8467297198 100644 --- a/level_zero/core/source/image/image_imp.h +++ b/level_zero/core/source/image/image_imp.h @@ -32,7 +32,7 @@ struct ImageImp : public Image { ze_result_t getMemoryProperties(ze_image_memory_properties_exp_t *pMemoryProperties) override { pMemoryProperties->rowPitch = imgInfo.rowPitch; pMemoryProperties->slicePitch = imgInfo.slicePitch; - pMemoryProperties->size = imgInfo.surfaceFormat->ImageElementSizeInBytes; + pMemoryProperties->size = imgInfo.surfaceFormat->imageElementSizeInBytes; return ZE_RESULT_SUCCESS; } diff --git a/level_zero/core/source/kernel/kernel_imp.cpp b/level_zero/core/source/kernel/kernel_imp.cpp index 9078774bb5..b555c32d28 100644 --- a/level_zero/core/source/kernel/kernel_imp.cpp +++ b/level_zero/core/source/kernel/kernel_imp.cpp @@ -694,7 +694,7 @@ ze_result_t KernelImp::setArgImage(uint32_t argIndex, size_t argSize, const void NEO::patchNonPointer(ArrayRef(crossThreadData.get(), crossThreadDataSize), arg.metadataPayload.channelOrder, clChannelOrder); NEO::patchNonPointer(ArrayRef(crossThreadData.get(), crossThreadDataSize), arg.metadataPayload.numMipLevels, imageInfo.imgDesc.numMipLevels); - auto pixelSize = imageInfo.surfaceFormat->ImageElementSizeInBytes; + auto pixelSize = imageInfo.surfaceFormat->imageElementSizeInBytes; NEO::patchNonPointer(ArrayRef(crossThreadData.get(), crossThreadDataSize), arg.metadataPayload.flatBaseOffset, image->getAllocation()->getGpuAddress()); NEO::patchNonPointer(ArrayRef(crossThreadData.get(), crossThreadDataSize), arg.metadataPayload.flatWidth, (imageInfo.imgDesc.imageWidth * pixelSize) - 1u); NEO::patchNonPointer(ArrayRef(crossThreadData.get(), crossThreadDataSize), arg.metadataPayload.flatHeight, (imageInfo.imgDesc.imageHeight * pixelSize) - 1u); diff --git a/level_zero/core/test/aub_tests/debugger/debugger_aub_tests.cpp b/level_zero/core/test/aub_tests/debugger/debugger_aub_tests.cpp index 26bd96dc70..29f5c717e5 100644 --- a/level_zero/core/test/aub_tests/debugger/debugger_aub_tests.cpp +++ b/level_zero/core/test/aub_tests/debugger/debugger_aub_tests.cpp @@ -136,16 +136,16 @@ HWTEST2_F(DebuggerSingleAddressSpaceAub, GivenSingleAddressSpaceWhenCmdListIsExe auto dynamicStateBaseAddress = commandList->commandContainer.getIndirectHeap(HeapType::DYNAMIC_STATE)->getGraphicsAllocation()->getGpuAddress(); auto surfaceStateBaseAddress = commandList->commandContainer.getIndirectHeap(HeapType::SURFACE_STATE)->getGraphicsAllocation()->getGpuAddress(); - expectMemory(reinterpret_cast(sbaAddress + offsetof(NEO::SbaTrackedAddresses, SurfaceStateBaseAddress)), + expectMemory(reinterpret_cast(sbaAddress + offsetof(NEO::SbaTrackedAddresses, surfaceStateBaseAddress)), &surfaceStateBaseAddress, sizeof(surfaceStateBaseAddress)); - expectMemory(reinterpret_cast(sbaAddress + offsetof(NEO::SbaTrackedAddresses, DynamicStateBaseAddress)), + expectMemory(reinterpret_cast(sbaAddress + offsetof(NEO::SbaTrackedAddresses, dynamicStateBaseAddress)), &dynamicStateBaseAddress, sizeof(dynamicStateBaseAddress)); - expectMemory(reinterpret_cast(sbaAddress + offsetof(NEO::SbaTrackedAddresses, InstructionBaseAddress)), + expectMemory(reinterpret_cast(sbaAddress + offsetof(NEO::SbaTrackedAddresses, instructionBaseAddress)), &instructionHeapBaseAddress, sizeof(instructionHeapBaseAddress)); - expectMemory(reinterpret_cast(sbaAddress + offsetof(NEO::SbaTrackedAddresses, BindlessSurfaceStateBaseAddress)), + expectMemory(reinterpret_cast(sbaAddress + offsetof(NEO::SbaTrackedAddresses, bindlessSurfaceStateBaseAddress)), &surfaceStateBaseAddress, sizeof(surfaceStateBaseAddress)); EXPECT_EQ(ZE_RESULT_SUCCESS, zeKernelDestroy(kernel)); diff --git a/level_zero/core/test/unit_tests/mocks/mock_gmm_resource_info_l0.cpp b/level_zero/core/test/unit_tests/mocks/mock_gmm_resource_info_l0.cpp index 4227f820a7..110e433a83 100644 --- a/level_zero/core/test/unit_tests/mocks/mock_gmm_resource_info_l0.cpp +++ b/level_zero/core/test/unit_tests/mocks/mock_gmm_resource_info_l0.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -20,7 +20,7 @@ void MockGmmResourceInfo::setSurfaceFormat() { if (!surfaceFormatInfo) { for (auto &formatArray : formats) { for (auto &format : formatArray) { - if (mockResourceCreateParams.Format == format.GMMSurfaceFormat) { + if (mockResourceCreateParams.Format == format.gmmSurfaceFormat) { surfaceFormatInfo = &format; ASSERT_NE(nullptr, surfaceFormatInfo); return; diff --git a/level_zero/core/test/unit_tests/sources/context/test_context_drm.cpp b/level_zero/core/test/unit_tests/sources/context/test_context_drm.cpp index ee9d266062..e43844ecd7 100644 --- a/level_zero/core/test/unit_tests/sources/context/test_context_drm.cpp +++ b/level_zero/core/test/unit_tests/sources/context/test_context_drm.cpp @@ -52,7 +52,7 @@ TEST_F(GetMemHandlePtrTest, whenCallingGetMemHandlePtrWithValidHandleThenSuccess uint64_t handle = 57; // Test Successfully returning fd Handle - fixtureMemoryManager->NTHandle = false; + fixtureMemoryManager->ntHandle = false; EXPECT_NE(nullptr, context->getMemHandlePtr(device, handle, NEO::AllocationType::BUFFER, 0)); } @@ -64,7 +64,7 @@ TEST_F(GetMemHandlePtrTest, whenCallingGetMemHandlePtrWithInvalidHandleThenNullp driverHandle->failHandleLookup = true; // Test Failing returning fd Handle - fixtureMemoryManager->NTHandle = false; + fixtureMemoryManager->ntHandle = false; EXPECT_EQ(nullptr, context->getMemHandlePtr(device, handle, NEO::AllocationType::BUFFER, 0)); } diff --git a/level_zero/core/test/unit_tests/sources/context/test_context_drm_or_wddm.cpp b/level_zero/core/test/unit_tests/sources/context/test_context_drm_or_wddm.cpp index bad641e78b..5ce64a2e83 100644 --- a/level_zero/core/test/unit_tests/sources/context/test_context_drm_or_wddm.cpp +++ b/level_zero/core/test/unit_tests/sources/context/test_context_drm_or_wddm.cpp @@ -65,7 +65,7 @@ TEST_F(GetMemHandlePtrTest, whenCallingGetMemHandlePtrWithValidNTHandleThenSucce uint64_t handle = 57; // Test Successfully returning NT Handle - fixtureMemoryManager->NTHandle = true; + fixtureMemoryManager->ntHandle = true; EXPECT_NE(nullptr, context->getMemHandlePtr(device, handle, NEO::AllocationType::BUFFER, 0)); } @@ -77,11 +77,11 @@ TEST_F(GetMemHandlePtrTest, whenCallingGetMemHandlePtrWithInvalidHandleThenNullp driverHandle->failHandleLookup = true; // Test Failing returning NT Handle - fixtureMemoryManager->NTHandle = true; + fixtureMemoryManager->ntHandle = true; EXPECT_EQ(nullptr, context->getMemHandlePtr(device, handle, NEO::AllocationType::BUFFER, 0)); // Test Failing returning fd Handle - fixtureMemoryManager->NTHandle = false; + fixtureMemoryManager->ntHandle = false; EXPECT_EQ(nullptr, context->getMemHandlePtr(device, handle, NEO::AllocationType::BUFFER, 0)); } @@ -92,7 +92,7 @@ TEST_F(GetMemHandlePtrTest, whenCallingGetMemHandlePtrWithDRMDriverTypeWithNonNT uint64_t handle = 57; // Test Successfully returning fd Handle - fixtureMemoryManager->NTHandle = false; + fixtureMemoryManager->ntHandle = false; EXPECT_NE(nullptr, context->getMemHandlePtr(device, handle, NEO::AllocationType::BUFFER, 0)); } @@ -103,7 +103,7 @@ TEST_F(GetMemHandlePtrTest, whenCallingGetMemHandlePtrWithWDDMDriverTypeWithNonN uint64_t handle = 57; // Test Successfully returning fd Handle - fixtureMemoryManager->NTHandle = false; + fixtureMemoryManager->ntHandle = false; EXPECT_EQ(nullptr, context->getMemHandlePtr(device, handle, NEO::AllocationType::BUFFER, 0)); } diff --git a/level_zero/core/test/unit_tests/sources/context/test_context_wddm.cpp b/level_zero/core/test/unit_tests/sources/context/test_context_wddm.cpp index 21b3162838..af040777ec 100644 --- a/level_zero/core/test/unit_tests/sources/context/test_context_wddm.cpp +++ b/level_zero/core/test/unit_tests/sources/context/test_context_wddm.cpp @@ -52,7 +52,7 @@ TEST_F(GetMemHandlePtrTest, whenCallingGetMemHandlePtrWithValidHandleThenSuccess uint64_t handle = 57; // Test Successfully returning NT Handle - fixtureMemoryManager->NTHandle = true; + fixtureMemoryManager->ntHandle = true; EXPECT_NE(nullptr, context->getMemHandlePtr(device, handle, NEO::AllocationType::BUFFER, 0)); } @@ -64,7 +64,7 @@ TEST_F(GetMemHandlePtrTest, whenCallingGetMemHandlePtrWithInvalidHandleThenNullp driverHandle->failHandleLookup = true; // Test Failing returning NT Handle - fixtureMemoryManager->NTHandle = true; + fixtureMemoryManager->ntHandle = true; EXPECT_EQ(nullptr, context->getMemHandlePtr(device, handle, NEO::AllocationType::BUFFER, 0)); } diff --git a/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_sba_tracking.cpp b/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_sba_tracking.cpp index d708a4f548..f9fd1a97ca 100644 --- a/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_sba_tracking.cpp +++ b/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_sba_tracking.cpp @@ -77,14 +77,14 @@ HWTEST_F(L0DebuggerTest, givenCreatedL0DebuggerThenSbaTrackingBuffersContainVali auto sbaHeader = reinterpret_cast(sbaAllocation->getUnderlyingBuffer()); EXPECT_STREQ("sbaarea", sbaHeader->magic); - EXPECT_EQ(0u, sbaHeader->BindlessSamplerStateBaseAddress); - EXPECT_EQ(0u, sbaHeader->BindlessSurfaceStateBaseAddress); - EXPECT_EQ(0u, sbaHeader->DynamicStateBaseAddress); - EXPECT_EQ(0u, sbaHeader->GeneralStateBaseAddress); - EXPECT_EQ(0u, sbaHeader->IndirectObjectBaseAddress); - EXPECT_EQ(0u, sbaHeader->InstructionBaseAddress); - EXPECT_EQ(0u, sbaHeader->SurfaceStateBaseAddress); - EXPECT_EQ(0u, sbaHeader->Version); + EXPECT_EQ(0u, sbaHeader->bindlessSamplerStateBaseAddress); + EXPECT_EQ(0u, sbaHeader->bindlessSurfaceStateBaseAddress); + EXPECT_EQ(0u, sbaHeader->dynamicStateBaseAddress); + EXPECT_EQ(0u, sbaHeader->generalStateBaseAddress); + EXPECT_EQ(0u, sbaHeader->indirectObjectBaseAddress); + EXPECT_EQ(0u, sbaHeader->instructionBaseAddress); + EXPECT_EQ(0u, sbaHeader->surfaceStateBaseAddress); + EXPECT_EQ(0u, sbaHeader->version); } } @@ -166,7 +166,7 @@ HWTEST2_F(L0DebuggerPerContextAddressSpaceTest, givenDebuggingEnabledAndRequired EXPECT_EQ(static_cast(gsbaGpuVa & 0x0000FFFFFFFFULL), cmdSdi->getDataDword0()); EXPECT_EQ(static_cast(gsbaGpuVa >> 32), cmdSdi->getDataDword1()); - auto expectedGpuVa = gmmHelper->decanonize(device->getL0Debugger()->getSbaTrackingGpuVa()) + offsetof(NEO::SbaTrackedAddresses, GeneralStateBaseAddress); + auto expectedGpuVa = gmmHelper->decanonize(device->getL0Debugger()->getSbaTrackingGpuVa()) + offsetof(NEO::SbaTrackedAddresses, generalStateBaseAddress); EXPECT_EQ(expectedGpuVa, cmdSdi->getAddress()); for (auto i = 0u; i < numCommandLists; i++) { diff --git a/level_zero/core/test/unit_tests/sources/device/test_l0_device.cpp b/level_zero/core/test/unit_tests/sources/device/test_l0_device.cpp index 19e5271dc7..86726e2008 100644 --- a/level_zero/core/test/unit_tests/sources/device/test_l0_device.cpp +++ b/level_zero/core/test/unit_tests/sources/device/test_l0_device.cpp @@ -1648,7 +1648,7 @@ TEST_F(GlobalTimestampTest, whenQueryingForTimerResolutionWithUseCyclesPerSecond class FalseCpuDeviceTime : public NEO::DeviceTime { public: bool getCpuGpuTime(TimeStampData *pGpuCpuTime, NEO::OSTime *) override { - pGpuCpuTime->CPUTimeinNS = 0u; + pGpuCpuTime->cpuTimeinNS = 0u; return true; } double getDynamicDeviceTimerResolution(HardwareInfo const &hwInfo) const override { diff --git a/level_zero/core/test/unit_tests/sources/image/test_image.cpp b/level_zero/core/test/unit_tests/sources/image/test_image.cpp index 3f71b02e8c..3763f68816 100644 --- a/level_zero/core/test/unit_tests/sources/image/test_image.cpp +++ b/level_zero/core/test/unit_tests/sources/image/test_image.cpp @@ -519,7 +519,7 @@ HWTEST2_F(ImageCreate, givenMediaBlockOptionWhenCopySurfaceStateThenSurfaceState imageHW->copySurfaceStateToSSH(&rss, 0u, true); - EXPECT_EQ(surfaceState->getWidth(), (static_cast(imageHW->getImageInfo().surfaceFormat->ImageElementSizeInBytes) * static_cast(imageHW->getImageInfo().imgDesc.imageWidth)) / sizeof(uint32_t)); + EXPECT_EQ(surfaceState->getWidth(), (static_cast(imageHW->getImageInfo().surfaceFormat->imageElementSizeInBytes) * static_cast(imageHW->getImageInfo().imgDesc.imageWidth)) / sizeof(uint32_t)); } HWTEST2_P(TestImageFormats, givenValidLayoutAndTypeWhenCreateImageCoreFamilyThenValidImageIsCreated, IsAtLeastSkl) { @@ -850,7 +850,7 @@ HWTEST2_F(ImageGetMemoryProperties, givenImageMemoryPropertiesExpStructureWhenGe auto imageInfo = image->getImageInfo(); - EXPECT_EQ(imageInfo.surfaceFormat->ImageElementSizeInBytes, imageMemoryPropertiesExp.size); + EXPECT_EQ(imageInfo.surfaceFormat->imageElementSizeInBytes, imageMemoryPropertiesExp.size); EXPECT_EQ(imageInfo.slicePitch, imageMemoryPropertiesExp.slicePitch); EXPECT_EQ(imageInfo.rowPitch, imageMemoryPropertiesExp.rowPitch); } diff --git a/level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp b/level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp index 32f060c8b6..eb12ae9696 100644 --- a/level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp +++ b/level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp @@ -440,7 +440,7 @@ HWTEST2_F(SetKernelArg, givenImageAndKernelWhenSetArgImageThenCrossThreadDataIsS auto handle = imageHW->toHandle(); auto imgInfo = imageHW->getImageInfo(); - auto pixelSize = imgInfo.surfaceFormat->ImageElementSizeInBytes; + auto pixelSize = imgInfo.surfaceFormat->imageElementSizeInBytes; kernel->setArgImage(3, sizeof(imageHW.get()), &handle); diff --git a/level_zero/core/test/unit_tests/sources/memory/test_memory_drm_or_wddm.cpp b/level_zero/core/test/unit_tests/sources/memory/test_memory_drm_or_wddm.cpp index 9e8d7f4da2..2fa4baed27 100644 --- a/level_zero/core/test/unit_tests/sources/memory/test_memory_drm_or_wddm.cpp +++ b/level_zero/core/test/unit_tests/sources/memory/test_memory_drm_or_wddm.cpp @@ -751,7 +751,7 @@ TEST_F(MemoryExportImportWSLTest, void *ptr = nullptr; MemoryManagerMemHandleMock *fixtureMemoryManager = static_cast(currMemoryManager); - fixtureMemoryManager->NTHandle = true; + fixtureMemoryManager->ntHandle = true; ze_device_mem_alloc_desc_t deviceDesc = {}; ze_external_memory_export_desc_t extendedDesc = {}; diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_api_tracing_common.h b/level_zero/core/test/unit_tests/sources/tracing/test_api_tracing_common.h index 88ab091f50..879874754a 100644 --- a/level_zero/core/test/unit_tests/sources/tracing/test_api_tracing_common.h +++ b/level_zero/core/test/unit_tests/sources/tracing/test_api_tracing_common.h @@ -33,7 +33,7 @@ class ZeAPITracingCoreTestsFixture { protected: void setUp() { - driver_ddiTable.enableTracing = true; + driverDdiTable.enableTracing = true; myThreadPrivateTracerData.onList = false; myThreadPrivateTracerData.isInitialized = false; myThreadPrivateTracerData.testAndSetThreadTracerDataInitializedAndOnList(); @@ -41,7 +41,7 @@ class ZeAPITracingCoreTestsFixture { void tearDown() { myThreadPrivateTracerData.removeThreadTracerDataFromList(); - driver_ddiTable.enableTracing = false; + driverDdiTable.enableTracing = false; } }; diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_barrier_api_tracing.cpp b/level_zero/core/test/unit_tests/sources/tracing/test_barrier_api_tracing.cpp index 41b5c7c87a..30ba680a02 100644 --- a/level_zero/core/test/unit_tests/sources/tracing/test_barrier_api_tracing.cpp +++ b/level_zero/core/test/unit_tests/sources/tracing/test_barrier_api_tracing.cpp @@ -12,7 +12,7 @@ namespace ult { TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendBarrierTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.CommandList.pfnAppendBarrier = + driverDdiTable.coreDdiTable.CommandList.pfnAppendBarrier = [](ze_command_list_handle_t hCommandList, ze_event_handle_t hSignalEvent, uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) { return ZE_RESULT_SUCCESS; }; ze_event_handle_t hSignalEvent = nullptr; @@ -30,13 +30,13 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendBarrierTracingWrapp TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendMemoryRangesBarrierTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.CommandList.pfnAppendMemoryRangesBarrier = + driverDdiTable.coreDdiTable.CommandList.pfnAppendMemoryRangesBarrier = [](ze_command_list_handle_t hCommandList, uint32_t numRanges, const size_t *pRangeSizes, const void **pRanges, ze_event_handle_t hSignalEvent, uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) { return ZE_RESULT_SUCCESS; }; uint32_t numRanges = 1; const size_t pRangeSizes[] = {1}; const void **pRanges = new const void *[1]; - driver_ddiTable.core_ddiTable.CommandList.pfnAppendMemoryRangesBarrier = + driverDdiTable.coreDdiTable.CommandList.pfnAppendMemoryRangesBarrier = [](ze_command_list_handle_t hCommandList, uint32_t numRanges, const size_t *pRangeSizes, const void **pRanges, ze_event_handle_t hSignalEvent, uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) { return ZE_RESULT_SUCCESS; }; prologCbs.CommandList.pfnAppendMemoryRangesBarrierCb = genericPrologCallbackPtr; diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_cmdlist_api_tracing.cpp b/level_zero/core/test/unit_tests/sources/tracing/test_cmdlist_api_tracing.cpp index 2050309504..fa7d15ab30 100644 --- a/level_zero/core/test/unit_tests/sources/tracing/test_cmdlist_api_tracing.cpp +++ b/level_zero/core/test/unit_tests/sources/tracing/test_cmdlist_api_tracing.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,7 +12,7 @@ namespace ult { TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListCreateTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.CommandList.pfnCreate = + driverDdiTable.coreDdiTable.CommandList.pfnCreate = [](ze_context_handle_t hContext, ze_device_handle_t hDevice, const ze_command_list_desc_t *desc, @@ -32,7 +32,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListCreateTracingWrapperWithO TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListCreateImmediateTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.CommandList.pfnCreateImmediate = + driverDdiTable.coreDdiTable.CommandList.pfnCreateImmediate = [](ze_context_handle_t hContext, ze_device_handle_t hDevice, const ze_command_queue_desc_t *desc, @@ -52,7 +52,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListCreateImmediateTracingWra TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListDestroyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.CommandList.pfnDestroy = + driverDdiTable.coreDdiTable.CommandList.pfnDestroy = [](ze_command_list_handle_t hCommandList) { return ZE_RESULT_SUCCESS; }; prologCbs.CommandList.pfnDestroyCb = genericPrologCallbackPtr; epilogCbs.CommandList.pfnDestroyCb = genericEpilogCallbackPtr; @@ -66,7 +66,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListDestroyTracingWrapperWith TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListResetTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.CommandList.pfnReset = + driverDdiTable.coreDdiTable.CommandList.pfnReset = [](ze_command_list_handle_t hCommandList) { return ZE_RESULT_SUCCESS; }; prologCbs.CommandList.pfnResetCb = genericPrologCallbackPtr; epilogCbs.CommandList.pfnResetCb = genericEpilogCallbackPtr; @@ -80,7 +80,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListResetTracingWrapperWithOn TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendMemoryPrefetchTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.CommandList.pfnAppendMemoryPrefetch = + driverDdiTable.coreDdiTable.CommandList.pfnAppendMemoryPrefetch = [](ze_command_list_handle_t hCommandList, const void *ptr, size_t size) { return ZE_RESULT_SUCCESS; }; prologCbs.CommandList.pfnAppendMemoryPrefetchCb = genericPrologCallbackPtr; epilogCbs.CommandList.pfnAppendMemoryPrefetchCb = genericEpilogCallbackPtr; @@ -94,7 +94,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendMemoryPrefetchTraci TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListCloseTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.CommandList.pfnClose = + driverDdiTable.coreDdiTable.CommandList.pfnClose = [](ze_command_list_handle_t hCommandList) { return ZE_RESULT_SUCCESS; }; prologCbs.CommandList.pfnCloseCb = genericPrologCallbackPtr; epilogCbs.CommandList.pfnCloseCb = genericEpilogCallbackPtr; @@ -109,7 +109,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListCloseTracingWrapperWithOn TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendQueryKernelTimestampsTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.CommandList.pfnAppendQueryKernelTimestamps = + driverDdiTable.coreDdiTable.CommandList.pfnAppendQueryKernelTimestamps = [](ze_command_list_handle_t hCommandList, uint32_t numEvents, ze_event_handle_t *phEvents, @@ -131,7 +131,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendQueryKernelTimestam TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendWriteGlobalTimestampTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.CommandList.pfnAppendWriteGlobalTimestamp = + driverDdiTable.coreDdiTable.CommandList.pfnAppendWriteGlobalTimestamp = [](ze_command_list_handle_t hCommandList, uint64_t *dstptr, ze_event_handle_t hSignalEvent, diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_cmdqueue_api_tracing.cpp b/level_zero/core/test/unit_tests/sources/tracing/test_cmdqueue_api_tracing.cpp index 3e74fb73d0..6380b4a3d9 100644 --- a/level_zero/core/test/unit_tests/sources/tracing/test_cmdqueue_api_tracing.cpp +++ b/level_zero/core/test/unit_tests/sources/tracing/test_cmdqueue_api_tracing.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,7 +12,7 @@ namespace ult { TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandQueueCreateTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.CommandQueue.pfnCreate = + driverDdiTable.coreDdiTable.CommandQueue.pfnCreate = [](ze_context_handle_t hContext, ze_device_handle_t hDevice, const ze_command_queue_desc_t *desc, @@ -32,7 +32,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandQueueCreateTracingWrapperWith TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandQueueDestroyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.CommandQueue.pfnDestroy = + driverDdiTable.coreDdiTable.CommandQueue.pfnDestroy = [](ze_command_queue_handle_t hCommandQueue) { return ZE_RESULT_SUCCESS; }; prologCbs.CommandQueue.pfnDestroyCb = genericPrologCallbackPtr; epilogCbs.CommandQueue.pfnDestroyCb = genericEpilogCallbackPtr; @@ -51,7 +51,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandQueueExecuteCommandListsTraci ze_command_list_handle_t phCommandLists = {}; ze_fence_handle_t hFence = nullptr; - driver_ddiTable.core_ddiTable.CommandQueue.pfnExecuteCommandLists = + driverDdiTable.coreDdiTable.CommandQueue.pfnExecuteCommandLists = [](ze_command_queue_handle_t hCommandQueue, uint32_t numCommandLists, ze_command_list_handle_t *phCommandLists, ze_fence_handle_t hFence) { return ZE_RESULT_SUCCESS; }; @@ -67,7 +67,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandQueueExecuteCommandListsTraci TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandQueueSynchronizeTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.CommandQueue.pfnSynchronize = + driverDdiTable.coreDdiTable.CommandQueue.pfnSynchronize = [](ze_command_queue_handle_t hCommandQueue, uint64_t timeout) { return ZE_RESULT_SUCCESS; }; uint64_t timeout = 100; diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_copy_api_tracing.cpp b/level_zero/core/test/unit_tests/sources/tracing/test_copy_api_tracing.cpp index f0353143f5..747eba1a1e 100644 --- a/level_zero/core/test/unit_tests/sources/tracing/test_copy_api_tracing.cpp +++ b/level_zero/core/test/unit_tests/sources/tracing/test_copy_api_tracing.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,7 +13,7 @@ namespace ult { TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendMemoryCopyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.CommandList.pfnAppendMemoryCopy = + driverDdiTable.coreDdiTable.CommandList.pfnAppendMemoryCopy = [](ze_command_list_handle_t hCommandList, void *dstptr, const void *srcptr, @@ -41,7 +41,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendMemoryCopyTracingWr TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendMemoryFillTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.CommandList.pfnAppendMemoryFill = + driverDdiTable.coreDdiTable.CommandList.pfnAppendMemoryFill = [](ze_command_list_handle_t hCommandList, void *ptr, const void *pattern, @@ -69,7 +69,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendMemoryFillTracingWr TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendMemoryCopyRegionTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.CommandList.pfnAppendMemoryCopyRegion = + driverDdiTable.coreDdiTable.CommandList.pfnAppendMemoryCopyRegion = [](ze_command_list_handle_t hCommandList, void *dstptr, const ze_copy_region_t *dstRegion, @@ -116,7 +116,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendMemoryCopyRegionTra TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendImageCopyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.CommandList.pfnAppendImageCopy = + driverDdiTable.coreDdiTable.CommandList.pfnAppendImageCopy = [](ze_command_list_handle_t hCommandList, ze_image_handle_t hDstImage, ze_image_handle_t hSrcImage, @@ -142,7 +142,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendImageCopyTracingWra TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendImageCopyRegionTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.CommandList.pfnAppendImageCopyRegion = + driverDdiTable.coreDdiTable.CommandList.pfnAppendImageCopyRegion = [](ze_command_list_handle_t hCommandList, ze_image_handle_t hDstImage, ze_image_handle_t hSrcImage, @@ -170,7 +170,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendImageCopyRegionTrac TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendImageCopyToMemoryTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.CommandList.pfnAppendImageCopyToMemory = + driverDdiTable.coreDdiTable.CommandList.pfnAppendImageCopyToMemory = [](ze_command_list_handle_t hCommandList, void *dstptr, ze_image_handle_t hSrcImage, @@ -197,7 +197,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendImageCopyToMemoryTr TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendImageCopyFromMemoryTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.CommandList.pfnAppendImageCopyFromMemory = + driverDdiTable.coreDdiTable.CommandList.pfnAppendImageCopyFromMemory = [](ze_command_list_handle_t hCommandList, ze_image_handle_t hDstImage, const void *srcptr, @@ -224,7 +224,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendImageCopyFromMemory TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendMemAdviseTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.CommandList.pfnAppendMemAdvise = + driverDdiTable.coreDdiTable.CommandList.pfnAppendMemAdvise = [](ze_command_list_handle_t hCommandList, ze_device_handle_t hDevice, const void *ptr, @@ -249,7 +249,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendMemAdviseTracingWra TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendMemoryCopyFromContextTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.CommandList.pfnAppendMemoryCopyFromContext = + driverDdiTable.coreDdiTable.CommandList.pfnAppendMemoryCopyFromContext = [](ze_command_list_handle_t hCommandList, void *dstptr, ze_context_handle_t hContextSrc, diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_core_api_tracing.cpp b/level_zero/core/test/unit_tests/sources/tracing/test_core_api_tracing.cpp index 852ffb633a..10f9fe3614 100644 --- a/level_zero/core/test/unit_tests/sources/tracing/test_core_api_tracing.cpp +++ b/level_zero/core/test/unit_tests/sources/tracing/test_core_api_tracing.cpp @@ -204,7 +204,7 @@ TEST_F(ZeApiTracingCoreTests, WhenCallingTracerWrapperWithOnePrologAndNoEpilogWi std::vector> prologCallbacks; std::vector> epilogCallbacks; APITracerCallbackStateImp prologCallback; - prologCallback.current_api_callback = prologCbs.CommandList.pfnCloseCb; + prologCallback.currentApiCallback = prologCbs.CommandList.pfnCloseCb; prologCallback.pUserData = &userData; prologCallbacks.push_back(prologCallback); ze_pfnCommandListCloseCb_t apiOrdinal = {}; @@ -231,8 +231,8 @@ TEST_F(ZeApiTracingCoreTests, WhenCallingTracerWrapperWithOneSetOfPrologEpilogsW std::vector> epilogCallbacks; APITracerCallbackStateImp prologCallback; APITracerCallbackStateImp epilogCallback; - prologCallback.current_api_callback = prologCbs.CommandList.pfnCloseCb; - epilogCallback.current_api_callback = epilogCbs.CommandList.pfnCloseCb; + prologCallback.currentApiCallback = prologCbs.CommandList.pfnCloseCb; + epilogCallback.currentApiCallback = epilogCbs.CommandList.pfnCloseCb; prologCallback.pUserData = &userData; epilogCallback.pUserData = &userData; prologCallbacks.push_back(prologCallback); @@ -261,8 +261,8 @@ TEST_F(ZeApiTracingCoreTests, WhenCallingTracerWrapperWithOneSetOfPrologEpilogsW std::vector> epilogCallbacks; APITracerCallbackStateImp prologCallback; APITracerCallbackStateImp epilogCallback; - prologCallback.current_api_callback = prologCbs.CommandList.pfnCloseCb; - epilogCallback.current_api_callback = epilogCbs.CommandList.pfnCloseCb; + prologCallback.currentApiCallback = prologCbs.CommandList.pfnCloseCb; + epilogCallback.currentApiCallback = epilogCbs.CommandList.pfnCloseCb; prologCallback.pUserData = &userData; epilogCallback.pUserData = &userData; prologCallbacks.push_back(prologCallback); @@ -290,8 +290,8 @@ TEST_F(ZeApiTracingCoreTests, WhenCallingTracerWrapperWithOneSetOfPrologEpilogsW std::vector> epilogCallbacks; APITracerCallbackStateImp prologCallback; APITracerCallbackStateImp epilogCallback; - prologCallback.current_api_callback = prologCbs.CommandList.pfnCloseCb; - epilogCallback.current_api_callback = epilogCbs.CommandList.pfnCloseCb; + prologCallback.currentApiCallback = prologCbs.CommandList.pfnCloseCb; + epilogCallback.currentApiCallback = epilogCbs.CommandList.pfnCloseCb; prologCallback.pUserData = nullptr; epilogCallback.pUserData = nullptr; prologCallbacks.push_back(prologCallback); @@ -320,8 +320,8 @@ TEST_F(ZeApiTracingCoreTests, WhenCallingTracerWrapperWithOneSetOfPrologEpilogsW std::vector> epilogCallbacks; APITracerCallbackStateImp prologCallback; APITracerCallbackStateImp epilogCallback; - prologCallback.current_api_callback = prologCbs.CommandList.pfnCloseCb; - epilogCallback.current_api_callback = epilogCbs.CommandList.pfnCloseCb; + prologCallback.currentApiCallback = prologCbs.CommandList.pfnCloseCb; + epilogCallback.currentApiCallback = epilogCbs.CommandList.pfnCloseCb; prologCallback.pUserData = &userData; epilogCallback.pUserData = &userData; prologCallbacks.push_back(prologCallback); diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_device_api_tracing.cpp b/level_zero/core/test/unit_tests/sources/tracing/test_device_api_tracing.cpp index 1e81d76f48..3f97c62b3a 100644 --- a/level_zero/core/test/unit_tests/sources/tracing/test_device_api_tracing.cpp +++ b/level_zero/core/test/unit_tests/sources/tracing/test_device_api_tracing.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,7 +12,7 @@ namespace ult { TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Device.pfnGet = + driverDdiTable.coreDdiTable.Device.pfnGet = [](ze_driver_handle_t hDriver, uint32_t *pCount, ze_device_handle_t *phDevices) { return ZE_RESULT_SUCCESS; }; prologCbs.Device.pfnGetCb = genericPrologCallbackPtr; @@ -27,7 +27,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetTracingWrapperWithOneSetOfP TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Device.pfnGetProperties = + driverDdiTable.coreDdiTable.Device.pfnGetProperties = [](ze_device_handle_t hDevice, ze_device_properties_t *pDeviceProperties) { return ZE_RESULT_SUCCESS; }; prologCbs.Device.pfnGetPropertiesCb = genericPrologCallbackPtr; @@ -42,7 +42,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetPropertiesTracingWrapperWit TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetComputePropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Device.pfnGetComputeProperties = + driverDdiTable.coreDdiTable.Device.pfnGetComputeProperties = [](ze_device_handle_t hDevice, ze_device_compute_properties_t *pComputeProperties) { return ZE_RESULT_SUCCESS; }; prologCbs.Device.pfnGetComputePropertiesCb = genericPrologCallbackPtr; @@ -57,7 +57,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetComputePropertiesTracingWra TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetMemoryPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Device.pfnGetMemoryProperties = + driverDdiTable.coreDdiTable.Device.pfnGetMemoryProperties = [](ze_device_handle_t hDevice, uint32_t *pCount, ze_device_memory_properties_t *pMemProperties) { return ZE_RESULT_SUCCESS; }; prologCbs.Device.pfnGetMemoryPropertiesCb = genericPrologCallbackPtr; @@ -72,7 +72,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetMemoryPropertiesTracingWrap TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetCachePropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Device.pfnGetCacheProperties = + driverDdiTable.coreDdiTable.Device.pfnGetCacheProperties = [](ze_device_handle_t hDevice, uint32_t *pCount, ze_device_cache_properties_t *pCacheProperties) { return ZE_RESULT_SUCCESS; }; @@ -89,7 +89,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetCachePropertiesTracingWrapp TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetImagePropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Device.pfnGetImageProperties = + driverDdiTable.coreDdiTable.Device.pfnGetImageProperties = [](ze_device_handle_t hDevice, ze_device_image_properties_t *pImageProperties) { return ZE_RESULT_SUCCESS; }; @@ -105,7 +105,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetImagePropertiesTracingWrapp TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetSubDevicesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Device.pfnGetSubDevices = + driverDdiTable.coreDdiTable.Device.pfnGetSubDevices = [](ze_device_handle_t hDevice, uint32_t *pCount, ze_device_handle_t *phSubdevices) { return ZE_RESULT_SUCCESS; }; @@ -124,7 +124,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetSubDevicesTracingWrapperWit TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetP2PPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Device.pfnGetP2PProperties = + driverDdiTable.coreDdiTable.Device.pfnGetP2PProperties = [](ze_device_handle_t hDevice, ze_device_handle_t hPeerDevice, ze_device_p2p_properties_t *pP2PProperties) { return ZE_RESULT_SUCCESS; }; @@ -143,7 +143,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetP2PPropertiesTracingWrapper TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceCanAccessPeerTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Device.pfnCanAccessPeer = + driverDdiTable.coreDdiTable.Device.pfnCanAccessPeer = [](ze_device_handle_t hDevice, ze_device_handle_t hPeerDevice, ze_bool_t *value) { return ZE_RESULT_SUCCESS; }; @@ -162,7 +162,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceCanAccessPeerTracingWrapperWit TEST_F(ZeApiTracingRuntimeTests, WhenCallingKernelSetCacheConfigTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Kernel.pfnSetCacheConfig = + driverDdiTable.coreDdiTable.Kernel.pfnSetCacheConfig = [](ze_kernel_handle_t hKernel, ze_cache_config_flags_t flags) { return ZE_RESULT_SUCCESS; }; @@ -180,7 +180,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingKernelSetCacheConfigTracingWrapperWi TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetModulePropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Device.pfnGetModuleProperties = + driverDdiTable.coreDdiTable.Device.pfnGetModuleProperties = [](ze_device_handle_t hDevice, ze_device_module_properties_t *pModuleProperties) { return ZE_RESULT_SUCCESS; }; @@ -196,7 +196,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetModulePropertiesTracingWrap TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetMemoryAccessPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Device.pfnGetMemoryAccessProperties = + driverDdiTable.coreDdiTable.Device.pfnGetMemoryAccessProperties = [](ze_device_handle_t hDevice, ze_device_memory_access_properties_t *pMemAccessProperties) { return ZE_RESULT_SUCCESS; }; @@ -212,7 +212,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetMemoryAccessPropertiesTraci TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetCommandQueueGroupPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Device.pfnGetCommandQueueGroupProperties = + driverDdiTable.coreDdiTable.Device.pfnGetCommandQueueGroupProperties = [](ze_device_handle_t hDevice, uint32_t *pCount, ze_command_queue_group_properties_t *pCommandQueueGroupProperties) { return ZE_RESULT_SUCCESS; }; prologCbs.Device.pfnGetCommandQueueGroupPropertiesCb = genericPrologCallbackPtr; @@ -227,7 +227,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetCommandQueueGroupProperties TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetExternalMemoryPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Device.pfnGetExternalMemoryProperties = + driverDdiTable.coreDdiTable.Device.pfnGetExternalMemoryProperties = [](ze_device_handle_t hDevice, ze_device_external_memory_properties_t *pExternalMemoryProperties) { return ZE_RESULT_SUCCESS; }; prologCbs.Device.pfnGetExternalMemoryPropertiesCb = genericPrologCallbackPtr; @@ -242,7 +242,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetExternalMemoryPropertiesTra TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetStatusTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Device.pfnGetStatus = + driverDdiTable.coreDdiTable.Device.pfnGetStatus = [](ze_device_handle_t hDevice) { return ZE_RESULT_SUCCESS; }; prologCbs.Device.pfnGetStatusCb = genericPrologCallbackPtr; diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_driver_api_tracing.cpp b/level_zero/core/test/unit_tests/sources/tracing/test_driver_api_tracing.cpp index 89f9e226bd..04959ffb6e 100644 --- a/level_zero/core/test/unit_tests/sources/tracing/test_driver_api_tracing.cpp +++ b/level_zero/core/test/unit_tests/sources/tracing/test_driver_api_tracing.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,7 +12,7 @@ namespace ult { TEST_F(ZeApiTracingRuntimeTests, WhenCallingzeDriverGetTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Driver.pfnGet = + driverDdiTable.coreDdiTable.Driver.pfnGet = [](uint32_t *pCount, ze_driver_handle_t *phDrivers) { return ZE_RESULT_SUCCESS; }; prologCbs.Driver.pfnGetCb = genericPrologCallbackPtr; @@ -27,7 +27,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingzeDriverGetTracingWrapperWithOneSetO TEST_F(ZeApiTracingRuntimeTests, WhenCallingzeDriverGetPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Driver.pfnGetProperties = + driverDdiTable.coreDdiTable.Driver.pfnGetProperties = [](ze_driver_handle_t hDriver, ze_driver_properties_t *properties) { return ZE_RESULT_SUCCESS; }; prologCbs.Device.pfnGetSubDevicesCb = genericPrologCallbackPtr; @@ -41,7 +41,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingzeDriverGetPropertiesTracingWrapperW TEST_F(ZeApiTracingRuntimeTests, WhenCallingzeDriverGetApiVersionTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Driver.pfnGetApiVersion = + driverDdiTable.coreDdiTable.Driver.pfnGetApiVersion = [](ze_driver_handle_t hDrivers, ze_api_version_t *version) { return ZE_RESULT_SUCCESS; }; prologCbs.Driver.pfnGetApiVersionCb = genericPrologCallbackPtr; @@ -56,7 +56,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingzeDriverGetApiVersionTracingWrapperW TEST_F(ZeApiTracingRuntimeTests, WhenCallingzeDriverGetIpcPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Driver.pfnGetIpcProperties = + driverDdiTable.coreDdiTable.Driver.pfnGetIpcProperties = [](ze_driver_handle_t hDrivers, ze_driver_ipc_properties_t *pIpcProperties) { return ZE_RESULT_SUCCESS; }; @@ -72,7 +72,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingzeDriverGetIpcPropertiesTracingWrapp TEST_F(ZeApiTracingRuntimeTests, WhenCallingzeDriverGetExtensionPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Driver.pfnGetExtensionProperties = + driverDdiTable.coreDdiTable.Driver.pfnGetExtensionProperties = [](ze_driver_handle_t hDrivers, uint32_t *pCount, ze_driver_extension_properties_t *pExtensionProperties) { return ZE_RESULT_SUCCESS; }; diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_event_api_multi_tracing.cpp b/level_zero/core/test/unit_tests/sources/tracing/test_event_api_multi_tracing.cpp index 4e2cca8ab8..6b596940c4 100644 --- a/level_zero/core/test/unit_tests/sources/tracing/test_event_api_multi_tracing.cpp +++ b/level_zero/core/test/unit_tests/sources/tracing/test_event_api_multi_tracing.cpp @@ -39,7 +39,7 @@ TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingEventCreateTracingW event_create_args.instanceData0 = generateRandomHandle(); event_create_args.instanceData3 = generateRandomHandle(); - driver_ddiTable.core_ddiTable.Event.pfnCreate = + driverDdiTable.coreDdiTable.Event.pfnCreate = [](ze_event_pool_handle_t hEventPool, const ze_event_desc_t *desc, ze_event_handle_t *phEvent) { EXPECT_EQ(event_create_args.hEventPool1, hEventPool); EXPECT_EQ(&event_create_args.desc1, desc); @@ -271,7 +271,7 @@ TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingEventDestroyTracing event_destroy_args.instanceData0 = generateRandomHandle(); event_destroy_args.instanceData3 = generateRandomHandle(); - driver_ddiTable.core_ddiTable.Event.pfnDestroy = + driverDdiTable.coreDdiTable.Event.pfnDestroy = [](ze_event_handle_t hEvent) { EXPECT_EQ(event_destroy_args.hEvent1, hEvent); return ZE_RESULT_SUCCESS; @@ -400,7 +400,7 @@ TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingEventHostSignalTrac event_host_signal_args.instanceData0 = generateRandomHandle(); event_host_signal_args.instanceData3 = generateRandomHandle(); - driver_ddiTable.core_ddiTable.Event.pfnHostSignal = + driverDdiTable.coreDdiTable.Event.pfnHostSignal = [](ze_event_handle_t hEvent) { EXPECT_EQ(event_host_signal_args.hEvent1, hEvent); return ZE_RESULT_SUCCESS; @@ -533,7 +533,7 @@ TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingEventHostSynchroniz event_host_synchronize_args.instanceData0 = generateRandomHandle(); event_host_synchronize_args.instanceData3 = generateRandomHandle(); - driver_ddiTable.core_ddiTable.Event.pfnHostSynchronize = + driverDdiTable.coreDdiTable.Event.pfnHostSynchronize = [](ze_event_handle_t hEvent, uint64_t timeout) { EXPECT_EQ(event_host_synchronize_args.hEvent1, hEvent); EXPECT_EQ(event_host_synchronize_args.timeout1, timeout); @@ -670,7 +670,7 @@ TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingEventQueryStatusTra event_query_status_args.instanceData0 = generateRandomHandle(); event_query_status_args.instanceData3 = generateRandomHandle(); - driver_ddiTable.core_ddiTable.Event.pfnQueryStatus = + driverDdiTable.coreDdiTable.Event.pfnQueryStatus = [](ze_event_handle_t hEvent) { EXPECT_EQ(event_query_status_args.hEvent1, hEvent); return ZE_RESULT_SUCCESS; @@ -799,7 +799,7 @@ TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingEventHostResetTraci event_reset_args.instanceData0 = generateRandomHandle(); event_reset_args.instanceData3 = generateRandomHandle(); - driver_ddiTable.core_ddiTable.Event.pfnHostReset = + driverDdiTable.coreDdiTable.Event.pfnHostReset = [](ze_event_handle_t hEvent) { EXPECT_EQ(event_reset_args.hEvent1, hEvent); return ZE_RESULT_SUCCESS; @@ -950,7 +950,7 @@ TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingEventPoolCreateTrac event_pool_create_args.instanceData0 = generateRandomHandle(); event_pool_create_args.instanceData3 = generateRandomHandle(); - driver_ddiTable.core_ddiTable.EventPool.pfnCreate = + driverDdiTable.coreDdiTable.EventPool.pfnCreate = [](ze_context_handle_t hContext, const ze_event_pool_desc_t *desc, uint32_t numDevices, ze_device_handle_t *phDevices, ze_event_pool_handle_t *phEventPool) { EXPECT_EQ(event_pool_create_args.hContext1, hContext); EXPECT_EQ(&event_pool_create_args.desc1, desc); @@ -1229,7 +1229,7 @@ TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingEventPoolDestroyTra event_pool_destroy_args.instanceData0 = generateRandomHandle(); event_pool_destroy_args.instanceData3 = generateRandomHandle(); - driver_ddiTable.core_ddiTable.EventPool.pfnDestroy = + driverDdiTable.coreDdiTable.EventPool.pfnDestroy = [](ze_event_pool_handle_t hEventPool) { EXPECT_EQ(event_pool_destroy_args.hEventPool1, hEventPool); return ZE_RESULT_SUCCESS; @@ -1380,7 +1380,7 @@ TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingEventPoolGetIpcHand event_pool_get_ipc_handle_args.instanceData0 = generateRandomHandle(); event_pool_get_ipc_handle_args.instanceData3 = generateRandomHandle(); - driver_ddiTable.core_ddiTable.EventPool.pfnGetIpcHandle = + driverDdiTable.coreDdiTable.EventPool.pfnGetIpcHandle = [](ze_event_pool_handle_t hEventPool, ze_ipc_event_pool_handle_t *phIpc) { EXPECT_EQ(event_pool_get_ipc_handle_args.hEventPool1, hEventPool); EXPECT_EQ(&event_pool_get_ipc_handle_args.hIpc1, phIpc); @@ -1546,7 +1546,7 @@ TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingEventPoolOpenIpcHan event_pool_open_ipc_handle_args.instanceData0 = generateRandomHandle(); event_pool_open_ipc_handle_args.instanceData3 = generateRandomHandle(); - driver_ddiTable.core_ddiTable.EventPool.pfnOpenIpcHandle = + driverDdiTable.coreDdiTable.EventPool.pfnOpenIpcHandle = [](ze_context_handle_t hContext, ze_ipc_event_pool_handle_t hIpc, ze_event_pool_handle_t *phEventPool) { EXPECT_EQ(event_pool_open_ipc_handle_args.hContext1, hContext); EXPECT_TRUE(eventPoolOpenIpcHandlesCompare(&event_pool_open_ipc_handle_args.hIpc1, &hIpc)); @@ -1781,7 +1781,7 @@ TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingEventPoolCloseIpcHa event_pool_close_ipc_handle_args.instanceData0 = generateRandomHandle(); event_pool_close_ipc_handle_args.instanceData3 = generateRandomHandle(); - driver_ddiTable.core_ddiTable.EventPool.pfnCloseIpcHandle = + driverDdiTable.coreDdiTable.EventPool.pfnCloseIpcHandle = [](ze_event_pool_handle_t hEventPool) { EXPECT_EQ(event_pool_close_ipc_handle_args.hEventPool1, hEventPool); return ZE_RESULT_SUCCESS; @@ -1916,7 +1916,7 @@ TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingCommandListAppendSi command_list_append_signal_event_args.instanceData0 = generateRandomHandle(); command_list_append_signal_event_args.instanceData3 = generateRandomHandle(); - driver_ddiTable.core_ddiTable.CommandList.pfnAppendSignalEvent = + driverDdiTable.coreDdiTable.CommandList.pfnAppendSignalEvent = [](ze_command_list_handle_t hCommandList, ze_event_handle_t hEvent) { EXPECT_EQ(command_list_append_signal_event_args.hCommandList1, hCommandList); EXPECT_EQ(command_list_append_signal_event_args.hEvent1, hEvent); @@ -2061,7 +2061,7 @@ TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingCommandListAppendWa command_list_append_wait_on_events_args.instanceData0 = generateRandomHandle(); command_list_append_wait_on_events_args.instanceData3 = generateRandomHandle(); - driver_ddiTable.core_ddiTable.CommandList.pfnAppendWaitOnEvents = + driverDdiTable.coreDdiTable.CommandList.pfnAppendWaitOnEvents = [](ze_command_list_handle_t hCommandList, uint32_t numEvents, ze_event_handle_t *phEvents) { EXPECT_EQ(command_list_append_wait_on_events_args.hCommandList1, hCommandList); EXPECT_EQ(numEvents, (uint32_t)NUM_COMMAND_LIST_APPEND_WAIT_ON_EVENTS_1); diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_event_api_tracing.cpp b/level_zero/core/test/unit_tests/sources/tracing/test_event_api_tracing.cpp index 4f5475bdde..145f7c6153 100644 --- a/level_zero/core/test/unit_tests/sources/tracing/test_event_api_tracing.cpp +++ b/level_zero/core/test/unit_tests/sources/tracing/test_event_api_tracing.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,7 +12,7 @@ namespace ult { TEST_F(ZeApiTracingRuntimeTests, WhenCallingEventCreateTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Event.pfnCreate = + driverDdiTable.coreDdiTable.Event.pfnCreate = [](ze_event_pool_handle_t hEventPool, const ze_event_desc_t *desc, ze_event_handle_t *phEvent) { return ZE_RESULT_SUCCESS; }; ze_event_handle_t event = {}; ze_event_desc_t desc = {}; @@ -29,7 +29,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingEventCreateTracingWrapperWithOneSetO TEST_F(ZeApiTracingRuntimeTests, WhenCallingEventDestroyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Event.pfnDestroy = + driverDdiTable.coreDdiTable.Event.pfnDestroy = [](ze_event_handle_t hEvent) { return ZE_RESULT_SUCCESS; }; prologCbs.Event.pfnDestroyCb = genericPrologCallbackPtr; @@ -44,7 +44,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingEventDestroyTracingWrapperWithOneSet TEST_F(ZeApiTracingRuntimeTests, WhenCallingEventHostSignalTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Event.pfnHostSignal = + driverDdiTable.coreDdiTable.Event.pfnHostSignal = [](ze_event_handle_t hEvent) { return ZE_RESULT_SUCCESS; }; prologCbs.Event.pfnHostSignalCb = genericPrologCallbackPtr; epilogCbs.Event.pfnHostSignalCb = genericEpilogCallbackPtr; @@ -58,7 +58,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingEventHostSignalTracingWrapperWithOne TEST_F(ZeApiTracingRuntimeTests, WhenCallingEventHostSynchronizeTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Event.pfnHostSynchronize = + driverDdiTable.coreDdiTable.Event.pfnHostSynchronize = [](ze_event_handle_t hEvent, uint64_t timeout) { return ZE_RESULT_SUCCESS; }; prologCbs.Event.pfnHostSynchronizeCb = genericPrologCallbackPtr; epilogCbs.Event.pfnHostSynchronizeCb = genericEpilogCallbackPtr; @@ -72,7 +72,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingEventHostSynchronizeTracingWrapperWi TEST_F(ZeApiTracingRuntimeTests, WhenCallingEventQueryStatusTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Event.pfnQueryStatus = + driverDdiTable.coreDdiTable.Event.pfnQueryStatus = [](ze_event_handle_t hEvent) { return ZE_RESULT_SUCCESS; }; prologCbs.Event.pfnQueryStatusCb = genericPrologCallbackPtr; epilogCbs.Event.pfnQueryStatusCb = genericEpilogCallbackPtr; @@ -86,7 +86,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingEventQueryStatusTracingWrapperWithOn TEST_F(ZeApiTracingRuntimeTests, WhenCallingEventHostResetTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Event.pfnHostReset = + driverDdiTable.coreDdiTable.Event.pfnHostReset = [](ze_event_handle_t hEvent) { return ZE_RESULT_SUCCESS; }; prologCbs.Event.pfnHostResetCb = genericPrologCallbackPtr; epilogCbs.Event.pfnHostResetCb = genericEpilogCallbackPtr; @@ -100,7 +100,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingEventHostResetTracingWrapperWithOneS TEST_F(ZeApiTracingRuntimeTests, WhenCallingEventPoolCreateTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.EventPool.pfnCreate = + driverDdiTable.coreDdiTable.EventPool.pfnCreate = [](ze_context_handle_t hContext, const ze_event_pool_desc_t *desc, uint32_t numDevices, @@ -118,7 +118,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingEventPoolCreateTracingWrapperWithOne TEST_F(ZeApiTracingRuntimeTests, WhenCallingEventPoolDestroyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.EventPool.pfnDestroy = + driverDdiTable.coreDdiTable.EventPool.pfnDestroy = [](ze_event_pool_handle_t hEventPool) { return ZE_RESULT_SUCCESS; }; prologCbs.EventPool.pfnDestroyCb = genericPrologCallbackPtr; epilogCbs.EventPool.pfnDestroyCb = genericEpilogCallbackPtr; @@ -132,7 +132,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingEventPoolDestroyTracingWrapperWithOn TEST_F(ZeApiTracingRuntimeTests, WhenCallingEventPoolGetIpcHandleTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.EventPool.pfnGetIpcHandle = + driverDdiTable.coreDdiTable.EventPool.pfnGetIpcHandle = [](ze_event_pool_handle_t hEventPool, ze_ipc_event_pool_handle_t *phIpc) { return ZE_RESULT_SUCCESS; }; ze_ipc_event_pool_handle_t phIpc; @@ -148,7 +148,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingEventPoolGetIpcHandleTracingWrapperW TEST_F(ZeApiTracingRuntimeTests, WhenCallingEventPoolOpenIpcHandleTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.EventPool.pfnOpenIpcHandle = + driverDdiTable.coreDdiTable.EventPool.pfnOpenIpcHandle = [](ze_context_handle_t hDriver, ze_ipc_event_pool_handle_t hIpc, ze_event_pool_handle_t *phEventPool) { return ZE_RESULT_SUCCESS; }; @@ -167,7 +167,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingEventPoolOpenIpcHandleTracingWrapper TEST_F(ZeApiTracingRuntimeTests, WhenCallingEventPoolCloseIpcHandleTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.EventPool.pfnCloseIpcHandle = + driverDdiTable.coreDdiTable.EventPool.pfnCloseIpcHandle = [](ze_event_pool_handle_t hEventPool) { return ZE_RESULT_SUCCESS; }; prologCbs.EventPool.pfnCloseIpcHandleCb = genericPrologCallbackPtr; epilogCbs.EventPool.pfnCloseIpcHandleCb = genericEpilogCallbackPtr; @@ -183,7 +183,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingEventPoolCloseIpcHandleTracingWrappe TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendSignalEventTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.CommandList.pfnAppendSignalEvent = + driverDdiTable.coreDdiTable.CommandList.pfnAppendSignalEvent = [](ze_command_list_handle_t hCommandList, ze_event_handle_t hEvent) { return ZE_RESULT_SUCCESS; }; prologCbs.CommandList.pfnAppendSignalEventCb = genericPrologCallbackPtr; epilogCbs.CommandList.pfnAppendSignalEventCb = genericEpilogCallbackPtr; @@ -197,7 +197,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendSignalEventTracingW TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendWaitOnEventsTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.CommandList.pfnAppendWaitOnEvents = + driverDdiTable.coreDdiTable.CommandList.pfnAppendWaitOnEvents = [](ze_command_list_handle_t hCommandList, uint32_t numEvents, ze_event_handle_t *phEvents) { return ZE_RESULT_SUCCESS; }; ze_event_handle_t phEvents = {}; @@ -214,7 +214,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendWaitOnEventsTracing TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendEventResetTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.CommandList.pfnAppendEventReset = + driverDdiTable.coreDdiTable.CommandList.pfnAppendEventReset = [](ze_command_list_handle_t hCommandList, ze_event_handle_t hEvent) { return ZE_RESULT_SUCCESS; }; prologCbs.CommandList.pfnAppendEventResetCb = genericPrologCallbackPtr; @@ -229,7 +229,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendEventResetTracingWr TEST_F(ZeApiTracingRuntimeTests, WhenCallingEventQueryKernelTimestampTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Event.pfnQueryKernelTimestamp = + driverDdiTable.coreDdiTable.Event.pfnQueryKernelTimestamp = [](ze_event_handle_t hEvent, ze_kernel_timestamp_result_t *dstptr) { return ZE_RESULT_SUCCESS; }; prologCbs.Event.pfnQueryKernelTimestampCb = genericPrologCallbackPtr; diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_fence_api_tracing.cpp b/level_zero/core/test/unit_tests/sources/tracing/test_fence_api_tracing.cpp index 1c17fede76..ca99204d1a 100644 --- a/level_zero/core/test/unit_tests/sources/tracing/test_fence_api_tracing.cpp +++ b/level_zero/core/test/unit_tests/sources/tracing/test_fence_api_tracing.cpp @@ -12,7 +12,7 @@ namespace ult { TEST_F(ZeApiTracingRuntimeTests, WhenCallingFenceCreateTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Fence.pfnCreate = + driverDdiTable.coreDdiTable.Fence.pfnCreate = [](ze_command_queue_handle_t hCommandQueue, const ze_fence_desc_t *desc, ze_fence_handle_t *phFence) { return ZE_RESULT_SUCCESS; }; ze_fence_handle_t fence = {}; ze_fence_desc_t desc = {}; @@ -29,7 +29,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingFenceCreateTracingWrapperWithOneSetO TEST_F(ZeApiTracingRuntimeTests, WhenCallingFenceDestroyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Fence.pfnDestroy = + driverDdiTable.coreDdiTable.Fence.pfnDestroy = [](ze_fence_handle_t hFence) { return ZE_RESULT_SUCCESS; }; prologCbs.Fence.pfnDestroyCb = genericPrologCallbackPtr; @@ -44,7 +44,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingFenceDestroyTracingWrapperWithOneSet TEST_F(ZeApiTracingRuntimeTests, WhenCallingFenceHostSynchronizeTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Fence.pfnHostSynchronize = + driverDdiTable.coreDdiTable.Fence.pfnHostSynchronize = [](ze_fence_handle_t hFence, uint64_t timeout) { return ZE_RESULT_SUCCESS; }; prologCbs.Fence.pfnHostSynchronizeCb = genericPrologCallbackPtr; epilogCbs.Fence.pfnHostSynchronizeCb = genericEpilogCallbackPtr; @@ -58,7 +58,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingFenceHostSynchronizeTracingWrapperWi TEST_F(ZeApiTracingRuntimeTests, WhenCallingFenceQueryStatusTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Fence.pfnQueryStatus = + driverDdiTable.coreDdiTable.Fence.pfnQueryStatus = [](ze_fence_handle_t hFence) { return ZE_RESULT_SUCCESS; }; prologCbs.Fence.pfnQueryStatusCb = genericPrologCallbackPtr; epilogCbs.Fence.pfnQueryStatusCb = genericEpilogCallbackPtr; @@ -72,7 +72,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingFenceQueryStatusTracingWrapperWithOn TEST_F(ZeApiTracingRuntimeTests, WhenCallingFenceResetTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Fence.pfnReset = + driverDdiTable.coreDdiTable.Fence.pfnReset = [](ze_fence_handle_t hFence) { return ZE_RESULT_SUCCESS; }; prologCbs.Fence.pfnResetCb = genericPrologCallbackPtr; epilogCbs.Fence.pfnResetCb = genericEpilogCallbackPtr; @@ -111,7 +111,7 @@ TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingFenceCreateTracingW fence_create_args.instanceData0 = generateRandomHandle(); fence_create_args.instanceData3 = generateRandomHandle(); - driver_ddiTable.core_ddiTable.Fence.pfnCreate = + driverDdiTable.coreDdiTable.Fence.pfnCreate = [](ze_command_queue_handle_t hCommandQueue, const ze_fence_desc_t *desc, ze_fence_handle_t *phFence) { EXPECT_EQ(fence_create_args.hCommandQueue1, hCommandQueue); EXPECT_EQ(&fence_create_args.desc1, desc); @@ -345,7 +345,7 @@ TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingFenceDestroyTracing fence_destroy_args.instanceData0 = generateRandomHandle(); fence_destroy_args.instanceData3 = generateRandomHandle(); - driver_ddiTable.core_ddiTable.Fence.pfnDestroy = + driverDdiTable.coreDdiTable.Fence.pfnDestroy = [](ze_fence_handle_t hFence) { EXPECT_EQ(fence_destroy_args.hFence1, hFence); return ZE_RESULT_SUCCESS; @@ -478,7 +478,7 @@ TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingFenceHostSynchroniz fence_host_synchronize_args.instanceData0 = generateRandomHandle(); fence_host_synchronize_args.instanceData3 = generateRandomHandle(); - driver_ddiTable.core_ddiTable.Fence.pfnHostSynchronize = + driverDdiTable.coreDdiTable.Fence.pfnHostSynchronize = [](ze_fence_handle_t hFence, uint64_t timeout) { EXPECT_EQ(fence_host_synchronize_args.hFence1, hFence); EXPECT_EQ(fence_host_synchronize_args.timeout1, timeout); @@ -615,7 +615,7 @@ TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingFenceQueryStatusTra fence_query_status_args.instanceData0 = generateRandomHandle(); fence_query_status_args.instanceData3 = generateRandomHandle(); - driver_ddiTable.core_ddiTable.Fence.pfnQueryStatus = + driverDdiTable.coreDdiTable.Fence.pfnQueryStatus = [](ze_fence_handle_t hFence) { EXPECT_EQ(fence_query_status_args.hFence1, hFence); return ZE_RESULT_SUCCESS; @@ -744,7 +744,7 @@ TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingFenceResetTracingWr fence_reset_args.instanceData0 = generateRandomHandle(); fence_reset_args.instanceData3 = generateRandomHandle(); - driver_ddiTable.core_ddiTable.Fence.pfnReset = + driverDdiTable.coreDdiTable.Fence.pfnReset = [](ze_fence_handle_t hFence) { EXPECT_EQ(fence_reset_args.hFence1, hFence); return ZE_RESULT_SUCCESS; diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_global_api_tracing.cpp b/level_zero/core/test/unit_tests/sources/tracing/test_global_api_tracing.cpp index d1a32b4d9f..7bd08fd1c3 100644 --- a/level_zero/core/test/unit_tests/sources/tracing/test_global_api_tracing.cpp +++ b/level_zero/core/test/unit_tests/sources/tracing/test_global_api_tracing.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,7 +12,7 @@ namespace ult { TEST_F(ZeApiTracingRuntimeTests, WhenCallingInitTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Global.pfnInit = [](ze_init_flags_t flags) { return ZE_RESULT_SUCCESS; }; + driverDdiTable.coreDdiTable.Global.pfnInit = [](ze_init_flags_t flags) { return ZE_RESULT_SUCCESS; }; prologCbs.Global.pfnInitCb = genericPrologCallbackPtr; epilogCbs.Global.pfnInitCb = genericEpilogCallbackPtr; diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_image_api_tracing.cpp b/level_zero/core/test/unit_tests/sources/tracing/test_image_api_tracing.cpp index 561beeb3d1..5b43e0c752 100644 --- a/level_zero/core/test/unit_tests/sources/tracing/test_image_api_tracing.cpp +++ b/level_zero/core/test/unit_tests/sources/tracing/test_image_api_tracing.cpp @@ -12,7 +12,7 @@ namespace ult { TEST_F(ZeApiTracingRuntimeTests, WhenCallingImageGetPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Image.pfnGetProperties = + driverDdiTable.coreDdiTable.Image.pfnGetProperties = [](ze_device_handle_t hDevice, const ze_image_desc_t *desc, ze_image_properties_t *pImageProperties) { return ZE_RESULT_SUCCESS; }; const ze_image_desc_t desc = {}; ze_image_properties_t pImageProperties = {}; @@ -29,7 +29,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingImageGetPropertiesTracingWrapperWith TEST_F(ZeApiTracingRuntimeTests, WhenCallingImageCreateTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Image.pfnCreate = + driverDdiTable.coreDdiTable.Image.pfnCreate = [](ze_context_handle_t hContext, ze_device_handle_t hDevice, const ze_image_desc_t *desc, ze_image_handle_t *phImage) { return ZE_RESULT_SUCCESS; }; const ze_image_desc_t desc = {}; ze_image_handle_t phImage = {}; @@ -46,7 +46,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingImageCreateTracingWrapperWithOneSetO TEST_F(ZeApiTracingRuntimeTests, WhenCallingImageDestroyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Image.pfnDestroy = + driverDdiTable.coreDdiTable.Image.pfnDestroy = [](ze_image_handle_t hImage) { return ZE_RESULT_SUCCESS; }; prologCbs.Image.pfnDestroyCb = genericPrologCallbackPtr; epilogCbs.Image.pfnDestroyCb = genericEpilogCallbackPtr; @@ -84,7 +84,7 @@ TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingImageGetPropertiesT ImageGetProperties_args.instanceData0 = generateRandomHandle(); ImageGetProperties_args.instanceData3 = generateRandomHandle(); - driver_ddiTable.core_ddiTable.Image.pfnGetProperties = + driverDdiTable.coreDdiTable.Image.pfnGetProperties = [](ze_device_handle_t hDevice, const ze_image_desc_t *desc, ze_image_properties_t *pImageProperties) { EXPECT_EQ(ImageGetProperties_args.hDevice1, hDevice); EXPECT_EQ(&ImageGetProperties_args.desc1, desc); @@ -240,7 +240,7 @@ TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingImageCreateTracingW ImageCreate_args.instanceData0 = generateRandomHandle(); ImageCreate_args.instanceData3 = generateRandomHandle(); - driver_ddiTable.core_ddiTable.Image.pfnCreate = + driverDdiTable.coreDdiTable.Image.pfnCreate = [](ze_context_handle_t hContext, ze_device_handle_t hDevice, const ze_image_desc_t *desc, ze_image_handle_t *phImage) { EXPECT_EQ(ImageCreate_args.hContext1, hContext); EXPECT_EQ(ImageCreate_args.hDevice1, hDevice); @@ -490,7 +490,7 @@ TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingImageDestroyTracing ImageDestroy_args.instanceData0 = generateRandomHandle(); ImageDestroy_args.instanceData3 = generateRandomHandle(); - driver_ddiTable.core_ddiTable.Image.pfnDestroy = + driverDdiTable.coreDdiTable.Image.pfnDestroy = [](ze_image_handle_t hImage) { EXPECT_EQ(ImageDestroy_args.hImage1, hImage); return ZE_RESULT_SUCCESS; diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_memory_api_tracing.cpp b/level_zero/core/test/unit_tests/sources/tracing/test_memory_api_tracing.cpp index 1f9c2d61ac..02919c0a15 100644 --- a/level_zero/core/test/unit_tests/sources/tracing/test_memory_api_tracing.cpp +++ b/level_zero/core/test/unit_tests/sources/tracing/test_memory_api_tracing.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,7 +12,7 @@ namespace ult { TEST_F(ZeApiTracingRuntimeTests, WhenCallingMemAllocSharedTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Mem.pfnAllocShared = + driverDdiTable.coreDdiTable.Mem.pfnAllocShared = [](ze_context_handle_t hContext, const ze_device_mem_alloc_desc_t *deviceDesc, const ze_host_mem_alloc_desc_t *hostDesc, size_t size, size_t alignment, ze_device_handle_t hDevice, void **pptr) { return ZE_RESULT_SUCCESS; }; ze_device_mem_alloc_desc_t deviceDesc = {}; @@ -33,7 +33,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingMemAllocSharedTracingWrapperWithOneS TEST_F(ZeApiTracingRuntimeTests, WhenCallingMemAllocDeviceTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Mem.pfnAllocDevice = + driverDdiTable.coreDdiTable.Mem.pfnAllocDevice = [](ze_context_handle_t hContext, const ze_device_mem_alloc_desc_t *deviceDesc, size_t size, size_t alignment, ze_device_handle_t hDevice, void **pptr) { return ZE_RESULT_SUCCESS; }; size_t size = 1024; @@ -52,7 +52,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingMemAllocDeviceTracingWrapperWithOneS } TEST_F(ZeApiTracingRuntimeTests, WhenCallingMemAllocHostTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { - driver_ddiTable.core_ddiTable.Mem.pfnAllocHost = + driverDdiTable.coreDdiTable.Mem.pfnAllocHost = [](ze_context_handle_t hContext, const ze_host_mem_alloc_desc_t *hostDesc, size_t size, size_t alignment, void **pptr) { return ZE_RESULT_SUCCESS; }; ze_result_t result = ZE_RESULT_SUCCESS; size_t size = 1024; @@ -71,7 +71,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingMemAllocHostTracingWrapperWithOneSet } TEST_F(ZeApiTracingRuntimeTests, WhenCallingMemFreeTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { - driver_ddiTable.core_ddiTable.Mem.pfnFree = + driverDdiTable.coreDdiTable.Mem.pfnFree = [](ze_context_handle_t hContext, void *ptr) { return ZE_RESULT_SUCCESS; }; ze_result_t result = ZE_RESULT_SUCCESS; @@ -86,7 +86,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingMemFreeTracingWrapperWithOneSetOfPro } TEST_F(ZeApiTracingRuntimeTests, WhenCallingMemGetAllocPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { - driver_ddiTable.core_ddiTable.Mem.pfnGetAllocProperties = + driverDdiTable.coreDdiTable.Mem.pfnGetAllocProperties = [](ze_context_handle_t hContext, const void *ptr, ze_memory_allocation_properties_t *pMemAllocProperties, ze_device_handle_t *phDevice) { return ZE_RESULT_SUCCESS; }; ze_result_t result = ZE_RESULT_SUCCESS; @@ -101,7 +101,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingMemGetAllocPropertiesTracingWrapperW } TEST_F(ZeApiTracingRuntimeTests, WhenCallingMemGetAddressRangeTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { - driver_ddiTable.core_ddiTable.Mem.pfnGetAddressRange = + driverDdiTable.coreDdiTable.Mem.pfnGetAddressRange = [](ze_context_handle_t hContext, const void *ptr, void **pBase, size_t *pSize) { return ZE_RESULT_SUCCESS; }; ze_result_t result = ZE_RESULT_SUCCESS; @@ -116,7 +116,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingMemGetAddressRangeTracingWrapperWith } TEST_F(ZeApiTracingRuntimeTests, WhenCallingMemGetIpcHandleTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { - driver_ddiTable.core_ddiTable.Mem.pfnGetIpcHandle = + driverDdiTable.coreDdiTable.Mem.pfnGetIpcHandle = [](ze_context_handle_t hContext, const void *ptr, ze_ipc_mem_handle_t *pIpcHandle) { return ZE_RESULT_SUCCESS; }; ze_result_t result = ZE_RESULT_SUCCESS; @@ -131,7 +131,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingMemGetIpcHandleTracingWrapperWithOne } TEST_F(ZeApiTracingRuntimeTests, WhenCallingMemOpenIpcHandleTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { - driver_ddiTable.core_ddiTable.Mem.pfnOpenIpcHandle = + driverDdiTable.coreDdiTable.Mem.pfnOpenIpcHandle = [](ze_context_handle_t hContext, ze_device_handle_t hDevice, ze_ipc_mem_handle_t handle, ze_ipc_memory_flags_t flags, void **pptr) { return ZE_RESULT_SUCCESS; }; ze_result_t result = ZE_RESULT_SUCCESS; @@ -148,7 +148,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingMemOpenIpcHandleTracingWrapperWithOn } TEST_F(ZeApiTracingRuntimeTests, WhenCallingMemCloseIpcHandleTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { - driver_ddiTable.core_ddiTable.Mem.pfnCloseIpcHandle = + driverDdiTable.coreDdiTable.Mem.pfnCloseIpcHandle = [](ze_context_handle_t hContext, const void *ptr) { return ZE_RESULT_SUCCESS; }; ze_result_t result = ZE_RESULT_SUCCESS; @@ -163,7 +163,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingMemCloseIpcHandleTracingWrapperWithO } TEST_F(ZeApiTracingRuntimeTests, WhenCallingPhysicalMemCreateTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { - driver_ddiTable.core_ddiTable.PhysicalMem.pfnCreate = + driverDdiTable.coreDdiTable.PhysicalMem.pfnCreate = [](ze_context_handle_t hContext, ze_device_handle_t hDevice, ze_physical_mem_desc_t *desc, ze_physical_mem_handle_t *phPhysicalMemory) { return ZE_RESULT_SUCCESS; }; ze_result_t result = ZE_RESULT_SUCCESS; @@ -179,7 +179,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingPhysicalMemCreateTracingWrapperWithO } TEST_F(ZeApiTracingRuntimeTests, WhenCallingPhysicalMemDestroyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { - driver_ddiTable.core_ddiTable.PhysicalMem.pfnDestroy = + driverDdiTable.coreDdiTable.PhysicalMem.pfnDestroy = [](ze_context_handle_t hContext, ze_physical_mem_handle_t hPhysicalMemory) { return ZE_RESULT_SUCCESS; }; ze_result_t result = ZE_RESULT_SUCCESS; @@ -195,7 +195,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingPhysicalMemDestroyTracingWrapperWith } TEST_F(ZeApiTracingRuntimeTests, WhenCallingVirtualMemFreeTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { - driver_ddiTable.core_ddiTable.VirtualMem.pfnFree = + driverDdiTable.coreDdiTable.VirtualMem.pfnFree = [](ze_context_handle_t hContext, const void *ptr, size_t size) { return ZE_RESULT_SUCCESS; }; ze_result_t result = ZE_RESULT_SUCCESS; @@ -211,7 +211,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingVirtualMemFreeTracingWrapperWithOneS } TEST_F(ZeApiTracingRuntimeTests, WhenCallingVirtualMemGetAccessAttributeTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { - driver_ddiTable.core_ddiTable.VirtualMem.pfnGetAccessAttribute = + driverDdiTable.coreDdiTable.VirtualMem.pfnGetAccessAttribute = [](ze_context_handle_t hContext, const void *ptr, size_t size, ze_memory_access_attribute_t *access, size_t *outSize) { return ZE_RESULT_SUCCESS; }; ze_result_t result = ZE_RESULT_SUCCESS; @@ -227,7 +227,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingVirtualMemGetAccessAttributeTracingW } TEST_F(ZeApiTracingRuntimeTests, WhenCallingVirtualMemMapTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { - driver_ddiTable.core_ddiTable.VirtualMem.pfnMap = + driverDdiTable.coreDdiTable.VirtualMem.pfnMap = [](ze_context_handle_t hContext, const void *ptr, size_t size, ze_physical_mem_handle_t hPhysicalMemory, size_t offset, ze_memory_access_attribute_t access) { return ZE_RESULT_SUCCESS; }; ze_result_t result = ZE_RESULT_SUCCESS; @@ -243,7 +243,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingVirtualMemMapTracingWrapperWithOneSe } TEST_F(ZeApiTracingRuntimeTests, WhenCallingVirtualMemQueryPageSizeTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { - driver_ddiTable.core_ddiTable.VirtualMem.pfnQueryPageSize = + driverDdiTable.coreDdiTable.VirtualMem.pfnQueryPageSize = [](ze_context_handle_t hContext, ze_device_handle_t hDevice, size_t size, size_t *pagesize) { return ZE_RESULT_SUCCESS; }; ze_result_t result = ZE_RESULT_SUCCESS; @@ -259,7 +259,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingVirtualMemQueryPageSizeTracingWrappe } TEST_F(ZeApiTracingRuntimeTests, WhenCallingVirtualMemReserveTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { - driver_ddiTable.core_ddiTable.VirtualMem.pfnReserve = + driverDdiTable.coreDdiTable.VirtualMem.pfnReserve = [](ze_context_handle_t hContext, const void *pStart, size_t size, void **pptr) { return ZE_RESULT_SUCCESS; }; ze_result_t result = ZE_RESULT_SUCCESS; @@ -275,7 +275,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingVirtualMemReserveTracingWrapperWithO } TEST_F(ZeApiTracingRuntimeTests, WhenCallingVirtualMemSetAccessAttributeTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { - driver_ddiTable.core_ddiTable.VirtualMem.pfnSetAccessAttribute = + driverDdiTable.coreDdiTable.VirtualMem.pfnSetAccessAttribute = [](ze_context_handle_t hContext, const void *ptr, size_t size, ze_memory_access_attribute_t access) { return ZE_RESULT_SUCCESS; }; ze_result_t result = ZE_RESULT_SUCCESS; @@ -291,7 +291,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingVirtualMemSetAccessAttributeTracingW } TEST_F(ZeApiTracingRuntimeTests, WhenCallingVirtualMemUnmapTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { - driver_ddiTable.core_ddiTable.VirtualMem.pfnUnmap = + driverDdiTable.coreDdiTable.VirtualMem.pfnUnmap = [](ze_context_handle_t hContext, const void *ptr, size_t size) { return ZE_RESULT_SUCCESS; }; ze_result_t result = ZE_RESULT_SUCCESS; diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_module_api_multi_tracing.cpp b/level_zero/core/test/unit_tests/sources/tracing/test_module_api_multi_tracing.cpp index e6783c8bf0..375ba19737 100644 --- a/level_zero/core/test/unit_tests/sources/tracing/test_module_api_multi_tracing.cpp +++ b/level_zero/core/test/unit_tests/sources/tracing/test_module_api_multi_tracing.cpp @@ -67,7 +67,7 @@ TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingModuleCreateTracing module_create_args.instanceData0 = generateRandomHandle(); module_create_args.instanceData3 = generateRandomHandle(); - driver_ddiTable.core_ddiTable.Module.pfnCreate = + driverDdiTable.coreDdiTable.Module.pfnCreate = [](ze_context_handle_t hContext, ze_device_handle_t hDevice, const ze_module_desc_t *desc, ze_module_handle_t *phModule, ze_module_build_log_handle_t *phBuildLog) { EXPECT_EQ(module_create_args.hContext1, hContext); EXPECT_EQ(module_create_args.hDevice1, hDevice); @@ -398,7 +398,7 @@ TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingModuleDestroyTracin module_destroy_args.instanceData0 = generateRandomHandle(); module_destroy_args.instanceData3 = generateRandomHandle(); - driver_ddiTable.core_ddiTable.Module.pfnDestroy = + driverDdiTable.coreDdiTable.Module.pfnDestroy = [](ze_module_handle_t hModule) { EXPECT_EQ(module_destroy_args.hModule1, hModule); return ZE_RESULT_SUCCESS; @@ -553,7 +553,7 @@ TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingModuleGetNativeBina module_get_native_binary_args.instanceData0 = generateRandomHandle(); module_get_native_binary_args.instanceData3 = generateRandomHandle(); - driver_ddiTable.core_ddiTable.Module.pfnGetNativeBinary = + driverDdiTable.coreDdiTable.Module.pfnGetNativeBinary = [](ze_module_handle_t hModule, size_t *pSize, uint8_t *pModuleNativeBinary) { EXPECT_EQ(module_get_native_binary_args.hModule1, hModule); EXPECT_EQ(&module_get_native_binary_args.size1, pSize); diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_module_api_tracing.cpp b/level_zero/core/test/unit_tests/sources/tracing/test_module_api_tracing.cpp index 5f07153f23..d8a42865ea 100644 --- a/level_zero/core/test/unit_tests/sources/tracing/test_module_api_tracing.cpp +++ b/level_zero/core/test/unit_tests/sources/tracing/test_module_api_tracing.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,7 +12,7 @@ namespace ult { TEST_F(ZeApiTracingRuntimeTests, WhenCallingModuleCreateTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Module.pfnCreate = + driverDdiTable.coreDdiTable.Module.pfnCreate = [](ze_context_handle_t hContext, ze_device_handle_t hDevice, const ze_module_desc_t *pDesc, ze_module_handle_t *phModule, ze_module_build_log_handle_t *phBuildLog) { return ZE_RESULT_SUCCESS; }; ze_module_desc_t desc = {}; ze_module_handle_t phModule = {}; @@ -30,7 +30,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingModuleCreateTracingWrapperWithOneSet TEST_F(ZeApiTracingRuntimeTests, WhenCallingModuleDestroyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Module.pfnDestroy = + driverDdiTable.coreDdiTable.Module.pfnDestroy = [](ze_module_handle_t hModule) { return ZE_RESULT_SUCCESS; }; prologCbs.Module.pfnDestroyCb = genericPrologCallbackPtr; @@ -45,7 +45,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingModuleDestroyTracingWrapperWithOneSe TEST_F(ZeApiTracingRuntimeTests, WhenCallingModuleBuildLogDestroyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.ModuleBuildLog.pfnDestroy = + driverDdiTable.coreDdiTable.ModuleBuildLog.pfnDestroy = [](ze_module_build_log_handle_t hModuleBuildLog) { return ZE_RESULT_SUCCESS; }; prologCbs.ModuleBuildLog.pfnDestroyCb = genericPrologCallbackPtr; @@ -60,7 +60,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingModuleBuildLogDestroyTracingWrapperW TEST_F(ZeApiTracingRuntimeTests, WhenCallingModuleBuildLogGetStringTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.ModuleBuildLog.pfnGetString = + driverDdiTable.coreDdiTable.ModuleBuildLog.pfnGetString = [](ze_module_build_log_handle_t hModuleBuildLog, size_t *pSize, char *pBuildLog) { return ZE_RESULT_SUCCESS; }; size_t pSize = {}; @@ -78,7 +78,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingModuleBuildLogGetStringTracingWrappe TEST_F(ZeApiTracingRuntimeTests, WhenCallingModuleGetNativeBinaryTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Module.pfnGetNativeBinary = + driverDdiTable.coreDdiTable.Module.pfnGetNativeBinary = [](ze_module_handle_t hModule, size_t *pSize, uint8_t *pModuleNativeBinary) { return ZE_RESULT_SUCCESS; }; size_t pSize = {}; uint8_t pModuleNativeBinary = {}; @@ -95,7 +95,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingModuleGetNativeBinaryTracingWrapperW TEST_F(ZeApiTracingRuntimeTests, WhenCallingModuleGetGlobalPointerTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Module.pfnGetGlobalPointer = + driverDdiTable.coreDdiTable.Module.pfnGetGlobalPointer = [](ze_module_handle_t hModule, const char *pGlobalName, size_t *pSize, void **pPtr) { return ZE_RESULT_SUCCESS; }; const char pGlobalName = {}; size_t size; @@ -113,7 +113,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingModuleGetGlobalPointerTracingWrapper TEST_F(ZeApiTracingRuntimeTests, WhenCallingKernelCreateTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Kernel.pfnCreate = + driverDdiTable.coreDdiTable.Kernel.pfnCreate = [](ze_module_handle_t hModule, const ze_kernel_desc_t *pDesc, ze_kernel_handle_t *phKernel) { return ZE_RESULT_SUCCESS; }; const ze_kernel_desc_t desc = {}; ze_kernel_handle_t phKernel = {}; @@ -130,7 +130,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingKernelCreateTracingWrapperWithOneSet TEST_F(ZeApiTracingRuntimeTests, WhenCallingKernelDestroyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Kernel.pfnDestroy = + driverDdiTable.coreDdiTable.Kernel.pfnDestroy = [](ze_kernel_handle_t hKernel) { return ZE_RESULT_SUCCESS; }; prologCbs.Kernel.pfnDestroyCb = genericPrologCallbackPtr; @@ -145,7 +145,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingKernelDestroyTracingWrapperWithOneSe TEST_F(ZeApiTracingRuntimeTests, WhenCallingModuleGetFunctionPointerTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Module.pfnGetFunctionPointer = + driverDdiTable.coreDdiTable.Module.pfnGetFunctionPointer = [](ze_module_handle_t hModule, const char *pKernelName, void **pfnFunction) { return ZE_RESULT_SUCCESS; }; const char pKernelName = {}; void *pfnFunction = nullptr; @@ -162,7 +162,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingModuleGetFunctionPointerTracingWrapp TEST_F(ZeApiTracingRuntimeTests, WhenCallingKernelSetGroupSizeTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Kernel.pfnSetGroupSize = + driverDdiTable.coreDdiTable.Kernel.pfnSetGroupSize = [](ze_kernel_handle_t hKernel, uint32_t groupSizeX, uint32_t groupSizeY, uint32_t groupSizeZ) { return ZE_RESULT_SUCCESS; }; uint32_t groupSizeX = {}; uint32_t groupSizeY = {}; @@ -180,7 +180,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingKernelSetGroupSizeTracingWrapperWith TEST_F(ZeApiTracingRuntimeTests, WhenCallingKernelSuggestGroupSizeTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Kernel.pfnSuggestGroupSize = + driverDdiTable.coreDdiTable.Kernel.pfnSuggestGroupSize = [](ze_kernel_handle_t hKernel, uint32_t globalSizeX, uint32_t globalSizeY, uint32_t globalSizeZ, uint32_t *groupSizeX, uint32_t *groupSizeY, uint32_t *groupSizeZ) { return ZE_RESULT_SUCCESS; }; uint32_t globalSizeX = {}; uint32_t globalSizeY = {}; @@ -201,7 +201,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingKernelSuggestGroupSizeTracingWrapper TEST_F(ZeApiTracingRuntimeTests, WhenCallingKernelSetArgumentValueTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Kernel.pfnSetArgumentValue = + driverDdiTable.coreDdiTable.Kernel.pfnSetArgumentValue = [](ze_kernel_handle_t hKernel, uint32_t argIndex, size_t argSize, const void *pArgValue) { return ZE_RESULT_SUCCESS; }; uint32_t argIndex = {}; size_t argSize = {}; @@ -219,7 +219,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingKernelSetArgumentValueTracingWrapper TEST_F(ZeApiTracingRuntimeTests, WhenCallingKernelGetPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Kernel.pfnGetProperties = + driverDdiTable.coreDdiTable.Kernel.pfnGetProperties = [](ze_kernel_handle_t hKernel, ze_kernel_properties_t *pKernelProperties) { return ZE_RESULT_SUCCESS; }; prologCbs.Kernel.pfnGetPropertiesCb = genericPrologCallbackPtr; @@ -234,7 +234,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingKernelGetPropertiesTracingWrapperWit TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendLaunchKernelTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.CommandList.pfnAppendLaunchKernel = + driverDdiTable.coreDdiTable.CommandList.pfnAppendLaunchKernel = [](ze_command_list_handle_t hCommandList, ze_kernel_handle_t hKernel, const ze_group_count_t *pLaunchFuncArgs, ze_event_handle_t hSignalEvent, uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) { return ZE_RESULT_SUCCESS; }; const ze_group_count_t pLaunchFuncArgs = {}; @@ -254,7 +254,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendLaunchKernelTracing TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendLaunchKernelIndirectTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.CommandList.pfnAppendLaunchKernelIndirect = + driverDdiTable.coreDdiTable.CommandList.pfnAppendLaunchKernelIndirect = [](ze_command_list_handle_t hCommandList, ze_kernel_handle_t hKernel, const ze_group_count_t *pLaunchArgumentsBuffer, ze_event_handle_t hSignalEvent, uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) { return ZE_RESULT_SUCCESS; }; const ze_group_count_t pLaunchArgumentsBuffer = {}; @@ -274,7 +274,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendLaunchKernelIndirec TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendLaunchMultipleKernelsIndirectTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.CommandList.pfnAppendLaunchMultipleKernelsIndirect = + driverDdiTable.coreDdiTable.CommandList.pfnAppendLaunchMultipleKernelsIndirect = [](ze_command_list_handle_t hCommandList, uint32_t numKernels, ze_kernel_handle_t *phKernels, const uint32_t *pNumLaunchArguments, const ze_group_count_t *pLaunchArgumentsBuffer, ze_event_handle_t hSignalEvent, uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) { return ZE_RESULT_SUCCESS; }; @@ -298,7 +298,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendLaunchMultipleKerne TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendLaunchCooperativeKernelTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.CommandList.pfnAppendLaunchCooperativeKernel = + driverDdiTable.coreDdiTable.CommandList.pfnAppendLaunchCooperativeKernel = [](ze_command_list_handle_t hCommandList, ze_kernel_handle_t hKernel, const ze_group_count_t *pLaunchFuncArgs, ze_event_handle_t hSignalEvent, uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) { return ZE_RESULT_SUCCESS; }; prologCbs.CommandList.pfnAppendLaunchCooperativeKernelCb = genericPrologCallbackPtr; @@ -313,7 +313,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendLaunchCooperativeKe TEST_F(ZeApiTracingRuntimeTests, WhenCallingModuleGetKernelNamesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Module.pfnGetKernelNames = + driverDdiTable.coreDdiTable.Module.pfnGetKernelNames = [](ze_module_handle_t hDevice, uint32_t *pCount, const char **pNames) { return ZE_RESULT_SUCCESS; }; prologCbs.Module.pfnGetKernelNamesCb = genericPrologCallbackPtr; @@ -328,7 +328,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingModuleGetKernelNamesTracingWrapperWi TEST_F(ZeApiTracingRuntimeTests, WhenCallingKernelSuggestMaxCooperativeGroupCountTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Kernel.pfnSuggestMaxCooperativeGroupCount = + driverDdiTable.coreDdiTable.Kernel.pfnSuggestMaxCooperativeGroupCount = [](ze_kernel_handle_t hKernel, uint32_t *totalGroupCount) { return ZE_RESULT_SUCCESS; }; prologCbs.Kernel.pfnSuggestMaxCooperativeGroupCountCb = genericPrologCallbackPtr; @@ -343,7 +343,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingKernelSuggestMaxCooperativeGroupCoun TEST_F(ZeApiTracingRuntimeTests, WhenCallingKernelGetIndirectAccessTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Kernel.pfnGetIndirectAccess = + driverDdiTable.coreDdiTable.Kernel.pfnGetIndirectAccess = [](ze_kernel_handle_t hKernel, ze_kernel_indirect_access_flags_t *pFlags) { return ZE_RESULT_SUCCESS; }; prologCbs.Kernel.pfnGetIndirectAccessCb = genericPrologCallbackPtr; @@ -358,7 +358,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingKernelGetIndirectAccessTracingWrappe TEST_F(ZeApiTracingRuntimeTests, WhenCallingKernelGetNameTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Kernel.pfnGetName = + driverDdiTable.coreDdiTable.Kernel.pfnGetName = [](ze_kernel_handle_t hKernel, size_t *pSize, char *pName) { return ZE_RESULT_SUCCESS; }; prologCbs.Kernel.pfnGetNameCb = genericPrologCallbackPtr; @@ -373,7 +373,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingKernelGetNameTracingWrapperWithOneSe TEST_F(ZeApiTracingRuntimeTests, WhenCallingKernelGetSourceAttributesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Kernel.pfnGetSourceAttributes = + driverDdiTable.coreDdiTable.Kernel.pfnGetSourceAttributes = [](ze_kernel_handle_t hKernel, uint32_t *pSize, char **pString) { return ZE_RESULT_SUCCESS; }; prologCbs.Kernel.pfnGetSourceAttributesCb = genericPrologCallbackPtr; @@ -388,7 +388,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingKernelGetSourceAttributesTracingWrap TEST_F(ZeApiTracingRuntimeTests, WhenCallingKernelSetIndirectAccessTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Kernel.pfnSetIndirectAccess = + driverDdiTable.coreDdiTable.Kernel.pfnSetIndirectAccess = [](ze_kernel_handle_t hKernel, ze_kernel_indirect_access_flags_t flags) { return ZE_RESULT_SUCCESS; }; prologCbs.Kernel.pfnSetIndirectAccessCb = genericPrologCallbackPtr; @@ -403,7 +403,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingKernelSetIndirectAccessTracingWrappe TEST_F(ZeApiTracingRuntimeTests, WhenCallingModuleDynamicLinkTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Module.pfnDynamicLink = + driverDdiTable.coreDdiTable.Module.pfnDynamicLink = [](uint32_t numModules, ze_module_handle_t *phModules, ze_module_build_log_handle_t *phLinkLog) { return ZE_RESULT_SUCCESS; }; prologCbs.Module.pfnDynamicLinkCb = genericPrologCallbackPtr; @@ -418,7 +418,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingModuleDynamicLinkTracingWrapperWithO TEST_F(ZeApiTracingRuntimeTests, WhenCallingModuleGetPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Module.pfnGetProperties = + driverDdiTable.coreDdiTable.Module.pfnGetProperties = [](ze_module_handle_t hModule, ze_module_properties_t *pModuleProperties) { return ZE_RESULT_SUCCESS; }; prologCbs.Module.pfnGetPropertiesCb = genericPrologCallbackPtr; diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_residency_api_tracing.cpp b/level_zero/core/test/unit_tests/sources/tracing/test_residency_api_tracing.cpp index af476764a9..87ba7092c1 100644 --- a/level_zero/core/test/unit_tests/sources/tracing/test_residency_api_tracing.cpp +++ b/level_zero/core/test/unit_tests/sources/tracing/test_residency_api_tracing.cpp @@ -12,7 +12,7 @@ namespace ult { TEST_F(ZeApiTracingRuntimeTests, WhenCallingContextCreateTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Context.pfnCreate = [](ze_driver_handle_t hContext, const ze_context_desc_t *desc, ze_context_handle_t *phContext) { return ZE_RESULT_SUCCESS; }; + driverDdiTable.coreDdiTable.Context.pfnCreate = [](ze_driver_handle_t hContext, const ze_context_desc_t *desc, ze_context_handle_t *phContext) { return ZE_RESULT_SUCCESS; }; prologCbs.Context.pfnCreateCb = genericPrologCallbackPtr; epilogCbs.Context.pfnCreateCb = genericEpilogCallbackPtr; @@ -26,7 +26,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingContextCreateTracingWrapperWithOneSe TEST_F(ZeApiTracingRuntimeTests, WhenCallingContextDestroyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Context.pfnDestroy = [](ze_context_handle_t hContext) { return ZE_RESULT_SUCCESS; }; + driverDdiTable.coreDdiTable.Context.pfnDestroy = [](ze_context_handle_t hContext) { return ZE_RESULT_SUCCESS; }; prologCbs.Context.pfnDestroyCb = genericPrologCallbackPtr; epilogCbs.Context.pfnDestroyCb = genericEpilogCallbackPtr; @@ -40,7 +40,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingContextDestroyTracingWrapperWithOneS TEST_F(ZeApiTracingRuntimeTests, WhenCallingContextGetStatusTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Context.pfnGetStatus = [](ze_context_handle_t hContext) { return ZE_RESULT_SUCCESS; }; + driverDdiTable.coreDdiTable.Context.pfnGetStatus = [](ze_context_handle_t hContext) { return ZE_RESULT_SUCCESS; }; prologCbs.Context.pfnGetStatusCb = genericPrologCallbackPtr; epilogCbs.Context.pfnGetStatusCb = genericEpilogCallbackPtr; @@ -54,7 +54,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingContextGetStatusTracingWrapperWithOn TEST_F(ZeApiTracingRuntimeTests, WhenCallingContextSystemBarrierTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Context.pfnSystemBarrier = [](ze_context_handle_t hContext, ze_device_handle_t hDevice) { return ZE_RESULT_SUCCESS; }; + driverDdiTable.coreDdiTable.Context.pfnSystemBarrier = [](ze_context_handle_t hContext, ze_device_handle_t hDevice) { return ZE_RESULT_SUCCESS; }; prologCbs.Context.pfnSystemBarrierCb = genericPrologCallbackPtr; epilogCbs.Context.pfnSystemBarrierCb = genericEpilogCallbackPtr; @@ -68,7 +68,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingContextSystemBarrierTracingWrapperWi TEST_F(ZeApiTracingRuntimeTests, WhenCallingContextMakeMemoryResidentTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Context.pfnMakeMemoryResident = [](ze_context_handle_t hContext, ze_device_handle_t hDevice, void *ptr, size_t size) { return ZE_RESULT_SUCCESS; }; + driverDdiTable.coreDdiTable.Context.pfnMakeMemoryResident = [](ze_context_handle_t hContext, ze_device_handle_t hDevice, void *ptr, size_t size) { return ZE_RESULT_SUCCESS; }; prologCbs.Context.pfnMakeMemoryResidentCb = genericPrologCallbackPtr; epilogCbs.Context.pfnMakeMemoryResidentCb = genericEpilogCallbackPtr; @@ -82,7 +82,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingContextMakeMemoryResidentTracingWrap TEST_F(ZeApiTracingRuntimeTests, WhenCallingContextEvictMemoryTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Context.pfnEvictMemory = [](ze_context_handle_t hContext, ze_device_handle_t hDevice, void *ptr, size_t size) { return ZE_RESULT_SUCCESS; }; + driverDdiTable.coreDdiTable.Context.pfnEvictMemory = [](ze_context_handle_t hContext, ze_device_handle_t hDevice, void *ptr, size_t size) { return ZE_RESULT_SUCCESS; }; prologCbs.Context.pfnEvictMemoryCb = genericPrologCallbackPtr; epilogCbs.Context.pfnEvictMemoryCb = genericEpilogCallbackPtr; @@ -96,7 +96,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingContextEvictMemoryTracingWrapperWith TEST_F(ZeApiTracingRuntimeTests, WhenCallingContextMakeImageResidentTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Context.pfnMakeImageResident = [](ze_context_handle_t hContext, ze_device_handle_t hDevice, ze_image_handle_t hImage) { return ZE_RESULT_SUCCESS; }; + driverDdiTable.coreDdiTable.Context.pfnMakeImageResident = [](ze_context_handle_t hContext, ze_device_handle_t hDevice, ze_image_handle_t hImage) { return ZE_RESULT_SUCCESS; }; prologCbs.Context.pfnMakeImageResidentCb = genericPrologCallbackPtr; epilogCbs.Context.pfnMakeImageResidentCb = genericEpilogCallbackPtr; @@ -110,7 +110,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingContextMakeImageResidentTracingWrapp TEST_F(ZeApiTracingRuntimeTests, WhenCallingContextEvictImageTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Context.pfnEvictImage = [](ze_context_handle_t hContext, ze_device_handle_t hDevice, ze_image_handle_t hImage) { return ZE_RESULT_SUCCESS; }; + driverDdiTable.coreDdiTable.Context.pfnEvictImage = [](ze_context_handle_t hContext, ze_device_handle_t hDevice, ze_image_handle_t hImage) { return ZE_RESULT_SUCCESS; }; prologCbs.Context.pfnEvictImageCb = genericPrologCallbackPtr; epilogCbs.Context.pfnEvictImageCb = genericEpilogCallbackPtr; @@ -156,7 +156,7 @@ TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, MakeMemoryResident_args.instanceData3 = generateRandomHandle(); // arguments are expeted to be passed in from first prolog callback - driver_ddiTable.core_ddiTable.Context.pfnMakeMemoryResident = + driverDdiTable.coreDdiTable.Context.pfnMakeMemoryResident = [](ze_context_handle_t hContext, ze_device_handle_t hDevice, void *ptr, size_t size) { EXPECT_EQ(hContext, MakeMemoryResident_args.hContext1); EXPECT_EQ(hDevice, MakeMemoryResident_args.hDevice1); @@ -321,7 +321,7 @@ TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingContextEvictMemoryT EvictMemory_args.instanceData0 = generateRandomHandle(); EvictMemory_args.instanceData3 = generateRandomHandle(); - driver_ddiTable.core_ddiTable.Context.pfnEvictMemory = + driverDdiTable.coreDdiTable.Context.pfnEvictMemory = [](ze_context_handle_t hContext, ze_device_handle_t hDevice, void *ptr, size_t size) { EXPECT_EQ(hContext, EvictMemory_args.hContext1); EXPECT_EQ(hDevice, EvictMemory_args.hDevice1); @@ -482,7 +482,7 @@ TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, MakeImageResident_args.instanceData3 = generateRandomHandle(); // arguments are expeted to be passed in from first prolog callback - driver_ddiTable.core_ddiTable.Context.pfnMakeImageResident = + driverDdiTable.coreDdiTable.Context.pfnMakeImageResident = [](ze_context_handle_t hContext, ze_device_handle_t hDevice, ze_image_handle_t hImage) { EXPECT_EQ(hContext, MakeImageResident_args.hContext1); EXPECT_EQ(hDevice, MakeImageResident_args.hDevice1); @@ -637,7 +637,7 @@ TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, EvictImage_args.instanceData3 = generateRandomHandle(); // arguments are expeted to be passed in from first prolog callback - driver_ddiTable.core_ddiTable.Context.pfnMakeImageResident = + driverDdiTable.coreDdiTable.Context.pfnMakeImageResident = [](ze_context_handle_t hContext, ze_device_handle_t hDevice, ze_image_handle_t hImage) { EXPECT_EQ(hContext, EvictImage_args.hContext1); EXPECT_EQ(hDevice, EvictImage_args.hDevice1); diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_sampler_api_tracing.cpp b/level_zero/core/test/unit_tests/sources/tracing/test_sampler_api_tracing.cpp index f964698bf3..b245b9a83e 100644 --- a/level_zero/core/test/unit_tests/sources/tracing/test_sampler_api_tracing.cpp +++ b/level_zero/core/test/unit_tests/sources/tracing/test_sampler_api_tracing.cpp @@ -12,7 +12,7 @@ namespace ult { TEST_F(ZeApiTracingRuntimeTests, WhenCallingSamplerCreateTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Sampler.pfnCreate = [](ze_context_handle_t hContext, ze_device_handle_t hDevice, const ze_sampler_desc_t *pDesc, ze_sampler_handle_t *phSampler) { return ZE_RESULT_SUCCESS; }; + driverDdiTable.coreDdiTable.Sampler.pfnCreate = [](ze_context_handle_t hContext, ze_device_handle_t hDevice, const ze_sampler_desc_t *pDesc, ze_sampler_handle_t *phSampler) { return ZE_RESULT_SUCCESS; }; prologCbs.Sampler.pfnCreateCb = genericPrologCallbackPtr; epilogCbs.Sampler.pfnCreateCb = genericEpilogCallbackPtr; @@ -26,7 +26,7 @@ TEST_F(ZeApiTracingRuntimeTests, WhenCallingSamplerCreateTracingWrapperWithOneSe TEST_F(ZeApiTracingRuntimeTests, WhenCallingSamplerDestroyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) { ze_result_t result = ZE_RESULT_SUCCESS; - driver_ddiTable.core_ddiTable.Sampler.pfnDestroy = [](ze_sampler_handle_t hSampler) { return ZE_RESULT_SUCCESS; }; + driverDdiTable.coreDdiTable.Sampler.pfnDestroy = [](ze_sampler_handle_t hSampler) { return ZE_RESULT_SUCCESS; }; prologCbs.Sampler.pfnDestroyCb = genericPrologCallbackPtr; epilogCbs.Sampler.pfnDestroyCb = genericEpilogCallbackPtr; @@ -71,7 +71,7 @@ TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, sampler_create_args.instanceData3 = generateRandomHandle(); // Arguments are expected to be passed in by the first prolog callback - driver_ddiTable.core_ddiTable.Sampler.pfnCreate = + driverDdiTable.coreDdiTable.Sampler.pfnCreate = [](ze_context_handle_t hContext, ze_device_handle_t hDevice, const ze_sampler_desc_t *pDesc, ze_sampler_handle_t *phSampler) { EXPECT_EQ(sampler_create_args.hContext1, hContext); EXPECT_EQ(sampler_create_args.hDevice1, hDevice); @@ -314,7 +314,7 @@ TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, sampler_destroy_args.instanceData3 = generateRandomHandle(); // Arguments are expected to be passed in by the first prolog callback - driver_ddiTable.core_ddiTable.Sampler.pfnDestroy = + driverDdiTable.coreDdiTable.Sampler.pfnDestroy = [](ze_sampler_handle_t hSampler) { EXPECT_EQ(sampler_destroy_args.hSampler1, hSampler); return ZE_RESULT_SUCCESS; diff --git a/level_zero/ddi/ze_ddi_tables.h b/level_zero/ddi/ze_ddi_tables.h index 312692a566..1a3139b311 100644 --- a/level_zero/ddi/ze_ddi_tables.h +++ b/level_zero/ddi/ze_ddi_tables.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -18,16 +18,16 @@ extern "C" { typedef struct _ze_gpu_driver_dditable_t { ze_dditable_t ddiTable; - ze_dditable_t core_ddiTable; - ze_dditable_t tracing_ddiTable; - zet_dditable_t tools_ddiTable; - zes_dditable_t sysman_ddiTable; + ze_dditable_t coreDdiTable; + ze_dditable_t tracingDdiTable; + zet_dditable_t toolsDdiTable; + zes_dditable_t sysmanDdiTable; ze_api_version_t version = ZE_API_VERSION_1_0; bool enableTracing; } ze_gpu_driver_dditable_t; -extern ze_gpu_driver_dditable_t driver_ddiTable; +extern ze_gpu_driver_dditable_t driverDdiTable; } // extern "C" diff --git a/level_zero/experimental/source/tracing/tracing_barrier_imp.cpp b/level_zero/experimental/source/tracing/tracing_barrier_imp.cpp index 10d12572da..950e3782e3 100644 --- a/level_zero/experimental/source/tracing/tracing_barrier_imp.cpp +++ b/level_zero/experimental/source/tracing/tracing_barrier_imp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,7 +13,7 @@ zeCommandListAppendBarrierTracing(ze_command_list_handle_t hCommandList, uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.CommandList.pfnAppendBarrier, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.CommandList.pfnAppendBarrier, hCommandList, hSignalEvent, numWaitEvents, @@ -29,7 +29,7 @@ zeCommandListAppendBarrierTracing(ze_command_list_handle_t hCommandList, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnCommandListAppendBarrierCb_t, CommandList, pfnAppendBarrierCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.CommandList.pfnAppendBarrier, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.CommandList.pfnAppendBarrier, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -49,7 +49,7 @@ zeCommandListAppendMemoryRangesBarrierTracing(ze_command_list_handle_t hCommandL uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.CommandList.pfnAppendMemoryRangesBarrier, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.CommandList.pfnAppendMemoryRangesBarrier, hCommandList, numRanges, pRangeSizes, @@ -71,7 +71,7 @@ zeCommandListAppendMemoryRangesBarrierTracing(ze_command_list_handle_t hCommandL ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnCommandListAppendMemoryRangesBarrierCb_t, CommandList, pfnAppendMemoryRangesBarrierCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.CommandList.pfnAppendMemoryRangesBarrier, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.CommandList.pfnAppendMemoryRangesBarrier, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, diff --git a/level_zero/experimental/source/tracing/tracing_cmdlist_imp.cpp b/level_zero/experimental/source/tracing/tracing_cmdlist_imp.cpp index 032bfea0eb..4041736996 100644 --- a/level_zero/experimental/source/tracing/tracing_cmdlist_imp.cpp +++ b/level_zero/experimental/source/tracing/tracing_cmdlist_imp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,7 +13,7 @@ zeCommandListCreateTracing(ze_context_handle_t hContext, const ze_command_list_desc_t *desc, ze_command_list_handle_t *phCommandList) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.CommandList.pfnCreate, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.CommandList.pfnCreate, hContext, hDevice, desc, @@ -29,7 +29,7 @@ zeCommandListCreateTracing(ze_context_handle_t hContext, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnCommandListCreateCb_t, CommandList, pfnCreateCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.CommandList.pfnCreate, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.CommandList.pfnCreate, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -46,7 +46,7 @@ zeCommandListCreateImmediateTracing(ze_context_handle_t hContext, const ze_command_queue_desc_t *altdesc, ze_command_list_handle_t *phCommandList) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.CommandList.pfnCreateImmediate, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.CommandList.pfnCreateImmediate, hContext, hDevice, altdesc, @@ -62,7 +62,7 @@ zeCommandListCreateImmediateTracing(ze_context_handle_t hContext, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnCommandListCreateImmediateCb_t, CommandList, pfnCreateImmediateCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.CommandList.pfnCreateImmediate, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.CommandList.pfnCreateImmediate, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -76,7 +76,7 @@ zeCommandListCreateImmediateTracing(ze_context_handle_t hContext, ZE_APIEXPORT ze_result_t ZE_APICALL zeCommandListDestroyTracing(ze_command_list_handle_t hCommandList) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.CommandList.pfnDestroy, hCommandList); + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.CommandList.pfnDestroy, hCommandList); ze_command_list_destroy_params_t tracerParams; tracerParams.phCommandList = &hCommandList; @@ -85,7 +85,7 @@ zeCommandListDestroyTracing(ze_command_list_handle_t hCommandList) { ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnCommandListDestroyCb_t, CommandList, pfnDestroyCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.CommandList.pfnDestroy, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.CommandList.pfnDestroy, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -96,7 +96,7 @@ zeCommandListDestroyTracing(ze_command_list_handle_t hCommandList) { ZE_APIEXPORT ze_result_t ZE_APICALL zeCommandListCloseTracing(ze_command_list_handle_t hCommandList) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.CommandList.pfnClose, hCommandList); + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.CommandList.pfnClose, hCommandList); ze_command_list_close_params_t tracerParams; tracerParams.phCommandList = &hCommandList; @@ -105,7 +105,7 @@ zeCommandListCloseTracing(ze_command_list_handle_t hCommandList) { ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnCommandListCloseCb_t, CommandList, pfnCloseCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.CommandList.pfnClose, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.CommandList.pfnClose, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -116,7 +116,7 @@ zeCommandListCloseTracing(ze_command_list_handle_t hCommandList) { ZE_APIEXPORT ze_result_t ZE_APICALL zeCommandListResetTracing(ze_command_list_handle_t hCommandList) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.CommandList.pfnReset, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.CommandList.pfnReset, hCommandList); ze_command_list_reset_params_t tracerParams; @@ -126,7 +126,7 @@ zeCommandListResetTracing(ze_command_list_handle_t hCommandList) { ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnCommandListResetCb_t, CommandList, pfnResetCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.CommandList.pfnReset, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.CommandList.pfnReset, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -141,7 +141,7 @@ zeCommandListAppendWriteGlobalTimestampTracing(ze_command_list_handle_t hCommand uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.CommandList.pfnAppendWriteGlobalTimestamp, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.CommandList.pfnAppendWriteGlobalTimestamp, hCommandList, dstptr, hSignalEvent, @@ -159,7 +159,7 @@ zeCommandListAppendWriteGlobalTimestampTracing(ze_command_list_handle_t hCommand ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnCommandListAppendWriteGlobalTimestampCb_t, CommandList, pfnAppendWriteGlobalTimestampCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.CommandList.pfnAppendWriteGlobalTimestamp, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.CommandList.pfnAppendWriteGlobalTimestamp, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -181,7 +181,7 @@ zeCommandListAppendQueryKernelTimestampsTracing(ze_command_list_handle_t hComman uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.CommandList.pfnAppendQueryKernelTimestamps, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.CommandList.pfnAppendQueryKernelTimestamps, hCommandList, numEvents, phEvents, @@ -205,7 +205,7 @@ zeCommandListAppendQueryKernelTimestampsTracing(ze_command_list_handle_t hComman ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnCommandListAppendQueryKernelTimestampsCb_t, CommandList, pfnAppendQueryKernelTimestampsCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.CommandList.pfnAppendQueryKernelTimestamps, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.CommandList.pfnAppendQueryKernelTimestamps, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, diff --git a/level_zero/experimental/source/tracing/tracing_cmdqueue_imp.cpp b/level_zero/experimental/source/tracing/tracing_cmdqueue_imp.cpp index 2467af5603..be294cf1bb 100644 --- a/level_zero/experimental/source/tracing/tracing_cmdqueue_imp.cpp +++ b/level_zero/experimental/source/tracing/tracing_cmdqueue_imp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,7 +13,7 @@ zeCommandQueueCreateTracing(ze_context_handle_t hContext, const ze_command_queue_desc_t *desc, ze_command_queue_handle_t *phCommandQueue) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.CommandQueue.pfnCreate, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.CommandQueue.pfnCreate, hContext, hDevice, desc, @@ -28,7 +28,7 @@ zeCommandQueueCreateTracing(ze_context_handle_t hContext, L0::APITracerCallbackDataImp apiCallbackData; ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnCommandQueueCreateCb_t, CommandQueue, pfnCreateCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.CommandQueue.pfnCreate, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.CommandQueue.pfnCreate, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -42,7 +42,7 @@ zeCommandQueueCreateTracing(ze_context_handle_t hContext, ZE_APIEXPORT ze_result_t ZE_APICALL zeCommandQueueDestroyTracing(ze_command_queue_handle_t hCommandQueue) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.CommandQueue.pfnDestroy, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.CommandQueue.pfnDestroy, hCommandQueue); ze_command_queue_destroy_params_t tracerParams; @@ -52,7 +52,7 @@ zeCommandQueueDestroyTracing(ze_command_queue_handle_t hCommandQueue) { ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnCommandQueueDestroyCb_t, CommandQueue, pfnDestroyCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.CommandQueue.pfnDestroy, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.CommandQueue.pfnDestroy, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -65,7 +65,7 @@ zeCommandQueueExecuteCommandListsTracing(ze_command_queue_handle_t hCommandQueue ze_command_list_handle_t *phCommandLists, ze_fence_handle_t hFence) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.CommandQueue.pfnExecuteCommandLists, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.CommandQueue.pfnExecuteCommandLists, hCommandQueue, numCommandLists, phCommandLists, @@ -80,7 +80,7 @@ zeCommandQueueExecuteCommandListsTracing(ze_command_queue_handle_t hCommandQueue ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnCommandQueueExecuteCommandListsCb_t, CommandQueue, pfnExecuteCommandListsCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.CommandQueue.pfnExecuteCommandLists, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.CommandQueue.pfnExecuteCommandLists, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -95,7 +95,7 @@ ZE_APIEXPORT ze_result_t ZE_APICALL zeCommandQueueSynchronizeTracing(ze_command_queue_handle_t hCommandQueue, uint64_t timeout) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.CommandQueue.pfnSynchronize, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.CommandQueue.pfnSynchronize, hCommandQueue, timeout); @@ -107,7 +107,7 @@ zeCommandQueueSynchronizeTracing(ze_command_queue_handle_t hCommandQueue, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnCommandQueueSynchronizeCb_t, CommandQueue, pfnSynchronizeCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.CommandQueue.pfnSynchronize, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.CommandQueue.pfnSynchronize, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, diff --git a/level_zero/experimental/source/tracing/tracing_copy_imp.cpp b/level_zero/experimental/source/tracing/tracing_copy_imp.cpp index ebc29c25c2..e321db4fb5 100644 --- a/level_zero/experimental/source/tracing/tracing_copy_imp.cpp +++ b/level_zero/experimental/source/tracing/tracing_copy_imp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -16,7 +16,7 @@ zeCommandListAppendMemoryCopyTracing(ze_command_list_handle_t hCommandList, uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.CommandList.pfnAppendMemoryCopy, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.CommandList.pfnAppendMemoryCopy, hCommandList, dstptr, srcptr, @@ -38,7 +38,7 @@ zeCommandListAppendMemoryCopyTracing(ze_command_list_handle_t hCommandList, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnCommandListAppendMemoryCopyCb_t, CommandList, pfnAppendMemoryCopyCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.CommandList.pfnAppendMemoryCopy, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.CommandList.pfnAppendMemoryCopy, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -62,7 +62,7 @@ zeCommandListAppendMemoryFillTracing(ze_command_list_handle_t hCommandList, uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.CommandList.pfnAppendMemoryFill, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.CommandList.pfnAppendMemoryFill, hCommandList, ptr, pattern, @@ -86,7 +86,7 @@ zeCommandListAppendMemoryFillTracing(ze_command_list_handle_t hCommandList, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnCommandListAppendMemoryFillCb_t, CommandList, pfnAppendMemoryFillCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.CommandList.pfnAppendMemoryFill, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.CommandList.pfnAppendMemoryFill, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -115,7 +115,7 @@ zeCommandListAppendMemoryCopyRegionTracing(ze_command_list_handle_t hCommandList uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.CommandList.pfnAppendMemoryCopyRegion, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.CommandList.pfnAppendMemoryCopyRegion, hCommandList, dstptr, dstRegion, @@ -147,7 +147,7 @@ zeCommandListAppendMemoryCopyRegionTracing(ze_command_list_handle_t hCommandList ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnCommandListAppendMemoryCopyRegionCb_t, CommandList, pfnAppendMemoryCopyRegionCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.CommandList.pfnAppendMemoryCopyRegion, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.CommandList.pfnAppendMemoryCopyRegion, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -176,7 +176,7 @@ zeCommandListAppendMemoryCopyFromContextTracing(ze_command_list_handle_t hComman uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.CommandList.pfnAppendMemoryCopyFromContext, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.CommandList.pfnAppendMemoryCopyFromContext, hCommandList, dstptr, hContextSrc, @@ -200,7 +200,7 @@ zeCommandListAppendMemoryCopyFromContextTracing(ze_command_list_handle_t hComman ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnCommandListAppendMemoryCopyFromContextCb_t, CommandList, pfnAppendMemoryCopyFromContextCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.CommandList.pfnAppendMemoryCopyFromContext, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.CommandList.pfnAppendMemoryCopyFromContext, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -223,7 +223,7 @@ zeCommandListAppendImageCopyTracing(ze_command_list_handle_t hCommandList, uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.CommandList.pfnAppendImageCopy, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.CommandList.pfnAppendImageCopy, hCommandList, hDstImage, hSrcImage, @@ -243,7 +243,7 @@ zeCommandListAppendImageCopyTracing(ze_command_list_handle_t hCommandList, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnCommandListAppendImageCopyCb_t, CommandList, pfnAppendImageCopyCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.CommandList.pfnAppendImageCopy, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.CommandList.pfnAppendImageCopy, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -266,7 +266,7 @@ zeCommandListAppendImageCopyRegionTracing(ze_command_list_handle_t hCommandList, uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.CommandList.pfnAppendImageCopyRegion, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.CommandList.pfnAppendImageCopyRegion, hCommandList, hDstImage, hSrcImage, @@ -290,7 +290,7 @@ zeCommandListAppendImageCopyRegionTracing(ze_command_list_handle_t hCommandList, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnCommandListAppendImageCopyRegionCb_t, CommandList, pfnAppendImageCopyRegionCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.CommandList.pfnAppendImageCopyRegion, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.CommandList.pfnAppendImageCopyRegion, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -314,7 +314,7 @@ zeCommandListAppendImageCopyToMemoryTracing(ze_command_list_handle_t hCommandLis uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.CommandList.pfnAppendImageCopyToMemory, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.CommandList.pfnAppendImageCopyToMemory, hCommandList, dstptr, hSrcImage, @@ -336,7 +336,7 @@ zeCommandListAppendImageCopyToMemoryTracing(ze_command_list_handle_t hCommandLis ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnCommandListAppendImageCopyToMemoryCb_t, CommandList, pfnAppendImageCopyToMemoryCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.CommandList.pfnAppendImageCopyToMemory, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.CommandList.pfnAppendImageCopyToMemory, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -359,7 +359,7 @@ zeCommandListAppendImageCopyFromMemoryTracing(ze_command_list_handle_t hCommandL uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.CommandList.pfnAppendImageCopyFromMemory, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.CommandList.pfnAppendImageCopyFromMemory, hCommandList, hDstImage, srcptr, @@ -381,7 +381,7 @@ zeCommandListAppendImageCopyFromMemoryTracing(ze_command_list_handle_t hCommandL ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnCommandListAppendImageCopyFromMemoryCb_t, CommandList, pfnAppendImageCopyFromMemoryCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.CommandList.pfnAppendImageCopyFromMemory, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.CommandList.pfnAppendImageCopyFromMemory, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -400,7 +400,7 @@ zeCommandListAppendMemoryPrefetchTracing(ze_command_list_handle_t hCommandList, const void *ptr, size_t size) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.CommandList.pfnAppendMemoryPrefetch, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.CommandList.pfnAppendMemoryPrefetch, hCommandList, ptr, size); @@ -414,7 +414,7 @@ zeCommandListAppendMemoryPrefetchTracing(ze_command_list_handle_t hCommandList, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnCommandListAppendMemoryPrefetchCb_t, CommandList, pfnAppendMemoryPrefetchCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.CommandList.pfnAppendMemoryPrefetch, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.CommandList.pfnAppendMemoryPrefetch, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -431,7 +431,7 @@ zeCommandListAppendMemAdviseTracing(ze_command_list_handle_t hCommandList, size_t size, ze_memory_advice_t advice) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.CommandList.pfnAppendMemAdvise, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.CommandList.pfnAppendMemAdvise, hCommandList, hDevice, ptr, @@ -449,7 +449,7 @@ zeCommandListAppendMemAdviseTracing(ze_command_list_handle_t hCommandList, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnCommandListAppendMemAdviseCb_t, CommandList, pfnAppendMemAdviseCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.CommandList.pfnAppendMemAdvise, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.CommandList.pfnAppendMemAdvise, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, diff --git a/level_zero/experimental/source/tracing/tracing_device_imp.cpp b/level_zero/experimental/source/tracing/tracing_device_imp.cpp index c87aee4d47..7b0698761e 100644 --- a/level_zero/experimental/source/tracing/tracing_device_imp.cpp +++ b/level_zero/experimental/source/tracing/tracing_device_imp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,7 +12,7 @@ zeDeviceGetTracing(ze_driver_handle_t hDriver, uint32_t *pCount, ze_device_handle_t *phDevices) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Device.pfnGet, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Device.pfnGet, hDriver, pCount, phDevices); @@ -26,7 +26,7 @@ zeDeviceGetTracing(ze_driver_handle_t hDriver, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnDeviceGetCb_t, Device, pfnGetCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Device.pfnGet, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Device.pfnGet, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -40,7 +40,7 @@ ZE_APIEXPORT ze_result_t ZE_APICALL zeDeviceGetPropertiesTracing(ze_device_handle_t hDevice, ze_device_properties_t *pDeviceProperties) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Device.pfnGetProperties, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Device.pfnGetProperties, hDevice, pDeviceProperties); @@ -52,7 +52,7 @@ zeDeviceGetPropertiesTracing(ze_device_handle_t hDevice, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnDeviceGetPropertiesCb_t, Device, pfnGetPropertiesCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Device.pfnGetProperties, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Device.pfnGetProperties, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -65,7 +65,7 @@ ZE_APIEXPORT ze_result_t ZE_APICALL zeDeviceGetComputePropertiesTracing(ze_device_handle_t hDevice, ze_device_compute_properties_t *pComputeProperties) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Device.pfnGetComputeProperties, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Device.pfnGetComputeProperties, hDevice, pComputeProperties); @@ -77,7 +77,7 @@ zeDeviceGetComputePropertiesTracing(ze_device_handle_t hDevice, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnDeviceGetComputePropertiesCb_t, Device, pfnGetComputePropertiesCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Device.pfnGetComputeProperties, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Device.pfnGetComputeProperties, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -91,7 +91,7 @@ zeDeviceGetMemoryPropertiesTracing(ze_device_handle_t hDevice, uint32_t *pCount, ze_device_memory_properties_t *pMemProperties) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Device.pfnGetMemoryProperties, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Device.pfnGetMemoryProperties, hDevice, pCount, pMemProperties); @@ -105,7 +105,7 @@ zeDeviceGetMemoryPropertiesTracing(ze_device_handle_t hDevice, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnDeviceGetMemoryPropertiesCb_t, Device, pfnGetMemoryPropertiesCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Device.pfnGetMemoryProperties, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Device.pfnGetMemoryProperties, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -120,7 +120,7 @@ zeDeviceGetCachePropertiesTracing(ze_device_handle_t hDevice, uint32_t *pCount, ze_device_cache_properties_t *pCacheProperties) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Device.pfnGetCacheProperties, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Device.pfnGetCacheProperties, hDevice, pCount, pCacheProperties); @@ -134,7 +134,7 @@ zeDeviceGetCachePropertiesTracing(ze_device_handle_t hDevice, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnDeviceGetCachePropertiesCb_t, Device, pfnGetCachePropertiesCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Device.pfnGetCacheProperties, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Device.pfnGetCacheProperties, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -148,7 +148,7 @@ ZE_APIEXPORT ze_result_t ZE_APICALL zeDeviceGetImagePropertiesTracing(ze_device_handle_t hDevice, ze_device_image_properties_t *pImageProperties) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Device.pfnGetImageProperties, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Device.pfnGetImageProperties, hDevice, pImageProperties); @@ -160,7 +160,7 @@ zeDeviceGetImagePropertiesTracing(ze_device_handle_t hDevice, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnDeviceGetImagePropertiesCb_t, Device, pfnGetImagePropertiesCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Device.pfnGetImageProperties, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Device.pfnGetImageProperties, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -174,7 +174,7 @@ zeDeviceGetSubDevicesTracing(ze_device_handle_t hDevice, uint32_t *pCount, ze_device_handle_t *phSubdevices) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Device.pfnGetSubDevices, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Device.pfnGetSubDevices, hDevice, pCount, phSubdevices); @@ -188,7 +188,7 @@ zeDeviceGetSubDevicesTracing(ze_device_handle_t hDevice, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnDeviceGetSubDevicesCb_t, Device, pfnGetSubDevicesCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Device.pfnGetSubDevices, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Device.pfnGetSubDevices, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -203,7 +203,7 @@ zeDeviceGetP2PPropertiesTracing(ze_device_handle_t hDevice, ze_device_handle_t hPeerDevice, ze_device_p2p_properties_t *pP2PProperties) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Device.pfnGetP2PProperties, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Device.pfnGetP2PProperties, hDevice, hPeerDevice, pP2PProperties); @@ -217,7 +217,7 @@ zeDeviceGetP2PPropertiesTracing(ze_device_handle_t hDevice, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnDeviceGetP2PPropertiesCb_t, Device, pfnGetP2PPropertiesCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Device.pfnGetP2PProperties, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Device.pfnGetP2PProperties, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -232,7 +232,7 @@ zeDeviceCanAccessPeerTracing(ze_device_handle_t hDevice, ze_device_handle_t hPeerDevice, ze_bool_t *value) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Device.pfnCanAccessPeer, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Device.pfnCanAccessPeer, hDevice, hPeerDevice, value); @@ -246,7 +246,7 @@ zeDeviceCanAccessPeerTracing(ze_device_handle_t hDevice, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnDeviceCanAccessPeerCb_t, Device, pfnCanAccessPeerCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Device.pfnCanAccessPeer, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Device.pfnCanAccessPeer, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -260,7 +260,7 @@ ZE_APIEXPORT ze_result_t ZE_APICALL zeKernelSetCacheConfigTracing(ze_kernel_handle_t hKernel, ze_cache_config_flags_t flags) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Kernel.pfnSetCacheConfig, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Kernel.pfnSetCacheConfig, hKernel, flags); @@ -272,7 +272,7 @@ zeKernelSetCacheConfigTracing(ze_kernel_handle_t hKernel, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnKernelSetCacheConfigCb_t, Kernel, pfnSetCacheConfigCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Kernel.pfnSetCacheConfig, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Kernel.pfnSetCacheConfig, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -285,7 +285,7 @@ ZE_APIEXPORT ze_result_t ZE_APICALL zeDeviceGetMemoryAccessPropertiesTracing(ze_device_handle_t hDevice, ze_device_memory_access_properties_t *pMemAccessProperties) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Device.pfnGetMemoryAccessProperties, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Device.pfnGetMemoryAccessProperties, hDevice, pMemAccessProperties); @@ -298,7 +298,7 @@ zeDeviceGetMemoryAccessPropertiesTracing(ze_device_handle_t hDevice, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnDeviceGetMemoryAccessPropertiesCb_t, Device, pfnGetMemoryAccessPropertiesCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Device.pfnGetMemoryAccessProperties, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Device.pfnGetMemoryAccessProperties, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -311,7 +311,7 @@ ZE_APIEXPORT ze_result_t ZE_APICALL zeDeviceGetModulePropertiesTracing(ze_device_handle_t hDevice, ze_device_module_properties_t *pModuleProperties) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Device.pfnGetModuleProperties, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Device.pfnGetModuleProperties, hDevice, pModuleProperties); @@ -323,7 +323,7 @@ zeDeviceGetModulePropertiesTracing(ze_device_handle_t hDevice, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnDeviceGetModulePropertiesCb_t, Device, pfnGetModulePropertiesCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Device.pfnGetModuleProperties, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Device.pfnGetModuleProperties, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -337,7 +337,7 @@ zeDeviceGetCommandQueueGroupPropertiesTracing(ze_device_handle_t hDevice, uint32_t *pCount, ze_command_queue_group_properties_t *pCommandQueueGroupProperties) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Device.pfnGetCommandQueueGroupProperties, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Device.pfnGetCommandQueueGroupProperties, hDevice, pCount, pCommandQueueGroupProperties); @@ -351,7 +351,7 @@ zeDeviceGetCommandQueueGroupPropertiesTracing(ze_device_handle_t hDevice, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnDeviceGetCommandQueueGroupPropertiesCb_t, Device, pfnGetCommandQueueGroupPropertiesCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Device.pfnGetCommandQueueGroupProperties, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Device.pfnGetCommandQueueGroupProperties, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -365,7 +365,7 @@ ZE_APIEXPORT ze_result_t ZE_APICALL zeDeviceGetExternalMemoryPropertiesTracing(ze_device_handle_t hDevice, ze_device_external_memory_properties_t *pExternalMemoryProperties) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Device.pfnGetExternalMemoryProperties, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Device.pfnGetExternalMemoryProperties, hDevice, pExternalMemoryProperties); @@ -377,7 +377,7 @@ zeDeviceGetExternalMemoryPropertiesTracing(ze_device_handle_t hDevice, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnDeviceGetExternalMemoryPropertiesCb_t, Device, pfnGetExternalMemoryPropertiesCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Device.pfnGetExternalMemoryProperties, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Device.pfnGetExternalMemoryProperties, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -389,7 +389,7 @@ zeDeviceGetExternalMemoryPropertiesTracing(ze_device_handle_t hDevice, ZE_APIEXPORT ze_result_t ZE_APICALL zeDeviceGetStatusTracing(ze_device_handle_t hDevice) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Device.pfnGetStatus, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Device.pfnGetStatus, hDevice); ze_device_get_status_params_t tracerParams; @@ -399,7 +399,7 @@ zeDeviceGetStatusTracing(ze_device_handle_t hDevice) { ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnDeviceGetStatusCb_t, Device, pfnGetStatusCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Device.pfnGetStatus, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Device.pfnGetStatus, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, diff --git a/level_zero/experimental/source/tracing/tracing_driver_imp.cpp b/level_zero/experimental/source/tracing/tracing_driver_imp.cpp index 826822bed3..4dc1c9a83c 100644 --- a/level_zero/experimental/source/tracing/tracing_driver_imp.cpp +++ b/level_zero/experimental/source/tracing/tracing_driver_imp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ ZE_APIEXPORT ze_result_t ZE_APICALL zeDriverGetTracing(uint32_t *pCount, ze_driver_handle_t *phDrivers) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Driver.pfnGet, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Driver.pfnGet, pCount, phDrivers); @@ -23,7 +23,7 @@ zeDriverGetTracing(uint32_t *pCount, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnDriverGetCb_t, Driver, pfnGetCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Driver.pfnGet, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Driver.pfnGet, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -36,7 +36,7 @@ ZE_APIEXPORT ze_result_t ZE_APICALL zeDriverGetPropertiesTracing(ze_driver_handle_t hDriver, ze_driver_properties_t *properties) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Driver.pfnGetProperties, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Driver.pfnGetProperties, hDriver, properties); ze_driver_get_properties_params_t tracerParams; @@ -47,7 +47,7 @@ zeDriverGetPropertiesTracing(ze_driver_handle_t hDriver, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnDriverGetPropertiesCb_t, Driver, pfnGetPropertiesCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Driver.pfnGetProperties, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Driver.pfnGetProperties, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -60,7 +60,7 @@ ZE_APIEXPORT ze_result_t ZE_APICALL zeDriverGetApiVersionTracing(ze_driver_handle_t hDrivers, ze_api_version_t *version) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Driver.pfnGetApiVersion, hDrivers, version); + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Driver.pfnGetApiVersion, hDrivers, version); ze_driver_get_api_version_params_t tracerParams; tracerParams.phDriver = &hDrivers; @@ -70,7 +70,7 @@ zeDriverGetApiVersionTracing(ze_driver_handle_t hDrivers, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnDriverGetApiVersionCb_t, Driver, pfnGetApiVersionCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Driver.pfnGetApiVersion, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Driver.pfnGetApiVersion, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -83,7 +83,7 @@ ZE_APIEXPORT ze_result_t ZE_APICALL zeDriverGetIpcPropertiesTracing(ze_driver_handle_t hDriver, ze_driver_ipc_properties_t *pIpcProperties) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Driver.pfnGetIpcProperties, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Driver.pfnGetIpcProperties, hDriver, pIpcProperties); @@ -95,7 +95,7 @@ zeDriverGetIpcPropertiesTracing(ze_driver_handle_t hDriver, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnDriverGetIpcPropertiesCb_t, Driver, pfnGetIpcPropertiesCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Driver.pfnGetIpcProperties, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Driver.pfnGetIpcProperties, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -109,7 +109,7 @@ zeDriverGetExtensionPropertiesTracing(ze_driver_handle_t hDriver, uint32_t *pCount, ze_driver_extension_properties_t *pExtensionProperties) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Driver.pfnGetExtensionProperties, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Driver.pfnGetExtensionProperties, hDriver, pCount, pExtensionProperties); @@ -123,7 +123,7 @@ zeDriverGetExtensionPropertiesTracing(ze_driver_handle_t hDriver, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnDriverGetExtensionPropertiesCb_t, Driver, pfnGetExtensionPropertiesCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Driver.pfnGetExtensionProperties, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Driver.pfnGetExtensionProperties, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, diff --git a/level_zero/experimental/source/tracing/tracing_event_imp.cpp b/level_zero/experimental/source/tracing/tracing_event_imp.cpp index 6fe85a9a26..13531223e7 100644 --- a/level_zero/experimental/source/tracing/tracing_event_imp.cpp +++ b/level_zero/experimental/source/tracing/tracing_event_imp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -14,7 +14,7 @@ zeEventPoolCreateTracing(ze_context_handle_t hContext, ze_device_handle_t *phDevices, ze_event_pool_handle_t *phEventPool) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.EventPool.pfnCreate, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.EventPool.pfnCreate, hContext, desc, numDevices, @@ -32,7 +32,7 @@ zeEventPoolCreateTracing(ze_context_handle_t hContext, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnEventPoolCreateCb_t, EventPool, pfnCreateCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.EventPool.pfnCreate, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.EventPool.pfnCreate, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -47,7 +47,7 @@ zeEventPoolCreateTracing(ze_context_handle_t hContext, ZE_APIEXPORT ze_result_t ZE_APICALL zeEventPoolDestroyTracing(ze_event_pool_handle_t hEventPool) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.EventPool.pfnDestroy, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.EventPool.pfnDestroy, hEventPool); ze_event_pool_destroy_params_t tracerParams; @@ -57,7 +57,7 @@ zeEventPoolDestroyTracing(ze_event_pool_handle_t hEventPool) { ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnEventPoolDestroyCb_t, EventPool, pfnDestroyCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.EventPool.pfnDestroy, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.EventPool.pfnDestroy, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -70,7 +70,7 @@ zeEventCreateTracing(ze_event_pool_handle_t hEventPool, const ze_event_desc_t *desc, ze_event_handle_t *phEvent) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Event.pfnCreate, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Event.pfnCreate, hEventPool, desc, phEvent); @@ -84,7 +84,7 @@ zeEventCreateTracing(ze_event_pool_handle_t hEventPool, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnEventCreateCb_t, Event, pfnCreateCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Event.pfnCreate, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Event.pfnCreate, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -97,7 +97,7 @@ zeEventCreateTracing(ze_event_pool_handle_t hEventPool, ZE_APIEXPORT ze_result_t ZE_APICALL zeEventDestroyTracing(ze_event_handle_t hEvent) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Event.pfnDestroy, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Event.pfnDestroy, hEvent); ze_event_destroy_params_t tracerParams; @@ -107,7 +107,7 @@ zeEventDestroyTracing(ze_event_handle_t hEvent) { ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnEventDestroyCb_t, Event, pfnDestroyCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Event.pfnDestroy, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Event.pfnDestroy, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -119,7 +119,7 @@ ZE_APIEXPORT ze_result_t ZE_APICALL zeEventPoolGetIpcHandleTracing(ze_event_pool_handle_t hEventPool, ze_ipc_event_pool_handle_t *phIpc) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.EventPool.pfnGetIpcHandle, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.EventPool.pfnGetIpcHandle, hEventPool, phIpc); @@ -131,7 +131,7 @@ zeEventPoolGetIpcHandleTracing(ze_event_pool_handle_t hEventPool, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnEventPoolGetIpcHandleCb_t, EventPool, pfnGetIpcHandleCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.EventPool.pfnGetIpcHandle, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.EventPool.pfnGetIpcHandle, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -145,7 +145,7 @@ zeEventPoolOpenIpcHandleTracing(ze_context_handle_t hContext, ze_ipc_event_pool_handle_t hIpc, ze_event_pool_handle_t *phEventPool) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.EventPool.pfnOpenIpcHandle, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.EventPool.pfnOpenIpcHandle, hContext, hIpc, phEventPool); @@ -159,7 +159,7 @@ zeEventPoolOpenIpcHandleTracing(ze_context_handle_t hContext, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnEventPoolOpenIpcHandleCb_t, EventPool, pfnOpenIpcHandleCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.EventPool.pfnOpenIpcHandle, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.EventPool.pfnOpenIpcHandle, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -172,7 +172,7 @@ zeEventPoolOpenIpcHandleTracing(ze_context_handle_t hContext, ZE_APIEXPORT ze_result_t ZE_APICALL zeEventPoolCloseIpcHandleTracing(ze_event_pool_handle_t hEventPool) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.EventPool.pfnCloseIpcHandle, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.EventPool.pfnCloseIpcHandle, hEventPool); ze_event_pool_close_ipc_handle_params_t tracerParams; @@ -182,7 +182,7 @@ zeEventPoolCloseIpcHandleTracing(ze_event_pool_handle_t hEventPool) { ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnEventPoolCloseIpcHandleCb_t, EventPool, pfnCloseIpcHandleCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.EventPool.pfnCloseIpcHandle, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.EventPool.pfnCloseIpcHandle, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -194,7 +194,7 @@ ZE_APIEXPORT ze_result_t ZE_APICALL zeCommandListAppendSignalEventTracing(ze_command_list_handle_t hCommandList, ze_event_handle_t hEvent) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.CommandList.pfnAppendSignalEvent, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.CommandList.pfnAppendSignalEvent, hCommandList, hEvent); @@ -206,7 +206,7 @@ zeCommandListAppendSignalEventTracing(ze_command_list_handle_t hCommandList, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnCommandListAppendSignalEventCb_t, CommandList, pfnAppendSignalEventCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.CommandList.pfnAppendSignalEvent, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.CommandList.pfnAppendSignalEvent, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -220,7 +220,7 @@ zeCommandListAppendWaitOnEventsTracing(ze_command_list_handle_t hCommandList, uint32_t numEvents, ze_event_handle_t *phEvents) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.CommandList.pfnAppendWaitOnEvents, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.CommandList.pfnAppendWaitOnEvents, hCommandList, numEvents, phEvents); @@ -234,7 +234,7 @@ zeCommandListAppendWaitOnEventsTracing(ze_command_list_handle_t hCommandList, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnCommandListAppendWaitOnEventsCb_t, CommandList, pfnAppendWaitOnEventsCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.CommandList.pfnAppendWaitOnEvents, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.CommandList.pfnAppendWaitOnEvents, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -247,7 +247,7 @@ zeCommandListAppendWaitOnEventsTracing(ze_command_list_handle_t hCommandList, ZE_APIEXPORT ze_result_t ZE_APICALL zeEventHostSignalTracing(ze_event_handle_t hEvent) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Event.pfnHostSignal, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Event.pfnHostSignal, hEvent); ze_event_host_signal_params_t tracerParams; @@ -257,7 +257,7 @@ zeEventHostSignalTracing(ze_event_handle_t hEvent) { ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnEventHostSignalCb_t, Event, pfnHostSignalCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Event.pfnHostSignal, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Event.pfnHostSignal, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -269,7 +269,7 @@ ZE_APIEXPORT ze_result_t ZE_APICALL zeEventHostSynchronizeTracing(ze_event_handle_t hEvent, uint64_t timeout) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Event.pfnHostSynchronize, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Event.pfnHostSynchronize, hEvent, timeout); @@ -281,7 +281,7 @@ zeEventHostSynchronizeTracing(ze_event_handle_t hEvent, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnEventHostSynchronizeCb_t, Event, pfnHostSynchronizeCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Event.pfnHostSynchronize, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Event.pfnHostSynchronize, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -293,7 +293,7 @@ zeEventHostSynchronizeTracing(ze_event_handle_t hEvent, ZE_APIEXPORT ze_result_t ZE_APICALL zeEventQueryStatusTracing(ze_event_handle_t hEvent) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Event.pfnQueryStatus, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Event.pfnQueryStatus, hEvent); ze_event_query_status_params_t tracerParams; @@ -303,7 +303,7 @@ zeEventQueryStatusTracing(ze_event_handle_t hEvent) { ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnEventQueryStatusCb_t, Event, pfnQueryStatusCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Event.pfnQueryStatus, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Event.pfnQueryStatus, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -314,7 +314,7 @@ zeEventQueryStatusTracing(ze_event_handle_t hEvent) { ZE_APIEXPORT ze_result_t ZE_APICALL zeEventHostResetTracing(ze_event_handle_t hEvent) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Event.pfnHostReset, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Event.pfnHostReset, hEvent); ze_event_host_reset_params_t tracerParams; @@ -324,7 +324,7 @@ zeEventHostResetTracing(ze_event_handle_t hEvent) { ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnEventHostResetCb_t, Event, pfnHostResetCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Event.pfnHostReset, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Event.pfnHostReset, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -336,7 +336,7 @@ ZE_APIEXPORT ze_result_t ZE_APICALL zeCommandListAppendEventResetTracing(ze_command_list_handle_t hCommandList, ze_event_handle_t hEvent) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.CommandList.pfnAppendEventReset, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.CommandList.pfnAppendEventReset, hCommandList, hEvent); @@ -349,7 +349,7 @@ zeCommandListAppendEventResetTracing(ze_command_list_handle_t hCommandList, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnCommandListAppendEventResetCb_t, CommandList, pfnAppendEventResetCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.CommandList.pfnAppendEventReset, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.CommandList.pfnAppendEventReset, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -362,7 +362,7 @@ ZE_APIEXPORT ze_result_t ZE_APICALL zeEventQueryKernelTimestampTracing(ze_event_handle_t hEvent, ze_kernel_timestamp_result_t *dstptr) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Event.pfnQueryKernelTimestamp, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Event.pfnQueryKernelTimestamp, hEvent, dstptr); @@ -374,7 +374,7 @@ zeEventQueryKernelTimestampTracing(ze_event_handle_t hEvent, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnEventQueryKernelTimestampCb_t, Event, pfnQueryKernelTimestampCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Event.pfnQueryKernelTimestamp, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Event.pfnQueryKernelTimestamp, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, diff --git a/level_zero/experimental/source/tracing/tracing_fence_imp.cpp b/level_zero/experimental/source/tracing/tracing_fence_imp.cpp index 0059ad1676..80ff6d5c01 100644 --- a/level_zero/experimental/source/tracing/tracing_fence_imp.cpp +++ b/level_zero/experimental/source/tracing/tracing_fence_imp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,7 +12,7 @@ zeFenceCreateTracing(ze_command_queue_handle_t hCommandQueue, const ze_fence_desc_t *desc, ze_fence_handle_t *phFence) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Fence.pfnCreate, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Fence.pfnCreate, hCommandQueue, desc, phFence); @@ -26,7 +26,7 @@ zeFenceCreateTracing(ze_command_queue_handle_t hCommandQueue, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnFenceCreateCb_t, Fence, pfnCreateCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Fence.pfnCreate, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Fence.pfnCreate, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -39,7 +39,7 @@ zeFenceCreateTracing(ze_command_queue_handle_t hCommandQueue, ZE_APIEXPORT ze_result_t ZE_APICALL zeFenceDestroyTracing(ze_fence_handle_t hFence) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Fence.pfnDestroy, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Fence.pfnDestroy, hFence); ze_fence_destroy_params_t tracerParams; @@ -49,7 +49,7 @@ zeFenceDestroyTracing(ze_fence_handle_t hFence) { ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnFenceDestroyCb_t, Fence, pfnDestroyCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Fence.pfnDestroy, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Fence.pfnDestroy, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -61,7 +61,7 @@ ZE_APIEXPORT ze_result_t ZE_APICALL zeFenceHostSynchronizeTracing(ze_fence_handle_t hFence, uint64_t timeout) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Fence.pfnHostSynchronize, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Fence.pfnHostSynchronize, hFence, timeout); @@ -73,7 +73,7 @@ zeFenceHostSynchronizeTracing(ze_fence_handle_t hFence, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnFenceHostSynchronizeCb_t, Fence, pfnHostSynchronizeCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Fence.pfnHostSynchronize, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Fence.pfnHostSynchronize, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -85,7 +85,7 @@ zeFenceHostSynchronizeTracing(ze_fence_handle_t hFence, ZE_APIEXPORT ze_result_t ZE_APICALL zeFenceQueryStatusTracing(ze_fence_handle_t hFence) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Fence.pfnQueryStatus, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Fence.pfnQueryStatus, hFence); ze_fence_query_status_params_t tracerParams; @@ -95,7 +95,7 @@ zeFenceQueryStatusTracing(ze_fence_handle_t hFence) { ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnFenceQueryStatusCb_t, Fence, pfnQueryStatusCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Fence.pfnQueryStatus, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Fence.pfnQueryStatus, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -106,7 +106,7 @@ zeFenceQueryStatusTracing(ze_fence_handle_t hFence) { ZE_APIEXPORT ze_result_t ZE_APICALL zeFenceResetTracing(ze_fence_handle_t hFence) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Fence.pfnReset, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Fence.pfnReset, hFence); ze_fence_reset_params_t tracerParams; @@ -116,7 +116,7 @@ zeFenceResetTracing(ze_fence_handle_t hFence) { ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnFenceResetCb_t, Fence, pfnResetCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Fence.pfnReset, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Fence.pfnReset, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, diff --git a/level_zero/experimental/source/tracing/tracing_global_imp.cpp b/level_zero/experimental/source/tracing/tracing_global_imp.cpp index 6b6963fb8a..0b088b5588 100644 --- a/level_zero/experimental/source/tracing/tracing_global_imp.cpp +++ b/level_zero/experimental/source/tracing/tracing_global_imp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ ZE_APIEXPORT ze_result_t ZE_APICALL zeInitTracing(ze_init_flags_t flags) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Global.pfnInit, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Global.pfnInit, flags); ze_init_params_t tracerParams; @@ -19,7 +19,7 @@ zeInitTracing(ze_init_flags_t flags) { ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnInitCb_t, Global, pfnInitCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Global.pfnInit, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Global.pfnInit, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, diff --git a/level_zero/experimental/source/tracing/tracing_image_imp.cpp b/level_zero/experimental/source/tracing/tracing_image_imp.cpp index 776731f739..5f60a91110 100644 --- a/level_zero/experimental/source/tracing/tracing_image_imp.cpp +++ b/level_zero/experimental/source/tracing/tracing_image_imp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,7 +12,7 @@ zeImageGetPropertiesTracing(ze_device_handle_t hDevice, const ze_image_desc_t *desc, ze_image_properties_t *pImageProperties) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Image.pfnGetProperties, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Image.pfnGetProperties, hDevice, desc, pImageProperties); @@ -26,7 +26,7 @@ zeImageGetPropertiesTracing(ze_device_handle_t hDevice, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnImageGetPropertiesCb_t, Image, pfnGetPropertiesCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Image.pfnGetProperties, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Image.pfnGetProperties, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -42,7 +42,7 @@ zeImageCreateTracing(ze_context_handle_t hContext, const ze_image_desc_t *desc, ze_image_handle_t *phImage) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Image.pfnCreate, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Image.pfnCreate, hContext, hDevice, desc, @@ -58,7 +58,7 @@ zeImageCreateTracing(ze_context_handle_t hContext, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnImageCreateCb_t, Image, pfnCreateCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Image.pfnCreate, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Image.pfnCreate, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -72,7 +72,7 @@ zeImageCreateTracing(ze_context_handle_t hContext, ZE_APIEXPORT ze_result_t ZE_APICALL zeImageDestroyTracing(ze_image_handle_t hImage) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Image.pfnDestroy, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Image.pfnDestroy, hImage); ze_image_destroy_params_t tracerParams; @@ -82,7 +82,7 @@ zeImageDestroyTracing(ze_image_handle_t hImage) { ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnImageDestroyCb_t, Image, pfnDestroyCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Image.pfnDestroy, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Image.pfnDestroy, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, diff --git a/level_zero/experimental/source/tracing/tracing_imp.cpp b/level_zero/experimental/source/tracing/tracing_imp.cpp index ef00ec476d..0165c9376a 100644 --- a/level_zero/experimental/source/tracing/tracing_imp.cpp +++ b/level_zero/experimental/source/tracing/tracing_imp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -132,7 +132,7 @@ bool ThreadPrivateTracerData::testAndSetThreadTracerDataInitializedAndOnList(voi return onList; } -bool APITracerContextImp::isTracingEnabled() { return driver_ddiTable.enableTracing; } +bool APITracerContextImp::isTracingEnabled() { return driverDdiTable.enableTracing; } // // Walk the list of per-thread private data structures, testing diff --git a/level_zero/experimental/source/tracing/tracing_imp.h b/level_zero/experimental/source/tracing/tracing_imp.h index d8b95f8e95..3de8061289 100644 --- a/level_zero/experimental/source/tracing/tracing_imp.h +++ b/level_zero/experimental/source/tracing/tracing_imp.h @@ -32,7 +32,7 @@ #include #include -extern ze_gpu_driver_dditable_t driver_ddiTable; +extern ze_gpu_driver_dditable_t driverDdiTable; namespace L0 { @@ -136,7 +136,7 @@ extern thread_local ThreadPrivateTracerData myThreadPrivateTracerData; template class APITracerCallbackStateImp { public: - T current_api_callback; + T currentApiCallback; void *pUserData; }; @@ -172,12 +172,12 @@ class APITracerCallbackDataImp { ZE_GEN_TRACER_ARRAY_ENTRY(epilogue_callback_ptr, currentTracerArray, i, coreEpilogues, callbackCategory, callbackFunctionType); \ \ L0::APITracerCallbackStateImp prologCallback; \ - prologCallback.current_api_callback = prologueCallbackPtr; \ + prologCallback.currentApiCallback = prologueCallbackPtr; \ prologCallback.pUserData = currentTracerArray->tracerArrayEntries[i].pUserData; \ perApiCallbackData.prologCallbacks.push_back(prologCallback); \ \ L0::APITracerCallbackStateImp epilogCallback; \ - epilogCallback.current_api_callback = epilogue_callback_ptr; \ + epilogCallback.currentApiCallback = epilogue_callback_ptr; \ epilogCallback.pUserData = currentTracerArray->tracerArrayEntries[i].pUserData; \ perApiCallbackData.epilogCallbacks.push_back(epilogCallback); \ } \ @@ -197,14 +197,14 @@ ze_result_t apiTracerWrapperImp(TFunction_pointer zeApiPtr, ppTracerInstanceUserData.resize(callbacksPrologs->size()); for (size_t i = 0; i < callbacksPrologs->size(); i++) { - if (callbacksPrologs->at(i).current_api_callback != nullptr) - callbacksPrologs->at(i).current_api_callback(paramsStruct, ret, callbacksPrologs->at(i).pUserData, &ppTracerInstanceUserData[i]); + if (callbacksPrologs->at(i).currentApiCallback != nullptr) + callbacksPrologs->at(i).currentApiCallback(paramsStruct, ret, callbacksPrologs->at(i).pUserData, &ppTracerInstanceUserData[i]); } ret = zeApiPtr(args...); std::vector> *callbacksEpilogs = &epilogCallbacks; for (size_t i = 0; i < callbacksEpilogs->size(); i++) { - if (callbacksEpilogs->at(i).current_api_callback != nullptr) - callbacksEpilogs->at(i).current_api_callback(paramsStruct, ret, callbacksEpilogs->at(i).pUserData, &ppTracerInstanceUserData[i]); + if (callbacksEpilogs->at(i).currentApiCallback != nullptr) + callbacksEpilogs->at(i).currentApiCallback(paramsStruct, ret, callbacksEpilogs->at(i).pUserData, &ppTracerInstanceUserData[i]); } L0::tracingInProgress = 0; L0::pGlobalAPITracerContextImp->releaseActivetracersList(); diff --git a/level_zero/experimental/source/tracing/tracing_memory_imp.cpp b/level_zero/experimental/source/tracing/tracing_memory_imp.cpp index f0cbca94e2..ae99694edd 100644 --- a/level_zero/experimental/source/tracing/tracing_memory_imp.cpp +++ b/level_zero/experimental/source/tracing/tracing_memory_imp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -16,7 +16,7 @@ zeMemAllocSharedTracing(ze_context_handle_t hContext, ze_device_handle_t hDevice, void **pptr) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Mem.pfnAllocShared, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Mem.pfnAllocShared, hContext, deviceDesc, hostDesc, @@ -38,7 +38,7 @@ zeMemAllocSharedTracing(ze_context_handle_t hContext, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnMemAllocSharedCb_t, Mem, pfnAllocSharedCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Mem.pfnAllocShared, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Mem.pfnAllocShared, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -60,7 +60,7 @@ zeMemAllocDeviceTracing(ze_context_handle_t hContext, ze_device_handle_t hDevice, void **pptr) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Mem.pfnAllocDevice, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Mem.pfnAllocDevice, hContext, deviceDesc, size, @@ -80,7 +80,7 @@ zeMemAllocDeviceTracing(ze_context_handle_t hContext, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnMemAllocDeviceCb_t, Mem, pfnAllocDeviceCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Mem.pfnAllocDevice, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Mem.pfnAllocDevice, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -100,7 +100,7 @@ zeMemAllocHostTracing(ze_context_handle_t hContext, size_t alignment, void **pptr) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Mem.pfnAllocHost, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Mem.pfnAllocHost, hContext, hostDesc, size, @@ -118,7 +118,7 @@ zeMemAllocHostTracing(ze_context_handle_t hContext, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnMemAllocHostCb_t, Mem, pfnAllocHostCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Mem.pfnAllocHost, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Mem.pfnAllocHost, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -134,7 +134,7 @@ ZE_APIEXPORT ze_result_t ZE_APICALL zeMemFreeTracing(ze_context_handle_t hContext, void *ptr) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Mem.pfnFree, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Mem.pfnFree, hContext, ptr); @@ -146,7 +146,7 @@ zeMemFreeTracing(ze_context_handle_t hContext, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnMemFreeCb_t, Mem, pfnFreeCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Mem.pfnFree, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Mem.pfnFree, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -161,7 +161,7 @@ zeMemGetAllocPropertiesTracing(ze_context_handle_t hContext, ze_memory_allocation_properties_t *pMemAllocProperties, ze_device_handle_t *phDevice) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Mem.pfnGetAllocProperties, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Mem.pfnGetAllocProperties, hContext, ptr, pMemAllocProperties, @@ -177,7 +177,7 @@ zeMemGetAllocPropertiesTracing(ze_context_handle_t hContext, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnMemGetAllocPropertiesCb_t, Mem, pfnGetAllocPropertiesCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Mem.pfnGetAllocProperties, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Mem.pfnGetAllocProperties, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -194,7 +194,7 @@ zeMemGetAddressRangeTracing(ze_context_handle_t hContext, void **pBase, size_t *pSize) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Mem.pfnGetAddressRange, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Mem.pfnGetAddressRange, hContext, ptr, pBase, @@ -210,7 +210,7 @@ zeMemGetAddressRangeTracing(ze_context_handle_t hContext, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnMemGetAddressRangeCb_t, Mem, pfnGetAddressRangeCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Mem.pfnGetAddressRange, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Mem.pfnGetAddressRange, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -226,7 +226,7 @@ zeMemGetIpcHandleTracing(ze_context_handle_t hContext, const void *ptr, ze_ipc_mem_handle_t *pIpcHandle) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Mem.pfnGetIpcHandle, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Mem.pfnGetIpcHandle, hContext, ptr, pIpcHandle); @@ -240,7 +240,7 @@ zeMemGetIpcHandleTracing(ze_context_handle_t hContext, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnMemGetIpcHandleCb_t, Mem, pfnGetIpcHandleCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Mem.pfnGetIpcHandle, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Mem.pfnGetIpcHandle, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -257,7 +257,7 @@ zeMemOpenIpcHandleTracing(ze_context_handle_t hContext, ze_ipc_memory_flags_t flags, void **pptr) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Mem.pfnOpenIpcHandle, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Mem.pfnOpenIpcHandle, hContext, hDevice, handle, @@ -275,7 +275,7 @@ zeMemOpenIpcHandleTracing(ze_context_handle_t hContext, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnMemOpenIpcHandleCb_t, Mem, pfnOpenIpcHandleCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Mem.pfnOpenIpcHandle, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Mem.pfnOpenIpcHandle, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -291,7 +291,7 @@ ZE_APIEXPORT ze_result_t ZE_APICALL zeMemCloseIpcHandleTracing(ze_context_handle_t hContext, const void *ptr) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Mem.pfnCloseIpcHandle, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Mem.pfnCloseIpcHandle, hContext, ptr); @@ -303,7 +303,7 @@ zeMemCloseIpcHandleTracing(ze_context_handle_t hContext, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnMemCloseIpcHandleCb_t, Mem, pfnCloseIpcHandleCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Mem.pfnCloseIpcHandle, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Mem.pfnCloseIpcHandle, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -318,7 +318,7 @@ zeVirtualMemReserveTracing(ze_context_handle_t hContext, size_t size, void **pptr) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.VirtualMem.pfnReserve, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.VirtualMem.pfnReserve, hContext, pStart, size, @@ -334,7 +334,7 @@ zeVirtualMemReserveTracing(ze_context_handle_t hContext, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnVirtualMemReserveCb_t, VirtualMem, pfnReserveCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.VirtualMem.pfnReserve, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.VirtualMem.pfnReserve, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -350,7 +350,7 @@ zeVirtualMemFreeTracing(ze_context_handle_t hContext, const void *ptr, size_t size) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.VirtualMem.pfnFree, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.VirtualMem.pfnFree, hContext, ptr, size); @@ -364,7 +364,7 @@ zeVirtualMemFreeTracing(ze_context_handle_t hContext, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnVirtualMemFreeCb_t, VirtualMem, pfnFreeCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.VirtualMem.pfnFree, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.VirtualMem.pfnFree, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -380,7 +380,7 @@ zeVirtualMemQueryPageSizeTracing(ze_context_handle_t hContext, size_t size, size_t *pagesize) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.VirtualMem.pfnQueryPageSize, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.VirtualMem.pfnQueryPageSize, hContext, hDevice, size, @@ -396,7 +396,7 @@ zeVirtualMemQueryPageSizeTracing(ze_context_handle_t hContext, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnVirtualMemQueryPageSizeCb_t, VirtualMem, pfnQueryPageSizeCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.VirtualMem.pfnQueryPageSize, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.VirtualMem.pfnQueryPageSize, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -415,7 +415,7 @@ zeVirtualMemMapTracing(ze_context_handle_t hContext, size_t offset, ze_memory_access_attribute_t access) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.VirtualMem.pfnMap, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.VirtualMem.pfnMap, hContext, ptr, size, @@ -435,7 +435,7 @@ zeVirtualMemMapTracing(ze_context_handle_t hContext, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnVirtualMemMapCb_t, VirtualMem, pfnMapCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.VirtualMem.pfnMap, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.VirtualMem.pfnMap, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -453,7 +453,7 @@ zeVirtualMemUnmapTracing(ze_context_handle_t hContext, const void *ptr, size_t size) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.VirtualMem.pfnUnmap, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.VirtualMem.pfnUnmap, hContext, ptr, size); @@ -467,7 +467,7 @@ zeVirtualMemUnmapTracing(ze_context_handle_t hContext, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnVirtualMemUnmapCb_t, VirtualMem, pfnUnmapCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.VirtualMem.pfnUnmap, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.VirtualMem.pfnUnmap, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -483,7 +483,7 @@ zeVirtualMemSetAccessAttributeTracing(ze_context_handle_t hContext, size_t size, ze_memory_access_attribute_t access) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.VirtualMem.pfnSetAccessAttribute, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.VirtualMem.pfnSetAccessAttribute, hContext, ptr, size, @@ -499,7 +499,7 @@ zeVirtualMemSetAccessAttributeTracing(ze_context_handle_t hContext, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnVirtualMemSetAccessAttributeCb_t, VirtualMem, pfnSetAccessAttributeCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.VirtualMem.pfnSetAccessAttribute, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.VirtualMem.pfnSetAccessAttribute, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -517,7 +517,7 @@ zeVirtualMemGetAccessAttributeTracing(ze_context_handle_t hContext, ze_memory_access_attribute_t *access, size_t *outSize) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.VirtualMem.pfnGetAccessAttribute, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.VirtualMem.pfnGetAccessAttribute, hContext, ptr, size, @@ -535,7 +535,7 @@ zeVirtualMemGetAccessAttributeTracing(ze_context_handle_t hContext, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnVirtualMemGetAccessAttributeCb_t, VirtualMem, pfnGetAccessAttributeCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.VirtualMem.pfnGetAccessAttribute, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.VirtualMem.pfnGetAccessAttribute, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -553,7 +553,7 @@ zePhysicalMemCreateTracing(ze_context_handle_t hContext, ze_physical_mem_desc_t *desc, ze_physical_mem_handle_t *phPhysicalMemory) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.PhysicalMem.pfnCreate, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.PhysicalMem.pfnCreate, hContext, hDevice, desc, @@ -569,7 +569,7 @@ zePhysicalMemCreateTracing(ze_context_handle_t hContext, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnPhysicalMemCreateCb_t, PhysicalMem, pfnCreateCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.PhysicalMem.pfnCreate, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.PhysicalMem.pfnCreate, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -584,7 +584,7 @@ ZE_APIEXPORT ze_result_t ZE_APICALL zePhysicalMemDestroyTracing(ze_context_handle_t hContext, ze_physical_mem_handle_t hPhysicalMemory) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.PhysicalMem.pfnDestroy, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.PhysicalMem.pfnDestroy, hContext, hPhysicalMemory); @@ -596,7 +596,7 @@ zePhysicalMemDestroyTracing(ze_context_handle_t hContext, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnPhysicalMemDestroyCb_t, PhysicalMem, pfnDestroyCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.PhysicalMem.pfnDestroy, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.PhysicalMem.pfnDestroy, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, diff --git a/level_zero/experimental/source/tracing/tracing_module_imp.cpp b/level_zero/experimental/source/tracing/tracing_module_imp.cpp index c4572b426c..563e60ee06 100644 --- a/level_zero/experimental/source/tracing/tracing_module_imp.cpp +++ b/level_zero/experimental/source/tracing/tracing_module_imp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -14,7 +14,7 @@ zeModuleCreateTracing(ze_context_handle_t hContext, ze_module_handle_t *phModule, ze_module_build_log_handle_t *phBuildLog) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Module.pfnCreate, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Module.pfnCreate, hContext, hDevice, desc, @@ -32,7 +32,7 @@ zeModuleCreateTracing(ze_context_handle_t hContext, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnModuleCreateCb_t, Module, pfnCreateCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Module.pfnCreate, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Module.pfnCreate, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -47,7 +47,7 @@ zeModuleCreateTracing(ze_context_handle_t hContext, ZE_APIEXPORT ze_result_t ZE_APICALL zeModuleDestroyTracing(ze_module_handle_t hModule) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Module.pfnDestroy, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Module.pfnDestroy, hModule); ze_module_destroy_params_t tracerParams; @@ -57,7 +57,7 @@ zeModuleDestroyTracing(ze_module_handle_t hModule) { ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnModuleDestroyCb_t, Module, pfnDestroyCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Module.pfnDestroy, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Module.pfnDestroy, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -68,7 +68,7 @@ zeModuleDestroyTracing(ze_module_handle_t hModule) { ZE_APIEXPORT ze_result_t ZE_APICALL zeModuleBuildLogDestroyTracing(ze_module_build_log_handle_t hModuleBuildLog) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.ModuleBuildLog.pfnDestroy, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.ModuleBuildLog.pfnDestroy, hModuleBuildLog); ze_module_build_log_destroy_params_t tracerParams; @@ -78,7 +78,7 @@ zeModuleBuildLogDestroyTracing(ze_module_build_log_handle_t hModuleBuildLog) { ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnModuleBuildLogDestroyCb_t, ModuleBuildLog, pfnDestroyCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.ModuleBuildLog.pfnDestroy, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.ModuleBuildLog.pfnDestroy, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -91,7 +91,7 @@ zeModuleBuildLogGetStringTracing(ze_module_build_log_handle_t hModuleBuildLog, size_t *pSize, char *pBuildLog) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.ModuleBuildLog.pfnGetString, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.ModuleBuildLog.pfnGetString, hModuleBuildLog, pSize, pBuildLog); @@ -105,7 +105,7 @@ zeModuleBuildLogGetStringTracing(ze_module_build_log_handle_t hModuleBuildLog, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnModuleBuildLogGetStringCb_t, ModuleBuildLog, pfnGetStringCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.ModuleBuildLog.pfnGetString, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.ModuleBuildLog.pfnGetString, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -120,7 +120,7 @@ zeModuleGetNativeBinaryTracing(ze_module_handle_t hModule, size_t *pSize, uint8_t *pModuleNativeBinary) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Module.pfnGetNativeBinary, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Module.pfnGetNativeBinary, hModule, pSize, pModuleNativeBinary); @@ -134,7 +134,7 @@ zeModuleGetNativeBinaryTracing(ze_module_handle_t hModule, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnModuleGetNativeBinaryCb_t, Module, pfnGetNativeBinaryCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Module.pfnGetNativeBinary, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Module.pfnGetNativeBinary, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -150,7 +150,7 @@ zeModuleGetGlobalPointerTracing(ze_module_handle_t hModule, size_t *pSize, void **pptr) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Module.pfnGetGlobalPointer, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Module.pfnGetGlobalPointer, hModule, pGlobalName, pSize, @@ -166,7 +166,7 @@ zeModuleGetGlobalPointerTracing(ze_module_handle_t hModule, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnModuleGetGlobalPointerCb_t, Module, pfnGetGlobalPointerCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Module.pfnGetGlobalPointer, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Module.pfnGetGlobalPointer, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -182,7 +182,7 @@ zeModuleDynamicLinkTracing(uint32_t numModules, ze_module_handle_t *phModules, ze_module_build_log_handle_t *phLinkLog) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Module.pfnDynamicLink, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Module.pfnDynamicLink, numModules, phModules, phLinkLog); @@ -196,7 +196,7 @@ zeModuleDynamicLinkTracing(uint32_t numModules, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnModuleDynamicLinkCb_t, Module, pfnDynamicLinkCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Module.pfnDynamicLink, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Module.pfnDynamicLink, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -210,7 +210,7 @@ ZE_APIEXPORT ze_result_t ZE_APICALL zeModuleGetPropertiesTracing(ze_module_handle_t hModule, ze_module_properties_t *pModuleProperties) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Module.pfnGetProperties, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Module.pfnGetProperties, hModule, pModuleProperties); @@ -222,7 +222,7 @@ zeModuleGetPropertiesTracing(ze_module_handle_t hModule, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnModuleGetPropertiesCb_t, Module, pfnGetPropertiesCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Module.pfnGetProperties, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Module.pfnGetProperties, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -236,7 +236,7 @@ zeKernelCreateTracing(ze_module_handle_t hModule, const ze_kernel_desc_t *desc, ze_kernel_handle_t *phKernel) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Kernel.pfnCreate, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Kernel.pfnCreate, hModule, desc, phKernel); @@ -250,7 +250,7 @@ zeKernelCreateTracing(ze_module_handle_t hModule, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnKernelCreateCb_t, Kernel, pfnCreateCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Kernel.pfnCreate, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Kernel.pfnCreate, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -263,7 +263,7 @@ zeKernelCreateTracing(ze_module_handle_t hModule, ZE_APIEXPORT ze_result_t ZE_APICALL zeKernelDestroyTracing(ze_kernel_handle_t hKernel) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Kernel.pfnDestroy, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Kernel.pfnDestroy, hKernel); ze_kernel_destroy_params_t tracerParams; @@ -273,7 +273,7 @@ zeKernelDestroyTracing(ze_kernel_handle_t hKernel) { ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnKernelDestroyCb_t, Kernel, pfnDestroyCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Kernel.pfnDestroy, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Kernel.pfnDestroy, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -286,7 +286,7 @@ zeModuleGetFunctionPointerTracing(ze_module_handle_t hModule, const char *pKernelName, void **pfnFunction) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Module.pfnGetFunctionPointer, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Module.pfnGetFunctionPointer, hModule, pKernelName, pfnFunction); @@ -300,7 +300,7 @@ zeModuleGetFunctionPointerTracing(ze_module_handle_t hModule, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnModuleGetFunctionPointerCb_t, Module, pfnGetFunctionPointerCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Module.pfnGetFunctionPointer, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Module.pfnGetFunctionPointer, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -316,7 +316,7 @@ zeKernelSetGroupSizeTracing(ze_kernel_handle_t hKernel, uint32_t groupSizeY, uint32_t groupSizeZ) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Kernel.pfnSetGroupSize, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Kernel.pfnSetGroupSize, hKernel, groupSizeX, groupSizeY, @@ -332,7 +332,7 @@ zeKernelSetGroupSizeTracing(ze_kernel_handle_t hKernel, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnKernelSetGroupSizeCb_t, Kernel, pfnSetGroupSizeCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Kernel.pfnSetGroupSize, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Kernel.pfnSetGroupSize, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -352,7 +352,7 @@ zeKernelSuggestGroupSizeTracing(ze_kernel_handle_t hKernel, uint32_t *groupSizeY, uint32_t *groupSizeZ) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Kernel.pfnSuggestGroupSize, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Kernel.pfnSuggestGroupSize, hKernel, globalSizeX, globalSizeY, @@ -374,7 +374,7 @@ zeKernelSuggestGroupSizeTracing(ze_kernel_handle_t hKernel, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnKernelSuggestGroupSizeCb_t, Kernel, pfnSuggestGroupSizeCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Kernel.pfnSuggestGroupSize, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Kernel.pfnSuggestGroupSize, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -394,7 +394,7 @@ zeKernelSetArgumentValueTracing(ze_kernel_handle_t hKernel, size_t argSize, const void *pArgValue) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Kernel.pfnSetArgumentValue, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Kernel.pfnSetArgumentValue, hKernel, argIndex, argSize, @@ -410,7 +410,7 @@ zeKernelSetArgumentValueTracing(ze_kernel_handle_t hKernel, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnKernelSetArgumentValueCb_t, Kernel, pfnSetArgumentValueCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Kernel.pfnSetArgumentValue, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Kernel.pfnSetArgumentValue, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -425,7 +425,7 @@ ZE_APIEXPORT ze_result_t ZE_APICALL zeKernelGetPropertiesTracing(ze_kernel_handle_t hKernel, ze_kernel_properties_t *pKernelProperties) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Kernel.pfnGetProperties, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Kernel.pfnGetProperties, hKernel, pKernelProperties); @@ -437,7 +437,7 @@ zeKernelGetPropertiesTracing(ze_kernel_handle_t hKernel, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnKernelGetPropertiesCb_t, Kernel, pfnGetPropertiesCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Kernel.pfnGetProperties, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Kernel.pfnGetProperties, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -454,7 +454,7 @@ zeCommandListAppendLaunchKernelTracing(ze_command_list_handle_t hCommandList, uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.CommandList.pfnAppendLaunchKernel, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.CommandList.pfnAppendLaunchKernel, hCommandList, hKernel, pLaunchFuncArgs, @@ -476,7 +476,7 @@ zeCommandListAppendLaunchKernelTracing(ze_command_list_handle_t hCommandList, CommandList, pfnAppendLaunchKernelCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.CommandList.pfnAppendLaunchKernel, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.CommandList.pfnAppendLaunchKernel, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -497,7 +497,7 @@ zeCommandListAppendLaunchKernelIndirectTracing(ze_command_list_handle_t hCommand uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.CommandList.pfnAppendLaunchKernelIndirect, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.CommandList.pfnAppendLaunchKernelIndirect, hCommandList, hKernel, pLaunchArgumentsBuffer, @@ -519,7 +519,7 @@ zeCommandListAppendLaunchKernelIndirectTracing(ze_command_list_handle_t hCommand CommandList, pfnAppendLaunchKernelIndirectCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.CommandList.pfnAppendLaunchKernelIndirect, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.CommandList.pfnAppendLaunchKernelIndirect, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -542,7 +542,7 @@ zeCommandListAppendLaunchMultipleKernelsIndirectTracing(ze_command_list_handle_t uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.CommandList.pfnAppendLaunchMultipleKernelsIndirect, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.CommandList.pfnAppendLaunchMultipleKernelsIndirect, hCommandList, numKernels, phKernels, @@ -568,7 +568,7 @@ zeCommandListAppendLaunchMultipleKernelsIndirectTracing(ze_command_list_handle_t CommandList, pfnAppendLaunchMultipleKernelsIndirectCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.CommandList.pfnAppendLaunchMultipleKernelsIndirect, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.CommandList.pfnAppendLaunchMultipleKernelsIndirect, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -591,7 +591,7 @@ zeCommandListAppendLaunchCooperativeKernelTracing(ze_command_list_handle_t hComm uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.CommandList.pfnAppendLaunchCooperativeKernel, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.CommandList.pfnAppendLaunchCooperativeKernel, hCommandList, hKernel, pLaunchFuncArgs, @@ -612,7 +612,7 @@ zeCommandListAppendLaunchCooperativeKernelTracing(ze_command_list_handle_t hComm ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnCommandListAppendLaunchCooperativeKernelCb_t, CommandList, pfnAppendLaunchCooperativeKernelCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.CommandList.pfnAppendLaunchCooperativeKernel, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.CommandList.pfnAppendLaunchCooperativeKernel, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -630,7 +630,7 @@ zeModuleGetKernelNamesTracing(ze_module_handle_t hModule, uint32_t *pCount, const char **pNames) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Module.pfnGetKernelNames, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Module.pfnGetKernelNames, hModule, pCount, pNames); @@ -644,7 +644,7 @@ zeModuleGetKernelNamesTracing(ze_module_handle_t hModule, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnModuleGetKernelNamesCb_t, Module, pfnGetKernelNamesCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Module.pfnGetKernelNames, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Module.pfnGetKernelNames, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -658,7 +658,7 @@ ZE_APIEXPORT ze_result_t ZE_APICALL zeKernelSuggestMaxCooperativeGroupCountTracing(ze_kernel_handle_t hKernel, uint32_t *totalGroupCount) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Kernel.pfnSuggestMaxCooperativeGroupCount, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Kernel.pfnSuggestMaxCooperativeGroupCount, hKernel, totalGroupCount); @@ -671,7 +671,7 @@ zeKernelSuggestMaxCooperativeGroupCountTracing(ze_kernel_handle_t hKernel, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnKernelSuggestMaxCooperativeGroupCountCb_t, Kernel, pfnSuggestMaxCooperativeGroupCountCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Kernel.pfnSuggestMaxCooperativeGroupCount, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Kernel.pfnSuggestMaxCooperativeGroupCount, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -684,7 +684,7 @@ ZE_APIEXPORT ze_result_t ZE_APICALL zeKernelGetIndirectAccessTracing(ze_kernel_handle_t hKernel, ze_kernel_indirect_access_flags_t *pFlags) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Kernel.pfnGetIndirectAccess, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Kernel.pfnGetIndirectAccess, hKernel, pFlags); @@ -697,7 +697,7 @@ zeKernelGetIndirectAccessTracing(ze_kernel_handle_t hKernel, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnKernelGetIndirectAccessCb_t, Kernel, pfnGetIndirectAccessCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Kernel.pfnGetIndirectAccess, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Kernel.pfnGetIndirectAccess, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -711,7 +711,7 @@ zeKernelGetNameTracing(ze_kernel_handle_t hKernel, size_t *pSize, char *pName) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Kernel.pfnGetName, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Kernel.pfnGetName, hKernel, pSize, pName); @@ -726,7 +726,7 @@ zeKernelGetNameTracing(ze_kernel_handle_t hKernel, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnKernelGetNameCb_t, Kernel, pfnGetNameCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Kernel.pfnGetName, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Kernel.pfnGetName, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -741,7 +741,7 @@ zeKernelGetSourceAttributesTracing(ze_kernel_handle_t hKernel, uint32_t *pSize, char **pString) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Kernel.pfnGetSourceAttributes, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Kernel.pfnGetSourceAttributes, hKernel, pSize, pString); @@ -756,7 +756,7 @@ zeKernelGetSourceAttributesTracing(ze_kernel_handle_t hKernel, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnKernelGetSourceAttributesCb_t, Kernel, pfnGetSourceAttributesCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Kernel.pfnGetSourceAttributes, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Kernel.pfnGetSourceAttributes, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -770,7 +770,7 @@ ZE_APIEXPORT ze_result_t ZE_APICALL zeKernelSetIndirectAccessTracing(ze_kernel_handle_t hKernel, ze_kernel_indirect_access_flags_t flags) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Kernel.pfnSetIndirectAccess, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Kernel.pfnSetIndirectAccess, hKernel, flags); @@ -783,7 +783,7 @@ zeKernelSetIndirectAccessTracing(ze_kernel_handle_t hKernel, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnKernelSetIndirectAccessCb_t, Kernel, pfnSetIndirectAccessCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Kernel.pfnSetIndirectAccess, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Kernel.pfnSetIndirectAccess, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, diff --git a/level_zero/experimental/source/tracing/tracing_residency_imp.cpp b/level_zero/experimental/source/tracing/tracing_residency_imp.cpp index c4122f6c62..5b7c36695b 100644 --- a/level_zero/experimental/source/tracing/tracing_residency_imp.cpp +++ b/level_zero/experimental/source/tracing/tracing_residency_imp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,7 +12,7 @@ zeContextCreateTracing(ze_driver_handle_t hDriver, const ze_context_desc_t *desc, ze_context_handle_t *phContext) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Context.pfnCreate, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Context.pfnCreate, hDriver, desc, phContext); @@ -26,7 +26,7 @@ zeContextCreateTracing(ze_driver_handle_t hDriver, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnContextCreateCb_t, Context, pfnCreateCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Context.pfnCreate, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Context.pfnCreate, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -39,7 +39,7 @@ zeContextCreateTracing(ze_driver_handle_t hDriver, ZE_APIEXPORT ze_result_t ZE_APICALL zeContextDestroyTracing(ze_context_handle_t hContext) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Context.pfnDestroy, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Context.pfnDestroy, hContext); ze_context_destroy_params_t tracerParams; @@ -49,7 +49,7 @@ zeContextDestroyTracing(ze_context_handle_t hContext) { ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnContextDestroyCb_t, Context, pfnDestroyCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Context.pfnDestroy, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Context.pfnDestroy, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -60,7 +60,7 @@ zeContextDestroyTracing(ze_context_handle_t hContext) { ZE_APIEXPORT ze_result_t ZE_APICALL zeContextGetStatusTracing(ze_context_handle_t hContext) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Context.pfnGetStatus, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Context.pfnGetStatus, hContext); ze_context_get_status_params_t tracerParams; @@ -70,7 +70,7 @@ zeContextGetStatusTracing(ze_context_handle_t hContext) { ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnContextGetStatusCb_t, Context, pfnGetStatusCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Context.pfnGetStatus, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Context.pfnGetStatus, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -82,7 +82,7 @@ ZE_APIEXPORT ze_result_t ZE_APICALL zeContextSystemBarrierTracing(ze_context_handle_t hContext, ze_device_handle_t hDevice) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Context.pfnSystemBarrier, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Context.pfnSystemBarrier, hContext, hDevice); @@ -94,7 +94,7 @@ zeContextSystemBarrierTracing(ze_context_handle_t hContext, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnContextSystemBarrierCb_t, Context, pfnSystemBarrierCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Context.pfnSystemBarrier, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Context.pfnSystemBarrier, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -109,7 +109,7 @@ zeContextMakeMemoryResidentTracing(ze_context_handle_t hContext, void *ptr, size_t size) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Context.pfnMakeMemoryResident, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Context.pfnMakeMemoryResident, hContext, hDevice, ptr, @@ -125,7 +125,7 @@ zeContextMakeMemoryResidentTracing(ze_context_handle_t hContext, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnContextMakeMemoryResidentCb_t, Context, pfnMakeMemoryResidentCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Context.pfnMakeMemoryResident, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Context.pfnMakeMemoryResident, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -142,7 +142,7 @@ zeContextEvictMemoryTracing(ze_context_handle_t hContext, void *ptr, size_t size) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Context.pfnEvictMemory, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Context.pfnEvictMemory, hContext, hDevice, ptr, @@ -158,7 +158,7 @@ zeContextEvictMemoryTracing(ze_context_handle_t hContext, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnContextEvictMemoryCb_t, Context, pfnEvictMemoryCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Context.pfnEvictMemory, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Context.pfnEvictMemory, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -174,7 +174,7 @@ zeContextMakeImageResidentTracing(ze_context_handle_t hContext, ze_device_handle_t hDevice, ze_image_handle_t hImage) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Context.pfnMakeImageResident, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Context.pfnMakeImageResident, hContext, hDevice, hImage); @@ -188,7 +188,7 @@ zeContextMakeImageResidentTracing(ze_context_handle_t hContext, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnContextMakeImageResidentCb_t, Context, pfnMakeImageResidentCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Context.pfnMakeImageResident, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Context.pfnMakeImageResident, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -203,7 +203,7 @@ zeContextEvictImageTracing(ze_context_handle_t hContext, ze_device_handle_t hDevice, ze_image_handle_t hImage) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Context.pfnEvictImage, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Context.pfnEvictImage, hContext, hDevice, hImage); @@ -217,7 +217,7 @@ zeContextEvictImageTracing(ze_context_handle_t hContext, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnContextEvictImageCb_t, Context, pfnEvictImageCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Context.pfnEvictImage, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Context.pfnEvictImage, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, diff --git a/level_zero/experimental/source/tracing/tracing_sampler_imp.cpp b/level_zero/experimental/source/tracing/tracing_sampler_imp.cpp index 4bab327a09..23aac1c67b 100644 --- a/level_zero/experimental/source/tracing/tracing_sampler_imp.cpp +++ b/level_zero/experimental/source/tracing/tracing_sampler_imp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,7 +13,7 @@ zeSamplerCreateTracing(ze_context_handle_t hContext, const ze_sampler_desc_t *pDesc, ze_sampler_handle_t *phSampler) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Sampler.pfnCreate, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Sampler.pfnCreate, hContext, hDevice, pDesc, @@ -29,7 +29,7 @@ zeSamplerCreateTracing(ze_context_handle_t hContext, ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnSamplerCreateCb_t, Sampler, pfnCreateCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Sampler.pfnCreate, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Sampler.pfnCreate, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, @@ -43,7 +43,7 @@ zeSamplerCreateTracing(ze_context_handle_t hContext, ZE_APIEXPORT ze_result_t ZE_APICALL zeSamplerDestroyTracing(ze_sampler_handle_t hSampler) { - ZE_HANDLE_TRACER_RECURSION(driver_ddiTable.core_ddiTable.Sampler.pfnDestroy, + ZE_HANDLE_TRACER_RECURSION(driverDdiTable.coreDdiTable.Sampler.pfnDestroy, hSampler); ze_sampler_destroy_params_t tracerParams; @@ -53,7 +53,7 @@ zeSamplerDestroyTracing(ze_sampler_handle_t hSampler) { ZE_GEN_PER_API_CALLBACK_STATE(apiCallbackData, ze_pfnSamplerDestroyCb_t, Sampler, pfnDestroyCb); - return L0::apiTracerWrapperImp(driver_ddiTable.core_ddiTable.Sampler.pfnDestroy, + return L0::apiTracerWrapperImp(driverDdiTable.coreDdiTable.Sampler.pfnDestroy, &tracerParams, apiCallbackData.apiOrdinal, apiCallbackData.prologCallbacks, diff --git a/level_zero/tools/source/debug/debug_session_imp.cpp b/level_zero/tools/source/debug/debug_session_imp.cpp index 534e306139..a54a970a7e 100644 --- a/level_zero/tools/source/debug/debug_session_imp.cpp +++ b/level_zero/tools/source/debug/debug_session_imp.cpp @@ -1109,7 +1109,7 @@ ze_result_t DebugSessionImp::readSbaRegisters(EuThread::ThreadId threadId, uint3 return ret; } - uint64_t bindingTableBaseAddress = ((r0[4] >> 5) << 5) + sbaBuffer.SurfaceStateBaseAddress; + uint64_t bindingTableBaseAddress = ((r0[4] >> 5) << 5) + sbaBuffer.surfaceStateBaseAddress; uint64_t scratchSpaceBaseAddress = 0; auto &gfxCoreHelper = connectedDevice->getGfxCoreHelper(); @@ -1117,7 +1117,7 @@ ze_result_t DebugSessionImp::readSbaRegisters(EuThread::ThreadId threadId, uint3 auto surfaceStateForScratch = ((r0[5] >> 10) << 6); if (surfaceStateForScratch > 0) { - uint64_t renderSurfaceStateGpuVa = surfaceStateForScratch + sbaBuffer.SurfaceStateBaseAddress; + uint64_t renderSurfaceStateGpuVa = surfaceStateForScratch + sbaBuffer.surfaceStateBaseAddress; constexpr size_t renderSurfaceStateSize = 64; std::vector renderSurfaceState(renderSurfaceStateSize, 0); @@ -1138,18 +1138,18 @@ ze_result_t DebugSessionImp::readSbaRegisters(EuThread::ThreadId threadId, uint3 } else { auto scratchPointer = ((r0[5] >> 10) << 10); if (scratchPointer != 0) { - scratchSpaceBaseAddress = scratchPointer + sbaBuffer.GeneralStateBaseAddress; + scratchSpaceBaseAddress = scratchPointer + sbaBuffer.generalStateBaseAddress; } } std::vector packed; - packed.push_back(sbaBuffer.GeneralStateBaseAddress); - packed.push_back(sbaBuffer.SurfaceStateBaseAddress); - packed.push_back(sbaBuffer.DynamicStateBaseAddress); - packed.push_back(sbaBuffer.IndirectObjectBaseAddress); - packed.push_back(sbaBuffer.InstructionBaseAddress); - packed.push_back(sbaBuffer.BindlessSurfaceStateBaseAddress); - packed.push_back(sbaBuffer.BindlessSamplerStateBaseAddress); + packed.push_back(sbaBuffer.generalStateBaseAddress); + packed.push_back(sbaBuffer.surfaceStateBaseAddress); + packed.push_back(sbaBuffer.dynamicStateBaseAddress); + packed.push_back(sbaBuffer.indirectObjectBaseAddress); + packed.push_back(sbaBuffer.instructionBaseAddress); + packed.push_back(sbaBuffer.bindlessSurfaceStateBaseAddress); + packed.push_back(sbaBuffer.bindlessSamplerStateBaseAddress); packed.push_back(bindingTableBaseAddress); packed.push_back(scratchSpaceBaseAddress); diff --git a/level_zero/tools/test/unit_tests/sources/debug/debug_session_tests.cpp b/level_zero/tools/test/unit_tests/sources/debug/debug_session_tests.cpp index 74a2b4a7cb..05b9ea97ce 100644 --- a/level_zero/tools/test/unit_tests/sources/debug/debug_session_tests.cpp +++ b/level_zero/tools/test/unit_tests/sources/debug/debug_session_tests.cpp @@ -2501,13 +2501,13 @@ TEST_F(DebugSessionRegistersAccessTest, WhenReadingSbaRegistersThenCorrectAddres sbaExpected[ZET_DEBUG_SBA_SURFACE_STATE_INTEL_GPU] = reinterpret_cast(session->readMemoryBuffer); - session->sba.InstructionBaseAddress = sbaExpected[ZET_DEBUG_SBA_INSTRUCTION_INTEL_GPU]; - session->sba.IndirectObjectBaseAddress = sbaExpected[ZET_DEBUG_SBA_INDIRECT_OBJECT_INTEL_GPU]; - session->sba.GeneralStateBaseAddress = sbaExpected[ZET_DEBUG_SBA_GENERAL_STATE_INTEL_GPU]; - session->sba.DynamicStateBaseAddress = sbaExpected[ZET_DEBUG_SBA_DYNAMIC_STATE_INTEL_GPU]; - session->sba.BindlessSurfaceStateBaseAddress = sbaExpected[ZET_DEBUG_SBA_BINDLESS_SURFACE_INTEL_GPU]; - session->sba.BindlessSamplerStateBaseAddress = sbaExpected[ZET_DEBUG_SBA_BINDLESS_SAMPLER_INTEL_GPU]; - session->sba.SurfaceStateBaseAddress = sbaExpected[ZET_DEBUG_SBA_SURFACE_STATE_INTEL_GPU]; + session->sba.instructionBaseAddress = sbaExpected[ZET_DEBUG_SBA_INSTRUCTION_INTEL_GPU]; + session->sba.indirectObjectBaseAddress = sbaExpected[ZET_DEBUG_SBA_INDIRECT_OBJECT_INTEL_GPU]; + session->sba.generalStateBaseAddress = sbaExpected[ZET_DEBUG_SBA_GENERAL_STATE_INTEL_GPU]; + session->sba.dynamicStateBaseAddress = sbaExpected[ZET_DEBUG_SBA_DYNAMIC_STATE_INTEL_GPU]; + session->sba.bindlessSurfaceStateBaseAddress = sbaExpected[ZET_DEBUG_SBA_BINDLESS_SURFACE_INTEL_GPU]; + session->sba.bindlessSamplerStateBaseAddress = sbaExpected[ZET_DEBUG_SBA_BINDLESS_SAMPLER_INTEL_GPU]; + session->sba.surfaceStateBaseAddress = sbaExpected[ZET_DEBUG_SBA_SURFACE_STATE_INTEL_GPU]; auto scratchAllocationBase = 0ULL; if (gfxCoreHelper.isScratchSpaceSurfaceStateAccessible()) { diff --git a/level_zero/tools/test/unit_tests/sources/debug/linux/test_debug_api_linux.cpp b/level_zero/tools/test/unit_tests/sources/debug/linux/test_debug_api_linux.cpp index b853c440cb..7778b1eb3c 100644 --- a/level_zero/tools/test/unit_tests/sources/debug/linux/test_debug_api_linux.cpp +++ b/level_zero/tools/test/unit_tests/sources/debug/linux/test_debug_api_linux.cpp @@ -7349,13 +7349,13 @@ void sbaInit(std::vector &stateSaveArea, uint64_t stateSaveAreaGpuVa, SbaT r0[4] = 0xAAAAAAAA; r0[5] = ((renderSurfaceStateOffset) >> 6) << 10; - sba.GeneralStateBaseAddress = 0x11111111; - sba.SurfaceStateBaseAddress = surfaceStateBaseAddress; - sba.DynamicStateBaseAddress = 0x33333333; - sba.IndirectObjectBaseAddress = 0x44444444; - sba.InstructionBaseAddress = 0x55555555; - sba.BindlessSurfaceStateBaseAddress = 0x66666666; - sba.BindlessSamplerStateBaseAddress = 0x77777777; + sba.generalStateBaseAddress = 0x11111111; + sba.surfaceStateBaseAddress = surfaceStateBaseAddress; + sba.dynamicStateBaseAddress = 0x33333333; + sba.indirectObjectBaseAddress = 0x44444444; + sba.instructionBaseAddress = 0x55555555; + sba.bindlessSurfaceStateBaseAddress = 0x66666666; + sba.bindlessSamplerStateBaseAddress = 0x77777777; char *sbaCpuPtr = stateSaveArea.data() + maxDbgSurfaceSize; char *rssCpuPtr = sbaCpuPtr + sizeof(SbaTrackedAddresses) + renderSurfaceStateOffset; @@ -7386,13 +7386,13 @@ TEST_F(DebugApiRegistersAccessTest, GivenReadSbaBufferCalledThenSbaBufferIsRead) sbaInit(session->stateSaveAreaHeader, stateSaveAreaGpuVa, sbaExpected, r0, device); EXPECT_EQ(ZE_RESULT_SUCCESS, session->readSbaBuffer(session->convertToThreadId(thread), sba)); - EXPECT_EQ(sbaExpected.GeneralStateBaseAddress, sba.GeneralStateBaseAddress); - EXPECT_EQ(sbaExpected.SurfaceStateBaseAddress, sba.SurfaceStateBaseAddress); - EXPECT_EQ(sbaExpected.DynamicStateBaseAddress, sba.DynamicStateBaseAddress); - EXPECT_EQ(sbaExpected.IndirectObjectBaseAddress, sba.IndirectObjectBaseAddress); - EXPECT_EQ(sbaExpected.InstructionBaseAddress, sba.InstructionBaseAddress); - EXPECT_EQ(sbaExpected.BindlessSurfaceStateBaseAddress, sba.BindlessSurfaceStateBaseAddress); - EXPECT_EQ(sbaExpected.BindlessSamplerStateBaseAddress, sba.BindlessSamplerStateBaseAddress); + EXPECT_EQ(sbaExpected.generalStateBaseAddress, sba.generalStateBaseAddress); + EXPECT_EQ(sbaExpected.surfaceStateBaseAddress, sba.surfaceStateBaseAddress); + EXPECT_EQ(sbaExpected.dynamicStateBaseAddress, sba.dynamicStateBaseAddress); + EXPECT_EQ(sbaExpected.indirectObjectBaseAddress, sba.indirectObjectBaseAddress); + EXPECT_EQ(sbaExpected.instructionBaseAddress, sba.instructionBaseAddress); + EXPECT_EQ(sbaExpected.bindlessSurfaceStateBaseAddress, sba.bindlessSurfaceStateBaseAddress); + EXPECT_EQ(sbaExpected.bindlessSamplerStateBaseAddress, sba.bindlessSamplerStateBaseAddress); } TEST_F(DebugApiRegistersAccessTest, givenInvalidSbaRegistersIndicesWhenReadSbaRegistersCalledThenErrorInvalidArgumentIsReturned) { @@ -7428,22 +7428,22 @@ TEST_F(DebugApiRegistersAccessTest, GivenReadSbaRegistersCalledThenSbaRegistersA uint64_t sba[9]; EXPECT_EQ(ZE_RESULT_SUCCESS, zetDebugReadRegisters(session->toHandle(), thread, ZET_DEBUG_REGSET_TYPE_SBA_INTEL_GPU, 0, 9, sba)); - EXPECT_EQ(sbaExpected.GeneralStateBaseAddress, sba[0]); - EXPECT_EQ(sbaExpected.SurfaceStateBaseAddress, sba[1]); - EXPECT_EQ(sbaExpected.DynamicStateBaseAddress, sba[2]); - EXPECT_EQ(sbaExpected.IndirectObjectBaseAddress, sba[3]); - EXPECT_EQ(sbaExpected.InstructionBaseAddress, sba[4]); - EXPECT_EQ(sbaExpected.BindlessSurfaceStateBaseAddress, sba[5]); - EXPECT_EQ(sbaExpected.BindlessSamplerStateBaseAddress, sba[6]); + EXPECT_EQ(sbaExpected.generalStateBaseAddress, sba[0]); + EXPECT_EQ(sbaExpected.surfaceStateBaseAddress, sba[1]); + EXPECT_EQ(sbaExpected.dynamicStateBaseAddress, sba[2]); + EXPECT_EQ(sbaExpected.indirectObjectBaseAddress, sba[3]); + EXPECT_EQ(sbaExpected.instructionBaseAddress, sba[4]); + EXPECT_EQ(sbaExpected.bindlessSurfaceStateBaseAddress, sba[5]); + EXPECT_EQ(sbaExpected.bindlessSamplerStateBaseAddress, sba[6]); - uint64_t expectedBindingTableBaseAddress = ((r0[4] >> 5) << 5) + sbaExpected.SurfaceStateBaseAddress; + uint64_t expectedBindingTableBaseAddress = ((r0[4] >> 5) << 5) + sbaExpected.surfaceStateBaseAddress; uint64_t expectedScratchSpaceBaseAddress = 0; auto &gfxCoreHelper = device->getGfxCoreHelper(); if (gfxCoreHelper.isScratchSpaceSurfaceStateAccessible()) { expectedScratchSpaceBaseAddress = 0xBA5EBA5E; } else { - expectedScratchSpaceBaseAddress = ((r0[5] >> 10) << 10) + sbaExpected.GeneralStateBaseAddress; + expectedScratchSpaceBaseAddress = ((r0[5] >> 10) << 10) + sbaExpected.generalStateBaseAddress; } EXPECT_EQ(expectedBindingTableBaseAddress, sba[7]); @@ -7479,7 +7479,7 @@ TEST_F(DebugApiRegistersAccessTest, GivenScarcthPointerAndZeroAddressInSurfaceSt if (!gfxCoreHelper.isScratchSpaceSurfaceStateAccessible()) { r0[5] = 0; } - sbaExpected.SurfaceStateBaseAddress = surfaceStateBaseAddress; + sbaExpected.surfaceStateBaseAddress = surfaceStateBaseAddress; char *sbaCpuPtr = session->stateSaveAreaHeader.data() + maxDbgSurfaceSize; char *rssCpuPtr = sbaCpuPtr + sizeof(SbaTrackedAddresses) + renderSurfaceStateOffset; @@ -7491,7 +7491,7 @@ TEST_F(DebugApiRegistersAccessTest, GivenScarcthPointerAndZeroAddressInSurfaceSt uint64_t sba[9]; EXPECT_EQ(ZE_RESULT_SUCCESS, zetDebugReadRegisters(session->toHandle(), thread, ZET_DEBUG_REGSET_TYPE_SBA_INTEL_GPU, 0, 9, sba)); - EXPECT_EQ(sbaExpected.SurfaceStateBaseAddress, sba[1]); + EXPECT_EQ(sbaExpected.surfaceStateBaseAddress, sba[1]); const uint64_t expectedScratchSpaceBaseAddress = 0; EXPECT_EQ(expectedScratchSpaceBaseAddress, sba[8]); diff --git a/level_zero/tools/test/unit_tests/sources/debug/windows/test_debug_api_windows.cpp b/level_zero/tools/test/unit_tests/sources/debug/windows/test_debug_api_windows.cpp index 0c0110f72a..05199caa5c 100644 --- a/level_zero/tools/test/unit_tests/sources/debug/windows/test_debug_api_windows.cpp +++ b/level_zero/tools/test/unit_tests/sources/debug/windows/test_debug_api_windows.cpp @@ -527,8 +527,8 @@ TEST_F(DebugApiWindowsTest, GivenSbaBufferGpuVaAvailableWhenReadingSbaBufferThen session->wddm = mockWddm; session->allContexts.insert(0x12345); EXPECT_EQ(ZE_RESULT_SUCCESS, session->readSbaBuffer(session->convertToThreadId(thread), sbaBuffer)); - EXPECT_EQ(sbaBuffer.Version, 0xaa); - EXPECT_EQ(sbaBuffer.BindlessSamplerStateBaseAddress, 0xaaaaaaaaaaaaaaaa); + EXPECT_EQ(sbaBuffer.version, 0xaa); + EXPECT_EQ(sbaBuffer.bindlessSamplerStateBaseAddress, 0xaaaaaaaaaaaaaaaa); } TEST_F(DebugApiWindowsTest, GivenEscapeCallToReadMMIOReturnsSuccessWhenReadingSbaBufferGpuVaThenValidGpuVaIsObtained) { diff --git a/opencl/source/accelerators/intel_accelerator.h b/opencl/source/accelerators/intel_accelerator.h index 95ef17874b..9d0ea33777 100644 --- a/opencl/source/accelerators/intel_accelerator.h +++ b/opencl/source/accelerators/intel_accelerator.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -19,8 +19,8 @@ namespace NEO { class Context; typedef struct TagAcceleratorObjParams { - cl_uint AcceleratorType; - cl_uint AcceleratorFlags; + cl_uint acceleratorType; + cl_uint acceleratorFlags; } OCLRT_ACCELERATOR_OBJECT_PARAMS, *POCLRT_ACCELERATOR_OBJECT_PARAMS; template <> diff --git a/opencl/source/built_ins/builtins_dispatch_builder.cpp b/opencl/source/built_ins/builtins_dispatch_builder.cpp index d04444421a..1cdd5e5077 100644 --- a/opencl/source/built_ins/builtins_dispatch_builder.cpp +++ b/opencl/source/built_ins/builtins_dispatch_builder.cpp @@ -432,7 +432,7 @@ class BuiltInOp : public BuiltinDispatchInfoBu multiDispatchInfo.pushRedescribedMemObj(std::unique_ptr(dstImageRedescribed)); // life range same as mdi's // Calculate srcRowPitch and srcSlicePitch - auto bytesPerPixel = dstImage->getSurfaceFormatInfo().surfaceFormat.ImageElementSizeInBytes; + auto bytesPerPixel = dstImage->getSurfaceFormatInfo().surfaceFormat.imageElementSizeInBytes; size_t region[] = {operationParams.size.x, operationParams.size.y, operationParams.size.z}; @@ -548,7 +548,7 @@ class BuiltInOp : public BuiltinDispatchInfoBu multiDispatchInfo.pushRedescribedMemObj(std::unique_ptr(srcImageRedescribed)); // life range same as mdi's // Calculate dstRowPitch and dstSlicePitch - auto bytesPerPixel = srcImage->getSurfaceFormatInfo().surfaceFormat.ImageElementSizeInBytes; + auto bytesPerPixel = srcImage->getSurfaceFormatInfo().surfaceFormat.imageElementSizeInBytes; size_t region[] = {operationParams.size.x, operationParams.size.y, operationParams.size.z}; @@ -727,8 +727,8 @@ class BuiltInOp : public BuiltinDispatchInfoBuilder { const void *fillColor = operationParams.srcPtr; convertFillColor(fillColor, iFillColor, - image->getSurfaceFormatInfo().OCLImageFormat, - imageRedescribed->getSurfaceFormatInfo().OCLImageFormat); + image->getSurfaceFormatInfo().oclImageFormat, + imageRedescribed->getSurfaceFormatInfo().oclImageFormat); kernelNoSplit3DBuilder.setArg(1, 4 * sizeof(int32_t), iFillColor); // Set-up dstOffset diff --git a/opencl/source/command_queue/enqueue_common.h b/opencl/source/command_queue/enqueue_common.h index 02653b1772..4c0f3b0720 100644 --- a/opencl/source/command_queue/enqueue_common.h +++ b/opencl/source/command_queue/enqueue_common.h @@ -1204,7 +1204,7 @@ void CommandQueueHw::computeOffsetsValueForRectCommands(size_t *buffe template size_t CommandQueueHw::calculateHostPtrSizeForImage(const size_t *region, size_t rowPitch, size_t slicePitch, Image *image) { - auto bytesPerPixel = image->getSurfaceFormatInfo().surfaceFormat.ImageElementSizeInBytes; + auto bytesPerPixel = image->getSurfaceFormatInfo().surfaceFormat.imageElementSizeInBytes; auto dstRowPitch = rowPitch ? rowPitch : region[0] * bytesPerPixel; auto dstSlicePitch = slicePitch ? slicePitch : ((image->getImageDesc().image_type == CL_MEM_OBJECT_IMAGE1D_ARRAY ? 1 : region[1]) * dstRowPitch); diff --git a/opencl/source/command_queue/enqueue_read_image.h b/opencl/source/command_queue/enqueue_read_image.h index 5f0b3d1183..26e40c8040 100644 --- a/opencl/source/command_queue/enqueue_read_image.h +++ b/opencl/source/command_queue/enqueue_read_image.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -47,7 +47,7 @@ cl_int CommandQueueHw::enqueueReadImage( auto isMemTransferNeeded = true; if (srcImage->isMemObjZeroCopy()) { size_t hostOffset; - Image::calculateHostPtrOffset(&hostOffset, origin, region, inputRowPitch, inputSlicePitch, srcImage->getImageDesc().image_type, srcImage->getSurfaceFormatInfo().surfaceFormat.ImageElementSizeInBytes); + Image::calculateHostPtrOffset(&hostOffset, origin, region, inputRowPitch, inputSlicePitch, srcImage->getImageDesc().image_type, srcImage->getSurfaceFormatInfo().surfaceFormat.imageElementSizeInBytes); isMemTransferNeeded = srcImage->checkIfMemoryTransferIsRequired(hostOffset, 0, ptr, cmdType); } if (!isMemTransferNeeded) { diff --git a/opencl/source/command_queue/enqueue_write_image.h b/opencl/source/command_queue/enqueue_write_image.h index 263aeda28b..90ac423341 100644 --- a/opencl/source/command_queue/enqueue_write_image.h +++ b/opencl/source/command_queue/enqueue_write_image.h @@ -43,7 +43,7 @@ cl_int CommandQueueHw::enqueueWriteImage( if (dstImage->isMemObjZeroCopy()) { size_t hostOffset; - Image::calculateHostPtrOffset(&hostOffset, origin, region, inputRowPitch, inputSlicePitch, dstImage->getImageDesc().image_type, dstImage->getSurfaceFormatInfo().surfaceFormat.ImageElementSizeInBytes); + Image::calculateHostPtrOffset(&hostOffset, origin, region, inputRowPitch, inputSlicePitch, dstImage->getImageDesc().image_type, dstImage->getSurfaceFormatInfo().surfaceFormat.imageElementSizeInBytes); isMemTransferNeeded = dstImage->checkIfMemoryTransferIsRequired(hostOffset, 0, ptr, cmdType); } if (!isMemTransferNeeded) { diff --git a/opencl/source/context/context.cpp b/opencl/source/context/context.cpp index 8885df9eae..a9f45761d9 100644 --- a/opencl/source/context/context.cpp +++ b/opencl/source/context/context.cpp @@ -371,7 +371,7 @@ cl_int Context::getSupportedImageFormats( if (imageFormats) { size_t offset = numImageFormats; for (size_t i = 0; i < formats.size() && offset < numEntries; ++i) { - imageFormats[offset++] = formats[i].OCLImageFormat; + imageFormats[offset++] = formats[i].oclImageFormat; } } numImageFormats += formats.size(); diff --git a/opencl/source/event/event.cpp b/opencl/source/event/event.cpp index cc412699a9..ea59d9abbf 100644 --- a/opencl/source/event/event.cpp +++ b/opencl/source/event/event.cpp @@ -284,18 +284,18 @@ void Event::calculateSubmitTimestampData() { auto &gfxCoreHelper = device.getGfxCoreHelper(); double resolution = device.getDeviceInfo().profilingTimerResolution; - int64_t timerDiff = queueTimeStamp.CPUTimeinNS - gfxCoreHelper.getGpuTimeStampInNS(queueTimeStamp.GPUTimeStamp, resolution); - submitTimeStamp.GPUTimeStamp = static_cast((submitTimeStamp.CPUTimeinNS - timerDiff) / resolution); + int64_t timerDiff = queueTimeStamp.cpuTimeinNS - gfxCoreHelper.getGpuTimeStampInNS(queueTimeStamp.gpuTimeStamp, resolution); + submitTimeStamp.gpuTimeStamp = static_cast((submitTimeStamp.cpuTimeinNS - timerDiff) / resolution); } } uint64_t Event::getTimeInNSFromTimestampData(const TimeStampData ×tamp) const { if (isCPUProfilingPath()) { - return timestamp.CPUTimeinNS; + return timestamp.cpuTimeinNS; } if (DebugManager.flags.ReturnRawGpuTimestamps.get()) { - return timestamp.GPUTimeStamp; + return timestamp.gpuTimeStamp; } if (cmdQueue && DebugManager.flags.EnableDeviceBasedTimestamps.get()) { @@ -303,10 +303,10 @@ uint64_t Event::getTimeInNSFromTimestampData(const TimeStampData ×tamp) con auto &gfxCoreHelper = device.getGfxCoreHelper(); double resolution = device.getDeviceInfo().profilingTimerResolution; - return gfxCoreHelper.getGpuTimeStampInNS(timestamp.GPUTimeStamp, resolution); + return gfxCoreHelper.getGpuTimeStampInNS(timestamp.gpuTimeStamp, resolution); } - return timestamp.CPUTimeinNS; + return timestamp.cpuTimeinNS; } bool Event::calcProfilingData() { @@ -366,7 +366,7 @@ void Event::calculateProfilingDataInternal(uint64_t contextStartTS, uint64_t con auto &device = this->cmdQueue->getDevice(); auto &gfxCoreHelper = device.getGfxCoreHelper(); auto frequency = device.getDeviceInfo().profilingTimerResolution; - auto gpuQueueTimeStamp = gfxCoreHelper.getGpuTimeStampInNS(queueTimeStamp.GPUTimeStamp, frequency); + auto gpuQueueTimeStamp = gfxCoreHelper.getGpuTimeStampInNS(queueTimeStamp.gpuTimeStamp, frequency); if (DebugManager.flags.EnableDeviceBasedTimestamps.get()) { startTimeStamp = static_cast(globalStartTS * frequency); @@ -374,9 +374,9 @@ void Event::calculateProfilingDataInternal(uint64_t contextStartTS, uint64_t con startTimeStamp += static_cast((1ULL << gfxCoreHelper.getGlobalTimeStampBits()) * frequency); } } else { - int64_t c0 = queueTimeStamp.CPUTimeinNS - gpuQueueTimeStamp; + int64_t c0 = queueTimeStamp.cpuTimeinNS - gpuQueueTimeStamp; startTimeStamp = static_cast(globalStartTS * frequency) + c0; - if (startTimeStamp < queueTimeStamp.CPUTimeinNS) { + if (startTimeStamp < queueTimeStamp.cpuTimeinNS) { c0 += static_cast((1ULL << (gfxCoreHelper.getGlobalTimeStampBits())) * frequency); startTimeStamp = static_cast(globalStartTS * frequency) + c0; } @@ -863,13 +863,13 @@ void Event::tryFlushEvent() { void Event::setQueueTimeStamp() { if (this->profilingEnabled && (this->cmdQueue != nullptr)) { - this->cmdQueue->getDevice().getOSTime()->getCpuTime(&queueTimeStamp.CPUTimeinNS); + this->cmdQueue->getDevice().getOSTime()->getCpuTime(&queueTimeStamp.cpuTimeinNS); } } void Event::setSubmitTimeStamp() { if (this->profilingEnabled && (this->cmdQueue != nullptr)) { - this->cmdQueue->getDevice().getOSTime()->getCpuTime(&submitTimeStamp.CPUTimeinNS); + this->cmdQueue->getDevice().getOSTime()->getCpuTime(&submitTimeStamp.cpuTimeinNS); } } diff --git a/opencl/source/helpers/cl_blit_properties.h b/opencl/source/helpers/cl_blit_properties.h index 7867e97ef8..ecb225d8e1 100644 --- a/opencl/source/helpers/cl_blit_properties.h +++ b/opencl/source/helpers/cl_blit_properties.h @@ -193,7 +193,7 @@ struct ClBlitProperties { size.x = imageWidth; size.y = imageHeight ? imageHeight : 1; size.z = imageDepth ? imageDepth : 1; - bytesPerPixel = image->getSurfaceFormatInfo().surfaceFormat.ImageElementSizeInBytes; + bytesPerPixel = image->getSurfaceFormatInfo().surfaceFormat.imageElementSizeInBytes; rowPitch = imageDesc.image_row_pitch; slicePitch = imageDesc.image_slice_pitch; plane = image->getPlane(); diff --git a/opencl/source/helpers/gmm_types_converter.cpp b/opencl/source/helpers/gmm_types_converter.cpp index 87900cb59c..34a7c82dae 100644 --- a/opencl/source/helpers/gmm_types_converter.cpp +++ b/opencl/source/helpers/gmm_types_converter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2020 Intel Corporation + * Copyright (C) 2019-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -21,7 +21,7 @@ void GmmTypesConverter::queryImgFromBufferParams(ImageInfo &imgInfo, GraphicsAll if (imgInfo.imgDesc.imageRowPitch > 0) { imgInfo.rowPitch = imgInfo.imgDesc.imageRowPitch; } else { - imgInfo.rowPitch = getValidParam(imgInfo.imgDesc.imageWidth) * imgInfo.surfaceFormat->ImageElementSizeInBytes; + imgInfo.rowPitch = getValidParam(imgInfo.imgDesc.imageWidth) * imgInfo.surfaceFormat->imageElementSizeInBytes; } imgInfo.slicePitch = imgInfo.rowPitch * getValidParam(imgInfo.imgDesc.imageHeight); imgInfo.size = gfxAlloc->getUnderlyingBufferSize(); diff --git a/opencl/source/helpers/mipmap.cpp b/opencl/source/helpers/mipmap.cpp index d31789f4e0..7e83c626f7 100644 --- a/opencl/source/helpers/mipmap.cpp +++ b/opencl/source/helpers/mipmap.cpp @@ -64,7 +64,7 @@ uint32_t getMipOffset(Image *image, const size_t *origin) { return 0; } UNRECOVERABLE_IF(origin == nullptr); - auto bytesPerPixel = image->getSurfaceFormatInfo().surfaceFormat.ImageElementSizeInBytes; + auto bytesPerPixel = image->getSurfaceFormatInfo().surfaceFormat.imageElementSizeInBytes; size_t offset{}; auto imageType = image->getImageDesc().image_type; auto lod = findMipLevel(imageType, origin); diff --git a/opencl/source/helpers/surface_formats.h b/opencl/source/helpers/surface_formats.h index 0ddf526da9..65b0fc419a 100644 --- a/opencl/source/helpers/surface_formats.h +++ b/opencl/source/helpers/surface_formats.h @@ -14,7 +14,7 @@ namespace NEO { struct ClSurfaceFormatInfo { - cl_image_format OCLImageFormat; + cl_image_format oclImageFormat; SurfaceFormatInfo surfaceFormat; }; diff --git a/opencl/source/kernel/kernel.cpp b/opencl/source/kernel/kernel.cpp index ceb666b1b1..0e44d6fd6c 100644 --- a/opencl/source/kernel/kernel.cpp +++ b/opencl/source/kernel/kernel.cpp @@ -1683,7 +1683,7 @@ cl_int Kernel::setArgImageWithMipLevel(uint32_t argIndex, patch(imageFormat.image_channel_data_type, crossThreadData, argAsImg.metadataPayload.channelDataType); patch(imageFormat.image_channel_order, crossThreadData, argAsImg.metadataPayload.channelOrder); - auto pixelSize = pImage->getSurfaceFormatInfo().surfaceFormat.ImageElementSizeInBytes; + auto pixelSize = pImage->getSurfaceFormatInfo().surfaceFormat.imageElementSizeInBytes; patch(graphicsAllocation->getGpuAddress(), crossThreadData, argAsImg.metadataPayload.flatBaseOffset); patch((imageDesc.image_width * pixelSize) - 1, crossThreadData, argAsImg.metadataPayload.flatWidth); patch((imageDesc.image_height * pixelSize) - 1, crossThreadData, argAsImg.metadataPayload.flatHeight); diff --git a/opencl/source/mem_obj/buffer_base.inl b/opencl/source/mem_obj/buffer_base.inl index c735bcef28..6480865a50 100644 --- a/opencl/source/mem_obj/buffer_base.inl +++ b/opencl/source/mem_obj/buffer_base.inl @@ -18,12 +18,12 @@ namespace NEO { union SURFACE_STATE_BUFFER_LENGTH { - uint32_t Length; + uint32_t length; struct SurfaceState { - uint32_t Width : 7; - uint32_t Height : 14; - uint32_t Depth : 11; - } SurfaceState; + uint32_t width : 7; + uint32_t height : 14; + uint32_t depth : 11; + } surfaceState; }; template diff --git a/opencl/source/mem_obj/image.cpp b/opencl/source/mem_obj/image.cpp index faa665520f..e1219d2a72 100644 --- a/opencl/source/mem_obj/image.cpp +++ b/opencl/source/mem_obj/image.cpp @@ -95,7 +95,7 @@ void Image::transferData(void *dest, size_t destRowPitch, size_t destSlicePitch, void *src, size_t srcRowPitch, size_t srcSlicePitch, std::array copyRegion, std::array copyOrigin) { - size_t pixelSize = surfaceFormatInfo.surfaceFormat.ImageElementSizeInBytes; + size_t pixelSize = surfaceFormatInfo.surfaceFormat.imageElementSizeInBytes; size_t lineWidth = copyRegion[0] * pixelSize; DBG_LOG(LogMemoryObject, __FUNCTION__, "memcpy dest:", dest, "sizeRowToCopy:", lineWidth, "src:", src); @@ -149,7 +149,7 @@ Image *Image::create(Context *context, // Driver needs to store rowPitch passed by the app in order to synchronize the host_ptr later on map call const auto hostPtrRowPitch = imageDesc->image_row_pitch ? imageDesc->image_row_pitch - : imageWidth * surfaceFormat->surfaceFormat.ImageElementSizeInBytes; + : imageWidth * surfaceFormat->surfaceFormat.imageElementSizeInBytes; const auto hostPtrSlicePitch = getHostPtrSlicePitch(*imageDesc, hostPtrRowPitch, imageHeight); auto defaultClDevice = context->getDevice(0); @@ -167,11 +167,11 @@ Image *Image::create(Context *context, auto &clGfxCoreHelper = defaultClDevice->getRootDeviceEnvironment().getHelper(); bool preferCompression = MemObjHelper::isSuitableForCompression(!imgInfo.linearStorage, memoryProperties, *context, true); - preferCompression &= clGfxCoreHelper.allowImageCompression(surfaceFormat->OCLImageFormat); - preferCompression &= !clGfxCoreHelper.isFormatRedescribable(surfaceFormat->OCLImageFormat); + preferCompression &= clGfxCoreHelper.allowImageCompression(surfaceFormat->oclImageFormat); + preferCompression &= !clGfxCoreHelper.isFormatRedescribable(surfaceFormat->oclImageFormat); MemoryManager *memoryManager = context->getMemoryManager(); - size_t hostPtrMinSize = getHostPtrMinSize(imageDesc->image_type, surfaceFormat->OCLImageFormat, + size_t hostPtrMinSize = getHostPtrMinSize(imageDesc->image_type, surfaceFormat->oclImageFormat, hostPtrRowPitch, hostPtrSlicePitch, imageHeight, imageDepth, imageCount); void *hostPtrToSet = memoryProperties.flags.useHostPtr ? const_cast(hostPtr) : nullptr; @@ -253,7 +253,7 @@ Image *Image::create(Context *context, multiGraphicsAllocation.setMultiStorage(!MemoryPoolHelper::isSystemMemoryPool(allocationInfos[defaultRootDeviceIndex].memory->getMemoryPool())); } - Image *image = createImageHw(context, memoryProperties, flags, flagsIntel, imgInfo.size, hostPtrToSet, surfaceFormat->OCLImageFormat, + Image *image = createImageHw(context, memoryProperties, flags, flagsIntel, imgInfo.size, hostPtrToSet, surfaceFormat->oclImageFormat, imageDescriptor, allocationInfos[defaultRootDeviceIndex].zeroCopyAllowed, std::move(multiGraphicsAllocation), false, 0, 0, surfaceFormat); setImageProperties(image, *imageDesc, imgInfo, parentImage, parentBuffer, hostPtrRowPitch, hostPtrSlicePitch, imageCount, hostPtrMinSize); @@ -353,7 +353,7 @@ Image *Image::createSharedImage(Context *context, SharingHandler *sharingHandler auto sharedImage = createImageHw( context, ClMemoryPropertiesHelper::createMemoryProperties(flags, 0, 0, &context->getDevice(0)->getDevice()), flags, flagsIntel, size, nullptr, - surfaceFormat->OCLImageFormat, Image::convertDescriptor(imgInfo.imgDesc), false, + surfaceFormat->oclImageFormat, Image::convertDescriptor(imgInfo.imgDesc), false, std::move(multiGraphicsAllocation), false, baseMipLevel, mipCount, surfaceFormat); sharedImage->setSharingHandler(sharingHandler); sharedImage->setMcsAllocation(mcsAllocation); @@ -400,7 +400,7 @@ cl_int Image::validate(Context *context, pClDevice->getCap(reinterpret_cast(pitchAlignment), srcSize, retSize); pClDevice->getCap(reinterpret_cast(baseAddressAlignment), srcSize, retSize); - const auto rowSize = imageDesc->image_row_pitch != 0 ? imageDesc->image_row_pitch : alignUp(imageDesc->image_width * surfaceFormat->surfaceFormat.NumChannels * surfaceFormat->surfaceFormat.PerChannelSizeInBytes, *pitchAlignment); + const auto rowSize = imageDesc->image_row_pitch != 0 ? imageDesc->image_row_pitch : alignUp(imageDesc->image_width * surfaceFormat->surfaceFormat.numChannels * surfaceFormat->surfaceFormat.perChannelSizeInBytes, *pitchAlignment); const auto minimumBufferSize = imageDesc->image_height * rowSize; if ((imageDesc->image_row_pitch % (*pitchAlignment)) || @@ -412,12 +412,12 @@ cl_int Image::validate(Context *context, } } if (parentImage && (!isNV12Image(&parentImage->getImageFormat()) && !isPackedYuvImage(&parentImage->getImageFormat()))) { // Image 2d from image 2d - if (!parentImage->hasSameDescriptor(*imageDesc) || !parentImage->hasValidParentImageFormat(surfaceFormat->OCLImageFormat)) { + if (!parentImage->hasSameDescriptor(*imageDesc) || !parentImage->hasValidParentImageFormat(surfaceFormat->oclImageFormat)) { return CL_INVALID_IMAGE_FORMAT_DESCRIPTOR; } } if (parentImage && isPackedYuvImage(&parentImage->getImageFormat())) { - if (!parentImage->hasValidParentImageFormat(surfaceFormat->OCLImageFormat) || imageDesc->image_width != parentImage->getImageDesc().image_width / 2) { + if (!parentImage->hasValidParentImageFormat(surfaceFormat->oclImageFormat) || imageDesc->image_width != parentImage->getImageDesc().image_width / 2) { return CL_INVALID_IMAGE_DESCRIPTOR; } } @@ -432,8 +432,8 @@ cl_int Image::validate(Context *context, } } else { if (imageDesc->image_row_pitch != 0) { - if (imageDesc->image_row_pitch % surfaceFormat->surfaceFormat.ImageElementSizeInBytes != 0 || - imageDesc->image_row_pitch < imageDesc->image_width * surfaceFormat->surfaceFormat.ImageElementSizeInBytes) { + if (imageDesc->image_row_pitch % surfaceFormat->surfaceFormat.imageElementSizeInBytes != 0 || + imageDesc->image_row_pitch < imageDesc->image_width * surfaceFormat->surfaceFormat.imageElementSizeInBytes) { return CL_INVALID_IMAGE_DESCRIPTOR; } } @@ -447,7 +447,7 @@ cl_int Image::validate(Context *context, return CL_INVALID_IMAGE_DESCRIPTOR; } - return validateImageTraits(context, memoryProperties, &surfaceFormat->OCLImageFormat, imageDesc, hostPtr); + return validateImageTraits(context, memoryProperties, &surfaceFormat->oclImageFormat, imageDesc, hostPtr); } cl_int Image::validateImageFormat(const cl_image_format *imageFormat) { @@ -723,18 +723,18 @@ cl_int Image::getImageInfo(cl_image_info paramName, switch (paramName) { case CL_IMAGE_FORMAT: srcParamSize = sizeof(cl_image_format); - srcParam = &(surfFmtInfo.OCLImageFormat); + srcParam = &(surfFmtInfo.oclImageFormat); break; case CL_IMAGE_ELEMENT_SIZE: srcParamSize = sizeof(size_t); - srcParam = &(surfFmtInfo.surfaceFormat.ImageElementSizeInBytes); + srcParam = &(surfFmtInfo.surfaceFormat.imageElementSizeInBytes); break; case CL_IMAGE_ROW_PITCH: srcParamSize = sizeof(size_t); if (mcsSurfaceInfo.multisampleCount > 1) { - retParam = imageDesc.image_width * surfFmtInfo.surfaceFormat.ImageElementSizeInBytes * imageDesc.num_samples; + retParam = imageDesc.image_width * surfFmtInfo.surfaceFormat.imageElementSizeInBytes * imageDesc.num_samples; } else { retParam = hostPtrRowPitch; } @@ -818,16 +818,16 @@ Image *Image::redescribeFillImage() { auto imageFormatNew = this->imageFormat; auto imageDescNew = this->imageDesc; const ClSurfaceFormatInfo *surfaceFormat = nullptr; - uint32_t redescribeTableCol = this->surfaceFormatInfo.surfaceFormat.NumChannels / 2; - uint32_t redescribeTableRow = this->surfaceFormatInfo.surfaceFormat.PerChannelSizeInBytes / 2; + uint32_t redescribeTableCol = this->surfaceFormatInfo.surfaceFormat.numChannels / 2; + uint32_t redescribeTableRow = this->surfaceFormatInfo.surfaceFormat.perChannelSizeInBytes / 2; ArrayRef readWriteSurfaceFormats = SurfaceFormats::readWrite(); uint32_t surfaceFormatIdx = redescribeTable[redescribeTableRow][redescribeTableCol]; surfaceFormat = &readWriteSurfaceFormats[surfaceFormatIdx]; - imageFormatNew.image_channel_order = surfaceFormat->OCLImageFormat.image_channel_order; - imageFormatNew.image_channel_data_type = surfaceFormat->OCLImageFormat.image_channel_data_type; + imageFormatNew.image_channel_order = surfaceFormat->oclImageFormat.image_channel_order; + imageFormatNew.image_channel_data_type = surfaceFormat->oclImageFormat.image_channel_data_type; DEBUG_BREAK_IF(nullptr == createFunction); MemoryProperties memoryProperties = ClMemoryPropertiesHelper::createMemoryProperties(flags | CL_MEM_USE_HOST_PTR, flagsIntel, 0, @@ -862,7 +862,7 @@ static const uint32_t redescribeTableBytes[] = { }; Image *Image::redescribe() { - const uint32_t bytesPerPixel = this->surfaceFormatInfo.surfaceFormat.NumChannels * surfaceFormatInfo.surfaceFormat.PerChannelSizeInBytes; + const uint32_t bytesPerPixel = this->surfaceFormatInfo.surfaceFormat.numChannels * surfaceFormatInfo.surfaceFormat.perChannelSizeInBytes; const uint32_t exponent = Math::log2(bytesPerPixel); DEBUG_BREAK_IF(exponent >= 5u); const uint32_t surfaceFormatIdx = redescribeTableBytes[exponent % 5]; @@ -870,8 +870,8 @@ Image *Image::redescribe() { const ClSurfaceFormatInfo *surfaceFormat = &readWriteSurfaceFormats[surfaceFormatIdx]; auto imageFormatNew = this->imageFormat; - imageFormatNew.image_channel_order = surfaceFormat->OCLImageFormat.image_channel_order; - imageFormatNew.image_channel_data_type = surfaceFormat->OCLImageFormat.image_channel_data_type; + imageFormatNew.image_channel_order = surfaceFormat->oclImageFormat.image_channel_order; + imageFormatNew.image_channel_data_type = surfaceFormat->oclImageFormat.image_channel_data_type; DEBUG_BREAK_IF(nullptr == createFunction); MemoryProperties memoryProperties = ClMemoryPropertiesHelper::createMemoryProperties(flags | CL_MEM_USE_HOST_PTR, flagsIntel, 0, @@ -984,8 +984,8 @@ const ClSurfaceFormatInfo *Image::getSurfaceFormatFromTable(cl_mem_flags flags, ArrayRef formats = SurfaceFormats::surfaceFormats(flags, imageFormat, supportsOcl20Features); for (auto &format : formats) { - if (format.OCLImageFormat.image_channel_data_type == imageFormat->image_channel_data_type && - format.OCLImageFormat.image_channel_order == imageFormat->image_channel_order) { + if (format.oclImageFormat.image_channel_data_type == imageFormat->image_channel_data_type && + format.oclImageFormat.image_channel_order == imageFormat->image_channel_order) { return &format; } } @@ -1503,7 +1503,7 @@ size_t Image::calculateOffsetForMapping(const MemObjOffsetArray &origin) const { size_t rowPitch = mappingOnCpuAllowed() ? imageDesc.image_row_pitch : getHostPtrRowPitch(); size_t slicePitch = mappingOnCpuAllowed() ? imageDesc.image_slice_pitch : getHostPtrSlicePitch(); - size_t offset = getSurfaceFormatInfo().surfaceFormat.ImageElementSizeInBytes * origin[0]; + size_t offset = getSurfaceFormatInfo().surfaceFormat.imageElementSizeInBytes * origin[0]; switch (imageDesc.image_type) { case CL_MEM_OBJECT_IMAGE1D_ARRAY: diff --git a/opencl/source/mem_obj/image.inl b/opencl/source/mem_obj/image.inl index 8345686ba6..3bc53e600c 100644 --- a/opencl/source/mem_obj/image.inl +++ b/opencl/source/mem_obj/image.inl @@ -24,12 +24,12 @@ namespace NEO { union SURFACE_STATE_BUFFER_LENGTH { - uint32_t Length; + uint32_t length; struct SurfaceState { - uint32_t Width : BITFIELD_RANGE(0, 6); - uint32_t Height : BITFIELD_RANGE(7, 20); - uint32_t Depth : BITFIELD_RANGE(21, 31); - } SurfaceState; + uint32_t width : BITFIELD_RANGE(0, 6); + uint32_t height : BITFIELD_RANGE(7, 20); + uint32_t depth : BITFIELD_RANGE(21, 31); + } surfaceState; }; template @@ -53,12 +53,12 @@ void ImageHw::setImageArg(void *memory, bool setAsMediaBlockImage, ui // image1d_buffer is image1d created from buffer. The length of buffer could be larger // than the maximal image width. Mock image1d_buffer with SURFACE_TYPE_SURFTYPE_BUFFER. SURFACE_STATE_BUFFER_LENGTH length = {0}; - length.Length = static_cast(getImageDesc().image_width - 1); + length.length = static_cast(getImageDesc().image_width - 1); - surfaceState->setWidth(static_cast(length.SurfaceState.Width + 1)); - surfaceState->setHeight(static_cast(length.SurfaceState.Height + 1)); - surfaceState->setDepth(static_cast(length.SurfaceState.Depth + 1)); - surfaceState->setSurfacePitch(static_cast(getSurfaceFormatInfo().surfaceFormat.ImageElementSizeInBytes)); + surfaceState->setWidth(static_cast(length.surfaceState.width + 1)); + surfaceState->setHeight(static_cast(length.surfaceState.height + 1)); + surfaceState->setDepth(static_cast(length.surfaceState.depth + 1)); + surfaceState->setSurfacePitch(static_cast(getSurfaceFormatInfo().surfaceFormat.imageElementSizeInBytes)); surfaceState->setSurfaceType(RENDER_SURFACE_STATE::SURFACE_TYPE_SURFTYPE_BUFFER); } else { setImageSurfaceStateDimensions(surfaceState, imgInfo, cubeFaceIndex, surfaceType); @@ -71,7 +71,7 @@ void ImageHw::setImageArg(void *memory, bool setAsMediaBlockImage, ui surfaceState->setMipCountLod((this->mipCount > 0) ? (this->mipCount - 1) : 0); setMipTailStartLod(surfaceState, gmm); - cl_channel_order imgChannelOrder = getSurfaceFormatInfo().OCLImageFormat.image_channel_order; + cl_channel_order imgChannelOrder = getSurfaceFormatInfo().oclImageFormat.image_channel_order; int shaderChannelValue = ImageHw::getShaderChannelValue(RENDER_SURFACE_STATE::SHADER_CHANNEL_SELECT_RED, imgChannelOrder); surfaceState->setShaderChannelSelectRed(static_cast(shaderChannelValue)); diff --git a/opencl/source/sharings/d3d/d3d_sharing.cpp b/opencl/source/sharings/d3d/d3d_sharing.cpp index 033ec052cc..8ec3a59dbe 100644 --- a/opencl/source/sharings/d3d/d3d_sharing.cpp +++ b/opencl/source/sharings/d3d/d3d_sharing.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -87,14 +87,14 @@ template const ClSurfaceFormatInfo *D3DSharing::findSurfaceFormatInfo(GMM_RESOURCE_FORMAT_ENUM gmmFormat, cl_mem_flags flags, bool supportsOcl20Features, bool packedSupported) { ArrayRef formats = SurfaceFormats::surfaceFormats(flags, supportsOcl20Features); for (auto &format : formats) { - if (gmmFormat == format.surfaceFormat.GMMSurfaceFormat) { + if (gmmFormat == format.surfaceFormat.gmmSurfaceFormat) { return &format; } } if (packedSupported) { formats = SurfaceFormats::packed(); for (auto &format : formats) { - if (gmmFormat == format.surfaceFormat.GMMSurfaceFormat) { + if (gmmFormat == format.surfaceFormat.gmmSurfaceFormat) { return &format; } } diff --git a/opencl/source/sharings/gl/gl_sharing.h b/opencl/source/sharings/gl/gl_sharing.h index 957ead5261..8501be50d2 100644 --- a/opencl/source/sharings/gl/gl_sharing.h +++ b/opencl/source/sharings/gl/gl_sharing.h @@ -33,8 +33,8 @@ class DriverModel; typedef unsigned int OS_HANDLE; typedef struct CLGLContextInfo { - OS_HANDLE DeviceHandle; - OS_HANDLE ContextHandle; + OS_HANDLE deviceHandle; + OS_HANDLE contextHandle; } ContextInfo; class GLSharingFunctions : public SharingFunctions { diff --git a/opencl/source/sharings/gl/linux/gl_sharing_linux.cpp b/opencl/source/sharings/gl/linux/gl_sharing_linux.cpp index 2ae2b47668..d39fc85788 100644 --- a/opencl/source/sharings/gl/linux/gl_sharing_linux.cpp +++ b/opencl/source/sharings/gl/linux/gl_sharing_linux.cpp @@ -42,8 +42,8 @@ GLboolean GLSharingFunctionsLinux::setSharedOCLContextState() { if (retVal == GL_FALSE) { return GL_FALSE; } - glContextHandle = contextInfo.ContextHandle; - glDeviceHandle = contextInfo.DeviceHandle; + glContextHandle = contextInfo.contextHandle; + glDeviceHandle = contextInfo.deviceHandle; return retVal; } diff --git a/opencl/source/sharings/gl/windows/gl_sharing_windows.cpp b/opencl/source/sharings/gl/windows/gl_sharing_windows.cpp index a346c964bf..94987f9e38 100644 --- a/opencl/source/sharings/gl/windows/gl_sharing_windows.cpp +++ b/opencl/source/sharings/gl/windows/gl_sharing_windows.cpp @@ -46,8 +46,8 @@ GLboolean GLSharingFunctionsWindows::setSharedOCLContextState() { if (retVal == GL_FALSE) { return GL_FALSE; } - GLContextHandle = CtxInfo.ContextHandle; - GLDeviceHandle = CtxInfo.DeviceHandle; + GLContextHandle = CtxInfo.contextHandle; + GLDeviceHandle = CtxInfo.deviceHandle; return retVal; } diff --git a/opencl/source/sharings/gl/windows/gl_texture_windows.cpp b/opencl/source/sharings/gl/windows/gl_texture_windows.cpp index ce0855b3da..9f7150ebc2 100644 --- a/opencl/source/sharings/gl/windows/gl_texture_windows.cpp +++ b/opencl/source/sharings/gl/windows/gl_texture_windows.cpp @@ -122,7 +122,7 @@ Image *GlTexture::createSharedGlTexture(Context *context, cl_mem_flags flags, cl } auto surfaceFormatInfo = *surfaceFormatInfoAddress; if (texInfo.glInternalFormat != GL_RGB10) { - surfaceFormatInfo.surfaceFormat.GenxSurfaceFormat = (GFX3DSTATE_SURFACEFORMAT)texInfo.glHWFormat; + surfaceFormatInfo.surfaceFormat.genxSurfaceFormat = (GFX3DSTATE_SURFACEFORMAT)texInfo.glHWFormat; } GraphicsAllocation *mcsAlloc = nullptr; diff --git a/opencl/test/unit_test/api/cl_get_image_info_tests.inl b/opencl/test/unit_test/api/cl_get_image_info_tests.inl index c75ad23915..a0456bf7a2 100644 --- a/opencl/test/unit_test/api/cl_get_image_info_tests.inl +++ b/opencl/test/unit_test/api/cl_get_image_info_tests.inl @@ -372,7 +372,7 @@ TEST_F(ClGetImageInfoTests, givenMultisampleCountForMcsWhenAskingForRowPitchThen auto imageObj = castToObject(image); auto formatInfo = imageObj->getSurfaceFormatInfo(); - size_t multisampleRowPitch = imageDesc.image_width * formatInfo.surfaceFormat.ImageElementSizeInBytes * imageDesc.num_samples; + size_t multisampleRowPitch = imageDesc.image_width * formatInfo.surfaceFormat.imageElementSizeInBytes * imageDesc.num_samples; EXPECT_NE(multisampleRowPitch, imageObj->getHostPtrRowPitch()); for (uint32_t multisampleCount = 0; multisampleCount <= 4; multisampleCount++) { diff --git a/opencl/test/unit_test/aub_mem_dump/cl_aub_alloc_dump_tests.cpp b/opencl/test/unit_test/aub_mem_dump/cl_aub_alloc_dump_tests.cpp index 42187eafcd..ce414da3d2 100644 --- a/opencl/test/unit_test/aub_mem_dump/cl_aub_alloc_dump_tests.cpp +++ b/opencl/test/unit_test/aub_mem_dump/cl_aub_alloc_dump_tests.cpp @@ -87,17 +87,17 @@ HWTEST_F(AubAllocDumpTests, givenWritableBufferWhenDumpAllocationIsCalledAndAubD AubMemDump::AubCaptureBinaryDumpHD cmd; memcpy(&cmd, mockAubFileStream->getData(), mockAubFileStream->getSize()); - EXPECT_EQ(0x7u, cmd.Header.Type); - EXPECT_EQ(0x1u, cmd.Header.Opcode); - EXPECT_EQ(0x15u, cmd.Header.SubOp); - EXPECT_EQ(((sizeof(cmd) - sizeof(cmd.Header)) / sizeof(uint32_t)) - 1, cmd.Header.DwordLength); + EXPECT_EQ(0x7u, cmd.header.type); + EXPECT_EQ(0x1u, cmd.header.opcode); + EXPECT_EQ(0x15u, cmd.header.subOp); + EXPECT_EQ(((sizeof(cmd) - sizeof(cmd.header)) / sizeof(uint32_t)) - 1, cmd.header.dwordLength); EXPECT_EQ(gfxAllocation->getGpuAddress(), cmd.getBaseAddr()); EXPECT_EQ(static_cast(gfxAllocation->getUnderlyingBufferSize()), cmd.getWidth()); EXPECT_EQ(1u, cmd.getHeight()); EXPECT_EQ(static_cast(gfxAllocation->getUnderlyingBufferSize()), cmd.getPitch()); - EXPECT_EQ(1u, cmd.GttType); - EXPECT_EQ(handle, cmd.DirectoryHandle); + EXPECT_EQ(1u, cmd.gttType); + EXPECT_EQ(handle, cmd.directoryHandle); } HWTEST_F(AubAllocDumpTests, givenWritableBufferWhenDumpAllocationIsCalledAndAubDumpBufferFormatIsSetToTreThenBufferShouldBeDumpedInTreFormat) { @@ -160,29 +160,29 @@ HWTEST_F(AubAllocDumpTests, givenWritableImageWhenDumpAllocationIsCalledAndAubDu AubMemDump::AubCmdDumpBmpHd cmd; memcpy(&cmd, mockAubFileStream->getData(), mockAubFileStream->getSize()); - EXPECT_EQ(0x7u, cmd.Header.Type); - EXPECT_EQ(0x1u, cmd.Header.Opcode); - EXPECT_EQ(0x44u, cmd.Header.SubOp); - EXPECT_EQ(((sizeof(cmd) - sizeof(cmd.Header)) / sizeof(uint32_t)) - 1, cmd.Header.DwordLength); + EXPECT_EQ(0x7u, cmd.header.type); + EXPECT_EQ(0x1u, cmd.header.opcode); + EXPECT_EQ(0x44u, cmd.header.subOp); + EXPECT_EQ(((sizeof(cmd) - sizeof(cmd.header)) / sizeof(uint32_t)) - 1, cmd.header.dwordLength); - EXPECT_EQ(0u, cmd.Xmin); - EXPECT_EQ(0u, cmd.Ymin); + EXPECT_EQ(0u, cmd.xMin); + EXPECT_EQ(0u, cmd.yMin); auto gmm = gfxAllocation->getDefaultGmm(); - EXPECT_EQ((8 * gmm->gmmResourceInfo->getRenderPitch()) / gmm->gmmResourceInfo->getBitsPerPixel(), cmd.BufferPitch); - EXPECT_EQ(gmm->gmmResourceInfo->getBitsPerPixel(), cmd.BitsPerPixel); - EXPECT_EQ(static_cast(gmm->gmmResourceInfo->getResourceFormatSurfaceState()), cmd.Format); - EXPECT_EQ(static_cast(gmm->gmmResourceInfo->getBaseWidth()), cmd.Xsize); - EXPECT_EQ(static_cast(gmm->gmmResourceInfo->getBaseHeight()), cmd.Ysize); + EXPECT_EQ((8 * gmm->gmmResourceInfo->getRenderPitch()) / gmm->gmmResourceInfo->getBitsPerPixel(), cmd.bufferPitch); + EXPECT_EQ(gmm->gmmResourceInfo->getBitsPerPixel(), cmd.bitsPerPixel); + EXPECT_EQ(static_cast(gmm->gmmResourceInfo->getResourceFormatSurfaceState()), cmd.format); + EXPECT_EQ(static_cast(gmm->gmmResourceInfo->getBaseWidth()), cmd.xSize); + EXPECT_EQ(static_cast(gmm->gmmResourceInfo->getBaseHeight()), cmd.ySize); EXPECT_EQ(gfxAllocation->getGpuAddress(), cmd.getBaseAddr()); - EXPECT_EQ(0u, cmd.Secure); - EXPECT_EQ(0u, cmd.UseFence); + EXPECT_EQ(0u, cmd.secure); + EXPECT_EQ(0u, cmd.useFence); auto flagInfo = gmm->gmmResourceInfo->getResourceFlags()->Info; - EXPECT_EQ(static_cast(flagInfo.TiledW || flagInfo.TiledX || flagInfo.TiledY || flagInfo.TiledYf || flagInfo.TiledYs), cmd.TileOn); - EXPECT_EQ(flagInfo.TiledY, cmd.WalkY); - EXPECT_EQ(1u, cmd.UsePPGTT); - EXPECT_EQ(1u, cmd.Use32BitDump); - EXPECT_EQ(1u, cmd.UseFullFormat); - EXPECT_EQ(handle, cmd.DirectoryHandle); + EXPECT_EQ(static_cast(flagInfo.TiledW || flagInfo.TiledX || flagInfo.TiledY || flagInfo.TiledYf || flagInfo.TiledYs), cmd.tileOn); + EXPECT_EQ(flagInfo.TiledY, cmd.walkY); + EXPECT_EQ(1u, cmd.usePPGTT); + EXPECT_EQ(1u, cmd.use32BitDump); + EXPECT_EQ(1u, cmd.useFullFormat); + EXPECT_EQ(handle, cmd.directoryHandle); } HWTEST_F(AubAllocDumpTests, givenWritableImageWhenDumpAllocationIsCalledAndAubDumpImageFormatIsSetToTreThenImageShouldBeDumpedInTreFormat) { diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.h b/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.h index 6ee95f9e16..82bb67e94d 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.h +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.h @@ -114,16 +114,16 @@ void setupAUB(const NEO::Device *pDevice, aub_stream::EngineType engineType) { typename AUB::MiContextDescriptorReg contextDescriptor = {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}; - contextDescriptor.sData.Valid = true; - contextDescriptor.sData.ForcePageDirRestore = false; - contextDescriptor.sData.ForceRestore = false; - contextDescriptor.sData.Legacy = true; - contextDescriptor.sData.FaultSupport = 0; - contextDescriptor.sData.PrivilegeAccessOrPPGTT = true; - contextDescriptor.sData.ADor64bitSupport = AUB::Traits::addressingBits > 32; + contextDescriptor.sData.valid = true; + contextDescriptor.sData.forcePageDirRestore = false; + contextDescriptor.sData.forceRestore = false; + contextDescriptor.sData.legacy = true; + contextDescriptor.sData.faultSupport = 0; + contextDescriptor.sData.privilegeAccessOrPPGTT = true; + contextDescriptor.sData.aDor64bitSupport = AUB::Traits::addressingBits > 32; - contextDescriptor.sData.LogicalRingCtxAddress = (uintptr_t)pLRCABase / 4096; - contextDescriptor.sData.ContextID = 0; + contextDescriptor.sData.logicalRingCtxAddress = (uintptr_t)pLRCABase / 4096; + contextDescriptor.sData.contextID = 0; aubFile.writeMMIO(mmioBase + 0x2230, 0); aubFile.writeMMIO(mmioBase + 0x2230, 0); diff --git a/opencl/test/unit_test/aub_tests/gen11/batch_buffer/aub_batch_buffer_tests_gen11.h b/opencl/test/unit_test/aub_tests/gen11/batch_buffer/aub_batch_buffer_tests_gen11.h index cf9b4b55db..1e1ad88ea8 100644 --- a/opencl/test/unit_test/aub_tests/gen11/batch_buffer/aub_batch_buffer_tests_gen11.h +++ b/opencl/test/unit_test/aub_tests/gen11/batch_buffer/aub_batch_buffer_tests_gen11.h @@ -126,16 +126,16 @@ void setupAUBWithBatchBuffer(const NEO::Device *pDevice, aub_stream::EngineType typename AUB::MiContextDescriptorReg contextDescriptor = {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}; - contextDescriptor.sData.Valid = true; - contextDescriptor.sData.ForcePageDirRestore = false; - contextDescriptor.sData.ForceRestore = false; - contextDescriptor.sData.Legacy = true; - contextDescriptor.sData.FaultSupport = 0; - contextDescriptor.sData.PrivilegeAccessOrPPGTT = true; - contextDescriptor.sData.ADor64bitSupport = AUB::Traits::addressingBits > 32; + contextDescriptor.sData.valid = true; + contextDescriptor.sData.forcePageDirRestore = false; + contextDescriptor.sData.forceRestore = false; + contextDescriptor.sData.legacy = true; + contextDescriptor.sData.faultSupport = 0; + contextDescriptor.sData.privilegeAccessOrPPGTT = true; + contextDescriptor.sData.aDor64bitSupport = AUB::Traits::addressingBits > 32; - contextDescriptor.sData.LogicalRingCtxAddress = (uintptr_t)pLRCABase / 4096; - contextDescriptor.sData.ContextID = 0; + contextDescriptor.sData.logicalRingCtxAddress = (uintptr_t)pLRCABase / 4096; + contextDescriptor.sData.contextID = 0; aubFile.writeMMIO(AubMemDump::computeRegisterOffset(mmioBase, 0x2510), contextDescriptor.ulData[0]); aubFile.writeMMIO(AubMemDump::computeRegisterOffset(mmioBase, 0x2514), contextDescriptor.ulData[1]); diff --git a/opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.h b/opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.h index 97df50842d..3a66e2e3e3 100644 --- a/opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.h +++ b/opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2022 Intel Corporation + * Copyright (C) 2019-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -132,16 +132,16 @@ void setupAUBWithBatchBuffer(const NEO::Device *pDevice, aub_stream::EngineType typename AUB::MiContextDescriptorReg contextDescriptor = {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}; - contextDescriptor.sData.Valid = true; - contextDescriptor.sData.ForcePageDirRestore = false; - contextDescriptor.sData.ForceRestore = false; - contextDescriptor.sData.Legacy = true; - contextDescriptor.sData.FaultSupport = 0; - contextDescriptor.sData.PrivilegeAccessOrPPGTT = true; - contextDescriptor.sData.ADor64bitSupport = AUB::Traits::addressingBits > 32; + contextDescriptor.sData.valid = true; + contextDescriptor.sData.forcePageDirRestore = false; + contextDescriptor.sData.forceRestore = false; + contextDescriptor.sData.legacy = true; + contextDescriptor.sData.faultSupport = 0; + contextDescriptor.sData.privilegeAccessOrPPGTT = true; + contextDescriptor.sData.aDor64bitSupport = AUB::Traits::addressingBits > 32; - contextDescriptor.sData.LogicalRingCtxAddress = (uintptr_t)pLRCABase / 4096; - contextDescriptor.sData.ContextID = 0; + contextDescriptor.sData.logicalRingCtxAddress = (uintptr_t)pLRCABase / 4096; + contextDescriptor.sData.contextID = 0; aubFile.writeMMIO(AubMemDump::computeRegisterOffset(mmioBase, 0x2510), contextDescriptor.ulData[0]); aubFile.writeMMIO(AubMemDump::computeRegisterOffset(mmioBase, 0x2514), contextDescriptor.ulData[1]); diff --git a/opencl/test/unit_test/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.h b/opencl/test/unit_test/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.h index b9fc0bc47d..de977366c3 100644 --- a/opencl/test/unit_test/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.h +++ b/opencl/test/unit_test/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.h @@ -128,16 +128,16 @@ void setupAUBWithBatchBuffer(const NEO::Device *pDevice, aub_stream::EngineType typename AUB::MiContextDescriptorReg contextDescriptor = {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}; - contextDescriptor.sData.Valid = true; - contextDescriptor.sData.ForcePageDirRestore = false; - contextDescriptor.sData.ForceRestore = false; - contextDescriptor.sData.Legacy = true; - contextDescriptor.sData.FaultSupport = 0; - contextDescriptor.sData.PrivilegeAccessOrPPGTT = true; - contextDescriptor.sData.ADor64bitSupport = AUB::Traits::addressingBits > 32; + contextDescriptor.sData.valid = true; + contextDescriptor.sData.forcePageDirRestore = false; + contextDescriptor.sData.forceRestore = false; + contextDescriptor.sData.legacy = true; + contextDescriptor.sData.faultSupport = 0; + contextDescriptor.sData.privilegeAccessOrPPGTT = true; + contextDescriptor.sData.aDor64bitSupport = AUB::Traits::addressingBits > 32; - contextDescriptor.sData.LogicalRingCtxAddress = (uintptr_t)pLRCABase / 4096; - contextDescriptor.sData.ContextID = 0; + contextDescriptor.sData.logicalRingCtxAddress = (uintptr_t)pLRCABase / 4096; + contextDescriptor.sData.contextID = 0; // Submit our exec-list aubFile.writeMMIO(AubMemDump::computeRegisterOffset(mmioBase, 0x2230), 0); diff --git a/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests.cpp index 36a14fcca4..05676e2051 100644 --- a/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests.cpp @@ -160,19 +160,19 @@ HWTEST_F(EnqueueHandlerTimestampEnabledTest, givenProflingAndTimeStampPacketsEna CsrDependencies csrDeps; EnqueueProperties enqueueProperties(false, false, false, true, false, nullptr); - EXPECT_EQ(ev->submitTimeStamp.CPUTimeinNS, 0u); - EXPECT_EQ(ev->submitTimeStamp.GPUTimeStamp, 0u); + EXPECT_EQ(ev->submitTimeStamp.cpuTimeinNS, 0u); + EXPECT_EQ(ev->submitTimeStamp.gpuTimeStamp, 0u); mockCmdQ->enqueueCommandWithoutKernel(surfaces, 1, &mockCmdQ->getCS(0), 0, blocking, enqueueProperties, timestampPacketDependencies, eventsRequest, eventBuilder, 0, csrDeps, nullptr, false); - EXPECT_NE(ev->submitTimeStamp.CPUTimeinNS, 0u); - EXPECT_EQ(ev->submitTimeStamp.GPUTimeStamp, 0u); + EXPECT_NE(ev->submitTimeStamp.cpuTimeinNS, 0u); + EXPECT_EQ(ev->submitTimeStamp.gpuTimeStamp, 0u); - ev->queueTimeStamp.GPUTimeStamp = 1000; + ev->queueTimeStamp.gpuTimeStamp = 1000; ev->calculateSubmitTimestampData(); - EXPECT_NE(ev->submitTimeStamp.GPUTimeStamp, 0u); + EXPECT_NE(ev->submitTimeStamp.gpuTimeStamp, 0u); delete ev; } @@ -198,19 +198,19 @@ HWTEST_F(EnqueueHandlerTimestampDisabledTest, givenProflingEnabledTimeStampPacke CsrDependencies csrDeps; EnqueueProperties enqueueProperties(false, false, false, true, false, nullptr); - EXPECT_EQ(ev->submitTimeStamp.CPUTimeinNS, 0u); - EXPECT_EQ(ev->submitTimeStamp.GPUTimeStamp, 0u); + EXPECT_EQ(ev->submitTimeStamp.cpuTimeinNS, 0u); + EXPECT_EQ(ev->submitTimeStamp.gpuTimeStamp, 0u); mockCmdQ->enqueueCommandWithoutKernel(surfaces, 1, &mockCmdQ->getCS(0), 0, blocking, enqueueProperties, timestampPacketDependencies, eventsRequest, eventBuilder, 0, csrDeps, nullptr, false); - EXPECT_NE(ev->submitTimeStamp.CPUTimeinNS, 0u); - EXPECT_EQ(ev->submitTimeStamp.GPUTimeStamp, 0u); + EXPECT_NE(ev->submitTimeStamp.cpuTimeinNS, 0u); + EXPECT_EQ(ev->submitTimeStamp.gpuTimeStamp, 0u); - ev->queueTimeStamp.GPUTimeStamp = 1000; + ev->queueTimeStamp.gpuTimeStamp = 1000; ev->calculateSubmitTimestampData(); - EXPECT_NE(ev->submitTimeStamp.GPUTimeStamp, 0u); + EXPECT_NE(ev->submitTimeStamp.gpuTimeStamp, 0u); delete ev; } diff --git a/opencl/test/unit_test/command_queue/enqueue_map_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_map_image_tests.cpp index 08838a1210..de05f583e2 100644 --- a/opencl/test/unit_test/command_queue/enqueue_map_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_map_image_tests.cpp @@ -115,7 +115,7 @@ HWTEST_F(EnqueueMapImageTest, givenAllocatedMapPtrAndMapWithDifferentOriginIsCal EXPECT_NE(ptr1, ptr2); EXPECT_NE(nullptr, img->getAllocatedMapPtr()); - size_t mapOffset = img->getSurfaceFormatInfo().surfaceFormat.ImageElementSizeInBytes * origin2[0] + + size_t mapOffset = img->getSurfaceFormatInfo().surfaceFormat.imageElementSizeInBytes * origin2[0] + img->getHostPtrRowPitch() * origin2[1]; EXPECT_EQ(ptr2, ptrOffset(ptr1, mapOffset)); } diff --git a/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp index 4097007e29..d3aed70a73 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp @@ -482,7 +482,7 @@ HWTEST_P(MipMapWriteImageTest, GivenImageWithMipLevelNonZeroWhenReadImageIsCalle EXPECT_NE(nullptr, image.get()); auto hostPtrSize = Image::calculateHostPtrSize(region, image->getHostPtrRowPitch(), image->getHostPtrSlicePitch(), - image->getSurfaceFormatInfo().surfaceFormat.ImageElementSizeInBytes, imageType); + image->getSurfaceFormatInfo().surfaceFormat.imageElementSizeInBytes, imageType); std::unique_ptr ptr = std::unique_ptr(new uint32_t[hostPtrSize]); retVal = pCmdQ->enqueueWriteImage(image.get(), diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_2_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_2_tests.cpp index 39602bf140..bd83a9a709 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_2_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_2_tests.cpp @@ -1596,7 +1596,7 @@ HWTEST_F(BcsTestsImages, givenImage1DWhenAdjustBlitPropertiesForImageIsCalledThe imgDesc.image_height = 0u; imgDesc.image_depth = 0u; std::unique_ptr image(Image1dHelper<>::create(context.get(), &imgDesc)); - size_t expectedBytesPerPixel = image->getSurfaceFormatInfo().surfaceFormat.ImageElementSizeInBytes; + size_t expectedBytesPerPixel = image->getSurfaceFormatInfo().surfaceFormat.imageElementSizeInBytes; size_t expectedRowPitch = image->getImageDesc().image_row_pitch; size_t expectedSlicePitch = image->getImageDesc().image_slice_pitch; BlitProperties blitProperties{}; @@ -1624,7 +1624,7 @@ HWTEST_F(BcsTestsImages, givenImage1DBufferWhenAdjustBlitPropertiesForImageIsCal imgFormat.image_channel_order = CL_RGBA; imgFormat.image_channel_data_type = CL_UNSIGNED_INT8; std::unique_ptr image(Image1dHelper<>::create(context.get(), &imgDesc, &imgFormat)); - size_t originalBytesPerPixel = image->getSurfaceFormatInfo().surfaceFormat.ImageElementSizeInBytes; + size_t originalBytesPerPixel = image->getSurfaceFormatInfo().surfaceFormat.imageElementSizeInBytes; size_t expectedBytesPerPixel = 1; BlitProperties blitProperties{}; blitProperties.srcGpuAddress = image->getGraphicsAllocation(0)->getGpuAddress(); @@ -1656,7 +1656,7 @@ HWTEST_F(BcsTestsImages, givenImage2DArrayWhenAdjustBlitPropertiesForImageIsCall imgDesc.image_type = CL_MEM_OBJECT_IMAGE2D_ARRAY; std::unique_ptr image(Image2dArrayHelper<>::create(context.get(), &imgDesc)); - size_t expectedBytesPerPixel = image->getSurfaceFormatInfo().surfaceFormat.ImageElementSizeInBytes; + size_t expectedBytesPerPixel = image->getSurfaceFormatInfo().surfaceFormat.imageElementSizeInBytes; size_t expectedRowPitch = image->getImageDesc().image_row_pitch; size_t expectedSlicePitch = image->getImageDesc().image_slice_pitch; BlitProperties blitProperties{}; @@ -1729,7 +1729,7 @@ HWTEST_F(BcsTests, givenHostPtrToImageWhenConstructPropertiesIsCalledThenValuesA auto &csr = pDevice->getUltCommandStreamReceiver(); auto expectedDstPtr = image->getGraphicsAllocation(csr.getRootDeviceIndex())->getGpuAddress(); - auto expectedBytesPerPixel = image->getSurfaceFormatInfo().surfaceFormat.ImageElementSizeInBytes; + auto expectedBytesPerPixel = image->getSurfaceFormatInfo().surfaceFormat.imageElementSizeInBytes; auto srcRowPitchExpected = expectedBytesPerPixel * builtinOpParams.size.x; auto dstRowPitchExpected = image->getImageDesc().image_row_pitch; auto srcSlicePitchExpected = srcRowPitchExpected * builtinOpParams.size.y; @@ -1767,7 +1767,7 @@ HWTEST_F(BcsTests, givenImageToHostPtrWhenConstructPropertiesIsCalledThenValuesA auto &csr = pDevice->getUltCommandStreamReceiver(); auto expectedSrcPtr = image->getGraphicsAllocation(csr.getRootDeviceIndex())->getGpuAddress(); - auto expectedBytesPerPixel = image->getSurfaceFormatInfo().surfaceFormat.ImageElementSizeInBytes; + auto expectedBytesPerPixel = image->getSurfaceFormatInfo().surfaceFormat.imageElementSizeInBytes; auto srcRowPitchExpected = image->getImageDesc().image_row_pitch; auto dstRowPitchExpected = expectedBytesPerPixel * builtinOpParams.size.x; auto srcSlicePitchExpected = image->getImageDesc().image_slice_pitch; diff --git a/opencl/test/unit_test/context/context_get_info_tests.cpp b/opencl/test/unit_test/context/context_get_info_tests.cpp index 60c111f528..490ca105cd 100644 --- a/opencl/test/unit_test/context/context_get_info_tests.cpp +++ b/opencl/test/unit_test/context/context_get_info_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -25,7 +25,7 @@ struct ContextGetInfoTest : public PlatformFixture, void SetUp() override { PlatformFixture::setUp(); - ContextFixture::setUp(num_devices, devices); + ContextFixture::setUp(numDevices, devices); } void TearDown() override { @@ -69,7 +69,7 @@ TEST_F(ContextGetInfoTest, GivenNumDevicesParamNameWhenGettingInfoThenNumberOfDe &numDevices, nullptr); - EXPECT_EQ(this->num_devices, numDevices); + EXPECT_EQ(this->numDevices, numDevices); EXPECT_EQ(CL_SUCCESS, retVal); retVal = pContext->getInfo( @@ -84,15 +84,15 @@ TEST_F(ContextGetInfoTest, GivenNumDevicesParamNameWhenGettingInfoThenNumberOfDe } TEST_F(ContextGetInfoTest, GivenContextDevicesParamNameWhenGettingInfoThenCorrectDeviceIdsAreReturned) { - auto devicesReturned = new cl_device_id[this->num_devices]; + auto devicesReturned = new cl_device_id[this->numDevices]; retVal = pContext->getInfo( CL_CONTEXT_DEVICES, - this->num_devices * sizeof(cl_device_id), + this->numDevices * sizeof(cl_device_id), devicesReturned, nullptr); EXPECT_EQ(CL_SUCCESS, retVal); - for (size_t deviceOrdinal = 0; deviceOrdinal < this->num_devices; ++deviceOrdinal) { + for (size_t deviceOrdinal = 0; deviceOrdinal < this->numDevices; ++deviceOrdinal) { EXPECT_EQ(devices[deviceOrdinal], devicesReturned[deviceOrdinal]); } diff --git a/opencl/test/unit_test/context/context_tests.cpp b/opencl/test/unit_test/context/context_tests.cpp index 5d17a92b9c..641ec769f2 100644 --- a/opencl/test/unit_test/context/context_tests.cpp +++ b/opencl/test/unit_test/context/context_tests.cpp @@ -62,7 +62,7 @@ struct ContextTest : public PlatformFixture, properties.push_back(reinterpret_cast(pPlatform)); properties.push_back(0); - context = Context::create(properties.data(), ClDeviceVector(devices, num_devices), nullptr, nullptr, retVal); + context = Context::create(properties.data(), ClDeviceVector(devices, numDevices), nullptr, nullptr, retVal); ASSERT_NE(nullptr, context); } diff --git a/opencl/test/unit_test/context/driver_diagnostics_enqueue_tests.cpp b/opencl/test/unit_test/context/driver_diagnostics_enqueue_tests.cpp index fa11cc2ccf..63b2ac34ef 100644 --- a/opencl/test/unit_test/context/driver_diagnostics_enqueue_tests.cpp +++ b/opencl/test/unit_test/context/driver_diagnostics_enqueue_tests.cpp @@ -374,7 +374,7 @@ TEST_P(PerformanceHintEnqueueReadImageTest, GivenHostPtrAndSizeAlignmentsWhenEnq 0, nullptr, nullptr); - size_t sizeForReadImage = sizeForReadImageInPixels * image->getSurfaceFormatInfo().surfaceFormat.ImageElementSizeInBytes; + size_t sizeForReadImage = sizeForReadImageInPixels * image->getSurfaceFormatInfo().surfaceFormat.imageElementSizeInBytes; ASSERT_EQ(alignedSize, isAligned(sizeForReadImage)); snprintf(expectedHint, DriverDiagnostics::maxHintStringSize, DriverDiagnostics::hintFormat[CL_ENQUEUE_READ_IMAGE_DOESNT_MEET_ALIGNMENT_RESTRICTIONS], addressForReadImage, sizeForReadImage, MemoryConstants::pageSize, MemoryConstants::pageSize); diff --git a/opencl/test/unit_test/context/driver_diagnostics_tests.h b/opencl/test/unit_test/context/driver_diagnostics_tests.h index 9598f3b904..105ae1123b 100644 --- a/opencl/test/unit_test/context/driver_diagnostics_tests.h +++ b/opencl/test/unit_test/context/driver_diagnostics_tests.h @@ -71,7 +71,7 @@ struct PerformanceHintTest : public DriverDiagnosticsTest, void SetUp() override { DriverDiagnosticsTest::SetUp(); cl_context_properties validProperties[3] = {CL_CONTEXT_SHOW_DIAGNOSTICS_INTEL, CL_CONTEXT_DIAGNOSTICS_LEVEL_ALL_INTEL, 0}; - context = Context::create(validProperties, ClDeviceVector(devices, num_devices), callbackFunction, (void *)userData, retVal); + context = Context::create(validProperties, ClDeviceVector(devices, numDevices), callbackFunction, (void *)userData, retVal); EXPECT_EQ(CL_SUCCESS, retVal); } diff --git a/opencl/test/unit_test/context/get_supported_image_formats_tests.cpp b/opencl/test/unit_test/context/get_supported_image_formats_tests.cpp index 330460a393..6bdf7b88ea 100644 --- a/opencl/test/unit_test/context/get_supported_image_formats_tests.cpp +++ b/opencl/test/unit_test/context/get_supported_image_formats_tests.cpp @@ -33,7 +33,7 @@ struct GetSupportedImageFormatsTest : public PlatformFixture, void SetUp() override { PlatformFixture::setUp(); - ContextFixture::setUp(num_devices, devices); + ContextFixture::setUp(numDevices, devices); } void TearDown() override { @@ -159,11 +159,11 @@ TEST_P(GetSupportedImageFormatsTest, WhenRetrievingImageFormatsSRGBThenListIsNon TEST(ImageFormats, WhenCheckingIsDepthFormatThenCorrectValueReturned) { for (auto &format : SurfaceFormats::readOnly20()) { - EXPECT_FALSE(Image::isDepthFormat(format.OCLImageFormat)); + EXPECT_FALSE(Image::isDepthFormat(format.oclImageFormat)); } for (auto &format : SurfaceFormats::readOnlyDepth()) { - EXPECT_TRUE(Image::isDepthFormat(format.OCLImageFormat)); + EXPECT_TRUE(Image::isDepthFormat(format.oclImageFormat)); } } diff --git a/opencl/test/unit_test/context/gl/context_gl_tests.h b/opencl/test/unit_test/context/gl/context_gl_tests.h index 918ff9e44f..e0a4ea13c6 100644 --- a/opencl/test/unit_test/context/gl/context_gl_tests.h +++ b/opencl/test/unit_test/context/gl/context_gl_tests.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -26,7 +26,7 @@ struct GlContextTest : public PlatformFixture, public ::testing::Test { properties[1] = reinterpret_cast(static_cast(pPlatform)); properties[2] = 0; - context = Context::create(properties, ClDeviceVector(devices, num_devices), nullptr, nullptr, retVal); + context = Context::create(properties, ClDeviceVector(devices, numDevices), nullptr, nullptr, retVal); ASSERT_NE(nullptr, context); } diff --git a/opencl/test/unit_test/d3d_sharing/d3d_tests_part1.cpp b/opencl/test/unit_test/d3d_sharing/d3d_tests_part1.cpp index 0430e68224..376933b04c 100644 --- a/opencl/test/unit_test/d3d_sharing/d3d_tests_part1.cpp +++ b/opencl/test/unit_test/d3d_sharing/d3d_tests_part1.cpp @@ -712,7 +712,7 @@ TYPED_TEST_P(D3DTests, givenInvalidSubresourceWhenCreateTexture3dIsCalledThenFai TYPED_TEST_P(D3DTests, givenPackedFormatWhenLookingForSurfaceFormatWithPackedNotSupportedThenReturnNull) { EXPECT_GT(SurfaceFormats::packed().size(), 0u); for (auto &format : SurfaceFormats::packed()) { - auto surfaceFormat = D3DSharing::findSurfaceFormatInfo(format.surfaceFormat.GMMSurfaceFormat, CL_MEM_READ_ONLY, false /* supportsOcl20Features */, false /* packedSupported */); + auto surfaceFormat = D3DSharing::findSurfaceFormatInfo(format.surfaceFormat.gmmSurfaceFormat, CL_MEM_READ_ONLY, false /* supportsOcl20Features */, false /* packedSupported */); ASSERT_EQ(nullptr, surfaceFormat); } } @@ -721,7 +721,7 @@ TYPED_TEST_P(D3DTests, givenPackedFormatWhenLookingForSurfaceFormatWithPackedSup EXPECT_GT(SurfaceFormats::packed().size(), 0u); uint32_t counter = 0; for (auto &format : SurfaceFormats::packed()) { - auto surfaceFormat = D3DSharing::findSurfaceFormatInfo(format.surfaceFormat.GMMSurfaceFormat, CL_MEM_READ_ONLY, false /* supportsOcl20Features */, true /* packedSupported */); + auto surfaceFormat = D3DSharing::findSurfaceFormatInfo(format.surfaceFormat.gmmSurfaceFormat, CL_MEM_READ_ONLY, false /* supportsOcl20Features */, true /* packedSupported */); ASSERT_NE(nullptr, surfaceFormat); counter++; EXPECT_EQ(&format, surfaceFormat); @@ -733,11 +733,11 @@ TYPED_TEST_P(D3DTests, givenReadonlyFormatWhenLookingForSurfaceFormatThenReturnV EXPECT_GT(SurfaceFormats::readOnly12().size(), 0u); for (auto &format : SurfaceFormats::readOnly12()) { // only RGBA, BGRA, RG, R allowed for D3D - if (format.OCLImageFormat.image_channel_order == CL_RGBA || - format.OCLImageFormat.image_channel_order == CL_BGRA || - format.OCLImageFormat.image_channel_order == CL_RG || - format.OCLImageFormat.image_channel_order == CL_R) { - auto surfaceFormat = D3DSharing::findSurfaceFormatInfo(format.surfaceFormat.GMMSurfaceFormat, CL_MEM_READ_ONLY, false /* supportsOcl20Features */, true); + if (format.oclImageFormat.image_channel_order == CL_RGBA || + format.oclImageFormat.image_channel_order == CL_BGRA || + format.oclImageFormat.image_channel_order == CL_RG || + format.oclImageFormat.image_channel_order == CL_R) { + auto surfaceFormat = D3DSharing::findSurfaceFormatInfo(format.surfaceFormat.gmmSurfaceFormat, CL_MEM_READ_ONLY, false /* supportsOcl20Features */, true); ASSERT_NE(nullptr, surfaceFormat); EXPECT_EQ(&format, surfaceFormat); } @@ -748,11 +748,11 @@ TYPED_TEST_P(D3DTests, givenWriteOnlyFormatWhenLookingForSurfaceFormatThenReturn EXPECT_GT(SurfaceFormats::writeOnly().size(), 0u); for (auto &format : SurfaceFormats::writeOnly()) { // only RGBA, BGRA, RG, R allowed for D3D - if (format.OCLImageFormat.image_channel_order == CL_RGBA || - format.OCLImageFormat.image_channel_order == CL_BGRA || - format.OCLImageFormat.image_channel_order == CL_RG || - format.OCLImageFormat.image_channel_order == CL_R) { - auto surfaceFormat = D3DSharing::findSurfaceFormatInfo(format.surfaceFormat.GMMSurfaceFormat, CL_MEM_WRITE_ONLY, context->getDevice(0)->getHardwareInfo().capabilityTable.supportsOcl21Features, true); + if (format.oclImageFormat.image_channel_order == CL_RGBA || + format.oclImageFormat.image_channel_order == CL_BGRA || + format.oclImageFormat.image_channel_order == CL_RG || + format.oclImageFormat.image_channel_order == CL_R) { + auto surfaceFormat = D3DSharing::findSurfaceFormatInfo(format.surfaceFormat.gmmSurfaceFormat, CL_MEM_WRITE_ONLY, context->getDevice(0)->getHardwareInfo().capabilityTable.supportsOcl21Features, true); ASSERT_NE(nullptr, surfaceFormat); EXPECT_EQ(&format, surfaceFormat); } @@ -763,11 +763,11 @@ TYPED_TEST_P(D3DTests, givenReadWriteFormatWhenLookingForSurfaceFormatThenReturn EXPECT_GT(SurfaceFormats::readWrite().size(), 0u); for (auto &format : SurfaceFormats::readWrite()) { // only RGBA, BGRA, RG, R allowed for D3D - if (format.OCLImageFormat.image_channel_order == CL_RGBA || - format.OCLImageFormat.image_channel_order == CL_BGRA || - format.OCLImageFormat.image_channel_order == CL_RG || - format.OCLImageFormat.image_channel_order == CL_R) { - auto surfaceFormat = D3DSharing::findSurfaceFormatInfo(format.surfaceFormat.GMMSurfaceFormat, CL_MEM_READ_WRITE, context->getDevice(0)->getHardwareInfo().capabilityTable.supportsOcl21Features, true); + if (format.oclImageFormat.image_channel_order == CL_RGBA || + format.oclImageFormat.image_channel_order == CL_BGRA || + format.oclImageFormat.image_channel_order == CL_RG || + format.oclImageFormat.image_channel_order == CL_R) { + auto surfaceFormat = D3DSharing::findSurfaceFormatInfo(format.surfaceFormat.gmmSurfaceFormat, CL_MEM_READ_WRITE, context->getDevice(0)->getHardwareInfo().capabilityTable.supportsOcl21Features, true); ASSERT_NE(nullptr, surfaceFormat); EXPECT_EQ(&format, surfaceFormat); } diff --git a/opencl/test/unit_test/d3d_sharing/d3d_tests_part2.cpp b/opencl/test/unit_test/d3d_sharing/d3d_tests_part2.cpp index 2e59e09cc1..b4c9c1f9b2 100644 --- a/opencl/test/unit_test/d3d_sharing/d3d_tests_part2.cpp +++ b/opencl/test/unit_test/d3d_sharing/d3d_tests_part2.cpp @@ -434,24 +434,24 @@ TYPED_TEST_P(D3DTests, givenPlaneWhenFindYuvSurfaceCalledThenReturnValidImgForma int channelDataType[] = {CL_UNORM_INT8, CL_UNORM_INT16, CL_UNORM_INT16}; for (int n = 0; n < 3; n++) { surfaceFormat = D3DTexture::findYuvSurfaceFormatInfo(testFormat[n], ImagePlane::NO_PLANE, CL_MEM_READ_WRITE); - EXPECT_TRUE(surfaceFormat->OCLImageFormat.image_channel_order == CL_RG); - EXPECT_TRUE(surfaceFormat->OCLImageFormat.image_channel_data_type == channelDataType[n]); + EXPECT_TRUE(surfaceFormat->oclImageFormat.image_channel_order == CL_RG); + EXPECT_TRUE(surfaceFormat->oclImageFormat.image_channel_data_type == channelDataType[n]); surfaceFormat = D3DTexture::findYuvSurfaceFormatInfo(testFormat[n], ImagePlane::PLANE_U, CL_MEM_READ_WRITE); - EXPECT_TRUE(surfaceFormat->OCLImageFormat.image_channel_order == CL_RG); - EXPECT_TRUE(surfaceFormat->OCLImageFormat.image_channel_data_type == channelDataType[n]); + EXPECT_TRUE(surfaceFormat->oclImageFormat.image_channel_order == CL_RG); + EXPECT_TRUE(surfaceFormat->oclImageFormat.image_channel_data_type == channelDataType[n]); surfaceFormat = D3DTexture::findYuvSurfaceFormatInfo(testFormat[n], ImagePlane::PLANE_UV, CL_MEM_READ_WRITE); - EXPECT_TRUE(surfaceFormat->OCLImageFormat.image_channel_order == CL_RG); - EXPECT_TRUE(surfaceFormat->OCLImageFormat.image_channel_data_type == channelDataType[n]); + EXPECT_TRUE(surfaceFormat->oclImageFormat.image_channel_order == CL_RG); + EXPECT_TRUE(surfaceFormat->oclImageFormat.image_channel_data_type == channelDataType[n]); surfaceFormat = D3DTexture::findYuvSurfaceFormatInfo(testFormat[n], ImagePlane::PLANE_V, CL_MEM_READ_WRITE); - EXPECT_TRUE(surfaceFormat->OCLImageFormat.image_channel_order == CL_RG); - EXPECT_TRUE(surfaceFormat->OCLImageFormat.image_channel_data_type == channelDataType[n]); + EXPECT_TRUE(surfaceFormat->oclImageFormat.image_channel_order == CL_RG); + EXPECT_TRUE(surfaceFormat->oclImageFormat.image_channel_data_type == channelDataType[n]); surfaceFormat = D3DTexture::findYuvSurfaceFormatInfo(testFormat[n], ImagePlane::PLANE_Y, CL_MEM_READ_WRITE); - EXPECT_TRUE(surfaceFormat->OCLImageFormat.image_channel_order == CL_R); - EXPECT_TRUE(surfaceFormat->OCLImageFormat.image_channel_data_type == channelDataType[n]); + EXPECT_TRUE(surfaceFormat->oclImageFormat.image_channel_order == CL_R); + EXPECT_TRUE(surfaceFormat->oclImageFormat.image_channel_data_type == channelDataType[n]); } } diff --git a/opencl/test/unit_test/event/event_tests.cpp b/opencl/test/unit_test/event/event_tests.cpp index 0d319caa38..79e5dc6052 100644 --- a/opencl/test/unit_test/event/event_tests.cpp +++ b/opencl/test/unit_test/event/event_tests.cpp @@ -823,8 +823,8 @@ TEST_F(InternalsEventTest, givenDeviceTimestampBaseNotEnabledWhenCalculateStartT HwTimeStamps timestamp{}; timestamp.globalStartTS = 2; - event.queueTimeStamp.GPUTimeStamp = 1; - event.queueTimeStamp.CPUTimeinNS = 100; + event.queueTimeStamp.gpuTimeStamp = 1; + event.queueTimeStamp.cpuTimeinNS = 100; TagNode timestampNode{}; timestampNode.tagForCpuAccess = ×tamp; event.timeStampNode = ×tampNode; @@ -834,7 +834,7 @@ TEST_F(InternalsEventTest, givenDeviceTimestampBaseNotEnabledWhenCalculateStartT auto resolution = pClDevice->getDevice().getDeviceInfo().profilingTimerResolution; auto &gfxCoreHelper = pClDevice->getGfxCoreHelper(); - auto c0 = event.queueTimeStamp.CPUTimeinNS - gfxCoreHelper.getGpuTimeStampInNS(event.queueTimeStamp.GPUTimeStamp, resolution); + auto c0 = event.queueTimeStamp.cpuTimeinNS - gfxCoreHelper.getGpuTimeStampInNS(event.queueTimeStamp.gpuTimeStamp, resolution); EXPECT_EQ(start, static_cast(timestamp.globalStartTS * resolution) + c0); event.timeStampNode = nullptr; @@ -845,7 +845,7 @@ TEST_F(InternalsEventTest, givenDeviceTimestampBaseEnabledWhenGetEventProfilingI const cl_queue_properties props[3] = {CL_QUEUE_PROPERTIES, CL_QUEUE_PROFILING_ENABLE, 0}; MockCommandQueue cmdQ(mockContext, pClDevice, props, false); MockEvent event(&cmdQ, CL_COMMAND_MARKER, 0, 0); - event.queueTimeStamp.GPUTimeStamp = MockDeviceTimeWithConstTimestamp::gpuTimestamp; + event.queueTimeStamp.gpuTimeStamp = MockDeviceTimeWithConstTimestamp::gpuTimestamp; event.setCommand(std::unique_ptr(new CommandWithoutKernel(cmdQ))); event.submitCommand(false); @@ -863,7 +863,7 @@ TEST_F(InternalsEventTest, givenDeviceTimestampBaseEnabledWhenCalculateStartTime HwTimeStamps timestamp{}; timestamp.globalStartTS = 2; - event.queueTimeStamp.GPUTimeStamp = 1; + event.queueTimeStamp.gpuTimeStamp = 1; TagNode timestampNode{}; timestampNode.tagForCpuAccess = ×tamp; event.timeStampNode = ×tampNode; @@ -884,7 +884,7 @@ TEST_F(InternalsEventTest, givenDeviceTimestampBaseEnabledAndGlobalStartTSSmalle HwTimeStamps timestamp{}; timestamp.globalStartTS = 1; - event.queueTimeStamp.GPUTimeStamp = 2; + event.queueTimeStamp.gpuTimeStamp = 2; TagNode timestampNode{}; timestampNode.tagForCpuAccess = ×tamp; event.timeStampNode = ×tampNode; @@ -1311,13 +1311,13 @@ TEST_F(EventTest, WhenSettingCpuTimeStampThenCorrectTimeIsSet) { ev.setQueueTimeStamp(); TimeStampData outtimeStamp = {0, 0}; outtimeStamp = ev.getQueueTimeStamp(); - EXPECT_NE(0ULL, outtimeStamp.CPUTimeinNS); - EXPECT_EQ(0ULL, outtimeStamp.GPUTimeStamp); + EXPECT_NE(0ULL, outtimeStamp.cpuTimeinNS); + EXPECT_EQ(0ULL, outtimeStamp.gpuTimeStamp); ev.setSubmitTimeStamp(); outtimeStamp = ev.getSubmitTimeStamp(); - EXPECT_NE(0ULL, outtimeStamp.CPUTimeinNS); - EXPECT_EQ(0ULL, outtimeStamp.GPUTimeStamp); + EXPECT_NE(0ULL, outtimeStamp.cpuTimeinNS); + EXPECT_EQ(0ULL, outtimeStamp.gpuTimeStamp); ev.setStartTimeStamp(); uint64_t outCPUtimeStamp = ev.getStartTimeStamp(); @@ -1337,13 +1337,13 @@ TEST_F(EventTest, GivenNoQueueWhenSettingCpuTimeStampThenTimesIsNotSet) { ev.setQueueTimeStamp(); TimeStampData outtimeStamp = {0, 0}; outtimeStamp = ev.getQueueTimeStamp(); - EXPECT_EQ(0ULL, outtimeStamp.CPUTimeinNS); - EXPECT_EQ(0ULL, outtimeStamp.GPUTimeStamp); + EXPECT_EQ(0ULL, outtimeStamp.cpuTimeinNS); + EXPECT_EQ(0ULL, outtimeStamp.gpuTimeStamp); ev.setSubmitTimeStamp(); outtimeStamp = ev.getSubmitTimeStamp(); - EXPECT_EQ(0ULL, outtimeStamp.CPUTimeinNS); - EXPECT_EQ(0ULL, outtimeStamp.GPUTimeStamp); + EXPECT_EQ(0ULL, outtimeStamp.cpuTimeinNS); + EXPECT_EQ(0ULL, outtimeStamp.gpuTimeStamp); ev.setStartTimeStamp(); uint64_t outCPUtimeStamp = ev.getStartTimeStamp(); diff --git a/opencl/test/unit_test/fixtures/platform_fixture.cpp b/opencl/test/unit_test/fixtures/platform_fixture.cpp index b51079dcef..7a029d99c5 100644 --- a/opencl/test/unit_test/fixtures/platform_fixture.cpp +++ b/opencl/test/unit_test/fixtures/platform_fixture.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -21,14 +21,14 @@ void PlatformFixture::setUp() { bool isInitialized = initPlatform(); ASSERT_EQ(true, isInitialized); - num_devices = static_cast(pPlatform->getNumDevices()); - ASSERT_GT(num_devices, 0u); + numDevices = static_cast(pPlatform->getNumDevices()); + ASSERT_GT(numDevices, 0u); auto allDev = pPlatform->getClDevices(); ASSERT_NE(nullptr, allDev); - devices = new cl_device_id[num_devices]; - for (cl_uint deviceOrdinal = 0; deviceOrdinal < num_devices; ++deviceOrdinal) { + devices = new cl_device_id[numDevices]; + for (cl_uint deviceOrdinal = 0; deviceOrdinal < numDevices; ++deviceOrdinal) { auto device = allDev[deviceOrdinal]; ASSERT_NE(nullptr, device); devices[deviceOrdinal] = device; diff --git a/opencl/test/unit_test/fixtures/platform_fixture.h b/opencl/test/unit_test/fixtures/platform_fixture.h index e4485a3cab..b41d471b1a 100644 --- a/opencl/test/unit_test/fixtures/platform_fixture.h +++ b/opencl/test/unit_test/fixtures/platform_fixture.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -18,7 +18,7 @@ class PlatformFixture { Platform *pPlatform = nullptr; - cl_uint num_devices = 0u; + cl_uint numDevices = 0u; cl_device_id *devices = nullptr; }; } // namespace NEO diff --git a/opencl/test/unit_test/gen12lp/profiling_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/profiling_tests_gen12lp.inl index ded8a7ed42..10d7ab0901 100644 --- a/opencl/test/unit_test/gen12lp/profiling_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/profiling_tests_gen12lp.inl @@ -150,11 +150,11 @@ GEN12LPTEST_F(ProfilingTestsGen12LP, givenRawTimestampsDebugModeWhenDataIsQuerie MockEvent event(&cmdQ, CL_COMPLETE, 0, 0); cl_event clEvent = &event; - event.queueTimeStamp.CPUTimeinNS = 1; - event.queueTimeStamp.GPUTimeStamp = 2; + event.queueTimeStamp.cpuTimeinNS = 1; + event.queueTimeStamp.gpuTimeStamp = 2; - event.submitTimeStamp.CPUTimeinNS = 3; - event.submitTimeStamp.GPUTimeStamp = 4; + event.submitTimeStamp.cpuTimeinNS = 3; + event.submitTimeStamp.gpuTimeStamp = 4; event.setCPUProfilingPath(false); event.timeStampNode = ×tampNode; @@ -171,7 +171,7 @@ GEN12LPTEST_F(ProfilingTestsGen12LP, givenRawTimestampsDebugModeWhenDataIsQuerie EXPECT_EQ(timestamp.globalEndTS, complete); EXPECT_EQ(timestamp.globalEndTS, end); EXPECT_EQ(timestamp.globalStartTS, start); - EXPECT_EQ(event.submitTimeStamp.GPUTimeStamp, submited); - EXPECT_EQ(event.queueTimeStamp.GPUTimeStamp, queued); + EXPECT_EQ(event.submitTimeStamp.gpuTimeStamp, submited); + EXPECT_EQ(event.queueTimeStamp.gpuTimeStamp, queued); event.timeStampNode = nullptr; } diff --git a/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp b/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp index 880cfa9c70..2755c8fcb3 100644 --- a/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp +++ b/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp @@ -329,7 +329,7 @@ TEST_F(GmmTests, givenZeroRowPitchWhenQueryImgFromBufferParamsThenCalculate) { imgDesc.imageRowPitch = 0; auto imgInfo = MockGmm::initImgInfo(imgDesc, 0, nullptr); - size_t expectedRowPitch = imgDesc.imageWidth * imgInfo.surfaceFormat->ImageElementSizeInBytes; + size_t expectedRowPitch = imgDesc.imageWidth * imgInfo.surfaceFormat->imageElementSizeInBytes; GmmTypesConverter::queryImgFromBufferParams(imgInfo, &bufferAllocation); EXPECT_EQ(imgInfo.rowPitch, expectedRowPitch); @@ -1211,7 +1211,7 @@ TEST_F(GmmCompressionTests, givenDisabledAndPreferredE2ECWhenApplyingForBuffersT HWTEST_F(GmmCompressionTests, givenAllValidInputsWhenQueryingThenSetAppropriateFlags) { EXPECT_TRUE(localPlatformDevice->capabilityTable.ftrRenderCompressedImages); - EXPECT_TRUE(imgInfo.surfaceFormat->GMMSurfaceFormat != GMM_RESOURCE_FORMAT::GMM_FORMAT_NV12); + EXPECT_TRUE(imgInfo.surfaceFormat->gmmSurfaceFormat != GMM_RESOURCE_FORMAT::GMM_FORMAT_NV12); EXPECT_TRUE(imgInfo.plane == GMM_YUV_PLANE_ENUM::GMM_NO_PLANE); auto queryGmm = MockGmm::queryImgParams(getGmmHelper(), imgInfo, true); @@ -1230,7 +1230,7 @@ HWTEST_F(GmmCompressionTests, givenAllValidInputsWhenQueryingThenSetAppropriateF TEST_F(GmmCompressionTests, givenAllValidInputsAndNoLocalMemoryRequestWhenQueryingThenRenderCompressionFlagsAreNotSet) { EXPECT_TRUE(localPlatformDevice->capabilityTable.ftrRenderCompressedImages); - EXPECT_TRUE(imgInfo.surfaceFormat->GMMSurfaceFormat != GMM_RESOURCE_FORMAT::GMM_FORMAT_NV12); + EXPECT_TRUE(imgInfo.surfaceFormat->gmmSurfaceFormat != GMM_RESOURCE_FORMAT::GMM_FORMAT_NV12); EXPECT_TRUE(imgInfo.plane == GMM_YUV_PLANE_ENUM::GMM_NO_PLANE); imgInfo.useLocalMemory = false; @@ -1291,7 +1291,7 @@ TEST_F(GmmCompressionTests, givenNotPreferredCompressionFlagWhenQueryingThenDisa TEST_F(GmmCompressionTests, givenNV12FormatWhenQueryingThenDisallow) { imgInfo.surfaceFormat = &SurfaceFormats::planarYuv()[0].surfaceFormat; - EXPECT_TRUE(imgInfo.surfaceFormat->GMMSurfaceFormat == GMM_RESOURCE_FORMAT::GMM_FORMAT_NV12); + EXPECT_TRUE(imgInfo.surfaceFormat->gmmSurfaceFormat == GMM_RESOURCE_FORMAT::GMM_FORMAT_NV12); auto queryGmm = MockGmm::queryImgParams(getGmmHelper(), imgInfo, true); auto resourceFormat = queryGmm->gmmResourceInfo->getResourceFormat(); diff --git a/opencl/test/unit_test/helpers/cl_helper_tests.cpp b/opencl/test/unit_test/helpers/cl_helper_tests.cpp index a78bd36a1d..c5883c2300 100644 --- a/opencl/test/unit_test/helpers/cl_helper_tests.cpp +++ b/opencl/test/unit_test/helpers/cl_helper_tests.cpp @@ -151,7 +151,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, ClGfxCoreHelperTest, givenCLImageFormatsWhenCallingI auto &clGfxCoreHelper = getHelper(); auto formats = SurfaceFormats::readWrite(); for (const auto &format : formats) { - const cl_image_format oclFormat = format.OCLImageFormat; + const cl_image_format oclFormat = format.oclImageFormat; bool expectedResult = true; for (const auto &nonRedescribableFormat : redescribeFormats) { expectedResult &= (memcmp(&oclFormat, &nonRedescribableFormat, sizeof(cl_image_format)) != 0); diff --git a/opencl/test/unit_test/helpers/mipmap_tests.cpp b/opencl/test/unit_test/helpers/mipmap_tests.cpp index 97eca43e20..6bccd03da5 100644 --- a/opencl/test/unit_test/helpers/mipmap_tests.cpp +++ b/opencl/test/unit_test/helpers/mipmap_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -76,7 +76,7 @@ TEST(MipmapHelper, givenBufferWhenIsMipMappedIsCalledThenFalseIsReturned) { struct MockImage : MockImageBase { MockImage() : MockImageBase() { - surfaceFormatInfo.surfaceFormat.ImageElementSizeInBytes = 4u; + surfaceFormatInfo.surfaceFormat.imageElementSizeInBytes = 4u; } }; diff --git a/opencl/test/unit_test/kernel/kernel_image_arg_tests.cpp b/opencl/test/unit_test/kernel/kernel_image_arg_tests.cpp index b4fd310cbf..542889792b 100644 --- a/opencl/test/unit_test/kernel/kernel_image_arg_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_image_arg_tests.cpp @@ -62,7 +62,7 @@ TEST_F(KernelImageArgTest, givenKernelWithFlatImageTokensWhenArgIsSetThenPatchAl pKernel->setArg(0, sizeof(memObj), &memObj); auto crossThreadData = reinterpret_cast(pKernel->getCrossThreadData()); - auto pixelSize = image->getSurfaceFormatInfo().surfaceFormat.ImageElementSizeInBytes; + auto pixelSize = image->getSurfaceFormatInfo().surfaceFormat.imageElementSizeInBytes; const auto &metadata = pKernel->getKernelInfo().getArgDescriptorAt(0).as().metadataPayload; auto offsetFlatBaseOffset = ptrOffset(crossThreadData, metadata.flatBaseOffset); diff --git a/opencl/test/unit_test/mem_obj/buffer_tests.cpp b/opencl/test/unit_test/mem_obj/buffer_tests.cpp index 061fdda830..921bfe322d 100644 --- a/opencl/test/unit_test/mem_obj/buffer_tests.cpp +++ b/opencl/test/unit_test/mem_obj/buffer_tests.cpp @@ -2061,11 +2061,11 @@ HWTEST_F(BufferUnmapTest, givenBufferWithSharingHandlerWhenUnmappingThenUseNonBl auto mappedPtr = clEnqueueMapBuffer(&cmdQ, buffer.get(), CL_TRUE, CL_MAP_WRITE, 0, 1, 0, nullptr, nullptr, &retVal); EXPECT_EQ(CL_SUCCESS, retVal); - EXPECT_EQ(0u, cmdQ.EnqueueWriteBufferCounter); + EXPECT_EQ(0u, cmdQ.enqueueWriteBufferCounter); retVal = clEnqueueUnmapMemObject(&cmdQ, buffer.get(), mappedPtr, 0, nullptr, nullptr); EXPECT_EQ(CL_SUCCESS, retVal); - EXPECT_EQ(1u, cmdQ.EnqueueWriteBufferCounter); + EXPECT_EQ(1u, cmdQ.enqueueWriteBufferCounter); EXPECT_FALSE(cmdQ.blockingWriteBuffer); } @@ -2085,7 +2085,7 @@ HWTEST_F(BufferUnmapTest, givenBufferWithoutSharingHandlerWhenUnmappingThenDontU retVal = clEnqueueUnmapMemObject(&cmdQ, buffer.get(), mappedPtr, 0, nullptr, nullptr); EXPECT_EQ(CL_SUCCESS, retVal); - EXPECT_EQ(0u, cmdQ.EnqueueWriteBufferCounter); + EXPECT_EQ(0u, cmdQ.enqueueWriteBufferCounter); } using BufferTransferTests = BufferUnmapTest; diff --git a/opencl/test/unit_test/mem_obj/create_image_in_local_memory_tests.cpp b/opencl/test/unit_test/mem_obj/create_image_in_local_memory_tests.cpp index 3300251359..5ad10c2567 100644 --- a/opencl/test/unit_test/mem_obj/create_image_in_local_memory_tests.cpp +++ b/opencl/test/unit_test/mem_obj/create_image_in_local_memory_tests.cpp @@ -80,7 +80,7 @@ TEST_F(ImageInLocalMemoryTest, givenImageWithoutHostPtrWhenLocalMemoryIsEnabledT auto imgGfxAlloc = image->getGraphicsAllocation(device->getRootDeviceIndex()); ASSERT_NE(nullptr, imgGfxAlloc); EXPECT_EQ(MemoryPool::LocalMemory, imgGfxAlloc->getMemoryPool()); - EXPECT_LE(imageDesc.image_width * surfaceFormat->surfaceFormat.ImageElementSizeInBytes, imgGfxAlloc->getUnderlyingBufferSize()); + EXPECT_LE(imageDesc.image_width * surfaceFormat->surfaceFormat.imageElementSizeInBytes, imgGfxAlloc->getUnderlyingBufferSize()); EXPECT_EQ(AllocationType::IMAGE, imgGfxAlloc->getAllocationType()); EXPECT_EQ(0u, imgGfxAlloc->getDefaultGmm()->resourceParams.Flags.Info.NonLocalOnly); diff --git a/opencl/test/unit_test/mem_obj/image_redescribe_tests.cpp b/opencl/test/unit_test/mem_obj/image_redescribe_tests.cpp index 0cb34035ed..b8370c95b8 100644 --- a/opencl/test/unit_test/mem_obj/image_redescribe_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_redescribe_tests.cpp @@ -34,7 +34,7 @@ class ImageRedescribeTest : public testing::TestWithParam readWriteSurfaceFormats = SurfaceFormats::readWrite(); auto &surfaceFormatInfo = readWriteSurfaceFormats[indexImageFormat]; - imageFormat = surfaceFormatInfo.OCLImageFormat; + imageFormat = surfaceFormatInfo.oclImageFormat; auto imageHeight = imageType == CL_MEM_OBJECT_IMAGE1D_ARRAY ? 0 : 32; auto imageArrays = imageType == CL_MEM_OBJECT_IMAGE1D_ARRAY || imageType == CL_MEM_OBJECT_IMAGE2D_ARRAY ? 7 : 1; @@ -80,19 +80,19 @@ TEST_P(ImageRedescribeTest, givenImageWhenItIsRedescribedThenItContainsProperFor EXPECT_EQ(static_cast(CL_MEM_USE_HOST_PTR), imageNew->getFlags() & CL_MEM_USE_HOST_PTR); EXPECT_EQ(image->getCpuAddress(), imageNew->getCpuAddress()); - EXPECT_NE(static_cast(CL_FLOAT), imageNew->getSurfaceFormatInfo().OCLImageFormat.image_channel_data_type); - EXPECT_NE(static_cast(CL_HALF_FLOAT), imageNew->getSurfaceFormatInfo().OCLImageFormat.image_channel_data_type); - EXPECT_EQ(imageNew->getSurfaceFormatInfo().surfaceFormat.NumChannels * imageNew->getSurfaceFormatInfo().surfaceFormat.PerChannelSizeInBytes, - imageNew->getSurfaceFormatInfo().surfaceFormat.ImageElementSizeInBytes); - EXPECT_EQ(image->getSurfaceFormatInfo().surfaceFormat.ImageElementSizeInBytes, - imageNew->getSurfaceFormatInfo().surfaceFormat.ImageElementSizeInBytes); + EXPECT_NE(static_cast(CL_FLOAT), imageNew->getSurfaceFormatInfo().oclImageFormat.image_channel_data_type); + EXPECT_NE(static_cast(CL_HALF_FLOAT), imageNew->getSurfaceFormatInfo().oclImageFormat.image_channel_data_type); + EXPECT_EQ(imageNew->getSurfaceFormatInfo().surfaceFormat.numChannels * imageNew->getSurfaceFormatInfo().surfaceFormat.perChannelSizeInBytes, + imageNew->getSurfaceFormatInfo().surfaceFormat.imageElementSizeInBytes); + EXPECT_EQ(image->getSurfaceFormatInfo().surfaceFormat.imageElementSizeInBytes, + imageNew->getSurfaceFormatInfo().surfaceFormat.imageElementSizeInBytes); } TEST_P(ImageRedescribeTest, givenImageWhenItIsRedescribedThenNewImageFormatHasNumberOfChannelsDependingOnBytesPerPixel) { std::unique_ptr imageNew(image->redescribe()); ASSERT_NE(nullptr, imageNew); - size_t bytesPerPixel = image->getSurfaceFormatInfo().surfaceFormat.NumChannels * image->getSurfaceFormatInfo().surfaceFormat.PerChannelSizeInBytes; + size_t bytesPerPixel = image->getSurfaceFormatInfo().surfaceFormat.numChannels * image->getSurfaceFormatInfo().surfaceFormat.perChannelSizeInBytes; size_t channelsExpected = 0; switch (bytesPerPixel) { case 1: @@ -107,15 +107,15 @@ TEST_P(ImageRedescribeTest, givenImageWhenItIsRedescribedThenNewImageFormatHasNu channelsExpected = 4; break; } - EXPECT_EQ(channelsExpected, imageNew->getSurfaceFormatInfo().surfaceFormat.NumChannels); + EXPECT_EQ(channelsExpected, imageNew->getSurfaceFormatInfo().surfaceFormat.numChannels); } TEST_P(ImageRedescribeTest, givenImageWhenItIsRedescribedThenNewImageDimensionsAreMatchingTheRedescribedImage) { std::unique_ptr imageNew(image->redescribe()); ASSERT_NE(nullptr, imageNew); - auto bytesWide = image->getSurfaceFormatInfo().surfaceFormat.ImageElementSizeInBytes * image->getImageDesc().image_width; - auto bytesWideNew = imageNew->getSurfaceFormatInfo().surfaceFormat.ImageElementSizeInBytes * imageNew->getImageDesc().image_width; + auto bytesWide = image->getSurfaceFormatInfo().surfaceFormat.imageElementSizeInBytes * image->getImageDesc().image_width; + auto bytesWideNew = imageNew->getSurfaceFormatInfo().surfaceFormat.imageElementSizeInBytes * imageNew->getImageDesc().image_width; EXPECT_EQ(bytesWide, bytesWideNew); EXPECT_EQ(imageNew->getImageDesc().image_height, image->getImageDesc().image_height); @@ -155,7 +155,7 @@ TEST_P(ImageRedescribeTest, givenImageWithMaxSizesWhenItIsRedescribedThenNewImag ArrayRef readWriteSurfaceFormats = SurfaceFormats::readWrite(); auto &surfaceFormatInfo = readWriteSurfaceFormats[indexImageFormat]; - imageFormat = surfaceFormatInfo.OCLImageFormat; + imageFormat = surfaceFormatInfo.oclImageFormat; auto imageWidth = 1; auto imageHeight = 1; diff --git a/opencl/test/unit_test/mem_obj/image_set_arg_tests.cpp b/opencl/test/unit_test/mem_obj/image_set_arg_tests.cpp index 55c8610f89..a12d795f10 100644 --- a/opencl/test/unit_test/mem_obj/image_set_arg_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_set_arg_tests.cpp @@ -142,7 +142,7 @@ HWTEST_F(ImageSetArgTest, GivenMediaBlockImageWhenSettingImageArgThenCorrectValu srcImage->setImageArg(&surfaceState, true, 0, pClDevice->getRootDeviceIndex(), false); auto computedWidth = surfaceState.getWidth(); - auto expectedWidth = (srcImage->getImageDesc().image_width * srcImage->getSurfaceFormatInfo().surfaceFormat.ImageElementSizeInBytes) / sizeof(uint32_t); + auto expectedWidth = (srcImage->getImageDesc().image_width * srcImage->getSurfaceFormatInfo().surfaceFormat.imageElementSizeInBytes) / sizeof(uint32_t); EXPECT_EQ(expectedWidth, computedWidth); } @@ -266,8 +266,8 @@ HWTEST_F(ImageSetArgTest, givenImageArraySizeGreaterThanOneButTypeIsNotImageArra ImageInfo imageInfo = {}; ClSurfaceFormatInfo surfaceFormatInfo{}; - surfaceFormatInfo.surfaceFormat.GMMSurfaceFormat = GMM_FORMAT_B8G8R8A8_UNORM; - surfaceFormatInfo.surfaceFormat.ImageElementSizeInBytes = 4u; + surfaceFormatInfo.surfaceFormat.gmmSurfaceFormat = GMM_FORMAT_B8G8R8A8_UNORM; + surfaceFormatInfo.surfaceFormat.imageElementSizeInBytes = 4u; imageInfo.surfaceFormat = &surfaceFormatInfo.surfaceFormat; cl_image_desc imageDesc = Image2dDefaults::imageDesc; imageDesc.image_array_size = 3u; @@ -374,7 +374,7 @@ HWTEST_F(ImageSetArgTest, WhenSettingKernelArgThenPropertiesAreSetCorrectly) { EXPECT_EQ(srcImage->getImageDesc().image_depth, surfaceState->getRenderTargetViewExtent()); EXPECT_EQ(rPitch, surfaceState->getSurfacePitch()); EXPECT_EQ(0u, surfaceState->getSurfaceQpitch() % 4); - EXPECT_EQ(srcImage->getSurfaceFormatInfo().surfaceFormat.GenxSurfaceFormat, (GFX3DSTATE_SURFACEFORMAT)surfaceState->getSurfaceFormat()); + EXPECT_EQ(srcImage->getSurfaceFormatInfo().surfaceFormat.genxSurfaceFormat, (GFX3DSTATE_SURFACEFORMAT)surfaceState->getSurfaceFormat()); EXPECT_EQ(RENDER_SURFACE_STATE::SURFACE_TYPE_SURFTYPE_3D, surfaceState->getSurfaceType()); EXPECT_EQ(expectedChannelRed, surfaceState->getShaderChannelSelectRed()); EXPECT_EQ(expectedChannelGreen, surfaceState->getShaderChannelSelectGreen()); @@ -446,7 +446,7 @@ HWTEST_F(ImageSetArgTest, Given2dArrayWhenSettingKernelArgThenPropertiesAreSetCo EXPECT_EQ(image2Darray->getImageDesc().image_array_size, surfaceState->getRenderTargetViewExtent()); EXPECT_EQ(rPitch, surfaceState->getSurfacePitch()); EXPECT_EQ(0u, surfaceState->getSurfaceQpitch() % 4); - EXPECT_EQ(image2Darray->getSurfaceFormatInfo().surfaceFormat.GenxSurfaceFormat, (GFX3DSTATE_SURFACEFORMAT)surfaceState->getSurfaceFormat()); + EXPECT_EQ(image2Darray->getSurfaceFormatInfo().surfaceFormat.genxSurfaceFormat, (GFX3DSTATE_SURFACEFORMAT)surfaceState->getSurfaceFormat()); EXPECT_EQ(RENDER_SURFACE_STATE::SURFACE_TYPE_SURFTYPE_2D, surfaceState->getSurfaceType()); EXPECT_TRUE((GFX3DSTATE_SURFACEFORMAT)surfaceState->getSurfaceArray()); @@ -494,7 +494,7 @@ HWTEST_F(ImageSetArgTest, Given1dArrayWhenSettingKernelArgThenPropertiesAreSetCo EXPECT_EQ(0u, surfaceState->getSurfaceQpitch() % 4); EXPECT_EQ(graphicsAllocation->getDefaultGmm()->queryQPitch(GMM_RESOURCE_TYPE::RESOURCE_1D), surfaceState->getSurfaceQpitch()); - EXPECT_EQ(image1Darray->getSurfaceFormatInfo().surfaceFormat.GenxSurfaceFormat, (GFX3DSTATE_SURFACEFORMAT)surfaceState->getSurfaceFormat()); + EXPECT_EQ(image1Darray->getSurfaceFormatInfo().surfaceFormat.genxSurfaceFormat, (GFX3DSTATE_SURFACEFORMAT)surfaceState->getSurfaceFormat()); EXPECT_EQ(RENDER_SURFACE_STATE::SURFACE_TYPE_SURFTYPE_1D, surfaceState->getSurfaceType()); EXPECT_TRUE((GFX3DSTATE_SURFACEFORMAT)surfaceState->getSurfaceArray()); @@ -814,7 +814,7 @@ HWTEST_F(ImageSetArgTest, GivenImageFrom1dBufferWhenSettingKernelArgThenProperti EXPECT_EQ(0u, surfaceState->getSurfaceQpitch() % 4); EXPECT_EQ(0u, surfaceState->getSurfaceQpitch()); - EXPECT_EQ(image->getSurfaceFormatInfo().surfaceFormat.GenxSurfaceFormat, (GFX3DSTATE_SURFACEFORMAT)surfaceState->getSurfaceFormat()); + EXPECT_EQ(image->getSurfaceFormatInfo().surfaceFormat.genxSurfaceFormat, (GFX3DSTATE_SURFACEFORMAT)surfaceState->getSurfaceFormat()); EXPECT_EQ(RENDER_SURFACE_STATE::SURFACE_TYPE_SURFTYPE_BUFFER, surfaceState->getSurfaceType()); EXPECT_FALSE((GFX3DSTATE_SURFACEFORMAT)surfaceState->getSurfaceArray()); @@ -970,7 +970,7 @@ HWTEST_F(ImageMediaBlockSetArgTest, WhenSettingKernelArgImageThenPropertiesAreCo auto surfaceAddress = surfaceState->getSurfaceBaseAddress(); EXPECT_EQ(srcAllocation->getGpuAddress(), surfaceAddress); - uint32_t elementSize = static_cast(srcImage->getSurfaceFormatInfo().surfaceFormat.ImageElementSizeInBytes); + uint32_t elementSize = static_cast(srcImage->getSurfaceFormatInfo().surfaceFormat.imageElementSizeInBytes); setupChannels(srcImage->getImageFormat().image_channel_order); @@ -980,7 +980,7 @@ HWTEST_F(ImageMediaBlockSetArgTest, WhenSettingKernelArgImageThenPropertiesAreCo EXPECT_EQ(srcImage->getImageDesc().image_depth, surfaceState->getRenderTargetViewExtent()); EXPECT_EQ(rPitch, surfaceState->getSurfacePitch()); EXPECT_EQ(0u, surfaceState->getSurfaceQpitch() % 4); - EXPECT_EQ(srcImage->getSurfaceFormatInfo().surfaceFormat.GenxSurfaceFormat, (GFX3DSTATE_SURFACEFORMAT)surfaceState->getSurfaceFormat()); + EXPECT_EQ(srcImage->getSurfaceFormatInfo().surfaceFormat.genxSurfaceFormat, (GFX3DSTATE_SURFACEFORMAT)surfaceState->getSurfaceFormat()); EXPECT_EQ(RENDER_SURFACE_STATE::SURFACE_TYPE_SURFTYPE_3D, surfaceState->getSurfaceType()); EXPECT_EQ(expectedChannelRed, surfaceState->getShaderChannelSelectRed()); EXPECT_EQ(expectedChannelGreen, surfaceState->getShaderChannelSelectGreen()); diff --git a/opencl/test/unit_test/mem_obj/image_snorm_tests.cpp b/opencl/test/unit_test/mem_obj/image_snorm_tests.cpp index 0d6b0ce1d4..ba459b822a 100644 --- a/opencl/test/unit_test/mem_obj/image_snorm_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_snorm_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -40,12 +40,12 @@ TEST_P(SnormSurfaceFormatAccessFlagsTests, givenSnormFormatWhenGetSurfaceFormatF cl_mem_flags flags = GetParam(); for (const auto &snormSurfaceFormat : referenceSnormSurfaceFormats) { - auto format = Image::getSurfaceFormatFromTable(flags, &snormSurfaceFormat.OCLImageFormat, false /* supportsOcl20Features */); + auto format = Image::getSurfaceFormatFromTable(flags, &snormSurfaceFormat.oclImageFormat, false /* supportsOcl20Features */); EXPECT_NE(nullptr, format); EXPECT_TRUE(memcmp(&snormSurfaceFormat, format, sizeof(ClSurfaceFormatInfo)) == 0); } for (const auto &snormSurfaceFormat : referenceSnormSurfaceFormats) { - auto format = Image::getSurfaceFormatFromTable(flags, &snormSurfaceFormat.OCLImageFormat, true /* supportsOcl20Features */); + auto format = Image::getSurfaceFormatFromTable(flags, &snormSurfaceFormat.oclImageFormat, true /* supportsOcl20Features */); EXPECT_NE(nullptr, format); EXPECT_TRUE(memcmp(&snormSurfaceFormat, format, sizeof(ClSurfaceFormatInfo)) == 0); } @@ -58,7 +58,7 @@ TEST_P(SnormSurfaceFormatTests, givenSnormOclFormatWhenCheckingrReadOnlySurfaceF size_t snormFormatsFound = 0; for (const auto &format : formatsTable) { - auto oclFormat = format.OCLImageFormat; + auto oclFormat = format.oclImageFormat; if (CL_SNORM_INT8 == oclFormat.image_channel_data_type || CL_SNORM_INT16 == oclFormat.image_channel_data_type) { EXPECT_TRUE(oclFormat.image_channel_order == CL_R || oclFormat.image_channel_order == CL_RG || oclFormat.image_channel_order == CL_RGBA); snormFormatsFound++; diff --git a/opencl/test/unit_test/mem_obj/image_tests.cpp b/opencl/test/unit_test/mem_obj/image_tests.cpp index c050e5c788..e4bf82510c 100644 --- a/opencl/test/unit_test/mem_obj/image_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_tests.cpp @@ -637,7 +637,7 @@ TEST(TestCreateImageUseHostPtr, givenZeroCopyImageValuesWhenUsingHostPtrThenZero cl_mem_flags flags = CL_MEM_READ_WRITE | CL_MEM_USE_HOST_PTR; auto surfaceFormat = Image::getSurfaceFormatFromTable( flags, &imageFormat, context.getDevice(0)->getHardwareInfo().capabilityTable.supportsOcl21Features); - auto hostPtr = alignedMalloc(imageDesc.image_width * surfaceFormat->surfaceFormat.ImageElementSizeInBytes, + auto hostPtr = alignedMalloc(imageDesc.image_width * surfaceFormat->surfaceFormat.imageElementSizeInBytes, MemoryConstants::cacheLineSize); auto image = std::unique_ptr(Image::create( @@ -1278,7 +1278,7 @@ HWTEST_F(ImageTests, givenImageWhenAskedForPtrOffsetForGpuMappingThenReturnCorre MemObjOffsetArray origin = {{4, 5, 6}}; auto retOffset = image->calculateOffsetForMapping(origin); - size_t expectedOffset = image->getSurfaceFormatInfo().surfaceFormat.ImageElementSizeInBytes * origin[0] + + size_t expectedOffset = image->getSurfaceFormatInfo().surfaceFormat.imageElementSizeInBytes * origin[0] + image->getHostPtrRowPitch() * origin[1] + image->getHostPtrSlicePitch() * origin[2]; EXPECT_EQ(expectedOffset, retOffset); @@ -1304,7 +1304,7 @@ TEST(ImageTest, givenImageWhenAskedForPtrOffsetForCpuMappingThenReturnCorrectVal MemObjOffsetArray origin = {{4, 5, 6}}; auto retOffset = image->calculateOffsetForMapping(origin); - size_t expectedOffset = image->getSurfaceFormatInfo().surfaceFormat.ImageElementSizeInBytes * origin[0] + + size_t expectedOffset = image->getSurfaceFormatInfo().surfaceFormat.imageElementSizeInBytes * origin[0] + image->getImageDesc().image_row_pitch * origin[1] + image->getImageDesc().image_slice_pitch * origin[2]; @@ -1318,7 +1318,7 @@ TEST(ImageTest, given1DArrayImageWhenAskedForPtrOffsetForMappingThenReturnCorrec MemObjOffsetArray origin = {{4, 5, 0}}; auto retOffset = image->calculateOffsetForMapping(origin); - size_t expectedOffset = image->getSurfaceFormatInfo().surfaceFormat.ImageElementSizeInBytes * origin[0] + + size_t expectedOffset = image->getSurfaceFormatInfo().surfaceFormat.imageElementSizeInBytes * origin[0] + image->getImageDesc().image_slice_pitch * origin[1]; EXPECT_EQ(expectedOffset, retOffset); @@ -1335,7 +1335,7 @@ HWTEST_F(ImageTests, givenImageWhenAskedForPtrLengthForGpuMappingThenReturnCorre MemObjSizeArray region = {{4, 5, 6}}; auto retLength = image->calculateMappedPtrLength(region); - size_t expectedLength = image->getSurfaceFormatInfo().surfaceFormat.ImageElementSizeInBytes * region[0] + + size_t expectedLength = image->getSurfaceFormatInfo().surfaceFormat.imageElementSizeInBytes * region[0] + image->getHostPtrRowPitch() * region[1] + image->getHostPtrSlicePitch() * region[2]; EXPECT_EQ(expectedLength, retLength); @@ -1351,7 +1351,7 @@ TEST(ImageTest, givenImageWhenAskedForPtrLengthForCpuMappingThenReturnCorrectVal MemObjSizeArray region = {{4, 5, 6}}; auto retLength = image->calculateMappedPtrLength(region); - size_t expectedLength = image->getSurfaceFormatInfo().surfaceFormat.ImageElementSizeInBytes * region[0] + + size_t expectedLength = image->getSurfaceFormatInfo().surfaceFormat.imageElementSizeInBytes * region[0] + image->getImageDesc().image_row_pitch * region[1] + image->getImageDesc().image_slice_pitch * region[2]; @@ -1373,7 +1373,7 @@ TEST(ImageTest, givenMipMapImage3DWhenAskedForPtrOffsetForGpuMappingThenReturnOf MemObjOffsetArray origin{{1, 1, 1}}; auto retOffset = image->calculateOffsetForMapping(origin); - size_t expectedOffset = image->getSurfaceFormatInfo().surfaceFormat.ImageElementSizeInBytes * origin[0] + + size_t expectedOffset = image->getSurfaceFormatInfo().surfaceFormat.imageElementSizeInBytes * origin[0] + image->getHostPtrRowPitch() * origin[1] + image->getHostPtrSlicePitch() * origin[2]; EXPECT_EQ(expectedOffset, retOffset); @@ -1394,7 +1394,7 @@ TEST(ImageTest, givenMipMapImage2DArrayWhenAskedForPtrOffsetForGpuMappingThenRet MemObjOffsetArray origin{{1, 1, 1}}; auto retOffset = image->calculateOffsetForMapping(origin); - size_t expectedOffset = image->getSurfaceFormatInfo().surfaceFormat.ImageElementSizeInBytes * origin[0] + + size_t expectedOffset = image->getSurfaceFormatInfo().surfaceFormat.imageElementSizeInBytes * origin[0] + image->getHostPtrRowPitch() * origin[1] + image->getHostPtrSlicePitch() * origin[2]; EXPECT_EQ(expectedOffset, retOffset); @@ -1415,7 +1415,7 @@ TEST(ImageTest, givenNonMipMapImage2DArrayWhenAskedForPtrOffsetForGpuMappingThen MemObjOffsetArray origin{{1, 1, 1}}; auto retOffset = image->calculateOffsetForMapping(origin); - size_t expectedOffset = image->getSurfaceFormatInfo().surfaceFormat.ImageElementSizeInBytes * origin[0] + + size_t expectedOffset = image->getSurfaceFormatInfo().surfaceFormat.imageElementSizeInBytes * origin[0] + image->getHostPtrRowPitch() * origin[1] + image->getHostPtrSlicePitch() * origin[2]; EXPECT_EQ(expectedOffset, retOffset); @@ -1435,7 +1435,7 @@ TEST(ImageTest, givenMipMapImage1DArrayWhenAskedForPtrOffsetForGpuMappingThenRet MemObjOffsetArray origin{{1, 1, 0}}; auto retOffset = image->calculateOffsetForMapping(origin); - size_t expectedOffset = image->getSurfaceFormatInfo().surfaceFormat.ImageElementSizeInBytes * origin[0] + image->getHostPtrSlicePitch() * origin[1]; + size_t expectedOffset = image->getSurfaceFormatInfo().surfaceFormat.imageElementSizeInBytes * origin[0] + image->getHostPtrSlicePitch() * origin[1]; EXPECT_EQ(expectedOffset, retOffset); } diff --git a/opencl/test/unit_test/mem_obj/image_tiled_tests.cpp b/opencl/test/unit_test/mem_obj/image_tiled_tests.cpp index ae64b0c6fe..b6649d1900 100644 --- a/opencl/test/unit_test/mem_obj/image_tiled_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_tiled_tests.cpp @@ -93,7 +93,7 @@ TEST_P(CreateTiledImageTest, GivenSharedTiledImageWhenCheckingIsTiledThenTrueRet ImageInfo info = {}; McsSurfaceInfo msi = {}; ClSurfaceFormatInfo surfaceFormat; - surfaceFormat.surfaceFormat.GMMSurfaceFormat = GMM_FORMAT_B8G8R8A8_UNORM; + surfaceFormat.surfaceFormat.gmmSurfaceFormat = GMM_FORMAT_B8G8R8A8_UNORM; info.surfaceFormat = &surfaceFormat.surfaceFormat; info.imgDesc = Image::convertDescriptor(imageDesc); @@ -133,7 +133,7 @@ TEST_P(CreateNonTiledImageTest, GivenSharedNonTiledImageWhenCheckingIsTiledThenF imageDesc.image_height = 1; - surfaceFormat.surfaceFormat.GMMSurfaceFormat = GMM_FORMAT_B8G8R8A8_UNORM; + surfaceFormat.surfaceFormat.gmmSurfaceFormat = GMM_FORMAT_B8G8R8A8_UNORM; info.surfaceFormat = &surfaceFormat.surfaceFormat; info.imgDesc = Image::convertDescriptor(imageDesc); diff --git a/opencl/test/unit_test/mem_obj/image_transfer_tests.cpp b/opencl/test/unit_test/mem_obj/image_transfer_tests.cpp index 8a5d8b1772..f7aca77857 100644 --- a/opencl/test/unit_test/mem_obj/image_transfer_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_transfer_tests.cpp @@ -34,7 +34,7 @@ class ImageHostPtrTransferTests : public testing::Test { hostPtrRowPitch = image->getHostPtrRowPitch(); imageSlicePitch = image->getImageDesc().image_slice_pitch; imageRowPitch = image->getImageDesc().image_row_pitch; - pixelSize = image->getSurfaceFormatInfo().surfaceFormat.ImageElementSizeInBytes; + pixelSize = image->getSurfaceFormatInfo().surfaceFormat.imageElementSizeInBytes; } void setExpectedData(uint8_t *dstPtr, size_t slicePitch, size_t rowPitch, std::array copyOrigin, std::array copyRegion) { diff --git a/opencl/test/unit_test/mem_obj/image_validate_tests.cpp b/opencl/test/unit_test/mem_obj/image_validate_tests.cpp index 420596ffbe..e6b2807fa6 100644 --- a/opencl/test/unit_test/mem_obj/image_validate_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_validate_tests.cpp @@ -25,7 +25,7 @@ typedef decltype(&Image::redescribe) RedescribeMethod; class ImageValidateTest : public testing::TestWithParam { public: ImageValidateTest() { - imageFormat = &surfaceFormat.OCLImageFormat; + imageFormat = &surfaceFormat.oclImageFormat; imageFormat->image_channel_data_type = CL_UNSIGNED_INT8; imageFormat->image_channel_order = CL_RGBA; } @@ -114,12 +114,12 @@ TEST(ImageDepthFormatTest, GivenDepthFormatsWhenGettingSurfaceFormatThenCorrectS auto surfaceFormatInfo = Image::getSurfaceFormatFromTable(CL_MEM_READ_WRITE, &imgFormat, defaultHwInfo->capabilityTable.supportsOcl21Features); ASSERT_NE(surfaceFormatInfo, nullptr); - EXPECT_TRUE(surfaceFormatInfo->surfaceFormat.GMMSurfaceFormat == GMM_FORMAT_R32_FLOAT_TYPE); + EXPECT_TRUE(surfaceFormatInfo->surfaceFormat.gmmSurfaceFormat == GMM_FORMAT_R32_FLOAT_TYPE); imgFormat.image_channel_data_type = CL_UNORM_INT16; surfaceFormatInfo = Image::getSurfaceFormatFromTable(CL_MEM_READ_WRITE, &imgFormat, defaultHwInfo->capabilityTable.supportsOcl21Features); ASSERT_NE(surfaceFormatInfo, nullptr); - EXPECT_TRUE(surfaceFormatInfo->surfaceFormat.GMMSurfaceFormat == GMM_FORMAT_R16_UNORM_TYPE); + EXPECT_TRUE(surfaceFormatInfo->surfaceFormat.gmmSurfaceFormat == GMM_FORMAT_R16_UNORM_TYPE); } TEST(ImageDepthFormatTest, GivenWriteOnlyDepthFormatsWhenGettingSurfaceFormatThenCorrectSurfaceFormatIsReturned) { @@ -129,12 +129,12 @@ TEST(ImageDepthFormatTest, GivenWriteOnlyDepthFormatsWhenGettingSurfaceFormatThe auto surfaceFormatInfo = Image::getSurfaceFormatFromTable(CL_MEM_WRITE_ONLY, &imgFormat, defaultHwInfo->capabilityTable.supportsOcl21Features); ASSERT_NE(surfaceFormatInfo, nullptr); - EXPECT_TRUE(surfaceFormatInfo->surfaceFormat.GMMSurfaceFormat == GMM_FORMAT_R32_FLOAT_TYPE); + EXPECT_TRUE(surfaceFormatInfo->surfaceFormat.gmmSurfaceFormat == GMM_FORMAT_R32_FLOAT_TYPE); imgFormat.image_channel_data_type = CL_UNORM_INT16; surfaceFormatInfo = Image::getSurfaceFormatFromTable(CL_MEM_WRITE_ONLY, &imgFormat, defaultHwInfo->capabilityTable.supportsOcl21Features); ASSERT_NE(surfaceFormatInfo, nullptr); - EXPECT_TRUE(surfaceFormatInfo->surfaceFormat.GMMSurfaceFormat == GMM_FORMAT_R16_UNORM_TYPE); + EXPECT_TRUE(surfaceFormatInfo->surfaceFormat.gmmSurfaceFormat == GMM_FORMAT_R16_UNORM_TYPE); } TEST(ImageDepthFormatTest, GivenDepthStencilFormatsWhenGettingSurfaceFormatThenCorrectSurfaceFormatIsReturned) { @@ -144,13 +144,13 @@ TEST(ImageDepthFormatTest, GivenDepthStencilFormatsWhenGettingSurfaceFormatThenC auto surfaceFormatInfo = Image::getSurfaceFormatFromTable(CL_MEM_READ_ONLY, &imgFormat, defaultHwInfo->capabilityTable.supportsOcl21Features); ASSERT_NE(surfaceFormatInfo, nullptr); - EXPECT_TRUE(surfaceFormatInfo->surfaceFormat.GMMSurfaceFormat == GMM_FORMAT_GENERIC_32BIT); + EXPECT_TRUE(surfaceFormatInfo->surfaceFormat.gmmSurfaceFormat == GMM_FORMAT_GENERIC_32BIT); imgFormat.image_channel_order = CL_DEPTH_STENCIL; imgFormat.image_channel_data_type = CL_FLOAT; surfaceFormatInfo = Image::getSurfaceFormatFromTable(CL_MEM_READ_ONLY, &imgFormat, defaultHwInfo->capabilityTable.supportsOcl21Features); ASSERT_NE(surfaceFormatInfo, nullptr); - EXPECT_TRUE(surfaceFormatInfo->surfaceFormat.GMMSurfaceFormat == GMM_FORMAT_R32G32_FLOAT_TYPE); + EXPECT_TRUE(surfaceFormatInfo->surfaceFormat.gmmSurfaceFormat == GMM_FORMAT_R32G32_FLOAT_TYPE); } static cl_image_desc validImageDesc[] = { @@ -901,7 +901,7 @@ TEST(ImageValidatorTest, givenPackedYUVImage2dAsParentImageWhenValidateImageZero void *dummyPtr = reinterpret_cast(0x17); ClSurfaceFormatInfo surfaceFormat = {}; - surfaceFormat.OCLImageFormat.image_channel_order = CL_RGBA; + surfaceFormat.oclImageFormat.image_channel_order = CL_RGBA; image.imageFormat.image_channel_order = CL_YUYV_INTEL; descriptor.image_type = CL_MEM_OBJECT_IMAGE2D; @@ -920,7 +920,7 @@ TEST(ImageValidatorTest, givenPackedYUVImage2dAsParentImageWhenValidateImageTwoC void *dummyPtr = reinterpret_cast(0x17); ClSurfaceFormatInfo surfaceFormat = {}; - surfaceFormat.OCLImageFormat.image_channel_order = CL_RG; + surfaceFormat.oclImageFormat.image_channel_order = CL_RG; image.imageFormat.image_channel_order = CL_YUYV_INTEL; descriptor.image_type = CL_MEM_OBJECT_IMAGE2D; @@ -941,7 +941,7 @@ TEST(ImageValidatorTest, givenPackedYUVImage2dAsParentImageWhenValidateImageInva ClSurfaceFormatInfo surfaceFormat = {}; image.imageDesc.image_width = 4u; image.imageDesc.image_height = 4u; - surfaceFormat.OCLImageFormat.image_channel_order = CL_RGBA; + surfaceFormat.oclImageFormat.image_channel_order = CL_RGBA; image.imageFormat.image_channel_order = CL_YUYV_INTEL; descriptor.image_type = CL_MEM_OBJECT_IMAGE2D; @@ -962,7 +962,7 @@ TEST(ImageValidatorTest, givenPackedYUVImage2dAsParentImageWhenValidateImageInva ClSurfaceFormatInfo surfaceFormat = {}; image.imageDesc.image_width = 4u; image.imageDesc.image_height = 4u; - surfaceFormat.OCLImageFormat.image_channel_order = CL_RG; + surfaceFormat.oclImageFormat.image_channel_order = CL_RG; image.imageFormat.image_channel_order = CL_YUYV_INTEL; descriptor.image_type = CL_MEM_OBJECT_IMAGE2D; @@ -1002,8 +1002,8 @@ TEST(ImageValidatorTest, givenNonNV12Image2dAsParentImageWhenValidateImageZeroSi image.imageFormat.image_channel_order = CL_BGRA; image.imageFormat.image_channel_data_type = CL_UNORM_INT8; - surfaceFormat.OCLImageFormat.image_channel_order = CL_sBGRA; - surfaceFormat.OCLImageFormat.image_channel_data_type = CL_UNORM_INT8; + surfaceFormat.oclImageFormat.image_channel_order = CL_sBGRA; + surfaceFormat.oclImageFormat.image_channel_data_type = CL_UNORM_INT8; descriptor.image_type = CL_MEM_OBJECT_IMAGE2D; descriptor.image_height = 0; descriptor.image_width = 0; diff --git a/opencl/test/unit_test/mem_obj/nv12_image_tests.cpp b/opencl/test/unit_test/mem_obj/nv12_image_tests.cpp index 0eb8ea92c7..55bdc357ba 100644 --- a/opencl/test/unit_test/mem_obj/nv12_image_tests.cpp +++ b/opencl/test/unit_test/mem_obj/nv12_image_tests.cpp @@ -356,7 +356,7 @@ HWTEST_F(Nv12ImageTest, WhenCreatingParentImageThenPlanesAreWritten) { ClMemoryPropertiesHelper::createMemoryProperties(flags, 0, 0, &context.getDevice(0)->getDevice()), flags, 0, surfaceFormat, &imageDesc, hostPtr, retVal)}; - EXPECT_EQ(imageNV12->isTiledAllocation() ? 2u : 0u, cmdQ->EnqueueWriteImageCounter); + EXPECT_EQ(imageNV12->isTiledAllocation() ? 2u : 0u, cmdQ->enqueueWriteImageCounter); ASSERT_NE(nullptr, imageNV12); contextWithMockCmdQ->release(); } diff --git a/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp b/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp index 729160106e..8f72900ac2 100644 --- a/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp +++ b/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp @@ -2317,7 +2317,7 @@ TEST(MemoryManagerTest, givenAllowedTilingWhenIsCopyRequiredIsCalledThenTrueIsRe imgInfo.imgDesc = Image::convertDescriptor(imageDesc); imgInfo.surfaceFormat = &surfaceFormat->surfaceFormat; - imgInfo.rowPitch = imageDesc.image_width * surfaceFormat->surfaceFormat.ImageElementSizeInBytes; + imgInfo.rowPitch = imageDesc.image_width * surfaceFormat->surfaceFormat.imageElementSizeInBytes; imgInfo.slicePitch = imgInfo.rowPitch * imageDesc.image_height; imgInfo.size = imgInfo.slicePitch; @@ -2343,7 +2343,7 @@ TEST(MemoryManagerTest, givenDifferentRowPitchWhenIsCopyRequiredIsCalledThenTrue imgInfo.imgDesc = Image::convertDescriptor(imageDesc); imgInfo.surfaceFormat = &surfaceFormat->surfaceFormat; - imgInfo.rowPitch = imageDesc.image_width * surfaceFormat->surfaceFormat.ImageElementSizeInBytes; + imgInfo.rowPitch = imageDesc.image_width * surfaceFormat->surfaceFormat.imageElementSizeInBytes; imgInfo.slicePitch = imgInfo.rowPitch * imageDesc.image_height; imgInfo.size = imgInfo.slicePitch; @@ -2366,11 +2366,11 @@ TEST(MemoryManagerTest, givenDifferentSlicePitchAndTilingNotAllowedWhenIsCopyReq imageDesc.image_type = CL_MEM_OBJECT_IMAGE1D; imageDesc.image_width = 4; imageDesc.image_height = 2; - imageDesc.image_slice_pitch = imageDesc.image_width * (imageDesc.image_height + 3) * surfaceFormat->surfaceFormat.ImageElementSizeInBytes; + imageDesc.image_slice_pitch = imageDesc.image_width * (imageDesc.image_height + 3) * surfaceFormat->surfaceFormat.imageElementSizeInBytes; imgInfo.imgDesc = Image::convertDescriptor(imageDesc); imgInfo.surfaceFormat = &surfaceFormat->surfaceFormat; - imgInfo.rowPitch = imageDesc.image_width * surfaceFormat->surfaceFormat.ImageElementSizeInBytes; + imgInfo.rowPitch = imageDesc.image_width * surfaceFormat->surfaceFormat.imageElementSizeInBytes; imgInfo.slicePitch = imgInfo.rowPitch * imageDesc.image_height; imgInfo.size = imgInfo.slicePitch; char memory[8]; @@ -2395,7 +2395,7 @@ TEST(MemoryManagerTest, givenNotCachelinAlignedPointerWhenIsCopyRequiredIsCalled imgInfo.imgDesc = Image::convertDescriptor(imageDesc); imgInfo.surfaceFormat = &surfaceFormat->surfaceFormat; - imgInfo.rowPitch = imageDesc.image_width * surfaceFormat->surfaceFormat.ImageElementSizeInBytes; + imgInfo.rowPitch = imageDesc.image_width * surfaceFormat->surfaceFormat.imageElementSizeInBytes; imgInfo.slicePitch = imgInfo.rowPitch * imageDesc.image_height; imgInfo.size = imgInfo.slicePitch; char memory[8]; @@ -2420,7 +2420,7 @@ TEST(MemoryManagerTest, givenCachelineAlignedPointerAndProperDescriptorValuesWhe imgInfo.imgDesc = Image::convertDescriptor(imageDesc); imgInfo.surfaceFormat = &surfaceFormat->surfaceFormat; - imgInfo.rowPitch = imageDesc.image_width * surfaceFormat->surfaceFormat.ImageElementSizeInBytes; + imgInfo.rowPitch = imageDesc.image_width * surfaceFormat->surfaceFormat.imageElementSizeInBytes; imgInfo.slicePitch = imgInfo.rowPitch * imageDesc.image_height; imgInfo.size = imgInfo.slicePitch; imgInfo.linearStorage = true; @@ -2455,7 +2455,7 @@ TEST(MemoryManagerTest, givenForcedLinearImages3DImageAndProperDescriptorValuesW imgInfo.imgDesc = Image::convertDescriptor(imageDesc); imgInfo.surfaceFormat = &surfaceFormat->surfaceFormat; - imgInfo.rowPitch = imageDesc.image_width * surfaceFormat->surfaceFormat.ImageElementSizeInBytes; + imgInfo.rowPitch = imageDesc.image_width * surfaceFormat->surfaceFormat.imageElementSizeInBytes; imgInfo.slicePitch = imgInfo.rowPitch * imageDesc.image_height; imgInfo.size = imgInfo.slicePitch; imgInfo.linearStorage = productHelper.isLinearStoragePreferred(false, Image::isImage1d(Image::convertDescriptor(imgInfo.imgDesc)), false); diff --git a/opencl/test/unit_test/mock_gl/windows/mock_opengl32.cpp b/opencl/test/unit_test/mock_gl/windows/mock_opengl32.cpp index 964844a4ed..a8fd1946c7 100644 --- a/opencl/test/unit_test/mock_gl/windows/mock_opengl32.cpp +++ b/opencl/test/unit_test/mock_gl/windows/mock_opengl32.cpp @@ -52,8 +52,8 @@ const unsigned char *WINAPI glGetString(unsigned int name) { }; GLboolean WINAPI wglSetSharedOCLContextStateINTELMock(HDC HDCHandle, HGLRC ContextHandle, unsigned char State, void *pContextInfo) { - ((NEO::ContextInfo *)pContextInfo)->ContextHandle = 1; - ((NEO::ContextInfo *)pContextInfo)->DeviceHandle = 2; + ((NEO::ContextInfo *)pContextInfo)->contextHandle = 1; + ((NEO::ContextInfo *)pContextInfo)->deviceHandle = 2; return GLSetSharedOCLContextStateReturnedValue; }; GLboolean WINAPI mockGLAcquireSharedBuffer(GLDisplay, GLContext, GLContext, GLvoid *pResourceInfo) { diff --git a/opencl/test/unit_test/mocks/mock_command_queue.h b/opencl/test/unit_test/mocks/mock_command_queue.h index 0c986f0ffd..a00a3b71a9 100644 --- a/opencl/test/unit_test/mocks/mock_command_queue.h +++ b/opencl/test/unit_test/mocks/mock_command_queue.h @@ -321,7 +321,7 @@ class MockCommandQueueHw : public CommandQueueHw { cl_uint numEventsInWaitList, const cl_event *eventWaitList, cl_event *event) override { - EnqueueWriteImageCounter++; + enqueueWriteImageCounter++; return BaseClass::enqueueWriteImage(dstImage, blockingWrite, origin, @@ -340,7 +340,7 @@ class MockCommandQueueHw : public CommandQueueHw { } cl_int enqueueWriteBuffer(Buffer *buffer, cl_bool blockingWrite, size_t offset, size_t size, const void *ptr, GraphicsAllocation *mapAllocation, cl_uint numEventsInWaitList, const cl_event *eventWaitList, cl_event *event) override { - EnqueueWriteBufferCounter++; + enqueueWriteBufferCounter++; blockingWriteBuffer = blockingWrite == CL_TRUE; return BaseClass::enqueueWriteBuffer(buffer, blockingWrite, offset, size, ptr, mapAllocation, numEventsInWaitList, eventWaitList, event); } @@ -416,8 +416,8 @@ class MockCommandQueueHw : public CommandQueueHw { unsigned int lastCommandType; std::vector lastEnqueuedKernels; MultiDispatchInfo storedMultiDispatchInfo; - size_t EnqueueWriteImageCounter = 0; - size_t EnqueueWriteBufferCounter = 0; + size_t enqueueWriteImageCounter = 0; + size_t enqueueWriteBufferCounter = 0; size_t requestedCmdStreamSize = 0; bool blockingWriteBuffer = false; bool storeMultiDispatchInfo = false; diff --git a/opencl/test/unit_test/mocks/mock_gmm_resource_info_ocl.cpp b/opencl/test/unit_test/mocks/mock_gmm_resource_info_ocl.cpp index 332318c515..0b6e7f6ecd 100644 --- a/opencl/test/unit_test/mocks/mock_gmm_resource_info_ocl.cpp +++ b/opencl/test/unit_test/mocks/mock_gmm_resource_info_ocl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -17,7 +17,7 @@ void MockGmmResourceInfo::setSurfaceFormat() { auto iterate = [&](ArrayRef formats) { if (!surfaceFormatInfo) { for (auto &format : formats) { - if (mockResourceCreateParams.Format == format.surfaceFormat.GMMSurfaceFormat) { + if (mockResourceCreateParams.Format == format.surfaceFormat.gmmSurfaceFormat) { surfaceFormatInfo = &format.surfaceFormat; break; } @@ -26,19 +26,19 @@ void MockGmmResourceInfo::setSurfaceFormat() { }; if (mockResourceCreateParams.Format == GMM_RESOURCE_FORMAT::GMM_FORMAT_P010 || mockResourceCreateParams.Format == GMM_RESOURCE_FORMAT::GMM_FORMAT_P016) { - tempSurface.GMMSurfaceFormat = mockResourceCreateParams.Format; - tempSurface.NumChannels = 1; - tempSurface.ImageElementSizeInBytes = 16; - tempSurface.PerChannelSizeInBytes = 16; + tempSurface.gmmSurfaceFormat = mockResourceCreateParams.Format; + tempSurface.numChannels = 1; + tempSurface.imageElementSizeInBytes = 16; + tempSurface.perChannelSizeInBytes = 16; surfaceFormatInfo = &tempSurface; } if (mockResourceCreateParams.Format == GMM_RESOURCE_FORMAT::GMM_FORMAT_RGBP) { - tempSurface.GMMSurfaceFormat = GMM_RESOURCE_FORMAT::GMM_FORMAT_RGBP; - tempSurface.NumChannels = 1; - tempSurface.ImageElementSizeInBytes = 8; - tempSurface.PerChannelSizeInBytes = 8; + tempSurface.gmmSurfaceFormat = GMM_RESOURCE_FORMAT::GMM_FORMAT_RGBP; + tempSurface.numChannels = 1; + tempSurface.imageElementSizeInBytes = 8; + tempSurface.perChannelSizeInBytes = 8; surfaceFormatInfo = &tempSurface; } diff --git a/opencl/test/unit_test/os_interface/linux/cl_drm_memory_manager_tests.cpp b/opencl/test/unit_test/os_interface/linux/cl_drm_memory_manager_tests.cpp index 0ea4fa1385..cb4be7f3bc 100644 --- a/opencl/test/unit_test/os_interface/linux/cl_drm_memory_manager_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/cl_drm_memory_manager_tests.cpp @@ -721,7 +721,7 @@ TEST_F(ClDrmMemoryManagerTest, givenHostPointerNotRequiringCopyWhenAllocateGraph auto surfaceFormat = &Image::getSurfaceFormatFromTable(flags, &imageFormat, context.getDevice(0)->getHardwareInfo().capabilityTable.supportsOcl21Features)->surfaceFormat; auto imgInfo = MockGmm::initImgInfo(imgDesc, 0, surfaceFormat); - imgInfo.rowPitch = imgDesc.imageWidth * surfaceFormat->ImageElementSizeInBytes; + imgInfo.rowPitch = imgDesc.imageWidth * surfaceFormat->imageElementSizeInBytes; imgInfo.slicePitch = imgInfo.rowPitch * imgDesc.imageHeight; imgInfo.size = imgInfo.slicePitch; imgInfo.linearStorage = true; diff --git a/opencl/test/unit_test/os_interface/mock_performance_counters.h b/opencl/test/unit_test/os_interface/mock_performance_counters.h index 94f3725c52..a90b76d5bd 100644 --- a/opencl/test/unit_test/os_interface/mock_performance_counters.h +++ b/opencl/test/unit_test/os_interface/mock_performance_counters.h @@ -35,16 +35,16 @@ using MetricsLibraryApi::QueryHandle_1_0; // MI_REPORT_PERF_COUNT definition for all GENs ////////////////////////////////////////////////////// struct MI_REPORT_PERF_COUNT { // NOLINT(readability-identifier-naming) - uint32_t DwordLength : BITFIELD_RANGE(0, 5); - uint32_t Reserved_6 : BITFIELD_RANGE(6, 22); - uint32_t MiCommandOpcode : BITFIELD_RANGE(23, 28); - uint32_t CommandType : BITFIELD_RANGE(29, 31); - uint64_t UseGlobalGtt : BITFIELD_RANGE(0, 0); - uint64_t Reserved_33 : BITFIELD_RANGE(1, 3); - uint64_t CoreModeEnable : BITFIELD_RANGE(4, 4); - uint64_t Reserved_37 : BITFIELD_RANGE(5, 5); - uint64_t MemoryAddress : BITFIELD_RANGE(6, 63); - uint32_t ReportId; + uint32_t dwordLength : BITFIELD_RANGE(0, 5); + uint32_t reserved6 : BITFIELD_RANGE(6, 22); + uint32_t miCommandOpcode : BITFIELD_RANGE(23, 28); + uint32_t commandType : BITFIELD_RANGE(29, 31); + uint64_t useGlobalGtt : BITFIELD_RANGE(0, 0); + uint64_t reserved33 : BITFIELD_RANGE(1, 3); + uint64_t coreModeEnable : BITFIELD_RANGE(4, 4); + uint64_t reserved37 : BITFIELD_RANGE(5, 5); + uint64_t memoryAddress : BITFIELD_RANGE(6, 63); + uint32_t reportId; typedef enum tagDWORD_LENGTH { DWORD_LENGTH_EXCLUDES_DWORD_0_1 = 0x2, @@ -60,9 +60,9 @@ struct MI_REPORT_PERF_COUNT { // NOLINT(readability-identifier-naming) inline void init(void) { memset(this, 0, sizeof(MI_REPORT_PERF_COUNT)); - DwordLength = DWORD_LENGTH_EXCLUDES_DWORD_0_1; - MiCommandOpcode = MI_COMMAND_OPCODE_MI_REPORT_PERF_COUNT; - CommandType = COMMAND_TYPE_MI_COMMAND; + dwordLength = DWORD_LENGTH_EXCLUDES_DWORD_0_1; + miCommandOpcode = MI_COMMAND_OPCODE_MI_REPORT_PERF_COUNT; + commandType = COMMAND_TYPE_MI_COMMAND; } }; diff --git a/opencl/test/unit_test/profiling/profiling_tests.cpp b/opencl/test/unit_test/profiling/profiling_tests.cpp index 8fd4e3654b..2776cf4fb3 100644 --- a/opencl/test/unit_test/profiling/profiling_tests.cpp +++ b/opencl/test/unit_test/profiling/profiling_tests.cpp @@ -202,10 +202,10 @@ HWCMDTEST_F(IGFX_GEN8_CORE, ProfilingTests, GivenCommandQueueWithProfilingWhenNo &event); auto mockEvent = static_cast *>(event); - EXPECT_NE(0u, mockEvent->queueTimeStamp.GPUTimeStamp); - EXPECT_NE(0u, mockEvent->queueTimeStamp.CPUTimeinNS); - EXPECT_LT(mockEvent->queueTimeStamp.CPUTimeinNS, mockEvent->submitTimeStamp.CPUTimeinNS); - EXPECT_EQ(0u, mockEvent->submitTimeStamp.GPUTimeStamp); + EXPECT_NE(0u, mockEvent->queueTimeStamp.gpuTimeStamp); + EXPECT_NE(0u, mockEvent->queueTimeStamp.cpuTimeinNS); + EXPECT_LT(mockEvent->queueTimeStamp.cpuTimeinNS, mockEvent->submitTimeStamp.cpuTimeinNS); + EXPECT_EQ(0u, mockEvent->submitTimeStamp.gpuTimeStamp); clReleaseEvent(event); } @@ -599,11 +599,11 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EventProfilingTests, givenRawTimestampsDebugModeWhen MockEvent event(&cmdQ, CL_COMPLETE, 0, 0); cl_event clEvent = &event; - event.queueTimeStamp.CPUTimeinNS = 1; - event.queueTimeStamp.GPUTimeStamp = 2; + event.queueTimeStamp.cpuTimeinNS = 1; + event.queueTimeStamp.gpuTimeStamp = 2; - event.submitTimeStamp.CPUTimeinNS = 3; - event.submitTimeStamp.GPUTimeStamp = 4; + event.submitTimeStamp.cpuTimeinNS = 3; + event.submitTimeStamp.gpuTimeStamp = 4; event.setCPUProfilingPath(false); event.timeStampNode = ×tampNode; @@ -620,8 +620,8 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EventProfilingTests, givenRawTimestampsDebugModeWhen EXPECT_EQ(timestamp.contextCompleteTS, complete); EXPECT_EQ(timestamp.contextEndTS, end); EXPECT_EQ(timestamp.contextStartTS, start); - EXPECT_EQ(event.submitTimeStamp.GPUTimeStamp, submited); - EXPECT_EQ(event.queueTimeStamp.GPUTimeStamp, queued); + EXPECT_EQ(event.submitTimeStamp.gpuTimeStamp, submited); + EXPECT_EQ(event.queueTimeStamp.gpuTimeStamp, queued); event.timeStampNode = nullptr; } @@ -651,8 +651,8 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EventProfilingTest, givenRawTimestampsDebugModeWhenS MockEvent event(&cmdQ, CL_COMPLETE, 0, 0); cl_event clEvent = &event; - event.queueTimeStamp.CPUTimeinNS = 83; - event.queueTimeStamp.GPUTimeStamp = 1; + event.queueTimeStamp.cpuTimeinNS = 83; + event.queueTimeStamp.gpuTimeStamp = 1; event.setCPUProfilingPath(false); event.timeStampNode = ×tampNode; diff --git a/opencl/test/unit_test/sharings/gl/windows/gl_texture_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_texture_tests.cpp index defdd89469..e5e5458a46 100644 --- a/opencl/test/unit_test/sharings/gl/windows/gl_texture_tests.cpp +++ b/opencl/test/unit_test/sharings/gl/windows/gl_texture_tests.cpp @@ -218,7 +218,7 @@ TEST_F(GlSharingTextureTests, givenDifferentHwFormatWhenSurfaceFormatInfoIsSetTh ASSERT_NE(format, nullptr); auto newHwFormat = 217u; - EXPECT_TRUE(format->surfaceFormat.GenxSurfaceFormat != newHwFormat); + EXPECT_TRUE(format->surfaceFormat.genxSurfaceFormat != newHwFormat); glSharing->textureInfoOutput.glHWFormat = newHwFormat; glSharing->textureInfoOutput.glInternalFormat = GL_DEPTH32F_STENCIL8; @@ -227,7 +227,7 @@ TEST_F(GlSharingTextureTests, givenDifferentHwFormatWhenSurfaceFormatInfoIsSetTh auto glTexture = GlTexture::createSharedGlTexture(clContext.get(), CL_MEM_READ_ONLY, GL_TEXTURE_2D, 0, textureId, &retVal); ASSERT_NE(nullptr, glTexture); - EXPECT_TRUE(newHwFormat == glTexture->getSurfaceFormatInfo().surfaceFormat.GenxSurfaceFormat); + EXPECT_TRUE(newHwFormat == glTexture->getSurfaceFormatInfo().surfaceFormat.genxSurfaceFormat); delete glTexture; } @@ -240,7 +240,7 @@ TEST_F(GlSharingTextureTests, givenGLRGB10FormatWhenSharedGlTextureIsCreatedThen std::unique_ptr glTexture(GlTexture::createSharedGlTexture(clContext.get(), CL_MEM_READ_ONLY, GL_TEXTURE_2D, 0, textureId, &retVal)); ASSERT_NE(nullptr, glTexture); - EXPECT_EQ(glTexture->getSurfaceFormatInfo().surfaceFormat.GenxSurfaceFormat, GFX3DSTATE_SURFACEFORMAT_R16G16B16A16_UNORM); + EXPECT_EQ(glTexture->getSurfaceFormatInfo().surfaceFormat.genxSurfaceFormat, GFX3DSTATE_SURFACEFORMAT_R16G16B16A16_UNORM); } TEST_F(GlSharingTextureTests, givenContextAnd1dTextureWhenClCreateFromGlTextureIsCalledThenImageIsReturned) { diff --git a/opencl/test/unit_test/sharings/unified/unified_sharing_image_tests.cpp b/opencl/test/unit_test/sharings/unified/unified_sharing_image_tests.cpp index c6b421af7e..981bb42591 100644 --- a/opencl/test/unit_test/sharings/unified/unified_sharing_image_tests.cpp +++ b/opencl/test/unit_test/sharings/unified/unified_sharing_image_tests.cpp @@ -93,8 +93,8 @@ TEST_F(UnifiedSharingImageTestsWithMemoryManager, givenPassedFormatWhenCreatingU auto image = std::unique_ptr(UnifiedImage::createSharedUnifiedImage(context.get(), flags, getValidUnifiedSharingDesc(), &format, &imageDesc, &retVal)); ASSERT_EQ(CL_SUCCESS, retVal); - EXPECT_EQ(GMM_FORMAT_R16G16_FLOAT_TYPE, image->getSurfaceFormatInfo().surfaceFormat.GMMSurfaceFormat); - EXPECT_EQ(GFX3DSTATE_SURFACEFORMAT_R16G16_FLOAT, image->getSurfaceFormatInfo().surfaceFormat.GenxSurfaceFormat); + EXPECT_EQ(GMM_FORMAT_R16G16_FLOAT_TYPE, image->getSurfaceFormatInfo().surfaceFormat.gmmSurfaceFormat); + EXPECT_EQ(GFX3DSTATE_SURFACEFORMAT_R16G16_FLOAT, image->getSurfaceFormatInfo().surfaceFormat.genxSurfaceFormat); } template diff --git a/opencl/test/unit_test/sharings/va/context_va_tests.cpp b/opencl/test/unit_test/sharings/va/context_va_tests.cpp index 13e65dcc3d..e6fd953148 100644 --- a/opencl/test/unit_test/sharings/va/context_va_tests.cpp +++ b/opencl/test/unit_test/sharings/va/context_va_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -33,7 +33,7 @@ struct VAContextTest : public PlatformFixture, properties[1] = (cl_context_properties)platform; properties[2] = 0; - context = Context::create(properties, ClDeviceVector(devices, num_devices), nullptr, nullptr, retVal); + context = Context::create(properties, ClDeviceVector(devices, numDevices), nullptr, nullptr, retVal); ASSERT_NE(nullptr, context); } diff --git a/opencl/test/unit_test/sharings/va/va_sharing_tests.cpp b/opencl/test/unit_test/sharings/va/va_sharing_tests.cpp index 5a9fa9611c..f3cb575f09 100644 --- a/opencl/test/unit_test/sharings/va/va_sharing_tests.cpp +++ b/opencl/test/unit_test/sharings/va/va_sharing_tests.cpp @@ -508,7 +508,7 @@ TEST_F(VaSharingTests, givenValidPlanarSurfaceWithPlaneSetWhenApplyPlanarOptions EXPECT_EQ(surfaceInfo.imgInfo.plane, GMM_PLANE_Y); EXPECT_EQ(surfaceInfo.channelOrder, static_cast(CL_R)); - EXPECT_EQ(surfaceInfo.imgInfo.surfaceFormat->GMMSurfaceFormat, GMM_FORMAT_NV12); + EXPECT_EQ(surfaceInfo.imgInfo.surfaceFormat->gmmSurfaceFormat, GMM_FORMAT_NV12); VASurface::applyPlanarOptions(surfaceInfo, 1, 0, true); @@ -543,7 +543,7 @@ TEST_F(VaSharingTests, givenValidPlanarSurfaceWithPlaneSetWhenApplyPlanarOptions VASurface::applyPlanarOptions(surfaceInfo, 1, 0, true); EXPECT_EQ(surfaceInfo.channelType, static_cast(CL_UNORM_INT16)); - EXPECT_EQ(surfaceInfo.imgInfo.surfaceFormat->GMMSurfaceFormat, GMM_FORMAT_P010); + EXPECT_EQ(surfaceInfo.imgInfo.surfaceFormat->gmmSurfaceFormat, GMM_FORMAT_P010); // P016 part @@ -552,7 +552,7 @@ TEST_F(VaSharingTests, givenValidPlanarSurfaceWithPlaneSetWhenApplyPlanarOptions VASurface::applyPlanarOptions(surfaceInfo, 1, 0, true); EXPECT_EQ(surfaceInfo.channelType, static_cast(CL_UNORM_INT16)); - EXPECT_EQ(surfaceInfo.imgInfo.surfaceFormat->GMMSurfaceFormat, GMM_FORMAT_P016); + EXPECT_EQ(surfaceInfo.imgInfo.surfaceFormat->gmmSurfaceFormat, GMM_FORMAT_P016); } TEST_F(VaSharingTests, givenValidPlanarSurfaceWithInvalidPlaneSetWhenApplyPlanarOptionsThenUnrecoverableIsCalled) { @@ -603,14 +603,14 @@ TEST_F(VaSharingTests, givenValidPackedFormatWhenApplyPackedOptionsThenSurfaceFo VASurface::applyPackedOptions(surfaceInfoYUY2); - EXPECT_EQ(surfaceInfoYUY2.imgInfo.surfaceFormat->GMMSurfaceFormat, GMM_FORMAT_YCRCB_NORMAL); + EXPECT_EQ(surfaceInfoYUY2.imgInfo.surfaceFormat->gmmSurfaceFormat, GMM_FORMAT_YCRCB_NORMAL); SharedSurfaceInfo surfaceInfoY210{}; surfaceInfoY210.imageFourcc = VA_FOURCC_Y210; VASurface::applyPackedOptions(surfaceInfoY210); - EXPECT_EQ(surfaceInfoY210.imgInfo.surfaceFormat->GMMSurfaceFormat, GMM_FORMAT_Y210); + EXPECT_EQ(surfaceInfoY210.imgInfo.surfaceFormat->gmmSurfaceFormat, GMM_FORMAT_Y210); } TEST_F(VaSharingTests, givenInvalidPlaneWhenVaSurfaceIsCreatedAndNotRGBPThenUnrecoverableIsCalled) { @@ -805,13 +805,13 @@ TEST_F(VaSharingTests, givenPlaneWhenCreateSurfaceIsCalledThenSetPlaneFields) { for (int i = 0; i < 2; i++) { createMediaSurface(planes[i]); - EXPECT_TRUE(sharedImg->getSurfaceFormatInfo().OCLImageFormat.image_channel_data_type == CL_UNORM_INT8); + EXPECT_TRUE(sharedImg->getSurfaceFormatInfo().oclImageFormat.image_channel_data_type == CL_UNORM_INT8); EXPECT_EQ(planes[i], sharedImg->getMediaPlaneType()); if (planes[i] == 0u) { - EXPECT_TRUE(sharedImg->getSurfaceFormatInfo().OCLImageFormat.image_channel_order == CL_R); + EXPECT_TRUE(sharedImg->getSurfaceFormatInfo().oclImageFormat.image_channel_order == CL_R); } else if (planes[i] == 1) { - EXPECT_TRUE(sharedImg->getSurfaceFormatInfo().OCLImageFormat.image_channel_order == CL_RG); + EXPECT_TRUE(sharedImg->getSurfaceFormatInfo().oclImageFormat.image_channel_order == CL_RG); } delete sharedImg; @@ -931,7 +931,7 @@ TEST_F(VaSharingTests, givenP010FormatWhenCreatingSharedVaSurfaceForPlane0ThenCo auto graphicsAllocation = vaSurface->getGraphicsAllocation(rootDeviceIndex); EXPECT_EQ(static_cast(CL_UNORM_INT16), vaSurface->getImageFormat().image_channel_data_type); EXPECT_EQ(static_cast(CL_R), vaSurface->getImageFormat().image_channel_order); - EXPECT_EQ(GMM_RESOURCE_FORMAT::GMM_FORMAT_R16_UNORM, vaSurface->getSurfaceFormatInfo().surfaceFormat.GMMSurfaceFormat); + EXPECT_EQ(GMM_RESOURCE_FORMAT::GMM_FORMAT_R16_UNORM, vaSurface->getSurfaceFormatInfo().surfaceFormat.gmmSurfaceFormat); EXPECT_EQ(GMM_RESOURCE_FORMAT::GMM_FORMAT_P010, graphicsAllocation->getDefaultGmm()->resourceParams.Format); EXPECT_EQ(CL_SUCCESS, errCode); } @@ -945,7 +945,7 @@ TEST_F(VaSharingTests, givenP010FormatWhenCreatingSharedVaSurfaceForPlane1ThenCo auto graphicsAllocation = vaSurface->getGraphicsAllocation(rootDeviceIndex); EXPECT_EQ(static_cast(CL_UNORM_INT16), vaSurface->getImageFormat().image_channel_data_type); EXPECT_EQ(static_cast(CL_RG), vaSurface->getImageFormat().image_channel_order); - EXPECT_EQ(GMM_RESOURCE_FORMAT::GMM_FORMAT_R16G16_UNORM, vaSurface->getSurfaceFormatInfo().surfaceFormat.GMMSurfaceFormat); + EXPECT_EQ(GMM_RESOURCE_FORMAT::GMM_FORMAT_R16G16_UNORM, vaSurface->getSurfaceFormatInfo().surfaceFormat.gmmSurfaceFormat); EXPECT_EQ(GMM_RESOURCE_FORMAT::GMM_FORMAT_P010, graphicsAllocation->getDefaultGmm()->resourceParams.Format); EXPECT_EQ(CL_SUCCESS, errCode); } @@ -959,7 +959,7 @@ TEST_F(VaSharingTests, givenP016FormatWhenCreatingSharedVaSurfaceForPlane0ThenCo auto graphicsAllocation = vaSurface->getGraphicsAllocation(rootDeviceIndex); EXPECT_EQ(static_cast(CL_UNORM_INT16), vaSurface->getImageFormat().image_channel_data_type); EXPECT_EQ(static_cast(CL_R), vaSurface->getImageFormat().image_channel_order); - EXPECT_EQ(GMM_RESOURCE_FORMAT::GMM_FORMAT_R16_UNORM, vaSurface->getSurfaceFormatInfo().surfaceFormat.GMMSurfaceFormat); + EXPECT_EQ(GMM_RESOURCE_FORMAT::GMM_FORMAT_R16_UNORM, vaSurface->getSurfaceFormatInfo().surfaceFormat.gmmSurfaceFormat); EXPECT_EQ(GMM_RESOURCE_FORMAT::GMM_FORMAT_P016, graphicsAllocation->getDefaultGmm()->resourceParams.Format); EXPECT_EQ(CL_SUCCESS, errCode); } @@ -973,7 +973,7 @@ TEST_F(VaSharingTests, givenP016FormatWhenCreatingSharedVaSurfaceForPlane1ThenCo auto graphicsAllocation = vaSurface->getGraphicsAllocation(rootDeviceIndex); EXPECT_EQ(static_cast(CL_UNORM_INT16), vaSurface->getImageFormat().image_channel_data_type); EXPECT_EQ(static_cast(CL_RG), vaSurface->getImageFormat().image_channel_order); - EXPECT_EQ(GMM_RESOURCE_FORMAT::GMM_FORMAT_R16G16_UNORM, vaSurface->getSurfaceFormatInfo().surfaceFormat.GMMSurfaceFormat); + EXPECT_EQ(GMM_RESOURCE_FORMAT::GMM_FORMAT_R16G16_UNORM, vaSurface->getSurfaceFormatInfo().surfaceFormat.gmmSurfaceFormat); EXPECT_EQ(GMM_RESOURCE_FORMAT::GMM_FORMAT_P016, graphicsAllocation->getDefaultGmm()->resourceParams.Format); EXPECT_EQ(CL_SUCCESS, errCode); } @@ -1004,7 +1004,7 @@ TEST_F(VaSharingTests, givenYUY2FormatWhenCreatingSharedVaSurfaceThenCorrectForm auto graphicsAllocation = vaSurface->getGraphicsAllocation(rootDeviceIndex); EXPECT_EQ(static_cast(CL_UNORM_INT8), vaSurface->getImageFormat().image_channel_data_type); EXPECT_EQ(static_cast(CL_YUYV_INTEL), vaSurface->getImageFormat().image_channel_order); - EXPECT_EQ(GMM_RESOURCE_FORMAT::GMM_FORMAT_YCRCB_NORMAL, vaSurface->getSurfaceFormatInfo().surfaceFormat.GMMSurfaceFormat); + EXPECT_EQ(GMM_RESOURCE_FORMAT::GMM_FORMAT_YCRCB_NORMAL, vaSurface->getSurfaceFormatInfo().surfaceFormat.gmmSurfaceFormat); EXPECT_EQ(GMM_RESOURCE_FORMAT::GMM_FORMAT_YCRCB_NORMAL, graphicsAllocation->getDefaultGmm()->resourceParams.Format); EXPECT_EQ(CL_SUCCESS, errCode); } @@ -1040,7 +1040,7 @@ TEST_F(VaSharingTests, givenEnabledExtendedVaFormatsAndRGBPFormatWhenCreatingSha auto graphicsAllocation = vaSurface->getGraphicsAllocation(rootDeviceIndex); EXPECT_EQ(static_cast(CL_UNORM_INT8), vaSurface->getImageFormat().image_channel_data_type); EXPECT_EQ(static_cast(CL_R), vaSurface->getImageFormat().image_channel_order); - EXPECT_EQ(GMM_RESOURCE_FORMAT::GMM_FORMAT_R8_UNORM, vaSurface->getSurfaceFormatInfo().surfaceFormat.GMMSurfaceFormat); + EXPECT_EQ(GMM_RESOURCE_FORMAT::GMM_FORMAT_R8_UNORM, vaSurface->getSurfaceFormatInfo().surfaceFormat.gmmSurfaceFormat); EXPECT_EQ(GMM_RESOURCE_FORMAT::GMM_FORMAT_RGBP, graphicsAllocation->getDefaultGmm()->resourceParams.Format); EXPECT_EQ(CL_SUCCESS, errCode); } @@ -1064,7 +1064,7 @@ TEST_F(VaSharingTests, givenEnabledExtendedVaFormatsAndRGBPFormatWhenCreatingSha auto graphicsAllocation = vaSurface->getGraphicsAllocation(rootDeviceIndex); EXPECT_EQ(static_cast(CL_UNORM_INT8), vaSurface->getImageFormat().image_channel_data_type); EXPECT_EQ(static_cast(CL_R), vaSurface->getImageFormat().image_channel_order); - EXPECT_EQ(GMM_RESOURCE_FORMAT::GMM_FORMAT_R8_UNORM, vaSurface->getSurfaceFormatInfo().surfaceFormat.GMMSurfaceFormat); + EXPECT_EQ(GMM_RESOURCE_FORMAT::GMM_FORMAT_R8_UNORM, vaSurface->getSurfaceFormatInfo().surfaceFormat.gmmSurfaceFormat); EXPECT_EQ(GMM_RESOURCE_FORMAT::GMM_FORMAT_RGBP, graphicsAllocation->getDefaultGmm()->resourceParams.Format); EXPECT_EQ(CL_SUCCESS, errCode); } @@ -1088,7 +1088,7 @@ TEST_F(VaSharingTests, givenEnabledExtendedVaFormatsAndRGBPFormatWhenCreatingSha auto graphicsAllocation = vaSurface->getGraphicsAllocation(rootDeviceIndex); EXPECT_EQ(static_cast(CL_UNORM_INT8), vaSurface->getImageFormat().image_channel_data_type); EXPECT_EQ(static_cast(CL_R), vaSurface->getImageFormat().image_channel_order); - EXPECT_EQ(GMM_RESOURCE_FORMAT::GMM_FORMAT_R8_UNORM, vaSurface->getSurfaceFormatInfo().surfaceFormat.GMMSurfaceFormat); + EXPECT_EQ(GMM_RESOURCE_FORMAT::GMM_FORMAT_R8_UNORM, vaSurface->getSurfaceFormatInfo().surfaceFormat.gmmSurfaceFormat); EXPECT_EQ(GMM_RESOURCE_FORMAT::GMM_FORMAT_RGBP, graphicsAllocation->getDefaultGmm()->resourceParams.Format); EXPECT_EQ(CL_SUCCESS, errCode); } @@ -1158,7 +1158,7 @@ TEST_F(VaSharingTests, givenEnabledExtendedVaFormatsAndNV12FormatWhenCreatingSha auto graphicsAllocation = vaSurface->getGraphicsAllocation(rootDeviceIndex); EXPECT_EQ(static_cast(CL_UNORM_INT8), vaSurface->getImageFormat().image_channel_data_type); EXPECT_EQ(static_cast(CL_R), vaSurface->getImageFormat().image_channel_order); - EXPECT_EQ(GMM_RESOURCE_FORMAT::GMM_FORMAT_R8_UNORM, vaSurface->getSurfaceFormatInfo().surfaceFormat.GMMSurfaceFormat); + EXPECT_EQ(GMM_RESOURCE_FORMAT::GMM_FORMAT_R8_UNORM, vaSurface->getSurfaceFormatInfo().surfaceFormat.gmmSurfaceFormat); EXPECT_EQ(GMM_RESOURCE_FORMAT::GMM_FORMAT_NV12, graphicsAllocation->getDefaultGmm()->resourceParams.Format); EXPECT_EQ(CL_SUCCESS, errCode); } diff --git a/shared/source/aub_mem_dump/aub_alloc_dump.inl b/shared/source/aub_mem_dump/aub_alloc_dump.inl index cf75f8796f..2d59e35f3a 100644 --- a/shared/source/aub_mem_dump/aub_alloc_dump.inl +++ b/shared/source/aub_mem_dump/aub_alloc_dump.inl @@ -84,17 +84,17 @@ template void dumpBufferInBinFormat(GraphicsAllocation &gfxAllocation, AubMemDump::AubFileStream *stream, uint32_t context) { AubMemDump::AubCaptureBinaryDumpHD cmd; memset(&cmd, 0, sizeof(cmd)); - cmd.Header.Type = 0x7; - cmd.Header.Opcode = 0x1; - cmd.Header.SubOp = 0x15; - cmd.Header.DwordLength = ((sizeof(cmd) - sizeof(cmd.Header)) / sizeof(uint32_t)) - 1; + cmd.header.type = 0x7; + cmd.header.opcode = 0x1; + cmd.header.subOp = 0x15; + cmd.header.dwordLength = ((sizeof(cmd) - sizeof(cmd.header)) / sizeof(uint32_t)) - 1; cmd.setHeight(1); cmd.setWidth(gfxAllocation.getUnderlyingBufferSize()); cmd.setBaseAddr(gfxAllocation.getGpuAddress()); cmd.setPitch(gfxAllocation.getUnderlyingBufferSize()); - cmd.GttType = 1; - cmd.DirectoryHandle = context; + cmd.gttType = 1; + cmd.directoryHandle = context; stream->write(reinterpret_cast(&cmd), sizeof(cmd)); } @@ -105,31 +105,31 @@ void dumpImageInBmpFormat(GraphicsAllocation &gfxAllocation, AubMemDump::AubFile AubMemDump::AubCmdDumpBmpHd cmd; memset(&cmd, 0, sizeof(cmd)); - cmd.Header.Type = 0x7; - cmd.Header.Opcode = 0x1; - cmd.Header.SubOp = 0x44; - cmd.Header.DwordLength = ((sizeof(cmd) - sizeof(cmd.Header)) / sizeof(uint32_t)) - 1; + cmd.header.type = 0x7; + cmd.header.opcode = 0x1; + cmd.header.subOp = 0x44; + cmd.header.dwordLength = ((sizeof(cmd) - sizeof(cmd.header)) / sizeof(uint32_t)) - 1; - cmd.Xmin = 0; - cmd.Ymin = 0; + cmd.xMin = 0; + cmd.yMin = 0; auto pitch = gmm->gmmResourceInfo->getRenderPitch(); auto bitsPerPixel = gmm->gmmResourceInfo->getBitsPerPixel(); auto pitchInPixels = static_cast(8 * pitch / bitsPerPixel); - cmd.BufferPitch = pitchInPixels; - cmd.BitsPerPixel = bitsPerPixel; - cmd.Format = gmm->gmmResourceInfo->getResourceFormatSurfaceState(); - cmd.Xsize = static_cast(gmm->gmmResourceInfo->getBaseWidth()); - cmd.Ysize = static_cast(gmm->gmmResourceInfo->getBaseHeight()); + cmd.bufferPitch = pitchInPixels; + cmd.bitsPerPixel = bitsPerPixel; + cmd.format = gmm->gmmResourceInfo->getResourceFormatSurfaceState(); + cmd.xSize = static_cast(gmm->gmmResourceInfo->getBaseWidth()); + cmd.ySize = static_cast(gmm->gmmResourceInfo->getBaseHeight()); cmd.setBaseAddr(gfxAllocation.getGpuAddress()); - cmd.Secure = 0; - cmd.UseFence = 0; + cmd.secure = 0; + cmd.useFence = 0; auto flagInfo = gmm->gmmResourceInfo->getResourceFlags()->Info; - cmd.TileOn = flagInfo.TiledW || flagInfo.TiledX || flagInfo.TiledY || flagInfo.TiledYf || flagInfo.TiledYs; - cmd.WalkY = flagInfo.TiledY; - cmd.UsePPGTT = 1; - cmd.Use32BitDump = 1; // Dump out in 32bpp vs 24bpp - cmd.UseFullFormat = 1; - cmd.DirectoryHandle = context; + cmd.tileOn = flagInfo.TiledW || flagInfo.TiledX || flagInfo.TiledY || flagInfo.TiledYf || flagInfo.TiledYs; + cmd.walkY = flagInfo.TiledY; + cmd.usePPGTT = 1; + cmd.use32BitDump = 1; // Dump out in 32bpp vs 24bpp + cmd.useFullFormat = 1; + cmd.directoryHandle = context; stream->write(reinterpret_cast(&cmd), sizeof(cmd)); } diff --git a/shared/source/aub_mem_dump/aub_header.h b/shared/source/aub_mem_dump/aub_header.h index 9fcb383517..b1cf2b35b5 100644 --- a/shared/source/aub_mem_dump/aub_header.h +++ b/shared/source/aub_mem_dump/aub_header.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -27,88 +27,88 @@ inline uint64_t getMisalignedUint64(const uint64_t *address) { } struct AubCmdHdr { - uint32_t DwordLength : 16, - SubOp : 7, - Opcode : 6, - Type : 3; + uint32_t dwordLength : 16, + subOp : 7, + opcode : 6, + type : 3; }; static_assert(4 == sizeof(AubCmdHdr), "Invalid size for AubCmdHdr"); struct AubCmdDumpBmpHd { - AubCmdHdr Header; - uint32_t Xmin; - uint32_t Ymin; - uint32_t BufferPitch; - uint32_t BitsPerPixel : 8, - Format : 8, - Reserved_0 : 16; - uint32_t Xsize; - uint32_t Ysize; - uint64_t BaseAddr; - uint32_t Secure : 1, - UseFence : 1, - TileOn : 1, - WalkY : 1, - UsePPGTT : 1, - Use32BitDump : 1, - UseFullFormat : 1, - Reserved_1 : 25; - uint32_t DirectoryHandle; + AubCmdHdr header; + uint32_t xMin; + uint32_t yMin; + uint32_t bufferPitch; + uint32_t bitsPerPixel : 8, + format : 8, + reserved0 : 16; + uint32_t xSize; + uint32_t ySize; + uint64_t baseAddr; + uint32_t secure : 1, + useFence : 1, + tileOn : 1, + walkY : 1, + usePPGTT : 1, + use32BitDump : 1, + useFullFormat : 1, + reserved1 : 25; + uint32_t directoryHandle; uint64_t getBaseAddr() const { - return getMisalignedUint64(&this->BaseAddr); + return getMisalignedUint64(&this->baseAddr); } void setBaseAddr(const uint64_t baseAddr) { - setMisalignedUint64(&this->BaseAddr, baseAddr); + setMisalignedUint64(&this->baseAddr, baseAddr); } }; static_assert(44 == sizeof(AubCmdDumpBmpHd), "Invalid size for AubCmdDumpBmpHd"); struct AubPpgttContextCreate { - AubCmdHdr Header; - uint32_t Handle; - uint32_t AdvancedContext : 1, - SixtyFourBit : 1, - Reserved_31_2 : 30; - uint64_t PageDirPointer[4]; + AubCmdHdr header; + uint32_t handle; + uint32_t advancedContext : 1, + sixtyFourBit : 1, + reserved31To2 : 30; + uint64_t pageDirPointer[4]; }; static_assert(44 == sizeof(AubPpgttContextCreate), "Invalid size for AubPpgttContextCreate"); struct AubCaptureBinaryDumpHD { - AubCmdHdr Header; - uint64_t BaseAddr; - uint64_t Width; - uint64_t Height; - uint64_t Pitch; - uint32_t SurfaceType : 4, - GttType : 2, - Reserved_31_6 : 26; - uint32_t DirectoryHandle; - uint32_t ReservedDW1; - uint32_t ReservedDW2; - char OutputFile[4]; + AubCmdHdr header; + uint64_t baseAddr; + uint64_t width; + uint64_t height; + uint64_t pitch; + uint32_t surfaceType : 4, + gttType : 2, + reserved31To6 : 26; + uint32_t directoryHandle; + uint32_t reservedDW1; + uint32_t reservedDW2; + char outputFile[4]; uint64_t getBaseAddr() const { - return getMisalignedUint64(&this->BaseAddr); + return getMisalignedUint64(&this->baseAddr); } void setBaseAddr(const uint64_t baseAddr) { - setMisalignedUint64(&this->BaseAddr, baseAddr); + setMisalignedUint64(&this->baseAddr, baseAddr); } uint64_t getWidth() const { - return getMisalignedUint64(&this->Width); + return getMisalignedUint64(&this->width); } void setWidth(const uint64_t width) { - setMisalignedUint64(&this->Width, width); + setMisalignedUint64(&this->width, width); } uint64_t getHeight() const { - return getMisalignedUint64(&this->Height); + return getMisalignedUint64(&this->height); } void setHeight(const uint64_t height) { - setMisalignedUint64(&this->Height, height); + setMisalignedUint64(&this->height, height); } uint64_t getPitch() const { - return getMisalignedUint64(&this->Pitch); + return getMisalignedUint64(&this->pitch); } void setPitch(const uint64_t pitch) { - setMisalignedUint64(&this->Pitch, pitch); + setMisalignedUint64(&this->pitch, pitch); } }; static_assert(56 == sizeof(AubCaptureBinaryDumpHD), "Invalid size for AubCaptureBinaryDumpHD"); diff --git a/shared/source/aub_mem_dump/aub_mem_dump.h b/shared/source/aub_mem_dump/aub_mem_dump.h index c5727f2719..1676937cce 100644 --- a/shared/source/aub_mem_dump/aub_mem_dump.h +++ b/shared/source/aub_mem_dump/aub_mem_dump.h @@ -43,22 +43,22 @@ inline void setAddress(CmdServicesMemTraceMemoryCompare &cmd, uint64_t address) union IAPageTableEntry { struct { - uint64_t Present : 1; //[0] - uint64_t Writable : 1; //[1] - uint64_t UserSupervisor : 1; //[2] - uint64_t PWT : 1; //[3] - uint64_t PCD : 1; //[4] - uint64_t Accessed : 1; //[5] - uint64_t Dirty : 1; //[6] - uint64_t PAT : 1; //[7] - uint64_t Global : 1; //[8] - uint64_t Reserved_9 : 1; //[9] - uint64_t Reserved_10 : 1; //[10] - uint64_t Reserved_11 : 1; //[11] - uint64_t PhysicalAddress : 27; //[38:12] - uint64_t Reserved_51_39 : 13; //[51:39] - uint64_t Ignored : 11; //[62:52] - uint64_t ExecuteDisable : 1; //[63] + uint64_t present : 1; //[0] + uint64_t writable : 1; //[1] + uint64_t userSupervisor : 1; //[2] + uint64_t pwt : 1; //[3] + uint64_t pcd : 1; //[4] + uint64_t accessed : 1; //[5] + uint64_t dirty : 1; //[6] + uint64_t pat : 1; //[7] + uint64_t global : 1; //[8] + uint64_t reserved_9 : 1; //[9] + uint64_t reserved_10 : 1; //[10] + uint64_t reserved_11 : 1; //[11] + uint64_t physicalAddress : 27; //[38:12] + uint64_t reserved_51_39 : 13; //[51:39] + uint64_t ignored : 11; //[62:52] + uint64_t executeDisable : 1; //[63] } pageConfig; uint32_t dwordData[2]; uint64_t uiData; @@ -67,11 +67,11 @@ union IAPageTableEntry { union MiGttEntry { struct { - uint64_t Present : 1; //[0] - uint64_t LocalMemory : 1; //[1] - uint64_t FunctionNumber : 10; //[11:2] - uint64_t PhysicalAddress : 35; //[46:12] - uint64_t Ignored : 17; //[63:47] + uint64_t present : 1; //[0] + uint64_t localMemory : 1; //[1] + uint64_t functionNumber : 10; //[11:2] + uint64_t physicalAddress : 35; //[46:12] + uint64_t ignored : 17; //[63:47] } pageConfig; uint32_t dwordData[2]; uint64_t uiData; @@ -272,17 +272,17 @@ struct AubDump : public std::conditional::reserveAddressGGTTAndWriteMmeory(typename Traits::Stream & template void AubDump::setGttEntry(MiGttEntry &entry, uint64_t address, AubGTTData data) { entry.uiData = 0; - entry.pageConfig.PhysicalAddress = address / 4096; - entry.pageConfig.Present = data.present; - entry.pageConfig.LocalMemory = data.localMemory; + entry.pageConfig.physicalAddress = address / 4096; + entry.pageConfig.present = data.present; + entry.pageConfig.localMemory = data.localMemory; } template @@ -326,18 +326,18 @@ template void AubPageTableHelper32::createContext(typename Traits::Stream &stream, uint32_t context) { AubPpgttContextCreate cmd; memset(&cmd, 0, sizeof(cmd)); - cmd.Header.Type = 0x7; - cmd.Header.Opcode = 0x1; - cmd.Header.SubOp = 0x14; - cmd.Header.DwordLength = ((sizeof(cmd) - sizeof(cmd.Header)) / sizeof(uint32_t)) - 1; - cmd.Handle = context; - cmd.AdvancedContext = false; + cmd.header.type = 0x7; + cmd.header.opcode = 0x1; + cmd.header.subOp = 0x14; + cmd.header.dwordLength = ((sizeof(cmd) - sizeof(cmd.header)) / sizeof(uint32_t)) - 1; + cmd.handle = context; + cmd.advancedContext = false; - cmd.SixtyFourBit = 0; - cmd.PageDirPointer[0] = BaseClass::getPDEAddress(0x000); - cmd.PageDirPointer[1] = BaseClass::getPDEAddress(0x200); - cmd.PageDirPointer[2] = BaseClass::getPDEAddress(0x400); - cmd.PageDirPointer[3] = BaseClass::getPDEAddress(0x600); + cmd.sixtyFourBit = 0; + cmd.pageDirPointer[0] = BaseClass::getPDEAddress(0x000); + cmd.pageDirPointer[1] = BaseClass::getPDEAddress(0x200); + cmd.pageDirPointer[2] = BaseClass::getPDEAddress(0x400); + cmd.pageDirPointer[3] = BaseClass::getPDEAddress(0x600); stream.createContext(cmd); } @@ -346,15 +346,15 @@ template void AubPageTableHelper64::createContext(typename Traits::Stream &stream, uint32_t context) { AubPpgttContextCreate cmd; memset(&cmd, 0, sizeof(cmd)); - cmd.Header.Type = 0x7; - cmd.Header.Opcode = 0x1; - cmd.Header.SubOp = 0x14; - cmd.Header.DwordLength = ((sizeof(cmd) - sizeof(cmd.Header)) / sizeof(uint32_t)) - 1; - cmd.Handle = context; - cmd.AdvancedContext = false; + cmd.header.type = 0x7; + cmd.header.opcode = 0x1; + cmd.header.subOp = 0x14; + cmd.header.dwordLength = ((sizeof(cmd) - sizeof(cmd.header)) / sizeof(uint32_t)) - 1; + cmd.handle = context; + cmd.advancedContext = false; - cmd.SixtyFourBit = 1; - cmd.PageDirPointer[0] = getPML4Address(0); + cmd.sixtyFourBit = 1; + cmd.pageDirPointer[0] = getPML4Address(0); stream.createContext(cmd); } diff --git a/shared/source/aub_mem_dump/definitions/aub_services.h b/shared/source/aub_mem_dump/definitions/aub_services.h index ba476bb4cf..05dd6e8791 100644 --- a/shared/source/aub_mem_dump/definitions/aub_services.h +++ b/shared/source/aub_mem_dump/definitions/aub_services.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -19,7 +19,7 @@ struct CmdServicesMemTraceVersion { union { - AubCmdHdr Header; + AubCmdHdr header; struct { uint32_t dwordCount : 16; uint32_t instructionSubOpcode : 7; @@ -160,7 +160,7 @@ struct CmdServicesMemTraceVersion { struct CmdServicesMemTraceRegisterCompare { union { - AubCmdHdr Header; + AubCmdHdr header; struct { uint32_t dwordCount : 16; uint32_t instructionSubOpcode : 7; @@ -230,7 +230,7 @@ struct CmdServicesMemTraceRegisterCompare { struct CmdServicesMemTraceRegisterPoll { union { - AubCmdHdr Header; + AubCmdHdr header; struct { uint32_t dwordCount : 16; uint32_t instructionSubOpcode : 7; @@ -308,7 +308,7 @@ struct CmdServicesMemTraceRegisterPoll { struct CmdServicesMemTraceRegisterWrite { union { - AubCmdHdr Header; + AubCmdHdr header; struct { uint32_t dwordCount : 16; uint32_t instructionSubOpcode : 7; @@ -382,7 +382,7 @@ struct CmdServicesMemTraceRegisterWrite { struct CmdServicesMemTraceMemoryCompare { union { - AubCmdHdr Header; + AubCmdHdr header; struct { uint32_t dwordCount : 16; uint32_t instructionSubOpcode : 7; @@ -527,7 +527,7 @@ struct CmdServicesMemTraceMemoryCompare { struct CmdServicesMemTraceMemoryPoll { union { - AubCmdHdr Header; + AubCmdHdr header; struct { uint32_t dwordCount : 16; uint32_t instructionSubOpcode : 7; @@ -665,7 +665,7 @@ struct CmdServicesMemTraceMemoryPoll { struct CmdServicesMemTraceMemoryWrite { union { - AubCmdHdr Header; + AubCmdHdr header; struct { uint32_t dwordCount : 16; uint32_t instructionSubOpcode : 7; @@ -816,7 +816,7 @@ struct CmdServicesMemTraceMemoryWrite { struct CmdServicesMemTraceMemoryWriteDiscontiguous { union { - AubCmdHdr Header; + AubCmdHdr header; struct { uint32_t dwordCount : 16; uint32_t instructionSubOpcode : 7; @@ -835,7 +835,7 @@ struct CmdServicesMemTraceMemoryWriteDiscontiguous { struct { uint64_t address; uint32_t dataSizeInBytes; - } Dword_2_To_190[63]; + } dword2To190[63]; int32_t getDword2To190Length() const { return 190 - (2) + 1; } @@ -960,7 +960,7 @@ struct CmdServicesMemTraceMemoryWriteDiscontiguous { struct CmdServicesMemTraceFrameBegin { union { - AubCmdHdr Header; + AubCmdHdr header; struct { uint32_t dwordCount : 16; uint32_t instructionSubOpcode : 7; @@ -1002,7 +1002,7 @@ struct CmdServicesMemTraceFrameBegin { struct CmdServicesMemTraceComment { union { - AubCmdHdr Header; + AubCmdHdr header; struct { uint32_t dwordCount : 16; uint32_t instructionSubOpcode : 7; @@ -1049,7 +1049,7 @@ struct CmdServicesMemTraceComment { struct CmdServicesMemTraceDelay { union { - AubCmdHdr Header; + AubCmdHdr header; struct { uint32_t dwordCount : 16; uint32_t instructionSubOpcode : 7; @@ -1088,7 +1088,7 @@ struct CmdServicesMemTraceDelay { struct CmdServicesMemTraceMemoryDump { union { - AubCmdHdr Header; + AubCmdHdr header; struct { uint32_t dwordCount : 16; uint32_t instructionSubOpcode : 7; @@ -1151,7 +1151,7 @@ struct CmdServicesMemTraceMemoryDump { struct CmdServicesMemTraceTestPhaseMarker { union { - AubCmdHdr Header; + AubCmdHdr header; struct { uint32_t dwordCount : 16; uint32_t instructionSubOpcode : 7; @@ -1202,7 +1202,7 @@ struct CmdServicesMemTraceTestPhaseMarker { struct CmdServicesMemTraceMemoryContinuousRegion { union { - AubCmdHdr Header; + AubCmdHdr header; struct { uint32_t dwordCount : 16; uint32_t instructionSubOpcode : 7; @@ -1248,7 +1248,7 @@ struct CmdServicesMemTraceMemoryContinuousRegion { struct CmdServicesMemTracePredicate { union { - AubCmdHdr Header; + AubCmdHdr header; struct { uint32_t dwordCount : 16; uint32_t instructionSubOpcode : 7; @@ -1308,7 +1308,7 @@ struct CmdServicesMemTracePredicate { struct CmdServicesMemTraceDumpCompress { union { - AubCmdHdr Header; + AubCmdHdr header; struct { uint32_t dwordCount : 16; uint32_t instructionSubOpcode : 7; diff --git a/shared/source/command_stream/aub_command_stream_receiver_hw_base.inl b/shared/source/command_stream/aub_command_stream_receiver_hw_base.inl index 5a9db58060..2f098d120b 100644 --- a/shared/source/command_stream/aub_command_stream_receiver_hw_base.inl +++ b/shared/source/command_stream/aub_command_stream_receiver_hw_base.inl @@ -564,17 +564,17 @@ void AUBCommandStreamReceiverHw::submitBatchBufferAub(uint64_t batchB { typename AUB::MiContextDescriptorReg contextDescriptor = {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}; - contextDescriptor.sData.Valid = true; - contextDescriptor.sData.ForcePageDirRestore = false; - contextDescriptor.sData.ForceRestore = false; - contextDescriptor.sData.Legacy = true; - contextDescriptor.sData.FaultSupport = 0; - contextDescriptor.sData.PrivilegeAccessOrPPGTT = true; - contextDescriptor.sData.ADor64bitSupport = AUB::Traits::addressingBits > 32; + contextDescriptor.sData.valid = true; + contextDescriptor.sData.forcePageDirRestore = false; + contextDescriptor.sData.forceRestore = false; + contextDescriptor.sData.legacy = true; + contextDescriptor.sData.faultSupport = 0; + contextDescriptor.sData.privilegeAccessOrPPGTT = true; + contextDescriptor.sData.aDor64bitSupport = AUB::Traits::addressingBits > 32; auto ggttLRCA = engineInfo.ggttLRCA; - contextDescriptor.sData.LogicalRingCtxAddress = ggttLRCA / 4096; - contextDescriptor.sData.ContextID = 0; + contextDescriptor.sData.logicalRingCtxAddress = ggttLRCA / 4096; + contextDescriptor.sData.contextID = 0; this->submitLRCA(contextDescriptor); } diff --git a/shared/source/command_stream/tbx_command_stream_receiver_hw.inl b/shared/source/command_stream/tbx_command_stream_receiver_hw.inl index 0f41170fea..e90ec8da32 100644 --- a/shared/source/command_stream/tbx_command_stream_receiver_hw.inl +++ b/shared/source/command_stream/tbx_command_stream_receiver_hw.inl @@ -375,17 +375,17 @@ void TbxCommandStreamReceiverHw::submitBatchBufferTbx(uint64_t batchB { typename AUB::MiContextDescriptorReg contextDescriptor = {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}; - contextDescriptor.sData.Valid = true; - contextDescriptor.sData.ForcePageDirRestore = false; - contextDescriptor.sData.ForceRestore = false; - contextDescriptor.sData.Legacy = true; - contextDescriptor.sData.FaultSupport = 0; - contextDescriptor.sData.PrivilegeAccessOrPPGTT = true; - contextDescriptor.sData.ADor64bitSupport = AUB::Traits::addressingBits > 32; + contextDescriptor.sData.valid = true; + contextDescriptor.sData.forcePageDirRestore = false; + contextDescriptor.sData.forceRestore = false; + contextDescriptor.sData.legacy = true; + contextDescriptor.sData.faultSupport = 0; + contextDescriptor.sData.privilegeAccessOrPPGTT = true; + contextDescriptor.sData.aDor64bitSupport = AUB::Traits::addressingBits > 32; auto ggttLRCA = engineInfo.ggttLRCA; - contextDescriptor.sData.LogicalRingCtxAddress = ggttLRCA / 4096; - contextDescriptor.sData.ContextID = 0; + contextDescriptor.sData.logicalRingCtxAddress = ggttLRCA / 4096; + contextDescriptor.sData.contextID = 0; this->submitLRCA(contextDescriptor); } diff --git a/shared/source/debugger/debugger_l0.cpp b/shared/source/debugger/debugger_l0.cpp index dd527e98bd..14d765c26e 100644 --- a/shared/source/debugger/debugger_l0.cpp +++ b/shared/source/debugger/debugger_l0.cpp @@ -121,8 +121,8 @@ void DebuggerL0::printTrackedAddresses(uint32_t contextId) { " ioba = %" SCNx64 " iba = %" SCNx64 " bsurfsba = %" SCNx64 "\n", - sba->SurfaceStateBaseAddress, sba->GeneralStateBaseAddress, sba->DynamicStateBaseAddress, - sba->IndirectObjectBaseAddress, sba->InstructionBaseAddress, sba->BindlessSurfaceStateBaseAddress); + sba->surfaceStateBaseAddress, sba->generalStateBaseAddress, sba->dynamicStateBaseAddress, + sba->indirectObjectBaseAddress, sba->instructionBaseAddress, sba->bindlessSurfaceStateBaseAddress); } DebuggerL0 ::~DebuggerL0() { diff --git a/shared/source/debugger/debugger_l0.h b/shared/source/debugger/debugger_l0.h index 50ffdaae05..0f23dfe824 100644 --- a/shared/source/debugger/debugger_l0.h +++ b/shared/source/debugger/debugger_l0.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -24,16 +24,16 @@ class OSInterface; #pragma pack(1) struct SbaTrackedAddresses { char magic[8] = "sbaarea"; - uint64_t Reserved1 = 0; - uint8_t Version = 0; - uint8_t Reserved2[7]; - uint64_t GeneralStateBaseAddress = 0; - uint64_t SurfaceStateBaseAddress = 0; - uint64_t DynamicStateBaseAddress = 0; - uint64_t IndirectObjectBaseAddress = 0; - uint64_t InstructionBaseAddress = 0; - uint64_t BindlessSurfaceStateBaseAddress = 0; - uint64_t BindlessSamplerStateBaseAddress = 0; + uint64_t reserved1 = 0; + uint8_t version = 0; + uint8_t reserved2[7]; + uint64_t generalStateBaseAddress = 0; + uint64_t surfaceStateBaseAddress = 0; + uint64_t dynamicStateBaseAddress = 0; + uint64_t indirectObjectBaseAddress = 0; + uint64_t instructionBaseAddress = 0; + uint64_t bindlessSurfaceStateBaseAddress = 0; + uint64_t bindlessSamplerStateBaseAddress = 0; }; struct DebugAreaHeader { diff --git a/shared/source/debugger/debugger_l0.inl b/shared/source/debugger/debugger_l0.inl index 3dceb92009..156e66d70a 100644 --- a/shared/source/debugger/debugger_l0.inl +++ b/shared/source/debugger/debugger_l0.inl @@ -47,7 +47,7 @@ void DebuggerL0Hw::captureStateBaseAddress(NEO::LinearStream &cmdStre if (sbaCanonized.GeneralStateBaseAddress) { auto generalStateBaseAddress = sbaCanonized.GeneralStateBaseAddress; NEO::EncodeStoreMemory::programStoreDataImm(cmdStream, - gpuAddress + offsetof(SbaTrackedAddresses, GeneralStateBaseAddress), + gpuAddress + offsetof(SbaTrackedAddresses, generalStateBaseAddress), static_cast(generalStateBaseAddress & 0x0000FFFFFFFFULL), static_cast(generalStateBaseAddress >> 32), true, @@ -56,7 +56,7 @@ void DebuggerL0Hw::captureStateBaseAddress(NEO::LinearStream &cmdStre if (sbaCanonized.SurfaceStateBaseAddress) { auto surfaceStateBaseAddress = sbaCanonized.SurfaceStateBaseAddress; NEO::EncodeStoreMemory::programStoreDataImm(cmdStream, - gpuAddress + offsetof(SbaTrackedAddresses, SurfaceStateBaseAddress), + gpuAddress + offsetof(SbaTrackedAddresses, surfaceStateBaseAddress), static_cast(surfaceStateBaseAddress & 0x0000FFFFFFFFULL), static_cast(surfaceStateBaseAddress >> 32), true, @@ -65,7 +65,7 @@ void DebuggerL0Hw::captureStateBaseAddress(NEO::LinearStream &cmdStre if (sbaCanonized.DynamicStateBaseAddress) { auto dynamicStateBaseAddress = sbaCanonized.DynamicStateBaseAddress; NEO::EncodeStoreMemory::programStoreDataImm(cmdStream, - gpuAddress + offsetof(SbaTrackedAddresses, DynamicStateBaseAddress), + gpuAddress + offsetof(SbaTrackedAddresses, dynamicStateBaseAddress), static_cast(dynamicStateBaseAddress & 0x0000FFFFFFFFULL), static_cast(dynamicStateBaseAddress >> 32), true, @@ -74,7 +74,7 @@ void DebuggerL0Hw::captureStateBaseAddress(NEO::LinearStream &cmdStre if (sbaCanonized.IndirectObjectBaseAddress) { auto indirectObjectBaseAddress = sbaCanonized.IndirectObjectBaseAddress; NEO::EncodeStoreMemory::programStoreDataImm(cmdStream, - gpuAddress + offsetof(SbaTrackedAddresses, IndirectObjectBaseAddress), + gpuAddress + offsetof(SbaTrackedAddresses, indirectObjectBaseAddress), static_cast(indirectObjectBaseAddress & 0x0000FFFFFFFFULL), static_cast(indirectObjectBaseAddress >> 32), true, @@ -83,7 +83,7 @@ void DebuggerL0Hw::captureStateBaseAddress(NEO::LinearStream &cmdStre if (sbaCanonized.InstructionBaseAddress) { auto instructionBaseAddress = sbaCanonized.InstructionBaseAddress; NEO::EncodeStoreMemory::programStoreDataImm(cmdStream, - gpuAddress + offsetof(SbaTrackedAddresses, InstructionBaseAddress), + gpuAddress + offsetof(SbaTrackedAddresses, instructionBaseAddress), static_cast(instructionBaseAddress & 0x0000FFFFFFFFULL), static_cast(instructionBaseAddress >> 32), true, @@ -92,7 +92,7 @@ void DebuggerL0Hw::captureStateBaseAddress(NEO::LinearStream &cmdStre if (sbaCanonized.BindlessSurfaceStateBaseAddress) { auto bindlessSurfaceStateBaseAddress = sbaCanonized.BindlessSurfaceStateBaseAddress; NEO::EncodeStoreMemory::programStoreDataImm(cmdStream, - gpuAddress + offsetof(SbaTrackedAddresses, BindlessSurfaceStateBaseAddress), + gpuAddress + offsetof(SbaTrackedAddresses, bindlessSurfaceStateBaseAddress), static_cast(bindlessSurfaceStateBaseAddress & 0x0000FFFFFFFFULL), static_cast(bindlessSurfaceStateBaseAddress >> 32), true, diff --git a/shared/source/debugger/debugger_l0_tgllp_and_later.inl b/shared/source/debugger/debugger_l0_tgllp_and_later.inl index 94e98b78e8..55baf6826c 100644 --- a/shared/source/debugger/debugger_l0_tgllp_and_later.inl +++ b/shared/source/debugger/debugger_l0_tgllp_and_later.inl @@ -38,22 +38,22 @@ void DebuggerL0Hw::programSbaTrackingCommandsSingleAddressSpace(NEO:: std::vector> fieldOffsetAndValue; if (sba.GeneralStateBaseAddress) { - fieldOffsetAndValue.push_back({offsetof(SbaTrackedAddresses, GeneralStateBaseAddress), sba.GeneralStateBaseAddress}); + fieldOffsetAndValue.push_back({offsetof(SbaTrackedAddresses, generalStateBaseAddress), sba.GeneralStateBaseAddress}); } if (sba.SurfaceStateBaseAddress) { - fieldOffsetAndValue.push_back({offsetof(SbaTrackedAddresses, SurfaceStateBaseAddress), sba.SurfaceStateBaseAddress}); + fieldOffsetAndValue.push_back({offsetof(SbaTrackedAddresses, surfaceStateBaseAddress), sba.SurfaceStateBaseAddress}); } if (sba.DynamicStateBaseAddress) { - fieldOffsetAndValue.push_back({offsetof(SbaTrackedAddresses, DynamicStateBaseAddress), sba.DynamicStateBaseAddress}); + fieldOffsetAndValue.push_back({offsetof(SbaTrackedAddresses, dynamicStateBaseAddress), sba.DynamicStateBaseAddress}); } if (sba.IndirectObjectBaseAddress) { - fieldOffsetAndValue.push_back({offsetof(SbaTrackedAddresses, IndirectObjectBaseAddress), sba.IndirectObjectBaseAddress}); + fieldOffsetAndValue.push_back({offsetof(SbaTrackedAddresses, indirectObjectBaseAddress), sba.IndirectObjectBaseAddress}); } if (sba.InstructionBaseAddress) { - fieldOffsetAndValue.push_back({offsetof(SbaTrackedAddresses, InstructionBaseAddress), sba.InstructionBaseAddress}); + fieldOffsetAndValue.push_back({offsetof(SbaTrackedAddresses, instructionBaseAddress), sba.InstructionBaseAddress}); } if (sba.BindlessSurfaceStateBaseAddress) { - fieldOffsetAndValue.push_back({offsetof(SbaTrackedAddresses, BindlessSurfaceStateBaseAddress), sba.BindlessSurfaceStateBaseAddress}); + fieldOffsetAndValue.push_back({offsetof(SbaTrackedAddresses, bindlessSurfaceStateBaseAddress), sba.BindlessSurfaceStateBaseAddress}); } const auto cmdStreamGpuBase = cmdStream.getGpuBase(); const auto cmdStreamCpuBase = reinterpret_cast(cmdStream.getCpuBase()); diff --git a/shared/source/device/device.cpp b/shared/source/device/device.cpp index 04b8bb4b3e..e3c9a147e6 100644 --- a/shared/source/device/device.cpp +++ b/shared/source/device/device.cpp @@ -521,10 +521,10 @@ bool Device::getDeviceAndHostTimer(uint64_t *deviceTimestamp, uint64_t *hostTime TimeStampData timeStamp; auto retVal = getOSTime()->getCpuGpuTime(&timeStamp); if (retVal) { - *hostTimestamp = timeStamp.CPUTimeinNS; + *hostTimestamp = timeStamp.cpuTimeinNS; if (DebugManager.flags.EnableDeviceBasedTimestamps.get()) { auto resolution = getOSTime()->getDynamicDeviceTimerResolution(getHardwareInfo()); - *deviceTimestamp = static_cast(timeStamp.GPUTimeStamp * resolution); + *deviceTimestamp = static_cast(timeStamp.gpuTimeStamp * resolution); } else *deviceTimestamp = *hostTimestamp; } diff --git a/shared/source/gmm_helper/gmm.cpp b/shared/source/gmm_helper/gmm.cpp index d7a953b8b9..dc730fa0b2 100644 --- a/shared/source/gmm_helper/gmm.cpp +++ b/shared/source/gmm_helper/gmm.cpp @@ -123,7 +123,7 @@ void Gmm::setupImageResourceParams(ImageInfo &imgInfo, bool preferCompressed) { resourceParams.Usage = CacheSettingsHelper::getGmmUsageType(AllocationType::IMAGE, false, productHelper); - resourceParams.Format = imgInfo.surfaceFormat->GMMSurfaceFormat; + resourceParams.Format = imgInfo.surfaceFormat->gmmSurfaceFormat; resourceParams.Flags.Gpu.Texture = 1; resourceParams.BaseWidth64 = imageWidth; resourceParams.BaseHeight = imageHeight; @@ -157,9 +157,9 @@ void Gmm::applyAuxFlagsForImage(ImageInfo &imgInfo, bool preferCompressed) { auto &gfxCoreHelper = rootDeviceEnvironment.getHelper(); auto hardwareInfo = rootDeviceEnvironment.getHardwareInfo(); if (this->resourceParams.Flags.Info.MediaCompressed) { - compressionFormat = gmmHelper->getClientContext()->getMediaSurfaceStateCompressionFormat(imgInfo.surfaceFormat->GMMSurfaceFormat); + compressionFormat = gmmHelper->getClientContext()->getMediaSurfaceStateCompressionFormat(imgInfo.surfaceFormat->gmmSurfaceFormat); } else { - compressionFormat = gmmHelper->getClientContext()->getSurfaceStateCompressionFormat(imgInfo.surfaceFormat->GMMSurfaceFormat); + compressionFormat = gmmHelper->getClientContext()->getSurfaceStateCompressionFormat(imgInfo.surfaceFormat->gmmSurfaceFormat); } bool compressionFormatSupported = false; @@ -169,15 +169,15 @@ void Gmm::applyAuxFlagsForImage(ImageInfo &imgInfo, bool preferCompressed) { compressionFormatSupported = compressionFormat != GMM_E2ECOMP_FORMAT::GMM_E2ECOMP_FORMAT_INVALID; } - const bool isPackedYuv = imgInfo.surfaceFormat->GMMSurfaceFormat == GMM_FORMAT_YUY2 || - imgInfo.surfaceFormat->GMMSurfaceFormat == GMM_FORMAT_UYVY || - imgInfo.surfaceFormat->GMMSurfaceFormat == GMM_FORMAT_YVYU || - imgInfo.surfaceFormat->GMMSurfaceFormat == GMM_FORMAT_VYUY; + const bool isPackedYuv = imgInfo.surfaceFormat->gmmSurfaceFormat == GMM_FORMAT_YUY2 || + imgInfo.surfaceFormat->gmmSurfaceFormat == GMM_FORMAT_UYVY || + imgInfo.surfaceFormat->gmmSurfaceFormat == GMM_FORMAT_YVYU || + imgInfo.surfaceFormat->gmmSurfaceFormat == GMM_FORMAT_VYUY; bool allowCompression = GfxCoreHelper::compressedImagesSupported(*hardwareInfo) && preferCompressed && compressionFormatSupported && - imgInfo.surfaceFormat->GMMSurfaceFormat != GMM_RESOURCE_FORMAT::GMM_FORMAT_NV12 && + imgInfo.surfaceFormat->gmmSurfaceFormat != GMM_RESOURCE_FORMAT::GMM_FORMAT_NV12 && imgInfo.plane == GMM_YUV_PLANE_ENUM::GMM_NO_PLANE && !isPackedYuv; @@ -234,7 +234,7 @@ void Gmm::queryImageParams(ImageInfo &imgInfo) { imgInfo.offset = reqOffsetInfo.Render.Offset; } - if (imgInfo.surfaceFormat->GMMSurfaceFormat == GMM_RESOURCE_FORMAT::GMM_FORMAT_NV12 || imgInfo.surfaceFormat->GMMSurfaceFormat == GMM_RESOURCE_FORMAT::GMM_FORMAT_P010) { + if (imgInfo.surfaceFormat->gmmSurfaceFormat == GMM_RESOURCE_FORMAT::GMM_FORMAT_NV12 || imgInfo.surfaceFormat->gmmSurfaceFormat == GMM_RESOURCE_FORMAT::GMM_FORMAT_P010) { GMM_REQ_OFFSET_INFO reqOffsetInfo = {}; reqOffsetInfo.ReqLock = 1; reqOffsetInfo.Slice = 1; diff --git a/shared/source/helpers/surface_format_info.h b/shared/source/helpers/surface_format_info.h index dcd63c811b..e92e4e0db5 100644 --- a/shared/source/helpers/surface_format_info.h +++ b/shared/source/helpers/surface_format_info.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -193,12 +193,12 @@ enum class ImagePlane { }; struct SurfaceFormatInfo { - GMM_RESOURCE_FORMAT GMMSurfaceFormat; - GFX3DSTATE_SURFACEFORMAT GenxSurfaceFormat; - uint32_t GMMTileWalk; - uint32_t NumChannels; - uint32_t PerChannelSizeInBytes; - size_t ImageElementSizeInBytes; + GMM_RESOURCE_FORMAT gmmSurfaceFormat; + GFX3DSTATE_SURFACEFORMAT genxSurfaceFormat; + uint32_t gmmTileWalk; + uint32_t numChannels; + uint32_t perChannelSizeInBytes; + size_t imageElementSizeInBytes; }; enum class ImageType { diff --git a/shared/source/image/image_surface_state.h b/shared/source/image/image_surface_state.h index ebdc60d6a5..2b5236d330 100644 --- a/shared/source/image/image_surface_state.h +++ b/shared/source/image/image_surface_state.h @@ -91,7 +91,7 @@ inline void setImageSurfaceState(typename GfxFamily::RENDER_SURFACE_STATE *surfa surfaceState->setXOffsetForUOrUvPlane(0); } - surfaceState->setSurfaceFormat(static_cast(imageInfo.surfaceFormat->GenxSurfaceFormat)); + surfaceState->setSurfaceFormat(static_cast(imageInfo.surfaceFormat->genxSurfaceFormat)); setFilterMode(surfaceState, gmmHelper.getHardwareInfo()); } @@ -125,7 +125,7 @@ inline void setImageSurfaceStateDimensions(typename GfxFamily::RENDER_SURFACE_ST template inline void setWidthForMediaBlockSurfaceState(typename GfxFamily::RENDER_SURFACE_STATE *surfaceState, const ImageInfo &imageInfo) { - auto elSize = imageInfo.surfaceFormat->ImageElementSizeInBytes; + auto elSize = imageInfo.surfaceFormat->imageElementSizeInBytes; auto numDwords = static_cast(Math::divideAndRoundUp(imageInfo.imgDesc.imageWidth * elSize, sizeof(uint32_t))); surfaceState->setWidth(numDwords); } diff --git a/shared/source/memory_manager/memory_manager.cpp b/shared/source/memory_manager/memory_manager.cpp index 13509b6f0f..ec8782adac 100644 --- a/shared/source/memory_manager/memory_manager.cpp +++ b/shared/source/memory_manager/memory_manager.cpp @@ -887,7 +887,7 @@ bool MemoryManager::isCopyRequired(ImageInfo &imgInfo, const void *hostPtr) { break; } - auto hostPtrRowPitch = imgInfo.imgDesc.imageRowPitch ? imgInfo.imgDesc.imageRowPitch : imageWidth * imgInfo.surfaceFormat->ImageElementSizeInBytes; + auto hostPtrRowPitch = imgInfo.imgDesc.imageRowPitch ? imgInfo.imgDesc.imageRowPitch : imageWidth * imgInfo.surfaceFormat->imageElementSizeInBytes; auto hostPtrSlicePitch = imgInfo.imgDesc.imageSlicePitch ? imgInfo.imgDesc.imageSlicePitch : hostPtrRowPitch * imgInfo.imgDesc.imageHeight; size_t pointerPassedSize = hostPtrRowPitch * imageHeight * imageDepth * imageCount; diff --git a/shared/source/os_interface/linux/device_time_drm.cpp b/shared/source/os_interface/linux/device_time_drm.cpp index 37cfc6e021..96bd9a62bb 100644 --- a/shared/source/os_interface/linux/device_time_drm.cpp +++ b/shared/source/os_interface/linux/device_time_drm.cpp @@ -102,10 +102,10 @@ bool DeviceTimeDrm::getCpuGpuTime(TimeStampData *pGpuCpuTime, OSTime *osTime) { if (nullptr == this->getGpuTime) { return false; } - if (!(this->*getGpuTime)(&pGpuCpuTime->GPUTimeStamp)) { + if (!(this->*getGpuTime)(&pGpuCpuTime->gpuTimeStamp)) { return false; } - if (!osTime->getCpuTime(&pGpuCpuTime->CPUTimeinNS)) { + if (!osTime->getCpuTime(&pGpuCpuTime->cpuTimeinNS)) { return false; } diff --git a/shared/source/os_interface/os_time.cpp b/shared/source/os_interface/os_time.cpp index 6c1d980870..0f59460a1e 100644 --- a/shared/source/os_interface/os_time.cpp +++ b/shared/source/os_interface/os_time.cpp @@ -16,8 +16,8 @@ double OSTime::getDeviceTimerResolution(HardwareInfo const &hwInfo) { }; bool DeviceTime::getCpuGpuTime(TimeStampData *pGpuCpuTime, OSTime *osTime) { - pGpuCpuTime->CPUTimeinNS = 0; - pGpuCpuTime->GPUTimeStamp = 0; + pGpuCpuTime->cpuTimeinNS = 0; + pGpuCpuTime->gpuTimeStamp = 0; return true; } diff --git a/shared/source/os_interface/os_time.h b/shared/source/os_interface/os_time.h index 4d2856b116..28009fbc28 100644 --- a/shared/source/os_interface/os_time.h +++ b/shared/source/os_interface/os_time.h @@ -16,8 +16,8 @@ class OSInterface; struct HardwareInfo; struct TimeStampData { - uint64_t GPUTimeStamp; // GPU time in counter ticks - uint64_t CPUTimeinNS; // CPU time in ns + uint64_t gpuTimeStamp; // GPU time in counter ticks + uint64_t cpuTimeinNS; // CPU time in ns }; class OSTime; diff --git a/shared/source/os_interface/windows/device_time_gpu_cpu_drm_or_wddm.cpp b/shared/source/os_interface/windows/device_time_gpu_cpu_drm_or_wddm.cpp index ac08a75679..79ae8c6c70 100644 --- a/shared/source/os_interface/windows/device_time_gpu_cpu_drm_or_wddm.cpp +++ b/shared/source/os_interface/windows/device_time_gpu_cpu_drm_or_wddm.cpp @@ -15,17 +15,17 @@ namespace NEO { bool DeviceTimeWddm::getCpuGpuTime(TimeStampData *pGpuCpuTime, OSTime *osTime) { bool retVal = false; - pGpuCpuTime->CPUTimeinNS = 0; - pGpuCpuTime->GPUTimeStamp = 0; + pGpuCpuTime->cpuTimeinNS = 0; + pGpuCpuTime->gpuTimeStamp = 0; TimeStampDataHeader escapeInfo = {}; if (runEscape(wddm, escapeInfo)) { auto &gfxCoreHelper = wddm->getRootDeviceEnvironment().getHelper(); - convertTimestampsFromOaToCsDomain(gfxCoreHelper, escapeInfo.m_Data.m_Out.gpuPerfTicks, escapeInfo.m_Data.m_Out.gpuPerfFreq, static_cast(wddm->getTimestampFrequency())); + convertTimestampsFromOaToCsDomain(gfxCoreHelper, escapeInfo.data.out.gpuPerfTicks, escapeInfo.data.out.gpuPerfFreq, static_cast(wddm->getTimestampFrequency())); - osTime->getCpuTime(&pGpuCpuTime->CPUTimeinNS); - pGpuCpuTime->GPUTimeStamp = (unsigned long long)escapeInfo.m_Data.m_Out.gpuPerfTicks; + osTime->getCpuTime(&pGpuCpuTime->cpuTimeinNS); + pGpuCpuTime->gpuTimeStamp = (unsigned long long)escapeInfo.data.out.gpuPerfTicks; retVal = true; } diff --git a/shared/source/os_interface/windows/device_time_gpu_cpu_wddm.cpp b/shared/source/os_interface/windows/device_time_gpu_cpu_wddm.cpp index cfc5dcb7b3..8d7686a418 100644 --- a/shared/source/os_interface/windows/device_time_gpu_cpu_wddm.cpp +++ b/shared/source/os_interface/windows/device_time_gpu_cpu_wddm.cpp @@ -15,19 +15,19 @@ namespace NEO { bool DeviceTimeWddm::getCpuGpuTime(TimeStampData *pGpuCpuTime, OSTime *osTime) { bool retVal = false; - pGpuCpuTime->CPUTimeinNS = 0; - pGpuCpuTime->GPUTimeStamp = 0; + pGpuCpuTime->cpuTimeinNS = 0; + pGpuCpuTime->gpuTimeStamp = 0; TimeStampDataHeader escapeInfo = {}; if (runEscape(wddm, escapeInfo)) { auto &gfxCoreHelper = wddm->getRootDeviceEnvironment().getHelper(); - convertTimestampsFromOaToCsDomain(gfxCoreHelper, escapeInfo.m_Data.m_Out.gpuPerfTicks, escapeInfo.m_Data.m_Out.gpuPerfFreq, static_cast(wddm->getTimestampFrequency())); - double cpuNanoseconds = escapeInfo.m_Data.m_Out.cpuPerfTicks * - (1000000000.0 / escapeInfo.m_Data.m_Out.cpuPerfFreq); + convertTimestampsFromOaToCsDomain(gfxCoreHelper, escapeInfo.data.out.gpuPerfTicks, escapeInfo.data.out.gpuPerfFreq, static_cast(wddm->getTimestampFrequency())); + double cpuNanoseconds = escapeInfo.data.out.cpuPerfTicks * + (1000000000.0 / escapeInfo.data.out.cpuPerfFreq); - pGpuCpuTime->CPUTimeinNS = (unsigned long long)cpuNanoseconds; - pGpuCpuTime->GPUTimeStamp = (unsigned long long)escapeInfo.m_Data.m_Out.gpuPerfTicks; + pGpuCpuTime->cpuTimeinNS = (unsigned long long)cpuNanoseconds; + pGpuCpuTime->gpuTimeStamp = (unsigned long long)escapeInfo.data.out.gpuPerfTicks; retVal = true; } diff --git a/shared/source/os_interface/windows/device_time_wddm.cpp b/shared/source/os_interface/windows/device_time_wddm.cpp index 6dcbac8672..5ef2a0d1cd 100644 --- a/shared/source/os_interface/windows/device_time_wddm.cpp +++ b/shared/source/os_interface/windows/device_time_wddm.cpp @@ -27,9 +27,9 @@ bool DeviceTimeWddm::runEscape(Wddm *wddm, TimeStampDataHeader &escapeInfo) { GTDIGetGpuCpuTimestampsIn in = {GTDI_FNC_GET_GPU_CPU_TIMESTAMPS}; uint32_t outSize = sizeof(GTDIGetGpuCpuTimestampsOut); - escapeInfo.m_Header.EscapeCode = static_cast(GFX_ESCAPE_IGPA_INSTRUMENTATION_CONTROL); - escapeInfo.m_Header.Size = outSize; - escapeInfo.m_Data.m_In = in; + escapeInfo.header.EscapeCode = static_cast(GFX_ESCAPE_IGPA_INSTRUMENTATION_CONTROL); + escapeInfo.header.Size = outSize; + escapeInfo.data.in = in; escapeCommand.Flags.Value = 0; escapeCommand.hAdapter = (D3DKMT_HANDLE)0; diff --git a/shared/source/os_interface/windows/device_time_wddm.h b/shared/source/os_interface/windows/device_time_wddm.h index d685b2e284..a559b04aee 100644 --- a/shared/source/os_interface/windows/device_time_wddm.h +++ b/shared/source/os_interface/windows/device_time_wddm.h @@ -34,7 +34,7 @@ typedef enum GTDI_ESCAPE_FUNCTION_ENUM { } GTDI_ESCAPE_FUNCTION; typedef struct GTDIBaseInStruct { - GTDI_ESCAPE_FUNCTION Function; + GTDI_ESCAPE_FUNCTION function; } GTDIHeaderIn; typedef GTDIHeaderIn GTDIGetGpuCpuTimestampsIn; @@ -55,7 +55,7 @@ typedef enum GTDI_RETURN_CODE_ENUM { } GTDI_RETURN_CODE; typedef struct GTDIGetGpuCpuTimestampsOutStruct { - GTDI_RETURN_CODE RetCode; // Result of the call + GTDI_RETURN_CODE retCode; // Result of the call uint64_t gpuPerfTicks; // in GPU_timestamp_ticks uint64_t cpuPerfTicks; // in CPU_timestamp_ticks uint64_t gpuPerfFreq; // in GPU_timestamp_ticks/s @@ -63,11 +63,11 @@ typedef struct GTDIGetGpuCpuTimestampsOutStruct { } GTDIGetGpuCpuTimestampsOut; struct TimeStampDataHeader { - GFX_ESCAPE_HEADER_T m_Header; + GFX_ESCAPE_HEADER_T header; union { - GTDIGetGpuCpuTimestampsIn m_In; - GTDIGetGpuCpuTimestampsOut m_Out; - } m_Data; + GTDIGetGpuCpuTimestampsIn in; + GTDIGetGpuCpuTimestampsOut out; + } data; }; } // namespace NEO diff --git a/shared/source/os_interface/windows/gdi_interface.cpp b/shared/source/os_interface/windows/gdi_interface.cpp index a41f5b888c..8d53ba72c6 100644 --- a/shared/source/os_interface/windows/gdi_interface.cpp +++ b/shared/source/os_interface/windows/gdi_interface.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -40,7 +40,7 @@ bool Gdi::setupHwQueueProcAddresses() { bool Gdi::getAllProcAddresses() { openAdapterFromLuid = gdiDll->getProcAddress("D3DKMTOpenAdapterFromLuid"); - createAllocation_ = gdiDll->getProcAddress("D3DKMTCreateAllocation"); + createAllocation = gdiDll->getProcAddress("D3DKMTCreateAllocation"); shareObjects = reinterpret_cast(gdiDll->getProcAddress("D3DKMTShareObjects")); createAllocation2 = gdiDll->getProcAddress("D3DKMTCreateAllocation2"); destroyAllocation2 = gdiDll->getProcAddress("D3DKMTDestroyAllocation2"); diff --git a/shared/source/os_interface/windows/gdi_interface.h b/shared/source/os_interface/windows/gdi_interface.h index 7f8b5e1caa..3b3501882c 100644 --- a/shared/source/os_interface/windows/gdi_interface.h +++ b/shared/source/os_interface/windows/gdi_interface.h @@ -20,7 +20,7 @@ class Gdi { MOCKABLE_VIRTUAL ~Gdi(); ThkWrapper openAdapterFromLuid{}; - ThkWrapper createAllocation_{}; + ThkWrapper createAllocation{}; ThkWrapper createAllocation2{}; NTSTATUS(APIENTRY *shareObjects) (UINT cObjects, const D3DKMT_HANDLE *hObjects, POBJECT_ATTRIBUTES pObjectAttributes, DWORD dwDesiredAccess, HANDLE *phSharedNtHandle) = {}; diff --git a/shared/source/os_interface/windows/gfx_escape_wrapper.h b/shared/source/os_interface/windows/gfx_escape_wrapper.h index 848579987e..3d07b7d981 100644 --- a/shared/source/os_interface/windows/gfx_escape_wrapper.h +++ b/shared/source/os_interface/windows/gfx_escape_wrapper.h @@ -16,9 +16,9 @@ typedef struct GFX_ESCAPE_HEADER { // NOLINT(readability-identifier-naming) union { struct { - unsigned int Size; - unsigned int CheckSum; - unsigned int EscapeCode; + unsigned int Size; // NOLINT(readability-identifier-naming) + unsigned int CheckSum; // NOLINT(readability-identifier-naming) + unsigned int EscapeCode; // NOLINT(readability-identifier-naming) unsigned int ulReserved; }; diff --git a/shared/source/os_interface/windows/wddm/configure_device_address_space_wddm.cpp b/shared/source/os_interface/windows/wddm/configure_device_address_space_wddm.cpp index 00dd00a5df..f888a0a70d 100644 --- a/shared/source/os_interface/windows/wddm/configure_device_address_space_wddm.cpp +++ b/shared/source/os_interface/windows/wddm/configure_device_address_space_wddm.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Intel Corporation + * Copyright (C) 2021-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -28,7 +28,7 @@ bool Wddm::configureDeviceAddressSpace() { deviceCallbacks.PagingQueue = pagingQueue; deviceCallbacks.PagingFence = pagingQueueSyncObject; - deviceCallbacks.DevCbPtrs.KmtCbPtrs.pfnAllocate = getGdi()->createAllocation_; + deviceCallbacks.DevCbPtrs.KmtCbPtrs.pfnAllocate = getGdi()->createAllocation; deviceCallbacks.DevCbPtrs.KmtCbPtrs.pfnDeallocate = getGdi()->destroyAllocation; deviceCallbacks.DevCbPtrs.KmtCbPtrs.pfnMapGPUVA = getGdi()->mapGpuVirtualAddress; deviceCallbacks.DevCbPtrs.KmtCbPtrs.pfnMakeResident = getGdi()->makeResident; diff --git a/shared/source/utilities/perf_profiler.cpp b/shared/source/utilities/perf_profiler.cpp index be0afe9e66..a8d57bf7fc 100644 --- a/shared/source/utilities/perf_profiler.cpp +++ b/shared/source/utilities/perf_profiler.cpp @@ -53,7 +53,7 @@ void PerfProfiler::destroyAll() { } PerfProfiler::PerfProfiler(int id, std::unique_ptr &&logOut, std::unique_ptr &&sysLogOut) { - ApiTimer.setFreq(); + apiTimer.setFreq(); systemLogs.reserve(20); diff --git a/shared/source/utilities/perf_profiler.h b/shared/source/utilities/perf_profiler.h index 8d0d0c6697..a99d9f09d7 100644 --- a/shared/source/utilities/perf_profiler.h +++ b/shared/source/utilities/perf_profiler.h @@ -43,25 +43,25 @@ class PerfProfiler { totalSystemTime = 0; systemLogs.clear(); systemLogs.reserve(20); - ApiTimer.start(); + apiTimer.start(); } void apiLeave(const char *func) { - ApiTimer.end(); - logTimes(ApiTimer.getStart(), ApiTimer.getEnd(), ApiTimer.get(), totalSystemTime, func); + apiTimer.end(); + logTimes(apiTimer.getStart(), apiTimer.getEnd(), apiTimer.get(), totalSystemTime, func); } void logTimes(long long start, long long end, long long span, unsigned long long totalSystem, const char *function); void logSysTimes(long long start, unsigned long long time, unsigned int id); void systemEnter() { - SystemTimer.start(); + systemTimer.start(); } void systemLeave(unsigned int id) { - SystemTimer.end(); - logSysTimes(SystemTimer.getStart(), SystemTimer.get(), id); - totalSystemTime += SystemTimer.get(); + systemTimer.end(); + logSysTimes(systemTimer.getStart(), systemTimer.get(), id); + totalSystemTime += systemTimer.get(); } std::ostream *getLogStream() { @@ -88,8 +88,8 @@ class PerfProfiler { protected: static std::atomic counter; static PerfProfiler *objects[PerfProfiler::objectsNumber]; - Timer ApiTimer; - Timer SystemTimer; + Timer apiTimer; + Timer systemTimer; unsigned long long totalSystemTime = 0; std::unique_ptr logFile; std::unique_ptr sysLogFile; diff --git a/shared/source/utilities/software_tags.cpp b/shared/source/utilities/software_tags.cpp index 0ab11d7ab9..784b010008 100644 --- a/shared/source/utilities/software_tags.cpp +++ b/shared/source/utilities/software_tags.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Intel Corporation + * Copyright (C) 2021-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -61,17 +61,17 @@ void SWTagHeapInfo::bxml(std::ostream &os) { uint32_t BaseTag::getMarkerNoopID(OpCode opcode) { MarkerNoopID id; - id.OpCode = static_cast(opcode); - id.Reserved = 0; + id.opCode = static_cast(opcode); + id.reserved = 0; return id.value; } uint32_t BaseTag::getOffsetNoopID(uint32_t offset) { OffsetNoopID id; - id.Offset = offset / sizeof(uint32_t); - id.SubTag = 0; - id.MagicBit = 1; - id.Reserved = 0; + id.offset = offset / sizeof(uint32_t); + id.subTag = 0; + id.magicBit = 1; + id.reserved = 0; return id.value; } diff --git a/shared/source/utilities/software_tags.h b/shared/source/utilities/software_tags.h index 520cfc2a91..dee8ca2791 100644 --- a/shared/source/utilities/software_tags.h +++ b/shared/source/utilities/software_tags.h @@ -51,7 +51,7 @@ struct BaseTag { reserved(0), component(static_cast(Component::COMMON)), driverDebug(1), - DWORDCount(static_cast(size / sizeof(uint32_t) - 2)) {} + dwordCount(static_cast(size / sizeof(uint32_t) - 2)) {} OpCode getOpCode() const { return static_cast(opcode); } static uint32_t getMarkerNoopID(OpCode opcode); @@ -61,17 +61,17 @@ struct BaseTag { protected: union MarkerNoopID { struct { - uint32_t OpCode : 20; - uint32_t Reserved : 12; + uint32_t opCode : 20; + uint32_t reserved : 12; }; uint32_t value; }; union OffsetNoopID { struct { - uint32_t Offset : 20; - uint32_t SubTag : 1; - uint32_t MagicBit : 1; - uint32_t Reserved : 10; + uint32_t offset : 20; + uint32_t subTag : 1; + uint32_t magicBit : 1; + uint32_t reserved : 10; }; uint32_t value; }; @@ -80,7 +80,7 @@ struct BaseTag { const uint32_t reserved : 4; const uint32_t component : 7; const uint32_t driverDebug : 1; // always 0x1 - const uint32_t DWORDCount; + const uint32_t dwordCount; }; struct KernelNameTag : public BaseTag { diff --git a/shared/test/common/helpers/custom_event_listener.h b/shared/test/common/helpers/custom_event_listener.h index 9d3bc59d94..4bf3a9a100 100644 --- a/shared/test/common/helpers/custom_event_listener.h +++ b/shared/test/common/helpers/custom_event_listener.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -22,17 +22,15 @@ extern const char *executionName; class CCustomEventListener : public ::testing::TestEventListener { public: - CCustomEventListener(::testing::TestEventListener *listener) : hardwarePrefix("---") { - _listener = listener; - } + CCustomEventListener(::testing::TestEventListener *listener) : listener(listener), hardwarePrefix("---") {} - CCustomEventListener(::testing::TestEventListener *listener, const char *hardwarePrefix) : _listener(listener), hardwarePrefix(hardwarePrefix) { + CCustomEventListener(::testing::TestEventListener *listener, const char *hardwarePrefix) : listener(listener), hardwarePrefix(hardwarePrefix) { std::transform(this->hardwarePrefix.begin(), this->hardwarePrefix.end(), this->hardwarePrefix.begin(), [](unsigned char c) { return std::toupper(c); }); } ~CCustomEventListener() override { - delete _listener; + delete listener; } private: @@ -75,7 +73,7 @@ class CCustomEventListener : public ::testing::TestEventListener { if (testPartResult.failed()) { printf("\n"); } - _listener->OnTestPartResult(testPartResult); + listener->OnTestPartResult(testPartResult); } void OnTestEnd(const ::testing::TestInfo &testCase) override { @@ -162,7 +160,7 @@ class CCustomEventListener : public ::testing::TestEventListener { fflush(stdout); } - ::testing::TestEventListener *_listener; + ::testing::TestEventListener *listener; std::vector> testFailures; int currentSeed = -1; diff --git a/shared/test/common/mock_gdi/mock_gdi.cpp b/shared/test/common/mock_gdi/mock_gdi.cpp index 12b07bf70a..2224f302d6 100644 --- a/shared/test/common/mock_gdi/mock_gdi.cpp +++ b/shared/test/common/mock_gdi/mock_gdi.cpp @@ -22,11 +22,11 @@ ADAPTER_BDF gAdapterBDF{}; NTSTATUS __stdcall mockD3DKMTEscape(IN CONST D3DKMT_ESCAPE *pData) { static int perfTicks = 0; ++perfTicks; - ((NEO::TimeStampDataHeader *)pData->pPrivateDriverData)->m_Data.m_Out.RetCode = NEO::GTDI_RET_OK; - ((NEO::TimeStampDataHeader *)pData->pPrivateDriverData)->m_Data.m_Out.gpuPerfTicks = ++perfTicks; - ((NEO::TimeStampDataHeader *)pData->pPrivateDriverData)->m_Data.m_Out.cpuPerfTicks = perfTicks; - ((NEO::TimeStampDataHeader *)pData->pPrivateDriverData)->m_Data.m_Out.gpuPerfFreq = 1; - ((NEO::TimeStampDataHeader *)pData->pPrivateDriverData)->m_Data.m_Out.cpuPerfFreq = 1; + ((NEO::TimeStampDataHeader *)pData->pPrivateDriverData)->data.out.retCode = NEO::GTDI_RET_OK; + ((NEO::TimeStampDataHeader *)pData->pPrivateDriverData)->data.out.gpuPerfTicks = ++perfTicks; + ((NEO::TimeStampDataHeader *)pData->pPrivateDriverData)->data.out.cpuPerfTicks = perfTicks; + ((NEO::TimeStampDataHeader *)pData->pPrivateDriverData)->data.out.gpuPerfFreq = 1; + ((NEO::TimeStampDataHeader *)pData->pPrivateDriverData)->data.out.cpuPerfFreq = 1; return STATUS_SUCCESS; } diff --git a/shared/test/common/mocks/mock_gmm_resource_info_common.cpp b/shared/test/common/mocks/mock_gmm_resource_info_common.cpp index 00007ae77c..75b1337fd5 100644 --- a/shared/test/common/mocks/mock_gmm_resource_info_common.cpp +++ b/shared/test/common/mocks/mock_gmm_resource_info_common.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -74,12 +74,12 @@ GMM_STATUS MockGmmResourceInfo::getOffset(GMM_REQ_OFFSET_INFO &reqOffsetInfo) { } void MockGmmResourceInfo::computeRowPitch() { - rowPitch = static_cast(mockResourceCreateParams.BaseWidth64 * (surfaceFormatInfo->ImageElementSizeInBytes)); + rowPitch = static_cast(mockResourceCreateParams.BaseWidth64 * (surfaceFormatInfo->imageElementSizeInBytes)); rowPitch = alignUp(rowPitch, 64); } uint32_t MockGmmResourceInfo::getBitsPerPixel() { - return static_cast(surfaceFormatInfo->ImageElementSizeInBytes * 8); + return static_cast(surfaceFormatInfo->imageElementSizeInBytes * 8); } void MockGmmResourceInfo::setUnifiedAuxTranslationCapable() { diff --git a/shared/test/common/mocks/mock_memory_manager.h b/shared/test/common/mocks/mock_memory_manager.h index 50561e895b..3e151154c7 100644 --- a/shared/test/common/mocks/mock_memory_manager.h +++ b/shared/test/common/mocks/mock_memory_manager.h @@ -424,10 +424,10 @@ class MockMemoryManagerWithCapacity : public MockMemoryManager { class MemoryManagerMemHandleMock : public MockMemoryManager { public: bool isNTHandle(osHandle handle, uint32_t rootDeviceIndex) override { - return NTHandle; + return ntHandle; }; - bool NTHandle = false; + bool ntHandle = false; }; } // namespace NEO diff --git a/shared/test/common/mocks/mock_ostime.h b/shared/test/common/mocks/mock_ostime.h index 09aab88fed..be78ad4f60 100644 --- a/shared/test/common/mocks/mock_ostime.h +++ b/shared/test/common/mocks/mock_ostime.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,8 +13,8 @@ static int PerfTicks = 0; constexpr uint64_t convertToNs = 100; class MockDeviceTime : public DeviceTime { bool getCpuGpuTime(TimeStampData *pGpuCpuTime, OSTime *osTime) override { - pGpuCpuTime->GPUTimeStamp = ++PerfTicks; - pGpuCpuTime->CPUTimeinNS = PerfTicks * convertToNs; + pGpuCpuTime->gpuTimeStamp = ++PerfTicks; + pGpuCpuTime->cpuTimeinNS = PerfTicks * convertToNs; return true; } @@ -55,8 +55,8 @@ class MockDeviceTimeWithConstTimestamp : public DeviceTime { static constexpr uint64_t gpuTimestamp = 2u; bool getCpuGpuTime(TimeStampData *pGpuCpuTime, OSTime *osTime) override { - pGpuCpuTime->GPUTimeStamp = gpuTimestamp; - pGpuCpuTime->CPUTimeinNS = cpuTimeInNs; + pGpuCpuTime->gpuTimeStamp = gpuTimestamp; + pGpuCpuTime->cpuTimeinNS = cpuTimeInNs; return true; } diff --git a/shared/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp b/shared/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp index f7e2d43615..98626c4a15 100644 --- a/shared/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp +++ b/shared/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp @@ -674,9 +674,9 @@ HWTEST_F(AubCommandStreamReceiverTests, givenPhysicalAddressWhenSetGttEntryIsCal AubGTTData data = {true, false}; AUB::setGttEntry(entry, address, data); - EXPECT_EQ(entry.pageConfig.PhysicalAddress, address / 4096); - EXPECT_TRUE(entry.pageConfig.Present); - EXPECT_FALSE(entry.pageConfig.LocalMemory); + EXPECT_EQ(entry.pageConfig.physicalAddress, address / 4096); + EXPECT_TRUE(entry.pageConfig.present); + EXPECT_FALSE(entry.pageConfig.localMemory); } HWTEST_F(AubCommandStreamReceiverTests, whenGetMemoryBankForGttIsCalledThenCorrectBankIsReturned) { diff --git a/shared/test/unit_test/debugger/test_l0_debugger.cpp b/shared/test/unit_test/debugger/test_l0_debugger.cpp index 8f9e35f629..249d1e9e3e 100644 --- a/shared/test/unit_test/debugger/test_l0_debugger.cpp +++ b/shared/test/unit_test/debugger/test_l0_debugger.cpp @@ -362,7 +362,7 @@ HWTEST_F(PerContextAddressSpaceL0DebuggerTest, givenCanonizedGpuVasWhenProgrammi auto debugger = std::make_unique>(pDevice); debugger->sbaTrackingGpuVa.address = 0x45670000; - auto expectedGpuVa = debugger->sbaTrackingGpuVa.address + offsetof(NEO::SbaTrackedAddresses, GeneralStateBaseAddress); + auto expectedGpuVa = debugger->sbaTrackingGpuVa.address + offsetof(NEO::SbaTrackedAddresses, generalStateBaseAddress); StackVec buffer(4096); NEO::LinearStream cmdStream(buffer.begin(), buffer.size()); @@ -399,7 +399,7 @@ HWTEST_F(PerContextAddressSpaceL0DebuggerTest, givenCanonizedGpuVasWhenProgrammi sdiItor++; cmdSdi = genCmdCast(*sdiItor); - expectedGpuVa = debugger->sbaTrackingGpuVa.address + offsetof(NEO::SbaTrackedAddresses, SurfaceStateBaseAddress); + expectedGpuVa = debugger->sbaTrackingGpuVa.address + offsetof(NEO::SbaTrackedAddresses, surfaceStateBaseAddress); EXPECT_EQ(static_cast(ssba & 0x0000FFFFFFFFULL), cmdSdi->getDataDword0()); EXPECT_EQ(static_cast(ssba >> 32), cmdSdi->getDataDword1()); @@ -409,7 +409,7 @@ HWTEST_F(PerContextAddressSpaceL0DebuggerTest, givenCanonizedGpuVasWhenProgrammi sdiItor++; cmdSdi = genCmdCast(*sdiItor); - expectedGpuVa = debugger->sbaTrackingGpuVa.address + offsetof(NEO::SbaTrackedAddresses, DynamicStateBaseAddress); + expectedGpuVa = debugger->sbaTrackingGpuVa.address + offsetof(NEO::SbaTrackedAddresses, dynamicStateBaseAddress); EXPECT_EQ(static_cast(dsba & 0x0000FFFFFFFFULL), cmdSdi->getDataDword0()); EXPECT_EQ(static_cast(dsba >> 32), cmdSdi->getDataDword1()); EXPECT_EQ(expectedGpuVa, cmdSdi->getAddress()); @@ -418,7 +418,7 @@ HWTEST_F(PerContextAddressSpaceL0DebuggerTest, givenCanonizedGpuVasWhenProgrammi sdiItor++; cmdSdi = genCmdCast(*sdiItor); - expectedGpuVa = debugger->sbaTrackingGpuVa.address + offsetof(NEO::SbaTrackedAddresses, IndirectObjectBaseAddress); + expectedGpuVa = debugger->sbaTrackingGpuVa.address + offsetof(NEO::SbaTrackedAddresses, indirectObjectBaseAddress); EXPECT_EQ(static_cast(ioba & 0x0000FFFFFFFFULL), cmdSdi->getDataDword0()); EXPECT_EQ(static_cast(ioba >> 32), cmdSdi->getDataDword1()); EXPECT_EQ(expectedGpuVa, cmdSdi->getAddress()); @@ -427,7 +427,7 @@ HWTEST_F(PerContextAddressSpaceL0DebuggerTest, givenCanonizedGpuVasWhenProgrammi sdiItor++; cmdSdi = genCmdCast(*sdiItor); - expectedGpuVa = debugger->sbaTrackingGpuVa.address + offsetof(NEO::SbaTrackedAddresses, InstructionBaseAddress); + expectedGpuVa = debugger->sbaTrackingGpuVa.address + offsetof(NEO::SbaTrackedAddresses, instructionBaseAddress); EXPECT_EQ(static_cast(iba & 0x0000FFFFFFFFULL), cmdSdi->getDataDword0()); EXPECT_EQ(static_cast(iba >> 32), cmdSdi->getDataDword1()); EXPECT_EQ(expectedGpuVa, cmdSdi->getAddress()); @@ -436,7 +436,7 @@ HWTEST_F(PerContextAddressSpaceL0DebuggerTest, givenCanonizedGpuVasWhenProgrammi sdiItor++; cmdSdi = genCmdCast(*sdiItor); - expectedGpuVa = debugger->sbaTrackingGpuVa.address + offsetof(NEO::SbaTrackedAddresses, BindlessSurfaceStateBaseAddress); + expectedGpuVa = debugger->sbaTrackingGpuVa.address + offsetof(NEO::SbaTrackedAddresses, bindlessSurfaceStateBaseAddress); EXPECT_EQ(static_cast(ssba & 0x0000FFFFFFFFULL), cmdSdi->getDataDword0()); EXPECT_EQ(static_cast(ssba >> 32), cmdSdi->getDataDword1()); EXPECT_EQ(expectedGpuVa, cmdSdi->getAddress()); @@ -451,7 +451,7 @@ HWTEST_F(PerContextAddressSpaceL0DebuggerTest, givenNonZeroGpuVasWhenProgramming auto debugger = std::make_unique>(pDevice); debugger->singleAddressSpaceSbaTracking = 0; debugger->sbaTrackingGpuVa.address = 0x45670000; - auto expectedGpuVa = debugger->sbaTrackingGpuVa.address + offsetof(NEO::SbaTrackedAddresses, GeneralStateBaseAddress); + auto expectedGpuVa = debugger->sbaTrackingGpuVa.address + offsetof(NEO::SbaTrackedAddresses, generalStateBaseAddress); StackVec buffer(4096); NEO::LinearStream cmdStream(buffer.begin(), buffer.size()); @@ -488,7 +488,7 @@ HWTEST_F(PerContextAddressSpaceL0DebuggerTest, givenNonZeroGpuVasWhenProgramming sdiItor++; cmdSdi = genCmdCast(*sdiItor); - expectedGpuVa = debugger->sbaTrackingGpuVa.address + offsetof(NEO::SbaTrackedAddresses, SurfaceStateBaseAddress); + expectedGpuVa = debugger->sbaTrackingGpuVa.address + offsetof(NEO::SbaTrackedAddresses, surfaceStateBaseAddress); EXPECT_EQ(static_cast(ssba & 0x0000FFFFFFFFULL), cmdSdi->getDataDword0()); EXPECT_EQ(static_cast(ssba >> 32), cmdSdi->getDataDword1()); EXPECT_EQ(expectedGpuVa, cmdSdi->getAddress()); @@ -497,7 +497,7 @@ HWTEST_F(PerContextAddressSpaceL0DebuggerTest, givenNonZeroGpuVasWhenProgramming sdiItor++; cmdSdi = genCmdCast(*sdiItor); - expectedGpuVa = debugger->sbaTrackingGpuVa.address + offsetof(NEO::SbaTrackedAddresses, DynamicStateBaseAddress); + expectedGpuVa = debugger->sbaTrackingGpuVa.address + offsetof(NEO::SbaTrackedAddresses, dynamicStateBaseAddress); EXPECT_EQ(static_cast(dsba & 0x0000FFFFFFFFULL), cmdSdi->getDataDword0()); EXPECT_EQ(static_cast(dsba >> 32), cmdSdi->getDataDword1()); @@ -507,7 +507,7 @@ HWTEST_F(PerContextAddressSpaceL0DebuggerTest, givenNonZeroGpuVasWhenProgramming sdiItor++; cmdSdi = genCmdCast(*sdiItor); - expectedGpuVa = debugger->sbaTrackingGpuVa.address + offsetof(NEO::SbaTrackedAddresses, IndirectObjectBaseAddress); + expectedGpuVa = debugger->sbaTrackingGpuVa.address + offsetof(NEO::SbaTrackedAddresses, indirectObjectBaseAddress); EXPECT_EQ(static_cast(ioba & 0x0000FFFFFFFFULL), cmdSdi->getDataDword0()); EXPECT_EQ(static_cast(ioba >> 32), cmdSdi->getDataDword1()); EXPECT_EQ(expectedGpuVa, cmdSdi->getAddress()); @@ -516,7 +516,7 @@ HWTEST_F(PerContextAddressSpaceL0DebuggerTest, givenNonZeroGpuVasWhenProgramming sdiItor++; cmdSdi = genCmdCast(*sdiItor); - expectedGpuVa = debugger->sbaTrackingGpuVa.address + offsetof(NEO::SbaTrackedAddresses, InstructionBaseAddress); + expectedGpuVa = debugger->sbaTrackingGpuVa.address + offsetof(NEO::SbaTrackedAddresses, instructionBaseAddress); EXPECT_EQ(static_cast(iba & 0x0000FFFFFFFFULL), cmdSdi->getDataDword0()); EXPECT_EQ(static_cast(iba >> 32), cmdSdi->getDataDword1()); EXPECT_EQ(expectedGpuVa, cmdSdi->getAddress()); @@ -525,7 +525,7 @@ HWTEST_F(PerContextAddressSpaceL0DebuggerTest, givenNonZeroGpuVasWhenProgramming sdiItor++; cmdSdi = genCmdCast(*sdiItor); - expectedGpuVa = debugger->sbaTrackingGpuVa.address + offsetof(NEO::SbaTrackedAddresses, BindlessSurfaceStateBaseAddress); + expectedGpuVa = debugger->sbaTrackingGpuVa.address + offsetof(NEO::SbaTrackedAddresses, bindlessSurfaceStateBaseAddress); EXPECT_EQ(static_cast(ssba & 0x0000FFFFFFFFULL), cmdSdi->getDataDword0()); EXPECT_EQ(static_cast(ssba >> 32), cmdSdi->getDataDword1()); EXPECT_EQ(expectedGpuVa, cmdSdi->getAddress()); @@ -569,14 +569,14 @@ HWTEST_F(L0DebuggerMultiSubDeviceTest, givenMultiSubDevicesWhenSbaTrackingBuffer debugger->perContextSbaAllocations[contextId]->getUnderlyingBufferSize() * i)); EXPECT_STREQ("sbaarea", sbaHeader->magic); - EXPECT_EQ(0u, sbaHeader->BindlessSamplerStateBaseAddress); - EXPECT_EQ(0u, sbaHeader->BindlessSurfaceStateBaseAddress); - EXPECT_EQ(0u, sbaHeader->DynamicStateBaseAddress); - EXPECT_EQ(0u, sbaHeader->GeneralStateBaseAddress); - EXPECT_EQ(0u, sbaHeader->IndirectObjectBaseAddress); - EXPECT_EQ(0u, sbaHeader->InstructionBaseAddress); - EXPECT_EQ(0u, sbaHeader->SurfaceStateBaseAddress); - EXPECT_EQ(0u, sbaHeader->Version); + EXPECT_EQ(0u, sbaHeader->bindlessSamplerStateBaseAddress); + EXPECT_EQ(0u, sbaHeader->bindlessSurfaceStateBaseAddress); + EXPECT_EQ(0u, sbaHeader->dynamicStateBaseAddress); + EXPECT_EQ(0u, sbaHeader->generalStateBaseAddress); + EXPECT_EQ(0u, sbaHeader->indirectObjectBaseAddress); + EXPECT_EQ(0u, sbaHeader->instructionBaseAddress); + EXPECT_EQ(0u, sbaHeader->surfaceStateBaseAddress); + EXPECT_EQ(0u, sbaHeader->version); } if (!debugger->singleAddressSpaceSbaTracking) { EXPECT_EQ(debugger->sbaTrackingGpuVa.address, debugger->perContextSbaAllocations[contextId]->getGpuAddress()); diff --git a/shared/test/unit_test/execution_environment/execution_environment_tests.cpp b/shared/test/unit_test/execution_environment/execution_environment_tests.cpp index 519843786b..6f820f992a 100644 --- a/shared/test/unit_test/execution_environment/execution_environment_tests.cpp +++ b/shared/test/unit_test/execution_environment/execution_environment_tests.cpp @@ -99,8 +99,8 @@ TEST(RootDeviceEnvironment, whenCreatingRootDeviceEnvironmentThenCreateOsAgnosti TimeStampData tsData{1, 2}; EXPECT_TRUE(rootDeviceEnvironment->osTime->getCpuGpuTime(&tsData)); - EXPECT_EQ(0u, tsData.CPUTimeinNS); - EXPECT_EQ(0u, tsData.GPUTimeStamp); + EXPECT_EQ(0u, tsData.cpuTimeinNS); + EXPECT_EQ(0u, tsData.gpuTimeStamp); EXPECT_EQ(profilingTimerResolution, rootDeviceEnvironment->osTime->getDynamicDeviceTimerResolution(*defaultHwInfo)); EXPECT_EQ(static_cast(1000000000.0 / OSTime::getDeviceTimerResolution(*defaultHwInfo)), rootDeviceEnvironment->osTime->getDynamicDeviceTimerClock(*defaultHwInfo)); diff --git a/shared/test/unit_test/image/image_surface_state_tests.cpp b/shared/test/unit_test/image/image_surface_state_tests.cpp index bd9e5ca093..fd931b9778 100644 --- a/shared/test/unit_test/image/image_surface_state_tests.cpp +++ b/shared/test/unit_test/image/image_surface_state_tests.cpp @@ -29,7 +29,7 @@ HWTEST_F(ImageSurfaceStateTests, givenImageInfoWhenSetImageSurfaceStateThenPrope imageInfo.imgDesc.numSamples = 9u; imageInfo.imgDesc.imageType = ImageType::Image2DArray; SurfaceFormatInfo surfaceFormatInfo; - surfaceFormatInfo.GenxSurfaceFormat = GFX3DSTATE_SURFACEFORMAT::GFX3DSTATE_SURFACEFORMAT_A32_FLOAT; + surfaceFormatInfo.genxSurfaceFormat = GFX3DSTATE_SURFACEFORMAT::GFX3DSTATE_SURFACEFORMAT_A32_FLOAT; imageInfo.surfaceFormat = &surfaceFormatInfo; SurfaceOffsets surfaceOffsets; surfaceOffsets.offset = 0u; @@ -68,7 +68,7 @@ HWTEST_F(ImageSurfaceStateTests, givenImageInfoWhenSetImageSurfaceStateThenPrope EXPECT_EQ(castSurfaceState->getYOffsetForUOrUvPlane(), surfaceOffsets.yOffsetForUVplane); EXPECT_EQ(castSurfaceState->getXOffsetForUOrUvPlane(), surfaceOffsets.xOffset); - EXPECT_EQ(castSurfaceState->getSurfaceFormat(), static_cast(imageInfo.surfaceFormat->GenxSurfaceFormat)); + EXPECT_EQ(castSurfaceState->getSurfaceFormat(), static_cast(imageInfo.surfaceFormat->genxSurfaceFormat)); surfaceState = std::make_unique(size); castSurfaceState = reinterpret_cast(surfaceState.get()); @@ -124,7 +124,7 @@ HWTEST_F(ImageSurfaceStateTests, givenImage2DWhen2dImageWAIsEnabledThenArrayFlag SurfaceOffsets surfaceOffsets = {0, 0, 0, 0}; const uint32_t cubeFaceIndex = __GMM_NO_CUBE_MAP; SurfaceFormatInfo surfaceFormatInfo; - surfaceFormatInfo.GenxSurfaceFormat = GFX3DSTATE_SURFACEFORMAT::GFX3DSTATE_SURFACEFORMAT_A32_FLOAT; + surfaceFormatInfo.genxSurfaceFormat = GFX3DSTATE_SURFACEFORMAT::GFX3DSTATE_SURFACEFORMAT_A32_FLOAT; imageInfo.surfaceFormat = &surfaceFormatInfo; const uint64_t gpuAddress = 0x000001a78a8a8000; @@ -147,7 +147,7 @@ HWTEST_F(ImageSurfaceStateTests, givenImage2DWhen2dImageWAIsDisabledThenArrayFla SurfaceOffsets surfaceOffsets = {0, 0, 0, 0}; const uint32_t cubeFaceIndex = __GMM_NO_CUBE_MAP; SurfaceFormatInfo surfaceFormatInfo; - surfaceFormatInfo.GenxSurfaceFormat = GFX3DSTATE_SURFACEFORMAT::GFX3DSTATE_SURFACEFORMAT_A32_FLOAT; + surfaceFormatInfo.genxSurfaceFormat = GFX3DSTATE_SURFACEFORMAT::GFX3DSTATE_SURFACEFORMAT_A32_FLOAT; imageInfo.surfaceFormat = &surfaceFormatInfo; const uint64_t gpuAddress = 0x000001a78a8a8000; @@ -170,7 +170,7 @@ HWTEST_F(ImageSurfaceStateTests, givenImage2DArrayOfSize1When2dImageWAIsEnabledT SurfaceOffsets surfaceOffsets = {0, 0, 0, 0}; const uint32_t cubeFaceIndex = __GMM_NO_CUBE_MAP; SurfaceFormatInfo surfaceFormatInfo; - surfaceFormatInfo.GenxSurfaceFormat = GFX3DSTATE_SURFACEFORMAT::GFX3DSTATE_SURFACEFORMAT_A32_FLOAT; + surfaceFormatInfo.genxSurfaceFormat = GFX3DSTATE_SURFACEFORMAT::GFX3DSTATE_SURFACEFORMAT_A32_FLOAT; imageInfo.surfaceFormat = &surfaceFormatInfo; const uint64_t gpuAddress = 0x000001a78a8a8000; @@ -193,7 +193,7 @@ HWTEST_F(ImageSurfaceStateTests, givenImage2DArrayOfSize1When2dImageWAIsDisabled SurfaceOffsets surfaceOffsets = {0, 0, 0, 0}; const uint32_t cubeFaceIndex = __GMM_NO_CUBE_MAP; SurfaceFormatInfo surfaceFormatInfo; - surfaceFormatInfo.GenxSurfaceFormat = GFX3DSTATE_SURFACEFORMAT::GFX3DSTATE_SURFACEFORMAT_A32_FLOAT; + surfaceFormatInfo.genxSurfaceFormat = GFX3DSTATE_SURFACEFORMAT::GFX3DSTATE_SURFACEFORMAT_A32_FLOAT; imageInfo.surfaceFormat = &surfaceFormatInfo; const uint64_t gpuAddress = 0x000001a78a8a8000; @@ -216,7 +216,7 @@ HWTEST_F(ImageSurfaceStateTests, givenImage1DWhen2dImageWAIsEnabledThenArrayFlag SurfaceOffsets surfaceOffsets = {0, 0, 0, 0}; const uint32_t cubeFaceIndex = __GMM_NO_CUBE_MAP; SurfaceFormatInfo surfaceFormatInfo; - surfaceFormatInfo.GenxSurfaceFormat = GFX3DSTATE_SURFACEFORMAT::GFX3DSTATE_SURFACEFORMAT_A32_FLOAT; + surfaceFormatInfo.genxSurfaceFormat = GFX3DSTATE_SURFACEFORMAT::GFX3DSTATE_SURFACEFORMAT_A32_FLOAT; imageInfo.surfaceFormat = &surfaceFormatInfo; const uint64_t gpuAddress = 0x000001a78a8a8000; @@ -248,7 +248,7 @@ HWTEST_F(ImageWidthTest, givenMediaBlockWhenProgrammingWidthInSurfaceStateThenCo auto renderSurfaceState = FamilyType::cmdInitRenderSurfaceState; { - surfaceFormatInfo.ImageElementSizeInBytes = 1u; + surfaceFormatInfo.imageElementSizeInBytes = 1u; constexpr std::array params = {{ {1, 1}, {2, 1}, @@ -260,7 +260,7 @@ HWTEST_F(ImageWidthTest, givenMediaBlockWhenProgrammingWidthInSurfaceStateThenCo verifyProgramming(renderSurfaceState, params); } { - surfaceFormatInfo.ImageElementSizeInBytes = 2u; + surfaceFormatInfo.imageElementSizeInBytes = 2u; constexpr std::array params = {{ {1, 1}, {2, 1}, @@ -272,7 +272,7 @@ HWTEST_F(ImageWidthTest, givenMediaBlockWhenProgrammingWidthInSurfaceStateThenCo verifyProgramming(renderSurfaceState, params); } { - surfaceFormatInfo.ImageElementSizeInBytes = 4u; + surfaceFormatInfo.imageElementSizeInBytes = 4u; constexpr std::array params = {{ {1, 1}, {2, 2}, diff --git a/shared/test/unit_test/os_interface/linux/os_time_test.cpp b/shared/test/unit_test/os_interface/linux/os_time_test.cpp index b482a68215..4982b4df47 100644 --- a/shared/test/unit_test/os_interface/linux/os_time_test.cpp +++ b/shared/test/unit_test/os_interface/linux/os_time_test.cpp @@ -105,14 +105,14 @@ TEST_F(DrmTimeTest, WhenGettingCpuGpuTimeThenSucceeds) { osTime->updateDrm(pDrm); auto error = osTime->getCpuGpuTime(&cpuGpuTime01); EXPECT_TRUE(error); - EXPECT_NE(0ULL, cpuGpuTime01.CPUTimeinNS); - EXPECT_NE(0ULL, cpuGpuTime01.GPUTimeStamp); + EXPECT_NE(0ULL, cpuGpuTime01.cpuTimeinNS); + EXPECT_NE(0ULL, cpuGpuTime01.gpuTimeStamp); error = osTime->getCpuGpuTime(&cpuGpuTime02); EXPECT_TRUE(error); - EXPECT_NE(0ULL, cpuGpuTime02.CPUTimeinNS); - EXPECT_NE(0ULL, cpuGpuTime02.GPUTimeStamp); - EXPECT_GT(cpuGpuTime02.GPUTimeStamp, cpuGpuTime01.GPUTimeStamp); - EXPECT_GT(cpuGpuTime02.CPUTimeinNS, cpuGpuTime01.CPUTimeinNS); + EXPECT_NE(0ULL, cpuGpuTime02.cpuTimeinNS); + EXPECT_NE(0ULL, cpuGpuTime02.gpuTimeStamp); + EXPECT_GT(cpuGpuTime02.gpuTimeStamp, cpuGpuTime01.gpuTimeStamp); + EXPECT_GT(cpuGpuTime02.cpuTimeinNS, cpuGpuTime01.cpuTimeinNS); } TEST_F(DrmTimeTest, GivenDrmWhenGettingCpuGpuTimeThenSucceeds) { @@ -122,14 +122,14 @@ TEST_F(DrmTimeTest, GivenDrmWhenGettingCpuGpuTimeThenSucceeds) { osTime->updateDrm(pDrm); auto error = osTime->getCpuGpuTime(&cpuGpuTime01); EXPECT_TRUE(error); - EXPECT_NE(0ULL, cpuGpuTime01.CPUTimeinNS); - EXPECT_NE(0ULL, cpuGpuTime01.GPUTimeStamp); + EXPECT_NE(0ULL, cpuGpuTime01.cpuTimeinNS); + EXPECT_NE(0ULL, cpuGpuTime01.gpuTimeStamp); error = osTime->getCpuGpuTime(&cpuGpuTime02); EXPECT_TRUE(error); - EXPECT_NE(0ULL, cpuGpuTime02.CPUTimeinNS); - EXPECT_NE(0ULL, cpuGpuTime02.GPUTimeStamp); - EXPECT_GT(cpuGpuTime02.GPUTimeStamp, cpuGpuTime01.GPUTimeStamp); - EXPECT_GT(cpuGpuTime02.CPUTimeinNS, cpuGpuTime01.CPUTimeinNS); + EXPECT_NE(0ULL, cpuGpuTime02.cpuTimeinNS); + EXPECT_NE(0ULL, cpuGpuTime02.gpuTimeStamp); + EXPECT_GT(cpuGpuTime02.gpuTimeStamp, cpuGpuTime01.gpuTimeStamp); + EXPECT_GT(cpuGpuTime02.cpuTimeinNS, cpuGpuTime01.cpuTimeinNS); } TEST_F(DrmTimeTest, givenGetCpuGpuTimeWhenItIsUnavailableThenReturnFalse) { diff --git a/shared/test/unit_test/os_interface/windows/os_time_win_tests.cpp b/shared/test/unit_test/os_interface/windows/os_time_win_tests.cpp index f3e5435771..dba84978fd 100644 --- a/shared/test/unit_test/os_interface/windows/os_time_win_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/os_time_win_tests.cpp @@ -82,8 +82,8 @@ TEST(OSTimeWinTests, givenNoOSInterfaceWhenGetCpuGpuTimeThenReturnsSuccess) { auto osTime(OSTime::create(nullptr)); auto success = osTime->getCpuGpuTime(&CPUGPUTime); EXPECT_TRUE(success); - EXPECT_EQ(0u, CPUGPUTime.CPUTimeinNS); - EXPECT_EQ(0u, CPUGPUTime.GPUTimeStamp); + EXPECT_EQ(0u, CPUGPUTime.cpuTimeinNS); + EXPECT_EQ(0u, CPUGPUTime.gpuTimeStamp); } TEST(OSTimeWinTests, givenOSInterfaceWhenGetCpuGpuTimeThenReturnsSuccess) { @@ -98,12 +98,12 @@ TEST(OSTimeWinTests, givenOSInterfaceWhenGetCpuGpuTimeThenReturnsSuccess) { auto osTime = OSTime::create(osInterface.get()); auto success = osTime->getCpuGpuTime(&CPUGPUTime01); EXPECT_TRUE(success); - EXPECT_NE(0u, CPUGPUTime01.CPUTimeinNS); - EXPECT_NE(0u, CPUGPUTime01.GPUTimeStamp); + EXPECT_NE(0u, CPUGPUTime01.cpuTimeinNS); + EXPECT_NE(0u, CPUGPUTime01.gpuTimeStamp); success = osTime->getCpuGpuTime(&CPUGPUTime02); EXPECT_TRUE(success); - EXPECT_NE(0u, CPUGPUTime02.CPUTimeinNS); - EXPECT_NE(0u, CPUGPUTime02.GPUTimeStamp); - EXPECT_GT(CPUGPUTime02.GPUTimeStamp, CPUGPUTime01.GPUTimeStamp); - EXPECT_GT(CPUGPUTime02.CPUTimeinNS, CPUGPUTime01.CPUTimeinNS); + EXPECT_NE(0u, CPUGPUTime02.cpuTimeinNS); + EXPECT_NE(0u, CPUGPUTime02.gpuTimeStamp); + EXPECT_GT(CPUGPUTime02.gpuTimeStamp, CPUGPUTime01.gpuTimeStamp); + EXPECT_GT(CPUGPUTime02.cpuTimeinNS, CPUGPUTime01.cpuTimeinNS); } diff --git a/shared/test/unit_test/os_interface/windows/wddm_windows_tests.cpp b/shared/test/unit_test/os_interface/windows/wddm_windows_tests.cpp index f29770e763..9e4cec629b 100644 --- a/shared/test/unit_test/os_interface/windows/wddm_windows_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/wddm_windows_tests.cpp @@ -187,7 +187,7 @@ TEST_F(Wddm20WithMockGdiDllTests, whenSetDeviceInfoSucceedsThenDeviceCallbacksAr expectedDeviceCb.PagingQueue = wddm->getPagingQueue(); expectedDeviceCb.PagingFence = wddm->getPagingQueueSyncObject(); - expectedDeviceCb.DevCbPtrs.KmtCbPtrs.pfnAllocate = gdi->createAllocation_; + expectedDeviceCb.DevCbPtrs.KmtCbPtrs.pfnAllocate = gdi->createAllocation; expectedDeviceCb.DevCbPtrs.KmtCbPtrs.pfnDeallocate = gdi->destroyAllocation; expectedDeviceCb.DevCbPtrs.KmtCbPtrs.pfnMapGPUVA = gdi->mapGpuVirtualAddress; expectedDeviceCb.DevCbPtrs.KmtCbPtrs.pfnMakeResident = gdi->makeResident; diff --git a/shared/test/unit_test/xe_hpg_core/mtl/test_image_surface_state_mtl.cpp b/shared/test/unit_test/xe_hpg_core/mtl/test_image_surface_state_mtl.cpp index 9599d85091..8fa8228dd9 100644 --- a/shared/test/unit_test/xe_hpg_core/mtl/test_image_surface_state_mtl.cpp +++ b/shared/test/unit_test/xe_hpg_core/mtl/test_image_surface_state_mtl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -29,7 +29,7 @@ MTLTEST_F(ImageSurfaceStateTestsMtl, givenMtlWhenCallSetImageSurfaceStateThenDis const uint32_t cubeFaceIndex = 2u; SurfaceFormatInfo surfaceFormatInfo; - surfaceFormatInfo.GenxSurfaceFormat = GFX3DSTATE_SURFACEFORMAT::GFX3DSTATE_SURFACEFORMAT_A32_FLOAT; + surfaceFormatInfo.genxSurfaceFormat = GFX3DSTATE_SURFACEFORMAT::GFX3DSTATE_SURFACEFORMAT_A32_FLOAT; imageInfo.surfaceFormat = &surfaceFormatInfo; SurfaceOffsets surfaceOffsets; surfaceOffsets.offset = 0u;