Skip to content

Commit 7b3aea3

Browse files
ichenkaiigcbot
authored andcommitted
Remove OCL driverInfo control for LscStoresWithNonDefaultL1Cache
With NEO version has been updated to have the zebin feature for LscStoresWithNonDefaultL1Cache, we can remove the workaround by driver info control check.
1 parent dc1e942 commit 7b3aea3

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

IGC/AdaptorOCL/DriverInfoOCL.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ namespace TC
8181
bool SupportInlineAssembly() const override { return true; }
8282
/// Enables the use of inline data on XeHP_SDV+
8383
virtual bool UseInlineData() const override { return true; }
84-
bool getLscStoresWithNonDefaultL1CacheControls() const override{ return false; }
8584
};
8685

8786
}//namespace TC

IGC/Compiler/CISACodeGen/DriverInfo.hpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,8 +381,9 @@ namespace IGC
381381
virtual unsigned getCSSIMD32_SpillThreshold() const { return IGC_GET_FLAG_VALUE(CSSIMD32_SpillThreshold); }
382382

383383
virtual bool supportLscSamplerRouting() const { return true; }
384-
virtual bool supportBarrierControlFlowOptimization() const { return false; }
385-
virtual bool getLscStoresWithNonDefaultL1CacheControls() const { return true; }
384+
virtual bool supportBarrierControlFlowOptimization() const {
385+
return false;
386+
}
386387

387388
// Informs if the UMD understands atomic pull tile walk for raytracing
388389
virtual bool supportsAtomicPullSWTileWalk() const { return false; }

IGC/Compiler/CISACodeGen/OpenCLKernelCodeGen.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2844,6 +2844,9 @@ namespace IGC
28442844

28452845
m_Context->SetSIMDInfo(SIMD_SELECTED, simdMode, ShaderDispatchMode::NOT_APPLICABLE);
28462846

2847+
// Use this for others later to match clang-formatter style needs
2848+
auto &execEnv = m_kernelInfo.m_executionEnvironment;
2849+
28472850
m_kernelInfo.m_executionEnvironment.CompiledSIMDSize = numLanes(simdMode);
28482851
m_kernelInfo.m_executionEnvironment.SIMDInfo = m_Context->GetSIMDInfo();
28492852

@@ -2933,11 +2936,8 @@ namespace IGC
29332936
m_kernelInfo.m_executionEnvironment.UseBindlessMode = m_Context->m_InternalOptions.UseBindlessMode;
29342937
m_kernelInfo.m_executionEnvironment.HasStackCalls = HasStackCalls();
29352938

2936-
2937-
if (m_Context->m_DriverInfo.getLscStoresWithNonDefaultL1CacheControls())
2938-
{
2939-
m_kernelInfo.m_executionEnvironment.HasLscStoresWithNonDefaultL1CacheControls = m_State.GetHasLscStoresWithNonDefaultL1CacheControls();
2940-
}
2939+
execEnv.HasLscStoresWithNonDefaultL1CacheControls =
2940+
m_State.GetHasLscStoresWithNonDefaultL1CacheControls();
29412941

29422942
if (m_Context->enableZEBinary()) {
29432943
FillZEKernelArgInfo();

0 commit comments

Comments
 (0)