Add debug flag to control ISA allocation padding

Signed-off-by: Filip Hazubski <[email protected]>

Author: fhazubski-Intel

opencl/test/unit_test/helpers/hw_helper_tests.cpp

@@ -88,6 +88,17 @@ HWTEST_F(HwHelperTest, givenHwHelperWhenGettingISAPaddingThenCorrectValueIsRetur
     EXPECT_EQ(hwHelper.getPaddingForISAAllocation(), 512u);
 }
 
+HWTEST_F(HwHelperTest, givenForceExtendedKernelIsaSizeSetWhenGettingISAPaddingThenCorrectValueIsReturned) {
+    DebugManagerStateRestore restore;
+    auto &hwHelper = HwHelper::get(pDevice->getHardwareInfo().platform.eRenderCoreFamily);
+
+    auto defaultPadding = hwHelper.getPaddingForISAAllocation();
+    for (int32_t valueToTest : {0, 1, 2, 10}) {
+        DebugManager.flags.ForceExtendedKernelIsaSize.set(valueToTest);
+        EXPECT_EQ(hwHelper.getPaddingForISAAllocation(), defaultPadding + MemoryConstants::pageSize * valueToTest);
+    }
+}
+
 HWTEST_F(HwHelperTest, WhenSettingRenderSurfaceStateForBufferThenL1CachePolicyIsSet) {
     using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE;
     using SURFACE_TYPE = typename RENDER_SURFACE_STATE::SURFACE_TYPE;

opencl/test/unit_test/test_files/igdrcl.config

@@ -378,6 +378,7 @@ ExperimentalEnableSourceLevelDebugger = 0
 Force2dImageAsArray = -1
 ForceExtendedBufferSize = -1
 ForceExtendedUSMBufferSize = -1
+ForceExtendedKernelIsaSize = -1
 MakeIndirectAllocationsResidentAsPack = -1
 MakeEachAllocationResident = -1
 AssignBCSAtEnqueue = -1

shared/source/debug_settings/debug_variables_base.inl

@@ -179,8 +179,9 @@ DECLARE_DEBUG_VARIABLE(int32_t, ClosNumCacheWays, -1, "-1: default, >= 0 Number
 DECLARE_DEBUG_VARIABLE(int32_t, EngineUsageHint, -1, "-1: default, >=0: engine usage value to use when creating command queue on user selected engine")
 DECLARE_DEBUG_VARIABLE(int32_t, ForceBcsEngineIndex, -1, "-1: default, >=0 Copy Engine index")
 DECLARE_DEBUG_VARIABLE(int32_t, Force2dImageAsArray, -1, "-1: default, 0: WA Disabled, 1: Forces surface state of 2dImage to array")
-DECLARE_DEBUG_VARIABLE(int32_t, ForceExtendedBufferSize, -1, "-1: default, 0: disabled, >=1: Forces extended buffer size by specify pageSize number in clCreateBuffer, clCreateBufferWithProperties and clCreateBufferWithPropertiesINTEL calls")
-DECLARE_DEBUG_VARIABLE(int32_t, ForceExtendedUSMBufferSize, -1, "-1: default, 0: disabled, >=1: Forces extended buffer size by specify pageSize number in USM calls")
+DECLARE_DEBUG_VARIABLE(int32_t, ForceExtendedBufferSize, -1, "-1: default, 0: disabled, >=1: Forces extended buffer size by specified pageSize number in clCreateBuffer, clCreateBufferWithProperties and clCreateBufferWithPropertiesINTEL calls")
+DECLARE_DEBUG_VARIABLE(int32_t, ForceExtendedUSMBufferSize, -1, "-1: default, 0: disabled, >=1: Forces extended buffer size by specified pageSize number in USM calls")
+DECLARE_DEBUG_VARIABLE(int32_t, ForceExtendedKernelIsaSize, -1, "-1: default, 0: disabled, >=1: Forces extended kernel isa size by specified pageSize number")
 DECLARE_DEBUG_VARIABLE(int32_t, ForceSimdMessageSizeInWalker, -1, "-1: default, >=0 Program given value in Walker command for SIMD size")
 DECLARE_DEBUG_VARIABLE(int32_t, EnableRecoverablePageFaults, -1, "-1: default - ignore, 0: disable, 1: enable recoverable page faults on all VMs (on faultable hardware)")
 DECLARE_DEBUG_VARIABLE(int32_t, EnableImplicitMigrationOnFaultableHardware, -1, "-1: default - ignore, 0: disable, 1: enable implicit migration on faultable hardware (for all allocations)")

shared/source/helpers/hw_helper_base.inl

@@ -74,6 +74,9 @@ size_t HwHelperHw<Family>::getMaxBarrierRegisterPerSlice() const {
 
 template <typename Family>
 size_t HwHelperHw<Family>::getPaddingForISAAllocation() const {
+    if (DebugManager.flags.ForceExtendedKernelIsaSize.get() >= 1) {
+        return 512 + (MemoryConstants::pageSize * DebugManager.flags.ForceExtendedKernelIsaSize.get());
+    }
     return 512;
 }
 

shared/source/xe_hpc_core/hw_helper_xe_hpc_core.cpp

@@ -167,7 +167,10 @@ uint32_t HwHelperHw<Family>::getMaxNumSamplers() const {
 
 template <>
 size_t HwHelperHw<Family>::getPaddingForISAAllocation() const {
-    return 3584;
+    if (DebugManager.flags.ForceExtendedKernelIsaSize.get() >= 1) {
+        return 0xE00 + (MemoryConstants::pageSize * DebugManager.flags.ForceExtendedKernelIsaSize.get());
+    }
+    return 0xE00;
 }
 
 template <>

shared/test/unit_test/xe_hpc_core/hw_helper_xe_hpc_core_tests.cpp

@@ -56,7 +56,7 @@ XE_HPC_CORETEST_F(HwHelperXeHpcCoreTest, WhenGettingIsCpuImageTransferPreferredT
 
 XE_HPC_CORETEST_F(HwHelperXeHpcCoreTest, givenHwHelperWhenGettingISAPaddingThenCorrectValueIsReturned) {
     auto &hwHelper = NEO::HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily);
-    EXPECT_EQ(hwHelper.getPaddingForISAAllocation(), 3584u);
+    EXPECT_EQ(hwHelper.getPaddingForISAAllocation(), 0xE00u);
 }
 
 XE_HPC_CORETEST_F(HwHelperXeHpcCoreTest, givenHwHelperWhenGettingIfRevisionSpecificBinaryBuiltinIsRequiredThenTrueIsReturned) {