[rocprofiler-systems] Build rocprofiler-systems examples as target-specific

.gitmodules

@@ -24,7 +24,7 @@
 [submodule "rocm-systems"]
 	path = rocm-systems
 	url = https://github.com/ROCm/rocm-systems.git
-	branch = develop
+	branch = users/kcossett-amd/rocprof-sys-build-examples
 [submodule "spirv-llvm-translator"]
 	path = compiler/spirv-llvm-translator
 	url = https://github.com/ROCm/SPIRV-LLVM-Translator.git

BUILD_TOPOLOGY.toml

@@ -653,6 +653,13 @@ feature_name = "ROCPROFSYS"
 feature_group = "PROFILER"
 disable_platforms = ["windows"]
 
+[artifacts.rocprofiler-systems-examples]
+artifact_group = "profiler-apps"
+type = "target-specific"
+artifact_deps = ["rocprofiler-systems"]
+feature_group = "PROFILER"
+disable_platforms = ["windows"]
+
 # --- Data Center Tools ---
 
 [artifacts.rdc]

build_tools/install_rocm_from_artifacts.py

@@ -435,6 +435,9 @@ def retrieve_artifacts_by_run_id(args):
             extra_artifacts.append("rocprofiler-systems")
             # Contains executables (rocprof-sys-run, rocprof-sys-instrument, etc.)
             argv.append("rocprofiler-systems_run")
+            if args.tests:
+                # Contains example binaries primarily used in rocprofiler-systems tests
+                extra_artifacts.append("rocprofiler-systems-examples")
         if args.rocrtst:
             extra_artifacts.append("rocrtst")
             # rocrtst depends on sysdeps-hwloc (which depends on sysdeps-libpciaccess)

profiler/CMakeLists.txt

@@ -125,9 +125,9 @@ endif(THEROCK_BUILD_TESTING)
       gfx942
     CMAKE_ARGS
       -DHIP_PLATFORM=amd
-      -DENABLE_TESTS=${THEROCK_BUILD_TESTING}
-      -DINSTALL_TESTS=${THEROCK_BUILD_TESTING}
-      -DTEST_FROM_INSTALL=${THEROCK_BUILD_TESTING}
+      -DENABLE_TESTS=OFF
+      -DINSTALL_TESTS=OFF
+      -DTEST_FROM_INSTALL=OFF
       -DCHECK_PYTHON_DEPS=OFF
     CMAKE_INCLUDES
       therock_explicit_finders.cmake
@@ -227,12 +227,6 @@ endif(THEROCK_BUILD_TESTING)
   # rocprofiler-systems requires GCC, but sanitizer builds use Clang.
   # Skip enabling rocprofiler-systems when building with sanitizers.
   if (THEROCK_ENABLE_ROCPROFSYS AND THEROCK_SANITIZER STREQUAL "")
-    # Escape semicolons in GPU targets list to prevent shell interpretation
-    if (THEROCK_DIST_AMDGPU_TARGETS STREQUAL "THEROCK_DIST_AMDGPU_TARGETS-NOTFOUND")
-      set(_ROCPROFSYS_GFX_TARGETS_ESCAPED "")
-    else()
-      string(REPLACE ";" "\\;" _ROCPROFSYS_GFX_TARGETS_ESCAPED "${THEROCK_DIST_AMDGPU_TARGETS}")
-    endif()
 
     therock_cmake_subproject_declare(rocprofiler-systems
       USE_DIST_AMDGPU_TARGETS
@@ -247,7 +241,6 @@ endif(THEROCK_BUILD_TESTING)
         -DROCPROFSYS_BUILD_BOOST=ON
         -DROCPROFSYS_BUILD_DYNINST=ON
         -DROCPROFSYS_BUILD_FOR_THEROCK=ON
-        -DROCPROFSYS_GFX_TARGETS="${_ROCPROFSYS_GFX_TARGETS_ESCAPED}"
         -DROCPROFSYS_BUILD_SPDLOG=OFF
       INSTALL_RPATH_DIRS
         "lib"
@@ -269,7 +262,7 @@ endif(THEROCK_BUILD_TESTING)
     therock_cmake_subproject_glob_c_sources(rocprofiler-systems
       SUBDIRS .
     )
-
+    therock_cmake_subproject_provide_package(rocprofiler-systems rocprofiler-systems lib/cmake/rocprofiler-systems)
     therock_cmake_subproject_activate(rocprofiler-systems)
 
     therock_provide_artifact(rocprofiler-systems
@@ -281,10 +274,54 @@ endif(THEROCK_BUILD_TESTING)
         doc
         lib
         run
+        test
       SUBPROJECT_DEPS
         amdsmi
         rocprofiler-sdk
         rocprofiler-systems
       )
+
+    # Build the examples/ folder for tests. These are target-specific
+    if(THEROCK_BUILD_TESTING)
+
+      # Escape semicolons in GPU targets list to prevent shell interpretation
+      if (THEROCK_DIST_AMDGPU_TARGETS STREQUAL "THEROCK_DIST_AMDGPU_TARGETS-NOTFOUND")
+        set(_ROCPROFSYS_GFX_TARGETS_ESCAPED "")
+      else()
+        string(REPLACE ";" "\\;" _ROCPROFSYS_GFX_TARGETS_ESCAPED "${THEROCK_DIST_AMDGPU_TARGETS}")
+      endif()
+
+      therock_cmake_subproject_declare(rocprofiler-systems-examples
+        USE_DIST_AMDGPU_TARGETS
+        EXTERNAL_SOURCE_DIR "${THEROCK_ROCM_SYSTEMS_SOURCE_DIR}/projects/rocprofiler-systems/examples"
+        BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/rocprofiler-systems-examples"
+        BACKGROUND_BUILD
+        CMAKE_ARGS
+          -DHIP_PLATFORM=amd
+          -DROCPROFSYS_GFX_TARGETS="${_ROCPROFSYS_GFX_TARGETS_ESCAPED}"
+          -DROCPROFSYS_BUILD_FOR_THEROCK="${THEROCK_BUILD_TESTING}"
+        INSTALL_RPATH_DIRS
+          "lib"
+          "lib/rocprofiler-systems"
+          "llvm/lib"
+        RUNTIME_DEPS
+          rocprofiler-systems
+      )
+      therock_cmake_subproject_glob_c_sources(rocprofiler-systems-examples
+        SUBDIRS .
+      )
+      therock_cmake_subproject_activate(rocprofiler-systems-examples)
+
+      therock_provide_artifact(rocprofiler-systems-examples
+        DESCRIPTOR artifact-rocprofiler-systems-examples.toml
+        COMPONENTS
+          test
+        SUBPROJECT_DEPS
+          rocprofiler-systems
+          rocprofiler-systems-examples
+      )
+
+    endif()
+
   endif(THEROCK_ENABLE_ROCPROFSYS AND THEROCK_SANITIZER STREQUAL "")
 endif(THEROCK_ENABLE_ROCPROFV3)

profiler/artifact-rocprofiler-systems-examples.toml

@@ -0,0 +1,5 @@
+# rocprofiler-systems-examples
+[components.test."profiler/rocprofiler-systems-examples/stage"]
+include = [
+  "share/rocprofiler-systems/**",
+]

profiler/artifact-rocprofiler-systems.toml

@@ -8,10 +8,16 @@ include = [
 [components.lib."profiler/rocprofiler-systems/stage"]
 include = [
   "libexec/rocprofiler-systems/**",
-  "share/rocprofiler-systems/**",
 ]
 [components.run."profiler/rocprofiler-systems/stage"]
 include = [
   "bin/**",
   "share/rocprofiler-systems/**"
 ]
+exclude = [
+  "share/rocprofiler-systems/tests/**"
+]
+[components.test."profiler/rocprofiler-systems/stage"]
+include = [
+  "share/rocprofiler-systems/tests/**"
+]