Fix bindless surface/sampler MOCS programming

Signed-off-by: Rafal Maziejuk <[email protected]>
Related-To: NEO-6045

Author: RafalMaziejukIntel

shared/source/gen11/state_base_address_gen11.cpp

@@ -7,7 +7,7 @@
 
 #include "shared/source/helpers/state_base_address.h"
 #include "shared/source/helpers/state_base_address_bdw_plus.inl"
-#include "shared/source/helpers/state_base_address_skl_plus.inl"
+#include "shared/source/helpers/state_base_address_icllp_plus.inl"
 
 namespace NEO {
 template struct StateBaseAddressHelper<ICLFamily>;

shared/source/gen12lp/state_base_address_gen12lp.cpp

@@ -1,13 +1,13 @@
 /*
- * Copyright (C) 2019-2020 Intel Corporation
+ * Copyright (C) 2019-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/helpers/state_base_address.h"
 #include "shared/source/helpers/state_base_address_bdw_plus.inl"
-#include "shared/source/helpers/state_base_address_skl_plus.inl"
+#include "shared/source/helpers/state_base_address_icllp_plus.inl"
 
 namespace NEO {
 template struct StateBaseAddressHelper<TGLLPFamily>;

shared/source/helpers/state_base_address_icllp_plus.inl

@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2020-2021 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "shared/source/helpers/state_base_address.h"
+
+namespace NEO {
+
+template <typename GfxFamily>
+void StateBaseAddressHelper<GfxFamily>::appendStateBaseAddressParameters(
+    STATE_BASE_ADDRESS *stateBaseAddress,
+    const IndirectHeap *ssh,
+    bool setGeneralStateBaseAddress,
+    uint64_t indirectObjectHeapBaseAddress,
+    GmmHelper *gmmHelper,
+    bool isMultiOsContextCapable,
+    MemoryCompressionState memoryCompressionState,
+    bool overrideBindlessSurfaceStateBase,
+    bool useGlobalAtomics,
+    bool areMultipleSubDevicesInContext) {
+
+    if (overrideBindlessSurfaceStateBase && ssh) {
+        stateBaseAddress->setBindlessSurfaceStateBaseAddressModifyEnable(true);
+        stateBaseAddress->setBindlessSurfaceStateBaseAddress(ssh->getHeapGpuBase());
+        uint32_t size = uint32_t(ssh->getMaxAvailableSpace() / 64) - 1;
+        stateBaseAddress->setBindlessSurfaceStateSize(size);
+    }
+
+    stateBaseAddress->setBindlessSamplerStateBaseAddressModifyEnable(true);
+
+    auto l3CacheOnPolicy = GMM_RESOURCE_USAGE_OCL_STATE_HEAP_BUFFER;
+
+    if (gmmHelper != nullptr) {
+        stateBaseAddress->setBindlessSurfaceStateMemoryObjectControlStateIndexToMocsTables(gmmHelper->getMOCS(l3CacheOnPolicy));
+        stateBaseAddress->setBindlessSamplerStateMemoryObjectControlStateIndexToMocsTables(gmmHelper->getMOCS(l3CacheOnPolicy));
+    }
+
+    appendExtraCacheSettings(stateBaseAddress, gmmHelper);
+}
+} // namespace NEO

shared/source/helpers/state_base_address_xehp_plus.inl

@@ -66,6 +66,7 @@ void StateBaseAddressHelper<GfxFamily>::appendStateBaseAddressParameters(
     stateBaseAddress->setDynamicStateMemoryObjectControlStateIndexToMocsTables(gmmHelper->getMOCS(l3CacheOnPolicy));
     stateBaseAddress->setGeneralStateMemoryObjectControlStateIndexToMocsTables(gmmHelper->getMOCS(l3CacheOnPolicy));
     stateBaseAddress->setBindlessSurfaceStateMemoryObjectControlStateIndexToMocsTables(gmmHelper->getMOCS(l3CacheOnPolicy));
+    stateBaseAddress->setBindlessSamplerStateMemoryObjectControlStateIndexToMocsTables(gmmHelper->getMOCS(l3CacheOnPolicy));
 
     bool enableMultiGpuAtomics = isMultiOsContextCapable;
     if (DebugManager.flags.EnableMultiGpuAtomicsOptimization.get()) {