Remove runtime/gen_common from include paths

Change-Id: I4d1f9e64e0f4099e7903234e62b070ad4235347a
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski 2019-11-18 16:48:41 +01:00 committed by sys_ocldev
parent 3e1b15c31d
commit e7ee6daaa0
79 changed files with 26 additions and 137 deletions

View File

@ -788,8 +788,6 @@ include_directories(${NEO_SOURCE_DIR}/runtime/memory_manager/definitions${BRANCH
include_directories(${NEO_SOURCE_DIR}/runtime/os_interface/definitions${BRANCH_DIR_SUFFIX})
include_directories(${NEO_SOURCE_DIR}/runtime/sku_info/definitions${BRANCH_DIR_SUFFIX})
set(HW_SRC_INCLUDE_PATH ${NEO_SOURCE_DIR}/runtime/gen_common)
if(HAVE_INSTRUMENTATION)
set(IGDRCL__INSTRUMENTATION_DIR_SUFFIX ${BRANCH_DIR_SUFFIX})
message(STATUS "Instrumentation include dirs: ${INSTRUMENTATION_INCLUDE_PATHS}")

View File

@ -10,10 +10,10 @@
#include "core/helpers/aligned_memory.h"
#include "core/helpers/preamble.h"
#include "runtime/device/device.h"
#include "runtime/gen_common/hw_cmds.h"
#include "runtime/helpers/hardware_commands_helper.h"
#include "runtime/kernel/kernel.h"
#include "hw_cmds.h"
#include "reg_configs_common.h"
#include <cstddef>

View File

@ -103,7 +103,6 @@ set(CLOC_INCLUDES
${ENGINE_NODE_DIR}
${IGC_OCL_ADAPTOR_DIR}
${CIF_BASE_DIR}
${HW_SRC_INCLUDE_PATH}
${UMKM_SHAREDDATA_INCLUDE_PATHS}
${KHRONOS_HEADERS_DIR}
${IGDRCL__IGC_INCLUDE_DIR}

View File

@ -7,10 +7,9 @@
#include "runtime/helpers/options.h"
#include "runtime/gen_common/hw_cmds.h"
#include "runtime/helpers/array_count.h"
#include "hw_cmds.h"
#include <cstddef>
namespace NEO {

View File

@ -63,7 +63,6 @@ target_include_directories(${NEO_STATIC_LIB_NAME} PUBLIC
${KHRONOS_GL_HEADERS_DIR}
${CIF_BASE_DIR}
${GMM_INCLUDE_PATHS}
${HW_SRC_INCLUDE_PATH}
${IGC_OCL_ADAPTOR_DIR}
${VISA_INCLUDE_DIR}
${IGDRCL__IGC_INCLUDE_DIR}

View File

@ -12,8 +12,6 @@
#include "runtime/event/event.h"
#include "runtime/memory_manager/surface.h"
#include "hw_cmds.h"
#include <new>
namespace NEO {

View File

@ -33,8 +33,6 @@
#include "runtime/program/printf_handler.h"
#include "runtime/utilities/tag_allocator.h"
#include "hw_cmds.h"
#include <algorithm>
#include <new>

View File

@ -14,8 +14,6 @@
#include "runtime/mem_obj/buffer.h"
#include "runtime/memory_manager/surface.h"
#include "hw_cmds.h"
#include <new>
namespace NEO {

View File

@ -16,8 +16,6 @@
#include "runtime/mem_obj/image.h"
#include "runtime/memory_manager/surface.h"
#include "hw_cmds.h"
#include <new>
namespace NEO {

View File

@ -15,8 +15,6 @@
#include "runtime/mem_obj/image.h"
#include "runtime/memory_manager/surface.h"
#include "hw_cmds.h"
#include <algorithm>
#include <new>

View File

@ -16,8 +16,6 @@
#include "runtime/mem_obj/image.h"
#include "runtime/memory_manager/surface.h"
#include "hw_cmds.h"
#include <new>
namespace NEO {

View File

@ -15,8 +15,6 @@
#include "runtime/memory_manager/memory_manager.h"
#include "runtime/memory_manager/surface.h"
#include "hw_cmds.h"
#include <new>
namespace NEO {

View File

@ -15,8 +15,6 @@
#include "runtime/mem_obj/image.h"
#include "runtime/memory_manager/surface.h"
#include "hw_cmds.h"
#include <algorithm>
#include <new>

View File

@ -15,8 +15,6 @@
#include "runtime/mem_obj/buffer.h"
#include "runtime/memory_manager/surface.h"
#include "hw_cmds.h"
#include <new>
namespace NEO {

View File

@ -13,8 +13,6 @@
#include "runtime/event/event.h"
#include "runtime/memory_manager/surface.h"
#include "hw_cmds.h"
#include <new>
namespace NEO {

View File

@ -13,8 +13,6 @@
#include "runtime/event/event.h"
#include "runtime/memory_manager/surface.h"
#include "hw_cmds.h"
namespace NEO {
template <typename GfxFamily>

View File

@ -15,8 +15,6 @@
#include "runtime/mem_obj/buffer.h"
#include "runtime/memory_manager/surface.h"
#include "hw_cmds.h"
#include <new>
namespace NEO {

View File

@ -20,8 +20,6 @@
#include "runtime/mem_obj/image.h"
#include "runtime/memory_manager/surface.h"
#include "hw_cmds.h"
#include <algorithm>
#include <new>

View File

@ -14,8 +14,6 @@
#include "runtime/mem_obj/buffer.h"
#include "runtime/memory_manager/surface.h"
#include "hw_cmds.h"
#include <new>
namespace NEO {

View File

@ -16,8 +16,6 @@
#include "runtime/helpers/surface_formats.h"
#include "runtime/mem_obj/image.h"
#include "hw_cmds.h"
#include <algorithm>
#include <new>

View File

@ -8,9 +8,6 @@
#pragma once
#include "runtime/command_queue/command_queue_hw.h"
#include "runtime/command_stream/command_stream_receiver.h"
#include "runtime/device/device.h"
#include "hw_cmds.h"
namespace NEO {

View File

@ -17,6 +17,7 @@
#include "runtime/aub_mem_dump/aub_alloc_dump.h"
#include "runtime/aub_mem_dump/aub_alloc_dump.inl"
#include "runtime/aub_mem_dump/page_table_entry_bits.h"
#include "runtime/command_stream/aub_command_stream_receiver_hw.h"
#include "runtime/command_stream/aub_stream_provider.h"
#include "runtime/command_stream/aub_subcapture.h"
#include "runtime/command_stream/command_stream_receiver.h"
@ -28,9 +29,7 @@
#include "runtime/os_interface/debug_settings_manager.h"
#include "runtime/os_interface/os_context.h"
#include "aub_command_stream_receiver_hw.h"
#include "driver_version.h"
#include "hw_cmds.h"
#include "third_party/aub_stream/headers/aub_manager.h"
#include "third_party/aub_stream/headers/aubstream.h"

View File

@ -17,7 +17,6 @@
#include "runtime/os_interface/debug_settings_manager.h"
#include "runtime/os_interface/os_context.h"
#include "aub_mapper.h"
#include "third_party/aub_stream/headers/aub_manager.h"
namespace NEO {

View File

@ -25,8 +25,6 @@
#include "runtime/os_interface/debug_settings_manager.h"
#include "runtime/os_interface/os_context.h"
#include "hw_cmds.h"
#include <cstring>
namespace NEO {

View File

@ -9,13 +9,12 @@
#include "core/command_stream/linear_stream.h"
#include "core/helpers/ptr_math.h"
#include "runtime/device_queue/device_queue.h"
#include "runtime/gen_common/hw_cmds.h"
#include "runtime/indirect_heap/indirect_heap.h"
#include "runtime/kernel/kernel.h"
#include "runtime/program/program.h"
#include "runtime/scheduler/scheduler_kernel.h"
#include "hw_cmds.h"
namespace NEO {
template <typename GfxFamily>

View File

@ -6,6 +6,7 @@
*/
#include "core/helpers/hw_helper.h"
#include "runtime/gen_common/hw_cmds.h"
#include "runtime/gmm_helper/gmm_helper.h"
#include "runtime/helpers/hw_info.h"
#include "runtime/helpers/options.h"
@ -14,7 +15,6 @@
#include "runtime/os_interface/linux/drm_null_device.h"
#include "drm/i915_drm.h"
#include "hw_cmds.h"
#include <array>
#include <cstdio>

View File

@ -7,10 +7,9 @@
#include "runtime/helpers/options.h"
#include "runtime/gen_common/hw_cmds.h"
#include "runtime/helpers/array_count.h"
#include "hw_cmds.h"
namespace NEO {
// AUB file folder location
const char *folderAUB = ".";

View File

@ -6,11 +6,10 @@
*/
#include "core/helpers/string.h"
#include "runtime/gen_common/hw_cmds.h"
#include "runtime/gtpin/gtpin_hw_helper.h"
#include "runtime/kernel/kernel.h"
#include "hw_cmds.h"
namespace NEO {
template <typename GfxFamily>

View File

@ -5,12 +5,11 @@
*
*/
#include "hw_info.h"
#include "runtime/helpers/hw_info.h"
#include "runtime/gen_common/hw_cmds.h"
#include "runtime/os_interface/debug_settings_manager.h"
#include "hw_cmds.h"
#include <algorithm>
namespace NEO {

View File

@ -7,10 +7,9 @@
#include "runtime/helpers/options.h"
#include "runtime/gen_common/hw_cmds.h"
#include "runtime/helpers/array_count.h"
#include "hw_cmds.h"
#include <cstddef>
namespace NEO {

View File

@ -6,13 +6,12 @@
*/
#include "core/memory_manager/memory_constants.h"
#include "runtime/gen_common/hw_cmds.h"
#include "runtime/gmm_helper/gmm_helper.h"
#include "runtime/helpers/cache_policy.h"
#include "runtime/helpers/state_base_address.h"
#include "runtime/indirect_heap/indirect_heap.h"
#include "hw_cmds.h"
namespace NEO {
template <typename GfxFamily>
void StateBaseAddressHelper<GfxFamily>::programStateBaseAddress(

View File

@ -7,8 +7,7 @@
#pragma once
#include "runtime/command_stream/csr_definitions.h"
#include "hw_cmds.h"
#include "runtime/gen_common/hw_cmds.h"
namespace NEO {
template <typename GfxFamily>

View File

@ -8,6 +8,7 @@
#include "common/helpers/bit_helpers.h"
#include "core/helpers/aligned_memory.h"
#include "runtime/execution_environment/execution_environment.h"
#include "runtime/gen_common/hw_cmds.h"
#include "runtime/gmm_helper/gmm.h"
#include "runtime/gmm_helper/gmm_helper.h"
#include "runtime/gmm_helper/resource_info.h"
@ -15,7 +16,6 @@
#include "runtime/mem_obj/buffer.h"
#include "buffer_ext.inl"
#include "hw_cmds.h"
namespace NEO {

View File

@ -7,13 +7,13 @@
#include "core/helpers/aligned_memory.h"
#include "runtime/execution_environment/execution_environment.h"
#include "runtime/gen_common/hw_cmds.h"
#include "runtime/gmm_helper/gmm.h"
#include "runtime/gmm_helper/gmm_helper.h"
#include "runtime/gmm_helper/resource_info.h"
#include "runtime/helpers/surface_formats.h"
#include "runtime/mem_obj/image.h"
#include "hw_cmds.h"
#include "image_ext.inl"
namespace NEO {

View File

@ -10,7 +10,6 @@
#include "runtime/os_interface/linux/drm_command_stream.h"
#include "drm_command_stream.h"
#include "hw_cmds.h"
namespace NEO {

View File

@ -21,8 +21,6 @@
#include "runtime/os_interface/linux/os_interface.h"
#include "runtime/platform/platform.h"
#include "hw_cmds.h"
#include <cstdlib>
#include <cstring>

View File

@ -7,8 +7,9 @@
#include "runtime/os_interface/linux/drm_engine_mapper.h"
#include "core/helpers/debug_helpers.h"
#include "drm/i915_drm.h"
#include "hw_cmds.h"
namespace NEO {

View File

@ -11,9 +11,8 @@
#pragma warning(disable : 4005)
#include "runtime/command_stream/command_stream_receiver_with_aub_dump.h"
#include "runtime/command_stream/device_command_stream.h"
#include "runtime/gen_common/hw_cmds.h"
#include "runtime/os_interface/windows/wddm_device_command_stream.h"
#include "hw_cmds.h"
#pragma warning(pop)
namespace NEO {

View File

@ -13,13 +13,12 @@
#include "core/command_stream/preemption.h"
#include "core/helpers/ptr_math.h"
#include "runtime/device/device.h"
#include "runtime/gen_common/hw_cmds.h"
#include "runtime/gmm_helper/page_table_mngr.h"
#include "runtime/helpers/gmm_callbacks.h"
#include "runtime/mem_obj/mem_obj.h"
#include "runtime/os_interface/windows/wddm/wddm.h"
#include "runtime/os_interface/windows/wddm_device_command_stream.h"
#include "hw_cmds.h"
#pragma warning(pop)
#include "runtime/os_interface/windows/gdi_interface.h"

View File

@ -7,7 +7,7 @@
#include "runtime/os_interface/windows/wddm_engine_mapper.h"
#include "hw_cmds.h"
#include "runtime/gen_common/hw_cmds.h"
namespace NEO {

View File

@ -9,6 +9,7 @@
#include "core/helpers/ptr_math.h"
#include "core/helpers/string.h"
#include "runtime/device/device.h"
#include "runtime/gen_common/hw_cmds.h"
#include "runtime/helpers/dispatch_info.h"
#include "runtime/kernel/kernel.h"
#include "runtime/mem_obj/buffer.h"
@ -16,8 +17,6 @@
#include "runtime/memory_manager/memory_manager.h"
#include "runtime/sampler/sampler.h"
#include "hw_cmds.h"
#include <cstdint>
#include <cstring>
#include <map>

View File

@ -17,8 +17,6 @@
#include "unit_tests/mocks/mock_kernel.h"
#include "unit_tests/mocks/mock_program.h"
#include "hw_cmds.h"
using namespace NEO;
class MediaImageSetArgTest : public DeviceFixture,

View File

@ -11,11 +11,10 @@
#include "runtime/aub_mem_dump/aub_mem_dump.h"
#include "runtime/command_stream/aub_command_stream_receiver_hw.h"
#include "runtime/device/device.h"
#include "runtime/gen_common/aub_mapper.h"
#include "runtime/helpers/options.h"
#include "test.h"
#include "aub_mapper.h"
namespace Os {
extern const char *fileSeparator;
}

View File

@ -9,8 +9,6 @@
#include "gtest/gtest.h"
//#include "unit_tests/test_files/4265157215134882557.cl"
namespace BuiltinKernelsSimulation {
__kernel void CopyImage3dToBuffer16Bytes(__read_only image3d_t input,

View File

@ -13,7 +13,6 @@
#include "unit_tests/mocks/mock_device.h"
#include "gtest/gtest.h"
#include "hw_cmds.h"
namespace NEO {

View File

@ -26,8 +26,6 @@
#include "unit_tests/mocks/mock_mdi.h"
#include "unit_tests/mocks/mock_program.h"
#include "hw_cmds.h"
using namespace NEO;
struct DispatchWalkerTest : public CommandQueueFixture, public DeviceFixture, public ::testing::Test {

View File

@ -10,7 +10,6 @@
#include "test.h"
#include "unit_tests/fixtures/device_fixture.h"
#include "hw_cmds.h"
#include "patch_shared.h"
using namespace NEO;

View File

@ -11,7 +11,6 @@
#include "unit_tests/fixtures/device_fixture.h"
#include "gtest/gtest.h"
#include "hw_cmds.h"
using namespace NEO;

View File

@ -13,7 +13,6 @@
#include "CL/cl_gl.h"
#include "gtest/gtest.h"
#include "hw_cmds.h"
#include <memory>

View File

@ -15,7 +15,6 @@
#include "unit_tests/fixtures/device_fixture.h"
#include "gmock/gmock.h"
#include "hw_cmds.h"
#include <memory>

View File

@ -7,6 +7,7 @@
#include "core/unit_tests/helpers/debug_manager_state_restore.h"
#include "runtime/command_queue/gpgpu_walker.h"
#include "runtime/gen_common/hw_cmds.h"
#include "runtime/helpers/hardware_commands_helper.h"
#include "runtime/helpers/options.h"
#include "runtime/utilities/tag_allocator.h"
@ -18,8 +19,6 @@
#include "unit_tests/mocks/mock_device_queue.h"
#include "unit_tests/mocks/mock_kernel.h"
#include "hw_cmds.h"
#include <memory>
using namespace NEO;

View File

@ -8,8 +8,6 @@
#include "runtime/os_interface/linux/drm_neo.h"
#include "test.h"
#include "hw_cmds.h"
#include <array>
using namespace NEO;

View File

@ -8,8 +8,6 @@
#include "runtime/os_interface/linux/drm_neo.h"
#include "test.h"
#include "hw_cmds.h"
#include <array>
using namespace NEO;

View File

@ -8,8 +8,6 @@
#include "runtime/os_interface/linux/drm_neo.h"
#include "test.h"
#include "hw_cmds.h"
#include <array>
using namespace NEO;

View File

@ -8,8 +8,6 @@
#include "runtime/os_interface/linux/drm_neo.h"
#include "test.h"
#include "hw_cmds.h"
#include <array>
using namespace NEO;

View File

@ -8,8 +8,6 @@
#include "runtime/os_interface/linux/drm_neo.h"
#include "test.h"
#include "hw_cmds.h"
#include <array>
using namespace NEO;

View File

@ -8,8 +8,6 @@
#include "runtime/os_interface/linux/drm_neo.h"
#include "test.h"
#include "hw_cmds.h"
#include <array>
using namespace NEO;

View File

@ -8,8 +8,6 @@
#include "runtime/os_interface/linux/drm_neo.h"
#include "test.h"
#include "hw_cmds.h"
#include <array>
using namespace NEO;

View File

@ -8,8 +8,6 @@
#include "runtime/os_interface/linux/drm_neo.h"
#include "test.h"
#include "hw_cmds.h"
#include <array>
using namespace NEO;

View File

@ -8,8 +8,6 @@
#include "runtime/os_interface/linux/drm_neo.h"
#include "test.h"
#include "hw_cmds.h"
#include <array>
using namespace NEO;

View File

@ -8,8 +8,6 @@
#include "runtime/os_interface/linux/drm_neo.h"
#include "test.h"
#include "hw_cmds.h"
#include <array>
using namespace NEO;

View File

@ -5,10 +5,9 @@
*
*/
#include "runtime/helpers/hw_info.h"
#include "test.h"
#include "hw_cmds.h"
#include <type_traits>
template <uint32_t prohibitedValue>

View File

@ -23,8 +23,6 @@
#include "unit_tests/indirect_heap/indirect_heap_fixture.h"
#include "unit_tests/mocks/mock_graphics_allocation.h"
#include "hw_cmds.h"
using namespace NEO;
void HardwareCommandsTest::SetUp() {

View File

@ -7,7 +7,7 @@
#pragma once
#include "hw_cmds.h"
#include "runtime/gen_common/hw_cmds.h"
namespace NEO {

View File

@ -14,8 +14,6 @@
#include "unit_tests/mocks/mock_kernel.h"
#include "unit_tests/mocks/mock_program.h"
#include "hw_cmds.h"
using namespace NEO;
struct KernelSLMAndBarrierTest : public DeviceFixture,

View File

@ -23,7 +23,6 @@
#include "global_environment.h"
#include "gmock/gmock.h"
#include "helpers/test_files.h"
#include "hw_cmds.h"
#include "mock_gmm_client_context.h"
#include <algorithm>

View File

@ -12,8 +12,6 @@
#include "unit_tests/fixtures/device_fixture.h"
#include "unit_tests/mocks/mock_context.h"
#include "hw_cmds.h"
using namespace NEO;
static const unsigned int testImageDimensions = 32;

View File

@ -12,8 +12,6 @@
#include "unit_tests/helpers/unit_test_helper.h"
#include "unit_tests/mocks/mock_context.h"
#include "hw_cmds.h"
using namespace NEO;
static const unsigned int testImageDimensions = 32;

View File

@ -14,8 +14,6 @@
#include "unit_tests/mocks/mock_context.h"
#include "unit_tests/mocks/mock_gmm.h"
#include "hw_cmds.h"
using namespace NEO;
static const unsigned int testImageDimensions = 31;

View File

@ -13,8 +13,6 @@
#include "unit_tests/helpers/unit_test_helper.h"
#include "unit_tests/mocks/mock_context.h"
#include "hw_cmds.h"
using namespace NEO;
static const unsigned int testImageDimensions = 17;

View File

@ -25,7 +25,6 @@
#include "unit_tests/mocks/mock_program.h"
#include "gmock/gmock.h"
#include "hw_cmds.h"
using namespace NEO;
using namespace ::testing;

View File

@ -15,7 +15,6 @@
#include "unit_tests/mocks/mock_csr.h"
#include "gtest/gtest.h"
#include "hw_cmds.h"
#include <type_traits>

View File

@ -19,7 +19,6 @@
#include "unit_tests/os_interface/linux/device_command_stream_fixture.h"
#include "gtest/gtest.h"
#include "hw_cmds.h"
#include <memory>

View File

@ -21,7 +21,6 @@
#include "drm/i915_drm.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
#include "hw_cmds.h"
#include <iostream>
#include <memory>

View File

@ -38,7 +38,6 @@
#include "drm/i915_drm.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
#include "hw_cmds.h"
#include <iostream>
#include <memory>

View File

@ -12,7 +12,6 @@
#include "runtime/device/device.h"
#include "gtest/gtest.h"
#include "hw_cmds.h"
namespace NEO {

View File

@ -5,11 +5,9 @@
*
*/
#include "runtime/gen_common/hw_cmds.h"
#include "runtime/helpers/array_count.h"
#include "hw_cmds.h"
#include "hw_info.h"
namespace NEO {
// IP address for TBX server
const char *tbxServerIp = "127.0.0.1";

View File

@ -17,8 +17,6 @@
#include "unit_tests/mocks/mock_kernel.h"
#include "unit_tests/mocks/mock_program.h"
#include "hw_cmds.h"
using namespace NEO;
namespace NEO {

View File

@ -8,6 +8,7 @@
#include "unit_tests/scheduler/scheduler_source_tests.h"
#include "runtime/device_queue/device_queue_hw.h"
#include "runtime/gen_common/hw_cmds.h"
#include "test.h"
#include "unit_tests/fixtures/device_host_queue_fixture.h"
#include "unit_tests/fixtures/execution_model_fixture.h"
@ -15,7 +16,6 @@
#include "unit_tests/mocks/mock_device_queue.h"
#include "gtest/gtest.h"
#include "hw_cmds.h"
// Keep this include after execution_model_fixture.h otherwise there is high chance of conflict with macros
#include "runtime/builtin_kernels_simulation/opencl_c.h"
#include "runtime/builtin_kernels_simulation/scheduler_simulation.h"