[Autobackout][FuncReg]Revert of change: efc6f8e

 Adding earlyZ test

Adding earlyZ test

Author: mkhoshza

IGC/Compiler/CustomSafeOptPass.cpp

@@ -114,8 +114,6 @@ STATISTIC(Stat_DiscardRemoved, "Number of insts removed in Discard Opt");
 
 bool CustomSafeOptPass::runOnFunction(Function& F)
 {
-    pContext = getAnalysis<CodeGenContextWrapper>().getCodeGenContext();
-    m_modMD = getAnalysis<MetaDataUtilsWrapper>().getModuleMetaData();
     psHasSideEffect = getAnalysis<CodeGenContextWrapper>().getCodeGenContext()->m_instrTypes.psHasSideEffect;
     visit(F);
     return true;
@@ -729,58 +727,12 @@ void CustomSafeOptPass::visitCallInst(CallInst& C)
             visitLdRawVec(inst);
             break;
         }
-        case GenISAIntrinsic::GenISA_OUTPUT:
-        {
-            earlyZDepthDetection(C);
-            break;
-        }
         default:
             break;
         }
     }
 }
 
-void IGC::CustomSafeOptPass::earlyZDepthDetection(llvm::CallInst& C)
-{
-    if (pContext->type == ShaderType::PIXEL_SHADER)
-    {
-        uint outputType = (uint)cast<ConstantInt>((&C)->getOperand(4))->getZExtValue();
-        if (outputType == SHADER_OUTPUT_TYPE_DEPTHOUT)
-        {
-            uint depthMask = (uint)cast<ConstantInt>((&C)->getOperand(5))->getZExtValue();
-            if (depthMask == 0)
-            {
-                if (CallInst* minInst = dyn_cast<CallInst>((&C)->getOperand(0)))
-                {
-                    if (GetOpCode(minInst) == llvm_min || GetOpCode(minInst) == llvm_max)
-                    {
-                        if (Instruction* divInst = dyn_cast<Instruction>(minInst->getOperand(0)))
-                        {
-                            if (divInst->getOpcode() == Instruction::FDiv)
-                            {
-                                if (Instruction* mulInst = dyn_cast<Instruction>(divInst->getOperand(0)))
-                                {
-                                    if (mulInst->getOpcode() == Instruction::FMul)
-                                    {
-                                        if (mulInst->getOperand(1) == divInst->getOperand(1))
-                                        {
-                                            (&C)->eraseFromParent();
-                                            IGC::PixelShaderContext* psContext = static_cast<IGC::PixelShaderContext*>(pContext);
-                                            psContext->programOutput.outputDepth = false;
-                                            m_modMD->psInfo.outputDepth = false;
-                                            return;
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
 //
 // pattern match packing of two half float from f32tof16:
 //

IGC/Compiler/CustomSafeOptPass.hpp

@@ -41,7 +41,6 @@ namespace IGC
         virtual void getAnalysisUsage(llvm::AnalysisUsage& AU) const override
         {
             AU.addRequired<CodeGenContextWrapper>();
-            AU.addRequired<MetaDataUtilsWrapper>();
             AU.setPreservesCFG();
         }
 
@@ -56,7 +55,6 @@ namespace IGC
         void visitUDiv(llvm::BinaryOperator& I);
         void visitAllocaInst(llvm::AllocaInst& I);
         void visitCallInst(llvm::CallInst& C);
-        void earlyZDepthDetection(llvm::CallInst& C);
         void removeHftoFCast(llvm::Instruction& I);
         void visitBinaryOperator(llvm::BinaryOperator& I);
         bool isEmulatedAdd(llvm::BinaryOperator& I);
@@ -99,8 +97,7 @@ namespace IGC
         template <typename MaskType> void matchReverse(llvm::BinaryOperator& I);
     private:
         bool psHasSideEffect;
-        CodeGenContext* pContext = nullptr;
-        IGC::ModuleMetaData* m_modMD = nullptr;
+
         bool lower64bto32b(llvm::BinaryOperator& AndInst);
         llvm::Value* analyzeTreeForTrunc64bto32b(const llvm::Use& OperandUse, llvm::SmallVector<llvm::BinaryOperator*, 8>& OpsToDelete);
     };