From 093a4511ee6e3001bd9feb90165211e4dd3c528b Mon Sep 17 00:00:00 2001
From: Karl W Schulz <karl.schulz@amd.com>
Date: Thu, 18 Apr 2024 10:38:52 -0500
Subject: [PATCH] update logic to detect roofline binaries in two alternate
 paths depending on whether user is running within local clone or from form
 install.

Signed-off-by: Karl W Schulz <karl.schulz@amd.com>
---
 src/utils/utils.py | 44 +++++++++++++++++++++++++++++---------------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/utils/utils.py b/src/utils/utils.py
index 6fdb6f5b6a..6f541c7030 100644
--- a/src/utils/utils.py
+++ b/src/utils/utils.py
@@ -442,26 +442,40 @@ def mibench(args, mspec):
         "22.04": "ubuntu22_04",
     }
 
+    binary_paths = []
+
     target_binary = detect_roofline(mspec)
     if target_binary["rocm_ver"] == "override":
-        path_to_binary = target_binary["path"]
+        binary_paths.append(target_binary["path"])
     else:
-        path_to_binary = (
-            str(config.omniperf_home)
-            + "/utils/rooflines/roofline"
-            + "-"
-            + distro_map[target_binary["distro"]]
-            + "-"
-            + mspec.gpu_model.lower()
-            + "-rocm"
-            + target_binary["rocm_ver"]
-        )
+        # check two potential locations for roofline binaries due to differences in
+        # development usage vs formal install
+        potential_paths = [
+            "%s/utils/rooflines/roofline" % config.omniperf_home,
+            "%s/bin/roofline" % config.omniperf_home.parent.parent,
+        ]
+
+        for dir in potential_paths:
+            path_to_binary = (
+                dir
+                + "-"
+                + distro_map[target_binary["distro"]]
+                + "-"
+                + mspec.gpu_model.lower()
+                + "-rocm"
+                + target_binary["rocm_ver"]
+            )
+            binary_paths.append(path_to_binary)
 
     # Distro is valid but cant find rocm ver
-    if not os.path.exists(path_to_binary):
-        console_error(
-            "roofline", "Unable to locate expected binary (%s)." % path_to_binary
-        )
+    found = False
+    for path in binary_paths:
+        if os.path.exists(path):
+            found = True
+            break
+
+    if not found:
+        console_error("roofline", "Unable to locate expected binary (%s)." % binary_paths)
 
     subprocess.run(
         [