From c8b72cb926b3b89846e4f1a817a456c7e1a69fc0 Mon Sep 17 00:00:00 2001 From: Ben Sander Date: Thu, 27 Jul 2017 22:00:15 -0500 Subject: [PATCH 1/2] Pass kernel name to HCC dispatch_hsa_kernel, for debug/profile [ROCm/clr commit: a282351763c46c7d29bb211bc162d5cec7bedad2] --- projects/clr/hipamd/src/hip_module.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/projects/clr/hipamd/src/hip_module.cpp b/projects/clr/hipamd/src/hip_module.cpp index b8c032da27..5dad689c69 100644 --- a/projects/clr/hipamd/src/hip_module.cpp +++ b/projects/clr/hipamd/src/hip_module.cpp @@ -452,10 +452,7 @@ hipError_t ihipModuleLaunchKernel(hipFunction_t f, lp.av->dispatch_hsa_kernel(&aql, config[1] /* kernarg*/, kernArgSize, (startEvent || stopEvent) ? &cf : nullptr -#define USE_NAMED_KERNEL 0 -#if USE_NAMED_KERNEL , f->_name.c_str() -#endif ); From 004080bff872105c5cbcfc2b5dddf2be194a807a Mon Sep 17 00:00:00 2001 From: Ben Sander Date: Thu, 27 Jul 2017 23:00:58 -0500 Subject: [PATCH 2/2] Add workweek check to make sure we have a new enough compiler [ROCm/clr commit: 2781293e898b098c825082057bf3583772215315] --- projects/clr/hipamd/src/hip_module.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/clr/hipamd/src/hip_module.cpp b/projects/clr/hipamd/src/hip_module.cpp index 5dad689c69..10fcd15fdc 100644 --- a/projects/clr/hipamd/src/hip_module.cpp +++ b/projects/clr/hipamd/src/hip_module.cpp @@ -452,7 +452,9 @@ hipError_t ihipModuleLaunchKernel(hipFunction_t f, lp.av->dispatch_hsa_kernel(&aql, config[1] /* kernarg*/, kernArgSize, (startEvent || stopEvent) ? &cf : nullptr +#if (__hcc_workweek__ >= 17300) , f->_name.c_str() +#endif );