[Autobackout][FuncReg]Revert of change: b4ebf95

 Enable __ocl_dbg_* variables in -O2 -g.

If not used in a program, then __ocl_dbg_* variables could be available
in -O0 -g compilation only. Now it is enabled also in -O2 -g compilation
when -cl-kernel-debug-enable is set.

Author: mtargows

IGC/AdaptorOCL/UnifyIROCL.cpp

@@ -47,7 +47,6 @@ SPDX-License-Identifier: MIT
 #include "Compiler/Optimizer/CodeAssumption.hpp"
 #include "Compiler/Optimizer/Scalarizer.h"
 #include "Compiler/Optimizer/OpenCLPasses/DebuggerSupport/ImplicitGIDPass.hpp"
-#include "Compiler/Optimizer/OpenCLPasses/DebuggerSupport/ImplicitGIDRestoring.hpp"
 #include "Compiler/Optimizer/OpenCLPasses/ExtenstionFuncs/ExtensionArgAnalysis.hpp"
 #include "Compiler/Optimizer/OpenCLPasses/ExtenstionFuncs/ExtensionFuncsAnalysis.hpp"
 #include "Compiler/Optimizer/OpenCLPasses/ExtenstionFuncs/ExtensionFuncResolution.hpp"
@@ -531,10 +530,6 @@ static void CommonOCLBasedPasses(
     // TODO: Run CheckInstrTypes after builtin import to determine if builtins have allocas.
     mpm.add(createSROAPass());
     mpm.add(createIGCInstructionCombiningPass());
-    if (pContext->m_InternalOptions.KernelDebugEnable)
-    {
-        mpm.add(new ImplicitGIDRestoring());
-    }
     // See the comment above (it's copied as is).
     // Instcombine can create constant expressions, which are not handled by the program scope constant resolution pass.
     // For example, in InsertDummyKernelForSymbolTablePass addresses of indirectly called functions

IGC/Compiler/CISACodeGen/CodeSinking.cpp

@@ -726,11 +726,8 @@ namespace IGC {
                     // which is not really a local-code-motion
                     if (def->getNextNode() != use && !isa<PHINode>(use))
                     {
-                        if (!def->getMetadata("implicitGlobalID"))
-                        {
-                            def->moveBefore(use);
-                            madeChange = true;
-                        }
+                        def->moveBefore(use);
+                        madeChange = true;
                     }
                     localInstSet.erase(def);
                 }

IGC/Compiler/CISACodeGen/DebugInfo.cpp

@@ -377,10 +377,6 @@ void DebugInfoData::markOutputVar(CShader* pShader, IDebugEmitter* pDebugEmitter
     IGC_ASSERT_MESSAGE(IGC_IS_FLAG_ENABLED(UseOffsetInLocation), "UseOffsetInLocation not enabled");
     IGC_ASSERT_MESSAGE(pInst, "Missing instruction");
 
-    // No dummy instruction needs to be marked with "Output"
-    if (dyn_cast<GenIntrinsicInst>(pValue))
-        return;
-
     CVariable* pVar = pShader->GetSymbol(pValue);
     if (pVar->GetVarType() == EVARTYPE_GENERAL)
     {
@@ -391,8 +387,7 @@ void DebugInfoData::markOutputVar(CShader* pShader, IDebugEmitter* pDebugEmitter
         // This will help debugger examine their values anywhere in the code till they
         // are in scope. However, emit "Output" attribute when -g and -cl-opt-disable
         // are both passed -g by itself shouldnt alter generated code.
-        if (static_cast<OpenCLProgramContext*>(pShader->GetContext())->m_InternalOptions.KernelDebugEnable ||
-            pShader->GetContext()->getModuleMetaData()->compOpt.OptDisable)
+        if (pShader->GetContext()->getModuleMetaData()->compOpt.OptDisable)
         {
             // If "Output" attribute is emitted for perThreadOffset variable(s)
             // then debug info emission is preserved for this:

IGC/Compiler/CISACodeGen/EmitVISAPass.cpp

@@ -9630,8 +9630,6 @@ void EmitPass::EmitGenIntrinsicMessage(llvm::GenIntrinsicInst* inst)
     case GenISAIntrinsic::GenISA_dummyInst:
         emitDummyInst(inst);
         break;
-    case GenISAIntrinsic::GenISA_dummyInstID:
-        break;  // pseudo instruction, do nothing
     case GenISAIntrinsic::GenISA_vectorUniform:
         break;  // pseudo instruction, do nothing
     case GenISAIntrinsic::GenISA_staticConstantPatchValue:

IGC/Compiler/CISACodeGen/ShaderCodeGen.cpp

@@ -67,7 +67,6 @@ SPDX-License-Identifier: MIT
 
 #include "Compiler/CISACodeGen/SLMConstProp.hpp"
 #include "Compiler/Optimizer/OpenCLPasses/DebuggerSupport/ImplicitGIDPass.hpp"
-#include "Compiler/Optimizer/OpenCLPasses/DebuggerSupport/ImplicitGIDRestoring.hpp"
 #include "Compiler/Optimizer/OpenCLPasses/GenericAddressResolution/GenericAddressDynamicResolution.hpp"
 #include "Compiler/Optimizer/OpenCLPasses/PrivateMemory/PrivateMemoryUsageAnalysis.hpp"
 #include "Compiler/Optimizer/OpenCLPasses/PrivateMemory/PrivateMemoryResolution.hpp"
@@ -667,11 +666,6 @@ static void AddLegalizationPasses(CodeGenContext& ctx, IGCPassManager& mpm, PSSi
             ctx.type == ShaderType::OPENCL_SHADER;
         mpm.add(createMemOptPass(AllowNegativeSymPtrsForLoad));
         mpm.add(createIGCInstructionCombiningPass());
-        if (ctx.type == ShaderType::OPENCL_SHADER &&
-            static_cast<OpenCLProgramContext&>(ctx).m_InternalOptions.KernelDebugEnable)
-        {
-            mpm.add(new ImplicitGIDRestoring());
-        }
     }
 
     if (ctx.type == ShaderType::OPENCL_SHADER &&
@@ -764,11 +758,6 @@ static void AddLegalizationPasses(CodeGenContext& ctx, IGCPassManager& mpm, PSSi
         if (!fastCompile && !highAllocaPressure && !isPotentialHPCKernel)
         {
             mpm.add(createIGCInstructionCombiningPass());
-            if (ctx.type == ShaderType::OPENCL_SHADER &&
-                static_cast<OpenCLProgramContext&>(ctx).m_InternalOptions.KernelDebugEnable)
-            {
-                mpm.add(new ImplicitGIDRestoring());
-            }
         }
         mpm.add(new GenSpecificPattern());
         // Cases with DPDivSqrtEmu grow significantly.
@@ -1836,11 +1825,6 @@ void OptimizeIR(CodeGenContext* const pContext)
         }
 
         mpm.add(createIGCInstructionCombiningPass());
-        if (pContext->type == ShaderType::OPENCL_SHADER &&
-            static_cast<OpenCLProgramContext*>(pContext)->m_InternalOptions.KernelDebugEnable)
-        {
-            mpm.add(new ImplicitGIDRestoring());
-        }
         mpm.add(new FCmpPaternMatch());
         mpm.add(llvm::createDeadCodeEliminationPass()); // this should be done both before/after constant propagation
 
@@ -1898,11 +1882,6 @@ void OptimizeIR(CodeGenContext* const pContext)
                 }
 
                 mpm.add(createIGCInstructionCombiningPass());
-                if (pContext->type == ShaderType::OPENCL_SHADER &&
-                    static_cast<OpenCLProgramContext*>(pContext)->m_InternalOptions.KernelDebugEnable)
-                {
-                    mpm.add(new ImplicitGIDRestoring());
-                }
                 if (IGC_IS_FLAG_ENABLED(EnableAdvCodeMotion) &&
                     pContext->type == ShaderType::OPENCL_SHADER &&
                     !pContext->m_instrTypes.hasSwitch)
@@ -2040,11 +2019,6 @@ void OptimizeIR(CodeGenContext* const pContext)
 
             // run instruction combining to clean up the code after CFG optimizations
             mpm.add(createIGCInstructionCombiningPass());
-            if (pContext->type == ShaderType::OPENCL_SHADER &&
-                static_cast<OpenCLProgramContext*>(pContext)->m_InternalOptions.KernelDebugEnable)
-            {
-                mpm.add(new ImplicitGIDRestoring());
-            }
 
             mpm.add(llvm::createDeadCodeEliminationPass());
             mpm.add(llvm::createEarlyCSEPass());

IGC/Compiler/DebugInfo/Utils.cpp

@@ -117,33 +117,6 @@ namespace Utils {
         return nullptr;
     }
 
-    unsigned int GetSpecialDebugVariableHash(const std::string& name)
-    {
-        // Calculate hash index for OCL special debug variables:
-        // 0 for __ocl_dbg_gid0
-        // 1 for __ocl_dbg_gid1
-        // 2 for __ocl_dbg_gid2
-        // 3 for __ocl_dbg_lid0
-        // 4 for __ocl_dbg_lid1
-        // 5 for __ocl_dbg_lid2
-        // 6 for __ocl_dbg_grid0
-        // 7 for __ocl_dbg_grid1
-        // 8 for __ocl_dbg_grid2
-
-        unsigned int idx = 0;
-
-        // 0 for ocl_dbg_gid*, so at position size-4 check only 'l' for lid and 'r' for grid
-        size_t significantCharPos = name.size() - 4;
-        if (name.at(significantCharPos) == 'l')
-            idx = 3;
-        else if (name.at(significantCharPos) == 'r')
-            idx = 6;
-
-        idx += std::strtoul(name.substr(name.size() - 1).data(), nullptr, 0);
-
-        return idx;
-    }
-
     bool IsSpecialDebugVariable(const std::string& name)
     {
         // Check for OCL special debug variable such as:
@@ -154,26 +127,5 @@ namespace Utils {
         return (name.find("__ocl_dbg", 0) == 0);
     }
 
-    std::string GetSpecialVariableMetaName(const llvm::Instruction* inst)
-    {
-        // Check for OCL special debug variable such as in metadata
-        //   "preserve__ocl_dbg_gid0"
-        //   "preserve__ocl_dbg_gid1"
-        //   "preserve__ocl_dbg_gid2"
-        std::string names[__OCL_DBG_VARIABLES] =
-        {
-            "__ocl_dbg_gid0", "__ocl_dbg_gid1", "__ocl_dbg_gid2",
-            "__ocl_dbg_lid0", "__ocl_dbg_lid1", "__ocl_dbg_lid2",
-            "__ocl_dbg_grid0", "__ocl_dbg_grid1", "__ocl_dbg_grid2"
-        };
-
-        for (int i = 0; i < __OCL_DBG_VARIABLES; i++)
-        {
-            if (inst->getMetadata(names[i]))
-                return names[i];
-        }
-
-        return "";
-    }
 } // namespace Utils
 } // namespace IGC

IGC/Compiler/DebugInfo/Utils.h

@@ -19,8 +19,6 @@ SPDX-License-Identifier: MIT
 namespace IGC {
 namespace Utils {
 
-    #define __OCL_DBG_VARIABLES 9
-
     /// @brief return true if given module contain debug info
     /// @param M The LLVM module.
     /// @return true if given module contain debug info
@@ -38,9 +36,7 @@ namespace Utils {
             llvm::GlobalVariable* pGlobalVar, llvm::Value* pNewVal,
             llvm::Instruction* pEntryPoint, bool isIndirect);
 
-    unsigned int GetSpecialDebugVariableHash(const std::string& name);
     bool IsSpecialDebugVariable(const std::string& name);
-    std::string GetSpecialVariableMetaName(const llvm::Instruction* CI);
 
 } // namespace Utils
 } // namespace IGC

IGC/Compiler/InitializePasses.h

@@ -162,4 +162,3 @@ void initializeBreakdownIntrinsicPassPass(llvm::PassRegistry&);
 void initializeCatchAllLineNumberPass(llvm::PassRegistry&);
 void initializePromoteConstantStructsPass(llvm::PassRegistry&);
 void initializeLowerInvokeSIMDPass(llvm::PassRegistry&);
-void initializeImplicitGIDRestoringPass(llvm::PassRegistry&);

IGC/Compiler/Optimizer/OpenCLPasses/DebuggerSupport/CMakeLists.txt

@@ -11,13 +11,11 @@ include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
 
 set(IGC_BUILD__SRC__DebuggerSupport
     "${CMAKE_CURRENT_SOURCE_DIR}/ImplicitGIDPass.cpp"
-    "${CMAKE_CURRENT_SOURCE_DIR}/ImplicitGIDRestoring.cpp"
   )
 set(IGC_BUILD__SRC__OpenCLPasses_DebuggerSupport ${IGC_BUILD__SRC__DebuggerSupport} PARENT_SCOPE)
 
 set(IGC_BUILD__HDR__DebuggerSupport
     "${CMAKE_CURRENT_SOURCE_DIR}/ImplicitGIDPass.hpp"
-    "${CMAKE_CURRENT_SOURCE_DIR}/ImplicitGIDRestoring.hpp"
   )
 set(IGC_BUILD__HDR__OpenCLPasses_DebuggerSupport ${IGC_BUILD__HDR__DebuggerSupport} PARENT_SCOPE)
 
@@ -28,4 +26,4 @@ igc_sg_register(
     FILES
       ${IGC_BUILD__SRC__DebuggerSupport}
       ${IGC_BUILD__HDR__DebuggerSupport}
-  )
+  )