Skip to content

Commit 4fa2608

Browse files
matborzyszkowskiigcbot
matborzyszkowski
authored and
igcbot
committed
[Autobackout][FuncReg]Revert of change: 829721c
Add LNL functionality Add LNL functionality
1 parent 8892271 commit 4fa2608

File tree

17 files changed

+0
-168
lines changed

17 files changed

+0
-168
lines changed

‎IGC/AdaptorCommon/RayTracing/RTBuilder.cpp

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,21 +1118,6 @@ std::pair<uint32_t, uint32_t> RTBuilder::getSliceIDBitsInSR0() const {
11181118
}
11191119
}
11201120

1121-
std::pair<uint32_t, uint32_t> RTBuilder::getSubsliceIDBitsInSR0() const {
1122-
if (Ctx.platform.GetPlatformFamily() == IGFX_GEN8_CORE ||
1123-
Ctx.platform.GetPlatformFamily() == IGFX_GEN9_CORE)
1124-
{
1125-
return {12, 13};
1126-
}
1127-
else if (Ctx.platform.GetPlatformFamily() == IGFX_XE2_LPG_CORE)
1128-
{
1129-
return {8, 9};
1130-
}
1131-
else
1132-
{
1133-
return {8, 8};
1134-
}
1135-
}
11361121

11371122
std::pair<uint32_t, uint32_t> RTBuilder::getDualSubsliceIDBitsInSR0() const {
11381123
if (Ctx.platform.GetPlatformFamily() == IGFX_GEN11_CORE ||
@@ -1159,36 +1144,6 @@ std::pair<uint32_t, uint32_t> RTBuilder::getDualSubsliceIDBitsInSR0() const {
11591144
// globalDSSID is the combined value of sliceID and dssID on slice.
11601145
Value* RTBuilder::getGlobalDSSID()
11611146
{
1162-
if (isChildOfXe2)
1163-
{
1164-
if (Ctx.platform.supportsWMTPForShaderType(Ctx.type))
1165-
{
1166-
Module* module = GetInsertBlock()->getModule();
1167-
return CreateCall(
1168-
GenISAIntrinsic::getDeclaration(module, GenISAIntrinsic::GenISA_logical_subslice_id),
1169-
None,
1170-
VALUE_NAME("logical_subslice_id"));
1171-
}
1172-
else
1173-
{
1174-
auto dssIDBits = getSubsliceIDBitsInSR0();
1175-
auto sliceIDBits = getSliceIDBitsInSR0();
1176-
1177-
if (dssIDBits.first < sliceIDBits.first && sliceIDBits.first == dssIDBits.second + 1)
1178-
{
1179-
return emitStateRegID(dssIDBits.first, sliceIDBits.second);
1180-
}
1181-
else
1182-
{
1183-
Value* dssID = emitStateRegID(dssIDBits.first, dssIDBits.second);
1184-
Value* sliceID = emitStateRegID(sliceIDBits.first, sliceIDBits.second);
1185-
unsigned shiftAmount = dssIDBits.second - dssIDBits.first + 1;
1186-
Value* globalDSSID = CreateShl(sliceID, shiftAmount);
1187-
return CreateOr(globalDSSID, dssID);
1188-
}
1189-
}
1190-
}
1191-
else
11921147
{
11931148
auto dssIDBits = getDualSubsliceIDBitsInSR0();
11941149
auto sliceIDBits = getSliceIDBitsInSR0();

‎IGC/AdaptorCommon/RayTracing/RTBuilder.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,6 @@ class RTBuilder : public IGCIRBuilder<>
431431
GenIntrinsicInst* getSr0_0();
432432
Value* emitStateRegID(uint32_t BitStart, uint32_t BitEnd);
433433
std::pair<uint32_t, uint32_t> getSliceIDBitsInSR0() const;
434-
std::pair<uint32_t, uint32_t> getSubsliceIDBitsInSR0() const;
435434
std::pair<uint32_t, uint32_t> getDualSubsliceIDBitsInSR0() const;
436435

437436

‎IGC/Compiler/CISACodeGen/CISABuilder.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3138,8 +3138,6 @@ namespace IGC
31383138
return Xe_PVC; // PVC XL A0 RevID=0x0
31393139
}
31403140
}
3141-
case IGFX_XE2_LPG_CORE:
3142-
return Xe2;
31433141
// fall-through
31443142
default:
31453143
IGC_ASSERT_MESSAGE(0, "unsupported platform");

‎IGC/Compiler/CISACodeGen/EmitVISAPass.cpp

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8464,23 +8464,6 @@ void EmitPass::EmitGenIntrinsicMessage(llvm::GenIntrinsicInst* inst)
84648464
emitStateRegID(8, 8);
84658465
break;
84668466
}
8467-
case GenISAIntrinsic::GenISA_logical_subslice_id:
8468-
{
8469-
if (m_currShader->m_Platform->hasLogicalSSID())
8470-
{
8471-
uint32_t and_imm = BITMASK_RANGE(0, 7);
8472-
m_encoder->SetSrcSubReg(0, 0);
8473-
m_encoder->SetSrcRegion(0, 0, 1, 0);
8474-
m_encoder->And(m_destination, m_currShader->GetMSG0(), m_currShader->ImmToVariable(and_imm, ISA_TYPE_UD));
8475-
m_encoder->Push();
8476-
}
8477-
else
8478-
{
8479-
m_pCtx->EmitError("logical SSID is not supported in this platform!", inst);
8480-
IGC_ASSERT_MESSAGE(0, "GenISA_logical_subslice_id not supported in this platform!");
8481-
}
8482-
break;
8483-
}
84848467
case GenISAIntrinsic::GenISA_dual_subslice_id:
84858468
{
84868469
if (m_currShader->m_Platform->GetPlatformFamily() == IGFX_GEN11_CORE ||

‎IGC/Compiler/CISACodeGen/Platform.hpp

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -157,21 +157,6 @@ bool canSupportWMTPWithoutBTD() const {
157157
}
158158

159159

160-
161-
bool supportsWMTPForShaderType(ShaderType type) const {
162-
if (isCoreChildOf(IGFX_XE2_LPG_CORE)) {
163-
switch (type) {
164-
case ShaderType::COMPUTE_SHADER:
165-
case ShaderType::OPENCL_SHADER:
166-
return true;
167-
default:
168-
return false;
169-
}
170-
}
171-
172-
return false;
173-
}
174-
175160
bool supportDisableMidThreadPreemptionSwitch() const { return m_platformInfo.eRenderCoreFamily >= IGFX_GEN10_CORE; }
176161

177162
bool needSWStencil() const
@@ -1580,10 +1565,6 @@ bool supportCheckCSThreadsLimit() const
15801565
{
15811566
return (m_platformInfo.eRenderCoreFamily == IGFX_XE2_LPG_CORE);
15821567
}
1583-
bool supportTriggerLargeGRFRetry() const
1584-
{
1585-
return (m_platformInfo.eRenderCoreFamily == IGFX_XE2_LPG_CORE);
1586-
}
15871568

15881569

15891570
bool EnableCSWalkerPass() const

‎IGC/Compiler/CISACodeGen/WIAnalysis.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1439,7 +1439,6 @@ WIAnalysis::WIDependancy WIAnalysisRunner::calculate_dep(const CallInst* inst)
14391439
GII_id == GenISAIntrinsic::GenISA_add_rtz ||
14401440
GII_id == GenISAIntrinsic::GenISA_slice_id ||
14411441
GII_id == GenISAIntrinsic::GenISA_subslice_id ||
1442-
GII_id == GenISAIntrinsic::GenISA_logical_subslice_id ||
14431442
GII_id == GenISAIntrinsic::GenISA_dual_subslice_id ||
14441443
GII_id == GenISAIntrinsic::GenISA_eu_id ||
14451444
GII_id == GenISAIntrinsic::GenISA_eu_thread_id ||
@@ -1485,7 +1484,6 @@ WIAnalysis::WIDependancy WIAnalysisRunner::calculate_dep(const CallInst* inst)
14851484
return WIAnalysis::UNIFORM_THREAD;
14861485
case GenISAIntrinsic::GenISA_slice_id:
14871486
case GenISAIntrinsic::GenISA_subslice_id:
1488-
case GenISAIntrinsic::GenISA_logical_subslice_id:
14891487
case GenISAIntrinsic::GenISA_dual_subslice_id:
14901488
// Make sure they are UNIFORM_WORKGROUP
14911489
//return WIAnalysis::UNIFORM_WORKGROUP;

‎IGC/Compiler/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ set(IGC_BUILD__SRC__Compiler
110110
"${IGC_BUILD__GFX_DEV_SRC_DIR}/skuwa/igt_12_70_sw_wa.c"
111111
"${IGC_BUILD__GFX_DEV_SRC_DIR}/skuwa/igt_12_71_hw_wa.c"
112112
"${IGC_BUILD__GFX_DEV_SRC_DIR}/skuwa/igt_12_74_hw_wa.c"
113-
"${IGC_BUILD__GFX_DEV_SRC_DIR}/skuwa/igt_20_04_hw_wa.c"
114113
"${CMAKE_CURRENT_SOURCE_DIR}/SamplerPerfOptPass.cpp"
115114
${IGC_BUILD__SRC__Compiler_CISACodeGen}
116115
${IGC_BUILD__SRC__Compiler_DebugInfo}

‎IGC/Compiler/CodeGenContext.cpp

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,6 @@ namespace IGC
177177
(stateId < RetryTableSize && RetryTable[stateId].nextState >= RetryTableSize));
178178
}
179179

180-
bool RetryManager::Trigger2xGRFRetry() const
181-
{
182-
return (lastSpillSize > IGC_GET_FLAG_VALUE(CSSpillThreshold2xGRFRetry));
183-
}
184180
unsigned RetryManager::GetRetryId() const
185181
{
186182
return stateId;
@@ -815,15 +811,6 @@ namespace IGC
815811
}
816812
if (getModuleMetaData()->csInfo.forceTotalGRFNum != 0)
817813
{
818-
if ((this->type == ShaderType::RAYTRACING_SHADER ||
819-
this->type == ShaderType::BINDLESS_SHADER) &&
820-
platform.isCoreChildOf(IGFX_XE2_LPG_CORE) &&
821-
getModuleMetaData()->csInfo.forceTotalGRFNum > DEFAULT_TOTAL_GRF_NUM)
822-
{
823-
m_NumGRFPerThread = DEFAULT_TOTAL_GRF_NUM;
824-
return m_NumGRFPerThread;
825-
}
826-
else
827814
{
828815
m_NumGRFPerThread = getModuleMetaData()->csInfo.forceTotalGRFNum;
829816
return m_NumGRFPerThread;

‎IGC/Compiler/CodeGenPublic.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,6 @@ namespace IGC
749749
void SetFirstStateId(int id);
750750
bool IsFirstTry() const;
751751
bool IsLastTry() const;
752-
bool Trigger2xGRFRetry() const;
753752
unsigned GetRetryId() const;
754753
unsigned GetPerFuncRetryStateId(llvm::Function* F) const;
755754

‎IGC/Compiler/Optimizer/OCLBIUtils.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1373,7 +1373,6 @@ CBuiltinsResolver::CBuiltinsResolver(CImagesBI::ParamMap* paramMap, CImagesBI::I
13731373
m_CommandMap["__builtin_IB_hw_thread_id"] = CSimpleIntrinMapping::create(GenISAIntrinsic::GenISA_hw_thread_id, false);
13741374
m_CommandMap["__builtin_IB_slice_id"] = CSimpleIntrinMapping::create(GenISAIntrinsic::GenISA_slice_id, false);
13751375
m_CommandMap["__builtin_IB_subslice_id"] = CSimpleIntrinMapping::create(GenISAIntrinsic::GenISA_subslice_id, false);
1376-
m_CommandMap["__builtin_IB_logical_subslice_id"] = CSimpleIntrinMapping::create(GenISAIntrinsic::GenISA_logical_subslice_id, false);
13771376
m_CommandMap["__builtin_IB_dual_subslice_id"] = CSimpleIntrinMapping::create(GenISAIntrinsic::GenISA_dual_subslice_id, false);
13781377
m_CommandMap["__builtin_IB_eu_id"] = CSimpleIntrinMapping::create(GenISAIntrinsic::GenISA_eu_id, false);
13791378
m_CommandMap["__builtin_IB_get_sr0"] = CSimpleIntrinMapping::create(GenISAIntrinsic::GenISA_getSR0, false);

‎IGC/Compiler/igc_workaround_linux.cpp

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -187,19 +187,6 @@ namespace IGC
187187
}
188188
InitGt_12_70SwWaTable(&waTable, pSkuFeatureTable, &stWaInitParam);
189189
}
190-
case IGFX_XE2_LPG_CORE:
191-
{
192-
switch (GFX_GET_GMD_RELEASE_VERSION_RENDER(platform->getPlatformInfo()))
193-
{
194-
case GFX_GMD_ARCH_20_RELEASE_XE2_LPG:
195-
InitGt_20_04HwWaTable(&waTable, pSkuFeatureTable, &stWaInitParam);
196-
break;
197-
default:
198-
IGC_ASSERT(0);
199-
break;
200-
}
201-
break;
202-
}
203190
break;
204191
default:
205192
// SKUs with no GT IP. So do nothing.

‎IGC/GenISAIntrinsics/Intrinsic_definitions.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1938,11 +1938,6 @@
19381938
[],
19391939
"NoMem"]],
19401940
####################################################################################################
1941-
"GenISA_logical_subslice_id": ["returns the logical SSID defined in the MSG0 'PREDEFINED_MSG0'",
1942-
[("int", "result"),
1943-
[],
1944-
"NoMem"]],
1945-
####################################################################################################
19461941
"GenISA_dual_subslice_id": ["",
19471942
[("int", ""),
19481943
[],

‎IGC/common/igc_flags.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,6 @@ DECLARE_IGC_REGKEY(bool, allowLICM, true, "Enable LICM in I
451451
DECLARE_IGC_REGKEY(DWORD, CSSpillThresholdSLM, 0, "Spill Threshold for CS SIMD16 with SLM", false)
452452
DECLARE_IGC_REGKEY(DWORD, CSSpillThresholdNoSLM, 5, "Spill Threshold for CS SIMD16 without SLM", false)
453453
DECLARE_IGC_REGKEY(DWORD, AllowedSpillRegCount, 0, "Max allowed spill size without recompile", false)
454-
DECLARE_IGC_REGKEY(DWORD, CSSpillThreshold2xGRFRetry, 3500, "Spill Threshold for CS to trigger 2xGRFRetry", false)
455454
DECLARE_IGC_REGKEY(DWORD, LICMStatThreshold, 70, "LICM stat threshold to avoid retry SIMD16 for CS", false)
456455
DECLARE_IGC_REGKEY(bool, EnableTypeDemotion, true, "Enable Type Demotion", false)
457456
DECLARE_IGC_REGKEY(bool, EnablePreRARematFlag, true, "Enable PreRA Rematerialization of Flag", false)

‎inc/common/igfxfmid.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,6 @@ typedef struct GFX_GMD_ID_DEF
150150
#define GFX_GMD_ARCH_12_RELEASE_XE_LP_LG (71)
151151
#define GFX_GMD_ARCH_12_RELEASE_XE_LPG_PLUS_1274 (74)
152152

153-
#define GFX_GMD_ARCH_20_RELEASE_XE2_LPG (4)
154-
155153
#define GFX_GET_GMD_RELEASE_VERSION_RENDER(p) ((p).sRenderBlockID.GmdID.GMDRelease)
156154
#define GFX_GET_GMD_RELEASE_VERSION_DISPLAY(p) ((p).sDisplayBlockID.GmdID.GMDRelease)
157155
#define GFX_GET_GMD_RELEASE_VERSION_MEDIA(p) ((p).sMediaBlockID.GmdID.GMDRelease)

‎skuwa/igt_20_04_hw_wa.c

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎skuwa/igt_20_04_rev_id.h

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎skuwa/wa_def.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -374,10 +374,6 @@ void InitGt_12_70SwWaTable(
374374
PWA_TABLE pWaTable,
375375
PSKU_FEATURE_TABLE pSkuTable,
376376
PWA_INIT_PARAM pWaParam);
377-
void InitGt_20_04HwWaTable(
378-
PWA_TABLE pWaTable,
379-
PSKU_FEATURE_TABLE pSkuTable,
380-
PWA_INIT_PARAM pWaParam);
381377
#ifdef __cplusplus
382378
}
383379
#endif

0 commit comments

Comments
 (0)