Add 0x10000000 bit to SLM addreses

Make sure that high bit indicating non-null offset is added.
It is needed for GDB to correctly read from SLM memory.

Author: Kotynia, Piotr

IGC/Compiler/DebugInfo/ScalarVISAModule.cpp

@@ -9,6 +9,7 @@ SPDX-License-Identifier: MIT
 #include "Compiler/DebugInfo/ScalarVISAModule.h"
 #include "Compiler/DebugInfo/Utils.h"
 #include "Compiler/Optimizer/OpenCLPasses/KernelArgs/KernelArgs.hpp"
+#include "Compiler/Optimizer/OpenCLPasses/PrivateMemory/PrivateMemoryToSLM.hpp"
 #include "Compiler/CISACodeGen/ShaderCodeGen.hpp"
 #include "GenISAIntrinsics/GenIntrinsicInst.h"
 #include "common/debug/Debug.hpp"
@@ -491,6 +492,7 @@ ScalarVisaModule::GetVariableLocation(const llvm::Instruction* pInst) const
     if (isa<GlobalVariable>(pVal))
     {
         unsigned int offset = m_pShader->GetSLMMappingValue(pVal);
+        offset |= VALID_LOCAL_HIGH_BITS;
         return VISAVariableLocation(offset, true, this);
     }
 

IGC/Compiler/Optimizer/OpenCLPasses/LocalBuffers/InlineLocalsResolution.cpp

@@ -8,6 +8,7 @@ SPDX-License-Identifier: MIT
 
 #include "AdaptorCommon/ImplicitArgs.hpp"
 #include "Compiler/Optimizer/OpenCLPasses/LocalBuffers/InlineLocalsResolution.hpp"
+#include "Compiler/Optimizer/OpenCLPasses/PrivateMemory/PrivateMemoryToSLM.hpp"
 #include "Compiler/CodeGenPublic.h"
 #include "Compiler/IGCPassSupport.h"
 #include "Compiler/CISACodeGen/OpenCLKernelCodeGen.hpp"
@@ -45,8 +46,6 @@ InlineLocalsResolution::InlineLocalsResolution() :
     initializeInlineLocalsResolutionPass(*PassRegistry::getPassRegistry());
 }
 
-const unsigned int InlineLocalsResolution::VALID_LOCAL_HIGH_BITS = 0x10000000;
-
 static bool useAsPointerOnly(Value* V) {
     IGC_ASSERT_MESSAGE(V->getType()->isPointerTy(), "Expect the input value is a pointer!");
 

IGC/Compiler/Optimizer/OpenCLPasses/LocalBuffers/InlineLocalsResolution.hpp

@@ -58,14 +58,6 @@ namespace IGC
             AU.addRequired<llvm::CallGraphWrapperPass>();
         }
 
-        // It is convenient to represent the null pointer as the zero
-        // bit-pattern. However, SLM address 0 is legal, and we want to be able
-        // to use it.
-        // To go around this, we use the fact only the low 16 bits ("low nibble")
-        // of SLM addresses are significant, and set all valid pointers to have
-        // a non-zero high nibble.
-        static const unsigned int VALID_LOCAL_HIGH_BITS;
-
     protected:
 
         void filterGlobals(llvm::Module&);

IGC/Compiler/Optimizer/OpenCLPasses/PrivateMemory/PrivateMemoryToSLM.cpp

@@ -40,7 +40,6 @@ IGC_INITIALIZE_PASS_END(PrivateMemoryToSLM, PASS_FLAG, PASS_DESCRIPTION, PASS_CF
 namespace IGC
 {
     char PrivateMemoryToSLM::ID = 0;
-    const unsigned int PrivateMemoryToSLM::VALID_LOCAL_HIGH_BITS = 0x10000000;
     const unsigned int PrivateMemoryToSLM::SLM_LOCAL_VARIABLE_ALIGNMENT = 4;
     const unsigned int PrivateMemoryToSLM::SLM_LOCAL_SIZE_ALIGNMENT = 32;
 

IGC/Compiler/Optimizer/OpenCLPasses/PrivateMemory/PrivateMemoryToSLM.hpp

@@ -18,6 +18,14 @@ using namespace llvm;
 
 namespace IGC
 {
+    // It is convenient to represent the null pointer as the zero
+    // bit-pattern. However, SLM address 0 is legal, and we want to be able
+    // to use it.
+    // To go around this, we use the fact only the low 16 bits ("low nibble")
+    // of SLM addresses are significant, and set all valid pointers to have
+    // a non-zero high nibble.
+    static inline const unsigned int VALID_LOCAL_HIGH_BITS = 0x10000000;
+
     // Experimental pass to move private memory allocations to SLM where it's
     // profitable. The pass is able to handle Compute and OpenCL shader types.
     class PrivateMemoryToSLM : public ModulePass
@@ -47,7 +55,6 @@ namespace IGC
 
         virtual bool runOnModule(Module& M) override;
 
-        static const unsigned int VALID_LOCAL_HIGH_BITS;
         static const unsigned int SLM_LOCAL_VARIABLE_ALIGNMENT;
         static const unsigned int SLM_LOCAL_SIZE_ALIGNMENT;