Add gen specific suffix to test files.

Change-Id: I7ee2fb6d1c2592e1aa0c2645f83526dbcfe521f1

unit_tests/gen8/CMakeLists.txt

@@ -21,21 +21,21 @@
 if(TESTS_GEN8)
   set(IGDRCL_SRCS_tests_gen8
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/coherency_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_hw_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/device_tests_bwd.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_media_kernel.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/image_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/kernel_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/sampler_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/scheduler_dispatch_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/test_device_queue_hw.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/test_platform_caps.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/test_preamble.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/test_preemption.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/test_sample.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/coherency_tests_gen8.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_hw_tests_gen8.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/device_tests_gen8.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_media_kernel_gen8.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_tests_gen8.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/image_tests_gen8.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/kernel_tests_gen8.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/sampler_tests_gen8.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/scheduler_dispatch_tests_gen8.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps_gen8.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/test_device_queue_hw_gen8.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/test_platform_caps_gen8.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/test_preamble_gen8.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_gen8.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/test_sample_gen8.cpp
   )
   target_sources(igdrcl_tests PRIVATE
     ${IGDRCL_SRCS_tests_gen8}

unit_tests/gen8/cmd_parse_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"),

unit_tests/gen8/coherency_tests_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"),

unit_tests/gen8/enqueue_media_kernel_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"),
@@ -61,4 +61,4 @@ GEN8TEST_F(MediaKernelTest, gen8CmdSizeForMediaSampler) {
     csr->lastVmeSubslicesConfig = true;
     EXPECT_EQ(0u, csr->getCmdSizeForMediaSampler(false));
     EXPECT_EQ(0u, csr->getCmdSizeForMediaSampler(true));
-}
+}

unit_tests/gen8/linux/CMakeLists.txt

@@ -19,8 +19,8 @@
 # OTHER DEALINGS IN THE SOFTWARE.
 
 set(IGDRCL_SRCS_tests_gen8_linux
-  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/drm_mapper_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_gen8.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/drm_mapper_tests_gen8.cpp
 )
 if(UNIX)
   target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen8_linux})

unit_tests/gen8/linux/dll/CMakeLists.txt

@@ -19,6 +19,6 @@
 # OTHER DEALINGS IN THE SOFTWARE.
 
 set(IGDRCL_SRCS_linux_dll_tests_gen8
-  ${CMAKE_CURRENT_SOURCE_DIR}/device_id_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/device_id_tests_gen8.cpp
 )
 target_sources(igdrcl_linux_dll_tests PRIVATE ${IGDRCL_SRCS_linux_dll_tests_gen8})

unit_tests/gen8/test_device_queue_hw_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"),

unit_tests/gen8/test_platform_caps_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"),

unit_tests/gen8/windows/CMakeLists.txt

@@ -20,9 +20,9 @@
 
 set(IGDRCL_SRCS_tests_gen8_windows
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/wddm_mapper_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/translationtable_callbacks_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/wddm_mapper_tests_gen8.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/translationtable_callbacks_tests_gen8.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_gen8.cpp
 )
 if(WIN32)
   target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen8_windows})

unit_tests/gen8/windows/wddm_mapper_tests_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"),

unit_tests/gen9/CMakeLists.txt

@@ -21,21 +21,21 @@
 if(TESTS_GEN9)
   set(IGDRCL_SRCS_tests_gen9
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/coherency_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_hw_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_kernel.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_media_kernel.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/image_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/kernel_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/preamble_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/sampler_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/sip_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/test_device_queue_hw.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/test_platform_caps.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/test_preemption.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/test_sample.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/coherency_tests_gen9.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_hw_tests_gen9.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_kernel_gen9.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_media_kernel_gen9.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_tests_gen9.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/image_tests_gen9.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/kernel_tests_gen9.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/preamble_tests_gen9.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/sampler_tests_gen9.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/sip_tests_gen9.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps_gen9.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/test_device_queue_hw_gen9.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/test_platform_caps_gen9.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_gen9.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/test_sample_gen9.cpp
   )
   target_sources(igdrcl_tests PRIVATE
     ${IGDRCL_SRCS_tests_gen9}

unit_tests/gen9/bxt/windows/CMakeLists.txt

@@ -21,7 +21,7 @@
 set(IGDRCL_SRCS_tests_gen9_bxt_windows
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
   ${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps_bxt_windows.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_bxt.cpp
 )
 
 if(WIN32)

unit_tests/gen9/cfl/linux/CMakeLists.txt

@@ -20,7 +20,7 @@
 
 set(IGDRCL_SRCS_tests_gen9_cfl_linux
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_cfl.cpp
 )
 if(UNIX)
   target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen9_cfl_linux})

unit_tests/gen9/cfl/linux/dll/CMakeLists.txt

@@ -20,6 +20,6 @@
 
 set(IGDRCL_SRCS_linux_dll_tests_gen9_cfl
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/${BRANCH_DIR_SUFFIX}/device_id_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/${BRANCH_DIR_SUFFIX}/device_id_tests_cfl.cpp
 )
 target_sources(igdrcl_linux_dll_tests PRIVATE ${IGDRCL_SRCS_linux_dll_tests_gen9_cfl})

unit_tests/gen9/cfl/windows/CMakeLists.txt

@@ -21,7 +21,7 @@
 set(IGDRCL_SRCS_tests_gen9_cfl_windows
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
   ${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps_cfl_windows.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_cfl.cpp
 )
 
 if(WIN32)

unit_tests/gen9/coherency_tests_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"),

unit_tests/gen9/enqueue_kernel_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"),

unit_tests/gen9/enqueue_media_kernel_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"),
@@ -125,4 +125,4 @@ GEN9TEST_F(MediaKernelTest, gen9CmdSizeForMediaSampler) {
     csr->lastVmeSubslicesConfig = true;
     EXPECT_EQ(0u, csr->getCmdSizeForMediaSampler(false));
     EXPECT_EQ(0u, csr->getCmdSizeForMediaSampler(true));
-}
+}

unit_tests/gen9/glk/linux/CMakeLists.txt

@@ -20,7 +20,7 @@
 
 set(IGDRCL_SRCS_tests_gen9_glk_linux
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_glk.cpp
 )
 if(UNIX)
   target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen9_glk_linux})

unit_tests/gen9/glk/linux/dll/CMakeLists.txt

@@ -20,6 +20,6 @@
 
 set(IGDRCL_SRCS_linux_dll_tests_gen9_glk
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/device_id_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/device_id_tests_glk.cpp
 )
 target_sources(igdrcl_linux_dll_tests PRIVATE ${IGDRCL_SRCS_linux_dll_tests_gen9_glk})

unit_tests/gen9/glk/windows/CMakeLists.txt

@@ -21,7 +21,7 @@
 set(IGDRCL_SRCS_tests_gen9_glk_windows
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
   ${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps_glk_windows.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_glk.cpp
 )
 
 if(WIN32)

unit_tests/gen9/kbl/linux/CMakeLists.txt

@@ -20,7 +20,7 @@
 
 set(IGDRCL_SRCS_tests_gen9_kbl_linux
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_kbl.cpp
 )
 if(UNIX)
   target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen9_kbl_linux})

unit_tests/gen9/kbl/linux/dll/CMakeLists.txt

@@ -20,6 +20,6 @@
 
 set(IGDRCL_SRCS_linux_dll_tests_gen9_kbl
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/device_id_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/device_id_tests_kbl.cpp
 )
 target_sources(igdrcl_linux_dll_tests PRIVATE ${IGDRCL_SRCS_linux_dll_tests_gen9_kbl})

unit_tests/gen9/kbl/windows/CMakeLists.txt

@@ -21,7 +21,7 @@
 set(IGDRCL_SRCS_tests_gen9_kbl_windows
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
   ${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps_kbl_windows.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_kbl.cpp
 )
 
 if(WIN32)

unit_tests/gen9/linux/CMakeLists.txt

@@ -20,8 +20,8 @@
 
 set(IGDRCL_SRCS_tests_gen9_linux
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/device_factory_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/drm_mapper_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/device_factory_tests_gen9.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/drm_mapper_tests_gen9.cpp
 )
 if(UNIX)
   target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen9_linux})

unit_tests/gen9/linux/device_factory_tests_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"),

unit_tests/gen9/skl/linux/CMakeLists.txt

@@ -20,7 +20,7 @@
 
 set(IGDRCL_SRCS_tests_gen9_skl_linux
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_skl.cpp
 )
 if(UNIX)
   target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen9_skl_linux})

unit_tests/gen9/skl/linux/dll/CMakeLists.txt

@@ -20,6 +20,6 @@
 
 set(IGDRCL_SRCS_linux_dll_tests_gen9_skl
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/device_id_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/device_id_tests_skl.cpp
 )
 target_sources(igdrcl_linux_dll_tests PRIVATE ${IGDRCL_SRCS_linux_dll_tests_gen9_skl})

unit_tests/gen9/skl/windows/CMakeLists.txt

@@ -21,7 +21,7 @@
 set(IGDRCL_SRCS_tests_gen9_skl_windows
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
   ${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps_skl_windows.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_skl.cpp
 )
 
 if(WIN32)

unit_tests/gen9/test_platform_caps_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"),

unit_tests/gen9/windows/CMakeLists.txt

@@ -20,9 +20,9 @@
 
 set(IGDRCL_SRCS_tests_gen9_windows
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/wddm_mapper_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/translationtable_callbacks_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_tests_gen9.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/wddm_mapper_tests_gen9.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/translationtable_callbacks_tests_gen9.cpp
 )
 if(WIN32)
   target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen9_windows})

unit_tests/gen9/windows/os_interface_tests_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"),

unit_tests/gen9/windows/wddm_mapper_tests_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"),