Author: yaxunl Date: Thu Feb 21 20:20:12 2019 New Revision: 354651 URL: http://llvm.org/viewvc/llvm-project?rev=354651&view=rev Log: revert r354615: [HIP] change kernel stub name
It caused regressions. Differential Revision: https://reviews.llvm.org/D58518 Modified: cfe/trunk/lib/CodeGen/CGCUDANV.cpp cfe/trunk/test/CodeGenCUDA/device-stub.cu Modified: cfe/trunk/lib/CodeGen/CGCUDANV.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGCUDANV.cpp?rev=354651&r1=354650&r2=354651&view=diff ============================================================================== --- cfe/trunk/lib/CodeGen/CGCUDANV.cpp (original) +++ cfe/trunk/lib/CodeGen/CGCUDANV.cpp Thu Feb 21 20:20:12 2019 @@ -227,12 +227,6 @@ void CGNVCUDARuntime::emitDeviceStub(Cod 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 Modified: cfe/trunk/test/CodeGenCUDA/device-stub.cu URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCUDA/device-stub.cu?rev=354651&r1=354650&r2=354651&view=diff ============================================================================== --- cfe/trunk/test/CodeGenCUDA/device-stub.cu (original) +++ cfe/trunk/test/CodeGenCUDA/device-stub.cu Thu Feb 21 20:20:12 2019 @@ -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 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
