diff --git a/projects/rocprofiler-sdk/source/bin/rocprofv3 b/projects/rocprofiler-sdk/source/bin/rocprofv3 index b1c984c982..5f814b103c 100755 --- a/projects/rocprofiler-sdk/source/bin/rocprofv3 +++ b/projects/rocprofiler-sdk/source/bin/rocprofv3 @@ -26,7 +26,7 @@ usage() { echo -e "${GREEN}--marker-trace ${RESET} For Collecting Marker (ROCTx) Traces" echo -e "${GREEN}--hip-trace ${RESET} For Collecting HIP Runtime Traces" echo -e "${GREEN}--hip-compiler-trace ${RESET} For Collecting HIP Compiler generated code Traces" - echo -e "${GREEN}--sys-trace ${RESET} For Collecting HIP,HSA, Memory Copy, (marker)ROCTx, Kernel dispatch and HIP compiler traces\n" + echo -e "${GREEN}--sys-trace ${RESET} For Collecting HIP,HSA, Memory Copy, (marker)ROCTx and Kernel dispatch traces\n" echo -e "${GREEN}-o | --output-file ${RESET} For the output file name" echo -e "\t#${GREY} usage e.g:(with current dir): rocprofv3 --hsa-trace -o " echo -e "\t#${GREY} usage e.g:(with custom dir): rocprofv3 --hsa-trace -d -o ${RESET}\n" diff --git a/projects/rocprofiler-sdk/tests/rocprofv3/tracing/CMakeLists.txt b/projects/rocprofiler-sdk/tests/rocprofv3/tracing/CMakeLists.txt index cefd827d80..c9c5601027 100644 --- a/projects/rocprofiler-sdk/tests/rocprofv3/tracing/CMakeLists.txt +++ b/projects/rocprofiler-sdk/tests/rocprofv3/tracing/CMakeLists.txt @@ -13,7 +13,7 @@ find_package(rocprofiler-sdk REQUIRED) add_test( NAME rocprofv3-test-trace-execute COMMAND - $ --hsa-trace --kernel-trace + $ -M --hsa-trace --kernel-trace --memory-copy-trace --marker-trace -d ${CMAKE_CURRENT_BINARY_DIR}/%argt%-trace -o out $) @@ -78,12 +78,13 @@ set_tests_properties( ATTACHED_FILES_ON_FAIL "${VALIDATION_FILES}") -# sys-trace test: tests --sys-trace command and validates generated files +# sys-trace test: tests --sys-trace command with mangled kernel names and validates +# generated files add_test( NAME rocprofv3-test-systrace-execute COMMAND - $ --sys-trace -d + $ -M --sys-trace -d ${CMAKE_CURRENT_BINARY_DIR}/%argt%-systrace -o out $) diff --git a/projects/rocprofiler-sdk/tests/rocprofv3/tracing/validate.py b/projects/rocprofiler-sdk/tests/rocprofv3/tracing/validate.py index 809a411f97..310b80137a 100644 --- a/projects/rocprofiler-sdk/tests/rocprofv3/tracing/validate.py +++ b/projects/rocprofiler-sdk/tests/rocprofv3/tracing/validate.py @@ -2,6 +2,7 @@ import sys import pytest +import re def test_hsa_api_trace(hsa_input_data): @@ -36,12 +37,13 @@ def test_hsa_api_trace(hsa_input_data): def test_kernel_trace(kernel_input_data): + mangled_kernel_name = "_Z15matrixTransposePfS_i.kd" for row in kernel_input_data: assert row["Kind"] == "KERNEL_DISPATCH" assert int(row["Agent_Id"]) > 0 assert int(row["Queue_Id"]) > 0 assert int(row["Kernel_Id"]) > 0 - assert row["Kernel_Name"] == "matrixTranspose(float*, float*, int)" + assert row["Kernel_Name"] == mangled_kernel_name assert int(row["Correlation_Id"]) > 0 assert int(row["Workgroup_Size_X"]) == 4 assert int(row["Workgroup_Size_Y"]) == 4