use 9 for program AS, enable function ptr ext by default

Signed-off-by: Sarnie, Nick <[email protected]>

Author: sarnex

clang/lib/Basic/Targets/SPIR.h

@@ -477,7 +477,7 @@ class LLVM_LIBRARY_VISIBILITY SPIRV64IntelTargetInfo final
     assert(Triple.getVendor() == llvm::Triple::VendorType::Intel &&
            "64-bit Intel SPIR-V target must use Intel vendor");
     resetDataLayout("e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-"
-                    "v256:256-v512:512-v1024:1024-n8:16:32:64-G1-P4-A0");
+                    "v256:256-v512:512-v1024:1024-n8:16:32:64-G1-P9-A0");
   }
 };
 } // namespace targets

clang/test/CodeGenSPIRV/spirv-intel.c

@@ -3,7 +3,7 @@
 // RUN: %clang_cc1 -triple spir-intel %s -emit-llvm -o - | FileCheck -check-prefix=CHECK-WITHOUT %s
 // RUN: %clang_cc1 -triple spir64-intel %s -emit-llvm -o - | FileCheck -check-prefix=CHECK-WITHOUT %s
 
-// CHECK-WITH-64: spir_func void @foo(ptr addrspace(4) noundef %param) addrspace(4) #0 {
+// CHECK-WITH-64: spir_func void @foo(ptr addrspace(4) noundef %param) addrspace(9) #0 {
 // CHECK-WITH-32: spir_func void @foo(ptr addrspace(4) noundef %param) #0 {
 
 // CHECK-WITHOUT: spir_func void @foo(ptr noundef %param) #0 {

clang/test/OpenMP/spirv_variant_match.cpp

@@ -35,7 +35,7 @@ int foo() { return 1; }
 
 // CHECK-DAG: define{{.*}} @{{"_Z[0-9]+foo\$ompvariant\$.*"}}()
 
-// CHECK-DAG: call spir_func noundef addrspace(4) i32 @{{"_Z[0-9]+foo\$ompvariant\$.*"}}()
+// CHECK-DAG: call spir_func noundef addrspace(9) i32 @{{"_Z[0-9]+foo\$ompvariant\$.*"}}()
 
 int main() {
   int res;

llvm/lib/Target/SPIRV/SPIRVSubtarget.cpp

@@ -90,6 +90,10 @@ SPIRVSubtarget::SPIRVSubtarget(const Triple &TT, const std::string &CPU,
   else
     Env = Unknown;
 
+  // Set the default extensions based on the target triple.
+  if (TargetTriple.getVendor() == Triple::Intel)
+    Extensions.insert(SPIRV::Extension::SPV_INTEL_function_pointers);
+
   // The order of initialization is important.
   initAvailableExtensions(Extensions);
   initAvailableExtInstSets();

llvm/lib/Target/SPIRV/SPIRVTargetMachine.cpp

@@ -79,7 +79,7 @@ static std::string computeDataLayout(const Triple &TT) {
            "v512:512-v1024:1024-n32:64-S32-G1-P4-A0";
   if (TT.getVendor() == Triple::VendorType::Intel)
     return "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-"
-           "v512:512-v1024:1024-n8:16:32:64-G1-P4-A0";
+           "v512:512-v1024:1024-n8:16:32:64-G1-P9-A0";
   return "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-"
          "v512:512-v1024:1024-n8:16:32:64-G1";
 }