Extract functions to state_base_address_bdw_plus.inl

Change-Id: I577488aa18b7ca53e87c5e05c383d9879c545fbb
Related-To: NEO-3016
Signed-off-by: Maciej Dziuban <[email protected]>

Author: DziubanMaciejIntel

runtime/gen10/state_base_address_gen10.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "runtime/helpers/state_base_address.h"
-#include "runtime/helpers/state_base_address.inl"
+#include "runtime/helpers/state_base_address_bdw_plus.inl"
 
 namespace NEO {
 template struct StateBaseAddressHelper<CNLFamily>;

runtime/gen11/state_base_address_gen11.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "runtime/helpers/state_base_address.h"
-#include "runtime/helpers/state_base_address.inl"
+#include "runtime/helpers/state_base_address_bdw_plus.inl"
 
 namespace NEO {
 template struct StateBaseAddressHelper<ICLFamily>;

runtime/gen8/state_base_address_gen8.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "runtime/helpers/state_base_address.h"
-#include "runtime/helpers/state_base_address.inl"
+#include "runtime/helpers/state_base_address_bdw_plus.inl"
 
 namespace NEO {
 template struct StateBaseAddressHelper<BDWFamily>;

runtime/gen9/state_base_address_gen9.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "runtime/helpers/state_base_address.h"
-#include "runtime/helpers/state_base_address.inl"
+#include "runtime/helpers/state_base_address_bdw_plus.inl"
 
 namespace NEO {
 template struct StateBaseAddressHelper<SKLFamily>;

runtime/helpers/CMakeLists.txt

@@ -76,7 +76,8 @@ set(RUNTIME_SRCS_HELPERS_BASE
   ${CMAKE_CURRENT_SOURCE_DIR}/queue_helpers.h
   ${CMAKE_CURRENT_SOURCE_DIR}/sampler_helpers.h
   ${CMAKE_CURRENT_SOURCE_DIR}/state_base_address.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/state_base_address.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/state_base_address_base.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/state_base_address_bdw_plus.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/stdio.h
   ${CMAKE_CURRENT_SOURCE_DIR}/string.h
   ${CMAKE_CURRENT_SOURCE_DIR}/string_helpers.h

runtime/helpers/state_base_address.inl …time/helpers/state_base_address_base.inlruntime/helpers/state_base_address.inl renamed to runtime/helpers/state_base_address_base.inl runtime/helpers/state_base_address.inl renamed to runtime/helpers/state_base_address_base.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -62,24 +62,4 @@ void StateBaseAddressHelper<GfxFamily>::programStateBaseAddress(
     appendStateBaseAddressParameters(pCmd, dsh, ioh, ssh, generalStateBase, internalHeapBase, gmmHelper, dispatchFlags);
 }
 
-template <typename GfxFamily>
-void StateBaseAddressHelper<GfxFamily>::appendStateBaseAddressParameters(
-    STATE_BASE_ADDRESS *stateBaseAddress,
-    const IndirectHeap &dsh,
-    const IndirectHeap &ioh,
-    const IndirectHeap &ssh,
-    uint64_t generalStateBase,
-    uint64_t internalHeapBase,
-    GmmHelper *gmmHelper,
-    DispatchFlags &dispatchFlags) {
-}
-
-template <typename GfxFamily>
-void StateBaseAddressHelper<GfxFamily>::programBindingTableBaseAddress(LinearStream &commandStream, const IndirectHeap &ssh,
-                                                                       size_t stateBaseAddressCmdOffset, GmmHelper *gmmHelper) {
-
-    auto sbaCommand = static_cast<STATE_BASE_ADDRESS *>(ptrOffset(commandStream.getCpuBase(), stateBaseAddressCmdOffset));
-    UNRECOVERABLE_IF(sbaCommand->getSurfaceStateBaseAddress() != ssh.getGraphicsAllocation()->getGpuAddress());
-}
-
 } // namespace NEO

runtime/helpers/state_base_address_bdw_plus.inl

@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "runtime/helpers/state_base_address_base.inl"
+
+namespace NEO {
+
+template <typename GfxFamily>
+void StateBaseAddressHelper<GfxFamily>::appendStateBaseAddressParameters(
+    STATE_BASE_ADDRESS *stateBaseAddress,
+    const IndirectHeap &dsh,
+    const IndirectHeap &ioh,
+    const IndirectHeap &ssh,
+    uint64_t generalStateBase,
+    uint64_t internalHeapBase,
+    GmmHelper *gmmHelper,
+    DispatchFlags &dispatchFlags) {
+}
+
+template <typename GfxFamily>
+void StateBaseAddressHelper<GfxFamily>::programBindingTableBaseAddress(LinearStream &commandStream, const IndirectHeap &ssh,
+                                                                       size_t stateBaseAddressCmdOffset, GmmHelper *gmmHelper) {
+
+    auto sbaCommand = static_cast<STATE_BASE_ADDRESS *>(ptrOffset(commandStream.getCpuBase(), stateBaseAddressCmdOffset));
+    UNRECOVERABLE_IF(sbaCommand->getSurfaceStateBaseAddress() != ssh.getGraphicsAllocation()->getGpuAddress());
+}
+
+} // namespace NEO