diff --git a/CMakeLists.txt b/CMakeLists.txt index 03e9c2b50d..9443c9cbbb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -461,6 +461,7 @@ endif() include_directories(${IGDRCL_SOURCE_DIR}) include_directories(${IGDRCL_BUILD_DIR}) include_directories(${IGDRCL_SOURCE_DIR}/runtime/sku_info/definitions${BRANCH_DIR_SUFFIX}) +include_directories(${IGDRCL_SOURCE_DIR}/runtime/gen_common/reg_configs${BRANCH_DIR_SUFFIX}) include_directories(${IGDRCL_SOURCE_DIR}/runtime/gmm_helper/${BRANCH_DIR_SUFFIX}) set(HW_SRC_INCLUDE_PATH ${IGDRCL_SOURCE_DIR}/runtime/gen_common) diff --git a/runtime/gen_common/CMakeLists.txt b/runtime/gen_common/CMakeLists.txt index 502fd8729b..3dc9703911 100644 --- a/runtime/gen_common/CMakeLists.txt +++ b/runtime/gen_common/CMakeLists.txt @@ -23,7 +23,7 @@ set(RUNTIME_SRCS_GEN_COMMON ${CMAKE_CURRENT_SOURCE_DIR}/aub_mapper.h ${CMAKE_CURRENT_SOURCE_DIR}/aub_mapper_base.h ${CMAKE_CURRENT_SOURCE_DIR}/hw_cmds.h - ${CMAKE_CURRENT_SOURCE_DIR}/reg_configs.h + ${CMAKE_CURRENT_SOURCE_DIR}/reg_configs${BRANCH_DIR_SUFFIX}/reg_configs_common.h ) target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_GEN_COMMON}) diff --git a/runtime/gen_common/reg_configs.h b/runtime/gen_common/reg_configs/reg_configs_common.h similarity index 96% rename from runtime/gen_common/reg_configs.h rename to runtime/gen_common/reg_configs/reg_configs_common.h index 25707a8d56..9395b76667 100644 --- a/runtime/gen_common/reg_configs.h +++ b/runtime/gen_common/reg_configs/reg_configs_common.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (c) 2017 - 2018, Intel Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/runtime/helpers/preamble.inl b/runtime/helpers/preamble.inl index 0e45bf5817..93d856abc3 100644 --- a/runtime/helpers/preamble.inl +++ b/runtime/helpers/preamble.inl @@ -24,7 +24,7 @@ #include "runtime/command_stream/linear_stream.h" #include "runtime/command_stream/preemption.h" #include "hw_cmds.h" -#include "reg_configs.h" +#include "reg_configs_common.h" #include "runtime/device/device.h" #include "runtime/kernel/kernel.h" #include "runtime/helpers/aligned_memory.h" diff --git a/unit_tests/command_queue/enqueue_copy_buffer_rect_tests.cpp b/unit_tests/command_queue/enqueue_copy_buffer_rect_tests.cpp index 862caa41ad..f873c51588 100644 --- a/unit_tests/command_queue/enqueue_copy_buffer_rect_tests.cpp +++ b/unit_tests/command_queue/enqueue_copy_buffer_rect_tests.cpp @@ -22,7 +22,7 @@ #include "runtime/built_ins/built_ins.h" #include "runtime/built_ins/builtins_dispatch_builder.h" -#include "runtime/gen_common/reg_configs.h" +#include "reg_configs_common.h" #include "runtime/helpers/dispatch_info.h" #include "runtime/memory_manager/memory_constants.h" #include "unit_tests/command_queue/enqueue_copy_buffer_rect_fixture.h" diff --git a/unit_tests/command_queue/enqueue_copy_buffer_tests.cpp b/unit_tests/command_queue/enqueue_copy_buffer_tests.cpp index d5e34c81da..31aa4e6393 100644 --- a/unit_tests/command_queue/enqueue_copy_buffer_tests.cpp +++ b/unit_tests/command_queue/enqueue_copy_buffer_tests.cpp @@ -24,7 +24,7 @@ #include "runtime/built_ins/builtins_dispatch_builder.h" #include "runtime/helpers/ptr_math.h" #include "runtime/kernel/kernel.h" -#include "runtime/gen_common/reg_configs.h" +#include "reg_configs_common.h" #include "runtime/helpers/dispatch_info.h" #include "unit_tests/command_queue/enqueue_fixture.h" #include "unit_tests/command_queue/enqueue_copy_buffer_fixture.h" diff --git a/unit_tests/command_queue/enqueue_copy_buffer_to_image_tests.cpp b/unit_tests/command_queue/enqueue_copy_buffer_to_image_tests.cpp index 85ab946d17..17719ba8ee 100644 --- a/unit_tests/command_queue/enqueue_copy_buffer_to_image_tests.cpp +++ b/unit_tests/command_queue/enqueue_copy_buffer_to_image_tests.cpp @@ -22,7 +22,7 @@ #include #include "runtime/built_ins/builtins_dispatch_builder.h" -#include "runtime/gen_common/reg_configs.h" +#include "reg_configs_common.h" #include "unit_tests/command_queue/enqueue_copy_buffer_to_image_fixture.h" #include "unit_tests/gen_common/gen_commands_common_validation.h" #include "unit_tests/mocks/mock_builtin_dispatch_info_builder.h" diff --git a/unit_tests/command_queue/enqueue_copy_image_tests.cpp b/unit_tests/command_queue/enqueue_copy_image_tests.cpp index ee27ccf3a6..bd35e2c773 100644 --- a/unit_tests/command_queue/enqueue_copy_image_tests.cpp +++ b/unit_tests/command_queue/enqueue_copy_image_tests.cpp @@ -22,7 +22,7 @@ #include #include "runtime/built_ins/builtins_dispatch_builder.h" -#include "runtime/gen_common/reg_configs.h" +#include "reg_configs_common.h" #include "unit_tests/command_queue/enqueue_copy_image_fixture.h" #include "unit_tests/gen_common/gen_commands_common_validation.h" #include "unit_tests/mocks/mock_builtin_dispatch_info_builder.h" diff --git a/unit_tests/command_queue/enqueue_copy_image_to_buffer_tests.cpp b/unit_tests/command_queue/enqueue_copy_image_to_buffer_tests.cpp index 2a84e6caee..9ac6c0e47b 100644 --- a/unit_tests/command_queue/enqueue_copy_image_to_buffer_tests.cpp +++ b/unit_tests/command_queue/enqueue_copy_image_to_buffer_tests.cpp @@ -22,7 +22,7 @@ #include #include "runtime/built_ins/builtins_dispatch_builder.h" -#include "runtime/gen_common/reg_configs.h" +#include "reg_configs_common.h" #include "unit_tests/command_queue/enqueue_copy_image_to_buffer_fixture.h" #include "unit_tests/gen_common/gen_commands_common_validation.h" #include "unit_tests/mocks/mock_builtin_dispatch_info_builder.h" diff --git a/unit_tests/command_queue/enqueue_fill_buffer_tests.cpp b/unit_tests/command_queue/enqueue_fill_buffer_tests.cpp index 87da339721..a03e3b95c4 100644 --- a/unit_tests/command_queue/enqueue_fill_buffer_tests.cpp +++ b/unit_tests/command_queue/enqueue_fill_buffer_tests.cpp @@ -24,7 +24,7 @@ #include "runtime/built_ins/builtins_dispatch_builder.h" #include "runtime/command_queue/command_queue.h" #include "runtime/command_stream/command_stream_receiver.h" -#include "runtime/gen_common/reg_configs.h" +#include "reg_configs_common.h" #include "runtime/helpers/ptr_math.h" #include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/dispatch_info.h" diff --git a/unit_tests/command_queue/enqueue_fill_image_tests.cpp b/unit_tests/command_queue/enqueue_fill_image_tests.cpp index 483454a247..aca9169882 100644 --- a/unit_tests/command_queue/enqueue_fill_image_tests.cpp +++ b/unit_tests/command_queue/enqueue_fill_image_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (c) 2017 - 2018, Intel Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -21,7 +21,7 @@ */ #include -#include "runtime/gen_common/reg_configs.h" +#include "reg_configs_common.h" #include "unit_tests/command_queue/enqueue_fill_image_fixture.h" #include "unit_tests/gen_common/gen_commands_common_validation.h" #include "runtime/helpers/convert_color.h" diff --git a/unit_tests/command_queue/enqueue_kernel_tests.cpp b/unit_tests/command_queue/enqueue_kernel_tests.cpp index 31f7c28f26..a40675515d 100644 --- a/unit_tests/command_queue/enqueue_kernel_tests.cpp +++ b/unit_tests/command_queue/enqueue_kernel_tests.cpp @@ -23,7 +23,7 @@ #include "runtime/built_ins/built_ins.h" #include "runtime/built_ins/builtins_dispatch_builder.h" #include "runtime/command_stream/thread_arbitration_policy.h" -#include "runtime/gen_common/reg_configs.h" +#include "reg_configs_common.h" #include "runtime/helpers/preamble.h" #include "runtime/memory_manager/graphics_allocation.h" #include "runtime/memory_manager/memory_constants.h" diff --git a/unit_tests/command_queue/enqueue_read_buffer_rect_tests.cpp b/unit_tests/command_queue/enqueue_read_buffer_rect_tests.cpp index 5395e7406f..ac7b1ea99a 100644 --- a/unit_tests/command_queue/enqueue_read_buffer_rect_tests.cpp +++ b/unit_tests/command_queue/enqueue_read_buffer_rect_tests.cpp @@ -22,7 +22,7 @@ #include "runtime/built_ins/built_ins.h" #include "runtime/built_ins/builtins_dispatch_builder.h" -#include "runtime/gen_common/reg_configs.h" +#include "reg_configs_common.h" #include "runtime/helpers/dispatch_info.h" #include "runtime/memory_manager/memory_constants.h" #include "unit_tests/command_queue/enqueue_read_buffer_rect_fixture.h" diff --git a/unit_tests/command_queue/enqueue_read_buffer_tests.cpp b/unit_tests/command_queue/enqueue_read_buffer_tests.cpp index a5d94feaf1..0f32bf5ba7 100644 --- a/unit_tests/command_queue/enqueue_read_buffer_tests.cpp +++ b/unit_tests/command_queue/enqueue_read_buffer_tests.cpp @@ -22,7 +22,7 @@ #include "runtime/built_ins/built_ins.h" #include "runtime/built_ins/builtins_dispatch_builder.h" -#include "runtime/gen_common/reg_configs.h" +#include "reg_configs_common.h" #include "runtime/helpers/cache_policy.h" #include "runtime/helpers/dispatch_info.h" #include "unit_tests/command_queue/enqueue_fixture.h" diff --git a/unit_tests/command_queue/enqueue_read_image_tests.cpp b/unit_tests/command_queue/enqueue_read_image_tests.cpp index d6791cb838..f383dcb940 100644 --- a/unit_tests/command_queue/enqueue_read_image_tests.cpp +++ b/unit_tests/command_queue/enqueue_read_image_tests.cpp @@ -21,7 +21,7 @@ */ #include "runtime/built_ins/builtins_dispatch_builder.h" -#include "runtime/gen_common/reg_configs.h" +#include "reg_configs_common.h" #include "unit_tests/command_queue/enqueue_read_image_fixture.h" #include "unit_tests/gen_common/gen_commands_common_validation.h" #include "unit_tests/mocks/mock_builtin_dispatch_info_builder.h" diff --git a/unit_tests/command_queue/enqueue_write_buffer_rect_tests.cpp b/unit_tests/command_queue/enqueue_write_buffer_rect_tests.cpp index 0d51290ec0..0e802f2d40 100644 --- a/unit_tests/command_queue/enqueue_write_buffer_rect_tests.cpp +++ b/unit_tests/command_queue/enqueue_write_buffer_rect_tests.cpp @@ -22,7 +22,7 @@ #include "runtime/built_ins/built_ins.h" #include "runtime/built_ins/builtins_dispatch_builder.h" -#include "runtime/gen_common/reg_configs.h" +#include "reg_configs_common.h" #include "runtime/helpers/dispatch_info.h" #include "unit_tests/command_queue/enqueue_write_buffer_rect_fixture.h" #include "unit_tests/fixtures/buffer_fixture.h" diff --git a/unit_tests/command_queue/enqueue_write_buffer_tests.cpp b/unit_tests/command_queue/enqueue_write_buffer_tests.cpp index 51ea2736f0..c248658493 100644 --- a/unit_tests/command_queue/enqueue_write_buffer_tests.cpp +++ b/unit_tests/command_queue/enqueue_write_buffer_tests.cpp @@ -23,7 +23,7 @@ #include "unit_tests/command_queue/buffer_operations_fixture.h" #include "runtime/built_ins/built_ins.h" #include "runtime/built_ins/builtins_dispatch_builder.h" -#include "runtime/gen_common/reg_configs.h" +#include "reg_configs_common.h" #include "runtime/helpers/dispatch_info.h" #include "unit_tests/command_queue/enqueue_fixture.h" #include "unit_tests/gen_common/gen_commands_common_validation.h" diff --git a/unit_tests/command_queue/enqueue_write_image_tests.cpp b/unit_tests/command_queue/enqueue_write_image_tests.cpp index fed1ad9681..1d1ea4d26d 100644 --- a/unit_tests/command_queue/enqueue_write_image_tests.cpp +++ b/unit_tests/command_queue/enqueue_write_image_tests.cpp @@ -21,7 +21,7 @@ */ #include "runtime/built_ins/builtins_dispatch_builder.h" -#include "runtime/gen_common/reg_configs.h" +#include "reg_configs_common.h" #include "runtime/memory_manager/memory_manager.h" #include "unit_tests/command_queue/enqueue_write_image_fixture.h" #include "unit_tests/gen_common/gen_commands_common_validation.h" diff --git a/unit_tests/command_stream/command_stream_receiver_hw_tests.cpp b/unit_tests/command_stream/command_stream_receiver_hw_tests.cpp index e9d97526ca..69c6ff02cd 100644 --- a/unit_tests/command_stream/command_stream_receiver_hw_tests.cpp +++ b/unit_tests/command_stream/command_stream_receiver_hw_tests.cpp @@ -20,6 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#include "reg_configs_common.h" #include "runtime/built_ins/built_ins.h" #include "runtime/command_queue/command_queue_hw.h" #include "runtime/command_stream/command_stream_receiver.h" @@ -34,7 +35,6 @@ #include "runtime/memory_manager/memory_manager.h" #include "runtime/mem_obj/buffer.h" #include "runtime/command_stream/preemption.h" -#include "runtime/gen_common/reg_configs.h" #include "unit_tests/libult/ult_command_stream_receiver.h" #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/fixtures/built_in_fixture.h" diff --git a/unit_tests/gen8/command_stream_receiver_hw_tests_gen8.cpp b/unit_tests/gen8/command_stream_receiver_hw_tests_gen8.cpp index bbe6e00d03..d15b319c22 100644 --- a/unit_tests/gen8/command_stream_receiver_hw_tests_gen8.cpp +++ b/unit_tests/gen8/command_stream_receiver_hw_tests_gen8.cpp @@ -20,10 +20,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#include "reg_configs_common.h" #include "runtime/command_queue/command_queue_hw.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/command_stream/linear_stream.h" -#include "runtime/gen_common/reg_configs.h" #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/helpers/hw_parse.h" diff --git a/unit_tests/gen9/command_stream_receiver_hw_tests_gen9.cpp b/unit_tests/gen9/command_stream_receiver_hw_tests_gen9.cpp index d95162755a..a543a0e926 100644 --- a/unit_tests/gen9/command_stream_receiver_hw_tests_gen9.cpp +++ b/unit_tests/gen9/command_stream_receiver_hw_tests_gen9.cpp @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#include "reg_configs_common.h" #include "runtime/built_ins/built_ins.h" #include "runtime/command_queue/command_queue_hw.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/command_stream/linear_stream.h" -#include "runtime/gen_common/reg_configs.h" #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/fixtures/ult_command_stream_receiver_fixture.h"