[clang] f9ee5ce - [clang][SPIR-V] Fix OpenCL addrspace mapping when using non-zero default AS (#137187)

[via cfe-commits]

Author: Nick Sarnie
Date: 2025-04-28T19:26:01Z
New Revision: f9ee5ce605f94d905d3112fd0923a5fd23e48dd3

URL: https://github.com/llvm/llvm-project/commit/f9ee5ce605f94d905d3112fd0923a5fd23e48dd3
DIFF: https://github.com/llvm/llvm-project/commit/f9ee5ce605f94d905d3112fd0923a5fd23e48dd3.diff

LOG: [clang][SPIR-V] Fix OpenCL addrspace mapping when using non-zero default AS (#137187)

Based on feedback from https://github.com/llvm/llvm-project/pull/136753,
remove the dummy values for OpenCL and make them match the zero default
AS map.

Signed-off-by: Sarnie, Nick <nick.sarnie at intel.com>

Added: 
    

Modified: 
    clang/lib/Basic/Targets/SPIR.h

Removed: 
    


################################################################################
diff  --git a/clang/lib/Basic/Targets/SPIR.h b/clang/lib/Basic/Targets/SPIR.h
index 310ef9f2df2c6..bf249e271a870 100644
--- a/clang/lib/Basic/Targets/SPIR.h
+++ b/clang/lib/Basic/Targets/SPIR.h
@@ -58,15 +58,13 @@ static const unsigned SPIRDefIsPrivMap[] = {
 // Used by both the SPIR and SPIR-V targets.
 static const unsigned SPIRDefIsGenMap[] = {
     4, // Default
-    // Some OpenCL address space values for this map are dummy and they can't be
-    // used
     1, // opencl_global
-    0, // opencl_local
-    0, // opencl_constant
+    3, // opencl_local
+    2, // opencl_constant
     0, // opencl_private
-    0, // opencl_generic
-    0, // opencl_global_device
-    0, // opencl_global_host
+    4, // opencl_generic
+    5, // opencl_global_device
+    6, // opencl_global_host
     // cuda_* address space mapping is intended for HIPSPV (HIP to SPIR-V
     // translation). This mapping is enabled when the language mode is HIP.
     1, // cuda_device