From 3f94399dbb56b5e263ee2c502b6b6eb0617e0acd Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Fri, 15 Oct 2021 12:02:31 +0000 Subject: [PATCH] Cleanup builtins dependencies move builtins builders to ClExecutionEnvironment Signed-off-by: Mateusz Jablonski --- .../built_ins/builtins_dispatch_builder.cpp | 32 +++++++++-------- opencl/source/built_ins/vme_builtin.cpp | 4 ++- .../cl_execution_environment.cpp | 10 +++++- .../cl_execution_environment.h | 13 ++++++- .../unit_test/built_ins/built_in_tests.cpp | 4 +-- .../command_queue/blit_enqueue_tests.cpp | 2 +- .../command_queue/command_queue_fixture.cpp | 2 +- .../command_queue/command_queue_hw_tests.cpp | 7 ++-- .../command_queue/command_queue_tests.cpp | 2 +- .../enqueue_copy_buffer_rect_tests.cpp | 2 +- .../enqueue_copy_buffer_tests.cpp | 2 +- .../enqueue_copy_buffer_to_image_tests.cpp | 14 ++++---- .../enqueue_copy_image_tests.cpp | 12 +++---- .../enqueue_copy_image_to_buffer_tests.cpp | 14 ++++---- .../enqueue_fill_buffer_tests.cpp | 2 +- .../enqueue_read_buffer_rect_tests.cpp | 2 +- .../enqueue_read_buffer_tests.cpp | 2 +- .../enqueue_read_image_tests.cpp | 22 +++++------- .../enqueue_svm_mem_copy_tests.cpp | 34 ++++++++----------- .../enqueue_svm_mem_fill_tests.cpp | 14 ++++---- .../enqueue_write_buffer_rect_tests.cpp | 2 +- .../enqueue_write_buffer_tests.cpp | 2 +- .../enqueue_write_image_tests.cpp | 22 +++++------- .../command_stream_receiver_tests.cpp | 2 +- .../unit_test/device/device_caps_tests.cpp | 2 +- .../unit_test/fixtures/cl_device_fixture.cpp | 3 +- .../unit_test/fixtures/cl_device_fixture.h | 1 + .../unit_test/mem_obj/buffer_bcs_tests.cpp | 2 +- .../test/unit_test/mem_obj/buffer_tests.cpp | 2 +- .../image_release_mapped_ptr_tests.cpp | 3 +- .../unit_test/mem_obj/nv12_image_tests.cpp | 2 +- opencl/test/unit_test/mocks/CMakeLists.txt | 2 -- opencl/test/unit_test/mocks/mock_builtins.cpp | 22 ------------ opencl/test/unit_test/mocks/mock_cl_device.h | 8 +++-- .../mocks/mock_cl_execution_environment.h | 9 +++++ .../linux/drm_memory_manager_tests.h | 4 +-- .../windows/device_command_stream_tests.cpp | 2 +- .../unit_test/platform/platform_tests.cpp | 2 +- .../source_level_debugger_csr_tests.h | 2 +- shared/source/built_ins/built_ins.cpp | 3 -- shared/source/built_ins/built_ins.h | 6 ---- .../execution_environment.h | 2 +- shared/test/common/mocks/CMakeLists.txt | 1 + .../test/common}/mocks/mock_builtins.h | 3 -- .../unit_test/preemption/preemption_tests.cpp | 3 +- 45 files changed, 143 insertions(+), 165 deletions(-) delete mode 100644 opencl/test/unit_test/mocks/mock_builtins.cpp rename {opencl/test/unit_test => shared/test/common}/mocks/mock_builtins.h (80%) diff --git a/opencl/source/built_ins/builtins_dispatch_builder.cpp b/opencl/source/built_ins/builtins_dispatch_builder.cpp index da8ee96d36..bcf556a310 100644 --- a/opencl/source/built_ins/builtins_dispatch_builder.cpp +++ b/opencl/source/built_ins/builtins_dispatch_builder.cpp @@ -17,6 +17,7 @@ #include "opencl/source/built_ins/built_ins.inl" #include "opencl/source/built_ins/vme_dispatch_builder.h" #include "opencl/source/cl_device/cl_device.h" +#include "opencl/source/execution_environment/cl_execution_environment.h" #include "opencl/source/helpers/convert_color.h" #include "opencl/source/helpers/dispatch_info_builder.h" #include "opencl/source/kernel/kernel.h" @@ -731,47 +732,48 @@ class BuiltInOp : public BuiltinDispatchInfoBuilder { BuiltinDispatchInfoBuilder &BuiltInDispatchBuilderOp::getBuiltinDispatchInfoBuilder(EBuiltInOps::Type operation, ClDevice &device) { uint32_t operationId = static_cast(operation); - auto kernelsLib = device.getDevice().getBuiltIns(); - auto &operationBuilder = kernelsLib->BuiltinOpsBuilders[operationId]; + auto &builtins = *device.getDevice().getBuiltIns(); + auto clExecutionEnvironment = static_cast(device.getExecutionEnvironment()); + auto &operationBuilder = clExecutionEnvironment->peekBuilders(device.getRootDeviceIndex())[operationId]; switch (operation) { case EBuiltInOps::CopyBufferToBuffer: - std::call_once(operationBuilder.second, [&] { operationBuilder.first = std::make_unique>(*kernelsLib, device); }); + std::call_once(operationBuilder.second, [&] { operationBuilder.first = std::make_unique>(builtins, device); }); break; case EBuiltInOps::CopyBufferToBufferStateless: - std::call_once(operationBuilder.second, [&] { operationBuilder.first = std::make_unique>(*kernelsLib, device); }); + std::call_once(operationBuilder.second, [&] { operationBuilder.first = std::make_unique>(builtins, device); }); break; case EBuiltInOps::CopyBufferRect: - std::call_once(operationBuilder.second, [&] { operationBuilder.first = std::make_unique>(*kernelsLib, device); }); + std::call_once(operationBuilder.second, [&] { operationBuilder.first = std::make_unique>(builtins, device); }); break; case EBuiltInOps::CopyBufferRectStateless: - std::call_once(operationBuilder.second, [&] { operationBuilder.first = std::make_unique>(*kernelsLib, device); }); + std::call_once(operationBuilder.second, [&] { operationBuilder.first = std::make_unique>(builtins, device); }); break; case EBuiltInOps::FillBuffer: - std::call_once(operationBuilder.second, [&] { operationBuilder.first = std::make_unique>(*kernelsLib, device); }); + std::call_once(operationBuilder.second, [&] { operationBuilder.first = std::make_unique>(builtins, device); }); break; case EBuiltInOps::FillBufferStateless: - std::call_once(operationBuilder.second, [&] { operationBuilder.first = std::make_unique>(*kernelsLib, device); }); + std::call_once(operationBuilder.second, [&] { operationBuilder.first = std::make_unique>(builtins, device); }); break; case EBuiltInOps::CopyBufferToImage3d: - std::call_once(operationBuilder.second, [&] { operationBuilder.first = std::make_unique>(*kernelsLib, device); }); + std::call_once(operationBuilder.second, [&] { operationBuilder.first = std::make_unique>(builtins, device); }); break; case EBuiltInOps::CopyBufferToImage3dStateless: - std::call_once(operationBuilder.second, [&] { operationBuilder.first = std::make_unique>(*kernelsLib, device); }); + std::call_once(operationBuilder.second, [&] { operationBuilder.first = std::make_unique>(builtins, device); }); break; case EBuiltInOps::CopyImage3dToBuffer: - std::call_once(operationBuilder.second, [&] { operationBuilder.first = std::make_unique>(*kernelsLib, device); }); + std::call_once(operationBuilder.second, [&] { operationBuilder.first = std::make_unique>(builtins, device); }); break; case EBuiltInOps::CopyImage3dToBufferStateless: - std::call_once(operationBuilder.second, [&] { operationBuilder.first = std::make_unique>(*kernelsLib, device); }); + std::call_once(operationBuilder.second, [&] { operationBuilder.first = std::make_unique>(builtins, device); }); break; case EBuiltInOps::CopyImageToImage3d: - std::call_once(operationBuilder.second, [&] { operationBuilder.first = std::make_unique>(*kernelsLib, device); }); + std::call_once(operationBuilder.second, [&] { operationBuilder.first = std::make_unique>(builtins, device); }); break; case EBuiltInOps::FillImage3d: - std::call_once(operationBuilder.second, [&] { operationBuilder.first = std::make_unique>(*kernelsLib, device); }); + std::call_once(operationBuilder.second, [&] { operationBuilder.first = std::make_unique>(builtins, device); }); break; case EBuiltInOps::AuxTranslation: - std::call_once(operationBuilder.second, [&] { operationBuilder.first = std::make_unique>(*kernelsLib, device); }); + std::call_once(operationBuilder.second, [&] { operationBuilder.first = std::make_unique>(builtins, device); }); break; default: return getUnknownDispatchInfoBuilder(operation, device); diff --git a/opencl/source/built_ins/vme_builtin.cpp b/opencl/source/built_ins/vme_builtin.cpp index 03991a025e..e799a6ce7c 100644 --- a/opencl/source/built_ins/vme_builtin.cpp +++ b/opencl/source/built_ins/vme_builtin.cpp @@ -14,6 +14,7 @@ #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/built_ins/populate_built_ins.inl" #include "opencl/source/built_ins/vme_dispatch_builder.h" +#include "opencl/source/execution_environment/cl_execution_environment.h" #include "opencl/source/program/program.h" namespace NEO { @@ -103,7 +104,8 @@ const char *getAdditionalBuiltinAsString(EBuiltInOps::Type builtin) { BuiltinDispatchInfoBuilder &Vme::getBuiltinDispatchInfoBuilder(EBuiltInOps::Type operation, ClDevice &device) { auto &builtins = *device.getDevice().getBuiltIns(); uint32_t operationId = static_cast(operation); - auto &operationBuilder = builtins.BuiltinOpsBuilders[operationId]; + auto clExecutionEnvironment = static_cast(device.getExecutionEnvironment()); + auto &operationBuilder = clExecutionEnvironment->peekBuilders(device.getRootDeviceIndex())[operationId]; switch (operation) { default: return BuiltInDispatchBuilderOp::getBuiltinDispatchInfoBuilder(operation, device); diff --git a/opencl/source/execution_environment/cl_execution_environment.cpp b/opencl/source/execution_environment/cl_execution_environment.cpp index eb035af6b3..caf7bf517b 100644 --- a/opencl/source/execution_environment/cl_execution_environment.cpp +++ b/opencl/source/execution_environment/cl_execution_environment.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Intel Corporation + * Copyright (C) 2020-2021 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,6 +7,7 @@ #include "opencl/source/execution_environment/cl_execution_environment.h" +#include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/event/async_events_handler.h" namespace NEO { @@ -22,4 +23,11 @@ AsyncEventsHandler *ClExecutionEnvironment::getAsyncEventsHandler() const { ClExecutionEnvironment::~ClExecutionEnvironment() { asyncEventsHandler->closeThread(); }; +void ClExecutionEnvironment::prepareRootDeviceEnvironments(uint32_t numRootDevices) { + ExecutionEnvironment::prepareRootDeviceEnvironments(numRootDevices); + builtinOpsBuilders.resize(numRootDevices); + for (auto i = 0u; i < numRootDevices; i++) { + builtinOpsBuilders[i] = std::make_unique(EBuiltInOps::COUNT); + } +} } // namespace NEO diff --git a/opencl/source/execution_environment/cl_execution_environment.h b/opencl/source/execution_environment/cl_execution_environment.h index 992ddee2f4..a9a4491bb5 100644 --- a/opencl/source/execution_environment/cl_execution_environment.h +++ b/opencl/source/execution_environment/cl_execution_environment.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Intel Corporation + * Copyright (C) 2020-2021 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,17 +8,28 @@ #pragma once #include "shared/source/execution_environment/execution_environment.h" +#include "built_in_ops.h" + +#include +#include +#include + namespace NEO { class AsyncEventsHandler; +class BuiltinDispatchInfoBuilder; class ClExecutionEnvironment : public ExecutionEnvironment { public: ClExecutionEnvironment(); AsyncEventsHandler *getAsyncEventsHandler() const; ~ClExecutionEnvironment() override; + void prepareRootDeviceEnvironments(uint32_t numRootDevices) override; + using BuilderT = std::pair, std::once_flag>; + BuilderT *peekBuilders(uint32_t rootDeviceIndex) { return builtinOpsBuilders[rootDeviceIndex].get(); } protected: + std::vector> builtinOpsBuilders; std::unique_ptr asyncEventsHandler; }; } // namespace NEO \ No newline at end of file diff --git a/opencl/test/unit_test/built_ins/built_in_tests.cpp b/opencl/test/unit_test/built_ins/built_in_tests.cpp index 3233cfb96c..8a785c4729 100644 --- a/opencl/test/unit_test/built_ins/built_in_tests.cpp +++ b/opencl/test/unit_test/built_ins/built_in_tests.cpp @@ -14,6 +14,7 @@ #include "shared/source/helpers/string.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/libult/global_environment.h" +#include "shared/test/common/mocks/mock_builtins.h" #include "shared/test/common/mocks/mock_builtinslib.h" #include "shared/test/common/mocks/mock_compiler_interface.h" #include "shared/test/common/mocks/mock_compilers.h" @@ -33,7 +34,6 @@ #include "opencl/test/unit_test/fixtures/image_fixture.h" #include "opencl/test/unit_test/fixtures/run_kernel_fixture.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" -#include "opencl/test/unit_test/mocks/mock_builtins.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" @@ -501,7 +501,7 @@ TEST_F(BuiltInTests, givenkAuxBuiltInWhenResizeIsCalledThenCloneAllNewInstancesF HWTEST2_P(AuxBuiltInTests, givenKernelWithAuxTranslationRequiredWhenEnqueueCalledThenLockOnBuiltin, AuxBuiltinsMatcher) { BuiltInDispatchBuilderOp::getBuiltinDispatchInfoBuilder(EBuiltInOps::AuxTranslation, *pClDevice); auto mockAuxBuiltInOp = new MockAuxBuilInOp(*pBuiltIns, *pClDevice); - pBuiltIns->BuiltinOpsBuilders[static_cast(EBuiltInOps::AuxTranslation)].first.reset(mockAuxBuiltInOp); + pClExecutionEnvironment->setBuiltinDispatchInfoBuilder(rootDeviceIndex, EBuiltInOps::AuxTranslation, std::unique_ptr(mockAuxBuiltInOp)); auto mockProgram = clUniquePtr(new MockProgram(toClDeviceVector(*pClDevice))); auto mockBuiltinKernel = MockKernel::create(*pDevice, mockProgram.get()); diff --git a/opencl/test/unit_test/command_queue/blit_enqueue_tests.cpp b/opencl/test/unit_test/command_queue/blit_enqueue_tests.cpp index 62bcf2bbe5..6b800efda2 100644 --- a/opencl/test/unit_test/command_queue/blit_enqueue_tests.cpp +++ b/opencl/test/unit_test/command_queue/blit_enqueue_tests.cpp @@ -84,7 +84,7 @@ struct BlitEnqueueTests : public ::testing::Test { DebugManager.flags.ForceGpgpuSubmissionForBcsEnqueue.set(1); DebugManager.flags.CsrDispatchMode.set(static_cast(DispatchMode::ImmediateDispatch)); DebugManager.flags.EnableLocalMemory.set(1); - device = std::make_unique(MockDevice::createWithNewExecutionEnvironment(nullptr)); + device = std::make_unique(MockClDevice::createWithNewExecutionEnvironment(nullptr)); auto &capabilityTable = device->getRootDeviceEnvironment().getMutableHardwareInfo()->capabilityTable; bool createBcsEngine = !capabilityTable.blitterOperationsSupported; capabilityTable.blitterOperationsSupported = true; diff --git a/opencl/test/unit_test/command_queue/command_queue_fixture.cpp b/opencl/test/unit_test/command_queue/command_queue_fixture.cpp index 0d65f633d2..97d1da3da2 100644 --- a/opencl/test/unit_test/command_queue/command_queue_fixture.cpp +++ b/opencl/test/unit_test/command_queue/command_queue_fixture.cpp @@ -35,7 +35,7 @@ CommandQueue *CommandQueueHwFixture::createCommandQueue( const cl_command_queue_properties *properties) { if (pDevice == nullptr) { if (this->device == nullptr) { - this->device = new MockClDevice{MockDevice::createWithNewExecutionEnvironment(nullptr)}; + this->device = new MockClDevice{MockClDevice::createWithNewExecutionEnvironment(nullptr)}; createdDevice = true; } pDevice = this->device; diff --git a/opencl/test/unit_test/command_queue/command_queue_hw_tests.cpp b/opencl/test/unit_test/command_queue/command_queue_hw_tests.cpp index 6ccaefb0e7..17c504f8da 100644 --- a/opencl/test/unit_test/command_queue/command_queue_hw_tests.cpp +++ b/opencl/test/unit_test/command_queue/command_queue_hw_tests.cpp @@ -8,6 +8,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/mocks/mock_allocation_properties.h" +#include "shared/test/common/mocks/mock_builtins.h" #include "shared/test/common/mocks/mock_csr.h" #include "shared/test/common/mocks/mock_os_library.h" #include "shared/test/common/mocks/mock_source_level_debugger.h" @@ -23,7 +24,6 @@ #include "opencl/test/unit_test/fixtures/context_fixture.h" #include "opencl/test/unit_test/fixtures/image_fixture.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" -#include "opencl/test/unit_test/mocks/mock_builtins.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_event.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" @@ -939,10 +939,9 @@ struct BuiltinParamsCommandQueueHwTests : public CommandQueueHwTest { auto builtIns = new MockBuiltins(); pCmdQ->getDevice().getExecutionEnvironment()->rootDeviceEnvironments[pCmdQ->getDevice().getRootDeviceIndex()]->builtins.reset(builtIns); - auto swapBuilder = builtIns->setBuiltinDispatchInfoBuilder( + auto swapBuilder = pClExecutionEnvironment->setBuiltinDispatchInfoBuilder( + rootDeviceIndex, operation, - *pContext, - *pDevice, std::unique_ptr(new MockBuilder(*builtIns, pCmdQ->getClDevice()))); mockBuilder = static_cast(&BuiltInDispatchBuilderOp::getBuiltinDispatchInfoBuilder( diff --git a/opencl/test/unit_test/command_queue/command_queue_tests.cpp b/opencl/test/unit_test/command_queue/command_queue_tests.cpp index ffd459efd4..c929d334a5 100644 --- a/opencl/test/unit_test/command_queue/command_queue_tests.cpp +++ b/opencl/test/unit_test/command_queue/command_queue_tests.cpp @@ -820,7 +820,7 @@ struct WaitForQueueCompletionTests : public ::testing::Test { }; void SetUp() override { - device = std::make_unique(MockDevice::createWithNewExecutionEnvironment(defaultHwInfo.get())); + device = std::make_unique(MockClDevice::createWithNewExecutionEnvironment(defaultHwInfo.get())); context.reset(new MockContext(device.get())); } diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_tests.cpp index 3da8e26098..d194fd8f88 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_tests.cpp @@ -417,7 +417,7 @@ struct EnqueueCopyBufferRectHw : public ::testing::Test { if (is32bit) { GTEST_SKIP(); } - device = std::make_unique(MockDevice::createWithNewExecutionEnvironment(defaultHwInfo.get())); + device = std::make_unique(MockClDevice::createWithNewExecutionEnvironment(defaultHwInfo.get())); context.reset(new MockContext(device.get())); dstBuffer = std::unique_ptr(BufferHelper::create(context.get())); } diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_tests.cpp index cbcbb9cdd9..96b91154a9 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_tests.cpp @@ -370,7 +370,7 @@ struct EnqueueCopyBufferHw : public ::testing::Test { if (is32bit) { GTEST_SKIP(); } - device = std::make_unique(MockDevice::createWithNewExecutionEnvironment(defaultHwInfo.get())); + device = std::make_unique(MockClDevice::createWithNewExecutionEnvironment(defaultHwInfo.get())); context.reset(new MockContext(device.get())); dstBuffer = std::unique_ptr(BufferHelper<>::create(context.get())); } diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp index 7883928d01..30437f1181 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp @@ -7,6 +7,7 @@ #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" +#include "shared/test/common/mocks/mock_builtins.h" #include "shared/test/common/test_macros/test_checks_shared.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" @@ -15,7 +16,6 @@ #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h" -#include "opencl/test/unit_test/mocks/mock_builtins.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "test.h" @@ -215,10 +215,9 @@ HWTEST_P(MipMapCopyBufferToImageTest, GivenImageWithMipLevelNonZeroWhenCopyBuffe pCmdQ->getClDevice()); // substitute original builder with mock builder - auto oldBuilder = builtIns->setBuiltinDispatchInfoBuilder( + auto oldBuilder = pClExecutionEnvironment->setBuiltinDispatchInfoBuilder( + rootDeviceIndex, EBuiltInOps::CopyBufferToImage3d, - pCmdQ->getContext(), - pCmdQ->getDevice(), std::unique_ptr(new MockBuiltinDispatchInfoBuilder(*builtIns, pCmdQ->getClDevice(), &origBuilder))); cl_int retVal = CL_SUCCESS; @@ -277,10 +276,9 @@ HWTEST_P(MipMapCopyBufferToImageTest, GivenImageWithMipLevelNonZeroWhenCopyBuffe EXPECT_EQ(expectedMipLevel, params->dstMipLevel); // restore original builder and retrieve mock builder - auto newBuilder = builtIns->setBuiltinDispatchInfoBuilder( + auto newBuilder = pClExecutionEnvironment->setBuiltinDispatchInfoBuilder( + rootDeviceIndex, EBuiltInOps::CopyBufferToImage3d, - pCmdQ->getContext(), - pCmdQ->getDevice(), std::move(oldBuilder)); EXPECT_NE(nullptr, newBuilder); } @@ -293,7 +291,7 @@ struct EnqueueCopyBufferToImageHw : public ::testing::Test { void SetUp() override { REQUIRE_64BIT_OR_SKIP(); REQUIRE_IMAGES_OR_SKIP(defaultHwInfo); - device = std::make_unique(MockDevice::createWithNewExecutionEnvironment(defaultHwInfo.get())); + device = std::make_unique(MockClDevice::createWithNewExecutionEnvironment(defaultHwInfo.get())); context = std::make_unique(device.get()); dstImage = std::unique_ptr(Image2dHelper<>::create(context.get())); } diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp index 2f3067f341..b2b3920c40 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp @@ -8,13 +8,13 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" +#include "shared/test/common/mocks/mock_builtins.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/test/unit_test/command_queue/enqueue_copy_image_fixture.h" #include "opencl/test/unit_test/fixtures/one_mip_level_image_fixture.h" #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" #include "opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h" -#include "opencl/test/unit_test/mocks/mock_builtins.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "test.h" @@ -279,10 +279,9 @@ HWTEST_P(MipMapCopyImageTest, GivenImagesWithNonZeroMipLevelsWhenCopyImageIsCall EBuiltInOps::CopyImageToImage3d, pCmdQ->getClDevice()); // substitute original builder with mock builder - auto oldBuilder = builtIns->setBuiltinDispatchInfoBuilder( + auto oldBuilder = pClExecutionEnvironment->setBuiltinDispatchInfoBuilder( + rootDeviceIndex, EBuiltInOps::CopyImageToImage3d, - pCmdQ->getContext(), - pCmdQ->getDevice(), std::unique_ptr(new MockBuiltinDispatchInfoBuilder(*builtIns, pCmdQ->getClDevice(), &origBuilder))); cl_int retVal = CL_SUCCESS; @@ -377,10 +376,9 @@ HWTEST_P(MipMapCopyImageTest, GivenImagesWithNonZeroMipLevelsWhenCopyImageIsCall EXPECT_EQ(expectedDstMipLevel, params->dstMipLevel); // restore original builder and retrieve mock builder - auto newBuilder = builtIns->setBuiltinDispatchInfoBuilder( + auto newBuilder = pClExecutionEnvironment->setBuiltinDispatchInfoBuilder( + rootDeviceIndex, EBuiltInOps::CopyImageToImage3d, - pCmdQ->getContext(), - pCmdQ->getDevice(), std::move(oldBuilder)); EXPECT_NE(nullptr, newBuilder); } diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp index d4ef2bd2c4..6acc926304 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp @@ -7,6 +7,7 @@ #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" +#include "shared/test/common/mocks/mock_builtins.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_fixture.h" @@ -14,7 +15,6 @@ #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h" -#include "opencl/test/unit_test/mocks/mock_builtins.h" #include "test.h" #include "reg_configs_common.h" @@ -208,10 +208,9 @@ HWTEST_P(MipMapCopyImageToBufferTest, GivenImageWithMipLevelNonZeroWhenCopyImage pCmdQ->getClDevice()); // substitute original builder with mock builder - auto oldBuilder = builtIns->setBuiltinDispatchInfoBuilder( + auto oldBuilder = pClExecutionEnvironment->setBuiltinDispatchInfoBuilder( + rootDeviceIndex, EBuiltInOps::CopyImage3dToBuffer, - pCmdQ->getContext(), - pCmdQ->getDevice(), std::unique_ptr(new MockBuiltinDispatchInfoBuilder(*builtIns, pCmdQ->getClDevice(), &origBuilder))); cl_int retVal = CL_SUCCESS; @@ -269,10 +268,9 @@ HWTEST_P(MipMapCopyImageToBufferTest, GivenImageWithMipLevelNonZeroWhenCopyImage EXPECT_EQ(expectedMipLevel, params->srcMipLevel); // restore original builder and retrieve mock builder - auto newBuilder = builtIns->setBuiltinDispatchInfoBuilder( + auto newBuilder = pClExecutionEnvironment->setBuiltinDispatchInfoBuilder( + rootDeviceIndex, EBuiltInOps::CopyImage3dToBuffer, - pCmdQ->getContext(), - pCmdQ->getDevice(), std::move(oldBuilder)); EXPECT_NE(nullptr, newBuilder); } @@ -285,7 +283,7 @@ struct EnqueueCopyImageToBufferHw : public ::testing::Test { void SetUp() override { REQUIRE_64BIT_OR_SKIP(); REQUIRE_IMAGES_OR_SKIP(defaultHwInfo); - device = std::make_unique(MockDevice::createWithNewExecutionEnvironment(defaultHwInfo.get())); + device = std::make_unique(MockClDevice::createWithNewExecutionEnvironment(defaultHwInfo.get())); context = std::make_unique(device.get()); srcImage = std::unique_ptr(Image2dHelper<>::create(context.get())); } diff --git a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp index 2f2cbb5e0a..f1ea3bd892 100644 --- a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp @@ -529,7 +529,7 @@ struct EnqueueFillBufferHw : public ::testing::Test { if (is32bit) { GTEST_SKIP(); } - device = std::make_unique(MockDevice::createWithNewExecutionEnvironment(defaultHwInfo.get())); + device = std::make_unique(MockClDevice::createWithNewExecutionEnvironment(defaultHwInfo.get())); context.reset(new MockContext(device.get())); } diff --git a/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_tests.cpp index ed39a13974..0e7e8e08ca 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_tests.cpp @@ -632,7 +632,7 @@ struct EnqueueReadBufferRectHw : public ::testing::Test { if (is32bit) { GTEST_SKIP(); } - device = std::make_unique(MockDevice::createWithNewExecutionEnvironment(defaultHwInfo.get())); + device = std::make_unique(MockClDevice::createWithNewExecutionEnvironment(defaultHwInfo.get())); context.reset(new MockContext(device.get())); } 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 5a4084ac52..7df8e026dd 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 @@ -700,7 +700,7 @@ struct EnqueueReadBufferHw : public ::testing::Test { if (is32bit) { GTEST_SKIP(); } - device = std::make_unique(MockDevice::createWithNewExecutionEnvironment(defaultHwInfo.get())); + device = std::make_unique(MockClDevice::createWithNewExecutionEnvironment(defaultHwInfo.get())); context.reset(new MockContext(device.get())); } diff --git a/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp index a1af77f15a..c30cc8c0cc 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp @@ -9,13 +9,13 @@ #include "shared/source/memory_manager/migration_sync_data.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/unit_test_helper.h" +#include "shared/test/common/mocks/mock_builtins.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/test/unit_test/command_queue/enqueue_read_image_fixture.h" #include "opencl/test/unit_test/fixtures/one_mip_level_image_fixture.h" #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" #include "opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h" -#include "opencl/test/unit_test/mocks/mock_builtins.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "test.h" @@ -594,10 +594,9 @@ HWTEST_F(EnqueueReadImageTest, GivenImage1DarrayWhenReadImageIsCalledThenRowPitc pCmdQ->getClDevice()); // substitute original builder with mock builder - auto oldBuilder = builtIns->setBuiltinDispatchInfoBuilder( + auto oldBuilder = pClExecutionEnvironment->setBuiltinDispatchInfoBuilder( + rootDeviceIndex, copyBuiltIn, - pCmdQ->getContext(), - pCmdQ->getDevice(), std::unique_ptr(new MockBuiltinDispatchInfoBuilder(*builtIns, pCmdQ->getClDevice(), &origBuilder))); std::unique_ptr srcImage(Image1dArrayHelper<>::create(context)); @@ -615,10 +614,9 @@ HWTEST_F(EnqueueReadImageTest, GivenImage1DarrayWhenReadImageIsCalledThenRowPitc EXPECT_EQ(params->dstRowPitch, slicePitch); // restore original builder and retrieve mock builder - auto newBuilder = builtIns->setBuiltinDispatchInfoBuilder( + auto newBuilder = pClExecutionEnvironment->setBuiltinDispatchInfoBuilder( + rootDeviceIndex, copyBuiltIn, - pCmdQ->getContext(), - pCmdQ->getDevice(), std::move(oldBuilder)); EXPECT_NE(nullptr, newBuilder); } @@ -869,10 +867,9 @@ HWTEST_P(MipMapReadImageTest, GivenImageWithMipLevelNonZeroWhenReadImageIsCalled pCmdQ->getClDevice()); // substitute original builder with mock builder - auto oldBuilder = builtIns->setBuiltinDispatchInfoBuilder( + auto oldBuilder = pClExecutionEnvironment->setBuiltinDispatchInfoBuilder( + rootDeviceIndex, EBuiltInOps::CopyImage3dToBuffer, - pCmdQ->getContext(), - pCmdQ->getDevice(), std::unique_ptr(new MockBuiltinDispatchInfoBuilder(*builtIns, pCmdQ->getClDevice(), &origBuilder))); cl_int retVal = CL_SUCCESS; @@ -934,10 +931,9 @@ HWTEST_P(MipMapReadImageTest, GivenImageWithMipLevelNonZeroWhenReadImageIsCalled EXPECT_EQ(expectedMipLevel, params->srcMipLevel); // restore original builder and retrieve mock builder - auto newBuilder = builtIns->setBuiltinDispatchInfoBuilder( + auto newBuilder = pClExecutionEnvironment->setBuiltinDispatchInfoBuilder( + rootDeviceIndex, EBuiltInOps::CopyImage3dToBuffer, - pCmdQ->getContext(), - pCmdQ->getDevice(), std::move(oldBuilder)); EXPECT_NE(nullptr, newBuilder); } diff --git a/opencl/test/unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp index 849947bfd1..a332736d51 100644 --- a/opencl/test/unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp @@ -10,13 +10,13 @@ #include "shared/source/memory_manager/unified_memory_manager.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" +#include "shared/test/common/mocks/mock_builtins.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h" -#include "opencl/test/unit_test/mocks/mock_builtins.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "test.h" @@ -80,10 +80,9 @@ HWTEST_F(EnqueueSvmMemCopyTest, givenEnqueueSVMMemcpyWhenUsingCopyBufferToBuffer ASSERT_NE(nullptr, &origBuilder); // substitute original builder with mock builder - auto oldBuilder = builtIns->setBuiltinDispatchInfoBuilder( + auto oldBuilder = pClExecutionEnvironment->setBuiltinDispatchInfoBuilder( + rootDeviceIndex, EBuiltInOps::CopyBufferToBuffer, - pCmdQ->getContext(), - pCmdQ->getDevice(), std::unique_ptr(new MockBuiltinDispatchInfoBuilder(*builtIns, pCmdQ->getClDevice(), &origBuilder))); EXPECT_EQ(&origBuilder, oldBuilder.get()); @@ -100,10 +99,9 @@ HWTEST_F(EnqueueSvmMemCopyTest, givenEnqueueSVMMemcpyWhenUsingCopyBufferToBuffer EXPECT_EQ(CL_SUCCESS, retVal); // restore original builder and retrieve mock builder - auto newBuilder = builtIns->setBuiltinDispatchInfoBuilder( + auto newBuilder = pClExecutionEnvironment->setBuiltinDispatchInfoBuilder( + rootDeviceIndex, EBuiltInOps::CopyBufferToBuffer, - pCmdQ->getContext(), - pCmdQ->getDevice(), std::move(oldBuilder)); EXPECT_NE(nullptr, newBuilder); @@ -157,10 +155,9 @@ HWTEST_F(EnqueueSvmMemCopyTest, givenEnqueueSVMMemcpyWhenUsingCopyBufferToBuffer ASSERT_NE(nullptr, &origBuilder); // substitute original builder with mock builder - auto oldBuilder = builtIns->setBuiltinDispatchInfoBuilder( + auto oldBuilder = pClExecutionEnvironment->setBuiltinDispatchInfoBuilder( + rootDeviceIndex, EBuiltInOps::CopyBufferToBuffer, - pCmdQ->getContext(), - pCmdQ->getDevice(), std::unique_ptr(new MockBuiltinDispatchInfoBuilder(*builtIns, pCmdQ->getClDevice(), &origBuilder))); EXPECT_EQ(&origBuilder, oldBuilder.get()); @@ -177,10 +174,9 @@ HWTEST_F(EnqueueSvmMemCopyTest, givenEnqueueSVMMemcpyWhenUsingCopyBufferToBuffer EXPECT_EQ(CL_SUCCESS, retVal); // restore original builder and retrieve mock builder - auto newBuilder = builtIns->setBuiltinDispatchInfoBuilder( + auto newBuilder = pClExecutionEnvironment->setBuiltinDispatchInfoBuilder( + rootDeviceIndex, EBuiltInOps::CopyBufferToBuffer, - pCmdQ->getContext(), - pCmdQ->getDevice(), std::move(oldBuilder)); EXPECT_NE(nullptr, newBuilder); @@ -239,10 +235,9 @@ HWTEST_F(EnqueueSvmMemCopyTest, givenEnqueueSVMMemcpyWhenUsingCopyBufferToBuffer ASSERT_NE(nullptr, &origBuilder); // substitute original builder with mock builder - auto oldBuilder = builtIns->setBuiltinDispatchInfoBuilder( + auto oldBuilder = pClExecutionEnvironment->setBuiltinDispatchInfoBuilder( + rootDeviceIndex, EBuiltInOps::CopyBufferToBuffer, - pCmdQ->getContext(), - pCmdQ->getDevice(), std::unique_ptr(new MockBuiltinDispatchInfoBuilder(*builtIns, pCmdQ->getClDevice(), &origBuilder))); EXPECT_EQ(&origBuilder, oldBuilder.get()); @@ -259,10 +254,9 @@ HWTEST_F(EnqueueSvmMemCopyTest, givenEnqueueSVMMemcpyWhenUsingCopyBufferToBuffer EXPECT_EQ(CL_SUCCESS, retVal); // restore original builder and retrieve mock builder - auto newBuilder = builtIns->setBuiltinDispatchInfoBuilder( + auto newBuilder = pClExecutionEnvironment->setBuiltinDispatchInfoBuilder( + rootDeviceIndex, EBuiltInOps::CopyBufferToBuffer, - pCmdQ->getContext(), - pCmdQ->getDevice(), std::move(oldBuilder)); EXPECT_NE(nullptr, newBuilder); @@ -365,7 +359,7 @@ struct EnqueueSvmMemCopyHw : public ::testing::Test { void SetUp() override { - device = std::make_unique(MockDevice::createWithNewExecutionEnvironment(defaultHwInfo.get())); + device = std::make_unique(MockClDevice::createWithNewExecutionEnvironment(defaultHwInfo.get())); if (is32bit || !device->isFullRangeSvm()) { GTEST_SKIP(); } diff --git a/opencl/test/unit_test/command_queue/enqueue_svm_mem_fill_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_svm_mem_fill_tests.cpp index 346d110fb7..18605339dc 100644 --- a/opencl/test/unit_test/command_queue/enqueue_svm_mem_fill_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_svm_mem_fill_tests.cpp @@ -6,13 +6,13 @@ */ #include "shared/source/memory_manager/unified_memory_manager.h" +#include "shared/test/common/mocks/mock_builtins.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h" -#include "opencl/test/unit_test/mocks/mock_builtins.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" #include "test.h" @@ -82,10 +82,9 @@ HWTEST_P(EnqueueSvmMemFillTest, givenEnqueueSVMMemFillWhenUsingFillBufferBuilder ASSERT_NE(nullptr, &origBuilder); // substitute original builder with mock builder - auto oldBuilder = builtIns->setBuiltinDispatchInfoBuilder( + auto oldBuilder = pClExecutionEnvironment->setBuiltinDispatchInfoBuilder( + rootDeviceIndex, EBuiltInOps::FillBuffer, - pCmdQ->getContext(), - pCmdQ->getDevice(), std::unique_ptr(new MockFillBufferBuilder(*builtIns, pCmdQ->getClDevice(), &origBuilder, pattern, patternSize))); EXPECT_EQ(&origBuilder, oldBuilder.get()); @@ -102,10 +101,9 @@ HWTEST_P(EnqueueSvmMemFillTest, givenEnqueueSVMMemFillWhenUsingFillBufferBuilder EXPECT_EQ(CL_SUCCESS, retVal); // restore original builder and retrieve mock builder - auto newBuilder = builtIns->setBuiltinDispatchInfoBuilder( + auto newBuilder = pClExecutionEnvironment->setBuiltinDispatchInfoBuilder( + rootDeviceIndex, EBuiltInOps::FillBuffer, - pCmdQ->getContext(), - pCmdQ->getDevice(), std::move(oldBuilder)); EXPECT_NE(nullptr, newBuilder); @@ -150,7 +148,7 @@ struct EnqueueSvmMemFillHw : public ::testing::Test { void SetUp() override { - device = std::make_unique(MockDevice::createWithNewExecutionEnvironment(defaultHwInfo.get())); + device = std::make_unique(MockClDevice::createWithNewExecutionEnvironment(defaultHwInfo.get())); if (is32bit || !device->isFullRangeSvm()) { GTEST_SKIP(); } diff --git a/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_tests.cpp index bb2b5de6b9..f60f4c1e15 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_tests.cpp @@ -631,7 +631,7 @@ struct EnqueueWriteBufferRectHw : public ::testing::Test { if (is32bit) { GTEST_SKIP(); } - device = std::make_unique(MockDevice::createWithNewExecutionEnvironment(defaultHwInfo.get())); + device = std::make_unique(MockClDevice::createWithNewExecutionEnvironment(defaultHwInfo.get())); context.reset(new MockContext(device.get())); } 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 ab010c5ff0..99aa43828f 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 @@ -513,7 +513,7 @@ struct EnqueueWriteBufferHw : public ::testing::Test { if (is32bit) { GTEST_SKIP(); } - device = std::make_unique(MockDevice::createWithNewExecutionEnvironment(defaultHwInfo.get())); + device = std::make_unique(MockClDevice::createWithNewExecutionEnvironment(defaultHwInfo.get())); context.reset(new MockContext(device.get())); } diff --git a/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp index f30ca371c8..ed12bf5657 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp @@ -11,13 +11,13 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" +#include "shared/test/common/mocks/mock_builtins.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/test/unit_test/command_queue/enqueue_write_image_fixture.h" #include "opencl/test/unit_test/fixtures/one_mip_level_image_fixture.h" #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" #include "opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h" -#include "opencl/test/unit_test/mocks/mock_builtins.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "test.h" @@ -278,10 +278,9 @@ HWTEST_F(EnqueueWriteImageTest, GivenImage1DarrayWhenWriteImageIsCalledThenRowPi pCmdQ->getClDevice()); // substitute original builder with mock builder - auto oldBuilder = builtIns->setBuiltinDispatchInfoBuilder( + auto oldBuilder = pClExecutionEnvironment->setBuiltinDispatchInfoBuilder( + rootDeviceIndex, copyBuiltIn, - pCmdQ->getContext(), - pCmdQ->getDevice(), std::unique_ptr(new MockBuiltinDispatchInfoBuilder(*builtIns, pCmdQ->getClDevice(), &origBuilder))); std::unique_ptr image; @@ -300,10 +299,9 @@ HWTEST_F(EnqueueWriteImageTest, GivenImage1DarrayWhenWriteImageIsCalledThenRowPi EXPECT_EQ(params->srcRowPitch, slicePitch); // restore original builder and retrieve mock builder - auto newBuilder = builtIns->setBuiltinDispatchInfoBuilder( + auto newBuilder = pClExecutionEnvironment->setBuiltinDispatchInfoBuilder( + rootDeviceIndex, copyBuiltIn, - pCmdQ->getContext(), - pCmdQ->getDevice(), std::move(oldBuilder)); EXPECT_NE(nullptr, newBuilder); } @@ -461,10 +459,9 @@ HWTEST_P(MipMapWriteImageTest, GivenImageWithMipLevelNonZeroWhenReadImageIsCalle pCmdQ->getClDevice()); // substitute original builder with mock builder - auto oldBuilder = builtIns->setBuiltinDispatchInfoBuilder( + auto oldBuilder = pClExecutionEnvironment->setBuiltinDispatchInfoBuilder( + rootDeviceIndex, EBuiltInOps::CopyBufferToImage3d, - pCmdQ->getContext(), - pCmdQ->getDevice(), std::unique_ptr(new MockBuiltinDispatchInfoBuilder(*builtIns, pCmdQ->getClDevice(), &origBuilder))); cl_int retVal = CL_SUCCESS; @@ -529,10 +526,9 @@ HWTEST_P(MipMapWriteImageTest, GivenImageWithMipLevelNonZeroWhenReadImageIsCalle EXPECT_EQ(expectedMipLevel, params->dstMipLevel); // restore original builder and retrieve mock builder - auto newBuilder = builtIns->setBuiltinDispatchInfoBuilder( + auto newBuilder = pClExecutionEnvironment->setBuiltinDispatchInfoBuilder( + rootDeviceIndex, EBuiltInOps::CopyBufferToImage3d, - pCmdQ->getContext(), - pCmdQ->getDevice(), std::move(oldBuilder)); EXPECT_NE(nullptr, newBuilder); } diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_tests.cpp index 50a089b1db..8ca08a04d3 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_tests.cpp @@ -25,6 +25,7 @@ #include "shared/test/common/helpers/engine_descriptor_helper.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/mocks/mock_allocation_properties.h" +#include "shared/test/common/mocks/mock_builtins.h" #include "shared/test/common/mocks/mock_csr.h" #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" @@ -40,7 +41,6 @@ #include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h" #include "opencl/test/unit_test/helpers/raii_hw_helper.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" -#include "opencl/test/unit_test/mocks/mock_builtins.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_hw_helper.h" #include "opencl/test/unit_test/mocks/mock_platform.h" diff --git a/opencl/test/unit_test/device/device_caps_tests.cpp b/opencl/test/unit_test/device/device_caps_tests.cpp index 595e4d98f7..6523f284f7 100644 --- a/opencl/test/unit_test/device/device_caps_tests.cpp +++ b/opencl/test/unit_test/device/device_caps_tests.cpp @@ -12,6 +12,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/hw_helper_tests.h" #include "shared/test/common/helpers/variable_backup.h" +#include "shared/test/common/mocks/mock_builtins.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_driver_info.h" #include "shared/test/common/mocks/mock_execution_environment.h" @@ -21,7 +22,6 @@ #include "opencl/source/platform/extensions.h" #include "opencl/test/unit_test/fixtures/device_info_fixture.h" #include "opencl/test/unit_test/helpers/raii_hw_helper.h" -#include "opencl/test/unit_test/mocks/mock_builtins.h" #include "opencl/test/unit_test/mocks/ult_cl_device_factory.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" diff --git a/opencl/test/unit_test/fixtures/cl_device_fixture.cpp b/opencl/test/unit_test/fixtures/cl_device_fixture.cpp index 2bdf73eeb1..eeb996fc82 100644 --- a/opencl/test/unit_test/fixtures/cl_device_fixture.cpp +++ b/opencl/test/unit_test/fixtures/cl_device_fixture.cpp @@ -18,8 +18,9 @@ void ClDeviceFixture::SetUp() { } void ClDeviceFixture::SetUpImpl(const NEO::HardwareInfo *hardwareInfo) { - pDevice = MockDevice::createWithNewExecutionEnvironment(hardwareInfo, rootDeviceIndex); + pDevice = MockClDevice::createWithNewExecutionEnvironment(hardwareInfo, rootDeviceIndex); ASSERT_NE(nullptr, pDevice); + pClExecutionEnvironment = static_cast(pDevice->getExecutionEnvironment()); pClDevice = new MockClDevice{pDevice}; ASSERT_NE(nullptr, pClDevice); diff --git a/opencl/test/unit_test/fixtures/cl_device_fixture.h b/opencl/test/unit_test/fixtures/cl_device_fixture.h index 4ce3b9c611..b5446b323b 100644 --- a/opencl/test/unit_test/fixtures/cl_device_fixture.h +++ b/opencl/test/unit_test/fixtures/cl_device_fixture.h @@ -27,5 +27,6 @@ struct ClDeviceFixture { PLATFORM platformHelper = {}; OsContext *osContext = nullptr; const uint32_t rootDeviceIndex = 0u; + MockClExecutionEnvironment *pClExecutionEnvironment = nullptr; }; } // namespace NEO diff --git a/opencl/test/unit_test/mem_obj/buffer_bcs_tests.cpp b/opencl/test/unit_test/mem_obj/buffer_bcs_tests.cpp index b459e68563..204de07117 100644 --- a/opencl/test/unit_test/mem_obj/buffer_bcs_tests.cpp +++ b/opencl/test/unit_test/mem_obj/buffer_bcs_tests.cpp @@ -99,7 +99,7 @@ struct BcsBufferTests : public ::testing::Test { DebugManager.flags.EnableBlitterForEnqueueOperations.set(1); DebugManager.flags.ForceGpgpuSubmissionForBcsEnqueue.set(1); DebugManager.flags.PreferCopyEngineForCopyBufferToBuffer.set(1); - device = std::make_unique(MockDevice::createWithNewExecutionEnvironment(nullptr)); + device = std::make_unique(MockClDevice::createWithNewExecutionEnvironment(nullptr)); auto &capabilityTable = device->getRootDeviceEnvironment().getMutableHardwareInfo()->capabilityTable; bool createBcsEngine = !capabilityTable.blitterOperationsSupported; capabilityTable.blitterOperationsSupported = true; diff --git a/opencl/test/unit_test/mem_obj/buffer_tests.cpp b/opencl/test/unit_test/mem_obj/buffer_tests.cpp index e5640ed2e6..ee48430169 100644 --- a/opencl/test/unit_test/mem_obj/buffer_tests.cpp +++ b/opencl/test/unit_test/mem_obj/buffer_tests.cpp @@ -537,7 +537,7 @@ TEST(Buffer, givenZeroFlagsNoSharedContextAndRenderCompressedBuffersDisabledWhen } TEST(Buffer, givenClMemCopyHostPointerPassedToBufferCreateWhenAllocationIsNotInSystemMemoryPoolThenAllocationIsWrittenByEnqueueWriteBuffer) { - ExecutionEnvironment *executionEnvironment = MockDevice::prepareExecutionEnvironment(defaultHwInfo.get(), 0u); + ExecutionEnvironment *executionEnvironment = MockClDevice::prepareExecutionEnvironment(defaultHwInfo.get(), 0u); auto *memoryManager = new ::testing::NiceMock(*executionEnvironment); executionEnvironment->memoryManager.reset(memoryManager); diff --git a/opencl/test/unit_test/mem_obj/image_release_mapped_ptr_tests.cpp b/opencl/test/unit_test/mem_obj/image_release_mapped_ptr_tests.cpp index fbb4bed286..973ec3a7e7 100644 --- a/opencl/test/unit_test/mem_obj/image_release_mapped_ptr_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_release_mapped_ptr_tests.cpp @@ -49,7 +49,7 @@ class MyMockCommandQueue : public CommandQueueHw { class ImageUnmapTest : public ::testing::Test { public: void SetUp() override { - device = std::make_unique(MockDevice::createWithNewExecutionEnvironment(defaultHwInfo.get())); + device = std::make_unique(MockClDevice::createWithNewExecutionEnvironment(defaultHwInfo.get())); context = std::make_unique(device.get()); image.reset(ImageHelper>::create(context.get())); } @@ -89,7 +89,6 @@ HWTEST_F(ImageUnmapTest, givenImageWhenEnqueueMapImageIsCalledTwiceThenAllocated cl_int retVal; size_t origin[] = {0, 0, 0}; size_t region[] = {1, 1, 1}; - auto device = std::make_unique(MockDevice::createWithNewExecutionEnvironment(nullptr)); std::unique_ptr commandQueue(CommandQueue::create(context.get(), device.get(), nullptr, false, retVal)); commandQueue->enqueueMapImage(image.get(), CL_FALSE, 0, origin, region, nullptr, nullptr, 0, nullptr, nullptr, retVal); EXPECT_NE(nullptr, image->getAllocatedMapPtr()); diff --git a/opencl/test/unit_test/mem_obj/nv12_image_tests.cpp b/opencl/test/unit_test/mem_obj/nv12_image_tests.cpp index bdbce4f111..58b0971fcc 100644 --- a/opencl/test/unit_test/mem_obj/nv12_image_tests.cpp +++ b/opencl/test/unit_test/mem_obj/nv12_image_tests.cpp @@ -339,7 +339,7 @@ TEST_F(Nv12ImageTest, GivenOffsetOfUVPlaneWhenCreatingUVPlaneImageThenDimensions HWTEST_F(Nv12ImageTest, WhenCreatingParentImageThenPlanesAreWritten) { KernelBinaryHelper kbHelper(KernelBinaryHelper::BUILT_INS_WITH_IMAGES); - auto device = std::make_unique(MockDevice::createWithNewExecutionEnvironment(nullptr)); + auto device = std::make_unique(MockClDevice::createWithNewExecutionEnvironment(nullptr)); char hostPtr[16 * 16 * 16]; auto contextWithMockCmdQ = new MockContext(device.get(), true); auto cmdQ = new MockCommandQueueHw(contextWithMockCmdQ, device.get(), 0); diff --git a/opencl/test/unit_test/mocks/CMakeLists.txt b/opencl/test/unit_test/mocks/CMakeLists.txt index 9097525bcb..75aa9a68c8 100644 --- a/opencl/test/unit_test/mocks/CMakeLists.txt +++ b/opencl/test/unit_test/mocks/CMakeLists.txt @@ -12,8 +12,6 @@ set(IGDRCL_SRCS_tests_mocks ${CMAKE_CURRENT_SOURCE_DIR}/mock_aub_subcapture_manager.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_block_kernel_manager.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_buffer.h - ${CMAKE_CURRENT_SOURCE_DIR}/mock_builtins.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/mock_builtins.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_cl_device.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mock_cl_device.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_cl_execution_environment.h diff --git a/opencl/test/unit_test/mocks/mock_builtins.cpp b/opencl/test/unit_test/mocks/mock_builtins.cpp deleted file mode 100644 index 341ea65c85..0000000000 --- a/opencl/test/unit_test/mocks/mock_builtins.cpp +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (C) 2019-2021 Intel Corporation - * - * SPDX-License-Identifier: MIT - * - */ - -#include "opencl/test/unit_test/mocks/mock_builtins.h" - -#include "opencl/source/built_ins/builtins_dispatch_builder.h" - -namespace NEO { - -std::unique_ptr MockBuiltins::setBuiltinDispatchInfoBuilder(EBuiltInOps::Type operation, Context &context, Device &device, std::unique_ptr builder) { - uint32_t operationId = static_cast(operation); - auto &operationBuilder = BuiltinOpsBuilders[operationId]; - std::call_once(operationBuilder.second, [] {}); - operationBuilder.first.swap(builder); - return builder; -} - -} // namespace NEO diff --git a/opencl/test/unit_test/mocks/mock_cl_device.h b/opencl/test/unit_test/mocks/mock_cl_device.h index 5c662b54ab..c50c00029d 100644 --- a/opencl/test/unit_test/mocks/mock_cl_device.h +++ b/opencl/test/unit_test/mocks/mock_cl_device.h @@ -65,14 +65,18 @@ class MockClDevice : public ClDevice { } template static T *createWithNewExecutionEnvironment(const HardwareInfo *pHwInfo, uint32_t rootDeviceIndex = 0) { + auto executionEnvironment = prepareExecutionEnvironment(pHwInfo, rootDeviceIndex); + return MockDevice::createWithExecutionEnvironment(pHwInfo, executionEnvironment, rootDeviceIndex); + } + static ExecutionEnvironment *prepareExecutionEnvironment(const HardwareInfo *pHwInfo, uint32_t rootDeviceIndex) { auto executionEnvironment = new MockClExecutionEnvironment(); - auto numRootDevices = DebugManager.flags.CreateMultipleRootDevices.get() ? DebugManager.flags.CreateMultipleRootDevices.get() : 1u; + auto numRootDevices = DebugManager.flags.CreateMultipleRootDevices.get() ? DebugManager.flags.CreateMultipleRootDevices.get() : rootDeviceIndex + 1; executionEnvironment->prepareRootDeviceEnvironments(numRootDevices); pHwInfo = pHwInfo ? pHwInfo : defaultHwInfo.get(); for (auto i = 0u; i < executionEnvironment->rootDeviceEnvironments.size(); i++) { executionEnvironment->rootDeviceEnvironments[i]->setHwInfo(pHwInfo); } - return MockDevice::createWithExecutionEnvironment(pHwInfo, executionEnvironment, rootDeviceIndex); + return executionEnvironment; } SubDevice *createSubDevice(uint32_t subDeviceIndex) { return device.createSubDevice(subDeviceIndex); } std::unique_ptr createCommandStreamReceiver() const { return device.createCommandStreamReceiver(); } diff --git a/opencl/test/unit_test/mocks/mock_cl_execution_environment.h b/opencl/test/unit_test/mocks/mock_cl_execution_environment.h index da87eec333..8bbf7cad11 100644 --- a/opencl/test/unit_test/mocks/mock_cl_execution_environment.h +++ b/opencl/test/unit_test/mocks/mock_cl_execution_environment.h @@ -6,12 +6,21 @@ */ #pragma once +#include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/execution_environment/cl_execution_environment.h" namespace NEO { class MockClExecutionEnvironment : public ClExecutionEnvironment { public: using ClExecutionEnvironment::asyncEventsHandler; + using ClExecutionEnvironment::builtinOpsBuilders; using ClExecutionEnvironment::ClExecutionEnvironment; + std::unique_ptr setBuiltinDispatchInfoBuilder(uint32_t rootDeviceIndex, EBuiltInOps::Type operation, std::unique_ptr builder) { + uint32_t operationId = static_cast(operation); + auto &operationBuilder = peekBuilders(rootDeviceIndex)[operationId]; + std::call_once(operationBuilder.second, [] {}); + operationBuilder.first.swap(builder); + return builder; + } }; } // namespace NEO diff --git a/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.h b/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.h index e8a44c0b99..db0c1ba561 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.h +++ b/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.h @@ -13,12 +13,12 @@ #include "shared/test/common/helpers/ult_hw_config.h" #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/mocks/linux/mock_drm_memory_manager.h" +#include "shared/test/common/mocks/mock_builtins.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_execution_environment.h" #include "opencl/test/unit_test/fixtures/memory_management_fixture.h" #include "opencl/test/unit_test/mocks/linux/mock_drm_command_stream_receiver.h" -#include "opencl/test/unit_test/mocks/mock_builtins.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.h" @@ -64,7 +64,7 @@ class DrmMemoryManagerFixture : public MemoryManagementFixture { environmentWrapper.setCsrType>(); allocationData.rootDeviceIndex = rootDeviceIndex; this->mock = mock; - executionEnvironment = new MockExecutionEnvironment(defaultHwInfo.get(), false, numRootDevices); + executionEnvironment = MockClDevice::prepareExecutionEnvironment(defaultHwInfo.get(), numRootDevices - 1); executionEnvironment->incRefInternal(); for (auto i = 0u; i < numRootDevices; i++) { auto rootDeviceEnvironment = executionEnvironment->rootDeviceEnvironments[i].get(); diff --git a/opencl/test/unit_test/os_interface/windows/device_command_stream_tests.cpp b/opencl/test/unit_test/os_interface/windows/device_command_stream_tests.cpp index f2bcfd64a5..301a4cd2b2 100644 --- a/opencl/test/unit_test/os_interface/windows/device_command_stream_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/device_command_stream_tests.cpp @@ -27,6 +27,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/dispatch_flags_helper.h" #include "shared/test/common/helpers/engine_descriptor_helper.h" +#include "shared/test/common/mocks/mock_builtins.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_gmm_page_table_mngr.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" @@ -43,7 +44,6 @@ #include "opencl/test/unit_test/fixtures/memory_management_fixture.h" #include "opencl/test/unit_test/helpers/execution_environment_helper.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" -#include "opencl/test/unit_test/mocks/mock_builtins.h" #include "opencl/test/unit_test/mocks/mock_platform.h" #include "opencl/test/unit_test/mocks/mock_program.h" #include "opencl/test/unit_test/mocks/mock_submissions_aggregator.h" diff --git a/opencl/test/unit_test/platform/platform_tests.cpp b/opencl/test/unit_test/platform/platform_tests.cpp index 4899770f7a..44ac479ca2 100644 --- a/opencl/test/unit_test/platform/platform_tests.cpp +++ b/opencl/test/unit_test/platform/platform_tests.cpp @@ -12,6 +12,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/ult_hw_config.h" #include "shared/test/common/helpers/variable_backup.h" +#include "shared/test/common/mocks/mock_builtins.h" #include "shared/test/common/mocks/mock_csr.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_execution_environment.h" @@ -23,7 +24,6 @@ #include "opencl/source/platform/extensions.h" #include "opencl/source/sharings/sharing_factory.h" #include "opencl/test/unit_test/fixtures/platform_fixture.h" -#include "opencl/test/unit_test/mocks/mock_builtins.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_platform.h" #include "opencl/test/unit_test/mocks/ult_cl_device_factory.h" diff --git a/opencl/test/unit_test/source_level_debugger/source_level_debugger_csr_tests.h b/opencl/test/unit_test/source_level_debugger/source_level_debugger_csr_tests.h index 8a225ab1e5..007e5287e8 100644 --- a/opencl/test/unit_test/source_level_debugger/source_level_debugger_csr_tests.h +++ b/opencl/test/unit_test/source_level_debugger/source_level_debugger_csr_tests.h @@ -5,6 +5,7 @@ * */ +#include "shared/test/common/mocks/mock_builtins.h" #include "shared/test/common/mocks/mock_csr.h" #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/mocks/mock_os_library.h" @@ -12,7 +13,6 @@ #include "shared/test/common/mocks/mock_source_level_debugger.h" #include "opencl/test/unit_test/helpers/execution_environment_helper.h" -#include "opencl/test/unit_test/mocks/mock_builtins.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "test.h" diff --git a/shared/source/built_ins/built_ins.cpp b/shared/source/built_ins/built_ins.cpp index a3ca0eab01..effd787b10 100644 --- a/shared/source/built_ins/built_ins.cpp +++ b/shared/source/built_ins/built_ins.cpp @@ -14,9 +14,6 @@ #include "shared/source/helpers/debug_helpers.h" #include "shared/source/memory_manager/memory_manager.h" -#include "opencl/source/helpers/convert_color.h" -#include "opencl/source/helpers/dispatch_info_builder.h" - #include "compiler_options.h" #include diff --git a/shared/source/built_ins/built_ins.h b/shared/source/built_ins/built_ins.h index 34040ca493..ad50b55986 100644 --- a/shared/source/built_ins/built_ins.h +++ b/shared/source/built_ins/built_ins.h @@ -28,7 +28,6 @@ namespace NEO { typedef std::vector BuiltinResourceT; class Device; -class Program; class SipKernel; class MemoryManager; @@ -145,11 +144,8 @@ class BuiltinsLib { std::mutex mutex; }; -class BuiltinDispatchInfoBuilder; - class BuiltIns { public: - std::pair, std::once_flag> BuiltinOpsBuilders[static_cast(EBuiltInOps::COUNT)]; BuiltIns(); virtual ~BuiltIns(); @@ -175,8 +171,6 @@ class BuiltIns { std::unique_ptr builtinsLib; - using ProgramsContainerT = std::array, std::once_flag>, static_cast(EBuiltInOps::COUNT)>; - ProgramsContainerT builtinPrograms; bool enableCacheing = true; }; diff --git a/shared/source/execution_environment/execution_environment.h b/shared/source/execution_environment/execution_environment.h index 4c2658b8d6..400e05523b 100644 --- a/shared/source/execution_environment/execution_environment.h +++ b/shared/source/execution_environment/execution_environment.h @@ -24,7 +24,7 @@ class ExecutionEnvironment : public ReferenceTrackedObject MOCKABLE_VIRTUAL bool initializeMemoryManager(); void calculateMaxOsContextCount(); - void prepareRootDeviceEnvironments(uint32_t numRootDevices); + virtual void prepareRootDeviceEnvironments(uint32_t numRootDevices); void parseAffinityMask(); void sortNeoDevices(); void setDebuggingEnabled() { diff --git a/shared/test/common/mocks/CMakeLists.txt b/shared/test/common/mocks/CMakeLists.txt index f25fd4a45f..f61883687a 100644 --- a/shared/test/common/mocks/CMakeLists.txt +++ b/shared/test/common/mocks/CMakeLists.txt @@ -21,6 +21,7 @@ set(NEO_CORE_tests_mocks ${CMAKE_CURRENT_SOURCE_DIR}/mock_aub_file_stream.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_aub_manager.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_bindless_heaps_helper.h + ${CMAKE_CURRENT_SOURCE_DIR}/mock_builtins.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_builtinslib.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_cif.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mock_cif.h diff --git a/opencl/test/unit_test/mocks/mock_builtins.h b/shared/test/common/mocks/mock_builtins.h similarity index 80% rename from opencl/test/unit_test/mocks/mock_builtins.h rename to shared/test/common/mocks/mock_builtins.h index 9f78f2b9f3..4e50870d3a 100644 --- a/opencl/test/unit_test/mocks/mock_builtins.h +++ b/shared/test/common/mocks/mock_builtins.h @@ -11,8 +11,6 @@ #include "shared/source/built_ins/sip.h" #include "shared/test/common/mocks/mock_sip.h" -#include "opencl/source/built_ins/builtins_dispatch_builder.h" - #include namespace NEO { @@ -31,7 +29,6 @@ class MockBuiltins : public BuiltIns { void overrideSipKernel(std::unique_ptr kernel) { sipKernelsOverride[kernel->getType()] = std::move(kernel); } - std::unique_ptr setBuiltinDispatchInfoBuilder(EBuiltInOps::Type operation, Context &context, Device &device, std::unique_ptr builder); std::map> sipKernelsOverride; bool getSipKernelCalled = false; SipKernelType getSipKernelType = SipKernelType::COUNT; diff --git a/shared/test/unit_test/preemption/preemption_tests.cpp b/shared/test/unit_test/preemption/preemption_tests.cpp index 94d3b86442..6cea1582e5 100644 --- a/shared/test/unit_test/preemption/preemption_tests.cpp +++ b/shared/test/unit_test/preemption/preemption_tests.cpp @@ -12,11 +12,10 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/dispatch_flags_helper.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" +#include "shared/test/common/mocks/mock_builtins.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" -#include "opencl/test/unit_test/mocks/mock_builtins.h" - #include "gmock/gmock.h" using namespace NEO;