Split structures into core and OCL-specific ones

Change-Id: I349ed52bcc7ed26eb0ff892acadc456ae285b92e
Signed-off-by: Daria Hinz <[email protected]>

Author: daariahinz

core/gen11/enable_family_full_core_gen11.cpp

@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2018-2020 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "core/gen11/hw_cmds.h"
+#include "core/helpers/hw_helper.h"
+
+namespace NEO {
+
+extern HwHelper *hwHelperFactory[IGFX_MAX_CORE];
+
+typedef ICLFamily Family;
+static auto gfxFamily = IGFX_GEN11_CORE;
+
+struct EnableCoreGen11 {
+    EnableCoreGen11() {
+        hwHelperFactory[gfxFamily] = &HwHelperHw<Family>::get();
+    }
+};
+
+static EnableCoreGen11 enable;
+} // namespace NEO

core/gen12lp/enable_family_full_core_gen12lp.cpp

@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2019-2020 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "core/gen12lp/hw_cmds.h"
+#include "core/helpers/hw_helper.h"
+
+namespace NEO {
+
+extern HwHelper *hwHelperFactory[IGFX_MAX_CORE];
+
+typedef TGLLPFamily Family;
+static auto gfxFamily = IGFX_GEN12LP_CORE;
+
+struct EnableCoreGen12LP {
+    EnableCoreGen12LP() {
+        hwHelperFactory[gfxFamily] = &HwHelperHw<Family>::get();
+    }
+};
+
+static EnableCoreGen12LP enable;
+} // namespace NEO

core/gen8/enable_family_full_core_gen8.cpp

@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2017-2020 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "core/gen8/hw_cmds.h"
+#include "core/helpers/hw_helper.h"
+
+#include <type_traits>
+
+namespace NEO {
+
+extern HwHelper *hwHelperFactory[IGFX_MAX_CORE];
+
+typedef BDWFamily Family;
+static const auto gfxFamily = IGFX_GEN8_CORE;
+
+struct EnableCoreGen8 {
+    EnableCoreGen8() {
+        hwHelperFactory[gfxFamily] = &HwHelperHw<Family>::get();
+    }
+};
+
+static EnableCoreGen8 enable;
+} // namespace NEO

core/gen9/enable_family_full_core_gen9.cpp

@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2017-2020 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "core/gen8/hw_cmds.h"
+#include "core/helpers/hw_helper.h"
+
+#include <type_traits>
+
+namespace NEO {
+
+extern HwHelper *hwHelperFactory[IGFX_MAX_CORE];
+
+typedef SKLFamily Family;
+static const auto gfxFamily = IGFX_GEN9_CORE;
+
+struct EnableCoreGen9 {
+    EnableCoreGen9() {
+        hwHelperFactory[gfxFamily] = &HwHelperHw<Family>::get();
+    }
+};
+
+static EnableCoreGen9 enable;
+} // namespace NEO

runtime/enable_gens.cmake

@@ -117,7 +117,8 @@ macro(macro_for_each_gen)
   list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_WINDOWS ${GENX_PREFIX}/windows/hw_info_config_${GEN_TYPE_LOWER}.cpp)
   list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_LINUX ${GENX_PREFIX}/linux/hw_info_config_${GEN_TYPE_LOWER}.cpp)
 
-  list(APPEND ${GEN_TYPE}_SRC_LINK_BASE ${GENX_PREFIX}/enable_family_full_${GEN_TYPE_LOWER}.cpp)
+  list(APPEND ${GEN_TYPE}_SRC_LINK_BASE ${GENX_PREFIX}/enable_family_full_ocl_${GEN_TYPE_LOWER}.cpp)
+  list(APPEND ${GEN_TYPE}_SRC_LINK_BASE ${CORE_GENX_PREFIX}/enable_family_full_core_${GEN_TYPE_LOWER}.cpp)
   list(APPEND ${GEN_TYPE}_SRC_LINK_BASE ${CORE_GENX_PREFIX}/enable_hw_info_config_${GEN_TYPE_LOWER}.cpp)
   list(APPEND ${GEN_TYPE}_SRC_LINK_BASE ${CORE_GENX_PREFIX}/enable_${GEN_TYPE_LOWER}.cpp)
 

…ntime/gen11/enable_family_full_gen11.cpp …e/gen11/enable_family_full_ocl_gen11.cppruntime/gen11/enable_family_full_gen11.cpp renamed to runtime/gen11/enable_family_full_ocl_gen11.cpp runtime/gen11/enable_family_full_gen11.cpp renamed to runtime/gen11/enable_family_full_ocl_gen11.cpp

@@ -1,11 +1,10 @@
 /*
- * Copyright (C) 2018-2019 Intel Corporation
+ * Copyright (C) 2018-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "core/gen11/hw_cmds.h"
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/command_stream/aub_command_stream_receiver_hw.h"
 #include "runtime/command_stream/command_stream_receiver_hw.h"
@@ -15,20 +14,16 @@
 #ifdef HAVE_INSTRUMENTATION
 #include "runtime/event/perf_counter.h"
 #endif
-#include "core/helpers/hw_helper.h"
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/sampler/sampler.h"
 
 namespace NEO {
 
-extern HwHelper *hwHelperFactory[IGFX_MAX_CORE];
-
 typedef ICLFamily Family;
-static auto gfxFamily = IGFX_GEN11_CORE;
 
-struct EnableGen11 {
-    EnableGen11() {
+struct EnableOCLGen11 {
+    EnableOCLGen11() {
         populateFactoryTable<AUBCommandStreamReceiverHw<Family>>();
         populateFactoryTable<TbxCommandStreamReceiverHw<Family>>();
         populateFactoryTable<CommandQueueHw<Family>>();
@@ -37,9 +32,8 @@ struct EnableGen11 {
         populateFactoryTable<BufferHw<Family>>();
         populateFactoryTable<ImageHw<Family>>();
         populateFactoryTable<SamplerHw<Family>>();
-        hwHelperFactory[gfxFamily] = &HwHelperHw<Family>::get();
     }
 };
 
-static EnableGen11 enable;
+static EnableOCLGen11 enable;
 } // namespace NEO

…e/gen12lp/enable_family_full_gen12lp.cpp …n12lp/enable_family_full_ocl_gen12lp.cppruntime/gen12lp/enable_family_full_gen12lp.cpp renamed to runtime/gen12lp/enable_family_full_ocl_gen12lp.cpp runtime/gen12lp/enable_family_full_gen12lp.cpp renamed to runtime/gen12lp/enable_family_full_ocl_gen12lp.cpp

@@ -1,12 +1,10 @@
 /*
- * Copyright (C) 2019 Intel Corporation
+ * Copyright (C) 2019-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "core/gen12lp/hw_cmds.h"
-#include "core/helpers/hw_helper.h"
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/command_stream/aub_command_stream_receiver_hw.h"
 #include "runtime/command_stream/command_stream_receiver_hw.h"
@@ -18,13 +16,10 @@
 
 namespace NEO {
 
-extern HwHelper *hwHelperFactory[IGFX_MAX_CORE];
-
 typedef TGLLPFamily Family;
-static auto gfxFamily = IGFX_GEN12LP_CORE;
 
-struct EnableGen12LP {
-    EnableGen12LP() {
+struct EnableOCLGen12LP {
+    EnableOCLGen12LP() {
         populateFactoryTable<AUBCommandStreamReceiverHw<Family>>();
         populateFactoryTable<TbxCommandStreamReceiverHw<Family>>();
         populateFactoryTable<CommandQueueHw<Family>>();
@@ -33,9 +28,8 @@ struct EnableGen12LP {
         populateFactoryTable<BufferHw<Family>>();
         populateFactoryTable<ImageHw<Family>>();
         populateFactoryTable<SamplerHw<Family>>();
-        hwHelperFactory[gfxFamily] = &HwHelperHw<Family>::get();
     }
 };
 
-static EnableGen12LP enable;
+static EnableOCLGen12LP enable;
 } // namespace NEO

runtime/gen8/enable_family_full_gen8.cpp …ime/gen8/enable_family_full_ocl_gen8.cppruntime/gen8/enable_family_full_gen8.cpp renamed to runtime/gen8/enable_family_full_ocl_gen8.cpp runtime/gen8/enable_family_full_gen8.cpp renamed to runtime/gen8/enable_family_full_ocl_gen8.cpp

@@ -1,12 +1,10 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "core/gen8/hw_cmds.h"
-#include "core/helpers/hw_helper.h"
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/command_stream/aub_command_stream_receiver_hw.h"
 #include "runtime/command_stream/command_stream_receiver_hw.h"
@@ -21,13 +19,10 @@
 
 namespace NEO {
 
-extern HwHelper *hwHelperFactory[IGFX_MAX_CORE];
-
 typedef BDWFamily Family;
-static const auto gfxFamily = IGFX_GEN8_CORE;
 
-struct EnableGen8 {
-    EnableGen8() {
+struct EnableOCLGen8 {
+    EnableOCLGen8() {
         populateFactoryTable<AUBCommandStreamReceiverHw<Family>>();
         populateFactoryTable<TbxCommandStreamReceiverHw<Family>>();
         populateFactoryTable<CommandQueueHw<Family>>();
@@ -36,9 +31,8 @@ struct EnableGen8 {
         populateFactoryTable<BufferHw<Family>>();
         populateFactoryTable<ImageHw<Family>>();
         populateFactoryTable<SamplerHw<Family>>();
-        hwHelperFactory[gfxFamily] = &HwHelperHw<Family>::get();
     }
 };
 
-static EnableGen8 enable;
+static EnableOCLGen8 enable;
 } // namespace NEO

runtime/gen9/enable_family_full_gen9.cpp …ime/gen9/enable_family_full_ocl_gen9.cppruntime/gen9/enable_family_full_gen9.cpp renamed to runtime/gen9/enable_family_full_ocl_gen9.cpp runtime/gen9/enable_family_full_gen9.cpp renamed to runtime/gen9/enable_family_full_ocl_gen9.cpp

@@ -1,12 +1,10 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "core/gen8/hw_cmds.h"
-#include "core/helpers/hw_helper.h"
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/command_stream/aub_command_stream_receiver_hw.h"
 #include "runtime/command_stream/command_stream_receiver_hw.h"
@@ -21,13 +19,10 @@
 
 namespace NEO {
 
-extern HwHelper *hwHelperFactory[IGFX_MAX_CORE];
-
 typedef SKLFamily Family;
-static const auto gfxFamily = IGFX_GEN9_CORE;
 
-struct EnableGen9 {
-    EnableGen9() {
+struct EnableOCLGen9 {
+    EnableOCLGen9() {
         populateFactoryTable<AUBCommandStreamReceiverHw<Family>>();
         populateFactoryTable<TbxCommandStreamReceiverHw<Family>>();
         populateFactoryTable<CommandQueueHw<Family>>();
@@ -36,9 +31,8 @@ struct EnableGen9 {
         populateFactoryTable<BufferHw<Family>>();
         populateFactoryTable<ImageHw<Family>>();
         populateFactoryTable<SamplerHw<Family>>();
-        hwHelperFactory[gfxFamily] = &HwHelperHw<Family>::get();
     }
 };
 
-static EnableGen9 enable;
+static EnableOCLGen9 enable;
 } // namespace NEO

unit_tests/libult/CMakeLists.txt

@@ -10,7 +10,8 @@ macro(macro_for_each_gen)
     ${NEO_SOURCE_DIR}/core/unit_tests/libult/${GEN_TYPE_LOWER}.cpp
     ${NEO_SOURCE_DIR}/core/${GEN_TYPE_LOWER}/enable_hw_info_config_${GEN_TYPE_LOWER}.cpp
     ${NEO_SOURCE_DIR}/core/${GEN_TYPE_LOWER}/enable_${GEN_TYPE_LOWER}.cpp
-    ${NEO_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/enable_family_full_${GEN_TYPE_LOWER}.cpp
+    ${NEO_SOURCE_DIR}/core/${GEN_TYPE_LOWER}/enable_family_full_core_${GEN_TYPE_LOWER}.cpp
+    ${NEO_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/enable_family_full_ocl_${GEN_TYPE_LOWER}.cpp
   )
 
   if(EXISTS "${NEO_SOURCE_DIR}/core/unit_tests/${GEN_TYPE_LOWER}/cmd_parse${BRANCH_DIR_SUFFIX}/cmd_parse_${GEN_TYPE_LOWER}.inl")