move annotation test (w/ --annotate-args) separate from original test

Author: mcao59

projects/rocprofiler-sdk/tests/pytest-packages/tests/rocprofv3.py

@@ -575,9 +575,10 @@ def test_perfetto_hip_event_annotations(pftrace_data, pftrace_filename):
 
     result = reader.query_tp(query)
 
-    # Check if we found any event handle annotations
-    if result.empty:
-        pytest.skip("No HIP event API calls with event annotations found. ")
+    # Annotations must exist - perfetto was generated with --annotate-args
+    assert (
+        not result.empty
+    ), "No HIP event annotations found - --annotate-args may be broken"
 
     print(f"\n{len(result)} HIP event argument annotations found:")
     print(result.to_string())

projects/rocprofiler-sdk/tests/rocprofv3/rocpd/CMakeLists.txt

@@ -126,8 +126,8 @@ rocprofiler_add_integration_execute_test(
 rocprofiler_add_integration_execute_test(
     rocprofv3-test-rocpd-perfetto-generation
     COMMAND
-        ${Python3_EXECUTABLE} -m rocpd convert -f pftrace --kernel-rename --annotate-args
-        -d ${CMAKE_CURRENT_BINARY_DIR}/rocpd-output-data -i
+        ${Python3_EXECUTABLE} -m rocpd convert -f pftrace --kernel-rename -d
+        ${CMAKE_CURRENT_BINARY_DIR}/rocpd-output-data -i
         ${CMAKE_CURRENT_BINARY_DIR}/rocpd-input-data/out_results.db
     DEPENDS rocprofiler-sdk::rocprofv3
     TIMEOUT 120
@@ -137,6 +137,20 @@ rocprofiler_add_integration_execute_test(
     FIXTURES_SETUP rocprofv3-test-rocpd-generation
     FIXTURES_REQUIRED rocprofv3-test-rocpd)
 
+rocprofiler_add_integration_execute_test(
+    rocprofv3-test-rocpd-perfetto-generation-annotations
+    COMMAND
+        ${Python3_EXECUTABLE} -m rocpd convert -f pftrace --kernel-rename --annotate-args
+        -d ${CMAKE_CURRENT_BINARY_DIR}/rocpd-output-data-annotations -i
+        ${CMAKE_CURRENT_BINARY_DIR}/rocpd-input-data/out_results.db
+    DEPENDS rocprofiler-sdk::rocprofv3
+    TIMEOUT 120
+    LABELS "integration-tests;rocpd"
+    PRELOAD "${ROCPROFILER_MEMCHECK_PRELOAD_ENV_VALUE}"
+    ENVIRONMENT "${rocprofv3-rocpd-env}"
+    FIXTURES_SETUP rocprofv3-test-rocpd-generation-annotations
+    FIXTURES_REQUIRED rocprofv3-test-rocpd)
+
 rocprofiler_add_integration_execute_test(
     rocprofv3-test-rocpd-perfetto-generation-multiproc
     COMMAND
@@ -239,6 +253,17 @@ rocprofiler_add_integration_validate_test(
     LABELS "integration-tests;rocpd"
     FIXTURES_REQUIRED rocprofv3-test-rocpd-generation)
 
+rocprofiler_add_integration_validate_test(
+    rocprofv3-test-rocpd-annotations
+    TEST_PATHS validate_annotations.py
+    COPY conftest.py
+    CONFIG pytest.ini
+    ARGS --pftrace-input
+         ${CMAKE_CURRENT_BINARY_DIR}/rocpd-output-data-annotations/out_results.pftrace
+    TIMEOUT 120
+    LABELS "integration-tests;rocpd"
+    FIXTURES_REQUIRED rocprofv3-test-rocpd-generation-annotations)
+
 #########################################################################################
 #
 # Package generation

projects/rocprofiler-sdk/tests/rocprofv3/rocpd/validate.py

@@ -71,13 +71,6 @@ def test_csv_data(csv_data, json_data):
     )
 
 
-def test_hip_event_annotations(pftrace_data, request):
-    import rocprofiler_sdk.tests.rocprofv3 as rocprofv3
-
-    pftrace_filename = request.config.getoption("--pftrace-input")
-    rocprofv3.test_perfetto_hip_event_annotations(pftrace_data, pftrace_filename)
-
-
 if __name__ == "__main__":
     exit_code = pytest.main(["-x", __file__] + sys.argv[1:])
     sys.exit(exit_code)

projects/rocprofiler-sdk/tests/rocprofv3/rocpd/validate_annotations.py

@@ -0,0 +1,38 @@
+#!/usr/bin/env python3
+
+# MIT License
+#
+# Copyright (c) 2024-2025 Advanced Micro Devices, Inc. All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+import sys
+import pytest
+
+
+def test_hip_event_annotations(pftrace_data, request):
+    import rocprofiler_sdk.tests.rocprofv3 as rocprofv3
+
+    pftrace_filename = request.config.getoption("--pftrace-input")
+    rocprofv3.test_perfetto_hip_event_annotations(pftrace_data, pftrace_filename)
+
+
+if __name__ == "__main__":
+    exit_code = pytest.main(["-x", __file__] + sys.argv[1:])
+    sys.exit(exit_code)