From e7d31254594dfd20b67fc1a34d0995fe94a0bf87 Mon Sep 17 00:00:00 2001 From: "Jonathan R. Madsen" Date: Sat, 4 Feb 2023 10:59:50 -0600 Subject: [PATCH] restructure libomnitrace + tasking and omnitrace-causal updates (#237) * restructured libomnitrace - this is necessary to incorporate some of the binary analysis capabilities into omnitrace exe - created libomnitrace-core (static) - created libomnitrace-binary (static) - created libomnitrace (static) - omnitrace-avail links to libomnitrace.a - omnitrace-critical-trace links to libomnitrace.a - tweaked the testing - reduced verbosity on some of MPI tests - excluded trace-time-window from tests on Ubuntu 18.04 - reduced causal e2e iterations - minor tweak to tasking - manually create `PTL::UserTaskQueue` instance instead of relying on `PTL::ThreadPool` to create it * Update formatting workflow - source formatting uses ubuntu-22.04 - check-includes doesn't generate false positive for 'include "timemory.hpp"' * omnitrace-causal --generate-configs - fix config generation in omnitrace causal - add test for omnitrace-causal + generating configs * Fix omnitrace-object-library build - accidentally included rocm sources in non-rocm builds * Fix rocm compilation w/o rocprofiler * update timemory submodule with mpi_get warning messages * sampling offload file updates - more verbose messages - disable offload before stopping * testing updates - increase causal e2e iterations to 12 - increase lock_environment verbose to 2 (for sampling offload messages) - fix return for omnitrace_add_validation_test --- .github/workflows/formatting.yml | 13 ++--- cmake/Packages.cmake | 3 +- external/timemory | 2 +- source/bin/omnitrace-avail/CMakeLists.txt | 9 ++-- source/bin/omnitrace-avail/avail.cpp | 4 +- source/bin/omnitrace-avail/defines.hpp | 5 +- source/bin/omnitrace-causal/impl.cpp | 22 ++++++-- .../omnitrace-critical-trace/CMakeLists.txt | 9 ++-- .../critical-trace.cpp | 6 +-- .../critical-trace.hpp | 8 +-- source/lib/CMakeLists.txt | 3 ++ .../library => }/binary/CMakeLists.txt | 14 +++-- .../binary/address_multirange.cpp | 2 +- .../binary/address_multirange.hpp | 4 +- .../library => }/binary/analysis.cpp | 26 ++++----- .../library => }/binary/analysis.hpp | 8 +-- .../library => }/binary/binary_info.hpp | 10 ++-- .../library => }/binary/dwarf_entry.cpp | 8 +-- .../library => }/binary/dwarf_entry.hpp | 4 +- .../library => }/binary/link_map.cpp | 10 ++-- .../library => }/binary/link_map.hpp | 0 .../library => }/binary/scope_filter.cpp | 4 +- .../library => }/binary/scope_filter.hpp | 2 +- .../{omnitrace/library => }/binary/symbol.cpp | 16 +++--- .../{omnitrace/library => }/binary/symbol.hpp | 4 +- source/lib/core/CMakeLists.txt | 52 ++++++++++++++++++ source/lib/core/binary/CMakeLists.txt | 7 +++ .../library => core}/binary/address_range.cpp | 4 +- .../library => core}/binary/address_range.hpp | 6 +-- .../library => core}/binary/fwd.hpp | 6 +-- .../library => core}/categories.cpp | 14 ++--- .../library => core}/categories.hpp | 2 +- .../{omnitrace/library => core}/common.hpp | 6 +-- source/lib/core/components/CMakeLists.txt | 6 +++ .../library => core}/components/fwd.hpp | 6 +-- .../{omnitrace/library => core}/concepts.hpp | 2 +- .../{omnitrace/library => core}/config.cpp | 14 ++--- .../{omnitrace/library => core}/config.hpp | 8 +-- .../library => core}/constraint.cpp | 10 ++-- .../library => core}/constraint.hpp | 2 +- .../containers/CMakeLists.txt | 3 +- .../library => core}/containers/c_array.hpp | 2 +- .../library => core}/containers/operators.hpp | 2 +- .../containers/stable_vector.hpp | 6 +-- .../containers/static_vector.hpp | 6 +-- .../lib/{omnitrace/library => core}/debug.cpp | 6 +-- .../lib/{omnitrace/library => core}/debug.hpp | 4 +- .../library => core}/defines.hpp.in | 0 .../library => core}/dynamic_library.cpp | 8 +-- .../library => core}/dynamic_library.hpp | 2 +- .../{omnitrace/library => core}/exception.cpp | 2 +- .../{omnitrace/library => core}/exception.hpp | 0 .../lib/{omnitrace/library => core}/gpu.cpp | 6 +-- .../lib/{omnitrace/library => core}/gpu.hpp | 0 .../{omnitrace/library => core}/locking.cpp | 0 .../{omnitrace/library => core}/locking.hpp | 0 .../lib/{omnitrace/library => core}/mproc.cpp | 6 +-- .../lib/{omnitrace/library => core}/mproc.hpp | 0 .../{omnitrace/library => core}/perfetto.cpp | 5 +- .../{omnitrace/library => core}/perfetto.hpp | 6 +-- .../{omnitrace/library => core}/redirect.hpp | 2 +- .../lib/{omnitrace/library => core}/state.cpp | 8 +-- .../lib/{omnitrace/library => core}/state.hpp | 3 +- .../{omnitrace/library => core}/timemory.cpp | 2 +- .../{omnitrace/library => core}/timemory.hpp | 6 +-- .../{omnitrace/library => core}/utility.hpp | 2 +- source/lib/omnitrace/CMakeLists.txt | 32 ++++++++--- source/lib/omnitrace/api.cpp | 2 +- source/lib/omnitrace/api.hpp | 2 +- source/lib/omnitrace/library.cpp | 20 +++---- source/lib/omnitrace/library/CMakeLists.txt | 37 +------------ .../library/causal/components/backtrace.cpp | 10 ++-- .../library/causal/components/backtrace.hpp | 8 +-- .../causal/components/blocking_gotcha.cpp | 6 +-- .../causal/components/blocking_gotcha.hpp | 6 +-- .../causal/components/causal_gotcha.cpp | 2 +- .../causal/components/causal_gotcha.hpp | 6 +-- .../causal/components/progress_point.cpp | 8 +-- .../causal/components/progress_point.hpp | 6 +-- .../causal/components/unblocking_gotcha.cpp | 4 +- .../causal/components/unblocking_gotcha.hpp | 6 +-- source/lib/omnitrace/library/causal/data.cpp | 20 +++---- source/lib/omnitrace/library/causal/data.hpp | 12 ++--- source/lib/omnitrace/library/causal/delay.cpp | 4 +- source/lib/omnitrace/library/causal/delay.hpp | 6 +-- .../omnitrace/library/causal/experiment.cpp | 6 +-- .../omnitrace/library/causal/experiment.hpp | 10 ++-- source/lib/omnitrace/library/causal/fwd.hpp | 6 +-- source/lib/omnitrace/library/causal/perf.cpp | 4 +- source/lib/omnitrace/library/causal/perf.hpp | 4 +- .../omnitrace/library/causal/sample_data.hpp | 4 +- .../lib/omnitrace/library/causal/sampling.cpp | 12 ++--- .../lib/omnitrace/library/causal/sampling.hpp | 4 +- .../library/causal/selected_entry.cpp | 4 +- .../library/causal/selected_entry.hpp | 10 ++-- .../library/components/CMakeLists.txt | 1 - .../library/components/backtrace.cpp | 10 ++-- .../library/components/backtrace.hpp | 8 +-- .../library/components/backtrace_metrics.cpp | 8 +-- .../library/components/backtrace_metrics.hpp | 8 +-- .../components/backtrace_timestamp.hpp | 8 +-- .../library/components/category_region.hpp | 8 +-- .../library/components/comm_data.cpp | 6 +-- .../library/components/comm_data.hpp | 8 +-- .../omnitrace/library/components/cpu_freq.cpp | 14 ++--- .../omnitrace/library/components/cpu_freq.hpp | 6 +-- .../library/components/ensure_storage.hpp | 2 +- .../library/components/exit_gotcha.cpp | 10 ++-- .../library/components/exit_gotcha.hpp | 6 +-- .../library/components/fork_gotcha.cpp | 6 +-- .../library/components/fork_gotcha.hpp | 6 +-- .../library/components/mpi_gotcha.cpp | 8 +-- .../library/components/mpi_gotcha.hpp | 6 +-- .../library/components/numa_gotcha.cpp | 10 ++-- .../library/components/numa_gotcha.hpp | 6 +-- .../components/pthread_create_gotcha.cpp | 8 +-- .../components/pthread_create_gotcha.hpp | 6 +-- .../library/components/pthread_gotcha.cpp | 6 +-- .../library/components/pthread_gotcha.hpp | 6 +-- .../components/pthread_mutex_gotcha.cpp | 6 +-- .../components/pthread_mutex_gotcha.hpp | 6 +-- .../omnitrace/library/components/rcclp.hpp | 8 +-- .../library/components/rocprofiler.cpp | 14 ++--- .../library/components/rocprofiler.hpp | 4 +- .../library/components/roctracer.cpp | 12 ++--- .../library/components/roctracer.hpp | 6 +-- source/lib/omnitrace/library/coverage.cpp | 4 +- source/lib/omnitrace/library/cpu_freq.cpp | 14 ++--- .../lib/omnitrace/library/critical_trace.cpp | 8 +-- .../lib/omnitrace/library/critical_trace.hpp | 8 +-- source/lib/omnitrace/library/kokkosp.cpp | 10 ++-- source/lib/omnitrace/library/ompt.cpp | 10 ++-- .../lib/omnitrace/library/process_sampler.cpp | 4 +- .../lib/omnitrace/library/process_sampler.hpp | 8 +-- source/lib/omnitrace/library/ptl.cpp | 19 ++++--- source/lib/omnitrace/library/ptl.hpp | 4 +- source/lib/omnitrace/library/rcclp.cpp | 8 +-- source/lib/omnitrace/library/rcclp.hpp | 2 +- source/lib/omnitrace/library/rocm.cpp | 12 +++-- source/lib/omnitrace/library/rocm.hpp | 2 +- .../library/rocm/hsa_rsrc_factory.cpp | 4 +- .../library/rocm/hsa_rsrc_factory.hpp | 2 +- source/lib/omnitrace/library/rocm_smi.cpp | 14 ++--- source/lib/omnitrace/library/rocm_smi.hpp | 8 +-- source/lib/omnitrace/library/rocprofiler.cpp | 10 ++-- source/lib/omnitrace/library/rocprofiler.hpp | 4 +- source/lib/omnitrace/library/roctracer.cpp | 6 +-- source/lib/omnitrace/library/roctracer.hpp | 6 +-- source/lib/omnitrace/library/runtime.cpp | 8 +-- source/lib/omnitrace/library/runtime.hpp | 8 +-- source/lib/omnitrace/library/sampling.cpp | 33 +++++++----- source/lib/omnitrace/library/sampling.hpp | 8 +-- source/lib/omnitrace/library/thread_data.hpp | 16 +++--- .../lib/omnitrace/library/thread_deleter.cpp | 2 +- .../lib/omnitrace/library/thread_deleter.hpp | 4 +- source/lib/omnitrace/library/thread_info.cpp | 12 ++--- source/lib/omnitrace/library/thread_info.hpp | 2 +- source/lib/omnitrace/library/tracing.cpp | 4 +- source/lib/omnitrace/library/tracing.hpp | 18 +++---- .../omnitrace/library/tracing/annotation.hpp | 14 ++--- source/lib/omnitrace/progress.cpp | 4 +- source/lib/omnitrace/regions.cpp | 4 +- tests/CMakeLists.txt | 53 ++++++++++++++++--- tests/omnitrace-testing.cmake | 22 ++++++++ 164 files changed, 721 insertions(+), 574 deletions(-) rename source/lib/{omnitrace/library => }/binary/CMakeLists.txt (60%) rename source/lib/{omnitrace/library => }/binary/address_multirange.cpp (97%) rename source/lib/{omnitrace/library => }/binary/address_multirange.hpp (97%) rename source/lib/{omnitrace/library => }/binary/analysis.cpp (93%) rename source/lib/{omnitrace/library => }/binary/analysis.hpp (93%) rename source/lib/{omnitrace/library => }/binary/binary_info.hpp (93%) rename source/lib/{omnitrace/library => }/binary/dwarf_entry.cpp (98%) rename source/lib/{omnitrace/library => }/binary/dwarf_entry.hpp (96%) rename source/lib/{omnitrace/library => }/binary/link_map.cpp (97%) rename source/lib/{omnitrace/library => }/binary/link_map.hpp (100%) rename source/lib/{omnitrace/library => }/binary/scope_filter.cpp (95%) rename source/lib/{omnitrace/library => }/binary/scope_filter.hpp (98%) rename source/lib/{omnitrace/library => }/binary/symbol.cpp (97%) rename source/lib/{omnitrace/library => }/binary/symbol.hpp (97%) create mode 100644 source/lib/core/CMakeLists.txt create mode 100644 source/lib/core/binary/CMakeLists.txt rename source/lib/{omnitrace/library => core}/binary/address_range.cpp (98%) rename source/lib/{omnitrace/library => core}/binary/address_range.hpp (97%) rename source/lib/{omnitrace/library => core}/binary/fwd.hpp (95%) rename source/lib/{omnitrace/library => core}/categories.cpp (95%) rename source/lib/{omnitrace/library => core}/categories.hpp (99%) rename source/lib/{omnitrace/library => core}/common.hpp (98%) create mode 100644 source/lib/core/components/CMakeLists.txt rename source/lib/{omnitrace/library => core}/components/fwd.hpp (99%) rename source/lib/{omnitrace/library => core}/concepts.hpp (99%) rename source/lib/{omnitrace/library => core}/config.cpp (99%) rename source/lib/{omnitrace/library => core}/config.hpp (98%) rename source/lib/{omnitrace/library => core}/constraint.cpp (98%) rename source/lib/{omnitrace/library => core}/constraint.hpp (99%) rename source/lib/{omnitrace/library => core}/containers/CMakeLists.txt (53%) rename source/lib/{omnitrace/library => core}/containers/c_array.hpp (99%) rename source/lib/{omnitrace/library => core}/containers/operators.hpp (99%) rename source/lib/{omnitrace/library => core}/containers/stable_vector.hpp (98%) rename source/lib/{omnitrace/library => core}/containers/static_vector.hpp (98%) rename source/lib/{omnitrace/library => core}/debug.cpp (97%) rename source/lib/{omnitrace/library => core}/debug.hpp (99%) rename source/lib/{omnitrace/library => core}/defines.hpp.in (100%) rename source/lib/{omnitrace/library => core}/dynamic_library.cpp (97%) rename source/lib/{omnitrace/library => core}/dynamic_library.hpp (98%) rename source/lib/{omnitrace/library => core}/exception.cpp (99%) rename source/lib/{omnitrace/library => core}/exception.hpp (100%) rename source/lib/{omnitrace/library => core}/gpu.cpp (99%) rename source/lib/{omnitrace/library => core}/gpu.hpp (100%) rename source/lib/{omnitrace/library => core}/locking.cpp (100%) rename source/lib/{omnitrace/library => core}/locking.hpp (100%) rename source/lib/{omnitrace/library => core}/mproc.cpp (96%) rename source/lib/{omnitrace/library => core}/mproc.hpp (100%) rename source/lib/{omnitrace/library => core}/perfetto.cpp (97%) rename source/lib/{omnitrace/library => core}/perfetto.hpp (98%) rename source/lib/{omnitrace/library => core}/redirect.hpp (99%) rename source/lib/{omnitrace/library => core}/state.cpp (97%) rename source/lib/{omnitrace/library => core}/state.hpp (98%) rename source/lib/{omnitrace/library => core}/timemory.cpp (97%) rename source/lib/{omnitrace/library => core}/timemory.hpp (95%) rename source/lib/{omnitrace/library => core}/utility.hpp (99%) diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml index 14927fe338..a89ab88144 100644 --- a/.github/workflows/formatting.yml +++ b/.github/workflows/formatting.yml @@ -64,7 +64,7 @@ jobs: fi source: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 @@ -72,12 +72,7 @@ jobs: run: | DISTRIB_CODENAME=$(cat /etc/lsb-release | grep DISTRIB_CODENAME | awk -F '=' '{print $NF}') sudo apt-get update - sudo apt-get install -y software-properties-common wget curl - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - - echo "deb http://apt.llvm.org/${DISTRIB_CODENAME}/ llvm-toolchain-${DISTRIB_CODENAME}-11 main" | sudo tee -a /etc/apt/sources.list.d/llvm-toolchain.list - echo "deb-src http://apt.llvm.org/${DISTRIB_CODENAME}/ llvm-toolchain-${DISTRIB_CODENAME}-11 main" | sudo tee -a /etc/apt/sources.list.d/llvm-toolchain.list - sudo apt-get update - sudo apt-get install -y clang-format-11 + sudo apt-get install -y software-properties-common wget curl clang-format-11 - name: clang-format run: | set +e @@ -99,8 +94,8 @@ jobs: - name: check-includes run: | set +e - FILES=$(find source examples -type f | egrep '\.hpp$|\.cpp$|\.cpp\.in$') - MATCHES=$(egrep 'include "timemory|include ) + ${CMAKE_CURRENT_LIST_DIR}/info_type.hpp) target_include_directories(omnitrace-avail PRIVATE ${CMAKE_CURRENT_LIST_DIR}) target_compile_definitions(omnitrace-avail PRIVATE OMNITRACE_EXTERN_COMPONENTS=0) -target_link_libraries(omnitrace-avail PRIVATE omnitrace::omnitrace-compile-definitions - omnitrace::omnitrace-interface-library) +target_link_libraries( + omnitrace-avail + PRIVATE omnitrace::omnitrace-compile-definitions + omnitrace::omnitrace-interface-library omnitrace::libomnitrace-static) set_target_properties( omnitrace-avail PROPERTIES BUILD_RPATH "\$ORIGIN:\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}" INSTALL_RPATH "${OMNITRACE_EXE_INSTALL_RPATH}") diff --git a/source/bin/omnitrace-avail/avail.cpp b/source/bin/omnitrace-avail/avail.cpp index f7dcbd0581..a29f55d925 100644 --- a/source/bin/omnitrace-avail/avail.cpp +++ b/source/bin/omnitrace-avail/avail.cpp @@ -29,8 +29,8 @@ #include "get_availability.hpp" #include "info_type.hpp" -#include "library/config.hpp" -#include "library/gpu.hpp" +#include "core/config.hpp" +#include "core/gpu.hpp" #include "library/rocprofiler.hpp" #include diff --git a/source/bin/omnitrace-avail/defines.hpp b/source/bin/omnitrace-avail/defines.hpp index e382e436eb..0d74a69f85 100644 --- a/source/bin/omnitrace-avail/defines.hpp +++ b/source/bin/omnitrace-avail/defines.hpp @@ -25,5 +25,6 @@ #define TIMEMORY_DISABLE_BANNER #define TIMEMORY_DISABLE_COMPONENT_STORAGE_INIT -#include "library/config.hpp" -#include "library/defines.hpp" +#include "common/defines.h" +#include "core/config.hpp" +#include "core/defines.hpp" diff --git a/source/bin/omnitrace-causal/impl.cpp b/source/bin/omnitrace-causal/impl.cpp index bf558cc61a..66975dfabd 100644 --- a/source/bin/omnitrace-causal/impl.cpp +++ b/source/bin/omnitrace-causal/impl.cpp @@ -905,11 +905,12 @@ parse_args(int argc, char** argv, std::vector& _env, { auto _is_omni_cfg = [](std::string_view itr) { return (itr.find("OMNITRACE") == 0 && itr.find("OMNITRACE_MODE") != 0 && - itr.find("OMNITRACE_CONFIG_FILE") != 0 && - itr.find('=') < itr.length()); + itr.find("OMNITRACE_DEBUG_") != 0 && itr.find('=') < itr.length()); + // omnitrace has miscellaneous env options starting with OMNITRACE_DEBUG_ that + // are not official options }; - auto _omni_env = std::map{}; + auto _omni_env_m = std::map{}; for(auto* itr : _env) { if(_is_omni_cfg(itr)) @@ -918,12 +919,25 @@ parse_args(int argc, char** argv, std::vector& _env, auto _pos = _env_var.find('='); auto _env_val = _env_var.substr(_pos + 1); _env_var = _env_var.substr(0, _pos); - _omni_env.emplace(_env_var, _env_val); + _omni_env_m.emplace(_env_var, _env_val); } } _env.erase(std::remove_if(_env.begin(), _env.end(), _is_omni_cfg), _env.end()); + auto _omni_env = std::vector>{}; + // make sure that OMNITRACE_CONFIG_FILE is the first entry + { + auto citr = _omni_env_m.find("OMNITRACE_CONFIG_FILE"); + if(citr != _omni_env_m.end()) + { + _omni_env.emplace_back(citr->first, citr->second); + _omni_env_m.erase(citr); + } + } + for(const auto& itr : _omni_env_m) + _omni_env.emplace_back(itr.first, itr.second); + _causal_envs_tmp = std::move(_causal_envs); _causal_envs.clear(); auto _write_config = diff --git a/source/bin/omnitrace-critical-trace/CMakeLists.txt b/source/bin/omnitrace-critical-trace/CMakeLists.txt index 389d7475be..df08edcbc5 100644 --- a/source/bin/omnitrace-critical-trace/CMakeLists.txt +++ b/source/bin/omnitrace-critical-trace/CMakeLists.txt @@ -4,11 +4,8 @@ # # ------------------------------------------------------------------------------# -add_executable( - omnitrace-critical-trace - ${CMAKE_CURRENT_LIST_DIR}/critical-trace.cpp - ${CMAKE_CURRENT_LIST_DIR}/critical-trace.hpp - $) +add_executable(omnitrace-critical-trace ${CMAKE_CURRENT_LIST_DIR}/critical-trace.cpp + ${CMAKE_CURRENT_LIST_DIR}/critical-trace.hpp) target_include_directories(omnitrace-critical-trace PRIVATE ${CMAKE_CURRENT_LIST_DIR}) target_compile_definitions(omnitrace-critical-trace PRIVATE OMNITRACE_EXTERN_COMPONENTS=0) @@ -16,7 +13,7 @@ target_link_libraries( omnitrace-critical-trace PRIVATE omnitrace::omnitrace-compile-definitions omnitrace::omnitrace-interface-library omnitrace::omnitrace-headers - omnitrace::omnitrace-timemory) + omnitrace::omnitrace-timemory omnitrace::libomnitrace-static) set_target_properties( omnitrace-critical-trace PROPERTIES BUILD_RPATH "\$ORIGIN:\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}" diff --git a/source/bin/omnitrace-critical-trace/critical-trace.cpp b/source/bin/omnitrace-critical-trace/critical-trace.cpp index 5431083466..598dd3b19b 100644 --- a/source/bin/omnitrace-critical-trace/critical-trace.cpp +++ b/source/bin/omnitrace-critical-trace/critical-trace.cpp @@ -23,9 +23,9 @@ #include "critical-trace.hpp" #include "api.hpp" -#include "library/config.hpp" -#include "library/debug.hpp" -#include "library/perfetto.hpp" +#include "core/config.hpp" +#include "core/debug.hpp" +#include "core/perfetto.hpp" #include "library/tracing.hpp" #include diff --git a/source/bin/omnitrace-critical-trace/critical-trace.hpp b/source/bin/omnitrace-critical-trace/critical-trace.hpp index 1230636453..0cbe03331b 100644 --- a/source/bin/omnitrace-critical-trace/critical-trace.hpp +++ b/source/bin/omnitrace-critical-trace/critical-trace.hpp @@ -22,11 +22,11 @@ #pragma once -#include "library/config.hpp" +#include "core/config.hpp" +#include "core/debug.hpp" +#include "core/defines.hpp" +#include "core/perfetto.hpp" #include "library/critical_trace.hpp" -#include "library/debug.hpp" -#include "library/defines.hpp" -#include "library/perfetto.hpp" #include "library/ptl.hpp" #include diff --git a/source/lib/CMakeLists.txt b/source/lib/CMakeLists.txt index d207f14c23..302153f1f1 100644 --- a/source/lib/CMakeLists.txt +++ b/source/lib/CMakeLists.txt @@ -19,6 +19,9 @@ else() endif() add_subdirectory(common) +add_subdirectory(core) +add_subdirectory(binary) + add_subdirectory(omnitrace) add_subdirectory(omnitrace-dl) add_subdirectory(omnitrace-user) diff --git a/source/lib/omnitrace/library/binary/CMakeLists.txt b/source/lib/binary/CMakeLists.txt similarity index 60% rename from source/lib/omnitrace/library/binary/CMakeLists.txt rename to source/lib/binary/CMakeLists.txt index 9a022fa363..8eefb0a44f 100644 --- a/source/lib/omnitrace/library/binary/CMakeLists.txt +++ b/source/lib/binary/CMakeLists.txt @@ -1,7 +1,6 @@ # set(binary_sources ${CMAKE_CURRENT_LIST_DIR}/address_multirange.cpp - ${CMAKE_CURRENT_LIST_DIR}/address_range.cpp ${CMAKE_CURRENT_LIST_DIR}/analysis.cpp ${CMAKE_CURRENT_LIST_DIR}/dwarf_entry.cpp ${CMAKE_CURRENT_LIST_DIR}/link_map.cpp @@ -10,13 +9,20 @@ set(binary_sources set(binary_headers ${CMAKE_CURRENT_LIST_DIR}/address_multirange.hpp - ${CMAKE_CURRENT_LIST_DIR}/address_range.hpp ${CMAKE_CURRENT_LIST_DIR}/analysis.hpp ${CMAKE_CURRENT_LIST_DIR}/dwarf_entry.hpp - ${CMAKE_CURRENT_LIST_DIR}/fwd.hpp ${CMAKE_CURRENT_LIST_DIR}/binary_info.hpp ${CMAKE_CURRENT_LIST_DIR}/link_map.hpp ${CMAKE_CURRENT_LIST_DIR}/scope_filter.hpp ${CMAKE_CURRENT_LIST_DIR}/symbol.hpp) -target_sources(omnitrace-object-library PRIVATE ${binary_sources} ${binary_headers}) +add_library(omnitrace-binary-library STATIC) +add_library(omnitrace::omnitrace-binary ALIAS omnitrace-binary-library) + +target_sources(omnitrace-binary-library PRIVATE ${binary_sources} ${binary_headers}) + +target_link_libraries( + omnitrace-binary-library PRIVATE omnitrace::omnitrace-interface-library + omnitrace::omnitrace-core) + +set_target_properties(omnitrace-binary-library PROPERTIES OUTPUT_NAME omnitrace-binary) diff --git a/source/lib/omnitrace/library/binary/address_multirange.cpp b/source/lib/binary/address_multirange.cpp similarity index 97% rename from source/lib/omnitrace/library/binary/address_multirange.cpp rename to source/lib/binary/address_multirange.cpp index 893eaaed06..9e732cdc69 100644 --- a/source/lib/omnitrace/library/binary/address_multirange.cpp +++ b/source/lib/binary/address_multirange.cpp @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "library/binary/address_multirange.hpp" +#include "address_multirange.hpp" #include #include diff --git a/source/lib/omnitrace/library/binary/address_multirange.hpp b/source/lib/binary/address_multirange.hpp similarity index 97% rename from source/lib/omnitrace/library/binary/address_multirange.hpp rename to source/lib/binary/address_multirange.hpp index 5193e6969f..51f8fb06f5 100644 --- a/source/lib/omnitrace/library/binary/address_multirange.hpp +++ b/source/lib/binary/address_multirange.hpp @@ -22,8 +22,8 @@ #pragma once -#include "library/binary/address_range.hpp" -#include "library/binary/fwd.hpp" +#include "core/binary/address_range.hpp" +#include "core/binary/fwd.hpp" #include diff --git a/source/lib/omnitrace/library/binary/analysis.cpp b/source/lib/binary/analysis.cpp similarity index 93% rename from source/lib/omnitrace/library/binary/analysis.cpp rename to source/lib/binary/analysis.cpp index 2922f541a0..988885f70f 100644 --- a/source/lib/omnitrace/library/binary/analysis.cpp +++ b/source/lib/binary/analysis.cpp @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "library/config.hpp" +#include "core/config.hpp" #if !defined(TIMEMORY_USE_BFD) # error "BFD support not enabled" @@ -30,18 +30,18 @@ #include -#include "library/binary/address_range.hpp" -#include "library/binary/analysis.hpp" -#include "library/binary/binary_info.hpp" -#include "library/binary/dwarf_entry.hpp" -#include "library/binary/fwd.hpp" -#include "library/binary/scope_filter.hpp" -#include "library/binary/symbol.hpp" -#include "library/common.hpp" -#include "library/config.hpp" -#include "library/debug.hpp" -#include "library/state.hpp" -#include "library/utility.hpp" +#include "analysis.hpp" +#include "binary_info.hpp" +#include "core/binary/address_range.hpp" +#include "core/binary/fwd.hpp" +#include "core/common.hpp" +#include "core/config.hpp" +#include "core/debug.hpp" +#include "core/state.hpp" +#include "core/utility.hpp" +#include "dwarf_entry.hpp" +#include "scope_filter.hpp" +#include "symbol.hpp" #include #include diff --git a/source/lib/omnitrace/library/binary/analysis.hpp b/source/lib/binary/analysis.hpp similarity index 93% rename from source/lib/omnitrace/library/binary/analysis.hpp rename to source/lib/binary/analysis.hpp index 87038a37d1..d24a68fec8 100644 --- a/source/lib/omnitrace/library/binary/analysis.hpp +++ b/source/lib/binary/analysis.hpp @@ -23,10 +23,10 @@ #pragma once #include "common/defines.h" -#include "library/binary/fwd.hpp" -#include "library/common.hpp" -#include "library/defines.hpp" -#include "library/exception.hpp" +#include "core/binary/fwd.hpp" +#include "core/common.hpp" +#include "core/defines.hpp" +#include "core/exception.hpp" #include #include diff --git a/source/lib/omnitrace/library/binary/binary_info.hpp b/source/lib/binary/binary_info.hpp similarity index 93% rename from source/lib/omnitrace/library/binary/binary_info.hpp rename to source/lib/binary/binary_info.hpp index 30e31bcf33..b7f80daa9e 100644 --- a/source/lib/omnitrace/library/binary/binary_info.hpp +++ b/source/lib/binary/binary_info.hpp @@ -22,11 +22,11 @@ #pragma once -#include "library/binary/address_range.hpp" -#include "library/binary/dwarf_entry.hpp" -#include "library/binary/fwd.hpp" -#include "library/binary/symbol.hpp" -#include "library/utility.hpp" +#include "core/binary/address_range.hpp" +#include "core/binary/fwd.hpp" +#include "core/utility.hpp" +#include "dwarf_entry.hpp" +#include "symbol.hpp" #include diff --git a/source/lib/omnitrace/library/binary/dwarf_entry.cpp b/source/lib/binary/dwarf_entry.cpp similarity index 98% rename from source/lib/omnitrace/library/binary/dwarf_entry.cpp rename to source/lib/binary/dwarf_entry.cpp index 00c18029ad..e74c10c42e 100644 --- a/source/lib/omnitrace/library/binary/dwarf_entry.cpp +++ b/source/lib/binary/dwarf_entry.cpp @@ -20,10 +20,10 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "library/binary/dwarf_entry.hpp" -#include "library/binary/fwd.hpp" -#include "library/timemory.hpp" -#include "library/utility.hpp" +#include "dwarf_entry.hpp" +#include "core/binary/fwd.hpp" +#include "core/timemory.hpp" +#include "core/utility.hpp" #include #include diff --git a/source/lib/omnitrace/library/binary/dwarf_entry.hpp b/source/lib/binary/dwarf_entry.hpp similarity index 96% rename from source/lib/omnitrace/library/binary/dwarf_entry.hpp rename to source/lib/binary/dwarf_entry.hpp index 3832bfcca2..3c4c4572d1 100644 --- a/source/lib/omnitrace/library/binary/dwarf_entry.hpp +++ b/source/lib/binary/dwarf_entry.hpp @@ -22,8 +22,8 @@ #pragma once -#include "library/binary/address_range.hpp" -#include "library/binary/fwd.hpp" +#include "core/binary/address_range.hpp" +#include "core/binary/fwd.hpp" namespace omnitrace { diff --git a/source/lib/omnitrace/library/binary/link_map.cpp b/source/lib/binary/link_map.cpp similarity index 97% rename from source/lib/omnitrace/library/binary/link_map.cpp rename to source/lib/binary/link_map.cpp index bd1536530d..73dc168f41 100644 --- a/source/lib/omnitrace/library/binary/link_map.cpp +++ b/source/lib/binary/link_map.cpp @@ -20,11 +20,11 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "library/binary/link_map.hpp" -#include "library/common.hpp" -#include "library/config.hpp" -#include "library/debug.hpp" -#include "library/timemory.hpp" +#include "link_map.hpp" +#include "core/common.hpp" +#include "core/config.hpp" +#include "core/debug.hpp" +#include "core/timemory.hpp" #include diff --git a/source/lib/omnitrace/library/binary/link_map.hpp b/source/lib/binary/link_map.hpp similarity index 100% rename from source/lib/omnitrace/library/binary/link_map.hpp rename to source/lib/binary/link_map.hpp diff --git a/source/lib/omnitrace/library/binary/scope_filter.cpp b/source/lib/binary/scope_filter.cpp similarity index 95% rename from source/lib/omnitrace/library/binary/scope_filter.cpp rename to source/lib/binary/scope_filter.cpp index 01dd02c6a0..524eba4586 100644 --- a/source/lib/omnitrace/library/binary/scope_filter.cpp +++ b/source/lib/binary/scope_filter.cpp @@ -20,8 +20,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "library/binary/scope_filter.hpp" -#include "library/exception.hpp" +#include "scope_filter.hpp" +#include "core/exception.hpp" #include diff --git a/source/lib/omnitrace/library/binary/scope_filter.hpp b/source/lib/binary/scope_filter.hpp similarity index 98% rename from source/lib/omnitrace/library/binary/scope_filter.hpp rename to source/lib/binary/scope_filter.hpp index a12b015a11..047ba90cb6 100644 --- a/source/lib/omnitrace/library/binary/scope_filter.hpp +++ b/source/lib/binary/scope_filter.hpp @@ -22,7 +22,7 @@ #pragma once -#include "library/defines.hpp" +#include "core/defines.hpp" #include #include diff --git a/source/lib/omnitrace/library/binary/symbol.cpp b/source/lib/binary/symbol.cpp similarity index 97% rename from source/lib/omnitrace/library/binary/symbol.cpp rename to source/lib/binary/symbol.cpp index a551d8f608..7a63f1f5dd 100644 --- a/source/lib/omnitrace/library/binary/symbol.cpp +++ b/source/lib/binary/symbol.cpp @@ -20,8 +20,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "library/config.hpp" -#include "library/debug.hpp" +#include "core/config.hpp" +#include "core/debug.hpp" #if !defined(TIMEMORY_USE_BFD) # error "BFD support not enabled" @@ -40,12 +40,12 @@ #include #include -#include "library/binary/dwarf_entry.hpp" -#include "library/binary/fwd.hpp" -#include "library/binary/scope_filter.hpp" -#include "library/binary/symbol.hpp" -#include "library/timemory.hpp" -#include "library/utility.hpp" +#include "core/binary/fwd.hpp" +#include "core/timemory.hpp" +#include "core/utility.hpp" +#include "dwarf_entry.hpp" +#include "scope_filter.hpp" +#include "symbol.hpp" #include diff --git a/source/lib/omnitrace/library/binary/symbol.hpp b/source/lib/binary/symbol.hpp similarity index 97% rename from source/lib/omnitrace/library/binary/symbol.hpp rename to source/lib/binary/symbol.hpp index 6e86ddf160..86967fb779 100644 --- a/source/lib/omnitrace/library/binary/symbol.hpp +++ b/source/lib/binary/symbol.hpp @@ -22,8 +22,8 @@ #pragma once -#include "library/binary/address_range.hpp" -#include "library/binary/fwd.hpp" +#include "core/binary/address_range.hpp" +#include "core/binary/fwd.hpp" #include diff --git a/source/lib/core/CMakeLists.txt b/source/lib/core/CMakeLists.txt new file mode 100644 index 0000000000..b0ecea7474 --- /dev/null +++ b/source/lib/core/CMakeLists.txt @@ -0,0 +1,52 @@ +# +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/defines.hpp.in + ${CMAKE_CURRENT_BINARY_DIR}/defines.hpp @ONLY) + +set(core_sources + ${CMAKE_CURRENT_LIST_DIR}/categories.cpp + ${CMAKE_CURRENT_LIST_DIR}/config.cpp + ${CMAKE_CURRENT_LIST_DIR}/constraint.cpp + ${CMAKE_CURRENT_LIST_DIR}/debug.cpp + ${CMAKE_CURRENT_LIST_DIR}/dynamic_library.cpp + ${CMAKE_CURRENT_LIST_DIR}/exception.cpp + ${CMAKE_CURRENT_LIST_DIR}/gpu.cpp + ${CMAKE_CURRENT_LIST_DIR}/locking.cpp + ${CMAKE_CURRENT_LIST_DIR}/mproc.cpp + ${CMAKE_CURRENT_LIST_DIR}/perfetto.cpp + ${CMAKE_CURRENT_LIST_DIR}/state.cpp + ${CMAKE_CURRENT_LIST_DIR}/timemory.cpp) + +set(core_headers + ${CMAKE_CURRENT_LIST_DIR}/categories.hpp + ${CMAKE_CURRENT_LIST_DIR}/common.hpp + ${CMAKE_CURRENT_LIST_DIR}/concepts.hpp + ${CMAKE_CURRENT_LIST_DIR}/config.hpp + ${CMAKE_CURRENT_LIST_DIR}/constraint.hpp + ${CMAKE_CURRENT_LIST_DIR}/debug.hpp + ${CMAKE_CURRENT_LIST_DIR}/dynamic_library.hpp + ${CMAKE_CURRENT_LIST_DIR}/exception.hpp + ${CMAKE_CURRENT_LIST_DIR}/gpu.hpp + ${CMAKE_CURRENT_LIST_DIR}/locking.hpp + ${CMAKE_CURRENT_LIST_DIR}/mproc.hpp + ${CMAKE_CURRENT_LIST_DIR}/perfetto.hpp + ${CMAKE_CURRENT_LIST_DIR}/redirect.hpp + ${CMAKE_CURRENT_LIST_DIR}/state.hpp + ${CMAKE_CURRENT_LIST_DIR}/timemory.hpp + ${CMAKE_CURRENT_LIST_DIR}/utility.hpp) + +add_library(omnitrace-core-library STATIC) +add_library(omnitrace::omnitrace-core ALIAS omnitrace-core-library) + +target_sources(omnitrace-core-library PRIVATE ${core_sources} ${core_headers} + ${CMAKE_CURRENT_BINARY_DIR}/defines.hpp) +add_subdirectory(binary) +add_subdirectory(components) +add_subdirectory(containers) + +target_include_directories(omnitrace-core-library BEFORE + PRIVATE ${CMAKE_CURRENT_LIST_DIR}) + +target_link_libraries(omnitrace-core-library + PRIVATE omnitrace::omnitrace-interface-library) + +set_target_properties(omnitrace-core-library PROPERTIES OUTPUT_NAME omnitrace-core) diff --git a/source/lib/core/binary/CMakeLists.txt b/source/lib/core/binary/CMakeLists.txt new file mode 100644 index 0000000000..085125f314 --- /dev/null +++ b/source/lib/core/binary/CMakeLists.txt @@ -0,0 +1,7 @@ +# +set(binary_sources ${CMAKE_CURRENT_LIST_DIR}/address_range.cpp) + +set(binary_headers ${CMAKE_CURRENT_LIST_DIR}/address_range.hpp + ${CMAKE_CURRENT_LIST_DIR}/fwd.hpp) + +target_sources(omnitrace-core-library PRIVATE ${binary_sources} ${binary_headers}) diff --git a/source/lib/omnitrace/library/binary/address_range.cpp b/source/lib/core/binary/address_range.cpp similarity index 98% rename from source/lib/omnitrace/library/binary/address_range.cpp rename to source/lib/core/binary/address_range.cpp index 2c43db1cad..2cd2940a2b 100644 --- a/source/lib/omnitrace/library/binary/address_range.cpp +++ b/source/lib/core/binary/address_range.cpp @@ -20,8 +20,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "library/binary/address_range.hpp" -#include "library/debug.hpp" +#include "binary/address_range.hpp" +#include "debug.hpp" namespace omnitrace { diff --git a/source/lib/omnitrace/library/binary/address_range.hpp b/source/lib/core/binary/address_range.hpp similarity index 97% rename from source/lib/omnitrace/library/binary/address_range.hpp rename to source/lib/core/binary/address_range.hpp index 5cf3d077ec..96b5259ec4 100644 --- a/source/lib/omnitrace/library/binary/address_range.hpp +++ b/source/lib/core/binary/address_range.hpp @@ -22,9 +22,9 @@ #pragma once -#include "library/binary/fwd.hpp" -#include "library/common.hpp" -#include "library/timemory.hpp" +#include "core/binary/fwd.hpp" +#include "core/common.hpp" +#include "core/timemory.hpp" #include #include diff --git a/source/lib/omnitrace/library/binary/fwd.hpp b/source/lib/core/binary/fwd.hpp similarity index 95% rename from source/lib/omnitrace/library/binary/fwd.hpp rename to source/lib/core/binary/fwd.hpp index e4c9b7ca61..8a24585167 100644 --- a/source/lib/omnitrace/library/binary/fwd.hpp +++ b/source/lib/core/binary/fwd.hpp @@ -23,9 +23,9 @@ #pragma once #include "common/defines.h" -#include "library/common.hpp" -#include "library/defines.hpp" -#include "library/exception.hpp" +#include "core/common.hpp" +#include "core/defines.hpp" +#include "core/exception.hpp" #include #include diff --git a/source/lib/omnitrace/library/categories.cpp b/source/lib/core/categories.cpp similarity index 95% rename from source/lib/omnitrace/library/categories.cpp rename to source/lib/core/categories.cpp index 6b0eb895d1..27e19e1b79 100644 --- a/source/lib/omnitrace/library/categories.cpp +++ b/source/lib/core/categories.cpp @@ -20,13 +20,13 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "library/categories.hpp" -#include "library/common.hpp" -#include "library/config.hpp" -#include "library/constraint.hpp" -#include "library/debug.hpp" -#include "library/timemory.hpp" -#include "library/utility.hpp" +#include "core/categories.hpp" +#include "core/common.hpp" +#include "core/config.hpp" +#include "core/constraint.hpp" +#include "core/debug.hpp" +#include "core/timemory.hpp" +#include "core/utility.hpp" #include #include diff --git a/source/lib/omnitrace/library/categories.hpp b/source/lib/core/categories.hpp similarity index 99% rename from source/lib/omnitrace/library/categories.hpp rename to source/lib/core/categories.hpp index e9a0b36cab..4e946b8006 100644 --- a/source/lib/omnitrace/library/categories.hpp +++ b/source/lib/core/categories.hpp @@ -23,7 +23,7 @@ #pragma once #include "common/join.hpp" -#include "library/defines.hpp" +#include "defines.hpp" #include "omnitrace/categories.h" // in omnitrace-user #if defined(TIMEMORY_PERFETTO_CATEGORIES) diff --git a/source/lib/omnitrace/library/common.hpp b/source/lib/core/common.hpp similarity index 98% rename from source/lib/omnitrace/library/common.hpp rename to source/lib/core/common.hpp index a8df0996f2..cd47909f7f 100644 --- a/source/lib/omnitrace/library/common.hpp +++ b/source/lib/core/common.hpp @@ -22,10 +22,10 @@ #pragma once +#include "categories.hpp" #include "common/join.hpp" -#include "library/categories.hpp" -#include "library/concepts.hpp" -#include "library/defines.hpp" +#include "concepts.hpp" +#include "defines.hpp" #include #include diff --git a/source/lib/core/components/CMakeLists.txt b/source/lib/core/components/CMakeLists.txt new file mode 100644 index 0000000000..52774a7c61 --- /dev/null +++ b/source/lib/core/components/CMakeLists.txt @@ -0,0 +1,6 @@ +# +set(component_sources) + +set(component_headers ${CMAKE_CURRENT_LIST_DIR}/fwd.hpp) + +target_sources(omnitrace-core-library PRIVATE ${component_sources} ${component_headers}) diff --git a/source/lib/omnitrace/library/components/fwd.hpp b/source/lib/core/components/fwd.hpp similarity index 99% rename from source/lib/omnitrace/library/components/fwd.hpp rename to source/lib/core/components/fwd.hpp index 4d3ad2ec95..df9f2afaa2 100644 --- a/source/lib/omnitrace/library/components/fwd.hpp +++ b/source/lib/core/components/fwd.hpp @@ -22,9 +22,9 @@ #pragma once -#include "library/categories.hpp" -#include "library/common.hpp" -#include "library/defines.hpp" +#include "core/categories.hpp" +#include "core/common.hpp" +#include "core/defines.hpp" #include #include diff --git a/source/lib/omnitrace/library/concepts.hpp b/source/lib/core/concepts.hpp similarity index 99% rename from source/lib/omnitrace/library/concepts.hpp rename to source/lib/core/concepts.hpp index bd55d54da6..0015a625c5 100644 --- a/source/lib/omnitrace/library/concepts.hpp +++ b/source/lib/core/concepts.hpp @@ -22,7 +22,7 @@ #pragma once -#include "library/defines.hpp" +#include "defines.hpp" #include #include diff --git a/source/lib/omnitrace/library/config.cpp b/source/lib/core/config.cpp similarity index 99% rename from source/lib/omnitrace/library/config.cpp rename to source/lib/core/config.cpp index ec232f0576..69b84c797f 100644 --- a/source/lib/omnitrace/library/config.cpp +++ b/source/lib/core/config.cpp @@ -20,14 +20,14 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "library/config.hpp" +#include "config.hpp" #include "common/defines.h" -#include "library/constraint.hpp" -#include "library/debug.hpp" -#include "library/defines.hpp" -#include "library/gpu.hpp" -#include "library/mproc.hpp" -#include "library/perfetto.hpp" +#include "constraint.hpp" +#include "debug.hpp" +#include "defines.hpp" +#include "gpu.hpp" +#include "mproc.hpp" +#include "perfetto.hpp" #include #include diff --git a/source/lib/omnitrace/library/config.hpp b/source/lib/core/config.hpp similarity index 98% rename from source/lib/omnitrace/library/config.hpp rename to source/lib/core/config.hpp index ff5150f5fb..e576ec77a4 100644 --- a/source/lib/omnitrace/library/config.hpp +++ b/source/lib/core/config.hpp @@ -22,10 +22,10 @@ #pragma once -#include "library/common.hpp" -#include "library/defines.hpp" -#include "library/state.hpp" -#include "library/timemory.hpp" +#include "common.hpp" +#include "defines.hpp" +#include "state.hpp" +#include "timemory.hpp" #include #include diff --git a/source/lib/omnitrace/library/constraint.cpp b/source/lib/core/constraint.cpp similarity index 98% rename from source/lib/omnitrace/library/constraint.cpp rename to source/lib/core/constraint.cpp index 27d122bfa8..f1cdbd0cf7 100644 --- a/source/lib/omnitrace/library/constraint.cpp +++ b/source/lib/core/constraint.cpp @@ -20,11 +20,11 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "library/constraint.hpp" -#include "library/config.hpp" -#include "library/debug.hpp" -#include "library/state.hpp" -#include "library/utility.hpp" +#include "constraint.hpp" +#include "config.hpp" +#include "debug.hpp" +#include "state.hpp" +#include "utility.hpp" #include #include diff --git a/source/lib/omnitrace/library/constraint.hpp b/source/lib/core/constraint.hpp similarity index 99% rename from source/lib/omnitrace/library/constraint.hpp rename to source/lib/core/constraint.hpp index 888df8c003..f2b8808f13 100644 --- a/source/lib/omnitrace/library/constraint.hpp +++ b/source/lib/core/constraint.hpp @@ -30,7 +30,7 @@ /// to use this /// -#include "library/defines.hpp" +#include "defines.hpp" #include #include diff --git a/source/lib/omnitrace/library/containers/CMakeLists.txt b/source/lib/core/containers/CMakeLists.txt similarity index 53% rename from source/lib/omnitrace/library/containers/CMakeLists.txt rename to source/lib/core/containers/CMakeLists.txt index 8624008df3..970d286ecd 100644 --- a/source/lib/omnitrace/library/containers/CMakeLists.txt +++ b/source/lib/core/containers/CMakeLists.txt @@ -4,5 +4,4 @@ set(containers_sources) set(containers_headers ${CMAKE_CURRENT_LIST_DIR}/stable_vector.hpp ${CMAKE_CURRENT_LIST_DIR}/static_vector.hpp) -target_sources(omnitrace-object-library PRIVATE ${containers_sources} - ${containers_headers}) +target_sources(omnitrace-core-library PRIVATE ${containers_sources} ${containers_headers}) diff --git a/source/lib/omnitrace/library/containers/c_array.hpp b/source/lib/core/containers/c_array.hpp similarity index 99% rename from source/lib/omnitrace/library/containers/c_array.hpp rename to source/lib/core/containers/c_array.hpp index 4dc9aaaec9..b04f6efe8d 100644 --- a/source/lib/omnitrace/library/containers/c_array.hpp +++ b/source/lib/core/containers/c_array.hpp @@ -22,7 +22,7 @@ #pragma once -#include "library/exception.hpp" +#include "core/exception.hpp" #include #include diff --git a/source/lib/omnitrace/library/containers/operators.hpp b/source/lib/core/containers/operators.hpp similarity index 99% rename from source/lib/omnitrace/library/containers/operators.hpp rename to source/lib/core/containers/operators.hpp index 15e8007c47..043497d059 100644 --- a/source/lib/omnitrace/library/containers/operators.hpp +++ b/source/lib/core/containers/operators.hpp @@ -22,7 +22,7 @@ #pragma once -#include "library/defines.hpp" +#include "core/defines.hpp" #include #include diff --git a/source/lib/omnitrace/library/containers/stable_vector.hpp b/source/lib/core/containers/stable_vector.hpp similarity index 98% rename from source/lib/omnitrace/library/containers/stable_vector.hpp rename to source/lib/core/containers/stable_vector.hpp index 7830489413..71a67b8019 100644 --- a/source/lib/omnitrace/library/containers/stable_vector.hpp +++ b/source/lib/core/containers/stable_vector.hpp @@ -22,9 +22,9 @@ #pragma once -#include "library/containers/operators.hpp" -#include "library/containers/static_vector.hpp" -#include "library/defines.hpp" +#include "core/containers/operators.hpp" +#include "core/containers/static_vector.hpp" +#include "core/defines.hpp" #include #include diff --git a/source/lib/omnitrace/library/containers/static_vector.hpp b/source/lib/core/containers/static_vector.hpp similarity index 98% rename from source/lib/omnitrace/library/containers/static_vector.hpp rename to source/lib/core/containers/static_vector.hpp index 3d293c9405..a54ba49ac9 100644 --- a/source/lib/omnitrace/library/containers/static_vector.hpp +++ b/source/lib/core/containers/static_vector.hpp @@ -22,9 +22,9 @@ #pragma once -#include "library/common.hpp" -#include "library/debug.hpp" -#include "library/exception.hpp" +#include "core/common.hpp" +#include "core/debug.hpp" +#include "core/exception.hpp" #include diff --git a/source/lib/omnitrace/library/debug.cpp b/source/lib/core/debug.cpp similarity index 97% rename from source/lib/omnitrace/library/debug.cpp rename to source/lib/core/debug.cpp index 036babfcc0..1076d34e5c 100644 --- a/source/lib/omnitrace/library/debug.cpp +++ b/source/lib/core/debug.cpp @@ -20,9 +20,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "library/debug.hpp" -#include "library/binary/address_range.hpp" -#include "library/state.hpp" +#include "debug.hpp" +#include "binary/address_range.hpp" +#include "state.hpp" #include #include diff --git a/source/lib/omnitrace/library/debug.hpp b/source/lib/core/debug.hpp similarity index 99% rename from source/lib/omnitrace/library/debug.hpp rename to source/lib/core/debug.hpp index bb63d477d3..63902c3678 100644 --- a/source/lib/omnitrace/library/debug.hpp +++ b/source/lib/core/debug.hpp @@ -22,8 +22,8 @@ #pragma once -#include "library/defines.hpp" -#include "library/exception.hpp" +#include "defines.hpp" +#include "exception.hpp" #include #include diff --git a/source/lib/omnitrace/library/defines.hpp.in b/source/lib/core/defines.hpp.in similarity index 100% rename from source/lib/omnitrace/library/defines.hpp.in rename to source/lib/core/defines.hpp.in diff --git a/source/lib/omnitrace/library/dynamic_library.cpp b/source/lib/core/dynamic_library.cpp similarity index 97% rename from source/lib/omnitrace/library/dynamic_library.cpp rename to source/lib/core/dynamic_library.cpp index 66680e2c8d..9959d0ef7d 100644 --- a/source/lib/omnitrace/library/dynamic_library.cpp +++ b/source/lib/core/dynamic_library.cpp @@ -20,10 +20,10 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "library/dynamic_library.hpp" -#include "library/common.hpp" -#include "library/debug.hpp" -#include "library/defines.hpp" +#include "dynamic_library.hpp" +#include "common.hpp" +#include "debug.hpp" +#include "defines.hpp" #include #include diff --git a/source/lib/omnitrace/library/dynamic_library.hpp b/source/lib/core/dynamic_library.hpp similarity index 98% rename from source/lib/omnitrace/library/dynamic_library.hpp rename to source/lib/core/dynamic_library.hpp index 708953d359..b8979aef3c 100644 --- a/source/lib/omnitrace/library/dynamic_library.hpp +++ b/source/lib/core/dynamic_library.hpp @@ -22,7 +22,7 @@ #pragma once -#include "library/defines.hpp" +#include "defines.hpp" #include #include diff --git a/source/lib/omnitrace/library/exception.cpp b/source/lib/core/exception.cpp similarity index 99% rename from source/lib/omnitrace/library/exception.cpp rename to source/lib/core/exception.cpp index 2e2d330af9..43aebda473 100644 --- a/source/lib/omnitrace/library/exception.cpp +++ b/source/lib/core/exception.cpp @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "library/exception.hpp" +#include "exception.hpp" #include #include diff --git a/source/lib/omnitrace/library/exception.hpp b/source/lib/core/exception.hpp similarity index 100% rename from source/lib/omnitrace/library/exception.hpp rename to source/lib/core/exception.hpp diff --git a/source/lib/omnitrace/library/gpu.cpp b/source/lib/core/gpu.cpp similarity index 99% rename from source/lib/omnitrace/library/gpu.cpp rename to source/lib/core/gpu.cpp index f14c8cb6e1..9b4e486bf2 100644 --- a/source/lib/omnitrace/library/gpu.cpp +++ b/source/lib/core/gpu.cpp @@ -34,9 +34,9 @@ # endif #endif -#include "library/gpu.hpp" -#include "library/debug.hpp" -#include "library/defines.hpp" +#include "gpu.hpp" +#include "debug.hpp" +#include "defines.hpp" #include diff --git a/source/lib/omnitrace/library/gpu.hpp b/source/lib/core/gpu.hpp similarity index 100% rename from source/lib/omnitrace/library/gpu.hpp rename to source/lib/core/gpu.hpp diff --git a/source/lib/omnitrace/library/locking.cpp b/source/lib/core/locking.cpp similarity index 100% rename from source/lib/omnitrace/library/locking.cpp rename to source/lib/core/locking.cpp diff --git a/source/lib/omnitrace/library/locking.hpp b/source/lib/core/locking.hpp similarity index 100% rename from source/lib/omnitrace/library/locking.hpp rename to source/lib/core/locking.hpp diff --git a/source/lib/omnitrace/library/mproc.cpp b/source/lib/core/mproc.cpp similarity index 96% rename from source/lib/omnitrace/library/mproc.cpp rename to source/lib/core/mproc.cpp index 83af7f1ae9..b6ed20277a 100644 --- a/source/lib/omnitrace/library/mproc.cpp +++ b/source/lib/core/mproc.cpp @@ -20,9 +20,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "library/mproc.hpp" -#include "library/common.hpp" -#include "library/debug.hpp" +#include "mproc.hpp" +#include "common.hpp" +#include "debug.hpp" #include #include diff --git a/source/lib/omnitrace/library/mproc.hpp b/source/lib/core/mproc.hpp similarity index 100% rename from source/lib/omnitrace/library/mproc.hpp rename to source/lib/core/mproc.hpp diff --git a/source/lib/omnitrace/library/perfetto.cpp b/source/lib/core/perfetto.cpp similarity index 97% rename from source/lib/omnitrace/library/perfetto.cpp rename to source/lib/core/perfetto.cpp index d68f307926..5256cb2828 100644 --- a/source/lib/omnitrace/library/perfetto.cpp +++ b/source/lib/core/perfetto.cpp @@ -20,9 +20,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "library/perfetto.hpp" -#include "library/config.hpp" -#include "library/tracing.hpp" +#include "perfetto.hpp" +#include "config.hpp" namespace omnitrace { diff --git a/source/lib/omnitrace/library/perfetto.hpp b/source/lib/core/perfetto.hpp similarity index 98% rename from source/lib/omnitrace/library/perfetto.hpp rename to source/lib/core/perfetto.hpp index 2c6f2999ef..b30d2e6604 100644 --- a/source/lib/omnitrace/library/perfetto.hpp +++ b/source/lib/core/perfetto.hpp @@ -22,8 +22,8 @@ #pragma once -#include "library/categories.hpp" -#include "library/common.hpp" +#include "categories.hpp" +#include "common.hpp" #if defined(TIMEMORY_USE_PERFETTO) # include @@ -32,7 +32,7 @@ PERFETTO_DEFINE_CATEGORIES(OMNITRACE_PERFETTO_CATEGORIES); #endif -#include "library/debug.hpp" +#include "debug.hpp" #include #include diff --git a/source/lib/omnitrace/library/redirect.hpp b/source/lib/core/redirect.hpp similarity index 99% rename from source/lib/omnitrace/library/redirect.hpp rename to source/lib/core/redirect.hpp index 24dabfc3df..65c59e8beb 100644 --- a/source/lib/omnitrace/library/redirect.hpp +++ b/source/lib/core/redirect.hpp @@ -22,7 +22,7 @@ #pragma once -#include "library/defines.hpp" +#include "core/defines.hpp" #include #include diff --git a/source/lib/omnitrace/library/state.cpp b/source/lib/core/state.cpp similarity index 97% rename from source/lib/omnitrace/library/state.cpp rename to source/lib/core/state.cpp index ed4ed1fee8..864c923bf3 100644 --- a/source/lib/omnitrace/library/state.cpp +++ b/source/lib/core/state.cpp @@ -20,10 +20,10 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "library/state.hpp" -#include "library/config.hpp" -#include "library/debug.hpp" -#include "library/utility.hpp" +#include "state.hpp" +#include "config.hpp" +#include "debug.hpp" +#include "utility.hpp" #include diff --git a/source/lib/omnitrace/library/state.hpp b/source/lib/core/state.hpp similarity index 98% rename from source/lib/omnitrace/library/state.hpp rename to source/lib/core/state.hpp index 11f8475001..c7d41f5ddb 100644 --- a/source/lib/omnitrace/library/state.hpp +++ b/source/lib/core/state.hpp @@ -22,7 +22,8 @@ #pragma once -#include "library/defines.hpp" +#include "common/defines.h" +#include "defines.hpp" #include #include diff --git a/source/lib/omnitrace/library/timemory.cpp b/source/lib/core/timemory.cpp similarity index 97% rename from source/lib/omnitrace/library/timemory.cpp rename to source/lib/core/timemory.cpp index 40180cf569..161ba6bda2 100644 --- a/source/lib/omnitrace/library/timemory.cpp +++ b/source/lib/core/timemory.cpp @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "library/timemory.hpp" +#include "timemory.hpp" using namespace omnitrace; diff --git a/source/lib/omnitrace/library/timemory.hpp b/source/lib/core/timemory.hpp similarity index 95% rename from source/lib/omnitrace/library/timemory.hpp rename to source/lib/core/timemory.hpp index b1af4030fb..0e3bdedd84 100644 --- a/source/lib/omnitrace/library/timemory.hpp +++ b/source/lib/core/timemory.hpp @@ -22,9 +22,9 @@ #pragma once -#include "library/common.hpp" -#include "library/components/fwd.hpp" -#include "library/defines.hpp" +#include "common.hpp" +#include "components/fwd.hpp" +#include "defines.hpp" #include #include diff --git a/source/lib/omnitrace/library/utility.hpp b/source/lib/core/utility.hpp similarity index 99% rename from source/lib/omnitrace/library/utility.hpp rename to source/lib/core/utility.hpp index 17e69c6c90..87c03d885f 100644 --- a/source/lib/omnitrace/library/utility.hpp +++ b/source/lib/core/utility.hpp @@ -22,7 +22,7 @@ #pragma once -#include "library/concepts.hpp" +#include "concepts.hpp" #include #include diff --git a/source/lib/omnitrace/CMakeLists.txt b/source/lib/omnitrace/CMakeLists.txt index 210e660491..150e3c695e 100644 --- a/source/lib/omnitrace/CMakeLists.txt +++ b/source/lib/omnitrace/CMakeLists.txt @@ -73,21 +73,41 @@ endif() # # ------------------------------------------------------------------------------# -add_library(omnitrace-library SHARED $) -add_library(omnitrace::omnitrace-library ALIAS omnitrace-library) +add_library(omnitrace-static-library STATIC $) +add_library(omnitrace::libomnitrace-static ALIAS omnitrace-static-library) -target_link_libraries(omnitrace-library PRIVATE omnitrace::omnitrace-interface-library) +target_link_libraries( + omnitrace-static-library + PRIVATE omnitrace::omnitrace-interface-library omnitrace::omnitrace-core + omnitrace::omnitrace-core omnitrace::omnitrace-binary) + +set_target_properties(omnitrace-static-library PROPERTIES OUTPUT_NAME omnitrace) + +# ------------------------------------------------------------------------------# +# +# omnitrace shared library +# +# ------------------------------------------------------------------------------# + +add_library(omnitrace-shared-library SHARED $) +add_library(omnitrace::libomnitrace-shared ALIAS omnitrace-shared-library) +add_library(omnitrace::omnitrace-library ALIAS omnitrace-shared-library) + +target_link_libraries( + omnitrace-shared-library + PRIVATE omnitrace::omnitrace-interface-library omnitrace::omnitrace-core + omnitrace::omnitrace-core omnitrace::omnitrace-binary) set_target_properties( - omnitrace-library + omnitrace-shared-library PROPERTIES OUTPUT_NAME omnitrace VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} INSTALL_RPATH "${OMNITRACE_LIB_INSTALL_RPATH}") -omnitrace_strip_target(omnitrace-library) +omnitrace_strip_target(omnitrace-shared-library) install( - TARGETS omnitrace-library + TARGETS omnitrace-shared-library DESTINATION ${CMAKE_INSTALL_LIBDIR} OPTIONAL) diff --git a/source/lib/omnitrace/api.cpp b/source/lib/omnitrace/api.cpp index ae04bd3e21..28000ee9f0 100644 --- a/source/lib/omnitrace/api.cpp +++ b/source/lib/omnitrace/api.cpp @@ -21,7 +21,7 @@ // SOFTWARE. #include "api.hpp" -#include "library/debug.hpp" +#include "core/debug.hpp" #include #include diff --git a/source/lib/omnitrace/api.hpp b/source/lib/omnitrace/api.hpp index e4d75fee32..4cb8debf5c 100644 --- a/source/lib/omnitrace/api.hpp +++ b/source/lib/omnitrace/api.hpp @@ -22,7 +22,7 @@ #pragma once -#include "library/defines.hpp" +#include "core/defines.hpp" #include "omnitrace/categories.h" // in omnitrace-user #include diff --git a/source/lib/omnitrace/library.cpp b/source/lib/omnitrace/library.cpp index c07cb56e5a..c6bf76d7ba 100644 --- a/source/lib/omnitrace/library.cpp +++ b/source/lib/omnitrace/library.cpp @@ -26,24 +26,26 @@ // #include "api.hpp" #include "common/setup.hpp" -#include "library/categories.hpp" +#include "core/categories.hpp" +#include "core/components/fwd.hpp" +#include "core/concepts.hpp" +#include "core/config.hpp" +#include "core/constraint.hpp" +#include "core/debug.hpp" +#include "core/defines.hpp" +#include "core/gpu.hpp" +#include "core/timemory.hpp" +#include "core/utility.hpp" #include "library/causal/data.hpp" #include "library/causal/experiment.hpp" #include "library/causal/sampling.hpp" #include "library/components/exit_gotcha.hpp" #include "library/components/fork_gotcha.hpp" -#include "library/components/fwd.hpp" #include "library/components/mpi_gotcha.hpp" #include "library/components/pthread_gotcha.hpp" #include "library/components/rocprofiler.hpp" -#include "library/concepts.hpp" -#include "library/config.hpp" -#include "library/constraint.hpp" #include "library/coverage.hpp" #include "library/critical_trace.hpp" -#include "library/debug.hpp" -#include "library/defines.hpp" -#include "library/gpu.hpp" #include "library/ompt.hpp" #include "library/process_sampler.hpp" #include "library/ptl.hpp" @@ -53,9 +55,7 @@ #include "library/sampling.hpp" #include "library/thread_data.hpp" #include "library/thread_info.hpp" -#include "library/timemory.hpp" #include "library/tracing.hpp" -#include "library/utility.hpp" #include "omnitrace/categories.h" // in omnitrace-user #include diff --git a/source/lib/omnitrace/library/CMakeLists.txt b/source/lib/omnitrace/library/CMakeLists.txt index 6c84ca864e..3c8b09801c 100644 --- a/source/lib/omnitrace/library/CMakeLists.txt +++ b/source/lib/omnitrace/library/CMakeLists.txt @@ -1,69 +1,38 @@ # -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/defines.hpp.in - ${CMAKE_CURRENT_BINARY_DIR}/defines.hpp @ONLY) - set(library_sources - ${CMAKE_CURRENT_LIST_DIR}/categories.cpp - ${CMAKE_CURRENT_LIST_DIR}/config.cpp - ${CMAKE_CURRENT_LIST_DIR}/constraint.cpp ${CMAKE_CURRENT_LIST_DIR}/coverage.cpp ${CMAKE_CURRENT_LIST_DIR}/cpu_freq.cpp ${CMAKE_CURRENT_LIST_DIR}/critical_trace.cpp - ${CMAKE_CURRENT_LIST_DIR}/debug.cpp - ${CMAKE_CURRENT_LIST_DIR}/dynamic_library.cpp - ${CMAKE_CURRENT_LIST_DIR}/exception.cpp - ${CMAKE_CURRENT_LIST_DIR}/gpu.cpp ${CMAKE_CURRENT_LIST_DIR}/kokkosp.cpp - ${CMAKE_CURRENT_LIST_DIR}/locking.cpp - ${CMAKE_CURRENT_LIST_DIR}/mproc.cpp ${CMAKE_CURRENT_LIST_DIR}/ompt.cpp - ${CMAKE_CURRENT_LIST_DIR}/perfetto.cpp ${CMAKE_CURRENT_LIST_DIR}/process_sampler.cpp ${CMAKE_CURRENT_LIST_DIR}/ptl.cpp ${CMAKE_CURRENT_LIST_DIR}/runtime.cpp ${CMAKE_CURRENT_LIST_DIR}/sampling.cpp - ${CMAKE_CURRENT_LIST_DIR}/state.cpp ${CMAKE_CURRENT_LIST_DIR}/thread_deleter.cpp ${CMAKE_CURRENT_LIST_DIR}/thread_info.cpp - ${CMAKE_CURRENT_LIST_DIR}/timemory.cpp ${CMAKE_CURRENT_LIST_DIR}/tracing.cpp) set(library_headers - ${CMAKE_CURRENT_LIST_DIR}/categories.hpp - ${CMAKE_CURRENT_LIST_DIR}/common.hpp - ${CMAKE_CURRENT_LIST_DIR}/concepts.hpp - ${CMAKE_CURRENT_LIST_DIR}/config.hpp - ${CMAKE_CURRENT_LIST_DIR}/constraint.hpp ${CMAKE_CURRENT_LIST_DIR}/coverage.hpp ${CMAKE_CURRENT_LIST_DIR}/cpu_freq.hpp ${CMAKE_CURRENT_LIST_DIR}/critical_trace.hpp - ${CMAKE_CURRENT_LIST_DIR}/debug.hpp - ${CMAKE_CURRENT_LIST_DIR}/dynamic_library.hpp - ${CMAKE_CURRENT_LIST_DIR}/gpu.hpp - ${CMAKE_CURRENT_LIST_DIR}/locking.hpp - ${CMAKE_CURRENT_LIST_DIR}/mproc.hpp ${CMAKE_CURRENT_LIST_DIR}/ompt.hpp - ${CMAKE_CURRENT_LIST_DIR}/perfetto.hpp ${CMAKE_CURRENT_LIST_DIR}/process_sampler.hpp ${CMAKE_CURRENT_LIST_DIR}/ptl.hpp ${CMAKE_CURRENT_LIST_DIR}/rcclp.hpp - ${CMAKE_CURRENT_LIST_DIR}/redirect.hpp ${CMAKE_CURRENT_LIST_DIR}/rocm.hpp ${CMAKE_CURRENT_LIST_DIR}/rocm_smi.hpp ${CMAKE_CURRENT_LIST_DIR}/rocprofiler.hpp ${CMAKE_CURRENT_LIST_DIR}/roctracer.hpp ${CMAKE_CURRENT_LIST_DIR}/runtime.hpp ${CMAKE_CURRENT_LIST_DIR}/sampling.hpp - ${CMAKE_CURRENT_LIST_DIR}/state.hpp ${CMAKE_CURRENT_LIST_DIR}/thread_data.hpp ${CMAKE_CURRENT_LIST_DIR}/thread_deleter.hpp ${CMAKE_CURRENT_LIST_DIR}/thread_info.hpp - ${CMAKE_CURRENT_LIST_DIR}/timemory.hpp - ${CMAKE_CURRENT_LIST_DIR}/tracing.hpp - ${CMAKE_CURRENT_LIST_DIR}/utility.hpp) + ${CMAKE_CURRENT_LIST_DIR}/tracing.hpp) -target_sources(omnitrace-object-library PRIVATE ${library_sources} ${library_headers} - ${CMAKE_CURRENT_BINARY_DIR}/defines.hpp) +target_sources(omnitrace-object-library PRIVATE ${library_sources} ${library_headers}) if(OMNITRACE_USE_ROCTRACER OR OMNITRACE_USE_ROCPROFILER) target_sources(omnitrace-object-library PRIVATE ${CMAKE_CURRENT_LIST_DIR}/rocm.cpp) @@ -89,10 +58,8 @@ if(OMNITRACE_USE_ROCM_SMI) PRIVATE ${CMAKE_CURRENT_LIST_DIR}/rocm_smi.cpp) endif() -add_subdirectory(binary) add_subdirectory(causal) add_subdirectory(components) -add_subdirectory(containers) add_subdirectory(coverage) add_subdirectory(rocm) add_subdirectory(tracing) diff --git a/source/lib/omnitrace/library/causal/components/backtrace.cpp b/source/lib/omnitrace/library/causal/components/backtrace.cpp index 7210383712..f90f3ad11c 100644 --- a/source/lib/omnitrace/library/causal/components/backtrace.cpp +++ b/source/lib/omnitrace/library/causal/components/backtrace.cpp @@ -21,18 +21,18 @@ // SOFTWARE. #include "library/causal/components/backtrace.hpp" +#include "core/concepts.hpp" +#include "core/config.hpp" +#include "core/debug.hpp" +#include "core/state.hpp" +#include "core/utility.hpp" #include "library/causal/data.hpp" #include "library/causal/delay.hpp" #include "library/causal/experiment.hpp" -#include "library/concepts.hpp" -#include "library/config.hpp" -#include "library/debug.hpp" #include "library/runtime.hpp" -#include "library/state.hpp" #include "library/thread_data.hpp" #include "library/thread_info.hpp" #include "library/tracing.hpp" -#include "library/utility.hpp" #include #include diff --git a/source/lib/omnitrace/library/causal/components/backtrace.hpp b/source/lib/omnitrace/library/causal/components/backtrace.hpp index ae1841bea3..0e1a2d5160 100644 --- a/source/lib/omnitrace/library/causal/components/backtrace.hpp +++ b/source/lib/omnitrace/library/causal/components/backtrace.hpp @@ -22,12 +22,12 @@ #pragma once +#include "core/common.hpp" +#include "core/components/fwd.hpp" +#include "core/defines.hpp" +#include "core/timemory.hpp" #include "library/causal/data.hpp" #include "library/causal/sample_data.hpp" -#include "library/common.hpp" -#include "library/components/fwd.hpp" -#include "library/defines.hpp" -#include "library/timemory.hpp" #include #include diff --git a/source/lib/omnitrace/library/causal/components/blocking_gotcha.cpp b/source/lib/omnitrace/library/causal/components/blocking_gotcha.cpp index d76c960e12..b96073aa8b 100644 --- a/source/lib/omnitrace/library/causal/components/blocking_gotcha.cpp +++ b/source/lib/omnitrace/library/causal/components/blocking_gotcha.cpp @@ -21,12 +21,12 @@ // SOFTWARE. #include "library/causal/components/blocking_gotcha.hpp" +#include "core/config.hpp" +#include "core/debug.hpp" +#include "core/state.hpp" #include "library/causal/delay.hpp" #include "library/causal/experiment.hpp" -#include "library/config.hpp" -#include "library/debug.hpp" #include "library/runtime.hpp" -#include "library/state.hpp" #include #include diff --git a/source/lib/omnitrace/library/causal/components/blocking_gotcha.hpp b/source/lib/omnitrace/library/causal/components/blocking_gotcha.hpp index 320698b07e..543701fe2b 100644 --- a/source/lib/omnitrace/library/causal/components/blocking_gotcha.hpp +++ b/source/lib/omnitrace/library/causal/components/blocking_gotcha.hpp @@ -22,9 +22,9 @@ #pragma once -#include "library/common.hpp" -#include "library/defines.hpp" -#include "library/timemory.hpp" +#include "core/common.hpp" +#include "core/defines.hpp" +#include "core/timemory.hpp" #include #include diff --git a/source/lib/omnitrace/library/causal/components/causal_gotcha.cpp b/source/lib/omnitrace/library/causal/components/causal_gotcha.cpp index 0292b35b0b..c9971a8103 100644 --- a/source/lib/omnitrace/library/causal/components/causal_gotcha.cpp +++ b/source/lib/omnitrace/library/causal/components/causal_gotcha.cpp @@ -21,9 +21,9 @@ // SOFTWARE. #include "library/causal/components/causal_gotcha.hpp" +#include "core/config.hpp" #include "library/causal/components/blocking_gotcha.hpp" #include "library/causal/components/unblocking_gotcha.hpp" -#include "library/config.hpp" #include #include diff --git a/source/lib/omnitrace/library/causal/components/causal_gotcha.hpp b/source/lib/omnitrace/library/causal/components/causal_gotcha.hpp index b931c4659f..d674470582 100644 --- a/source/lib/omnitrace/library/causal/components/causal_gotcha.hpp +++ b/source/lib/omnitrace/library/causal/components/causal_gotcha.hpp @@ -22,9 +22,9 @@ #pragma once -#include "library/common.hpp" -#include "library/defines.hpp" -#include "library/timemory.hpp" +#include "core/common.hpp" +#include "core/defines.hpp" +#include "core/timemory.hpp" #include #include diff --git a/source/lib/omnitrace/library/causal/components/progress_point.cpp b/source/lib/omnitrace/library/causal/components/progress_point.cpp index f375ede750..15c4c7b0c4 100644 --- a/source/lib/omnitrace/library/causal/components/progress_point.cpp +++ b/source/lib/omnitrace/library/causal/components/progress_point.cpp @@ -21,12 +21,12 @@ // SOFTWARE. #include "library/causal/components/progress_point.hpp" +#include "core/common.hpp" +#include "core/concepts.hpp" +#include "core/debug.hpp" +#include "core/timemory.hpp" #include "library/causal/experiment.hpp" -#include "library/common.hpp" -#include "library/concepts.hpp" -#include "library/debug.hpp" #include "library/thread_data.hpp" -#include "library/timemory.hpp" #include #include diff --git a/source/lib/omnitrace/library/causal/components/progress_point.hpp b/source/lib/omnitrace/library/causal/components/progress_point.hpp index 50b92d5452..aa74c1ffb5 100644 --- a/source/lib/omnitrace/library/causal/components/progress_point.hpp +++ b/source/lib/omnitrace/library/causal/components/progress_point.hpp @@ -22,9 +22,9 @@ #pragma once -#include "library/common.hpp" -#include "library/components/fwd.hpp" -#include "library/defines.hpp" +#include "core/common.hpp" +#include "core/components/fwd.hpp" +#include "core/defines.hpp" #include #include diff --git a/source/lib/omnitrace/library/causal/components/unblocking_gotcha.cpp b/source/lib/omnitrace/library/causal/components/unblocking_gotcha.cpp index f29d1b3139..5e0b7dbed0 100644 --- a/source/lib/omnitrace/library/causal/components/unblocking_gotcha.cpp +++ b/source/lib/omnitrace/library/causal/components/unblocking_gotcha.cpp @@ -21,10 +21,10 @@ // SOFTWARE. #include "library/causal/components/unblocking_gotcha.hpp" +#include "core/config.hpp" +#include "core/debug.hpp" #include "library/causal/delay.hpp" #include "library/causal/experiment.hpp" -#include "library/config.hpp" -#include "library/debug.hpp" #include "library/runtime.hpp" #include diff --git a/source/lib/omnitrace/library/causal/components/unblocking_gotcha.hpp b/source/lib/omnitrace/library/causal/components/unblocking_gotcha.hpp index f8197a62cf..44a58728ef 100644 --- a/source/lib/omnitrace/library/causal/components/unblocking_gotcha.hpp +++ b/source/lib/omnitrace/library/causal/components/unblocking_gotcha.hpp @@ -22,9 +22,9 @@ #pragma once -#include "library/common.hpp" -#include "library/defines.hpp" -#include "library/timemory.hpp" +#include "core/common.hpp" +#include "core/defines.hpp" +#include "core/timemory.hpp" #include #include diff --git a/source/lib/omnitrace/library/causal/data.cpp b/source/lib/omnitrace/library/causal/data.cpp index d0c8fb454e..2f236bbdcf 100644 --- a/source/lib/omnitrace/library/causal/data.cpp +++ b/source/lib/omnitrace/library/causal/data.cpp @@ -21,24 +21,24 @@ // SOFTWARE. #include "library/causal/data.hpp" -#include "library/binary/address_multirange.hpp" -#include "library/binary/analysis.hpp" -#include "library/binary/binary_info.hpp" -#include "library/binary/fwd.hpp" -#include "library/binary/link_map.hpp" -#include "library/binary/scope_filter.hpp" +#include "binary/address_multirange.hpp" +#include "binary/analysis.hpp" +#include "binary/binary_info.hpp" +#include "binary/link_map.hpp" +#include "binary/scope_filter.hpp" +#include "core/binary/fwd.hpp" +#include "core/config.hpp" +#include "core/debug.hpp" +#include "core/state.hpp" +#include "core/utility.hpp" #include "library/causal/delay.hpp" #include "library/causal/experiment.hpp" #include "library/causal/sampling.hpp" #include "library/causal/selected_entry.hpp" -#include "library/config.hpp" -#include "library/debug.hpp" #include "library/ptl.hpp" #include "library/runtime.hpp" -#include "library/state.hpp" #include "library/thread_data.hpp" #include "library/thread_info.hpp" -#include "library/utility.hpp" #include #include diff --git a/source/lib/omnitrace/library/causal/data.hpp b/source/lib/omnitrace/library/causal/data.hpp index 257195dc83..8fdba31656 100644 --- a/source/lib/omnitrace/library/causal/data.hpp +++ b/source/lib/omnitrace/library/causal/data.hpp @@ -22,14 +22,14 @@ #pragma once -#include "library/binary/analysis.hpp" -#include "library/binary/fwd.hpp" +#include "binary/analysis.hpp" +#include "core/binary/fwd.hpp" +#include "core/containers/c_array.hpp" +#include "core/containers/static_vector.hpp" +#include "core/defines.hpp" +#include "core/utility.hpp" #include "library/causal/fwd.hpp" -#include "library/containers/c_array.hpp" -#include "library/containers/static_vector.hpp" -#include "library/defines.hpp" #include "library/thread_data.hpp" -#include "library/utility.hpp" #include #include diff --git a/source/lib/omnitrace/library/causal/delay.cpp b/source/lib/omnitrace/library/causal/delay.cpp index d6ed4bab10..eb2cd3806d 100644 --- a/source/lib/omnitrace/library/causal/delay.cpp +++ b/source/lib/omnitrace/library/causal/delay.cpp @@ -21,13 +21,13 @@ // SOFTWARE. #include "library/causal/delay.hpp" +#include "core/state.hpp" +#include "core/utility.hpp" #include "library/causal/experiment.hpp" #include "library/runtime.hpp" -#include "library/state.hpp" #include "library/thread_data.hpp" #include "library/thread_info.hpp" #include "library/tracing.hpp" -#include "library/utility.hpp" #include #include diff --git a/source/lib/omnitrace/library/causal/delay.hpp b/source/lib/omnitrace/library/causal/delay.hpp index 9b82c10339..8c9ceee68a 100644 --- a/source/lib/omnitrace/library/causal/delay.hpp +++ b/source/lib/omnitrace/library/causal/delay.hpp @@ -22,9 +22,9 @@ #pragma once -#include "library/common.hpp" -#include "library/components/fwd.hpp" -#include "library/defines.hpp" +#include "core/common.hpp" +#include "core/components/fwd.hpp" +#include "core/defines.hpp" #include "library/thread_data.hpp" #include diff --git a/source/lib/omnitrace/library/causal/experiment.cpp b/source/lib/omnitrace/library/causal/experiment.cpp index c8ae8c2df8..49cfe90724 100644 --- a/source/lib/omnitrace/library/causal/experiment.cpp +++ b/source/lib/omnitrace/library/causal/experiment.cpp @@ -22,13 +22,13 @@ #include "library/causal/experiment.hpp" #include "common/defines.h" +#include "core/config.hpp" +#include "core/debug.hpp" +#include "core/state.hpp" #include "library/causal/components/backtrace.hpp" #include "library/causal/components/progress_point.hpp" #include "library/causal/data.hpp" #include "library/causal/delay.hpp" -#include "library/config.hpp" -#include "library/debug.hpp" -#include "library/state.hpp" #include "library/thread_data.hpp" #include "library/thread_info.hpp" #include "library/tracing.hpp" diff --git a/source/lib/omnitrace/library/causal/experiment.hpp b/source/lib/omnitrace/library/causal/experiment.hpp index dc1cd72fb6..c383022337 100644 --- a/source/lib/omnitrace/library/causal/experiment.hpp +++ b/source/lib/omnitrace/library/causal/experiment.hpp @@ -22,16 +22,16 @@ #pragma once -#include "library/binary/dwarf_entry.hpp" -#include "library/binary/symbol.hpp" +#include "binary/dwarf_entry.hpp" +#include "binary/symbol.hpp" +#include "core/containers/c_array.hpp" +#include "core/defines.hpp" +#include "core/utility.hpp" #include "library/causal/components/backtrace.hpp" #include "library/causal/components/progress_point.hpp" #include "library/causal/data.hpp" #include "library/causal/sample_data.hpp" #include "library/causal/selected_entry.hpp" -#include "library/containers/c_array.hpp" -#include "library/defines.hpp" -#include "library/utility.hpp" #include #include diff --git a/source/lib/omnitrace/library/causal/fwd.hpp b/source/lib/omnitrace/library/causal/fwd.hpp index 22a8880bef..183ac2ec2d 100644 --- a/source/lib/omnitrace/library/causal/fwd.hpp +++ b/source/lib/omnitrace/library/causal/fwd.hpp @@ -22,9 +22,9 @@ #pragma once -#include "library/binary/fwd.hpp" -#include "library/containers/static_vector.hpp" -#include "library/defines.hpp" +#include "core/binary/fwd.hpp" +#include "core/containers/static_vector.hpp" +#include "core/defines.hpp" #include #include diff --git a/source/lib/omnitrace/library/causal/perf.cpp b/source/lib/omnitrace/library/causal/perf.cpp index 662e59bbe3..a4908da386 100644 --- a/source/lib/omnitrace/library/causal/perf.cpp +++ b/source/lib/omnitrace/library/causal/perf.cpp @@ -21,8 +21,8 @@ // SOFTWARE. #include "library/causal/perf.hpp" -#include "library/timemory.hpp" -#include "library/utility.hpp" +#include "core/timemory.hpp" +#include "core/utility.hpp" #include #include diff --git a/source/lib/omnitrace/library/causal/perf.hpp b/source/lib/omnitrace/library/causal/perf.hpp index 17c96aacf9..d815737dbc 100644 --- a/source/lib/omnitrace/library/causal/perf.hpp +++ b/source/lib/omnitrace/library/causal/perf.hpp @@ -22,8 +22,8 @@ #pragma once -#include "library/containers/c_array.hpp" -#include "library/defines.hpp" +#include "core/containers/c_array.hpp" +#include "core/defines.hpp" #include #include diff --git a/source/lib/omnitrace/library/causal/sample_data.hpp b/source/lib/omnitrace/library/causal/sample_data.hpp index 3d38e859cf..1a6e21ace3 100644 --- a/source/lib/omnitrace/library/causal/sample_data.hpp +++ b/source/lib/omnitrace/library/causal/sample_data.hpp @@ -22,8 +22,8 @@ #pragma once -#include "library/defines.hpp" -#include "library/timemory.hpp" +#include "core/defines.hpp" +#include "core/timemory.hpp" #include #include diff --git a/source/lib/omnitrace/library/causal/sampling.cpp b/source/lib/omnitrace/library/causal/sampling.cpp index f43ad2f63a..f90d621f23 100644 --- a/source/lib/omnitrace/library/causal/sampling.cpp +++ b/source/lib/omnitrace/library/causal/sampling.cpp @@ -21,19 +21,19 @@ // SOFTWARE. #include "library/causal/sampling.hpp" +#include "core/common.hpp" +#include "core/concepts.hpp" +#include "core/config.hpp" +#include "core/debug.hpp" +#include "core/state.hpp" +#include "core/utility.hpp" #include "library/causal/components/backtrace.hpp" #include "library/causal/data.hpp" -#include "library/common.hpp" -#include "library/concepts.hpp" -#include "library/config.hpp" -#include "library/debug.hpp" #include "library/ptl.hpp" #include "library/runtime.hpp" #include "library/sampling.hpp" -#include "library/state.hpp" #include "library/thread_data.hpp" #include "library/thread_info.hpp" -#include "library/utility.hpp" #include #include diff --git a/source/lib/omnitrace/library/causal/sampling.hpp b/source/lib/omnitrace/library/causal/sampling.hpp index 7562444229..992a139c0e 100644 --- a/source/lib/omnitrace/library/causal/sampling.hpp +++ b/source/lib/omnitrace/library/causal/sampling.hpp @@ -22,8 +22,8 @@ #pragma once -#include "library/concepts.hpp" -#include "library/defines.hpp" +#include "core/concepts.hpp" +#include "core/defines.hpp" #include #include diff --git a/source/lib/omnitrace/library/causal/selected_entry.cpp b/source/lib/omnitrace/library/causal/selected_entry.cpp index 6c0c9944f2..0fd68c11a6 100644 --- a/source/lib/omnitrace/library/causal/selected_entry.cpp +++ b/source/lib/omnitrace/library/causal/selected_entry.cpp @@ -21,8 +21,8 @@ // SOFTWARE. #include "library/causal/selected_entry.hpp" -#include "library/common.hpp" -#include "library/timemory.hpp" +#include "core/common.hpp" +#include "core/timemory.hpp" namespace omnitrace { diff --git a/source/lib/omnitrace/library/causal/selected_entry.hpp b/source/lib/omnitrace/library/causal/selected_entry.hpp index 158a41ad05..bc45ffbcfb 100644 --- a/source/lib/omnitrace/library/causal/selected_entry.hpp +++ b/source/lib/omnitrace/library/causal/selected_entry.hpp @@ -22,12 +22,12 @@ #pragma once -#include "library/binary/dwarf_entry.hpp" -#include "library/binary/fwd.hpp" -#include "library/binary/symbol.hpp" +#include "binary/dwarf_entry.hpp" +#include "binary/symbol.hpp" +#include "core/binary/fwd.hpp" +#include "core/debug.hpp" +#include "core/defines.hpp" #include "library/causal/fwd.hpp" -#include "library/debug.hpp" -#include "library/defines.hpp" #include #include diff --git a/source/lib/omnitrace/library/components/CMakeLists.txt b/source/lib/omnitrace/library/components/CMakeLists.txt index 5a3b4f7f08..942d53378c 100644 --- a/source/lib/omnitrace/library/components/CMakeLists.txt +++ b/source/lib/omnitrace/library/components/CMakeLists.txt @@ -14,7 +14,6 @@ set(component_sources ${CMAKE_CURRENT_LIST_DIR}/pthread_mutex_gotcha.cpp) set(component_headers - ${CMAKE_CURRENT_LIST_DIR}/fwd.hpp ${CMAKE_CURRENT_LIST_DIR}/backtrace.hpp ${CMAKE_CURRENT_LIST_DIR}/backtrace_metrics.hpp ${CMAKE_CURRENT_LIST_DIR}/backtrace_timestamp.hpp diff --git a/source/lib/omnitrace/library/components/backtrace.cpp b/source/lib/omnitrace/library/components/backtrace.cpp index b2fe1cbbb8..5d9d44a6d7 100644 --- a/source/lib/omnitrace/library/components/backtrace.cpp +++ b/source/lib/omnitrace/library/components/backtrace.cpp @@ -20,12 +20,12 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "library/common.hpp" +#include "core/common.hpp" +#include "core/components/fwd.hpp" +#include "core/config.hpp" +#include "core/debug.hpp" +#include "core/perfetto.hpp" #include "library/components/ensure_storage.hpp" -#include "library/components/fwd.hpp" -#include "library/config.hpp" -#include "library/debug.hpp" -#include "library/perfetto.hpp" #include "library/ptl.hpp" #include "library/runtime.hpp" #include "library/sampling.hpp" diff --git a/source/lib/omnitrace/library/components/backtrace.hpp b/source/lib/omnitrace/library/components/backtrace.hpp index 63a91f4487..e077d4c3f2 100644 --- a/source/lib/omnitrace/library/components/backtrace.hpp +++ b/source/lib/omnitrace/library/components/backtrace.hpp @@ -22,11 +22,11 @@ #pragma once -#include "library/common.hpp" -#include "library/components/fwd.hpp" -#include "library/defines.hpp" +#include "core/common.hpp" +#include "core/components/fwd.hpp" +#include "core/defines.hpp" +#include "core/timemory.hpp" #include "library/thread_data.hpp" -#include "library/timemory.hpp" #include #include diff --git a/source/lib/omnitrace/library/components/backtrace_metrics.cpp b/source/lib/omnitrace/library/components/backtrace_metrics.cpp index ea87e01459..8c2527ca69 100644 --- a/source/lib/omnitrace/library/components/backtrace_metrics.cpp +++ b/source/lib/omnitrace/library/components/backtrace_metrics.cpp @@ -21,11 +21,11 @@ // SOFTWARE. #include "library/components/backtrace_metrics.hpp" +#include "core/components/fwd.hpp" +#include "core/config.hpp" +#include "core/debug.hpp" +#include "core/perfetto.hpp" #include "library/components/ensure_storage.hpp" -#include "library/components/fwd.hpp" -#include "library/config.hpp" -#include "library/debug.hpp" -#include "library/perfetto.hpp" #include "library/ptl.hpp" #include "library/runtime.hpp" #include "library/sampling.hpp" diff --git a/source/lib/omnitrace/library/components/backtrace_metrics.hpp b/source/lib/omnitrace/library/components/backtrace_metrics.hpp index d62658c1a4..d9f6f6e540 100644 --- a/source/lib/omnitrace/library/components/backtrace_metrics.hpp +++ b/source/lib/omnitrace/library/components/backtrace_metrics.hpp @@ -22,12 +22,12 @@ #pragma once -#include "library/common.hpp" +#include "core/common.hpp" +#include "core/components/fwd.hpp" +#include "core/defines.hpp" +#include "core/timemory.hpp" #include "library/components/backtrace.hpp" -#include "library/components/fwd.hpp" -#include "library/defines.hpp" #include "library/thread_data.hpp" -#include "library/timemory.hpp" #include #include diff --git a/source/lib/omnitrace/library/components/backtrace_timestamp.hpp b/source/lib/omnitrace/library/components/backtrace_timestamp.hpp index 4c7f90531e..fc49d8e757 100644 --- a/source/lib/omnitrace/library/components/backtrace_timestamp.hpp +++ b/source/lib/omnitrace/library/components/backtrace_timestamp.hpp @@ -22,10 +22,10 @@ #pragma once -#include "library/common.hpp" -#include "library/components/fwd.hpp" -#include "library/defines.hpp" -#include "library/timemory.hpp" +#include "core/common.hpp" +#include "core/components/fwd.hpp" +#include "core/defines.hpp" +#include "core/timemory.hpp" #include #include diff --git a/source/lib/omnitrace/library/components/category_region.hpp b/source/lib/omnitrace/library/components/category_region.hpp index 3eeb031f45..ec89f747c0 100644 --- a/source/lib/omnitrace/library/components/category_region.hpp +++ b/source/lib/omnitrace/library/components/category_region.hpp @@ -22,13 +22,13 @@ #pragma once +#include "core/config.hpp" +#include "core/defines.hpp" +#include "core/state.hpp" +#include "core/timemory.hpp" #include "library/causal/data.hpp" -#include "library/config.hpp" #include "library/critical_trace.hpp" -#include "library/defines.hpp" #include "library/runtime.hpp" -#include "library/state.hpp" -#include "library/timemory.hpp" #include "library/tracing.hpp" #include "library/tracing/annotation.hpp" diff --git a/source/lib/omnitrace/library/components/comm_data.cpp b/source/lib/omnitrace/library/components/comm_data.cpp index 2a160fea48..e1cd974138 100644 --- a/source/lib/omnitrace/library/components/comm_data.cpp +++ b/source/lib/omnitrace/library/components/comm_data.cpp @@ -21,9 +21,9 @@ // SOFTWARE. #include "library/components/comm_data.hpp" -#include "library/components/fwd.hpp" -#include "library/config.hpp" -#include "library/perfetto.hpp" +#include "core/components/fwd.hpp" +#include "core/config.hpp" +#include "core/perfetto.hpp" #include "library/tracing.hpp" #include diff --git a/source/lib/omnitrace/library/components/comm_data.hpp b/source/lib/omnitrace/library/components/comm_data.hpp index e58756541a..7609c29d6a 100644 --- a/source/lib/omnitrace/library/components/comm_data.hpp +++ b/source/lib/omnitrace/library/components/comm_data.hpp @@ -23,11 +23,11 @@ // SOFTWARE. #include "common/join.hpp" -#include "library/common.hpp" +#include "core/common.hpp" +#include "core/components/fwd.hpp" +#include "core/defines.hpp" +#include "core/timemory.hpp" #include "library/components/category_region.hpp" -#include "library/components/fwd.hpp" -#include "library/defines.hpp" -#include "library/timemory.hpp" #include #include diff --git a/source/lib/omnitrace/library/components/cpu_freq.cpp b/source/lib/omnitrace/library/components/cpu_freq.cpp index 26ea1f73d3..4444eadca3 100644 --- a/source/lib/omnitrace/library/components/cpu_freq.cpp +++ b/source/lib/omnitrace/library/components/cpu_freq.cpp @@ -21,13 +21,13 @@ // SOFTWARE. #include "library/components/cpu_freq.hpp" -#include "library/common.hpp" -#include "library/components/fwd.hpp" -#include "library/config.hpp" -#include "library/debug.hpp" -#include "library/defines.hpp" -#include "library/perfetto.hpp" -#include "library/timemory.hpp" +#include "core/common.hpp" +#include "core/components/fwd.hpp" +#include "core/config.hpp" +#include "core/debug.hpp" +#include "core/defines.hpp" +#include "core/perfetto.hpp" +#include "core/timemory.hpp" #include #include diff --git a/source/lib/omnitrace/library/components/cpu_freq.hpp b/source/lib/omnitrace/library/components/cpu_freq.hpp index b86671f67b..d352613b53 100644 --- a/source/lib/omnitrace/library/components/cpu_freq.hpp +++ b/source/lib/omnitrace/library/components/cpu_freq.hpp @@ -22,9 +22,9 @@ #pragma once -#include "library/common.hpp" -#include "library/defines.hpp" -#include "library/timemory.hpp" +#include "core/common.hpp" +#include "core/defines.hpp" +#include "core/timemory.hpp" #include #include diff --git a/source/lib/omnitrace/library/components/ensure_storage.hpp b/source/lib/omnitrace/library/components/ensure_storage.hpp index 6950379290..383f3a45a4 100644 --- a/source/lib/omnitrace/library/components/ensure_storage.hpp +++ b/source/lib/omnitrace/library/components/ensure_storage.hpp @@ -22,7 +22,7 @@ #pragma once -#include "library/defines.hpp" +#include "core/defines.hpp" #include #include diff --git a/source/lib/omnitrace/library/components/exit_gotcha.cpp b/source/lib/omnitrace/library/components/exit_gotcha.cpp index 6447d648e2..ce955833da 100644 --- a/source/lib/omnitrace/library/components/exit_gotcha.cpp +++ b/source/lib/omnitrace/library/components/exit_gotcha.cpp @@ -21,12 +21,12 @@ // SOFTWARE. #include "library/components/exit_gotcha.hpp" -#include "library/common.hpp" -#include "library/config.hpp" -#include "library/debug.hpp" +#include "core/common.hpp" +#include "core/config.hpp" +#include "core/debug.hpp" +#include "core/state.hpp" +#include "core/timemory.hpp" #include "library/runtime.hpp" -#include "library/state.hpp" -#include "library/timemory.hpp" #include #include diff --git a/source/lib/omnitrace/library/components/exit_gotcha.hpp b/source/lib/omnitrace/library/components/exit_gotcha.hpp index cca80b7402..b5a63bad45 100644 --- a/source/lib/omnitrace/library/components/exit_gotcha.hpp +++ b/source/lib/omnitrace/library/components/exit_gotcha.hpp @@ -22,9 +22,9 @@ #pragma once -#include "library/common.hpp" -#include "library/defines.hpp" -#include "library/timemory.hpp" +#include "core/common.hpp" +#include "core/defines.hpp" +#include "core/timemory.hpp" #include #include diff --git a/source/lib/omnitrace/library/components/fork_gotcha.cpp b/source/lib/omnitrace/library/components/fork_gotcha.cpp index 70ddf04661..cf7f120c26 100644 --- a/source/lib/omnitrace/library/components/fork_gotcha.cpp +++ b/source/lib/omnitrace/library/components/fork_gotcha.cpp @@ -21,9 +21,9 @@ // SOFTWARE. #include "library/components/fork_gotcha.hpp" -#include "library/config.hpp" -#include "library/debug.hpp" -#include "library/state.hpp" +#include "core/config.hpp" +#include "core/debug.hpp" +#include "core/state.hpp" #include #include diff --git a/source/lib/omnitrace/library/components/fork_gotcha.hpp b/source/lib/omnitrace/library/components/fork_gotcha.hpp index d579f6ada9..6e95dc314c 100644 --- a/source/lib/omnitrace/library/components/fork_gotcha.hpp +++ b/source/lib/omnitrace/library/components/fork_gotcha.hpp @@ -22,9 +22,9 @@ #pragma once -#include "library/common.hpp" -#include "library/defines.hpp" -#include "library/timemory.hpp" +#include "core/common.hpp" +#include "core/defines.hpp" +#include "core/timemory.hpp" namespace omnitrace { diff --git a/source/lib/omnitrace/library/components/mpi_gotcha.cpp b/source/lib/omnitrace/library/components/mpi_gotcha.cpp index 04f59cfc2d..bc34ca42c6 100644 --- a/source/lib/omnitrace/library/components/mpi_gotcha.cpp +++ b/source/lib/omnitrace/library/components/mpi_gotcha.cpp @@ -22,12 +22,12 @@ #include "library/components/mpi_gotcha.hpp" #include "api.hpp" +#include "core/components/fwd.hpp" +#include "core/config.hpp" +#include "core/debug.hpp" +#include "core/mproc.hpp" #include "library/components/category_region.hpp" #include "library/components/comm_data.hpp" -#include "library/components/fwd.hpp" -#include "library/config.hpp" -#include "library/debug.hpp" -#include "library/mproc.hpp" #include #include diff --git a/source/lib/omnitrace/library/components/mpi_gotcha.hpp b/source/lib/omnitrace/library/components/mpi_gotcha.hpp index ba2140e937..20ff490ef4 100644 --- a/source/lib/omnitrace/library/components/mpi_gotcha.hpp +++ b/source/lib/omnitrace/library/components/mpi_gotcha.hpp @@ -22,9 +22,9 @@ #pragma once -#include "library/common.hpp" -#include "library/defines.hpp" -#include "library/timemory.hpp" +#include "core/common.hpp" +#include "core/defines.hpp" +#include "core/timemory.hpp" #include diff --git a/source/lib/omnitrace/library/components/numa_gotcha.cpp b/source/lib/omnitrace/library/components/numa_gotcha.cpp index 054ed7e2b9..8fde33fb21 100644 --- a/source/lib/omnitrace/library/components/numa_gotcha.cpp +++ b/source/lib/omnitrace/library/components/numa_gotcha.cpp @@ -21,13 +21,13 @@ // SOFTWARE. #include "library/components/numa_gotcha.hpp" -#include "library/common.hpp" +#include "core/common.hpp" +#include "core/config.hpp" +#include "core/debug.hpp" +#include "core/state.hpp" +#include "core/timemory.hpp" #include "library/components/category_region.hpp" -#include "library/config.hpp" -#include "library/debug.hpp" #include "library/runtime.hpp" -#include "library/state.hpp" -#include "library/timemory.hpp" #include #include diff --git a/source/lib/omnitrace/library/components/numa_gotcha.hpp b/source/lib/omnitrace/library/components/numa_gotcha.hpp index a71a9cd2e6..78b6564848 100644 --- a/source/lib/omnitrace/library/components/numa_gotcha.hpp +++ b/source/lib/omnitrace/library/components/numa_gotcha.hpp @@ -22,9 +22,9 @@ #pragma once -#include "library/common.hpp" -#include "library/defines.hpp" -#include "library/timemory.hpp" +#include "core/common.hpp" +#include "core/defines.hpp" +#include "core/timemory.hpp" #include #include diff --git a/source/lib/omnitrace/library/components/pthread_create_gotcha.cpp b/source/lib/omnitrace/library/components/pthread_create_gotcha.cpp index b84d0f40ab..8179ea7b6b 100644 --- a/source/lib/omnitrace/library/components/pthread_create_gotcha.cpp +++ b/source/lib/omnitrace/library/components/pthread_create_gotcha.cpp @@ -21,17 +21,17 @@ // SOFTWARE. #include "library/components/pthread_create_gotcha.hpp" +#include "core/config.hpp" +#include "core/debug.hpp" +#include "core/state.hpp" +#include "core/utility.hpp" #include "library/causal/delay.hpp" #include "library/components/category_region.hpp" #include "library/components/roctracer.hpp" -#include "library/config.hpp" -#include "library/debug.hpp" #include "library/runtime.hpp" #include "library/sampling.hpp" -#include "library/state.hpp" #include "library/thread_data.hpp" #include "library/thread_info.hpp" -#include "library/utility.hpp" #include #include diff --git a/source/lib/omnitrace/library/components/pthread_create_gotcha.hpp b/source/lib/omnitrace/library/components/pthread_create_gotcha.hpp index fc540a3abe..c0cdf74e40 100644 --- a/source/lib/omnitrace/library/components/pthread_create_gotcha.hpp +++ b/source/lib/omnitrace/library/components/pthread_create_gotcha.hpp @@ -22,10 +22,10 @@ #pragma once -#include "library/common.hpp" -#include "library/defines.hpp" +#include "core/common.hpp" +#include "core/defines.hpp" +#include "core/timemory.hpp" #include "library/thread_data.hpp" -#include "library/timemory.hpp" #include #include diff --git a/source/lib/omnitrace/library/components/pthread_gotcha.cpp b/source/lib/omnitrace/library/components/pthread_gotcha.cpp index 6648bcab5c..ba014bc369 100644 --- a/source/lib/omnitrace/library/components/pthread_gotcha.cpp +++ b/source/lib/omnitrace/library/components/pthread_gotcha.cpp @@ -21,14 +21,14 @@ // SOFTWARE. #include "library/components/pthread_gotcha.hpp" +#include "core/config.hpp" +#include "core/debug.hpp" +#include "core/utility.hpp" #include "library/components/pthread_create_gotcha.hpp" #include "library/components/pthread_mutex_gotcha.hpp" -#include "library/config.hpp" -#include "library/debug.hpp" #include "library/runtime.hpp" #include "library/sampling.hpp" #include "library/thread_data.hpp" -#include "library/utility.hpp" #include #include diff --git a/source/lib/omnitrace/library/components/pthread_gotcha.hpp b/source/lib/omnitrace/library/components/pthread_gotcha.hpp index 8f42af89be..96e156725a 100644 --- a/source/lib/omnitrace/library/components/pthread_gotcha.hpp +++ b/source/lib/omnitrace/library/components/pthread_gotcha.hpp @@ -22,9 +22,9 @@ #pragma once -#include "library/common.hpp" -#include "library/defines.hpp" -#include "library/timemory.hpp" +#include "core/common.hpp" +#include "core/defines.hpp" +#include "core/timemory.hpp" #include #include diff --git a/source/lib/omnitrace/library/components/pthread_mutex_gotcha.cpp b/source/lib/omnitrace/library/components/pthread_mutex_gotcha.cpp index 556c8ae341..e4732e4915 100644 --- a/source/lib/omnitrace/library/components/pthread_mutex_gotcha.cpp +++ b/source/lib/omnitrace/library/components/pthread_mutex_gotcha.cpp @@ -21,14 +21,14 @@ // SOFTWARE. #include "library/components/pthread_mutex_gotcha.hpp" +#include "core/config.hpp" +#include "core/debug.hpp" +#include "core/utility.hpp" #include "library/components/category_region.hpp" -#include "library/config.hpp" #include "library/critical_trace.hpp" -#include "library/debug.hpp" #include "library/runtime.hpp" #include "library/sampling.hpp" #include "library/thread_info.hpp" -#include "library/utility.hpp" #include #include diff --git a/source/lib/omnitrace/library/components/pthread_mutex_gotcha.hpp b/source/lib/omnitrace/library/components/pthread_mutex_gotcha.hpp index d7074cbfcd..36ef1ae885 100644 --- a/source/lib/omnitrace/library/components/pthread_mutex_gotcha.hpp +++ b/source/lib/omnitrace/library/components/pthread_mutex_gotcha.hpp @@ -22,9 +22,9 @@ #pragma once -#include "library/common.hpp" -#include "library/defines.hpp" -#include "library/timemory.hpp" +#include "core/common.hpp" +#include "core/defines.hpp" +#include "core/timemory.hpp" #include #include diff --git a/source/lib/omnitrace/library/components/rcclp.hpp b/source/lib/omnitrace/library/components/rcclp.hpp index 977c2f68e6..2260aafd4e 100644 --- a/source/lib/omnitrace/library/components/rcclp.hpp +++ b/source/lib/omnitrace/library/components/rcclp.hpp @@ -22,12 +22,12 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "library/common.hpp" +#include "core/common.hpp" +#include "core/components/fwd.hpp" +#include "core/defines.hpp" +#include "core/timemory.hpp" #include "library/components/category_region.hpp" #include "library/components/comm_data.hpp" -#include "library/components/fwd.hpp" -#include "library/defines.hpp" -#include "library/timemory.hpp" #include #include diff --git a/source/lib/omnitrace/library/components/rocprofiler.cpp b/source/lib/omnitrace/library/components/rocprofiler.cpp index 46ca870597..0fcb460b34 100644 --- a/source/lib/omnitrace/library/components/rocprofiler.cpp +++ b/source/lib/omnitrace/library/components/rocprofiler.cpp @@ -21,13 +21,13 @@ // SOFTWARE. #include "library/components/rocprofiler.hpp" -#include "library/common.hpp" -#include "library/config.hpp" -#include "library/debug.hpp" -#include "library/defines.hpp" -#include "library/dynamic_library.hpp" -#include "library/perfetto.hpp" -#include "library/redirect.hpp" +#include "core/common.hpp" +#include "core/config.hpp" +#include "core/debug.hpp" +#include "core/defines.hpp" +#include "core/dynamic_library.hpp" +#include "core/perfetto.hpp" +#include "core/redirect.hpp" #include "library/rocprofiler.hpp" #include "library/sampling.hpp" #include "library/thread_data.hpp" diff --git a/source/lib/omnitrace/library/components/rocprofiler.hpp b/source/lib/omnitrace/library/components/rocprofiler.hpp index 2de4baddf5..07ca3aba69 100644 --- a/source/lib/omnitrace/library/components/rocprofiler.hpp +++ b/source/lib/omnitrace/library/components/rocprofiler.hpp @@ -22,8 +22,8 @@ #pragma once -#include "library/components/fwd.hpp" -#include "library/defines.hpp" +#include "core/components/fwd.hpp" +#include "core/defines.hpp" #include "library/thread_data.hpp" #include diff --git a/source/lib/omnitrace/library/components/roctracer.cpp b/source/lib/omnitrace/library/components/roctracer.cpp index 7c9f412757..c169eccf19 100644 --- a/source/lib/omnitrace/library/components/roctracer.cpp +++ b/source/lib/omnitrace/library/components/roctracer.cpp @@ -21,12 +21,12 @@ // SOFTWARE. #include "library/components/roctracer.hpp" -#include "library/common.hpp" -#include "library/config.hpp" -#include "library/debug.hpp" -#include "library/defines.hpp" -#include "library/dynamic_library.hpp" -#include "library/redirect.hpp" +#include "core/common.hpp" +#include "core/config.hpp" +#include "core/debug.hpp" +#include "core/defines.hpp" +#include "core/dynamic_library.hpp" +#include "core/redirect.hpp" #include "library/roctracer.hpp" #include "library/runtime.hpp" #include "library/sampling.hpp" diff --git a/source/lib/omnitrace/library/components/roctracer.hpp b/source/lib/omnitrace/library/components/roctracer.hpp index b3ee6f14c9..20cb93134e 100644 --- a/source/lib/omnitrace/library/components/roctracer.hpp +++ b/source/lib/omnitrace/library/components/roctracer.hpp @@ -22,9 +22,9 @@ #pragma once -#include "library/common.hpp" -#include "library/components/fwd.hpp" -#include "library/defines.hpp" +#include "core/common.hpp" +#include "core/components/fwd.hpp" +#include "core/defines.hpp" #include #include diff --git a/source/lib/omnitrace/library/coverage.cpp b/source/lib/omnitrace/library/coverage.cpp index 8d47b0ac10..70f46fc607 100644 --- a/source/lib/omnitrace/library/coverage.cpp +++ b/source/lib/omnitrace/library/coverage.cpp @@ -22,9 +22,9 @@ #include "library/coverage.hpp" #include "api.hpp" -#include "library/config.hpp" +#include "core/config.hpp" +#include "core/debug.hpp" #include "library/coverage/impl.hpp" -#include "library/debug.hpp" #include "library/thread_data.hpp" #include diff --git a/source/lib/omnitrace/library/cpu_freq.cpp b/source/lib/omnitrace/library/cpu_freq.cpp index 40b79030df..4b6a2dd351 100644 --- a/source/lib/omnitrace/library/cpu_freq.cpp +++ b/source/lib/omnitrace/library/cpu_freq.cpp @@ -21,16 +21,16 @@ // SOFTWARE. #include "library/cpu_freq.hpp" -#include "library/common.hpp" +#include "core/common.hpp" +#include "core/components/fwd.hpp" +#include "core/config.hpp" +#include "core/debug.hpp" +#include "core/defines.hpp" +#include "core/perfetto.hpp" +#include "core/timemory.hpp" #include "library/components/cpu_freq.hpp" -#include "library/components/fwd.hpp" -#include "library/config.hpp" -#include "library/debug.hpp" -#include "library/defines.hpp" -#include "library/perfetto.hpp" #include "library/thread_data.hpp" #include "library/thread_info.hpp" -#include "library/timemory.hpp" #include #include diff --git a/source/lib/omnitrace/library/critical_trace.cpp b/source/lib/omnitrace/library/critical_trace.cpp index 8d90070cc0..2aea98e518 100644 --- a/source/lib/omnitrace/library/critical_trace.cpp +++ b/source/lib/omnitrace/library/critical_trace.cpp @@ -21,10 +21,10 @@ // SOFTWARE. #include "library/critical_trace.hpp" -#include "library/config.hpp" -#include "library/debug.hpp" -#include "library/defines.hpp" -#include "library/perfetto.hpp" +#include "core/config.hpp" +#include "core/debug.hpp" +#include "core/defines.hpp" +#include "core/perfetto.hpp" #include "library/ptl.hpp" #include "library/runtime.hpp" #include "library/thread_data.hpp" diff --git a/source/lib/omnitrace/library/critical_trace.hpp b/source/lib/omnitrace/library/critical_trace.hpp index 460ff0c62c..6f8b0e332b 100644 --- a/source/lib/omnitrace/library/critical_trace.hpp +++ b/source/lib/omnitrace/library/critical_trace.hpp @@ -22,10 +22,10 @@ #pragma once -#include "library/common.hpp" -#include "library/config.hpp" -#include "library/defines.hpp" -#include "library/perfetto.hpp" +#include "core/common.hpp" +#include "core/config.hpp" +#include "core/defines.hpp" +#include "core/perfetto.hpp" #include "library/runtime.hpp" #include "library/thread_data.hpp" diff --git a/source/lib/omnitrace/library/kokkosp.cpp b/source/lib/omnitrace/library/kokkosp.cpp index 2ec85fb8ad..7bedef33ef 100644 --- a/source/lib/omnitrace/library/kokkosp.cpp +++ b/source/lib/omnitrace/library/kokkosp.cpp @@ -23,12 +23,12 @@ #define TIMEMORY_KOKKOSP_POSTFIX OMNITRACE_PUBLIC_API #include "api.hpp" +#include "core/components/fwd.hpp" +#include "core/config.hpp" +#include "core/debug.hpp" +#include "core/defines.hpp" +#include "core/perfetto.hpp" #include "library/components/category_region.hpp" -#include "library/components/fwd.hpp" -#include "library/config.hpp" -#include "library/debug.hpp" -#include "library/defines.hpp" -#include "library/perfetto.hpp" #include "library/runtime.hpp" #include diff --git a/source/lib/omnitrace/library/ompt.cpp b/source/lib/omnitrace/library/ompt.cpp index c833c320b7..d8e3eb6b48 100644 --- a/source/lib/omnitrace/library/ompt.cpp +++ b/source/lib/omnitrace/library/ompt.cpp @@ -21,17 +21,17 @@ // SOFTWARE. #include "api.hpp" -#include "library/common.hpp" -#include "library/config.hpp" -#include "library/debug.hpp" -#include "library/defines.hpp" +#include "core/common.hpp" +#include "core/config.hpp" +#include "core/debug.hpp" +#include "core/defines.hpp" #include #if defined(OMNITRACE_USE_OMPT) && OMNITRACE_USE_OMPT > 0 +# include "core/components/fwd.hpp" # include "library/components/category_region.hpp" -# include "library/components/fwd.hpp" # include # include diff --git a/source/lib/omnitrace/library/process_sampler.cpp b/source/lib/omnitrace/library/process_sampler.cpp index efbfffcb5d..38032526a1 100644 --- a/source/lib/omnitrace/library/process_sampler.cpp +++ b/source/lib/omnitrace/library/process_sampler.cpp @@ -21,9 +21,9 @@ // SOFTWARE. #include "library/process_sampler.hpp" -#include "library/config.hpp" +#include "core/config.hpp" +#include "core/debug.hpp" #include "library/cpu_freq.hpp" -#include "library/debug.hpp" #include "library/rocm_smi.hpp" #include "library/runtime.hpp" #include "library/sampling.hpp" diff --git a/source/lib/omnitrace/library/process_sampler.hpp b/source/lib/omnitrace/library/process_sampler.hpp index cb4cbfdb6c..6b73f887b0 100644 --- a/source/lib/omnitrace/library/process_sampler.hpp +++ b/source/lib/omnitrace/library/process_sampler.hpp @@ -22,10 +22,10 @@ #pragma once -#include "library/common.hpp" -#include "library/components/fwd.hpp" -#include "library/defines.hpp" -#include "library/state.hpp" +#include "core/common.hpp" +#include "core/components/fwd.hpp" +#include "core/defines.hpp" +#include "core/state.hpp" #include "library/thread_data.hpp" #include diff --git a/source/lib/omnitrace/library/ptl.cpp b/source/lib/omnitrace/library/ptl.cpp index afd782a55a..44683cfd31 100644 --- a/source/lib/omnitrace/library/ptl.cpp +++ b/source/lib/omnitrace/library/ptl.cpp @@ -21,16 +21,17 @@ // SOFTWARE. #include "library/ptl.hpp" -#include "library/config.hpp" -#include "library/debug.hpp" -#include "library/defines.hpp" +#include "core/config.hpp" +#include "core/debug.hpp" +#include "core/defines.hpp" +#include "core/state.hpp" #include "library/runtime.hpp" #include "library/sampling.hpp" -#include "library/state.hpp" #include "library/thread_data.hpp" #include "library/thread_info.hpp" #include +#include #include #include @@ -63,6 +64,9 @@ auto _thread_pool_cfg = []() { } } + static char buffer[sizeof(PTL::UserTaskQueue)]; + static auto* _task_queue = new((void*) buffer) PTL::UserTaskQueue(_nthreads); + PTL::ThreadPool::Config _v{}; _v.init = true; _v.use_affinity = false; @@ -75,9 +79,10 @@ auto _thread_pool_cfg = []() { set_thread_state(ThreadState::Disabled); sampling::block_signals(); }; - _v.finalizer = []() {}; - _v.priority = 5; - _v.pool_size = _nthreads; + _v.finalizer = []() {}; + _v.priority = 5; + _v.pool_size = _nthreads; + _v.task_queue = _task_queue; return _v; }; diff --git a/source/lib/omnitrace/library/ptl.hpp b/source/lib/omnitrace/library/ptl.hpp index 8c87f740a8..b3630216bc 100644 --- a/source/lib/omnitrace/library/ptl.hpp +++ b/source/lib/omnitrace/library/ptl.hpp @@ -22,8 +22,8 @@ #pragma once -#include "library/defines.hpp" -#include "library/utility.hpp" +#include "core/defines.hpp" +#include "core/utility.hpp" #include diff --git a/source/lib/omnitrace/library/rcclp.cpp b/source/lib/omnitrace/library/rcclp.cpp index 100d7d6542..1751544a72 100644 --- a/source/lib/omnitrace/library/rcclp.cpp +++ b/source/lib/omnitrace/library/rcclp.cpp @@ -23,11 +23,11 @@ // SOFTWARE. #include "library/components/rcclp.hpp" +#include "core/components/fwd.hpp" +#include "core/defines.hpp" +#include "core/dynamic_library.hpp" +#include "core/timemory.hpp" #include "library/components/category_region.hpp" -#include "library/components/fwd.hpp" -#include "library/defines.hpp" -#include "library/dynamic_library.hpp" -#include "library/timemory.hpp" #include diff --git a/source/lib/omnitrace/library/rcclp.hpp b/source/lib/omnitrace/library/rcclp.hpp index 1b04559d8b..75a5faaab1 100644 --- a/source/lib/omnitrace/library/rcclp.hpp +++ b/source/lib/omnitrace/library/rcclp.hpp @@ -24,7 +24,7 @@ #pragma once -#include "library/defines.hpp" +#include "core/defines.hpp" namespace omnitrace { diff --git a/source/lib/omnitrace/library/rocm.cpp b/source/lib/omnitrace/library/rocm.cpp index 628521b843..ae82a97b01 100644 --- a/source/lib/omnitrace/library/rocm.cpp +++ b/source/lib/omnitrace/library/rocm.cpp @@ -21,12 +21,12 @@ // SOFTWARE. #include "library/rocm.hpp" +#include "core/config.hpp" +#include "core/debug.hpp" +#include "core/dynamic_library.hpp" +#include "core/gpu.hpp" #include "library/components/rocprofiler.hpp" #include "library/components/roctracer.hpp" -#include "library/config.hpp" -#include "library/debug.hpp" -#include "library/dynamic_library.hpp" -#include "library/gpu.hpp" #include "library/rocm/hsa_rsrc_factory.hpp" #include "library/rocm_smi.hpp" #include "library/rocprofiler.hpp" @@ -81,10 +81,11 @@ bool on_load_trace = (get_env("ROCP_ONLOAD_TRACE", 0) > 0); } // namespace rocm } // namespace omnitrace +#if defined(OMNITRACE_USE_ROCPROFILER) && OMNITRACE_USE_ROCPROFILER > 0 std::ostream& operator<<(std::ostream& _os, const rocprofiler_settings_t& _v) { -#define ROCPROF_SETTING_FIELD_STR(NAME) JOIN('=', #NAME, _v.NAME) +# define ROCPROF_SETTING_FIELD_STR(NAME) JOIN('=', # NAME, _v.NAME) _os << JOIN( ", ", ROCPROF_SETTING_FIELD_STR(intercept_mode), @@ -97,6 +98,7 @@ operator<<(std::ostream& _os, const rocprofiler_settings_t& _v) ROCPROF_SETTING_FIELD_STR(obj_dumping)); return _os; } +#endif // HSA-runtime tool on-load method extern "C" diff --git a/source/lib/omnitrace/library/rocm.hpp b/source/lib/omnitrace/library/rocm.hpp index 94f982ce48..2eeb3190fa 100644 --- a/source/lib/omnitrace/library/rocm.hpp +++ b/source/lib/omnitrace/library/rocm.hpp @@ -22,7 +22,7 @@ #pragma once -#include "library/defines.hpp" +#include "core/defines.hpp" #if defined(OMNITRACE_USE_ROCPROFILER) && OMNITRACE_USE_ROCPROFILER > 0 # include diff --git a/source/lib/omnitrace/library/rocm/hsa_rsrc_factory.cpp b/source/lib/omnitrace/library/rocm/hsa_rsrc_factory.cpp index 004585d28e..3b57cdb8c6 100644 --- a/source/lib/omnitrace/library/rocm/hsa_rsrc_factory.cpp +++ b/source/lib/omnitrace/library/rocm/hsa_rsrc_factory.cpp @@ -21,8 +21,8 @@ THE SOFTWARE. *******************************************************************************/ #include "library/rocm/hsa_rsrc_factory.hpp" -#include "library/debug.hpp" -#include "library/defines.hpp" +#include "core/debug.hpp" +#include "core/defines.hpp" #include diff --git a/source/lib/omnitrace/library/rocm/hsa_rsrc_factory.hpp b/source/lib/omnitrace/library/rocm/hsa_rsrc_factory.hpp index 238e6663ae..f0bfd22b28 100644 --- a/source/lib/omnitrace/library/rocm/hsa_rsrc_factory.hpp +++ b/source/lib/omnitrace/library/rocm/hsa_rsrc_factory.hpp @@ -22,7 +22,7 @@ #pragma once -#include "library/exception.hpp" +#include "core/exception.hpp" #define AMD_INTERNAL_BUILD 1 diff --git a/source/lib/omnitrace/library/rocm_smi.cpp b/source/lib/omnitrace/library/rocm_smi.cpp index bce7d222dd..f851af6403 100644 --- a/source/lib/omnitrace/library/rocm_smi.cpp +++ b/source/lib/omnitrace/library/rocm_smi.cpp @@ -31,15 +31,15 @@ #endif #include "library/rocm_smi.hpp" -#include "library/common.hpp" -#include "library/components/fwd.hpp" -#include "library/config.hpp" +#include "core/common.hpp" +#include "core/components/fwd.hpp" +#include "core/config.hpp" +#include "core/debug.hpp" +#include "core/gpu.hpp" +#include "core/perfetto.hpp" +#include "core/state.hpp" #include "library/critical_trace.hpp" -#include "library/debug.hpp" -#include "library/gpu.hpp" -#include "library/perfetto.hpp" #include "library/runtime.hpp" -#include "library/state.hpp" #include "library/thread_info.hpp" #include diff --git a/source/lib/omnitrace/library/rocm_smi.hpp b/source/lib/omnitrace/library/rocm_smi.hpp index 7cdc915670..e73e1a117f 100644 --- a/source/lib/omnitrace/library/rocm_smi.hpp +++ b/source/lib/omnitrace/library/rocm_smi.hpp @@ -28,10 +28,10 @@ #pragma once -#include "library/common.hpp" -#include "library/components/fwd.hpp" -#include "library/defines.hpp" -#include "library/state.hpp" +#include "core/common.hpp" +#include "core/components/fwd.hpp" +#include "core/defines.hpp" +#include "core/state.hpp" #include "library/thread_data.hpp" #include diff --git a/source/lib/omnitrace/library/rocprofiler.cpp b/source/lib/omnitrace/library/rocprofiler.cpp index d0a7f12ddc..174c015a52 100644 --- a/source/lib/omnitrace/library/rocprofiler.cpp +++ b/source/lib/omnitrace/library/rocprofiler.cpp @@ -21,11 +21,11 @@ // SOFTWARE. #include "library/rocprofiler.hpp" -#include "library/common.hpp" -#include "library/config.hpp" -#include "library/debug.hpp" -#include "library/gpu.hpp" -#include "library/perfetto.hpp" +#include "core/common.hpp" +#include "core/config.hpp" +#include "core/debug.hpp" +#include "core/gpu.hpp" +#include "core/perfetto.hpp" #include "library/rocm.hpp" #include "library/rocm/hsa_rsrc_factory.hpp" diff --git a/source/lib/omnitrace/library/rocprofiler.hpp b/source/lib/omnitrace/library/rocprofiler.hpp index e08329c9ae..26eb9b58b4 100644 --- a/source/lib/omnitrace/library/rocprofiler.hpp +++ b/source/lib/omnitrace/library/rocprofiler.hpp @@ -22,9 +22,9 @@ #pragma once +#include "core/defines.hpp" +#include "core/timemory.hpp" #include "library/components/rocprofiler.hpp" -#include "library/defines.hpp" -#include "library/timemory.hpp" #include #include diff --git a/source/lib/omnitrace/library/roctracer.cpp b/source/lib/omnitrace/library/roctracer.cpp index 0644db61b8..76352c4805 100644 --- a/source/lib/omnitrace/library/roctracer.cpp +++ b/source/lib/omnitrace/library/roctracer.cpp @@ -21,11 +21,11 @@ // SOFTWARE. #include "library/roctracer.hpp" +#include "core/components/fwd.hpp" +#include "core/config.hpp" +#include "core/debug.hpp" #include "library/components/category_region.hpp" -#include "library/components/fwd.hpp" -#include "library/config.hpp" #include "library/critical_trace.hpp" -#include "library/debug.hpp" #include "library/runtime.hpp" #include "library/sampling.hpp" #include "library/thread_data.hpp" diff --git a/source/lib/omnitrace/library/roctracer.hpp b/source/lib/omnitrace/library/roctracer.hpp index b555b43b91..54e56987b2 100644 --- a/source/lib/omnitrace/library/roctracer.hpp +++ b/source/lib/omnitrace/library/roctracer.hpp @@ -22,10 +22,10 @@ #pragma once +#include "core/config.hpp" +#include "core/debug.hpp" +#include "core/perfetto.hpp" #include "library/components/roctracer.hpp" -#include "library/config.hpp" -#include "library/debug.hpp" -#include "library/perfetto.hpp" #include "library/ptl.hpp" #include diff --git a/source/lib/omnitrace/library/runtime.cpp b/source/lib/omnitrace/library/runtime.cpp index 61e6eee0c0..ac0bc793fe 100644 --- a/source/lib/omnitrace/library/runtime.cpp +++ b/source/lib/omnitrace/library/runtime.cpp @@ -22,12 +22,12 @@ #include "library/runtime.hpp" #include "api.hpp" -#include "library/config.hpp" -#include "library/debug.hpp" -#include "library/defines.hpp" +#include "core/config.hpp" +#include "core/debug.hpp" +#include "core/defines.hpp" +#include "core/utility.hpp" #include "library/thread_data.hpp" #include "library/thread_info.hpp" -#include "library/utility.hpp" #include #include diff --git a/source/lib/omnitrace/library/runtime.hpp b/source/lib/omnitrace/library/runtime.hpp index da1b2cbd0a..0677e1b4da 100644 --- a/source/lib/omnitrace/library/runtime.hpp +++ b/source/lib/omnitrace/library/runtime.hpp @@ -23,18 +23,18 @@ #pragma once #include "api.hpp" +#include "core/common.hpp" +#include "core/defines.hpp" +#include "core/state.hpp" +#include "core/timemory.hpp" #include "library/causal/components/causal_gotcha.hpp" -#include "library/common.hpp" #include "library/components/exit_gotcha.hpp" #include "library/components/fork_gotcha.hpp" #include "library/components/mpi_gotcha.hpp" #include "library/components/numa_gotcha.hpp" #include "library/components/pthread_gotcha.hpp" #include "library/components/roctracer.hpp" -#include "library/defines.hpp" -#include "library/state.hpp" #include "library/thread_data.hpp" -#include "library/timemory.hpp" #include #include diff --git a/source/lib/omnitrace/library/sampling.cpp b/source/lib/omnitrace/library/sampling.cpp index a32433f6a9..cea900234f 100644 --- a/source/lib/omnitrace/library/sampling.cpp +++ b/source/lib/omnitrace/library/sampling.cpp @@ -21,22 +21,22 @@ // SOFTWARE. #include "library/sampling.hpp" -#include "library/common.hpp" +#include "core/common.hpp" +#include "core/components/fwd.hpp" +#include "core/config.hpp" +#include "core/debug.hpp" +#include "core/locking.hpp" +#include "core/state.hpp" +#include "core/utility.hpp" #include "library/components/backtrace.hpp" #include "library/components/backtrace_metrics.hpp" #include "library/components/backtrace_timestamp.hpp" -#include "library/components/fwd.hpp" -#include "library/config.hpp" -#include "library/debug.hpp" -#include "library/locking.hpp" #include "library/ptl.hpp" #include "library/runtime.hpp" -#include "library/state.hpp" #include "library/thread_data.hpp" #include "library/thread_info.hpp" #include "library/tracing.hpp" #include "library/tracing/annotation.hpp" -#include "library/utility.hpp" #include #include @@ -417,7 +417,12 @@ auto load_offload_buffer() { auto _data = std::map>{}; - if(!get_use_tmp_files()) return _data; + if(!get_use_tmp_files()) + { + OMNITRACE_WARNING_F( + 2, "[sampling] returning no data because using temporary files is disabled"); + return _data; + } // use homemade atomic_mutex/atomic_lock since contention will be low // and using pthread_lock might trigger our wrappers @@ -444,11 +449,15 @@ load_offload_buffer() { int64_t _seq = 0; _fs.read(reinterpret_cast(&_seq), sizeof(_seq)); - if(_fs.eof()) break; + if(_fs.eof()) + { + OMNITRACE_VERBOSE_F(2, "[sampling] No more samples found in file...\n"); + break; + } sampler_buffer_t _buffer{}; _buffer.load(_fs); - OMNITRACE_VERBOSE_F(2, "Loading %zu samples for thread %li...\n", _buffer.count(), - _seq); + OMNITRACE_VERBOSE_F(2, "[sampling] Loading %zu samples for thread %li...\n", + _buffer.count(), _seq); _data[_seq].emplace_back(std::move(_buffer)); } _file.reset(); @@ -732,8 +741,8 @@ post_process() auto& _sampler = get_sampler(i); if(_sampler) { - _sampler->stop(); _sampler->set_offload(nullptr); + _sampler->stop(); } } diff --git a/source/lib/omnitrace/library/sampling.hpp b/source/lib/omnitrace/library/sampling.hpp index d726e00077..0c0b748b56 100644 --- a/source/lib/omnitrace/library/sampling.hpp +++ b/source/lib/omnitrace/library/sampling.hpp @@ -22,14 +22,14 @@ #pragma once -#include "library/common.hpp" +#include "core/common.hpp" +#include "core/components/fwd.hpp" +#include "core/defines.hpp" +#include "core/timemory.hpp" #include "library/components/backtrace.hpp" #include "library/components/backtrace_metrics.hpp" #include "library/components/backtrace_timestamp.hpp" -#include "library/components/fwd.hpp" -#include "library/defines.hpp" #include "library/thread_data.hpp" -#include "library/timemory.hpp" #include #include diff --git a/source/lib/omnitrace/library/thread_data.hpp b/source/lib/omnitrace/library/thread_data.hpp index 9ee81dfec7..ecedc69b45 100644 --- a/source/lib/omnitrace/library/thread_data.hpp +++ b/source/lib/omnitrace/library/thread_data.hpp @@ -23,15 +23,15 @@ #pragma once #include "api.hpp" -#include "library/common.hpp" -#include "library/concepts.hpp" -#include "library/config.hpp" -#include "library/containers/stable_vector.hpp" -#include "library/defines.hpp" -#include "library/state.hpp" +#include "core/common.hpp" +#include "core/concepts.hpp" +#include "core/config.hpp" +#include "core/containers/stable_vector.hpp" +#include "core/defines.hpp" +#include "core/state.hpp" +#include "core/timemory.hpp" +#include "core/utility.hpp" #include "library/thread_deleter.hpp" -#include "library/timemory.hpp" -#include "library/utility.hpp" #include #include diff --git a/source/lib/omnitrace/library/thread_deleter.cpp b/source/lib/omnitrace/library/thread_deleter.cpp index 1fbc6eebea..7ecbdba74a 100644 --- a/source/lib/omnitrace/library/thread_deleter.cpp +++ b/source/lib/omnitrace/library/thread_deleter.cpp @@ -21,9 +21,9 @@ // SOFTWARE. #include "library/thread_deleter.hpp" +#include "core/utility.hpp" #include "library/components/pthread_create_gotcha.hpp" #include "library/thread_info.hpp" -#include "library/utility.hpp" #include #include diff --git a/source/lib/omnitrace/library/thread_deleter.hpp b/source/lib/omnitrace/library/thread_deleter.hpp index 00ccb09636..845349c914 100644 --- a/source/lib/omnitrace/library/thread_deleter.hpp +++ b/source/lib/omnitrace/library/thread_deleter.hpp @@ -22,8 +22,8 @@ #pragma once -#include "library/concepts.hpp" -#include "library/defines.hpp" +#include "core/concepts.hpp" +#include "core/defines.hpp" namespace omnitrace { diff --git a/source/lib/omnitrace/library/thread_info.cpp b/source/lib/omnitrace/library/thread_info.cpp index 852e415a1c..7841171488 100644 --- a/source/lib/omnitrace/library/thread_info.cpp +++ b/source/lib/omnitrace/library/thread_info.cpp @@ -21,15 +21,15 @@ // SOFTWARE. #include "library/thread_info.hpp" +#include "core/common.hpp" +#include "core/concepts.hpp" +#include "core/config.hpp" +#include "core/debug.hpp" +#include "core/state.hpp" +#include "core/utility.hpp" #include "library/causal/delay.hpp" -#include "library/common.hpp" -#include "library/concepts.hpp" -#include "library/config.hpp" -#include "library/debug.hpp" #include "library/runtime.hpp" -#include "library/state.hpp" #include "library/thread_data.hpp" -#include "library/utility.hpp" #include #include diff --git a/source/lib/omnitrace/library/thread_info.hpp b/source/lib/omnitrace/library/thread_info.hpp index 07738bbfb7..8469df505e 100644 --- a/source/lib/omnitrace/library/thread_info.hpp +++ b/source/lib/omnitrace/library/thread_info.hpp @@ -22,7 +22,7 @@ #pragma once -#include "library/utility.hpp" +#include "core/utility.hpp" #include diff --git a/source/lib/omnitrace/library/tracing.cpp b/source/lib/omnitrace/library/tracing.cpp index 5956b5ce29..d58940dbf1 100644 --- a/source/lib/omnitrace/library/tracing.cpp +++ b/source/lib/omnitrace/library/tracing.cpp @@ -21,8 +21,8 @@ // SOFTWARE. #include "library/tracing.hpp" -#include "library/config.hpp" -#include "library/state.hpp" +#include "core/config.hpp" +#include "core/state.hpp" #include "library/thread_info.hpp" namespace omnitrace diff --git a/source/lib/omnitrace/library/tracing.hpp b/source/lib/omnitrace/library/tracing.hpp index 586a900f59..e63a806119 100644 --- a/source/lib/omnitrace/library/tracing.hpp +++ b/source/lib/omnitrace/library/tracing.hpp @@ -23,20 +23,20 @@ #pragma once #include "common/defines.h" +#include "core/common.hpp" +#include "core/concepts.hpp" +#include "core/config.hpp" +#include "core/debug.hpp" +#include "core/defines.hpp" +#include "core/perfetto.hpp" +#include "core/state.hpp" +#include "core/timemory.hpp" +#include "core/utility.hpp" #include "library/causal/sampling.hpp" -#include "library/common.hpp" -#include "library/concepts.hpp" -#include "library/config.hpp" -#include "library/debug.hpp" -#include "library/defines.hpp" -#include "library/perfetto.hpp" #include "library/runtime.hpp" #include "library/sampling.hpp" -#include "library/state.hpp" #include "library/thread_data.hpp" -#include "library/timemory.hpp" #include "library/tracing/annotation.hpp" -#include "library/utility.hpp" #include #include diff --git a/source/lib/omnitrace/library/tracing/annotation.hpp b/source/lib/omnitrace/library/tracing/annotation.hpp index 9bdcccdd63..4373bf9107 100644 --- a/source/lib/omnitrace/library/tracing/annotation.hpp +++ b/source/lib/omnitrace/library/tracing/annotation.hpp @@ -22,13 +22,13 @@ #pragma once -#include "library/common.hpp" -#include "library/concepts.hpp" -#include "library/debug.hpp" -#include "library/defines.hpp" -#include "library/perfetto.hpp" -#include "library/state.hpp" -#include "library/utility.hpp" +#include "core/common.hpp" +#include "core/concepts.hpp" +#include "core/debug.hpp" +#include "core/defines.hpp" +#include "core/perfetto.hpp" +#include "core/state.hpp" +#include "core/utility.hpp" #include "omnitrace/categories.h" // in omnitrace-user #include diff --git a/source/lib/omnitrace/progress.cpp b/source/lib/omnitrace/progress.cpp index e9f7176734..f5e46ca1b1 100644 --- a/source/lib/omnitrace/progress.cpp +++ b/source/lib/omnitrace/progress.cpp @@ -21,9 +21,9 @@ // SOFTWARE. #include "api.hpp" -#include "library/categories.hpp" +#include "core/categories.hpp" +#include "core/config.hpp" #include "library/components/category_region.hpp" -#include "library/config.hpp" #include "library/tracing.hpp" extern "C" void diff --git a/source/lib/omnitrace/regions.cpp b/source/lib/omnitrace/regions.cpp index 8a3b4a7d9e..7f2799f221 100644 --- a/source/lib/omnitrace/regions.cpp +++ b/source/lib/omnitrace/regions.cpp @@ -21,9 +21,9 @@ // SOFTWARE. #include "api.hpp" -#include "library/categories.hpp" +#include "core/categories.hpp" +#include "core/config.hpp" #include "library/components/category_region.hpp" -#include "library/config.hpp" #include "library/tracing.hpp" #if defined(__GNUC__) && (__GNUC__ == 7) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 35c5e4765c..a541b52e0e 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -304,6 +304,20 @@ if(OMNITRACE_USE_MPI OR OMNITRACE_USE_MPI_HEADERS) ) set(_mpip_environment + "OMNITRACE_USE_PERFETTO=ON" + "OMNITRACE_USE_TIMEMORY=ON" + "OMNITRACE_USE_SAMPLING=OFF" + "OMNITRACE_USE_PROCESS_SAMPLING=OFF" + "OMNITRACE_TIME_OUTPUT=OFF" + "OMNITRACE_FILE_OUTPUT=ON" + "OMNITRACE_USE_MPIP=ON" + "OMNITRACE_DEBUG=OFF" + "OMNITRACE_VERBOSE=2" + "OMNITRACE_DL_VERBOSE=2" + "${_test_openmp_env}" + "${_test_library_path}") + + set(_mpip_all2all_environment "OMNITRACE_USE_PERFETTO=ON" "OMNITRACE_USE_TIMEMORY=ON" "OMNITRACE_USE_SAMPLING=OFF" @@ -314,12 +328,13 @@ if(OMNITRACE_USE_MPI OR OMNITRACE_USE_MPI_HEADERS) "OMNITRACE_DEBUG=ON" "OMNITRACE_VERBOSE=3" "OMNITRACE_DL_VERBOSE=3" - "OMNITRACE_SAMPLING_DELAY=1" - "OMNITRACE_SAMPLING_FREQ=0.001" "${_test_openmp_env}" "${_test_library_path}") foreach(_EXAMPLE all2all allgather allreduce bcast reduce scatter-gather send-recv) + if("${_mpip_${_EXAMPLE}_environment}" STREQUAL "") + set(_mpip_${_EXAMPLE}_environment "${_mpip_environment}") + endif() omnitrace_add_test( SKIP_RUNTIME SKIP_SAMPLING NAME "mpi-${_EXAMPLE}" @@ -329,7 +344,7 @@ if(OMNITRACE_USE_MPI OR OMNITRACE_USE_MPI_HEADERS) LABELS "mpip" REWRITE_ARGS -e -v 2 --label file line --min-instructions 0 RUN_ARGS 30 - ENVIRONMENT "${_mpip_environment}") + ENVIRONMENT "${_mpip_${_EXAMPLE}_environment}") endforeach() endif() @@ -684,8 +699,12 @@ omnitrace_add_test( RUNTIME_PASS_REGEX "(\\\[[0-9]+\\\]) function coverage :: 66.67%" REWRITE_RUN_PASS_REGEX "(\\\[[0-9]+\\\]) function coverage :: 66.67%") +if(_OS_RELEASE STREQUAL "ubuntu-18.04") + set(_TRACE_WINDOW_SKIP SKIP_RUNTIME) +endif() + omnitrace_add_test( - SKIP_BASELINE SKIP_SAMPLING SKIP_PRELOAD + SKIP_BASELINE SKIP_SAMPLING SKIP_PRELOAD ${_TRACE_WINDOW_SKIP} NAME trace-time-window TARGET trace-time-window REWRITE_ARGS -e -v 2 --caller-include inner -i 4096 @@ -744,7 +763,7 @@ omnitrace_add_validation_test( -p) omnitrace_add_test( - SKIP_BASELINE SKIP_SAMPLING SKIP_PRELOAD + SKIP_BASELINE SKIP_SAMPLING SKIP_PRELOAD ${_TRACE_WINDOW_SKIP} NAME trace-time-window-delay TARGET trace-time-window REWRITE_ARGS -e -v 2 --caller-include inner -i 4096 @@ -986,6 +1005,28 @@ omnitrace_add_causal_test( "Starting causal experiment #1(.*)causal/experiments.json(.*)causal/experiments.coz" ) +omnitrace_add_causal_test( + NAME both-omni-func + TARGET causal-both-omni + RUN_ARGS 70 10 432525 400000000 + CAUSAL_MODE "function" + CAUSAL_ARGS + -w + 1 + -d + 3 + --monochrome + -g + ${CMAKE_BINARY_DIR}/omnitrace-tests-config/causal-both-omni-func + -l + causal-both-omni + -v + 3 + ENVIRONMENT "OMNITRACE_STRICT_CONFIG=OFF" + CAUSAL_PASS_REGEX + "Starting causal experiment #1(.*)causal/experiments.json(.*)causal/experiments.coz" + ) + omnitrace_add_causal_test( NAME lulesh-func TARGET lulesh-omni @@ -1019,7 +1060,7 @@ omnitrace_add_causal_test( ) set(_causal_common_args - "-n 20 -e -s 0 10 20 30 -B $") + "-n 12 -e -s 0 10 20 30 -B $") macro( causal_e2e_args_and_validation diff --git a/tests/omnitrace-testing.cmake b/tests/omnitrace-testing.cmake index d733fb2ee3..fe89b3552f 100644 --- a/tests/omnitrace-testing.cmake +++ b/tests/omnitrace-testing.cmake @@ -3,6 +3,20 @@ # include_guard(DIRECTORY) +if(EXISTS /etc/os-release AND NOT IS_DIRECTORY /etc/os-release) + file(READ /etc/os-release _OS_RELEASE_RAW) + + if(_OS_RELEASE_RAW) + string(REPLACE "\"" "" _OS_RELEASE_RAW "${_OS_RELEASE_RAW}") + string(REPLACE "-" " " _OS_RELEASE_RAW "${_OS_RELEASE_RAW}") + string(REGEX REPLACE "NAME=.*\nVERSION=([0-9]+)\.([0-9]+).*\nID=([a-z]+).*" + "\\3-\\1.\\2" _OS_RELEASE "${_OS_RELEASE_RAW}") + endif() + unset(_OS_RELEASE_RAW) +endif() + +omnitrace_message(STATUS "OS release: ${_OS_RELEASE}") + if(NOT OMNITRACE_DYNINST_API_RT_DIR AND OMNITRACE_DYNINST_API_RT) get_filename_component(OMNITRACE_DYNINST_API_RT_DIR "${OMNITRACE_DYNINST_API_RT}" DIRECTORY) @@ -74,6 +88,7 @@ set(_lock_environment "OMNITRACE_COUT_OUTPUT=ON" "OMNITRACE_TIME_OUTPUT=OFF" "OMNITRACE_TIMELINE_PROFILE=OFF" + "OMNITRACE_VERBOSE=2" "${_test_library_path}") set(_critical_trace_environment @@ -827,6 +842,13 @@ function(OMNITRACE_ADD_VALIDATION_TEST) "ENVIRONMENT;LABELS;PROPERTIES;PASS_REGEX;FAIL_REGEX;SKIP_REGEX;DEPENDS;ARGS" ${ARGN}) + if(NOT TEST "${TEST_NAME}") + omnitrace_message( + AUTHOR_WARNING + "No validation test(s) for ${TEST_NAME} because test does not exist") + return() + endif() + if(NOT TEST_TIMEOUT) set(TEST_TIMEOUT 30) endif()