From 0ce92a14539bfa8c041c1cb16beba24e2e72a077 Mon Sep 17 00:00:00 2001 From: Yaxun Liu Date: Fri, 22 Feb 2019 04:20:12 +0000 Subject: [PATCH] revert r354615: [HIP] change kernel stub name It caused regressions. Differential Revision: https://reviews.llvm.org/D58518 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@354651 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CGCUDANV.cpp | 6 ------ test/CodeGenCUDA/device-stub.cu | 3 +-- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/lib/CodeGen/CGCUDANV.cpp b/lib/CodeGen/CGCUDANV.cpp index 6f7295bf4b..62661039a3 100644 --- a/lib/CodeGen/CGCUDANV.cpp +++ b/lib/CodeGen/CGCUDANV.cpp @@ -227,12 +227,6 @@ void CGNVCUDARuntime::emitDeviceStub(CodeGenFunction &CGF, emitDeviceStubBodyNew(CGF, Args); else emitDeviceStubBodyLegacy(CGF, Args); - - // Postfix kernel stub names with .stub to differentiate them from kernel - // names in device binaries. This is to facilitate the debugger to find - // the correct symbols for kernels in the device binary. - if (CGF.getLangOpts().HIP) - CGF.CurFn->setName(CGF.CurFn->getName() + ".stub"); } // CUDA 9.0+ uses new way to launch kernels. Parameters are packed in a local diff --git a/test/CodeGenCUDA/device-stub.cu b/test/CodeGenCUDA/device-stub.cu index 3be0e7b2ec..387a787cce 100644 --- a/test/CodeGenCUDA/device-stub.cu +++ b/test/CodeGenCUDA/device-stub.cu @@ -145,8 +145,7 @@ void use_pointers() { // Test that we build the correct number of calls to cudaSetupArgument followed // by a call to cudaLaunch. -// CUDA-LABEL: define{{.*}}kernelfunc -// HIP-LABEL: define{{.*}}@_Z10kernelfunciii.stub +// LNX: define{{.*}}kernelfunc // New launch sequence stores arguments into local buffer and passes array of // pointers to them directly to cudaLaunchKernel -- 2.50.1