Fix using ATP markers

Change-Id: If2d04f80b580237426c569737551e2001a8cd35a


[ROCm/hip commit: b23fad53cc]

projects/hip/bin/hipcc

@@ -31,10 +31,6 @@ $verbose = 0 unless defined $verbose;
 $HIP_PATH=$ENV{'HIP_PATH'};
 $HIP_PATH=dirname (dirname $0) unless defined $HIP_PATH;        # use parent directory of hipcc
 
-$CODEXL_PATH = $ENV{'CODEXL_PATH'};
-$CODEXL_PATH = "/opt/AMD/CodeXL" unless defined $CODEXL_PATH;
-$marker_path = "$CODEXL_PATH/SDK/AMDTActivityLogger";
-
 #---
 #HIP_PLATFORM controls whether to use NVCC or HCC for compilation:
 $HIP_PLATFORM= `$HIP_PATH/bin/hipconfig --platform`;
@@ -60,6 +56,11 @@ if ($HIP_PLATFORM eq "hcc") {
     $ROCM_PATH=$ENV{'ROCM_PATH'};
     $ROCM_PATH="/opt/rocm" unless defined $ROCM_PATH;
 
+    $HIP_ATP_MARKER=$ENV{'HIP_ATP_MARKER'};
+    if ($HIP_ATP_MARKER) {
+        $marker_path = "$ROCM_PATH/profiler/CXLActivityLogger";
+    }
+
     $ROCM_TARGET=$ENV{'ROCM_TARGET'};
     $ROCM_TARGET="fiji" unless defined $ROCM_TARGET;
 
@@ -97,14 +98,16 @@ if ($HIP_PLATFORM eq "hcc") {
 
     # Add trace marker library:
     # TODO - once we cleanly separate the HIP API headers from HIP library headers this logic should move to CMakebuild option - apps do not need to see the marker library.
-    $marker_inc_path = "$marker_path/include";
-    if (-e $marker_inc_path) {
-        $HIPCXXFLAGS .= " -I$marker_inc_path";
-    }
+    if ($HIP_ATP_MARKER) {
+        $marker_inc_path = "$marker_path/include";
+        if (-e $marker_inc_path) {
+            $HIPCXXFLAGS .= " -I$marker_inc_path";
+        }
 
-    $marker_lib_path = "$marker_path/bin/x86_64";
-    if (-e $marker_lib_path) {
-        $HIPLDFLAGS .= " -L$marker_lib_path -lAMDTActivityLogger";
+        $marker_lib_path = "$marker_path/bin/x86_64";
+        if (-e $marker_lib_path) {
+            $HIPLDFLAGS .= " -L$marker_lib_path -lCXLActivityLogger -Wl,--rpath=$marker_lib_path";
+        }
     }
 
     # Add C++ libs for GCC.