Rename files with the same name

BartoszDunajski · Compute-Runtime-Automation · commit bb248d674204 · 2019-12-13T14:17:31.000+01:00
Change-Id: I46144a52d755e03587b3b1e41d1883ddf4230889
Signed-off-by: Dunajski, Bartosz &lt;bartosz.dunajski@intel.com&gt;
diff --git a/offline_compiler/CMakeLists.txt b/offline_compiler/CMakeLists.txt
@@ -19,12 +19,12 @@ set(CLOC_SRCS_LIB
   ${NEO_SOURCE_DIR}/offline_compiler/decoder/helper.h
   ${NEO_SOURCE_DIR}/offline_compiler/decoder/iga_wrapper.h
   ${NEO_SOURCE_DIR}/offline_compiler/decoder/translate_platform_base.h
-  ${NEO_SOURCE_DIR}/offline_compiler/helper.cpp
+  ${NEO_SOURCE_DIR}/offline_compiler/offline_compiler_helper.cpp
   ${NEO_SOURCE_DIR}/offline_compiler/offline_compiler.cpp
   ${NEO_SOURCE_DIR}/offline_compiler/offline_compiler.h
   ${NEO_SOURCE_DIR}/offline_compiler/multi_command.cpp
   ${NEO_SOURCE_DIR}/offline_compiler/multi_command.h
-  ${NEO_SOURCE_DIR}/offline_compiler/options.cpp
+  ${NEO_SOURCE_DIR}/offline_compiler/offline_compiler_options.cpp
   ${NEO_SOURCE_DIR}/offline_compiler/${BRANCH_DIR_SUFFIX}/extra_settings.cpp
   ${NEO_SOURCE_DIR}/core/compiler_interface/create_main.cpp
   ${NEO_SOURCE_DIR}/core/helpers/hw_info.cpp
@@ -47,13 +47,13 @@ if(WIN32)
   list(APPEND CLOC_SRCS_LIB
     ${NEO_SOURCE_DIR}/core/os_interface/windows/os_library_win.cpp
     ${NEO_SOURCE_DIR}/core/os_interface/windows/os_library_win.h
-    ${NEO_SOURCE_DIR}/runtime/dll/windows/options.cpp
+    ${NEO_SOURCE_DIR}/runtime/dll/windows/options_windows.cpp
   )
 else()
   list(APPEND CLOC_SRCS_LIB
     ${NEO_SOURCE_DIR}/core/os_interface/linux/os_library_linux.cpp
     ${NEO_SOURCE_DIR}/core/os_interface/linux/os_library_linux.h
-    ${NEO_SOURCE_DIR}/runtime/dll/linux/options.cpp
+    ${NEO_SOURCE_DIR}/runtime/dll/linux/options_linux.cpp
   )
 endif()
 
diff --git a/offline_compiler/offline_compiler_helper.cpp b/offline_compiler/offline_compiler_helper.cpp
diff --git a/offline_compiler/offline_compiler_options.cpp b/offline_compiler/offline_compiler_options.cpp
@@ -5,9 +5,8 @@
  *
  */
 
-#include "core/helpers/options.h"
-
 #include "core/helpers/hw_cmds.h"
+#include "core/helpers/options.h"
 #include "runtime/helpers/array_count.h"
 
 #include <cstddef>
diff --git a/runtime/builtin_kernels_simulation/CMakeLists.txt b/runtime/builtin_kernels_simulation/CMakeLists.txt
@@ -38,7 +38,7 @@ endif()
 macro(macro_for_each_gen)
   list(APPEND DEFAULT_GEN_PLATFORMS_DEFITIONS DEFAULT_${GEN_TYPE}_PLATFORM=${DEFAULT_SUPPORTED_${GEN_TYPE}_PLATFORM})
   if(${SUPPORT_DEVICE_ENQUEUE_${GEN_TYPE}})
-    list(APPEND BUILTIN_KERNELS_SIMULATION_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/${GEN_TYPE_LOWER}/scheduler_simulation.cpp)
+    list(APPEND BUILTIN_KERNELS_SIMULATION_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/${GEN_TYPE_LOWER}/scheduler_simulation_${GEN_TYPE_LOWER}.cpp)
   endif()
 endmacro()
 
diff --git a/runtime/builtin_kernels_simulation/gen11/scheduler_simulation_gen11.cpp b/runtime/builtin_kernels_simulation/gen11/scheduler_simulation_gen11.cpp
@@ -5,11 +5,10 @@
  *
  */
 
-#include "runtime/builtin_kernels_simulation/scheduler_simulation.h"
-
 #include "core/gen11/hw_cmds.h"
 #include "core/memory_manager/graphics_allocation.h"
 #include "runtime/builtin_kernels_simulation/opencl_c.h"
+#include "runtime/builtin_kernels_simulation/scheduler_simulation.h"
 #include "runtime/builtin_kernels_simulation/scheduler_simulation.inl"
 #include "runtime/execution_model/device_enqueue.h"
 
diff --git a/runtime/builtin_kernels_simulation/gen12lp/scheduler_simulation_gen12lp.cpp b/runtime/builtin_kernels_simulation/gen12lp/scheduler_simulation_gen12lp.cpp
@@ -5,11 +5,10 @@
  *
  */
 
-#include "runtime/builtin_kernels_simulation/scheduler_simulation.h"
-
 #include "core/gen12lp/hw_cmds.h"
 #include "core/memory_manager/graphics_allocation.h"
 #include "runtime/builtin_kernels_simulation/opencl_c.h"
+#include "runtime/builtin_kernels_simulation/scheduler_simulation.h"
 #include "runtime/builtin_kernels_simulation/scheduler_simulation.inl"
 #include "runtime/execution_model/device_enqueue.h"
 
diff --git a/runtime/builtin_kernels_simulation/gen8/scheduler_simulation_gen8.cpp b/runtime/builtin_kernels_simulation/gen8/scheduler_simulation_gen8.cpp
@@ -5,11 +5,10 @@
  *
  */
 
-#include "runtime/builtin_kernels_simulation/scheduler_simulation.h"
-
 #include "core/gen8/hw_cmds.h"
 #include "core/memory_manager/graphics_allocation.h"
 #include "runtime/builtin_kernels_simulation/opencl_c.h"
+#include "runtime/builtin_kernels_simulation/scheduler_simulation.h"
 #include "runtime/builtin_kernels_simulation/scheduler_simulation.inl"
 #include "runtime/execution_model/device_enqueue.h"
 
diff --git a/runtime/builtin_kernels_simulation/gen9/scheduler_simulation_gen9.cpp b/runtime/builtin_kernels_simulation/gen9/scheduler_simulation_gen9.cpp
@@ -5,11 +5,10 @@
  *
  */
 
-#include "runtime/builtin_kernels_simulation/scheduler_simulation.h"
-
 #include "core/gen9/hw_cmds.h"
 #include "core/memory_manager/graphics_allocation.h"
 #include "runtime/builtin_kernels_simulation/opencl_c.h"
+#include "runtime/builtin_kernels_simulation/scheduler_simulation.h"
 #include "runtime/builtin_kernels_simulation/scheduler_simulation.inl"
 #include "runtime/execution_model/device_enqueue.h"
 
diff --git a/runtime/dll/CMakeLists.txt b/runtime/dll/CMakeLists.txt
@@ -15,7 +15,7 @@ set(RUNTIME_SRCS_DLL_BASE
   ${CMAKE_CURRENT_SOURCE_DIR}/create_command_stream.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/create_deferred_deleter.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/create_tbx_sockets.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/options.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/options_dll.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/source_level_debugger.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/get_devices.cpp
 
@@ -40,14 +40,14 @@ set(RUNTIME_SRCS_DLL_LINUX
   ${CMAKE_CURRENT_SOURCE_DIR}/linux/devices${BRANCH_DIR_SUFFIX}/devices.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/linux/devices/devices_base.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/linux/drm_neo_create.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/linux/options.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/linux/options_linux.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/linux/os_interface.cpp
 )
 
 set(RUNTIME_SRCS_DLL_WINDOWS
   ${CMAKE_CURRENT_SOURCE_DIR}/windows/create_wddm_memory_manager.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/windows/environment_variables.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/windows/options.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/windows/options_windows.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/windows/os_interface.cpp
   ${NEO_SOURCE_DIR}/runtime/gmm_helper/gmm_memory.cpp
   ${NEO_SOURCE_DIR}/runtime/gmm_helper/page_table_mngr.cpp
diff --git a/runtime/dll/linux/options_linux.cpp b/runtime/dll/linux/options_linux.cpp
diff --git a/runtime/dll/options_dll.cpp b/runtime/dll/options_dll.cpp
@@ -5,9 +5,8 @@
  *
  */
 
-#include "core/helpers/options.h"
-
 #include "core/helpers/hw_cmds.h"
+#include "core/helpers/options.h"
 #include "runtime/helpers/array_count.h"
 
 namespace NEO {
diff --git a/runtime/dll/windows/options_windows.cpp b/runtime/dll/windows/options_windows.cpp
diff --git a/runtime/helpers/CMakeLists.txt b/runtime/helpers/CMakeLists.txt
@@ -40,14 +40,14 @@ set(RUNTIME_SRCS_HELPERS_BASE
   ${CMAKE_CURRENT_SOURCE_DIR}/hardware_commands_helper_base.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/hardware_context_controller.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/hardware_context_controller.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/helper_options.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/mem_properties_parser_helper.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/mem_properties_parser_helper.h
   ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/memory_properties_flags_helpers.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/memory_properties_flags_helpers.h
   ${CMAKE_CURRENT_SOURCE_DIR}/memory_properties_flags_helpers_base.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/mipmap.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/mipmap.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/options.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/per_thread_data.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/per_thread_data.h
   ${CMAKE_CURRENT_SOURCE_DIR}/pipeline_select_helper.h
diff --git a/runtime/helpers/helper_options.cpp b/runtime/helpers/helper_options.cpp
@@ -5,9 +5,8 @@
  *
  */
 
-#include "core/helpers/options.h"
-
 #include "core/helpers/hw_cmds.h"
+#include "core/helpers/options.h"
 #include "runtime/helpers/array_count.h"
 
 #include <cstddef>
diff --git a/unit_tests/libult/CMakeLists.txt b/unit_tests/libult/CMakeLists.txt
@@ -73,7 +73,7 @@ set(IGDRCL_SRCS_LIB_ULT_ENV
   ${NEO_SOURCE_DIR}/unit_tests/global_environment.cpp
   ${NEO_SOURCE_DIR}/unit_tests/global_environment.h
   ${NEO_SOURCE_DIR}/unit_tests/main.cpp
-  ${NEO_SOURCE_DIR}/unit_tests/options.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/options_unit_tests.cpp
   ${NEO_SOURCE_DIR}/unit_tests/command_queue/command_queue_fixture.cpp
   ${NEO_SOURCE_DIR}/unit_tests/command_queue/command_queue_fixture.h
   ${NEO_SOURCE_DIR}/unit_tests/fixtures/memory_management_fixture.cpp
diff --git a/unit_tests/linux/CMakeLists.txt b/unit_tests/linux/CMakeLists.txt
@@ -25,7 +25,7 @@ set(IGDRCL_SRCS_linux_dll_tests
   ${NEO_SOURCE_DIR}/runtime/os_interface/debug_settings_manager.cpp
   ${NEO_SOURCE_DIR}/runtime/dll/linux/allocator_helper.cpp
   ${NEO_SOURCE_DIR}/runtime/dll/linux/drm_neo_create.cpp
-  ${NEO_SOURCE_DIR}/runtime/dll/linux/options.cpp
+  ${NEO_SOURCE_DIR}/runtime/dll/linux/options_linux.cpp
   ${NEO_SOURCE_DIR}/runtime/dll/linux/os_interface.cpp
   ${NEO_SOURCE_DIR}/unit_tests/aub_stream_mocks/aub_stream_interface_mock.cpp
   ${NEO_SOURCE_DIR}/unit_tests/linux${BRANCH_DIR_SUFFIX}/drm_other_requests.cpp
diff --git a/unit_tests/options_unit_tests.cpp b/unit_tests/options_unit_tests.cpp
@@ -5,10 +5,9 @@
  *
  */
 
-#include "core/helpers/options.h"
-
 #include "core/helpers/hw_cmds.h"
 #include "core/helpers/hw_info.h"
+#include "core/helpers/options.h"
 #include "runtime/helpers/array_count.h"
 
 namespace NEO {
diff --git a/unit_tests/perf_tests/CMakeLists.txt b/unit_tests/perf_tests/CMakeLists.txt
@@ -1,22 +1,8 @@
-# Copyright (c) 2017, 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:
+# Copyright (C) 2017-2019 Intel Corporation
 #
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
+# SPDX-License-Identifier: MIT
 #
-# 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.
 
 cmake_minimum_required(VERSION 3.2.0 FATAL_ERROR)
 
@@ -27,7 +13,7 @@ add_subdirectory(fixtures)
 set(IGDRCL_SRCS_performance_tests
     ${IGDRCL_SRCS_perf_tests_api}
     ${IGDRCL_SRCS_perf_tests_fixtures}
-    "${CMAKE_CURRENT_SOURCE_DIR}/options.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/options_perf_tests.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/perf_test_utils.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/perf_test_utils.h"
     PARENT_SCOPE
diff --git a/unit_tests/perf_tests/options_perf_tests.cpp b/unit_tests/perf_tests/options_perf_tests.cpp

Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,8 @@`
`5`	`5`	`*`
`6`	`6`	`*/`
`7`	`7`
`8`		`-#include "core/helpers/options.h"`
`9`		`-`
`10`	`8`	`#include "core/helpers/hw_cmds.h"`
	`9`	`+#include "core/helpers/options.h"`
`11`	`10`	`#include "runtime/helpers/array_count.h"`
`12`	`11`
`13`	`12`	`#include <cstddef>`