Adding support for opaque pointers in HandleSpirvDecorationMetadata

For `opaque pointers` we cannot deduce a type for `Prefetch` call with `ptr`.
We need this information to create appropriate builtins. To achieve this,
we can use `llvm::demangle()` method and find appropriate type.

This change is compatible with both typed and opaque pointers.

Author: matborzyszkowski

IGC/AdaptorOCL/preprocess_spvir/HandleSPIRVDecorations/HandleSpirvDecorationMetadata.cpp

@@ -22,6 +22,8 @@ SPDX-License-Identifier: MIT
 #include <llvm/Support/Regex.h>
 #include "common/LLVMWarningsPop.hpp"
 
+#include <regex>
+
 using namespace llvm;
 using namespace IGC;
 
@@ -40,6 +42,46 @@ HandleSpirvDecorationMetadata::HandleSpirvDecorationMetadata() : ModulePass(ID)
   initializeHandleSpirvDecorationMetadataPass(*PassRegistry::getPassRegistry());
 }
 
+// Get type from demangled name for both typed and opaque pointers
+// For opaque pointers, we cannot deduce type from ptr
+Type *HandleSpirvDecorationMetadata::getArgumentType(std::string demangledName, size_t argNo, llvm::LLVMContext &ctx) {
+  auto open = demangledName.find('('), close = demangledName.find(')', open);
+  if (open == std::string::npos || close == std::string::npos || close <= open + 1) {
+    IGC_ASSERT_MESSAGE(0, "Unexpected demangled name!");
+    return nullptr;
+  }
+
+  std::stringstream ss(demangledName.substr(open + 1, close - open - 1));
+  std::string arg;
+  std::vector<std::string> args;
+
+  while (std::getline(ss, arg, ',')) {
+    arg.erase(0, arg.find_first_not_of(" \t"));
+    arg.erase(arg.find_last_not_of(" \t") + 1);
+    args.push_back(arg);
+  }
+
+  if (argNo >= args.size()) {
+    IGC_ASSERT_MESSAGE(0, "Provided arg number is greater than or equal to arg.size()!");
+    return nullptr;
+  }
+
+  const auto &a = args[argNo];
+
+  if (std::regex_search(a, std::regex("\\bchar\\b")))
+    return llvm::Type::getInt8Ty(ctx);
+  else if (std::regex_search(a, std::regex("\\bshort\\b")))
+    return llvm::Type::getInt16Ty(ctx);
+  else if (std::regex_search(a, std::regex("\\bint\\b")))
+    return llvm::Type::getInt32Ty(ctx);
+  else if (std::regex_search(a, std::regex("\\blong\\b")))
+    return llvm::Type::getInt64Ty(ctx);
+  else
+    IGC_ASSERT_MESSAGE(0, "Unexpected type!");
+
+  return nullptr;
+}
+
 bool HandleSpirvDecorationMetadata::runOnModule(Module &module) {
   m_Metadata = getAnalysis<MetaDataUtilsWrapper>().getModuleMetaData();
   m_pCtx = getAnalysis<CodeGenContextWrapper>().getCodeGenContext();
@@ -388,7 +430,7 @@ void HandleSpirvDecorationMetadata::handleCacheControlINTELFor1DBlockIO(CallInst
   std::string funcName;
   if constexpr (std::is_same_v<T, LoadCacheControl>) {
     if (auto isPrefetch = I.getType()->isVoidTy()) {
-      operationType = IGCLLVM::getNonOpaquePtrEltTy(I.getArgOperand(0)->getType());
+      operationType = getArgumentType(llvm::demangle(F->getName().str()), 0, F->getContext());
       funcName = "SubgroupBlockPrefetchINTEL";
     } else {
       operationType = I.getType();

IGC/AdaptorOCL/preprocess_spvir/HandleSPIRVDecorations/HandleSpirvDecorationMetadata.h

@@ -70,5 +70,7 @@ class HandleSpirvDecorationMetadata : public llvm::ModulePass, public llvm::Inst
   void handleCacheControlINTELFor1DBlockIO(llvm::CallInst &I, llvm::SmallPtrSetImpl<llvm::MDNode *> &MDNodes);
   void handleCacheControlINTELForOCL1DBlockPrefetch(llvm::CallInst &I, llvm::SmallPtrSetImpl<llvm::MDNode *> &MDNodes,
                                                     llvm::SmallVectorImpl<llvm::StringRef> &Matches);
+
+  llvm::Type *getArgumentType(std::string demangledName, size_t argNo, llvm::LLVMContext &ctx);
 };
 } // namespace IGC

IGC/ocloc_tests/features/cache_controls/cl_intel_subgroups_buffer_prefetch/SPV_INTEL_subgroup_buffer_prefetch.ll

@@ -7,21 +7,18 @@
 ;============================ end_copyright_notice =============================
 
 ; REQUIRES: llvm-spirv, regkeys, pvc-supported, llvm-15-or-older
-
-; TODO: This test fails on LLVM 16 with opaque pointers, but passes with typed pointers. Once the necessary fixes are made, remove llvm-15-or-older from the list above. llvm-15-or-older was added to the list above to prevent non-zero return from llvm-lit on LLVM 16 build with typed pointers forced.
-; XFAIL: llvm-16-plus
 ; UNSUPPORTED: sys32
 
 ; LLVM with opaque pointers:
-; TODO: llvm-as -opaque-pointers=1 %s -o %t.bc
+; RUN: llvm-as -opaque-pointers=1 %s -o %t.bc
 ; COM: Replace SPV_INTEL_subgroups with SPV_INTEL_subgroup_buffer_prefetch once support for prefetches is implemented in the KHR Translator
-; TODO: llvm-spirv %t.bc -opaque-pointers=1 --spirv-ext=+SPV_INTEL_subgroups,+SPV_INTEL_cache_controls -o %t.spv
-; TODO: ocloc compile -spirv_input -file %t.spv -device pvc -options " -igc_opts 'EnableOpaquePointersBackend=1,DumpVISAASMToConsole=1'" 2>&1 | FileCheck %s
+; RUN: llvm-spirv %t.bc -opaque-pointers=1 --spirv-ext=+SPV_INTEL_subgroups,+SPV_INTEL_cache_controls -o %t.spv
+; RUN: ocloc compile -spirv_input -file %t.spv -device pvc -options " -igc_opts 'EnableOpaquePointersBackend=1, DumpVISAASMToConsole=1'" 2>&1 | FileCheck %s
 
 ; LLVM with typed pointers/default pointer typing:
-; RUN: llvm-as %s -o %t.bc
+; RUN: llvm-as -opaque-pointers=0 %s -o %t.bc
 ; COM: Replace SPV_INTEL_subgroups with SPV_INTEL_subgroup_buffer_prefetch once support for prefetches is implemented in the KHR Translator
-; RUN: llvm-spirv %t.bc --spirv-ext=+SPV_INTEL_subgroups,+SPV_INTEL_cache_controls -o %t.spv
+; RUN: llvm-spirv %t.bc -opaque-pointers=0 --spirv-ext=+SPV_INTEL_subgroups,+SPV_INTEL_cache_controls -o %t.spv
 ; RUN: ocloc compile -spirv_input -file %t.spv -device pvc -options " -igc_opts 'DumpVISAASMToConsole=1'" 2>&1 | FileCheck %s
 
 target triple = "spir64-unknown-unknown"