Miscellaneous Testing Fixes + CMake find_package include guard (#1106)

* Improve ROCPROFILER_DEFAULT_FAIL_REGEX

* Support find_package called twice

* Skip iteration of ROCPROFILER_AGENT_TYPE_CPU

* Relax tests/rocprofv3/summary

* Tweak to rocprofiler-sdk-tool/tool.cpp

* Move rocprofv3-trigger-list-metrics to libexec

* Remove PC_SAMPLING_TESTS_REGEX from CI workflow

* Update packaging

- core component depends on roctx component

* Increase verbosity for failing tests

* Fix RPATH of rocprofv3-trigger-list-metrics

---------

Co-authored-by: Gopesh Bhardwaj <gopesh.bhardwaj@amd.com>

source/CMakeLists.txt

@@ -7,5 +7,6 @@ endif()
 
 add_subdirectory(include)
 add_subdirectory(lib)
+add_subdirectory(libexec)
 add_subdirectory(bin)
 add_subdirectory(docs)

source/bin/rocprofv3.py

@@ -830,7 +830,7 @@ def run(app_args, args, **kwargs):
         sys.stderr.flush()
 
     if args.list_metrics:
-        app_args = [f"{ROCM_DIR}/lib/rocprofiler-sdk/rocprofv3-trigger-list-metrics"]
+        app_args = [f"{ROCM_DIR}/libexec/rocprofv3-trigger-list-metrics"]
 
     elif not app_args:
         log_config(app_env)

source/lib/rocprofiler-sdk-tool/CMakeLists.txt

@@ -65,21 +65,4 @@ install(
     COMPONENT tools
     EXPORT rocprofiler-sdk-tool-targets)
 
-add_executable(rocprofv3-trigger-list-metrics)
-target_sources(rocprofv3-trigger-list-metrics PRIVATE rocprofv3_trigger_list_metrics.cpp)
-target_link_libraries(rocprofv3-trigger-list-metrics
-                      PRIVATE rocprofiler-sdk::rocprofiler-hsa-runtime)
-set_target_properties(
-    rocprofv3-trigger-list-metrics
-    PROPERTIES RUNTIME_OUTPUT_DIRECTORY
-               ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/rocprofiler-sdk
-               BUILD_RPATH "\$ORIGIN:\$ORIGIN/.."
-               INSTALL_RPATH "\$ORIGIN:\$ORIGIN/..")
-
-install(
-    TARGETS rocprofv3-trigger-list-metrics
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/rocprofiler-sdk
-    COMPONENT tools
-    EXPORT rocprofiler-sdk-tool-targets)
-
 add_subdirectory(kokkosp)

source/lib/rocprofiler-sdk-tool/helper.hpp

@@ -71,14 +71,9 @@
         {                                                                                          \
             std::string status_msg =                                                               \
                 rocprofiler_get_status_string(ROCPROFILER_VARIABLE(CHECKSTATUS, __LINE__));        \
-            std::cerr << "[" #result "][" << __FILE__ << ":" << __LINE__ << "] " << msg            \
-                      << " failed with error code " << ROCPROFILER_VARIABLE(CHECKSTATUS, __LINE__) \
-                      << ": " << status_msg << "\n"                                                \
-                      << std::flush;                                                               \
-            std::stringstream errmsg{};                                                            \
-            errmsg << "[" #result "][" << __FILE__ << ":" << __LINE__ << "] " << msg " failure ("  \
-                   << status_msg << ")";                                                           \
-            throw std::runtime_error(errmsg.str());                                                \
+            ROCP_FATAL << " :: [" << __FILE__ << ":" << __LINE__ << "]\n\t" << #result << "\n\n"   \
+                       << msg << " failed with error code "                                        \
+                       << ROCPROFILER_VARIABLE(CHECKSTATUS, __LINE__) << ": " << status_msg;       \
         }                                                                                          \
     }
 

source/lib/rocprofiler-sdk-tool/tool.cpp

@@ -1181,10 +1181,9 @@ list_metrics_iterate_agents(rocprofiler_agent_version_t,
                 return ROCPROFILER_STATUS_SUCCESS;
             },
             reinterpret_cast<void*>(&node_id));
-        if(status != ROCPROFILER_STATUS_SUCCESS)
-        {
-            ROCP_ERROR << "Failed to iterate counters for agent " << node_id;
-        }
+
+        ROCP_ERROR_IF(status != ROCPROFILER_STATUS_SUCCESS)
+            << "Failed to iterate counters for agent " << node_id << " (" << agent->name << ")";
     }
     return ROCPROFILER_STATUS_SUCCESS;
 }

source/libexec/CMakeLists.txt

@@ -0,0 +1,5 @@
+#
+#
+#
+
+add_subdirectory(rocprofv3-trigger-list-metrics)

source/libexec/rocprofv3-trigger-list-metrics/CMakeLists.txt

@@ -0,0 +1,21 @@
+#
+#
+#
+
+set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME "tools")
+
+add_executable(rocprofv3-trigger-list-metrics)
+target_sources(rocprofv3-trigger-list-metrics PRIVATE rocprofv3_trigger_list_metrics.cpp)
+target_link_libraries(rocprofv3-trigger-list-metrics
+                      PRIVATE rocprofiler-sdk::rocprofiler-hsa-runtime)
+set_target_properties(
+    rocprofv3-trigger-list-metrics
+    PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBEXECDIR}
+               BUILD_RPATH "\$ORIGIN:\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}"
+               INSTALL_RPATH "\$ORIGIN:\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}")
+
+install(
+    TARGETS rocprofv3-trigger-list-metrics
+    DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}
+    COMPONENT tools
+    EXPORT rocprofiler-sdk-tool-targets)