Reorganize source/lib/omnitrace (#51)

- Got rid of `source/lib/omnitrace/include` and `source/lib/omnitrace/src` and merged into `source/lib/omnitrace`
- Updated perfetto submodule to v25.0
- Updated papi submodule

[ROCm/rocprofiler-systems commit: 1f66e23fdd]

projects/rocprofiler-systems/cmake/Packages.cmake

@@ -35,11 +35,11 @@ set(OMNITRACE_EXTENSION_LIBRARIES
     omnitrace::omnitrace-papi)
 
 target_include_directories(
-    omnitrace-headers INTERFACE ${PROJECT_SOURCE_DIR}/source/lib/omnitrace/include
-                                ${PROJECT_BINARY_DIR}/source/lib/omnitrace/include)
+    omnitrace-headers INTERFACE ${PROJECT_SOURCE_DIR}/source/lib/omnitrace
+                                ${PROJECT_BINARY_DIR}/source/lib/omnitrace)
 
 # include threading because of rooflines
-target_link_libraries(omnitrace-headers INTERFACE omnitrace-threading)
+target_link_libraries(omnitrace-headers INTERFACE omnitrace::omnitrace-threading)
 
 # ensure the env overrides the appending /opt/rocm later
 string(REPLACE ":" ";" CMAKE_PREFIX_PATH "$ENV{CMAKE_PREFIX_PATH};${CMAKE_PREFIX_PATH}")

projects/rocprofiler-systems/source/lib/omnitrace/CMakeLists.txt

@@ -44,65 +44,65 @@ target_link_libraries(
 add_library(omnitrace-object-library OBJECT)
 add_library(omnitrace::omnitrace-object-library ALIAS omnitrace-object-library)
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/library/defines.hpp.in
-               ${CMAKE_CURRENT_BINARY_DIR}/include/library/defines.hpp @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/library/defines.hpp.in
+               ${CMAKE_CURRENT_BINARY_DIR}/library/defines.hpp @ONLY)
 
 set(library_sources
-    ${CMAKE_CURRENT_LIST_DIR}/src/library.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/api.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/config.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/coverage.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/cpu_freq.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/critical_trace.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/kokkosp.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/gpu.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/ompt.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/perfetto.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/ptl.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/runtime.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/sampling.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/state.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/thread_data.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/thread_sampler.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/timemory.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/components/backtrace.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/components/fork_gotcha.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/components/mpi_gotcha.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/components/omnitrace.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/components/pthread_gotcha.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/library/components/user_region.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/api.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/config.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/coverage.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/cpu_freq.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/critical_trace.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/kokkosp.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/gpu.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/ompt.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/perfetto.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/ptl.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/runtime.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/sampling.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/state.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/thread_data.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/thread_sampler.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/timemory.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/components/backtrace.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/components/fork_gotcha.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/components/mpi_gotcha.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/components/omnitrace.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/components/pthread_gotcha.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/components/user_region.cpp
     ${perfetto_DIR}/sdk/perfetto.cc)
 
 set(library_headers
-    ${CMAKE_CURRENT_LIST_DIR}/include/library.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/api.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/config.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/common.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/coverage.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/cpu_freq.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/critical_trace.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/debug.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/gpu.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/ompt.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/perfetto.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/ptl.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/runtime.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/sampling.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/state.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/thread_data.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/thread_sampler.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/timemory.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/components/fwd.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/components/backtrace.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/components/fork_gotcha.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/components/functors.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/components/mpi_gotcha.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/components/omnitrace.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/components/rocm_smi.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/components/roctracer.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/components/roctracer_callbacks.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/components/pthread_gotcha.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/library/components/user_region.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/api.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/config.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/common.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/coverage.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/cpu_freq.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/critical_trace.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/debug.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/gpu.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/ompt.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/perfetto.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/ptl.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/runtime.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/sampling.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/state.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/thread_data.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/thread_sampler.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/timemory.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/components/fwd.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/components/backtrace.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/components/fork_gotcha.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/components/functors.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/components/mpi_gotcha.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/components/omnitrace.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/components/rocm_smi.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/components/roctracer.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/components/roctracer_callbacks.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/components/pthread_gotcha.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/library/components/user_region.hpp
     ${perfetto_DIR}/sdk/perfetto.h)
 
 target_sources(omnitrace-object-library PRIVATE ${library_sources} ${library_headers})
@@ -110,13 +110,13 @@ target_sources(omnitrace-object-library PRIVATE ${library_sources} ${library_hea
 if(OMNITRACE_USE_ROCTRACER)
     target_sources(
         omnitrace-object-library
-        PRIVATE ${CMAKE_CURRENT_LIST_DIR}/src/library/components/roctracer.cpp
-                ${CMAKE_CURRENT_LIST_DIR}/src/library/components/roctracer_callbacks.cpp)
+        PRIVATE ${CMAKE_CURRENT_LIST_DIR}/library/components/roctracer.cpp
+                ${CMAKE_CURRENT_LIST_DIR}/library/components/roctracer_callbacks.cpp)
 endif()
 
 if(OMNITRACE_USE_ROCM_SMI)
     target_sources(omnitrace-object-library
-                   PRIVATE ${CMAKE_CURRENT_LIST_DIR}/src/library/components/rocm_smi.cpp)
+                   PRIVATE ${CMAKE_CURRENT_LIST_DIR}/library/components/rocm_smi.cpp)
 endif()
 
 target_link_libraries(omnitrace-object-library PRIVATE omnitrace-interface-library)