From b12edbe9078123d0f2bc3cd0f9eb566847c5d8fc Mon Sep 17 00:00:00 2001
From: Keith Lowery <klowery@amd.com>
Date: Tue, 17 Jan 2023 05:06:56 -0600
Subject: [PATCH] Implemented the --use-rocscope command-line argument

Signed-off-by: coleramos425 <colramos@amd.com>


[ROCm/rocprofiler-compute commit: 60eca50d0289bc1ffe34eda11442c4be370aa56e]
---
 projects/rocprofiler-compute/src/omniperf | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/projects/rocprofiler-compute/src/omniperf b/projects/rocprofiler-compute/src/omniperf
index fd5066d325..b592be740e 100755
--- a/projects/rocprofiler-compute/src/omniperf
+++ b/projects/rocprofiler-compute/src/omniperf
@@ -275,13 +275,13 @@ def characterize_app(path, cmd, verbose):
     # Workload profiling
     for fname in glob.glob(workload_dir + "/perfmon/*.txt"):
         print(fname)
-        run_prof(fname, workload_dir, perfmon_dir, app_cmd, verbose, False)
+        run_prof(fname, workload_dir, perfmon_dir, app_cmd, verbose)
 
 ################################################
 # Profiling Helpers
 ################################################
 
-def run_rocscope(args):
+def run_rocscope(args, fname):
     # profile the app
     if args.use_rocscope == True:
         result = subprocess.run(["which", "rocscope"], stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
@@ -290,14 +290,16 @@ def run_rocscope(args):
                       "metrics",
                       "-p", args.path,
                       "-n", args.name,
+                      "-t", fname,
                       "--", args.remaining]
             print(rs_cmd)
             result = subprocess.run(rs_cmd) #, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
             if result.returncode != 0:
                 print(result.stderr.decode('ascii'))
+                sys.exit(1)
 
 
-def run_prof(fname, workload_dir, perfmon_dir, cmd, verbose, use_rocscope):
+def run_prof(fname, workload_dir, perfmon_dir, cmd, verbose):
     global rocprof_cmd
 
     fbase = os.path.splitext(os.path.basename(fname))[0]
@@ -421,7 +423,10 @@ def omniperf_profile(args):
                         fname,
                     ]
                 )
-            run_prof(fname, workload_dir, perfmon_dir, args.remaining, args.verbose, args.use_rocscope)
+            if args.use_rocscope == True:
+                run_rocscope(args, fname)
+            else:
+                run_prof(fname, workload_dir, perfmon_dir, args.remaining, args.verbose)