From a8d64bf7e9f424562911bdf42c8446c58a203bbb Mon Sep 17 00:00:00 2001
From: coleramos425 <colramos@amd.com>
Date: Wed, 25 Jan 2023 15:30:04 -0600
Subject: [PATCH] Modify parameters for calls to rocscope

Signed-off-by: coleramos425 <colramos@amd.com>
---
 src/omniperf | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/omniperf b/src/omniperf
index 9931b3d7fd..ca15939679 100755
--- a/src/omniperf
+++ b/src/omniperf
@@ -331,9 +331,11 @@ def run_rocscope(args, fname):
                       "-p", args.path,
                       "-n", args.name,
                       "-t", fname,
-                      "--", args.remaining]
+                      "--"]
+            for i in args.remaining.split():
+                rs_cmd.append(i)
             print(rs_cmd)
-            result = subprocess.run(rs_cmd) #, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            result = run_subprocess(rs_cmd) #, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
             if result.returncode != 0:
                 print(result.stderr.decode('ascii'))
                 sys.exit(1)
@@ -381,9 +383,9 @@ def omniperf_profile(args, VER):
     print("Dispatch Selection: ", args.dispatch)
 
     if args.ipblocks == None:
-        print("IP Blocks: All")
+        print("IP Blocks: All", "\n")
     else:
-        print("IP Blocks: ", args.ipblocks)
+        print("IP Blocks: ", args.ipblocks, "\n")
 
     # Set up directories
     workload_dir = args.path + "/" + args.name + "/" + args.target
@@ -408,9 +410,11 @@ def omniperf_profile(args, VER):
                       "top10",
                       "-p", args.path,
                       "-n", args.name,
-                      "--", args.remaining]
+                      "--"]
+            for i in args.remaining.split():
+                rs_cmd.append(i)
             print(rs_cmd)
-            result = subprocess.run(rs_cmd) #, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            result = run_subprocess(rs_cmd) #, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
             if result.returncode != 0:
                 print(result.stderr.decode('ascii'))
         else:
@@ -432,9 +436,11 @@ def omniperf_profile(args, VER):
                       "summary",
                       "-p", args.path,
                       "-n", args.name,
-                      "--", args.remaining]
+                      "--"]
+            for i in args.remaining.split():
+                rs_cmd.append(i)
             print(rs_cmd)
-            result = subprocess.run(rs_cmd) #, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            result = run_subprocess(rs_cmd) #, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
             if result.returncode != 0:
                 print(result.stderr.decode('ascii'))
         else: