Add missing check on argument type.

Add missing check on argument type.

Author: pratikashar

IGC/Compiler/DebugInfo/ScalarVISAModule.cpp

@@ -428,6 +428,16 @@ ScalarVisaModule::GetVariableLocation(const llvm::Instruction* pInst) const
             {
                 const std::string typeStr = modMD->FuncMD[const_cast<Function*>(curFunc)].m_OpenCLArgBaseTypes[pArgument->getArgNo()];
                 KernelArg::ArgType argType = KernelArg::calcArgType(pArgument, typeStr);
+                if (argType == KernelArg::ArgType::SAMPLER)
+                {
+                    // SAMPLER and NOT_TO_ALLOCATE have same enum values so disambiguate these
+                    auto pr = KernelArg::getBufferType(pArgument, typeStr);
+                    if(!pr.isSampler)
+                    {
+                        // type is actually NOT_TO_ALLOCATE
+                        argType = KernelArg::ArgType::End;
+                    }
+                }
                 FunctionMetaData* funcMD = &modMD->FuncMD[const_cast<Function*>(curFunc)];
                 ResourceAllocMD* resAllocMD = &funcMD->resAllocMD;
                 IGC_ASSERT_MESSAGE(resAllocMD->argAllocMDList.size() == curFunc->arg_size(), "Invalid ArgAllocMDList");

IGC/Compiler/Optimizer/OpenCLPasses/KernelArgs.cpp

@@ -116,6 +116,36 @@ unsigned int KernelArg::calcElemAllocateSize(const Argument* arg, const DataLayo
     return int_cast<unsigned int>(DL->getTypeAllocSize(arg->getType()->getScalarType()));
 }
 
+// First member of pair is ArgType of buffer.
+// When ArgType is SAMPLER, second member should be true.
+// When ArgType is NOT_TO_ALLOCATE, second member should be false.
+// ArgType enum uses same values for SAMPLER and NOT_TO_ALLOCATE.
+// This function helps disambiguate between the two values.
+KernelArg::BufferArgType KernelArg::getBufferType(const Argument* arg, const StringRef typeStr)
+{
+    if (arg->getType()->getTypeID() != Type::PointerTyID)
+        return { KernelArg::ArgType::SAMPLER, true };
+
+    PointerType* ptrType = cast<PointerType>(arg->getType());
+
+    int address_space = ptrType->getPointerAddressSpace();
+    bool directIdx = false;
+    unsigned int bufId = 0;
+    BufferType bufType = DecodeAS4GFXResource(address_space, directIdx, bufId);
+
+    // Check if this arg is an image
+    if (bufType == BufferType::UAV)
+    {
+        ArgType imgArgType;
+        // Check if argument is image
+        if (isImage(arg, typeStr, imgArgType)) return { imgArgType, false };
+    }
+    else if (bufType == BufferType::SAMPLER)
+        return { KernelArg::ArgType::SAMPLER, true };
+
+    return { KernelArg::ArgType::NOT_TO_ALLOCATE, false };
+}
+
 KernelArg::ArgType KernelArg::calcArgType(const Argument* arg, const StringRef typeStr)
 {
     switch (arg->getType()->getTypeID())
@@ -185,22 +215,7 @@ KernelArg::ArgType KernelArg::calcArgType(const Argument* arg, const StringRef t
             IGC_ASSERT_MESSAGE(0, "Unrecognized address space");
 #endif
             // This is a buffer. Try to decode this
-            int address_space = ptrType->getPointerAddressSpace();
-            bool directIdx = false;
-            unsigned int bufId = 0;
-            BufferType bufType = DecodeAS4GFXResource(address_space, directIdx, bufId);
-
-            // Check if this arg is an image
-            if (bufType == BufferType::UAV)
-            {
-                ArgType imgArgType;
-                // Check if argument is image
-                if (isImage(arg, typeStr, imgArgType)) return imgArgType;
-            }
-            else if (bufType == BufferType::SAMPLER)
-                return KernelArg::ArgType::SAMPLER;
-
-            return KernelArg::ArgType::NOT_TO_ALLOCATE;
+            return getBufferType(arg, typeStr).type;
         }
     }
     case  Type::IntegerTyID:

IGC/Compiler/Optimizer/OpenCLPasses/KernelArgs.hpp

@@ -228,6 +228,17 @@ namespace IGC
         /// @return The kernel argument type of the given explicit argument
         static ArgType calcArgType(const llvm::Argument* arg, const llvm::StringRef typeStr);
 
+        struct BufferArgType
+        {
+            KernelArg::ArgType type = KernelArg::ArgType::End;
+            bool isSampler = false;
+        };
+        /// @brief  Calculates the kernel arg type for buffer
+        /// @param  arg         The explicit kernel argument
+        /// @param  typeStr     The OpenCL type information for the kernel this argument belongs to
+        /// @return Pair of the kernel argument type of the given explicit argument and whether the type is really SAMPLER
+        static BufferArgType getBufferType(const llvm::Argument* arg, const llvm::StringRef typeStr);
+
         /// @brief  Checks whether the given argument is an image
         /// @param  arg           The kernel argument
         /// @param  typeStr       The OpenCL type information for the kernel this argument belongs to