From e6181d79333ffe0f8955c59cbb55d6080d34bf89 Mon Sep 17 00:00:00 2001 From: Lukasz Jobczyk Date: Wed, 8 Feb 2023 12:06:17 +0000 Subject: [PATCH] Reuse builtin module and init selected builtin on device init -start async thread at device initialization which initializes selected builtins and exits -share module across builtins using same binary Resolves: NEO-7644 Signed-off-by: Lukasz Jobczyk --- .../source/builtin/builtin_functions_lib.h | 1 + .../builtin/builtin_functions_lib_impl.cpp | 60 +++++++++++++------ .../builtin/builtin_functions_lib_impl.h | 22 +++++-- .../dll/create_builtin_functions_lib.cpp | 13 ++++ .../core/source/driver/driver_handle_imp.cpp | 4 ++ .../create_aub_ult_builtin_functions_lib.cpp | 4 ++ .../mocks/mock_builtin_functions_lib_impl.h | 5 +- ...ck_builtin_functions_lib_impl_timestamps.h | 12 ++-- .../sources/builtin/built_in_spv_tests_l0.cpp | 1 - .../builtin/builtin_functions_tests.cpp | 44 +++++++++++++- .../create_ult_builtin_functions_lib.cpp | 5 ++ .../sources/cmdlist/test_cmdlist_5.cpp | 6 +- .../tools/test/unit_tests/CMakeLists.txt | 2 +- .../test/common/base_ult_config_listener.cpp | 2 +- shared/test/common/helpers/ult_hw_config.h | 1 + 15 files changed, 139 insertions(+), 43 deletions(-) diff --git a/level_zero/core/source/builtin/builtin_functions_lib.h b/level_zero/core/source/builtin/builtin_functions_lib.h index abc819e551..33b9d99d4c 100644 --- a/level_zero/core/source/builtin/builtin_functions_lib.h +++ b/level_zero/core/source/builtin/builtin_functions_lib.h @@ -67,6 +67,7 @@ struct BuiltinFunctionsLib { virtual Kernel *getImageFunction(ImageBuiltin func) = 0; virtual void initBuiltinKernel(Builtin builtId) = 0; virtual void initBuiltinImageKernel(ImageBuiltin func) = 0; + virtual void ensureInitCompletion() = 0; [[nodiscard]] MOCKABLE_VIRTUAL std::unique_lock obtainUniqueOwnership(); protected: diff --git a/level_zero/core/source/builtin/builtin_functions_lib_impl.cpp b/level_zero/core/source/builtin/builtin_functions_lib_impl.cpp index 69fd217e7a..ac5ec9ff20 100644 --- a/level_zero/core/source/builtin/builtin_functions_lib_impl.cpp +++ b/level_zero/core/source/builtin/builtin_functions_lib_impl.cpp @@ -9,10 +9,10 @@ #include "shared/source/built_ins/built_ins.h" #include "shared/source/debug_settings/debug_settings_manager.h" +#include "shared/source/os_interface/os_interface.h" #include "level_zero/core/source/device/device.h" #include "level_zero/core/source/kernel/kernel.h" -#include "level_zero/core/source/module/module.h" namespace NEO { const char *getAdditionalBuiltinAsString(EBuiltInOps::Type builtin) { @@ -24,13 +24,9 @@ namespace L0 { BuiltinFunctionsLibImpl::BuiltinData::~BuiltinData() { func.reset(); - module.reset(); } BuiltinFunctionsLibImpl::BuiltinData::BuiltinData() = default; -BuiltinFunctionsLibImpl::BuiltinData::BuiltinData(std::unique_ptr &&mod, std::unique_ptr &&ker) { - module = std::move(mod); - func = std::move(ker); -} +BuiltinFunctionsLibImpl::BuiltinData::BuiltinData(Module *module, std::unique_ptr &&ker) : module(module), func(std::move(ker)) {} std::unique_lock BuiltinFunctionsLib::obtainUniqueOwnership() { return std::unique_lock(this->ownershipMutex); } @@ -185,9 +181,17 @@ void BuiltinFunctionsLibImpl::initBuiltinImageKernel(ImageBuiltin func) { imageBuiltins[builtId] = loadBuiltIn(builtin, builtinName); } +BuiltinFunctionsLibImpl::BuiltinFunctionsLibImpl(Device *device, NEO::BuiltIns *builtInsLib) : device(device), builtInsLib(builtInsLib) { + if (initBuiltinsAsyncEnabled(device)) { + this->initAsyncComplete = false; + this->initAsync = std::async(std::launch::async, &BuiltinFunctionsLibImpl::initBuiltinKernel, this, Builtin::FillBufferImmediate); + } +} + Kernel *BuiltinFunctionsLibImpl::getFunction(Builtin func) { auto builtId = static_cast(func); + this->ensureInitCompletion(); if (builtins[builtId].get() == nullptr) { initBuiltinKernel(func); } @@ -198,6 +202,7 @@ Kernel *BuiltinFunctionsLibImpl::getFunction(Builtin func) { Kernel *BuiltinFunctionsLibImpl::getImageFunction(ImageBuiltin func) { auto builtId = static_cast(func); + this->ensureInitCompletion(); if (imageBuiltins[builtId].get() == nullptr) { initBuiltinImageKernel(func); } @@ -227,27 +232,46 @@ std::unique_ptr BuiltinFunctionsLibImpl::l } } - [[maybe_unused]] ze_result_t res; - std::unique_ptr module; - ze_module_handle_t moduleHandle; - ze_module_desc_t moduleDesc = {}; - moduleDesc.format = builtinCode.type == BuiltInCodeType::Binary ? ZE_MODULE_FORMAT_NATIVE : ZE_MODULE_FORMAT_IL_SPIRV; - moduleDesc.pInputModule = reinterpret_cast(&builtinCode.resource[0]); - moduleDesc.inputSize = builtinCode.resource.size(); - res = device->createModule(&moduleDesc, &moduleHandle, nullptr, ModuleType::Builtin); - UNRECOVERABLE_IF(res != ZE_RESULT_SUCCESS); + if (builtinCode.resource.empty() || !NEO::EmbeddedStorageRegistry::exists) { + return nullptr; + } - module.reset(Module::fromHandle(moduleHandle)); + [[maybe_unused]] ze_result_t res; + + if (this->modules.size() <= builtin) { + this->modules.resize(builtin + 1u); + } + + if (this->modules[builtin].get() == nullptr) { + std::unique_ptr module; + ze_module_handle_t moduleHandle; + ze_module_desc_t moduleDesc = {}; + moduleDesc.format = builtinCode.type == BuiltInCodeType::Binary ? ZE_MODULE_FORMAT_NATIVE : ZE_MODULE_FORMAT_IL_SPIRV; + moduleDesc.pInputModule = reinterpret_cast(&builtinCode.resource[0]); + moduleDesc.inputSize = builtinCode.resource.size(); + res = device->createModule(&moduleDesc, &moduleHandle, nullptr, ModuleType::Builtin); + UNRECOVERABLE_IF(res != ZE_RESULT_SUCCESS); + + module.reset(Module::fromHandle(moduleHandle)); + this->modules[builtin] = std::move(module); + } std::unique_ptr kernel; ze_kernel_handle_t kernelHandle; ze_kernel_desc_t kernelDesc = {}; kernelDesc.pKernelName = builtInName; - res = module->createKernel(&kernelDesc, &kernelHandle); + res = this->modules[builtin]->createKernel(&kernelDesc, &kernelHandle); DEBUG_BREAK_IF(res != ZE_RESULT_SUCCESS); kernel.reset(Kernel::fromHandle(kernelHandle)); - return std::unique_ptr(new BuiltinData{std::move(module), std::move(kernel)}); + return std::unique_ptr(new BuiltinData{modules[builtin].get(), std::move(kernel)}); +} + +void BuiltinFunctionsLibImpl::ensureInitCompletion() { + if (!this->initAsyncComplete) { + this->initAsync.wait(); + this->initAsyncComplete = true; + } } } // namespace L0 diff --git a/level_zero/core/source/builtin/builtin_functions_lib_impl.h b/level_zero/core/source/builtin/builtin_functions_lib_impl.h index dea44be42b..d32e3d9963 100644 --- a/level_zero/core/source/builtin/builtin_functions_lib_impl.h +++ b/level_zero/core/source/builtin/builtin_functions_lib_impl.h @@ -7,7 +7,13 @@ #pragma once +#include "shared/source/os_interface/os_thread.h" + #include "level_zero/core/source/builtin/builtin_functions_lib.h" +#include "level_zero/core/source/module/module.h" + +#include +#include namespace NEO { namespace EBuiltInOps { @@ -17,15 +23,12 @@ class BuiltIns; } // namespace NEO namespace L0 { -struct Module; struct Kernel; struct Device; struct BuiltinFunctionsLibImpl : BuiltinFunctionsLib { struct BuiltinData; - BuiltinFunctionsLibImpl(Device *device, NEO::BuiltIns *builtInsLib) - : device(device), builtInsLib(builtInsLib) { - } + BuiltinFunctionsLibImpl(Device *device, NEO::BuiltIns *builtInsLib); ~BuiltinFunctionsLibImpl() override { builtins->reset(); imageBuiltins->reset(); @@ -35,20 +38,27 @@ struct BuiltinFunctionsLibImpl : BuiltinFunctionsLib { Kernel *getImageFunction(ImageBuiltin func) override; void initBuiltinKernel(Builtin builtId) override; void initBuiltinImageKernel(ImageBuiltin func) override; + void ensureInitCompletion() override; MOCKABLE_VIRTUAL std::unique_ptr loadBuiltIn(NEO::EBuiltInOps::Type builtin, const char *builtInName); + static bool initBuiltinsAsyncEnabled(Device *device); + protected: + std::vector> modules = {}; std::unique_ptr builtins[static_cast(Builtin::COUNT)]; std::unique_ptr imageBuiltins[static_cast(ImageBuiltin::COUNT)]; Device *device; NEO::BuiltIns *builtInsLib; + + std::future initAsync = {}; + bool initAsyncComplete = true; }; struct BuiltinFunctionsLibImpl::BuiltinData { MOCKABLE_VIRTUAL ~BuiltinData(); BuiltinData(); - BuiltinData(std::unique_ptr &&mod, std::unique_ptr &&ker); + BuiltinData(Module *module, std::unique_ptr &&ker); - std::unique_ptr module; + Module *module = nullptr; std::unique_ptr func; }; } // namespace L0 diff --git a/level_zero/core/source/dll/create_builtin_functions_lib.cpp b/level_zero/core/source/dll/create_builtin_functions_lib.cpp index c2aad30290..e2df7d5f3b 100644 --- a/level_zero/core/source/dll/create_builtin_functions_lib.cpp +++ b/level_zero/core/source/dll/create_builtin_functions_lib.cpp @@ -5,7 +5,14 @@ * */ +#include "shared/source/command_stream/command_stream_receiver.h" +#include "shared/source/device/device.h" +#include "shared/source/execution_environment/root_device_environment.h" +#include "shared/source/helpers/driver_model_type.h" +#include "shared/source/os_interface/os_interface.h" + #include "level_zero/core/source/builtin/builtin_functions_lib_impl.h" +#include "level_zero/core/source/device/device.h" namespace L0 { @@ -14,4 +21,10 @@ std::unique_ptr BuiltinFunctionsLib::create(Device *device, return std::unique_ptr(new BuiltinFunctionsLibImpl(device, builtins)); } +bool BuiltinFunctionsLibImpl::initBuiltinsAsyncEnabled(Device *device) { + return device->getNEODevice()->getRootDeviceEnvironment().osInterface.get() && + device->getNEODevice()->getRootDeviceEnvironment().osInterface->getDriverModel()->getDriverModelType() == NEO::DriverModelType::DRM && + device->getNEODevice()->getDefaultEngine().commandStreamReceiver->getType() == NEO::CommandStreamReceiverType::CSR_HW; +} + } // namespace L0 diff --git a/level_zero/core/source/driver/driver_handle_imp.cpp b/level_zero/core/source/driver/driver_handle_imp.cpp index b89b7809b2..f6c88c789c 100644 --- a/level_zero/core/source/driver/driver_handle_imp.cpp +++ b/level_zero/core/source/driver/driver_handle_imp.cpp @@ -19,6 +19,7 @@ #include "shared/source/memory_manager/unified_memory_manager.h" #include "shared/source/os_interface/os_library.h" +#include "level_zero/core/source/builtin/builtin_functions_lib.h" #include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/source/device/device_imp.h" #include "level_zero/core/source/driver/driver_imp.h" @@ -162,6 +163,9 @@ DriverHandleImp::~DriverHandleImp() { } for (auto &device : this->devices) { + if (device->getBuiltinFunctionsLib()) { + device->getBuiltinFunctionsLib()->ensureInitCompletion(); + } delete device; } diff --git a/level_zero/core/test/aub_tests/fixtures/create_aub_ult_builtin_functions_lib.cpp b/level_zero/core/test/aub_tests/fixtures/create_aub_ult_builtin_functions_lib.cpp index c6ed49dc04..787513f819 100644 --- a/level_zero/core/test/aub_tests/fixtures/create_aub_ult_builtin_functions_lib.cpp +++ b/level_zero/core/test/aub_tests/fixtures/create_aub_ult_builtin_functions_lib.cpp @@ -14,4 +14,8 @@ std::unique_ptr BuiltinFunctionsLib::create(Device *device, return std::unique_ptr(new BuiltinFunctionsLibImpl(device, builtins)); } +bool BuiltinFunctionsLibImpl::initBuiltinsAsyncEnabled(Device *device) { + return false; +} + } // namespace L0 diff --git a/level_zero/core/test/unit_tests/mocks/mock_builtin_functions_lib_impl.h b/level_zero/core/test/unit_tests/mocks/mock_builtin_functions_lib_impl.h index ce753b4ce9..3d87510e1f 100644 --- a/level_zero/core/test/unit_tests/mocks/mock_builtin_functions_lib_impl.h +++ b/level_zero/core/test/unit_tests/mocks/mock_builtin_functions_lib_impl.h @@ -23,6 +23,7 @@ struct MockBuiltinFunctionsLibImpl : BuiltinFunctionsLibImpl { dummyKernel = std::unique_ptr>(new Mock<::L0::Kernel>()); dummyModule = std::unique_ptr(new Mock(device, nullptr)); dummyKernel->module = dummyModule.get(); + mockModule = std::unique_ptr(new Mock(device, nullptr)); } void initBuiltinKernel(L0::Builtin func) override { auto builtId = static_cast(func); @@ -40,6 +41,7 @@ struct MockBuiltinFunctionsLibImpl : BuiltinFunctionsLibImpl { std::unique_ptr> dummyKernel; std::unique_ptr dummyModule; + std::unique_ptr mockModule; Kernel *getFunction(Builtin func) override { return dummyKernel.get(); @@ -51,9 +53,8 @@ struct MockBuiltinFunctionsLibImpl : BuiltinFunctionsLibImpl { std::unique_ptr loadBuiltIn(NEO::EBuiltInOps::Type builtin, const char *builtInName) override { std::unique_ptr mockKernel(new Mock<::L0::Kernel>()); - std::unique_ptr mockModule(new Mock(device, nullptr)); - return std::unique_ptr(new BuiltinData{std::move(mockModule), std::move(mockKernel)}); + return std::unique_ptr(new BuiltinData{mockModule.get(), std::move(mockKernel)}); } }; } // namespace ult diff --git a/level_zero/core/test/unit_tests/mocks/mock_builtin_functions_lib_impl_timestamps.h b/level_zero/core/test/unit_tests/mocks/mock_builtin_functions_lib_impl_timestamps.h index 00fc30fd9c..064372fa5c 100644 --- a/level_zero/core/test/unit_tests/mocks/mock_builtin_functions_lib_impl_timestamps.h +++ b/level_zero/core/test/unit_tests/mocks/mock_builtin_functions_lib_impl_timestamps.h @@ -17,10 +17,6 @@ namespace ult { struct MockBuiltinDataTimestamp : BuiltinFunctionsLibImpl::BuiltinData { using BuiltinFunctionsLibImpl::BuiltinData::BuiltinData; - - ~MockBuiltinDataTimestamp() override { - module.release(); - } }; struct MockBuiltinFunctionsLibImplTimestamps : BuiltinFunctionsLibImpl { @@ -57,7 +53,8 @@ struct MockBuiltinFunctionsLibImplTimestamps : BuiltinFunctionsLibImpl { auto builtInCode = builtInsLib->getBuiltinsLib().getBuiltinCode(builtin, builtInCodeType, *device->getNEODevice()); [[maybe_unused]] ze_result_t res; - std::unique_ptr module; + + Module *module; ze_module_handle_t moduleHandle; ze_module_desc_t moduleDesc = {}; moduleDesc.format = builtInCode.type == BuiltInCodeType::Binary ? ZE_MODULE_FORMAT_NATIVE : ZE_MODULE_FORMAT_IL_SPIRV; @@ -65,8 +62,7 @@ struct MockBuiltinFunctionsLibImplTimestamps : BuiltinFunctionsLibImpl { moduleDesc.inputSize = builtInCode.resource.size(); res = device->createModule(&moduleDesc, &moduleHandle, nullptr, ModuleType::Builtin); UNRECOVERABLE_IF(res != ZE_RESULT_SUCCESS); - - module.reset(Module::fromHandle(moduleHandle)); + module = Module::fromHandle(moduleHandle); std::unique_ptr kernel; ze_kernel_handle_t kernelHandle; @@ -76,7 +72,7 @@ struct MockBuiltinFunctionsLibImplTimestamps : BuiltinFunctionsLibImpl { DEBUG_BREAK_IF(res != ZE_RESULT_SUCCESS); kernel.reset(Kernel::fromHandle(kernelHandle)); - return std::unique_ptr(new MockBuiltinDataTimestamp{std::move(module), std::move(kernel)}); + return std::unique_ptr(new MockBuiltinDataTimestamp{module, std::move(kernel)}); } }; diff --git a/level_zero/core/test/unit_tests/sources/builtin/built_in_spv_tests_l0.cpp b/level_zero/core/test/unit_tests/sources/builtin/built_in_spv_tests_l0.cpp index 45ed1e6fd7..eaa566f050 100644 --- a/level_zero/core/test/unit_tests/sources/builtin/built_in_spv_tests_l0.cpp +++ b/level_zero/core/test/unit_tests/sources/builtin/built_in_spv_tests_l0.cpp @@ -42,7 +42,6 @@ HWTEST_F(BuiltInTestL0, givenDeviceWithUnregisteredBinaryBuiltinWhenGettingBuilt pDevice->getRootDeviceEnvironment().getMutableHardwareInfo()->platform.usRevId += 0xdead; L0::BuiltinFunctionsLibImpl builtinFunctionsLib{&deviceL0, pDevice->getBuiltIns()}; for (uint32_t builtId = 0; builtId < static_cast(L0::Builtin::COUNT); builtId++) { - deviceL0.formatForModule = {}; ASSERT_NE(nullptr, builtinFunctionsLib.getFunction(static_cast(builtId))); EXPECT_EQ(ZE_MODULE_FORMAT_NATIVE, deviceL0.formatForModule); } diff --git a/level_zero/core/test/unit_tests/sources/builtin/builtin_functions_tests.cpp b/level_zero/core/test/unit_tests/sources/builtin/builtin_functions_tests.cpp index 8a5b09ad8a..63e891e039 100644 --- a/level_zero/core/test/unit_tests/sources/builtin/builtin_functions_tests.cpp +++ b/level_zero/core/test/unit_tests/sources/builtin/builtin_functions_tests.cpp @@ -8,6 +8,8 @@ #include "shared/source/built_ins/built_ins.h" #include "shared/source/execution_environment/root_device_environment.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/helpers/memory_management.h" +#include "shared/test/common/helpers/ult_hw_config.h" #include "shared/test/common/mocks/mock_compiler_interface_spirv.h" #include "shared/test/common/test_macros/hw_test.h" @@ -26,21 +28,27 @@ class BuiltinFunctionsLibFixture : public DeviceFixture { public: struct MockBuiltinFunctionsLibImpl : BuiltinFunctionsLibImpl { using BuiltinFunctionsLibImpl::builtins; + using BuiltinFunctionsLibImpl::ensureInitCompletion; using BuiltinFunctionsLibImpl::getFunction; using BuiltinFunctionsLibImpl::imageBuiltins; - MockBuiltinFunctionsLibImpl(L0::Device *device, NEO::BuiltIns *builtInsLib) : BuiltinFunctionsLibImpl(device, builtInsLib) {} + using BuiltinFunctionsLibImpl::initAsyncComplete; + MockBuiltinFunctionsLibImpl(L0::Device *device, NEO::BuiltIns *builtInsLib) : BuiltinFunctionsLibImpl(device, builtInsLib) { + mockModule = std::unique_ptr(new Mock(device, nullptr)); + } std::unique_ptr loadBuiltIn(NEO::EBuiltInOps::Type builtin, const char *builtInName) override { std::unique_ptr mockKernel(new Mock<::L0::Kernel>()); - std::unique_ptr mockModule(new Mock(device, nullptr)); - return std::unique_ptr(new BuiltinData{std::move(mockModule), std::move(mockKernel)}); + return std::unique_ptr(new BuiltinData{mockModule.get(), std::move(mockKernel)}); } + std::unique_ptr mockModule; }; void setUp() { DeviceFixture::setUp(); mockDevicePtr = std::unique_ptr>(new MockDeviceForSpv(device->getNEODevice(), device->getNEODevice()->getExecutionEnvironment(), driverHandle.get())); mockBuiltinFunctionsLibImpl.reset(new MockBuiltinFunctionsLibImpl(mockDevicePtr.get(), neoDevice->getBuiltIns())); + mockBuiltinFunctionsLibImpl->ensureInitCompletion(); + EXPECT_TRUE(mockBuiltinFunctionsLibImpl->initAsyncComplete); } void tearDown() { mockBuiltinFunctionsLibImpl.reset(); @@ -108,6 +116,36 @@ HWTEST_F(TestBuiltinFunctionsLibImpl, givenCallToBuiltinFunctionWithWrongIdThenE EXPECT_THROW(mockBuiltinFunctionsLibImpl->initBuiltinKernel(static_cast(builtId)), std::exception); } +HWTEST_F(TestBuiltinFunctionsLibImpl, whenCreateBuiltinFunctionsLibThenImmediateFillIsLoaded) { + struct MockBuiltinFunctionsLibImpl : public BuiltinFunctionsLibImpl { + using BuiltinFunctionsLibImpl::BuiltinFunctionsLibImpl; + using BuiltinFunctionsLibImpl::builtins; + using BuiltinFunctionsLibImpl::ensureInitCompletion; + using BuiltinFunctionsLibImpl::initAsyncComplete; + }; + + EXPECT_TRUE(mockBuiltinFunctionsLibImpl->initAsyncComplete); + VariableBackup backup(&ultHwConfig); + ultHwConfig.useinitBuiltinsAsyncEnabled = true; + MockBuiltinFunctionsLibImpl lib(device, device->getNEODevice()->getBuiltIns()); + EXPECT_FALSE(lib.initAsyncComplete); + lib.ensureInitCompletion(); + EXPECT_TRUE(lib.initAsyncComplete); + for (uint32_t builtId = 0; builtId < static_cast(Builtin::COUNT); builtId++) { + if (builtId == static_cast(Builtin::FillBufferImmediate)) { + EXPECT_NE(nullptr, lib.builtins[builtId]); + } else { + EXPECT_EQ(nullptr, lib.builtins[builtId]); + } + } + uint32_t builtId = static_cast(Builtin::COUNT) + 1; + EXPECT_THROW(lib.initBuiltinKernel(static_cast(builtId)), std::exception); + + /* std::async may create a detached thread - completion of the scheduled task can be ensured, + but there is no way to ensure that actual OS thread exited and its resources are freed */ + MemoryManagement::fastLeaksDetectionMode = MemoryManagement::LeakDetectionMode::TURN_OFF_LEAK_DETECTION; +} + HWTEST_F(TestBuiltinFunctionsLibImpl, givenCompilerInterfaceWhenCreateDeviceAndImageSupportedThenBuiltinsImageFunctionsAreLoaded) { ze_result_t returnValue = ZE_RESULT_SUCCESS; neoDevice->getExecutionEnvironment()->rootDeviceEnvironments[neoDevice->getRootDeviceIndex()]->compilerInterface.reset(new NEO::MockCompilerInterfaceSpirv()); diff --git a/level_zero/core/test/unit_tests/sources/builtin/create_ult_builtin_functions_lib.cpp b/level_zero/core/test/unit_tests/sources/builtin/create_ult_builtin_functions_lib.cpp index 621ec8974b..853fdff179 100644 --- a/level_zero/core/test/unit_tests/sources/builtin/create_ult_builtin_functions_lib.cpp +++ b/level_zero/core/test/unit_tests/sources/builtin/create_ult_builtin_functions_lib.cpp @@ -6,6 +6,7 @@ */ #include "shared/source/built_ins/built_ins.h" +#include "shared/test/common/helpers/ult_hw_config.h" #include "level_zero/core/source/builtin/builtin_functions_lib_impl.h" #include "level_zero/core/test/unit_tests/mocks/mock_builtin_functions_lib_impl.h" @@ -17,4 +18,8 @@ std::unique_ptr BuiltinFunctionsLib::create(Device *device, return std::unique_ptr(new ult::MockBuiltinFunctionsLibImpl(device, builtins)); } +bool BuiltinFunctionsLibImpl::initBuiltinsAsyncEnabled(Device *device) { + return NEO::ultHwConfig.useinitBuiltinsAsyncEnabled; +} + } // namespace L0 diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_5.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_5.cpp index 5e31f28500..f601f8fbf3 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_5.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_5.cpp @@ -331,7 +331,7 @@ HWTEST2_F(AppendQueryKernelTimestamps, givenCommandListWhenAppendQueryKernelTime neoDevice->incRefInternal(); execEnvironment = device->getExecEnvironment(); driverHandle = device->getDriverHandle(); - tmpMockBultinLib = new MockBuiltinFunctionsForQueryKernelTimestamps{nullptr, nullptr}; + tmpMockBultinLib = new MockBuiltinFunctionsForQueryKernelTimestamps{this, device->getNEODevice()->getBuiltIns()}; } MockBuiltinFunctionsForQueryKernelTimestamps *getBuiltinFunctionsLib() override { return tmpMockBultinLib; @@ -416,7 +416,7 @@ HWTEST2_F(AppendQueryKernelTimestamps, givenCommandListWhenAppendQueryKernelTime neoDevice->incRefInternal(); execEnvironment = device->getExecEnvironment(); driverHandle = device->getDriverHandle(); - tmpMockBultinLib = new MockBuiltinFunctionsForQueryKernelTimestamps{nullptr, nullptr}; + tmpMockBultinLib = new MockBuiltinFunctionsForQueryKernelTimestamps{this, device->getNEODevice()->getBuiltIns()}; } MockBuiltinFunctionsForQueryKernelTimestamps *getBuiltinFunctionsLib() override { return tmpMockBultinLib; @@ -500,7 +500,7 @@ HWTEST2_F(AppendQueryKernelTimestamps, givenEventWhenAppendQueryIsCalledThenSetA neoDevice->incRefInternal(); execEnvironment = device->getExecEnvironment(); driverHandle = device->getDriverHandle(); - tmpMockBultinLib = std::make_unique(this, nullptr); + tmpMockBultinLib = std::make_unique(this, device->getNEODevice()->getBuiltIns()); } MockBuiltinFunctionsForQueryKernelTimestamps *getBuiltinFunctionsLib() override { return tmpMockBultinLib.get(); diff --git a/level_zero/tools/test/unit_tests/CMakeLists.txt b/level_zero/tools/test/unit_tests/CMakeLists.txt index 61ddeddc29..5951ff7566 100644 --- a/level_zero/tools/test/unit_tests/CMakeLists.txt +++ b/level_zero/tools/test/unit_tests/CMakeLists.txt @@ -27,7 +27,7 @@ target_sources(${TARGET_NAME} PRIVATE ${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/main.cpp ${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/mock.h ${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/white_box.h - ${NEO_SOURCE_DIR}/level_zero/core/source/dll/create_builtin_functions_lib.cpp + ${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/sources/builtin/create_ult_builtin_functions_lib.cpp ${NEO_SOURCE_DIR}/level_zero/tools/test/unit_tests/sources/debug/debug_session_helper.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/tests_configuration.h ) diff --git a/shared/test/common/base_ult_config_listener.cpp b/shared/test/common/base_ult_config_listener.cpp index 9bd2cba169..8d54f6b5bb 100644 --- a/shared/test/common/base_ult_config_listener.cpp +++ b/shared/test/common/base_ult_config_listener.cpp @@ -36,7 +36,7 @@ void NEO::BaseUltConfigListener::OnTestEnd(const ::testing::TestInfo &) { // Ensure that global state is restored UltHwConfig expectedState{}; - static_assert(sizeof(UltHwConfig) == 14 * sizeof(bool), ""); // Ensure that there is no internal padding + static_assert(sizeof(UltHwConfig) == 15 * sizeof(bool), ""); // Ensure that there is no internal padding EXPECT_EQ(0, memcmp(&expectedState, &ultHwConfig, sizeof(UltHwConfig))); EXPECT_EQ(0, memcmp(&referencedHwInfo.platform, &defaultHwInfo->platform, sizeof(PLATFORM))); diff --git a/shared/test/common/helpers/ult_hw_config.h b/shared/test/common/helpers/ult_hw_config.h index 60790d3b58..4c4298d429 100644 --- a/shared/test/common/helpers/ult_hw_config.h +++ b/shared/test/common/helpers/ult_hw_config.h @@ -12,6 +12,7 @@ struct UltHwConfig { bool useHwCsr = false; bool useMockedPrepareDeviceEnvironmentsFunc = true; bool forceOsAgnosticMemoryManager = true; + bool useinitBuiltinsAsyncEnabled = false; bool useWaitForTimestamps = false; bool useBlitSplit = false; bool useFirstSubmissionInitDevice = false;