Emit target extension types for SPIR-V friendly IR.

The ABI name mangling of target extension types is tweaked to be like a
pointer-to-a-struct, which maintains somewhat better compatibility with
the typed pointer representation for name mangling.

Original commit:
KhronosGroup/SPIRV-LLVM-Translator@15e0aa9

Author: jcranmer-intel

llvm-spirv/lib/SPIRV/SPIRVReader.cpp

@@ -59,6 +59,7 @@
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/Analysis/LoopInfo.h"
 #include "llvm/BinaryFormat/Dwarf.h"
+#include "llvm/IR/AttributeMask.h"
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/DerivedTypes.h"
 #include "llvm/IR/Dominators.h"
@@ -3179,6 +3180,8 @@ SPIRVToLLVM::SPIRVToLLVM(Module *LLVMModule, SPIRVModule *TheSPIRVModule)
   assert(M && "Initialization without an LLVM module is not allowed");
   initialize(*M);
   Context = &M->getContext();
+  if (BM->getDesiredBIsRepresentation() == BIsRepresentation::SPIRVFriendlyIR)
+    UseTargetTypes = !Context->supportsTypedPointers();
   DbgTran.reset(new SPIRVToLLVMDbgTran(TheSPIRVModule, LLVMModule, this));
 }
 

llvm-spirv/lib/SPIRV/SPIRVUtil.cpp

@@ -1352,11 +1352,14 @@ static SPIR::RefParamType transTypeDesc(Type *Ty,
   }
   if (auto *TargetTy = dyn_cast<TargetExtType>(Ty)) {
     std::string FullName;
+    unsigned AS = 0;
     {
       raw_string_ostream OS(FullName);
       StringRef Name = TargetTy->getName();
       if (Name.consume_front(kSPIRVTypeName::PrefixAndDelim)) {
         OS << "__spirv_" << Name;
+        AS = getOCLOpaqueTypeAddrSpace(
+            SPIRVOpaqueTypeOpCodeMap::map(Name.str()));
       } else {
         OS << Name;
       }
@@ -1367,7 +1370,12 @@ static SPIR::RefParamType transTypeDesc(Type *Ty,
       for (unsigned Param : TargetTy->int_params())
         OS << "_" << Param;
     }
-    return SPIR::RefParamType(new SPIR::UserDefinedType(FullName));
+    // Translate as if it's a pointer to the named struct.
+    auto *Inner = new SPIR::UserDefinedType(FullName);
+    auto *PT = new SPIR::PointerType(Inner);
+    PT->setAddressSpace(static_cast<SPIR::TypeAttributeEnum>(
+        AS + (unsigned)SPIR::ATTR_ADDR_SPACE_FIRST));
+    return SPIR::RefParamType(PT);
   }
 
   if (auto *TPT = dyn_cast<TypedPointerType>(Ty)) {

llvm-spirv/test/GroupAndSubgroupInstructions.spvasm

@@ -93,8 +93,8 @@
 ; CHECK-SPV-IR: declare spir_func i32 @_Z31__spirv_SubgroupShuffleXorINTELij(i32, i32) #[[#Attrs]]
 ; CHECK-SPV-IR: declare spir_func i32 @_Z35__spirv_SubgroupBlockReadINTEL_RintPU3AS1Kj(ptr addrspace(1)) #[[#Attrs]]
 ; CHECK-SPV-IR: declare spir_func void @_Z31__spirv_SubgroupBlockWriteINTELPU3AS1jj(ptr addrspace(1), i32) #[[#Attrs]]
-; CHECK-SPV-IR: declare spir_func i32 @_Z40__spirv_SubgroupImageBlockReadINTEL_RintPU3AS133__spirv_Image__void_1_0_0_0_0_0_2Dv2_i(ptr addrspace(1), <2 x i32>) #[[#Attrs]]
-; CHECK-SPV-IR: declare spir_func void @_Z36__spirv_SubgroupImageBlockWriteINTELPU3AS133__spirv_Image__void_1_0_0_0_0_0_2Dv2_ij(ptr addrspace(1), <2 x i32>, i32) #[[#Attrs]]
+; CHECK-SPV-IR: declare spir_func i32 @_Z40__spirv_SubgroupImageBlockReadINTEL_RintPU3AS133__spirv_Image__void_1_0_0_0_0_0_2Dv2_i(target("spirv.Image", void, 1, 0, 0, 0, 0, 0, 2), <2 x i32>) #[[#Attrs]]
+; CHECK-SPV-IR: declare spir_func void @_Z36__spirv_SubgroupImageBlockWriteINTELPU3AS133__spirv_Image__void_1_0_0_0_0_0_2Dv2_ij(target("spirv.Image", void, 1, 0, 0, 0, 0, 0, 2), <2 x i32>, i32) #[[#Attrs]]
 
 ; CHECK-COMMON: attributes #[[#Attrs]] =
 ; CHECK-COMMON-SAME: convergent

llvm-spirv/test/constant-sampler-under-control-flow.spt

@@ -98,9 +98,9 @@
 ; CHECK-LLVM: br i1 %[[cond]], label %[[br1:.*]], label %[[br0:.*]]
 
 ; CHECK-LLVM: [[br0]]:
-; CHECK-LLVM: %[[s0:.*]] = call ptr addrspace(2) @__translate_sampler_initializer(i32 23)
-; CHECK-LLVM: call spir_func ptr addrspace(1) @_Z20__spirv_SampledImagePU3AS133__spirv_Image__void_1_0_0_0_0_0_0PU3AS215__spirv_Sampler(ptr addrspace(1) %{{.*}}, ptr addrspace(2) %[[s0]])
+; CHECK-LLVM: %[[s0:.*]] = call target("spirv.Sampler") @__translate_sampler_initializer(i32 23)
+; CHECK-LLVM: call spir_func target("spirv.SampledImage", void, 1, 0, 0, 0, 0, 0, 0) @_Z20__spirv_SampledImagePU3AS133__spirv_Image__void_1_0_0_0_0_0_0PU3AS215__spirv_Sampler(target("spirv.Image", void, 1, 0, 0, 0, 0, 0, 0) %{{.*}}, target("spirv.Sampler") %[[s0]])
 
 ; CHECK-LLVM: [[br1]]:
-; CHECK-LLVM: %[[s1:.*]] = call ptr addrspace(2) @__translate_sampler_initializer(i32 23)
-; CHECK-LLVM: call spir_func ptr addrspace(1) @_Z20__spirv_SampledImagePU3AS133__spirv_Image__void_1_0_0_0_0_0_0PU3AS215__spirv_Sampler(ptr addrspace(1) %{{.*}}, ptr addrspace(2) %[[s1]])
+; CHECK-LLVM: %[[s1:.*]] = call target("spirv.Sampler") @__translate_sampler_initializer(i32 23)
+; CHECK-LLVM: call spir_func target("spirv.SampledImage", void, 1, 0, 0, 0, 0, 0, 0) @_Z20__spirv_SampledImagePU3AS133__spirv_Image__void_1_0_0_0_0_0_0PU3AS215__spirv_Sampler(target("spirv.Image", void, 1, 0, 0, 0, 0, 0, 0) %{{.*}}, target("spirv.Sampler") %[[s1]])