Skip to content

Commit 07b71c0

Browse files
Jay-Jiewu-Lugfxbot
Jay-Jiewu-Lu
authored and
gfxbot
committed
Backout of d559301 due to Functional Regression
Change-Id: I7df02ce3c6990f13aec21d1ca033b7aa62426afc
1 parent e060727 commit 07b71c0

File tree

3 files changed

+42
-106
lines changed

3 files changed

+42
-106
lines changed

‎IGC/Compiler/CISACodeGen/CISABuilder.cpp

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -852,28 +852,17 @@ Common_VISA_EMask_Ctrl CEncoder::GetAluEMask(CVariable* dst)
852852
{
853853
e_mask mask = m_encoderState.m_mask;
854854
bool noMask = m_encoderState.m_noMask;
855-
if (dst)
855+
if (dst && dst->GetVarType() == EVARTYPE_ADDRESS)
856856
{
857-
if (m_encoderState.m_SubSpanDestination)
857+
if (dst->IsVectorUniform() && dst->IsUniform())
858858
{
859859
noMask = true;
860860
}
861-
else
862-
{
863-
if (dst->GetVarType() == EVARTYPE_ADDRESS)
864-
{
865-
if (dst->IsVectorUniform() && dst->IsUniform())
866-
{
867-
noMask = true;
868-
}
869-
}
870-
else if (dst->IsUniform())
871-
{
872-
noMask = true;
873-
}
874-
}
875-
}
876-
861+
}
862+
else if (dst && (dst->IsUniform() || m_encoderState.m_SubSpanDestination))
863+
{
864+
noMask = true;
865+
}
877866
return ConvertMaskToVisaType(mask, noMask);
878867
}
879868

‎IGC/Compiler/CustomSafeOptPass.cpp

Lines changed: 32 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1918,8 +1918,6 @@ namespace {
19181918
AU.setPreservesCFG();
19191919
AU.addRequired<CodeGenContextWrapper>();
19201920
}
1921-
private:
1922-
bool isICBOffseted(llvm::LoadInst* inst, uint offset);
19231921
};
19241922

19251923
} // namespace
@@ -1951,78 +1949,47 @@ bool IGCIndirectICBPropagaion::runOnFunction(Function &F)
19511949
bool directBuf;
19521950
unsigned bufId;
19531951
BufferType bufType = IGC::DecodeAS4GFXResource(as, directBuf, bufId);
1954-
bool bICBNoOffset =
1955-
(IGC::INVALID_CONSTANT_BUFFER_INVALID_ADDR == modMD->pushInfo.inlineConstantBufferOffset && bufType == CONSTANT_BUFFER && directBuf && bufId == modMD->pushInfo.inlineConstantBufferSlot);
1956-
bool bICBOffseted =
1957-
(IGC::INVALID_CONSTANT_BUFFER_INVALID_ADDR != modMD->pushInfo.inlineConstantBufferOffset && ADDRESS_SPACE_CONSTANT == as && isICBOffseted(inst, modMD->pushInfo.inlineConstantBufferOffset));
1958-
if (bICBNoOffset || bICBOffseted)
1952+
if (bufType == CONSTANT_BUFFER && directBuf && bufId == modMD->pushInfo.inlineConstantBufferSlot)
19591953
{
19601954
Value *ptrVal = inst->getPointerOperand();
1961-
Value *eltPtr = nullptr;
1962-
Value *eltIdx = nullptr;
1963-
if (IntToPtrInst *i2p = dyn_cast<IntToPtrInst>(ptrVal))
1955+
ConstantExpr *ptrExpr = dyn_cast<ConstantExpr>(ptrVal);
1956+
IntToPtrInst *i2p = dyn_cast<IntToPtrInst>(ptrVal);
1957+
if (ptrExpr == nullptr && i2p)
19641958
{
1965-
eltPtr = i2p->getOperand(0);
1966-
}
1967-
else if (GetElementPtrInst *gep = dyn_cast<GetElementPtrInst>(ptrVal))
1968-
{
1969-
if (gep->getNumOperands() != 3)
1970-
{
1971-
continue;
1972-
}
1973-
1974-
Type* eleType = gep->getPointerOperandType()->getPointerElementType();
1975-
if (!eleType->isArrayTy() ||
1976-
!(eleType->getArrayElementType()->isFloatTy() || eleType->getArrayElementType()->isIntegerTy(32)))
1977-
{
1978-
continue;
1979-
}
1980-
1981-
eltIdx = gep->getOperand(2);
1982-
}
1983-
else
1984-
{
1985-
continue;
1986-
}
1987-
1988-
m_builder.SetInsertPoint(inst);
1989-
1990-
unsigned int size_in_bytes = inst->getType()->getPrimitiveSizeInBits() / 8;
1991-
if (size_in_bytes)
1992-
{
1993-
Value* ICBbuffer = UndefValue::get(VectorType::get(inst->getType(), maxImmConstantSizePushed / size_in_bytes));
1994-
if (inst->getType()->isFloatTy())
1995-
{
1996-
float returnConstant = 0;
1997-
for (unsigned int i = 0; i < maxImmConstantSizePushed; i += size_in_bytes)
1998-
{
1999-
memcpy_s(&returnConstant, size_in_bytes, offset + i, size_in_bytes);
2000-
Value *fp = ConstantFP::get(inst->getType(), returnConstant);
2001-
ICBbuffer = m_builder.CreateInsertElement(ICBbuffer, fp, m_builder.getInt32(i / size_in_bytes));
2002-
}
1959+
m_builder.SetInsertPoint(inst);
20031960

2004-
if (eltPtr)
2005-
{
2006-
eltIdx = m_builder.CreateLShr(eltPtr, m_builder.getInt32(2));
2007-
}
2008-
Value *ICBvalue = m_builder.CreateExtractElement(ICBbuffer, eltIdx);
2009-
inst->replaceAllUsesWith(ICBvalue);
2010-
}
2011-
else if (inst->getType()->isIntegerTy(32))
1961+
unsigned int size_in_bytes = inst->getType()->getPrimitiveSizeInBits() / 8;
1962+
if (size_in_bytes)
20121963
{
2013-
int returnConstant = 0;
2014-
for (unsigned int i = 0; i < maxImmConstantSizePushed; i += size_in_bytes)
1964+
Value* ICBbuffer = UndefValue::get(VectorType::get(inst->getType(), maxImmConstantSizePushed / size_in_bytes));
1965+
if (inst->getType()->isFloatingPointTy())
20151966
{
2016-
memcpy_s(&returnConstant, size_in_bytes, offset + i, size_in_bytes);
2017-
Value *fp = ConstantInt::get(inst->getType(), returnConstant);
2018-
ICBbuffer = m_builder.CreateInsertElement(ICBbuffer, fp, m_builder.getInt32(i / size_in_bytes));
1967+
float returnConstant = 0;
1968+
for (unsigned int i = 0; i < maxImmConstantSizePushed; i += size_in_bytes)
1969+
{
1970+
memcpy_s(&returnConstant, size_in_bytes, offset + i, size_in_bytes);
1971+
Value *fp = ConstantFP::get(inst->getType(), returnConstant);
1972+
ICBbuffer = m_builder.CreateInsertElement(ICBbuffer, fp, m_builder.getInt32(i / size_in_bytes));
1973+
}
1974+
Value *eltIdxVal = i2p->getOperand(0);
1975+
Value *div = m_builder.CreateLShr(eltIdxVal, m_builder.getInt32(2));
1976+
Value *ICBvalue = m_builder.CreateExtractElement(ICBbuffer, div);
1977+
inst->replaceAllUsesWith(ICBvalue);
20191978
}
2020-
if (eltPtr)
1979+
else if (inst->getType()->isIntegerTy())
20211980
{
2022-
eltIdx = m_builder.CreateLShr(eltPtr, m_builder.getInt32(2));
1981+
int returnConstant = 0;
1982+
for (unsigned int i = 0; i < maxImmConstantSizePushed; i += size_in_bytes)
1983+
{
1984+
memcpy_s(&returnConstant, size_in_bytes, offset + i, size_in_bytes);
1985+
Value *fp = ConstantInt::get(inst->getType(), returnConstant);
1986+
ICBbuffer = m_builder.CreateInsertElement(ICBbuffer, fp, m_builder.getInt32(i / size_in_bytes));
1987+
}
1988+
Value *eltIdxVal = i2p->getOperand(0);
1989+
Value *div = m_builder.CreateLShr(eltIdxVal, m_builder.getInt32(2));
1990+
Value *ICBvalue = m_builder.CreateExtractElement(ICBbuffer, div);
1991+
inst->replaceAllUsesWith(ICBvalue);
20231992
}
2024-
Value *ICBvalue = m_builder.CreateExtractElement(ICBbuffer, eltIdx);
2025-
inst->replaceAllUsesWith(ICBvalue);
20261993
}
20271994
}
20281995
}
@@ -2034,24 +2001,6 @@ bool IGCIndirectICBPropagaion::runOnFunction(Function &F)
20342001
return false;
20352002
}
20362003

2037-
bool IGCIndirectICBPropagaion::isICBOffseted(llvm::LoadInst* inst, uint offset) {
2038-
Value *ptrVal = inst->getPointerOperand();
2039-
std::vector<Value*> srcInstList;
2040-
IGC::TracePointerSource(ptrVal, false, true, srcInstList);
2041-
if (srcInstList.size())
2042-
{
2043-
CallInst* inst = dyn_cast<CallInst>(srcInstList.back());
2044-
GenIntrinsicInst* genIntr = inst ? dyn_cast<GenIntrinsicInst>(inst) : nullptr;
2045-
if (!genIntr || (genIntr->getIntrinsicID() != GenISAIntrinsic::GenISA_RuntimeValue))
2046-
return false;
2047-
2048-
llvm::ConstantInt* ci = dyn_cast<llvm::ConstantInt>(inst->getOperand(0));
2049-
return ci && (uint)ci->getZExtValue() == offset;
2050-
}
2051-
2052-
return false;
2053-
}
2054-
20552004
IGC_INITIALIZE_PASS_BEGIN(IGCIndirectICBPropagaion, "IGCIndirectICBPropagaion",
20562005
"IGCIndirectICBPropagaion", false, false)
20572006
IGC_INITIALIZE_PASS_END(IGCIndirectICBPropagaion, "IGCIndirectICBPropagaion",

‎IGC/common/MDFrameWork.h

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@ const unsigned int NUM_SHADER_RESOURCE_VIEW_SIZE = (INPUT_RESOURCE_SLOT_COUNT +
1818

1919
const unsigned int g_c_maxNumberOfBufferPushed = 4;
2020

21+
2122
namespace IGC
2223
{
23-
const unsigned int INVALID_CONSTANT_BUFFER_INVALID_ADDR = 0xFFFFFFFF;
24-
2524
enum FunctionTypeMD
2625
{
2726
UnknownFunction,
@@ -158,15 +157,14 @@ namespace IGC
158157
bool isStatic = false;
159158
};
160159

161-
// simplePushInfoArr needs to be initialized to a vector of size g_c_maxNumberOfBufferPushed, which we are doing in module MD initialization done in code gen context
160+
// simplePushInfoArr needs to be initialized to a vector of size g_c_maxNumberOfBufferPushed, which we are doing in module MD initialization done in code gen context
162161
// All the pushinfo below is mapping to an argument number (int) so that we can retrieve relevant Argument as a value pointer from Function
163162
struct PushInfo
164163
{
165164
std::vector<StatelessPushInfo> pushableAddresses;
166165
unsigned int MaxNumberOfPushedBuffers = 0; ///> specifies the maximum number of buffers available for the simple push mechanism for current shader.
167166

168-
unsigned int inlineConstantBufferSlot = INVALID_CONSTANT_BUFFER_INVALID_ADDR; // slot of the inlined constant buffer
169-
unsigned int inlineConstantBufferOffset = INVALID_CONSTANT_BUFFER_INVALID_ADDR; // offset of the inlined constant buffer
167+
unsigned int inlineConstantBufferSlot = 0xFFFFFFFF; // slot of the inlined constant buffer
170168

171169
std::map<ConstantAddress, int> constants;
172170
std::map<unsigned int, SInputDesc> inputs;

0 commit comments

Comments
 (0)