[CUDA][Integrate] Switch CUDATarget to to ptx_kernel cc.

This drops the local LLVM revert: llvm/llvm-project@de7438e Signed-off-by: hanhanW <[email protected]>
iree-org · Feb 6, 2025 · 2968631 · 2968631
1 parent 86b845b
commit 2968631
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/compiler/plugins/target/CUDA/CUDATarget.cpp b/compiler/plugins/target/CUDA/CUDATarget.cpp
@@ -545,7 +545,7 @@ class CUDATargetBackend final : public TargetBackend {
         };
 
         // Mark the entry point as a kernel.
-        setMetadataValueI32("kernel", 1);
+        llvmFunc->setCallingConv(llvm::CallingConv::PTX_Kernel);
 
         // Set the maximum number of threads in the thread block (CTA).
         auto exportOp = exportOpMap[funcOp.getName()];

diff --git a/third_party/llvm-project b/third_party/llvm-project
+4 −0		llvm/include/llvm/IR/AutoUpgrade.h
+1 −0		llvm/lib/AsmParser/LLParser.cpp
+2 −0		llvm/lib/Bitcode/Reader/BitcodeReader.cpp
+67 −0		llvm/lib/IR/AutoUpgrade.cpp
+1 −0		llvm/lib/Linker/IRMover.cpp
+9 −18		llvm/lib/Target/NVPTX/NVPTXUtilities.cpp
+6 −1		llvm/lib/Target/NVPTX/NVPTXUtilities.h
+4 −24		llvm/lib/Transforms/IPO/OpenMPOpt.cpp
+28 −0		llvm/test/CodeGen/NVPTX/upgrade-nvvm-annotations.ll