From de93bc69288da034e1fc8af72be81ee730f8d219 Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Tue, 19 Dec 2023 10:17:17 +0000 Subject: [PATCH] refactor: correct naming of enum class constants 10/n Signed-off-by: Mateusz Jablonski --- .../test_cmdlist_append_launch_kernel_2.cpp | 26 +++--- .../test_cmdqueue_enqueue_cmdlist.cpp | 2 +- .../debugger/test_module_with_debug.cpp | 2 +- .../unit_tests/sources/kernel/test_kernel.cpp | 10 +-- .../unit_tests/sources/module/test_module.cpp | 18 ++-- .../built_ins/aux_translation_builtin.h | 2 +- .../built_ins/builtins_dispatch_builder.cpp | 66 +++++++------- .../source/built_ins/vme_dispatch_builder.h | 2 +- opencl/source/command_queue/enqueue_common.h | 2 +- opencl/source/helpers/dispatch_info_builder.h | 74 ++++++++-------- opencl/source/mem_obj/buffer.cpp | 2 +- .../aub_multicontext_tests_xehp_and_later.cpp | 32 +++---- ...va_multi_physical_tests_xehp_and_later.cpp | 2 +- ..._tile_buffers_aub_tests_xehp_and_later.cpp | 4 +- .../copy_engine_aub_tests_xehp_and_later.h | 2 +- .../fixtures/multicontext_aub_fixture.cpp | 14 +-- .../fixtures/multicontext_aub_fixture.h | 6 +- .../system_memfence_aub_tests_xe_hpc_core.cpp | 4 +- ...less_compression_aub_tests_xe_hpc_core.cpp | 4 +- ...ateless_compression_in_sba_xe_hpg_core.cpp | 2 +- .../command_queue/blit_enqueue_2_tests.cpp | 12 +-- .../command_queue_hw_2_tests.cpp | 2 +- .../dispatch_walker_tests_xehp_and_later.cpp | 6 +- .../command_queue/enqueue_handler_tests.cpp | 16 ++-- .../enqueue_read_buffer_event_tests.cpp | 6 +- .../enqueue_read_buffer_tests.cpp | 2 +- .../enqueue_unmap_memobject_tests.cpp | 2 +- .../enqueue_write_buffer_event_tests.cpp | 4 +- .../enqueue_write_buffer_tests.cpp | 2 +- .../read_write_buffer_cpu_copy.cpp | 18 ++-- .../test/unit_test/context/context_tests.cpp | 4 +- .../gen12lp/gfx_core_helper_tests_gen12lp.inl | 2 +- .../helpers/dispatch_info_builder_tests.cpp | 86 +++++++++---------- .../test/unit_test/mem_obj/buffer_tests.cpp | 4 +- .../mem_obj/linux/buffer_linux_tests.cpp | 4 +- .../mem_obj/windows/buffer_windows_tests.cpp | 4 +- .../unified_memory_manager_tests.cpp | 2 +- .../program/printf_handler_tests.cpp | 10 +-- shared/source/aub/aub_subcapture.cpp | 8 +- shared/source/aub/aub_subcapture.h | 10 +-- .../tbx_command_stream_receiver_hw.inl | 2 +- .../windows/wddm_direct_submission.inl | 2 +- .../gen12lp/gfx_core_helper_gen12lp.cpp | 2 +- .../blit_commands_helper_xehp_and_later.inl | 4 +- .../helpers/local_memory_access_modes.h | 8 +- .../os_interface/linux/drm_buffer_object.cpp | 6 +- .../os_interface/linux/drm_buffer_object.h | 6 +- shared/source/os_interface/product_helper.inl | 10 +-- .../os_interface/windows/os_context_win.cpp | 2 +- .../source/os_interface/windows/wddm/wddm.cpp | 6 +- .../os_interface/windows/wddm/wddm_defs.h | 6 +- shared/source/utilities/software_tags.cpp | 10 +-- shared/source/utilities/software_tags.h | 30 +++---- .../pvc/os_agnostic_product_helper_pvc.inl | 2 +- .../dg2/os_agnostic_product_helper_dg2.inl | 4 +- .../gfx_core_helper_xe_hpg_core.cpp | 2 +- .../test/common/mocks/mock_modules_zebin.cpp | 8 +- shared/test/common/mocks/mock_modules_zebin.h | 12 +-- .../test/common/mocks/mock_product_helper.cpp | 4 +- .../test/unit_test/aub/aub_center_tests.cpp | 4 +- .../aub_command_stream_receiver_1_tests.cpp | 42 ++++----- .../command_stream/aub_file_stream_tests.cpp | 8 +- .../command_stream/aub_subcapture_tests.cpp | 52 +++++------ .../tbx_command_stream_tests.cpp | 8 +- ...st_blit_commands_helper_xehp_and_later.cpp | 8 +- .../os_interface/product_helper_tests.cpp | 8 +- .../os_interface/windows/wddm20_tests.cpp | 4 +- .../program/program_initialization_tests.cpp | 8 +- .../utilities/software_tags_manager_tests.cpp | 12 +-- .../dg2/test_product_helper_dg2.cpp | 16 ++-- 70 files changed, 388 insertions(+), 388 deletions(-) diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_2.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_2.cpp index 33d5257017..c9f5488e73 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_2.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_2.cpp @@ -418,7 +418,7 @@ HWTEST_F(CommandListAppendLaunchKernelSWTags, givenEnableSWTagsWhenAppendLaunchK for (auto it = noops.begin(); it != noops.end() && !tagFound; ++it) { auto noop = genCmdCast(*(*it)); - if (NEO::SWTags::BaseTag::getMarkerNoopID(SWTags::OpCode::KernelName) == noop->getIdentificationNumber() && + if (NEO::SWTags::BaseTag::getMarkerNoopID(SWTags::OpCode::kernelName) == noop->getIdentificationNumber() && noop->getIdentificationNumberRegisterWriteEnable() == true && ++it != noops.end()) { @@ -434,7 +434,7 @@ HWTEST_F(CommandListAppendLaunchKernelSWTags, givenEnableSWTagsWhenAppendLaunchK tagFound = false; for (auto it = noops.begin(); it != noops.end() && !tagFound; ++it) { auto noop = genCmdCast(*(*it)); - if (NEO::SWTags::BaseTag::getMarkerNoopID(SWTags::OpCode::CallNameBegin) == noop->getIdentificationNumber() && + if (NEO::SWTags::BaseTag::getMarkerNoopID(SWTags::OpCode::callNameBegin) == noop->getIdentificationNumber() && noop->getIdentificationNumberRegisterWriteEnable() == true && ++it != noops.end()) { @@ -450,7 +450,7 @@ HWTEST_F(CommandListAppendLaunchKernelSWTags, givenEnableSWTagsWhenAppendLaunchK tagFound = false; for (auto it = noops.begin(); it != noops.end() && !tagFound; ++it) { auto noop = genCmdCast(*(*it)); - if (NEO::SWTags::BaseTag::getMarkerNoopID(SWTags::OpCode::CallNameEnd) == noop->getIdentificationNumber() && + if (NEO::SWTags::BaseTag::getMarkerNoopID(SWTags::OpCode::callNameEnd) == noop->getIdentificationNumber() && noop->getIdentificationNumberRegisterWriteEnable() == true && ++it != noops.end()) { @@ -505,7 +505,7 @@ HWTEST_F(CommandListAppendLaunchKernelSWTags, givenEnableSWTagsWhenAppendEventRe bool tagFound = false; for (auto it = noops.begin(); it != noops.end() && !tagFound; ++it) { auto noop = genCmdCast(*(*it)); - if (NEO::SWTags::BaseTag::getMarkerNoopID(SWTags::OpCode::CallNameBegin) == noop->getIdentificationNumber() && + if (NEO::SWTags::BaseTag::getMarkerNoopID(SWTags::OpCode::callNameBegin) == noop->getIdentificationNumber() && noop->getIdentificationNumberRegisterWriteEnable() == true && ++it != noops.end()) { @@ -521,7 +521,7 @@ HWTEST_F(CommandListAppendLaunchKernelSWTags, givenEnableSWTagsWhenAppendEventRe tagFound = false; for (auto it = noops.begin(); it != noops.end() && !tagFound; ++it) { auto noop = genCmdCast(*(*it)); - if (NEO::SWTags::BaseTag::getMarkerNoopID(SWTags::OpCode::CallNameEnd) == noop->getIdentificationNumber() && + if (NEO::SWTags::BaseTag::getMarkerNoopID(SWTags::OpCode::callNameEnd) == noop->getIdentificationNumber() && noop->getIdentificationNumberRegisterWriteEnable() == true && ++it != noops.end()) { @@ -579,7 +579,7 @@ HWTEST_F(CommandListAppendLaunchKernelSWTags, givenEnableSWTagsWhenAppendSignalE bool tagFound = false; for (auto it = noops.begin(); it != noops.end() && !tagFound; ++it) { auto noop = genCmdCast(*(*it)); - if (NEO::SWTags::BaseTag::getMarkerNoopID(SWTags::OpCode::CallNameBegin) == noop->getIdentificationNumber() && + if (NEO::SWTags::BaseTag::getMarkerNoopID(SWTags::OpCode::callNameBegin) == noop->getIdentificationNumber() && noop->getIdentificationNumberRegisterWriteEnable() == true && ++it != noops.end()) { @@ -595,7 +595,7 @@ HWTEST_F(CommandListAppendLaunchKernelSWTags, givenEnableSWTagsWhenAppendSignalE tagFound = false; for (auto it = noops.begin(); it != noops.end() && !tagFound; ++it) { auto noop = genCmdCast(*(*it)); - if (NEO::SWTags::BaseTag::getMarkerNoopID(SWTags::OpCode::CallNameEnd) == noop->getIdentificationNumber() && + if (NEO::SWTags::BaseTag::getMarkerNoopID(SWTags::OpCode::callNameEnd) == noop->getIdentificationNumber() && noop->getIdentificationNumberRegisterWriteEnable() == true && ++it != noops.end()) { @@ -653,7 +653,7 @@ HWTEST_F(CommandListAppendLaunchKernelSWTags, givenEnableSWTagsWhenAppendWaitOnE bool tagFound = false; for (auto it = noops.begin(); it != noops.end() && !tagFound; ++it) { auto noop = genCmdCast(*(*it)); - if (NEO::SWTags::BaseTag::getMarkerNoopID(SWTags::OpCode::CallNameBegin) == noop->getIdentificationNumber() && + if (NEO::SWTags::BaseTag::getMarkerNoopID(SWTags::OpCode::callNameBegin) == noop->getIdentificationNumber() && noop->getIdentificationNumberRegisterWriteEnable() == true && ++it != noops.end()) { @@ -669,7 +669,7 @@ HWTEST_F(CommandListAppendLaunchKernelSWTags, givenEnableSWTagsWhenAppendWaitOnE tagFound = false; for (auto it = noops.begin(); it != noops.end() && !tagFound; ++it) { auto noop = genCmdCast(*(*it)); - if (NEO::SWTags::BaseTag::getMarkerNoopID(SWTags::OpCode::CallNameEnd) == noop->getIdentificationNumber() && + if (NEO::SWTags::BaseTag::getMarkerNoopID(SWTags::OpCode::callNameEnd) == noop->getIdentificationNumber() && noop->getIdentificationNumberRegisterWriteEnable() == true && ++it != noops.end()) { @@ -713,7 +713,7 @@ HWTEST_F(CommandListAppendLaunchKernelSWTags, givenEnableSWTagsWhenAppendMemoryC bool tagFound = false; for (auto it = noops.begin(); it != noops.end() && !tagFound; ++it) { auto noop = genCmdCast(*(*it)); - if (NEO::SWTags::BaseTag::getMarkerNoopID(SWTags::OpCode::CallNameBegin) == noop->getIdentificationNumber() && + if (NEO::SWTags::BaseTag::getMarkerNoopID(SWTags::OpCode::callNameBegin) == noop->getIdentificationNumber() && noop->getIdentificationNumberRegisterWriteEnable() == true && ++it != noops.end()) { @@ -729,7 +729,7 @@ HWTEST_F(CommandListAppendLaunchKernelSWTags, givenEnableSWTagsWhenAppendMemoryC tagFound = false; for (auto it = noops.begin(); it != noops.end() && !tagFound; ++it) { auto noop = genCmdCast(*(*it)); - if (NEO::SWTags::BaseTag::getMarkerNoopID(SWTags::OpCode::CallNameEnd) == noop->getIdentificationNumber() && + if (NEO::SWTags::BaseTag::getMarkerNoopID(SWTags::OpCode::callNameEnd) == noop->getIdentificationNumber() && noop->getIdentificationNumberRegisterWriteEnable() == true && ++it != noops.end()) { @@ -774,7 +774,7 @@ HWTEST_F(CommandListAppendLaunchKernelSWTags, givenEnableSWTagsWhenAppendMemoryC bool tagFound = false; for (auto it = noops.begin(); it != noops.end() && !tagFound; ++it) { auto noop = genCmdCast(*(*it)); - if (NEO::SWTags::BaseTag::getMarkerNoopID(SWTags::OpCode::CallNameBegin) == noop->getIdentificationNumber() && + if (NEO::SWTags::BaseTag::getMarkerNoopID(SWTags::OpCode::callNameBegin) == noop->getIdentificationNumber() && noop->getIdentificationNumberRegisterWriteEnable() == true && ++it != noops.end()) { @@ -790,7 +790,7 @@ HWTEST_F(CommandListAppendLaunchKernelSWTags, givenEnableSWTagsWhenAppendMemoryC tagFound = false; for (auto it = noops.begin(); it != noops.end() && !tagFound; ++it) { auto noop = genCmdCast(*(*it)); - if (NEO::SWTags::BaseTag::getMarkerNoopID(SWTags::OpCode::CallNameEnd) == noop->getIdentificationNumber() && + if (NEO::SWTags::BaseTag::getMarkerNoopID(SWTags::OpCode::callNameEnd) == noop->getIdentificationNumber() && noop->getIdentificationNumberRegisterWriteEnable() == true && ++it != noops.end()) { diff --git a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_enqueue_cmdlist.cpp b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_enqueue_cmdlist.cpp index 14aa2cdf7c..db5ba127ef 100644 --- a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_enqueue_cmdlist.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_enqueue_cmdlist.cpp @@ -1047,7 +1047,7 @@ HWTEST_F(CommandQueueExecuteCommandListSWTagsTests, givenEnableSWTagsAndCommandL for (auto it = noops.begin(); it != noops.end() && !tagFound; ++it) { auto noop = genCmdCast(*(*it)); - if (NEO::SWTags::BaseTag::getMarkerNoopID(SWTags::OpCode::PipeControlReason) == noop->getIdentificationNumber() && + if (NEO::SWTags::BaseTag::getMarkerNoopID(SWTags::OpCode::pipeControlReason) == noop->getIdentificationNumber() && noop->getIdentificationNumberRegisterWriteEnable() == true && ++it != noops.end()) { diff --git a/level_zero/core/test/unit_tests/sources/debugger/test_module_with_debug.cpp b/level_zero/core/test/unit_tests/sources/debugger/test_module_with_debug.cpp index 23ccdb1a91..e18da21855 100644 --- a/level_zero/core/test/unit_tests/sources/debugger/test_module_with_debug.cpp +++ b/level_zero/core/test/unit_tests/sources/debugger/test_module_with_debug.cpp @@ -614,7 +614,7 @@ HWTEST_F(NotifyModuleLoadTest, givenDebuggingEnabledWhenModuleIsCreatedAndFullyL auto debugger = MockDebuggerL0Hw::allocate(neoDevice); neoDevice->getExecutionEnvironment()->rootDeviceEnvironments[0]->debugger.reset(debugger); - auto elfAdditionalSections = {ZebinTestData::appendElfAdditionalSection::CONSTANT}; // for const surface allocation copy + auto elfAdditionalSections = {ZebinTestData::appendElfAdditionalSection::constant}; // for const surface allocation copy auto zebinData = std::make_unique(device->getHwInfo(), elfAdditionalSections); const auto &src = zebinData->storage; 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 7ae38a515d..7cb6c87889 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 @@ -719,7 +719,7 @@ TEST_F(KernelImmutableDataIsaCopyTests, whenUserKernelIsCreatedThenIsaIsCopiedWh std::unique_ptr mockKernelImmData = std::make_unique(perHwThreadPrivateMemorySizeRequested); - auto additionalSections = {ZebinTestData::appendElfAdditionalSection::GLOBAL}; + auto additionalSections = {ZebinTestData::appendElfAdditionalSection::global}; createModuleFromMockBinary(perHwThreadPrivateMemorySizeRequested, isInternal, mockKernelImmData.get(), additionalSections); size_t copyForGlobalSurface = 1u; @@ -799,7 +799,7 @@ TEST_F(KernelImmutableDataTests, givenInternalModuleWhenKernelIsCreatedThenIsaIs size_t previouscopyMemoryToAllocationCalledTimes = mockMemoryManager->copyMemoryToAllocationCalledTimes; - auto additionalSections = {ZebinTestData::appendElfAdditionalSection::GLOBAL}; + auto additionalSections = {ZebinTestData::appendElfAdditionalSection::global}; createModuleFromMockBinary(perHwThreadPrivateMemorySizeRequested, isInternal, mockKernelImmData.get(), additionalSections); size_t copyForGlobalSurface = 1u; @@ -1928,7 +1928,7 @@ using KernelIsaTests = Test; TEST_F(KernelIsaTests, givenKernelAllocationInLocalMemoryWhenCreatingWithoutAllowedCpuAccessThenUseBcsForTransfer) { DebugManagerStateRestore restore; - debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::CpuAccessDisallowed)); + debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::cpuAccessDisallowed)); debugManager.flags.ForceNonSystemMemoryPlacement.set(1 << (static_cast(NEO::AllocationType::kernelIsa) - 1)); this->createModuleFromMockBinary(ModuleType::user); @@ -1945,7 +1945,7 @@ TEST_F(KernelIsaTests, givenKernelAllocationInLocalMemoryWhenCreatingWithoutAllo TEST_F(KernelIsaTests, givenKernelAllocationInLocalMemoryWhenCreatingWithAllowedCpuAccessThenDontUseBcsForTransfer) { DebugManagerStateRestore restore; - debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::CpuAccessAllowed)); + debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::cpuAccessAllowed)); debugManager.flags.ForceNonSystemMemoryPlacement.set(1 << (static_cast(NEO::AllocationType::kernelIsa) - 1)); this->createModuleFromMockBinary(ModuleType::user); @@ -1957,7 +1957,7 @@ TEST_F(KernelIsaTests, givenKernelAllocationInLocalMemoryWhenCreatingWithAllowed TEST_F(KernelIsaTests, givenKernelAllocationInLocalMemoryWhenCreatingWithDisallowedCpuAccessAndDisabledBlitterThenFallbackToCpuCopy) { DebugManagerStateRestore restore; - debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::CpuAccessDisallowed)); + debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::cpuAccessDisallowed)); debugManager.flags.ForceNonSystemMemoryPlacement.set(1 << (static_cast(NEO::AllocationType::kernelIsa) - 1)); this->createModuleFromMockBinary(ModuleType::user); diff --git a/level_zero/core/test/unit_tests/sources/module/test_module.cpp b/level_zero/core/test/unit_tests/sources/module/test_module.cpp index a8f6c103ad..1b9108f1e3 100644 --- a/level_zero/core/test/unit_tests/sources/module/test_module.cpp +++ b/level_zero/core/test/unit_tests/sources/module/test_module.cpp @@ -643,7 +643,7 @@ struct ModuleSpecConstantsFixture : public DeviceFixture { } void runTest() { - auto additionalSections = {ZebinTestData::appendElfAdditionalSection::SPIRV}; + auto additionalSections = {ZebinTestData::appendElfAdditionalSection::spirv}; zebinData = std::make_unique(device->getHwInfo(), additionalSections); const auto &src = zebinData->storage; @@ -682,7 +682,7 @@ struct ModuleSpecConstantsFixture : public DeviceFixture { } void runTestStatic() { - auto additionalSections = {ZebinTestData::appendElfAdditionalSection::SPIRV}; + auto additionalSections = {ZebinTestData::appendElfAdditionalSection::spirv}; zebinData = std::make_unique(device->getHwInfo(), additionalSections); const auto &src = zebinData->storage; @@ -775,7 +775,7 @@ TEST_F(ModuleSpecConstantsLongTests, givenSpecializationConstantsSetWhenCompiler mockCompiler = new FailingMockCompilerInterfaceWithSpecConstants(moduleNumSpecConstants); auto rootDeviceEnvironment = neoDevice->getExecutionEnvironment()->rootDeviceEnvironments[0].get(); rootDeviceEnvironment->compilerInterface.reset(mockCompiler); - auto additionalSections = {ZebinTestData::appendElfAdditionalSection::SPIRV}; + auto additionalSections = {ZebinTestData::appendElfAdditionalSection::spirv}; auto zebinData = std::make_unique(device->getHwInfo(), additionalSections); const auto &src = zebinData->storage; @@ -806,7 +806,7 @@ TEST_F(ModuleSpecConstantsLongTests, givenSpecializationConstantsSetWhenCompiler } TEST_F(ModuleSpecConstantsLongTests, givenSpecializationConstantsSetWhenUserPassTooMuchConstsIdsThenModuleInitFails) { - auto additionalSections = {ZebinTestData::appendElfAdditionalSection::SPIRV}; + auto additionalSections = {ZebinTestData::appendElfAdditionalSection::spirv}; auto zebinData = std::make_unique(device->getHwInfo(), additionalSections); const auto &src = zebinData->storage; @@ -862,7 +862,7 @@ TEST_F(ModuleSpecConstantsLongTests, givenSpecializationConstantsSetWhenCompiler mockCompiler = new FailingMockCompilerInterfaceWithSpecConstants(moduleNumSpecConstants); auto rootDeviceEnvironment = neoDevice->getExecutionEnvironment()->rootDeviceEnvironments[0].get(); rootDeviceEnvironment->compilerInterface.reset(mockCompiler); - auto additionalSections = {ZebinTestData::appendElfAdditionalSection::SPIRV}; + auto additionalSections = {ZebinTestData::appendElfAdditionalSection::spirv}; auto zebinData = std::make_unique(device->getHwInfo(), additionalSections); const auto &src = zebinData->storage; @@ -925,7 +925,7 @@ struct ModuleStaticLinkFixture : public DeviceFixture { } void loadModules(bool multiple) { - auto additionalSections = {ZebinTestData::appendElfAdditionalSection::SPIRV}; + auto additionalSections = {ZebinTestData::appendElfAdditionalSection::spirv}; zebinData = std::make_unique(device->getHwInfo(), additionalSections); const auto &storage = zebinData->storage; @@ -2846,7 +2846,7 @@ HWTEST_F(ModuleTranslationUnitTest, GivenRebuildFlagWhenCreatingModuleFromNative DebugManagerStateRestore dgbRestorer; NEO::debugManager.flags.RebuildPrecompiledKernels.set(true); - auto additionalSections = {ZebinTestData::appendElfAdditionalSection::SPIRV}; + auto additionalSections = {ZebinTestData::appendElfAdditionalSection::spirv}; bool forceRecompilation = true; auto zebinData = std::make_unique(device->getHwInfo(), additionalSections, forceRecompilation); const auto &src = zebinData->storage; @@ -2881,7 +2881,7 @@ HWTEST_F(ModuleTranslationUnitTest, GivenRebuildFlagWhenCreatingModuleFromNative DebugManagerStateRestore dgbRestorer; NEO::debugManager.flags.RebuildPrecompiledKernels.set(true); - auto additionalSections = {ZebinTestData::appendElfAdditionalSection::SPIRV}; + auto additionalSections = {ZebinTestData::appendElfAdditionalSection::spirv}; bool forceRecompilation = true; auto zebinData = std::make_unique(device->getHwInfo(), additionalSections, forceRecompilation); const auto &src = zebinData->storage; @@ -4525,7 +4525,7 @@ TEST_F(ModuleIsaCopyTest, whenModuleIsInitializedThenIsaIsCopied) { uint32_t previouscopyMemoryToAllocationCalledTimes = mockMemoryManager->copyMemoryToAllocationCalledTimes; - auto additionalSections = {ZebinTestData::appendElfAdditionalSection::GLOBAL}; + auto additionalSections = {ZebinTestData::appendElfAdditionalSection::global}; createModuleFromMockBinary(perHwThreadPrivateMemorySizeRequested, isInternal, mockKernelImmData.get(), additionalSections); uint32_t numOfKernels = static_cast(module->getKernelImmutableDataVector().size()); diff --git a/opencl/source/built_ins/aux_translation_builtin.h b/opencl/source/built_ins/aux_translation_builtin.h index 27fbbabee7..34f615a046 100644 --- a/opencl/source/built_ins/aux_translation_builtin.h +++ b/opencl/source/built_ins/aux_translation_builtin.h @@ -32,7 +32,7 @@ class BuiltInOp : public BuiltinDispatchInfoBuilder multiDispatchInfo.setBuiltinOpParams(operationParams); for (auto &kernelObj : *multiDispatchInfo.getKernelObjsForAuxTranslation()) { - DispatchInfoBuilder builder(clDevice); + DispatchInfoBuilder builder(clDevice); UNRECOVERABLE_IF(builder.getMaxNumDispatches() != 1); diff --git a/opencl/source/built_ins/builtins_dispatch_builder.cpp b/opencl/source/built_ins/builtins_dispatch_builder.cpp index 629bda2124..f31506f905 100644 --- a/opencl/source/built_ins/builtins_dispatch_builder.cpp +++ b/opencl/source/built_ins/builtins_dispatch_builder.cpp @@ -33,7 +33,7 @@ class BuiltInOp : public BuiltinDispatchInfoBui : BuiltInOp(kernelsLib, device, true) {} template bool buildDispatchInfosTyped(MultiDispatchInfo &multiDispatchInfo) const { - DispatchInfoBuilder kernelSplit1DBuilder(clDevice); + DispatchInfoBuilder kernelSplit1DBuilder(clDevice); auto &operationParams = multiDispatchInfo.peekBuiltinOpParams(); uintptr_t start = reinterpret_cast(operationParams.dstPtr) + operationParams.dstOffset.x; @@ -60,13 +60,13 @@ class BuiltInOp : public BuiltinDispatchInfoBui uint32_t rootDeviceIndex = clDevice.getRootDeviceIndex(); // Set-up ISA - kernelSplit1DBuilder.setKernel(SplitDispatch::RegionCoordX::Left, kernLeftLeftover->getKernel(rootDeviceIndex)); + kernelSplit1DBuilder.setKernel(SplitDispatch::RegionCoordX::left, kernLeftLeftover->getKernel(rootDeviceIndex)); if (isSrcMisaligned) { - kernelSplit1DBuilder.setKernel(SplitDispatch::RegionCoordX::Middle, kernMiddleMisaligned->getKernel(rootDeviceIndex)); + kernelSplit1DBuilder.setKernel(SplitDispatch::RegionCoordX::middle, kernMiddleMisaligned->getKernel(rootDeviceIndex)); } else { - kernelSplit1DBuilder.setKernel(SplitDispatch::RegionCoordX::Middle, kernMiddle->getKernel(rootDeviceIndex)); + kernelSplit1DBuilder.setKernel(SplitDispatch::RegionCoordX::middle, kernMiddle->getKernel(rootDeviceIndex)); } - kernelSplit1DBuilder.setKernel(SplitDispatch::RegionCoordX::Right, kernRightLeftover->getKernel(rootDeviceIndex)); + kernelSplit1DBuilder.setKernel(SplitDispatch::RegionCoordX::right, kernRightLeftover->getKernel(rootDeviceIndex)); // Set-up common kernel args if (operationParams.srcSvmAlloc) { @@ -93,24 +93,24 @@ class BuiltInOp : public BuiltinDispatchInfoBui kernelSplit1DBuilder.setUnifiedMemorySyncRequirement(operationParams.unifiedMemoryArgsRequireMemSync); // Set-up srcOffset - kernelSplit1DBuilder.setArg(SplitDispatch::RegionCoordX::Left, 2, static_cast(operationParams.srcOffset.x)); - kernelSplit1DBuilder.setArg(SplitDispatch::RegionCoordX::Middle, 2, static_cast(operationParams.srcOffset.x + leftSize)); - kernelSplit1DBuilder.setArg(SplitDispatch::RegionCoordX::Right, 2, static_cast(operationParams.srcOffset.x + leftSize + middleSizeBytes)); + kernelSplit1DBuilder.setArg(SplitDispatch::RegionCoordX::left, 2, static_cast(operationParams.srcOffset.x)); + kernelSplit1DBuilder.setArg(SplitDispatch::RegionCoordX::middle, 2, static_cast(operationParams.srcOffset.x + leftSize)); + kernelSplit1DBuilder.setArg(SplitDispatch::RegionCoordX::right, 2, static_cast(operationParams.srcOffset.x + leftSize + middleSizeBytes)); // Set-up dstOffset - kernelSplit1DBuilder.setArg(SplitDispatch::RegionCoordX::Left, 3, static_cast(operationParams.dstOffset.x)); - kernelSplit1DBuilder.setArg(SplitDispatch::RegionCoordX::Middle, 3, static_cast(operationParams.dstOffset.x + leftSize)); - kernelSplit1DBuilder.setArg(SplitDispatch::RegionCoordX::Right, 3, static_cast(operationParams.dstOffset.x + leftSize + middleSizeBytes)); + kernelSplit1DBuilder.setArg(SplitDispatch::RegionCoordX::left, 3, static_cast(operationParams.dstOffset.x)); + kernelSplit1DBuilder.setArg(SplitDispatch::RegionCoordX::middle, 3, static_cast(operationParams.dstOffset.x + leftSize)); + kernelSplit1DBuilder.setArg(SplitDispatch::RegionCoordX::right, 3, static_cast(operationParams.dstOffset.x + leftSize + middleSizeBytes)); if (isSrcMisaligned) { - kernelSplit1DBuilder.setArg(SplitDispatch::RegionCoordX::Middle, 4, static_cast(srcMisalignment * 8)); + kernelSplit1DBuilder.setArg(SplitDispatch::RegionCoordX::middle, 4, static_cast(srcMisalignment * 8)); } // Set-up work sizes // Note for split walker, it would be just builder.SetDipatchGeometry(GWS, ELWS, OFFSET) - kernelSplit1DBuilder.setDispatchGeometry(SplitDispatch::RegionCoordX::Left, Vec3{leftSize, 0, 0}, Vec3{0, 0, 0}, Vec3{0, 0, 0}); - kernelSplit1DBuilder.setDispatchGeometry(SplitDispatch::RegionCoordX::Middle, Vec3{middleSizeEls, 0, 0}, Vec3{0, 0, 0}, Vec3{0, 0, 0}); - kernelSplit1DBuilder.setDispatchGeometry(SplitDispatch::RegionCoordX::Right, Vec3{rightSize, 0, 0}, Vec3{0, 0, 0}, Vec3{0, 0, 0}); + kernelSplit1DBuilder.setDispatchGeometry(SplitDispatch::RegionCoordX::left, Vec3{leftSize, 0, 0}, Vec3{0, 0, 0}, Vec3{0, 0, 0}); + kernelSplit1DBuilder.setDispatchGeometry(SplitDispatch::RegionCoordX::middle, Vec3{middleSizeEls, 0, 0}, Vec3{0, 0, 0}, Vec3{0, 0, 0}); + kernelSplit1DBuilder.setDispatchGeometry(SplitDispatch::RegionCoordX::right, Vec3{rightSize, 0, 0}, Vec3{0, 0, 0}, Vec3{0, 0, 0}); kernelSplit1DBuilder.bake(multiDispatchInfo); return true; @@ -164,7 +164,7 @@ class BuiltInOp : public BuiltinDispatchInfoBuilder template bool buildDispatchInfosTyped(MultiDispatchInfo &multiDispatchInfo) const { - DispatchInfoBuilder kernelNoSplit3DBuilder(clDevice); + DispatchInfoBuilder kernelNoSplit3DBuilder(clDevice); auto &operationParams = multiDispatchInfo.peekBuiltinOpParams(); size_t hostPtrSize = 0; @@ -293,7 +293,7 @@ class BuiltInOp : public BuiltinDispatchInfoBuilder { template bool buildDispatchInfosTyped(MultiDispatchInfo &multiDispatchInfo) const { - DispatchInfoBuilder kernelSplit1DBuilder(clDevice); + DispatchInfoBuilder kernelSplit1DBuilder(clDevice); auto &operationParams = multiDispatchInfo.peekBuiltinOpParams(); uintptr_t start = reinterpret_cast(operationParams.dstPtr) + operationParams.dstOffset.x; @@ -315,9 +315,9 @@ class BuiltInOp : public BuiltinDispatchInfoBuilder { uint32_t rootDeviceIndex = clDevice.getRootDeviceIndex(); // Set-up ISA - kernelSplit1DBuilder.setKernel(SplitDispatch::RegionCoordX::Left, kernLeftLeftover->getKernel(rootDeviceIndex)); - kernelSplit1DBuilder.setKernel(SplitDispatch::RegionCoordX::Middle, kernMiddle->getKernel(rootDeviceIndex)); - kernelSplit1DBuilder.setKernel(SplitDispatch::RegionCoordX::Right, kernRightLeftover->getKernel(rootDeviceIndex)); + kernelSplit1DBuilder.setKernel(SplitDispatch::RegionCoordX::left, kernLeftLeftover->getKernel(rootDeviceIndex)); + kernelSplit1DBuilder.setKernel(SplitDispatch::RegionCoordX::middle, kernMiddle->getKernel(rootDeviceIndex)); + kernelSplit1DBuilder.setKernel(SplitDispatch::RegionCoordX::right, kernRightLeftover->getKernel(rootDeviceIndex)); DEBUG_BREAK_IF((operationParams.srcMemObj == nullptr) || (operationParams.srcOffset != 0)); DEBUG_BREAK_IF((operationParams.dstMemObj == nullptr) && (operationParams.dstSvmAlloc == nullptr)); @@ -334,24 +334,24 @@ class BuiltInOp : public BuiltinDispatchInfoBuilder { kernelSplit1DBuilder.setKernelDestinationArgumentInSystem(isDestinationInSystem); // Set-up dstOffset - kernelSplit1DBuilder.setArg(SplitDispatch::RegionCoordX::Left, 1, static_cast(operationParams.dstOffset.x)); - kernelSplit1DBuilder.setArg(SplitDispatch::RegionCoordX::Middle, 1, static_cast(operationParams.dstOffset.x + leftSize)); - kernelSplit1DBuilder.setArg(SplitDispatch::RegionCoordX::Right, 1, static_cast(operationParams.dstOffset.x + leftSize + middleSizeBytes)); + kernelSplit1DBuilder.setArg(SplitDispatch::RegionCoordX::left, 1, static_cast(operationParams.dstOffset.x)); + kernelSplit1DBuilder.setArg(SplitDispatch::RegionCoordX::middle, 1, static_cast(operationParams.dstOffset.x + leftSize)); + kernelSplit1DBuilder.setArg(SplitDispatch::RegionCoordX::right, 1, static_cast(operationParams.dstOffset.x + leftSize + middleSizeBytes)); // Set-up srcMemObj with pattern auto graphicsAllocation = operationParams.srcMemObj->getMultiGraphicsAllocation().getDefaultGraphicsAllocation(); kernelSplit1DBuilder.setArgSvm(2, operationParams.srcMemObj->getSize(), reinterpret_cast(graphicsAllocation->getGpuAddressToPatch()), graphicsAllocation, CL_MEM_READ_ONLY); // Set-up patternSizeInEls - kernelSplit1DBuilder.setArg(SplitDispatch::RegionCoordX::Left, 3, static_cast(operationParams.srcMemObj->getSize())); - kernelSplit1DBuilder.setArg(SplitDispatch::RegionCoordX::Middle, 3, static_cast(operationParams.srcMemObj->getSize() / middleElSize)); - kernelSplit1DBuilder.setArg(SplitDispatch::RegionCoordX::Right, 3, static_cast(operationParams.srcMemObj->getSize())); + kernelSplit1DBuilder.setArg(SplitDispatch::RegionCoordX::left, 3, static_cast(operationParams.srcMemObj->getSize())); + kernelSplit1DBuilder.setArg(SplitDispatch::RegionCoordX::middle, 3, static_cast(operationParams.srcMemObj->getSize() / middleElSize)); + kernelSplit1DBuilder.setArg(SplitDispatch::RegionCoordX::right, 3, static_cast(operationParams.srcMemObj->getSize())); // Set-up work sizes // Note for split walker, it would be just builder.SetDipatchGeomtry(GWS, ELWS, OFFSET) - kernelSplit1DBuilder.setDispatchGeometry(SplitDispatch::RegionCoordX::Left, Vec3{leftSize, 0, 0}, Vec3{0, 0, 0}, Vec3{0, 0, 0}); - kernelSplit1DBuilder.setDispatchGeometry(SplitDispatch::RegionCoordX::Middle, Vec3{middleSizeEls, 0, 0}, Vec3{0, 0, 0}, Vec3{0, 0, 0}); - kernelSplit1DBuilder.setDispatchGeometry(SplitDispatch::RegionCoordX::Right, Vec3{rightSize, 0, 0}, Vec3{0, 0, 0}, Vec3{0, 0, 0}); + kernelSplit1DBuilder.setDispatchGeometry(SplitDispatch::RegionCoordX::left, Vec3{leftSize, 0, 0}, Vec3{0, 0, 0}, Vec3{0, 0, 0}); + kernelSplit1DBuilder.setDispatchGeometry(SplitDispatch::RegionCoordX::middle, Vec3{middleSizeEls, 0, 0}, Vec3{0, 0, 0}, Vec3{0, 0, 0}); + kernelSplit1DBuilder.setDispatchGeometry(SplitDispatch::RegionCoordX::right, Vec3{rightSize, 0, 0}, Vec3{0, 0, 0}, Vec3{0, 0, 0}); kernelSplit1DBuilder.bake(multiDispatchInfo); return true; @@ -420,7 +420,7 @@ class BuiltInOp : public BuiltinDispatchInfoBu template bool buildDispatchInfosTyped(MultiDispatchInfo &multiDispatchInfo) const { - DispatchInfoBuilder kernelNoSplit3DBuilder(clDevice); + DispatchInfoBuilder kernelNoSplit3DBuilder(clDevice); auto &operationParams = multiDispatchInfo.peekBuiltinOpParams(); DEBUG_BREAK_IF(!(((operationParams.srcPtr != nullptr) || (operationParams.srcMemObj != nullptr)) && (operationParams.dstPtr == nullptr))); @@ -536,7 +536,7 @@ class BuiltInOp : public BuiltinDispatchInfoBu template bool buildDispatchInfosTyped(MultiDispatchInfo &multiDispatchInfo) const { - DispatchInfoBuilder kernelNoSplit3DBuilder(clDevice); + DispatchInfoBuilder kernelNoSplit3DBuilder(clDevice); auto &operationParams = multiDispatchInfo.peekBuiltinOpParams(); DEBUG_BREAK_IF(!((operationParams.srcPtr == nullptr) && ((operationParams.dstPtr != nullptr) || (operationParams.dstMemObj != nullptr)))); @@ -641,7 +641,7 @@ class BuiltInOp : public BuiltinDispatchInfoBui } bool buildDispatchInfos(MultiDispatchInfo &multiDispatchInfo) const override { - DispatchInfoBuilder kernelNoSplit3DBuilder(clDevice); + DispatchInfoBuilder kernelNoSplit3DBuilder(clDevice); auto &operationParams = multiDispatchInfo.peekBuiltinOpParams(); DEBUG_BREAK_IF(!((operationParams.srcPtr == nullptr) && (operationParams.dstPtr == nullptr))); @@ -706,7 +706,7 @@ class BuiltInOp : public BuiltinDispatchInfoBuilder { } bool buildDispatchInfos(MultiDispatchInfo &multiDispatchInfo) const override { - DispatchInfoBuilder kernelNoSplit3DBuilder(clDevice); + DispatchInfoBuilder kernelNoSplit3DBuilder(clDevice); auto &operationParams = multiDispatchInfo.peekBuiltinOpParams(); DEBUG_BREAK_IF(!((operationParams.srcMemObj == nullptr) && (operationParams.srcPtr != nullptr) && (operationParams.dstPtr == nullptr))); diff --git a/opencl/source/built_ins/vme_dispatch_builder.h b/opencl/source/built_ins/vme_dispatch_builder.h index 0a1b599967..a7fd7e6e97 100644 --- a/opencl/source/built_ins/vme_dispatch_builder.h +++ b/opencl/source/built_ins/vme_dispatch_builder.h @@ -73,7 +73,7 @@ class VmeBuiltinDispatchInfoBuilder : public BuiltinDispatchInfoBuilder { Vec3 gws = {numThreadsX * simdWidth, 1, 1}; Vec3 lws = {vmeKernel->getKernelInfo().kernelDescriptor.kernelAttributes.requiredWorkgroupSize[0], 1, 1}; - DispatchInfoBuilder builder(clDevice); + DispatchInfoBuilder builder(clDevice); builder.setDispatchGeometry(gws, lws, inOffset, gws, lws); builder.setKernel(vmeKernel); builder.bake(multiDispatchInfo); diff --git a/opencl/source/command_queue/enqueue_common.h b/opencl/source/command_queue/enqueue_common.h index b438df2670..e825b2dada 100644 --- a/opencl/source/command_queue/enqueue_common.h +++ b/opencl/source/command_queue/enqueue_common.h @@ -83,7 +83,7 @@ cl_int CommandQueueHw::enqueueHandler(Surface *(&surfaces)[surfaceCou } if (kernel->getKernelInfo().builtinDispatchBuilder == nullptr) { - DispatchInfoBuilder builder(getClDevice()); + DispatchInfoBuilder builder(getClDevice()); builder.setDispatchGeometry(workDim, workItems, enqueuedWorkSizes, globalOffsets, Vec3{0, 0, 0}, localWorkSizesIn); builder.setKernel(kernel); builder.bake(multiDispatchInfo); diff --git a/opencl/source/helpers/dispatch_info_builder.h b/opencl/source/helpers/dispatch_info_builder.h index 5e06ecff39..8140b9283b 100644 --- a/opencl/source/helpers/dispatch_info_builder.h +++ b/opencl/source/helpers/dispatch_info_builder.h @@ -22,16 +22,16 @@ enum class Dim : uint32_t { }; enum class SplitMode : uint32_t { - NoSplit = 0, - WalkerSplit = 1, // 1 kernel and many GPGPU walkers (e.g. for non-uniform workgroup sizes) - KernelSplit = 2 // many kernels and many GPGPU walkers (e.g. for copy kernels) + noSplit = 0, + walkerSplit = 1, // 1 kernel and many GPGPU walkers (e.g. for non-uniform workgroup sizes) + kernelSplit = 2 // many kernels and many GPGPU walkers (e.g. for copy kernels) }; // Left | Middle | Right enum class RegionCoordX : uint32_t { - Left = 0, - Middle = 1, - Right = 2 + left = 0, + middle = 1, + right = 2 }; // Top @@ -40,18 +40,18 @@ enum class RegionCoordX : uint32_t { // ------ // Bottom enum class RegionCoordY : uint32_t { - Top = 0, - Middle = 1, - Bottom = 2 + top = 0, + middle = 1, + bottom = 2 }; // Front / / // / Middle / // / / Back enum class RegionCoordZ : uint32_t { - Front = 0, - Middle = 1, - Back = 2 + front = 0, + middle = 1, + back = 2 }; } // namespace SplitDispatch @@ -101,18 +101,18 @@ class DispatchInfoBuilder { } template - typename std::enable_if<(d == SplitDispatch::Dim::d1D) && (mode != SplitDispatch::SplitMode::NoSplit), void>::type + typename std::enable_if<(d == SplitDispatch::Dim::d1D) && (mode != SplitDispatch::SplitMode::noSplit), void>::type setArgSvm(SplitDispatch::RegionCoordX x, ArgsT &&...args) { dispatchInfos[getDispatchId(x)].getKernel()->setArgSvm(std::forward(args)...); } template - typename std::enable_if<(d == SplitDispatch::Dim::d2D) && (mode != SplitDispatch::SplitMode::NoSplit), void>::type + typename std::enable_if<(d == SplitDispatch::Dim::d2D) && (mode != SplitDispatch::SplitMode::noSplit), void>::type setArgSvm(SplitDispatch::RegionCoordX x, SplitDispatch::RegionCoordY y, ArgsT &&...args) { dispatchInfos[getDispatchId(x, y)].getKernel()->setArgSvm(std::forward(args)...); } template - typename std::enable_if<(d == SplitDispatch::Dim::d3D) && (mode != SplitDispatch::SplitMode::NoSplit), void>::type + typename std::enable_if<(d == SplitDispatch::Dim::d3D) && (mode != SplitDispatch::SplitMode::noSplit), void>::type setArgSvm(SplitDispatch::RegionCoordX x, SplitDispatch::RegionCoordY y, SplitDispatch::RegionCoordZ z, ArgsT &&...args) { dispatchInfos[getDispatchId(x, y, z)].getKernel()->setArgSvm(std::forward(args)...); } @@ -132,41 +132,41 @@ class DispatchInfoBuilder { } template - typename std::enable_if<(d == SplitDispatch::Dim::d1D) && (mode != SplitDispatch::SplitMode::NoSplit), void>::type + typename std::enable_if<(d == SplitDispatch::Dim::d1D) && (mode != SplitDispatch::SplitMode::noSplit), void>::type setArg(SplitDispatch::RegionCoordX x, ArgsT &&...args) { dispatchInfos[getDispatchId(x)].getKernel()->setArg(std::forward(args)...); } template - typename std::enable_if<(d == SplitDispatch::Dim::d2D) && (mode != SplitDispatch::SplitMode::NoSplit), void>::type + typename std::enable_if<(d == SplitDispatch::Dim::d2D) && (mode != SplitDispatch::SplitMode::noSplit), void>::type setArg(SplitDispatch::RegionCoordX x, SplitDispatch::RegionCoordY y, ArgsT &&...args) { dispatchInfos[getDispatchId(x, y)].getKernel()->setArg(std::forward(args)...); } template - typename std::enable_if<(d == SplitDispatch::Dim::d3D) && (mode != SplitDispatch::SplitMode::NoSplit), void>::type + typename std::enable_if<(d == SplitDispatch::Dim::d3D) && (mode != SplitDispatch::SplitMode::noSplit), void>::type setArg(SplitDispatch::RegionCoordX x, SplitDispatch::RegionCoordY y, SplitDispatch::RegionCoordZ z, ArgsT &&...args) { dispatchInfos[getDispatchId(x, y, z)].getKernel()->setArg(std::forward(args)...); } template - typename std::enable_if<(d == SplitDispatch::Dim::d1D) && (mode != SplitDispatch::SplitMode::NoSplit), void>::type + typename std::enable_if<(d == SplitDispatch::Dim::d1D) && (mode != SplitDispatch::SplitMode::noSplit), void>::type setKernel(SplitDispatch::RegionCoordX x, Kernel *kern) { dispatchInfos[getDispatchId(x)].setKernel(kern); } template - typename std::enable_if<(d == SplitDispatch::Dim::d2D) && (mode != SplitDispatch::SplitMode::NoSplit), void>::type + typename std::enable_if<(d == SplitDispatch::Dim::d2D) && (mode != SplitDispatch::SplitMode::noSplit), void>::type setKernel(SplitDispatch::RegionCoordX x, SplitDispatch::RegionCoordY y, Kernel *kern) { dispatchInfos[getDispatchId(x, y)].setKernel(kern); } template - typename std::enable_if<(d == SplitDispatch::Dim::d3D) && (mode != SplitDispatch::SplitMode::NoSplit), void>::type + typename std::enable_if<(d == SplitDispatch::Dim::d3D) && (mode != SplitDispatch::SplitMode::noSplit), void>::type setKernel(SplitDispatch::RegionCoordX x, SplitDispatch::RegionCoordY y, SplitDispatch::RegionCoordZ z, Kernel *kern) { dispatchInfos[getDispatchId(x, y, z)].setKernel(kern); } template - typename std::enable_if<(m == SplitDispatch::SplitMode::NoSplit) || (m == SplitDispatch::SplitMode::WalkerSplit), void>::type + typename std::enable_if<(m == SplitDispatch::SplitMode::noSplit) || (m == SplitDispatch::SplitMode::walkerSplit), void>::type setDispatchGeometry(const uint32_t inputDim, const Vec3 &gws, const Vec3 &elws, const Vec3 &offset, const Vec3 &agws = {0, 0, 0}, const Vec3 &lws = {0, 0, 0}, const Vec3 &twgs = {0, 0, 0}, const Vec3 &nwgs = {0, 0, 0}, const Vec3 &swgs = {0, 0, 0}) { auto &dispatchInfo = dispatchInfos[0]; DEBUG_BREAK_IF(inputDim > static_cast(dim) + 1); @@ -182,7 +182,7 @@ class DispatchInfoBuilder { } template - typename std::enable_if<(m == SplitDispatch::SplitMode::NoSplit) || (m == SplitDispatch::SplitMode::WalkerSplit), void>::type + typename std::enable_if<(m == SplitDispatch::SplitMode::noSplit) || (m == SplitDispatch::SplitMode::walkerSplit), void>::type setDispatchGeometry(const Vec3 &gws, const Vec3 &elws, const Vec3 &offset, const Vec3 &agws = {0, 0, 0}, const Vec3 &lws = {0, 0, 0}, const Vec3 &twgs = {0, 0, 0}, const Vec3 &nwgs = {0, 0, 0}, const Vec3 &swgs = {0, 0, 0}) { auto &dispatchInfo = dispatchInfos[0]; dispatchInfo.setDim(static_cast(dim) + 1); @@ -197,7 +197,7 @@ class DispatchInfoBuilder { } template - typename std::enable_if<(d == SplitDispatch::Dim::d1D) && (mode != SplitDispatch::SplitMode::NoSplit), void>::type + typename std::enable_if<(d == SplitDispatch::Dim::d1D) && (mode != SplitDispatch::SplitMode::noSplit), void>::type setDispatchGeometry(SplitDispatch::RegionCoordX x, const Vec3 &gws, const Vec3 &elws, const Vec3 &offset, const Vec3 &agws = {0, 0, 0}, const Vec3 &lws = {0, 0, 0}, const Vec3 &twgs = {0, 0, 0}, const Vec3 &nwgs = {0, 0, 0}, const Vec3 &swgs = {0, 0, 0}) { auto &dispatchInfo = dispatchInfos[getDispatchId(x)]; @@ -213,7 +213,7 @@ class DispatchInfoBuilder { } template - typename std::enable_if<(d == SplitDispatch::Dim::d2D) && (mode != SplitDispatch::SplitMode::NoSplit), void>::type + typename std::enable_if<(d == SplitDispatch::Dim::d2D) && (mode != SplitDispatch::SplitMode::noSplit), void>::type setDispatchGeometry(SplitDispatch::RegionCoordX x, SplitDispatch::RegionCoordY y, const Vec3 &gws, const Vec3 &elws, const Vec3 &offset, const Vec3 &agws = {0, 0, 0}, const Vec3 lws = {0, 0, 0}, const Vec3 &twgs = {0, 0, 0}, const Vec3 &nwgs = {0, 0, 0}, const Vec3 &swgs = {0, 0, 0}) { auto &dispatchInfo = dispatchInfos[getDispatchId(x, y)]; @@ -229,7 +229,7 @@ class DispatchInfoBuilder { } template - typename std::enable_if<(d == SplitDispatch::Dim::d3D) && (mode != SplitDispatch::SplitMode::NoSplit), void>::type + typename std::enable_if<(d == SplitDispatch::Dim::d3D) && (mode != SplitDispatch::SplitMode::noSplit), void>::type setDispatchGeometry(SplitDispatch::RegionCoordX x, SplitDispatch::RegionCoordY y, SplitDispatch::RegionCoordZ z, const Vec3 &gws, const Vec3 &elws, const Vec3 &offset, const Vec3 &agws = {0, 0, 0}, const Vec3 &lws = {0, 0, 0}, const Vec3 &twgs = {0, 0, 0}, const Vec3 &nwgs = {0, 0, 0}, const Vec3 &swgs = {0, 0, 0}) { auto &dispatchInfo = dispatchInfos[getDispatchId(x, y, z)]; @@ -304,7 +304,7 @@ class DispatchInfoBuilder { protected: static bool supportsSplit() { - return (mode == SplitDispatch::SplitMode::WalkerSplit); + return (mode == SplitDispatch::SplitMode::walkerSplit); } static bool needsSplit(const DispatchInfo &dispatchInfo) { @@ -312,12 +312,12 @@ class DispatchInfoBuilder { } static void pushSplit(const DispatchInfo &dispatchInfo, MultiDispatchInfo &outMdi) { - constexpr auto xMain = SplitDispatch::RegionCoordX::Left; - constexpr auto xRight = SplitDispatch::RegionCoordX::Middle; - constexpr auto yMain = SplitDispatch::RegionCoordY::Top; - constexpr auto yBottom = SplitDispatch::RegionCoordY::Middle; - constexpr auto zMain = SplitDispatch::RegionCoordZ::Front; - constexpr auto zBack = SplitDispatch::RegionCoordZ::Middle; + constexpr auto xMain = SplitDispatch::RegionCoordX::left; + constexpr auto xRight = SplitDispatch::RegionCoordX::middle; + constexpr auto yMain = SplitDispatch::RegionCoordY::top; + constexpr auto yBottom = SplitDispatch::RegionCoordY::middle; + constexpr auto zMain = SplitDispatch::RegionCoordZ::front; + constexpr auto zBack = SplitDispatch::RegionCoordZ::middle; switch (dispatchInfo.getDim()) { default: @@ -335,7 +335,7 @@ class DispatchInfoBuilder { Vec3 mainSWGS = {0, 0, 0}; Vec3 rightSWGS = {mainNWGS.x, 0, 0}; - DispatchInfoBuilder builder1D(dispatchInfo.getClDevice()); + DispatchInfoBuilder builder1D(dispatchInfo.getClDevice()); builder1D.setKernel(dispatchInfo.getKernel()); @@ -365,7 +365,7 @@ class DispatchInfoBuilder { Vec3 bottomSWGS = {0, mainNWGS.y, 0}; Vec3 rightbottomSWGS = {mainNWGS.x, mainNWGS.y, 0}; - DispatchInfoBuilder builder2D(dispatchInfo.getClDevice()); + DispatchInfoBuilder builder2D(dispatchInfo.getClDevice()); builder2D.setKernel(dispatchInfo.getKernel()); @@ -413,7 +413,7 @@ class DispatchInfoBuilder { Vec3 bottombackSWGS = {0, mainNWGS.y, mainNWGS.z}; Vec3 rightbottombackSWGS = {mainNWGS.x, mainNWGS.y, mainNWGS.z}; - DispatchInfoBuilder builder3D(dispatchInfo.getClDevice()); + DispatchInfoBuilder builder3D(dispatchInfo.getClDevice()); builder3D.setKernel(dispatchInfo.getKernel()); @@ -443,7 +443,7 @@ class DispatchInfoBuilder { return static_cast(x); } - static const size_t numDispatches = (mode == SplitDispatch::SplitMode::WalkerSplit) ? 1 : powConst((static_cast(mode) + 1), // 1 (middle) 2 (middle + right/bottom) or 3 (lef/top + middle + right/mottom) + static const size_t numDispatches = (mode == SplitDispatch::SplitMode::walkerSplit) ? 1 : powConst((static_cast(mode) + 1), // 1 (middle) 2 (middle + right/bottom) or 3 (lef/top + middle + right/mottom) (static_cast(dim) + 1)); // 1, 2 or 3 DispatchInfo dispatchInfos[numDispatches]; diff --git a/opencl/source/mem_obj/buffer.cpp b/opencl/source/mem_obj/buffer.cpp index b571bb10ef..8f69d2be1b 100644 --- a/opencl/source/mem_obj/buffer.cpp +++ b/opencl/source/mem_obj/buffer.cpp @@ -208,7 +208,7 @@ bool inline copyHostPointer(Buffer *buffer, bool copyOnCpuAllowed = implicitScalingEnabled == false && size <= Buffer::maxBufferSizeForCopyOnCpu && isCompressionEnabled == false && - productHelper.getLocalMemoryAccessMode(hwInfo) != LocalMemoryAccessMode::CpuAccessDisallowed && + productHelper.getLocalMemoryAccessMode(hwInfo) != LocalMemoryAccessMode::cpuAccessDisallowed && isLockable; if (debugManager.flags.CopyHostPtrOnCpu.get() != -1) { copyOnCpuAllowed = debugManager.flags.CopyHostPtrOnCpu.get() == 1; diff --git a/opencl/test/unit_test/aub_tests/command_queue/aub_multicontext_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_queue/aub_multicontext_tests_xehp_and_later.cpp index 71a8cb3487..d34bf4b9a4 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/aub_multicontext_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/aub_multicontext_tests_xehp_and_later.cpp @@ -208,17 +208,17 @@ struct MultitileMulticontextTests : public MulticontextAubFixture, public ::test }; // 4 Tiles -using FourTilesAllContextsTest = MultitileMulticontextTests<4, MulticontextAubFixture::EnabledCommandStreamers::All>; +using FourTilesAllContextsTest = MultitileMulticontextTests<4, MulticontextAubFixture::EnabledCommandStreamers::all>; HWCMDTEST_F(IGFX_XE_HP_CORE, FourTilesAllContextsTest, GENERATEONLY_givenFourTilesAndAllContextsWhenSubmittingThenDataIsValid) { runAubTest(); } -using FourTilesDualContextTest = MultitileMulticontextTests<4, MulticontextAubFixture::EnabledCommandStreamers::Dual>; +using FourTilesDualContextTest = MultitileMulticontextTests<4, MulticontextAubFixture::EnabledCommandStreamers::dual>; HWCMDTEST_F(IGFX_XE_HP_CORE, FourTilesDualContextTest, HEAVY_givenFourTilesAndDualContextWhenSubmittingThenDataIsValid) { runAubTest(); } -using FourTilesSingleContextTest = MultitileMulticontextTests<4, MulticontextAubFixture::EnabledCommandStreamers::Single>; +using FourTilesSingleContextTest = MultitileMulticontextTests<4, MulticontextAubFixture::EnabledCommandStreamers::single>; HWCMDTEST_F(IGFX_XE_HP_CORE, FourTilesSingleContextTest, givenFourTilesAndSingleContextWhenSubmittingThenDataIsValid) { runAubTest(); } @@ -521,28 +521,28 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, StaticWalkerPartitionFourTilesTests, whenNoPreWalke } // 2 Tiles -using TwoTilesAllContextsTest = MultitileMulticontextTests<2, MulticontextAubFixture::EnabledCommandStreamers::All>; +using TwoTilesAllContextsTest = MultitileMulticontextTests<2, MulticontextAubFixture::EnabledCommandStreamers::all>; HWCMDTEST_F(IGFX_XE_HP_CORE, TwoTilesAllContextsTest, HEAVY_givenTwoTilesAndAllContextsWhenSubmittingThenDataIsValid) { runAubTest(); } -using TwoTilesDualContextTest = MultitileMulticontextTests<2, MulticontextAubFixture::EnabledCommandStreamers::Dual>; +using TwoTilesDualContextTest = MultitileMulticontextTests<2, MulticontextAubFixture::EnabledCommandStreamers::dual>; HWCMDTEST_F(IGFX_XE_HP_CORE, TwoTilesDualContextTest, givenTwoTilesAndDualContextWhenSubmittingThenDataIsValid) { runAubTest(); } -using TwoTilesSingleContextTest = MultitileMulticontextTests<2, MulticontextAubFixture::EnabledCommandStreamers::Single>; +using TwoTilesSingleContextTest = MultitileMulticontextTests<2, MulticontextAubFixture::EnabledCommandStreamers::single>; HWCMDTEST_F(IGFX_XE_HP_CORE, TwoTilesSingleContextTest, givenTwoTilesAndSingleContextWhenSubmittingThenDataIsValid) { runAubTest(); } // 1 Tile -using SingleTileAllContextsTest = MultitileMulticontextTests<1, MulticontextAubFixture::EnabledCommandStreamers::All>; +using SingleTileAllContextsTest = MultitileMulticontextTests<1, MulticontextAubFixture::EnabledCommandStreamers::all>; HWCMDTEST_F(IGFX_XE_HP_CORE, SingleTileAllContextsTest, GENERATEONLY_givenSingleTileAndAllContextsWhenSubmittingThenDataIsValid) { runAubTest(); } -using SingleTileDualContextTest = MultitileMulticontextTests<1, MulticontextAubFixture::EnabledCommandStreamers::Dual>; +using SingleTileDualContextTest = MultitileMulticontextTests<1, MulticontextAubFixture::EnabledCommandStreamers::dual>; HWCMDTEST_F(IGFX_XE_HP_CORE, SingleTileDualContextTest, givenSingleTileAndDualContextWhenSubmittingThenDataIsValid) { runAubTest(); } @@ -578,44 +578,44 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, SingleTileDualContextTest, givenSingleAllocationWhe } // 1 Tile -using SingleTileDualContextTest = MultitileMulticontextTests<1, MulticontextAubFixture::EnabledCommandStreamers::Dual>; +using SingleTileDualContextTest = MultitileMulticontextTests<1, MulticontextAubFixture::EnabledCommandStreamers::dual>; HWCMDTEST_F(IGFX_XE_HP_CORE, SingleTileDualContextTest, givenSingleTileAndDualContextWhenWritingImageThenDataIsValid) { runAubWriteImageTest(); } -using SingleTileAllContextsTest = MultitileMulticontextTests<1, MulticontextAubFixture::EnabledCommandStreamers::All>; +using SingleTileAllContextsTest = MultitileMulticontextTests<1, MulticontextAubFixture::EnabledCommandStreamers::all>; HWCMDTEST_F(IGFX_XE_HP_CORE, SingleTileAllContextsTest, HEAVY_givenSingleTileAndAllContextsWhenWritingImageThenDataIsValid) { runAubWriteImageTest(); } // 2 Tiles -using TwoTilesSingleContextTest = MultitileMulticontextTests<2, MulticontextAubFixture::EnabledCommandStreamers::Single>; +using TwoTilesSingleContextTest = MultitileMulticontextTests<2, MulticontextAubFixture::EnabledCommandStreamers::single>; HWCMDTEST_F(IGFX_XE_HP_CORE, TwoTilesSingleContextTest, givenTwoTilesAndSingleContextWhenWritingImageThenDataIsValid) { runAubWriteImageTest(); } -using TwoTilesDualContextTest = MultitileMulticontextTests<2, MulticontextAubFixture::EnabledCommandStreamers::Dual>; +using TwoTilesDualContextTest = MultitileMulticontextTests<2, MulticontextAubFixture::EnabledCommandStreamers::dual>; HWCMDTEST_F(IGFX_XE_HP_CORE, TwoTilesDualContextTest, givenTwoTilesAndDualContextWhenWritingImageThenDataIsValid) { runAubWriteImageTest(); } -using TwoTilesAllContextsTest = MultitileMulticontextTests<2, MulticontextAubFixture::EnabledCommandStreamers::All>; +using TwoTilesAllContextsTest = MultitileMulticontextTests<2, MulticontextAubFixture::EnabledCommandStreamers::all>; HWCMDTEST_F(IGFX_XE_HP_CORE, TwoTilesAllContextsTest, GENERATEONLY_givenTwoTilesAndAllContextsWhenWritingImageThenDataIsValid) { runAubWriteImageTest(); } // 4 Tiles -using FourTilesSingleContextTest = MultitileMulticontextTests<4, MulticontextAubFixture::EnabledCommandStreamers::Single>; +using FourTilesSingleContextTest = MultitileMulticontextTests<4, MulticontextAubFixture::EnabledCommandStreamers::single>; HWCMDTEST_F(IGFX_XE_HP_CORE, FourTilesSingleContextTest, givenFourTilesAndSingleContextWhenWritingImageThenDataIsValid) { runAubWriteImageTest(); } -using FourTilesDualContextTest = MultitileMulticontextTests<4, MulticontextAubFixture::EnabledCommandStreamers::Dual>; +using FourTilesDualContextTest = MultitileMulticontextTests<4, MulticontextAubFixture::EnabledCommandStreamers::dual>; HWCMDTEST_F(IGFX_XE_HP_CORE, FourTilesDualContextTest, GENERATEONLY_givenFourTilesAndDualContextWhenWritingImageThenDataIsValid) { runAubWriteImageTest(); } -using FourTilesAllContextsTest = MultitileMulticontextTests<4, MulticontextAubFixture::EnabledCommandStreamers::All>; +using FourTilesAllContextsTest = MultitileMulticontextTests<4, MulticontextAubFixture::EnabledCommandStreamers::all>; HWCMDTEST_F(IGFX_XE_HP_CORE, FourTilesAllContextsTest, GENERATEONLY_givenFourTilesAndAllContextsWhenWritingImageThenDataIsValid) { runAubWriteImageTest(); } diff --git a/opencl/test/unit_test/aub_tests/command_queue/aub_one_va_multi_physical_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_queue/aub_one_va_multi_physical_tests_xehp_and_later.cpp index e20f05fe3e..40360e2831 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/aub_one_va_multi_physical_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/aub_one_va_multi_physical_tests_xehp_and_later.cpp @@ -17,7 +17,7 @@ using namespace NEO; struct OneVAFourPhysicalStoragesTest : public MulticontextAubFixture, public ::testing::Test { static const uint32_t numTiles = 4; void SetUp() override { - MulticontextAubFixture::setUp(numTiles, MulticontextAubFixture::EnabledCommandStreamers::Single, false); + MulticontextAubFixture::setUp(numTiles, MulticontextAubFixture::EnabledCommandStreamers::single, false); } void TearDown() override { MulticontextAubFixture::tearDown(); diff --git a/opencl/test/unit_test/aub_tests/command_queue/multi_tile_buffers_aub_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_queue/multi_tile_buffers_aub_tests_xehp_and_later.cpp index 1d2557ea43..f12145a6fa 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/multi_tile_buffers_aub_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/multi_tile_buffers_aub_tests_xehp_and_later.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -19,7 +19,7 @@ struct MultiTileBuffersXeHPAndLater : public MulticontextAubFixture, public ::te static constexpr uint32_t numTiles = 2; void SetUp() override { - MulticontextAubFixture::setUp(numTiles, EnabledCommandStreamers::Single, false); + MulticontextAubFixture::setUp(numTiles, EnabledCommandStreamers::single, false); } void TearDown() override { MulticontextAubFixture::tearDown(); diff --git a/opencl/test/unit_test/aub_tests/command_stream/copy_engine_aub_tests_xehp_and_later.h b/opencl/test/unit_test/aub_tests/command_stream/copy_engine_aub_tests_xehp_and_later.h index 1b62111e52..01348133fc 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/copy_engine_aub_tests_xehp_and_later.h +++ b/opencl/test/unit_test/aub_tests/command_stream/copy_engine_aub_tests_xehp_and_later.h @@ -53,7 +53,7 @@ struct CopyEngineXeHPAndLater : public MulticontextAubFixture, public ::testing: debugManager.flags.RenderCompressedImagesEnabled.set(true); debugManager.flags.EnableFreeMemory.set(false); - MulticontextAubFixture::setUp(numTiles, EnabledCommandStreamers::Single, true); + MulticontextAubFixture::setUp(numTiles, EnabledCommandStreamers::single, true); defaultCommandQueue = commandQueues[0][0].get(); bcsCsr = tileDevices[0]->getNearestGenericSubDevice(0)->getEngine(bcsEngineType, EngineUsage::regular).commandStreamReceiver; diff --git a/opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.cpp b/opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.cpp index 1b4836d796..274549ba9a 100644 --- a/opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.cpp +++ b/opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.cpp @@ -39,7 +39,7 @@ void MulticontextAubFixture::setUp(uint32_t numberOfTiles, EnabledCommandStreame } HardwareInfo localHwInfo = *defaultHwInfo; - if (EnabledCommandStreamers::All == enabledCommandStreamers) { + if (EnabledCommandStreamers::all == enabledCommandStreamers) { overridePlatformConfigForAllEnginesSupport(localHwInfo); } @@ -73,11 +73,11 @@ void MulticontextAubFixture::setUp(uint32_t numberOfTiles, EnabledCommandStreame std::stringstream strfilename; strfilename << ApiSpecificConfig::getAubPrefixForSpecificApi(); strfilename << testInfo->test_case_name() << "_" << testInfo->name() << "_"; - if (EnabledCommandStreamers::Single == enabledCommandStreamers) { + if (EnabledCommandStreamers::single == enabledCommandStreamers) { strfilename << renderEngineName; - } else if (EnabledCommandStreamers::Dual == enabledCommandStreamers) { + } else if (EnabledCommandStreamers::dual == enabledCommandStreamers) { strfilename << renderEngineName << "_CCS0"; - } else if (EnabledCommandStreamers::All == enabledCommandStreamers) { + } else if (EnabledCommandStreamers::all == enabledCommandStreamers) { strfilename << renderEngineName << "_CCS0_3"; // xehp_config_name_RCS_CCS0_3.aub } @@ -123,7 +123,7 @@ void MulticontextAubFixture::setUp(uint32_t numberOfTiles, EnabledCommandStreame for (uint32_t tile = 0; tile < numberOfTiles; tile++) { tileDevices.push_back(rootDevice->getNearestGenericSubDevice(tile)); EXPECT_NE(nullptr, tileDevices[tile]); - if (EnabledCommandStreamers::Single == enabledCommandStreamers) { + if (EnabledCommandStreamers::single == enabledCommandStreamers) { if (EngineHelpers::isCcs(engineType)) { auto familyQueue = tileDevices[tile]->getDevice().getEngineGroupIndexFromEngineGroupType(EngineGroupType::compute); commandQueues[tile].push_back(createCommandQueueForEngine(tile, familyQueue, 0)); @@ -131,12 +131,12 @@ void MulticontextAubFixture::setUp(uint32_t numberOfTiles, EnabledCommandStreame auto familyQueue = tileDevices[tile]->getDevice().getEngineGroupIndexFromEngineGroupType(EngineGroupType::renderCompute); commandQueues[tile].push_back(createCommandQueueForEngine(tile, familyQueue, 0)); } - } else if (EnabledCommandStreamers::Dual == enabledCommandStreamers) { + } else if (EnabledCommandStreamers::dual == enabledCommandStreamers) { auto rcsQueue = tileDevices[tile]->getDevice().getEngineGroupIndexFromEngineGroupType(EngineGroupType::renderCompute); auto ccsQueue = tileDevices[tile]->getDevice().getEngineGroupIndexFromEngineGroupType(EngineGroupType::compute); commandQueues[tile].push_back(createCommandQueueForEngine(tile, rcsQueue, 0)); commandQueues[tile].push_back(createCommandQueueForEngine(tile, ccsQueue, 0)); - } else if (EnabledCommandStreamers::All == enabledCommandStreamers) { + } else if (EnabledCommandStreamers::all == enabledCommandStreamers) { auto rcsQueue = tileDevices[tile]->getDevice().getEngineGroupIndexFromEngineGroupType(EngineGroupType::renderCompute); auto ccsQueue = tileDevices[tile]->getDevice().getEngineGroupIndexFromEngineGroupType(EngineGroupType::compute); commandQueues[tile].push_back(createCommandQueueForEngine(tile, rcsQueue, 0)); diff --git a/opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.h b/opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.h index 062b737a17..57f0bb0365 100644 --- a/opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.h +++ b/opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.h @@ -24,9 +24,9 @@ class MockDevice; struct MulticontextAubFixture { enum class EnabledCommandStreamers { - Single, // default only - Dual, // RCS + CCS0 - All, // RCS + CCS0-3 + single, // default only + dual, // RCS + CCS0 + all, // RCS + CCS0-3 }; void setUp(uint32_t numberOfTiles, EnabledCommandStreamers enabledCommandStreamers, bool enableCompression); diff --git a/opencl/test/unit_test/aub_tests/xe_hpc_core/system_memfence_aub_tests_xe_hpc_core.cpp b/opencl/test/unit_test/aub_tests/xe_hpc_core/system_memfence_aub_tests_xe_hpc_core.cpp index 3094825b79..87b793b251 100644 --- a/opencl/test/unit_test/aub_tests/xe_hpc_core/system_memfence_aub_tests_xe_hpc_core.cpp +++ b/opencl/test/unit_test/aub_tests/xe_hpc_core/system_memfence_aub_tests_xe_hpc_core.cpp @@ -122,7 +122,7 @@ class SystemMemFenceWithBlitter : public MulticontextAubFixture, debugManager.flags.EnableBlitterOperationsSupport.set(1); debugManager.flags.EnableBlitterForEnqueueOperations.set(1); - MulticontextAubFixture::setUp(1, EnabledCommandStreamers::Single, true); + MulticontextAubFixture::setUp(1, EnabledCommandStreamers::single, true); } void TearDown() override { MulticontextAubFixture::tearDown(); @@ -171,7 +171,7 @@ class SystemMemFenceViaKernel : public ProgramFixture, debugManager.flags.ProgramGlobalFenceAsKernelInstructionInEUKernel.set(1); ProgramFixture::setUp(); - MulticontextAubFixture::setUp(1, EnabledCommandStreamers::Single, true); + MulticontextAubFixture::setUp(1, EnabledCommandStreamers::single, true); } void TearDown() override { MulticontextAubFixture::tearDown(); diff --git a/opencl/test/unit_test/aub_tests/xe_hpc_core/um_stateless_compression_aub_tests_xe_hpc_core.cpp b/opencl/test/unit_test/aub_tests/xe_hpc_core/um_stateless_compression_aub_tests_xe_hpc_core.cpp index 3eab4fa15e..ac7ac5056f 100644 --- a/opencl/test/unit_test/aub_tests/xe_hpc_core/um_stateless_compression_aub_tests_xe_hpc_core.cpp +++ b/opencl/test/unit_test/aub_tests/xe_hpc_core/um_stateless_compression_aub_tests_xe_hpc_core.cpp @@ -83,7 +83,7 @@ class UmStatelessCompressionWithBlitter : public MulticontextAubFixture, debugManager.flags.EnableBlitterForEnqueueOperations.set(1); compareCompressedMemory = GetParam(); - MulticontextAubFixture::setUp(1, EnabledCommandStreamers::Single, true); + MulticontextAubFixture::setUp(1, EnabledCommandStreamers::single, true); } void TearDown() override { MulticontextAubFixture::tearDown(); @@ -144,7 +144,7 @@ class UmStatelessCompressionWithStatefulAccess : public ProgramFixture, compareCompressedMemory = GetParam(); ProgramFixture::setUp(); - MulticontextAubFixture::setUp(1, EnabledCommandStreamers::Single, true); + MulticontextAubFixture::setUp(1, EnabledCommandStreamers::single, true); } void TearDown() override { MulticontextAubFixture::tearDown(); diff --git a/opencl/test/unit_test/aub_tests/xe_hpg_core/aub_tests_stateless_compression_in_sba_xe_hpg_core.cpp b/opencl/test/unit_test/aub_tests/xe_hpg_core/aub_tests_stateless_compression_in_sba_xe_hpg_core.cpp index baf5c38da2..3ed82f0395 100644 --- a/opencl/test/unit_test/aub_tests/xe_hpg_core/aub_tests_stateless_compression_in_sba_xe_hpg_core.cpp +++ b/opencl/test/unit_test/aub_tests/xe_hpg_core/aub_tests_stateless_compression_in_sba_xe_hpg_core.cpp @@ -487,7 +487,7 @@ struct XeHpgCoreStatelessCompressionInSBAWithBCS : public MulticontextAubFixture debugManager.flags.EnableStatelessCompression.set(1); debugManager.flags.ForceAuxTranslationMode.set(static_cast(AuxTranslationMode::blit)); debugManager.flags.EnableBlitterOperationsSupport.set(true); - MulticontextAubFixture::setUp(1, EnabledCommandStreamers::Single, true); + MulticontextAubFixture::setUp(1, EnabledCommandStreamers::single, true); StatelessCopyKernelFixture::setUp(tileDevices[0], context.get()); if (!tileDevices[0]->getHardwareInfo().featureTable.flags.ftrLocalMemory) { GTEST_SKIP(); diff --git a/opencl/test/unit_test/command_queue/blit_enqueue_2_tests.cpp b/opencl/test/unit_test/command_queue/blit_enqueue_2_tests.cpp index daf5e8bc3a..49cf2dfa15 100644 --- a/opencl/test/unit_test/command_queue/blit_enqueue_2_tests.cpp +++ b/opencl/test/unit_test/command_queue/blit_enqueue_2_tests.cpp @@ -495,7 +495,7 @@ HWTEST_TEMPLATED_F(BlitEnqueueForceFlagsTests, givenFlagToForceCsrLockAndBlocked using BlitCopyTests = BlitEnqueueTests<1>; HWTEST_TEMPLATED_F(BlitCopyTests, givenKernelAllocationInLocalMemoryWhenCreatingWithoutAllowedCpuAccessThenUseBcsForTransfer) { - debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::CpuAccessDisallowed)); + debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::cpuAccessDisallowed)); debugManager.flags.ForceNonSystemMemoryPlacement.set(1 << (static_cast(AllocationType::kernelIsa) - 1)); uint32_t kernelHeap = 0; @@ -517,7 +517,7 @@ HWTEST_TEMPLATED_F(BlitCopyTests, givenKernelAllocationInLocalMemoryWhenCreating } HWTEST_TEMPLATED_F(BlitCopyTests, givenKernelAllocationInLocalMemoryWhenCreatingWithAllowedCpuAccessThenDontUseBcsForTransfer) { - debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::CpuAccessAllowed)); + debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::cpuAccessAllowed)); debugManager.flags.ForceNonSystemMemoryPlacement.set(1 << (static_cast(AllocationType::kernelIsa) - 1)); uint32_t kernelHeap = 0; @@ -535,7 +535,7 @@ HWTEST_TEMPLATED_F(BlitCopyTests, givenKernelAllocationInLocalMemoryWhenCreating } HWTEST_TEMPLATED_F(BlitCopyTests, givenKernelAllocationInLocalMemoryWhenCreatingWithDisallowedCpuAccessAndDisabledBlitterThenFallbackToCpuCopy) { - debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::CpuAccessDisallowed)); + debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::cpuAccessDisallowed)); debugManager.flags.ForceNonSystemMemoryPlacement.set(1 << (static_cast(AllocationType::kernelIsa) - 1)); device->getExecutionEnvironment()->rootDeviceEnvironments[0]->getMutableHardwareInfo()->capabilityTable.blitterOperationsSupported = false; @@ -556,7 +556,7 @@ HWTEST_TEMPLATED_F(BlitCopyTests, givenKernelAllocationInLocalMemoryWhenCreating HWTEST_TEMPLATED_F(BlitCopyTests, givenLocalMemoryAccessNotAllowedWhenGlobalConstantsAreExportedThenUseBlitter) { debugManager.flags.EnableLocalMemory.set(1); - debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::CpuAccessDisallowed)); + debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::cpuAccessDisallowed)); char constantData[128] = {}; ProgramInfo programInfo; @@ -582,7 +582,7 @@ HWTEST_TEMPLATED_F(BlitCopyTests, givenLocalMemoryAccessNotAllowedWhenGlobalCons } HWTEST_TEMPLATED_F(BlitCopyTests, givenKernelAllocationInLocalMemoryWithoutCpuAccessAllowedWhenSubstituteKernelHeapIsCalledThenUseBcsForTransfer) { - debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::CpuAccessDisallowed)); + debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::cpuAccessDisallowed)); debugManager.flags.ForceNonSystemMemoryPlacement.set(1 << (static_cast(AllocationType::kernelIsa) - 1)); device->getExecutionEnvironment()->rootDeviceEnvironments[0]->getMutableHardwareInfo()->capabilityTable.blitterOperationsSupported = true; @@ -608,7 +608,7 @@ HWTEST_TEMPLATED_F(BlitCopyTests, givenKernelAllocationInLocalMemoryWithoutCpuAc } HWTEST_TEMPLATED_F(BlitCopyTests, givenKernelAllocationInLocalMemoryWithoutCpuAccessAllowedWhenLinkerRequiresPatchingOfInstructionSegmentsThenUseBcsForTransfer) { - debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::CpuAccessDisallowed)); + debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::cpuAccessDisallowed)); debugManager.flags.ForceNonSystemMemoryPlacement.set(1 << (static_cast(AllocationType::kernelIsa) - 1)); device->getExecutionEnvironment()->rootDeviceEnvironments[0]->getMutableHardwareInfo()->capabilityTable.blitterOperationsSupported = true; diff --git a/opencl/test/unit_test/command_queue/command_queue_hw_2_tests.cpp b/opencl/test/unit_test/command_queue/command_queue_hw_2_tests.cpp index 8b9da9eeb9..30b331c451 100644 --- a/opencl/test/unit_test/command_queue/command_queue_hw_2_tests.cpp +++ b/opencl/test/unit_test/command_queue/command_queue_hw_2_tests.cpp @@ -49,7 +49,7 @@ struct MockBuilder : BuiltinDispatchInfoBuilder { paramsReceived.offset = offset; wasBuildDispatchInfosWithKernelParamsCalled = true; - DispatchInfoBuilder dispatchInfoBuilder(clDevice); + DispatchInfoBuilder dispatchInfoBuilder(clDevice); dispatchInfoBuilder.setKernel(paramsToUse.kernel); dispatchInfoBuilder.setDispatchGeometry(dim, paramsToUse.gws, paramsToUse.elws, paramsToUse.offset); dispatchInfoBuilder.bake(d); diff --git a/opencl/test/unit_test/command_queue/dispatch_walker_tests_xehp_and_later.cpp b/opencl/test/unit_test/command_queue/dispatch_walker_tests_xehp_and_later.cpp index 5ace38d303..7281cf5527 100644 --- a/opencl/test/unit_test/command_queue/dispatch_walker_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/command_queue/dispatch_walker_tests_xehp_and_later.cpp @@ -643,7 +643,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenAutoLocal size_t globalOffsets[] = {0, 0, 0}; MultiDispatchInfo multiDispatchInfo(kernel->mockKernel); - DispatchInfoBuilder builder(*device); + DispatchInfoBuilder builder(*device); builder.setDispatchGeometry(1, gws, lws, globalOffsets); builder.setKernel(kernel->mockKernel); builder.bake(multiDispatchInfo); @@ -705,7 +705,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenPassInlin size_t globalOffsets[] = {0, 0, 0}; MultiDispatchInfo multiDispatchInfo(kernel->mockKernel); - DispatchInfoBuilder builder(*device); + DispatchInfoBuilder builder(*device); builder.setDispatchGeometry(1, gws, lws, globalOffsets); builder.setKernel(kernel->mockKernel); builder.bake(multiDispatchInfo); @@ -807,7 +807,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenPassInlin size_t globalOffsets[] = {0, 0, 0}; MultiDispatchInfo multiDispatchInfo(kernel->mockKernel); - DispatchInfoBuilder builder(*device); + DispatchInfoBuilder builder(*device); builder.setDispatchGeometry(1, gws, lws, globalOffsets); builder.setKernel(kernel->mockKernel); builder.bake(multiDispatchInfo); diff --git a/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp index 6b907561e1..f5002a97cd 100644 --- a/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp @@ -135,7 +135,7 @@ HWTEST_F(EnqueueHandlerWithAubSubCaptureTests, givenEnqueueHandlerWithAubSubCapt pDevice->resetCommandStreamReceiver(aubCsr); AubSubCaptureCommon subCaptureCommon; - subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Filter; + subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::filter; subCaptureCommon.subCaptureFilter.dumpKernelName = "invalid_kernel_name"; auto subCaptureManagerMock = new AubSubCaptureManagerMock("file_name.aub", subCaptureCommon); aubCsr->subCaptureManager.reset(subCaptureManagerMock); @@ -156,7 +156,7 @@ HWTEST_F(EnqueueHandlerWithAubSubCaptureTests, givenEnqueueMarkerWithAubSubCaptu pDevice->resetCommandStreamReceiver(aubCsr); AubSubCaptureCommon subCaptureCommon; - subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Filter; + subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::filter; subCaptureCommon.subCaptureFilter.dumpKernelName = "invalid_kernel_name"; auto subCaptureManagerMock = new AubSubCaptureManagerMock("file_name.aub", subCaptureCommon); aubCsr->subCaptureManager.reset(subCaptureManagerMock); @@ -176,7 +176,7 @@ HWTEST_F(EnqueueHandlerWithAubSubCaptureTests, givenEnqueueHandlerWithAubSubCapt pDevice->resetCommandStreamReceiver(aubCsr); AubSubCaptureCommon subCaptureCommon; - subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Filter; + subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::filter; subCaptureCommon.subCaptureFilter.dumpKernelName = ""; subCaptureCommon.subCaptureFilter.dumpKernelStartIdx = 0; subCaptureCommon.subCaptureFilter.dumpKernelEndIdx = 1; @@ -219,7 +219,7 @@ HWTEST_F(EnqueueHandlerWithAubSubCaptureTests, givenInputEventsWhenDispatchingEn pDevice->resetCommandStreamReceiver(aubCsr); AubSubCaptureCommon subCaptureCommon; - subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Filter; + subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::filter; subCaptureCommon.subCaptureFilter.dumpKernelName = ""; subCaptureCommon.subCaptureFilter.dumpKernelStartIdx = 0; subCaptureCommon.subCaptureFilter.dumpKernelEndIdx = 1; @@ -550,7 +550,7 @@ HWTEST_F(EnqueueHandlerTest, givenExternallySynchronizedParentEventWhenRequestin HWTEST_F(EnqueueHandlerTest, givenEnqueueHandlerWhenSubCaptureIsOffThenActivateSubCaptureIsNotCalled) { DebugManagerStateRestore stateRestore; - debugManager.flags.AUBDumpSubCaptureMode.set(static_cast(AubSubCaptureManager::SubCaptureMode::Off)); + debugManager.flags.AUBDumpSubCaptureMode.set(static_cast(AubSubCaptureManager::SubCaptureMode::off)); MockKernelWithInternals kernelInternals(*pClDevice, context); Kernel *kernel = kernelInternals.mockKernel; @@ -573,7 +573,7 @@ HWTEST_F(EnqueueHandlerTest, givenEnqueueHandlerWhenSubCaptureIsOffThenActivateS HWTEST_F(EnqueueHandlerTest, givenEnqueueHandlerWhenSubCaptureIsOnThenActivateSubCaptureIsCalled) { DebugManagerStateRestore stateRestore; - debugManager.flags.AUBDumpSubCaptureMode.set(static_cast(AubSubCaptureManager::SubCaptureMode::Filter)); + debugManager.flags.AUBDumpSubCaptureMode.set(static_cast(AubSubCaptureManager::SubCaptureMode::filter)); MockKernelWithInternals kernelInternals(*pClDevice, context); Kernel *kernel = kernelInternals.mockKernel; @@ -601,7 +601,7 @@ HWTEST_F(EnqueueHandlerTest, givenEnqueueHandlerWhenClSetKernelExecInfoAlreadySe GTEST_SKIP(); } DebugManagerStateRestore stateRestore; - debugManager.flags.AUBDumpSubCaptureMode.set(static_cast(AubSubCaptureManager::SubCaptureMode::Filter)); + debugManager.flags.AUBDumpSubCaptureMode.set(static_cast(AubSubCaptureManager::SubCaptureMode::filter)); debugManager.flags.ForceThreadArbitrationPolicyProgrammingWithScm.set(1); pDevice->getUltCommandStreamReceiver().streamProperties.initSupport(pClDevice->getRootDeviceEnvironment()); @@ -639,7 +639,7 @@ HWTEST_F(EnqueueHandlerTest, givenEnqueueHandlerWhenNotSupportedPolicyChangeThen GTEST_SKIP(); } DebugManagerStateRestore stateRestore; - debugManager.flags.AUBDumpSubCaptureMode.set(static_cast(AubSubCaptureManager::SubCaptureMode::Filter)); + debugManager.flags.AUBDumpSubCaptureMode.set(static_cast(AubSubCaptureManager::SubCaptureMode::filter)); MockKernelWithInternals kernelInternals(*pClDevice, context); Kernel *kernel = kernelInternals.mockKernel; diff --git a/opencl/test/unit_test/command_queue/enqueue_read_buffer_event_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_read_buffer_event_tests.cpp index 012b30182f..0c97e43593 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_buffer_event_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_read_buffer_event_tests.cpp @@ -104,7 +104,7 @@ TEST_F(EnqueueReadBuffer, WhenReadingBufferThenEventReturnedShouldBeMaxOfInputEv TEST_F(EnqueueReadBuffer, givenInOrderQueueAndForcedCpuCopyOnReadBufferAndDstPtrEqualSrcPtrWithEventsNotBlockedWhenReadBufferIsExecutedThenTaskLevelShouldNotBeIncreased) { DebugManagerStateRestore dbgRestore; debugManager.flags.DoCpuCopyOnReadBuffer.set(1); - debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::Default)); + debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::defaultMode)); cl_int retVal = CL_SUCCESS; uint32_t taskLevelCmdQ = 17; pCmdQ->taskLevel = taskLevelCmdQ; @@ -147,7 +147,7 @@ TEST_F(EnqueueReadBuffer, givenInOrderQueueAndForcedCpuCopyOnReadBufferAndDstPtr TEST_F(EnqueueReadBuffer, givenInOrderQueueAndForcedCpuCopyOnReadBufferAndDstPtrEqualSrcPtrWhenReadBufferIsExecutedThenTaskLevelShouldNotBeIncreased) { DebugManagerStateRestore dbgRestore; debugManager.flags.DoCpuCopyOnReadBuffer.set(1); - debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::Default)); + debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::defaultMode)); cl_int retVal = CL_SUCCESS; uint32_t taskLevelCmdQ = 17; pCmdQ->taskLevel = taskLevelCmdQ; @@ -181,7 +181,7 @@ TEST_F(EnqueueReadBuffer, givenInOrderQueueAndForcedCpuCopyOnReadBufferAndDstPtr TEST_F(EnqueueReadBuffer, givenOutOfOrderQueueAndForcedCpuCopyOnReadBufferAndDstPtrEqualSrcPtrWithEventsNotBlockedWhenReadBufferIsExecutedThenTaskLevelShouldNotBeIncreased) { DebugManagerStateRestore dbgRestore; debugManager.flags.DoCpuCopyOnReadBuffer.set(1); - debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::Default)); + debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::defaultMode)); std::unique_ptr pCmdOOQ(createCommandQueue(pClDevice, CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE)); cl_int retVal = CL_SUCCESS; uint32_t taskLevelCmdQ = 17; diff --git a/opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp index e94f1431f8..fc150ac126 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp @@ -602,7 +602,7 @@ HWTEST_F(EnqueueReadBufferTypeTest, givenForcedCpuCopyWhenEnqueueReadCompressedB DebugManagerStateRestore dbgRestore; debugManager.flags.DoCpuCopyOnReadBuffer.set(1); debugManager.flags.EnableCpuCacheForResources.set(true); - debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::Default)); + debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::defaultMode)); MockExecutionEnvironment executionEnvironment(defaultHwInfo.get()); MockMemoryManager memoryManager(false, true, executionEnvironment); diff --git a/opencl/test/unit_test/command_queue/enqueue_unmap_memobject_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_unmap_memobject_tests.cpp index 268e7a4db1..1dd440c0df 100644 --- a/opencl/test/unit_test/command_queue/enqueue_unmap_memobject_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_unmap_memobject_tests.cpp @@ -224,7 +224,7 @@ HWTEST_F(EnqueueUnmapMemObjTest, givenEnqueueUnmapMemObjectWhenNonAubWritableBuf HWTEST_F(EnqueueUnmapMemObjTest, givenWriteBufferIsServicedOnCPUWhenBufferIsNonAubTbxWriteableThenFlagsChange) { DebugManagerStateRestore restorer; debugManager.flags.DoCpuCopyOnWriteBuffer.set(1); - debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::Default)); + debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::defaultMode)); auto buffer = std::unique_ptr(BufferHelper<>::create()); ASSERT_NE(nullptr, buffer); auto graphicsAllocation = buffer->getGraphicsAllocation(pClDevice->getRootDeviceIndex()); diff --git a/opencl/test/unit_test/command_queue/enqueue_write_buffer_event_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_buffer_event_tests.cpp index 48e0cc93a0..57d318c11d 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_buffer_event_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_write_buffer_event_tests.cpp @@ -104,7 +104,7 @@ TEST_F(EnqueueWriteBufferTypeTest, WhenWritingBufferThenReturnedEventShouldBeMax TEST_F(EnqueueWriteBufferTypeTest, givenInOrderQueueAndForcedCpuCopyOnWriteBufferAndDstPtrEqualSrcPtrWithEventsNotBlockedWhenWriteBufferIsExecutedThenTaskLevelShouldNotBeIncreased) { DebugManagerStateRestore dbgRestore; debugManager.flags.DoCpuCopyOnWriteBuffer.set(1); - debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::Default)); + debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::defaultMode)); cl_int retVal = CL_SUCCESS; uint32_t taskLevelCmdQ = 17; pCmdQ->taskLevel = taskLevelCmdQ; @@ -219,7 +219,7 @@ TEST_F(EnqueueWriteBufferTypeTest, givenInOrderQueueAndForcedCpuCopyOnWriteBuffe TEST_F(EnqueueWriteBufferTypeTest, givenOutOfOrderQueueAndForcedCpuCopyOnWriteBufferAndDstPtrEqualSrcPtrWithEventsWhenWriteBufferIsExecutedThenTaskLevelShouldNotBeIncreased) { DebugManagerStateRestore dbgRestore; debugManager.flags.DoCpuCopyOnWriteBuffer.set(1); - debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::Default)); + debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::defaultMode)); std::unique_ptr pCmdOOQ(createCommandQueue(pClDevice, CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE)); cl_int retVal = CL_SUCCESS; uint32_t taskLevelCmdQ = 17; diff --git a/opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp index 941b08bf42..14e6c65a32 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp @@ -431,7 +431,7 @@ HWTEST_F(EnqueueWriteBufferTypeTest, givenForcedCpuCopyWhenEnqueueWriteCompresse DebugManagerStateRestore dbgRestore; debugManager.flags.DoCpuCopyOnWriteBuffer.set(1); debugManager.flags.EnableCpuCacheForResources.set(true); - debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::Default)); + debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::defaultMode)); MockExecutionEnvironment executionEnvironment(defaultHwInfo.get()); MockMemoryManager memoryManager(false, true, executionEnvironment); diff --git a/opencl/test/unit_test/command_queue/read_write_buffer_cpu_copy.cpp b/opencl/test/unit_test/command_queue/read_write_buffer_cpu_copy.cpp index c4131c2aac..9b7c20ee2a 100644 --- a/opencl/test/unit_test/command_queue/read_write_buffer_cpu_copy.cpp +++ b/opencl/test/unit_test/command_queue/read_write_buffer_cpu_copy.cpp @@ -22,7 +22,7 @@ typedef EnqueueReadBufferTypeTest ReadWriteBufferCpuCopyTest; HWTEST_F(ReadWriteBufferCpuCopyTest, givenCompressedGmmWhenAskingForCpuOperationThenDisallow) { DebugManagerStateRestore restorer; debugManager.flags.EnableCpuCacheForResources.set(true); - debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::Default)); + debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::defaultMode)); cl_int retVal; auto rootDeviceIndex = context->getDevice(0)->getRootDeviceIndex(); std::unique_ptr buffer(Buffer::create(context, CL_MEM_READ_WRITE, 1, nullptr, retVal)); @@ -49,7 +49,7 @@ HWTEST_F(ReadWriteBufferCpuCopyTest, givenCompressedGmmWhenAskingForCpuOperation HWTEST_F(ReadWriteBufferCpuCopyTest, GivenUnalignedReadPtrWhenReadingBufferThenMemoryIsReadCorrectly) { DebugManagerStateRestore restorer; - debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::Default)); + debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::defaultMode)); cl_int retVal; size_t offset = 1; size_t size = 4; @@ -90,7 +90,7 @@ HWTEST_F(ReadWriteBufferCpuCopyTest, GivenUnalignedReadPtrWhenReadingBufferThenM HWTEST_F(ReadWriteBufferCpuCopyTest, GivenUnalignedSrcPtrWhenWritingBufferThenMemoryIsWrittenCorrectly) { DebugManagerStateRestore restorer; - debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::Default)); + debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::defaultMode)); cl_int retVal; size_t offset = 1; size_t size = 4; @@ -138,7 +138,7 @@ HWTEST_F(ReadWriteBufferCpuCopyTest, GivenUnalignedSrcPtrWhenWritingBufferThenMe HWTEST_F(ReadWriteBufferCpuCopyTest, GivenSpecificMemoryStructuresWhenReadingWritingMemoryThenCpuReadWriteIsAllowed) { DebugManagerStateRestore restorer; - debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::Default)); + debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::defaultMode)); cl_int retVal; size_t size = MemoryConstants::cacheLineSize; auto alignedBufferPtr = alignedMalloc(MemoryConstants::cacheLineSize + 1, MemoryConstants::cacheLineSize); @@ -232,7 +232,7 @@ HWTEST_F(ReadWriteBufferCpuCopyTest, GivenSpecificMemoryStructuresWhenReadingWri HWTEST_F(ReadWriteBufferCpuCopyTest, givenDebugVariableToDisableCpuCopiesWhenBufferCpuCopyAllowedIsCalledThenItReturnsFalse) { DebugManagerStateRestore restorer; debugManager.flags.EnableLocalMemory.set(false); - debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::Default)); + debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::defaultMode)); cl_int retVal; @@ -258,7 +258,7 @@ HWTEST_F(ReadWriteBufferCpuCopyTest, givenDebugVariableToDisableCpuCopiesWhenBuf TEST(ReadWriteBufferOnCpu, givenNoHostPtrAndAlignedSizeWhenMemoryAllocationIsInNonSystemMemoryPoolThenIsReadWriteOnCpuAllowedReturnsFalse) { DebugManagerStateRestore restorer; - debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::Default)); + debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::defaultMode)); MockExecutionEnvironment *executionEnvironment = new MockExecutionEnvironment(nullptr, false, 1u); MockMemoryManager *memoryManager = new MockMemoryManager(*executionEnvironment); executionEnvironment->memoryManager.reset(memoryManager); @@ -282,7 +282,7 @@ TEST(ReadWriteBufferOnCpu, givenNoHostPtrAndAlignedSizeWhenMemoryAllocationIsInN TEST(ReadWriteBufferOnCpu, givenPointerThatRequiresCpuCopyWhenCpuCopyIsEvaluatedThenTrueIsReturned) { DebugManagerStateRestore restorer; - debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::Default)); + debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::defaultMode)); MockExecutionEnvironment *executionEnvironment = new MockExecutionEnvironment(nullptr, false, 1u); MockMemoryManager *memoryManager = new MockMemoryManager(*executionEnvironment); executionEnvironment->memoryManager.reset(memoryManager); @@ -305,7 +305,7 @@ TEST(ReadWriteBufferOnCpu, givenPointerThatRequiresCpuCopyWhenCpuCopyIsEvaluated TEST(ReadWriteBufferOnCpu, givenPointerThatRequiresCpuCopyButItIsNotPossibleWhenCpuCopyIsEvaluatedThenFalseIsReturned) { DebugManagerStateRestore restorer; - debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::Default)); + debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::defaultMode)); MockExecutionEnvironment *executionEnvironment = new MockExecutionEnvironment(nullptr, false, 1u); MockMemoryManager *memoryManager = new MockMemoryManager(*executionEnvironment); executionEnvironment->memoryManager.reset(memoryManager); @@ -329,7 +329,7 @@ TEST(ReadWriteBufferOnCpu, givenPointerThatRequiresCpuCopyButItIsNotPossibleWhen TEST(ReadWriteBufferOnCpu, whenLocalMemoryPoolAllocationIsAskedForPreferenceThenCpuIsNotChoosen) { DebugManagerStateRestore restorer; - debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::Default)); + debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::defaultMode)); auto device = std::make_unique(MockDevice::createWithNewExecutionEnvironment(nullptr)); MockContext ctx(device.get()); diff --git a/opencl/test/unit_test/context/context_tests.cpp b/opencl/test/unit_test/context/context_tests.cpp index 99c245508e..64e06462ca 100644 --- a/opencl/test/unit_test/context/context_tests.cpp +++ b/opencl/test/unit_test/context/context_tests.cpp @@ -547,7 +547,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ContextCreateTests, givenLocalMemoryAllocationWhenB DebugManagerStateRestore restore; debugManager.flags.EnableLocalMemory.set(true); - debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::Default)); + debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::defaultMode)); VariableBackup backupHwInfo(defaultHwInfo.get()); defaultHwInfo->capabilityTable.blitterOperationsSupported = true; @@ -579,7 +579,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ContextCreateTests, givenGpuHangOnFlushBcsTaskAndLo DebugManagerStateRestore restore; debugManager.flags.EnableLocalMemory.set(true); - debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::Default)); + debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::defaultMode)); VariableBackup backupHwInfo(defaultHwInfo.get()); defaultHwInfo->capabilityTable.blitterOperationsSupported = true; diff --git a/opencl/test/unit_test/gen12lp/gfx_core_helper_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/gfx_core_helper_tests_gen12lp.inl index 2a2bd94330..d5028faa0e 100644 --- a/opencl/test/unit_test/gen12lp/gfx_core_helper_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/gfx_core_helper_tests_gen12lp.inl @@ -394,7 +394,7 @@ GEN12LPTEST_F(GfxCoreHelperTestGen12Lp, givenL1ForceDisabledWhenRequestingMocsTh GEN12LPTEST_F(GfxCoreHelperTestGen12Lp, givenAllocationTypeWithCpuAccessRequiredWhenCpuAccessIsDisallowedThenSystemMemoryIsRequested) { DebugManagerStateRestore restore; - debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::CpuAccessDisallowed)); + debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::cpuAccessDisallowed)); const AllocationType allocationTypesToUseSystemMemory[] = { AllocationType::commandBuffer, diff --git a/opencl/test/unit_test/helpers/dispatch_info_builder_tests.cpp b/opencl/test/unit_test/helpers/dispatch_info_builder_tests.cpp index 96de4f0f39..71ffc297da 100644 --- a/opencl/test/unit_test/helpers/dispatch_info_builder_tests.cpp +++ b/opencl/test/unit_test/helpers/dispatch_info_builder_tests.cpp @@ -84,7 +84,7 @@ class DispatchInfoBuilderMock : DispatchInfoBuilder { TEST_F(DispatchInfoBuilderTest, Given1dWhenSplittingMultiDispatchInfoThenMultiDispatchInfo) { MultiDispatchInfo multiDispatchInfo; - auto diBuilder = new DispatchInfoBuilderMock(*pClDevice); + auto diBuilder = new DispatchInfoBuilderMock(*pClDevice); ASSERT_NE(nullptr, diBuilder); // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks) DispatchInfo dispatchInfo; @@ -97,13 +97,13 @@ TEST_F(DispatchInfoBuilderTest, Given1dWhenSplittingMultiDispatchInfoThenMultiDi TEST_F(DispatchInfoBuilderTest, WhenGettingDimensionThenCorrectDimensionIsReturned) { MultiDispatchInfo mdi1D, mdi2D, mdi3D; - DispatchInfoBuilder *diBuilder1D = new DispatchInfoBuilder(*pClDevice); + DispatchInfoBuilder *diBuilder1D = new DispatchInfoBuilder(*pClDevice); ASSERT_NE(nullptr, diBuilder1D); // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks) - DispatchInfoBuilder *diBuilder2D = new DispatchInfoBuilder(*pClDevice); + DispatchInfoBuilder *diBuilder2D = new DispatchInfoBuilder(*pClDevice); ASSERT_NE(nullptr, diBuilder2D); // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks) - DispatchInfoBuilder *diBuilder3D = new DispatchInfoBuilder(*pClDevice); + DispatchInfoBuilder *diBuilder3D = new DispatchInfoBuilder(*pClDevice); ASSERT_NE(nullptr, diBuilder3D); // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks) diBuilder1D->setDispatchGeometry(Vec3(1, 0, 0), Vec3(0, 0, 0), Vec3(0, 0, 0)); @@ -130,7 +130,7 @@ TEST_F(DispatchInfoBuilderTest, WhenGettingDimensionThenCorrectDimensionIsReturn } TEST_F(DispatchInfoBuilderTest, WhenGettingGwsThenCorrectValuesAreReturned) { - DispatchInfoBuilder *diBuilder = new DispatchInfoBuilder(*pClDevice); + DispatchInfoBuilder *diBuilder = new DispatchInfoBuilder(*pClDevice); ASSERT_NE(nullptr, diBuilder); // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks) MultiDispatchInfo mdi0, mdi1, mdi2, mdi3; @@ -176,7 +176,7 @@ TEST_F(DispatchInfoBuilderTest, WhenGettingGwsThenCorrectValuesAreReturned) { } TEST_F(DispatchInfoBuilderTest, WhenGettingElwsThenCorrectValuesAreReturned) { - DispatchInfoBuilder *diBuilder = new DispatchInfoBuilder(*pClDevice); + DispatchInfoBuilder *diBuilder = new DispatchInfoBuilder(*pClDevice); ASSERT_NE(nullptr, diBuilder); // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks) MultiDispatchInfo mdi0, mdi1, mdi2, mdi3; @@ -222,7 +222,7 @@ TEST_F(DispatchInfoBuilderTest, WhenGettingElwsThenCorrectValuesAreReturned) { } TEST_F(DispatchInfoBuilderTest, WhenGettingLwsThenCorrectValuesAreReturned) { - auto diBuilder = std::make_unique>(*pClDevice); + auto diBuilder = std::make_unique>(*pClDevice); ASSERT_NE(nullptr, diBuilder); MultiDispatchInfo mdi0, mdi1, mdi2, mdi3; @@ -261,7 +261,7 @@ TEST_F(DispatchInfoBuilderTest, WhenGettingLwsThenCorrectValuesAreReturned) { } TEST_F(DispatchInfoBuilderTest, GivenNoSplitWhenCheckingIfBuiltinThenReturnTrue) { - DispatchInfoBuilder *diBuilder = new DispatchInfoBuilder(*pClDevice); + DispatchInfoBuilder *diBuilder = new DispatchInfoBuilder(*pClDevice); ASSERT_NE(nullptr, diBuilder); // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks) diBuilder->setKernel(pKernel); @@ -278,18 +278,18 @@ TEST_F(DispatchInfoBuilderTest, GivenNoSplitWhenCheckingIfBuiltinThenReturnTrue) } TEST_F(DispatchInfoBuilderTest, GivenSplitWhenCheckingIfBuiltinThenReturnTrue) { - DispatchInfoBuilder *diBuilder1D = new DispatchInfoBuilder(*pClDevice); + DispatchInfoBuilder *diBuilder1D = new DispatchInfoBuilder(*pClDevice); ASSERT_NE(nullptr, diBuilder1D); // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks) - DispatchInfoBuilder *diBuilder2D = new DispatchInfoBuilder(*pClDevice); + DispatchInfoBuilder *diBuilder2D = new DispatchInfoBuilder(*pClDevice); ASSERT_NE(nullptr, diBuilder2D); // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks) - DispatchInfoBuilder *diBuilder3D = new DispatchInfoBuilder(*pClDevice); + DispatchInfoBuilder *diBuilder3D = new DispatchInfoBuilder(*pClDevice); ASSERT_NE(nullptr, diBuilder3D); // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks) // 1D - diBuilder1D->setKernel(RegionCoordX::Left, pKernel); - diBuilder1D->setDispatchGeometry(RegionCoordX::Left, Vec3(256, 0, 0), Vec3(16, 0, 0), Vec3(0, 0, 0)); + diBuilder1D->setKernel(RegionCoordX::left, pKernel); + diBuilder1D->setDispatchGeometry(RegionCoordX::left, Vec3(256, 0, 0), Vec3(16, 0, 0), Vec3(0, 0, 0)); MultiDispatchInfo mdi1D; diBuilder1D->bake(mdi1D); @@ -299,8 +299,8 @@ TEST_F(DispatchInfoBuilderTest, GivenSplitWhenCheckingIfBuiltinThenReturnTrue) { } // 2D - diBuilder2D->setKernel(RegionCoordX::Left, RegionCoordY::Bottom, pKernel); - diBuilder2D->setDispatchGeometry(RegionCoordX::Left, RegionCoordY::Bottom, Vec3(256, 256, 0), Vec3(16, 16, 0), Vec3(0, 0, 0)); + diBuilder2D->setKernel(RegionCoordX::left, RegionCoordY::bottom, pKernel); + diBuilder2D->setDispatchGeometry(RegionCoordX::left, RegionCoordY::bottom, Vec3(256, 256, 0), Vec3(16, 16, 0), Vec3(0, 0, 0)); MultiDispatchInfo mdi2D; diBuilder2D->bake(mdi2D); for (auto &dispatchInfo : mdi2D) { @@ -309,8 +309,8 @@ TEST_F(DispatchInfoBuilderTest, GivenSplitWhenCheckingIfBuiltinThenReturnTrue) { } // 3D - diBuilder3D->setKernel(RegionCoordX::Right, RegionCoordY::Bottom, RegionCoordZ::Back, pKernel); - diBuilder3D->setDispatchGeometry(RegionCoordX::Right, RegionCoordY::Bottom, RegionCoordZ::Back, Vec3(256, 256, 256), Vec3(16, 16, 16), Vec3(0, 0, 0)); + diBuilder3D->setKernel(RegionCoordX::right, RegionCoordY::bottom, RegionCoordZ::back, pKernel); + diBuilder3D->setDispatchGeometry(RegionCoordX::right, RegionCoordY::bottom, RegionCoordZ::back, Vec3(256, 256, 256), Vec3(16, 16, 16), Vec3(0, 0, 0)); MultiDispatchInfo mdi3D; diBuilder3D->bake(mdi3D); @@ -325,13 +325,13 @@ TEST_F(DispatchInfoBuilderTest, GivenSplitWhenCheckingIfBuiltinThenReturnTrue) { } TEST_F(DispatchInfoBuilderTest, GivenNoSplitWhenGettingWalkerInfoThenCorrectValuesAreReturned) { - DispatchInfoBuilder *diBuilder1D = new DispatchInfoBuilder(*pClDevice); + DispatchInfoBuilder *diBuilder1D = new DispatchInfoBuilder(*pClDevice); ASSERT_NE(nullptr, diBuilder1D); // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks) - DispatchInfoBuilder *diBuilder2D = new DispatchInfoBuilder(*pClDevice); + DispatchInfoBuilder *diBuilder2D = new DispatchInfoBuilder(*pClDevice); ASSERT_NE(nullptr, diBuilder2D); // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks) - DispatchInfoBuilder *diBuilder3D = new DispatchInfoBuilder(*pClDevice); + DispatchInfoBuilder *diBuilder3D = new DispatchInfoBuilder(*pClDevice); ASSERT_NE(nullptr, diBuilder3D); // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks) // 1D @@ -436,13 +436,13 @@ TEST_F(DispatchInfoBuilderTest, GivenNoSplitWhenGettingWalkerInfoThenCorrectValu } TEST_F(DispatchInfoBuilderTest, GivenSplitWhenGettingWalkerInfoThenCorrectValuesAreReturned) { - DispatchInfoBuilder *diBuilder1D = new DispatchInfoBuilder(*pClDevice); + DispatchInfoBuilder *diBuilder1D = new DispatchInfoBuilder(*pClDevice); ASSERT_NE(nullptr, diBuilder1D); // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks) - DispatchInfoBuilder *diBuilder2D = new DispatchInfoBuilder(*pClDevice); + DispatchInfoBuilder *diBuilder2D = new DispatchInfoBuilder(*pClDevice); ASSERT_NE(nullptr, diBuilder2D); // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks) - DispatchInfoBuilder *diBuilder3D = new DispatchInfoBuilder(*pClDevice); + DispatchInfoBuilder *diBuilder3D = new DispatchInfoBuilder(*pClDevice); ASSERT_NE(nullptr, diBuilder3D); // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks) // 1D @@ -727,7 +727,7 @@ TEST_F(DispatchInfoBuilderTest, GivenSplitWhenGettingWalkerInfoThenCorrectValues } TEST_F(DispatchInfoBuilderTest, GivenSplit1dWhenSettingDispatchGeometryThenMdiSizeIsCorrect) { - DispatchInfoBuilder *diBuilder = new DispatchInfoBuilder(*pClDevice); + DispatchInfoBuilder *diBuilder = new DispatchInfoBuilder(*pClDevice); ASSERT_NE(nullptr, diBuilder); // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks) diBuilder->setDispatchGeometry(Vec3(0, 0, 0), Vec3(2, 0, 0), Vec3(0, 0, 0)); @@ -749,7 +749,7 @@ TEST_F(DispatchInfoBuilderTest, GivenSplit1dWhenSettingDispatchGeometryThenMdiSi } TEST_F(DispatchInfoBuilderTest, GivenSplit2dWhenSettingDispatchGeometryThenMdiSizeIsCorrect) { - DispatchInfoBuilder *diBuilder = new DispatchInfoBuilder(*pClDevice); + DispatchInfoBuilder *diBuilder = new DispatchInfoBuilder(*pClDevice); ASSERT_NE(nullptr, diBuilder); // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks) diBuilder->setDispatchGeometry(Vec3(0, 0, 0), Vec3(2, 2, 0), Vec3(0, 0, 0)); @@ -781,7 +781,7 @@ TEST_F(DispatchInfoBuilderTest, GivenSplit2dWhenSettingDispatchGeometryThenMdiSi } TEST_F(DispatchInfoBuilderTest, GivenSplit3dWhenSettingDispatchGeometryThenMdiSizeIsCorrect) { - DispatchInfoBuilder *diBuilder = new DispatchInfoBuilder(*pClDevice); + DispatchInfoBuilder *diBuilder = new DispatchInfoBuilder(*pClDevice); ASSERT_NE(nullptr, diBuilder); // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks) diBuilder->setDispatchGeometry(Vec3(0, 0, 0), Vec3(2, 2, 2), Vec3(0, 0, 0)); @@ -842,7 +842,7 @@ TEST_F(DispatchInfoBuilderTest, WhenSettingKernelArgThenAddressesAreCorrect) { auto val = (cl_mem)buffer; auto pVal = &val; - DispatchInfoBuilder *diBuilder = new DispatchInfoBuilder(*pClDevice); + DispatchInfoBuilder *diBuilder = new DispatchInfoBuilder(*pClDevice); ASSERT_NE(nullptr, diBuilder); // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks) diBuilder->setKernel(pKernel); @@ -873,9 +873,9 @@ TEST_F(DispatchInfoBuilderTest, WhenSettingKernelArgThenAddressesAreCorrect) { } TEST_F(DispatchInfoBuilderTest, GivenSplitWhenSettingKernelArgThenAddressesAreCorrect) { - DispatchInfoBuilder builder1D(*pClDevice); - DispatchInfoBuilder builder2D(*pClDevice); - DispatchInfoBuilder builder3D(*pClDevice); + DispatchInfoBuilder builder1D(*pClDevice); + DispatchInfoBuilder builder2D(*pClDevice); + DispatchInfoBuilder builder3D(*pClDevice); Buffer *buffer = new MockBuffer(); auto val = (cl_mem)buffer; @@ -892,9 +892,9 @@ TEST_F(DispatchInfoBuilderTest, GivenSplitWhenSettingKernelArgThenAddressesAreCo Vec3 elws(16, 16, 16); Vec3 offset(0, 0, 0); - builder1D.setDispatchGeometry(SplitDispatch::RegionCoordX::Left, gws, elws, offset); - builder2D.setDispatchGeometry(SplitDispatch::RegionCoordX::Left, SplitDispatch::RegionCoordY::Top, gws, elws, offset); - builder3D.setDispatchGeometry(SplitDispatch::RegionCoordX::Left, SplitDispatch::RegionCoordY::Top, SplitDispatch::RegionCoordZ::Front, gws, elws, offset); + builder1D.setDispatchGeometry(SplitDispatch::RegionCoordX::left, gws, elws, offset); + builder2D.setDispatchGeometry(SplitDispatch::RegionCoordX::left, SplitDispatch::RegionCoordY::top, gws, elws, offset); + builder3D.setDispatchGeometry(SplitDispatch::RegionCoordX::left, SplitDispatch::RegionCoordY::top, SplitDispatch::RegionCoordZ::front, gws, elws, offset); MultiDispatchInfo mdi1D; MultiDispatchInfo mdi2D; MultiDispatchInfo mdi3D; @@ -905,34 +905,34 @@ TEST_F(DispatchInfoBuilderTest, GivenSplitWhenSettingKernelArgThenAddressesAreCo // Set arg clearCrossThreadData(); - builder1D.setArg(SplitDispatch::RegionCoordX::Left, static_cast(0), sizeof(cl_mem *), pVal); + builder1D.setArg(SplitDispatch::RegionCoordX::left, static_cast(0), sizeof(cl_mem *), pVal); for (auto &dispatchInfo : mdi1D) { EXPECT_EQ(buffer->getCpuAddress(), *reinterpret_cast((dispatchInfo.getKernel()->getCrossThreadData() + 0x10))); } clearCrossThreadData(); - builder2D.setArg(SplitDispatch::RegionCoordX::Left, SplitDispatch::RegionCoordY::Top, static_cast(0), sizeof(cl_mem *), pVal); + builder2D.setArg(SplitDispatch::RegionCoordX::left, SplitDispatch::RegionCoordY::top, static_cast(0), sizeof(cl_mem *), pVal); for (auto &dispatchInfo : mdi2D) { EXPECT_EQ(buffer->getCpuAddress(), *reinterpret_cast((dispatchInfo.getKernel()->getCrossThreadData() + 0x10))); } clearCrossThreadData(); - builder3D.setArg(SplitDispatch::RegionCoordX::Left, SplitDispatch::RegionCoordY::Top, SplitDispatch::RegionCoordZ::Front, static_cast(0), sizeof(cl_mem *), pVal); + builder3D.setArg(SplitDispatch::RegionCoordX::left, SplitDispatch::RegionCoordY::top, SplitDispatch::RegionCoordZ::front, static_cast(0), sizeof(cl_mem *), pVal); for (auto &dispatchInfo : mdi3D) { EXPECT_EQ(buffer->getCpuAddress(), *reinterpret_cast((dispatchInfo.getKernel()->getCrossThreadData() + 0x10))); } // Set arg SVM clearCrossThreadData(); - builder1D.setArgSvm(SplitDispatch::RegionCoordX::Left, 1, sizeof(svmPtr), svmPtr, nullptr, 0u); + builder1D.setArgSvm(SplitDispatch::RegionCoordX::left, 1, sizeof(svmPtr), svmPtr, nullptr, 0u); for (auto &dispatchInfo : mdi1D) { EXPECT_EQ(svmPtr, *(reinterpret_cast(dispatchInfo.getKernel()->getCrossThreadData() + 0x30))); } clearCrossThreadData(); - builder2D.setArgSvm(SplitDispatch::RegionCoordX::Left, SplitDispatch::RegionCoordY::Top, 1, sizeof(svmPtr), svmPtr, nullptr, 0u); + builder2D.setArgSvm(SplitDispatch::RegionCoordX::left, SplitDispatch::RegionCoordY::top, 1, sizeof(svmPtr), svmPtr, nullptr, 0u); for (auto &dispatchInfo : mdi2D) { EXPECT_EQ(svmPtr, *(reinterpret_cast(dispatchInfo.getKernel()->getCrossThreadData() + 0x30))); } clearCrossThreadData(); - builder3D.setArgSvm(SplitDispatch::RegionCoordX::Left, SplitDispatch::RegionCoordY::Top, SplitDispatch::RegionCoordZ::Front, 1, sizeof(svmPtr), svmPtr, nullptr, 0u); + builder3D.setArgSvm(SplitDispatch::RegionCoordX::left, SplitDispatch::RegionCoordY::top, SplitDispatch::RegionCoordZ::front, 1, sizeof(svmPtr), svmPtr, nullptr, 0u); for (auto &dispatchInfo : mdi3D) { EXPECT_EQ(svmPtr, *(reinterpret_cast(dispatchInfo.getKernel()->getCrossThreadData() + 0x30))); } @@ -946,7 +946,7 @@ TEST_F(DispatchInfoBuilderTest, GivenInvalidInputWhenSettingKernelArgThenInvalid auto val = (cl_mem)buffer; auto pVal = &val; - DispatchInfoBuilder *diBuilder = new DispatchInfoBuilder(*pClDevice); + DispatchInfoBuilder *diBuilder = new DispatchInfoBuilder(*pClDevice); ASSERT_NE(nullptr, diBuilder); // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks) diBuilder->setKernel(pKernel); @@ -974,7 +974,7 @@ TEST_F(DispatchInfoBuilderTest, GivenNullKernelWhenSettingKernelArgThenSuccessIs void *svmPtr = &data; MockGraphicsAllocation svmAlloc(svmPtr, 128); - DispatchInfoBuilder *diBuilder = new DispatchInfoBuilder(*pClDevice); + DispatchInfoBuilder *diBuilder = new DispatchInfoBuilder(*pClDevice); ASSERT_NE(nullptr, diBuilder); // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks) diBuilder->setDispatchGeometry(Vec3(256, 256, 256), Vec3(16, 16, 16), Vec3(0, 0, 0)); @@ -992,7 +992,7 @@ TEST_F(DispatchInfoBuilderTest, GivenNullKernelWhenSettingKernelArgThenSuccessIs TEST_F(DispatchInfoBuilderTest, WhenDimensionIsNotSetThenProperDimensionIsReturned) { MultiDispatchInfo mdi; - auto diBuilder = std::make_unique>(*pClDevice); + auto diBuilder = std::make_unique>(*pClDevice); ASSERT_NE(nullptr, diBuilder); diBuilder->setDispatchGeometry(0u, Vec3(128, 4, 1), Vec3(0, 0, 0), Vec3(0, 0, 0)); @@ -1005,7 +1005,7 @@ TEST_F(DispatchInfoBuilderTest, WhenDimensionIsNotSetThenProperDimensionIsReturn TEST_F(DispatchInfoBuilderTest, WhengDimensionIsNotMatchingGWSThenDimensionPassedAsArgumentIsReturned) { MultiDispatchInfo mdi; - auto diBuilder = std::make_unique>(*pClDevice); + auto diBuilder = std::make_unique>(*pClDevice); ASSERT_NE(nullptr, diBuilder); diBuilder->setDispatchGeometry(2u, Vec3(128, 1, 1), Vec3(0, 0, 0), Vec3(0, 0, 0)); diff --git a/opencl/test/unit_test/mem_obj/buffer_tests.cpp b/opencl/test/unit_test/mem_obj/buffer_tests.cpp index 5eedd46a63..6ebbe1abf8 100644 --- a/opencl/test/unit_test/mem_obj/buffer_tests.cpp +++ b/opencl/test/unit_test/mem_obj/buffer_tests.cpp @@ -1842,7 +1842,7 @@ using BufferCreateTests = testing::Test; HWTEST_F(BufferCreateTests, givenClMemCopyHostPointerPassedToBufferCreateWhenAllocationIsNotInSystemMemoryPoolAndCopyOnCpuEnabledThenAllocationIsWrittenUsingLockedPointerIfAllowed) { DebugManagerStateRestore restorer; - debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::CpuAccessAllowed)); + debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::cpuAccessAllowed)); auto executionEnvironment = new MockExecutionEnvironment(defaultHwInfo.get()); auto memoryManager = new MockMemoryManager(true, *executionEnvironment); @@ -1930,7 +1930,7 @@ HWTEST_F(BufferCreateTests, givenClMemCopyHostPointerPassedToBufferCreateWhenAll { // local memory cpu access disallowed -> cpu copy disallowed DebugManagerStateRestore subTestRestorer; - debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::CpuAccessDisallowed)); + debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::cpuAccessDisallowed)); cl_int retVal; cl_mem_flags flags = CL_MEM_READ_WRITE | CL_MEM_COPY_HOST_PTR; auto writeBufferCounter = commandQueue->writeBufferCounter; diff --git a/opencl/test/unit_test/mem_obj/linux/buffer_linux_tests.cpp b/opencl/test/unit_test/mem_obj/linux/buffer_linux_tests.cpp index d9cf9ed667..9b66b6fb0b 100644 --- a/opencl/test/unit_test/mem_obj/linux/buffer_linux_tests.cpp +++ b/opencl/test/unit_test/mem_obj/linux/buffer_linux_tests.cpp @@ -147,7 +147,7 @@ using BufferCreateLinuxTests = ::testing::Test; HWTEST_F(BufferCreateLinuxTests, givenClMemCopyHostPointerPassedToBufferCreateWhenCpuCopyAllowedThenLockResourceAndWriteBufferCorrectlyCalled) { DebugManagerStateRestore restorer; - debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::CpuAccessAllowed)); + debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::cpuAccessAllowed)); auto executionEnvironment = new MockExecutionEnvironment(defaultHwInfo.get()); auto memoryManager = new MockMemoryManager(true, *executionEnvironment); @@ -188,7 +188,7 @@ HWTEST_F(BufferCreateLinuxTests, givenClMemCopyHostPointerPassedToBufferCreateWh HWTEST_F(BufferCreateLinuxTests, givenClMemCopyHostPointerPassedToBufferCreateWhenCpuCopyDisAllowedThenLockResourceAndWriteBufferCorrectlyCalled) { DebugManagerStateRestore restorer; - debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::CpuAccessAllowed)); + debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::cpuAccessAllowed)); auto executionEnvironment = new MockExecutionEnvironment(defaultHwInfo.get()); auto memoryManager = new MockMemoryManager(true, *executionEnvironment); diff --git a/opencl/test/unit_test/mem_obj/windows/buffer_windows_tests.cpp b/opencl/test/unit_test/mem_obj/windows/buffer_windows_tests.cpp index 9f664270fc..0e780ea634 100644 --- a/opencl/test/unit_test/mem_obj/windows/buffer_windows_tests.cpp +++ b/opencl/test/unit_test/mem_obj/windows/buffer_windows_tests.cpp @@ -146,7 +146,7 @@ using BufferCreateWindowsTests = testing::Test; HWTEST_F(BufferCreateWindowsTests, givenClMemCopyHostPointerPassedToBufferCreateWhenCpuCopyAllowedThenLockResourceAndWriteBufferCorrectlyCalled) { DebugManagerStateRestore restorer; - debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::CpuAccessAllowed)); + debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::cpuAccessAllowed)); auto executionEnvironment = new MockExecutionEnvironment(defaultHwInfo.get()); auto memoryManager = new MockMemoryManager(true, *executionEnvironment); @@ -188,7 +188,7 @@ HWTEST_F(BufferCreateWindowsTests, givenClMemCopyHostPointerPassedToBufferCreate HWTEST_F(BufferCreateWindowsTests, givenClMemCopyHostPointerPassedToBufferCreateWhenCpuCopyDisAllowedThenLockResourceAndWriteBufferCorrectlyCalled) { DebugManagerStateRestore restorer; - debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::CpuAccessAllowed)); + debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::cpuAccessAllowed)); auto executionEnvironment = new MockExecutionEnvironment(defaultHwInfo.get()); auto memoryManager = new MockMemoryManager(true, *executionEnvironment); diff --git a/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp b/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp index 667ba91b3d..693de083f3 100644 --- a/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp +++ b/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp @@ -1130,7 +1130,7 @@ TEST(UnifiedSharedMemoryTransferCalls, givenDeviceUsmAllocationWhenPtrIsUsedForT TEST(UnifiedSharedMemoryTransferCalls, givenHostUsmAllocationWhenPtrIsUsedForTransferCallsThenCPUPathIsChoosen) { DebugManagerStateRestore restorer; debugManager.flags.EnableLocalMemory.set(false); - debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::Default)); + debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::defaultMode)); MockContext mockContext; cl_context clContext = &mockContext; diff --git a/opencl/test/unit_test/program/printf_handler_tests.cpp b/opencl/test/unit_test/program/printf_handler_tests.cpp index 04810f9dcd..e6337ab9de 100644 --- a/opencl/test/unit_test/program/printf_handler_tests.cpp +++ b/opencl/test/unit_test/program/printf_handler_tests.cpp @@ -200,7 +200,7 @@ HWTEST_F(PrintfHandlerTests, givenDisallowedLocalMemoryCpuAccessWhenPrintEnqueue hwInfo.capabilityTable.blitterOperationsSupported = true; DebugManagerStateRestore restore; - debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::CpuAccessDisallowed)); + debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(LocalMemoryAccessMode::cpuAccessDisallowed)); debugManager.flags.EnableLocalMemory.set(1); auto device = std::make_unique(MockDevice::createWithNewExecutionEnvironment(&hwInfo)); @@ -351,9 +351,9 @@ TEST_F(PrintfHandlerTests, GivenAllocationInLocalMemoryWhichRequiresBlitterWhenP &BlitHelperFunctions::blitMemoryToAllocation, mockBlitMemoryToAllocation}; LocalMemoryAccessMode localMemoryAccessModes[] = { - LocalMemoryAccessMode::Default, - LocalMemoryAccessMode::CpuAccessAllowed, - LocalMemoryAccessMode::CpuAccessDisallowed}; + LocalMemoryAccessMode::defaultMode, + LocalMemoryAccessMode::cpuAccessAllowed, + LocalMemoryAccessMode::cpuAccessDisallowed}; for (auto localMemoryAccessMode : localMemoryAccessModes) { debugManager.flags.ForceLocalMemoryAccessMode.set(static_cast(localMemoryAccessMode)); @@ -375,7 +375,7 @@ TEST_F(PrintfHandlerTests, GivenAllocationInLocalMemoryWhichRequiresBlitterWhenP printfHandler->prepareDispatch(multiDispatchInfo); if (printfHandler->getSurface()->isAllocatedInLocalMemoryPool() && - (localMemoryAccessMode == LocalMemoryAccessMode::CpuAccessDisallowed)) { + (localMemoryAccessMode == LocalMemoryAccessMode::cpuAccessDisallowed)) { expectedBlitsCount++; } EXPECT_EQ(expectedBlitsCount, blitsCounter); diff --git a/shared/source/aub/aub_subcapture.cpp b/shared/source/aub/aub_subcapture.cpp index 12289db2a9..51c1c0625c 100644 --- a/shared/source/aub/aub_subcapture.cpp +++ b/shared/source/aub/aub_subcapture.cpp @@ -46,10 +46,10 @@ AubSubCaptureStatus AubSubCaptureManager::checkAndActivateSubCapture(const std:: subCaptureIsActive = false; switch (subCaptureCommon.subCaptureMode) { - case SubCaptureMode::Toggle: + case SubCaptureMode::toggle: subCaptureIsActive = isSubCaptureToggleActive(); break; - case SubCaptureMode::Filter: + case SubCaptureMode::filter: subCaptureIsActive = isSubCaptureFilterActive(kernelName); break; default: @@ -79,13 +79,13 @@ const std::string &AubSubCaptureManager::getSubCaptureFileName(const std::string } switch (subCaptureCommon.subCaptureMode) { - case SubCaptureMode::Filter: + case SubCaptureMode::filter: if (currentFileName.empty()) { currentFileName = generateFilterFileName(); useToggleFileName = false; } break; - case SubCaptureMode::Toggle: + case SubCaptureMode::toggle: if (currentFileName.empty()) { currentFileName = generateToggleFileName(kernelName); useToggleFileName = false; diff --git a/shared/source/aub/aub_subcapture.h b/shared/source/aub/aub_subcapture.h index 9f572edd2e..743e52c788 100644 --- a/shared/source/aub/aub_subcapture.h +++ b/shared/source/aub/aub_subcapture.h @@ -20,10 +20,10 @@ class SettingsReader; class AubSubCaptureCommon { public: enum class SubCaptureMode { - Off = 0, // subcapture off - Filter, // subcapture kernel specified by filter (static regkey) - Toggle // toggle subcapture on/off (dynamic regkey) - } subCaptureMode = SubCaptureMode::Off; + off = 0, // subcapture off + filter, // subcapture kernel specified by filter (static regkey) + toggle // toggle subcapture on/off (dynamic regkey) + } subCaptureMode = SubCaptureMode::off; struct SubCaptureFilter { std::string dumpKernelName = ""; @@ -47,7 +47,7 @@ class AubSubCaptureManager { using SubCaptureFilter = AubSubCaptureCommon::SubCaptureFilter; inline bool isSubCaptureMode() const { - return subCaptureCommon.subCaptureMode > SubCaptureMode::Off; + return subCaptureCommon.subCaptureMode > SubCaptureMode::off; } bool isSubCaptureEnabled() const; 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 c644ef6f3c..1ef0669ac7 100644 --- a/shared/source/command_stream/tbx_command_stream_receiver_hw.inl +++ b/shared/source/command_stream/tbx_command_stream_receiver_hw.inl @@ -187,7 +187,7 @@ CommandStreamReceiver *TbxCommandStreamReceiverHw::create(const std:: auto subCaptureCommon = aubCenter->getSubCaptureCommon(); UNRECOVERABLE_IF(nullptr == subCaptureCommon); - if (subCaptureCommon->subCaptureMode > AubSubCaptureManager::SubCaptureMode::Off) { + if (subCaptureCommon->subCaptureMode > AubSubCaptureManager::SubCaptureMode::off) { csr->subCaptureManager = std::make_unique(fullName, *subCaptureCommon, ApiSpecificConfig::getRegistryPath()); } diff --git a/shared/source/direct_submission/windows/wddm_direct_submission.inl b/shared/source/direct_submission/windows/wddm_direct_submission.inl index f7cf97e2a6..b9c8fcb30d 100644 --- a/shared/source/direct_submission/windows/wddm_direct_submission.inl +++ b/shared/source/direct_submission/windows/wddm_direct_submission.inl @@ -86,7 +86,7 @@ void WddmDirectSubmission::ensureRingCompletion() { template bool WddmDirectSubmission::allocateOsResources() { // for now only WDDM2.0 - UNRECOVERABLE_IF(wddm->getWddmVersion() != WddmVersion::WDDM_2_0); + UNRECOVERABLE_IF(wddm->getWddmVersion() != WddmVersion::wddm20); bool ret = wddm->getWddmInterface()->createMonitoredFence(ringFence); ringFence.currentFenceValue = 1; diff --git a/shared/source/gen12lp/gfx_core_helper_gen12lp.cpp b/shared/source/gen12lp/gfx_core_helper_gen12lp.cpp index f1e7979e60..a2ad03ca9c 100644 --- a/shared/source/gen12lp/gfx_core_helper_gen12lp.cpp +++ b/shared/source/gen12lp/gfx_core_helper_gen12lp.cpp @@ -194,7 +194,7 @@ template <> void GfxCoreHelperHw::setExtraAllocationData(AllocationData &allocationData, const AllocationProperties &properties, const RootDeviceEnvironment &rootDeviceEnvironment) const { auto &productHelper = rootDeviceEnvironment.getHelper(); auto &hwInfo = *rootDeviceEnvironment.getHardwareInfo(); - if (productHelper.getLocalMemoryAccessMode(hwInfo) == LocalMemoryAccessMode::CpuAccessDisallowed) { + if (productHelper.getLocalMemoryAccessMode(hwInfo) == LocalMemoryAccessMode::cpuAccessDisallowed) { if (GraphicsAllocation::isCpuAccessRequired(properties.allocationType)) { allocationData.flags.useSystemMemory = true; } diff --git a/shared/source/helpers/blit_commands_helper_xehp_and_later.inl b/shared/source/helpers/blit_commands_helper_xehp_and_later.inl index b2cd223c2f..81cc0fdb5d 100644 --- a/shared/source/helpers/blit_commands_helper_xehp_and_later.inl +++ b/shared/source/helpers/blit_commands_helper_xehp_and_later.inl @@ -17,7 +17,7 @@ template uint64_t BlitCommandsHelper::getMaxBlitWidthOverride(const RootDeviceEnvironment &rootDeviceEnvironment) { auto &hwInfo = *rootDeviceEnvironment.getHardwareInfo(); const auto &productHelper = rootDeviceEnvironment.getHelper(); - if (productHelper.getLocalMemoryAccessMode(hwInfo) == LocalMemoryAccessMode::CpuAccessAllowed) { + if (productHelper.getLocalMemoryAccessMode(hwInfo) == LocalMemoryAccessMode::cpuAccessAllowed) { return 1024; } return 0; @@ -27,7 +27,7 @@ template uint64_t BlitCommandsHelper::getMaxBlitHeightOverride(const RootDeviceEnvironment &rootDeviceEnvironment, bool isSystemMemoryPoolUsed) { auto &hwInfo = *rootDeviceEnvironment.getHardwareInfo(); const auto &productHelper = rootDeviceEnvironment.getHelper(); - if (productHelper.getLocalMemoryAccessMode(hwInfo) == LocalMemoryAccessMode::CpuAccessAllowed) { + if (productHelper.getLocalMemoryAccessMode(hwInfo) == LocalMemoryAccessMode::cpuAccessAllowed) { return 1024; } return 0; diff --git a/shared/source/helpers/local_memory_access_modes.h b/shared/source/helpers/local_memory_access_modes.h index c1381c4f5e..c37a457b4a 100644 --- a/shared/source/helpers/local_memory_access_modes.h +++ b/shared/source/helpers/local_memory_access_modes.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,9 +10,9 @@ namespace NEO { enum class LocalMemoryAccessMode { - Default = 0, - CpuAccessAllowed = 1, - CpuAccessDisallowed = 3 + defaultMode = 0, + cpuAccessAllowed = 1, + cpuAccessDisallowed = 3 }; } // namespace NEO diff --git a/shared/source/os_interface/linux/drm_buffer_object.cpp b/shared/source/os_interface/linux/drm_buffer_object.cpp index 97fa7965e2..44b1b521ef 100644 --- a/shared/source/os_interface/linux/drm_buffer_object.cpp +++ b/shared/source/os_interface/linux/drm_buffer_object.cpp @@ -35,7 +35,7 @@ BufferObjectHandleWrapper BufferObjectHandleWrapper::acquireSharedOwnership() { std::lock_guard lock{controlBlock->blockMutex}; controlBlock->refCount++; - return BufferObjectHandleWrapper{boHandle, Ownership::Strong, controlBlock}; + return BufferObjectHandleWrapper{boHandle, Ownership::strong, controlBlock}; } BufferObjectHandleWrapper BufferObjectHandleWrapper::acquireWeakOwnership() { @@ -46,7 +46,7 @@ BufferObjectHandleWrapper BufferObjectHandleWrapper::acquireWeakOwnership() { std::lock_guard lock{controlBlock->blockMutex}; controlBlock->weakRefCount++; - return BufferObjectHandleWrapper{boHandle, Ownership::Weak, controlBlock}; + return BufferObjectHandleWrapper{boHandle, Ownership::weak, controlBlock}; } BufferObjectHandleWrapper::~BufferObjectHandleWrapper() { @@ -56,7 +56,7 @@ BufferObjectHandleWrapper::~BufferObjectHandleWrapper() { std::unique_lock lock{controlBlock->blockMutex}; - if (ownership == Ownership::Strong) { + if (ownership == Ownership::strong) { controlBlock->refCount--; } else { controlBlock->weakRefCount--; diff --git a/shared/source/os_interface/linux/drm_buffer_object.h b/shared/source/os_interface/linux/drm_buffer_object.h index ce63ae9d25..7c60c9a8a9 100644 --- a/shared/source/os_interface/linux/drm_buffer_object.h +++ b/shared/source/os_interface/linux/drm_buffer_object.h @@ -40,8 +40,8 @@ class BufferObjectHandleWrapper { }; enum class Ownership : std::uint8_t { - Weak = 0, - Strong = 1, + weak = 0, + strong = 1, }; public: @@ -75,7 +75,7 @@ class BufferObjectHandleWrapper { : boHandle{boHandle}, ownership{ownership}, controlBlock{controlBlock} {} int boHandle{}; - Ownership ownership{Ownership::Strong}; + Ownership ownership{Ownership::strong}; ControlBlock *controlBlock{}; }; diff --git a/shared/source/os_interface/product_helper.inl b/shared/source/os_interface/product_helper.inl index cb3395b718..41d3d0a164 100644 --- a/shared/source/os_interface/product_helper.inl +++ b/shared/source/os_interface/product_helper.inl @@ -269,15 +269,15 @@ bool ProductHelperHw::allowCompression(const HardwareInfo &hwInfo) c template LocalMemoryAccessMode ProductHelperHw::getDefaultLocalMemoryAccessMode(const HardwareInfo &hwInfo) const { - return LocalMemoryAccessMode::Default; + return LocalMemoryAccessMode::defaultMode; } template LocalMemoryAccessMode ProductHelperHw::getLocalMemoryAccessMode(const HardwareInfo &hwInfo) const { switch (static_cast(debugManager.flags.ForceLocalMemoryAccessMode.get())) { - case LocalMemoryAccessMode::Default: - case LocalMemoryAccessMode::CpuAccessAllowed: - case LocalMemoryAccessMode::CpuAccessDisallowed: + case LocalMemoryAccessMode::defaultMode: + case LocalMemoryAccessMode::cpuAccessAllowed: + case LocalMemoryAccessMode::cpuAccessDisallowed: return static_cast(debugManager.flags.ForceLocalMemoryAccessMode.get()); } return getDefaultLocalMemoryAccessMode(hwInfo); @@ -509,7 +509,7 @@ bool ProductHelperHw::isBlitCopyRequiredForLocalMemory(const RootDev auto &productHelper = rootDeviceEnvironment.getHelper(); auto &hwInfo = *rootDeviceEnvironment.getHardwareInfo(); return allocation.isAllocatedInLocalMemoryPool() && - (productHelper.getLocalMemoryAccessMode(hwInfo) == LocalMemoryAccessMode::CpuAccessDisallowed || + (productHelper.getLocalMemoryAccessMode(hwInfo) == LocalMemoryAccessMode::cpuAccessDisallowed || !allocation.isAllocationLockable()); } diff --git a/shared/source/os_interface/windows/os_context_win.cpp b/shared/source/os_interface/windows/os_context_win.cpp index dc0afdb4f8..2f24f090e7 100644 --- a/shared/source/os_interface/windows/os_context_win.cpp +++ b/shared/source/os_interface/windows/os_context_win.cpp @@ -96,7 +96,7 @@ bool OsContextWin::isDirectSubmissionSupported() const { auto &productHelper = rootDeviceEnvironment.getHelper(); auto isWSL = rootDeviceEnvironment.isWddmOnLinux(); - return !isWSL && wddm.getWddmVersion() == WddmVersion::WDDM_2_0 && productHelper.isDirectSubmissionSupported(rootDeviceEnvironment.getReleaseHelper()); + return !isWSL && wddm.getWddmVersion() == WddmVersion::wddm20 && productHelper.isDirectSubmissionSupported(rootDeviceEnvironment.getReleaseHelper()); } OsContextWin::~OsContextWin() { diff --git a/shared/source/os_interface/windows/wddm/wddm.cpp b/shared/source/os_interface/windows/wddm/wddm.cpp index 0b3ac69122..623b5e72d7 100644 --- a/shared/source/os_interface/windows/wddm/wddm.cpp +++ b/shared/source/os_interface/windows/wddm/wddm.cpp @@ -133,7 +133,7 @@ bool Wddm::init() { rootDeviceEnvironment.initGmm(); this->rootDeviceEnvironment.getGmmClientContext()->setHandleAllocator(this->hwDeviceId->getUmKmDataTranslator()->createGmmHandleAllocator()); - if (WddmVersion::WDDM_2_3 == getWddmVersion()) { + if (WddmVersion::wddm23 == getWddmVersion()) { wddmInterface = std::make_unique(*this); } else { wddmInterface = std::make_unique(*this); @@ -1310,9 +1310,9 @@ void Wddm::updatePagingFenceValue(uint64_t newPagingFenceValue) { WddmVersion Wddm::getWddmVersion() { if (featureTable->flags.ftrWddmHwQueues) { - return WddmVersion::WDDM_2_3; + return WddmVersion::wddm23; } else { - return WddmVersion::WDDM_2_0; + return WddmVersion::wddm20; } } diff --git a/shared/source/os_interface/windows/wddm/wddm_defs.h b/shared/source/os_interface/windows/wddm/wddm_defs.h index d16412010f..222a9efefd 100644 --- a/shared/source/os_interface/windows/wddm/wddm_defs.h +++ b/shared/source/os_interface/windows/wddm/wddm_defs.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -19,7 +19,7 @@ struct WddmSubmitArguments { }; enum class WddmVersion : uint32_t { - WDDM_2_0 = 0, - WDDM_2_3 + wddm20 = 0, + wddm23 }; } // namespace NEO diff --git a/shared/source/utilities/software_tags.cpp b/shared/source/utilities/software_tags.cpp index 68b3adcdaf..16e6d782d0 100644 --- a/shared/source/utilities/software_tags.cpp +++ b/shared/source/utilities/software_tags.cpp @@ -102,7 +102,7 @@ void KernelNameTag::bxml(std::ostream &os) { os << "\n"; os << " Name of the kernel.\n"; - BaseTag::bxml(os, OpCode::KernelName, sizeof(KernelNameTag), "KERNEL_NAME"); + BaseTag::bxml(os, OpCode::kernelName, sizeof(KernelNameTag), "KERNEL_NAME"); unsigned int stringDWORDSize = kenelNameStrLength / sizeof(uint32_t); os << " \n"; @@ -118,7 +118,7 @@ void ArbitraryStringTag::bxml(std::ostream &os) { os << "\n"; os << " Name of the arbitrary string.\n"; - BaseTag::bxml(os, OpCode::ArbitraryString, sizeof(ArbitraryStringTag), "ARBITRARY_STRING"); + BaseTag::bxml(os, OpCode::arbitraryString, sizeof(ArbitraryStringTag), "ARBITRARY_STRING"); constexpr unsigned int stringDWORDSize = tagStringLength / sizeof(uint32_t); os << " \n"; @@ -134,7 +134,7 @@ void PipeControlReasonTag::bxml(std::ostream &os) { os << "\n"; os << " Reason for why the PIPE_CONTROL was inserted.\n"; - BaseTag::bxml(os, OpCode::PipeControlReason, sizeof(PipeControlReasonTag), "PIPE_CONTROL_REASON"); + BaseTag::bxml(os, OpCode::pipeControlReason, sizeof(PipeControlReasonTag), "PIPE_CONTROL_REASON"); unsigned int stringDWORDSize = reasonStrLength / sizeof(uint32_t); os << " \n"; @@ -150,7 +150,7 @@ void CallNameBeginTag::bxml(std::ostream &os) { os << "\n"; os << " ZE Call where the GPU originated from.\n"; - BaseTag::bxml(os, OpCode::CallNameBegin, sizeof(CallNameBeginTag), "ZE_CALL_NAME_BEGIN"); + BaseTag::bxml(os, OpCode::callNameBegin, sizeof(CallNameBeginTag), "ZE_CALL_NAME_BEGIN"); unsigned int stringDWORDSize = zeCallNameStrLength / sizeof(uint32_t); os << " \n"; @@ -171,7 +171,7 @@ void CallNameEndTag::bxml(std::ostream &os) { os << "\n"; os << " ZE Call where the GPU originated from.\n"; - BaseTag::bxml(os, OpCode::CallNameEnd, sizeof(CallNameEndTag), "ZE_CALL_NAME_END"); + BaseTag::bxml(os, OpCode::callNameEnd, sizeof(CallNameEndTag), "ZE_CALL_NAME_END"); unsigned int stringDWORDSize = zeCallNameStrLength / sizeof(uint32_t); os << " \n"; diff --git a/shared/source/utilities/software_tags.h b/shared/source/utilities/software_tags.h index 5b66777258..5b16e0c2de 100644 --- a/shared/source/utilities/software_tags.h +++ b/shared/source/utilities/software_tags.h @@ -14,22 +14,22 @@ namespace NEO { namespace SWTags { enum class OpCode : uint32_t { - Unknown, - KernelName, - PipeControlReason, - CallNameBegin, - CallNameEnd, - ArbitraryString, + unknown, + kernelName, + pipeControlReason, + callNameBegin, + callNameEnd, + arbitraryString, }; enum class Component : uint32_t { - COMMON = 1 + common = 1 }; struct BXMLHeapInfo { const uint32_t magicNumber = 0xDEB06D0C; const uint32_t heapSize; - const uint32_t component = static_cast(Component::COMMON); + const uint32_t component = static_cast(Component::common); BXMLHeapInfo(size_t size) : heapSize(static_cast(size)) {} @@ -39,7 +39,7 @@ struct BXMLHeapInfo { struct SWTagHeapInfo { const uint32_t magicNumber = 0xDEB06DD1; const uint32_t heapSize; - const uint32_t component = static_cast(Component::COMMON); + const uint32_t component = static_cast(Component::common); SWTagHeapInfo(size_t size) : heapSize(static_cast(size)) {} @@ -50,7 +50,7 @@ struct BaseTag { public: BaseTag(OpCode code, size_t size) : opcode(static_cast(code)), reserved(0), - component(static_cast(Component::COMMON)), + component(static_cast(Component::common)), driverDebug(1), dwordCount(static_cast(size / sizeof(uint32_t) - 2)) {} @@ -87,7 +87,7 @@ struct BaseTag { struct KernelNameTag : public BaseTag { public: KernelNameTag(const char *name, uint32_t callId) - : BaseTag(OpCode::KernelName, sizeof(KernelNameTag)) { + : BaseTag(OpCode::kernelName, sizeof(KernelNameTag)) { strcpy_s(kernelName, kenelNameStrLength, name); } @@ -101,7 +101,7 @@ struct KernelNameTag : public BaseTag { struct ArbitraryStringTag : public BaseTag { public: ArbitraryStringTag(const char *name) - : BaseTag(OpCode::ArbitraryString, sizeof(ArbitraryStringTag)) { + : BaseTag(OpCode::arbitraryString, sizeof(ArbitraryStringTag)) { strcpy_s(arbitraryString, tagStringLength, name); } @@ -115,7 +115,7 @@ struct ArbitraryStringTag : public BaseTag { struct PipeControlReasonTag : public BaseTag { public: PipeControlReasonTag(const char *reason, uint32_t callId) - : BaseTag(OpCode::PipeControlReason, sizeof(PipeControlReasonTag)) { + : BaseTag(OpCode::pipeControlReason, sizeof(PipeControlReasonTag)) { strcpy_s(reasonString, reasonStrLength, reason); } @@ -129,7 +129,7 @@ struct PipeControlReasonTag : public BaseTag { struct CallNameBeginTag : public BaseTag { public: CallNameBeginTag(const char *name, uint32_t callId) - : BaseTag(OpCode::CallNameBegin, sizeof(CallNameBeginTag)) { + : BaseTag(OpCode::callNameBegin, sizeof(CallNameBeginTag)) { strcpy_s(zeCallName, zeCallNameStrLength, name); snprintf(zeCallId, sizeof(uint32_t), "%x", callId); } @@ -145,7 +145,7 @@ struct CallNameBeginTag : public BaseTag { struct CallNameEndTag : public BaseTag { public: CallNameEndTag(const char *name, uint32_t callId) - : BaseTag(OpCode::CallNameEnd, sizeof(CallNameEndTag)) { + : BaseTag(OpCode::callNameEnd, sizeof(CallNameEndTag)) { strcpy_s(zeCallName, zeCallNameStrLength, name); snprintf(zeCallId, sizeof(uint32_t), "%x", callId); } diff --git a/shared/source/xe_hpc_core/pvc/os_agnostic_product_helper_pvc.inl b/shared/source/xe_hpc_core/pvc/os_agnostic_product_helper_pvc.inl index 974c947118..b45ba2a589 100644 --- a/shared/source/xe_hpc_core/pvc/os_agnostic_product_helper_pvc.inl +++ b/shared/source/xe_hpc_core/pvc/os_agnostic_product_helper_pvc.inl @@ -118,7 +118,7 @@ bool ProductHelperHw::isBlitCopyRequiredForLocalMemory(const RootDev } auto &hwInfo = *rootDeviceEnvironment.getHardwareInfo(); - if (getLocalMemoryAccessMode(hwInfo) == LocalMemoryAccessMode::CpuAccessDisallowed) { + if (getLocalMemoryAccessMode(hwInfo) == LocalMemoryAccessMode::cpuAccessDisallowed) { // Regular L3 WA return true; } diff --git a/shared/source/xe_hpg_core/dg2/os_agnostic_product_helper_dg2.inl b/shared/source/xe_hpg_core/dg2/os_agnostic_product_helper_dg2.inl index c898182a1d..fbd72f7494 100644 --- a/shared/source/xe_hpg_core/dg2/os_agnostic_product_helper_dg2.inl +++ b/shared/source/xe_hpg_core/dg2/os_agnostic_product_helper_dg2.inl @@ -122,9 +122,9 @@ bool ProductHelperHw::allowCompression(const HardwareInfo &hwInfo) c template <> LocalMemoryAccessMode ProductHelperHw::getDefaultLocalMemoryAccessMode(const HardwareInfo &hwInfo) const { if (DG2::isG10(hwInfo) && GfxCoreHelper::isWorkaroundRequired(REVISION_A0, REVISION_B, hwInfo, *this)) { - return LocalMemoryAccessMode::CpuAccessDisallowed; + return LocalMemoryAccessMode::cpuAccessDisallowed; } - return LocalMemoryAccessMode::Default; + return LocalMemoryAccessMode::defaultMode; } template <> diff --git a/shared/source/xe_hpg_core/gfx_core_helper_xe_hpg_core.cpp b/shared/source/xe_hpg_core/gfx_core_helper_xe_hpg_core.cpp index 2ada34c473..95464f490d 100644 --- a/shared/source/xe_hpg_core/gfx_core_helper_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/gfx_core_helper_xe_hpg_core.cpp @@ -141,7 +141,7 @@ void GfxCoreHelperHw::setExtraAllocationData(AllocationData &allocationD auto &hwInfo = *rootDeviceEnvironment.getHardwareInfo(); auto &productHelper = rootDeviceEnvironment.getHelper(); - if (LocalMemoryAccessMode::CpuAccessDisallowed == productHelper.getLocalMemoryAccessMode(hwInfo)) { + if (LocalMemoryAccessMode::cpuAccessDisallowed == productHelper.getLocalMemoryAccessMode(hwInfo)) { if (properties.allocationType == AllocationType::linearStream || properties.allocationType == AllocationType::internalHeap || properties.allocationType == AllocationType::printfSurface || diff --git a/shared/test/common/mocks/mock_modules_zebin.cpp b/shared/test/common/mocks/mock_modules_zebin.cpp index f250f874d4..9adf4266b2 100644 --- a/shared/test/common/mocks/mock_modules_zebin.cpp +++ b/shared/test/common/mocks/mock_modules_zebin.cpp @@ -201,16 +201,16 @@ ZebinWithL0TestCommonModule::ZebinWithL0TestCommonModule(const NEO::HardwareInfo const uint8_t testAdditionalSectionsData[0x10] = {0u}; for (const auto &s : additionalSections) { switch (s) { - case appendElfAdditionalSection::SPIRV: + case appendElfAdditionalSection::spirv: elfEncoder.appendSection(NEO::Zebin::Elf::SHT_ZEBIN_SPIRV, NEO::Zebin::Elf::SectionNames::spv, testAdditionalSectionsData); break; - case appendElfAdditionalSection::GLOBAL: + case appendElfAdditionalSection::global: elfEncoder.appendSection(NEO::Elf::SHT_PROGBITS, NEO::Zebin::Elf::SectionNames::dataGlobal, testAdditionalSectionsData); break; - case appendElfAdditionalSection::CONSTANT: + case appendElfAdditionalSection::constant: elfEncoder.appendSection(NEO::Elf::SHT_PROGBITS, NEO::Zebin::Elf::SectionNames::dataConst, testAdditionalSectionsData); break; - case appendElfAdditionalSection::CONSTANT_STRING: + case appendElfAdditionalSection::constantString: elfEncoder.appendSection(NEO::Elf::SHT_PROGBITS, NEO::Zebin::Elf::SectionNames::dataConstString.str(), testAdditionalSectionsData); break; default: diff --git a/shared/test/common/mocks/mock_modules_zebin.h b/shared/test/common/mocks/mock_modules_zebin.h index 9b7319d746..46dd61a77f 100644 --- a/shared/test/common/mocks/mock_modules_zebin.h +++ b/shared/test/common/mocks/mock_modules_zebin.h @@ -28,11 +28,11 @@ inline std::string versionToString(NEO::Zebin::ZeInfo::Types::Version version) { namespace ZebinTestData { enum class appendElfAdditionalSection { - NONE, - SPIRV, - GLOBAL, - CONSTANT, - CONSTANT_STRING + none, + spirv, + global, + constant, + constantString }; template @@ -338,4 +338,4 @@ size_t writeElfNote(ArrayRef dst, ArrayRef desc, NEO::Co size_t writeIntelGTNote(ArrayRef dst, NEO::Zebin::Elf::IntelGTSectionType sectionType, ArrayRef desc); std::vector createIntelGTNoteSection(NEO::ConstStringRef version, AOT::PRODUCT_CONFIG productConfig); std::vector createIntelGTNoteSection(PRODUCT_FAMILY productFamily, GFXCORE_FAMILY coreFamily, NEO::Zebin::Elf::ZebinTargetFlags flags, NEO::ConstStringRef version); -} // namespace ZebinTestData \ No newline at end of file +} // namespace ZebinTestData diff --git a/shared/test/common/mocks/mock_product_helper.cpp b/shared/test/common/mocks/mock_product_helper.cpp index 98229ad192..b3526f4764 100644 --- a/shared/test/common/mocks/mock_product_helper.cpp +++ b/shared/test/common/mocks/mock_product_helper.cpp @@ -173,12 +173,12 @@ bool ProductHelperHw::isDirectSubmissionConstantCacheInvalidationN template <> LocalMemoryAccessMode ProductHelperHw::getDefaultLocalMemoryAccessMode(const HardwareInfo &hwInfo) const { - return LocalMemoryAccessMode::Default; + return LocalMemoryAccessMode::defaultMode; } template <> LocalMemoryAccessMode ProductHelperHw::getLocalMemoryAccessMode(const HardwareInfo &hwInfo) const { - return LocalMemoryAccessMode::Default; + return LocalMemoryAccessMode::defaultMode; } template <> diff --git a/shared/test/unit_test/aub/aub_center_tests.cpp b/shared/test/unit_test/aub/aub_center_tests.cpp index 194a2f5cc5..bc16c579d8 100644 --- a/shared/test/unit_test/aub/aub_center_tests.cpp +++ b/shared/test/unit_test/aub/aub_center_tests.cpp @@ -161,7 +161,7 @@ TEST_F(AubCenterTests, GivenSetCommandStreamReceiverFlagSetWhenAubManagerIsCreat } TEST_F(AubCenterTests, GivenAubCenterInSubCaptureModeWhenItIsCreatedWithoutDebugFilterSettingsThenItInitializesSubCaptureFiltersWithDefaults) { - debugManager.flags.AUBDumpSubCaptureMode.set(static_cast(AubSubCaptureManager::SubCaptureMode::Filter)); + debugManager.flags.AUBDumpSubCaptureMode.set(static_cast(AubSubCaptureManager::SubCaptureMode::filter)); MockAubCenter aubCenter(rootDeviceEnvironment, false, "", CommandStreamReceiverType::CSR_AUB); auto subCaptureCommon = aubCenter.getSubCaptureCommon(); @@ -173,7 +173,7 @@ TEST_F(AubCenterTests, GivenAubCenterInSubCaptureModeWhenItIsCreatedWithoutDebug } TEST_F(AubCenterTests, GivenAubCenterInSubCaptureModeWhenItIsCreatedWithDebugFilterSettingsThenItInitializesSubCaptureFiltersWithDebugFilterSettings) { - debugManager.flags.AUBDumpSubCaptureMode.set(static_cast(AubSubCaptureManager::SubCaptureMode::Filter)); + debugManager.flags.AUBDumpSubCaptureMode.set(static_cast(AubSubCaptureManager::SubCaptureMode::filter)); debugManager.flags.AUBDumpFilterKernelStartIdx.set(10); debugManager.flags.AUBDumpFilterKernelEndIdx.set(100); debugManager.flags.AUBDumpFilterKernelName.set("kernel_name"); diff --git a/shared/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp b/shared/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp index 7f972bcd26..a5c8abfdbe 100644 --- a/shared/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp +++ b/shared/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp @@ -219,7 +219,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCsrWhenLowPriorityOsContextIsSet HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverInSubCaptureModeWhenItIsCreatedThenFileIsNotCreated) { DebugManagerStateRestore stateRestore; - debugManager.flags.AUBDumpSubCaptureMode.set(static_cast(AubSubCaptureManager::SubCaptureMode::Filter)); + debugManager.flags.AUBDumpSubCaptureMode.set(static_cast(AubSubCaptureManager::SubCaptureMode::filter)); std::string fileName = "file_name.aub"; MockExecutionEnvironment executionEnvironment(defaultHwInfo.get()); executionEnvironment.initializeMemoryManager(); @@ -308,7 +308,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverInSubCaptur auto aubExecutionEnvironment = getEnvironment>(true, true, true); auto aubCsr = aubExecutionEnvironment->template getCsr>(); - aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; + aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::toggle; aubSubCaptureManagerMock->disableSubCapture(); aubCsr->subCaptureManager = std::unique_ptr(aubSubCaptureManagerMock); ASSERT_FALSE(aubCsr->subCaptureManager->isSubCaptureEnabled()); @@ -328,7 +328,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverInSubCaptur auto aubCsr = aubExecutionEnvironment->template getCsr>(); aubCsr->initializeEngine(); - aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; + aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::toggle; aubSubCaptureManagerMock->setSubCaptureToggleActive(true); aubSubCaptureManagerMock->checkAndActivateSubCapture("kernelName"); aubCsr->subCaptureManager = std::unique_ptr(aubSubCaptureManagerMock); @@ -348,7 +348,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverInSubCaptur auto aubCsr = aubExecutionEnvironment->template getCsr>(); LinearStream cs(aubExecutionEnvironment->commandBuffer); - aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; + aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::toggle; aubSubCaptureManagerMock->disableSubCapture(); aubCsr->subCaptureManager = std::unique_ptr(aubSubCaptureManagerMock); ASSERT_FALSE(aubCsr->subCaptureManager->isSubCaptureEnabled()); @@ -459,7 +459,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverInStandalon auto aubCsr = aubExecutionEnvironment->template getCsr>(); LinearStream cs(aubExecutionEnvironment->commandBuffer); - aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; + aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::toggle; aubSubCaptureManagerMock->disableSubCapture(); aubCsr->subCaptureManager = std::unique_ptr(aubSubCaptureManagerMock); ASSERT_FALSE(aubCsr->subCaptureManager->isSubCaptureEnabled()); @@ -486,7 +486,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverInNonStanda auto aubCsr = aubExecutionEnvironment->template getCsr>(); LinearStream cs(aubExecutionEnvironment->commandBuffer); - aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; + aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::toggle; aubSubCaptureManagerMock->disableSubCapture(); aubCsr->subCaptureManager = std::unique_ptr(aubSubCaptureManagerMock); ASSERT_FALSE(aubCsr->subCaptureManager->isSubCaptureEnabled()); @@ -514,7 +514,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverInSubCaptur auto aubCsr = aubExecutionEnvironment->template getCsr>(); LinearStream cs(aubExecutionEnvironment->commandBuffer); - aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; + aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::toggle; aubSubCaptureManagerMock->setSubCaptureToggleActive(true); aubSubCaptureManagerMock->checkAndActivateSubCapture("kernelName"); aubCsr->subCaptureManager = std::unique_ptr(aubSubCaptureManagerMock); @@ -538,7 +538,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverInSubCaptur auto aubCsr = aubExecutionEnvironment->template getCsr>(); LinearStream cs(aubExecutionEnvironment->commandBuffer); - aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; + aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::toggle; aubSubCaptureManagerMock->setSubCaptureToggleActive(true); aubSubCaptureManagerMock->checkAndActivateSubCapture("kernelName"); aubCsr->subCaptureManager = std::unique_ptr(aubSubCaptureManagerMock); @@ -661,7 +661,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverInStandalon auto commandBuffer = aubExecutionEnvironment->commandBuffer; LinearStream cs(commandBuffer); - aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; + aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::toggle; aubSubCaptureManagerMock->setSubCaptureToggleActive(true); aubSubCaptureManagerMock->checkAndActivateSubCapture("kernelName"); aubCsr->subCaptureManager = std::unique_ptr(aubSubCaptureManagerMock); @@ -912,7 +912,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverInSubCaptur AubSubCaptureCommon aubSubCaptureCommon; auto subCaptureManagerMock = new AubSubCaptureManagerMock("", aubSubCaptureCommon); - aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; + aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::toggle; subCaptureManagerMock->setSubCaptureIsActive(false); subCaptureManagerMock->setSubCaptureToggleActive(true); aubCsr->subCaptureManager = std::unique_ptr(subCaptureManagerMock); @@ -930,7 +930,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverInSubCaptur AubSubCaptureCommon aubSubCaptureCommon; auto subCaptureManagerMock = new AubSubCaptureManagerMock("", aubSubCaptureCommon); - aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; + aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::toggle; subCaptureManagerMock->setSubCaptureIsActive(false); subCaptureManagerMock->setSubCaptureToggleActive(true); aubCsr->subCaptureManager = std::unique_ptr(subCaptureManagerMock); @@ -953,7 +953,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverInSubCaptur AubSubCaptureCommon aubSubCaptureCommon; auto subCaptureManagerMock = new AubSubCaptureManagerMock("", aubSubCaptureCommon); - aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; + aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::toggle; subCaptureManagerMock->setSubCaptureIsActive(false); subCaptureManagerMock->setSubCaptureToggleActive(true); subCaptureManagerMock->setToggleFileName(newFileName); @@ -978,7 +978,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverInSubCaptur AubSubCaptureCommon aubSubCaptureCommon; auto subCaptureManagerMock = new AubSubCaptureManagerMock("", aubSubCaptureCommon); - aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; + aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::toggle; subCaptureManagerMock->setSubCaptureIsActive(false); subCaptureManagerMock->setSubCaptureToggleActive(true); subCaptureManagerMock->setToggleFileName(newFileName); @@ -1002,7 +1002,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverInSubCaptur AubSubCaptureCommon aubSubCaptureCommon; auto subCaptureManagerMock = new AubSubCaptureManagerMock("", aubSubCaptureCommon); - aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; + aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::toggle; subCaptureManagerMock->setSubCaptureIsActive(false); subCaptureManagerMock->setSubCaptureToggleActive(true); aubCsr->subCaptureManager = std::unique_ptr(subCaptureManagerMock); @@ -1018,7 +1018,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverInSubCaptur AubSubCaptureCommon aubSubCaptureCommon; auto subCaptureManagerMock = new AubSubCaptureManagerMock("", aubSubCaptureCommon); - aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; + aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::toggle; subCaptureManagerMock->setSubCaptureIsActive(false); subCaptureManagerMock->setSubCaptureToggleActive(true); aubCsr->subCaptureManager = std::unique_ptr(subCaptureManagerMock); @@ -1037,7 +1037,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverInSubCaptur AubSubCaptureCommon aubSubCaptureCommon; auto subCaptureManagerMock = new AubSubCaptureManagerMock("", aubSubCaptureCommon); - aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; + aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::toggle; subCaptureManagerMock->setSubCaptureIsActive(false); subCaptureManagerMock->setSubCaptureToggleActive(false); aubCsr->subCaptureManager = std::unique_ptr(subCaptureManagerMock); @@ -1053,7 +1053,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverInSubCaptur AubSubCaptureCommon aubSubCaptureCommon; auto subCaptureManagerMock = new AubSubCaptureManagerMock("", aubSubCaptureCommon); - aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; + aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::toggle; subCaptureManagerMock->setSubCaptureIsActive(false); subCaptureManagerMock->setSubCaptureToggleActive(true); aubCsr->subCaptureManager = std::unique_ptr(subCaptureManagerMock); @@ -1069,7 +1069,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverInStandalon AubSubCaptureCommon aubSubCaptureCommon; auto subCaptureManagerMock = new AubSubCaptureManagerMock("", aubSubCaptureCommon); - aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; + aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::toggle; subCaptureManagerMock->setSubCaptureIsActive(false); subCaptureManagerMock->setSubCaptureToggleActive(false); aubCsr->subCaptureManager = std::unique_ptr(subCaptureManagerMock); @@ -1086,7 +1086,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverInStandalon AubSubCaptureCommon aubSubCaptureCommon; auto subCaptureManagerMock = new AubSubCaptureManagerMock("", aubSubCaptureCommon); - aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; + aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::toggle; subCaptureManagerMock->setSubCaptureIsActive(true); subCaptureManagerMock->setSubCaptureToggleActive(true); aubCsr->subCaptureManager = std::unique_ptr(subCaptureManagerMock); @@ -1103,7 +1103,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverInStandalon AubSubCaptureCommon aubSubCaptureCommon; auto subCaptureManagerMock = new AubSubCaptureManagerMock("", aubSubCaptureCommon); - aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; + aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::toggle; subCaptureManagerMock->setSubCaptureIsActive(false); subCaptureManagerMock->setSubCaptureToggleActive(true); aubCsr->subCaptureManager = std::unique_ptr(subCaptureManagerMock); @@ -1120,7 +1120,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverInStandalon AubSubCaptureCommon aubSubCaptureCommon; auto subCaptureManagerMock = new AubSubCaptureManagerMock("", aubSubCaptureCommon); - aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; + aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::toggle; subCaptureManagerMock->setSubCaptureIsActive(true); subCaptureManagerMock->setSubCaptureToggleActive(false); aubCsr->subCaptureManager = std::unique_ptr(subCaptureManagerMock); diff --git a/shared/test/unit_test/command_stream/aub_file_stream_tests.cpp b/shared/test/unit_test/command_stream/aub_file_stream_tests.cpp index f886229993..44edb30e07 100644 --- a/shared/test/unit_test/command_stream/aub_file_stream_tests.cpp +++ b/shared/test/unit_test/command_stream/aub_file_stream_tests.cpp @@ -458,7 +458,7 @@ HWTEST_F(AubFileStreamTests, givenAubCommandStreamReceiverInSubCaptureModeWhenPo auto aubCsr = aubExecutionEnvironment->template getCsr>(); aubCsr->stream = aubStream.get(); - aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; + aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::toggle; aubSubCaptureManagerMock->setSubCaptureToggleActive(true); aubSubCaptureManagerMock->checkAndActivateSubCapture("kernelName"); aubCsr->subCaptureManager = std::unique_ptr(aubSubCaptureManagerMock); @@ -482,7 +482,7 @@ HWTEST_F(AubFileStreamTests, givenAubCommandStreamReceiverInSubCaptureModeWhenPo auto aubCsr = aubExecutionEnvironment->template getCsr>(); aubCsr->stream = aubStream.get(); - aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; + aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::toggle; aubSubCaptureManagerMock->disableSubCapture(); aubCsr->subCaptureManager = std::unique_ptr(aubSubCaptureManagerMock); ASSERT_FALSE(aubCsr->subCaptureManager->isSubCaptureEnabled()); @@ -505,7 +505,7 @@ HWTEST_F(AubFileStreamTests, givenAubCommandStreamReceiverWithHardwareContextInS aubCsr.setupContext(osContext); auto hardwareContext = static_cast(aubCsr.hardwareContextController->hardwareContexts[0].get()); - aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; + aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::toggle; aubSubCaptureManagerMock->setSubCaptureToggleActive(true); aubSubCaptureManagerMock->checkAndActivateSubCapture("kernelName"); aubCsr.subCaptureManager = std::unique_ptr(aubSubCaptureManagerMock); @@ -529,7 +529,7 @@ HWTEST_F(AubFileStreamTests, givenAubCommandStreamReceiverWithHardwareContextInS aubCsr.setupContext(osContext); auto hardwareContext = static_cast(aubCsr.hardwareContextController->hardwareContexts[0].get()); - aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; + aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::toggle; aubSubCaptureManagerMock->disableSubCapture(); aubCsr.subCaptureManager = std::unique_ptr(aubSubCaptureManagerMock); ASSERT_FALSE(aubCsr.subCaptureManager->isSubCaptureEnabled()); diff --git a/shared/test/unit_test/command_stream/aub_subcapture_tests.cpp b/shared/test/unit_test/command_stream/aub_subcapture_tests.cpp index 441703ba44..2192fc1411 100644 --- a/shared/test/unit_test/command_stream/aub_subcapture_tests.cpp +++ b/shared/test/unit_test/command_stream/aub_subcapture_tests.cpp @@ -57,7 +57,7 @@ TEST_F(AubSubCaptureTest, givenSubCaptureManagerWhenItIsCreatedThenItIsInitializ std::string initialFileName = "initial_file_name.aub"; AubSubCaptureManagerMock aubSubCaptureManager(initialFileName, subCaptureCommon); - EXPECT_EQ(AubSubCaptureCommon::SubCaptureMode::Off, subCaptureCommon.subCaptureMode); + EXPECT_EQ(AubSubCaptureCommon::SubCaptureMode::off, subCaptureCommon.subCaptureMode); EXPECT_STREQ("", subCaptureCommon.subCaptureFilter.dumpKernelName.c_str()); EXPECT_EQ(0u, subCaptureCommon.subCaptureFilter.dumpKernelStartIdx); EXPECT_EQ(static_cast(-1), subCaptureCommon.subCaptureFilter.dumpKernelEndIdx); @@ -95,7 +95,7 @@ TEST_F(AubSubCaptureTest, givenSubCaptureManagerWhenCheckAndActivateSubCaptureIs TEST_F(AubSubCaptureTest, givenSubCaptureManagerWhenCheckAndActivateSubCaptureIsCalledButSubCaptureModeIsOffThenSubCaptureIsInactive) { AubSubCaptureManagerMock aubSubCaptureManager("", subCaptureCommon); - subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Off; + subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::off; auto status = aubSubCaptureManager.checkAndActivateSubCapture("kernelName"); EXPECT_FALSE(status.isActive); EXPECT_FALSE(status.wasActiveInPreviousEnqueue); @@ -104,7 +104,7 @@ TEST_F(AubSubCaptureTest, givenSubCaptureManagerWhenCheckAndActivateSubCaptureIs TEST_F(AubSubCaptureTest, givenSubCaptureManagerInToggleModeWhenCheckAndActivateSubCaptureIsCalledAndSubCaptureIsToggledOnThenSubCaptureGetsAndRemainsActivated) { AubSubCaptureManagerMock aubSubCaptureManager("", subCaptureCommon); - subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; + subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::toggle; aubSubCaptureManager.setSubCaptureToggleActive(true); auto status = aubSubCaptureManager.checkAndActivateSubCapture("kernelName"); EXPECT_TRUE(status.isActive); @@ -118,7 +118,7 @@ TEST_F(AubSubCaptureTest, givenSubCaptureManagerInToggleModeWhenCheckAndActivate TEST_F(AubSubCaptureTest, givenSubCaptureManagerInToggleModeWhenCheckAndActivateSubCaptureIsCalledButSubCaptureIsToggledOffThenSubCaptureRemainsDeactivated) { AubSubCaptureManagerMock aubSubCaptureManager("", subCaptureCommon); - subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; + subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::toggle; aubSubCaptureManager.setSubCaptureToggleActive(false); auto status = aubSubCaptureManager.checkAndActivateSubCapture("kernelName"); EXPECT_FALSE(status.isActive); @@ -132,7 +132,7 @@ TEST_F(AubSubCaptureTest, givenSubCaptureManagerInToggleModeWhenCheckAndActivate TEST_F(AubSubCaptureTest, givenSubCaptureManagerInToggleModeWhenCheckAndActivateSubCaptureIsCalledButSubCaptureIsToggledOnAndOffThenSubCaptureGetsActivatedAndDeactivated) { AubSubCaptureManagerMock aubSubCaptureManager("", subCaptureCommon); - subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; + subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::toggle; aubSubCaptureManager.setSubCaptureToggleActive(true); auto status = aubSubCaptureManager.checkAndActivateSubCapture("kernelName"); EXPECT_TRUE(status.isActive); @@ -147,7 +147,7 @@ TEST_F(AubSubCaptureTest, givenSubCaptureManagerInToggleModeWhenCheckAndActivate TEST_F(AubSubCaptureTest, givenSubCaptureManagerInFilterModeWhenCheckAndActivateSubCaptureIsCalledAndSubCaptureFilterIsDefaultThenSubCaptureIsActive) { AubSubCaptureManagerMock aubSubCaptureManager("", subCaptureCommon); - subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Filter; + subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::filter; auto status = aubSubCaptureManager.checkAndActivateSubCapture(kernelName); EXPECT_TRUE(status.isActive); EXPECT_TRUE(aubSubCaptureManager.isSubCaptureActive()); @@ -156,7 +156,7 @@ TEST_F(AubSubCaptureTest, givenSubCaptureManagerInFilterModeWhenCheckAndActivate TEST_F(AubSubCaptureTest, givenSubCaptureManagerInFilterModeWhenCheckAndActivateSubCaptureIsCalledAndSubCaptureFilterWithValidKernelStartIndexIsSpecifiedThenSubCaptureGetsActivated) { AubSubCaptureManagerMock aubSubCaptureManager("", subCaptureCommon); - subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Filter; + subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::filter; subCaptureCommon.subCaptureFilter.dumpKernelStartIdx = 0; auto status = aubSubCaptureManager.checkAndActivateSubCapture(kernelName); EXPECT_TRUE(status.isActive); @@ -166,7 +166,7 @@ TEST_F(AubSubCaptureTest, givenSubCaptureManagerInFilterModeWhenCheckAndActivate TEST_F(AubSubCaptureTest, givenSubCaptureManagerInFilterModeWhenCheckAndActivateSubCaptureIsCalledAndSubCaptureFilterWithInvalidKernelStartIndexIsSpecifiedThenSubCaptureRemainsDeactivated) { AubSubCaptureManagerMock aubSubCaptureManager("", subCaptureCommon); - subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Filter; + subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::filter; subCaptureCommon.subCaptureFilter.dumpKernelStartIdx = 1; auto status = aubSubCaptureManager.checkAndActivateSubCapture(kernelName); EXPECT_FALSE(status.isActive); @@ -176,7 +176,7 @@ TEST_F(AubSubCaptureTest, givenSubCaptureManagerInFilterModeWhenCheckAndActivate TEST_F(AubSubCaptureTest, givenSubCaptureManagerInFilterModeWhenCheckAndActivateSubCaptureIsCalledAndSubCaptureFilterWithInvalidKernelEndIndexIsSpecifiedThenSubCaptureRemainsDeactivated) { AubSubCaptureManagerMock aubSubCaptureManager("", subCaptureCommon); - subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Filter; + subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::filter; subCaptureCommon.subCaptureFilter.dumpKernelEndIdx = 0; subCaptureCommon.getKernelCurrentIndexAndIncrement(); auto status = aubSubCaptureManager.checkAndActivateSubCapture(kernelName); @@ -187,7 +187,7 @@ TEST_F(AubSubCaptureTest, givenSubCaptureManagerInFilterModeWhenCheckAndActivate TEST_F(AubSubCaptureTest, givenSubCaptureManagerInFilterModeWhenCheckAndActivateSubCaptureIsCalledAndSubCaptureFilterWithValidKernelNameIsSpecifiedThenSubCaptureGetsActivated) { AubSubCaptureManagerMock aubSubCaptureManager("", subCaptureCommon); - subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Filter; + subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::filter; subCaptureCommon.subCaptureFilter.dumpKernelName = "kernel_name"; auto status = aubSubCaptureManager.checkAndActivateSubCapture(kernelName); EXPECT_TRUE(status.isActive); @@ -197,7 +197,7 @@ TEST_F(AubSubCaptureTest, givenSubCaptureManagerInFilterModeWhenCheckAndActivate TEST_F(AubSubCaptureTest, givenSubCaptureManagerInFilterModeWhenCheckAndActivateSubCaptureIsCalledAndSubCaptureFilterWithInvalidKernelNameIsSpecifiedThenSubCaptureRemainsDeactivated) { AubSubCaptureManagerMock aubSubCaptureManager("", subCaptureCommon); - subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Filter; + subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::filter; subCaptureCommon.subCaptureFilter.dumpKernelName = "invalid_kernel_name"; auto status = aubSubCaptureManager.checkAndActivateSubCapture(kernelName); EXPECT_FALSE(status.isActive); @@ -283,7 +283,7 @@ TEST_F(AubSubCaptureTest, givenSubCaptureManagerInFilterModeWhenGetSubCaptureFil std::string toggleFileName = "toggle_file_name.aub"; aubSubCaptureManager.setToggleFileName(toggleFileName); - subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Filter; + subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::filter; EXPECT_STREQ(toggleFileName.c_str(), aubSubCaptureManager.getSubCaptureFileName("kernelName").c_str()); } @@ -293,7 +293,7 @@ TEST_F(AubSubCaptureTest, givenSubCaptureManagerInToggleModeWhenGetSubCaptureFil std::string toggleFileName = "toggle_file_name.aub"; aubSubCaptureManager.setToggleFileName(toggleFileName); - subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; + subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::toggle; EXPECT_STREQ(toggleFileName.c_str(), aubSubCaptureManager.getSubCaptureFileName("kernelName").c_str()); } @@ -306,7 +306,7 @@ TEST_F(AubSubCaptureTest, givenSubCaptureManagerInToggleModeWhenGetSubCaptureFil std::string toggleFileName = "toggle_file_name.aub"; aubSubCaptureManager.setToggleFileName(toggleFileName); - subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; + subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::toggle; EXPECT_STREQ(toggleFileName.c_str(), aubSubCaptureManager.getSubCaptureFileName("kernelName").c_str()); } @@ -315,7 +315,7 @@ TEST_F(AubSubCaptureTest, givenSubCaptureManagerInFilterModeWhenGetSubCaptureFil aubSubCaptureManager.setToggleFileName(""); - subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Filter; + subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::filter; std::string filterFileName = aubSubCaptureManager.generateFilterFileName(); EXPECT_STREQ(filterFileName.c_str(), aubSubCaptureManager.getSubCaptureFileName("kernelName").c_str()); } @@ -325,7 +325,7 @@ TEST_F(AubSubCaptureTest, givenSubCaptureManagerInToggleModeWhenGetSubCaptureFil aubSubCaptureManager.setToggleFileName(""); - subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; + subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::toggle; std::string toggleFileName = aubSubCaptureManager.generateToggleFileName(kernelName); EXPECT_STREQ(toggleFileName.c_str(), aubSubCaptureManager.getSubCaptureFileName(kernelName).c_str()); } @@ -333,7 +333,7 @@ TEST_F(AubSubCaptureTest, givenSubCaptureManagerInToggleModeWhenGetSubCaptureFil TEST_F(AubSubCaptureTest, givenSubCaptureManagerInToggleModeWhenGetSubCaptureFileNameIsCalledForEmptyDispatchInfoThenGenerateToggleFileNameWithoutKernelName) { AubSubCaptureManagerMock aubSubCaptureManager("aubfile.aub", subCaptureCommon); - subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; + subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::toggle; auto toggleFileName = aubSubCaptureManager.generateToggleFileName("kernelName"); EXPECT_STREQ(toggleFileName.c_str(), aubSubCaptureManager.getSubCaptureFileName("kernelName").c_str()); } @@ -348,7 +348,7 @@ TEST_F(AubSubCaptureTest, givenSubCaptureManagerInFilterModeWhenGetSubCaptureFil mutable uint32_t generateFilterFileNameCount = 0; } aubSubCaptureManager("", subCaptureCommon, ""); - subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Filter; + subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::filter; aubSubCaptureManager.getSubCaptureFileName("kernelName"); aubSubCaptureManager.getSubCaptureFileName("kernelName"); aubSubCaptureManager.getSubCaptureFileName("kernelName"); @@ -365,7 +365,7 @@ TEST_F(AubSubCaptureTest, givenSubCaptureManagerInToggleModeWhenGetSubCaptureFil mutable uint32_t generateToggleFileNameCount = 0; } aubSubCaptureManager("", subCaptureCommon, ""); - subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; + subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::toggle; aubSubCaptureManager.getSubCaptureFileName("kernelName"); aubSubCaptureManager.getSubCaptureFileName("kernelName"); aubSubCaptureManager.getSubCaptureFileName("kernelName"); @@ -374,7 +374,7 @@ TEST_F(AubSubCaptureTest, givenSubCaptureManagerInToggleModeWhenGetSubCaptureFil TEST_F(AubSubCaptureTest, givenSubCaptureManagerInFilterModeWhenGenerateFilterFileNameIsCalledThenItGeneratesFileNameWithStartAndEndIndexes) { AubSubCaptureManagerMock aubSubCaptureManager("aubfile.aub", subCaptureCommon); - subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Filter; + subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::filter; subCaptureCommon.subCaptureFilter.dumpKernelStartIdx = 123; subCaptureCommon.subCaptureFilter.dumpKernelEndIdx = 456; std::string filterFileName = aubSubCaptureManager.generateFilterFileName(); @@ -384,7 +384,7 @@ TEST_F(AubSubCaptureTest, givenSubCaptureManagerInFilterModeWhenGenerateFilterFi TEST_F(AubSubCaptureTest, givenSubCaptureManagerInFilterModeWhenGenerateFilterFileNameIsCalledAndKernelNameIsSpecifiedInFilterThenItGeneratesFileNameWithNameOfKernel) { AubSubCaptureManagerMock aubSubCaptureManager("aubfile.aub", subCaptureCommon); std::string kernelName = "kernel_name"; - subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Filter; + subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::filter; subCaptureCommon.subCaptureFilter.dumpKernelName = kernelName; std::string filterFileName = aubSubCaptureManager.generateFilterFileName(); EXPECT_NE(std::string::npos, filterFileName.find(kernelName)); @@ -393,7 +393,7 @@ TEST_F(AubSubCaptureTest, givenSubCaptureManagerInFilterModeWhenGenerateFilterFi TEST_F(AubSubCaptureTest, givenSubCaptureManagerInFilterModeWhenGenerateFilterFileNameIsCalledAndKernelNameIsSpecifiedInFilterThenItGeneratesFileNameWithStartAndEndIndexesOfKernel) { AubSubCaptureManagerMock aubSubCaptureManager("aubfile.aub", subCaptureCommon); std::string kernelName = "kernel_name"; - subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Filter; + subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::filter; subCaptureCommon.subCaptureFilter.dumpKernelName = kernelName; subCaptureCommon.subCaptureFilter.dumpNamedKernelStartIdx = 12; subCaptureCommon.subCaptureFilter.dumpNamedKernelEndIdx = 17; @@ -404,7 +404,7 @@ TEST_F(AubSubCaptureTest, givenSubCaptureManagerInFilterModeWhenGenerateFilterFi TEST_F(AubSubCaptureTest, givenSubCaptureManagerInToggleModeWhenGenerateToggleFileNameIsCalledThenItGeneratesFileNameWithKernelCurrentIndex) { AubSubCaptureManagerMock aubSubCaptureManager("aubfile.aub", subCaptureCommon); std::string kernelCurrentIndex = "from_" + std::to_string(aubSubCaptureManager.getKernelCurrentIndex()); - subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; + subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::toggle; std::string filterFileName = aubSubCaptureManager.generateToggleFileName("kernelName"); EXPECT_NE(std::string::npos, filterFileName.find(kernelCurrentIndex)); } @@ -412,7 +412,7 @@ TEST_F(AubSubCaptureTest, givenSubCaptureManagerInToggleModeWhenGenerateToggleFi TEST_F(AubSubCaptureTest, givenSubCaptureManagerInToggleModeWhenGenerateToggleFileNameIsCalledAndDispatchInfoIsEmptyThenItGeneratesFileNameWithoutNameOfKernel) { AubSubCaptureManagerMock aubSubCaptureManager("aubfile.aub", subCaptureCommon); std::string kernelName = "kernel_name"; - subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; + subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::toggle; subCaptureCommon.subCaptureFilter.dumpKernelName = kernelName; std::string toggleFileName = aubSubCaptureManager.generateToggleFileName("kernelName"); EXPECT_EQ(std::string::npos, toggleFileName.find(kernelName)); @@ -421,12 +421,12 @@ TEST_F(AubSubCaptureTest, givenSubCaptureManagerInToggleModeWhenGenerateToggleFi TEST_F(AubSubCaptureTest, givenSubCaptureManagerInFilterModeWhenKernelNameIsSpecifiedThenNamedKernelIndexesShouldApplyToTheSpecifiedKernel) { AubSubCaptureManagerMock aubSubCaptureManager("aubfile.aub", subCaptureCommon); std::string kernelName = "kernel_name"; - subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Filter; + subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::filter; subCaptureCommon.subCaptureFilter.dumpNamedKernelStartIdx = 1; subCaptureCommon.subCaptureFilter.dumpNamedKernelEndIdx = 1; subCaptureCommon.subCaptureFilter.dumpKernelName = kernelName; - subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Filter; + subCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::filter; auto status = aubSubCaptureManager.checkAndActivateSubCapture(kernelName); EXPECT_FALSE(status.isActive); EXPECT_FALSE(aubSubCaptureManager.isSubCaptureActive()); diff --git a/shared/test/unit_test/command_stream/tbx_command_stream_tests.cpp b/shared/test/unit_test/command_stream/tbx_command_stream_tests.cpp index 2d549442fa..961823b896 100644 --- a/shared/test/unit_test/command_stream/tbx_command_stream_tests.cpp +++ b/shared/test/unit_test/command_stream/tbx_command_stream_tests.cpp @@ -651,7 +651,7 @@ HWTEST_F(SimulatedCsrTest, givenTbxCsrTypeWhenCreateCommandStreamReceiverThenPro HWTEST_F(TbxCommandStreamTests, givenTbxCsrWhenCreatedWithAubDumpInSubCaptureModeThenCreateSubCaptureManagerAndGenerateSubCaptureFileName) { DebugManagerStateRestore dbgRestore; - debugManager.flags.AUBDumpSubCaptureMode.set(static_cast(AubSubCaptureManager::SubCaptureMode::Filter)); + debugManager.flags.AUBDumpSubCaptureMode.set(static_cast(AubSubCaptureManager::SubCaptureMode::filter)); MockExecutionEnvironment executionEnvironment; executionEnvironment.rootDeviceEnvironments[0]->setHwInfoAndInitHelpers(defaultHwInfo.get()); @@ -851,7 +851,7 @@ HWTEST_F(TbxCommandStreamTests, givenTbxCsrInSubCaptureModeWhenCheckAndActivateA AubSubCaptureCommon aubSubCaptureCommon; auto aubSubCaptureManagerMock = new AubSubCaptureManagerMock("", aubSubCaptureCommon); - aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; + aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::toggle; tbxCsr.subCaptureManager = std::unique_ptr(aubSubCaptureManagerMock); EXPECT_FALSE(tbxCsr.dumpTbxNonWritable); @@ -870,7 +870,7 @@ HWTEST_F(TbxCommandStreamTests, givenTbxCsrInSubCaptureModeWhenCheckAndActivateA AubSubCaptureCommon aubSubCaptureCommon; auto aubSubCaptureManagerMock = new AubSubCaptureManagerMock("", aubSubCaptureCommon); - aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; + aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::toggle; aubSubCaptureManagerMock->setSubCaptureIsActive(false); aubSubCaptureManagerMock->setSubCaptureToggleActive(true); tbxCsr.subCaptureManager = std::unique_ptr(aubSubCaptureManagerMock); @@ -891,7 +891,7 @@ HWTEST_F(TbxCommandStreamTests, givenTbxCsrInSubCaptureModeWhenCheckAndActivateA AubSubCaptureCommon aubSubCaptureCommon; auto aubSubCaptureManagerMock = new AubSubCaptureManagerMock("", aubSubCaptureCommon); - aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::Toggle; + aubSubCaptureCommon.subCaptureMode = AubSubCaptureManager::SubCaptureMode::toggle; aubSubCaptureManagerMock->setSubCaptureIsActive(true); aubSubCaptureManagerMock->setSubCaptureToggleActive(true); tbxCsr.subCaptureManager = std::unique_ptr(aubSubCaptureManagerMock); diff --git a/shared/test/unit_test/helpers/test_blit_commands_helper_xehp_and_later.cpp b/shared/test/unit_test/helpers/test_blit_commands_helper_xehp_and_later.cpp index 5c17cab48c..6285b66891 100644 --- a/shared/test/unit_test/helpers/test_blit_commands_helper_xehp_and_later.cpp +++ b/shared/test/unit_test/helpers/test_blit_commands_helper_xehp_and_later.cpp @@ -179,14 +179,14 @@ HWTEST2_F(BlitTests, GivenCpuAccessToLocalMemoryWhenGettingMaxBlitSizeThenValues DebugManagerStateRestore restore{}; UltDeviceFactory deviceFactory{1, 2}; - int32_t testedLocalMemoryAccessModes[] = {static_cast(LocalMemoryAccessMode::Default), - static_cast(LocalMemoryAccessMode::CpuAccessAllowed), - static_cast(LocalMemoryAccessMode::CpuAccessDisallowed)}; + int32_t testedLocalMemoryAccessModes[] = {static_cast(LocalMemoryAccessMode::defaultMode), + static_cast(LocalMemoryAccessMode::cpuAccessAllowed), + static_cast(LocalMemoryAccessMode::cpuAccessDisallowed)}; for (auto localMemoryAccessModeOverride : testedLocalMemoryAccessModes) { debugManager.flags.ForceLocalMemoryAccessMode.set(localMemoryAccessModeOverride); - bool isBlitSizeOverridden = (localMemoryAccessModeOverride == static_cast(LocalMemoryAccessMode::CpuAccessAllowed)); + bool isBlitSizeOverridden = (localMemoryAccessModeOverride == static_cast(LocalMemoryAccessMode::cpuAccessAllowed)); if (isBlitSizeOverridden) { EXPECT_EQ(1024u, BlitCommandsHelper::getMaxBlitWidth(deviceFactory.rootDevices[0]->getRootDeviceEnvironment())); diff --git a/shared/test/unit_test/os_interface/product_helper_tests.cpp b/shared/test/unit_test/os_interface/product_helper_tests.cpp index 3df3b4fdc3..7302b5689e 100644 --- a/shared/test/unit_test/os_interface/product_helper_tests.cpp +++ b/shared/test/unit_test/os_interface/product_helper_tests.cpp @@ -333,11 +333,11 @@ HWTEST_F(ProductHelperTest, givenVariousDebugKeyValuesWhenGettingLocalMemoryAcce DebugManagerStateRestore restore{}; debugManager.flags.ForceLocalMemoryAccessMode.set(0); - EXPECT_EQ(LocalMemoryAccessMode::Default, productHelper->getLocalMemoryAccessMode(pInHwInfo)); + EXPECT_EQ(LocalMemoryAccessMode::defaultMode, productHelper->getLocalMemoryAccessMode(pInHwInfo)); debugManager.flags.ForceLocalMemoryAccessMode.set(1); - EXPECT_EQ(LocalMemoryAccessMode::CpuAccessAllowed, productHelper->getLocalMemoryAccessMode(pInHwInfo)); + EXPECT_EQ(LocalMemoryAccessMode::cpuAccessAllowed, productHelper->getLocalMemoryAccessMode(pInHwInfo)); debugManager.flags.ForceLocalMemoryAccessMode.set(3); - EXPECT_EQ(LocalMemoryAccessMode::CpuAccessDisallowed, productHelper->getLocalMemoryAccessMode(pInHwInfo)); + EXPECT_EQ(LocalMemoryAccessMode::cpuAccessDisallowed, productHelper->getLocalMemoryAccessMode(pInHwInfo)); } HWTEST_F(ProductHelperTest, givenProductHelperWhenAskedIfAllocationSizeAdjustmentIsRequiredThenFalseIsReturned) { @@ -480,7 +480,7 @@ HWTEST_F(ProductHelperTest, givenLockableAllocationWhenGettingIsBlitCopyRequired EXPECT_TRUE(GraphicsAllocation::isLockable(graphicsAllocation.getAllocationType())); graphicsAllocation.overrideMemoryPool(MemoryPool::localMemory); - auto expectedDefaultValue = (productHelper->getLocalMemoryAccessMode(pInHwInfo) == LocalMemoryAccessMode::CpuAccessDisallowed); + auto expectedDefaultValue = (productHelper->getLocalMemoryAccessMode(pInHwInfo) == LocalMemoryAccessMode::cpuAccessDisallowed); auto &rootDeviceEnvironment = *executionEnvironment->rootDeviceEnvironments[0]; EXPECT_EQ(expectedDefaultValue, productHelper->isBlitCopyRequiredForLocalMemory(rootDeviceEnvironment, graphicsAllocation)); diff --git a/shared/test/unit_test/os_interface/windows/wddm20_tests.cpp b/shared/test/unit_test/os_interface/windows/wddm20_tests.cpp index 1eccc6c7bb..20ac740f93 100644 --- a/shared/test/unit_test/os_interface/windows/wddm20_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/wddm20_tests.cpp @@ -1317,12 +1317,12 @@ TEST_F(Wddm20Tests, givenWddmWhenDiscoverDevicesAndFilterDeviceIdIsTheSameAsTheE TEST_F(WddmTest, WhenFeatureFlagHwQueueIsDisabledThenReturnWddm20Version) { wddm->featureTable->flags.ftrWddmHwQueues = 0; - EXPECT_EQ(WddmVersion::WDDM_2_0, wddm->getWddmVersion()); + EXPECT_EQ(WddmVersion::wddm20, wddm->getWddmVersion()); } TEST_F(WddmTest, WhenFeatureFlagHwQueueIsEnabledThenReturnWddm23Version) { wddm->featureTable->flags.ftrWddmHwQueues = 1; - EXPECT_EQ(WddmVersion::WDDM_2_3, wddm->getWddmVersion()); + EXPECT_EQ(WddmVersion::wddm23, wddm->getWddmVersion()); } TEST_F(Wddm20WithMockGdiDllTests, GivenCreationSucceedWhenCreatingSeparateMonitorFenceThenReturnFilledStructure) { diff --git a/shared/test/unit_test/program/program_initialization_tests.cpp b/shared/test/unit_test/program/program_initialization_tests.cpp index 4ac48b58e5..4081214b2e 100644 --- a/shared/test/unit_test/program/program_initialization_tests.cpp +++ b/shared/test/unit_test/program/program_initialization_tests.cpp @@ -211,9 +211,9 @@ TEST(AllocateGlobalSurfaceTest, GivenAllocationInLocalMemoryWhichRequiresBlitter &BlitHelperFunctions::blitMemoryToAllocation, mockBlitMemoryToAllocation}; LocalMemoryAccessMode localMemoryAccessModes[] = { - LocalMemoryAccessMode::Default, - LocalMemoryAccessMode::CpuAccessAllowed, - LocalMemoryAccessMode::CpuAccessDisallowed}; + LocalMemoryAccessMode::defaultMode, + LocalMemoryAccessMode::cpuAccessAllowed, + LocalMemoryAccessMode::cpuAccessDisallowed}; std::vector initData; initData.resize(64, 7U); @@ -232,7 +232,7 @@ TEST(AllocateGlobalSurfaceTest, GivenAllocationInLocalMemoryWhichRequiresBlitter EXPECT_EQ(nullptr, svmAllocsManager.getSVMAlloc(reinterpret_cast(static_cast(pAllocation->getGpuAddress())))); EXPECT_EQ(AllocationType::constantSurface, pAllocation->getAllocationType()); - if (pAllocation->isAllocatedInLocalMemoryPool() && (localMemoryAccessMode == LocalMemoryAccessMode::CpuAccessDisallowed)) { + if (pAllocation->isAllocatedInLocalMemoryPool() && (localMemoryAccessMode == LocalMemoryAccessMode::cpuAccessDisallowed)) { expectedBlitsCount++; } EXPECT_EQ(expectedBlitsCount, blitsCounter); diff --git a/shared/test/unit_test/utilities/software_tags_manager_tests.cpp b/shared/test/unit_test/utilities/software_tags_manager_tests.cpp index 816c86fce4..0ce2d24350 100644 --- a/shared/test/unit_test/utilities/software_tags_manager_tests.cpp +++ b/shared/test/unit_test/utilities/software_tags_manager_tests.cpp @@ -216,9 +216,9 @@ TEST(SoftwareTagsManagerMultiDeviceTests, givenEnableSWTagsAndCreateMultipleSubD struct SoftwareTagsParametrizedTests : public ::testing::TestWithParam { void SetUp() override { - tagMap.emplace(OpCode::KernelName, std::make_unique("", 0u)); - tagMap.emplace(OpCode::PipeControlReason, std::make_unique("", 0u)); - tagMap.emplace(OpCode::ArbitraryString, std::make_unique("")); + tagMap.emplace(OpCode::kernelName, std::make_unique("", 0u)); + tagMap.emplace(OpCode::pipeControlReason, std::make_unique("", 0u)); + tagMap.emplace(OpCode::arbitraryString, std::make_unique("")); } std::map> tagMap; @@ -228,9 +228,9 @@ INSTANTIATE_TEST_CASE_P( SoftwareTags, SoftwareTagsParametrizedTests, testing::Values( - OpCode::KernelName, - OpCode::PipeControlReason, - OpCode::ArbitraryString)); + OpCode::kernelName, + OpCode::pipeControlReason, + OpCode::arbitraryString)); TEST_P(SoftwareTagsParametrizedTests, whenGetOpCodeIsCalledThenCorrectValueIsReturned) { auto opcode = GetParam(); diff --git a/shared/test/unit_test/xe_hpg_core/dg2/test_product_helper_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/test_product_helper_dg2.cpp index ec8aff8c02..ac8cf5eda1 100644 --- a/shared/test/unit_test/xe_hpg_core/dg2/test_product_helper_dg2.cpp +++ b/shared/test/unit_test/xe_hpg_core/dg2/test_product_helper_dg2.cpp @@ -47,10 +47,10 @@ DG2TEST_F(Dg2ProductHelper, givenDG2WithBSteppingThenMaxThreadsForWorkgroupWAIsN DG2TEST_F(Dg2ProductHelper, givenSteppingWhenAskingForLocalMemoryAccessModeThenDisallowOnA0) { pInHwInfo.platform.usDeviceID = dg2G10DeviceIds[0]; pInHwInfo.platform.usRevId = productHelper->getHwRevIdFromStepping(REVISION_A0, pInHwInfo); - EXPECT_EQ(LocalMemoryAccessMode::CpuAccessDisallowed, productHelper->getLocalMemoryAccessMode(pInHwInfo)); + EXPECT_EQ(LocalMemoryAccessMode::cpuAccessDisallowed, productHelper->getLocalMemoryAccessMode(pInHwInfo)); pInHwInfo.platform.usRevId = productHelper->getHwRevIdFromStepping(REVISION_B, pInHwInfo); - EXPECT_EQ(LocalMemoryAccessMode::Default, productHelper->getLocalMemoryAccessMode(pInHwInfo)); + EXPECT_EQ(LocalMemoryAccessMode::defaultMode, productHelper->getLocalMemoryAccessMode(pInHwInfo)); } DG2TEST_F(Dg2ProductHelper, givenProductHelperWhenGetCommandsStreamPropertiesSupportThenExpectCorrectValues) { @@ -85,23 +85,23 @@ DG2TEST_F(Dg2ProductHelper, givenDG2WhenGettingLocalMemoryAccessModeThenCorrectV pInHwInfo.platform.usRevId = revIdA0; pInHwInfo.platform.usDeviceID = dg2G10DeviceIds[0]; - EXPECT_EQ(LocalMemoryAccessMode::CpuAccessDisallowed, productHelper->getLocalMemoryAccessMode(pInHwInfo)); + EXPECT_EQ(LocalMemoryAccessMode::cpuAccessDisallowed, productHelper->getLocalMemoryAccessMode(pInHwInfo)); pInHwInfo.platform.usDeviceID = dg2G11DeviceIds[0]; - EXPECT_EQ(LocalMemoryAccessMode::Default, productHelper->getLocalMemoryAccessMode(pInHwInfo)); + EXPECT_EQ(LocalMemoryAccessMode::defaultMode, productHelper->getLocalMemoryAccessMode(pInHwInfo)); pInHwInfo.platform.usDeviceID = dg2G12DeviceIds[0]; - EXPECT_EQ(LocalMemoryAccessMode::Default, productHelper->getLocalMemoryAccessMode(pInHwInfo)); + EXPECT_EQ(LocalMemoryAccessMode::defaultMode, productHelper->getLocalMemoryAccessMode(pInHwInfo)); pInHwInfo.platform.usRevId = revIdB0; pInHwInfo.platform.usDeviceID = dg2G10DeviceIds[0]; - EXPECT_EQ(LocalMemoryAccessMode::Default, productHelper->getLocalMemoryAccessMode(pInHwInfo)); + EXPECT_EQ(LocalMemoryAccessMode::defaultMode, productHelper->getLocalMemoryAccessMode(pInHwInfo)); pInHwInfo.platform.usDeviceID = dg2G11DeviceIds[0]; - EXPECT_EQ(LocalMemoryAccessMode::Default, productHelper->getLocalMemoryAccessMode(pInHwInfo)); + EXPECT_EQ(LocalMemoryAccessMode::defaultMode, productHelper->getLocalMemoryAccessMode(pInHwInfo)); pInHwInfo.platform.usDeviceID = dg2G12DeviceIds[0]; - EXPECT_EQ(LocalMemoryAccessMode::Default, productHelper->getLocalMemoryAccessMode(pInHwInfo)); + EXPECT_EQ(LocalMemoryAccessMode::defaultMode, productHelper->getLocalMemoryAccessMode(pInHwInfo)); } DG2TEST_F(Dg2ProductHelper, whenConfiguringHardwareInfoThenWa15010089951IsSet) {