From b74d50205227fb32cd883557be0a07cc36da27b4 Mon Sep 17 00:00:00 2001 From: Jaroslaw Chodor Date: Sat, 25 Jan 2020 13:11:54 +0100 Subject: [PATCH] Moving patchtokens decoder to core Change-Id: I61d9f3ec7a1bca55df5b3b8c1884014acff1a4c0 --- core/device_binary_format/CMakeLists.txt | 16 ++++++++++++++++ .../patchtokens_decoder.cpp | 2 +- .../device_binary_format}/patchtokens_decoder.h | 0 .../device_binary_format}/patchtokens_dumper.cpp | 2 +- .../device_binary_format}/patchtokens_dumper.h | 2 +- .../patchtokens_validator.inl | 2 +- core/program/program_info_from_patchtokens.cpp | 2 +- .../device_binary_format/CMakeLists.txt | 15 +++++++++++++++ .../patchtokens_decoder_tests.cpp | 2 +- .../patchtokens_dumper_tests.cpp | 7 +++---- .../device_binary_format}/patchtokens_tests.h | 2 +- .../patchtokens_validator_tests.cpp | 6 +++--- .../program_info_from_patchtokens_tests.cpp | 4 ++-- runtime/compiler_interface/CMakeLists.txt | 9 +++------ runtime/program/kernel_info.cpp | 2 +- runtime/program/kernel_info_from_patchtokens.cpp | 2 +- runtime/program/process_elf_binary.cpp | 4 ++-- runtime/program/process_gen_binary.cpp | 6 +++--- unit_tests/compiler_interface/CMakeLists.txt | 8 +++----- unit_tests/fixtures/kernel_data_fixture.cpp | 2 +- unit_tests/gtpin/gtpin_tests.cpp | 4 ++-- unit_tests/mocks/mock_program.cpp | 2 +- .../program/evaluate_unhandled_token_tests.cpp | 4 ++-- .../kernel_info_from_patchtokens_tests.cpp | 4 ++-- unit_tests/program/program_data_tests.cpp | 2 +- unit_tests/program/program_tests.cpp | 4 ++-- 26 files changed, 70 insertions(+), 45 deletions(-) create mode 100644 core/device_binary_format/CMakeLists.txt rename {runtime/compiler_interface => core/device_binary_format}/patchtokens_decoder.cpp (99%) rename {runtime/compiler_interface => core/device_binary_format}/patchtokens_decoder.h (100%) rename {runtime/compiler_interface => core/device_binary_format}/patchtokens_dumper.cpp (99%) rename {runtime/compiler_interface => core/device_binary_format}/patchtokens_dumper.h (91%) rename {runtime/compiler_interface => core/device_binary_format}/patchtokens_validator.inl (99%) create mode 100644 core/unit_tests/device_binary_format/CMakeLists.txt rename {unit_tests/compiler_interface => core/unit_tests/device_binary_format}/patchtokens_decoder_tests.cpp (99%) rename {unit_tests/compiler_interface => core/unit_tests/device_binary_format}/patchtokens_dumper_tests.cpp (99%) rename {unit_tests/compiler_interface => core/unit_tests/device_binary_format}/patchtokens_tests.h (99%) rename {unit_tests/compiler_interface => core/unit_tests/device_binary_format}/patchtokens_validator_tests.cpp (99%) diff --git a/core/device_binary_format/CMakeLists.txt b/core/device_binary_format/CMakeLists.txt new file mode 100644 index 0000000000..0a78547bdf --- /dev/null +++ b/core/device_binary_format/CMakeLists.txt @@ -0,0 +1,16 @@ +# +# Copyright (C) 2019-2020 Intel Corporation +# +# SPDX-License-Identifier: MIT +# + +set(NEO_DEVICE_BINARY_FORMAT + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/patchtokens_decoder.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/patchtokens_decoder.h + ${CMAKE_CURRENT_SOURCE_DIR}/patchtokens_dumper.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/patchtokens_dumper.h + ${CMAKE_CURRENT_SOURCE_DIR}/patchtokens_validator.inl +) + +set_property(GLOBAL PROPERTY NEO_DEVICE_BINARY_FORMAT ${NEO_DEVICE_BINARY_FORMAT}) diff --git a/runtime/compiler_interface/patchtokens_decoder.cpp b/core/device_binary_format/patchtokens_decoder.cpp similarity index 99% rename from runtime/compiler_interface/patchtokens_decoder.cpp rename to core/device_binary_format/patchtokens_decoder.cpp index 0423e6f517..6130348d9a 100644 --- a/runtime/compiler_interface/patchtokens_decoder.cpp +++ b/core/device_binary_format/patchtokens_decoder.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 Intel Corporation + * Copyright (C) 2019-2020 Intel Corporation * * SPDX-License-Identifier: MIT * diff --git a/runtime/compiler_interface/patchtokens_decoder.h b/core/device_binary_format/patchtokens_decoder.h similarity index 100% rename from runtime/compiler_interface/patchtokens_decoder.h rename to core/device_binary_format/patchtokens_decoder.h diff --git a/runtime/compiler_interface/patchtokens_dumper.cpp b/core/device_binary_format/patchtokens_dumper.cpp similarity index 99% rename from runtime/compiler_interface/patchtokens_dumper.cpp rename to core/device_binary_format/patchtokens_dumper.cpp index e39045fd99..14d941d97d 100644 --- a/runtime/compiler_interface/patchtokens_dumper.cpp +++ b/core/device_binary_format/patchtokens_dumper.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 Intel Corporation + * Copyright (C) 2019-2020 Intel Corporation * * SPDX-License-Identifier: MIT * diff --git a/runtime/compiler_interface/patchtokens_dumper.h b/core/device_binary_format/patchtokens_dumper.h similarity index 91% rename from runtime/compiler_interface/patchtokens_dumper.h rename to core/device_binary_format/patchtokens_dumper.h index 8a929c5e18..b0b5534914 100644 --- a/runtime/compiler_interface/patchtokens_dumper.h +++ b/core/device_binary_format/patchtokens_dumper.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 Intel Corporation + * Copyright (C) 2019-2020 Intel Corporation * * SPDX-License-Identifier: MIT * diff --git a/runtime/compiler_interface/patchtokens_validator.inl b/core/device_binary_format/patchtokens_validator.inl similarity index 99% rename from runtime/compiler_interface/patchtokens_validator.inl rename to core/device_binary_format/patchtokens_validator.inl index f9974de85e..807a4e542e 100644 --- a/runtime/compiler_interface/patchtokens_validator.inl +++ b/core/device_binary_format/patchtokens_validator.inl @@ -7,8 +7,8 @@ #pragma once +#include "core/device_binary_format/patchtokens_decoder.h" #include "core/helpers/hw_info.h" -#include "runtime/compiler_interface/patchtokens_decoder.h" #include "runtime/program/kernel_arg_info.h" #include "igfxfmid.h" diff --git a/core/program/program_info_from_patchtokens.cpp b/core/program/program_info_from_patchtokens.cpp index 84be3b8029..99cc56f6c9 100644 --- a/core/program/program_info_from_patchtokens.cpp +++ b/core/program/program_info_from_patchtokens.cpp @@ -9,8 +9,8 @@ #include "core/compiler_interface/linker.h" #include "core/debug_settings/debug_settings_manager.h" +#include "core/device_binary_format/patchtokens_decoder.h" #include "core/program/program_info.h" -#include "runtime/compiler_interface/patchtokens_decoder.h" #include "runtime/program/kernel_info.h" #include "runtime/program/kernel_info_from_patchtokens.h" diff --git a/core/unit_tests/device_binary_format/CMakeLists.txt b/core/unit_tests/device_binary_format/CMakeLists.txt new file mode 100644 index 0000000000..9b5c7f428d --- /dev/null +++ b/core/unit_tests/device_binary_format/CMakeLists.txt @@ -0,0 +1,15 @@ +# +# Copyright (C) 2019-2020 Intel Corporation +# +# SPDX-License-Identifier: MIT +# + +set(NEO_DEVICE_BINARY_FORMAT_TESTS + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/patchtokens_decoder_tests.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/patchtokens_dumper_tests.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/patchtokens_tests.h + ${CMAKE_CURRENT_SOURCE_DIR}/patchtokens_validator_tests.cpp +) + +set_property(GLOBAL PROPERTY NEO_DEVICE_BINARY_FORMAT_TESTS ${NEO_DEVICE_BINARY_FORMAT_TESTS}) diff --git a/unit_tests/compiler_interface/patchtokens_decoder_tests.cpp b/core/unit_tests/device_binary_format/patchtokens_decoder_tests.cpp similarity index 99% rename from unit_tests/compiler_interface/patchtokens_decoder_tests.cpp rename to core/unit_tests/device_binary_format/patchtokens_decoder_tests.cpp index a78abdb727..9c9f17964d 100644 --- a/unit_tests/compiler_interface/patchtokens_decoder_tests.cpp +++ b/core/unit_tests/device_binary_format/patchtokens_decoder_tests.cpp @@ -5,8 +5,8 @@ * */ +#include "core/device_binary_format/patchtokens_decoder.h" #include "core/helpers/hash.h" -#include "runtime/compiler_interface/patchtokens_decoder.h" #include "test.h" #include "patchtokens_tests.h" diff --git a/unit_tests/compiler_interface/patchtokens_dumper_tests.cpp b/core/unit_tests/device_binary_format/patchtokens_dumper_tests.cpp similarity index 99% rename from unit_tests/compiler_interface/patchtokens_dumper_tests.cpp rename to core/unit_tests/device_binary_format/patchtokens_dumper_tests.cpp index 2f40784413..22d8456ff8 100644 --- a/unit_tests/compiler_interface/patchtokens_dumper_tests.cpp +++ b/core/unit_tests/device_binary_format/patchtokens_dumper_tests.cpp @@ -5,12 +5,11 @@ * */ -#include "runtime/compiler_interface/patchtokens_decoder.h" -#include "runtime/compiler_interface/patchtokens_dumper.h" +#include "core/device_binary_format/patchtokens_decoder.h" +#include "core/device_binary_format/patchtokens_dumper.h" +#include "core/unit_tests/device_binary_format/patchtokens_tests.h" #include "test.h" -#include "patchtokens_tests.h" - #include TEST(ProgramDumper, GivenEmptyProgramThenProperlyCreatesDumpStringWithWarnig) { diff --git a/unit_tests/compiler_interface/patchtokens_tests.h b/core/unit_tests/device_binary_format/patchtokens_tests.h similarity index 99% rename from unit_tests/compiler_interface/patchtokens_tests.h rename to core/unit_tests/device_binary_format/patchtokens_tests.h index 89a98112a0..a31927c807 100644 --- a/unit_tests/compiler_interface/patchtokens_tests.h +++ b/core/unit_tests/device_binary_format/patchtokens_tests.h @@ -7,7 +7,7 @@ #pragma once -#include "runtime/compiler_interface/patchtokens_decoder.h" +#include "core/device_binary_format/patchtokens_decoder.h" #include "igfxfmid.h" diff --git a/unit_tests/compiler_interface/patchtokens_validator_tests.cpp b/core/unit_tests/device_binary_format/patchtokens_validator_tests.cpp similarity index 99% rename from unit_tests/compiler_interface/patchtokens_validator_tests.cpp rename to core/unit_tests/device_binary_format/patchtokens_validator_tests.cpp index 1fb48e8cdc..ad0a17ad19 100644 --- a/unit_tests/compiler_interface/patchtokens_validator_tests.cpp +++ b/core/unit_tests/device_binary_format/patchtokens_validator_tests.cpp @@ -5,12 +5,12 @@ * */ -#include "runtime/compiler_interface/patchtokens_decoder.h" -#include "runtime/compiler_interface/patchtokens_validator.inl" +#include "core/device_binary_format/patchtokens_decoder.h" +#include "core/device_binary_format/patchtokens_validator.inl" +#include "core/unit_tests/device_binary_format/patchtokens_tests.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "patchtokens_tests.h" struct UknownTokenValidator { UknownTokenValidator(bool isSafeToSkip = true) : isSafeToSkip(isSafeToSkip) { diff --git a/core/unit_tests/program/program_info_from_patchtokens_tests.cpp b/core/unit_tests/program/program_info_from_patchtokens_tests.cpp index c8d42db080..728788f555 100644 --- a/core/unit_tests/program/program_info_from_patchtokens_tests.cpp +++ b/core/unit_tests/program/program_info_from_patchtokens_tests.cpp @@ -6,12 +6,12 @@ */ #include "core/compiler_interface/linker.h" +#include "core/device_binary_format/patchtokens_decoder.h" #include "core/program/program_info.h" #include "core/program/program_info_from_patchtokens.h" #include "core/unit_tests/compiler_interface/linker_mock.h" -#include "runtime/compiler_interface/patchtokens_decoder.h" +#include "core/unit_tests/device_binary_format/patchtokens_tests.h" #include "runtime/program/kernel_info.h" -#include "unit_tests/compiler_interface/patchtokens_tests.h" #include "RelocationInfo.h" #include "gmock/gmock.h" diff --git a/runtime/compiler_interface/CMakeLists.txt b/runtime/compiler_interface/CMakeLists.txt index 06b66027a2..932cfbb64b 100644 --- a/runtime/compiler_interface/CMakeLists.txt +++ b/runtime/compiler_interface/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2018-2019 Intel Corporation +# Copyright (C) 2018-2020 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -7,15 +7,12 @@ set(RUNTIME_SRCS_COMPILER_INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/default_cl_cache_config.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/patchtokens_decoder.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/patchtokens_decoder.h - ${CMAKE_CURRENT_SOURCE_DIR}/patchtokens_dumper.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/patchtokens_dumper.h - ${CMAKE_CURRENT_SOURCE_DIR}/patchtokens_validator.inl ) get_property(NEO_COMPILER_INTERFACE GLOBAL PROPERTY NEO_COMPILER_INTERFACE) +get_property(NEO_DEVICE_BINARY_FORMAT GLOBAL PROPERTY NEO_DEVICE_BINARY_FORMAT) list(APPEND RUNTIME_SRCS_COMPILER_INTERFACE ${NEO_COMPILER_INTERFACE}) +list(APPEND RUNTIME_SRCS_COMPILER_INTERFACE ${NEO_DEVICE_BINARY_FORMAT}) target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_COMPILER_INTERFACE}) set_property(GLOBAL PROPERTY RUNTIME_SRCS_COMPILER_INTERFACE ${RUNTIME_SRCS_COMPILER_INTERFACE}) diff --git a/runtime/program/kernel_info.cpp b/runtime/program/kernel_info.cpp index 2e0212074d..0e2a146883 100644 --- a/runtime/program/kernel_info.cpp +++ b/runtime/program/kernel_info.cpp @@ -5,11 +5,11 @@ * */ +#include "core/device_binary_format/patchtokens_decoder.h" #include "core/helpers/aligned_memory.h" #include "core/helpers/hw_cmds.h" #include "core/helpers/ptr_math.h" #include "core/helpers/string.h" -#include "runtime/compiler_interface/patchtokens_decoder.h" #include "runtime/device/device.h" #include "runtime/helpers/dispatch_info.h" #include "runtime/kernel/kernel.h" diff --git a/runtime/program/kernel_info_from_patchtokens.cpp b/runtime/program/kernel_info_from_patchtokens.cpp index d783f0c847..a14703e7e6 100644 --- a/runtime/program/kernel_info_from_patchtokens.cpp +++ b/runtime/program/kernel_info_from_patchtokens.cpp @@ -7,7 +7,7 @@ #include "runtime/program/kernel_info_from_patchtokens.h" -#include "runtime/compiler_interface/patchtokens_decoder.h" +#include "core/device_binary_format/patchtokens_decoder.h" #include "runtime/program/kernel_info.h" #include diff --git a/runtime/program/process_elf_binary.cpp b/runtime/program/process_elf_binary.cpp index c937e0a3cc..6d33f94d9e 100644 --- a/runtime/program/process_elf_binary.cpp +++ b/runtime/program/process_elf_binary.cpp @@ -1,15 +1,15 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "common/compiler_support.h" +#include "core/device_binary_format/patchtokens_decoder.h" #include "core/elf/reader.h" #include "core/elf/writer.h" #include "core/helpers/string.h" -#include "runtime/compiler_interface/patchtokens_decoder.h" #include "program.h" diff --git a/runtime/program/process_gen_binary.cpp b/runtime/program/process_gen_binary.cpp index 179bf47262..995e5b6115 100644 --- a/runtime/program/process_gen_binary.cpp +++ b/runtime/program/process_gen_binary.cpp @@ -5,6 +5,9 @@ * */ +#include "core/device_binary_format/patchtokens_decoder.h" +#include "core/device_binary_format/patchtokens_dumper.h" +#include "core/device_binary_format/patchtokens_validator.inl" #include "core/helpers/aligned_memory.h" #include "core/helpers/debug_helpers.h" #include "core/helpers/ptr_math.h" @@ -13,9 +16,6 @@ #include "core/program/program_info.h" #include "core/program/program_info_from_patchtokens.h" #include "core/program/program_initialization.h" -#include "runtime/compiler_interface/patchtokens_decoder.h" -#include "runtime/compiler_interface/patchtokens_dumper.h" -#include "runtime/compiler_interface/patchtokens_validator.inl" #include "runtime/context/context.h" #include "runtime/device/device.h" #include "runtime/gtpin/gtpin_notify.h" diff --git a/unit_tests/compiler_interface/CMakeLists.txt b/unit_tests/compiler_interface/CMakeLists.txt index bd6864c797..c2835e3115 100644 --- a/unit_tests/compiler_interface/CMakeLists.txt +++ b/unit_tests/compiler_interface/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2017-2019 Intel Corporation +# Copyright (C) 2017-2020 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -7,13 +7,11 @@ set(IGDRCL_SRCS_tests_compiler_interface ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/default_cl_cache_config_tests.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/patchtokens_decoder_tests.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/patchtokens_dumper_tests.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/patchtokens_validator_tests.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/patchtokens_tests.h ) get_property(NEO_CORE_COMPILER_INTERFACE_TESTS GLOBAL PROPERTY NEO_CORE_COMPILER_INTERFACE_TESTS) +get_property(NEO_DEVICE_BINARY_FORMAT_TESTS GLOBAL PROPERTY NEO_DEVICE_BINARY_FORMAT_TESTS) list(APPEND IGDRCL_SRCS_tests_compiler_interface ${NEO_CORE_COMPILER_INTERFACE_TESTS}) +list(APPEND IGDRCL_SRCS_tests_compiler_interface ${NEO_DEVICE_BINARY_FORMAT_TESTS}) target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_compiler_interface}) diff --git a/unit_tests/fixtures/kernel_data_fixture.cpp b/unit_tests/fixtures/kernel_data_fixture.cpp index e65c074293..9f7b010f71 100644 --- a/unit_tests/fixtures/kernel_data_fixture.cpp +++ b/unit_tests/fixtures/kernel_data_fixture.cpp @@ -7,11 +7,11 @@ #include "unit_tests/fixtures/kernel_data_fixture.h" +#include "core/device_binary_format/patchtokens_decoder.h" #include "core/helpers/aligned_memory.h" #include "core/helpers/string.h" #include "core/memory_manager/graphics_allocation.h" #include "core/program/program_info_from_patchtokens.h" -#include "runtime/compiler_interface/patchtokens_decoder.h" void KernelDataTest::buildAndDecode() { cl_int error = CL_SUCCESS; diff --git a/unit_tests/gtpin/gtpin_tests.cpp b/unit_tests/gtpin/gtpin_tests.cpp index 56122eed5b..b465162d5c 100644 --- a/unit_tests/gtpin/gtpin_tests.cpp +++ b/unit_tests/gtpin/gtpin_tests.cpp @@ -5,13 +5,14 @@ * */ +#include "core/device_binary_format/patchtokens_decoder.h" #include "core/helpers/basic_math.h" #include "core/helpers/file_io.h" #include "core/helpers/hash.h" #include "core/helpers/options.h" #include "core/os_interface/os_context.h" +#include "core/unit_tests/device_binary_format/patchtokens_tests.h" #include "runtime/api/api.h" -#include "runtime/compiler_interface/patchtokens_decoder.h" #include "runtime/context/context.h" #include "runtime/device/device.h" #include "runtime/gtpin/gtpin_defs.h" @@ -24,7 +25,6 @@ #include "runtime/memory_manager/surface.h" #include "runtime/program/create.inl" #include "test.h" -#include "unit_tests/compiler_interface/patchtokens_tests.h" #include "unit_tests/fixtures/context_fixture.h" #include "unit_tests/fixtures/memory_management_fixture.h" #include "unit_tests/fixtures/platform_fixture.h" diff --git a/unit_tests/mocks/mock_program.cpp b/unit_tests/mocks/mock_program.cpp index 7889338643..bca9e3e592 100644 --- a/unit_tests/mocks/mock_program.cpp +++ b/unit_tests/mocks/mock_program.cpp @@ -8,9 +8,9 @@ #include "unit_tests/mocks/mock_program.h" #include "core/compiler_interface/compiler_cache.h" +#include "core/device_binary_format/patchtokens_decoder.h" #include "core/helpers/hash.h" #include "core/program/program_info_from_patchtokens.h" -#include "runtime/compiler_interface/patchtokens_decoder.h" #include "runtime/context/context.h" #include "runtime/program/create.inl" #include "runtime/program/kernel_info.h" diff --git a/unit_tests/program/evaluate_unhandled_token_tests.cpp b/unit_tests/program/evaluate_unhandled_token_tests.cpp index 6f9183c1ba..898629d92a 100644 --- a/unit_tests/program/evaluate_unhandled_token_tests.cpp +++ b/unit_tests/program/evaluate_unhandled_token_tests.cpp @@ -5,11 +5,11 @@ * */ -#include "runtime/compiler_interface/patchtokens_decoder.h" +#include "core/device_binary_format/patchtokens_decoder.h" +#include "core/unit_tests/device_binary_format/patchtokens_tests.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/program/create.inl" #include "runtime/program/program.h" -#include "unit_tests/compiler_interface/patchtokens_tests.h" #include "gtest/gtest.h" diff --git a/unit_tests/program/kernel_info_from_patchtokens_tests.cpp b/unit_tests/program/kernel_info_from_patchtokens_tests.cpp index 8068ad923d..81961a08eb 100644 --- a/unit_tests/program/kernel_info_from_patchtokens_tests.cpp +++ b/unit_tests/program/kernel_info_from_patchtokens_tests.cpp @@ -5,10 +5,10 @@ * */ -#include "runtime/compiler_interface/patchtokens_decoder.h" +#include "core/device_binary_format/patchtokens_decoder.h" +#include "core/unit_tests/device_binary_format/patchtokens_tests.h" #include "runtime/program/kernel_info.h" #include "runtime/program/kernel_info_from_patchtokens.h" -#include "unit_tests/compiler_interface/patchtokens_tests.h" #include "gtest/gtest.h" diff --git a/unit_tests/program/program_data_tests.cpp b/unit_tests/program/program_data_tests.cpp index c4812daed4..19f34c752e 100644 --- a/unit_tests/program/program_data_tests.cpp +++ b/unit_tests/program/program_data_tests.cpp @@ -11,10 +11,10 @@ #include "core/memory_manager/unified_memory_manager.h" #include "core/program/program_info_from_patchtokens.h" #include "core/unit_tests/compiler_interface/linker_mock.h" +#include "core/unit_tests/device_binary_format/patchtokens_tests.h" #include "runtime/platform/platform.h" #include "runtime/program/program.h" #include "test.h" -#include "unit_tests/compiler_interface/patchtokens_tests.h" #include "unit_tests/mocks/mock_buffer.h" #include "unit_tests/mocks/mock_csr.h" #include "unit_tests/mocks/mock_execution_environment.h" diff --git a/unit_tests/program/program_tests.cpp b/unit_tests/program/program_tests.cpp index 96372d3247..d8a383e43b 100644 --- a/unit_tests/program/program_tests.cpp +++ b/unit_tests/program/program_tests.cpp @@ -7,6 +7,7 @@ #include "unit_tests/program/program_tests.h" +#include "core/device_binary_format/patchtokens_decoder.h" #include "core/elf/reader.h" #include "core/gmm_helper/gmm_helper.h" #include "core/helpers/aligned_memory.h" @@ -17,16 +18,15 @@ #include "core/memory_manager/allocations_list.h" #include "core/memory_manager/graphics_allocation.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" #include "core/unit_tests/utilities/base_object_utils.h" #include "runtime/command_stream/command_stream_receiver_hw.h" -#include "runtime/compiler_interface/patchtokens_decoder.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/compiler_interface/patchtokens_tests.h" #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/fixtures/multi_root_device_fixture.h" #include "unit_tests/global_environment.h"