removed deprecated define

aparshin-intel · igcbot · commit 8886ad28abf7 · 2021-08-20T14:51:53.000+02:00
diff --git a/IGC/AdaptorCommon/AddImplicitArgs.cpp b/IGC/AdaptorCommon/AddImplicitArgs.cpp
@@ -216,9 +216,9 @@ void AddImplicitArgs::updateNewFuncArgs(llvm::Function* pFunc, llvm::Function* p
     // the new arguments, also transferring over the names as well.
     std::vector<std::pair<llvm::Instruction*, unsigned int>> newAddr;
     bool fullDebugInfo = false;
-    IF_DEBUG_INFO(bool lineNumbersOnly = false;)
-    IF_DEBUG_INFO(CodeGenContext* ctx = getAnalysis<CodeGenContextWrapper>().getCodeGenContext();)
-    IF_DEBUG_INFO(DebugMetadataInfo::hasAnyDebugInfo(ctx, fullDebugInfo, lineNumbersOnly);)
+    bool lineNumbersOnly = false;
+    CodeGenContext* ctx = getAnalysis<CodeGenContextWrapper>().getCodeGenContext();
+    DebugMetadataInfo::hasAnyDebugInfo(ctx, fullDebugInfo, lineNumbersOnly);
 
     if (fullDebugInfo)
     {
@@ -271,16 +271,16 @@ void AddImplicitArgs::updateNewFuncArgs(llvm::Function* pFunc, llvm::Function* p
     // storage location for the variable.
     for (auto toReplace : newAddr)
     {
-        IF_DEBUG_INFO(auto d = dyn_cast<DbgDeclareInst>(toReplace.first);)
+        auto d = dyn_cast<DbgDeclareInst>(toReplace.first);
 
-        IF_DEBUG_INFO(llvm::DIBuilder Builder(*pNewFunc->getParent()));
-        IF_DEBUG_INFO(auto DIVar = d->getVariable();)
-        IF_DEBUG_INFO(auto DIExpr = d->getExpression();)
+        llvm::DIBuilder Builder(*pNewFunc->getParent());
+        auto DIVar = d->getVariable();
+        auto DIExpr = d->getExpression();
 
         IGC_ASSERT(toReplace.second < pNewFunc->arg_size());
-        IF_DEBUG_INFO(Value* v = pNewFunc->arg_begin() + toReplace.second);
-        IF_DEBUG_INFO(Builder.insertDeclare(v, DIVar, DIExpr, d->getDebugLoc().get(), d);)
-        IF_DEBUG_INFO(d->eraseFromParent();)
+        Value* v = pNewFunc->arg_begin() + toReplace.second;
+        Builder.insertDeclare(v, DIVar, DIExpr, d->getDebugLoc().get(), d);
+        d->eraseFromParent();
     }
 
     // Set implicit argument names
diff --git a/IGC/AdaptorOCL/UnifyIROCL.cpp b/IGC/AdaptorOCL/UnifyIROCL.cpp
@@ -317,7 +317,7 @@ static void CommonOCLBasedPasses(
 
     if(pContext->m_InternalOptions.KernelDebugEnable)
     {
-        IF_DEBUG_INFO(mpm.add(new ImplicitGlobalId());)
+        mpm.add(new ImplicitGlobalId());
     }
 
     if (IGC_IS_FLAG_ENABLED(EnableCodeAssumption))
@@ -540,7 +540,7 @@ static void CommonOCLBasedPasses(
     // this function here, as opposed to beginning of this function,
     // is that unreferenced constants will be eliminated. So
     // debugger will not be able to query those variables.
-    IF_DEBUG_INFO(insertOCLMissingDebugConstMetadata(pContext);)
+    insertOCLMissingDebugConstMetadata(pContext);
 
     COMPILER_TIME_END(pContext, TIME_UnificationPasses);
 
diff --git a/IGC/Compiler/CISACodeGen/DebugInfo.cpp b/IGC/Compiler/CISACodeGen/DebugInfo.cpp
@@ -277,9 +277,10 @@ bool DebugInfoPass::runOnModule(llvm::Module& M)
 void DebugInfoPass::EmitDebugInfo(bool finalize, DbgDecoder* decodedDbg,
                                   const std::vector<llvm::DISubprogram*>& DISubprogramNodes)
 {
-    std::vector<char> buffer;
+    IGC_ASSERT(m_pDebugEmitter);
 
-    IF_DEBUG_INFO_IF(m_pDebugEmitter, buffer = m_pDebugEmitter->Finalize(finalize, decodedDbg, DISubprogramNodes);)
+    std::vector<char> buffer =
+        m_pDebugEmitter->Finalize(finalize, decodedDbg, DISubprogramNodes);
 
     if (!buffer.empty())
     {
diff --git a/IGC/Compiler/CISACodeGen/EmitVISAPass.cpp b/IGC/Compiler/CISACodeGen/EmitVISAPass.cpp
@@ -824,8 +824,8 @@ bool EmitPass::runOnFunction(llvm::Function& F)
         DebugOpts.EnableRelocation = IGC_IS_FLAG_ENABLED(EnableRelocations) || DebugOpts.ZeBinCompatible;
         DebugOpts.EnforceAMD64Machine = IGC_IS_FLAG_ENABLED(DebugInfoEnforceAmd64EM) || DebugOpts.ZeBinCompatible;
         DebugOpts.EmitPrologueEnd = IGC_IS_FLAG_ENABLED(EmitPrologueEnd);
-        IF_DEBUG_INFO(m_pDebugEmitter = IDebugEmitter::Create();)
-        IF_DEBUG_INFO(m_pDebugEmitter->Initialize(std::move(vMod), DebugOpts);)
+        m_pDebugEmitter = IDebugEmitter::Create();
+        m_pDebugEmitter->Initialize(std::move(vMod), DebugOpts);
     }
 
     if (DebugInfoData::hasDebugInfo(m_currShader))
@@ -1098,7 +1098,7 @@ bool EmitPass::runOnFunction(llvm::Function& F)
     {
         if (!m_currShader->GetDebugInfoData().m_pDebugEmitter)
         {
-            IF_DEBUG_INFO(IDebugEmitter::Release(m_pDebugEmitter);)
+            IDebugEmitter::Release(m_pDebugEmitter);
         }
 
         if (!m_encoder->IsCodePatchCandidate() || m_encoder->HasPrevKernel())
@@ -8329,7 +8329,7 @@ void EmitPass::emitPSSGV(GenIntrinsicInst* inst)
         {
             CVariable* r1 = m_currShader->BitCast(psProgram->GetR1(), ISA_TYPE_UW);
             temp = m_currShader->GetNewVariable(8, ISA_TYPE_UW, EALIGN_GRF,
-                std::string(IF_DEBUG_INFO("SampleIndexExtracted")));
+                                                "SampleIndexExtracted");
             m_encoder->SetSrcRegion(0, 0, 1, 0);
             m_encoder->SetSimdSize(SIMDMode::SIMD8);
             m_encoder->SetNoMask();
diff --git a/IGC/Compiler/CISACodeGen/ShaderCodeGen.cpp b/IGC/Compiler/CISACodeGen/ShaderCodeGen.cpp
@@ -1502,7 +1502,7 @@ void OptimizeIR(CodeGenContext* const pContext)
         if (((OpenCLProgramContext*)pContext)->m_InternalOptions.KernelDebugEnable)
         {
             IGCPassManager mpm(pContext, "CleanImplicitId");
-            IF_DEBUG_INFO(mpm.add(new CleanImplicitIds()));
+            mpm.add(new CleanImplicitIds());
             mpm.run(*pContext->getModule());
         }
     }
diff --git a/IGC/Compiler/Optimizer/OpenCLPasses/LocalBuffers/InlineLocalsResolution.cpp b/IGC/Compiler/Optimizer/OpenCLPasses/LocalBuffers/InlineLocalsResolution.cpp
@@ -449,14 +449,14 @@ void InlineLocalsResolution::collectInfoOnSharedLocalMem(Module& M)
     }
 
     // set debugging info, and insert mov inst.
-    IF_DEBUG_INFO(for (const auto& I : m_FuncToVarsMap))
+    for (const auto& I : m_FuncToVarsMap)
     {
-        IF_DEBUG_INFO(Function * userFunc = I.first;)
-            IF_DEBUG_INFO(for (auto G : I.second))
+        Function* userFunc = I.first;
+        for (auto* G : I.second)
         {
-            IF_DEBUG_INFO(Instruction * pInsertBefore = &(*userFunc->begin()->getFirstInsertionPt());)
-                TODO("Should inline local buffer points to origin offset 'globalVar' or to fixed offset 'pMovedPtr'?");
-            IF_DEBUG_INFO(Utils::UpdateGlobalVarDebugInfo(G, G, pInsertBefore, true););
+            Instruction * pInsertBefore = &(*userFunc->begin()->getFirstInsertionPt());
+            TODO("Should inline local buffer points to origin offset 'globalVar' or to fixed offset 'pMovedPtr'?");
+            Utils::UpdateGlobalVarDebugInfo(G, G, pInsertBefore, true);
         }
     }
 }
diff --git a/IGC/Compiler/Optimizer/OpenCLPasses/PrivateMemory/PrivateMemoryResolution.cpp b/IGC/Compiler/Optimizer/OpenCLPasses/PrivateMemory/PrivateMemoryResolution.cpp
@@ -842,8 +842,8 @@ bool PrivateMemoryResolution::resolveAllocaInstructions(bool privateOnStack)
     ImplicitArgs implicitArgs(*m_currFunction, m_pMdUtils);
 
     // Construct an empty DebugLoc.
-    IF_DEBUG_INFO(DebugLoc entryDebugLoc);
-    IF_DEBUG_INFO(entryBuilder.SetCurrentDebugLocation(entryDebugLoc));
+    DebugLoc entryDebugLoc;
+    entryBuilder.SetCurrentDebugLocation(entryDebugLoc);
 
     if (privateOnStack)
     {
@@ -855,7 +855,7 @@ bool PrivateMemoryResolution::resolveAllocaInstructions(bool privateOnStack)
         {
             bool isUniform = pAI->getMetadata("uniform") != nullptr;
             llvm::IRBuilder<> builder(pAI);
-            IF_DEBUG_INFO(builder.SetCurrentDebugLocation(entryDebugLoc));
+            builder.SetCurrentDebugLocation(entryDebugLoc);
 
             // buffer of this private var
             Value* privateBuffer = nullptr;
@@ -988,7 +988,7 @@ bool PrivateMemoryResolution::resolveAllocaInstructions(bool privateOnStack)
             // correctly. So instead, we set DebugLoc for the instructions generated by lowering
             // alloca to mark that they are part of the prologue.
             // Note: As per Amjad, later LLVM version has a fix for this in llvm/lib/Transforms/Utils/InlineFunction.cpp.
-            IF_DEBUG_INFO(builder.SetCurrentDebugLocation(pAI->getDebugLoc()));
+            builder.SetCurrentDebugLocation(pAI->getDebugLoc());
 
             // Get buffer information from the analysis
             unsigned int scalarBufferOffset = m_ModAllocaInfo->getConstBufferOffset(pAI);
@@ -1120,7 +1120,7 @@ bool PrivateMemoryResolution::resolveAllocaInstructions(bool privateOnStack)
         // %privateBuffer               = bitcast i8* %offsettmp1 to <buffer type>
 
         llvm::IRBuilder<> builder(pAI);
-        IF_DEBUG_INFO(builder.SetCurrentDebugLocation(entryDebugLoc));
+        builder.SetCurrentDebugLocation(entryDebugLoc);
         bool isUniform = pAI->getMetadata("uniform") != nullptr;
         // Get buffer information from the analysis
         unsigned int scalarBufferOffset = m_ModAllocaInfo->getConstBufferOffset(pAI);
diff --git a/IGC/Compiler/Optimizer/OpenCLPasses/PrivateMemory/PrivateMemoryToSLM.cpp b/IGC/Compiler/Optimizer/OpenCLPasses/PrivateMemory/PrivateMemoryToSLM.cpp
@@ -217,7 +217,7 @@ namespace IGC
 
             // This declaration will invoke constructor of DebugLoc class
             // and result in an empty DebugLoc instance, ie with line and scope set to 0.
-            IF_DEBUG_INFO(DebugLoc emptyDebugLoc);
+            DebugLoc emptyDebugLoc;
 
             LLVMContext& llvmCtx = F->getContext();
             IntegerType* typeInt32 = Type::getInt32Ty(llvmCtx);
@@ -292,7 +292,7 @@ namespace IGC
                     // TODO: optimize on x-y-z values
                     llvm::IRBuilder<> builder(pAI);
 
-                    IF_DEBUG_INFO(builder.SetCurrentDebugLocation(emptyDebugLoc));
+                    builder.SetCurrentDebugLocation(emptyDebugLoc);
 
                     // totalOffset = localIdX +
                     //               localIdY * dimX +
diff --git a/IGC/Compiler/Optimizer/ValueTracker.cpp b/IGC/Compiler/Optimizer/ValueTracker.cpp
@@ -182,9 +182,9 @@ Value* ValueTracker::handleGlobalVariable(GlobalVariable* G)
     Constant* pSamplerVal = G->getInitializer();
     // Add debug info intrinsic for this variable inside the function using this sampler.
     Instruction* pEntryPoint = &(*m_Function->getEntryBlock().getFirstInsertionPt());
-    IF_DEBUG_INFO(Utils::UpdateGlobalVarDebugInfo(G, pSamplerVal, pEntryPoint, false);)
-        // Found a global sampler, return it.
-        return isa<ConstantStruct>(pSamplerVal) ?
+    Utils::UpdateGlobalVarDebugInfo(G, pSamplerVal, pEntryPoint, false);
+    // Found a global sampler, return it.
+    return isa<ConstantStruct>(pSamplerVal) ?
         pSamplerVal->getAggregateElement(0U) : pSamplerVal;
 }
 
diff --git a/IGC/common/debug/Debug.hpp b/IGC/common/debug/Debug.hpp
@@ -50,5 +50,4 @@ namespace IGC
     int getPointerSize(llvm::Module &M);
 }
 
-#define IF_DEBUG_INFO(X) X
 #define IF_DEBUG_INFO_IF(C, X) if (C) { X }

Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ static void CommonOCLBasedPasses(`
`317`	`317`
`318`	`318`	`if(pContext->m_InternalOptions.KernelDebugEnable)`
`319`	`319`	`{`
`320`		`- IF_DEBUG_INFO(mpm.add(new ImplicitGlobalId());)`
	`320`	`+ mpm.add(new ImplicitGlobalId());`
`321`	`321`	`}`
`322`	`322`
`323`	`323`	`if (IGC_IS_FLAG_ENABLED(EnableCodeAssumption))`
`@@ -540,7 +540,7 @@ static void CommonOCLBasedPasses(`
`540`	`540`	`// this function here, as opposed to beginning of this function,`
`541`	`541`	`// is that unreferenced constants will be eliminated. So`
`542`	`542`	`// debugger will not be able to query those variables.`
`543`		`- IF_DEBUG_INFO(insertOCLMissingDebugConstMetadata(pContext);)`
	`543`	`+ insertOCLMissingDebugConstMetadata(pContext);`
`544`	`544`
`545`	`545`	`COMPILER_TIME_END(pContext, TIME_UnificationPasses);`
`546`	`546`
Original file line number	Diff line number	Diff line change
`@@ -277,9 +277,10 @@ bool DebugInfoPass::runOnModule(llvm::Module& M)`
`277`	`277`	`void DebugInfoPass::EmitDebugInfo(bool finalize, DbgDecoder* decodedDbg,`
`278`	`278`	`const std::vector<llvm::DISubprogram*>& DISubprogramNodes)`
`279`	`279`	`{`
`280`		`- std::vector<char> buffer;`
	`280`	`+ IGC_ASSERT(m_pDebugEmitter);`
`281`	`281`
`282`		`- IF_DEBUG_INFO_IF(m_pDebugEmitter, buffer = m_pDebugEmitter->Finalize(finalize, decodedDbg, DISubprogramNodes);)`
	`282`	`+ std::vector<char> buffer =`
	`283`	`+ m_pDebugEmitter->Finalize(finalize, decodedDbg, DISubprogramNodes);`
`283`	`284`
`284`	`285`	`if (!buffer.empty())`
`285`	`286`	`{`
Original file line number	Diff line number	Diff line change
`@@ -824,8 +824,8 @@ bool EmitPass::runOnFunction(llvm::Function& F)`
`824`	`824`	`DebugOpts.EnableRelocation = IGC_IS_FLAG_ENABLED(EnableRelocations) \|\| DebugOpts.ZeBinCompatible;`
`825`	`825`	`DebugOpts.EnforceAMD64Machine = IGC_IS_FLAG_ENABLED(DebugInfoEnforceAmd64EM) \|\| DebugOpts.ZeBinCompatible;`
`826`	`826`	`DebugOpts.EmitPrologueEnd = IGC_IS_FLAG_ENABLED(EmitPrologueEnd);`
`827`		`- IF_DEBUG_INFO(m_pDebugEmitter = IDebugEmitter::Create();)`
`828`		`- IF_DEBUG_INFO(m_pDebugEmitter->Initialize(std::move(vMod), DebugOpts);)`
	`827`	`+ m_pDebugEmitter = IDebugEmitter::Create();`
	`828`	`+ m_pDebugEmitter->Initialize(std::move(vMod), DebugOpts);`
`829`	`829`	`}`
`830`	`830`
`831`	`831`	`if (DebugInfoData::hasDebugInfo(m_currShader))`
`@@ -1098,7 +1098,7 @@ bool EmitPass::runOnFunction(llvm::Function& F)`
`1098`	`1098`	`{`
`1099`	`1099`	`if (!m_currShader->GetDebugInfoData().m_pDebugEmitter)`
`1100`	`1100`	`{`
`1101`		`- IF_DEBUG_INFO(IDebugEmitter::Release(m_pDebugEmitter);)`
	`1101`	`+ IDebugEmitter::Release(m_pDebugEmitter);`
`1102`	`1102`	`}`
`1103`	`1103`
`1104`	`1104`	`if (!m_encoder->IsCodePatchCandidate() \|\| m_encoder->HasPrevKernel())`
`@@ -8329,7 +8329,7 @@ void EmitPass::emitPSSGV(GenIntrinsicInst* inst)`
`8329`	`8329`	`{`
`8330`	`8330`	`CVariable* r1 = m_currShader->BitCast(psProgram->GetR1(), ISA_TYPE_UW);`
`8331`	`8331`	`temp = m_currShader->GetNewVariable(8, ISA_TYPE_UW, EALIGN_GRF,`
`8332`		`- std::string(IF_DEBUG_INFO("SampleIndexExtracted")));`
	`8332`	`+ "SampleIndexExtracted");`
`8333`	`8333`	`m_encoder->SetSrcRegion(0, 0, 1, 0);`
`8334`	`8334`	`m_encoder->SetSimdSize(SIMDMode::SIMD8);`
`8335`	`8335`	`m_encoder->SetNoMask();`
Original file line number	Diff line number	Diff line change
`@@ -1502,7 +1502,7 @@ void OptimizeIR(CodeGenContext* const pContext)`
`1502`	`1502`	`if (((OpenCLProgramContext*)pContext)->m_InternalOptions.KernelDebugEnable)`
`1503`	`1503`	`{`
`1504`	`1504`	`IGCPassManager mpm(pContext, "CleanImplicitId");`
`1505`		`- IF_DEBUG_INFO(mpm.add(new CleanImplicitIds()));`
	`1505`	`+ mpm.add(new CleanImplicitIds());`
`1506`	`1506`	`mpm.run(*pContext->getModule());`
`1507`	`1507`	`}`
`1508`	`1508`	`}`
Original file line number	Diff line number	Diff line change
`@@ -449,14 +449,14 @@ void InlineLocalsResolution::collectInfoOnSharedLocalMem(Module& M)`
`449`	`449`	`}`
`450`	`450`
`451`	`451`	`// set debugging info, and insert mov inst.`
`452`		`- IF_DEBUG_INFO(for (const auto& I : m_FuncToVarsMap))`
	`452`	`+ for (const auto& I : m_FuncToVarsMap)`
`453`	`453`	`{`
`454`		`- IF_DEBUG_INFO(Function * userFunc = I.first;)`
`455`		`- IF_DEBUG_INFO(for (auto G : I.second))`
	`454`	`+ Function* userFunc = I.first;`
	`455`	`+ for (auto* G : I.second)`
`456`	`456`	`{`
`457`		`- IF_DEBUG_INFO(Instruction * pInsertBefore = &(*userFunc->begin()->getFirstInsertionPt());)`
`458`		`- TODO("Should inline local buffer points to origin offset 'globalVar' or to fixed offset 'pMovedPtr'?");`
`459`		`- IF_DEBUG_INFO(Utils::UpdateGlobalVarDebugInfo(G, G, pInsertBefore, true););`
	`457`	`+ Instruction * pInsertBefore = &(*userFunc->begin()->getFirstInsertionPt());`
	`458`	`+ TODO("Should inline local buffer points to origin offset 'globalVar' or to fixed offset 'pMovedPtr'?");`
	`459`	`+ Utils::UpdateGlobalVarDebugInfo(G, G, pInsertBefore, true);`
`460`	`460`	`}`
`461`	`461`	`}`
`462`	`462`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,5 +50,4 @@ namespace IGC`
`50`	`50`	`int getPointerSize(llvm::Module &M);`
`51`	`51`	`}`
`52`	`52`
`53`		`-#define IF_DEBUG_INFO(X) X`
`54`	`53`	`#define IF_DEBUG_INFO_IF(C, X) if (C) { X }`