Skip to content

Commit 0d3debb

Browse files
sys-igcigcbot
authored andcommitted
[Autobackout][FunctionalRegression]Revert of change: cda473a: Add platforms to avoid dst/src overlap
Send dst src operand overlap may cause dead lock due to SBID dependence
1 parent 92c2e4b commit 0d3debb

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

IGC/Compiler/CISACodeGen/CISABuilder.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5236,6 +5236,11 @@ namespace IGC
52365236
SaveOption(vISA_noSendSrcDstOverlap, true);
52375237
}
52385238

5239+
if (m_program->m_Platform->WaDisableSendSrcDstOverlap())
5240+
{
5241+
SaveOption(vISA_noSendSrcDstOverlap, true);
5242+
}
5243+
52395244
// Set to stitch all functions to all kernels in a VISABuidler
52405245
SaveOption(vISA_noStitchExternFunc, false);
52415246

IGC/Compiler/CISACodeGen/Platform.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1545,8 +1545,7 @@ bool WaDisableSendSrcDstOverlap() const
15451545
{
15461546
return (!IGC_IS_FLAG_ENABLED(DisableSendSrcDstOverlapWA)) &&
15471547
(m_SkuTable.FtrWddm2Svm != 0 || m_platformInfo.eRenderCoreFamily == IGFX_GEN10_CORE ||
1548-
m_platformInfo.eRenderCoreFamily == IGFX_GEN11_CORE ||
1549-
m_platformInfo.eProductFamily >= IGFX_DG2);
1548+
m_platformInfo.eRenderCoreFamily == IGFX_GEN11_CORE);
15501549

15511550
}
15521551

visa/HWCaps.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,8 +334,8 @@ bool has8ByteA64Gather() const { return getPlatform() != GENX_TGLLP; }
334334
bool WaDisableSendSrcDstOverlap() const {
335335
return getOption(vISA_noSendSrcDstOverlap) ||
336336
(m_options->getTarget() == VISA_CM && getPlatform() >= GENX_SKL &&
337-
getPlatform() < GENX_TGLLP) || getPlatform() == GENX_ICLLP ||
338-
getPlatform() >= Xe_DG2;
337+
getPlatform() < GENX_TGLLP) ||
338+
getPlatform() == GENX_ICLLP;
339339
}
340340

341341
bool isXeLP() const { return getPlatform() == GENX_TGLLP; }

0 commit comments

Comments
 (0)