Deprecate addGTRelativeLocation

Deprecate addGTRelativeLocation function.
SLM offset should be emitted for SLM global vars.
DW_AT_address_class 1  should be added to type based on
dwarfAddressSpace.
DW_AT_address_class 1 will be also added to global slm vars because FE
doesn't add it to their debug info.

Author: Kotynia, Piotr

IGC/Compiler/CISACodeGen/CShader.cpp

@@ -1724,7 +1724,7 @@ uint64_t CShader::GetConstantExpr(ConstantExpr* CE) {
         if (ConstantExpr * CE1 = dyn_cast<ConstantExpr>(C))
             return GetConstantExpr(CE1);
         if (GlobalVariable * GV = dyn_cast<GlobalVariable>(C))
-            return GetGlobalMappingValue(GV);
+            return GetSLMMappingValue(GV);
         break;
     }
     case Instruction::Trunc: {
@@ -1752,14 +1752,14 @@ uint64_t CShader::GetConstantExpr(ConstantExpr* CE) {
     return 0;
 }
 
-unsigned int CShader::GetGlobalMappingValue(llvm::Value* c)
+unsigned int CShader::GetSLMMappingValue(llvm::Value* c)
 {
     IGC_ASSERT_MESSAGE(0, "The global variables are not handled");
 
     return 0;
 }
 
-CVariable* CShader::GetGlobalMapping(llvm::Value* c)
+CVariable* CShader::GetSLMMapping(llvm::Value* c)
 {
     IGC_ASSERT_MESSAGE(0, "The global variables are not handled");
 
@@ -1787,7 +1787,7 @@ CVariable* CShader::GetScalarConstant(llvm::Value* const c)
     // GlobalVariables
     if (isa<GlobalVariable>(c))
     {
-        return GetGlobalMapping(c);
+        return GetSLMMapping(c);
     }
 
     // Constant Expression

IGC/Compiler/CISACodeGen/OpenCLKernelCodeGen.cpp

@@ -2531,7 +2531,7 @@ namespace IGC
         return true;
     }
 
-    unsigned int COpenCLKernel::GetGlobalMappingValue(llvm::Value* c)
+    unsigned int COpenCLKernel::GetSLMMappingValue(llvm::Value *c)
     {
         unsigned int val = 0;
         auto localIter = m_localOffsetsMap.find(c);
@@ -2546,10 +2546,10 @@ namespace IGC
         return val;
     }
 
-    CVariable* COpenCLKernel::GetGlobalMapping(llvm::Value* c)
+    CVariable *COpenCLKernel::GetSLMMapping(llvm::Value *c)
     {
         VISA_Type type = GetType(c->getType());
-        unsigned int val = GetGlobalMappingValue(c);
+        unsigned int val = GetSLMMappingValue(c);
         return ImmToVariable(val, type);
     }
 

IGC/Compiler/CISACodeGen/OpenCLKernelCodeGen.hpp

@@ -176,8 +176,8 @@ namespace IGC
         // Returns the immediate value mapped to GlobalVariable c.
         // (GlobalVariables represent the pointer to the global,
         // which is a compile-time constant)
-        unsigned int GetGlobalMappingValue(llvm::Value* c) override;
-        CVariable* GetGlobalMapping(llvm::Value* c) override;
+        unsigned int GetSLMMappingValue(llvm::Value *c) override;
+        CVariable *GetSLMMapping(llvm::Value *c) override;
 
         const SOpenCLKernelInfo& getKernelInfo() const { return m_kernelInfo; }
 

IGC/Compiler/CISACodeGen/ShaderCodeGen.hpp

@@ -266,8 +266,8 @@ class CShader
     CVariable* GetScalarConstant(llvm::Value* c);
     CVariable* GetUndef(VISA_Type type);
     llvm::Constant* findCommonConstant(llvm::Constant* C, uint elts, uint currentEmitElts, bool& allSame);
-    virtual unsigned int GetGlobalMappingValue(llvm::Value* c);
-    virtual CVariable* GetGlobalMapping(llvm::Value* c);
+    virtual unsigned int GetSLMMappingValue(llvm::Value *c);
+    virtual CVariable *GetSLMMapping(llvm::Value *c);
     CVariable* BitCast(CVariable* var, VISA_Type newType);
     void        CacheArgumentsList();
     virtual void MapPushedInputs();

IGC/Compiler/DebugInfo/ScalarVISAModule.cpp

@@ -343,7 +343,7 @@ const Argument* ScalarVisaModule::GetTracedArgument(const Value* pVal, bool isAd
 VISAVariableLocation
 ScalarVisaModule::GetVariableLocation(const llvm::Instruction* pInst) const
 {
-    const Value* pVal = nullptr;
+    Value* pVal = nullptr;
     MDNode* pNode = nullptr;
     bool isDbgDclInst = false;
     if (const DbgDeclareInst * pDbgAddrInst = dyn_cast<DbgDeclareInst>(pInst))
@@ -464,9 +464,7 @@ ScalarVisaModule::GetVariableLocation(const llvm::Instruction* pInst) const
         }
     }
 
-    Value* pValue = const_cast<Value*>(pVal);
-
-    Type* pType = pValue->getType();
+    Type* pType = pVal->getType();
 
     if (isDbgDclInst)
     {
@@ -479,49 +477,29 @@ ScalarVisaModule::GetVariableLocation(const llvm::Instruction* pInst) const
         pType = IGCLLVM::getNonOpaquePtrEltTy(pType);
     }
 
-    bool isInSurface = false;
     bool isGlobalAddrSpace = false;
-    unsigned int surfaceReg = 0;
     if (pType->isPointerTy())
     {
         unsigned int addrSpace = pType->getPointerAddressSpace();
-        if (addrSpace == ADDRESS_SPACE_LOCAL)
-        {
-            isInSurface = true;
-            surfaceReg = TEXTURE_REGISTER_BEGIN + LOCAL_SURFACE_BTI;
-        }
         if (addrSpace == ADDRESS_SPACE_GLOBAL)
         {
             isGlobalAddrSpace = true;
         }
     }
 
-    if (pVal->getType()->isPointerTy())
+    // SLM global variable
+    if (isa<GlobalVariable>(pVal))
     {
-        unsigned int addrSpace = pVal->getType()->getPointerAddressSpace();
-        if (addrSpace == ADDRESS_SPACE_LOCAL)
-        {
-            isInSurface = true;
-            surfaceReg = TEXTURE_REGISTER_BEGIN + LOCAL_SURFACE_BTI;
-        }
-    }
-
-    if (isa<GlobalVariable>(pValue))
-    {
-        unsigned int offset = m_pShader->GetGlobalMappingValue(pValue);
-        if (isInSurface)
-        {
-            return VISAVariableLocation(surfaceReg, offset, false, isDbgDclInst, 0, false, this);
-        }
-        return VISAVariableLocation(offset, false, isDbgDclInst, 0, false, false, this);
+        unsigned int offset = m_pShader->GetSLMMappingValue(pVal);
+        return VISAVariableLocation(offset, true, this);
     }
 
     // At this point we expect only a register
     CVariable* pVar = nullptr;
-    auto globalSubCVar = m_pShader->GetGlobalCVar(pValue);
+    auto globalSubCVar = m_pShader->GetGlobalCVar(pVal);
 
     if (!globalSubCVar) {
-        pVar = m_pShader->GetDebugInfoData().getMapping(*pInst->getFunction(), pValue);
+        pVar = m_pShader->GetDebugInfoData().getMapping(*pInst->getFunction(), pVal);
         if (!pVar)
         {
             return VISAVariableLocation(this);
@@ -552,12 +530,6 @@ ScalarVisaModule::GetVariableLocation(const llvm::Instruction* pInst) const
         {
             vectorNumElements = 1;
         }
-
-        if (isInSurface)
-        {
-            return VISAVariableLocation(surfaceReg, reg, true /*isRegister*/, isDbgDclInst,
-                                        vectorNumElements, !pVar->IsUniform(), this);
-        }
         VISAVariableLocation genReg(reg, true /*isRegister*/, isDbgDclInst, vectorNumElements,
                                     !pVar->IsUniform(), isGlobalAddrSpace, this);
         // SIMD32 locations can't into one register. See VISAVariableLocation::m_locationSecondReg field description for more information