AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CI: Relax timestamp checking (#1189)

Browse Source 
* Relax timestamp checking

- Prevent recurring CI failures that have no remedy until HSA/driver issues are resolved

* Replace "cc" abbreviation in tests with "counter-collection"

* Update CODEOWNERS to explicitly include jrmadsen for source/include

* Extra logging in rocprofiler tool library

* Tweak aborted-app test

- remove counter collection as part of the test
This commit is contained in:
Jonathan R. Madsen
2024-11-06 23:32:47 -06:00
committed by GitHub
parent 6564419357
commit 98858b60ec
12 changed files with 127 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/rocprofv3/aborted-app/CMakeLists.txt
+1 -1
View File
@@ -51,7 +51,7 @@ set_tests_properties(
add_test(
NAME rocprofv3-test-validate-app-abort
COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/validate.py --json-input
${CMAKE_CURRENT_BINARY_DIR}/out-aborted-app/pass_1/out_results.json)
${CMAKE_CURRENT_BINARY_DIR}/out-aborted-app/out_results.json)
set_tests_properties(
rocprofv3-test-validate-app-abort
tests/rocprofv3/aborted-app/input.json
+3 -2
View File
@@ -1,14 +1,15 @@
{
"jobs": [
{
"pmc":["SQ_WAVES"],
"kernel_include_regex": "addition",
"kernel_exclude_regex": "subtract",
"hip_runtime_trace": true,
"kernel_trace": true,
"output_file": "out",
"output_format": [
"json"
"csv",
"json",
"pftrace"
],
"truncate_kernels": true
}
tests/rocprofv3/counter-collection/input1/CMakeLists.txt
+6 -4
View File
@@ -18,8 +18,9 @@ add_test(
NAME rocprofv3-test-counter-collection-txt-pmc1-execute
COMMAND
$<TARGET_FILE:rocprofiler-sdk::rocprofv3> -i
${CMAKE_CURRENT_BINARY_DIR}/input.txt -T -d ${CMAKE_CURRENT_BINARY_DIR}/out_cc_1
-o pmc1 --output-format csv json -- $<TARGET_FILE:vector-ops>)
${CMAKE_CURRENT_BINARY_DIR}/input.txt -T -d
${CMAKE_CURRENT_BINARY_DIR}/out_counter_collection_1 -o pmc1 --output-format csv
json -- $<TARGET_FILE:vector-ops>)
string(REPLACE "LD_PRELOAD=" "ROCPROF_PRELOAD=" PRELOAD_ENV
"${ROCPROFILER_MEMCHECK_PRELOAD_ENV}")
@@ -35,8 +36,9 @@ add_test(
NAME rocprofv3-test-counter-collection-pmc1-validate
COMMAND
${Python3_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/validate.py --input
${CMAKE_CURRENT_BINARY_DIR}/out_cc_1/pmc_1/pmc1_counter_collection.csv
--json-input ${CMAKE_CURRENT_BINARY_DIR}/out_cc_1/pmc_1/pmc1_results.json)
${CMAKE_CURRENT_BINARY_DIR}/out_counter_collection_1/pmc_1/pmc1_counter_collection.csv
--json-input
${CMAKE_CURRENT_BINARY_DIR}/out_counter_collection_1/pmc_1/pmc1_results.json)
set_tests_properties(
rocprofv3-test-counter-collection-pmc1-validate
tests/rocprofv3/counter-collection/kernel_filtering/CMakeLists.txt
+15 -15
View File
@@ -15,7 +15,7 @@ rocprofiler_configure_pytest_files(CONFIG pytest.ini COPY validate.py conftest.p
# pmc1
add_test(
NAME rocprofv3-test-cc-kernel-filtering-input-json-execute
NAME rocprofv3-test-counter-collection-kernel-filtering-input-json-execute
COMMAND
$<TARGET_FILE:rocprofiler-sdk::rocprofv3> -i
${CMAKE_CURRENT_BINARY_DIR}/input.json -d ${CMAKE_CURRENT_BINARY_DIR}/json_input
@@ -27,13 +27,13 @@ string(REPLACE "LD_PRELOAD=" "ROCPROF_PRELOAD=" PRELOAD_ENV
set(cc-env-kernel-filtering "${PRELOAD_ENV}")
set_tests_properties(
rocprofv3-test-cc-kernel-filtering-input-json-execute
rocprofv3-test-counter-collection-kernel-filtering-input-json-execute
PROPERTIES TIMEOUT 45 LABELS "integration-tests" ENVIRONMENT
"${cc-env-kernel-filtering}" FAIL_REGULAR_EXPRESSION
"${ROCPROFILER_DEFAULT_FAIL_REGEX}")
add_test(
NAME rocprofv3-test-cc-kernel-filtering-input-cmd-execute
NAME rocprofv3-test-counter-collection-kernel-filtering-input-cmd-execute
COMMAND
$<TARGET_FILE:rocprofiler-sdk::rocprofv3> -i
${CMAKE_CURRENT_BINARY_DIR}/input.txt --kernel-include-regex ".*kernel"
@@ -41,14 +41,14 @@ add_test(
out --output-format csv -- $<TARGET_FILE:vector-ops>)
set_tests_properties(
rocprofv3-test-cc-kernel-filtering-input-cmd-execute
rocprofv3-test-counter-collection-kernel-filtering-input-cmd-execute
PROPERTIES TIMEOUT 45 LABELS "integration-tests" ENVIRONMENT
"${cc-env-kernel-filtering}" FAIL_REGULAR_EXPRESSION
"${ROCPROFILER_DEFAULT_FAIL_REGEX}")
# pmc1
add_test(
NAME rocprofv3-test-cc-kernel-filtering-input-yaml-execute
NAME rocprofv3-test-counter-collection-kernel-filtering-input-yaml-execute
COMMAND
$<TARGET_FILE:rocprofiler-sdk::rocprofv3> -i
${CMAKE_CURRENT_BINARY_DIR}/input.yml -T -d
@@ -56,12 +56,12 @@ add_test(
$<TARGET_FILE:vector-ops>)
set_tests_properties(
rocprofv3-test-cc-kernel-filtering-input-yaml-execute
rocprofv3-test-counter-collection-kernel-filtering-input-yaml-execute
PROPERTIES TIMEOUT 45 LABELS "integration-tests" ENVIRONMENT
"${cc-env-kernel-filtering}" FAIL_REGULAR_EXPRESSION
"${ROCPROFILER_DEFAULT_FAIL_REGEX}")
add_test(
NAME rocprofv3-test-cc-kernel-filtering-input-json-validate
NAME rocprofv3-test-counter-collection-kernel-filtering-input-json-validate
COMMAND
${Python3_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/validate.py -k _pass
--input-csv-pass1
@@ -78,7 +78,7 @@ add_test(
--input-json-pass4 ${CMAKE_CURRENT_BINARY_DIR}/json_input/pass_4/out_results.json)
add_test(
NAME rocprofv3-test-cc-kernel-filtering-input-yaml-validate
NAME rocprofv3-test-counter-collection-kernel-filtering-input-yaml-validate
COMMAND
${Python3_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/validate.py -k _pass
--input-csv-pass1
@@ -95,26 +95,26 @@ add_test(
--input-json-pass4 ${CMAKE_CURRENT_BINARY_DIR}/yaml_input/pass_4/out_results.json)
add_test(
NAME rocprofv3-test-cc-kernel-filtering-input-cmd-validate
NAME rocprofv3-test-counter-collection-kernel-filtering-input-cmd-validate
COMMAND
${Python3_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/validate.py -k
test_validate_counter_collection_csv_pmc1 --input-csv-pmc1
${CMAKE_CURRENT_BINARY_DIR}/cmd_input/pmc_1/out_counter_collection.csv)
set_tests_properties(
rocprofv3-test-cc-kernel-filtering-input-json-validate
rocprofv3-test-counter-collection-kernel-filtering-input-json-validate
PROPERTIES TIMEOUT 45 LABELS "integration-tests" DEPENDS
"rocprofv3-test-cc-kernel-filtering-input-json-execute"
"rocprofv3-test-counter-collection-kernel-filtering-input-json-execute"
FAIL_REGULAR_EXPRESSION "${ROCPROFILER_DEFAULT_FAIL_REGEX}")
set_tests_properties(
rocprofv3-test-cc-kernel-filtering-input-cmd-validate
rocprofv3-test-counter-collection-kernel-filtering-input-cmd-validate
PROPERTIES TIMEOUT 45 LABELS "integration-tests" DEPENDS
"rocprofv3-test-cc-kernel-filtering-input-cmd-execute"
"rocprofv3-test-counter-collection-kernel-filtering-input-cmd-execute"
FAIL_REGULAR_EXPRESSION "${ROCPROFILER_DEFAULT_FAIL_REGEX}")
set_tests_properties(
rocprofv3-test-cc-kernel-filtering-input-yaml-validate
rocprofv3-test-counter-collection-kernel-filtering-input-yaml-validate
PROPERTIES TIMEOUT 45 LABELS "integration-tests" DEPENDS
"rocprofv3-test-cc-kernel-filtering-input-yaml-execute"
"rocprofv3-test-counter-collection-kernel-filtering-input-yaml-execute"
FAIL_REGULAR_EXPRESSION "${ROCPROFILER_DEFAULT_FAIL_REGEX}")
tests/rocprofv3/counter-collection/list_metrics/CMakeLists.txt
+10 -7
View File
@@ -14,9 +14,11 @@ rocprofiler_configure_pytest_files(CONFIG pytest.ini COPY validate.py conftest.p
input.json)
# basic-metrics
add_test(NAME rocprofv3-test-list-metrics-execute
COMMAND $<TARGET_FILE:rocprofiler-sdk::rocprofv3> -d
${CMAKE_CURRENT_BINARY_DIR}/out_cc_2 -o metrics --list-metrics)
add_test(
NAME rocprofv3-test-list-metrics-execute
COMMAND
$<TARGET_FILE:rocprofiler-sdk::rocprofv3> -d
${CMAKE_CURRENT_BINARY_DIR}/out_counter_collection_2 -o metrics --list-metrics)
# list-metrics-stdout
add_test(NAME rocprofv3-test-list-metrics-std-out-execute
@@ -45,17 +47,18 @@ set_tests_properties(
PASS_REGULAR_EXPRESSION
"gpu-agent[0-9]*:[a-zA-Z_]*\\n;Description:(.*)\\n*;Expression:(.)*\\n*;Block:[a-zA-Z]*\\n*;Dimensions:([A-Z_]*\\[[0-9]*:[0-9]*\\])*\\n*;"
)
set(VALIDATION_FILES ${CMAKE_CURRENT_BINARY_DIR}/out_cc_2/metrics_basic_metrics.csv
${CMAKE_CURRENT_BINARY_DIR}/out_cc_2/metrics_derived_metrics.csv)
set(VALIDATION_FILES
${CMAKE_CURRENT_BINARY_DIR}/out_counter_collection_2/metrics_basic_metrics.csv
${CMAKE_CURRENT_BINARY_DIR}/out_counter_collection_2/metrics_derived_metrics.csv)
add_test(
NAME rocprofv3-test-list-metrics-validate
COMMAND
${Python3_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/validate.py
--derived-metrics-input
${CMAKE_CURRENT_BINARY_DIR}/out_cc_2/metrics_derived_metrics.csv
${CMAKE_CURRENT_BINARY_DIR}/out_counter_collection_2/metrics_derived_metrics.csv
--basic-metrics-input
${CMAKE_CURRENT_BINARY_DIR}/out_cc_2/metrics_basic_metrics.csv)
${CMAKE_CURRENT_BINARY_DIR}/out_counter_collection_2/metrics_basic_metrics.csv)
set_tests_properties(
rocprofv3-test-list-metrics-validate
tests/rocprofv3/counter-collection/range_filtering/CMakeLists.txt
+5 -5
View File
@@ -14,7 +14,7 @@ rocprofiler_configure_pytest_files(CONFIG pytest.ini COPY validate.py conftest.p
input_range.json)
add_test(
NAME rocprofv3-test-cc-kernel-filtering-range-filter-execute
NAME rocprofv3-test-counter-collection-kernel-filtering-range-filter-execute
COMMAND
$<TARGET_FILE:rocprofiler-sdk::rocprofv3> -i
${CMAKE_CURRENT_BINARY_DIR}/input_range.json -d
@@ -26,13 +26,13 @@ string(REPLACE "LD_PRELOAD=" "ROCPROF_PRELOAD=" PRELOAD_ENV
set(cc-env-kernel-filtering "${PRELOAD_ENV}")
set_tests_properties(
rocprofv3-test-cc-kernel-filtering-range-filter-execute
rocprofv3-test-counter-collection-kernel-filtering-range-filter-execute
PROPERTIES TIMEOUT 45 LABELS "integration-tests" ENVIRONMENT
"${cc-env-kernel-filtering}" FAIL_REGULAR_EXPRESSION
"${ROCPROFILER_DEFAULT_FAIL_REGEX}")
add_test(
NAME rocprofv3-test-cc-kernel-filtering-range-filter-validate
NAME rocprofv3-test-counter-collection-kernel-filtering-range-filter-validate
COMMAND
${Python3_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/validate.py --json-config
${CMAKE_CURRENT_BINARY_DIR}/input_range.json --input-json-pass1
@@ -43,7 +43,7 @@ add_test(
${CMAKE_CURRENT_BINARY_DIR}/range_filter/pass_3/out_results.json)
set_tests_properties(
rocprofv3-test-cc-kernel-filtering-range-filter-validate
rocprofv3-test-counter-collection-kernel-filtering-range-filter-validate
PROPERTIES TIMEOUT 45 LABELS "integration-tests" DEPENDS
"rocprofv3-test-cc-kernel-filtering-range-filter-execute"
"rocprofv3-test-counter-collection-kernel-filtering-range-filter-execute"
FAIL_REGULAR_EXPRESSION "${ROCPROFILER_DEFAULT_FAIL_REGEX}")
tests/rocprofv3/tracing-plus-counter-collection/CMakeLists.txt
+14 -12
View File
@@ -19,8 +19,9 @@ add_test(
NAME rocprofv3-test-tracing-plus-counter-collection-execute
COMMAND
$<TARGET_FILE:rocprofiler-sdk::rocprofv3> --hsa-trace -i
${CMAKE_CURRENT_BINARY_DIR}/input.txt -d ${CMAKE_CURRENT_BINARY_DIR}/out_cc_trace
-o pmc3 --output-format JSON PFTRACE CSV -- $<TARGET_FILE:simple-transpose>)
${CMAKE_CURRENT_BINARY_DIR}/input.txt -d
${CMAKE_CURRENT_BINARY_DIR}/out_counter_collection_trace -o pmc3 --output-format
JSON PFTRACE CSV -- $<TARGET_FILE:simple-transpose>)
string(REPLACE "LD_PRELOAD=" "ROCPROF_PRELOAD=" PRELOAD_ENV
"${ROCPROFILER_MEMCHECK_PRELOAD_ENV}")
@@ -38,22 +39,22 @@ foreach(_DIR "pmc_1" "pmc_2" "pmc_3" "pmc_4")
NAME rocprofv3-test-tracing-plus-counter-collection-validate-${_DIR}
COMMAND
${Python3_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/validate.py --json-input
"${CMAKE_CURRENT_BINARY_DIR}/out_cc_trace/${_DIR}/pmc3_results.json"
"${CMAKE_CURRENT_BINARY_DIR}/out_counter_collection_trace/${_DIR}/pmc3_results.json"
--pftrace-input
"${CMAKE_CURRENT_BINARY_DIR}/out_cc_trace/${_DIR}/pmc3_results.pftrace"
"${CMAKE_CURRENT_BINARY_DIR}/out_counter_collection_trace/${_DIR}/pmc3_results.pftrace"
--hsa-input
"${CMAKE_CURRENT_BINARY_DIR}/out_cc_trace/${_DIR}/pmc3_hsa_api_trace.csv"
"${CMAKE_CURRENT_BINARY_DIR}/out_counter_collection_trace/${_DIR}/pmc3_hsa_api_trace.csv"
--agent-input
"${CMAKE_CURRENT_BINARY_DIR}/out_cc_trace/${_DIR}/pmc3_agent_info.csv"
"${CMAKE_CURRENT_BINARY_DIR}/out_counter_collection_trace/${_DIR}/pmc3_agent_info.csv"
--counter-input
"${CMAKE_CURRENT_BINARY_DIR}/out_cc_trace/${_DIR}/pmc3_counter_collection.csv"
"${CMAKE_CURRENT_BINARY_DIR}/out_counter_collection_trace/${_DIR}/pmc3_counter_collection.csv"
)
set_tests_properties(
rocprofv3-test-tracing-plus-counter-collection-validate-${_DIR}
PROPERTIES TIMEOUT 45 LABELS "integration-tests;application-replay" DEPENDS
"rocprofv3-test-tracing-plus-cc-execute" FAIL_REGULAR_EXPRESSION
"${ROCPROFILER_DEFAULT_FAIL_REGEX}")
"rocprofv3-test-tracing-plus-counter-collection-execute"
FAIL_REGULAR_EXPRESSION "${ROCPROFILER_DEFAULT_FAIL_REGEX}")
endforeach()
set(cmdl_single "GRBM_COUNT")
@@ -68,8 +69,8 @@ foreach(_GROUP "single" "multiple")
NAME ${_TEST_NAME_PREFIX}-execute
COMMAND
$<TARGET_FILE:rocprofiler-sdk::rocprofv3> --hip-trace --hsa-trace --pmc
${cmdl_${_GROUP}} -d ${CMAKE_CURRENT_BINARY_DIR}/out_cc_trace -o
cmdl/${_GROUP} --output-format JSON PFTRACE CSV --
${cmdl_${_GROUP}} -d ${CMAKE_CURRENT_BINARY_DIR}/out_counter_collection_trace
-o cmdl/${_GROUP} --output-format JSON PFTRACE CSV --
$<TARGET_FILE:simple-transpose>)
set_tests_properties(
@@ -77,7 +78,8 @@ foreach(_GROUP "single" "multiple")
PROPERTIES TIMEOUT 45 LABELS "integration-tests" ENVIRONMENT "${cc-tracing-env}"
FAIL_REGULAR_EXPRESSION "${ROCPROFILER_DEFAULT_FAIL_REGEX}")
set(_TEST_OUTPUT_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/out_cc_trace/cmdl/${_GROUP})
set(_TEST_OUTPUT_PREFIX
${CMAKE_CURRENT_BINARY_DIR}/out_counter_collection_trace/cmdl/${_GROUP})
add_test(
NAME ${_TEST_NAME_PREFIX}-validate