Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move blit_commands_helper files to core 

Change-Id: I29fb4e6a91e9fc32f5017eb966d478f51b3b3487
Signed-off-by: Mateusz Hoppe <mateusz.hoppe@intel.com>
This commit is contained in:
Mateusz Hoppe 2020-02-05 16:07:52 +01:00 committed by sys_ocldev
parent f77814a546
commit 3682e29ddc
57 changed files with 109 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/helpers/CMakeLists.txt
View File

@ -12,6 +12,10 @@ set(NEO_CORE_HELPERS
${CMAKE_CURRENT_SOURCE_DIR}/array_count.h
${CMAKE_CURRENT_SOURCE_DIR}/aux_translation.h
${CMAKE_CURRENT_SOURCE_DIR}/basic_math.h
${CMAKE_CURRENT_SOURCE_DIR}/blit_commands_helper_base.inl
${CMAKE_CURRENT_SOURCE_DIR}/blit_commands_helper_bdw_plus.inl
${CMAKE_CURRENT_SOURCE_DIR}/blit_commands_helper.cpp
${CMAKE_CURRENT_SOURCE_DIR}/blit_commands_helper.h
${CMAKE_CURRENT_SOURCE_DIR}/cache_policy.cpp
${CMAKE_CURRENT_SOURCE_DIR}/cache_policy.h
${CMAKE_CURRENT_SOURCE_DIR}/common_types.h

4
runtime/helpers/blit_commands_helper.cpp → core/helpers/blit_commands_helper.cpp
View File

@ -5,10 +5,10 @@
*
*/
#include "runtime/helpers/blit_commands_helper.h"
#include "core/helpers/blit_commands_helper.h"
#include "core/helpers/timestamp_packet.h"
#include "runtime/memory_manager/surface.h"
#include "core/memory_manager/surface.h"
namespace NEO {
BlitProperties BlitProperties::constructPropertiesForReadWriteBuffer(BlitterConstants::BlitDirection blitDirection,

0
runtime/helpers/blit_commands_helper.h → core/helpers/blit_commands_helper.h
View File

5
runtime/helpers/blit_commands_helper_base.inl → core/helpers/blit_commands_helper_base.inl
View File

@ -1,11 +1,12 @@
/*
* Copyright (C) 2019 Intel Corporation
* Copyright (C) 2019-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "runtime/helpers/blit_commands_helper.h"
#include "core/helpers/blit_commands_helper.h"
#include "core/helpers/timestamp_packet.h"
namespace NEO {

4
runtime/helpers/blit_commands_helper_bdw_plus.inl → core/helpers/blit_commands_helper_bdw_plus.inl
View File

@ -1,11 +1,11 @@
/*
* Copyright (C) 2019 Intel Corporation
* Copyright (C) 2019-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "runtime/helpers/blit_commands_helper_base.inl"
#include "core/helpers/blit_commands_helper_base.inl"
namespace NEO {

1
core/memory_manager/CMakeLists.txt
View File

@ -37,6 +37,7 @@ set(NEO_CORE_MEMORY_MANAGER
${CMAKE_CURRENT_SOURCE_DIR}/residency.cpp
${CMAKE_CURRENT_SOURCE_DIR}/residency.h
${CMAKE_CURRENT_SOURCE_DIR}/residency_container.h
${CMAKE_CURRENT_SOURCE_DIR}/surface.h
${CMAKE_CURRENT_SOURCE_DIR}/unified_memory_manager.cpp
${CMAKE_CURRENT_SOURCE_DIR}/unified_memory_manager.h
)

24
runtime/memory_manager/surface.h → core/memory_manager/surface.h
View File

@ -9,7 +9,6 @@
#include "core/helpers/cache_policy.h"
#include "core/memory_manager/graphics_allocation.h"
#include "runtime/command_stream/command_stream_receiver.h"
#include "runtime/mem_obj/mem_obj.h"
namespace NEO {
@ -86,29 +85,6 @@ class HostPtrSurface : public Surface {
bool isPtrCopyAllowed = false;
};
class MemObjSurface : public Surface {
public:
MemObjSurface(MemObj *memObj) : Surface(memObj->getGraphicsAllocation()->isCoherent()), memObj(memObj) {
memObj->incRefInternal();
}
~MemObjSurface() override {
memObj->decRefInternal();
memObj = nullptr;
};
void makeResident(CommandStreamReceiver &csr) override {
DEBUG_BREAK_IF(!memObj);
csr.makeResident(*memObj->getGraphicsAllocation());
}
Surface *duplicate() override {
return new MemObjSurface(this->memObj);
};
protected:
class MemObj *memObj;
};
class GeneralSurface : public Surface {
public:
GeneralSurface() : Surface(false) {

4
runtime/command_queue/command_queue_hw_base.inl
View File

@ -1,10 +1,11 @@
/*
* Copyright (C) 2019 Intel Corporation
* Copyright (C) 2019-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "core/helpers/blit_commands_helper.h"
#include "runtime/built_ins/aux_translation_builtin.h"
#include "runtime/command_queue/enqueue_barrier.h"
#include "runtime/command_queue/enqueue_copy_buffer.h"
@ -27,7 +28,6 @@
#include "runtime/command_queue/finish.h"
#include "runtime/command_queue/flush.h"
#include "runtime/command_queue/gpgpu_walker.h"
#include "runtime/helpers/blit_commands_helper.h"
namespace NEO {
template <typename Family>

4
runtime/command_queue/enqueue_barrier.h
View File

@ -1,16 +1,16 @@
/*
* Copyright (C) 2017-2019 Intel Corporation
* Copyright (C) 2017-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#pragma once
#include "core/memory_manager/surface.h"
#include "runtime/command_queue/command_queue_hw.h"
#include "runtime/command_stream/command_stream_receiver.h"
#include "runtime/device/device.h"
#include "runtime/event/event.h"
#include "runtime/memory_manager/surface.h"
#include <new>

2
runtime/command_queue/enqueue_common.h
View File

@ -9,6 +9,7 @@
#include "core/helpers/array_count.h"
#include "core/helpers/engine_node_helper.h"
#include "core/memory_manager/internal_allocation_storage.h"
#include "core/memory_manager/surface.h"
#include "core/os_interface/os_context.h"
#include "core/program/sync_buffer_handler.h"
#include "core/utilities/range.h"
@ -31,7 +32,6 @@
#include "runtime/mem_obj/buffer.h"
#include "runtime/mem_obj/image.h"
#include "runtime/memory_manager/memory_manager.h"
#include "runtime/memory_manager/surface.h"
#include "runtime/program/block_kernel_manager.h"
#include "runtime/program/printf_handler.h"

4
runtime/command_queue/enqueue_copy_buffer.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2017-2019 Intel Corporation
* Copyright (C) 2017-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -12,7 +12,7 @@
#include "runtime/command_stream/command_stream_receiver.h"
#include "runtime/helpers/hardware_commands_helper.h"
#include "runtime/mem_obj/buffer.h"
#include "runtime/memory_manager/surface.h"
#include "runtime/memory_manager/mem_obj_surface.h"
#include <new>

4
runtime/command_queue/enqueue_copy_buffer_rect.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2017-2019 Intel Corporation
* Copyright (C) 2017-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -11,7 +11,7 @@
#include "runtime/command_stream/command_stream_receiver.h"
#include "runtime/helpers/hardware_commands_helper.h"
#include "runtime/mem_obj/buffer.h"
#include "runtime/memory_manager/surface.h"
#include "runtime/memory_manager/mem_obj_surface.h"
#include <new>

2
runtime/command_queue/enqueue_copy_buffer_to_image.h
View File

@ -13,7 +13,7 @@
#include "runtime/helpers/mipmap.h"
#include "runtime/mem_obj/buffer.h"
#include "runtime/mem_obj/image.h"
#include "runtime/memory_manager/surface.h"
#include "runtime/memory_manager/mem_obj_surface.h"
#include <new>

4
runtime/command_queue/enqueue_copy_image.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2017-2019 Intel Corporation
* Copyright (C) 2017-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -13,7 +13,7 @@
#include "runtime/helpers/hardware_commands_helper.h"
#include "runtime/helpers/mipmap.h"
#include "runtime/mem_obj/image.h"
#include "runtime/memory_manager/surface.h"
#include "runtime/memory_manager/mem_obj_surface.h"
#include <algorithm>
#include <new>

2
runtime/command_queue/enqueue_copy_image_to_buffer.h
View File

@ -13,7 +13,7 @@
#include "runtime/helpers/mipmap.h"
#include "runtime/mem_obj/buffer.h"
#include "runtime/mem_obj/image.h"
#include "runtime/memory_manager/surface.h"
#include "runtime/memory_manager/mem_obj_surface.h"
#include <new>

2
runtime/command_queue/enqueue_fill_buffer.h
View File

@ -12,8 +12,8 @@
#include "runtime/command_stream/command_stream_receiver.h"
#include "runtime/helpers/hardware_commands_helper.h"
#include "runtime/mem_obj/buffer.h"
#include "runtime/memory_manager/mem_obj_surface.h"
#include "runtime/memory_manager/memory_manager.h"
#include "runtime/memory_manager/surface.h"
#include <new>

2
runtime/command_queue/enqueue_fill_image.h
View File

@ -12,7 +12,7 @@
#include "runtime/command_stream/command_stream_receiver.h"
#include "runtime/helpers/hardware_commands_helper.h"
#include "runtime/mem_obj/image.h"
#include "runtime/memory_manager/surface.h"
#include "runtime/memory_manager/mem_obj_surface.h"
#include <algorithm>
#include <new>

4
runtime/command_queue/enqueue_kernel.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2017-2019 Intel Corporation
* Copyright (C) 2017-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -13,7 +13,7 @@
#include "runtime/helpers/hardware_commands_helper.h"
#include "runtime/helpers/task_information.h"
#include "runtime/mem_obj/buffer.h"
#include "runtime/memory_manager/surface.h"
#include "runtime/memory_manager/mem_obj_surface.h"
#include <new>

4
runtime/command_queue/enqueue_marker.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2017-2019 Intel Corporation
* Copyright (C) 2017-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -11,7 +11,7 @@
#include "runtime/command_stream/command_stream_receiver.h"
#include "runtime/device/device.h"
#include "runtime/event/event.h"
#include "runtime/memory_manager/surface.h"
#include "runtime/memory_manager/mem_obj_surface.h"
#include <new>

4
runtime/command_queue/enqueue_migrate_mem_objects.h
View File

@ -1,17 +1,17 @@
/*
* Copyright (C) 2017-2019 Intel Corporation
* Copyright (C) 2017-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#pragma once
#include "core/memory_manager/surface.h"
#include "runtime/command_queue/command_queue_hw.h"
#include "runtime/command_queue/gpgpu_walker.h"
#include "runtime/command_stream/command_stream_receiver.h"
#include "runtime/device/device.h"
#include "runtime/event/event.h"
#include "runtime/memory_manager/surface.h"
namespace NEO {

2
runtime/command_queue/enqueue_read_buffer.h
View File

@ -14,7 +14,7 @@
#include "runtime/command_stream/command_stream_receiver.h"
#include "runtime/helpers/hardware_commands_helper.h"
#include "runtime/mem_obj/buffer.h"
#include "runtime/memory_manager/surface.h"
#include "runtime/memory_manager/mem_obj_surface.h"
#include <new>

4
runtime/command_queue/enqueue_read_buffer_rect.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2017-2019 Intel Corporation
* Copyright (C) 2017-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -12,7 +12,7 @@
#include "runtime/command_stream/command_stream_receiver.h"
#include "runtime/helpers/hardware_commands_helper.h"
#include "runtime/mem_obj/buffer.h"
#include "runtime/memory_manager/surface.h"
#include "runtime/memory_manager/mem_obj_surface.h"
#include <new>

2
runtime/command_queue/enqueue_read_image.h
View File

@ -17,7 +17,7 @@
#include "runtime/helpers/hardware_commands_helper.h"
#include "runtime/helpers/mipmap.h"
#include "runtime/mem_obj/image.h"
#include "runtime/memory_manager/surface.h"
#include "runtime/memory_manager/mem_obj_surface.h"
#include <algorithm>
#include <new>

4
runtime/command_queue/enqueue_svm.h
View File

@ -1,17 +1,17 @@
/*
* Copyright (C) 2017-2019 Intel Corporation
* Copyright (C) 2017-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#pragma once
#include "core/memory_manager/surface.h"
#include "core/memory_manager/unified_memory_manager.h"
#include "runtime/built_ins/built_ins.h"
#include "runtime/command_queue/command_queue_hw.h"
#include "runtime/command_queue/enqueue_common.h"
#include "runtime/event/event.h"
#include "runtime/memory_manager/surface.h"
#include <new>

2
runtime/command_queue/enqueue_write_buffer.h
View File

@ -13,7 +13,7 @@
#include "runtime/command_stream/command_stream_receiver.h"
#include "runtime/helpers/hardware_commands_helper.h"
#include "runtime/mem_obj/buffer.h"
#include "runtime/memory_manager/surface.h"
#include "runtime/memory_manager/mem_obj_surface.h"
#include <new>

4
runtime/command_queue/enqueue_write_buffer_rect.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2017-2019 Intel Corporation
* Copyright (C) 2017-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -11,7 +11,7 @@
#include "runtime/command_stream/command_stream_receiver.h"
#include "runtime/helpers/hardware_commands_helper.h"
#include "runtime/mem_obj/buffer.h"
#include "runtime/memory_manager/surface.h"
#include "runtime/memory_manager/mem_obj_surface.h"
#include <new>

2
runtime/command_stream/command_stream_receiver.cpp
View File

@ -17,6 +17,7 @@
#include "core/helpers/string.h"
#include "core/helpers/timestamp_packet.h"
#include "core/memory_manager/internal_allocation_storage.h"
#include "core/memory_manager/surface.h"
#include "core/os_interface/os_context.h"
#include "core/os_interface/os_interface.h"
#include "core/utilities/cpuintrinsics.h"
@ -26,7 +27,6 @@
#include "runtime/device/device.h"
#include "runtime/gtpin/gtpin_notify.h"
#include "runtime/memory_manager/memory_manager.h"
#include "runtime/memory_manager/surface.h"
#include "runtime/platform/platform.h"
namespace NEO {

2
runtime/command_stream/command_stream_receiver.h
View File

@ -12,11 +12,11 @@
#include "core/command_stream/submissions_aggregator.h"
#include "core/command_stream/thread_arbitration_policy.h"
#include "core/helpers/aligned_memory.h"
#include "core/helpers/blit_commands_helper.h"
#include "core/helpers/completion_stamp.h"
#include "core/helpers/options.h"
#include "core/indirect_heap/indirect_heap.h"
#include "core/kernel/grf_config.h"
#include "runtime/helpers/blit_commands_helper.h"
#include "runtime/helpers/flat_batch_buffer_helper.h"
#include <cstddef>

2
runtime/command_stream/command_stream_receiver_hw_base.inl
View File

@ -11,6 +11,7 @@
#include "core/debug_settings/debug_settings_manager.h"
#include "core/execution_environment/root_device_environment.h"
#include "core/gmm_helper/page_table_mngr.h"
#include "core/helpers/blit_commands_helper.h"
#include "core/helpers/cache_policy.h"
#include "core/helpers/flush_stamp.h"
#include "core/helpers/hw_helper.h"
@ -26,7 +27,6 @@
#include "runtime/command_stream/experimental_command_buffer.h"
#include "runtime/device/device.h"
#include "runtime/gtpin/gtpin_notify.h"
#include "runtime/helpers/blit_commands_helper.h"
#include "runtime/helpers/flat_batch_buffer_helper_hw.h"
#include "runtime/helpers/hardware_commands_helper.h"
#include "runtime/memory_manager/memory_manager.h"

4
runtime/gen11/command_stream_receiver_hw_gen11.cpp
View File

@ -1,15 +1,15 @@
/*
* Copyright (C) 2018-2019 Intel Corporation
* Copyright (C) 2018-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "core/debug_settings/debug_settings_manager.h"
#include "core/helpers/blit_commands_helper_bdw_plus.inl"
#include "runtime/command_stream/command_stream_receiver_hw_bdw_plus.inl"
#include "runtime/command_stream/device_command_stream.h"
#include "runtime/gen11/reg_configs.h"
#include "runtime/helpers/blit_commands_helper_bdw_plus.inl"
namespace NEO {
typedef ICLFamily Family;

4
runtime/gen12lp/command_stream_receiver_hw_gen12lp.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2019 Intel Corporation
* Copyright (C) 2019-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -9,11 +9,11 @@
using Family = NEO::TGLLPFamily;
#include "core/helpers/blit_commands_helper_bdw_plus.inl"
#include "runtime/command_stream/command_stream_receiver_hw_bdw_plus.inl"
#include "runtime/command_stream/command_stream_receiver_hw_tgllp_plus.inl"
#include "runtime/command_stream/device_command_stream.h"
#include "runtime/gen12lp/helpers_gen12lp.h"
#include "runtime/helpers/blit_commands_helper_bdw_plus.inl"
namespace NEO {
static auto gfxCore = IGFX_GEN12LP_CORE;

4
runtime/gen8/command_stream_receiver_hw_gen8.cpp
View File

@ -1,14 +1,14 @@
/*
* Copyright (C) 2018-2019 Intel Corporation
* Copyright (C) 2018-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "core/gen8/hw_cmds.h"
#include "core/helpers/blit_commands_helper_bdw_plus.inl"
#include "runtime/command_stream/command_stream_receiver_hw_bdw_plus.inl"
#include "runtime/command_stream/device_command_stream.h"
#include "runtime/helpers/blit_commands_helper_bdw_plus.inl"
namespace NEO {
typedef BDWFamily Family;

4
runtime/gen9/command_stream_receiver_hw_gen9.cpp
View File

@ -1,14 +1,14 @@
/*
* Copyright (C) 2018-2019 Intel Corporation
* Copyright (C) 2018-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "core/gen9/hw_cmds.h"
#include "core/helpers/blit_commands_helper_bdw_plus.inl"
#include "runtime/command_stream/command_stream_receiver_hw_bdw_plus.inl"
#include "runtime/command_stream/device_command_stream.h"
#include "runtime/helpers/blit_commands_helper_bdw_plus.inl"
namespace NEO {
typedef SKLFamily Family;

2
runtime/gtpin/gtpin_callbacks.cpp
View File

@ -5,6 +5,7 @@
*
*/
#include "core/memory_manager/surface.h"
#include "core/utilities/spinlock.h"
#include "runtime/command_queue/command_queue.h"
#include "runtime/command_stream/command_stream_receiver.h"
@ -16,7 +17,6 @@
#include "runtime/gtpin/gtpin_notify.h"
#include "runtime/kernel/kernel.h"
#include "runtime/mem_obj/buffer.h"
#include "runtime/memory_manager/surface.h"
#include "runtime/program/program.h"
#include "CL/cl.h"

4
runtime/helpers/CMakeLists.txt
View File

@ -8,10 +8,6 @@ set(RUNTIME_SRCS_HELPERS_BASE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/base_object.cpp
${CMAKE_CURRENT_SOURCE_DIR}/base_object.h
${CMAKE_CURRENT_SOURCE_DIR}/blit_commands_helper_base.inl
${CMAKE_CURRENT_SOURCE_DIR}/blit_commands_helper_bdw_plus.inl
${CMAKE_CURRENT_SOURCE_DIR}/blit_commands_helper.cpp
${CMAKE_CURRENT_SOURCE_DIR}/blit_commands_helper.h
${CMAKE_CURRENT_SOURCE_DIR}/built_ins_helper.h
${CMAKE_CURRENT_SOURCE_DIR}/cl_blit_properties.h
${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/cl_device_helpers.cpp

2
runtime/helpers/cl_blit_properties.h
View File

@ -6,8 +6,8 @@
*/
#pragma once
#include "core/helpers/blit_commands_helper.h"
#include "runtime/built_ins/builtins_dispatch_builder.h"
#include "runtime/helpers/blit_commands_helper.h"
#include "CL/cl.h"

4
runtime/helpers/dispatch_info.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2017-2019 Intel Corporation
* Copyright (C) 2017-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -9,10 +9,10 @@
#include "core/helpers/registered_method_dispatcher.h"
#include "core/helpers/vec.h"
#include "core/memory_manager/surface.h"
#include "core/utilities/stackvec.h"
#include "runtime/built_ins/builtins_dispatch_builder.h"
#include "runtime/mem_obj/mem_obj.h"
#include "runtime/memory_manager/surface.h"
#include <algorithm>
#include <memory>

4
runtime/helpers/enqueue_properties.h
View File

@ -1,12 +1,12 @@
/*
* Copyright (C) 2018-2019 Intel Corporation
* Copyright (C) 2018-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#pragma once
#include "runtime/helpers/blit_commands_helper.h"
#include "core/helpers/blit_commands_helper.h"
namespace NEO {

2
runtime/helpers/task_information.cpp
View File

@ -14,6 +14,7 @@
#include "core/helpers/engine_node_helper.h"
#include "core/helpers/string.h"
#include "core/memory_manager/internal_allocation_storage.h"
#include "core/memory_manager/surface.h"
#include "runtime/built_ins/builtins_dispatch_builder.h"
#include "runtime/command_queue/command_queue.h"
#include "runtime/command_queue/enqueue_common.h"
@ -24,7 +25,6 @@
#include "runtime/helpers/enqueue_properties.h"
#include "runtime/helpers/task_information.inl"
#include "runtime/mem_obj/mem_obj.h"
#include "runtime/memory_manager/surface.h"
namespace NEO {
template void KernelOperation::ResourceCleaner::operator()<LinearStream>(LinearStream *);

2
runtime/helpers/task_information.h
View File

@ -7,12 +7,12 @@
#pragma once
#include "core/command_stream/linear_stream.h"
#include "core/helpers/blit_commands_helper.h"
#include "core/helpers/completion_stamp.h"
#include "core/helpers/hw_info.h"
#include "core/helpers/timestamp_packet.h"
#include "core/indirect_heap/indirect_heap.h"
#include "core/utilities/iflist.h"
#include "runtime/helpers/blit_commands_helper.h"
#include "runtime/helpers/properties_helper.h"
#include <memory>

2
runtime/kernel/kernel.cpp
View File

@ -39,8 +39,8 @@
#include "runtime/mem_obj/buffer.h"
#include "runtime/mem_obj/image.h"
#include "runtime/mem_obj/pipe.h"
#include "runtime/memory_manager/mem_obj_surface.h"
#include "runtime/memory_manager/memory_manager.h"
#include "runtime/memory_manager/surface.h"
#include "runtime/platform/platform.h"
#include "runtime/program/block_kernel_manager.h"
#include "runtime/program/kernel_info.h"

1
runtime/memory_manager/CMakeLists.txt
View File

@ -20,7 +20,6 @@ set(RUNTIME_SRCS_MEMORY_MANAGER
${CMAKE_CURRENT_SOURCE_DIR}/page_table.h
${CMAKE_CURRENT_SOURCE_DIR}/page_table.inl
${CMAKE_CURRENT_SOURCE_DIR}/physical_address_allocator.h
${CMAKE_CURRENT_SOURCE_DIR}/surface.h
)
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_MEMORY_MANAGER})

37
runtime/memory_manager/mem_obj_surface.h Normal file
View File

@ -0,0 +1,37 @@
/*
* Copyright (C) 2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#pragma once
#include "core/memory_manager/surface.h"
#include "runtime/mem_obj/mem_obj.h"
namespace NEO {
class MemObjSurface : public Surface {
public:
MemObjSurface(MemObj *memObj) : Surface(memObj->getGraphicsAllocation()->isCoherent()), memObj(memObj) {
memObj->incRefInternal();
}
~MemObjSurface() override {
memObj->decRefInternal();
memObj = nullptr;
};
void makeResident(CommandStreamReceiver &csr) override {
DEBUG_BREAK_IF(!memObj);
csr.makeResident(*memObj->getGraphicsAllocation());
}
Surface *duplicate() override {
return new MemObjSurface(this->memObj);
};
protected:
class MemObj *memObj;
};
} // namespace NEO

2
unit_tests/accelerators/media_image_arg_tests.cpp
View File

@ -7,10 +7,10 @@
#include "core/helpers/aligned_memory.h"
#include "core/helpers/ptr_math.h"
#include "core/memory_manager/surface.h"
#include "runtime/helpers/surface_formats.h"
#include "runtime/kernel/kernel.h"
#include "runtime/mem_obj/image.h"
#include "runtime/memory_manager/surface.h"
#include "test.h"
#include "unit_tests/fixtures/device_fixture.h"
#include "unit_tests/fixtures/image_fixture.h"

2
unit_tests/command_queue/enqueue_command_without_kernel_tests.cpp
View File

@ -6,11 +6,11 @@
*/
#include "core/helpers/timestamp_packet.h"
#include "core/memory_manager/surface.h"
#include "core/os_interface/os_context.h"
#include "runtime/event/event_builder.h"
#include "runtime/event/user_event.h"
#include "runtime/helpers/enqueue_properties.h"
#include "runtime/memory_manager/surface.h"
#include "test.h"
#include "unit_tests/fixtures/dispatch_flags_fixture.h"
#include "unit_tests/fixtures/enqueue_handler_fixture.h"

1
unit_tests/command_queue/enqueue_handler_tests.cpp
View File

@ -8,7 +8,6 @@
#include "core/unit_tests/helpers/debug_manager_state_restore.h"
#include "runtime/command_stream/aub_subcapture.h"
#include "runtime/event/user_event.h"
#include "runtime/memory_manager/surface.h"
#include "runtime/platform/platform.h"
#include "test.h"
#include "unit_tests/command_stream/thread_arbitration_policy_helper.h"

2
unit_tests/command_queue/enqueue_svm_tests.cpp
View File

@ -8,13 +8,13 @@
#include "core/debug_settings/debug_settings_manager.h"
#include "core/helpers/aligned_memory.h"
#include "core/memory_manager/allocations_list.h"
#include "core/memory_manager/surface.h"
#include "core/memory_manager/unified_memory_manager.h"
#include "core/unit_tests/helpers/debug_manager_state_restore.h"
#include "core/unit_tests/page_fault_manager/mock_cpu_page_fault_manager.h"
#include "core/unit_tests/utilities/base_object_utils.h"
#include "runtime/command_stream/command_stream_receiver.h"
#include "runtime/event/user_event.h"
#include "runtime/memory_manager/surface.h"
#include "test.h"
#include "unit_tests/command_queue/command_queue_fixture.h"
#include "unit_tests/command_queue/enqueue_map_buffer_fixture.h"

2
unit_tests/command_stream/command_stream_receiver_tests.cpp
View File

@ -14,12 +14,12 @@
#include "core/helpers/timestamp_packet.h"
#include "core/memory_manager/graphics_allocation.h"
#include "core/memory_manager/internal_allocation_storage.h"
#include "core/memory_manager/surface.h"
#include "core/unit_tests/helpers/debug_manager_state_restore.h"
#include "core/utilities/tag_allocator.h"
#include "runtime/command_stream/command_stream_receiver.h"
#include "runtime/mem_obj/buffer.h"
#include "runtime/memory_manager/memory_manager.h"
#include "runtime/memory_manager/surface.h"
#include "runtime/platform/platform.h"
#include "test.h"
#include "unit_tests/fixtures/device_fixture.h"

2
unit_tests/event/event_tests.cpp
View File

@ -14,7 +14,7 @@
#include "runtime/command_stream/command_stream_receiver.h"
#include "runtime/event/perf_counter.h"
#include "runtime/helpers/task_information.h"
#include "runtime/memory_manager/surface.h"
#include "runtime/memory_manager/mem_obj_surface.h"
#include "test.h"
#include "unit_tests/fixtures/image_fixture.h"
#include "unit_tests/mocks/mock_command_queue.h"

1
unit_tests/execution_model/scheduler_dispatch_tests.cpp
View File

@ -9,7 +9,6 @@
#include "runtime/built_ins/built_ins.h"
#include "runtime/command_queue/enqueue_kernel.h"
#include "runtime/device_queue/device_queue.h"
#include "runtime/memory_manager/surface.h"
#include "runtime/scheduler/scheduler_kernel.h"
#include "unit_tests/fixtures/execution_model_fixture.h"
#include "unit_tests/helpers/hw_parse.h"

2
unit_tests/gtpin/gtpin_tests.cpp
View File

@ -9,6 +9,7 @@
#include "core/helpers/basic_math.h"
#include "core/helpers/file_io.h"
#include "core/helpers/hash.h"
#include "core/memory_manager/surface.h"
#include "core/os_interface/os_context.h"
#include "core/unit_tests/device_binary_format/patchtokens_tests.h"
#include "runtime/api/api.h"
@ -21,7 +22,6 @@
#include "runtime/gtpin/gtpin_notify.h"
#include "runtime/kernel/kernel.h"
#include "runtime/mem_obj/buffer.h"
#include "runtime/memory_manager/surface.h"
#include "runtime/program/create.inl"
#include "test.h"
#include "unit_tests/fixtures/context_fixture.h"

2
unit_tests/mem_obj/buffer_set_arg_tests.cpp
View File

@ -8,10 +8,10 @@
#include "core/gmm_helper/gmm.h"
#include "core/gmm_helper/gmm_helper.h"
#include "core/helpers/ptr_math.h"
#include "core/memory_manager/surface.h"
#include "core/memory_manager/unified_memory_manager.h"
#include "core/unit_tests/helpers/debug_manager_state_restore.h"
#include "runtime/kernel/kernel.h"
#include "runtime/memory_manager/surface.h"
#include "test.h"
#include "unit_tests/fixtures/buffer_fixture.h"
#include "unit_tests/fixtures/context_fixture.h"

2
unit_tests/mem_obj/image_set_arg_tests.cpp
View File

@ -11,10 +11,10 @@
#include "core/helpers/basic_math.h"
#include "core/helpers/ptr_math.h"
#include "core/memory_manager/graphics_allocation.h"
#include "core/memory_manager/surface.h"
#include "runtime/helpers/surface_formats.h"
#include "runtime/kernel/kernel.h"
#include "runtime/mem_obj/image.h"
#include "runtime/memory_manager/surface.h"
#include "test.h"
#include "unit_tests/fixtures/device_fixture.h"
#include "unit_tests/fixtures/image_fixture.h"

2
unit_tests/memory_manager/surface_tests.cpp
View File

@ -8,7 +8,7 @@
#include "core/command_stream/preemption.h"
#include "core/helpers/hw_helper.h"
#include "core/memory_manager/graphics_allocation.h"
#include "runtime/memory_manager/surface.h"
#include "runtime/memory_manager/mem_obj_surface.h"
#include "runtime/platform/platform.h"
#include "test.h"
#include "unit_tests/mocks/mock_buffer.h"

1
unit_tests/profiling/profiling_tests.cpp
View File

@ -15,7 +15,6 @@
#include "runtime/command_queue/enqueue_marker.h"
#include "runtime/command_queue/enqueue_migrate_mem_objects.h"
#include "runtime/helpers/dispatch_info.h"
#include "runtime/memory_manager/surface.h"
#include "test.h"
#include "unit_tests/command_queue/command_enqueue_fixture.h"
#include "unit_tests/event/event_fixture.h"

1
unit_tests/program/program_nonuniform.cpp
View File

@ -12,7 +12,6 @@
#include "runtime/command_stream/command_stream_receiver_hw.h"
#include "runtime/helpers/hardware_commands_helper.h"
#include "runtime/kernel/kernel.h"
#include "runtime/memory_manager/surface.h"
#include "test.h"
#include "unit_tests/fixtures/device_fixture.h"
#include "unit_tests/helpers/kernel_binary_helper.h"

2
unit_tests/program/program_tests.cpp
View File

@ -17,6 +17,7 @@
#include "core/helpers/string.h"
#include "core/memory_manager/allocations_list.h"
#include "core/memory_manager/graphics_allocation.h"
#include "core/memory_manager/surface.h"
#include "core/os_interface/os_context.h"
#include "core/unit_tests/device_binary_format/patchtokens_tests.h"
#include "core/unit_tests/helpers/debug_manager_state_restore.h"
@ -24,7 +25,6 @@
#include "runtime/command_stream/command_stream_receiver_hw.h"
#include "runtime/helpers/hardware_commands_helper.h"
#include "runtime/kernel/kernel.h"
#include "runtime/memory_manager/surface.h"
#include "runtime/program/create.inl"
#include "test.h"
#include "unit_tests/fixtures/device_fixture.h"