Release 1.3.0 preparations (#109)

* v1.3.0 * ROCm 5.2 and extensions tweaks * Container workflow + miscellaneous updates * Misc fixes + timemory submodule update - timemory submodule update for multiple definitions of variant_apply * Increase timeouts * Remove obsolete Julia docs and script - support for rocprofiler makes rocprof merging obsolete * Fix cpack testing and combine cpack workflows into single script * Install components + omnitrace tpl exes - Improved COMPONENT specification for installs - Install PAPI executables with omnitrace- prefix and hyphens - Install Perfetto executables with omnitrace- prefix and hyphens * Update docs on perfetto and papi command-line tools * remove ubuntu 22.04 from containers workflow * remove containers workflow running on all pushes * Fix CI_SCRIPT_ARGS * Fix PAPI utils install * Fixed traced test in workflow + removed return char - validate-perfetto-proto.py had return character * Fix test-docker-release.sh script to use correct container * Release build bc RelWtihDebInfo using too much memory
2022-07-23 03:02:31 -05:00
@@ -3,6 +3,8 @@ include_guard(GLOBAL)

 include(CMakePackageConfigHelpers)

+set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME config)
+
 install(
    EXPORT omnitrace-library-targets
    FILE omnitrace-library-targets.cmake
@@ -309,6 +309,7 @@ macro(OMNITRACE_ADD_INTERFACE_LIBRARY _TARGET)
    install(
        TARGETS ${_TARGET}
        DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        COMPONENT core
        EXPORT ${PROJECT_NAME}-library-depends
        OPTIONAL)
    if(NOT "${ARGN}" STREQUAL "")
@@ -736,6 +737,7 @@ function(OMNITRACE_PYTHON_CONSOLE_SCRIPT SCRIPT_NAME SCRIPT_SUBMODULE)
            install(
                PROGRAMS ${PROJECT_BINARY_DIR}/bin/${SCRIPT_NAME}-${ARG_VERSION}
                DESTINATION ${CMAKE_INSTALL_BINDIR}
+                COMPONENT python
                OPTIONAL)
        endif()

@@ -766,6 +768,7 @@ function(OMNITRACE_PYTHON_CONSOLE_SCRIPT SCRIPT_NAME SCRIPT_SUBMODULE)
            install(
                PROGRAMS ${PROJECT_BINARY_DIR}/bin/${SCRIPT_NAME}
                DESTINATION ${CMAKE_INSTALL_BINDIR}
+                COMPONENT python
                OPTIONAL)
        endif()
    endif()
@@ -814,7 +817,7 @@ function(OMNITRACE_BUILDTREE_TPL _TPL_TARGET _NEW_NAME _BUILD_TREE_DIR)
        COMMENT "Creating ${_NEW_NAME} from ${_TPL_TARGET}...")
 endfunction()

-function(OMNITRACE_INSTALL_TPL _TPL_TARGET _NEW_NAME _BUILD_TREE_DIR)
+function(OMNITRACE_INSTALL_TPL _TPL_TARGET _NEW_NAME _BUILD_TREE_DIR _COMPONENT)
    get_target_property(_TPL_VERSION ${_TPL_TARGET} VERSION)
    get_target_property(_TPL_SOVERSION ${_TPL_TARGET} SOVERSION)
    get_target_property(_TPL_NAME ${_TPL_TARGET} OUTPUT_NAME)
@@ -833,13 +836,15 @@ function(OMNITRACE_INSTALL_TPL _TPL_TARGET _NEW_NAME _BUILD_TREE_DIR)
    install(
        FILES $<TARGET_FILE:${_TPL_TARGET}>
        DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        COMPONENT ${_COMPONENT}
        RENAME ${_TPL_PREFIX}${_NEW_NAME}${_TPL_SUFFIX}.${_TPL_VERSION})

    install(
        FILES
            ${_BUILD_TREE_DIR}/${_TPL_PREFIX}${_NEW_NAME}${_TPL_SUFFIX}.${_TPL_SOVERSION}
            ${_BUILD_TREE_DIR}/${_TPL_PREFIX}${_NEW_NAME}${_TPL_SUFFIX}
-        DESTINATION ${CMAKE_INSTALL_LIBDIR})
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        COMPONENT ${_COMPONENT})

 endfunction()

@@ -199,11 +199,36 @@ externalproject_add(
                  ${OMNITRACE_PAPI_EXTRA_ENV} ${MAKE_EXECUTABLE} static install
    INSTALL_COMMAND "")

+file(
+    WRITE ${PROJECT_BINARY_DIR}/external/papi/build-utils.cmake
+    "
+cmake_minimum_required(VERSION ${CMAKE_VERSION} FATAL_ERROR)
+
+execute_process(
+    COMMAND ${CMAKE_COMMAND} -E env CFLAGS=-fPIC\\\ -O3\\\ -g ${OMNITRACE_PAPI_EXTRA_ENV}
+            ${MAKE_EXECUTABLE} utils install-utils
+    WORKING_DIRECTORY ${OMNITRACE_PAPI_SOURCE_DIR}/src
+    RESULT_VARIABLE _RET
+    OUTPUT_VARIABLE _OUT
+    ERROR_VARIABLE _ERR)
+
+if(NOT \${_RET} EQUAL 0)
+    message(\"\${_OUT}\")
+    message(FATAL_ERROR \"\${_ERR}\")
+endif()
+")
+
+add_custom_command(
+    TARGET omnitrace-papi-build
+    POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -P ${PROJECT_BINARY_DIR}/external/papi/build-utils.cmake)
+
 # target for re-executing the installation
 add_custom_target(
    omnitrace-papi-install
-    COMMAND ${CMAKE_COMMAND} -E env CFLAGS=-fPIC\ -O3\ -g\ -Wno-stringop-truncation
-            ${OMNITRACE_PAPI_EXTRA_ENV} ${MAKE_EXECUTABLE} static install
+    COMMAND
+        ${CMAKE_COMMAND} -E env CFLAGS=-fPIC\ -O3\ -g\ -Wno-stringop-truncation
+        ${OMNITRACE_PAPI_EXTRA_ENV} ${MAKE_EXECUTABLE} static utils install install-utils
    WORKING_DIRECTORY ${OMNITRACE_PAPI_SOURCE_DIR}/src
    COMMENT "Installing PAPI...")

@@ -246,5 +271,32 @@ omnitrace_target_compile_definitions(omnitrace-papi INTERFACE OMNITRACE_USE_PAPI
 install(
    DIRECTORY ${OMNITRACE_PAPI_INSTALL_DIR}/lib/
    DESTINATION ${CMAKE_INSTALL_LIBDIR}/omnitrace
+    COMPONENT papi
    FILES_MATCHING
    PATTERN "*.so*")
+
+foreach(
+    _UTIL_EXE
+    papi_avail
+    papi_clockres
+    papi_command_line
+    papi_component_avail
+    papi_cost
+    papi_decode
+    papi_error_codes
+    papi_event_chooser
+    papi_hardware_avail
+    papi_hl_output_writer.py
+    papi_mem_info
+    papi_multiplex_cost
+    papi_native_avail
+    papi_version
+    papi_xml_event_info)
+    string(REPLACE "_" "-" _UTIL_EXE_INSTALL_NAME "omnitrace-${_UTIL_EXE}")
+    install(
+        PROGRAMS ${OMNITRACE_PAPI_INSTALL_DIR}/bin/${_UTIL_EXE}
+        DESTINATION ${CMAKE_INSTALL_BINDIR}
+        COMPONENT papi
+        RENAME ${_UTIL_EXE_INSTALL_NAME}
+        OPTIONAL)
+endforeach()
@@ -287,17 +287,19 @@ if(OMNITRACE_BUILD_DYNINST)
            install(
                TARGETS ${_LIB}
                DESTINATION ${CMAKE_INSTALL_LIBDIR}/omnitrace
+                COMPONENT dyninst
                PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_LIBDIR}/omnitrace/include)
        endif()
    endforeach()

    omnitrace_install_tpl(dyninstAPI_RT omnitrace-rt
-                          "${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}")
+                          "${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}" core)

    # for packaging
    install(
        DIRECTORY ${DYNINST_TPL_STAGING_PREFIX}/lib/
        DESTINATION ${CMAKE_INSTALL_LIBDIR}/omnitrace
+        COMPONENT dyninst
        FILES_MATCHING
        PATTERN "*${CMAKE_SHARED_LIBRARY_SUFFIX}*")

@@ -616,11 +618,15 @@ endif()

 add_subdirectory(external/timemory EXCLUDE_FROM_ALL)

-install(TARGETS gotcha DESTINATION ${CMAKE_INSTALL_LIBDIR}/omnitrace)
+install(
+    TARGETS gotcha
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/omnitrace
+    COMPONENT gotcha)
 if(OMNITRACE_BUILD_LIBUNWIND)
    install(
        DIRECTORY ${PROJECT_BINARY_DIR}/external/timemory/external/libunwind/install/lib/
        DESTINATION ${CMAKE_INSTALL_LIBDIR}/omnitrace
+        COMPONENT libunwind
        FILES_MATCHING
        PATTERN "*${CMAKE_SHARED_LIBRARY_SUFFIX}*")
 endif()
@@ -137,19 +137,29 @@ if(OMNITRACE_INSTALL_PERFETTO_TOOLS)
    add_custom_target(
        omnitrace-perfetto-clean
        COMMAND ${OMNITRACE_NINJA_EXECUTABLE} -t clean
+        COMMAND ${CMAKE_COMMAND} -E rm -rf
+                ${PROJECT_BINARY_DIR}/external/perfetto/src/omnitrace-perfetto-build-stamp
        WORKING_DIRECTORY ${OMNITRACE_PERFETTO_BINARY_DIR}
        COMMENT "Cleaning Perfetto...")

    install(
        DIRECTORY ${OMNITRACE_PERFETTO_INSTALL_DIR}/
-        DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/omnitrace
+        COMPONENT perfetto
        FILES_MATCHING
        PATTERN "*libperfetto.so*")

    foreach(_FILE perfetto traced tracebox traced_probes traced_perf trigger_perfetto)
+        if("${_FILE}" STREQUAL "perfetto")
+            string(REPLACE "_" "-" _INSTALL_FILE "omnitrace-${_FILE}")
+        else()
+            string(REPLACE "_" "-" _INSTALL_FILE "omnitrace-perfetto-${_FILE}")
+        endif()
        install(
            PROGRAMS ${OMNITRACE_PERFETTO_INSTALL_DIR}/${_FILE}
            DESTINATION ${CMAKE_INSTALL_BINDIR}
+            COMPONENT perfetto
+            RENAME ${_INSTALL_FILE}
            OPTIONAL)
    endforeach()
 endif()
@@ -26,4 +26,4 @@ enable_perfetto_ui = false

 extra_cflags = "@OMNITRACE_PERFETTO_C_FLAGS@"
 extra_cxxflags = "@OMNITRACE_PERFETTO_CXX_FLAGS@"
-extra_ldflags = "@OMNITRACE_PERFETTO_LINK_FLAGS@ -Wl,-rpath=\\\$ORIGIN:\\\$ORIGIN/../lib"
+extra_ldflags = "@OMNITRACE_PERFETTO_LINK_FLAGS@ -Wl,-rpath=\\\$ORIGIN:\\\$ORIGIN/../lib:\\\$ORIGIN/../lib/omnitrace"