From 7eb7ef2d8eb8d9d1a1bbfe3d06fedb2e97c5bd16 Mon Sep 17 00:00:00 2001 From: Evgeny Mankov Date: Mon, 3 Apr 2017 22:05:01 +0300 Subject: [PATCH] [HIPIFY] GGL support + hipLaunchKernel -> hipLaunchKernelGGL + macro HIP_KERNEL_NAME is no longer used [ROCm/clr commit: 81415a41b807f9e25b048ef17b6e5a77022c47b5] --- projects/clr/hipamd/hipify-clang/src/Cuda2Hip.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/clr/hipamd/hipify-clang/src/Cuda2Hip.cpp b/projects/clr/hipamd/hipify-clang/src/Cuda2Hip.cpp index 27447b8d8c..383af0440c 100644 --- a/projects/clr/hipamd/hipify-clang/src/Cuda2Hip.cpp +++ b/projects/clr/hipamd/hipify-clang/src/Cuda2Hip.cpp @@ -2426,9 +2426,9 @@ private: XStr.clear(); if (calleeName.find(',') != StringRef::npos) { SmallString<128> tmpData; - calleeName = Twine("HIP_KERNEL_NAME(" + calleeName + ")").toStringRef(tmpData); + calleeName = Twine("(" + calleeName + ")").toStringRef(tmpData); } - OS << "hipLaunchKernel(" << calleeName << ","; + OS << "hipLaunchKernelGGL(" << calleeName << ","; const CallExpr *config = launchKernel->getConfig(); DEBUG(dbgs() << "Kernel config arguments:" << "\n"); SourceManager *SM = Result.SourceManager; @@ -2468,7 +2468,7 @@ private: Replacement Rep(*SM, launchKernel->getLocStart(), length, OS.str()); FullSourceLoc fullSL(launchKernel->getLocStart(), *SM); insertReplacement(Rep, fullSL); - hipCounter counter = {"hipLaunchKernel", CONV_KERN, API_RUNTIME}; + hipCounter counter = {"hipLaunchKernelGGL", CONV_KERN, API_RUNTIME}; updateCounters(counter, refName.str()); return true; }