Fix up SPIR-V data-layout strings for LLVM 20

Author: kinke

gen/dcompute/targetOCL.cpp

@@ -25,30 +25,39 @@
 
 // from SPIRVInternal.h
 #if LDC_LLVM_VER < 1900
-#define SPIR_TARGETTRIPLE32 "spir-unknown-unknown"
-#define SPIR_TARGETTRIPLE64 "spir64-unknown-unknown"
-#define SPIR_DATALAYOUT32                                                      \
-  "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32"                             \
-  "-i64:64:64-f32:32:32-f64:64:64-v16:16:16-v24:32:32"                         \
-  "-v32:32:32-v48:64:64-v64:64:64-v96:128:128"                                 \
-  "-v128:128:128-v192:256:256-v256:256:256"                                    \
-  "-v512:512:512-v1024:1024:1024"
-#define SPIR_DATALAYOUT64                                                      \
-  "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32"                             \
-  "-i64:64:64-f32:32:32-f64:64:64-v16:16:16-v24:32:32"                         \
-  "-v32:32:32-v48:64:64-v64:64:64-v96:128:128"                                 \
-  "-v128:128:128-v192:256:256-v256:256:256"                                    \
-  "-v512:512:512-v1024:1024:1024"
-#else
-#define SPIR_TARGETTRIPLE32 "spirv-unknown-unknown"
-#define SPIR_TARGETTRIPLE64 "spirv64-unknown-unknown"
-#define SPIR_DATALAYOUT32                                                      \
-  "e-p:32:32-i64:64-v16:16-v24:32-v32:32-v48:64"                               \
-  "-v96:128-v192:256-v256:256-v512:512-v1024:1024-G1"
-#define SPIR_DATALAYOUT64                                                      \
-  "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128"                               \
-  "-v192:256-v256:256-v512:512-v1024:1024-G1"
-#endif
+#  define SPIR_TARGETTRIPLE32 "spir-unknown-unknown"
+#  define SPIR_TARGETTRIPLE64 "spir64-unknown-unknown"
+#  define SPIR_DATALAYOUT32                                                    \
+     "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32"                          \
+     "-i64:64:64-f32:32:32-f64:64:64-v16:16:16-v24:32:32"                      \
+     "-v32:32:32-v48:64:64-v64:64:64-v96:128:128"                              \
+     "-v128:128:128-v192:256:256-v256:256:256"                                 \
+     "-v512:512:512-v1024:1024:1024"
+#  define SPIR_DATALAYOUT64                                                    \
+     "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32"                          \
+     "-i64:64:64-f32:32:32-f64:64:64-v16:16:16-v24:32:32"                      \
+     "-v32:32:32-v48:64:64-v64:64:64-v96:128:128"                              \
+     "-v128:128:128-v192:256:256-v256:256:256"                                 \
+     "-v512:512:512-v1024:1024:1024"
+#else // LLVM 19+
+#  define SPIR_TARGETTRIPLE32 "spirv-unknown-unknown"
+#  define SPIR_TARGETTRIPLE64 "spirv64-unknown-unknown"
+#  if LDC_LLVM_VER < 2000
+#    define SPIR_DATALAYOUT32                                                  \
+       "e-p:32:32-i64:64-v16:16-v24:32-v32:32-v48:64"                          \
+       "-v96:128-v192:256-v256:256-v512:512-v1024:1024-G1"
+#    define SPIR_DATALAYOUT64                                                  \
+       "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128"                          \
+       "-v192:256-v256:256-v512:512-v1024:1024-G1"
+#  else // LLVM 20+
+#    define SPIR_DATALAYOUT32                                                  \
+       "e-p:32:32-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"
+#    define SPIR_DATALAYOUT64                                                  \
+       "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"
+#  endif // LLVM 20+
+#endif // LLVM 19+
 
 using namespace dmd;