https://github.com/shiltian updated
https://github.com/llvm/llvm-project/pull/78333
>From 5eb2678a0a6a55c2d441b322d4eaaa8fe829a30f Mon Sep 17 00:00:00 2001
From: Shilei Tian <i...@tianshilei.me>
Date: Tue, 23 Jan 2024 16:14:48 -0500
Subject: [PATCH] [Clang][Driver] Fix `--save-temps` for OpenCL AoT compilation
We can directly call `clang -c -x cl -target amdgcn -mcpu=gfx90a test.cl -o
test.o`
to compile an OpenCL kernel file. However, when `--save-temps` is enabled, it
doesn't
work because the preprocessed file (`.i` file) is taken as C source file when
it
is fed to the front end, thus causing compilation error because those OpenCL
keywords
can't be recognized. This patch fixes the issue.
---
clang/include/clang/Driver/Types.def | 6 ++++--
clang/lib/Driver/Types.cpp | 7 ++++++-
clang/test/Driver/opencl_aot_save_temps.cl | 16 ++++++++++++++++
3 files changed, 26 insertions(+), 3 deletions(-)
create mode 100644 clang/test/Driver/opencl_aot_save_temps.cl
diff --git a/clang/include/clang/Driver/Types.def
b/clang/include/clang/Driver/Types.def
index b889883125c4c16..f72c27e1ee70193 100644
--- a/clang/include/clang/Driver/Types.def
+++ b/clang/include/clang/Driver/Types.def
@@ -37,8 +37,10 @@
// C family source language (with and without preprocessing).
TYPE("cpp-output", PP_C, INVALID, "i",
phases::Compile, phases::Backend, phases::Assemble, phases::Link)
TYPE("c", C, PP_C, "c",
phases::Preprocess, phases::Compile, phases::Backend, phases::Assemble,
phases::Link)
-TYPE("cl", CL, PP_C, "cl",
phases::Preprocess, phases::Compile, phases::Backend, phases::Assemble,
phases::Link)
-TYPE("clcpp", CLCXX, PP_CXX, "clcpp",
phases::Preprocess, phases::Compile, phases::Backend, phases::Assemble,
phases::Link)
+TYPE("cl", CL, PP_CL, "cl",
phases::Preprocess, phases::Compile, phases::Backend, phases::Assemble,
phases::Link)
+TYPE("cl-cpp-output", PP_CL, INVALID, "cli",
phases::Compile, phases::Backend, phases::Assemble, phases::Link)
+TYPE("clcpp", CLCXX, PP_CLCXX, "clcpp",
phases::Preprocess, phases::Compile, phases::Backend, phases::Assemble,
phases::Link)
+TYPE("clcpp-cpp-output", PP_CLCXX, INVALID, "clii",
phases::Compile, phases::Backend, phases::Assemble, phases::Link)
TYPE("cuda-cpp-output", PP_CUDA, INVALID, "cui",
phases::Compile, phases::Backend, phases::Assemble, phases::Link)
TYPE("cuda", CUDA, PP_CUDA, "cu",
phases::Preprocess, phases::Compile, phases::Backend, phases::Assemble,
phases::Link)
TYPE("cuda", CUDA_DEVICE, PP_CUDA, "cu",
phases::Preprocess, phases::Compile, phases::Backend, phases::Assemble,
phases::Link)
diff --git a/clang/lib/Driver/Types.cpp b/clang/lib/Driver/Types.cpp
index 08df34ade7b6530..a7b6b9000e1d2b1 100644
--- a/clang/lib/Driver/Types.cpp
+++ b/clang/lib/Driver/Types.cpp
@@ -133,7 +133,7 @@ bool types::isAcceptedByClang(ID Id) {
case TY_Asm:
case TY_C: case TY_PP_C:
- case TY_CL: case TY_CLCXX:
+ case TY_CL: case TY_PP_CL: case TY_CLCXX: case TY_PP_CLCXX:
case TY_CUDA: case TY_PP_CUDA:
case TY_CUDA_DEVICE:
case TY_HIP:
@@ -181,7 +181,9 @@ bool types::isDerivedFromC(ID Id) {
case TY_PP_C:
case TY_C:
case TY_CL:
+ case TY_PP_CL:
case TY_CLCXX:
+ case TY_PP_CLCXX:
case TY_PP_CUDA:
case TY_CUDA:
case TY_CUDA_DEVICE:
@@ -241,6 +243,7 @@ bool types::isCXX(ID Id) {
case TY_PP_CXXHeaderUnit:
case TY_ObjCXXHeader: case TY_PP_ObjCXXHeader:
case TY_CXXModule: case TY_PP_CXXModule:
+ case TY_PP_CLCXX:
case TY_CUDA: case TY_PP_CUDA: case TY_CUDA_DEVICE:
case TY_HIP:
case TY_PP_HIP:
@@ -310,7 +313,9 @@ types::ID types::lookupTypeForExtension(llvm::StringRef
Ext) {
.Case("cc", TY_CXX)
.Case("CC", TY_CXX)
.Case("cl", TY_CL)
+ .Case("cli", TY_PP_CL)
.Case("clcpp", TY_CLCXX)
+ .Case("clii", TY_PP_CLCXX)
.Case("cp", TY_CXX)
.Case("cu", TY_CUDA)
.Case("hh", TY_CXXHeader)
diff --git a/clang/test/Driver/opencl_aot_save_temps.cl
b/clang/test/Driver/opencl_aot_save_temps.cl
new file mode 100644
index 000000000000000..7b3149871f8fc2c
--- /dev/null
+++ b/clang/test/Driver/opencl_aot_save_temps.cl
@@ -0,0 +1,16 @@
+// RUN: %clang -x cl --save-temps -c -### %s 2>&1 | FileCheck %s
+// RUN: %clang -x cl -ccc-print-phases -c %s 2>&1 | FileCheck %s
-check-prefix=CHECK-PHASES
+
+// CHECK: "-o" "[[CLI_NAME:.+]].cli" "-x" "cl"
+// CHECK-NEXT: "-o" "[[CLI_NAME]].bc" "-x"
"cl-cpp-output"{{.*}}"[[CLI_NAME:.+]].cli"
+
+// CHECK-PHASES: 0: input, {{.*}}, cl
+// CHECK-PHASES: 1: preprocessor, {0}, cl-cpp-output
+// CHECK-PHASES: 2: compiler, {1}, ir
+
+uint3 add(uint3 a, uint3 b) {
+ ulong x = a.x + (ulong)b.x;
+ ulong y = a.y + (ulong)b.y + (x >> 32);
+ uint z = a.z + b.z + (y >> 32);
+ return (uint3)(x, y, z);
+}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
