From 71238d412437b55f3943b7d3be47524d454ffff4 Mon Sep 17 00:00:00 2001 From: "Naklicki, Mateusz" Date: Fri, 22 Aug 2025 15:36:43 +0000 Subject: [PATCH] test: extract duplicated code to functions Signed-off-by: Naklicki, Mateusz --- .../fixtures/mutable_cmdlist_fixture.cpp | 74 +++++++++---------- .../fixtures/mutable_cmdlist_fixture.h | 3 +- 2 files changed, 35 insertions(+), 42 deletions(-) diff --git a/level_zero/core/test/unit_tests/sources/mutable_cmdlist/fixtures/mutable_cmdlist_fixture.cpp b/level_zero/core/test/unit_tests/sources/mutable_cmdlist/fixtures/mutable_cmdlist_fixture.cpp index 3df24772d7..55c178fd72 100644 --- a/level_zero/core/test/unit_tests/sources/mutable_cmdlist/fixtures/mutable_cmdlist_fixture.cpp +++ b/level_zero/core/test/unit_tests/sources/mutable_cmdlist/fixtures/mutable_cmdlist_fixture.cpp @@ -25,51 +25,13 @@ void MutableCommandListFixtureInit::setUp(bool createInOrder) { mutableCommandList = createMutableCmdList(); - mockKernelImmData2 = std::make_unique(0u); - mockKernelImmData2->kernelDescriptor->kernelAttributes.crossThreadDataSize = crossThreadInitSize; - mockKernelImmData2->crossThreadDataSize = crossThreadInitSize; - mockKernelImmData2->crossThreadDataTemplate.reset(new uint8_t[crossThreadInitSize]); - - mockKernelImmData2->kernelDescriptor->payloadMappings.implicitArgs.indirectDataPointerAddress.offset = 0; - mockKernelImmData2->kernelDescriptor->payloadMappings.implicitArgs.indirectDataPointerAddress.pointerSize = sizeof(void *); - mockKernelImmData2->kernelDescriptor->payloadMappings.implicitArgs.scratchPointerAddress.offset = 8; - mockKernelImmData2->kernelDescriptor->payloadMappings.implicitArgs.scratchPointerAddress.pointerSize = sizeof(void *); - - { - std::initializer_list additionalSections = {}; - zebinData2 = std::make_unique(device->getHwInfo(), additionalSections); - const auto &src = zebinData2->storage; - - ze_module_desc_t moduleDesc = {}; - moduleDesc.format = ZE_MODULE_FORMAT_NATIVE; - moduleDesc.pInputModule = reinterpret_cast(src.data()); - moduleDesc.inputSize = src.size(); - - ModuleBuildLog *moduleBuildLog = nullptr; - - module2 = std::make_unique(device, - moduleBuildLog, - ModuleType::user, - 0, - mockKernelImmData2.get()); - - module2->type = ModuleType::user; - ze_result_t result = ZE_RESULT_ERROR_MODULE_BUILD_FAILURE; - result = module2->initialize(&moduleDesc, device->getNEODevice()); - EXPECT_EQ(ZE_RESULT_SUCCESS, result); - } + mockKernelImmData2 = prepareKernelImmData(); + module2 = prepareModule(mockKernelImmData2.get()); kernel2 = std::make_unique(module2.get()); createKernel(kernel2.get()); module2->mockKernelImmData->kernelDescriptor->kernelMetadata.kernelName = "test2"; - mockKernelImmData = std::make_unique(0u); - mockKernelImmData->kernelDescriptor->kernelAttributes.crossThreadDataSize = crossThreadInitSize; - mockKernelImmData->crossThreadDataSize = crossThreadInitSize; - mockKernelImmData->crossThreadDataTemplate.reset(new uint8_t[crossThreadInitSize]); - mockKernelImmData->kernelDescriptor->payloadMappings.implicitArgs.indirectDataPointerAddress.offset = 0; - mockKernelImmData->kernelDescriptor->payloadMappings.implicitArgs.indirectDataPointerAddress.pointerSize = sizeof(void *); - mockKernelImmData->kernelDescriptor->payloadMappings.implicitArgs.scratchPointerAddress.offset = 8; - mockKernelImmData->kernelDescriptor->payloadMappings.implicitArgs.scratchPointerAddress.pointerSize = sizeof(void *); + mockKernelImmData = prepareKernelImmData(); createModuleFromMockBinary(0u, false, mockKernelImmData.get()); kernel = std::make_unique(module.get()); createKernel(kernel.get()); @@ -107,6 +69,36 @@ void MutableCommandListFixtureInit::tearDown() { ModuleImmutableDataFixture::tearDown(); } +std::unique_ptr MutableCommandListFixtureInit::prepareKernelImmData() { + auto immData = std::make_unique(0u); + immData->kernelDescriptor->kernelAttributes.crossThreadDataSize = crossThreadInitSize; + immData->crossThreadDataSize = crossThreadInitSize; + immData->crossThreadDataTemplate.reset(new uint8_t[crossThreadInitSize]); + immData->kernelDescriptor->payloadMappings.implicitArgs.indirectDataPointerAddress.offset = 0; + immData->kernelDescriptor->payloadMappings.implicitArgs.indirectDataPointerAddress.pointerSize = sizeof(void *); + immData->kernelDescriptor->payloadMappings.implicitArgs.scratchPointerAddress.offset = 8; + immData->kernelDescriptor->payloadMappings.implicitArgs.scratchPointerAddress.pointerSize = sizeof(void *); + return immData; +} + +std::unique_ptr MutableCommandListFixtureInit::prepareModule(MockImmutableData *immData) { + std::initializer_list additionalSections = {}; + auto zebinDataOut = std::make_unique(device->getHwInfo(), additionalSections); + const auto &src = zebinDataOut->storage; + + ze_module_desc_t moduleDesc = {}; + moduleDesc.format = ZE_MODULE_FORMAT_NATIVE; + moduleDesc.pInputModule = reinterpret_cast(src.data()); + moduleDesc.inputSize = src.size(); + + ModuleBuildLog *moduleBuildLog = nullptr; + auto mod = std::make_unique(device, moduleBuildLog, ModuleType::user, 0, immData); + mod->type = ModuleType::user; + ze_result_t result = mod->initialize(&moduleDesc, device->getNEODevice()); + EXPECT_EQ(ZE_RESULT_SUCCESS, result); + return mod; +} + std::unique_ptr MutableCommandListFixtureInit::createMutableCmdList() { ze_result_t returnValue; diff --git a/level_zero/core/test/unit_tests/sources/mutable_cmdlist/fixtures/mutable_cmdlist_fixture.h b/level_zero/core/test/unit_tests/sources/mutable_cmdlist/fixtures/mutable_cmdlist_fixture.h index 981bf463aa..9feea68259 100644 --- a/level_zero/core/test/unit_tests/sources/mutable_cmdlist/fixtures/mutable_cmdlist_fixture.h +++ b/level_zero/core/test/unit_tests/sources/mutable_cmdlist/fixtures/mutable_cmdlist_fixture.h @@ -40,6 +40,8 @@ struct MutableCommandListFixtureInit : public ModuleImmutableDataFixture { void setUp(bool createInOrder); void tearDown(); + std::unique_ptr prepareKernelImmData(); + std::unique_ptr prepareModule(MockImmutableData *immData); std::unique_ptr createMutableCmdList(); Event *createTestEvent(bool cbEvent, bool signalScope, bool timestamp, bool external); void *allocateUsm(size_t size); @@ -69,7 +71,6 @@ struct MutableCommandListFixtureInit : public ModuleImmutableDataFixture { std::unique_ptr kernel; std::unique_ptr kernel2; std::unique_ptr module2; - std::unique_ptr zebinData2; std::unique_ptr> backupHwInfo; uint64_t commandId = 0;