diff --git a/scripts/test-install.sh b/scripts/test-install.sh index 66d81f954..943603c08 100755 --- a/scripts/test-install.sh +++ b/scripts/test-install.sh @@ -42,7 +42,6 @@ fi : ${ENABLE_OMNITRACE_PYTHON:=0} : ${ENABLE_OMNITRACE_REWRITE:=1} : ${ENABLE_OMNITRACE_RUNTIME:=1} -: ${ENABLE_OMNITRACE_CRITICAL_TRACE:=1} usage() { @@ -55,7 +54,6 @@ usage() print_option test-omnitrace-python "0|1" "Enable testing omnitrace-python" "${ENABLE_OMNITRACE_PYTHON}" print_option test-omnitrace-rewrite "0|1" "Enable testing omnitrace-instrument binary rewrite" "${ENABLE_OMNITRACE_REWRITE}" print_option test-omnitrace-runtime "0|1" "Enable testing omnitrace-instrument runtime instrumentation" "${ENABLE_OMNITRACE_RUNTIME}" - print_option test-omnitrace-critial-trace "0|1" "Enable testing omnitrace-instrument critical trace" "${ENABLE_OMNITRACE_CRITICAL_TRACE}" } cat << EOF > ${CONFIG_DIR}/omnitrace.cfg @@ -126,10 +124,6 @@ do ENABLE_OMNITRACE_RUNTIME=${VAL} continue ;; - --test-omnitrace-critical-trace) - ENABLE_OMNITRACE_CRITICAL_TRACE=${VAL} - continue - ;; --source-dir) SOURCE_DIR=${VAL} continue @@ -204,16 +198,9 @@ test-omnitrace-runtime() verbose-run omnitrace-instrument -e -v 1 -- ${LS_NAME} ${LS_ARGS} } -test-omnitrace-critical-trace() -{ - which omnitrace-critical-trace - ldd $(which omnitrace-critical-trace) -} - if [ "${ENABLE_OMNITRACE_INSTRUMENT}" -ne 0 ]; then verbose-run test-omnitrace; fi if [ "${ENABLE_OMNITRACE_AVAIL}" -ne 0 ]; then verbose-run test-omnitrace-avail; fi if [ "${ENABLE_OMNITRACE_SAMPLE}" -ne 0 ]; then verbose-run test-omnitrace-sample; fi if [ "${ENABLE_OMNITRACE_PYTHON}" -ne 0 ]; then verbose-run test-omnitrace-python; fi if [ "${ENABLE_OMNITRACE_REWRITE}" -ne 0 ]; then verbose-run test-omnitrace-rewrite; fi if [ "${ENABLE_OMNITRACE_RUNTIME}" -ne 0 ]; then verbose-run test-omnitrace-runtime; fi -if [ "${ENABLE_OMNITRACE_CRITICAL_TRACE}" -ne 0 ]; then verbose-run test-omnitrace-critical-trace; fi diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 284103d54..cd695bca8 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -17,7 +17,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/omnitrace-openmp-tests.cmake) include(${CMAKE_CURRENT_LIST_DIR}/omnitrace-code-coverage-tests.cmake) include(${CMAKE_CURRENT_LIST_DIR}/omnitrace-fork-tests.cmake) include(${CMAKE_CURRENT_LIST_DIR}/omnitrace-time-window-tests.cmake) -include(${CMAKE_CURRENT_LIST_DIR}/omnitrace-critical-trace-tests.cmake) include(${CMAKE_CURRENT_LIST_DIR}/omnitrace-attach-tests.cmake) include(${CMAKE_CURRENT_LIST_DIR}/omnitrace-rccl-tests.cmake) include(${CMAKE_CURRENT_LIST_DIR}/omnitrace-overflow-tests.cmake) diff --git a/tests/omnitrace-fork-tests.cmake b/tests/omnitrace-fork-tests.cmake index 17baec882..9fd9be134 100644 --- a/tests/omnitrace-fork-tests.cmake +++ b/tests/omnitrace-fork-tests.cmake @@ -10,7 +10,7 @@ omnitrace_add_test( REWRITE_ARGS -e -v 2 --print-instrumented modules -i 16 RUNTIME_ARGS -e -v 1 --label file -i 16 ENVIRONMENT - "${_base_environment};OMNITRACE_CRITICAL_TRACE=ON;OMNITRACE_SAMPLING_FREQ=250;OMNITRACE_SAMPLING_REALTIME=ON" + "${_base_environment};OMNITRACE_SAMPLING_FREQ=250;OMNITRACE_SAMPLING_REALTIME=ON" SAMPLING_PASS_REGEX "fork.. called on PID" RUNTIME_PASS_REGEX "fork.. called on PID" REWRITE_RUN_PASS_REGEX "fork.. called on PID" diff --git a/tests/omnitrace-instrument-tests.cmake b/tests/omnitrace-instrument-tests.cmake index db5d01041..c935510df 100644 --- a/tests/omnitrace-instrument-tests.cmake +++ b/tests/omnitrace-instrument-tests.cmake @@ -40,7 +40,7 @@ omnitrace_add_test( return args RUN_ARGS 10 ${NUM_THREADS} 1000 - ENVIRONMENT "${_base_environment};OMNITRACE_CRITICAL_TRACE=OFF") + ENVIRONMENT "${_base_environment}") omnitrace_add_test( SKIP_BASELINE SKIP_RUNTIME diff --git a/tests/omnitrace-kokkos-tests.cmake b/tests/omnitrace-kokkos-tests.cmake index f496b1c4b..aeb63e877 100644 --- a/tests/omnitrace-kokkos-tests.cmake +++ b/tests/omnitrace-kokkos-tests.cmake @@ -26,7 +26,7 @@ omnitrace_add_test( LABELS "kokkos;kokkos-profile-library" RUN_ARGS -i 25 -s 20 -p ENVIRONMENT - "${_base_environment};OMNITRACE_CRITICAL_TRACE=OFF;OMNITRACE_USE_KOKKOSP=ON;OMNITRACE_COUT_OUTPUT=ON;OMNITRACE_SAMPLING_FREQ=50;OMNITRACE_KOKKOSP_PREFIX=[kokkos];KOKKOS_PROFILE_LIBRARY=libomnitrace-dl.so" + "${_base_environment};OMNITRACE_USE_KOKKOSP=ON;OMNITRACE_COUT_OUTPUT=ON;OMNITRACE_SAMPLING_FREQ=50;OMNITRACE_KOKKOSP_PREFIX=[kokkos];KOKKOS_PROFILE_LIBRARY=libomnitrace-dl.so" REWRITE_RUN_PASS_REGEX "\\|_\\[kokkos\\] [a-zA-Z]" RUNTIME_PASS_REGEX "\\|_\\[kokkos\\] [a-zA-Z]") @@ -40,7 +40,7 @@ omnitrace_add_test( LABELS "kokkos;kokkos-profile-library" RUN_ARGS -i 10 -s 20 -p ENVIRONMENT - "${_base_environment};OMNITRACE_CRITICAL_TRACE=OFF;OMNITRACE_USE_KOKKOSP=ON;OMNITRACE_COUT_OUTPUT=ON;OMNITRACE_SAMPLING_FREQ=50;OMNITRACE_KOKKOSP_PREFIX=[kokkos];KOKKOS_PROFILE_LIBRARY=libomnitrace.so" + "${_base_environment};OMNITRACE_USE_KOKKOSP=ON;OMNITRACE_COUT_OUTPUT=ON;OMNITRACE_SAMPLING_FREQ=50;OMNITRACE_KOKKOSP_PREFIX=[kokkos];KOKKOS_PROFILE_LIBRARY=libomnitrace.so" BASELINE_PASS_REGEX "\\|_\\[kokkos\\] [a-zA-Z]") omnitrace_add_test( @@ -53,7 +53,7 @@ omnitrace_add_test( LABELS "kokkos;kokkos-profile-library" RUN_ARGS -i 10 -s 20 -p ENVIRONMENT - "${_base_environment};OMNITRACE_CRITICAL_TRACE=OFF;OMNITRACE_USE_KOKKOSP=ON;OMNITRACE_COUT_OUTPUT=ON;OMNITRACE_SAMPLING_FREQ=50;OMNITRACE_KOKKOSP_PREFIX=[kokkos];KOKKOS_PROFILE_LIBRARY=libomnitrace-dl.so" + "${_base_environment};OMNITRACE_USE_KOKKOSP=ON;OMNITRACE_COUT_OUTPUT=ON;OMNITRACE_SAMPLING_FREQ=50;OMNITRACE_KOKKOSP_PREFIX=[kokkos];KOKKOS_PROFILE_LIBRARY=libomnitrace-dl.so" BASELINE_PASS_REGEX "\\|_\\[kokkos\\] [a-zA-Z]") omnitrace_add_test( @@ -78,7 +78,7 @@ omnitrace_add_test( [==[lib(gomp|m-)]==] RUN_ARGS -i 10 -s 20 -p ENVIRONMENT - "${_base_environment};OMNITRACE_CRITICAL_TRACE=OFF;OMNITRACE_USE_KOKKOSP=ON") + "${_base_environment};OMNITRACE_USE_KOKKOSP=ON") omnitrace_add_test( SKIP_BASELINE @@ -101,7 +101,7 @@ omnitrace_add_test( [==[libgomp]==] RUN_ARGS -i 10 -s 20 -p ENVIRONMENT - "${_perfetto_environment};OMNITRACE_CRITICAL_TRACE=OFF;OMNITRACE_USE_KOKKOSP=OFF") + "${_perfetto_environment};OMNITRACE_USE_KOKKOSP=OFF") omnitrace_add_test( NAME lulesh-timemory @@ -123,5 +123,5 @@ omnitrace_add_test( OMNITRACE_TIMEMORY_COMPONENTS="wall_clock peak_rss" RUN_ARGS -i 10 -s 20 -p ENVIRONMENT - "${_timemory_environment};OMNITRACE_CRITICAL_TRACE=OFF;OMNITRACE_USE_KOKKOSP=OFF" + "${_timemory_environment};OMNITRACE_USE_KOKKOSP=OFF" REWRITE_FAIL_REGEX "0 instrumented loops in procedure") diff --git a/tests/omnitrace-rocm-tests.cmake b/tests/omnitrace-rocm-tests.cmake index cf40180ad..8c576b763 100644 --- a/tests/omnitrace-rocm-tests.cmake +++ b/tests/omnitrace-rocm-tests.cmake @@ -26,7 +26,7 @@ omnitrace_add_test( args -E uniform_int_distribution - ENVIRONMENT "${_base_environment};OMNITRACE_CRITICAL_TRACE=ON") + ENVIRONMENT "${_base_environment}") omnitrace_add_test( SKIP_REWRITE SKIP_RUNTIME @@ -37,7 +37,7 @@ omnitrace_add_test( NUM_PROCS 1 RUN_ARGS 1 2 2 ENVIRONMENT - "${_base_environment};OMNITRACE_CRITICAL_TRACE=OFF;OMNITRACE_ROCTRACER_HSA_ACTIVITY=OFF;OMNITRACE_ROCTRACER_HSA_API=OFF" + "${_base_environment};OMNITRACE_ROCTRACER_HSA_ACTIVITY=OFF;OMNITRACE_ROCTRACER_HSA_API=OFF" ) omnitrace_add_test( @@ -61,7 +61,7 @@ omnitrace_add_test( -E uniform_int_distribution RUN_ARGS 2 100 50 - ENVIRONMENT "${_base_environment};OMNITRACE_CRITICAL_TRACE=OFF" + ENVIRONMENT "${_base_environment}" REWRITE_FAIL_REGEX "0 instrumented loops in procedure transpose") if(OMNITRACE_USE_ROCPROFILER) @@ -75,7 +75,7 @@ if(OMNITRACE_USE_ROCPROFILER) NUM_PROCS ${NUM_PROCS} REWRITE_ARGS -e -v 2 -E uniform_int_distribution ENVIRONMENT - "${_base_environment};OMNITRACE_CRITICAL_TRACE=OFF;OMNITRACE_ROCM_EVENTS=${OMNITRACE_ROCM_EVENTS_TEST}" + "${_base_environment};OMNITRACE_ROCM_EVENTS=${OMNITRACE_ROCM_EVENTS_TEST}" REWRITE_RUN_PASS_REGEX "rocprof-device-0-GRBM_COUNT.txt(.*)rocprof-device-0-GPUBusy.txt(.*)rocprof-device-0-SQ_WAVES.txt(.*)rocprof-device-0-SQ_INSTS_VALU.txt(.*)rocprof-device-0-VALUInsts.txt(.*)rocprof-device-0-TCC_HIT_sum.txt(.*)rocprof-device-0-TA_TA_BUSY_0.txt(.*)rocprof-device-0-TA_TA_BUSY_11.txt" ) @@ -90,7 +90,7 @@ if(OMNITRACE_USE_ROCPROFILER) NUM_PROCS ${NUM_PROCS} REWRITE_ARGS -e -v 2 -E uniform_int_distribution ENVIRONMENT - "${_base_environment};OMNITRACE_CRITICAL_TRACE=OFF;OMNITRACE_USE_ROCTRACER=OFF;OMNITRACE_ROCM_EVENTS=${OMNITRACE_ROCM_EVENTS_TEST}" + "${_base_environment};OMNITRACE_USE_ROCTRACER=OFF;OMNITRACE_ROCM_EVENTS=${OMNITRACE_ROCM_EVENTS_TEST}" REWRITE_RUN_PASS_REGEX "rocprof-device-0-GRBM_COUNT.txt(.*)rocprof-device-0-GPUBusy.txt(.*)rocprof-device-0-SQ_WAVES.txt(.*)rocprof-device-0-SQ_INSTS_VALU.txt(.*)rocprof-device-0-VALUInsts.txt(.*)rocprof-device-0-TCC_HIT_sum.txt(.*)rocprof-device-0-TA_TA_BUSY_0.txt(.*)rocprof-device-0-TA_TA_BUSY_11.txt" REWRITE_RUN_FAIL_REGEX "roctracer.txt|OMNITRACE_ABORT_FAIL_REGEX") diff --git a/tests/omnitrace-testing.cmake b/tests/omnitrace-testing.cmake index 743a32a6a..22763ae7d 100644 --- a/tests/omnitrace-testing.cmake +++ b/tests/omnitrace-testing.cmake @@ -80,7 +80,6 @@ set(_lock_environment "OMNITRACE_USE_SAMPLING=ON" "OMNITRACE_USE_PROCESS_SAMPLING=OFF" "OMNITRACE_SAMPLING_FREQ=750" - "OMNITRACE_CRITICAL_TRACE=ON" "OMNITRACE_COLLAPSE_THREADS=ON" "OMNITRACE_TRACE_THREAD_LOCKS=ON" "OMNITRACE_TRACE_THREAD_SPIN_LOCKS=ON" @@ -91,26 +90,11 @@ set(_lock_environment "OMNITRACE_VERBOSE=2" "${_test_library_path}") -set(_critical_trace_environment - "OMNITRACE_VERBOSE=2" - "OMNITRACE_USE_SAMPLING=OFF" - "OMNITRACE_USE_PROCESS_SAMPLING=OFF" - "OMNITRACE_CRITICAL_TRACE=ON" - "OMNITRACE_CRITICAL_TRACE_DEBUG=ON" - "OMNITRACE_TRACE_THREAD_LOCKS=ON" - "OMNITRACE_TRACE_THREAD_SPIN_LOCKS=ON" - "OMNITRACE_TRACE_THREAD_RW_LOCKS=ON" - "OMNITRACE_COUT_OUTPUT=ON" - "OMNITRACE_TIME_OUTPUT=OFF" - "OMNITRACE_TIMELINE_PROFILE=OFF" - "${_test_library_path}") - set(_ompt_environment "OMNITRACE_TRACE=ON" "OMNITRACE_PROFILE=ON" "OMNITRACE_TIME_OUTPUT=OFF" "OMNITRACE_USE_OMPT=ON" - "OMNITRACE_CRITICAL_TRACE=OFF" "OMNITRACE_TIMEMORY_COMPONENTS=wall_clock,trip_count,peak_rss" "${_test_openmp_env}" "${_test_library_path}") @@ -136,7 +120,7 @@ set(_timemory_environment "${_test_openmp_env}" "${_test_library_path}") -set(_test_environment ${_base_environment} "OMNITRACE_CRITICAL_TRACE=OFF") +set(_test_environment ${_base_environment}) set(_causal_environment "${_test_openmp_env}" "${_test_library_path}" "OMNITRACE_TIME_OUTPUT=OFF" @@ -159,7 +143,6 @@ set(_attach_environment "OMNITRACE_PROFILE=ON" "OMNITRACE_USE_SAMPLING=OFF" "OMNITRACE_USE_PROCESS_SAMPLING=ON" - "OMNITRACE_USE_CRITICAL_TRACE=OFF" "OMNITRACE_USE_OMPT=ON" "OMNITRACE_USE_KOKKOSP=ON" "OMNITRACE_TIME_OUTPUT=OFF" diff --git a/tests/omnitrace-user-api-tests.cmake b/tests/omnitrace-user-api-tests.cmake index d26625841..106b1675b 100644 --- a/tests/omnitrace-user-api-tests.cmake +++ b/tests/omnitrace-user-api-tests.cmake @@ -23,7 +23,7 @@ omnitrace_add_test( return args RUN_ARGS 10 ${NUM_THREADS} 1000 - ENVIRONMENT "${_base_environment};OMNITRACE_CRITICAL_TRACE=OFF" + ENVIRONMENT "${_base_environment}" REWRITE_RUN_PASS_REGEX "Pushing custom region :: run.10. x 1000" RUNTIME_PASS_REGEX "Pushing custom region :: run.10. x 1000" SAMPLING_PASS_REGEX "Pushing custom region :: run.10. x 1000"