Skip to content

Commit 8479e81

Browse files
fftzengigcbot
authored andcommitted
Backout for ROV perf change
1 parent 72aec76 commit 8479e81

File tree

5 files changed

+4
-38
lines changed

5 files changed

+4
-38
lines changed

IGC/Compiler/CISACodeGen/EmitVISAPass.cpp

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -9451,34 +9451,6 @@ void EmitPass::emitUAVSerialize()
94519451
m_encoder->Push();
94529452
}
94539453

9454-
bool EmitPass::useRasterizerOrderedByteAddressBuffer(GenIntrinsicInst* inst)
9455-
{
9456-
bool isRov = false;
9457-
std::vector<uint32_t> ROV_RV = m_currShader->m_ModuleMetadata->RasterizerOrderedByteAddressBuffer;
9458-
9459-
unsigned calleeArgNo = 0;
9460-
PushInfo& pushInfo = m_currShader->m_ModuleMetadata->pushInfo;
9461-
9462-
Value* src = IGC::TracePointerSource(inst->getOperand(0));
9463-
if (Argument * calleeArg = dyn_cast<Argument>(src))
9464-
{
9465-
calleeArgNo = calleeArg->getArgNo();
9466-
for (auto index_it = pushInfo.constantReg.begin(); index_it != pushInfo.constantReg.end(); ++index_it)
9467-
{
9468-
if (index_it->second == calleeArgNo)
9469-
{
9470-
if (std::find(ROV_RV.begin(), ROV_RV.end(), index_it->first) != ROV_RV.end())
9471-
{
9472-
isRov = true;
9473-
break;
9474-
}
9475-
}
9476-
}
9477-
}
9478-
return isRov;
9479-
}
9480-
9481-
94829454
void EmitPass::emitLoadRawIndexed(GenIntrinsicInst* inst)
94839455
{
94849456
Value* buf_ptrv = inst->getOperand(0);

IGC/Compiler/CISACodeGen/EmitVISAPass.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,6 @@ class EmitPass : public llvm::FunctionPass
179179
// set the predicate with current active channels
180180
void emitPredicateFromChannelIP(CVariable* dst, CVariable* alias = NULL);
181181

182-
// check if this load/store is accessing RasterizerOrderedByteAddressBuffer
183-
bool useRasterizerOrderedByteAddressBuffer(llvm::GenIntrinsicInst* inst);
184-
185182
// Helper methods for message emit functions.
186183
template <typename T>
187184
void prepareRenderTargetWritePayload(

IGC/Compiler/CISACodeGen/PixelShaderLowering.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -272,9 +272,7 @@ bool PixelShaderLowering::runOnFunction(llvm::Function& F)
272272
{
273273
// Emitting a fence to ensure that the uav write is completed before an EOT is issued
274274
IRBuilder<> builder(F.getContext());
275-
276-
bool fenceFlushNone = 0;
277-
EmitMemoryFence(builder, fenceFlushNone);
275+
EmitMemoryFence(builder);
278276
}
279277

280278
// EmitRender target write intrinsic
@@ -503,7 +501,7 @@ void PixelShaderLowering::FindIntrinsicOutput(
503501
}
504502
}
505503

506-
void PixelShaderLowering::EmitMemoryFence(IRBuilder<>& builder, bool forceFlushNone)
504+
void PixelShaderLowering::EmitMemoryFence(IRBuilder<>& builder)
507505
{
508506
Value* trueValue = builder.getInt1(true);
509507
Value* falseValue = builder.getInt1(false);
@@ -519,7 +517,7 @@ void PixelShaderLowering::EmitMemoryFence(IRBuilder<>& builder, bool forceFlushN
519517
falseValue,
520518
};
521519

522-
CallInst* temp = GenIntrinsicInst::Create(GenISAIntrinsic::getDeclaration(m_module, GenISAIntrinsic::GenISA_memoryfence),
520+
GenIntrinsicInst::Create(GenISAIntrinsic::getDeclaration(m_module, GenISAIntrinsic::GenISA_memoryfence),
523521
arguments,
524522
"",
525523
m_ReturnBlock->getTerminator());

IGC/Compiler/CISACodeGen/PixelShaderLowering.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class PixelShaderLowering : public llvm::FunctionPass
113113
llvm::Value*& mask, llvm::Value*& src0Alpha,
114114
DebugLocArray& debugLocs);
115115

116-
void EmitMemoryFence(llvm::IRBuilder<>& builder, bool forceFlushNone = 0);
116+
void EmitMemoryFence(llvm::IRBuilder<>& builder);
117117
void EmitRTWrite(ColorOutputArray& color, llvm::Value* depth,
118118
llvm::Value* stencil, llvm::Value* mask,
119119
llvm::Value* src0Alpha, DebugLocArray& debugLocs);

IGC/common/MDFrameWork.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,6 @@ namespace IGC
449449
std::vector<InlineProgramScopeBuffer> inlineGlobalBuffers;
450450
std::vector<PointerProgramBinaryInfo> GlobalPointerProgramBinaryInfos;
451451
std::vector<PointerProgramBinaryInfo> ConstantPointerProgramBinaryInfos;
452-
std::vector<uint32_t> RasterizerOrderedByteAddressBuffer;
453452
unsigned int MinNOSPushConstantSize = 0;
454453
std::map<llvm::GlobalVariable*, int> inlineProgramScopeOffsets;
455454
ShaderData shaderData;

0 commit comments

Comments
 (0)