From c2368739ce719cc24c5c1699f810dd1f1a15583b Mon Sep 17 00:00:00 2001 From: "Stefanowski, Adam" Date: Fri, 11 May 2018 10:54:35 +0200 Subject: [PATCH] add gen suffix for each gen files Change-Id: Ie00e23fc6a7abf2114e62f70d66a07beaed2b502 --- offline_compiler/CMakeLists.txt | 10 +- runtime/enable_gens.cmake | 91 +++++++++++-------- ...p => aub_command_stream_receiver_gen8.cpp} | 0 ...aub_mem_dump.cpp => aub_mem_dump_gen8.cpp} | 0 runtime/gen8/{buffer.cpp => buffer_gen8.cpp} | 2 +- ...mmand_queue.cpp => command_queue_gen8.cpp} | 0 ...pp => command_stream_receiver_hw_gen8.cpp} | 0 ...device_queue.cpp => device_queue_gen8.cpp} | 2 +- ...y_full.cpp => enable_family_full_gen8.cpp} | 2 +- ...p => flat_batch_buffer_helper_hw_gen8.cpp} | 0 ...gpgpu_walker.cpp => gpgpu_walker_gen8.cpp} | 0 .../{hw_helper.cpp => hw_helper_gen8.cpp} | 2 +- runtime/gen8/hw_info_bdw.cpp | 1 - runtime/gen8/hw_info_gen8.cpp | 27 ++++++ runtime/gen8/{image.cpp => image_gen8.cpp} | 2 +- ..._commands.cpp => kernel_commands_gen8.cpp} | 2 +- ...r.cpp => command_stream_receiver_gen8.cpp} | 0 ..._mapper.cpp => drm_engine_mapper_gen8.cpp} | 0 .../gen8/{preamble.cpp => preamble_gen8.cpp} | 0 .../{preemption.cpp => preemption_gen8.cpp} | 0 .../gen8/{sampler.cpp => sampler_gen8.cpp} | 2 +- ...ddress.cpp => state_base_address_gen8.cpp} | 2 +- ...p => tbx_command_stream_receiver_gen8.cpp} | 0 ...r.cpp => command_stream_receiver_gen8.cpp} | 0 ...pp => translationtable_callbacks_gen8.cpp} | 0 ...mapper.cpp => wddm_engine_mapper_gen8.cpp} | 0 .../gen8/windows/{wddm.cpp => wddm_gen8.cpp} | 0 ...p => aub_command_stream_receiver_gen9.cpp} | 0 ...aub_mem_dump.cpp => aub_mem_dump_gen9.cpp} | 0 runtime/gen9/{buffer.cpp => buffer_gen9.cpp} | 2 +- ...mmand_queue.cpp => command_queue_gen9.cpp} | 0 ...pp => command_stream_receiver_hw_gen9.cpp} | 0 ...device_queue.cpp => device_queue_gen9.cpp} | 2 +- ...y_full.cpp => enable_family_full_gen9.cpp} | 2 +- ...p => flat_batch_buffer_helper_hw_gen9.cpp} | 0 ...gpgpu_walker.cpp => gpgpu_walker_gen9.cpp} | 0 .../{hw_helper.cpp => hw_helper_gen9.cpp} | 0 .../gen9/{hw_info.cpp => hw_info_gen9.cpp} | 2 +- runtime/gen9/{image.cpp => image_gen9.cpp} | 2 +- ..._commands.cpp => kernel_commands_gen9.cpp} | 2 +- ...r.cpp => command_stream_receiver_gen9.cpp} | 0 ..._mapper.cpp => drm_engine_mapper_gen9.cpp} | 0 .../gen9/{preamble.cpp => preamble_gen9.cpp} | 0 .../{preemption.cpp => preemption_gen9.cpp} | 0 .../gen9/{sampler.cpp => sampler_gen9.cpp} | 2 +- ...ddress.cpp => state_base_address_gen9.cpp} | 2 +- ...p => tbx_command_stream_receiver_gen9.cpp} | 0 ...r.cpp => command_stream_receiver_gen9.cpp} | 0 ...pp => translationtable_callbacks_gen9.cpp} | 0 ...mapper.cpp => wddm_engine_mapper_gen9.cpp} | 0 .../gen9/windows/{wddm.cpp => wddm_gen9.cpp} | 0 unit_tests/libult/CMakeLists.txt | 2 +- 52 files changed, 101 insertions(+), 62 deletions(-) rename runtime/gen8/{aub_command_stream_receiver.cpp => aub_command_stream_receiver_gen8.cpp} (100%) rename runtime/gen8/{aub_mem_dump.cpp => aub_mem_dump_gen8.cpp} (100%) rename runtime/gen8/{buffer.cpp => buffer_gen8.cpp} (96%) rename runtime/gen8/{command_queue.cpp => command_queue_gen8.cpp} (100%) rename runtime/gen8/{command_stream_receiver_hw.cpp => command_stream_receiver_hw_gen8.cpp} (100%) rename runtime/gen8/{device_queue.cpp => device_queue_gen8.cpp} (98%) rename runtime/gen8/{enable_family_full.cpp => enable_family_full_gen8.cpp} (98%) rename runtime/gen8/{flat_batch_buffer_helper_hw.cpp => flat_batch_buffer_helper_hw_gen8.cpp} (100%) rename runtime/gen8/{gpgpu_walker.cpp => gpgpu_walker_gen8.cpp} (100%) rename runtime/gen8/{hw_helper.cpp => hw_helper_gen8.cpp} (97%) create mode 100644 runtime/gen8/hw_info_gen8.cpp rename runtime/gen8/{image.cpp => image_gen8.cpp} (96%) rename runtime/gen8/{kernel_commands.cpp => kernel_commands_gen8.cpp} (97%) rename runtime/gen8/linux/{command_stream_receiver.cpp => command_stream_receiver_gen8.cpp} (100%) rename runtime/gen8/linux/{drm_engine_mapper.cpp => drm_engine_mapper_gen8.cpp} (100%) rename runtime/gen8/{preamble.cpp => preamble_gen8.cpp} (100%) rename runtime/gen8/{preemption.cpp => preemption_gen8.cpp} (100%) rename runtime/gen8/{sampler.cpp => sampler_gen8.cpp} (96%) rename runtime/gen8/{state_base_address.cpp => state_base_address_gen8.cpp} (96%) rename runtime/gen8/{tbx_command_stream_receiver.cpp => tbx_command_stream_receiver_gen8.cpp} (100%) rename runtime/gen8/windows/{command_stream_receiver.cpp => command_stream_receiver_gen8.cpp} (100%) rename runtime/gen8/windows/{translationtable_callbacks.cpp => translationtable_callbacks_gen8.cpp} (100%) rename runtime/gen8/windows/{wddm_engine_mapper.cpp => wddm_engine_mapper_gen8.cpp} (100%) rename runtime/gen8/windows/{wddm.cpp => wddm_gen8.cpp} (100%) rename runtime/gen9/{aub_command_stream_receiver.cpp => aub_command_stream_receiver_gen9.cpp} (100%) rename runtime/gen9/{aub_mem_dump.cpp => aub_mem_dump_gen9.cpp} (100%) rename runtime/gen9/{buffer.cpp => buffer_gen9.cpp} (96%) rename runtime/gen9/{command_queue.cpp => command_queue_gen9.cpp} (100%) rename runtime/gen9/{command_stream_receiver_hw.cpp => command_stream_receiver_hw_gen9.cpp} (100%) rename runtime/gen9/{device_queue.cpp => device_queue_gen9.cpp} (98%) rename runtime/gen9/{enable_family_full.cpp => enable_family_full_gen9.cpp} (98%) rename runtime/gen9/{flat_batch_buffer_helper_hw.cpp => flat_batch_buffer_helper_hw_gen9.cpp} (100%) rename runtime/gen9/{gpgpu_walker.cpp => gpgpu_walker_gen9.cpp} (100%) rename runtime/gen9/{hw_helper.cpp => hw_helper_gen9.cpp} (100%) rename runtime/gen9/{hw_info.cpp => hw_info_gen9.cpp} (96%) rename runtime/gen9/{image.cpp => image_gen9.cpp} (97%) rename runtime/gen9/{kernel_commands.cpp => kernel_commands_gen9.cpp} (96%) rename runtime/gen9/linux/{command_stream_receiver.cpp => command_stream_receiver_gen9.cpp} (100%) rename runtime/gen9/linux/{drm_engine_mapper.cpp => drm_engine_mapper_gen9.cpp} (100%) rename runtime/gen9/{preamble.cpp => preamble_gen9.cpp} (100%) rename runtime/gen9/{preemption.cpp => preemption_gen9.cpp} (100%) rename runtime/gen9/{sampler.cpp => sampler_gen9.cpp} (96%) rename runtime/gen9/{state_base_address.cpp => state_base_address_gen9.cpp} (96%) rename runtime/gen9/{tbx_command_stream_receiver.cpp => tbx_command_stream_receiver_gen9.cpp} (100%) rename runtime/gen9/windows/{command_stream_receiver.cpp => command_stream_receiver_gen9.cpp} (100%) rename runtime/gen9/windows/{translationtable_callbacks.cpp => translationtable_callbacks_gen9.cpp} (100%) rename runtime/gen9/windows/{wddm_engine_mapper.cpp => wddm_engine_mapper_gen9.cpp} (100%) rename runtime/gen9/windows/{wddm.cpp => wddm_gen9.cpp} (100%) diff --git a/offline_compiler/CMakeLists.txt b/offline_compiler/CMakeLists.txt index e9981f4141..8df60da482 100644 --- a/offline_compiler/CMakeLists.txt +++ b/offline_compiler/CMakeLists.txt @@ -50,8 +50,8 @@ set(CLOC_LIB_FLAGS_DEFINITIONS -DCIF_HEADERS_ONLY_BUILD ) -set(OPTIONAL_RUNTIME_GENX_FILES - hw_info.cpp +set(RUNTIME_GENX_CPP_FILES + hw_info ) macro(macro_for_each_platform) @@ -62,10 +62,10 @@ macro(macro_for_each_platform) endmacro() macro(macro_for_each_gen) - foreach(SRC_IT ${OPTIONAL_RUNTIME_GENX_FILES}) + foreach(SRC_IT ${RUNTIME_GENX_CPP_FILES}) set(SRC_FILE ${IGDRCL_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/${SRC_IT}) - if(EXISTS ${SRC_FILE}) - list(APPEND CLOC_SRCS_LIB ${SRC_FILE}) + if(EXISTS ${SRC_FILE}_${GEN_TYPE_LOWER}.cpp) + list(APPEND CLOC_SRCS_LIB ${SRC_FILE}_${GEN_TYPE_LOWER}.cpp) endif() endforeach() apply_macro_for_each_platform() diff --git a/runtime/enable_gens.cmake b/runtime/enable_gens.cmake index c190052a6c..b3d9f1224a 100644 --- a/runtime/enable_gens.cmake +++ b/runtime/enable_gens.cmake @@ -18,55 +18,63 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -set(RUNTIME_SRCS_GENX_WINDOWS - windows/command_stream_receiver.cpp - windows/translationtable_callbacks.cpp - windows/wddm_engine_mapper.cpp - windows/wddm.cpp -) -set(RUNTIME_SRCS_GENX_LINUX - linux/command_stream_receiver.cpp - linux/drm_engine_mapper.cpp +set(RUNTIME_SRCS_GENX_CPP_WINDOWS + windows/command_stream_receiver + windows/translationtable_callbacks + windows/wddm_engine_mapper + windows/wddm ) -set(RUNTIME_SRCS_GENX_BASE - aub_command_stream_receiver.cpp +set(RUNTIME_SRCS_GENX_CPP_LINUX + linux/command_stream_receiver + linux/drm_engine_mapper +) + +set(RUNTIME_SRCS_GENX_H_BASE aub_mapper.h - aub_mem_dump.cpp - command_queue.cpp device_enqueue.h - device_queue.cpp - command_stream_receiver_hw.cpp - flat_batch_buffer_helper_hw.cpp - gpgpu_walker.cpp hw_cmds.h hw_cmds_generated.h - hw_helper.cpp - hw_info.cpp hw_info.h - buffer.cpp - image.cpp - kernel_commands.cpp - preamble.cpp - preemption.cpp reg_configs.h - sampler.cpp scheduler_definitions.h scheduler_igdrcl_built_in.inl - state_base_address.cpp - tbx_command_stream_receiver.cpp +) + +set(RUNTIME_SRCS_GENX_CPP_BASE + aub_command_stream_receiver + aub_mem_dump + command_queue + device_queue + command_stream_receiver_hw + flat_batch_buffer_helper_hw + gpgpu_walker + hw_helper + hw_info + buffer + image + kernel_commands + preamble + preemption + sampler + state_base_address + tbx_command_stream_receiver ) macro(macro_for_each_platform) string(TOLOWER ${PLATFORM_IT} PLATFORM_IT_LOWER) - foreach(PLATFORM_FILE "hw_cmds_${PLATFORM_IT_LOWER}.h" "hw_info_${PLATFORM_IT_LOWER}.cpp") + foreach(PLATFORM_FILE "hw_cmds_${PLATFORM_IT_LOWER}.h") if(EXISTS ${GENX_PREFIX}/${PLATFORM_FILE}) - list(APPEND RUNTIME_SRCS_${GEN_TYPE}_BASE ${GENX_PREFIX}/${PLATFORM_FILE}) + list(APPEND RUNTIME_SRCS_${GEN_TYPE}_H_BASE ${GENX_PREFIX}/${PLATFORM_FILE}) endif() endforeach() - list(APPEND RUNTIME_SRCS_${GEN_TYPE}_LINUX ${GENX_PREFIX}/linux/hw_info_config_${PLATFORM_IT_LOWER}.cpp) - list(APPEND RUNTIME_SRCS_${GEN_TYPE}_WINDOWS ${GENX_PREFIX}/windows/hw_info_config_${PLATFORM_IT_LOWER}.cpp) + foreach(PLATFORM_FILE "hw_info_${PLATFORM_IT_LOWER}.cpp") + list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_BASE ${GENX_PREFIX}/${PLATFORM_FILE}) + endforeach() + + list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_LINUX ${GENX_PREFIX}/linux/hw_info_config_${PLATFORM_IT_LOWER}.cpp) + list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_WINDOWS ${GENX_PREFIX}/windows/hw_info_config_${PLATFORM_IT_LOWER}.cpp) # Enable platform list(APPEND ${GEN_TYPE}_SRC_LINK_BASE ${GENX_PREFIX}/enable_${PLATFORM_IT_LOWER}.cpp) @@ -76,28 +84,33 @@ endmacro() macro(macro_for_each_gen) set(GENX_PREFIX ${CMAKE_CURRENT_SOURCE_DIR}/${GEN_TYPE_LOWER}) # Add default GEN files + foreach(SRC_IT ${RUNTIME_SRCS_GENX_H_BASE}) + list(APPEND RUNTIME_SRCS_${GEN_TYPE}_H_BASE ${GENX_PREFIX}/${SRC_IT}) + endforeach() + foreach(OS_IT "BASE" "WINDOWS" "LINUX") - foreach(SRC_IT ${RUNTIME_SRCS_GENX_${OS_IT}}) - if(EXISTS ${GENX_PREFIX}/${SRC_IT}) - list(APPEND RUNTIME_SRCS_${GEN_TYPE}_${OS_IT} ${GENX_PREFIX}/${SRC_IT}) - endif() + foreach(SRC_IT ${RUNTIME_SRCS_GENX_CPP_${OS_IT}}) + list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_${OS_IT} ${GENX_PREFIX}/${SRC_IT}_${GEN_TYPE_LOWER}.cpp) endforeach() endforeach() apply_macro_for_each_platform() - list(APPEND ${GEN_TYPE}_SRC_LINK_BASE ${GENX_PREFIX}/enable_family_full.cpp) + list(APPEND ${GEN_TYPE}_SRC_LINK_BASE ${GENX_PREFIX}/enable_family_full_${GEN_TYPE_LOWER}.cpp) - list(APPEND RUNTIME_SRCS_GENX_ALL_BASE ${RUNTIME_SRCS_${GEN_TYPE}_BASE}) + list(APPEND RUNTIME_SRCS_GENX_ALL_BASE ${RUNTIME_SRCS_${GEN_TYPE}_H_BASE}) + list(APPEND RUNTIME_SRCS_GENX_ALL_BASE ${RUNTIME_SRCS_${GEN_TYPE}_CPP_BASE}) list(APPEND HW_SRC_LINK ${${GEN_TYPE}_SRC_LINK_BASE}) - list(APPEND RUNTIME_SRCS_GENX_ALL_WINDOWS ${RUNTIME_SRCS_${GEN_TYPE}_WINDOWS}) - list(APPEND RUNTIME_SRCS_GENX_ALL_LINUX ${RUNTIME_SRCS_${GEN_TYPE}_LINUX}) + list(APPEND RUNTIME_SRCS_GENX_ALL_WINDOWS ${RUNTIME_SRCS_${GEN_TYPE}_CPP_WINDOWS}) + list(APPEND RUNTIME_SRCS_GENX_ALL_LINUX ${RUNTIME_SRCS_${GEN_TYPE}_CPP_LINUX}) + if(UNIX) list(APPEND HW_SRC_LINK ${${GEN_TYPE}_SRC_LINK_LINUX}) endif() if(GTPIN_HEADERS_DIR) list(APPEND ${GEN_TYPE}_SRC_LINK_BASE ${GENX_PREFIX}/gtpin_setup_${GEN_TYPE_LOWER}.cpp) endif() + endmacro() apply_macro_for_each_gen("SUPPORTED") diff --git a/runtime/gen8/aub_command_stream_receiver.cpp b/runtime/gen8/aub_command_stream_receiver_gen8.cpp similarity index 100% rename from runtime/gen8/aub_command_stream_receiver.cpp rename to runtime/gen8/aub_command_stream_receiver_gen8.cpp diff --git a/runtime/gen8/aub_mem_dump.cpp b/runtime/gen8/aub_mem_dump_gen8.cpp similarity index 100% rename from runtime/gen8/aub_mem_dump.cpp rename to runtime/gen8/aub_mem_dump_gen8.cpp diff --git a/runtime/gen8/buffer.cpp b/runtime/gen8/buffer_gen8.cpp similarity index 96% rename from runtime/gen8/buffer.cpp rename to runtime/gen8/buffer_gen8.cpp index f76e72a5bb..78e8d73d03 100644 --- a/runtime/gen8/buffer.cpp +++ b/runtime/gen8/buffer_gen8.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"), diff --git a/runtime/gen8/command_queue.cpp b/runtime/gen8/command_queue_gen8.cpp similarity index 100% rename from runtime/gen8/command_queue.cpp rename to runtime/gen8/command_queue_gen8.cpp diff --git a/runtime/gen8/command_stream_receiver_hw.cpp b/runtime/gen8/command_stream_receiver_hw_gen8.cpp similarity index 100% rename from runtime/gen8/command_stream_receiver_hw.cpp rename to runtime/gen8/command_stream_receiver_hw_gen8.cpp diff --git a/runtime/gen8/device_queue.cpp b/runtime/gen8/device_queue_gen8.cpp similarity index 98% rename from runtime/gen8/device_queue.cpp rename to runtime/gen8/device_queue_gen8.cpp index ea750dbf1b..73963a67ad 100644 --- a/runtime/gen8/device_queue.cpp +++ b/runtime/gen8/device_queue_gen8.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"), diff --git a/runtime/gen8/enable_family_full.cpp b/runtime/gen8/enable_family_full_gen8.cpp similarity index 98% rename from runtime/gen8/enable_family_full.cpp rename to runtime/gen8/enable_family_full_gen8.cpp index 2b15bc4aab..4f01bcd8a1 100644 --- a/runtime/gen8/enable_family_full.cpp +++ b/runtime/gen8/enable_family_full_gen8.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"), diff --git a/runtime/gen8/flat_batch_buffer_helper_hw.cpp b/runtime/gen8/flat_batch_buffer_helper_hw_gen8.cpp similarity index 100% rename from runtime/gen8/flat_batch_buffer_helper_hw.cpp rename to runtime/gen8/flat_batch_buffer_helper_hw_gen8.cpp diff --git a/runtime/gen8/gpgpu_walker.cpp b/runtime/gen8/gpgpu_walker_gen8.cpp similarity index 100% rename from runtime/gen8/gpgpu_walker.cpp rename to runtime/gen8/gpgpu_walker_gen8.cpp diff --git a/runtime/gen8/hw_helper.cpp b/runtime/gen8/hw_helper_gen8.cpp similarity index 97% rename from runtime/gen8/hw_helper.cpp rename to runtime/gen8/hw_helper_gen8.cpp index 307c7a0c7e..6ab0a7692e 100644 --- a/runtime/gen8/hw_helper.cpp +++ b/runtime/gen8/hw_helper_gen8.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"), diff --git a/runtime/gen8/hw_info_bdw.cpp b/runtime/gen8/hw_info_bdw.cpp index 8076264f53..fa46bcbf8c 100644 --- a/runtime/gen8/hw_info_bdw.cpp +++ b/runtime/gen8/hw_info_bdw.cpp @@ -27,7 +27,6 @@ namespace OCLRT { -const char *GfxFamilyMapper::name = "Gen8"; const char *HwMapper::abbreviation = "bdw"; bool isSimulationBDW(unsigned short deviceId) { diff --git a/runtime/gen8/hw_info_gen8.cpp b/runtime/gen8/hw_info_gen8.cpp new file mode 100644 index 0000000000..2994bb328e --- /dev/null +++ b/runtime/gen8/hw_info_gen8.cpp @@ -0,0 +1,27 @@ +/* + * 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"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +#include "hw_cmds.h" + +namespace OCLRT { +const char *GfxFamilyMapper::name = "Gen8"; +} // namespace OCLRT diff --git a/runtime/gen8/image.cpp b/runtime/gen8/image_gen8.cpp similarity index 96% rename from runtime/gen8/image.cpp rename to runtime/gen8/image_gen8.cpp index 1797cb0b04..cf3a573ef1 100644 --- a/runtime/gen8/image.cpp +++ b/runtime/gen8/image_gen8.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"), diff --git a/runtime/gen8/kernel_commands.cpp b/runtime/gen8/kernel_commands_gen8.cpp similarity index 97% rename from runtime/gen8/kernel_commands.cpp rename to runtime/gen8/kernel_commands_gen8.cpp index 18f3d4c114..f40a3e29cf 100644 --- a/runtime/gen8/kernel_commands.cpp +++ b/runtime/gen8/kernel_commands_gen8.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"), diff --git a/runtime/gen8/linux/command_stream_receiver.cpp b/runtime/gen8/linux/command_stream_receiver_gen8.cpp similarity index 100% rename from runtime/gen8/linux/command_stream_receiver.cpp rename to runtime/gen8/linux/command_stream_receiver_gen8.cpp diff --git a/runtime/gen8/linux/drm_engine_mapper.cpp b/runtime/gen8/linux/drm_engine_mapper_gen8.cpp similarity index 100% rename from runtime/gen8/linux/drm_engine_mapper.cpp rename to runtime/gen8/linux/drm_engine_mapper_gen8.cpp diff --git a/runtime/gen8/preamble.cpp b/runtime/gen8/preamble_gen8.cpp similarity index 100% rename from runtime/gen8/preamble.cpp rename to runtime/gen8/preamble_gen8.cpp diff --git a/runtime/gen8/preemption.cpp b/runtime/gen8/preemption_gen8.cpp similarity index 100% rename from runtime/gen8/preemption.cpp rename to runtime/gen8/preemption_gen8.cpp diff --git a/runtime/gen8/sampler.cpp b/runtime/gen8/sampler_gen8.cpp similarity index 96% rename from runtime/gen8/sampler.cpp rename to runtime/gen8/sampler_gen8.cpp index f947628118..e063485577 100644 --- a/runtime/gen8/sampler.cpp +++ b/runtime/gen8/sampler_gen8.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"), diff --git a/runtime/gen8/state_base_address.cpp b/runtime/gen8/state_base_address_gen8.cpp similarity index 96% rename from runtime/gen8/state_base_address.cpp rename to runtime/gen8/state_base_address_gen8.cpp index ecff0b46ec..5bd63ff003 100644 --- a/runtime/gen8/state_base_address.cpp +++ b/runtime/gen8/state_base_address_gen8.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"), diff --git a/runtime/gen8/tbx_command_stream_receiver.cpp b/runtime/gen8/tbx_command_stream_receiver_gen8.cpp similarity index 100% rename from runtime/gen8/tbx_command_stream_receiver.cpp rename to runtime/gen8/tbx_command_stream_receiver_gen8.cpp diff --git a/runtime/gen8/windows/command_stream_receiver.cpp b/runtime/gen8/windows/command_stream_receiver_gen8.cpp similarity index 100% rename from runtime/gen8/windows/command_stream_receiver.cpp rename to runtime/gen8/windows/command_stream_receiver_gen8.cpp diff --git a/runtime/gen8/windows/translationtable_callbacks.cpp b/runtime/gen8/windows/translationtable_callbacks_gen8.cpp similarity index 100% rename from runtime/gen8/windows/translationtable_callbacks.cpp rename to runtime/gen8/windows/translationtable_callbacks_gen8.cpp diff --git a/runtime/gen8/windows/wddm_engine_mapper.cpp b/runtime/gen8/windows/wddm_engine_mapper_gen8.cpp similarity index 100% rename from runtime/gen8/windows/wddm_engine_mapper.cpp rename to runtime/gen8/windows/wddm_engine_mapper_gen8.cpp diff --git a/runtime/gen8/windows/wddm.cpp b/runtime/gen8/windows/wddm_gen8.cpp similarity index 100% rename from runtime/gen8/windows/wddm.cpp rename to runtime/gen8/windows/wddm_gen8.cpp diff --git a/runtime/gen9/aub_command_stream_receiver.cpp b/runtime/gen9/aub_command_stream_receiver_gen9.cpp similarity index 100% rename from runtime/gen9/aub_command_stream_receiver.cpp rename to runtime/gen9/aub_command_stream_receiver_gen9.cpp diff --git a/runtime/gen9/aub_mem_dump.cpp b/runtime/gen9/aub_mem_dump_gen9.cpp similarity index 100% rename from runtime/gen9/aub_mem_dump.cpp rename to runtime/gen9/aub_mem_dump_gen9.cpp diff --git a/runtime/gen9/buffer.cpp b/runtime/gen9/buffer_gen9.cpp similarity index 96% rename from runtime/gen9/buffer.cpp rename to runtime/gen9/buffer_gen9.cpp index 3f271443ef..22c396ff26 100644 --- a/runtime/gen9/buffer.cpp +++ b/runtime/gen9/buffer_gen9.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"), diff --git a/runtime/gen9/command_queue.cpp b/runtime/gen9/command_queue_gen9.cpp similarity index 100% rename from runtime/gen9/command_queue.cpp rename to runtime/gen9/command_queue_gen9.cpp diff --git a/runtime/gen9/command_stream_receiver_hw.cpp b/runtime/gen9/command_stream_receiver_hw_gen9.cpp similarity index 100% rename from runtime/gen9/command_stream_receiver_hw.cpp rename to runtime/gen9/command_stream_receiver_hw_gen9.cpp diff --git a/runtime/gen9/device_queue.cpp b/runtime/gen9/device_queue_gen9.cpp similarity index 98% rename from runtime/gen9/device_queue.cpp rename to runtime/gen9/device_queue_gen9.cpp index 36af61bff6..ffb77e1967 100644 --- a/runtime/gen9/device_queue.cpp +++ b/runtime/gen9/device_queue_gen9.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"), diff --git a/runtime/gen9/enable_family_full.cpp b/runtime/gen9/enable_family_full_gen9.cpp similarity index 98% rename from runtime/gen9/enable_family_full.cpp rename to runtime/gen9/enable_family_full_gen9.cpp index ed8fde178e..af0c787ddd 100644 --- a/runtime/gen9/enable_family_full.cpp +++ b/runtime/gen9/enable_family_full_gen9.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"), diff --git a/runtime/gen9/flat_batch_buffer_helper_hw.cpp b/runtime/gen9/flat_batch_buffer_helper_hw_gen9.cpp similarity index 100% rename from runtime/gen9/flat_batch_buffer_helper_hw.cpp rename to runtime/gen9/flat_batch_buffer_helper_hw_gen9.cpp diff --git a/runtime/gen9/gpgpu_walker.cpp b/runtime/gen9/gpgpu_walker_gen9.cpp similarity index 100% rename from runtime/gen9/gpgpu_walker.cpp rename to runtime/gen9/gpgpu_walker_gen9.cpp diff --git a/runtime/gen9/hw_helper.cpp b/runtime/gen9/hw_helper_gen9.cpp similarity index 100% rename from runtime/gen9/hw_helper.cpp rename to runtime/gen9/hw_helper_gen9.cpp diff --git a/runtime/gen9/hw_info.cpp b/runtime/gen9/hw_info_gen9.cpp similarity index 96% rename from runtime/gen9/hw_info.cpp rename to runtime/gen9/hw_info_gen9.cpp index 3473c021cd..30f3514878 100644 --- a/runtime/gen9/hw_info.cpp +++ b/runtime/gen9/hw_info_gen9.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"), diff --git a/runtime/gen9/image.cpp b/runtime/gen9/image_gen9.cpp similarity index 97% rename from runtime/gen9/image.cpp rename to runtime/gen9/image_gen9.cpp index ad092f4afd..fc2524ba4e 100644 --- a/runtime/gen9/image.cpp +++ b/runtime/gen9/image_gen9.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"), diff --git a/runtime/gen9/kernel_commands.cpp b/runtime/gen9/kernel_commands_gen9.cpp similarity index 96% rename from runtime/gen9/kernel_commands.cpp rename to runtime/gen9/kernel_commands_gen9.cpp index 1a81da3c10..2461a93274 100644 --- a/runtime/gen9/kernel_commands.cpp +++ b/runtime/gen9/kernel_commands_gen9.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"), diff --git a/runtime/gen9/linux/command_stream_receiver.cpp b/runtime/gen9/linux/command_stream_receiver_gen9.cpp similarity index 100% rename from runtime/gen9/linux/command_stream_receiver.cpp rename to runtime/gen9/linux/command_stream_receiver_gen9.cpp diff --git a/runtime/gen9/linux/drm_engine_mapper.cpp b/runtime/gen9/linux/drm_engine_mapper_gen9.cpp similarity index 100% rename from runtime/gen9/linux/drm_engine_mapper.cpp rename to runtime/gen9/linux/drm_engine_mapper_gen9.cpp diff --git a/runtime/gen9/preamble.cpp b/runtime/gen9/preamble_gen9.cpp similarity index 100% rename from runtime/gen9/preamble.cpp rename to runtime/gen9/preamble_gen9.cpp diff --git a/runtime/gen9/preemption.cpp b/runtime/gen9/preemption_gen9.cpp similarity index 100% rename from runtime/gen9/preemption.cpp rename to runtime/gen9/preemption_gen9.cpp diff --git a/runtime/gen9/sampler.cpp b/runtime/gen9/sampler_gen9.cpp similarity index 96% rename from runtime/gen9/sampler.cpp rename to runtime/gen9/sampler_gen9.cpp index a4367f59f4..9ff420ba62 100644 --- a/runtime/gen9/sampler.cpp +++ b/runtime/gen9/sampler_gen9.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"), diff --git a/runtime/gen9/state_base_address.cpp b/runtime/gen9/state_base_address_gen9.cpp similarity index 96% rename from runtime/gen9/state_base_address.cpp rename to runtime/gen9/state_base_address_gen9.cpp index ccdf2c0da9..cce08f5b80 100644 --- a/runtime/gen9/state_base_address.cpp +++ b/runtime/gen9/state_base_address_gen9.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"), diff --git a/runtime/gen9/tbx_command_stream_receiver.cpp b/runtime/gen9/tbx_command_stream_receiver_gen9.cpp similarity index 100% rename from runtime/gen9/tbx_command_stream_receiver.cpp rename to runtime/gen9/tbx_command_stream_receiver_gen9.cpp diff --git a/runtime/gen9/windows/command_stream_receiver.cpp b/runtime/gen9/windows/command_stream_receiver_gen9.cpp similarity index 100% rename from runtime/gen9/windows/command_stream_receiver.cpp rename to runtime/gen9/windows/command_stream_receiver_gen9.cpp diff --git a/runtime/gen9/windows/translationtable_callbacks.cpp b/runtime/gen9/windows/translationtable_callbacks_gen9.cpp similarity index 100% rename from runtime/gen9/windows/translationtable_callbacks.cpp rename to runtime/gen9/windows/translationtable_callbacks_gen9.cpp diff --git a/runtime/gen9/windows/wddm_engine_mapper.cpp b/runtime/gen9/windows/wddm_engine_mapper_gen9.cpp similarity index 100% rename from runtime/gen9/windows/wddm_engine_mapper.cpp rename to runtime/gen9/windows/wddm_engine_mapper_gen9.cpp diff --git a/runtime/gen9/windows/wddm.cpp b/runtime/gen9/windows/wddm_gen9.cpp similarity index 100% rename from runtime/gen9/windows/wddm.cpp rename to runtime/gen9/windows/wddm_gen9.cpp diff --git a/unit_tests/libult/CMakeLists.txt b/unit_tests/libult/CMakeLists.txt index a8c671c882..2d6731b3bf 100644 --- a/unit_tests/libult/CMakeLists.txt +++ b/unit_tests/libult/CMakeLists.txt @@ -29,7 +29,7 @@ macro(macro_for_each_gen) ${IGDRCL_SOURCE_DIR}/unit_tests/${GEN_TYPE_LOWER}/cmd_parse_${GEN_TYPE_LOWER}.cpp ${IGDRCL_SOURCE_DIR}/unit_tests/${GEN_TYPE_LOWER}/gen_cmd_parse.h ${IGDRCL_SOURCE_DIR}/unit_tests/libult/${GEN_TYPE_LOWER}.cpp - ${IGDRCL_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/enable_family_full.cpp + ${IGDRCL_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/enable_family_full_${GEN_TYPE_LOWER}.cpp ) apply_macro_for_each_platform() endmacro()