intel
diff --git a/‎runtime/os_interface/linux/CMakeLists.txt
+1-1 b/‎runtime/os_interface/linux/CMakeLists.txt
+1-1
diff --git a/‎runtime/os_interface/linux/device_factory.cpp renamed to ‎runtime/os_interface/linux/device_factory_linux.cpp b/‎runtime/os_interface/linux/device_factory.cpp renamed to ‎runtime/os_interface/linux/device_factory_linux.cpp
diff --git a/‎runtime/os_interface/windows/CMakeLists.txt
+1-1 b/‎runtime/os_interface/windows/CMakeLists.txt
+1-1
diff --git a/‎runtime/os_interface/windows/device_factory.cpp renamed to ‎runtime/os_interface/windows/device_factory_win.cpp b/‎runtime/os_interface/windows/device_factory.cpp renamed to ‎runtime/os_interface/windows/device_factory_win.cpp
diff --git a/‎unit_tests/aub_tests/gen10/CMakeLists.txt
+1-1 b/‎unit_tests/aub_tests/gen10/CMakeLists.txt
+1-1
diff --git a/‎unit_tests/aub_tests/gen10/aub_tests_configuration.cpp renamed to ‎unit_tests/aub_tests/gen10/aub_tests_configuration_gen10.cpp b/‎unit_tests/aub_tests/gen10/aub_tests_configuration.cpp renamed to ‎unit_tests/aub_tests/gen10/aub_tests_configuration_gen10.cpp
diff --git a/‎unit_tests/aub_tests/gen8/CMakeLists.txt
+1-1 b/‎unit_tests/aub_tests/gen8/CMakeLists.txt
+1-1
diff --git a/‎unit_tests/aub_tests/gen8/aub_tests_configuration.cpp renamed to ‎unit_tests/aub_tests/gen8/aub_tests_configuration_gen8.cpp b/‎unit_tests/aub_tests/gen8/aub_tests_configuration.cpp renamed to ‎unit_tests/aub_tests/gen8/aub_tests_configuration_gen8.cpp
diff --git a/‎unit_tests/aub_tests/gen9/CMakeLists.txt
+1-1 b/‎unit_tests/aub_tests/gen9/CMakeLists.txt
+1-1
diff --git a/‎unit_tests/aub_tests/gen9/aub_tests_configuration.cpp renamed to ‎unit_tests/aub_tests/gen9/aub_tests_configuration_gen9.cpp b/‎unit_tests/aub_tests/gen9/aub_tests_configuration.cpp renamed to ‎unit_tests/aub_tests/gen9/aub_tests_configuration_gen9.cpp
@@ -11,7 +11,7 @@ set(RUNTIME_SRCS_OS_INTERFACE_LINUX
   ${CMAKE_CURRENT_SOURCE_DIR}/d3d_sharing_functions.h
   ${CMAKE_CURRENT_SOURCE_DIR}/debug_env_reader.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/device_factory.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/device_factory_linux.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/driver_info.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/drm_32bit_memory.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/drm_allocation.h
 
@@ -20,7 +20,7 @@ set(RUNTIME_SRCS_OS_INTERFACE_WINDOWS
   ${CMAKE_CURRENT_SOURCE_DIR}/deferrable_deletion_win.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/deferrable_deletion_win.h
   ${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/device_factory.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/device_factory_win.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/driver_info.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/driver_info.h
   ${CMAKE_CURRENT_SOURCE_DIR}/gdi_interface.cpp
 
@@ -7,7 +7,7 @@
 if(TESTS_GEN10)
   target_sources(igdrcl_aub_tests PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration_gen10.cpp
   )
   add_subdirectories()
 endif()
@@ -7,7 +7,7 @@
 if(TESTS_GEN8)
   target_sources(igdrcl_aub_tests PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration_gen8.cpp
   )
   add_subdirectories()
 endif()
@@ -6,7 +6,7 @@
 
 if(TESTS_GEN9)
   target_sources(igdrcl_aub_tests PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration_gen9.cpp
   )
   add_subdirectories()
 endif()
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`if(TESTS_GEN10)`
`8`	`8`	`target_sources(igdrcl_aub_tests PRIVATE`
`9`	`9`	`${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt`
`10`		`- ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration.cpp`
	`10`	`+ ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration_gen10.cpp`
`11`	`11`	`)`
`12`	`12`	`add_subdirectories()`
`13`	`13`	`endif()`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`if(TESTS_GEN8)`
`8`	`8`	`target_sources(igdrcl_aub_tests PRIVATE`
`9`	`9`	`${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt`
`10`		`- ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration.cpp`
	`10`	`+ ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration_gen8.cpp`
`11`	`11`	`)`
`12`	`12`	`add_subdirectories()`
`13`	`13`	`endif()`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`if(TESTS_GEN9)`
`8`	`8`	`target_sources(igdrcl_aub_tests PRIVATE`
`9`		`- ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration.cpp`
	`9`	`+ ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration_gen9.cpp`
`10`	`10`	`)`
`11`	`11`	`add_subdirectories()`
`12`	`12`	`endif()`