opencl_constant only for ocl

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

Author: sarnex

clang/lib/Basic/Targets/SPIR.h

@@ -376,9 +376,18 @@ class LLVM_LIBRARY_VISIBILITY SPIRV64TargetInfo : public BaseSPIRVTargetInfo {
   }
 
   std::optional<LangAS> getConstantAddressSpace() const override {
+    return ConstantAS;
+  }
+  void adjust(DiagnosticsEngine &Diags, LangOptions &Opts) override {
+    BaseSPIRVTargetInfo::adjust(Diags, Opts);
     // opencl_constant will map to UniformConstant in SPIR-V
-    return LangAS::opencl_constant;
+    if (Opts.OpenCL)
+      ConstantAS = LangAS::opencl_constant;
   }
+
+private:
+  // opencl_global will map to CrossWorkgroup in SPIR-V
+  LangAS ConstantAS = LangAS::opencl_global;
 };
 
 class LLVM_LIBRARY_VISIBILITY SPIRV64AMDGCNTargetInfo final

clang/test/OpenMP/spirv_target_addrspace.c

@@ -5,7 +5,7 @@ extern int printf(char[]);
 
 #pragma omp declare target
 // CHECK: @global = addrspace(1) global i32 0, align 4
-// CHECK: @.str = private unnamed_addr addrspace(2) constant [4 x i8] c"foo\00", align 1f
+// CHECK: @.str = private unnamed_addr addrspace(1) constant [4 x i8] c"foo\00", align 1
 int global = 0;
 #pragma omp end declare target
 int main() {