From d1b2311207b51a3030923a2d99ea8ce751d97abc Mon Sep 17 00:00:00 2001 From: "Warchulski, Jaroslaw" Date: Tue, 7 Feb 2023 09:48:35 +0000 Subject: [PATCH] Cleanup includes 49 Cleaned up files: opencl/source/command_queue/command_queue_hw.h opencl/source/gtpin/gtpin_defs.h opencl/source/mem_obj/mem_obj_helper.h opencl/source/memory_manager/mem_obj_surface.h opencl/source/sharings/unified/unified_sharing.h opencl/test/unit_test/api/cl_enqueue_migrate_mem_objects_tests.inl opencl/test/unit_test/aub_tests/fixtures/unified_memory_fixture.h opencl/test/unit_test/command_queue/command_queue_fixture.h Related-To: NEO-5548 Signed-off-by: Warchulski, Jaroslaw --- .../source/command_queue/command_queue_hw.h | 1 - opencl/source/gtpin/gtpin_defs.h | 4 +- opencl/source/mem_obj/mem_obj.cpp | 6 -- opencl/source/mem_obj/mem_obj_helper.cpp | 1 + opencl/source/mem_obj/mem_obj_helper.h | 5 +- opencl/source/memory_manager/CMakeLists.txt | 3 +- .../source/memory_manager/mem_obj_surface.cpp | 34 ++++++++ .../source/memory_manager/mem_obj_surface.h | 24 ++---- .../source/sharings/unified/unified_buffer.h | 4 +- .../source/sharings/unified/unified_image.h | 4 +- .../source/sharings/unified/unified_sharing.h | 3 +- .../unit_test/api/cl_create_buffer_tests.cpp | 5 +- .../cl_enqueue_migrate_mem_objects_tests.inl | 3 +- .../api/cl_enqueue_svm_migrate_mem_tests.cpp | 4 +- ...ine_data_local_id_tests_xehp_and_later.cpp | 1 + ...aub_scratch_space_tests_xehp_and_later.cpp | 3 +- .../compression_aub_tests_xehp_and_later.cpp | 1 + ...queue_write_copy_read_buffer_aub_tests.cpp | 4 +- ..._walker_partition_tests_xehp_and_later.cpp | 1 + .../aub_tests/fixtures/CMakeLists.txt | 3 +- .../fixtures/unified_memory_fixture.cpp | 81 +++++++++++++++++++ .../fixtures/unified_memory_fixture.h | 71 +--------------- .../unified_memory_aub_tests.cpp | 3 +- .../unified_memory_copy_aub_tests.cpp | 3 +- .../command_queue/command_queue_fixture.h | 1 - .../unit_test/command_queue/oom_tests.cpp | 1 + .../driver_diagnostics_enqueue_tests.cpp | 1 + .../unit_test/fixtures/hello_world_fixture.h | 1 + opencl/test/unit_test/mem_obj/pipe_tests.cpp | 2 - .../unit_test/program/program_nonuniform.cpp | 1 + .../sharings/va/va_base_object_tests.cpp | 3 +- 31 files changed, 162 insertions(+), 120 deletions(-) create mode 100644 opencl/source/memory_manager/mem_obj_surface.cpp create mode 100644 opencl/test/unit_test/aub_tests/fixtures/unified_memory_fixture.cpp diff --git a/opencl/source/command_queue/command_queue_hw.h b/opencl/source/command_queue/command_queue_hw.h index 4595b20006..5a7e9e3ced 100644 --- a/opencl/source/command_queue/command_queue_hw.h +++ b/opencl/source/command_queue/command_queue_hw.h @@ -19,7 +19,6 @@ #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/helpers/queue_helpers.h" -#include "opencl/source/mem_obj/mem_obj.h" #include "opencl/source/program/printf_handler.h" #include diff --git a/opencl/source/gtpin/gtpin_defs.h b/opencl/source/gtpin/gtpin_defs.h index 1f5584c303..b2214c5303 100644 --- a/opencl/source/gtpin/gtpin_defs.h +++ b/opencl/source/gtpin/gtpin_defs.h @@ -1,13 +1,11 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #pragma once - -#include "opencl/source/command_queue/command_queue.h" #include "opencl/source/kernel/kernel.h" #include "CL/cl.h" diff --git a/opencl/source/mem_obj/mem_obj.cpp b/opencl/source/mem_obj/mem_obj.cpp index f96edb813d..3cc97729ff 100644 --- a/opencl/source/mem_obj/mem_obj.cpp +++ b/opencl/source/mem_obj/mem_obj.cpp @@ -7,20 +7,14 @@ #include "opencl/source/mem_obj/mem_obj.h" -#include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/gmm_helper/gmm.h" #include "shared/source/gmm_helper/resource_info.h" -#include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/bit_helpers.h" #include "shared/source/helpers/get_info.h" #include "shared/source/memory_manager/allocation_properties.h" -#include "shared/source/memory_manager/deferred_deleter.h" -#include "shared/source/memory_manager/internal_allocation_storage.h" #include "shared/source/memory_manager/memory_manager.h" -#include "shared/source/os_interface/os_context.h" #include "opencl/source/cl_device/cl_device.h" -#include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" #include "opencl/source/helpers/get_info_status_mapper.h" #include "opencl/source/helpers/mipmap.h" diff --git a/opencl/source/mem_obj/mem_obj_helper.cpp b/opencl/source/mem_obj/mem_obj_helper.cpp index 55c0707ac5..6f8d252314 100644 --- a/opencl/source/mem_obj/mem_obj_helper.cpp +++ b/opencl/source/mem_obj/mem_obj_helper.cpp @@ -15,6 +15,7 @@ #include "opencl/source/cl_device/cl_device.h" #include "opencl/source/context/context.h" #include "opencl/source/helpers/cl_gfx_core_helper.h" +#include "opencl/source/mem_obj/mem_obj.h" namespace NEO { diff --git a/opencl/source/mem_obj/mem_obj_helper.h b/opencl/source/mem_obj/mem_obj_helper.h index 2d5c7eb5b0..b8f8ddff2e 100644 --- a/opencl/source/mem_obj/mem_obj_helper.h +++ b/opencl/source/mem_obj/mem_obj_helper.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,13 +11,14 @@ #include "shared/source/memory_manager/unified_memory_manager.h" #include "opencl/extensions/public/cl_ext_private.h" -#include "opencl/source/mem_obj/mem_obj.h" #include "CL/cl.h" #include "memory_properties_flags.h" namespace NEO { +class Context; + class MemObjHelper { public: static const uint64_t extraFlags; diff --git a/opencl/source/memory_manager/CMakeLists.txt b/opencl/source/memory_manager/CMakeLists.txt index 47255a3a6c..c8e9807303 100644 --- a/opencl/source/memory_manager/CMakeLists.txt +++ b/opencl/source/memory_manager/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2018-2021 Intel Corporation +# Copyright (C) 2018-2023 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -8,6 +8,7 @@ set(RUNTIME_SRCS_MEMORY_MANAGER ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/compression_selector_ocl.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cpu_page_fault_manager_memory_sync.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/mem_obj_surface.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mem_obj_surface.h ${CMAKE_CURRENT_SOURCE_DIR}/migration_controller.cpp ${CMAKE_CURRENT_SOURCE_DIR}/migration_controller.h diff --git a/opencl/source/memory_manager/mem_obj_surface.cpp b/opencl/source/memory_manager/mem_obj_surface.cpp new file mode 100644 index 0000000000..ad458dc301 --- /dev/null +++ b/opencl/source/memory_manager/mem_obj_surface.cpp @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2023 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ + +#include "opencl/source/memory_manager/mem_obj_surface.h" + +#include "shared/source/command_stream/command_stream_receiver.h" + +#include "opencl/source/mem_obj/mem_obj.h" + +namespace NEO { + +MemObjSurface::MemObjSurface(MemObj *memObj) : Surface(memObj->getMultiGraphicsAllocation().isCoherent()), memObj(memObj) { + memObj->incRefInternal(); +} + +MemObjSurface::~MemObjSurface() { + memObj->decRefInternal(); + memObj = nullptr; +}; + +void MemObjSurface::makeResident(CommandStreamReceiver &csr) { + DEBUG_BREAK_IF(!memObj); + csr.makeResident(*memObj->getGraphicsAllocation(csr.getRootDeviceIndex())); +} + +Surface *MemObjSurface::duplicate() { + return new MemObjSurface(this->memObj); +}; + +} // namespace NEO \ No newline at end of file diff --git a/opencl/source/memory_manager/mem_obj_surface.h b/opencl/source/memory_manager/mem_obj_surface.h index 37ce374c67..18075cc057 100644 --- a/opencl/source/memory_manager/mem_obj_surface.h +++ b/opencl/source/memory_manager/mem_obj_surface.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,28 +8,18 @@ #pragma once #include "shared/source/memory_manager/surface.h" -#include "opencl/source/mem_obj/mem_obj.h" - namespace NEO { +class MemObj; + class MemObjSurface : public Surface { public: - MemObjSurface(MemObj *memObj) : Surface(memObj->getMultiGraphicsAllocation().isCoherent()), memObj(memObj) { - memObj->incRefInternal(); - } - ~MemObjSurface() override { - memObj->decRefInternal(); - memObj = nullptr; - }; + MemObjSurface(MemObj *memObj); + ~MemObjSurface() override; - void makeResident(CommandStreamReceiver &csr) override { - DEBUG_BREAK_IF(!memObj); - csr.makeResident(*memObj->getGraphicsAllocation(csr.getRootDeviceIndex())); - } + void makeResident(CommandStreamReceiver &csr) override; - Surface *duplicate() override { - return new MemObjSurface(this->memObj); - }; + Surface *duplicate() override; protected: class MemObj *memObj; diff --git a/opencl/source/sharings/unified/unified_buffer.h b/opencl/source/sharings/unified/unified_buffer.h index 1e5681cb52..31c1e9138d 100644 --- a/opencl/source/sharings/unified/unified_buffer.h +++ b/opencl/source/sharings/unified/unified_buffer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2020 Intel Corporation + * Copyright (C) 2019-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,6 +9,8 @@ #include "opencl/source/sharings/unified/unified_sharing.h" +#include "CL/cl.h" + namespace NEO { class Buffer; class Context; diff --git a/opencl/source/sharings/unified/unified_image.h b/opencl/source/sharings/unified/unified_image.h index d0b1fe9104..54ae385a29 100644 --- a/opencl/source/sharings/unified/unified_image.h +++ b/opencl/source/sharings/unified/unified_image.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2020 Intel Corporation + * Copyright (C) 2019-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,6 +9,8 @@ #include "opencl/source/sharings/unified/unified_sharing.h" +#include "CL/cl.h" + namespace NEO { class Image; class Context; diff --git a/opencl/source/sharings/unified/unified_sharing.h b/opencl/source/sharings/unified/unified_sharing.h index 9fb168e927..9eff3245dd 100644 --- a/opencl/source/sharings/unified/unified_sharing.h +++ b/opencl/source/sharings/unified/unified_sharing.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2022 Intel Corporation + * Copyright (C) 2019-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,6 @@ #pragma once -#include "opencl/source/mem_obj/mem_obj.h" #include "opencl/source/sharings/sharing.h" #include "opencl/source/sharings/unified/unified_sharing_types.h" diff --git a/opencl/test/unit_test/api/cl_create_buffer_tests.cpp b/opencl/test/unit_test/api/cl_create_buffer_tests.cpp index 8ecf2eab6b..eab60a8adb 100644 --- a/opencl/test/unit_test/api/cl_create_buffer_tests.cpp +++ b/opencl/test/unit_test/api/cl_create_buffer_tests.cpp @@ -1,19 +1,16 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_memory_manager.h" -#include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "opencl/test/unit_test/mocks/mock_program.h" #include "cl_api_tests.h" diff --git a/opencl/test/unit_test/api/cl_enqueue_migrate_mem_objects_tests.inl b/opencl/test/unit_test/api/cl_enqueue_migrate_mem_objects_tests.inl index 24247f54b2..77b628fee5 100644 --- a/opencl/test/unit_test/api/cl_enqueue_migrate_mem_objects_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_migrate_mem_objects_tests.inl @@ -1,11 +1,10 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" #include "opencl/source/event/event.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" diff --git a/opencl/test/unit_test/api/cl_enqueue_svm_migrate_mem_tests.cpp b/opencl/test/unit_test/api/cl_enqueue_svm_migrate_mem_tests.cpp index 99df7aeadf..2325a4934e 100644 --- a/opencl/test/unit_test/api/cl_enqueue_svm_migrate_mem_tests.cpp +++ b/opencl/test/unit_test/api/cl_enqueue_svm_migrate_mem_tests.cpp @@ -1,16 +1,14 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/device/device.h" #include "shared/source/memory_manager/graphics_allocation.h" #include "shared/source/memory_manager/unified_memory_manager.h" #include "shared/test/common/mocks/mock_device.h" -#include "opencl/source/command_queue/command_queue.h" #include "opencl/source/event/user_event.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_context.h" diff --git a/opencl/test/unit_test/aub_tests/command_queue/aub_inline_data_local_id_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_queue/aub_inline_data_local_id_tests_xehp_and_later.cpp index cfe9ea748d..edea5a4410 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/aub_inline_data_local_id_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/aub_inline_data_local_id_tests_xehp_and_later.cpp @@ -10,6 +10,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/test_macros/hw_test.h" +#include "opencl/source/command_queue/command_queue.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h" #include "opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h" diff --git a/opencl/test/unit_test/aub_tests/command_queue/aub_scratch_space_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_queue/aub_scratch_space_tests_xehp_and_later.cpp index 03eb5cb71e..c7e426a13e 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/aub_scratch_space_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/aub_scratch_space_tests_xehp_and_later.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,6 +10,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/test_macros/hw_test.h" +#include "opencl/source/command_queue/command_queue.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h" #include "opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h" diff --git a/opencl/test/unit_test/aub_tests/command_queue/compression_aub_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_queue/compression_aub_tests_xehp_and_later.cpp index 0e518fcfe9..d18ca30999 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/compression_aub_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/compression_aub_tests_xehp_and_later.cpp @@ -14,6 +14,7 @@ #include "shared/test/common/test_macros/test_checks_shared.h" #include "opencl/extensions/public/cl_ext_private.h" +#include "opencl/source/command_queue/command_queue.h" #include "opencl/source/helpers/cl_memory_properties_helpers.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/mem_obj/image.h" diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.cpp index bcec94f536..539d84f5f0 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,6 +10,8 @@ #include "shared/source/memory_manager/allocations_list.h" #include "shared/test/common/test_macros/hw_test.h" +#include "opencl/source/command_queue/command_queue.h" + using namespace NEO; template diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_walker_partition_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_stream/aub_walker_partition_tests_xehp_and_later.cpp index 1ef9ebaa26..6bb18c7987 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_walker_partition_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_walker_partition_tests_xehp_and_later.cpp @@ -16,6 +16,7 @@ #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/test_macros/hw_test.h" +#include "opencl/source/command_queue/command_queue.h" #include "opencl/source/event/event.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h" diff --git a/opencl/test/unit_test/aub_tests/fixtures/CMakeLists.txt b/opencl/test/unit_test/aub_tests/fixtures/CMakeLists.txt index 71dfc43afe..c16800f8a7 100644 --- a/opencl/test/unit_test/aub_tests/fixtures/CMakeLists.txt +++ b/opencl/test/unit_test/aub_tests/fixtures/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2018-2022 Intel Corporation +# Copyright (C) 2018-2023 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -15,6 +15,7 @@ target_sources(igdrcl_aub_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/multicontext_aub_fixture.h ${CMAKE_CURRENT_SOURCE_DIR}/run_kernel_fixture.h ${CMAKE_CURRENT_SOURCE_DIR}/simple_arg_fixture.h + ${CMAKE_CURRENT_SOURCE_DIR}/unified_memory_fixture.cpp ${CMAKE_CURRENT_SOURCE_DIR}/unified_memory_fixture.h ) add_subdirectories() diff --git a/opencl/test/unit_test/aub_tests/fixtures/unified_memory_fixture.cpp b/opencl/test/unit_test/aub_tests/fixtures/unified_memory_fixture.cpp new file mode 100644 index 0000000000..bf5bfae759 --- /dev/null +++ b/opencl/test/unit_test/aub_tests/fixtures/unified_memory_fixture.cpp @@ -0,0 +1,81 @@ +/* + * Copyright (C) 2023 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ + +#include "opencl/test/unit_test/aub_tests/fixtures/unified_memory_fixture.h" + +#include "shared/source/memory_manager/memory_manager.h" + +#include "opencl/source/command_queue/command_queue.h" + +namespace NEO { + +void UnifiedMemoryAubFixture::setUp() { + if (PagaFaultManagerTestConfig::disabled) { + skipped = true; + GTEST_SKIP(); + } + AUBFixture::setUp(nullptr); + if (!platform()->peekExecutionEnvironment()->memoryManager->getPageFaultManager()) { + skipped = true; + GTEST_SKIP(); + } +} + +void *UnifiedMemoryAubFixture::allocateUSM(InternalMemoryType type) { + void *ptr = nullptr; + if (!this->skipped) { + switch (type) { + case DEVICE_UNIFIED_MEMORY: + ptr = clDeviceMemAllocINTEL(this->context, this->device.get(), nullptr, dataSize, 0, &retVal); + break; + case HOST_UNIFIED_MEMORY: + ptr = clHostMemAllocINTEL(this->context, nullptr, dataSize, 0, &retVal); + break; + case SHARED_UNIFIED_MEMORY: + ptr = clSharedMemAllocINTEL(this->context, this->device.get(), nullptr, dataSize, 0, &retVal); + break; + default: + ptr = new char[dataSize]; + break; + } + EXPECT_EQ(retVal, CL_SUCCESS); + EXPECT_NE(ptr, nullptr); + } + return ptr; +} + +void UnifiedMemoryAubFixture::freeUSM(void *ptr, InternalMemoryType type) { + if (!this->skipped) { + switch (type) { + case DEVICE_UNIFIED_MEMORY: + case HOST_UNIFIED_MEMORY: + case SHARED_UNIFIED_MEMORY: + retVal = clMemFreeINTEL(this->context, ptr); + break; + default: + delete[] static_cast(ptr); + break; + } + EXPECT_EQ(retVal, CL_SUCCESS); + } +} + +void UnifiedMemoryAubFixture::writeToUsmMemory(std::vector data, void *ptr, InternalMemoryType type) { + if (!this->skipped) { + switch (type) { + case DEVICE_UNIFIED_MEMORY: + retVal = clEnqueueMemcpyINTEL(this->pCmdQ, true, ptr, data.data(), dataSize, 0, nullptr, nullptr); + break; + default: + std::copy(data.begin(), data.end(), static_cast(ptr)); + break; + } + EXPECT_EQ(retVal, CL_SUCCESS); + } +} + +} // namespace NEO \ No newline at end of file diff --git a/opencl/test/unit_test/aub_tests/fixtures/unified_memory_fixture.h b/opencl/test/unit_test/aub_tests/fixtures/unified_memory_fixture.h index ae560cda69..a84c004554 100644 --- a/opencl/test/unit_test/aub_tests/fixtures/unified_memory_fixture.h +++ b/opencl/test/unit_test/aub_tests/fixtures/unified_memory_fixture.h @@ -6,13 +6,7 @@ */ #pragma once - -#include "shared/source/helpers/constants.h" -#include "shared/source/memory_manager/memory_manager.h" - -#include "opencl/source/api/api.h" #include "opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h" -#include "opencl/test/unit_test/mocks/mock_platform.h" namespace NEO { namespace PagaFaultManagerTestConfig { @@ -27,69 +21,12 @@ class UnifiedMemoryAubFixture : public AUBFixture { const size_t dataSize = MemoryConstants::megaByte; bool skipped = false; - void setUp() { - if (PagaFaultManagerTestConfig::disabled) { - skipped = true; - GTEST_SKIP(); - } - AUBFixture::setUp(nullptr); - if (!platform()->peekExecutionEnvironment()->memoryManager->getPageFaultManager()) { - skipped = true; - GTEST_SKIP(); - } - } + void setUp(); - void *allocateUSM(InternalMemoryType type) { - void *ptr = nullptr; - if (!this->skipped) { - switch (type) { - case DEVICE_UNIFIED_MEMORY: - ptr = clDeviceMemAllocINTEL(this->context, this->device.get(), nullptr, dataSize, 0, &retVal); - break; - case HOST_UNIFIED_MEMORY: - ptr = clHostMemAllocINTEL(this->context, nullptr, dataSize, 0, &retVal); - break; - case SHARED_UNIFIED_MEMORY: - ptr = clSharedMemAllocINTEL(this->context, this->device.get(), nullptr, dataSize, 0, &retVal); - break; - default: - ptr = new char[dataSize]; - break; - } - EXPECT_EQ(retVal, CL_SUCCESS); - EXPECT_NE(ptr, nullptr); - } - return ptr; - } + void *allocateUSM(InternalMemoryType type); - void freeUSM(void *ptr, InternalMemoryType type) { - if (!this->skipped) { - switch (type) { - case DEVICE_UNIFIED_MEMORY: - case HOST_UNIFIED_MEMORY: - case SHARED_UNIFIED_MEMORY: - retVal = clMemFreeINTEL(this->context, ptr); - break; - default: - delete[] static_cast(ptr); - break; - } - EXPECT_EQ(retVal, CL_SUCCESS); - } - } + void freeUSM(void *ptr, InternalMemoryType type); - void writeToUsmMemory(std::vector data, void *ptr, InternalMemoryType type) { - if (!this->skipped) { - switch (type) { - case DEVICE_UNIFIED_MEMORY: - retVal = clEnqueueMemcpyINTEL(this->pCmdQ, true, ptr, data.data(), dataSize, 0, nullptr, nullptr); - break; - default: - std::copy(data.begin(), data.end(), static_cast(ptr)); - break; - } - EXPECT_EQ(retVal, CL_SUCCESS); - } - } + void writeToUsmMemory(std::vector data, void *ptr, InternalMemoryType type); }; } // namespace NEO diff --git a/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_aub_tests.cpp b/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_aub_tests.cpp index fdc402d176..63ce283f74 100644 --- a/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_aub_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2022 Intel Corporation + * Copyright (C) 2019-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,6 +7,7 @@ #include "shared/test/common/test_macros/hw_test.h" +#include "opencl/source/command_queue/command_queue.h" #include "opencl/test/unit_test/aub_tests/fixtures/unified_memory_fixture.h" namespace NEO { diff --git a/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_copy_aub_tests.cpp b/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_copy_aub_tests.cpp index 0ce5d9b18c..38d0a8c1db 100644 --- a/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_copy_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_copy_aub_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2022 Intel Corporation + * Copyright (C) 2019-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,6 +7,7 @@ #include "shared/test/common/test_macros/hw_test.h" +#include "opencl/source/command_queue/command_queue.h" #include "opencl/test/unit_test/aub_tests/fixtures/unified_memory_fixture.h" namespace NEO { diff --git a/opencl/test/unit_test/command_queue/command_queue_fixture.h b/opencl/test/unit_test/command_queue/command_queue_fixture.h index 05221ff80f..383703312a 100644 --- a/opencl/test/unit_test/command_queue/command_queue_fixture.h +++ b/opencl/test/unit_test/command_queue/command_queue_fixture.h @@ -9,7 +9,6 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/test_macros/test_checks_shared.h" -#include "opencl/source/command_queue/command_queue.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/fixtures/context_fixture.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" diff --git a/opencl/test/unit_test/command_queue/oom_tests.cpp b/opencl/test/unit_test/command_queue/oom_tests.cpp index a0d73fc310..ef0bff5774 100644 --- a/opencl/test/unit_test/command_queue/oom_tests.cpp +++ b/opencl/test/unit_test/command_queue/oom_tests.cpp @@ -9,6 +9,7 @@ #include "shared/source/memory_manager/memory_manager.h" #include "shared/test/common/test_macros/hw_test.h" +#include "opencl/source/command_queue/command_queue.h" #include "opencl/source/event/event.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/opencl/test/unit_test/context/driver_diagnostics_enqueue_tests.cpp b/opencl/test/unit_test/context/driver_diagnostics_enqueue_tests.cpp index 71d34e5f0b..a45f1f4b8c 100644 --- a/opencl/test/unit_test/context/driver_diagnostics_enqueue_tests.cpp +++ b/opencl/test/unit_test/context/driver_diagnostics_enqueue_tests.cpp @@ -9,6 +9,7 @@ #include "shared/source/memory_manager/unified_memory_manager.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "opencl/source/command_queue/command_queue.h" #include "opencl/source/event/user_event.h" #include "opencl/source/helpers/dispatch_info.h" #include "opencl/test/unit_test/context/driver_diagnostics_tests.h" diff --git a/opencl/test/unit_test/fixtures/hello_world_fixture.h b/opencl/test/unit_test/fixtures/hello_world_fixture.h index 552bc4fb74..53cbad33af 100644 --- a/opencl/test/unit_test/fixtures/hello_world_fixture.h +++ b/opencl/test/unit_test/fixtures/hello_world_fixture.h @@ -8,6 +8,7 @@ #pragma once #include "shared/test/common/test_macros/hw_test.h" +#include "opencl/source/command_queue/command_queue.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/command_stream/command_stream_fixture.h" #include "opencl/test/unit_test/fixtures/buffer_fixture.h" diff --git a/opencl/test/unit_test/mem_obj/pipe_tests.cpp b/opencl/test/unit_test/mem_obj/pipe_tests.cpp index 3a140c1742..a8c4b7bec7 100644 --- a/opencl/test/unit_test/mem_obj/pipe_tests.cpp +++ b/opencl/test/unit_test/mem_obj/pipe_tests.cpp @@ -9,9 +9,7 @@ #include "shared/test/common/fixtures/memory_management_fixture.h" #include "shared/test/common/test_macros/test.h" -#include "opencl/source/command_queue/command_queue.h" #include "opencl/source/mem_obj/pipe.h" -#include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_context.h" diff --git a/opencl/test/unit_test/program/program_nonuniform.cpp b/opencl/test/unit_test/program/program_nonuniform.cpp index 20356d5609..1b835f85a9 100644 --- a/opencl/test/unit_test/program/program_nonuniform.cpp +++ b/opencl/test/unit_test/program/program_nonuniform.cpp @@ -7,6 +7,7 @@ #include "shared/test/common/test_macros/test.h" +#include "opencl/source/command_queue/command_queue.h" #include "opencl/source/kernel/kernel.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/fixtures/context_fixture.h" diff --git a/opencl/test/unit_test/sharings/va/va_base_object_tests.cpp b/opencl/test/unit_test/sharings/va/va_base_object_tests.cpp index 2e15145f91..1efecffe0e 100644 --- a/opencl/test/unit_test/sharings/va/va_base_object_tests.cpp +++ b/opencl/test/unit_test/sharings/va/va_base_object_tests.cpp @@ -1,12 +1,11 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "opencl/source/accelerators/intel_accelerator.h" -#include "opencl/source/command_queue/command_queue.h" #include "opencl/source/helpers/base_object.h" #include "opencl/source/sharings/sharing_factory.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h"