Skip to content

Commit 92b475c

Browse files
Jay-Jiewu-Lusys_zuul
authored andcommitted
[Autobackout][FuncReg]Revert of change: f7d2069
minor refactor Change-Id: I52b1bc441a0fac0bbdc7de89921b628e907f7541
1 parent 5e48595 commit 92b475c

File tree

2 files changed

+2
-35
lines changed

2 files changed

+2
-35
lines changed

IGC/Compiler/CISACodeGen/EmitVISAPass.cpp

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -10310,23 +10310,6 @@ void EmitPass::emitInsert(llvm::Instruction* inst)
1031010310
}
1031110311
else
1031210312
{
10313-
//todo : At this moment, we only fix 32bit data type in simd16or32.
10314-
//will handle other data type later
10315-
bool multiGRFWA = (m_currShader->m_Platform->enableMultiGRFAccessWA() &&
10316-
m_currShader->m_SIMDSize > SIMDMode::SIMD8 &&
10317-
m_currShader->m_Platform->getMinDispatchMode() == SIMDMode::SIMD8 &&
10318-
pElement->getType()->getScalarSizeInBits() == 32
10319-
);
10320-
if (multiGRFWA)
10321-
{
10322-
CVariable* pOffset1_2ndHalf = m_currShader->ImmToVariable(0x20, ISA_TYPE_UW);
10323-
CVariable* pOffset2_2ndHalf = m_currShader->GetNewAlias(pOffset2, ISA_TYPE_UW, 16, 0);
10324-
m_encoder->SetSrcRegion(0, 8, 8, 1);
10325-
m_encoder->SetSimdSize(SIMDMode::SIMD8);
10326-
m_encoder->Add(pOffset2_2ndHalf, pOffset2_2ndHalf, pOffset1_2ndHalf);
10327-
m_encoder->Push();
10328-
}
10329-
1033010313
int loopCount = (m_currShader->m_dispatchSize == SIMDMode::SIMD32 && m_currShader->m_numberInstance == 1) ? 2 : 1;
1033110314
for (int i = 0; i < loopCount; ++i)
1033210315
{
@@ -10372,17 +10355,7 @@ void EmitPass::emitInsert(llvm::Instruction* inst)
1037210355
}
1037310356
m_encoder->SetSrcRegion(0, 0, 1, 0);
1037410357
m_encoder->SetDstSubReg(lane);
10375-
if (multiGRFWA)
10376-
{
10377-
// Hardcode to simd8 to avoid complain about possible being across 3 GRFs.
10378-
// Changing to simd1 needs more work and might cause extra overhead as well.
10379-
m_encoder->SetMask(lane / numLanes(SIMDMode::SIMD8) ? EMASK_Q2 : EMASK_Q1);
10380-
m_encoder->SetSimdSize(SIMDMode::SIMD8);
10381-
}
10382-
else
10383-
{
10384-
m_encoder->SetSimdSize(simdMode);
10385-
}
10358+
m_encoder->SetSimdSize(simdMode);
1038610359
m_encoder->Copy(pDstArrElm, pElemVar);
1038710360
m_encoder->Push();
1038810361
}

IGC/Compiler/CISACodeGen/Platform.hpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -569,13 +569,7 @@ bool WaEnableA64WA() const
569569
return false;
570570
}
571571

572-
//Only enable this WA for TGLLP+ because, in pre TGLLP projects, smov was replaced with two instructions which caused performance penalty.
573-
bool enableMultiGRFAccessWA() const
574-
{
575-
return (m_platformInfo.eProductFamily >= IGFX_TIGERLAKE_LP);
576-
}
577-
578-
const SCompilerHwCaps& GetCaps() { return m_caps; }
572+
const SCompilerHwCaps& GetCaps() { return m_caps; }
579573
};
580574

581575
}//namespace IGC

0 commit comments

Comments
 (0)