diff --git a/.github/workflows/redhat.yml b/.github/workflows/redhat.yml index 43aa7b844..43917689d 100644 --- a/.github/workflows/redhat.yml +++ b/.github/workflows/redhat.yml @@ -137,7 +137,7 @@ jobs: shell: bash run: | set -v - source /opt/omnitrace/share/omnitrace/setup-env.sh + source /opt/omnitrace/share/rocprofsys/setup-env.sh ./scripts/test-install.sh --test-rocprof-sys-{instrument,avail,sample,rewrite,runtime,python}=1 - name: Test User API diff --git a/.github/workflows/ubuntu-focal.yml b/.github/workflows/ubuntu-focal.yml index 7b24c97d7..0849787b7 100644 --- a/.github/workflows/ubuntu-focal.yml +++ b/.github/workflows/ubuntu-focal.yml @@ -167,7 +167,7 @@ jobs: source /usr/share/modules/init/$(basename ${SHELL}) module use ./share/modulefiles module avail - module load omnitrace + module load rocprofsys echo $(which rocprof-sys-instrument) ldd $(which rocprof-sys-instrument) rocprof-sys-instrument --help @@ -179,7 +179,7 @@ jobs: shell: bash run: | cd build - source ./share/omnitrace/setup-env.sh + source ./share/rocprofsys/setup-env.sh echo $(which rocprof-sys-instrument) ldd $(which rocprof-sys-instrument) rocprof-sys-instrument --help @@ -198,7 +198,7 @@ jobs: source /usr/share/modules/init/$(basename ${SHELL}) module use /opt/omnitrace/share/modulefiles module avail - module load omnitrace + module load rocprofsys ./scripts/test-install.sh --test-rocprof-sys-{instrument,avail,sample,rewrite,runtime}=1 --test-rocprof-sys-python=${{ matrix.python }} - name: Test User API @@ -358,7 +358,7 @@ jobs: timeout-minutes: 15 shell: bash run: | - source /opt/omnitrace/share/omnitrace/setup-env.sh + source /opt/omnitrace/share/rocprofsys/setup-env.sh ./scripts/test-install.sh --test-rocprof-sys-{instrument,avail,sample,python,rewrite,runtime}=1 - name: Test User API @@ -502,13 +502,13 @@ jobs: source /usr/share/modules/init/$(basename ${SHELL}) module use ${{ github.workspace }}/build/share/modulefiles module avail - module load omnitrace + module load rocprofsys module list env - module unload omnitrace + module unload rocprofsys module list env - source ${{ github.workspace }}/build/share/omnitrace/setup-env.sh + source ${{ github.workspace }}/build/share/rocprofsys/setup-env.sh env - name: Install @@ -522,7 +522,7 @@ jobs: timeout-minutes: 15 run: | set -v - source /opt/omnitrace/share/omnitrace/setup-env.sh + source /opt/omnitrace/share/rocprofsys/setup-env.sh ${{ github.workspace }}/scripts/test-install.sh --test-rocprof-sys-{instrument,avail,sample,python,rewrite,runtime}=1 - name: Test Install with Modulefile @@ -531,7 +531,7 @@ jobs: set -v source /usr/share/modules/init/$(basename ${SHELL}) module use /opt/omnitrace/share/modulefiles - module load omnitrace + module load rocprofsys ${{ github.workspace }}/scripts/test-install.sh --test-rocprof-sys-{instrument,avail,sample,python,rewrite,runtime}=1 - name: Test User API diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d7bf08e2..f3604d856 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ endif() if(NOT UNIX OR APPLE) message( AUTHOR_WARNING - "omnitrace only supports Linux. Configure and/or build is likely to fail") + "rocprofsys only supports Linux. Configure and/or build is likely to fail") endif() file(READ "${CMAKE_CURRENT_SOURCE_DIR}/VERSION" FULL_VERSION_STRING LIMIT_COUNT 1) @@ -21,11 +21,11 @@ string(REGEX REPLACE "([0-9]+)\.([0-9]+)\.([0-9]+)(.*)" "\\1.\\2.\\3" OMNITRACE_ "${FULL_VERSION_STRING}") project( - omnitrace + rocprofsys LANGUAGES C CXX VERSION ${OMNITRACE_VERSION} DESCRIPTION "CPU/GPU Application tracing with static/dynamic binary instrumentation" - HOMEPAGE_URL "https://github.com/ROCm/omnitrace") + HOMEPAGE_URL "https://github.com/ROCm/rocprofiler-systems") find_package(Git) diff --git a/cmake/BuildSettings.cmake b/cmake/BuildSettings.cmake index c4a91ad45..53796330f 100644 --- a/cmake/BuildSettings.cmake +++ b/cmake/BuildSettings.cmake @@ -33,16 +33,16 @@ omnitrace_add_cache_option( omnitrace_add_cache_option(OMNITRACE_BUILD_NUMBER "Internal CI use" STRING "0" ADVANCED NO_FEATURE) -omnitrace_add_interface_library(omnitrace-static-libgcc +omnitrace_add_interface_library(rocprofsys-static-libgcc "Link to static version of libgcc") -omnitrace_add_interface_library(omnitrace-static-libstdcxx +omnitrace_add_interface_library(rocprofsys-static-libstdcxx "Link to static version of libstdc++") -omnitrace_add_interface_library(omnitrace-static-libgcc-optional +omnitrace_add_interface_library(rocprofsys-static-libgcc-optional "Link to static version of libgcc") -omnitrace_add_interface_library(omnitrace-static-libstdcxx-optional +omnitrace_add_interface_library(rocprofsys-static-libstdcxx-optional "Link to static version of libstdc++") -target_compile_definitions(omnitrace-compile-options INTERFACE $<$:DEBUG>) +target_compile_definitions(rocprofsys-compile-options INTERFACE $<$:DEBUG>) set(OMNITRACE_SANITIZER_TYPE "leak" @@ -78,7 +78,7 @@ find_package_handle_standard_args(rt-library REQUIRED_VARS rt_LIBRARY) # find_package_handle_standard_args(dw-library REQUIRED_VARS dw_LIBRARY) if(dl_LIBRARY) - target_link_libraries(omnitrace-compile-options INTERFACE ${dl_LIBRARY}) + target_link_libraries(rocprofsys-compile-options INTERFACE ${dl_LIBRARY}) endif() # ----------------------------------------------------------------------------------------# @@ -105,57 +105,57 @@ endif() # extra flags for debug information in debug or optimized binaries # omnitrace_add_interface_library( - omnitrace-compile-debuginfo + rocprofsys-compile-debuginfo "Attempts to set best flags for more expressive profiling information in debug or optimized binaries" ) -add_target_flag_if_avail(omnitrace-compile-debuginfo "-g3" "-fno-omit-frame-pointer" +add_target_flag_if_avail(rocprofsys-compile-debuginfo "-g3" "-fno-omit-frame-pointer" "-fno-optimize-sibling-calls") if(CMAKE_CUDA_COMPILER_IS_NVIDIA) - add_target_cuda_flag(omnitrace-compile-debuginfo "-lineinfo") + add_target_cuda_flag(rocprofsys-compile-debuginfo "-lineinfo") endif() target_compile_options( - omnitrace-compile-debuginfo + rocprofsys-compile-debuginfo INTERFACE $<$:$<$:-rdynamic>> $<$:$<$:-rdynamic>>) if(NOT APPLE) - target_link_options(omnitrace-compile-debuginfo INTERFACE + target_link_options(rocprofsys-compile-debuginfo INTERFACE $<$:-rdynamic>) endif() if(CMAKE_CUDA_COMPILER_IS_NVIDIA) target_compile_options( - omnitrace-compile-debuginfo + rocprofsys-compile-debuginfo INTERFACE $<$:$<$:-Xcompiler=-rdynamic>>) endif() if(dl_LIBRARY) - target_link_libraries(omnitrace-compile-debuginfo INTERFACE ${dl_LIBRARY}) + target_link_libraries(rocprofsys-compile-debuginfo INTERFACE ${dl_LIBRARY}) endif() if(rt_LIBRARY) - target_link_libraries(omnitrace-compile-debuginfo INTERFACE ${rt_LIBRARY}) + target_link_libraries(rocprofsys-compile-debuginfo INTERFACE ${rt_LIBRARY}) endif() # ----------------------------------------------------------------------------------------# # non-debug optimizations # -omnitrace_add_interface_library(omnitrace-compile-extra "Extra optimization flags") +omnitrace_add_interface_library(rocprofsys-compile-extra "Extra optimization flags") if(NOT OMNITRACE_BUILD_CODECOV AND OMNITRACE_BUILD_EXTRA_OPTIMIZATIONS) add_target_flag_if_avail( - omnitrace-compile-extra "-finline-functions" "-funroll-loops" "-ftree-vectorize" + rocprofsys-compile-extra "-finline-functions" "-funroll-loops" "-ftree-vectorize" "-ftree-loop-optimize" "-ftree-loop-vectorize") endif() if(NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Debug" AND OMNITRACE_BUILD_EXTRA_OPTIMIZATIONS AND NOT OMNITRACE_BUILD_CODECOV) - target_link_libraries(omnitrace-compile-options - INTERFACE $) + target_link_libraries(rocprofsys-compile-options + INTERFACE $) add_flag_if_avail( "-fno-signaling-nans" "-fno-trapping-math" "-fno-signed-zeros" "-ffinite-math-only" "-fno-math-errno" "-fpredictive-commoning" @@ -168,28 +168,28 @@ endif() # add_cxx_flag_if_avail("-faligned-new") -omnitrace_add_interface_library(omnitrace-lto "Adds link-time-optimization flags") +omnitrace_add_interface_library(rocprofsys-lto "Adds link-time-optimization flags") if(NOT OMNITRACE_BUILD_CODECOV) omnitrace_save_variables(FLTO VARIABLES CMAKE_CXX_FLAGS) set(_CXX_FLAGS "${CMAKE_CXX_FLAGS}") set(CMAKE_CXX_FLAGS "-flto=thin ${_CXX_FLAGS}") - add_target_flag_if_avail(omnitrace-lto "-flto=thin") + add_target_flag_if_avail(rocprofsys-lto "-flto=thin") if(NOT cxx_omnitrace_lto_flto_thin) set(CMAKE_CXX_FLAGS "-flto ${_CXX_FLAGS}") - add_target_flag_if_avail(omnitrace-lto "-flto") + add_target_flag_if_avail(rocprofsys-lto "-flto") if(NOT cxx_omnitrace_lto_flto) set(OMNITRACE_BUILD_LTO OFF) else() - target_link_options(omnitrace-lto INTERFACE -flto) + target_link_options(rocprofsys-lto INTERFACE -flto) endif() - add_target_flag_if_avail(omnitrace-lto "-fno-fat-lto-objects") + add_target_flag_if_avail(rocprofsys-lto "-fno-fat-lto-objects") if(cxx_omnitrace_lto_fno_fat_lto_objects) - target_link_options(omnitrace-lto INTERFACE -fno-fat-lto-objects) + target_link_options(rocprofsys-lto INTERFACE -fno-fat-lto-objects) endif() else() - target_link_options(omnitrace-lto INTERFACE -flto=thin) + target_link_options(rocprofsys-lto INTERFACE -flto=thin) endif() omnitrace_restore_variables(FLTO VARIABLES CMAKE_CXX_FLAGS) @@ -199,31 +199,31 @@ endif() # print compilation timing reports (Clang compiler) # omnitrace_add_interface_library( - omnitrace-compile-timing + rocprofsys-compile-timing "Adds compiler flags which report compilation timing metrics") if(CMAKE_CXX_COMPILER_IS_CLANG) - add_target_flag_if_avail(omnitrace-compile-timing "-ftime-trace") + add_target_flag_if_avail(rocprofsys-compile-timing "-ftime-trace") if(NOT cxx_omnitrace_compile_timing_ftime_trace) - add_target_flag_if_avail(omnitrace-compile-timing "-ftime-report") + add_target_flag_if_avail(rocprofsys-compile-timing "-ftime-report") endif() else() - add_target_flag_if_avail(omnitrace-compile-timing "-ftime-report") + add_target_flag_if_avail(rocprofsys-compile-timing "-ftime-report") endif() if(OMNITRACE_USE_COMPILE_TIMING) - target_link_libraries(omnitrace-compile-options INTERFACE omnitrace-compile-timing) + target_link_libraries(rocprofsys-compile-options INTERFACE rocprofsys-compile-timing) endif() # ----------------------------------------------------------------------------------------# # fstack-protector # -omnitrace_add_interface_library(omnitrace-stack-protector +omnitrace_add_interface_library(rocprofsys-stack-protector "Adds stack-protector compiler flags") -add_target_flag_if_avail(omnitrace-stack-protector "-fstack-protector-strong" +add_target_flag_if_avail(rocprofsys-stack-protector "-fstack-protector-strong" "-Wstack-protector") if(OMNITRACE_BUILD_STACK_PROTECTOR) - target_link_libraries(omnitrace-compile-options INTERFACE omnitrace-stack-protector) + target_link_libraries(rocprofsys-compile-options INTERFACE rocprofsys-stack-protector) endif() # ----------------------------------------------------------------------------------------# @@ -231,17 +231,17 @@ endif() # if(OMNITRACE_BUILD_DEVELOPER) add_target_flag_if_avail( - omnitrace-compile-options "-Werror" "-Wdouble-promotion" "-Wshadow" "-Wextra" + rocprofsys-compile-options "-Werror" "-Wdouble-promotion" "-Wshadow" "-Wextra" "-Wpedantic" "-Wstack-usage=524288" # 512 KB "/showIncludes") if(OMNITRACE_BUILD_NUMBER GREATER 2) - add_target_flag_if_avail(omnitrace-compile-options "-gsplit-dwarf") + add_target_flag_if_avail(rocprofsys-compile-options "-gsplit-dwarf") endif() endif() if(OMNITRACE_BUILD_LINKER) target_link_options( - omnitrace-compile-options INTERFACE + rocprofsys-compile-options INTERFACE $<$:-fuse-ld=${OMNITRACE_BUILD_LINKER}> $<$:-fuse-ld=${OMNITRACE_BUILD_LINKER}>) endif() @@ -251,20 +251,20 @@ endif() # if(OMNITRACE_BUILD_RELEASE AND NOT OMNITRACE_BUILD_DEBUG) add_target_flag_if_avail( - omnitrace-compile-options "-g1" "-feliminate-unused-debug-symbols" + rocprofsys-compile-options "-g1" "-feliminate-unused-debug-symbols" "-gno-column-info" "-gno-variable-location-views" "-gline-tables-only") endif() # ----------------------------------------------------------------------------------------# # visibility build flags # -omnitrace_add_interface_library(omnitrace-default-visibility +omnitrace_add_interface_library(rocprofsys-default-visibility "Adds -fvisibility=default compiler flag") -omnitrace_add_interface_library(omnitrace-hidden-visibility +omnitrace_add_interface_library(rocprofsys-hidden-visibility "Adds -fvisibility=hidden compiler flag") -add_target_flag_if_avail(omnitrace-default-visibility "-fvisibility=default") -add_target_flag_if_avail(omnitrace-hidden-visibility "-fvisibility=hidden" +add_target_flag_if_avail(rocprofsys-default-visibility "-fvisibility=default") +add_target_flag_if_avail(rocprofsys-hidden-visibility "-fvisibility=hidden" "-fvisibility-inlines-hidden") # ----------------------------------------------------------------------------------------# @@ -292,26 +292,26 @@ set(OMNITRACE_SANITIZER_TYPES alignment) set_property(CACHE OMNITRACE_SANITIZER_TYPE PROPERTY STRINGS "${OMNITRACE_SANITIZER_TYPES}") -omnitrace_add_interface_library(omnitrace-sanitizer-compile-options +omnitrace_add_interface_library(rocprofsys-sanitizer-compile-options "Adds compiler flags for sanitizers") omnitrace_add_interface_library( - omnitrace-sanitizer + rocprofsys-sanitizer "Adds compiler flags to enable ${OMNITRACE_SANITIZER_TYPE} sanitizer (-fsanitizer=${OMNITRACE_SANITIZER_TYPE})" ) set(COMMON_SANITIZER_FLAGS "-fno-optimize-sibling-calls" "-fno-omit-frame-pointer" "-fno-inline-functions") -add_target_flag(omnitrace-sanitizer-compile-options ${COMMON_SANITIZER_FLAGS}) +add_target_flag(rocprofsys-sanitizer-compile-options ${COMMON_SANITIZER_FLAGS}) foreach(_TYPE ${OMNITRACE_SANITIZER_TYPES}) set(_FLAG "-fsanitize=${_TYPE}") omnitrace_add_interface_library( - omnitrace-${_TYPE}-sanitizer + rocprofsys-${_TYPE}-sanitizer "Adds compiler flags to enable ${_TYPE} sanitizer (${_FLAG})") - add_target_flag(omnitrace-${_TYPE}-sanitizer ${_FLAG}) - target_link_libraries(omnitrace-${_TYPE}-sanitizer - INTERFACE omnitrace-sanitizer-compile-options) - set_property(TARGET omnitrace-${_TYPE}-sanitizer + add_target_flag(rocprofsys-${_TYPE}-sanitizer ${_FLAG}) + target_link_libraries(rocprofsys-${_TYPE}-sanitizer + INTERFACE rocprofsys-sanitizer-compile-options) + set_property(TARGET rocprofsys-${_TYPE}-sanitizer PROPERTY INTERFACE_LINK_OPTIONS ${_FLAG} ${COMMON_SANITIZER_FLAGS}) endforeach() @@ -320,12 +320,12 @@ unset(COMMON_SANITIZER_FLAGS) if(OMNITRACE_USE_SANITIZER) foreach(_TYPE ${OMNITRACE_SANITIZER_TYPE}) - if(TARGET omnitrace-${_TYPE}-sanitizer) - target_link_libraries(omnitrace-sanitizer - INTERFACE omnitrace-${_TYPE}-sanitizer) + if(TARGET rocprofsys-${_TYPE}-sanitizer) + target_link_libraries(rocprof-sys-sanitizer + INTERFACE rocprofsys-${_TYPE}-sanitizer) else() message( - FATAL_ERROR "Error! Target 'omnitrace-${_TYPE}-sanitizer' does not exist!" + FATAL_ERROR "Error! Target 'rocprofsys-${_TYPE}-sanitizer' does not exist!" ) endif() endforeach() @@ -337,29 +337,29 @@ endif() # static lib flags # target_compile_options( - omnitrace-static-libgcc + rocprofsys-static-libgcc INTERFACE $<$:$<$:-static-libgcc>> $<$:$<$:-static-libgcc>>) target_link_options( - omnitrace-static-libgcc INTERFACE + rocprofsys-static-libgcc INTERFACE $<$:$<$:-static-libgcc>> $<$:$<$:-static-libgcc>>) target_compile_options( - omnitrace-static-libstdcxx + rocprofsys-static-libstdcxx INTERFACE $<$:$<$:-static-libstdc++>>) target_link_options( - omnitrace-static-libstdcxx INTERFACE + rocprofsys-static-libstdcxx INTERFACE $<$:$<$:-static-libstdc++>>) if(OMNITRACE_BUILD_STATIC_LIBGCC) - target_link_libraries(omnitrace-static-libgcc-optional - INTERFACE omnitrace-static-libgcc) + target_link_libraries(rocprofsys-static-libgcc-optional + INTERFACE rocprofsys-static-libgcc) endif() if(OMNITRACE_BUILD_STATIC_LIBSTDCXX) - target_link_libraries(omnitrace-static-libstdcxx-optional - INTERFACE omnitrace-static-libstdcxx) + target_link_libraries(rocprofsys-static-libstdcxx-optional + INTERFACE rocprofsys-static-libstdcxx) endif() # ----------------------------------------------------------------------------------------# @@ -368,5 +368,5 @@ endif() get_property(LANGUAGES GLOBAL PROPERTY ENABLED_LANGUAGES) if(NOT APPLE OR "$ENV{CONDA_PYTHON_EXE}" STREQUAL "") - add_user_flags(omnitrace-compile-options "CXX") + add_user_flags(rocprofsys-compile-options "CXX") endif() diff --git a/cmake/ConfigCPack.cmake b/cmake/ConfigCPack.cmake index 82c354b51..8d2d2d481 100644 --- a/cmake/ConfigCPack.cmake +++ b/cmake/ConfigCPack.cmake @@ -126,7 +126,7 @@ omnitrace_add_feature(OMNITRACE_PACKAGE_FILE_NAME "CPack filename") # # -------------------------------------------------------------------------------------- # -set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/ROCm/omnitrace") +set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/ROCm/rocprofiler-systems") set(CPACK_DEBIAN_PACKAGE_RELEASE "${OMNITRACE_CPACK_SYSTEM_NAME}${OMNITRACE_CPACK_PACKAGE_SUFFIX}") string(REGEX REPLACE "([a-zA-Z])-([0-9])" "\\1\\2" CPACK_DEBIAN_PACKAGE_RELEASE diff --git a/cmake/ConfigInstall.cmake b/cmake/ConfigInstall.cmake index c3d5d26db..db58f1d14 100644 --- a/cmake/ConfigInstall.cmake +++ b/cmake/ConfigInstall.cmake @@ -6,10 +6,10 @@ include(CMakePackageConfigHelpers) set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME config) install( - EXPORT omnitrace-library-targets - FILE omnitrace-library-targets.cmake - NAMESPACE omnitrace:: - DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/omnitrace) + EXPORT rocprofsys-library-targets + FILE rocprofsys-library-targets.cmake + NAMESPACE rocprofsys:: + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/rocprofsys) # ------------------------------------------------------------------------------# # install tree @@ -22,7 +22,7 @@ set(PROJECT_BUILD_TARGETS user) configure_package_config_file( ${PROJECT_SOURCE_DIR}/cmake/Templates/${PROJECT_NAME}-config.cmake.in ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}-config.cmake - INSTALL_DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/omnitrace + INSTALL_DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/rocprofsys INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} PATH_VARS PROJECT_INSTALL_DIR INCLUDE_INSTALL_DIR LIB_INSTALL_DIR) @@ -54,7 +54,7 @@ install(PROGRAMS ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/rocprof-sys-causa # build tree # set(_BUILDTREE_EXPORT_DIR - "${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/cmake/omnitrace") + "${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/cmake/rocprofsys") if(NOT EXISTS "${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}") file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}") @@ -64,15 +64,15 @@ if(NOT EXISTS "${_BUILDTREE_EXPORT_DIR}") file(MAKE_DIRECTORY "${_BUILDTREE_EXPORT_DIR}") endif() -if(NOT EXISTS "${_BUILDTREE_EXPORT_DIR}/omnitrace-library-targets.cmake") - file(TOUCH "${_BUILDTREE_EXPORT_DIR}/omnitrace-library-targets.cmake") +if(NOT EXISTS "${_BUILDTREE_EXPORT_DIR}/rocprofsys-library-targets.cmake") + file(TOUCH "${_BUILDTREE_EXPORT_DIR}/rocprofsys-library-targets.cmake") endif() export( - EXPORT omnitrace-library-targets - NAMESPACE omnitrace:: - FILE "${_BUILDTREE_EXPORT_DIR}/omnitrace-library-targets.cmake") + EXPORT rocprofsys-library-targets + NAMESPACE rocprofsys:: + FILE "${_BUILDTREE_EXPORT_DIR}/rocprofsys-library-targets.cmake") -set(omnitrace_DIR +set(rocprofsys_DIR "${_BUILDTREE_EXPORT_DIR}" - CACHE PATH "omnitrace" FORCE) + CACHE PATH "rocprofsys" FORCE) diff --git a/cmake/ElfUtils.cmake b/cmake/ElfUtils.cmake index df6a9a99c..8a3c4a8b5 100644 --- a/cmake/ElfUtils.cmake +++ b/cmake/ElfUtils.cmake @@ -1,7 +1,7 @@ # ====================================================================================== # elfutils.cmake # -# Configure elfutils for omnitrace +# Configure elfutils for rocprofsys # # ---------------------------------------- # @@ -100,7 +100,7 @@ set(_eu_build_byproducts "${_eu_root}/lib/libdw${CMAKE_STATIC_LIBRARY_SUFFIX}" "${_eu_root}/lib/libelf${CMAKE_STATIC_LIBRARY_SUFFIX}") externalproject_add( - omnitrace-elfutils-build + rocprofsys-elfutils-build PREFIX ${PROJECT_BINARY_DIR}/external/elfutils URL ${ElfUtils_DOWNLOAD_URL} "https://sourceware.org/elfutils/ftp/${ElfUtils_DOWNLOAD_VERSION}/elfutils-${ElfUtils_DOWNLOAD_VERSION}.tar.bz2" @@ -119,7 +119,7 @@ externalproject_add( # target for re-executing the installation add_custom_target( - omnitrace-elfutils-install + rocprofsys-elfutils-install COMMAND ${MAKE_COMMAND} install -s WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/external/elfutils/src/ElfUtils-External COMMENT "Installing ElfUtils...") diff --git a/cmake/Formatting.cmake b/cmake/Formatting.cmake index 52c17d127..afaffb281 100644 --- a/cmake/Formatting.cmake +++ b/cmake/Formatting.cmake @@ -86,18 +86,18 @@ if(OMNITRACE_CLANG_FORMAT_EXE if(OMNITRACE_CLANG_FORMAT_EXE) add_custom_target( - format-omnitrace-source + format-rocprofsys-source ${OMNITRACE_CLANG_FORMAT_EXE} -i ${sources} ${headers} ${examples} ${tests_source} - COMMENT "[omnitrace] Running C++ formatter ${OMNITRACE_CLANG_FORMAT_EXE}...") + COMMENT "[rocprof-sys] Running C++ formatter ${OMNITRACE_CLANG_FORMAT_EXE}...") endif() if(OMNITRACE_BLACK_FORMAT_EXE) add_custom_target( - format-omnitrace-python + format-rocprofsys-python ${OMNITRACE_BLACK_FORMAT_EXE} -q ${PROJECT_SOURCE_DIR} COMMENT - "[omnitrace] Running Python formatter ${OMNITRACE_BLACK_FORMAT_EXE}...") + "[rocprof-sys] Running Python formatter ${OMNITRACE_BLACK_FORMAT_EXE}...") if(NOT TARGET format-python) add_custom_target(format-python) endif() @@ -105,9 +105,9 @@ if(OMNITRACE_CLANG_FORMAT_EXE if(OMNITRACE_CMAKE_FORMAT_EXE) add_custom_target( - format-omnitrace-cmake + format-rocprofsys-cmake ${OMNITRACE_CMAKE_FORMAT_EXE} -i ${cmake_files} - COMMENT "[omnitrace] Running CMake formatter ${OMNITRACE_CMAKE_FORMAT_EXE}..." + COMMENT "[rocprof-sys] Running CMake formatter ${OMNITRACE_CMAKE_FORMAT_EXE}..." ) if(NOT TARGET format-cmake) add_custom_target(format-cmake) @@ -115,15 +115,15 @@ if(OMNITRACE_CLANG_FORMAT_EXE endif() foreach(_TYPE source python cmake) - if(TARGET format-omnitrace-${_TYPE}) - add_dependencies(format-omnitrace format-omnitrace-${_TYPE}) - add_dependencies(format-${_TYPE} format-omnitrace-${_TYPE}) + if(TARGET format-rocprofsys-${_TYPE}) + add_dependencies(format-omnitrace format-rocprofsys-${_TYPE}) + add_dependencies(format-${_TYPE} format-rocprofsys-${_TYPE}) endif() endforeach() foreach(_TYPE source python) - if(TARGET format-omnitrace-${_TYPE}) - add_dependencies(format format-omnitrace-${_TYPE}) + if(TARGET format-rocprofsys-${_TYPE}) + add_dependencies(format format-rocprofsys-${_TYPE}) endif() endforeach() else() diff --git a/cmake/MacroUtilities.cmake b/cmake/MacroUtilities.cmake index af48a5517..01dbf685a 100644 --- a/cmake/MacroUtilities.cmake +++ b/cmake/MacroUtilities.cmake @@ -17,7 +17,7 @@ include(CMakeParseArguments) # function(OMNITRACE_MESSAGE TYPE) if(NOT OMNITRACE_QUIET_CONFIG) - message(${TYPE} "[omnitrace] ${ARGN}") + message(${TYPE} "[rocprof-sys] ${ARGN}") endif() endfunction() @@ -169,9 +169,9 @@ endfunction() # Creates a target which runs ctest but depends on all the tests being built. # function(ADD_OMNITRACE_TEST_TARGET) - if(NOT TARGET omnitrace-test) + if(NOT TARGET rocprofsys-test) add_custom_target( - omnitrace-test + rocprofsys-test COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR} --target test WORKING_DIRECTORY ${PROJECT_BINARY_DIR} COMMENT "Running tests...") @@ -555,7 +555,7 @@ function(omnitrace_custom_compilation) cmake_parse_arguments(COMP "GLOBAL;PROJECT" "COMPILER" "DIRECTORY;TARGET;SOURCE" ${ARGN}) - # find omnitrace-launch-compiler + # find rocprofsys-launch-compiler find_program( OMNITRACE_COMPILE_LAUNCHER NAMES omnitrace-launch-compiler @@ -570,7 +570,7 @@ function(omnitrace_custom_compilation) if(NOT OMNITRACE_COMPILE_LAUNCHER) message( FATAL_ERROR - "omnitrace could not find 'omnitrace-launch-compiler'. Please set '-DOMNITRACE_COMPILE_LAUNCHER=/path/to/launcher'" + "rocprofsys could not find 'rocprofsys-launch-compiler'. Please set '-DOMNITRACE_COMPILE_LAUNCHER=/path/to/launcher'" ) endif() diff --git a/cmake/PAPI.cmake b/cmake/PAPI.cmake index af8a207e6..2a3210be9 100644 --- a/cmake/PAPI.cmake +++ b/cmake/PAPI.cmake @@ -1,7 +1,7 @@ # ====================================================================================== # PAPI.cmake # -# Configure papi for omnitrace +# Configure papi for rocprofsys # # ====================================================================================== @@ -199,7 +199,7 @@ set(PAPI_C_COMPILER include(ExternalProject) externalproject_add( - omnitrace-papi-build + rocprofsys-papi-build PREFIX ${PROJECT_BINARY_DIR}/external/papi SOURCE_DIR ${OMNITRACE_PAPI_SOURCE_DIR}/src BUILD_IN_SOURCE 1 @@ -218,7 +218,7 @@ externalproject_add( # target for re-executing the installation add_custom_target( - omnitrace-papi-install + rocprofsys-papi-install COMMAND ${CMAKE_COMMAND} -E env CFLAGS=-fPIC\ -O3\ -Wno-stringop-truncation ${OMNITRACE_PAPI_EXTRA_ENV} ${MAKE_EXECUTABLE} static install -s COMMAND ${CMAKE_COMMAND} -E env CFLAGS=-fPIC\ -O3\ -Wno-stringop-truncation @@ -227,7 +227,7 @@ add_custom_target( COMMENT "Installing PAPI...") add_custom_target( - omnitrace-papi-clean + rocprofsys-papi-clean COMMAND ${MAKE_EXECUTABLE} distclean COMMAND ${CMAKE_COMMAND} -E rm -rf ${OMNITRACE_PAPI_INSTALL_DIR}/include/* COMMAND ${CMAKE_COMMAND} -E rm -rf ${OMNITRACE_PAPI_INSTALL_DIR}/lib/* @@ -257,16 +257,16 @@ set(PAPI_pfm_STATIC_LIBRARY ${OMNITRACE_PAPI_INSTALL_DIR}/lib/libpfm.a CACHE FILEPATH "PAPI library" FORCE) -target_include_directories(omnitrace-papi SYSTEM +target_include_directories(rocprofsys-papi SYSTEM INTERFACE $) -target_link_libraries(omnitrace-papi INTERFACE $ +target_link_libraries(rocprofsys-papi INTERFACE $ $) omnitrace_target_compile_definitions( - omnitrace-papi INTERFACE OMNITRACE_USE_PAPI $) + rocprofsys-papi INTERFACE OMNITRACE_USE_PAPI $) install( DIRECTORY ${OMNITRACE_PAPI_INSTALL_DIR}/lib/ - DESTINATION ${CMAKE_INSTALL_LIBDIR}/omnitrace + DESTINATION ${CMAKE_INSTALL_LIBDIR}/rocprofsys COMPONENT papi FILES_MATCHING PATTERN "*.so*") @@ -289,7 +289,7 @@ foreach( papi_version papi_xml_event_info) - string(REPLACE "_" "-" _UTIL_EXE_INSTALL_NAME "omnitrace-${_UTIL_EXE}") + string(REPLACE "_" "-" _UTIL_EXE_INSTALL_NAME "rocprofsys-${_UTIL_EXE}") # RPM installer on RedHat/RockyLinux throws error that #!/usr/bin/python should either # be #!/usr/bin/python2 or #!/usr/bin/python3 diff --git a/cmake/Packages.cmake b/cmake/Packages.cmake index a391408b6..aa6e43015 100644 --- a/cmake/Packages.cmake +++ b/cmake/Packages.cmake @@ -8,49 +8,49 @@ include_guard(DIRECTORY) # ######################################################################################## omnitrace_add_interface_library( - omnitrace-headers "Provides minimal set of include flags to compile with omnitrace") -omnitrace_add_interface_library(omnitrace-threading "Enables multithreading support") + rocprofsys-headers "Provides minimal set of include flags to compile with rocprofsys") +omnitrace_add_interface_library(rocprofsys-threading "Enables multithreading support") omnitrace_add_interface_library( - omnitrace-dyninst + rocprofsys-dyninst "Provides flags and libraries for Dyninst (dynamic instrumentation)") -omnitrace_add_interface_library(omnitrace-hip "Provides flags and libraries for HIP") -omnitrace_add_interface_library(omnitrace-roctracer +omnitrace_add_interface_library(rocprofsys-hip "Provides flags and libraries for HIP") +omnitrace_add_interface_library(rocprofsys-roctracer "Provides flags and libraries for roctracer") -omnitrace_add_interface_library(omnitrace-rocprofiler +omnitrace_add_interface_library(rocprofsys-rocprofiler "Provides flags and libraries for rocprofiler") -omnitrace_add_interface_library(omnitrace-rocm-smi +omnitrace_add_interface_library(rocprofsys-rocm-smi "Provides flags and libraries for rocm-smi") omnitrace_add_interface_library( - omnitrace-rccl "Provides flags for ROCm Communication Collectives Library (RCCL)") -omnitrace_add_interface_library(omnitrace-mpi "Provides MPI or MPI headers") -omnitrace_add_interface_library(omnitrace-bfd "Provides Binary File Descriptor (BFD)") -omnitrace_add_interface_library(omnitrace-ptl "Enables PTL support (tasking)") -omnitrace_add_interface_library(omnitrace-papi "Enable PAPI support") -omnitrace_add_interface_library(omnitrace-ompt "Enable OMPT support") -omnitrace_add_interface_library(omnitrace-python "Enables Python support") -omnitrace_add_interface_library(omnitrace-elfutils "Provides ElfUtils") -omnitrace_add_interface_library(omnitrace-perfetto "Enables Perfetto support") -omnitrace_add_interface_library(omnitrace-timemory "Provides timemory libraries") -omnitrace_add_interface_library(omnitrace-timemory-config + rocprofsys-rccl "Provides flags for ROCm Communication Collectives Library (RCCL)") +omnitrace_add_interface_library(rocprofsys-mpi "Provides MPI or MPI headers") +omnitrace_add_interface_library(rocprofsys-bfd "Provides Binary File Descriptor (BFD)") +omnitrace_add_interface_library(rocprofsys-ptl "Enables PTL support (tasking)") +omnitrace_add_interface_library(rocprofsys-papi "Enable PAPI support") +omnitrace_add_interface_library(rocprofsys-ompt "Enable OMPT support") +omnitrace_add_interface_library(rocprofsys-python "Enables Python support") +omnitrace_add_interface_library(rocprofsys-elfutils "Provides ElfUtils") +omnitrace_add_interface_library(rocprofsys-perfetto "Enables Perfetto support") +omnitrace_add_interface_library(rocprofsys-timemory "Provides timemory libraries") +omnitrace_add_interface_library(rocprofsys-timemory-config "CMake interface library applied to all timemory targets") -omnitrace_add_interface_library(omnitrace-compile-definitions "Compile definitions") +omnitrace_add_interface_library(rocprofsys-compile-definitions "Compile definitions") # libraries with relevant compile definitions set(OMNITRACE_EXTENSION_LIBRARIES - omnitrace::omnitrace-hip - omnitrace::omnitrace-roctracer - omnitrace::omnitrace-rocprofiler - omnitrace::omnitrace-rocm-smi - omnitrace::omnitrace-rccl - omnitrace::omnitrace-bfd - omnitrace::omnitrace-mpi - omnitrace::omnitrace-ptl - omnitrace::omnitrace-ompt - omnitrace::omnitrace-papi - omnitrace::omnitrace-perfetto) + rocprofsys::rocprofsys-hip + rocprofsys::rocprofsys-roctracer + rocprofsys::rocprofsys-rocprofiler + rocprofsys::rocprofsys-rocm-smi + rocprofsys::rocprofsys-rccl + rocprofsys::rocprofsys-bfd + rocprofsys::rocprofsys-mpi + rocprofsys::rocprofsys-ptl + rocprofsys::rocprofsys-ompt + rocprofsys::rocprofsys-papi + rocprofsys::rocprofsys-perfetto) target_include_directories( - omnitrace-headers + rocprofsys-headers INTERFACE $ $ $ @@ -59,7 +59,7 @@ target_include_directories( $) # include threading because of rooflines -target_link_libraries(omnitrace-headers INTERFACE omnitrace::omnitrace-threading) +target_link_libraries(rocprofsys-headers INTERFACE rocprofsys::rocprofsys-threading) # ensure the env overrides the appending /opt/rocm later string(REPLACE ":" ";" CMAKE_PREFIX_PATH "$ENV{CMAKE_PREFIX_PATH};${CMAKE_PREFIX_PATH}") @@ -94,11 +94,11 @@ find_library(pthread_LIBRARY NAMES pthread pthreads) find_package_handle_standard_args(pthread-library REQUIRED_VARS pthread_LIBRARY) if(pthread_LIBRARY) - target_link_libraries(omnitrace-threading INTERFACE ${pthread_LIBRARY}) + target_link_libraries(rocprofsys-threading INTERFACE ${pthread_LIBRARY}) else() - find_package(Threads ${omnitrace_FIND_QUIETLY} ${omnitrace_FIND_REQUIREMENT}) + find_package(Threads ${rocprofsys_FIND_QUIETLY} ${rocprofsys_FIND_REQUIREMENT}) if(Threads_FOUND) - target_link_libraries(omnitrace-threading INTERFACE Threads::Threads) + target_link_libraries(rocprofsys-threading INTERFACE Threads::Threads) endif() endif() @@ -106,7 +106,7 @@ foreach(_LIB dl rt) find_library(${_LIB}_LIBRARY NAMES ${_LIB}) find_package_handle_standard_args(${_LIB}-library REQUIRED_VARS ${_LIB}_LIBRARY) if(${_LIB}_LIBRARY) - target_link_libraries(omnitrace-threading INTERFACE ${${_LIB}_LIBRARY}) + target_link_libraries(rocprofsys-threading INTERFACE ${${_LIB}_LIBRARY}) endif() endforeach() @@ -123,7 +123,7 @@ if(OMNITRACE_USE_HIP find_package(ROCmVersion) if(NOT ROCmVersion_FOUND) - find_package(hip ${omnitrace_FIND_QUIETLY} REQUIRED HINTS + find_package(hip ${rocprofsys_FIND_QUIETLY} REQUIRED HINTS ${OMNITRACE_DEFAULT_ROCM_PATH} PATHS ${OMNITRACE_DEFAULT_ROCM_PATH}) if(SPACK_BUILD) find_package(ROCmVersion HINTS ${ROCM_PATH} PATHS ${ROCM_PATH}) @@ -162,7 +162,7 @@ if(OMNITRACE_USE_HIP set(roctracer_kfdwrapper_LIBRARY) endif() - omnitrace_add_feature(OMNITRACE_ROCM_VERSION "ROCm version used by omnitrace") + omnitrace_add_feature(OMNITRACE_ROCM_VERSION "ROCm version used by rocprofsys") else() set(OMNITRACE_HIP_VERSION "0.0.0") set(OMNITRACE_HIP_VERSION_MAJOR 0) @@ -177,9 +177,9 @@ endif() # ----------------------------------------------------------------------------------------# if(OMNITRACE_USE_HIP) - find_package(hip ${omnitrace_FIND_QUIETLY} REQUIRED) - omnitrace_target_compile_definitions(omnitrace-hip INTERFACE OMNITRACE_USE_HIP) - target_link_libraries(omnitrace-hip INTERFACE hip::host) + find_package(hip ${rocprofsys_FIND_QUIETLY} REQUIRED) + omnitrace_target_compile_definitions(rocprofsys-hip INTERFACE OMNITRACE_USE_HIP) + target_link_libraries(rocprofsys-hip INTERFACE hip::host) endif() # ----------------------------------------------------------------------------------------# @@ -189,11 +189,11 @@ endif() # ----------------------------------------------------------------------------------------# if(OMNITRACE_USE_ROCTRACER) - find_package(roctracer ${omnitrace_FIND_QUIETLY} REQUIRED) - omnitrace_target_compile_definitions(omnitrace-roctracer + find_package(roctracer ${rocprofsys_FIND_QUIETLY} REQUIRED) + omnitrace_target_compile_definitions(rocprofsys-roctracer INTERFACE OMNITRACE_USE_ROCTRACER) - target_link_libraries(omnitrace-roctracer INTERFACE roctracer::roctracer - omnitrace::omnitrace-hip) + target_link_libraries(rocprofsys-roctracer INTERFACE roctracer::roctracer + rocprofsys::rocprofsys-hip) endif() # ----------------------------------------------------------------------------------------# @@ -202,10 +202,10 @@ endif() # # ----------------------------------------------------------------------------------------# if(OMNITRACE_USE_ROCPROFILER) - find_package(rocprofiler ${omnitrace_FIND_QUIETLY} REQUIRED) - omnitrace_target_compile_definitions(omnitrace-rocprofiler + find_package(rocprofiler ${rocprofsys_FIND_QUIETLY} REQUIRED) + omnitrace_target_compile_definitions(rocprofsys-rocprofiler INTERFACE OMNITRACE_USE_ROCPROFILER) - target_link_libraries(omnitrace-rocprofiler INTERFACE rocprofiler::rocprofiler) + target_link_libraries(rocprofsys-rocprofiler INTERFACE rocprofiler::rocprofiler) endif() # ----------------------------------------------------------------------------------------# @@ -215,10 +215,10 @@ endif() # ----------------------------------------------------------------------------------------# if(OMNITRACE_USE_ROCM_SMI) - find_package(rocm-smi ${omnitrace_FIND_QUIETLY} REQUIRED) - omnitrace_target_compile_definitions(omnitrace-rocm-smi + find_package(rocm-smi ${rocprofsys_FIND_QUIETLY} REQUIRED) + omnitrace_target_compile_definitions(rocprofsys-rocm-smi INTERFACE OMNITRACE_USE_ROCM_SMI) - target_link_libraries(omnitrace-rocm-smi INTERFACE rocm-smi::rocm-smi) + target_link_libraries(rocprofsys-rocm-smi INTERFACE rocm-smi::rocm-smi) endif() # ----------------------------------------------------------------------------------------# @@ -228,9 +228,9 @@ endif() # ----------------------------------------------------------------------------------------# if(OMNITRACE_USE_RCCL) - find_package(RCCL-Headers ${omnitrace_FIND_QUIETLY} REQUIRED) - target_link_libraries(omnitrace-rccl INTERFACE roc::rccl-headers) - omnitrace_target_compile_definitions(omnitrace-rccl INTERFACE OMNITRACE_USE_RCCL) + find_package(RCCL-Headers ${rocprofsys_FIND_QUIETLY} REQUIRED) + target_link_libraries(rocprofsys-rccl INTERFACE roc::rccl-headers) + omnitrace_target_compile_definitions(rocprofsys-rccl INTERFACE OMNITRACE_USE_RCCL) endif() # ----------------------------------------------------------------------------------------# @@ -243,15 +243,15 @@ endif() set(_OMNITRACE_MPI_HEADERS_ALLOW_MPICH ${MPI_HEADERS_ALLOW_MPICH}) if(OMNITRACE_USE_MPI) - find_package(MPI ${omnitrace_FIND_QUIETLY} REQUIRED) - target_link_libraries(omnitrace-mpi INTERFACE MPI::MPI_C MPI::MPI_CXX) - omnitrace_target_compile_definitions(omnitrace-mpi INTERFACE TIMEMORY_USE_MPI=1 + find_package(MPI ${rocprofsys_FIND_QUIETLY} REQUIRED) + target_link_libraries(rocprofsys-mpi INTERFACE MPI::MPI_C MPI::MPI_CXX) + omnitrace_target_compile_definitions(rocprofsys-mpi INTERFACE TIMEMORY_USE_MPI=1 OMNITRACE_USE_MPI) elseif(OMNITRACE_USE_MPI_HEADERS) - find_package(MPI-Headers ${omnitrace_FIND_QUIETLY} REQUIRED) + find_package(MPI-Headers ${rocprofsys_FIND_QUIETLY} REQUIRED) omnitrace_target_compile_definitions( - omnitrace-mpi INTERFACE TIMEMORY_USE_MPI_HEADERS=1 OMNITRACE_USE_MPI_HEADERS) - target_link_libraries(omnitrace-mpi INTERFACE MPI::MPI_HEADERS) + rocprofsys-mpi INTERFACE TIMEMORY_USE_MPI_HEADERS=1 OMNITRACE_USE_MPI_HEADERS) + target_link_libraries(rocprofsys-mpi INTERFACE MPI::MPI_HEADERS) endif() # ----------------------------------------------------------------------------------------# @@ -261,7 +261,7 @@ endif() # ----------------------------------------------------------------------------------------# omnitrace_target_compile_definitions( - omnitrace-ompt INTERFACE OMNITRACE_USE_OMPT=$) + rocprofsys-ompt INTERFACE OMNITRACE_USE_OMPT=$) # ----------------------------------------------------------------------------------------# # @@ -271,10 +271,10 @@ omnitrace_target_compile_definitions( include(ElfUtils) -target_include_directories(omnitrace-elfutils SYSTEM INTERFACE ${ElfUtils_INCLUDE_DIRS}) -target_compile_definitions(omnitrace-elfutils INTERFACE ${ElfUtils_DEFINITIONS}) -target_link_directories(omnitrace-elfutils INTERFACE ${ElfUtils_LIBRARY_DIRS}) -target_link_libraries(omnitrace-elfutils INTERFACE ${ElfUtils_LIBRARIES}) +target_include_directories(rocprofsys-elfutils SYSTEM INTERFACE ${ElfUtils_INCLUDE_DIRS}) +target_compile_definitions(rocprofsys-elfutils INTERFACE ${ElfUtils_DEFINITIONS}) +target_link_directories(rocprofsys-elfutils INTERFACE ${ElfUtils_LIBRARY_DIRS}) +target_link_libraries(rocprofsys-elfutils INTERFACE ${ElfUtils_LIBRARIES}) # ----------------------------------------------------------------------------------------# # @@ -321,13 +321,13 @@ if(OMNITRACE_BUILD_DYNINST) CMAKE_BUILD_RPATH CMAKE_INSTALL_RPATH_USE_LINK_PATH) set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_INSTALL_RPATH_USE_LINK_PATH OFF) - set(CMAKE_BUILD_RPATH "\$ORIGIN:\$ORIGIN/omnitrace") - set(CMAKE_INSTALL_RPATH "\$ORIGIN:\$ORIGIN/omnitrace") + set(CMAKE_BUILD_RPATH "\$ORIGIN:\$ORIGIN/rocprofsys") + set(CMAKE_INSTALL_RPATH "\$ORIGIN:\$ORIGIN/rocprofsys") set(DYNINST_TPL_INSTALL_PREFIX - "omnitrace" + "rocprofsys" CACHE PATH "Third-party library install-tree install prefix" FORCE) set(DYNINST_TPL_INSTALL_LIB_DIR - "omnitrace" + "rocprofsys" CACHE PATH "Third-party library install-tree install library prefix" FORCE) add_subdirectory(external/dyninst EXCLUDE_FROM_ALL) omnitrace_restore_variables( @@ -354,35 +354,35 @@ if(OMNITRACE_BUILD_DYNINST) if(TARGET ${_LIB}) install( TARGETS ${_LIB} - DESTINATION ${CMAKE_INSTALL_LIBDIR}/omnitrace + DESTINATION ${CMAKE_INSTALL_LIBDIR}/rocprofsys COMPONENT dyninst - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/omnitrace/dyninst) + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocprofsys/dyninst) endif() endforeach() # for packaging install( DIRECTORY ${DYNINST_TPL_STAGING_PREFIX}/lib/ - DESTINATION ${CMAKE_INSTALL_LIBDIR}/omnitrace + DESTINATION ${CMAKE_INSTALL_LIBDIR}/rocprofsys COMPONENT dyninst FILES_MATCHING PATTERN "*${CMAKE_SHARED_LIBRARY_SUFFIX}*") - target_link_libraries(omnitrace-dyninst INTERFACE Dyninst::Dyninst) + target_link_libraries(rocprofsys-dyninst INTERFACE Dyninst::Dyninst) else() - find_package(Dyninst ${omnitrace_FIND_QUIETLY} REQUIRED + find_package(Dyninst ${rocprofsys_FIND_QUIETLY} REQUIRED COMPONENTS dyninstAPI parseAPI instructionAPI symtabAPI) if(TARGET Dyninst::Dyninst) # updated Dyninst CMake system was found - target_link_libraries(omnitrace-dyninst INTERFACE Dyninst::Dyninst) + target_link_libraries(rocprofsys-dyninst INTERFACE Dyninst::Dyninst) else() # updated Dyninst CMake system was not found set(_BOOST_COMPONENTS atomic system thread date_time) - set(omnitrace_BOOST_COMPONENTS + set(rocprofsys_BOOST_COMPONENTS "${_BOOST_COMPONENTS}" - CACHE STRING "Boost components used by Dyninst in omnitrace") + CACHE STRING "Boost components used by Dyninst in rocprofsys") set(Boost_NO_BOOST_CMAKE ON) - find_package(Boost QUIET REQUIRED COMPONENTS ${omnitrace_BOOST_COMPONENTS}) + find_package(Boost QUIET REQUIRED COMPONENTS ${rocprofsys_BOOST_COMPONENTS}) # some installs of dyninst don't set this properly if(EXISTS "${DYNINST_INCLUDE_DIR}" AND NOT DYNINST_HEADER_DIR) @@ -413,7 +413,7 @@ else() PATH_SUFFIXES include) endif() - target_link_libraries(omnitrace-dyninst INTERFACE ${DYNINST_LIBRARIES} + target_link_libraries(rocprofsys-dyninst INTERFACE ${DYNINST_LIBRARIES} ${Boost_LIBRARIES}) foreach( _TARG @@ -429,17 +429,17 @@ else() date_time TBB) if(TARGET Dyninst::${_TARG}) - target_link_libraries(omnitrace-dyninst INTERFACE Dyninst::${_TARG}) + target_link_libraries(rocprofsys-dyninst INTERFACE Dyninst::${_TARG}) elseif(TARGET Boost::${_TARG}) - target_link_libraries(omnitrace-dyninst INTERFACE Boost::${_TARG}) + target_link_libraries(rocprofsys-dyninst INTERFACE Boost::${_TARG}) elseif(TARGET ${_TARG}) - target_link_libraries(omnitrace-dyninst INTERFACE ${_TARG}) + target_link_libraries(rocprofsys-dyninst INTERFACE ${_TARG}) endif() endforeach() target_include_directories( - omnitrace-dyninst SYSTEM INTERFACE ${TBB_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} + rocprofsys-dyninst SYSTEM INTERFACE ${TBB_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${DYNINST_HEADER_DIR}) - omnitrace_target_compile_definitions(omnitrace-dyninst + omnitrace_target_compile_definitions(rocprofsys-dyninst INTERFACE OMNITRACE_USE_DYNINST) endif() endif() @@ -521,22 +521,22 @@ endif() # ----------------------------------------------------------------------------------------# target_compile_definitions( - omnitrace-timemory-config + rocprofsys-timemory-config INTERFACE TIMEMORY_PAPI_ARRAY_SIZE=12 TIMEMORY_USE_ROOFLINE=0 TIMEMORY_USE_ERT=0 TIMEMORY_USE_CONTAINERS=0 TIMEMORY_USE_ERT_EXTERN=0 TIMEMORY_USE_CONTAINERS_EXTERN=0) if(OMNITRACE_BUILD_STACK_PROTECTOR) - add_target_flag_if_avail(omnitrace-timemory-config "-fstack-protector-strong" + add_target_flag_if_avail(rocprofsys-timemory-config "-fstack-protector-strong" "-Wstack-protector") endif() if(OMNITRACE_BUILD_DEBUG) - add_target_flag_if_avail(omnitrace-timemory-config "-fno-omit-frame-pointer" "-g3") + add_target_flag_if_avail(rocprofsys-timemory-config "-fno-omit-frame-pointer" "-g3") endif() set(TIMEMORY_EXTERNAL_INTERFACE_LIBRARY - omnitrace-timemory-config + rocprofsys-timemory-config CACHE STRING "timemory configuration interface library") set(TIMEMORY_INSTALL_HEADERS OFF @@ -636,7 +636,7 @@ set(TIMEMORY_SETTINGS_PREFIX "OMNITRACE_" CACHE STRING "Prefix used for settings and environment variables") set(TIMEMORY_PROJECT_NAME - "omnitrace" + "rocprofsys" CACHE STRING "Name for configuration") set(TIMEMORY_CXX_LIBRARY_EXCLUDE "kokkosp.cpp;pthread.cpp;timemory_c.cpp;trace.cpp;weak.cpp;library.cpp" @@ -673,12 +673,12 @@ add_subdirectory(external/timemory EXCLUDE_FROM_ALL) install( TARGETS gotcha - DESTINATION ${CMAKE_INSTALL_LIBDIR}/omnitrace + DESTINATION ${CMAKE_INSTALL_LIBDIR}/rocprofsys COMPONENT gotcha) if(OMNITRACE_BUILD_LIBUNWIND) install( DIRECTORY ${PROJECT_BINARY_DIR}/external/timemory/external/libunwind/install/lib/ - DESTINATION ${CMAKE_INSTALL_LIBDIR}/omnitrace + DESTINATION ${CMAKE_INSTALL_LIBDIR}/rocprofsys COMPONENT libunwind FILES_MATCHING PATTERN "*${CMAKE_SHARED_LIBRARY_SUFFIX}*") @@ -688,30 +688,30 @@ omnitrace_restore_variables( BUILD_CONFIG VARIABLES BUILD_SHARED_LIBS BUILD_STATIC_LIBS CMAKE_POSITION_INDEPENDENT_CODE CMAKE_PREFIX_PATH) -if(TARGET omnitrace-papi-build) +if(TARGET rocprofsys-papi-build) foreach(_TARGET PAPI::papi timemory-core timemory-common timemory-papi-component timemory-cxx) if(TARGET "${_TARGET}") - add_dependencies(${_TARGET} omnitrace-papi-build) + add_dependencies(${_TARGET} rocprofsys-papi-build) endif() foreach(_LINK shared static) if(TARGET "${_TARGET}-${_LINK}") - add_dependencies(${_TARGET}-${_LINK} omnitrace-papi-build) + add_dependencies(${_TARGET}-${_LINK} rocprofsys-papi-build) endif() endforeach() endforeach() endif() target_link_libraries( - omnitrace-timemory + rocprofsys-timemory INTERFACE $ $ $) -target_link_libraries(omnitrace-bfd INTERFACE $) +target_link_libraries(rocprofsys-bfd INTERFACE $) if(OMNITRACE_USE_BFD) - omnitrace_target_compile_definitions(omnitrace-bfd INTERFACE OMNITRACE_USE_BFD) + omnitrace_target_compile_definitions(rocprofsys-bfd INTERFACE OMNITRACE_USE_BFD) endif() # ----------------------------------------------------------------------------------------# @@ -758,10 +758,10 @@ if(NOT TARGET PTL::ptl-shared) CMAKE_VISIBILITY_INLINES_HIDDEN) endif() -target_sources(omnitrace-ptl +target_sources(rocprofsys-ptl INTERFACE $>) target_include_directories( - omnitrace-ptl INTERFACE $ + rocprofsys-ptl INTERFACE $ $) # ----------------------------------------------------------------------------------------# @@ -913,10 +913,10 @@ set(CMAKE_INSTALL_PYTHONDIR ${OMNITRACE_INSTALL_PYTHONDIR}) # ----------------------------------------------------------------------------------------# if("${CMAKE_BUILD_TYPE}" MATCHES "Release" AND NOT OMNITRACE_BUILD_DEBUG) - add_target_flag_if_avail(omnitrace-compile-options "-g1") + add_target_flag_if_avail(rocprofsys-compile-options "-g1") endif() -target_compile_definitions(omnitrace-compile-definitions +target_compile_definitions(rocprofsys-compile-definitions INTERFACE OMNITRACE_MAX_THREADS=${OMNITRACE_MAX_THREADS}) foreach(_LIB ${OMNITRACE_EXTENSION_LIBRARIES}) @@ -924,7 +924,7 @@ foreach(_LIB ${OMNITRACE_EXTENSION_LIBRARIES}) if(_COMPILE_DEFS) foreach(_DEF ${_COMPILE_DEFS}) if("${_DEF}" MATCHES "OMNITRACE_") - target_compile_definitions(omnitrace-compile-definitions + target_compile_definitions(rocprofsys-compile-definitions INTERFACE ${_DEF}) endif() endforeach() diff --git a/cmake/Perfetto.cmake b/cmake/Perfetto.cmake index aa1f11f25..fe5849f73 100644 --- a/cmake/Perfetto.cmake +++ b/cmake/Perfetto.cmake @@ -1,7 +1,7 @@ # ====================================================================================== # Perfetto.cmake # -# Configure perfetto for omnitrace +# Configure perfetto for rocprofsys # # ====================================================================================== @@ -143,7 +143,7 @@ if(OMNITRACE_INSTALL_PERFETTO_TOOLS) endif() externalproject_add( - omnitrace-perfetto-build + rocprofsys-perfetto-build PREFIX ${PROJECT_BINARY_DIR}/external/perfetto SOURCE_DIR ${OMNITRACE_PERFETTO_SOURCE_DIR} BUILD_IN_SOURCE 1 @@ -156,25 +156,25 @@ if(OMNITRACE_INSTALL_PERFETTO_TOOLS) BUILD_BYPRODUCTS ${OMNITRACE_PERFETTO_BINARY_DIR}/args.gn) add_custom_target( - omnitrace-perfetto-clean + rocprofsys-perfetto-clean COMMAND ${OMNITRACE_NINJA_EXECUTABLE} -t clean COMMAND ${CMAKE_COMMAND} -E rm -rf - ${PROJECT_BINARY_DIR}/external/perfetto/src/omnitrace-perfetto-build-stamp + ${PROJECT_BINARY_DIR}/external/perfetto/src/rocprofsys-perfetto-build-stamp WORKING_DIRECTORY ${OMNITRACE_PERFETTO_BINARY_DIR} COMMENT "Cleaning Perfetto...") install( DIRECTORY ${OMNITRACE_PERFETTO_INSTALL_DIR}/ - DESTINATION ${CMAKE_INSTALL_LIBDIR}/omnitrace + DESTINATION ${CMAKE_INSTALL_LIBDIR}/rocprofsys 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}") + string(REPLACE "_" "-" _INSTALL_FILE "rocprofsys-${_FILE}") else() - string(REPLACE "_" "-" _INSTALL_FILE "omnitrace-perfetto-${_FILE}") + string(REPLACE "_" "-" _INSTALL_FILE "rocprofsys-perfetto-${_FILE}") endif() install( PROGRAMS ${OMNITRACE_PERFETTO_INSTALL_DIR}/${_FILE} @@ -191,17 +191,17 @@ endif() # # ---------------------------------------------------------------------------------------# -add_library(omnitrace-perfetto-library STATIC) -add_library(omnitrace::omnitrace-perfetto-library ALIAS omnitrace-perfetto-library) +add_library(rocprofsys-perfetto-library STATIC) +add_library(rocprofsys::rocprofsys-perfetto-library ALIAS rocprofsys-perfetto-library) target_sources( - omnitrace-perfetto-library PRIVATE ${OMNITRACE_PERFETTO_SOURCE_DIR}/sdk/perfetto.cc + rocprofsys-perfetto-library PRIVATE ${OMNITRACE_PERFETTO_SOURCE_DIR}/sdk/perfetto.cc ${OMNITRACE_PERFETTO_SOURCE_DIR}/sdk/perfetto.h) target_link_libraries( - omnitrace-perfetto-library - PRIVATE omnitrace::omnitrace-threading omnitrace::omnitrace-static-libgcc - omnitrace::omnitrace-static-libstdcxx) + rocprofsys-perfetto-library + PRIVATE rocprofsys::rocprofsys-threading rocprofsys::rocprofsys-static-libgcc + rocprofsys::rocprofsys-static-libstdcxx) set_target_properties( - omnitrace-perfetto-library + rocprofsys-perfetto-library PROPERTIES OUTPUT_NAME perfetto ARCHIVE_OUTPUT_DIRECTORY ${OMNITRACE_PERFETTO_BINARY_DIR} POSITION_INDEPENDENT_CODE ON @@ -228,9 +228,9 @@ mark_as_advanced(PERFETTO_LIBRARY) # # ---------------------------------------------------------------------------------------# -omnitrace_target_compile_definitions(omnitrace-perfetto INTERFACE OMNITRACE_USE_PERFETTO) -target_include_directories(omnitrace-perfetto SYSTEM +omnitrace_target_compile_definitions(rocprofsys-perfetto INTERFACE OMNITRACE_USE_PERFETTO) +target_include_directories(rocprofsys-perfetto SYSTEM INTERFACE $) target_link_libraries( - omnitrace-perfetto INTERFACE $ - $) + rocprofsys-perfetto INTERFACE $ + $) diff --git a/cmake/Templates/args.gn.in b/cmake/Templates/args.gn.in index 860a10a84..ebd5e1d6d 100644 --- a/cmake/Templates/args.gn.in +++ b/cmake/Templates/args.gn.in @@ -25,4 +25,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:\\\$ORIGIN/../lib/omnitrace" +extra_ldflags = "@OMNITRACE_PERFETTO_LINK_FLAGS@ -Wl,-rpath=\\\$ORIGIN:\\\$ORIGIN/../lib:\\\$ORIGIN/../lib/rocprofsys" diff --git a/cmake/Templates/modulefile.in b/cmake/Templates/modulefile.in index 5f138333d..1bb87fd1d 100644 --- a/cmake/Templates/modulefile.in +++ b/cmake/Templates/modulefile.in @@ -15,6 +15,6 @@ prepend-path LD_LIBRARY_PATH "${ROOT}/@CMAKE_INSTALL_LIBDIR@" prepend-path PYTHONPATH "${ROOT}/@CMAKE_INSTALL_PYTHONDIR@" setenv @PROJECT_NAME@_DIR "${ROOT}/@CMAKE_INSTALL_DATAROOTDIR@/cmake/@PROJECT_NAME@" -# @OMNITRACE_HSA_ENV@setenv HSA_TOOLS_LIB "${ROOT}/@CMAKE_INSTALL_LIBDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@omnitrace@CMAKE_SHARED_LIBRARY_SUFFIX@" +# @OMNITRACE_HSA_ENV@setenv HSA_TOOLS_LIB "${ROOT}/@CMAKE_INSTALL_LIBDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@rocprofsys@CMAKE_SHARED_LIBRARY_SUFFIX@" # @OMNITRACE_HSA_ENV@setenv HSA_TOOLS_REPORT_LOAD_FAILURE 1 -# @OMNITRACE_ROCP_ENV@setenv ROCP_TOOL_LIB "${ROOT}/@CMAKE_INSTALL_LIBDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@omnitrace@CMAKE_SHARED_LIBRARY_SUFFIX@" +# @OMNITRACE_ROCP_ENV@setenv ROCP_TOOL_LIB "${ROOT}/@CMAKE_INSTALL_LIBDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@rocprofsys@CMAKE_SHARED_LIBRARY_SUFFIX@" diff --git a/cmake/Templates/omnitrace-config.cmake.in b/cmake/Templates/rocprofsys-config.cmake.in similarity index 100% rename from cmake/Templates/omnitrace-config.cmake.in rename to cmake/Templates/rocprofsys-config.cmake.in diff --git a/cmake/Templates/omnitrace-install.py.in b/cmake/Templates/rocprofsys-install.py.in similarity index 100% rename from cmake/Templates/omnitrace-install.py.in rename to cmake/Templates/rocprofsys-install.py.in diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 8c8451e30..65aa207fd 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -project(omnitrace-examples LANGUAGES C CXX) +project(rocprofsys-examples LANGUAGES C CXX) if("${CMAKE_BUILD_TYPE}" STREQUAL "") set(CMAKE_BUILD_TYPE @@ -23,13 +23,13 @@ endif() option(BUILD_SHARED_LIBS "Build dynamic libraries" ON) -if(CMAKE_PROJECT_NAME STREQUAL "omnitrace") +if(CMAKE_PROJECT_NAME STREQUAL "rocprofsys") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}) - omnitrace_add_option(OMNITRACE_INSTALL_EXAMPLES "Install omnitrace examples" OFF) + omnitrace_add_option(OMNITRACE_INSTALL_EXAMPLES "Install rocprofsys examples" OFF) else() - option(OMNITRACE_INSTALL_EXAMPLES "Install omnitrace examples" ON) + option(OMNITRACE_INSTALL_EXAMPLES "Install rocprofsys examples" ON) endif() if(OMNITRACE_INSTALL_EXAMPLES) diff --git a/examples/causal-helpers.cmake b/examples/causal-helpers.cmake index 342d1aa63..f72d6d333 100644 --- a/examples/causal-helpers.cmake +++ b/examples/causal-helpers.cmake @@ -3,8 +3,8 @@ # include_guard(DIRECTORY) -if(NOT TARGET omnitrace::omnitrace-user-library) - find_package(omnitrace REQUIRED COMPONENTS user) +if(NOT TARGET rocprofsys::rocprofsys-user-library) + find_package(rocprofsys REQUIRED COMPONENTS user) endif() if(NOT coz-profiler_FOUND) @@ -40,7 +40,7 @@ function(omnitrace_causal_example_executable _NAME) target_include_directories(${_NAME} PRIVATE ${OMNITRACE_EXAMPLE_ROOT_DIR}/causal ${CAUSAL_INCLUDE_DIRECTORIES}) target_link_libraries( - ${_NAME} PRIVATE ${CAUSAL_LINK_LIBRARIES} omnitrace::omnitrace-user-library + ${_NAME} PRIVATE ${CAUSAL_LINK_LIBRARIES} rocprofsys::rocprofsys-user-library omni-causal-example-lib-debug) add_executable(${_NAME}-omni ${CAUSAL_SOURCES}) @@ -49,7 +49,7 @@ function(omnitrace_causal_example_executable _NAME) target_include_directories(${_NAME}-omni PRIVATE ${OMNITRACE_EXAMPLE_ROOT_DIR}/causal ${CAUSAL_INCLUDE_DIRECTORIES}) target_link_libraries( - ${_NAME}-omni PRIVATE ${CAUSAL_LINK_LIBRARIES} omnitrace::omnitrace-user-library + ${_NAME}-omni PRIVATE ${CAUSAL_LINK_LIBRARIES} rocprofsys::rocprofsys-user-library omni-causal-example-lib-debug) add_executable(${_NAME}-ndebug ${CAUSAL_SOURCES}) @@ -60,7 +60,7 @@ function(omnitrace_causal_example_executable _NAME) ${CAUSAL_INCLUDE_DIRECTORIES}) target_link_libraries( ${_NAME}-ndebug - PRIVATE ${CAUSAL_LINK_LIBRARIES} omnitrace::omnitrace-user-library + PRIVATE ${CAUSAL_LINK_LIBRARIES} rocprofsys::rocprofsys-user-library omni-causal-example-lib-no-debug) add_executable(${_NAME}-omni-ndebug ${CAUSAL_SOURCES}) @@ -71,7 +71,7 @@ function(omnitrace_causal_example_executable _NAME) ${CAUSAL_INCLUDE_DIRECTORIES}) target_link_libraries( ${_NAME}-omni-ndebug - PRIVATE ${CAUSAL_LINK_LIBRARIES} omnitrace::omnitrace-user-library + PRIVATE ${CAUSAL_LINK_LIBRARIES} rocprofsys::rocprofsys-user-library omni-causal-example-lib-no-debug) add_dependencies(omni-causal-examples ${_NAME} ${_NAME}-omni ${_NAME}-ndebug @@ -98,7 +98,7 @@ function(omnitrace_causal_example_executable _NAME) install( TARGETS ${_NAME} ${_NAME}-omni ${_NAME}-coz DESTINATION bin - COMPONENT omnitrace-examples + COMPONENT rocprofsys-examples OPTIONAL) endif() endfunction() diff --git a/examples/causal/CMakeLists.txt b/examples/causal/CMakeLists.txt index a3bba08bf..e0fc98f0f 100644 --- a/examples/causal/CMakeLists.txt +++ b/examples/causal/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -project(omnitrace-causal-example LANGUAGES CXX) +project(rocprofsys-causal-example LANGUAGES CXX) if(OMNITRACE_DISABLE_EXAMPLES) get_filename_component(_DIR ${CMAKE_CURRENT_LIST_DIR} NAME) @@ -13,8 +13,8 @@ endif() set(CMAKE_BUILD_TYPE "Release") find_package(Threads REQUIRED) -if(NOT TARGET omnitrace::omnitrace-user-library) - find_package(omnitrace REQUIRED COMPONENTS user) +if(NOT TARGET rocprofsys::rocprofsys-user-library) + find_package(rocprofsys REQUIRED COMPONENTS user) endif() add_library(causal-interface-library INTERFACE) diff --git a/examples/code-coverage/CMakeLists.txt b/examples/code-coverage/CMakeLists.txt index 94a265a9b..25229f10b 100644 --- a/examples/code-coverage/CMakeLists.txt +++ b/examples/code-coverage/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.15 FATAL_ERROR) -project(omnitrace-code-coverage-example LANGUAGES CXX) +project(rocprofsys-code-coverage-example LANGUAGES CXX) if(OMNITRACE_DISABLE_EXAMPLES) get_filename_component(_DIR ${CMAKE_CURRENT_LIST_DIR} NAME) @@ -23,7 +23,7 @@ if(OMNITRACE_INSTALL_EXAMPLES) install( TARGETS code-coverage DESTINATION bin - COMPONENT omnitrace-examples) + COMPONENT rocprofsys-examples) endif() set(PYTHON_FILES code-coverage.py) @@ -41,7 +41,7 @@ if(Python3_FOUND) install( PROGRAMS ${PROJECT_BINARY_DIR}/${_FILE} DESTINATION bin - COMPONENT omnitrace-examples) + COMPONENT rocprofsys-examples) endif() endforeach() endif() diff --git a/examples/fork/CMakeLists.txt b/examples/fork/CMakeLists.txt index 909b18bbb..02a0686d3 100644 --- a/examples/fork/CMakeLists.txt +++ b/examples/fork/CMakeLists.txt @@ -1,19 +1,19 @@ cmake_minimum_required(VERSION 3.15 FATAL_ERROR) -project(omnitrace-fork LANGUAGES CXX) +project(rocprofsys-fork LANGUAGES CXX) set(CMAKE_BUILD_TYPE "RelWithDebInfo") string(REPLACE " " ";" _FLAGS "${CMAKE_CXX_FLAGS_DEBUG}") find_package(Threads REQUIRED) -find_package(omnitrace REQUIRED COMPONENTS user) +find_package(rocprofsys REQUIRED COMPONENTS user) add_executable(fork-example fork.cpp) -target_link_libraries(fork-example PRIVATE Threads::Threads omnitrace::omnitrace) +target_link_libraries(fork-example PRIVATE Threads::Threads rocprofsys::rocprofsys) target_compile_options(fork-example PRIVATE ${_FLAGS}) if(OMNITRACE_INSTALL_EXAMPLES) install( TARGETS fork-example DESTINATION bin - COMPONENT omnitrace-examples) + COMPONENT rocprofsys-examples) endif() diff --git a/examples/lulesh/CMakeLists.txt b/examples/lulesh/CMakeLists.txt index 8dd45dd28..bcd36a1ff 100644 --- a/examples/lulesh/CMakeLists.txt +++ b/examples/lulesh/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -project(omnitrace-lulesh-example LANGUAGES C CXX) +project(rocprofsys-lulesh-example LANGUAGES C CXX) if(OMNITRACE_DISABLE_EXAMPLES) get_filename_component(_DIR ${CMAKE_CURRENT_LIST_DIR} NAME) @@ -76,7 +76,7 @@ if(OMNITRACE_INSTALL_EXAMPLES) install( TARGETS kokkoscore kokkoscontainers DESTINATION ${CMAKE_INSTALL_LIBDIR} - COMPONENT omnitrace-examples) + COMPONENT rocprofsys-examples) set_target_properties(lulesh PROPERTIES INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}") endif() diff --git a/examples/mpi/CMakeLists.txt b/examples/mpi/CMakeLists.txt index 4c9452928..5fb9ca540 100644 --- a/examples/mpi/CMakeLists.txt +++ b/examples/mpi/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -project(omnitrace-mpi-examples LANGUAGES C CXX) +project(rocprofsys-mpi-examples LANGUAGES C CXX) if(OMNITRACE_DISABLE_EXAMPLES) get_filename_component(_DIR ${CMAKE_CURRENT_LIST_DIR} NAME) @@ -13,12 +13,12 @@ endif() find_package(MPI) if(NOT MPI_FOUND) - if("${CMAKE_PROJECT_NAME}" STREQUAL "omnitrace" AND "$ENV{OMNITRACE_CI}") + if("${CMAKE_PROJECT_NAME}" STREQUAL "rocprofsys" AND "$ENV{OMNITRACE_CI}") set(_MSG_TYPE STATUS) # don't generate warnings during CI else() set(_MSG_TYPE AUTHOR_WARNING) endif() - message(${_MSG_TYPE} "MPI could not be found. Cannot build omnitrace-mpi target") + message(${_MSG_TYPE} "MPI could not be found. Cannot build rocprofsys-mpi target") return() endif() @@ -30,7 +30,7 @@ add_library(mpi-c-interface-library INTERFACE) target_link_libraries( mpi-c-interface-library INTERFACE Threads::Threads MPI::MPI_C - $) + $) target_compile_options(mpi-c-interface-library INTERFACE -Wno-double-promotion) add_executable(mpi-allgather allgather.c) @@ -60,7 +60,7 @@ add_library(mpi-cxx-interface-library INTERFACE) target_link_libraries( mpi-cxx-interface-library INTERFACE Threads::Threads MPI::MPI_CXX - $) + $) add_executable(mpi-example mpi.cpp) target_link_libraries(mpi-example PRIVATE mpi-cxx-interface-library) @@ -70,5 +70,5 @@ if(OMNITRACE_INSTALL_EXAMPLES) TARGETS mpi-example mpi-allgather mpi-bcast mpi-all2all mpi-reduce mpi-scatter-gather mpi-send-recv DESTINATION bin - COMPONENT omnitrace-examples) + COMPONENT rocprofsys-examples) endif() diff --git a/examples/openmp/CMakeLists.txt b/examples/openmp/CMakeLists.txt index f63893aba..0f91f9ad0 100644 --- a/examples/openmp/CMakeLists.txt +++ b/examples/openmp/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -project(omnitrace-openmp LANGUAGES CXX) +project(rocprofsys-openmp LANGUAGES CXX) file(GLOB common_source ${CMAKE_CURRENT_SOURCE_DIR}/common/*.cpp) add_library(openmp-common OBJECT ${common_source}) @@ -17,7 +17,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") target_link_libraries(openmp-common PUBLIC OpenMP::OpenMP_CXX) set(OMNITRACE_OPENMP_USING_LIBOMP_LIBRARY ON - CACHE INTERNAL "Used by omnitrace testing" FORCE) + CACHE INTERNAL "Used by rocprofsys testing" FORCE) else() find_program(CLANGXX_EXECUTABLE NAMES clang++) find_library( @@ -34,13 +34,13 @@ else() omnitrace_custom_compilation(COMPILER ${CLANGXX_EXECUTABLE} TARGET openmp-lu) set(OMNITRACE_OPENMP_USING_LIBOMP_LIBRARY ON - CACHE INTERNAL "Used by omnitrace testing" FORCE) + CACHE INTERNAL "Used by rocprofsys testing" FORCE) else() find_package(OpenMP REQUIRED) target_link_libraries(openmp-common PUBLIC OpenMP::OpenMP_CXX) set(OMNITRACE_OPENMP_USING_LIBOMP_LIBRARY OFF - CACHE INTERNAL "Used by omnitrace testing" FORCE) + CACHE INTERNAL "Used by rocprofsys testing" FORCE) endif() endif() @@ -51,5 +51,5 @@ if(OMNITRACE_INSTALL_EXAMPLES) install( TARGETS openmp-cg openmp-lu DESTINATION bin - COMPONENT omnitrace-examples) + COMPONENT rocprofsys-examples) endif() diff --git a/examples/parallel-overhead/CMakeLists.txt b/examples/parallel-overhead/CMakeLists.txt index 1458e138a..9789a2d19 100644 --- a/examples/parallel-overhead/CMakeLists.txt +++ b/examples/parallel-overhead/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -project(omnitrace-parallel-overhead-example LANGUAGES CXX) +project(rocprofsys-parallel-overhead-example LANGUAGES CXX) if(OMNITRACE_DISABLE_EXAMPLES) get_filename_component(_DIR ${CMAKE_CURRENT_LIST_DIR} NAME) @@ -30,5 +30,5 @@ if(OMNITRACE_INSTALL_EXAMPLES) install( TARGETS parallel-overhead parallel-overhead-locks DESTINATION bin - COMPONENT omnitrace-examples) + COMPONENT rocprofsys-examples) endif() diff --git a/examples/python/CMakeLists.txt b/examples/python/CMakeLists.txt index 9f810ed3c..1e6271462 100644 --- a/examples/python/CMakeLists.txt +++ b/examples/python/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -project(omnitrace-python) +project(rocprofsys-python) if(OMNITRACE_DISABLE_EXAMPLES) get_filename_component(_DIR ${CMAKE_CURRENT_LIST_DIR} NAME) @@ -26,7 +26,7 @@ if(Python3_FOUND) install( PROGRAMS ${PROJECT_BINARY_DIR}/${_FILE} DESTINATION bin - COMPONENT omnitrace-examples) + COMPONENT rocprofsys-examples) endif() endforeach() endif() diff --git a/examples/rccl/CMakeLists.txt b/examples/rccl/CMakeLists.txt index 4b0d860d7..c42fa489e 100644 --- a/examples/rccl/CMakeLists.txt +++ b/examples/rccl/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -project(omnitrace-rccl-example LANGUAGES CXX) +project(rocprofsys-rccl-example LANGUAGES CXX) if(OMNITRACE_DISABLE_EXAMPLES) get_filename_component(_DIR ${CMAKE_CURRENT_LIST_DIR} NAME) @@ -12,12 +12,12 @@ if(OMNITRACE_DISABLE_EXAMPLES) endif() function(rccl_message _MSG_TYPE) - if("${CMAKE_PROJECT_NAME}" STREQUAL "omnitrace" + if("${CMAKE_PROJECT_NAME}" STREQUAL "rocprofsys" AND "$ENV{OMNITRACE_CI}" AND "${_MSG_TYPE}" MATCHES "WARNING") set(_MSG_TYPE STATUS) # don't generate warnings during CI endif() - if("${CMAKE_PROJECT_NAME}" STREQUAL "omnitrace") + if("${CMAKE_PROJECT_NAME}" STREQUAL "rocprofsys") omnitrace_message(${_MSG_TYPE} ${ARGN}) else() message(${_MSG_TYPE} ${ARGN}) @@ -31,7 +31,7 @@ if(NOT hip_FOUND) return() endif() -if("${CMAKE_PROJECT_NAME}" STREQUAL "omnitrace" +if("${CMAKE_PROJECT_NAME}" STREQUAL "rocprofsys" AND ("$ENV{OMNITRACE_CI}" OR OMNITRACE_CI OR OMNITRACE_BUILD_CI)) @@ -48,7 +48,7 @@ endif() if(hip_FOUND AND rccl_FOUND) include(FetchContent) fetchcontent_declare( - rccl-tests GIT_REPOSITORY https://github.com/ROCmSoftwarePlatform/rccl-tests.git) + rccl-tests GIT_REPOSITORY https://github.com/ROCm/rccl-tests.git) # After the following call, the CMake targets defined by googletest and Catch2 will be # available to the rest of the build diff --git a/examples/rewrite-caller/CMakeLists.txt b/examples/rewrite-caller/CMakeLists.txt index 75f60d922..40857483a 100644 --- a/examples/rewrite-caller/CMakeLists.txt +++ b/examples/rewrite-caller/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.15 FATAL_ERROR) -project(omnitrace-rewrite-caller-example LANGUAGES CXX) +project(rocprofsys-rewrite-caller-example LANGUAGES CXX) if(OMNITRACE_DISABLE_EXAMPLES) get_filename_component(_DIR ${CMAKE_CURRENT_LIST_DIR} NAME) @@ -20,5 +20,5 @@ if(OMNITRACE_INSTALL_EXAMPLES) install( TARGETS rewrite-caller DESTINATION bin - COMPONENT omnitrace-examples) + COMPONENT rocprofsys-examples) endif() diff --git a/examples/trace-time-window/CMakeLists.txt b/examples/trace-time-window/CMakeLists.txt index fe68dc16f..b066e64bf 100644 --- a/examples/trace-time-window/CMakeLists.txt +++ b/examples/trace-time-window/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.15 FATAL_ERROR) -project(omnitrace-trace-time-window-example LANGUAGES CXX) +project(rocprofsys-trace-time-window-example LANGUAGES CXX) if(OMNITRACE_DISABLE_EXAMPLES) get_filename_component(_DIR ${CMAKE_CURRENT_LIST_DIR} NAME) @@ -20,5 +20,5 @@ if(OMNITRACE_INSTALL_EXAMPLES) install( TARGETS trace-time-window DESTINATION bin - COMPONENT omnitrace-examples) + COMPONENT rocprofsys-examples) endif() diff --git a/examples/transpose/CMakeLists.txt b/examples/transpose/CMakeLists.txt index 25792c923..83c65ec0a 100644 --- a/examples/transpose/CMakeLists.txt +++ b/examples/transpose/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -project(omnitrace-transpose-example LANGUAGES CXX) +project(rocprofsys-transpose-example LANGUAGES CXX) if(OMNITRACE_DISABLE_EXAMPLES) get_filename_component(_DIR ${CMAKE_CURRENT_LIST_DIR} NAME) @@ -56,7 +56,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT HIPCC_EXECUTABLE) target_link_libraries( transpose - PRIVATE $ + PRIVATE $ $ $) else() target_compile_options(transpose PRIVATE -W -Wall) @@ -80,5 +80,5 @@ if(OMNITRACE_INSTALL_EXAMPLES) install( TARGETS transpose DESTINATION bin - COMPONENT omnitrace-examples) + COMPONENT rocprofsys-examples) endif() diff --git a/examples/user-api/CMakeLists.txt b/examples/user-api/CMakeLists.txt index 754e08eb0..cee7ca771 100644 --- a/examples/user-api/CMakeLists.txt +++ b/examples/user-api/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -project(omnitrace-user-api-example LANGUAGES CXX) +project(rocprofsys-user-api-example LANGUAGES CXX) if(OMNITRACE_DISABLE_EXAMPLES) get_filename_component(_DIR ${CMAKE_CURRENT_LIST_DIR} NAME) @@ -13,15 +13,15 @@ endif() set(CMAKE_BUILD_TYPE "Debug") find_package(Threads REQUIRED) -if(NOT TARGET omnitrace::omnitrace-user-library) - find_package(omnitrace REQUIRED COMPONENTS user) +if(NOT TARGET rocprofsys::rocprofsys-user-library) + find_package(rocprofsys REQUIRED COMPONENTS user) endif() add_executable(user-api user-api.cpp) -target_link_libraries(user-api PRIVATE Threads::Threads omnitrace::omnitrace-user-library) +target_link_libraries(user-api PRIVATE Threads::Threads rocprofsys::rocprofsys-user-library) if(OMNITRACE_INSTALL_EXAMPLES) install( TARGETS user-api DESTINATION bin - COMPONENT omnitrace-examples) + COMPONENT rocprofsys-examples) endif() diff --git a/scripts/write-omnitrace-install.cmake b/scripts/write-omnitrace-install.cmake index d823c5700..a9e341bda 100644 --- a/scripts/write-omnitrace-install.cmake +++ b/scripts/write-omnitrace-install.cmake @@ -13,7 +13,7 @@ endif() message( STATUS - "Writing ${OUTPUT_DIR}/omnitrace-install.py for omnitrace v${OMNITRACE_VERSION}") + "Writing ${OUTPUT_DIR}/rocprofsys-install.py for rocprofsys v${OMNITRACE_VERSION}") -configure_file(${CMAKE_CURRENT_LIST_DIR}/../cmake/Templates/omnitrace-install.py.in - ${OUTPUT_DIR}/omnitrace-install.py @ONLY) +configure_file(${CMAKE_CURRENT_LIST_DIR}/../cmake/Templates/rocprofsys-install.py.in + ${OUTPUT_DIR}/rocprofsys-install.py @ONLY) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index b93a14d8c..40d83aaa7 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -18,11 +18,11 @@ if(OMNITRACE_USE_PYTHON) endif() if(OMNITRACE_BUILD_DEVELOPER) - add_custom_target(omnitrace-precommit) - foreach(_TARGET format-omnitrace-source format-omnitrace-cmake format-timemory-source + add_custom_target(rocprofsys-precommit) + foreach(_TARGET format-rocprofsys-source format-rocprofsys-cmake format-timemory-source format-timemory-cmake) if(TARGET ${_TARGET}) - add_dependencies(omnitrace-precommit ${_TARGET}) + add_dependencies(rocprofsys-precommit ${_TARGET}) endif() endforeach() endif() diff --git a/source/bin/CMakeLists.txt b/source/bin/CMakeLists.txt index fa8306f06..55a3fa695 100644 --- a/source/bin/CMakeLists.txt +++ b/source/bin/CMakeLists.txt @@ -5,11 +5,11 @@ if(OMNITRACE_USE_ROCPROFILER AND ROCmVersion_TRIPLE_VERSION VERSION_LESS 5.2.0 AND NOT CMAKE_INSTALL_RPATH_USE_LINK_PATH) set(OMNITRACE_EXE_INSTALL_RPATH - "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}/omnitrace:${rocprofiler_LIBRARY_DIR}" + "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}/rocprofsys:${rocprofiler_LIBRARY_DIR}" ) else() set(OMNITRACE_EXE_INSTALL_RPATH - "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}/omnitrace" + "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}/rocprofsys" ) endif() diff --git a/source/bin/omnitrace-avail/CMakeLists.txt b/source/bin/omnitrace-avail/CMakeLists.txt index bc4d5eeb8..70f013b1f 100644 --- a/source/bin/omnitrace-avail/CMakeLists.txt +++ b/source/bin/omnitrace-avail/CMakeLists.txt @@ -1,13 +1,13 @@ # ------------------------------------------------------------------------------# # -# omnitrace-avail target +# rocprofsys-avail target # # ------------------------------------------------------------------------------# -add_executable(omnitrace-avail) +add_executable(rocprofsys-avail) target_sources( - omnitrace-avail + rocprofsys-avail PRIVATE ${CMAKE_CURRENT_LIST_DIR}/avail.cpp ${CMAKE_CURRENT_LIST_DIR}/avail.hpp ${CMAKE_CURRENT_LIST_DIR}/common.cpp @@ -22,21 +22,21 @@ target_sources( ${CMAKE_CURRENT_LIST_DIR}/info_type.cpp ${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_include_directories(rocprofsys-avail PRIVATE ${CMAKE_CURRENT_LIST_DIR}) +target_compile_definitions(rocprofsys-avail PRIVATE OMNITRACE_EXTERN_COMPONENTS=0) target_link_libraries( - omnitrace-avail - PRIVATE omnitrace::omnitrace-compile-definitions - omnitrace::omnitrace-interface-library omnitrace::libomnitrace-static) + rocprofsys-avail + PRIVATE rocprofsys::rocprofsys-compile-definitions + rocprofsys::rocprofsys-interface-library rocprofsys::librocprofsys-static) set_target_properties( - omnitrace-avail + rocprofsys-avail PROPERTIES BUILD_RPATH "\$ORIGIN:\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}" INSTALL_RPATH "${OMNITRACE_EXE_INSTALL_RPATH}" OUTPUT_NAME rocprof-sys-avail) -omnitrace_strip_target(omnitrace-avail) +omnitrace_strip_target(rocprofsys-avail) install( - TARGETS omnitrace-avail + TARGETS rocprofsys-avail DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL) diff --git a/source/bin/omnitrace-causal/CMakeLists.txt b/source/bin/omnitrace-causal/CMakeLists.txt index 6714158f7..9a722f6b2 100644 --- a/source/bin/omnitrace-causal/CMakeLists.txt +++ b/source/bin/omnitrace-causal/CMakeLists.txt @@ -1,28 +1,28 @@ # ------------------------------------------------------------------------------# # -# omnitrace-causal target +# rocprofsys-causal target # # ------------------------------------------------------------------------------# add_executable( - omnitrace-causal + rocprofsys-causal ${CMAKE_CURRENT_LIST_DIR}/omnitrace-causal.cpp ${CMAKE_CURRENT_LIST_DIR}/omnitrace-causal.hpp ${CMAKE_CURRENT_LIST_DIR}/impl.cpp) -target_compile_definitions(omnitrace-causal PRIVATE TIMEMORY_CMAKE=1) -target_include_directories(omnitrace-causal PRIVATE ${CMAKE_CURRENT_LIST_DIR}) +target_compile_definitions(rocprofsys-causal PRIVATE TIMEMORY_CMAKE=1) +target_include_directories(rocprofsys-causal PRIVATE ${CMAKE_CURRENT_LIST_DIR}) target_link_libraries( - omnitrace-causal - PRIVATE omnitrace::omnitrace-compile-definitions omnitrace::omnitrace-headers - omnitrace::omnitrace-common-library omnitrace::omnitrace-core) + rocprofsys-causal + PRIVATE rocprofsys::rocprofsys-compile-definitions rocprofsys::rocprofsys-headers + rocprofsys::rocprofsys-common-library rocprofsys::rocprofsys-core) set_target_properties( - omnitrace-causal PROPERTIES BUILD_RPATH "\$ORIGIN:\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}" + rocprofsys-causal PROPERTIES BUILD_RPATH "\$ORIGIN:\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}" INSTALL_RPATH "${OMNITRACE_EXE_INSTALL_RPATH}" OUTPUT_NAME "rocprof-sys-causal") -omnitrace_strip_target(omnitrace-causal) +omnitrace_strip_target(rocprofsys-causal) install( - TARGETS omnitrace-causal + TARGETS rocprofsys-causal DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL) diff --git a/source/bin/omnitrace-exe/CMakeLists.txt b/source/bin/omnitrace-exe/CMakeLists.txt index 09b12ce41..db97b6a92 100644 --- a/source/bin/omnitrace-exe/CMakeLists.txt +++ b/source/bin/omnitrace-exe/CMakeLists.txt @@ -1,24 +1,24 @@ # ------------------------------------------------------------------------------# # -# TODO: [DFG] Remove this file after 'rocprof-sys' rebranding is complete -# omnitrace-exe target (deprecated 'omnitrace' executable, now 'rocprof-sys-instrument') +# TODO: [DFG] Remove this file after 'rocprofsys' rebranding is complete +# rocprofsys-exe target (deprecated 'omnitrace' executable, now 'rocprofsys-instrument') # # ------------------------------------------------------------------------------# -add_executable(omnitrace-exe ${CMAKE_CURRENT_LIST_DIR}/omnitrace.cpp) +add_executable(rocprofsys-exe ${CMAKE_CURRENT_LIST_DIR}/omnitrace.cpp) -target_link_libraries(omnitrace-exe PRIVATE omnitrace::omnitrace-threading) +target_link_libraries(rocprofsys-exe PRIVATE rocprofsys::rocprofsys-threading) set_target_properties( - omnitrace-exe + rocprofsys-exe PROPERTIES OUTPUT_NAME omnitrace BUILD_RPATH "\$ORIGIN:\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}" INSTALL_RPATH "${OMNITRACE_EXE_INSTALL_RPATH}" INSTALL_RPATH_USE_LINK_PATH ON) -omnitrace_strip_target(omnitrace-exe) +omnitrace_strip_target(rocprofsys-exe) install( - TARGETS omnitrace-exe + TARGETS rocprofsys-exe DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL) diff --git a/source/bin/omnitrace-instrument/CMakeLists.txt b/source/bin/omnitrace-instrument/CMakeLists.txt index 195104b51..01490b2a0 100644 --- a/source/bin/omnitrace-instrument/CMakeLists.txt +++ b/source/bin/omnitrace-instrument/CMakeLists.txt @@ -1,15 +1,15 @@ # ------------------------------------------------------------------------------# # -# omnitrace-instrument target (formerly omnitrace-exe target prior to 1.8.1) +# rocprofsys-instrument target (formerly rocprofsys-exe target prior to 1.8.1) # # ------------------------------------------------------------------------------# set(CMAKE_INTERPROCEDURAL_OPTIMIZATION OFF) -add_executable(omnitrace-instrument) +add_executable(rocprofsys-instrument) target_sources( - omnitrace-instrument + rocprofsys-instrument PRIVATE ${CMAKE_CURRENT_LIST_DIR}/details.cpp ${CMAKE_CURRENT_LIST_DIR}/function_signature.cpp ${CMAKE_CURRENT_LIST_DIR}/function_signature.hpp @@ -25,37 +25,37 @@ target_sources( ${CMAKE_CURRENT_LIST_DIR}/omnitrace-instrument.hpp) target_link_libraries( - omnitrace-instrument - PRIVATE omnitrace::omnitrace-headers - omnitrace::omnitrace-dyninst - omnitrace::omnitrace-compile-options - omnitrace::omnitrace-compile-definitions - omnitrace::omnitrace-sanitizer + rocprofsys-instrument + PRIVATE rocprofsys::rocprofsys-headers + rocprofsys::rocprofsys-dyninst + rocprofsys::rocprofsys-compile-options + rocprofsys::rocprofsys-compile-definitions + rocprofsys::rocprofsys-sanitizer timemory::timemory-headers timemory::timemory-extensions timemory::timemory-core) set_target_properties( - omnitrace-instrument + rocprofsys-instrument PROPERTIES BUILD_RPATH "\$ORIGIN:\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}" INSTALL_RPATH "${OMNITRACE_EXE_INSTALL_RPATH}" INSTALL_RPATH_USE_LINK_PATH ON OUTPUT_NAME "rocprof-sys-instrument") if(OMNITRACE_BUILD_DYNINST) - target_compile_definitions(omnitrace-instrument PRIVATE OMNITRACE_BUILD_DYNINST=1) + target_compile_definitions(rocprofsys-instrument PRIVATE OMNITRACE_BUILD_DYNINST=1) endif() -add_target_flag_if_avail(omnitrace-instrument "-Wno-deprecated-declarations") +add_target_flag_if_avail(rocprofsys-instrument "-Wno-deprecated-declarations") -omnitrace_strip_target(omnitrace-instrument) +omnitrace_strip_target(rocprofsys-instrument) if(CMAKE_BUILD_TYPE MATCHES "^(DEBUG|Debug)") string(REPLACE " " ";" _FLAGS "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") - target_compile_options(omnitrace-instrument PRIVATE ${_FLAGS}) + target_compile_options(rocprofsys-instrument PRIVATE ${_FLAGS}) endif() install( - TARGETS omnitrace-instrument + TARGETS rocprofsys-instrument DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL) diff --git a/source/bin/omnitrace-instrument/module_function.cpp b/source/bin/omnitrace-instrument/module_function.cpp index 5b857c172..f0a77a3e2 100644 --- a/source/bin/omnitrace-instrument/module_function.cpp +++ b/source/bin/omnitrace-instrument/module_function.cpp @@ -444,12 +444,13 @@ module_function::is_internal_constrained() const auto _module_base = _basename(module_name); auto _module_real = _realpath(module_name); - if(std::regex_search(module_name, std::regex{ "lib(omnitrace|timemory|perfetto)" })) + if(std::regex_search(module_name, std::regex{ "lib(rocprof-sys|rocprofsys|omnitrace|timemory|perfetto)" })) return _report("Excluding", "module", "omnitrace", 3); else if(std::regex_match(module_name, std::regex{ ".*/source/lib/" "(core|common|binary|omnitrace|omnitrace-dl|" - "omnitrace-user)/.*/.*\\.(h|c|cpp|hpp)$" })) + "omnitrace-user|rocprofsys|rocprofsys-dl|" + "rocprofsys-user)/.*/.*\\.(h|c|cpp|hpp)$" })) return _report("Excluding", "module", "omnitrace", 3); if(std::regex_search(function_name, std::regex{ "9omnitrace|omnitrace(::|_)" })) @@ -507,7 +508,8 @@ module_function::is_module_constrained() const static std::regex sys_build_regex{ "^(\\.\\./sysdeps/|/build/)", regex_opts }; static std::regex dyninst_regex{ "(dyninst|DYNINST|(^|/)RT[[:graph:]]+\\.c$)", regex_opts }; - static std::regex dependlib_regex{ "^(lib|)(omnitrace|pthread|caliper|gotcha|papi|" + static std::regex dependlib_regex{ "^(lib|)(rocprof-sys|rocprofsys|omnitrace|" + "pthread|caliper|gotcha|papi|" "cupti|TAU|likwid|pfm|nvperf|unwind)", regex_opts }; static std::regex core_cmod_regex{ diff --git a/source/bin/omnitrace-instrument/omnitrace-instrument.cpp b/source/bin/omnitrace-instrument/omnitrace-instrument.cpp index 93c2c3c41..a860464d7 100644 --- a/source/bin/omnitrace-instrument/omnitrace-instrument.cpp +++ b/source/bin/omnitrace-instrument/omnitrace-instrument.cpp @@ -206,7 +206,7 @@ strvec_t lib_search_paths = tim::delimit( strvec_t bin_search_paths = tim::delimit(tim::get_env("PATH"), ":"); auto _dyn_api_rt_paths = tim::delimit( - JOIN(":", get_internal_libpath(), JOIN("/", get_internal_libpath(), "omnitrace")), + JOIN(":", get_internal_libpath(), JOIN("/", get_internal_libpath(), "rocprofsys")), ":"); std::string @@ -315,13 +315,13 @@ main(int argc, char** argv) if(!_omni_root.empty() && exists(_omni_root)) { bin_search_paths.emplace_back(JOIN('/', _omni_root, "bin")); - bin_search_paths.emplace_back(JOIN('/', _omni_root, "lib", "omnitrace")); - bin_search_paths.emplace_back(JOIN('/', _omni_root, "lib", "omnitrace", "bin")); + bin_search_paths.emplace_back(JOIN('/', _omni_root, "lib", "rocprofsys")); + bin_search_paths.emplace_back(JOIN('/', _omni_root, "lib", "rocprofsys", "bin")); lib_search_paths.emplace_back(JOIN('/', _omni_root, "lib")); - lib_search_paths.emplace_back(JOIN('/', _omni_root, "lib", "omnitrace")); - lib_search_paths.emplace_back(JOIN('/', _omni_root, "lib", "omnitrace", "lib")); - lib_search_paths.emplace_back(JOIN('/', _omni_root, "lib", "omnitrace", "lib64")); - OMNITRACE_ADD_LOG_ENTRY(argv[0], "::", "omnitrace root path: ", _omni_root); + lib_search_paths.emplace_back(JOIN('/', _omni_root, "lib", "rocprofsys")); + lib_search_paths.emplace_back(JOIN('/', _omni_root, "lib", "rocprofsys", "lib")); + lib_search_paths.emplace_back(JOIN('/', _omni_root, "lib", "rocprofsys", "lib64")); + OMNITRACE_ADD_LOG_ENTRY(argv[0], "::", "rocprofsys root path: ", _omni_root); } auto _omni_exe_path = get_realpath(get_absolute_exe_filepath(argv[0])); @@ -332,19 +332,19 @@ main(int argc, char** argv) auto _omni_lib_path = JOIN('/', filepath::dirname(filepath::dirname(_omni_exe_path)), "lib"); - bin_search_paths.emplace_back(JOIN('/', _omni_lib_path, "omnitrace")); - bin_search_paths.emplace_back(JOIN('/', _omni_lib_path, "omnitrace", "bin")); + bin_search_paths.emplace_back(JOIN('/', _omni_lib_path, "rocprofsys")); + bin_search_paths.emplace_back(JOIN('/', _omni_lib_path, "rocprofsys", "bin")); lib_search_paths.emplace_back(_omni_lib_path); - lib_search_paths.emplace_back(JOIN('/', _omni_lib_path, "omnitrace")); - lib_search_paths.emplace_back(JOIN('/', _omni_lib_path, "omnitrace", "lib")); - lib_search_paths.emplace_back(JOIN('/', _omni_lib_path, "omnitrace", "lib64")); + lib_search_paths.emplace_back(JOIN('/', _omni_lib_path, "rocprofsys")); + lib_search_paths.emplace_back(JOIN('/', _omni_lib_path, "rocprofsys", "lib")); + lib_search_paths.emplace_back(JOIN('/', _omni_lib_path, "rocprofsys", "lib64")); - OMNITRACE_ADD_LOG_ENTRY(argv[0], "::", "omnitrace bin path: ", _omni_exe_path); - OMNITRACE_ADD_LOG_ENTRY(argv[0], "::", "omnitrace lib path: ", _omni_lib_path); + OMNITRACE_ADD_LOG_ENTRY(argv[0], "::", "rocprofsys bin path: ", _omni_exe_path); + OMNITRACE_ADD_LOG_ENTRY(argv[0], "::", "rocprofsys lib path: ", _omni_lib_path); for(const auto& itr : omnitrace_get_link_map(nullptr)) { - if(itr.find("omnitrace") != std::string::npos || + if(itr.find("rocprofsys") != std::string::npos || itr.find("rocprof-sys") != std::string::npos || std::regex_search( itr, std::regex{ "lib(dyninstAPI|stackwalk|pcontrol|patchAPI|parseAPI|" diff --git a/source/bin/omnitrace-run/CMakeLists.txt b/source/bin/omnitrace-run/CMakeLists.txt index 95bd80ec7..df5ecac89 100644 --- a/source/bin/omnitrace-run/CMakeLists.txt +++ b/source/bin/omnitrace-run/CMakeLists.txt @@ -1,29 +1,29 @@ # ------------------------------------------------------------------------------# # -# omnitrace-run target +# rocprofsys-run target # # ------------------------------------------------------------------------------# add_executable( - omnitrace-run + rocprofsys-run ${CMAKE_CURRENT_LIST_DIR}/omnitrace-run.cpp ${CMAKE_CURRENT_LIST_DIR}/omnitrace-run.hpp ${CMAKE_CURRENT_LIST_DIR}/impl.cpp) -target_compile_definitions(omnitrace-run PRIVATE TIMEMORY_CMAKE=1) -target_include_directories(omnitrace-run PRIVATE ${CMAKE_CURRENT_LIST_DIR}) +target_compile_definitions(rocprofsys-run PRIVATE TIMEMORY_CMAKE=1) +target_include_directories(rocprofsys-run PRIVATE ${CMAKE_CURRENT_LIST_DIR}) target_link_libraries( - omnitrace-run - PRIVATE omnitrace::omnitrace-compile-definitions omnitrace::omnitrace-headers - omnitrace::omnitrace-common-library omnitrace::omnitrace-core - omnitrace::omnitrace-sanitizer) + rocprofsys-run + PRIVATE rocprofsys::rocprofsys-compile-definitions rocprofsys::rocprofsys-headers + rocprofsys::rocprofsys-common-library rocprofsys::rocprofsys-core + rocprofsys::rocprofsys-sanitizer) set_target_properties( - omnitrace-run PROPERTIES BUILD_RPATH "\$ORIGIN:\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}" + rocprofsys-run PROPERTIES BUILD_RPATH "\$ORIGIN:\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}" INSTALL_RPATH "${OMNITRACE_EXE_INSTALL_RPATH}" OUTPUT_NAME "rocprof-sys-run") -omnitrace_strip_target(omnitrace-run) +omnitrace_strip_target(rocprofsys-run) install( - TARGETS omnitrace-run + TARGETS rocprofsys-run DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL) diff --git a/source/bin/omnitrace-sample/CMakeLists.txt b/source/bin/omnitrace-sample/CMakeLists.txt index f8cd13154..93e2f4e82 100644 --- a/source/bin/omnitrace-sample/CMakeLists.txt +++ b/source/bin/omnitrace-sample/CMakeLists.txt @@ -1,26 +1,26 @@ # ------------------------------------------------------------------------------# # -# omnitrace-sample target +# rocprofsys-sample target # # ------------------------------------------------------------------------------# -add_executable(omnitrace-sample ${CMAKE_CURRENT_LIST_DIR}/omnitrace-sample.cpp +add_executable(rocprofsys-sample ${CMAKE_CURRENT_LIST_DIR}/omnitrace-sample.cpp ${CMAKE_CURRENT_LIST_DIR}/impl.cpp) -target_compile_definitions(omnitrace-sample PRIVATE TIMEMORY_CMAKE=1) -target_include_directories(omnitrace-sample PRIVATE ${CMAKE_CURRENT_LIST_DIR}) +target_compile_definitions(rocprofsys-sample PRIVATE TIMEMORY_CMAKE=1) +target_include_directories(rocprofsys-sample PRIVATE ${CMAKE_CURRENT_LIST_DIR}) target_link_libraries( - omnitrace-sample - PRIVATE omnitrace::omnitrace-compile-definitions omnitrace::omnitrace-headers - omnitrace::omnitrace-common-library) + rocprofsys-sample + PRIVATE rocprofsys::rocprofsys-compile-definitions rocprofsys::rocprofsys-headers + rocprofsys::rocprofsys-common-library) set_target_properties( - omnitrace-sample PROPERTIES BUILD_RPATH "\$ORIGIN:\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}" + rocprofsys-sample PROPERTIES BUILD_RPATH "\$ORIGIN:\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}" INSTALL_RPATH "${OMNITRACE_EXE_INSTALL_RPATH}" OUTPUT_NAME "rocprof-sys-sample") -omnitrace_strip_target(omnitrace-sample) +omnitrace_strip_target(rocprofsys-sample) install( - TARGETS omnitrace-sample + TARGETS rocprofsys-sample DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL) diff --git a/source/bin/tests/CMakeLists.txt b/source/bin/tests/CMakeLists.txt index 8a6eee3f6..8ff0efc32 100644 --- a/source/bin/tests/CMakeLists.txt +++ b/source/bin/tests/CMakeLists.txt @@ -34,7 +34,7 @@ function(OMNITRACE_ADD_BIN_TEST) "OMNITRACE_CI=ON" "OMNITRACE_CI_TIMEOUT=${TEST_TIMEOUT}" "OMNITRACE_CONFIG_FILE=" - "OMNITRACE_OUTPUT_PATH=${PROJECT_BINARY_DIR}/omnitrace-tests-output" + "OMNITRACE_OUTPUT_PATH=${PROJECT_BINARY_DIR}/rocprofsys-tests-output" "TWD=${TEST_WORKING_DIRECTORY}") # copy for inverse set(TEST_ENVIRONMENT_INV "${TEST_ENVIRONMENT}") @@ -74,7 +74,7 @@ function(OMNITRACE_ADD_BIN_TEST) DEPENDS "${TEST_DEPENDS}" LABELS - "omnitrace-bin;${TEST_LABELS}" + "rocprofsys-bin;${TEST_LABELS}" PASS_REGULAR_EXPRESSION "${TEST_PASS_REGEX}" FAIL_REGULAR_EXPRESSION @@ -97,7 +97,7 @@ function(OMNITRACE_ADD_BIN_TEST) DEPENDS "${TEST_DEPENDS}" LABELS - "omnitrace-bin;${TEST_LABELS}" + "rocprofsys-bin;${TEST_LABELS}" PASS_REGULAR_EXPRESSION "${TEST_PASS_REGEX}" FAIL_REGULAR_EXPRESSION @@ -111,10 +111,10 @@ function(OMNITRACE_ADD_BIN_TEST) endfunction() omnitrace_add_bin_test( - NAME rocprof-sys-instrument-help - TARGET omnitrace-instrument + NAME rocprofsys-instrument-help + TARGET rocprofsys-instrument ARGS --help - LABELS rocprof-sys-instrument + LABELS rocprofsys-instrument TIMEOUT 45 PASS_REGEX ".*\\\[rocprof-sys-instrument\\\] Usage:.*\\\[DEBUG OPTIONS\\\].*\\\[MODE OPTIONS\\\].*\\\[LIBRARY OPTIONS\\\].*\\\[SYMBOL SELECTION OPTIONS\\\].*\\\[RUNTIME OPTIONS\\\].*\\\[GRANULARITY OPTIONS\\\].*\\\[DYNINST OPTIONS\\\].*" @@ -130,8 +130,8 @@ else() endif() omnitrace_add_bin_test( - NAME rocprof-sys-instrument-simulate-ls - TARGET omnitrace-instrument + NAME rocprofsys-instrument-simulate-ls + TARGET rocprofsys-instrument ARGS --simulate --print-format json @@ -147,44 +147,44 @@ omnitrace_add_bin_test( TIMEOUT 240) omnitrace_add_bin_test( - NAME rocprof-sys-instrument-simulate-ls-check - DEPENDS rocprof-sys-instrument-simulate-ls - COMMAND ls omnitrace-tests-output/rocprof-sys-instrument-simulate-ls/instrumentation + NAME rocprofsys-instrument-simulate-ls-check + DEPENDS rocprofsys-instrument-simulate-ls + COMMAND ls rocprofsys-tests-output/rocprofsys-instrument-simulate-ls/instrumentation TIMEOUT 60 PASS_REGEX ".*available.json.*available.txt.*available.xml.*excluded.json.*excluded.txt.*excluded.xml.*instrumented.json.*instrumented.txt.*instrumented.xml.*overlapping.json.*overlapping.txt.*overlapping.xml.*" FAIL_REGEX "No such file or directory|not found|OMNITRACE_ABORT_FAIL_REGEX") omnitrace_add_bin_test( - NAME rocprof-sys-instrument-simulate-lib - TARGET omnitrace-instrument - ARGS --print-available functions -v 2 -- $ + NAME rocprofsys-instrument-simulate-lib + TARGET rocprofsys-instrument + ARGS --print-available functions -v 2 -- $ LABELS "simulate" TIMEOUT 120 PASS_REGEX - "\\\[omnitrace\\\]\\\[exe\\\] Runtime instrumentation is not possible!(.*)\n(.*)\\\[omnitrace\\\]\\\[exe\\\] Switching to binary rewrite mode and assuming '--simulate --all-functions'" + "\\\[rocprof-sys\\\]\\\[exe\\\] Runtime instrumentation is not possible!(.*)\n(.*)\\\[rocprof-sys\\\]\\\[exe\\\] Switching to binary rewrite mode and assuming '--simulate --all-functions'" ) -file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/omnitrace-tests-output/tmp) +file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/rocprofsys-tests-output/tmp) omnitrace_add_bin_test( - NAME rocprof-sys-instrument-simulate-lib-basename - TARGET omnitrace-instrument + NAME rocprofsys-instrument-simulate-lib-basename + TARGET rocprofsys-instrument ARGS --print-available functions -v 2 -o - ${PROJECT_BINARY_DIR}/omnitrace-tests-output/rocprof-sys-instrument-simulate-lib-basename/${CMAKE_SHARED_LIBRARY_PREFIX}$${CMAKE_SHARED_LIBRARY_SUFFIX} + ${PROJECT_BINARY_DIR}/rocprofsys-tests-output/rocprofsys-instrument-simulate-lib-basename/${CMAKE_SHARED_LIBRARY_PREFIX}$${CMAKE_SHARED_LIBRARY_SUFFIX} -- - ${CMAKE_SHARED_LIBRARY_PREFIX}$${CMAKE_SHARED_LIBRARY_SUFFIX} + ${CMAKE_SHARED_LIBRARY_PREFIX}$${CMAKE_SHARED_LIBRARY_SUFFIX} LABELS "simulate" TIMEOUT 120 - WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/omnitrace-tests-output/tmp) + WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/rocprofsys-tests-output/tmp) omnitrace_add_bin_test( - NAME rocprof-sys-instrument-write-log - TARGET omnitrace-instrument + NAME rocprofsys-instrument-write-log + TARGET rocprofsys-instrument ARGS --print-instrumented functions -v @@ -199,76 +199,76 @@ omnitrace_add_bin_test( PASS_REGEX "Opening .*/instrumentation/user.log") omnitrace_add_bin_test( - NAME rocprof-sys-instrument-write-log-check - DEPENDS rocprof-sys-instrument-write-log + NAME rocprofsys-instrument-write-log-check + DEPENDS rocprofsys-instrument-write-log COMMAND ls - omnitrace-tests-output/rocprof-sys-instrument-write-log/instrumentation/user.log + rocprofsys-tests-output/rocprofsys-instrument-write-log/instrumentation/user.log LABELS "log" TIMEOUT 60 PASS_REGEX "user.log" FAIL_REGEX "No such file or directory|not found|OMNITRACE_ABORT_FAIL_REGEX") omnitrace_add_bin_test( - NAME rocprof-sys-avail-help - TARGET omnitrace-avail + NAME rocprofsys-avail-help + TARGET rocprofsys-avail ARGS --help - LABELS "rocprof-sys-avail" + LABELS "rocprofsys-avail" TIMEOUT 45 PASS_REGEX ".*\\\[rocprof-sys-avail\\\] Usage:.*\\\[DEBUG OPTIONS\\\].*\\\[INFO OPTIONS\\\].*\\\[FILTER OPTIONS\\\].*\\\[COLUMN OPTIONS\\\].*\\\[DISPLAY OPTIONS\\\].*\\\[OUTPUT OPTIONS\\\].*" ) omnitrace_add_bin_test( - NAME rocprof-sys-avail-all - TARGET omnitrace-avail + NAME rocprofsys-avail-all + TARGET rocprofsys-avail ARGS --all - LABELS "rocprof-sys-avail" + LABELS "rocprofsys-avail" TIMEOUT 45) omnitrace_add_bin_test( - NAME rocprof-sys-avail-all-expand-keys - TARGET omnitrace-avail + NAME rocprofsys-avail-all-expand-keys + TARGET rocprofsys-avail ARGS --all --expand-keys - LABELS "rocprof-sys-avail" + LABELS "rocprofsys-avail" TIMEOUT 45 FAIL_REGEX "%[a-zA-Z_]%|OMNITRACE_ABORT_FAIL_REGEX") omnitrace_add_bin_test( - NAME rocprof-sys-avail-all-only-available-alphabetical - TARGET omnitrace-avail + NAME rocprofsys-avail-all-only-available-alphabetical + TARGET rocprofsys-avail ARGS --all --available --alphabetical --debug --output - ${CMAKE_CURRENT_BINARY_DIR}/rocprof-sys-avail-all-only-available-alphabetical.log - LABELS "rocprof-sys-avail" + ${CMAKE_CURRENT_BINARY_DIR}/rocprofsys-avail-all-only-available-alphabetical.log + LABELS "rocprofsys-avail" TIMEOUT 45 PROPERTIES ATTACHED_FILES - ${CMAKE_CURRENT_BINARY_DIR}/rocprof-sys-avail-all-only-available-alphabetical.log) + ${CMAKE_CURRENT_BINARY_DIR}/rocprofsys-avail-all-only-available-alphabetical.log) omnitrace_add_bin_test( - NAME rocprof-sys-avail-all-csv - TARGET omnitrace-avail + NAME rocprofsys-avail-all-csv + TARGET rocprofsys-avail ARGS --all --csv --csv-separator "#" - LABELS "rocprof-sys-avail" + LABELS "rocprofsys-avail" TIMEOUT 45 PASS_REGEX "COMPONENT#AVAILABLE#VALUE_TYPE#STRING_IDS#FILENAME#DESCRIPTION#CATEGORY#.*ENVIRONMENT VARIABLE#VALUE#DATA TYPE#DESCRIPTION#CATEGORIES#.*HARDWARE COUNTER#DEVICE#AVAILABLE#DESCRIPTION#" ) omnitrace_add_bin_test( - NAME rocprof-sys-avail-filter-wall-clock-available - TARGET omnitrace-avail + NAME rocprofsys-avail-filter-wall-clock-available + TARGET rocprofsys-avail ARGS -r wall_clock -C --available - LABELS "rocprof-sys-avail" + LABELS "rocprofsys-avail" TIMEOUT 45 PASS_REGEX "\\\|[-]+\\\|\n\\\|[ ]+COMPONENT[ ]+\\\|\n\\\|[-]+\\\|\n\\\| (wall_clock)[ ]+\\\|\n\\\|[-]+\\\|" ) omnitrace_add_bin_test( - NAME rocprof-sys-avail-category-filter-omnitrace - TARGET omnitrace-avail + NAME rocprofsys-avail-category-filter-rocprofsys + TARGET rocprofsys-avail ARGS --categories settings::omnitrace --brief - LABELS "rocprof-sys-avail" + LABELS "rocprofsys-avail" TIMEOUT 45 PASS_REGEX "OMNITRACE_(SETTINGS_DESC|OUTPUT_FILE|OUTPUT_PREFIX)" FAIL_REGEX @@ -276,18 +276,18 @@ omnitrace_add_bin_test( ) omnitrace_add_bin_test( - NAME rocprof-sys-avail-category-filter-timemory - TARGET omnitrace-avail + NAME rocprofsys-avail-category-filter-timemory + TARGET rocprofsys-avail ARGS --categories settings::timemory --brief --advanced - LABELS "rocprof-sys-avail" + LABELS "rocprofsys-avail" TIMEOUT 45 PASS_REGEX "OMNITRACE_(ADD_SECONDARY|SCIENTIFIC|PRECISION|MEMORY_PRECISION|TIMING_PRECISION)" FAIL_REGEX "OMNITRACE_(SETTINGS_DESC|OUTPUT_FILE)|OMNITRACE_ABORT_FAIL_REGEX") omnitrace_add_bin_test( - NAME rocprof-sys-avail-regex-negation - TARGET omnitrace-avail + NAME rocprofsys-avail-regex-negation + TARGET rocprofsys-avail ARGS -R omnitrace ~timemory @@ -299,7 +299,7 @@ omnitrace_add_bin_test( --csv --brief --advanced - LABELS "rocprof-sys-avail" + LABELS "rocprofsys-avail" TIMEOUT 45 PASS_REGEX "ENVIRONMENT VARIABLE,[ \n]+OMNITRACE_THREAD_POOL_SIZE,[ \n]+OMNITRACE_USE_PID,[ \n]+" @@ -307,13 +307,13 @@ omnitrace_add_bin_test( string( REPLACE "+" "\\\+" _AVAIL_CFG_PATH - "${PROJECT_BINARY_DIR}/omnitrace-tests-output/rocprof-sys-avail/rocprof-sys-") + "${PROJECT_BINARY_DIR}/rocprofsys-tests-output/rocprofsys-avail/rocprofsys-") # use of TWD == Test Working Directory (added by function) omnitrace_add_bin_test( - NAME rocprof-sys-avail-write-config - TARGET omnitrace-avail + NAME rocprofsys-avail-write-config + TARGET rocprofsys-avail ARGS -G - %env{TWD}%/omnitrace-tests-output/rocprof-sys-avail/rocprof-sys-test.cfg + %env{TWD}%/rocprofsys-tests-output/rocprofsys-avail/rocprofsys-test.cfg -F txt json @@ -323,67 +323,67 @@ omnitrace_add_bin_test( -c omnitrace TIMEOUT 45 - LABELS "rocprof-sys-avail" + LABELS "rocprofsys-avail" PASS_REGEX "Outputting JSON configuration file '${_AVAIL_CFG_PATH}test\\\.json'(.*)Outputting XML configuration file '${_AVAIL_CFG_PATH}test\\\.xml'(.*)Outputting text configuration file '${_AVAIL_CFG_PATH}test\\\.cfg'(.*)" ) omnitrace_add_bin_test( - NAME rocprof-sys-avail-write-config-tweak - TARGET omnitrace-avail - ARGS -G %env{TWD}%/omnitrace-tests-output/rocprof-sys-avail/rocprof-sys-tweak.cfg -F + NAME rocprofsys-avail-write-config-tweak + TARGET rocprofsys-avail + ARGS -G %env{TWD}%/rocprofsys-tests-output/rocprofsys-avail/rocprofsys-tweak.cfg -F txt json xml --force TIMEOUT 45 - LABELS "rocprof-sys-avail" + LABELS "rocprofsys-avail" ENVIRONMENT "OMNITRACE_TRACE=OFF;OMNITRACE_PROFILE=ON" PASS_REGEX "Outputting JSON configuration file '${_AVAIL_CFG_PATH}tweak\\\.json'(.*)Outputting XML configuration file '${_AVAIL_CFG_PATH}tweak\\\.xml'(.*)Outputting text configuration file '${_AVAIL_CFG_PATH}tweak\\\.cfg'(.*)" ) omnitrace_add_bin_test( - NAME rocprof-sys-avail-list-keys - TARGET omnitrace-avail + NAME rocprofsys-avail-list-keys + TARGET rocprofsys-avail ARGS --list-keys --expand-keys TIMEOUT 45 - LABELS "rocprof-sys-avail" + LABELS "rocprofsys-avail" PASS_REGEX "Output Keys:\n(.*)%argv%(.*)%argv_hash%") omnitrace_add_bin_test( - NAME rocprof-sys-avail-list-keys-markdown - TARGET omnitrace-avail + NAME rocprofsys-avail-list-keys-markdown + TARGET rocprofsys-avail ARGS --list-keys --expand-keys --markdown TIMEOUT 45 - LABELS "rocprof-sys-avail;markdown" + LABELS "rocprofsys-avail;markdown" PASS_REGEX "(.*)`%argv%`(.*)`%argv_hash%`") omnitrace_add_bin_test( - NAME rocprof-sys-avail-list-categories - TARGET omnitrace-avail + NAME rocprofsys-avail-list-categories + TARGET rocprofsys-avail ARGS --list-categories TIMEOUT 45 - LABELS "rocprof-sys-avail" + LABELS "rocprofsys-avail" PASS_REGEX " component::(.*) hw_counters::(.*) settings::") omnitrace_add_bin_test( - NAME rocprof-sys-avail-core-categories - TARGET omnitrace-avail + NAME rocprofsys-avail-core-categories + TARGET rocprofsys-avail ARGS -c core TIMEOUT 45 - LABELS "rocprof-sys-avail" + LABELS "rocprofsys-avail" PASS_REGEX "OMNITRACE_CONFIG_FILE(.*)OMNITRACE_ENABLED(.*)OMNITRACE_SUPPRESS_CONFIG(.*)OMNITRACE_SUPPRESS_PARSING(.*)OMNITRACE_VERBOSE" ) omnitrace_add_bin_test( - NAME rocprof-sys-run-help - TARGET omnitrace-run + NAME rocprofsys-run-help + TARGET rocprofsys-run ARGS --help TIMEOUT 45 - LABELS "rocprof-sys-run") + LABELS "rocprofsys-run") -file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/omnitrace-tests-config") +file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/rocprofsys-tests-config") file( - WRITE "${PROJECT_BINARY_DIR}/omnitrace-tests-config/empty.cfg" + WRITE "${PROJECT_BINARY_DIR}/rocprofsys-tests-config/empty.cfg" " # # empty config file @@ -396,17 +396,17 @@ set_target_properties( ${PROJECT_BINARY_DIR}/bin/testing) omnitrace_add_bin_test( - NAME rocprof-sys-run-args - TARGET omnitrace-run + NAME rocprofsys-run-args + TARGET rocprofsys-run ARGS --monochrome --debug=false -v 1 -c - %env{TWD}%/omnitrace-tests-config/empty.cfg + %env{TWD}%/rocprofsys-tests-config/empty.cfg -o - omnitrace-tests-output - rocprof-sys-run-args-output/ + rocprofsys-tests-output + rocprofsys-run-args-output/ -TPHD -S cputime @@ -470,7 +470,7 @@ omnitrace_add_bin_test( --kokkosp-name-length-max=1024 --kokkosp-prefix="[kokkos]" --tmpdir - ${CMAKE_BINARY_DIR}/omnitrace-tests-config/tmpdir + ${CMAKE_BINARY_DIR}/rocprofsys-tests-config/tmpdir --perfetto-backend inprocess --use-pid @@ -489,4 +489,4 @@ omnitrace_add_bin_test( $ 5 TIMEOUT 45 - LABELS "rocprof-sys-run") + LABELS "rocprofsys-run") diff --git a/source/lib/CMakeLists.txt b/source/lib/CMakeLists.txt index e1a5d06fb..bf325693e 100644 --- a/source/lib/CMakeLists.txt +++ b/source/lib/CMakeLists.txt @@ -1,10 +1,10 @@ # ----------------------------------------------------------------------------- # # -# omnitrace: contains all instrumentation functionality +# rocprofsys: contains all instrumentation functionality # -# omnitrace-dl: contains minimal symbols and dlopen's omnitrace +# rocprofsys-dl: contains minimal symbols and dlopen's rocprofsys # -# omnitrace-user: contains symbols for user API +# rocprofsys-user: contains symbols for user API # # ----------------------------------------------------------------------------- # @@ -17,51 +17,51 @@ if(OMNITRACE_USE_ROCPROFILER AND ROCmVersion_TRIPLE_VERSION VERSION_LESS 5.2.0 AND NOT CMAKE_INSTALL_RPATH_USE_LINK_PATH) set(OMNITRACE_LIB_INSTALL_RPATH - "\$ORIGIN:\$ORIGIN/omnitrace:${rocprofiler_LIBRARY_DIR}") + "\$ORIGIN:\$ORIGIN/rocprofsys:${rocprofiler_LIBRARY_DIR}") else() - set(OMNITRACE_LIB_INSTALL_RPATH "\$ORIGIN:\$ORIGIN/omnitrace") + set(OMNITRACE_LIB_INSTALL_RPATH "\$ORIGIN:\$ORIGIN/rocprofsys") endif() # ------------------------------------------------------------------------------# # -# omnitrace interface library +# rocprofsys interface library # # ------------------------------------------------------------------------------# -add_library(omnitrace-interface-library INTERFACE) -add_library(omnitrace::omnitrace-interface-library ALIAS omnitrace-interface-library) +add_library(rocprofsys-interface-library INTERFACE) +add_library(rocprofsys::rocprofsys-interface-library ALIAS rocprofsys-interface-library) target_include_directories( - omnitrace-interface-library INTERFACE ${CMAKE_CURRENT_SOURCE_DIR} + rocprofsys-interface-library INTERFACE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/omnitrace) target_link_libraries( - omnitrace-interface-library + rocprofsys-interface-library INTERFACE - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $,omnitrace::omnitrace-lto,>>) + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $,rocprofsys::rocprofsys-lto,>>) # ------------------------------------------------------------------------------# # -# omnitrace internal libraries +# rocprofsys internal libraries # # ------------------------------------------------------------------------------# @@ -71,7 +71,7 @@ add_subdirectory(binary) # ------------------------------------------------------------------------------# # -# omnitrace exported libraries +# rocprofsys exported libraries # # ------------------------------------------------------------------------------# diff --git a/source/lib/binary/CMakeLists.txt b/source/lib/binary/CMakeLists.txt index 0388b7f3a..627ea20ea 100644 --- a/source/lib/binary/CMakeLists.txt +++ b/source/lib/binary/CMakeLists.txt @@ -16,13 +16,13 @@ set(binary_headers ${CMAKE_CURRENT_LIST_DIR}/scope_filter.hpp ${CMAKE_CURRENT_LIST_DIR}/symbol.hpp) -add_library(omnitrace-binary-library STATIC) -add_library(omnitrace::omnitrace-binary ALIAS omnitrace-binary-library) +add_library(rocprofsys-binary-library STATIC) +add_library(rocprofsys::rocprofsys-binary ALIAS rocprofsys-binary-library) -target_sources(omnitrace-binary-library PRIVATE ${binary_sources} ${binary_headers}) +target_sources(rocprofsys-binary-library PRIVATE ${binary_sources} ${binary_headers}) target_link_libraries( - omnitrace-binary-library PRIVATE omnitrace::omnitrace-interface-library - omnitrace::omnitrace-core) + rocprofsys-binary-library PRIVATE rocprofsys::rocprofsys-interface-library + rocprofsys::rocprofsys-core) -set_target_properties(omnitrace-binary-library PROPERTIES OUTPUT_NAME rocprof-sys-binary) +set_target_properties(rocprofsys-binary-library PROPERTIES OUTPUT_NAME rocprof-sys-binary) diff --git a/source/lib/common/CMakeLists.txt b/source/lib/common/CMakeLists.txt index 74b7b6437..9294ff66b 100644 --- a/source/lib/common/CMakeLists.txt +++ b/source/lib/common/CMakeLists.txt @@ -1,18 +1,18 @@ # ------------------------------------------------------------------------------# # -# omnitrace common headers +# rocprofsys common headers # # ------------------------------------------------------------------------------# -add_library(omnitrace-common-library INTERFACE) -add_library(omnitrace::common-library ALIAS omnitrace-common-library) -add_library(omnitrace::omnitrace-common-library ALIAS omnitrace-common-library) +add_library(rocprofsys-common-library INTERFACE) +add_library(rocprofsys::common-library ALIAS rocprofsys-common-library) +add_library(rocprofsys::rocprofsys-common-library ALIAS rocprofsys-common-library) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/defines.h.in ${CMAKE_CURRENT_BINARY_DIR}/defines.h @ONLY) target_sources( - omnitrace-common-library + rocprofsys-common-library INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/defines.h ${CMAKE_CURRENT_SOURCE_DIR}/delimit.hpp ${CMAKE_CURRENT_SOURCE_DIR}/environment.hpp @@ -24,11 +24,11 @@ get_filename_component(COMMON_SOURCE_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" D get_filename_component(COMMON_BINARY_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}" DIRECTORY) target_include_directories( - omnitrace-common-library + rocprofsys-common-library INTERFACE $ $ $ $) -target_compile_definitions(omnitrace-common-library +target_compile_definitions(rocprofsys-common-library INTERFACE $) diff --git a/source/lib/core/CMakeLists.txt b/source/lib/core/CMakeLists.txt index cc125084a..a44695394 100644 --- a/source/lib/core/CMakeLists.txt +++ b/source/lib/core/CMakeLists.txt @@ -40,36 +40,36 @@ set(core_headers ${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) +add_library(rocprofsys-core-library STATIC) +add_library(rocprofsys::rocprofsys-core ALIAS rocprofsys-core-library) -target_sources(omnitrace-core-library PRIVATE ${core_sources} ${core_headers} +target_sources(rocprofsys-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 +target_include_directories(rocprofsys-core-library BEFORE PRIVATE ${CMAKE_CURRENT_LIST_DIR}) -target_link_libraries(omnitrace-core-library - PRIVATE omnitrace::omnitrace-interface-library) +target_link_libraries(rocprofsys-core-library + PRIVATE rocprofsys::rocprofsys-interface-library) target_link_libraries( - omnitrace-core-library + rocprofsys-core-library PRIVATE - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $,omnitrace::omnitrace-lto,>>) + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $,rocprofsys::rocprofsys-lto,>>) -set_target_properties(omnitrace-core-library PROPERTIES OUTPUT_NAME rocprof-sys-core) +set_target_properties(rocprofsys-core-library PROPERTIES OUTPUT_NAME rocprof-sys-core) diff --git a/source/lib/core/binary/CMakeLists.txt b/source/lib/core/binary/CMakeLists.txt index 085125f31..1a1803164 100644 --- a/source/lib/core/binary/CMakeLists.txt +++ b/source/lib/core/binary/CMakeLists.txt @@ -4,4 +4,4 @@ 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}) +target_sources(rocprofsys-core-library PRIVATE ${binary_sources} ${binary_headers}) diff --git a/source/lib/core/components/CMakeLists.txt b/source/lib/core/components/CMakeLists.txt index 52774a7c6..76370ed83 100644 --- a/source/lib/core/components/CMakeLists.txt +++ b/source/lib/core/components/CMakeLists.txt @@ -3,4 +3,4 @@ set(component_sources) set(component_headers ${CMAKE_CURRENT_LIST_DIR}/fwd.hpp) -target_sources(omnitrace-core-library PRIVATE ${component_sources} ${component_headers}) +target_sources(rocprofsys-core-library PRIVATE ${component_sources} ${component_headers}) diff --git a/source/lib/core/containers/CMakeLists.txt b/source/lib/core/containers/CMakeLists.txt index 57a361eaa..17eb65091 100644 --- a/source/lib/core/containers/CMakeLists.txt +++ b/source/lib/core/containers/CMakeLists.txt @@ -8,4 +8,4 @@ set(containers_headers ${CMAKE_CURRENT_LIST_DIR}/stable_vector.hpp ${CMAKE_CURRENT_LIST_DIR}/static_vector.hpp) -target_sources(omnitrace-core-library PRIVATE ${containers_sources} ${containers_headers}) +target_sources(rocprofsys-core-library PRIVATE ${containers_sources} ${containers_headers}) diff --git a/source/lib/omnitrace-dl/CMakeLists.txt b/source/lib/omnitrace-dl/CMakeLists.txt index ff651926c..9674bc598 100644 --- a/source/lib/omnitrace-dl/CMakeLists.txt +++ b/source/lib/omnitrace-dl/CMakeLists.txt @@ -1,6 +1,6 @@ # ------------------------------------------------------------------------------# # -# omnitrace dl library +# rocprofsys dl library # # ------------------------------------------------------------------------------# @@ -12,39 +12,39 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) find_package(Threads REQUIRED) -add_library(omnitrace-dl-library SHARED) -add_library(omnitrace::omnitrace-dl-library ALIAS omnitrace-dl-library) +add_library(rocprofsys-dl-library SHARED) +add_library(rocprofsys::rocprofsys-dl-library ALIAS rocprofsys-dl-library) target_sources( - omnitrace-dl-library + rocprofsys-dl-library PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/dl.cpp ${CMAKE_CURRENT_SOURCE_DIR}/main.c ${CMAKE_CURRENT_SOURCE_DIR}/dl/dl.hpp) target_include_directories( - omnitrace-dl-library + rocprofsys-dl-library PUBLIC $ $ - $ + $ $) target_link_libraries( - omnitrace-dl-library - PUBLIC $ $ - $ + rocprofsys-dl-library + PUBLIC $ $ + $ $) -add_target_cxx_flag_if_avail(omnitrace-dl-library "-ftls-model=global-dynamic") -add_target_cxx_flag_if_avail(omnitrace-dl-library "-g3") +add_target_cxx_flag_if_avail(rocprofsys-dl-library "-ftls-model=global-dynamic") +add_target_cxx_flag_if_avail(rocprofsys-dl-library "-g3") set_target_properties( - omnitrace-dl-library + rocprofsys-dl-library PROPERTIES OUTPUT_NAME rocprof-sys-dl VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} BUILD_RPATH "\$ORIGIN" INSTALL_RPATH "\$ORIGIN") -omnitrace_strip_target(omnitrace-dl-library) +omnitrace_strip_target(rocprofsys-dl-library) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dl/dl.hpp - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/omnitrace/dl) + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocprofsys/dl) -install(TARGETS omnitrace-dl-library DESTINATION ${CMAKE_INSTALL_LIBDIR}) +install(TARGETS rocprofsys-dl-library DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/source/lib/omnitrace-rt/CMakeLists.txt b/source/lib/omnitrace-rt/CMakeLists.txt index df591d4ca..487ce4ce3 100644 --- a/source/lib/omnitrace-rt/CMakeLists.txt +++ b/source/lib/omnitrace-rt/CMakeLists.txt @@ -91,45 +91,45 @@ if(UNIX) endif() endif() -add_library(omnitrace-rt-library SHARED) -add_library(omnitrace::omnitrace-rt-library ALIAS omnitrace-rt-library) +add_library(rocprofsys-rt-library SHARED) +add_library(rocprofsys::rocprofsys-rt-library ALIAS rocprofsys-rt-library) -target_sources(omnitrace-rt-library PRIVATE ${SRC_LIST}) +target_sources(rocprofsys-rt-library PRIVATE ${SRC_LIST}) target_include_directories( - omnitrace-rt-library PRIVATE $ + rocprofsys-rt-library PRIVATE $ $) -target_compile_definitions(omnitrace-rt-library PRIVATE ${UNIFIED_DEFINES}) +target_compile_definitions(rocprofsys-rt-library PRIVATE ${UNIFIED_DEFINES}) target_link_libraries( - omnitrace-rt-library + rocprofsys-rt-library PUBLIC $ - PRIVATE omnitrace::omnitrace-threading) + PRIVATE rocprofsys::rocprofsys-threading) -add_target_cxx_flag_if_avail(omnitrace-rt-library "-g3") +add_target_cxx_flag_if_avail(rocprofsys-rt-library "-g3") set_target_properties( - omnitrace-rt-library + rocprofsys-rt-library PROPERTIES OUTPUT_NAME rocprof-sys-rt VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} BUILD_RPATH "\$ORIGIN" INSTALL_RPATH "\$ORIGIN") -omnitrace_strip_target(omnitrace-rt-library) +omnitrace_strip_target(rocprofsys-rt-library) -install(TARGETS omnitrace-rt-library DESTINATION ${CMAKE_INSTALL_LIBDIR}) +install(TARGETS rocprofsys-rt-library DESTINATION ${CMAKE_INSTALL_LIBDIR}) if(NOT EXISTS ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}) file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}) endif() add_custom_target( - omnitrace-rt-library-dyninstAPI_RT-symlink ALL - ${CMAKE_COMMAND} -E create_symlink ../$ + rocprofsys-rt-library-dyninstAPI_RT-symlink ALL + ${CMAKE_COMMAND} -E create_symlink ../$ ${CMAKE_SHARED_LIBRARY_PREFIX}dyninstAPI_RT${CMAKE_SHARED_LIBRARY_SUFFIX} WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME} - DEPENDS omnitrace-rt-library + DEPENDS rocprofsys-rt-library COMMENT - "Creating ${CMAKE_SHARED_LIBRARY_PREFIX}dyninstAPI_RT${CMAKE_SHARED_LIBRARY_SUFFIX} to omnitrace-rt..." + "Creating ${CMAKE_SHARED_LIBRARY_PREFIX}dyninstAPI_RT${CMAKE_SHARED_LIBRARY_SUFFIX} to rocprofsys-rt..." ) install( diff --git a/source/lib/omnitrace-user/CMakeLists.txt b/source/lib/omnitrace-user/CMakeLists.txt index ea3920f2e..e8a445f11 100644 --- a/source/lib/omnitrace-user/CMakeLists.txt +++ b/source/lib/omnitrace-user/CMakeLists.txt @@ -1,6 +1,6 @@ # ------------------------------------------------------------------------------# # -# omnitrace user library +# rocprofsys user library # # ------------------------------------------------------------------------------# @@ -10,8 +10,8 @@ set(BUILD_RPATH_USE_ORIGIN ON) set(CMAKE_CXX_VISIBILITY_PRESET "hidden") set(CMAKE_VISIBILITY_INLINES_HIDDEN ON) -add_library(omnitrace-user-library SHARED) -add_library(omnitrace::omnitrace-user-library ALIAS omnitrace-user-library) +add_library(rocprofsys-user-library SHARED) +add_library(rocprofsys::rocprofsys-user-library ALIAS rocprofsys-user-library) set(_user_headers ${CMAKE_CURRENT_SOURCE_DIR}/omnitrace/user.h @@ -21,15 +21,15 @@ set(_user_headers set(_user_sources ${CMAKE_CURRENT_SOURCE_DIR}/user.cpp) -target_sources(omnitrace-user-library PRIVATE ${_user_sources} ${_user_headers}) +target_sources(rocprofsys-user-library PRIVATE ${_user_sources} ${_user_headers}) target_include_directories( - omnitrace-user-library PUBLIC $ + rocprofsys-user-library PUBLIC $ $) -target_link_libraries(omnitrace-user-library - PRIVATE $) +target_link_libraries(rocprofsys-user-library + PRIVATE $) set_target_properties( - omnitrace-user-library + rocprofsys-user-library PROPERTIES OUTPUT_NAME rocprof-sys-user VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} @@ -37,7 +37,7 @@ set_target_properties( BUILD_RPATH "\$ORIGIN" INSTALL_RPATH "\$ORIGIN") -omnitrace_strip_target(omnitrace-user-library) +omnitrace_strip_target(rocprofsys-user-library) foreach(_HEADER ${_user_headers}) string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/" @@ -46,9 +46,9 @@ foreach(_HEADER ${_user_headers}) configure_file(${_HEADER} ${_DEST} COPYONLY) endforeach() -install(FILES ${_user_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/omnitrace) +install(FILES ${_user_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocprofsys) install( - TARGETS omnitrace-user-library - EXPORT omnitrace-library-targets + TARGETS rocprofsys-user-library + EXPORT rocprofsys-library-targets DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/source/lib/omnitrace/CMakeLists.txt b/source/lib/omnitrace/CMakeLists.txt index 5faeef670..420bf897e 100644 --- a/source/lib/omnitrace/CMakeLists.txt +++ b/source/lib/omnitrace/CMakeLists.txt @@ -1,64 +1,64 @@ # ------------------------------------------------------------------------------# # -# omnitrace object library +# rocprofsys object library # # ------------------------------------------------------------------------------# -add_library(omnitrace-object-library OBJECT) -add_library(omnitrace::omnitrace-object-library ALIAS omnitrace-object-library) +add_library(rocprofsys-object-library OBJECT) +add_library(rocprofsys::rocprofsys-object-library ALIAS rocprofsys-object-library) target_sources( - omnitrace-object-library + rocprofsys-object-library PRIVATE ${CMAKE_CURRENT_LIST_DIR}/library.cpp ${CMAKE_CURRENT_LIST_DIR}/regions.cpp ${CMAKE_CURRENT_LIST_DIR}/progress.cpp ${CMAKE_CURRENT_LIST_DIR}/api.cpp ${CMAKE_CURRENT_LIST_DIR}/timeout.cpp ${CMAKE_CURRENT_LIST_DIR}/api.hpp) add_subdirectory(library) -target_link_libraries(omnitrace-object-library - PRIVATE omnitrace::omnitrace-interface-library) +target_link_libraries(rocprofsys-object-library + PRIVATE rocprofsys::rocprofsys-interface-library) # ------------------------------------------------------------------------------# # -# omnitrace static library +# rocprofsys static library # # ------------------------------------------------------------------------------# -add_library(omnitrace-static-library STATIC $) -add_library(omnitrace::libomnitrace-static ALIAS omnitrace-static-library) +add_library(rocprofsys-static-library STATIC $) +add_library(rocprofsys::librocprofsys-static ALIAS rocprofsys-static-library) target_link_libraries( - omnitrace-static-library - PRIVATE omnitrace::omnitrace-interface-library omnitrace::omnitrace-core - omnitrace::omnitrace-binary) + rocprofsys-static-library + PRIVATE rocprofsys::rocprofsys-interface-library rocprofsys::rocprofsys-core + rocprofsys::rocprofsys-binary) -set_target_properties(omnitrace-static-library PROPERTIES OUTPUT_NAME rocprof-sys) +set_target_properties(rocprofsys-static-library PROPERTIES OUTPUT_NAME rocprof-sys) # ------------------------------------------------------------------------------# # -# omnitrace shared library +# rocprofsys 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) +add_library(rocprofsys-shared-library SHARED $) +add_library(rocprofsys::librocprofsys-shared ALIAS rocprofsys-shared-library) +add_library(rocprofsys::rocprofsys-library ALIAS rocprofsys-shared-library) target_link_libraries( - omnitrace-shared-library - PRIVATE omnitrace::omnitrace-interface-library omnitrace::omnitrace-core - omnitrace::omnitrace-binary) + rocprofsys-shared-library + PRIVATE rocprofsys::rocprofsys-interface-library rocprofsys::rocprofsys-core + rocprofsys::rocprofsys-binary) set_target_properties( - omnitrace-shared-library + rocprofsys-shared-library PROPERTIES OUTPUT_NAME rocprof-sys VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} INSTALL_RPATH "${OMNITRACE_LIB_INSTALL_RPATH}") -omnitrace_strip_target(omnitrace-shared-library) +omnitrace_strip_target(rocprofsys-shared-library) install( - TARGETS omnitrace-shared-library + TARGETS rocprofsys-shared-library DESTINATION ${CMAKE_INSTALL_LIBDIR} OPTIONAL) diff --git a/source/lib/omnitrace/library/CMakeLists.txt b/source/lib/omnitrace/library/CMakeLists.txt index 60f6b4f61..c9a00b1b2 100644 --- a/source/lib/omnitrace/library/CMakeLists.txt +++ b/source/lib/omnitrace/library/CMakeLists.txt @@ -32,29 +32,29 @@ set(library_headers ${CMAKE_CURRENT_LIST_DIR}/thread_info.hpp ${CMAKE_CURRENT_LIST_DIR}/tracing.hpp) -target_sources(omnitrace-object-library PRIVATE ${library_sources} ${library_headers}) +target_sources(rocprofsys-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) + target_sources(rocprofsys-object-library PRIVATE ${CMAKE_CURRENT_LIST_DIR}/rocm.cpp) endif() if(OMNITRACE_USE_ROCTRACER) - target_sources(omnitrace-object-library + target_sources(rocprofsys-object-library PRIVATE ${CMAKE_CURRENT_LIST_DIR}/roctracer.cpp) endif() if(OMNITRACE_USE_RCCL) - target_sources(omnitrace-object-library PRIVATE ${CMAKE_CURRENT_LIST_DIR}/rcclp.cpp) + target_sources(rocprofsys-object-library PRIVATE ${CMAKE_CURRENT_LIST_DIR}/rcclp.cpp) endif() if(OMNITRACE_USE_ROCPROFILER) target_sources( - omnitrace-object-library PRIVATE ${CMAKE_CURRENT_LIST_DIR}/rocprofiler.cpp + rocprofsys-object-library PRIVATE ${CMAKE_CURRENT_LIST_DIR}/rocprofiler.cpp ${CMAKE_CURRENT_LIST_DIR}/rocprofiler.hpp) endif() if(OMNITRACE_USE_ROCM_SMI) - target_sources(omnitrace-object-library + target_sources(rocprofsys-object-library PRIVATE ${CMAKE_CURRENT_LIST_DIR}/rocm_smi.cpp) endif() diff --git a/source/lib/omnitrace/library/causal/CMakeLists.txt b/source/lib/omnitrace/library/causal/CMakeLists.txt index d00fe85fc..b8d4b5d71 100644 --- a/source/lib/omnitrace/library/causal/CMakeLists.txt +++ b/source/lib/omnitrace/library/causal/CMakeLists.txt @@ -9,6 +9,6 @@ set(causal_headers ${CMAKE_CURRENT_LIST_DIR}/experiment.hpp ${CMAKE_CURRENT_LIST_DIR}/sample_data.hpp ${CMAKE_CURRENT_LIST_DIR}/sampling.hpp ${CMAKE_CURRENT_LIST_DIR}/selected_entry.hpp) -target_sources(omnitrace-object-library PRIVATE ${causal_sources} ${causal_headers}) +target_sources(rocprofsys-object-library PRIVATE ${causal_sources} ${causal_headers}) add_subdirectory(components) diff --git a/source/lib/omnitrace/library/causal/components/CMakeLists.txt b/source/lib/omnitrace/library/causal/components/CMakeLists.txt index ef71d103c..cc62c6ecb 100644 --- a/source/lib/omnitrace/library/causal/components/CMakeLists.txt +++ b/source/lib/omnitrace/library/causal/components/CMakeLists.txt @@ -13,4 +13,4 @@ set(component_headers ${CMAKE_CURRENT_LIST_DIR}/progress_point.hpp ${CMAKE_CURRENT_LIST_DIR}/unblocking_gotcha.hpp) -target_sources(omnitrace-object-library PRIVATE ${component_sources} ${component_headers}) +target_sources(rocprofsys-object-library PRIVATE ${component_sources} ${component_headers}) diff --git a/source/lib/omnitrace/library/components/CMakeLists.txt b/source/lib/omnitrace/library/components/CMakeLists.txt index efc8915e8..e5a4b7160 100644 --- a/source/lib/omnitrace/library/components/CMakeLists.txt +++ b/source/lib/omnitrace/library/components/CMakeLists.txt @@ -34,18 +34,18 @@ set(component_headers ${CMAKE_CURRENT_LIST_DIR}/pthread_create_gotcha.hpp ${CMAKE_CURRENT_LIST_DIR}/pthread_mutex_gotcha.hpp) -target_sources(omnitrace-object-library PRIVATE ${component_sources} ${component_headers}) +target_sources(rocprofsys-object-library PRIVATE ${component_sources} ${component_headers}) if(OMNITRACE_USE_ROCPROFILER) - target_sources(omnitrace-object-library + target_sources(rocprofsys-object-library PRIVATE ${CMAKE_CURRENT_LIST_DIR}/rocprofiler.cpp) endif() if(OMNITRACE_USE_ROCTRACER) - target_sources(omnitrace-object-library + target_sources(rocprofsys-object-library PRIVATE ${CMAKE_CURRENT_LIST_DIR}/roctracer.cpp) endif() if(OMNITRACE_USE_RCCL) - target_sources(omnitrace-object-library PRIVATE ${CMAKE_CURRENT_LIST_DIR}/rcclp.cpp) + target_sources(rocprofsys-object-library PRIVATE ${CMAKE_CURRENT_LIST_DIR}/rcclp.cpp) endif() diff --git a/source/lib/omnitrace/library/coverage/CMakeLists.txt b/source/lib/omnitrace/library/coverage/CMakeLists.txt index bd8a386cb..294f7f669 100644 --- a/source/lib/omnitrace/library/coverage/CMakeLists.txt +++ b/source/lib/omnitrace/library/coverage/CMakeLists.txt @@ -2,4 +2,4 @@ set(coverage_sources) set(coverage_headers ${CMAKE_CURRENT_LIST_DIR}/impl.hpp) -target_sources(omnitrace-object-library PRIVATE ${coverage_sources} ${coverage_headers}) +target_sources(rocprofsys-object-library PRIVATE ${coverage_sources} ${coverage_headers}) diff --git a/source/lib/omnitrace/library/rocm/CMakeLists.txt b/source/lib/omnitrace/library/rocm/CMakeLists.txt index 357ca9383..c7ef07975 100644 --- a/source/lib/omnitrace/library/rocm/CMakeLists.txt +++ b/source/lib/omnitrace/library/rocm/CMakeLists.txt @@ -1,6 +1,6 @@ # if(OMNITRACE_USE_ROCPROFILER OR OMNITRACE_USE_ROCTRACER) target_sources( - omnitrace-object-library PRIVATE ${CMAKE_CURRENT_LIST_DIR}/hsa_rsrc_factory.hpp + rocprofsys-object-library PRIVATE ${CMAKE_CURRENT_LIST_DIR}/hsa_rsrc_factory.hpp ${CMAKE_CURRENT_LIST_DIR}/hsa_rsrc_factory.cpp) endif() diff --git a/source/lib/omnitrace/library/tracing/CMakeLists.txt b/source/lib/omnitrace/library/tracing/CMakeLists.txt index b9c38d055..0a3a98ebf 100644 --- a/source/lib/omnitrace/library/tracing/CMakeLists.txt +++ b/source/lib/omnitrace/library/tracing/CMakeLists.txt @@ -2,4 +2,4 @@ set(tracing_sources ${CMAKE_CURRENT_LIST_DIR}/annotation.cpp) set(tracing_headers ${CMAKE_CURRENT_LIST_DIR}/annotation.hpp) -target_sources(omnitrace-object-library PRIVATE ${tracing_sources} ${tracing_headers}) +target_sources(rocprofsys-object-library PRIVATE ${tracing_sources} ${tracing_headers}) diff --git a/source/python/CMakeLists.txt b/source/python/CMakeLists.txt index 8a8eb019a..59fba76eb 100644 --- a/source/python/CMakeLists.txt +++ b/source/python/CMakeLists.txt @@ -1,6 +1,6 @@ # ######################################################################################## # -# omnitrace (Python) +# rocprofsys (Python) # # ######################################################################################## @@ -19,7 +19,7 @@ set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME python) function(OMNITRACE_CONFIGURE_PYTARGET _TARGET _VERSION) - add_library(omnitrace::${_TARGET} ALIAS ${_TARGET}) + add_library(rocprofsys::${_TARGET} ALIAS ${_TARGET}) target_link_libraries(${_TARGET} PRIVATE libpyrocprofsys-interface) add_dependencies(libpyrocprofsys ${_TARGET}) @@ -60,11 +60,11 @@ endfunction() # ######################################################################################## -add_library(omnitrace-python-compile-options INTERFACE) -add_library(omnitrace::omnitrace-python-compile-options ALIAS - omnitrace-python-compile-options) +add_library(rocprofsys-python-compile-options INTERFACE) +add_library(rocprofsys::rocprofsys-python-compile-options ALIAS + rocprofsys-python-compile-options) add_target_cxx_flag_if_avail( - omnitrace-python-compile-options "-Wno-unused-value" "-Wno-range-loop-analysis" + rocprofsys-python-compile-options "-Wno-unused-value" "-Wno-range-loop-analysis" "-Wno-deprecated-declarations" "-Wno-unused-but-set-parameter" "-ftls-model=global-dynamic") @@ -78,14 +78,14 @@ target_link_libraries( libpyrocprofsys-interface INTERFACE pybind11::module timemory::timemory-headers - omnitrace::omnitrace-headers - omnitrace::omnitrace-compile-options - omnitrace::omnitrace-static-libgcc-optional - omnitrace::omnitrace-lto - omnitrace::omnitrace-dl-library - omnitrace::omnitrace-user-library - omnitrace::omnitrace-python - omnitrace::omnitrace-python-compile-options) + rocprofsys::rocprofsys-headers + rocprofsys::rocprofsys-compile-options + rocprofsys::rocprofsys-static-libgcc-optional + rocprofsys::rocprofsys-lto + rocprofsys::rocprofsys-dl-library + rocprofsys::rocprofsys-user-library + rocprofsys::rocprofsys-python + rocprofsys::rocprofsys-python-compile-options) omnitrace_target_compile_definitions(libpyrocprofsys-interface INTERFACE OMNITRACE_PYBIND11_SOURCE) diff --git a/source/python/cmake/ConfigPython.cmake b/source/python/cmake/ConfigPython.cmake index 06bcc64e9..824995424 100644 --- a/source/python/cmake/ConfigPython.cmake +++ b/source/python/cmake/ConfigPython.cmake @@ -54,14 +54,14 @@ foreach(_VAR FIND_STRATEGY FIND_VIRTUALENV FIND_FRAMEWORK FIND_IMPLEMENTATIONS if(DEFINED Python3_${_VAR}) set(Python_${_VAR} "${Python3_${_VAR}}" - CACHE STRING "Set via Python3_${_VAR} setting (omnitrace)") + CACHE STRING "Set via Python3_${_VAR} setting (rocprofsys)") mark_as_advanced(Python_${_VAR}) mark_as_advanced(Python3_${_VAR}) endif() endforeach() # display version -omnitrace_add_feature(OMNITRACE_PYTHON_VERSIONS "Python version for omnitrace" DOC) +omnitrace_add_feature(OMNITRACE_PYTHON_VERSIONS "Python version for rocprofsys" DOC) option(PYBIND11_INSTALL "Enable Pybind11 installation" OFF) diff --git a/source/python/setup.cfg.in b/source/python/setup.cfg.in index 2c8cccee5..cc67caf6b 100644 --- a/source/python/setup.cfg.in +++ b/source/python/setup.cfg.in @@ -1,5 +1,5 @@ [metadata] -name = rocprofsys +name = @PROJECT_NAME@ url = @PROJECT_HOMEPAGE_URL@ download_url = @PROJECT_HOMEPAGE_URL@.git maintainer = AMD ROCm @@ -30,6 +30,6 @@ classifiers = Topic :: Utilities [options] -packages = rocprofsys +packages = @PROJECT_NAME@ zip_safe = false include_package_data = false diff --git a/source/python/setup.py.in b/source/python/setup.py.in index 10f022475..3cd1a0e04 100644 --- a/source/python/setup.py.in +++ b/source/python/setup.py.in @@ -3,10 +3,10 @@ from setuptools import setup setup( - name="rocprofsys", + name="@PROJECT_NAME@", version="@PROJECT_VERSION@", description="@PROJECT_DESCRIPTION@", author="AMD ROCm", url="@PROJECT_HOMEPAGE_URL@", - packages=["rocprofsys"], + packages=["@PROJECT_NAME@"], ) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index cd695bca8..f207e8616 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,5 +1,5 @@ # -# omnitrace tests +# rocprofsys tests # include_guard(GLOBAL) diff --git a/tests/omnitrace-attach-tests.cmake b/tests/omnitrace-attach-tests.cmake index 3c2e82086..43bed5a81 100644 --- a/tests/omnitrace-attach-tests.cmake +++ b/tests/omnitrace-attach-tests.cmake @@ -30,13 +30,13 @@ endif() add_test( NAME parallel-overhead-attach COMMAND - ${CMAKE_CURRENT_LIST_DIR}/run-omnitrace-pid.sh $ + ${CMAKE_CURRENT_LIST_DIR}/run-rocprofsys-pid.sh $ -ME "\.c$" -E fib -e -v 1 --label return args file -l -- $ 30 8 1000 WORKING_DIRECTORY ${PROJECT_BINARY_DIR}) set(_parallel_overhead_attach_environ - "${_attach_environment}" "OMNITRACE_OUTPUT_PATH=omnitrace-tests-output" + "${_attach_environment}" "OMNITRACE_OUTPUT_PATH=rocprofsys-tests-output" "OMNITRACE_OUTPUT_PREFIX=parallel-overhead-attach/") set_tests_properties( diff --git a/tests/omnitrace-causal-tests.cmake b/tests/omnitrace-causal-tests.cmake index ef63cf887..205eceb60 100644 --- a/tests/omnitrace-causal-tests.cmake +++ b/tests/omnitrace-causal-tests.cmake @@ -47,7 +47,7 @@ omnitrace_add_causal_test( 3 --monochrome -g - ${CMAKE_BINARY_DIR}/omnitrace-tests-config/causal-both-omni-func + ${CMAKE_BINARY_DIR}/rocprofsys-tests-config/causal-both-omni-func -l causal-both-omni -v @@ -113,7 +113,7 @@ macro( # arguments to validate-causal-json.py set(${_NAME}_valid - "-n 0 -i omnitrace-tests-output/causal-cpu-omni-${_TEST}-e2e/causal/experiments.json -v ${_EXPER} $ 10 ${_V10} ${_TOL} ${_EXPER} $ 20 ${_V20} ${_TOL} ${_EXPER} $ 30 ${_V30} ${_TOL}" + "-n 0 -i rocprofsys-tests-output/causal-cpu-omni-${_TEST}-e2e/causal/experiments.json -v ${_EXPER} $ 10 ${_V10} ${_TOL} ${_EXPER} $ 20 ${_V20} ${_TOL} ${_EXPER} $ 30 ${_V30} ${_TOL}" ) # patch string for command-line diff --git a/tests/omnitrace-config-tests.cmake b/tests/omnitrace-config-tests.cmake index 91fd63cb1..80d527133 100644 --- a/tests/omnitrace-config-tests.cmake +++ b/tests/omnitrace-config-tests.cmake @@ -18,12 +18,12 @@ else() endif() add_test( - NAME omnitrace-invalid-config - COMMAND $ -- ${_CONFIG_TEST_EXE} + NAME rocprofsys-invalid-config + COMMAND $ -- ${_CONFIG_TEST_EXE} WORKING_DIRECTORY ${PROJECT_BINARY_DIR}) set_tests_properties( - omnitrace-invalid-config + rocprofsys-invalid-config PROPERTIES ENVIRONMENT "OMNITRACE_CONFIG_FILE=${CMAKE_CURRENT_BINARY_DIR}/invalid.cfg;OMNITRACE_CI=ON;OMNITRACE_CI_TIMEOUT=120" @@ -35,12 +35,12 @@ set_tests_properties( ON) add_test( - NAME omnitrace-missing-config - COMMAND $ -- ${_CONFIG_TEST_EXE} + NAME rocprofsys-missing-config + COMMAND $ -- ${_CONFIG_TEST_EXE} WORKING_DIRECTORY ${PROJECT_BINARY_DIR}) set_tests_properties( - omnitrace-missing-config + rocprofsys-missing-config PROPERTIES ENVIRONMENT "OMNITRACE_CONFIG_FILE=${CMAKE_CURRENT_BINARY_DIR}/missing.cfg;OMNITRACE_CI=ON;OMNITRACE_CI_TIMEOUT=120" diff --git a/tests/omnitrace-python-tests.cmake b/tests/omnitrace-python-tests.cmake index 5f770a657..b1d812c9f 100644 --- a/tests/omnitrace-python-tests.cmake +++ b/tests/omnitrace-python-tests.cmake @@ -74,10 +74,10 @@ foreach(_VERSION ${OMNITRACE_PYTHON_VERSIONS}) FILE ${CMAKE_SOURCE_DIR}/examples/code-coverage/code-coverage.py RUN_ARGS -i - ${PROJECT_BINARY_DIR}/omnitrace-tests-output/code-coverage-basic-blocks-binary-rewrite/coverage.json - ${PROJECT_BINARY_DIR}/omnitrace-tests-output/code-coverage-basic-blocks-hybrid-runtime-instrument/coverage.json + ${PROJECT_BINARY_DIR}/rocprofsys-tests-output/code-coverage-basic-blocks-binary-rewrite/coverage.json + ${PROJECT_BINARY_DIR}/rocprofsys-tests-output/code-coverage-basic-blocks-hybrid-runtime-instrument/coverage.json -o - ${PROJECT_BINARY_DIR}/omnitrace-tests-output/code-coverage-basic-blocks-summary/coverage.json + ${PROJECT_BINARY_DIR}/rocprofsys-tests-output/code-coverage-basic-blocks-summary/coverage.json DEPENDS code-coverage-basic-blocks-binary-rewrite code-coverage-basic-blocks-binary-rewrite-run code-coverage-basic-blocks-hybrid-runtime-instrument @@ -105,7 +105,7 @@ foreach(_VERSION ${OMNITRACE_PYTHON_VERSIONS}) NAME python-external-check COMMAND ${OMNITRACE_CAT_COMMAND} PYTHON_VERSION ${_VERSION} - FILE omnitrace-tests-output/python-external/${_VERSION}/trip_count.txt + FILE rocprofsys-tests-output/python-external/${_VERSION}/trip_count.txt PASS_REGEX "(\\\[compile\\\]).*(\\\| \\\|0>>> \\\[run\\\]\\\[external.py\\\]).*(\\\| \\\|0>>> \\\|_\\\[fib\\\]\\\[external.py\\\]).*(\\\| \\\|0>>> \\\|_\\\[inefficient\\\]\\\[external.py\\\])" DEPENDS python-external-${_VERSION} @@ -115,7 +115,7 @@ foreach(_VERSION ${OMNITRACE_PYTHON_VERSIONS}) NAME python-external-exclude-inefficient-check COMMAND ${OMNITRACE_CAT_COMMAND} PYTHON_VERSION ${_VERSION} - FILE omnitrace-tests-output/python-external-exclude-inefficient/${_VERSION}/trip_count.txt + FILE rocprofsys-tests-output/python-external-exclude-inefficient/${_VERSION}/trip_count.txt FAIL_REGEX "(\\\|_inefficient).*(\\\|_sum)|OMNITRACE_ABORT_FAIL_REGEX" DEPENDS python-external-exclude-inefficient-${_VERSION} ENVIRONMENT "${_python_environment}") @@ -124,7 +124,7 @@ foreach(_VERSION ${OMNITRACE_PYTHON_VERSIONS}) NAME python-builtin-check COMMAND ${OMNITRACE_CAT_COMMAND} PYTHON_VERSION ${_VERSION} - FILE omnitrace-tests-output/python-builtin/${_VERSION}/trip_count.txt + FILE rocprofsys-tests-output/python-builtin/${_VERSION}/trip_count.txt PASS_REGEX "\\\[inefficient\\\]\\\[builtin.py:14\\\]" DEPENDS python-builtin-${_VERSION} ENVIRONMENT "${_python_environment}") @@ -133,7 +133,7 @@ foreach(_VERSION ${OMNITRACE_PYTHON_VERSIONS}) NAME python-builtin-noprofile-check COMMAND ${OMNITRACE_CAT_COMMAND} PYTHON_VERSION ${_VERSION} - FILE omnitrace-tests-output/python-builtin-noprofile/${_VERSION}/trip_count.txt + FILE rocprofsys-tests-output/python-builtin-noprofile/${_VERSION}/trip_count.txt PASS_REGEX ".(run)..(noprofile.py)." FAIL_REGEX ".(fib|inefficient)..(noprofile.py).|OMNITRACE_ABORT_FAIL_REGEX" DEPENDS python-builtin-noprofile-${_VERSION} @@ -156,10 +156,10 @@ foreach(_VERSION ${OMNITRACE_PYTHON_VERSIONS}) ${_PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/validate-timemory-json.py -m ${TEST_TIMEMORY_METRIC} ${TEST_ARGS} -i PYTHON_VERSION ${_VERSION} - FILE omnitrace-tests-output/${TEST_NAME}/${_VERSION}/${TEST_TIMEMORY_FILE} + FILE rocprofsys-tests-output/${TEST_NAME}/${_VERSION}/${TEST_TIMEMORY_FILE} DEPENDS ${TEST_NAME}-${_VERSION} PASS_REGEX - "omnitrace-tests-output/${TEST_NAME}/${_VERSION}/${TEST_TIMEMORY_FILE} validated" + "rocprofsys-tests-output/${TEST_NAME}/${_VERSION}/${TEST_TIMEMORY_FILE} validated" ENVIRONMENT "${_python_environment}") omnitrace_add_python_test( @@ -169,10 +169,10 @@ foreach(_VERSION ${OMNITRACE_PYTHON_VERSIONS}) -m ${TEST_PERFETTO_METRIC} ${TEST_ARGS} -p -t /opt/trace_processor/bin/trace_processor_shell -i PYTHON_VERSION ${_VERSION} - FILE omnitrace-tests-output/${TEST_NAME}/${_VERSION}/${TEST_PERFETTO_FILE} + FILE rocprofsys-tests-output/${TEST_NAME}/${_VERSION}/${TEST_PERFETTO_FILE} DEPENDS ${TEST_NAME}-${_VERSION} PASS_REGEX - "omnitrace-tests-output/${TEST_NAME}/${_VERSION}/${TEST_PERFETTO_FILE} validated" + "rocprofsys-tests-output/${TEST_NAME}/${_VERSION}/${TEST_PERFETTO_FILE} validated" ENVIRONMENT "${_python_environment}") endfunction() diff --git a/tests/omnitrace-testing.cmake b/tests/omnitrace-testing.cmake index a7d08eb2b..44f1f03aa 100644 --- a/tests/omnitrace-testing.cmake +++ b/tests/omnitrace-testing.cmake @@ -300,7 +300,7 @@ function(OMNITRACE_WRITE_TEST_CONFIG _FILE _ENV) endif() endforeach() - set(_CONFIG_FILE ${PROJECT_BINARY_DIR}/omnitrace-tests-config/${_FILE}) + set(_CONFIG_FILE ${PROJECT_BINARY_DIR}/rocprofsys-tests-config/${_FILE}) file( WRITE ${_CONFIG_FILE} "# auto-generated by cmake @@ -481,7 +481,7 @@ function(OMNITRACE_ADD_TEST) add_test( NAME ${TEST_NAME}-sampling COMMAND - ${COMMAND_PREFIX} $ ${TEST_SAMPLE_ARGS} + ${COMMAND_PREFIX} $ ${TEST_SAMPLE_ARGS} -- $ ${TEST_RUN_ARGS} WORKING_DIRECTORY ${PROJECT_BINARY_DIR}) endif() @@ -490,7 +490,7 @@ function(OMNITRACE_ADD_TEST) add_test( NAME ${TEST_NAME}-binary-rewrite COMMAND - $ -o + $ -o $/${TEST_NAME}.inst ${TEST_REWRITE_ARGS} -- $ WORKING_DIRECTORY ${PROJECT_BINARY_DIR}) @@ -498,7 +498,7 @@ function(OMNITRACE_ADD_TEST) add_test( NAME ${TEST_NAME}-binary-rewrite-run COMMAND - ${COMMAND_PREFIX} $ -- + ${COMMAND_PREFIX} $ -- $/${TEST_NAME}.inst ${TEST_RUN_ARGS} WORKING_DIRECTORY ${PROJECT_BINARY_DIR}) endif() @@ -506,7 +506,7 @@ function(OMNITRACE_ADD_TEST) if(NOT TEST_SKIP_RUNTIME AND NOT OMNITRACE_USE_SANITIZER) add_test( NAME ${TEST_NAME}-runtime-instrument - COMMAND $ ${TEST_RUNTIME_ARGS} -- + COMMAND $ ${TEST_RUNTIME_ARGS} -- $ ${TEST_RUN_ARGS} WORKING_DIRECTORY ${PROJECT_BINARY_DIR}) endif() @@ -530,7 +530,7 @@ function(OMNITRACE_ADD_TEST) set(_environ "OMNITRACE_DEFAULT_MIN_INSTRUCTIONS=64" "${TEST_ENVIRONMENT}" - "OMNITRACE_OUTPUT_PATH=${PROJECT_BINARY_DIR}/omnitrace-tests-output" + "OMNITRACE_OUTPUT_PATH=${PROJECT_BINARY_DIR}/rocprofsys-tests-output" "OMNITRACE_OUTPUT_PREFIX=${_prefix}") set(_timeout ${TEST_REWRITE_TIMEOUT}) @@ -636,7 +636,7 @@ function(OMNITRACE_ADD_CAUSAL_TEST) endif() if(TARGET ${TEST_TARGET}) - set(COMMAND_PREFIX $ --reset -m ${TEST_CAUSAL_MODE} + set(COMMAND_PREFIX $ --reset -m ${TEST_CAUSAL_MODE} ${TEST_CAUSAL_ARGS} --) if(NOT TEST_SKIP_BASELINE) @@ -697,7 +697,7 @@ function(OMNITRACE_ADD_CAUSAL_TEST) set(_environ "${_causal_environment}" - "OMNITRACE_OUTPUT_PATH=${PROJECT_BINARY_DIR}/omnitrace-tests-output" + "OMNITRACE_OUTPUT_PATH=${PROJECT_BINARY_DIR}/rocprofsys-tests-output" "OMNITRACE_OUTPUT_PREFIX=${_prefix}" "OMNITRACE_CI=ON" "OMNITRACE_USE_PID=OFF" @@ -786,7 +786,7 @@ function(OMNITRACE_ADD_PYTHON_TEST) if(NOT TEST_COMMAND) list(APPEND TEST_ENVIRONMENT "OMNITRACE_CI=ON" - "OMNITRACE_OUTPUT_PATH=${PROJECT_BINARY_DIR}/omnitrace-tests-output") + "OMNITRACE_OUTPUT_PATH=${PROJECT_BINARY_DIR}/rocprofsys-tests-output") get_filename_component(_TEST_FILE "${TEST_FILE}" NAME) set(_TEST_FILE ${PROJECT_BINARY_DIR}/python/tests/${TEST_PYTHON_VERSION}/${_TEST_FILE}) @@ -962,7 +962,7 @@ function(OMNITRACE_ADD_VALIDATION_TEST) if(NOT TEST_PASS_REGEX) set(TEST_PASS_REGEX - "omnitrace-tests-output/${TEST_NAME}/(${TEST_TIMEMORY_FILE}|${TEST_PERFETTO_FILE}) validated" + "rocprofsys-tests-output/${TEST_NAME}/(${TEST_TIMEMORY_FILE}|${TEST_PERFETTO_FILE}) validated" ) endif() @@ -973,7 +973,7 @@ function(OMNITRACE_ADD_VALIDATION_TEST) ${OMNITRACE_VALIDATION_PYTHON} ${CMAKE_CURRENT_LIST_DIR}/validate-timemory-json.py -m "${TEST_TIMEMORY_METRIC}" ${TEST_ARGS} -i - ${PROJECT_BINARY_DIR}/omnitrace-tests-output/${TEST_NAME}/${TEST_TIMEMORY_FILE} + ${PROJECT_BINARY_DIR}/rocprofsys-tests-output/${TEST_NAME}/${TEST_TIMEMORY_FILE} WORKING_DIRECTORY ${PROJECT_BINARY_DIR}) endif() @@ -984,7 +984,7 @@ function(OMNITRACE_ADD_VALIDATION_TEST) ${OMNITRACE_VALIDATION_PYTHON} ${CMAKE_CURRENT_LIST_DIR}/validate-perfetto-proto.py -m "${TEST_PERFETTO_METRIC}" ${TEST_ARGS} -i - ${PROJECT_BINARY_DIR}/omnitrace-tests-output/${TEST_NAME}/${TEST_PERFETTO_FILE} + ${PROJECT_BINARY_DIR}/rocprofsys-tests-output/${TEST_NAME}/${TEST_PERFETTO_FILE} -t /opt/trace_processor/bin/trace_processor_shell WORKING_DIRECTORY ${PROJECT_BINARY_DIR}) endif()