diff --git a/projects/rocprofiler-sdk/CMakeLists.txt b/projects/rocprofiler-sdk/CMakeLists.txt index abe4c282a8..a38fa8666b 100644 --- a/projects/rocprofiler-sdk/CMakeLists.txt +++ b/projects/rocprofiler-sdk/CMakeLists.txt @@ -97,6 +97,8 @@ include(CTest) add_subdirectory(external) add_subdirectory(source) +include(rocprofiler_config_install) + if(ROCPROFILER_BUILD_TESTS) add_subdirectory(tests) endif() @@ -105,7 +107,6 @@ if(ROCPROFILER_BUILD_SAMPLES) add_subdirectory(samples) endif() -include(rocprofiler_config_install) include(rocprofiler_config_packaging) rocprofiler_print_features() diff --git a/projects/rocprofiler-sdk/RPM/post.in b/projects/rocprofiler-sdk/RPM/post.in index 3fb4dd57af..aaa90406ff 100644 --- a/projects/rocprofiler-sdk/RPM/post.in +++ b/projects/rocprofiler-sdk/RPM/post.in @@ -1,5 +1,5 @@ # left-hand term originates from ENABLE_LDCONFIG = ON/OFF at package build if [ "@ENABLE_LDCONFIG@" == "ON" ]; then - echo @CPACK_PACKAGING_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ > /@CMAKE_INSTALL_SYSCONFDIR@/ld.so.conf.d/librocprofiler64.conf + echo @CPACK_PACKAGING_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ > /@CMAKE_INSTALL_SYSCONFDIR@/ld.so.conf.d/librocprofiler-sdk.conf ldconfig fi diff --git a/projects/rocprofiler-sdk/RPM/postun.in b/projects/rocprofiler-sdk/RPM/postun.in index c5750b65e2..ea4a5f1864 100644 --- a/projects/rocprofiler-sdk/RPM/postun.in +++ b/projects/rocprofiler-sdk/RPM/postun.in @@ -1,4 +1,4 @@ # left-hand term originates from ENABLE_LDCONFIG = ON/OFF at package build if [ "@ENABLE_LDCONFIG@" == "ON" ]; then - rm -f /@CMAKE_INSTALL_SYSCONFDIR@/ld.so.conf.d/librocprofiler64.conf && ldconfig + rm -f /@CMAKE_INSTALL_SYSCONFDIR@/ld.so.conf.d/librocprofiler-sdk.conf && ldconfig fi diff --git a/projects/rocprofiler-sdk/VERSION b/projects/rocprofiler-sdk/VERSION index 227cea2156..77d6f4ca23 100644 --- a/projects/rocprofiler-sdk/VERSION +++ b/projects/rocprofiler-sdk/VERSION @@ -1 +1 @@ -2.0.0 +0.0.0 diff --git a/projects/rocprofiler-sdk/cmake/Templates/modulefile.in b/projects/rocprofiler-sdk/cmake/Templates/modulefile.in index 352fd6b877..656746f0e4 100644 --- a/projects/rocprofiler-sdk/cmake/Templates/modulefile.in +++ b/projects/rocprofiler-sdk/cmake/Templates/modulefile.in @@ -1,9 +1,9 @@ #%Module1.0 -module-whatis "@PROJECT_NAME@ (version @PROJECT_VERSION@)" +module-whatis "@PROJECT_NAME@-sdk (version @PROJECT_VERSION@)" proc ModulesHelp { } { -puts stderr "Loads @PROJECT_NAME@ v@PROJECT_VERSION@" +puts stderr "Loads @PROJECT_NAME@-sdk v@PROJECT_VERSION@" } set ROOT [file normalize [file dirname [file normalize ${ModulesCurrentModulefile}]]/../../..] @@ -13,4 +13,4 @@ prepend-path CMAKE_PREFIX_PATH "${ROOT}" prepend-path PATH "${ROOT}/bin" 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@" +setenv @PROJECT_NAME@_DIR "${ROOT}/@CMAKE_INSTALL_DATAROOTDIR@/cmake/@PROJECT_NAME@-sdk" diff --git a/projects/rocprofiler-sdk/cmake/Templates/rocprofiler-config.cmake.in b/projects/rocprofiler-sdk/cmake/Templates/rocprofiler-config.cmake.in deleted file mode 100644 index c096984620..0000000000 --- a/projects/rocprofiler-sdk/cmake/Templates/rocprofiler-config.cmake.in +++ /dev/null @@ -1,106 +0,0 @@ -# - Config file for @PROJECT_NAME@ and its component libraries -# It defines the following variables: -# -# @PROJECT_NAME@_INCLUDE_DIRS -# @PROJECT_NAME@_LIBRARIES -# @PROJECT_NAME@_INTERNAL_DEFINES - used by the test suite - -# compute paths -get_filename_component(@PROJECT_NAME@_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) - -# version -include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-version.cmake) - -@PACKAGE_INIT@ - -set_and_check(@PROJECT_NAME@_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") -set_and_check(@PROJECT_NAME@_LIB_DIR "@PACKAGE_LIB_INSTALL_DIR@") -get_filename_component(@PROJECT_NAME@_ROOT_DIR ${@PROJECT_NAME@_INCLUDE_DIR} PATH) - -set(@PROJECT_NAME@_LIBRARIES) - -add_library(@PROJECT_NAME@::@PROJECT_NAME@ INTERFACE IMPORTED) - -find_package( - AMDDeviceLibs - REQUIRED - CONFIG - HINTS - @AMDDeviceLibs_DIR@ - @rocm_version_DIR@ - PATHS - @AMDDeviceLibs_DIR@ - @rocm_version_DIR@) - -find_package( - amd_comgr - @amd_comgr_VERSION@ - EXACT - REQUIRED - CONFIG - HINTS - @amd_comgr_DIR@ - @rocm_version_DIR@ - PATHS - @amd_comgr_DIR@ - @rocm_version_DIR@) - -find_package( - hsa-runtime64 - @hsa-runtime64_VERSION@ - EXACT - REQUIRED - CONFIG - HINTS - @hsa-runtime64_DIR@ - @rocm_version_DIR@ - PATHS - @hsa-runtime64_DIR@ - @rocm_version_DIR@) - -find_package( - hip - @hip_VERSION@ - EXACT - REQUIRED - CONFIG - HINTS - @hip_DIR@ - @rocm_version_DIR@ - PATHS - @hip_DIR@ - @rocm_version_DIR@) - -include("${@PROJECT_NAME@_CMAKE_DIR}/@PROJECT_NAME@-library-targets.cmake") - -# Library dependencies -foreach(TARG @PROJECT_BUILD_TARGETS@) - set(TARG @PROJECT_NAME@-${TARG}) - if(NOT @PROJECT_NAME@_FIND_COMPONENTS) - list(APPEND @PROJECT_NAME@_LIBRARIES @PROJECT_NAME@::${TARG}) - target_link_libraries(@PROJECT_NAME@::@PROJECT_NAME@ - INTERFACE @PROJECT_NAME@::${TARG}) - endif() -endforeach() - -if(@PROJECT_NAME@_FIND_COMPONENTS) - foreach(COMP ${@PROJECT_NAME@_FIND_COMPONENTS}) - set(TARG @PROJECT_NAME@::@PROJECT_NAME@-${COMP}) - if(TARGET ${TARG}) - set(@PROJECT_NAME@_${COMP}_FOUND 1) - list(APPEND @PROJECT_NAME@_LIBRARIES ${TARG}) - target_link_libraries(@PROJECT_NAME@::@PROJECT_NAME@ INTERFACE ${TARG}) - else() - set(@PROJECT_NAME@_${COMP}_FOUND 0) - endif() - endforeach() -endif() - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args( - @PROJECT_NAME@ - FOUND_VAR @PROJECT_NAME@_FOUND - REQUIRED_VARS @PROJECT_NAME@_ROOT_DIR @PROJECT_NAME@_INCLUDE_DIR - @PROJECT_NAME@_LIBRARIES - VERSION_VAR @PROJECT_NAME@_VERSION - HANDLE_COMPONENTS) diff --git a/projects/rocprofiler-sdk/cmake/Templates/rocprofiler-sdk-build-config.cmake.in b/projects/rocprofiler-sdk/cmake/Templates/rocprofiler-sdk-build-config.cmake.in new file mode 100644 index 0000000000..484609d631 --- /dev/null +++ b/projects/rocprofiler-sdk/cmake/Templates/rocprofiler-sdk-build-config.cmake.in @@ -0,0 +1,25 @@ +# Config file for @PROJECT_NAME@ and its component libraries in the build tree +# + +if(@PROJECT_NAME@_FIND_COMPONENTS) + foreach(COMP ${@PROJECT_NAME@-sdk_FIND_COMPONENTS}) + set(TARG @PROJECT_NAME@::@PROJECT_NAME@-${COMP}) + if(TARGET ${TARG}) + set(@PROJECT_NAME@-sdk_${COMP}_FOUND 1) + list(APPEND @PROJECT_NAME@-sdk_LIBRARIES ${TARG}) + target_link_libraries(@PROJECT_NAME@::@PROJECT_NAME@ INTERFACE ${TARG}) + else() + set(@PROJECT_NAME@-sdk_${COMP}_FOUND 0) + endif() + endforeach() +else() + set(@PROJECT_NAME@-sdk_LIBRARIES @PROJECT_NAME@::@PROJECT_NAME@) +endif() + +foreach(COMP @PROJECT_BUILD_TREE_TARGETS@) + set(TARG @PROJECT_NAME@::@PROJECT_NAME@-${COMP}) + if(TARGET ${TARG}) + list(APPEND @PROJECT_NAME@-sdk_LIBRARIES ${TARG}) + target_link_libraries(@PROJECT_NAME@::@PROJECT_NAME@ INTERFACE ${TARG}) + endif() +endforeach() diff --git a/projects/rocprofiler-sdk/cmake/Templates/rocprofiler-sdk-config.cmake.in b/projects/rocprofiler-sdk/cmake/Templates/rocprofiler-sdk-config.cmake.in new file mode 100644 index 0000000000..b4b2d03ca6 --- /dev/null +++ b/projects/rocprofiler-sdk/cmake/Templates/rocprofiler-sdk-config.cmake.in @@ -0,0 +1,123 @@ +# - Config file for @PROJECT_NAME@ and its component libraries +# It defines the following variables: +# +# @PROJECT_NAME@-sdk_VERSION +# @PROJECT_NAME@-sdk_INCLUDE_DIR +# @PROJECT_NAME@-sdk_LIB_DIR +# @PROJECT_NAME@-sdk_LIBRARIES +# +# It provides the following interface libraries: +# +# @PROJECT_NAME@::@PROJECT_NAME@ +# @PROJECT_NAME@-sdk::@PROJECT_NAME@-sdk +# + +# compute paths +get_filename_component(@PROJECT_NAME@-sdk_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) + +# version +set(@PROJECT_NAME@-sdk_VERSION @PROJECT_VERSION@) + +@PACKAGE_INIT@ + +set_and_check(@PROJECT_NAME@-sdk_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") +set_and_check(@PROJECT_NAME@-sdk_LIB_DIR "@PACKAGE_LIB_INSTALL_DIR@") +get_filename_component(@PROJECT_NAME@-sdk_ROOT_DIR ${@PROJECT_NAME@-sdk_INCLUDE_DIR} PATH) + +# extra validation +set_and_check(@PROJECT_NAME@_INCLUDE_ROCPROFILER_SDK_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@/@PROJECT_NAME@-sdk") +set_and_check(@PROJECT_NAME@_LIB_ROCPROFILER_SDK_DIR "@PACKAGE_LIB_INSTALL_DIR@/@PROJECT_NAME@-sdk") + +set(@PROJECT_NAME@-sdk_LIBRARIES) + +# add interface library +add_library(@PROJECT_NAME@::@PROJECT_NAME@ INTERFACE IMPORTED) +add_library(@PROJECT_NAME@-sdk::@PROJECT_NAME@-sdk ALIAS @PROJECT_NAME@::@PROJECT_NAME@) + +if(@PROJECT_NAME@_BUILD_TREE AND EXISTS "${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-sdk-build-config.cmake") + include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-sdk-build-config.cmake") +else() + find_package( + AMDDeviceLibs + REQUIRED + CONFIG + HINTS + @AMDDeviceLibs_DIR@ + @rocm_version_DIR@ + PATHS + @AMDDeviceLibs_DIR@ + @rocm_version_DIR@) + + find_package( + amd_comgr + @amd_comgr_VERSION@ + EXACT + REQUIRED + CONFIG + HINTS + @amd_comgr_DIR@ + @rocm_version_DIR@ + PATHS + @amd_comgr_DIR@ + @rocm_version_DIR@) + + find_package( + hsa-runtime64 + @hsa-runtime64_VERSION@ + EXACT + REQUIRED + CONFIG + HINTS + @hsa-runtime64_DIR@ + @rocm_version_DIR@ + PATHS + @hsa-runtime64_DIR@ + @rocm_version_DIR@) + + find_package( + hip + @hip_VERSION@ + EXACT + REQUIRED + CONFIG + HINTS + @hip_DIR@ + @rocm_version_DIR@ + PATHS + @hip_DIR@ + @rocm_version_DIR@) + + include("${@PROJECT_NAME@-sdk_CMAKE_DIR}/@PROJECT_NAME@-sdk-library-targets.cmake") + + # Library dependencies + foreach(TARG @PROJECT_BUILD_TARGETS@) + set(TARG @PROJECT_NAME@::@PROJECT_NAME@-${TARG}) + if(NOT @PROJECT_NAME@_FIND_COMPONENTS) + list(APPEND @PROJECT_NAME@-sdk_LIBRARIES ${TARG}) + target_link_libraries(@PROJECT_NAME@::@PROJECT_NAME@ + INTERFACE ${TARG}) + endif() + endforeach() + + if(@PROJECT_NAME@_FIND_COMPONENTS) + foreach(COMP ${@PROJECT_NAME@_FIND_COMPONENTS}) + set(TARG @PROJECT_NAME@::${COMP}) + if(TARGET ${TARG}) + set(@PROJECT_NAME@-sdk_${COMP}_FOUND 1) + list(APPEND @PROJECT_NAME@-sdk_LIBRARIES ${TARG}) + target_link_libraries(@PROJECT_NAME@::@PROJECT_NAME@ INTERFACE ${TARG}) + else() + set(@PROJECT_NAME@-sdk_${COMP}_FOUND 0) + endif() + endforeach() + endif() +endif() + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args( + @PROJECT_NAME@-sdk + FOUND_VAR @PROJECT_NAME@-sdk_FOUND + VERSION_VAR @PROJECT_NAME@-sdk_VERSION + REQUIRED_VARS @PROJECT_NAME@-sdk_ROOT_DIR @PROJECT_NAME@-sdk_INCLUDE_DIR @PROJECT_NAME@-sdk_LIB_DIR + @PROJECT_NAME@-sdk_LIBRARIES @PROJECT_NAME@-sdk_VERSION + HANDLE_COMPONENTS HANDLE_VERSION_RANGE) diff --git a/projects/rocprofiler-sdk/cmake/Templates/setup-env.sh.in b/projects/rocprofiler-sdk/cmake/Templates/setup-env.sh.in index 43e8374c9c..12c594ef3c 100644 --- a/projects/rocprofiler-sdk/cmake/Templates/setup-env.sh.in +++ b/projects/rocprofiler-sdk/cmake/Templates/setup-env.sh.in @@ -13,7 +13,7 @@ PATH=${BASEDIR}/bin:${PATH} LD_LIBRARY_PATH=${BASEDIR}/@CMAKE_INSTALL_LIBDIR@:${LD_LIBRARY_PATH} PYTHONPATH=${BASEDIR}/@CMAKE_INSTALL_PYTHONDIR@:${PYTHONPATH} CMAKE_PREFIX_PATH=${BASEDIR}:${CMAKE_PREFIX_PATH} -@PROJECT_NAME@_DIR=${BASEDIR}/@CMAKE_INSTALL_DATAROOTDIR@/cmake/@PROJECT_NAME@ +@PROJECT_NAME@_DIR=${BASEDIR}/@CMAKE_INSTALL_DATAROOTDIR@/cmake/@PROJECT_NAME@-sdk export @PROJECT_NAME@_ROOT export PATH diff --git a/projects/rocprofiler-sdk/cmake/rocprofiler_config_install.cmake b/projects/rocprofiler-sdk/cmake/rocprofiler_config_install.cmake index baa366a383..ddd95a096d 100644 --- a/projects/rocprofiler-sdk/cmake/rocprofiler_config_install.cmake +++ b/projects/rocprofiler-sdk/cmake/rocprofiler_config_install.cmake @@ -6,13 +6,13 @@ include(CMakePackageConfigHelpers) set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME config) install(DIRECTORY ${PROJECT_SOURCE_DIR}/samples - DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}) + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}-sdk) install( - EXPORT rocprofiler-library-targets - FILE rocprofiler-library-targets.cmake + EXPORT rocprofiler-sdk-library-targets + FILE rocprofiler-sdk-library-targets.cmake NAMESPACE rocprofiler:: - DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/rocprofiler) + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME}-sdk) # ------------------------------------------------------------------------------# # install tree @@ -23,22 +23,22 @@ set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}) set(PROJECT_BUILD_TARGETS headers shared-library) 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/rocprofiler + ${PROJECT_SOURCE_DIR}/cmake/Templates/${PROJECT_NAME}-sdk-config.cmake.in + ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME}-sdk/${PROJECT_NAME}-sdk-config.cmake + INSTALL_DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/rocprofiler-sdk INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} PATH_VARS PROJECT_INSTALL_DIR INCLUDE_INSTALL_DIR LIB_INSTALL_DIR) write_basic_package_version_file( - ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}-version.cmake + ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME}-sdk/${PROJECT_NAME}-sdk-config-version.cmake VERSION ${PROJECT_VERSION} COMPATIBILITY SameMinorVersion) install( FILES - ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}-config.cmake - ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}-version.cmake - DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME} + ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME}-sdk/${PROJECT_NAME}-sdk-config.cmake + ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME}-sdk/${PROJECT_NAME}-sdk-version.cmake + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME}-sdk OPTIONAL) export(PACKAGE ${PROJECT_NAME}) @@ -46,26 +46,49 @@ export(PACKAGE ${PROJECT_NAME}) # ------------------------------------------------------------------------------# # build tree # +set(${PROJECT_NAME}_BUILD_TREE + ON + CACHE BOOL "" FORCE) + +set(PROJECT_BUILD_TREE_TARGETS headers shared-library build-flags stack-protector) + +configure_file( + ${PROJECT_SOURCE_DIR}/cmake/Templates/${PROJECT_NAME}-sdk-build-config.cmake.in + ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME}-sdk/${PROJECT_NAME}-sdk-build-config.cmake + @ONLY) + +file(RELATIVE_PATH rocp_bin2src_rel_path ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}) +string(REPLACE "//" "/" rocp_inc_rel_path "${rocp_bin2src_rel_path}/source/include") + set(_BUILDTREE_EXPORT_DIR - "${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/cmake/rocprofiler") + "${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME}-sdk") + +execute_process( + COMMAND ${CMAKE_COMMAND} -E create_symlink ${rocp_inc_rel_path} + ${PROJECT_BINARY_DIR}/include WORKING_DIRECTORY ${PROJECT_BINARY_DIR}) if(NOT EXISTS "${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}") file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}") endif() +if(NOT EXISTS "${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}-sdk") + file(MAKE_DIRECTORY + "${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}-sdk") +endif() + if(NOT EXISTS "${_BUILDTREE_EXPORT_DIR}") file(MAKE_DIRECTORY "${_BUILDTREE_EXPORT_DIR}") endif() -if(NOT EXISTS "${_BUILDTREE_EXPORT_DIR}/rocprofiler-library-targets.cmake") - file(TOUCH "${_BUILDTREE_EXPORT_DIR}/rocprofiler-library-targets.cmake") +if(NOT EXISTS "${_BUILDTREE_EXPORT_DIR}/${PROJECT_NAME}-sdk-library-targets.cmake") + file(TOUCH "${_BUILDTREE_EXPORT_DIR}/${PROJECT_NAME}-sdk-library-targets.cmake") endif() export( - EXPORT rocprofiler-library-targets + EXPORT rocprofiler-sdk-library-targets NAMESPACE rocprofiler:: - FILE "${_BUILDTREE_EXPORT_DIR}/rocprofiler-library-targets.cmake") + FILE "${_BUILDTREE_EXPORT_DIR}/${PROJECT_NAME}-sdk-library-targets.cmake") -set(rocprofiler_DIR +set(rocprofiler-sdk_DIR "${_BUILDTREE_EXPORT_DIR}" CACHE PATH "rocprofiler" FORCE) diff --git a/projects/rocprofiler-sdk/cmake/rocprofiler_utilities.cmake b/projects/rocprofiler-sdk/cmake/rocprofiler_utilities.cmake index fb288460dd..05d012a3af 100644 --- a/projects/rocprofiler-sdk/cmake/rocprofiler_utilities.cmake +++ b/projects/rocprofiler-sdk/cmake/rocprofiler_utilities.cmake @@ -360,7 +360,7 @@ function(ROCPROFILER_ADD_INTERFACE_LIBRARY _TARGET _DESCRIPT) TARGETS ${_TARGET} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT core - EXPORT ${PROJECT_NAME}-library-targets + EXPORT rocprofiler-sdk-library-targets OPTIONAL) endif() endfunction() diff --git a/projects/rocprofiler-sdk/samples/CMakeLists.txt b/projects/rocprofiler-sdk/samples/CMakeLists.txt index 100eedfcd3..dad701a647 100644 --- a/projects/rocprofiler-sdk/samples/CMakeLists.txt +++ b/projects/rocprofiler-sdk/samples/CMakeLists.txt @@ -3,7 +3,7 @@ # cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR) -project(rocprofiler-samples LANGUAGES C CXX) +project(rocprofiler-sdk-samples LANGUAGES C CXX) if(CMAKE_BUILD_TYPE STREQUAL "") set(CMAKE_BUILD_TYPE diff --git a/projects/rocprofiler-sdk/samples/api_buffered_tracing/CMakeLists.txt b/projects/rocprofiler-sdk/samples/api_buffered_tracing/CMakeLists.txt index a8bff6e349..bf1913a02b 100644 --- a/projects/rocprofiler-sdk/samples/api_buffered_tracing/CMakeLists.txt +++ b/projects/rocprofiler-sdk/samples/api_buffered_tracing/CMakeLists.txt @@ -17,7 +17,7 @@ if(NOT CMAKE_HIP_COMPILER) endif() endif() -project(rocprofiler-samples-buffered-api-tracing LANGUAGES CXX HIP) +project(rocprofiler-sdk-samples-buffered-api-tracing LANGUAGES CXX HIP) foreach(_TYPE DEBUG MINSIZEREL RELEASE RELWITHDEBINFO) if("${CMAKE_HIP_FLAGS_${_TYPE}}" STREQUAL "") @@ -25,9 +25,7 @@ foreach(_TYPE DEBUG MINSIZEREL RELEASE RELWITHDEBINFO) endif() endforeach() -if(NOT TARGET rocprofiler::rocprofiler) - find_package(rocprofiler REQUIRED) -endif() +find_package(rocprofiler-sdk REQUIRED) add_library(buffered-api-tracing-client SHARED) target_sources(buffered-api-tracing-client PRIVATE client.cpp client.hpp) diff --git a/projects/rocprofiler-sdk/samples/api_buffered_tracing/client.cpp b/projects/rocprofiler-sdk/samples/api_buffered_tracing/client.cpp index 4e76f72521..0def999330 100644 --- a/projects/rocprofiler-sdk/samples/api_buffered_tracing/client.cpp +++ b/projects/rocprofiler-sdk/samples/api_buffered_tracing/client.cpp @@ -33,13 +33,13 @@ #include "client.hpp" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include "common/defines.hpp" #include "common/filesystem.hpp" @@ -506,8 +506,8 @@ rocprofiler_configure(uint32_t version, // generate info string auto info = std::stringstream{}; - info << id->name << " is using rocprofiler v" << major << "." << minor << "." << patch << " (" - << runtime_version << ")"; + info << id->name << " is using rocprofiler-sdk v" << major << "." << minor << "." << patch + << " (" << runtime_version << ")"; std::clog << info.str() << std::endl; diff --git a/projects/rocprofiler-sdk/samples/api_callback_tracing/CMakeLists.txt b/projects/rocprofiler-sdk/samples/api_callback_tracing/CMakeLists.txt index ca58be9ef9..0e794e662a 100644 --- a/projects/rocprofiler-sdk/samples/api_callback_tracing/CMakeLists.txt +++ b/projects/rocprofiler-sdk/samples/api_callback_tracing/CMakeLists.txt @@ -17,7 +17,7 @@ if(NOT CMAKE_HIP_COMPILER) endif() endif() -project(rocprofiler-samples-callback-api-tracing LANGUAGES CXX HIP) +project(rocprofiler-sdk-samples-callback-api-tracing LANGUAGES CXX HIP) foreach(_TYPE DEBUG MINSIZEREL RELEASE RELWITHDEBINFO) if("${CMAKE_HIP_FLAGS_${_TYPE}}" STREQUAL "") @@ -25,9 +25,7 @@ foreach(_TYPE DEBUG MINSIZEREL RELEASE RELWITHDEBINFO) endif() endforeach() -if(NOT TARGET rocprofiler::rocprofiler) - find_package(rocprofiler REQUIRED) -endif() +find_package(rocprofiler-sdk REQUIRED) add_library(callback-api-tracing-client SHARED) target_sources(callback-api-tracing-client PRIVATE client.cpp client.hpp) diff --git a/projects/rocprofiler-sdk/samples/api_callback_tracing/client.cpp b/projects/rocprofiler-sdk/samples/api_callback_tracing/client.cpp index e756519080..22b65320e1 100644 --- a/projects/rocprofiler-sdk/samples/api_callback_tracing/client.cpp +++ b/projects/rocprofiler-sdk/samples/api_callback_tracing/client.cpp @@ -33,8 +33,8 @@ #include "client.hpp" -#include -#include +#include +#include #include "common/defines.hpp" #include "common/filesystem.hpp" @@ -351,8 +351,8 @@ rocprofiler_configure(uint32_t version, // generate info string auto info = std::stringstream{}; - info << id->name << " is using rocprofiler v" << major << "." << minor << "." << patch << " (" - << runtime_version << ")"; + info << id->name << " is using rocprofiler-sdk v" << major << "." << minor << "." << patch + << " (" << runtime_version << ")"; std::clog << info.str() << std::endl; diff --git a/projects/rocprofiler-sdk/samples/code_object_tracing/CMakeLists.txt b/projects/rocprofiler-sdk/samples/code_object_tracing/CMakeLists.txt index a141443def..4fdbf787da 100644 --- a/projects/rocprofiler-sdk/samples/code_object_tracing/CMakeLists.txt +++ b/projects/rocprofiler-sdk/samples/code_object_tracing/CMakeLists.txt @@ -17,7 +17,7 @@ if(NOT CMAKE_HIP_COMPILER) endif() endif() -project(rocprofiler-samples-code-object-tracing LANGUAGES CXX HIP) +project(rocprofiler-sdk-samples-code-object-tracing LANGUAGES CXX HIP) foreach(_TYPE DEBUG MINSIZEREL RELEASE RELWITHDEBINFO) if("${CMAKE_HIP_FLAGS_${_TYPE}}" STREQUAL "") @@ -25,9 +25,7 @@ foreach(_TYPE DEBUG MINSIZEREL RELEASE RELWITHDEBINFO) endif() endforeach() -if(NOT TARGET rocprofiler::rocprofiler) - find_package(rocprofiler REQUIRED) -endif() +find_package(rocprofiler-sdk REQUIRED) add_library(code-object-tracing-client SHARED) target_sources(code-object-tracing-client PRIVATE client.cpp) diff --git a/projects/rocprofiler-sdk/samples/code_object_tracing/client.cpp b/projects/rocprofiler-sdk/samples/code_object_tracing/client.cpp index ea997911c1..1da0077143 100644 --- a/projects/rocprofiler-sdk/samples/code_object_tracing/client.cpp +++ b/projects/rocprofiler-sdk/samples/code_object_tracing/client.cpp @@ -31,11 +31,11 @@ * @brief Example rocprofiler client (tool) */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "common/defines.hpp" #include "common/filesystem.hpp" @@ -368,8 +368,8 @@ rocprofiler_configure(uint32_t version, // generate info string auto info = std::stringstream{}; - info << id->name << " is using rocprofiler v" << major << "." << minor << "." << patch << " (" - << runtime_version << ")"; + info << id->name << " is using rocprofiler-sdk v" << major << "." << minor << "." << patch + << " (" << runtime_version << ")"; std::clog << info.str() << std::endl; diff --git a/projects/rocprofiler-sdk/samples/counter_collection/CMakeLists.txt b/projects/rocprofiler-sdk/samples/counter_collection/CMakeLists.txt index d02899422a..e447bc29e8 100644 --- a/projects/rocprofiler-sdk/samples/counter_collection/CMakeLists.txt +++ b/projects/rocprofiler-sdk/samples/counter_collection/CMakeLists.txt @@ -17,7 +17,7 @@ if(NOT CMAKE_HIP_COMPILER) endif() endif() -project(rocprofiler-samples-counter-collection LANGUAGES CXX HIP) +project(rocprofiler-sdk-samples-counter-collection LANGUAGES CXX HIP) foreach(_TYPE DEBUG MINSIZEREL RELEASE RELWITHDEBINFO) if("${CMAKE_HIP_FLAGS_${_TYPE}}" STREQUAL "") @@ -25,9 +25,7 @@ foreach(_TYPE DEBUG MINSIZEREL RELEASE RELWITHDEBINFO) endif() endforeach() -if(NOT TARGET rocprofiler::rocprofiler) - find_package(rocprofiler REQUIRED) -endif() +find_package(rocprofiler-sdk REQUIRED) add_library(counter-collection-buffer-client SHARED) target_sources(counter-collection-buffer-client PRIVATE client.cpp client.hpp) diff --git a/projects/rocprofiler-sdk/samples/counter_collection/client.cpp b/projects/rocprofiler-sdk/samples/counter_collection/client.cpp index 03ceaaac02..5a01c48b30 100644 --- a/projects/rocprofiler-sdk/samples/counter_collection/client.cpp +++ b/projects/rocprofiler-sdk/samples/counter_collection/client.cpp @@ -31,8 +31,8 @@ #include #include -#include -#include +#include +#include #define ROCPROFILER_CALL(result, msg) \ { \ @@ -253,8 +253,8 @@ rocprofiler_configure(uint32_t version, // generate info string auto info = std::stringstream{}; - info << id->name << " is using rocprofiler v" << major << "." << minor << "." << patch << " (" - << runtime_version << ")"; + info << id->name << " is using rocprofiler-sdk v" << major << "." << minor << "." << patch + << " (" << runtime_version << ")"; std::clog << info.str() << std::endl; diff --git a/projects/rocprofiler-sdk/samples/counter_collection/print_functional_counters.cpp b/projects/rocprofiler-sdk/samples/counter_collection/print_functional_counters.cpp index 9287a7fd8e..11fa16501c 100644 --- a/projects/rocprofiler-sdk/samples/counter_collection/print_functional_counters.cpp +++ b/projects/rocprofiler-sdk/samples/counter_collection/print_functional_counters.cpp @@ -10,8 +10,8 @@ #include #include -#include -#include +#include +#include /** * Tests the collection of all counters on the agent the test is run on. @@ -262,8 +262,8 @@ rocprofiler_configure(uint32_t version, // generate info string auto info = std::stringstream{}; - info << id->name << " is using rocprofiler v" << major << "." << minor << "." << patch << " (" - << runtime_version << ")"; + info << id->name << " is using rocprofiler-sdk v" << major << "." << minor << "." << patch + << " (" << runtime_version << ")"; std::clog << info.str() << std::endl; diff --git a/projects/rocprofiler-sdk/samples/intercept_table/CMakeLists.txt b/projects/rocprofiler-sdk/samples/intercept_table/CMakeLists.txt index 18cda6fc41..2f6636f630 100644 --- a/projects/rocprofiler-sdk/samples/intercept_table/CMakeLists.txt +++ b/projects/rocprofiler-sdk/samples/intercept_table/CMakeLists.txt @@ -17,7 +17,7 @@ if(NOT CMAKE_HIP_COMPILER) endif() endif() -project(rocprofiler-samples-intercept-table LANGUAGES CXX HIP) +project(rocprofiler-sdk-samples-intercept-table LANGUAGES CXX HIP) foreach(_TYPE DEBUG MINSIZEREL RELEASE RELWITHDEBINFO) if("${CMAKE_HIP_FLAGS_${_TYPE}}" STREQUAL "") @@ -25,9 +25,7 @@ foreach(_TYPE DEBUG MINSIZEREL RELEASE RELWITHDEBINFO) endif() endforeach() -if(NOT TARGET rocprofiler::rocprofiler) - find_package(rocprofiler REQUIRED) -endif() +find_package(rocprofiler-sdk REQUIRED) add_library(intercept-table-client SHARED) target_sources(intercept-table-client PRIVATE client.cpp client.hpp) diff --git a/projects/rocprofiler-sdk/samples/intercept_table/client.cpp b/projects/rocprofiler-sdk/samples/intercept_table/client.cpp index 3e8bf6e662..f7c12d92d1 100644 --- a/projects/rocprofiler-sdk/samples/intercept_table/client.cpp +++ b/projects/rocprofiler-sdk/samples/intercept_table/client.cpp @@ -33,8 +33,8 @@ #include "client.hpp" -#include -#include +#include +#include #include "common/defines.hpp" #include "common/filesystem.hpp" @@ -257,8 +257,8 @@ rocprofiler_configure(uint32_t version, // generate info string auto info = std::stringstream{}; - info << id->name << " is using rocprofiler v" << major << "." << minor << "." << patch << " (" - << runtime_version << ")"; + info << id->name << " is using rocprofiler-sdk v" << major << "." << minor << "." << patch + << " (" << runtime_version << ")"; std::clog << info.str() << std::endl; diff --git a/projects/rocprofiler-sdk/source/bin/CMakeLists.txt b/projects/rocprofiler-sdk/source/bin/CMakeLists.txt index 07213e0ec8..5c4928e54b 100644 --- a/projects/rocprofiler-sdk/source/bin/CMakeLists.txt +++ b/projects/rocprofiler-sdk/source/bin/CMakeLists.txt @@ -4,9 +4,9 @@ rocprofiler_activate_clang_tidy() -configure_file(rocprofv2 ${PROJECT_BINARY_DIR} COPYONLY) +configure_file(rocprofv3 ${PROJECT_BINARY_DIR} COPYONLY) install( - FILES rocprofv2 + FILES rocprofv3 DESTINATION ${CMAKE_INSTALL_BINDIR} PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE COMPONENT runtime) diff --git a/projects/rocprofiler-sdk/source/bin/rocprofv2 b/projects/rocprofiler-sdk/source/bin/rocprofv3 similarity index 86% rename from projects/rocprofiler-sdk/source/bin/rocprofv2 rename to projects/rocprofiler-sdk/source/bin/rocprofv3 index 73419d1a91..ea9a50b860 100755 --- a/projects/rocprofiler-sdk/source/bin/rocprofv2 +++ b/projects/rocprofiler-sdk/source/bin/rocprofv3 @@ -6,7 +6,7 @@ CURRENT_DIR="$( dirname -- "$0"; )"; ROCPROFV2_DIR=$(dirname -- $(realpath ${BASH_SOURCE[0]})); ROCM_DIR=$( dirname -- "${ROCPROFV2_DIR}"; ) -export HSA_TOOLS_LIB=${ROCM_DIR}/lib/librocprofiler64.so.2 +export HSA_TOOLS_LIB=${ROCM_DIR}/lib/librocprofiler-sdk.so.0 # Define color code GREEN='\033[0;32m' @@ -20,10 +20,10 @@ usage() { echo -e "${GREEN}--hsa-activity | --hsa-trace ${RESET} For Collecting HSA API Activities Traces" echo -e "${GREEN}--kernel-trace ${RESET} For Collecting Kernel Dispatch Traces" echo -e "${GREEN}-o | --output-file ${RESET} For the output file name" - echo -e "\t#${GREY} usage e.g:(with current dir): rocprofv2 --hip-trace -o " - echo -e "\t#${GREY} usage e.g:(with custom dir): rocprofv2 --hip-trace -d -o ${RESET}\n" + echo -e "\t#${GREY} usage e.g:(with current dir): rocprofv3 --hip-trace -o " + echo -e "\t#${GREY} usage e.g:(with custom dir): rocprofv3 --hip-trace -d -o ${RESET}\n" echo -e "${GREEN}-d | --output-directory ${RESET} For adding output path where the output files will be saved" - echo -e "\t#${GREY} usage e.g:(with custom dir): rocprofv2 --hip-trace -d ${RESET}\n" + echo -e "\t#${GREY} usage e.g:(with custom dir): rocprofv3 --hip-trace -d ${RESET}\n" exit 1 } @@ -80,4 +80,4 @@ done export ROCPROFILER_OUTPUT_PATH -ROCP_TOOL_LIBRARIES=${ROCM_DIR}/lib/rocprofiler/librocprofiler-tool.so $* +ROCP_TOOL_LIBRARIES=${ROCM_DIR}/lib/rocprofiler-sdk/librocprofiler-sdk-tool.so $* diff --git a/projects/rocprofiler-sdk/source/docs/conf.py b/projects/rocprofiler-sdk/source/docs/conf.py index 2ee2df28cb..8f55aa9940 100644 --- a/projects/rocprofiler-sdk/source/docs/conf.py +++ b/projects/rocprofiler-sdk/source/docs/conf.py @@ -32,7 +32,7 @@ read_the_docs_build = os.environ.get("READTHEDOCS", None) == "True" # -- Project information ----------------------------------------------------- -project = "rocprofiler" +project = "Rocprofiler SDK" copyright = "2023, Advanced Micro Devices, Inc." author = "Advanced Micro Devices, Inc." diff --git a/projects/rocprofiler-sdk/source/docs/generate-doxyfile.cmake b/projects/rocprofiler-sdk/source/docs/generate-doxyfile.cmake index 63758adfed..2745b2a53c 100644 --- a/projects/rocprofiler-sdk/source/docs/generate-doxyfile.cmake +++ b/projects/rocprofiler-sdk/source/docs/generate-doxyfile.cmake @@ -15,5 +15,5 @@ string(REGEX REPLACE "(\n|\r)" "" FULL_VERSION_STRING "${FULL_VERSION_STRING}") string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)(.*)" "\\1.\\2.\\3" ROCPROFILER_VERSION "${FULL_VERSION_STRING}") -configure_file(${SOURCE_DIR}/source/docs/rocprofiler.dox.in - ${SOURCE_DIR}/source/docs/rocprofiler.dox @ONLY) +configure_file(${SOURCE_DIR}/source/docs/rocprofiler-sdk.dox.in + ${SOURCE_DIR}/source/docs/rocprofiler-sdk.dox @ONLY) diff --git a/projects/rocprofiler-sdk/source/docs/rocprofiler-sdk.dox b/projects/rocprofiler-sdk/source/docs/rocprofiler-sdk.dox new file mode 100644 index 0000000000..1acadd90e8 --- /dev/null +++ b/projects/rocprofiler-sdk/source/docs/rocprofiler-sdk.dox @@ -0,0 +1,402 @@ +# Doxyfile 1.9.8 + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- +DOXYFILE_ENCODING = UTF-8 +PROJECT_NAME = +PROJECT_NUMBER = 0.0.0 +PROJECT_BRIEF = "ROCm Profiling API and tools" +PROJECT_LOGO = +OUTPUT_DIRECTORY = _doxygen +CREATE_SUBDIRS = NO +CREATE_SUBDIRS_LEVEL = 8 +ALLOW_UNICODE_NAMES = YES +OUTPUT_LANGUAGE = English +BRIEF_MEMBER_DESC = YES +REPEAT_BRIEF = YES +ABBREVIATE_BRIEF = +ALWAYS_DETAILED_SEC = YES +INLINE_INHERITED_MEMB = YES +FULL_PATH_NAMES = YES +STRIP_FROM_PATH = /home/jrmadsen/devel/c++/ROCm-Developer-Tools/rocprofiler-v2-internal/source/include \ + /home/jrmadsen/devel/c++/ROCm-Developer-Tools/rocprofiler-v2-internal/build-docs/source/include +STRIP_FROM_INC_PATH = /home/jrmadsen/devel/c++/ROCm-Developer-Tools/rocprofiler-v2-internal/source/include \ + /home/jrmadsen/devel/c++/ROCm-Developer-Tools/rocprofiler-v2-internal/build-docs/source/include +SHORT_NAMES = NO +JAVADOC_AUTOBRIEF = NO +JAVADOC_BANNER = NO +QT_AUTOBRIEF = NO +MULTILINE_CPP_IS_BRIEF = YES +PYTHON_DOCSTRING = YES +INHERIT_DOCS = YES +SEPARATE_MEMBER_PAGES = NO +TAB_SIZE = 4 +ALIASES = +OPTIMIZE_OUTPUT_FOR_C = YES +OPTIMIZE_OUTPUT_JAVA = NO +OPTIMIZE_FOR_FORTRAN = NO +OPTIMIZE_OUTPUT_VHDL = NO +OPTIMIZE_OUTPUT_SLICE = NO +EXTENSION_MAPPING = hpp=C++ \ + cpp=C++ \ + hh=C++ \ + cc=C++ \ + h=C \ + c=C \ + py=Python +MARKDOWN_SUPPORT = YES +TOC_INCLUDE_HEADINGS = 2 +MARKDOWN_ID_STYLE = DOXYGEN +AUTOLINK_SUPPORT = YES +BUILTIN_STL_SUPPORT = YES +CPP_CLI_SUPPORT = NO +SIP_SUPPORT = NO +IDL_PROPERTY_SUPPORT = YES +DISTRIBUTE_GROUP_DOC = NO +GROUP_NESTED_COMPOUNDS = YES +SUBGROUPING = YES +INLINE_GROUPED_CLASSES = NO +INLINE_SIMPLE_STRUCTS = YES +TYPEDEF_HIDES_STRUCT = YES +LOOKUP_CACHE_SIZE = 5 +NUM_PROC_THREADS = 0 +TIMESTAMP = NO +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- +EXTRACT_ALL = YES +EXTRACT_PRIVATE = NO +EXTRACT_PRIV_VIRTUAL = NO +EXTRACT_PACKAGE = NO +EXTRACT_STATIC = NO +EXTRACT_LOCAL_CLASSES = YES +EXTRACT_LOCAL_METHODS = NO +EXTRACT_ANON_NSPACES = NO +RESOLVE_UNNAMED_PARAMS = YES +HIDE_UNDOC_MEMBERS = NO +HIDE_UNDOC_CLASSES = YES +HIDE_FRIEND_COMPOUNDS = NO +HIDE_IN_BODY_DOCS = NO +INTERNAL_DOCS = NO +CASE_SENSE_NAMES = NO +HIDE_SCOPE_NAMES = NO +HIDE_COMPOUND_REFERENCE= NO +SHOW_HEADERFILE = YES +SHOW_INCLUDE_FILES = YES +SHOW_GROUPED_MEMB_INC = NO +FORCE_LOCAL_INCLUDES = YES +INLINE_INFO = YES +SORT_MEMBER_DOCS = YES +SORT_BRIEF_DOCS = NO +SORT_MEMBERS_CTORS_1ST = YES +SORT_GROUP_NAMES = NO +SORT_BY_SCOPE_NAME = NO +STRICT_PROTO_MATCHING = NO +GENERATE_TODOLIST = NO +GENERATE_TESTLIST = NO +GENERATE_BUGLIST = NO +GENERATE_DEPRECATEDLIST= NO +ENABLED_SECTIONS = +MAX_INITIALIZER_LINES = 30 +SHOW_USED_FILES = YES +SHOW_FILES = YES +SHOW_NAMESPACES = YES +FILE_VERSION_FILTER = +LAYOUT_FILE = +CITE_BIB_FILES = +#--------------------------------------------------------------------------- +# Configuration options related to warning and progress messages +#--------------------------------------------------------------------------- +QUIET = NO +WARNINGS = YES +WARN_IF_UNDOCUMENTED = YES +WARN_IF_DOC_ERROR = YES +WARN_IF_INCOMPLETE_DOC = YES +WARN_NO_PARAMDOC = YES +WARN_IF_UNDOC_ENUM_VAL = NO +WARN_AS_ERROR = YES +WARN_FORMAT = "---> WARNING! $file:$line: $text" +WARN_LINE_FORMAT = "at line $line of file $file" +WARN_LOGFILE = +#--------------------------------------------------------------------------- +# Configuration options related to the input files +#--------------------------------------------------------------------------- +INPUT = /home/jrmadsen/devel/c++/ROCm-Developer-Tools/rocprofiler-v2-internal/README.md \ + /home/jrmadsen/devel/c++/ROCm-Developer-Tools/rocprofiler-v2-internal/source/include/rocprofiler-sdk \ + /home/jrmadsen/devel/c++/ROCm-Developer-Tools/rocprofiler-v2-internal/build-docs/source/include/rocprofiler-sdk/version.h +INPUT_ENCODING = UTF-8 +INPUT_FILE_ENCODING = +FILE_PATTERNS = *.h \ + *.hh \ + *.hpp \ + *.c \ + *.cc \ + *.cxx \ + *.cpp \ + *.c++ \ + *.icc \ + *.tcc \ + conf.py +RECURSIVE = YES +EXCLUDE = +EXCLUDE_SYMLINKS = YES +EXCLUDE_PATTERNS = */.git/* \ + /home/jrmadsen/devel/c++/ROCm-Developer-Tools/rocprofiler-v2-internal/**/tests/* \ + /home/jrmadsen/devel/c++/ROCm-Developer-Tools/rocprofiler-v2-internal/**/scripts/* \ + /home/jrmadsen/devel/c++/ROCm-Developer-Tools/rocprofiler-v2-internal/**/docs/* +EXCLUDE_SYMBOLS = "std::*" \ + "ROCPROFILER_ATTRIBUTE" \ + "ROCPROFILER_API" \ + "ROCPROFILER_NONNULL" \ + "ROCPROFILER_PUBLIC_API" \ + "ROCPROFILER_HIDDEN_API" \ + "ROCPROFILER_EXPORT_DECORATOR" \ + "ROCPROFILER_IMPORT_DECORATOR" \ + "ROCPROFILER_EXPORT" \ + "ROCPROFILER_IMPORT" \ + "ROCPROFILER_HANDLE_LITERAL" \ + "ROCPROFILER_EXTERN_C_INIT" \ + "ROCPROFILER_EXTERN_C_FINI" +EXAMPLE_PATH = /home/jrmadsen/devel/c++/ROCm-Developer-Tools/rocprofiler-v2-internal/samples +EXAMPLE_PATTERNS = *.h \ + *.hh \ + *.hpp \ + *.c \ + *.cc \ + *.cpp \ + *.txt +EXAMPLE_RECURSIVE = YES +IMAGE_PATH = +INPUT_FILTER = +FILTER_PATTERNS = +FILTER_SOURCE_FILES = NO +FILTER_SOURCE_PATTERNS = +USE_MDFILE_AS_MAINPAGE = /home/jrmadsen/devel/c++/ROCm-Developer-Tools/rocprofiler-v2-internal/README.md +FORTRAN_COMMENT_AFTER = 72 +#--------------------------------------------------------------------------- +# Configuration options related to source browsing +#--------------------------------------------------------------------------- +SOURCE_BROWSER = YES +INLINE_SOURCES = YES +STRIP_CODE_COMMENTS = NO +REFERENCED_BY_RELATION = YES +REFERENCES_RELATION = YES +REFERENCES_LINK_SOURCE = YES +SOURCE_TOOLTIPS = YES +USE_HTAGS = NO +VERBATIM_HEADERS = YES +#--------------------------------------------------------------------------- +# Configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- +ALPHABETICAL_INDEX = YES +IGNORE_PREFIX = +#--------------------------------------------------------------------------- +# Configuration options related to the HTML output +#--------------------------------------------------------------------------- +GENERATE_HTML = YES +HTML_OUTPUT = html +HTML_FILE_EXTENSION = .html +HTML_HEADER = +HTML_FOOTER = +HTML_STYLESHEET = +HTML_EXTRA_STYLESHEET = ../../external/doxygen-awesome-css/doxygen-awesome.css +HTML_EXTRA_FILES = +HTML_COLORSTYLE = LIGHT +HTML_COLORSTYLE_HUE = 220 +HTML_COLORSTYLE_SAT = 100 +HTML_COLORSTYLE_GAMMA = 80 +HTML_DYNAMIC_MENUS = YES +HTML_DYNAMIC_SECTIONS = YES +HTML_CODE_FOLDING = YES +HTML_INDEX_NUM_ENTRIES = 1000 +GENERATE_DOCSET = NO +DOCSET_FEEDNAME = "Doxygen generated docs" +DOCSET_FEEDURL = +DOCSET_BUNDLE_ID = org.doxygen.rocprofiler +DOCSET_PUBLISHER_ID = org.doxygen.amd +DOCSET_PUBLISHER_NAME = "Advanced Micro Devices, Inc." +GENERATE_HTMLHELP = NO +CHM_FILE = +HHC_LOCATION = +GENERATE_CHI = NO +CHM_INDEX_ENCODING = +BINARY_TOC = NO +TOC_EXPAND = YES +SITEMAP_URL = +GENERATE_QHP = NO +QCH_FILE = +QHP_NAMESPACE = +QHP_VIRTUAL_FOLDER = doxy +QHP_CUST_FILTER_NAME = +QHP_CUST_FILTER_ATTRS = +QHP_SECT_FILTER_ATTRS = +QHG_LOCATION = +GENERATE_ECLIPSEHELP = NO +ECLIPSE_DOC_ID = org.doxygen.rocprofiler +DISABLE_INDEX = NO +GENERATE_TREEVIEW = YES +FULL_SIDEBAR = NO +ENUM_VALUES_PER_LINE = 1 +TREEVIEW_WIDTH = 300 +EXT_LINKS_IN_WINDOW = YES +OBFUSCATE_EMAILS = YES +HTML_FORMULA_FORMAT = png +FORMULA_FONTSIZE = 12 +FORMULA_MACROFILE = +USE_MATHJAX = NO +MATHJAX_VERSION = MathJax_2 +MATHJAX_FORMAT = HTML-CSS +MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest +MATHJAX_EXTENSIONS = +MATHJAX_CODEFILE = +SEARCHENGINE = NO +SERVER_BASED_SEARCH = NO +EXTERNAL_SEARCH = NO +SEARCHENGINE_URL = +SEARCHDATA_FILE = searchdata.xml +EXTERNAL_SEARCH_ID = +EXTRA_SEARCH_MAPPINGS = +#--------------------------------------------------------------------------- +# Configuration options related to the LaTeX output +#--------------------------------------------------------------------------- +GENERATE_LATEX = NO +LATEX_OUTPUT = latex +LATEX_CMD_NAME = latex +MAKEINDEX_CMD_NAME = makeindex +LATEX_MAKEINDEX_CMD = makeindex +COMPACT_LATEX = NO +PAPER_TYPE = +EXTRA_PACKAGES = float +LATEX_HEADER = +LATEX_FOOTER = +LATEX_EXTRA_STYLESHEET = +LATEX_EXTRA_FILES = +PDF_HYPERLINKS = YES +USE_PDFLATEX = YES +LATEX_BATCHMODE = YES +LATEX_HIDE_INDICES = NO +LATEX_BIB_STYLE = plain +LATEX_EMOJI_DIRECTORY = +#--------------------------------------------------------------------------- +# Configuration options related to the RTF output +#--------------------------------------------------------------------------- +GENERATE_RTF = NO +RTF_OUTPUT = rtf +COMPACT_RTF = NO +RTF_HYPERLINKS = NO +RTF_STYLESHEET_FILE = +RTF_EXTENSIONS_FILE = +#--------------------------------------------------------------------------- +# Configuration options related to the man page output +#--------------------------------------------------------------------------- +GENERATE_MAN = NO +MAN_OUTPUT = man +MAN_EXTENSION = .3 +MAN_SUBDIR = +MAN_LINKS = YES +#--------------------------------------------------------------------------- +# Configuration options related to the XML output +#--------------------------------------------------------------------------- +GENERATE_XML = NO +XML_OUTPUT = xml +XML_PROGRAMLISTING = YES +XML_NS_MEMB_FILE_SCOPE = YES +#--------------------------------------------------------------------------- +# Configuration options related to the DOCBOOK output +#--------------------------------------------------------------------------- +GENERATE_DOCBOOK = NO +DOCBOOK_OUTPUT = docbook +#--------------------------------------------------------------------------- +# Configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- +GENERATE_AUTOGEN_DEF = NO +#--------------------------------------------------------------------------- +# Configuration options related to Sqlite3 output +#--------------------------------------------------------------------------- +GENERATE_SQLITE3 = NO +SQLITE3_OUTPUT = sqlite3 +SQLITE3_RECREATE_DB = YES +#--------------------------------------------------------------------------- +# Configuration options related to the Perl module output +#--------------------------------------------------------------------------- +GENERATE_PERLMOD = NO +PERLMOD_LATEX = NO +PERLMOD_PRETTY = YES +PERLMOD_MAKEVAR_PREFIX = +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- +ENABLE_PREPROCESSING = YES +MACRO_EXPANSION = YES +EXPAND_ONLY_PREDEF = NO +SEARCH_INCLUDES = NO +INCLUDE_PATH = /home/jrmadsen/devel/c++/ROCm-Developer-Tools/rocprofiler-v2-internal/source/include +INCLUDE_FILE_PATTERNS = *.h +PREDEFINED = "ROCPROFILER_API=" \ + "ROCPROFILER_EXPORT=" \ + "ROCPROFILER_IMPORT=" \ + "ROCPROFILER_NONNULL(...)=" \ + "ROCPROFILER_PUBLIC_API=" \ + "ROCPROFILER_HIDDEN_API=" \ + "ROCPROFILER_EXPORT_DECORATOR=" \ + "ROCPROFILER_IMPORT_DECORATOR=" \ + "ROCPROFILER_HANDLE_LITERAL=" \ + "ROCPROFILER_EXTERN_C_INIT=" \ + "ROCPROFILER_EXTERN_C_FINI=" \ + "__attribute__(x)=" \ + "__declspec(x)=" \ + "size_t=unsigned long" \ + "uintptr_t=unsigned long" \ + "DOXYGEN_SHOULD_SKIP_THIS=1" +EXPAND_AS_DEFINED = +SKIP_FUNCTION_MACROS = NO +#--------------------------------------------------------------------------- +# Configuration options related to external references +#--------------------------------------------------------------------------- +TAGFILES = +GENERATE_TAGFILE = _doxygen/tagfile.xml +ALLEXTERNALS = NO +EXTERNAL_GROUPS = YES +EXTERNAL_PAGES = YES +#--------------------------------------------------------------------------- +# Configuration options related to diagram generator tools +#--------------------------------------------------------------------------- +HIDE_UNDOC_RELATIONS = NO +HAVE_DOT = YES +DOT_NUM_THREADS = 0 +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=12" +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=12" +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" +DOT_FONTPATH = +CLASS_GRAPH = YES +COLLABORATION_GRAPH = YES +GROUP_GRAPHS = YES +UML_LOOK = YES +UML_LIMIT_NUM_FIELDS = 10 +DOT_UML_DETAILS = YES +DOT_WRAP_THRESHOLD = 17 +TEMPLATE_RELATIONS = YES +INCLUDE_GRAPH = YES +INCLUDED_BY_GRAPH = YES +CALL_GRAPH = YES +CALLER_GRAPH = YES +GRAPHICAL_HIERARCHY = YES +DIRECTORY_GRAPH = YES +DIR_GRAPH_MAX_DEPTH = 1 +DOT_IMAGE_FORMAT = svg +INTERACTIVE_SVG = NO +DOT_PATH = /opt/conda/envs/rocprofiler-docs/bin/dot +DOTFILE_DIRS = +DIA_PATH = +DIAFILE_DIRS = +PLANTUML_JAR_PATH = +PLANTUML_CFG_FILE = +PLANTUML_INCLUDE_PATH = +DOT_GRAPH_MAX_NODES = 50 +MAX_DOT_GRAPH_DEPTH = 0 +DOT_MULTI_TARGETS = YES +GENERATE_LEGEND = YES +DOT_CLEANUP = YES +MSCGEN_TOOL = +MSCFILE_DIRS = diff --git a/projects/rocprofiler-sdk/source/docs/rocprofiler.dox.in b/projects/rocprofiler-sdk/source/docs/rocprofiler-sdk.dox.in similarity index 99% rename from projects/rocprofiler-sdk/source/docs/rocprofiler.dox.in rename to projects/rocprofiler-sdk/source/docs/rocprofiler-sdk.dox.in index f8848daa3d..a67cf7d97f 100644 --- a/projects/rocprofiler-sdk/source/docs/rocprofiler.dox.in +++ b/projects/rocprofiler-sdk/source/docs/rocprofiler-sdk.dox.in @@ -4,7 +4,7 @@ # Project related configuration options #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 -PROJECT_NAME = rocprofiler +PROJECT_NAME = @PROJECT_NAME@ PROJECT_NUMBER = @ROCPROFILER_VERSION@ PROJECT_BRIEF = "ROCm Profiling API and tools" PROJECT_LOGO = @@ -123,8 +123,8 @@ WARN_LOGFILE = # Configuration options related to the input files #--------------------------------------------------------------------------- INPUT = @SOURCE_DIR@/README.md \ - @SOURCE_DIR@/source/include/rocprofiler \ - @SOURCE_DIR@/build-docs/source/include/rocprofiler/version.h + @SOURCE_DIR@/source/include/rocprofiler-sdk \ + @SOURCE_DIR@/build-docs/source/include/rocprofiler-sdk/version.h INPUT_ENCODING = UTF-8 INPUT_FILE_ENCODING = FILE_PATTERNS = *.h \ diff --git a/projects/rocprofiler-sdk/source/docs/tool_library_overview.md b/projects/rocprofiler-sdk/source/docs/tool_library_overview.md index 7079c05fd3..0241ef658d 100644 --- a/projects/rocprofiler-sdk/source/docs/tool_library_overview.md +++ b/projects/rocprofiler-sdk/source/docs/tool_library_overview.md @@ -25,7 +25,7 @@ Rocprofiler provides a `rocprofiler/registration.h` header file which forward de compiler function attributes to ensure that the symbol is publicly visible. ```cpp -#include +#include namespace { @@ -90,7 +90,7 @@ collects all of the `rocprofiler_tool_configure_result_t` instances before invok When rocprofiler invokes this function in a tool, this is the opportunity to create contexts: ```cpp -#include +#include namespace { @@ -120,7 +120,7 @@ In the invocation of the user-provided `initialize` callback, rocprofiler will p This function pointer can be invoked by the tool to explicitly invoke the `finalize` callback from the `rocprofiler_tool_configure_result_t` instance: ```cpp -#include +#include namespace { @@ -168,7 +168,7 @@ Otherwise, rocprofiler will invoke the `finalize` callback via an `atexit` handl All of the snippets from the previous sections have been combined here for convenience. ```cpp -#include +#include namespace { diff --git a/projects/rocprofiler-sdk/source/include/CMakeLists.txt b/projects/rocprofiler-sdk/source/include/CMakeLists.txt index 95af2250ea..a3392e5dfb 100644 --- a/projects/rocprofiler-sdk/source/include/CMakeLists.txt +++ b/projects/rocprofiler-sdk/source/include/CMakeLists.txt @@ -1,4 +1,4 @@ # # # -add_subdirectory(rocprofiler) +add_subdirectory(rocprofiler-sdk) diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler/CMakeLists.txt b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/CMakeLists.txt similarity index 92% rename from projects/rocprofiler-sdk/source/include/rocprofiler/CMakeLists.txt rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/CMakeLists.txt index 5bceeb96ab..b844b78e49 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler/CMakeLists.txt +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/CMakeLists.txt @@ -34,7 +34,7 @@ set(ROCPROFILER_HEADER_FILES ${CMAKE_CURRENT_BINARY_DIR}/version.h) install(FILES ${ROCPROFILER_HEADER_FILES} - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocprofiler) + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocprofiler-sdk) add_subdirectory(hip) add_subdirectory(hsa) diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler/agent.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/agent.h similarity index 99% rename from projects/rocprofiler-sdk/source/include/rocprofiler/agent.h rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/agent.h index 501b8171be..67d5d22536 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler/agent.h +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/agent.h @@ -22,8 +22,8 @@ #pragma once -#include -#include +#include +#include #include diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler/agent_profile.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/agent_profile.h similarity index 97% rename from projects/rocprofiler-sdk/source/include/rocprofiler/agent_profile.h rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/agent_profile.h index c54133948d..09a636ce81 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler/agent_profile.h +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/agent_profile.h @@ -22,8 +22,8 @@ #pragma once -#include -#include +#include +#include ROCPROFILER_EXTERN_C_INIT diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler/buffer.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/buffer.h similarity index 98% rename from projects/rocprofiler-sdk/source/include/rocprofiler/buffer.h rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/buffer.h index 8f426d12e6..7a4aaa2b01 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler/buffer.h +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/buffer.h @@ -22,8 +22,8 @@ #pragma once -#include -#include +#include +#include ROCPROFILER_EXTERN_C_INIT diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler/buffer_tracing.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/buffer_tracing.h similarity index 99% rename from projects/rocprofiler-sdk/source/include/rocprofiler/buffer_tracing.h rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/buffer_tracing.h index afeb3218be..800463953d 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler/buffer_tracing.h +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/buffer_tracing.h @@ -22,9 +22,9 @@ #pragma once -#include -#include -#include +#include +#include +#include ROCPROFILER_EXTERN_C_INIT diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler/callback_tracing.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/callback_tracing.h similarity index 99% rename from projects/rocprofiler-sdk/source/include/rocprofiler/callback_tracing.h rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/callback_tracing.h index 93bb5564fd..28c34b211c 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler/callback_tracing.h +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/callback_tracing.h @@ -22,11 +22,11 @@ #pragma once -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler/context.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/context.h similarity index 97% rename from projects/rocprofiler-sdk/source/include/rocprofiler/context.h rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/context.h index bfe581c907..a4b3a476d4 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler/context.h +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/context.h @@ -22,8 +22,8 @@ #pragma once -#include -#include +#include +#include ROCPROFILER_EXTERN_C_INIT diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler/counters.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/counters.h similarity index 98% rename from projects/rocprofiler-sdk/source/include/rocprofiler/counters.h rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/counters.h index 653aeccf58..65b5bbcbed 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler/counters.h +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/counters.h @@ -22,9 +22,9 @@ #pragma once -#include -#include -#include +#include +#include +#include ROCPROFILER_EXTERN_C_INIT diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler/defines.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/defines.h similarity index 100% rename from projects/rocprofiler-sdk/source/include/rocprofiler/defines.h rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/defines.h diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler/dispatch_profile.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/dispatch_profile.h similarity index 95% rename from projects/rocprofiler-sdk/source/include/rocprofiler/dispatch_profile.h rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/dispatch_profile.h index 0f1f37c163..4f575fde0a 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler/dispatch_profile.h +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/dispatch_profile.h @@ -22,11 +22,11 @@ #pragma once -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include ROCPROFILER_EXTERN_C_INIT diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler/external_correlation.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/external_correlation.h similarity index 98% rename from projects/rocprofiler-sdk/source/include/rocprofiler/external_correlation.h rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/external_correlation.h index 8d37566874..c8391e4f42 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler/external_correlation.h +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/external_correlation.h @@ -22,8 +22,8 @@ #pragma once -#include -#include +#include +#include ROCPROFILER_EXTERN_C_INIT diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler/fwd.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/fwd.h similarity index 99% rename from projects/rocprofiler-sdk/source/include/rocprofiler/fwd.h rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/fwd.h index 50e9aa8f6b..27b6d2478b 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler/fwd.h +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/fwd.h @@ -22,7 +22,7 @@ #pragma once -#include +#include #include #include diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler/hip.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hip.h similarity index 93% rename from projects/rocprofiler-sdk/source/include/rocprofiler/hip.h rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hip.h index 9ea71caf20..ba0af78f44 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler/hip.h +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hip.h @@ -22,5 +22,5 @@ #pragma once -#include -#include +#include +#include diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler/hip/CMakeLists.txt b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hip/CMakeLists.txt similarity index 68% rename from projects/rocprofiler-sdk/source/include/rocprofiler/hip/CMakeLists.txt rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hip/CMakeLists.txt index 095e42ac9d..c98a1cbab2 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler/hip/CMakeLists.txt +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hip/CMakeLists.txt @@ -6,4 +6,4 @@ set(ROCPROFILER_HIP_HEADER_FILES api_args.h api_id.h) install(FILES ${ROCPROFILER_HIP_HEADER_FILES} - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocprofiler/hip) + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocprofiler-sdk/hip) diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler/hip/api_args.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hip/api_args.h similarity index 100% rename from projects/rocprofiler-sdk/source/include/rocprofiler/hip/api_args.h rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hip/api_args.h diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler/hip/api_id.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hip/api_id.h similarity index 100% rename from projects/rocprofiler-sdk/source/include/rocprofiler/hip/api_id.h rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hip/api_id.h diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler/hsa.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hsa.h similarity index 93% rename from projects/rocprofiler-sdk/source/include/rocprofiler/hsa.h rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hsa.h index bac3f94730..ef6372fd8c 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler/hsa.h +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hsa.h @@ -32,9 +32,9 @@ # endif #endif -#include -#include -#include +#include +#include +#include #include diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler/hsa/CMakeLists.txt b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hsa/CMakeLists.txt similarity index 70% rename from projects/rocprofiler-sdk/source/include/rocprofiler/hsa/CMakeLists.txt rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hsa/CMakeLists.txt index 4998e24a59..142bc03639 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler/hsa/CMakeLists.txt +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hsa/CMakeLists.txt @@ -6,4 +6,4 @@ set(ROCPROFILER_HSA_HEADER_FILES api_args.h api_id.h table_api_id.h) install(FILES ${ROCPROFILER_HSA_HEADER_FILES} - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocprofiler/hsa) + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocprofiler-sdk/hsa) diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler/hsa/api_args.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hsa/api_args.h similarity index 99% rename from projects/rocprofiler-sdk/source/include/rocprofiler/hsa/api_args.h rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hsa/api_args.h index f3cd276421..ea192ad89f 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler/hsa/api_args.h +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hsa/api_args.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include typedef union rocprofiler_hsa_api_retval_u { diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler/hsa/api_id.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hsa/api_id.h similarity index 99% rename from projects/rocprofiler-sdk/source/include/rocprofiler/hsa/api_id.h rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hsa/api_id.h index 359171e118..d9d76c0b98 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler/hsa/api_id.h +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hsa/api_id.h @@ -22,7 +22,7 @@ #pragma once -#include +#include /** * @brief ROCProfiler enumeration of HSA API tracing operations diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler/hsa/table_api_id.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hsa/table_api_id.h similarity index 100% rename from projects/rocprofiler-sdk/source/include/rocprofiler/hsa/table_api_id.h rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hsa/table_api_id.h diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler/intercept_table.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/intercept_table.h similarity index 99% rename from projects/rocprofiler-sdk/source/include/rocprofiler/intercept_table.h rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/intercept_table.h index 72ebf2f8db..67c0a92c53 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler/intercept_table.h +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/intercept_table.h @@ -22,8 +22,8 @@ #pragma once -#include -#include +#include +#include ROCPROFILER_EXTERN_C_INIT diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler/internal_threading.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/internal_threading.h similarity index 98% rename from projects/rocprofiler-sdk/source/include/rocprofiler/internal_threading.h rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/internal_threading.h index 03c643e832..234bc7cc0c 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler/internal_threading.h +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/internal_threading.h @@ -22,8 +22,8 @@ #pragma once -#include -#include +#include +#include ROCPROFILER_EXTERN_C_INIT diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler/marker.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/marker.h similarity index 93% rename from projects/rocprofiler-sdk/source/include/rocprofiler/marker.h rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/marker.h index d1ccaf83c2..2bd441a0c9 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler/marker.h +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/marker.h @@ -22,5 +22,5 @@ #pragma once -#include -#include +#include +#include diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler/marker/CMakeLists.txt b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/marker/CMakeLists.txt similarity index 68% rename from projects/rocprofiler-sdk/source/include/rocprofiler/marker/CMakeLists.txt rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/marker/CMakeLists.txt index 457d7e7c3e..eae50bee32 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler/marker/CMakeLists.txt +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/marker/CMakeLists.txt @@ -6,4 +6,4 @@ set(ROCPROFILER_MARKER_HEADER_FILES api_args.h api_id.h) install(FILES ${ROCPROFILER_MARKER_HEADER_FILES} - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocprofiler/marker) + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocprofiler-sdk/marker) diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler/marker/api_args.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/marker/api_args.h similarity index 100% rename from projects/rocprofiler-sdk/source/include/rocprofiler/marker/api_args.h rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/marker/api_args.h diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler/marker/api_id.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/marker/api_id.h similarity index 100% rename from projects/rocprofiler-sdk/source/include/rocprofiler/marker/api_id.h rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/marker/api_id.h diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler/pc_sampling.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/pc_sampling.h similarity index 99% rename from projects/rocprofiler-sdk/source/include/rocprofiler/pc_sampling.h rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/pc_sampling.h index 3b26b4f6ab..1d3492c964 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler/pc_sampling.h +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/pc_sampling.h @@ -22,9 +22,9 @@ #pragma once -#include -#include -#include +#include +#include +#include ROCPROFILER_EXTERN_C_INIT @@ -292,4 +292,4 @@ struct rocprofiler_pc_sampling_record_s /** @} */ -ROCPROFILER_EXTERN_C_FINI \ No newline at end of file +ROCPROFILER_EXTERN_C_FINI diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler/profile_config.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/profile_config.h similarity index 95% rename from projects/rocprofiler-sdk/source/include/rocprofiler/profile_config.h rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/profile_config.h index cc5db3c7fa..5cbeccee45 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler/profile_config.h +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/profile_config.h @@ -22,9 +22,9 @@ #pragma once -#include -#include -#include +#include +#include +#include ROCPROFILER_EXTERN_C_INIT diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler/registration.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/registration.h similarity index 98% rename from projects/rocprofiler-sdk/source/include/rocprofiler/registration.h rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/registration.h index 50681df294..be8890115d 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler/registration.h +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/registration.h @@ -22,8 +22,8 @@ #pragma once -#include -#include +#include +#include ROCPROFILER_EXTERN_C_INIT @@ -109,7 +109,7 @@ rocprofiler_is_finalized(int* status) ROCPROFILER_API; * @return rocprofiler_tool_configure_result_t* * * @code{.cpp} - * #include + * #include * * static rocprofiler_client_id_t my_client_id; * static rocprofiler_client_finalize_t my_fini_func; diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler/rocprofiler.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/rocprofiler.h similarity index 83% rename from projects/rocprofiler-sdk/source/include/rocprofiler/rocprofiler.h rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/rocprofiler.h index c9c5d166ff..096d488b64 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler/rocprofiler.h +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/rocprofiler.h @@ -25,8 +25,8 @@ #include #include -#include "rocprofiler/defines.h" -#include "rocprofiler/fwd.h" +#include "rocprofiler-sdk/defines.h" +#include "rocprofiler-sdk/fwd.h" /** * @defgroup VERSIONING_GROUP Library Versioning @@ -40,7 +40,7 @@ * @{ */ -#include "rocprofiler/version.h" +#include "rocprofiler-sdk/version.h" ROCPROFILER_EXTERN_C_INIT @@ -64,23 +64,23 @@ ROCPROFILER_EXTERN_C_FINI /** @} */ -#include "rocprofiler/agent.h" -// #include "rocprofiler/agent_profile.h" -#include "rocprofiler/buffer.h" -#include "rocprofiler/buffer_tracing.h" -#include "rocprofiler/callback_tracing.h" -#include "rocprofiler/context.h" -#include "rocprofiler/counters.h" -#include "rocprofiler/dispatch_profile.h" -#include "rocprofiler/external_correlation.h" -#include "rocprofiler/hip.h" -#include "rocprofiler/hsa.h" -#include "rocprofiler/intercept_table.h" -#include "rocprofiler/internal_threading.h" -// #include "rocprofiler/marker.h" -#include "rocprofiler/pc_sampling.h" -#include "rocprofiler/profile_config.h" -// #include "rocprofiler/spm.h" +#include "rocprofiler-sdk/agent.h" +// #include "rocprofiler-sdk/agent_profile.h" +#include "rocprofiler-sdk/buffer.h" +#include "rocprofiler-sdk/buffer_tracing.h" +#include "rocprofiler-sdk/callback_tracing.h" +#include "rocprofiler-sdk/context.h" +#include "rocprofiler-sdk/counters.h" +#include "rocprofiler-sdk/dispatch_profile.h" +#include "rocprofiler-sdk/external_correlation.h" +#include "rocprofiler-sdk/hip.h" +#include "rocprofiler-sdk/hsa.h" +#include "rocprofiler-sdk/intercept_table.h" +#include "rocprofiler-sdk/internal_threading.h" +// #include "rocprofiler-sdk/marker.h" +#include "rocprofiler-sdk/pc_sampling.h" +#include "rocprofiler-sdk/profile_config.h" +// #include "rocprofiler-sdk/spm.h" ROCPROFILER_EXTERN_C_INIT diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler/rocprofiler_plugin.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/rocprofiler_plugin.h similarity index 99% rename from projects/rocprofiler-sdk/source/include/rocprofiler/rocprofiler_plugin.h rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/rocprofiler_plugin.h index afee67a8a3..86f5fd3459 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler/rocprofiler_plugin.h +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/rocprofiler_plugin.h @@ -43,7 +43,7 @@ #pragma once -#include "rocprofiler/rocprofiler.h" +#include "rocprofiler-sdk/rocprofiler.h" #include diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler/spm.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/spm.h similarity index 96% rename from projects/rocprofiler-sdk/source/include/rocprofiler/spm.h rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/spm.h index b8b570b2b7..3ad6124ea2 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler/spm.h +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/spm.h @@ -22,8 +22,8 @@ #pragma once -#include -#include +#include +#include ROCPROFILER_EXTERN_C_INIT diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler/version.h.in b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/version.h.in similarity index 100% rename from projects/rocprofiler-sdk/source/include/rocprofiler/version.h.in rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/version.h.in diff --git a/projects/rocprofiler-sdk/source/lib/CMakeLists.txt b/projects/rocprofiler-sdk/source/lib/CMakeLists.txt index 0d644a4656..c2e6d9f24f 100644 --- a/projects/rocprofiler-sdk/source/lib/CMakeLists.txt +++ b/projects/rocprofiler-sdk/source/lib/CMakeLists.txt @@ -2,8 +2,8 @@ # # add_subdirectory(common) -add_subdirectory(rocprofiler) -add_subdirectory(rocprofiler-tool) +add_subdirectory(rocprofiler-sdk) +add_subdirectory(rocprofiler-sdk-tool) add_subdirectory(plugins) if(ROCPROFILER_BUILD_TESTS) diff --git a/projects/rocprofiler-sdk/source/lib/common/container/record_header_buffer.cpp b/projects/rocprofiler-sdk/source/lib/common/container/record_header_buffer.cpp index e7e898329e..af9c414882 100644 --- a/projects/rocprofiler-sdk/source/lib/common/container/record_header_buffer.cpp +++ b/projects/rocprofiler-sdk/source/lib/common/container/record_header_buffer.cpp @@ -22,7 +22,7 @@ #include "lib/common/container/record_header_buffer.hpp" -#include +#include #include #include #include diff --git a/projects/rocprofiler-sdk/source/lib/common/container/record_header_buffer.hpp b/projects/rocprofiler-sdk/source/lib/common/container/record_header_buffer.hpp index 26e03724d2..f3f9e44744 100644 --- a/projects/rocprofiler-sdk/source/lib/common/container/record_header_buffer.hpp +++ b/projects/rocprofiler-sdk/source/lib/common/container/record_header_buffer.hpp @@ -22,7 +22,7 @@ #pragma once -#include +#include #include "lib/common/container/ring_buffer.hpp" diff --git a/projects/rocprofiler-sdk/source/lib/common/defines.hpp b/projects/rocprofiler-sdk/source/lib/common/defines.hpp index e1a0974dd3..318d0e919c 100644 --- a/projects/rocprofiler-sdk/source/lib/common/defines.hpp +++ b/projects/rocprofiler-sdk/source/lib/common/defines.hpp @@ -22,7 +22,7 @@ #pragma once -#include +#include #define ROCPROFILER_VISIBILITY(MODE) ROCPROFILER_ATTRIBUTE(visibility(MODE)) #define ROCPROFILER_INTERNAL_API ROCPROFILER_VISIBILITY("internal") diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-tool/CMakeLists.txt b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/CMakeLists.txt similarity index 68% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-tool/CMakeLists.txt rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/CMakeLists.txt index 50927a6244..387b8b7908 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-tool/CMakeLists.txt +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/CMakeLists.txt @@ -2,10 +2,11 @@ # Tool library used by rocprofiler # -add_library(rocprofiler-tool SHARED) -target_sources(rocprofiler-tool PRIVATE helper.hpp helper.cpp tool.cpp trace_buffer.hpp) +add_library(rocprofiler-sdk-tool SHARED) +target_sources(rocprofiler-sdk-tool PRIVATE helper.hpp helper.cpp tool.cpp + trace_buffer.hpp) target_link_libraries( - rocprofiler-tool + rocprofiler-sdk-tool PRIVATE rocprofiler::rocprofiler-shared-library rocprofiler::rocprofiler-hsa-runtime rocprofiler::rocprofiler-headers @@ -16,9 +17,9 @@ target_link_libraries( atomic) set_target_properties( - rocprofiler-tool + rocprofiler-sdk-tool PROPERTIES LIBRARY_OUTPUT_DIRECTORY - ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/rocprofiler + ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/rocprofiler-sdk SOVERSION ${PROJECT_VERSION_MAJOR} VERSION ${PROJECT_VERSION} SKIP_BUILD_RPATH OFF @@ -26,7 +27,7 @@ set_target_properties( INSTALL_RPATH "\$ORIGIN:\$ORIGIN/..") install( - TARGETS rocprofiler-tool - DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME} + TARGETS rocprofiler-sdk-tool + DESTINATION ${CMAKE_INSTALL_LIBDIR}/rocprofiler-sdk COMPONENT tools - EXPORT ${PROJECT_NAME}-library-targets) + EXPORT rocprofiler-sdk-library-targets) diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-tool/README.md b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/README.md similarity index 93% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-tool/README.md rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/README.md index 3d1f5e7669..56b3c86530 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-tool/README.md +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/README.md @@ -3,12 +3,12 @@ This is a tool that gets registered with the rocprofiler to obtain its services. The tool is built as a shared library and is named as -rocprofiler-tool. +rocprofiler-sdk-tool. The library can be preloaded using LD_PRELOAD to facilitate its registration as a tool with the rocprofiler. -The user through rocprofv2 script can select the +The user through rocprofv3 script can select the options to obtain tracing and counter collection services from the rocprofiler. diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-tool/helper.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/helper.cpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-tool/helper.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/helper.cpp diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-tool/helper.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/helper.hpp similarity index 98% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-tool/helper.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/helper.hpp index 357666a70b..497115bb41 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-tool/helper.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/helper.hpp @@ -43,8 +43,8 @@ #include #include #include -#include -#include +#include +#include #define ROCPROFILER_CALL(result, msg) \ { \ diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-tool/tool.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/tool.cpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-tool/tool.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/tool.cpp diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-tool/trace_buffer.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/trace_buffer.hpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-tool/trace_buffer.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/trace_buffer.hpp diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/CMakeLists.txt b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/CMakeLists.txt similarity index 95% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/CMakeLists.txt rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/CMakeLists.txt index 37ee103c8d..45cf42db0c 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/CMakeLists.txt +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/CMakeLists.txt @@ -81,7 +81,7 @@ target_link_libraries( set_target_properties( rocprofiler-shared-library - PROPERTIES OUTPUT_NAME rocprofiler64 + PROPERTIES OUTPUT_NAME rocprofiler-sdk SOVERSION ${PROJECT_VERSION_MAJOR} VERSION ${PROJECT_VERSION} SKIP_BUILD_RPATH OFF @@ -90,13 +90,12 @@ set_target_properties( DEFINE_SYMBOL rocprofiler_EXPORTS) add_library(rocprofiler::rocprofiler-library ALIAS rocprofiler-shared-library) -add_library(rocprofiler::rocprofiler ALIAS rocprofiler-shared-library) install( TARGETS rocprofiler-shared-library DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT core - EXPORT ${PROJECT_NAME}-library-targets) + EXPORT rocprofiler-sdk-library-targets) # ----------------------------------------------------------------------------------------# # @@ -117,8 +116,8 @@ target_link_libraries( rocprofiler::rocprofiler-object-library) set_target_properties( - rocprofiler-static-library PROPERTIES OUTPUT_NAME rocprofiler64 DEFINE_SYMBOL - rocprofiler_EXPORTS) + rocprofiler-static-library PROPERTIES OUTPUT_NAME rocprofiler-sdk DEFINE_SYMBOL + rocprofiler_EXPORTS) # ----------------------------------------------------------------------------------------# # diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/agent.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/agent.cpp similarity index 99% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/agent.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/agent.cpp index 40265c3edf..e5f9551fc9 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/agent.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/agent.cpp @@ -20,13 +20,13 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include -#include -#include +#include +#include +#include #include "lib/common/filesystem.hpp" -#include "lib/rocprofiler/agent.hpp" -#include "lib/rocprofiler/hsa/agent_cache.hpp" +#include "lib/rocprofiler-sdk/agent.hpp" +#include "lib/rocprofiler-sdk/hsa/agent_cache.hpp" #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/agent.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/agent.hpp similarity index 95% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/agent.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/agent.hpp index 979144a692..a40ab11c82 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/agent.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/agent.hpp @@ -22,9 +22,9 @@ #pragma once -#include +#include -#include "lib/rocprofiler/hsa/agent_cache.hpp" +#include "lib/rocprofiler-sdk/hsa/agent_cache.hpp" #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/allocator.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/allocator.cpp similarity index 94% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/allocator.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/allocator.cpp index 5df352d41e..196cf812ec 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/allocator.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/allocator.cpp @@ -20,8 +20,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "lib/rocprofiler/allocator.hpp" -#include "lib/rocprofiler/registration.hpp" +#include "lib/rocprofiler-sdk/allocator.hpp" +#include "lib/rocprofiler-sdk/registration.hpp" #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/allocator.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/allocator.hpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/allocator.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/allocator.hpp diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/aql/CMakeLists.txt b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/CMakeLists.txt similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/aql/CMakeLists.txt rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/CMakeLists.txt diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/aql/helpers.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/helpers.cpp similarity index 98% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/aql/helpers.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/helpers.cpp index f02437d042..5d4312397c 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/aql/helpers.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/helpers.cpp @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "lib/rocprofiler/aql/helpers.hpp" +#include "lib/rocprofiler-sdk/aql/helpers.hpp" #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/aql/helpers.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/helpers.hpp similarity index 96% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/aql/helpers.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/helpers.hpp index e54d8a08ef..bb3de4ddb0 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/aql/helpers.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/helpers.hpp @@ -26,7 +26,7 @@ #include -#include "lib/rocprofiler/counters/metrics.hpp" +#include "lib/rocprofiler-sdk/counters/metrics.hpp" namespace rocprofiler { diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/aql/intercept.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/intercept.cpp similarity index 94% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/aql/intercept.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/intercept.cpp index 7a21cd6901..79163ab71e 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/aql/intercept.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/intercept.cpp @@ -20,9 +20,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "lib/rocprofiler/aql/intercept.hpp" +#include "lib/rocprofiler-sdk/aql/intercept.hpp" -#include "lib/rocprofiler/hsa/hsa.hpp" +#include "lib/rocprofiler-sdk/hsa/hsa.hpp" namespace rocprofiler { diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/aql/intercept.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/intercept.hpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/aql/intercept.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/intercept.hpp diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/aql/packet_construct.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/packet_construct.cpp similarity index 99% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/aql/packet_construct.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/packet_construct.cpp index bef067bff6..3196cf1f72 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/aql/packet_construct.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/packet_construct.cpp @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "lib/rocprofiler/aql/packet_construct.hpp" +#include "lib/rocprofiler-sdk/aql/packet_construct.hpp" #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/aql/packet_construct.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/packet_construct.hpp similarity index 93% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/aql/packet_construct.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/packet_construct.hpp index 3dcc5a3ee3..2fe247d2fd 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/aql/packet_construct.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/packet_construct.hpp @@ -30,10 +30,10 @@ #include #include -#include "lib/rocprofiler/aql/helpers.hpp" -#include "lib/rocprofiler/counters/metrics.hpp" -#include "lib/rocprofiler/hsa/agent_cache.hpp" -#include "lib/rocprofiler/hsa/queue.hpp" +#include "lib/rocprofiler-sdk/aql/helpers.hpp" +#include "lib/rocprofiler-sdk/counters/metrics.hpp" +#include "lib/rocprofiler-sdk/hsa/agent_cache.hpp" +#include "lib/rocprofiler-sdk/hsa/queue.hpp" namespace rocprofiler { diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/aql/tests/CMakeLists.txt b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/tests/CMakeLists.txt similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/aql/tests/CMakeLists.txt rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/tests/CMakeLists.txt diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/aql/tests/aql_test.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/tests/aql_test.cpp similarity index 94% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/aql/tests/aql_test.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/tests/aql_test.cpp index f39a58e6c5..4af35ec695 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/aql/tests/aql_test.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/tests/aql_test.cpp @@ -31,12 +31,12 @@ #include #include -#include "lib/rocprofiler/aql/helpers.hpp" -#include "lib/rocprofiler/aql/packet_construct.hpp" -#include "lib/rocprofiler/counters/metrics.hpp" -#include "lib/rocprofiler/hsa/agent_cache.hpp" -#include "lib/rocprofiler/hsa/queue.hpp" -#include "lib/rocprofiler/hsa/queue_controller.hpp" +#include "lib/rocprofiler-sdk/aql/helpers.hpp" +#include "lib/rocprofiler-sdk/aql/packet_construct.hpp" +#include "lib/rocprofiler-sdk/counters/metrics.hpp" +#include "lib/rocprofiler-sdk/hsa/agent_cache.hpp" +#include "lib/rocprofiler-sdk/hsa/queue.hpp" +#include "lib/rocprofiler-sdk/hsa/queue_controller.hpp" namespace rocprofiler { diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/buffer.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/buffer.cpp similarity index 96% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/buffer.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/buffer.cpp index 3347ea8804..b8770430cd 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/buffer.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/buffer.cpp @@ -20,18 +20,18 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "lib/rocprofiler/buffer.hpp" +#include "lib/rocprofiler-sdk/buffer.hpp" #include -#include +#include #include "lib/common/container/stable_vector.hpp" #include "lib/common/utility.hpp" -#include "lib/rocprofiler/context/context.hpp" -#include "lib/rocprofiler/context/domain.hpp" -#include "lib/rocprofiler/hsa/hsa.hpp" -#include "lib/rocprofiler/internal_threading.hpp" -#include "lib/rocprofiler/registration.hpp" +#include "lib/rocprofiler-sdk/context/context.hpp" +#include "lib/rocprofiler-sdk/context/domain.hpp" +#include "lib/rocprofiler-sdk/hsa/hsa.hpp" +#include "lib/rocprofiler-sdk/internal_threading.hpp" +#include "lib/rocprofiler-sdk/registration.hpp" #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/buffer.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/buffer.hpp similarity index 97% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/buffer.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/buffer.hpp index bdbedda30b..512f469ba8 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/buffer.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/buffer.hpp @@ -22,13 +22,13 @@ #pragma once -#include -#include +#include +#include #include "lib/common/container/record_header_buffer.hpp" #include "lib/common/container/stable_vector.hpp" #include "lib/common/demangle.hpp" -#include "lib/rocprofiler/allocator.hpp" +#include "lib/rocprofiler-sdk/allocator.hpp" #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/buffer_tracing.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/buffer_tracing.cpp similarity index 96% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/buffer_tracing.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/buffer_tracing.cpp index 3e37596b7d..717f1e5051 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/buffer_tracing.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/buffer_tracing.cpp @@ -20,13 +20,13 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include -#include +#include +#include -#include "lib/rocprofiler/context/context.hpp" -#include "lib/rocprofiler/context/domain.hpp" -#include "lib/rocprofiler/hsa/hsa.hpp" -#include "lib/rocprofiler/registration.hpp" +#include "lib/rocprofiler-sdk/context/context.hpp" +#include "lib/rocprofiler-sdk/context/domain.hpp" +#include "lib/rocprofiler-sdk/hsa/hsa.hpp" +#include "lib/rocprofiler-sdk/registration.hpp" #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/callback_tracing.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/callback_tracing.cpp similarity index 96% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/callback_tracing.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/callback_tracing.cpp index 897c679c37..50d2124f64 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/callback_tracing.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/callback_tracing.cpp @@ -20,13 +20,13 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include -#include +#include +#include -#include "lib/rocprofiler/context/context.hpp" -#include "lib/rocprofiler/context/domain.hpp" -#include "lib/rocprofiler/hsa/hsa.hpp" -#include "lib/rocprofiler/registration.hpp" +#include "lib/rocprofiler-sdk/context/context.hpp" +#include "lib/rocprofiler-sdk/context/domain.hpp" +#include "lib/rocprofiler-sdk/hsa/hsa.hpp" +#include "lib/rocprofiler-sdk/registration.hpp" #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/context.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context.cpp similarity index 92% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/context.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context.cpp index 966e9c2394..cd30b74135 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/context.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context.cpp @@ -20,14 +20,14 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include -#include -#include +#include +#include +#include -#include "lib/rocprofiler/context/context.hpp" -#include "lib/rocprofiler/context/domain.hpp" -#include "lib/rocprofiler/hsa/hsa.hpp" -#include "lib/rocprofiler/registration.hpp" +#include "lib/rocprofiler-sdk/context/context.hpp" +#include "lib/rocprofiler-sdk/context/domain.hpp" +#include "lib/rocprofiler-sdk/hsa/hsa.hpp" +#include "lib/rocprofiler-sdk/registration.hpp" #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/context/CMakeLists.txt b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/CMakeLists.txt similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/context/CMakeLists.txt rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/CMakeLists.txt diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/context/allocator.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/allocator.hpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/context/allocator.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/allocator.hpp diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/context/context.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/context.cpp similarity index 97% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/context/context.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/context.cpp index adddfd8839..2f190207fa 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/context/context.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/context.cpp @@ -20,16 +20,16 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include -#include -#include +#include +#include +#include #include "lib/common/container/stable_vector.hpp" #include "lib/common/synchronized.hpp" #include "lib/common/utility.hpp" -#include "lib/rocprofiler/buffer.hpp" -#include "lib/rocprofiler/context/context.hpp" -#include "lib/rocprofiler/counters/core.hpp" +#include "lib/rocprofiler-sdk/buffer.hpp" +#include "lib/rocprofiler-sdk/context/context.hpp" +#include "lib/rocprofiler-sdk/counters/core.hpp" #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/context/context.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/context.hpp similarity index 95% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/context/context.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/context.hpp index 577d64ea04..d7a4016abd 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/context/context.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/context.hpp @@ -22,17 +22,17 @@ #pragma once -#include -#include -#include +#include +#include +#include #include "lib/common/container/small_vector.hpp" #include "lib/common/container/stable_vector.hpp" #include "lib/common/synchronized.hpp" -#include "lib/rocprofiler/allocator.hpp" -#include "lib/rocprofiler/context/domain.hpp" -#include "lib/rocprofiler/counters/core.hpp" -#include "lib/rocprofiler/external_correlation.hpp" +#include "lib/rocprofiler-sdk/allocator.hpp" +#include "lib/rocprofiler-sdk/context/domain.hpp" +#include "lib/rocprofiler-sdk/counters/core.hpp" +#include "lib/rocprofiler-sdk/external_correlation.hpp" #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/context/domain.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/domain.cpp similarity index 97% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/context/domain.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/domain.cpp index 009433888f..2e6cd7d9c3 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/context/domain.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/domain.cpp @@ -20,8 +20,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "lib/rocprofiler/context/domain.hpp" -#include +#include "lib/rocprofiler-sdk/context/domain.hpp" +#include namespace rocprofiler { diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/context/domain.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/domain.hpp similarity index 98% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/context/domain.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/domain.hpp index ffe6a9583f..630379338e 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/context/domain.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/domain.hpp @@ -22,7 +22,7 @@ #pragma once -#include +#include #include "lib/common/mpl.hpp" diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters.cpp similarity index 95% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/counters.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters.cpp index 070e136373..971dbe8c53 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters.cpp @@ -20,18 +20,18 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include +#include #include #include "lib/common/synchronized.hpp" -#include "lib/rocprofiler/aql/helpers.hpp" -#include "lib/rocprofiler/counters/evaluate_ast.hpp" -#include "lib/rocprofiler/counters/id_decode.hpp" -#include "lib/rocprofiler/counters/metrics.hpp" -#include "lib/rocprofiler/hsa/agent_cache.hpp" -#include "lib/rocprofiler/hsa/queue.hpp" -#include "lib/rocprofiler/hsa/queue_controller.hpp" +#include "lib/rocprofiler-sdk/aql/helpers.hpp" +#include "lib/rocprofiler-sdk/counters/evaluate_ast.hpp" +#include "lib/rocprofiler-sdk/counters/id_decode.hpp" +#include "lib/rocprofiler-sdk/counters/metrics.hpp" +#include "lib/rocprofiler-sdk/hsa/agent_cache.hpp" +#include "lib/rocprofiler-sdk/hsa/queue.hpp" +#include "lib/rocprofiler-sdk/hsa/queue_controller.hpp" extern "C" { /** diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/CMakeLists.txt b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/CMakeLists.txt similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/counters/CMakeLists.txt rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/CMakeLists.txt diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/core.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/core.cpp similarity index 96% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/counters/core.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/core.cpp index 9bbda75398..f93a444243 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/core.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/core.cpp @@ -20,18 +20,18 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "lib/rocprofiler/counters/core.hpp" +#include "lib/rocprofiler-sdk/counters/core.hpp" #include "lib/common/synchronized.hpp" -#include "lib/rocprofiler/agent.hpp" -#include "lib/rocprofiler/aql/helpers.hpp" -#include "lib/rocprofiler/aql/packet_construct.hpp" -#include "lib/rocprofiler/buffer.hpp" -#include "lib/rocprofiler/context/context.hpp" -#include "lib/rocprofiler/hsa/queue_controller.hpp" -#include "lib/rocprofiler/registration.hpp" +#include "lib/rocprofiler-sdk/agent.hpp" +#include "lib/rocprofiler-sdk/aql/helpers.hpp" +#include "lib/rocprofiler-sdk/aql/packet_construct.hpp" +#include "lib/rocprofiler-sdk/buffer.hpp" +#include "lib/rocprofiler-sdk/context/context.hpp" +#include "lib/rocprofiler-sdk/hsa/queue_controller.hpp" +#include "lib/rocprofiler-sdk/registration.hpp" -#include +#include namespace rocprofiler { diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/core.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/core.hpp similarity index 92% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/counters/core.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/core.hpp index 64f022a388..f0a597318b 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/core.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/core.hpp @@ -22,14 +22,14 @@ #pragma once -#include -#include +#include +#include -#include "lib/rocprofiler/aql/helpers.hpp" -#include "lib/rocprofiler/aql/packet_construct.hpp" -#include "lib/rocprofiler/counters/evaluate_ast.hpp" -#include "lib/rocprofiler/counters/metrics.hpp" -#include "lib/rocprofiler/hsa/agent_cache.hpp" +#include "lib/rocprofiler-sdk/aql/helpers.hpp" +#include "lib/rocprofiler-sdk/aql/packet_construct.hpp" +#include "lib/rocprofiler-sdk/counters/evaluate_ast.hpp" +#include "lib/rocprofiler-sdk/counters/metrics.hpp" +#include "lib/rocprofiler-sdk/hsa/agent_cache.hpp" namespace rocprofiler { diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/dimensions.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/dimensions.cpp similarity index 95% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/counters/dimensions.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/dimensions.cpp index b2dd9e2949..f67f305151 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/dimensions.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/dimensions.cpp @@ -31,9 +31,9 @@ #include "lib/common/synchronized.hpp" #include "lib/common/utility.hpp" -#include "lib/rocprofiler/aql/helpers.hpp" -#include "lib/rocprofiler/aql/packet_construct.hpp" -#include "lib/rocprofiler/hsa/queue_controller.hpp" +#include "lib/rocprofiler-sdk/aql/helpers.hpp" +#include "lib/rocprofiler-sdk/aql/packet_construct.hpp" +#include "lib/rocprofiler-sdk/hsa/queue_controller.hpp" namespace rocprofiler { diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/dimensions.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/dimensions.hpp similarity index 97% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/counters/dimensions.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/dimensions.hpp index b49a04788d..982c9dc795 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/dimensions.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/dimensions.hpp @@ -29,8 +29,8 @@ #include #include -#include "lib/rocprofiler/counters/id_decode.hpp" -#include "lib/rocprofiler/counters/metrics.hpp" +#include "lib/rocprofiler-sdk/counters/id_decode.hpp" +#include "lib/rocprofiler-sdk/counters/metrics.hpp" namespace rocprofiler { diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/evaluate_ast.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/evaluate_ast.cpp similarity index 99% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/counters/evaluate_ast.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/evaluate_ast.cpp index 3df3753710..058322b0c4 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/evaluate_ast.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/evaluate_ast.cpp @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "lib/rocprofiler/counters/evaluate_ast.hpp" +#include "lib/rocprofiler-sdk/counters/evaluate_ast.hpp" #include #include @@ -30,8 +30,8 @@ #include #include "lib/common/synchronized.hpp" #include "lib/common/utility.hpp" -#include "lib/rocprofiler/counters/dimensions.hpp" -#include "lib/rocprofiler/counters/parser/reader.hpp" +#include "lib/rocprofiler-sdk/counters/dimensions.hpp" +#include "lib/rocprofiler-sdk/counters/parser/reader.hpp" namespace rocprofiler { diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/evaluate_ast.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/evaluate_ast.hpp similarity index 97% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/counters/evaluate_ast.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/evaluate_ast.hpp index 4a25809986..37387b6f65 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/evaluate_ast.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/evaluate_ast.hpp @@ -28,10 +28,10 @@ #include #include "lib/common/utility.hpp" -#include "lib/rocprofiler/aql/packet_construct.hpp" -#include "lib/rocprofiler/counters/dimensions.hpp" -#include "lib/rocprofiler/counters/metrics.hpp" -#include "lib/rocprofiler/counters/parser/raw_ast.hpp" +#include "lib/rocprofiler-sdk/aql/packet_construct.hpp" +#include "lib/rocprofiler-sdk/counters/dimensions.hpp" +#include "lib/rocprofiler-sdk/counters/metrics.hpp" +#include "lib/rocprofiler-sdk/counters/parser/raw_ast.hpp" namespace rocprofiler { diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/id_decode.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/id_decode.cpp similarity index 97% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/counters/id_decode.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/id_decode.cpp index b36ef4ad60..c724d448df 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/id_decode.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/id_decode.cpp @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "lib/rocprofiler/counters/id_decode.hpp" +#include "lib/rocprofiler-sdk/counters/id_decode.hpp" #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/id_decode.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/id_decode.hpp similarity index 99% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/counters/id_decode.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/id_decode.hpp index 17fae2b2fa..82a6f8da86 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/id_decode.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/id_decode.hpp @@ -24,7 +24,7 @@ #include -#include +#include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/metrics.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/metrics.cpp similarity index 91% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/counters/metrics.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/metrics.cpp index 7ae04f56fe..1fc58c4e0c 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/metrics.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/metrics.cpp @@ -22,14 +22,14 @@ #include "metrics.hpp" -#include +#include #include "lib/common/defines.hpp" #include "lib/common/filesystem.hpp" #include "lib/common/synchronized.hpp" #include "lib/common/utility.hpp" #include "lib/common/xml.hpp" -#include "lib/rocprofiler/agent.hpp" +#include "lib/rocprofiler-sdk/agent.hpp" #include "dimensions.hpp" #include "glog/logging.h" @@ -145,7 +145,7 @@ findViaInstallPath(const std::string& filename) if(dladdr(reinterpret_cast(rocprofiler_query_available_agents), &dl_info) != 0) { return common::filesystem::path{dl_info.dli_fname}.parent_path().parent_path() / - fmt::format("share/rocprofiler/{}", filename); + fmt::format("share/rocprofiler-sdk/{}", filename); } return filename; } @@ -167,13 +167,19 @@ findViaEnvironment(const std::string& filename) MetricMap getDerivedHardwareMetrics() { - return loadXml(findViaEnvironment("derived_counters.xml")); + auto counters_path = findViaEnvironment("derived_counters.xml"); + LOG_IF(FATAL, !common::filesystem::exists(counters_path)) + << "metric xml file '" << counters_path << "' does not exist"; + return loadXml(counters_path); } MetricMap getBaseHardwareMetrics() { - return loadXml(findViaEnvironment("basic_counters.xml"), true); + auto counters_path = findViaEnvironment("basic_counters.xml"); + LOG_IF(FATAL, !common::filesystem::exists(counters_path)) + << "metric xml file '" << counters_path << "' does not exist"; + return loadXml(counters_path, true); } const MetricIdMap& diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/metrics.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/metrics.hpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/counters/metrics.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/metrics.hpp diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/parser/CMakeLists.txt b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/parser/CMakeLists.txt similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/counters/parser/CMakeLists.txt rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/parser/CMakeLists.txt diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/parser/parser.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/parser/parser.cpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/counters/parser/parser.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/parser/parser.cpp diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/parser/parser.h b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/parser/parser.h similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/counters/parser/parser.h rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/parser/parser.h diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/parser/parser.y b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/parser/parser.y similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/counters/parser/parser.y rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/parser/parser.y diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/parser/raw_ast.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/parser/raw_ast.hpp similarity index 99% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/counters/parser/raw_ast.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/parser/raw_ast.hpp index 2ce87581f0..f1e24d69b8 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/parser/raw_ast.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/parser/raw_ast.hpp @@ -36,7 +36,7 @@ #include #include "lib/common/utility.hpp" -#include "lib/rocprofiler/counters/id_decode.hpp" +#include "lib/rocprofiler-sdk/counters/id_decode.hpp" namespace rocprofiler { diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/parser/reader.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/parser/reader.hpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/counters/parser/reader.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/parser/reader.hpp diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/parser/scanner.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/parser/scanner.cpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/counters/parser/scanner.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/parser/scanner.cpp diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/parser/scanner.l b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/parser/scanner.l similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/counters/parser/scanner.l rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/parser/scanner.l diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/parser/tests/CMakeLists.txt b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/parser/tests/CMakeLists.txt similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/counters/parser/tests/CMakeLists.txt rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/parser/tests/CMakeLists.txt diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/parser/tests/parser_test.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/parser/tests/parser_test.cpp similarity index 99% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/counters/parser/tests/parser_test.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/parser/tests/parser_test.cpp index 6c889d7b1a..55267bafd4 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/parser/tests/parser_test.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/parser/tests/parser_test.cpp @@ -26,8 +26,8 @@ #include -#include "lib/rocprofiler/counters/metrics.hpp" -#include "lib/rocprofiler/counters/parser/reader.hpp" +#include "lib/rocprofiler-sdk/counters/metrics.hpp" +#include "lib/rocprofiler-sdk/counters/parser/reader.hpp" TEST(parser, base_ops) { diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/tests/CMakeLists.txt b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/tests/CMakeLists.txt similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/counters/tests/CMakeLists.txt rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/tests/CMakeLists.txt diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/tests/dimension.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/tests/dimension.cpp similarity index 98% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/counters/tests/dimension.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/tests/dimension.cpp index d2db35df48..3e0d46ffe6 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/tests/dimension.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/tests/dimension.cpp @@ -23,7 +23,7 @@ #include #include "lib/common/utility.hpp" -#include "lib/rocprofiler/counters/id_decode.hpp" +#include "lib/rocprofiler-sdk/counters/id_decode.hpp" TEST(dimension, set_get) { diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/tests/evaluate_ast_test.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/tests/evaluate_ast_test.cpp similarity index 99% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/counters/tests/evaluate_ast_test.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/tests/evaluate_ast_test.cpp index 7758f8f01e..b008bb59f2 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/tests/evaluate_ast_test.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/tests/evaluate_ast_test.cpp @@ -28,8 +28,8 @@ #include #include "evaluate_ast_test.hpp" -#include "lib/rocprofiler/agent.hpp" -#include "lib/rocprofiler/counters/parser/reader.hpp" +#include "lib/rocprofiler-sdk/agent.hpp" +#include "lib/rocprofiler-sdk/counters/parser/reader.hpp" namespace { diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/tests/evaluate_ast_test.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/tests/evaluate_ast_test.hpp similarity index 98% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/counters/tests/evaluate_ast_test.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/tests/evaluate_ast_test.hpp index 901cfceb0a..e96d71aa32 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/tests/evaluate_ast_test.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/tests/evaluate_ast_test.hpp @@ -25,7 +25,7 @@ #include #include #include -#include "lib/rocprofiler/counters/evaluate_ast.hpp" +#include "lib/rocprofiler-sdk/counters/evaluate_ast.hpp" struct test_data { diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/tests/metrics_test.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/tests/metrics_test.cpp similarity index 98% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/counters/tests/metrics_test.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/tests/metrics_test.cpp index 9938ff35e4..8cabd90520 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/tests/metrics_test.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/tests/metrics_test.cpp @@ -25,8 +25,8 @@ #include #include -#include "lib/rocprofiler/agent.hpp" -#include "lib/rocprofiler/counters/metrics.hpp" +#include "lib/rocprofiler-sdk/agent.hpp" +#include "lib/rocprofiler-sdk/counters/metrics.hpp" namespace { diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/tests/metrics_test.h b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/tests/metrics_test.h similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/counters/tests/metrics_test.h rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/tests/metrics_test.h diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/xml/CMakeLists.txt b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/xml/CMakeLists.txt new file mode 100644 index 0000000000..4503aa1756 --- /dev/null +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/xml/CMakeLists.txt @@ -0,0 +1,10 @@ +configure_file(basic_counters.xml + ${PROJECT_BINARY_DIR}/share/rocprofiler-sdk/basic_counters.xml COPYONLY) +configure_file(derived_counters.xml + ${PROJECT_BINARY_DIR}/share/rocprofiler-sdk/derived_counters.xml COPYONLY) + +install( + FILES ${PROJECT_BINARY_DIR}/share/rocprofiler-sdk/basic_counters.xml + ${PROJECT_BINARY_DIR}/share/rocprofiler-sdk/derived_counters.xml + DESTINATION share/rocprofiler-sdk + COMPONENT core) diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/xml/basic_counters.xml b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/xml/basic_counters.xml similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/counters/xml/basic_counters.xml rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/xml/basic_counters.xml diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/xml/derived_counters.xml b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/xml/derived_counters.xml similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/counters/xml/derived_counters.xml rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/xml/derived_counters.xml diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/dispatch_profile.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/dispatch_profile.cpp similarity index 88% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/dispatch_profile.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/dispatch_profile.cpp index 150b8736bd..79ebddd190 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/dispatch_profile.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/dispatch_profile.cpp @@ -20,13 +20,13 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include +#include -#include "lib/rocprofiler/aql/helpers.hpp" -#include "lib/rocprofiler/counters/core.hpp" -#include "lib/rocprofiler/counters/evaluate_ast.hpp" -#include "lib/rocprofiler/counters/metrics.hpp" -#include "lib/rocprofiler/hsa/agent_cache.hpp" +#include "lib/rocprofiler-sdk/aql/helpers.hpp" +#include "lib/rocprofiler-sdk/counters/core.hpp" +#include "lib/rocprofiler-sdk/counters/evaluate_ast.hpp" +#include "lib/rocprofiler-sdk/counters/metrics.hpp" +#include "lib/rocprofiler-sdk/hsa/agent_cache.hpp" extern "C" { /** diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/external_correlation.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/external_correlation.cpp similarity index 97% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/external_correlation.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/external_correlation.cpp index 8b6023375f..091757f34f 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/external_correlation.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/external_correlation.cpp @@ -20,13 +20,13 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include -#include +#include +#include #include "lib/common/synchronized.hpp" #include "lib/common/utility.hpp" -#include "lib/rocprofiler/context/context.hpp" -#include "lib/rocprofiler/external_correlation.hpp" +#include "lib/rocprofiler-sdk/context/context.hpp" +#include "lib/rocprofiler-sdk/external_correlation.hpp" #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/external_correlation.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/external_correlation.hpp similarity index 96% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/external_correlation.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/external_correlation.hpp index 4da866290f..981d96895a 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/external_correlation.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/external_correlation.hpp @@ -22,8 +22,8 @@ #pragma once -#include -#include +#include +#include #include "lib/common/defines.hpp" #include "lib/common/synchronized.hpp" diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/CMakeLists.txt b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/CMakeLists.txt similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/CMakeLists.txt rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/CMakeLists.txt diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/agent_cache.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/agent_cache.cpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/agent_cache.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/agent_cache.cpp diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/agent_cache.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/agent_cache.hpp similarity index 99% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/agent_cache.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/agent_cache.hpp index c6105fa8b3..02d5cc182d 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/agent_cache.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/agent_cache.hpp @@ -34,7 +34,7 @@ #include #include -#include +#include #include "lib/common/utility.hpp" // Construct const and non-const accessor functions diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/aql_packet.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/aql_packet.cpp similarity index 97% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/aql_packet.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/aql_packet.cpp index 23a28e9fea..82da333b7f 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/aql_packet.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/aql_packet.cpp @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "lib/rocprofiler/hsa/aql_packet.hpp" +#include "lib/rocprofiler-sdk/hsa/aql_packet.hpp" #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/aql_packet.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/aql_packet.hpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/aql_packet.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/aql_packet.hpp diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/code_object.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/code_object.cpp similarity index 99% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/code_object.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/code_object.cpp index 2947c902c6..2b8e84ff60 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/code_object.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/code_object.cpp @@ -20,18 +20,18 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "lib/rocprofiler/hsa/code_object.hpp" +#include "lib/rocprofiler-sdk/hsa/code_object.hpp" #include "lib/common/scope_destructor.hpp" #include "lib/common/synchronized.hpp" #include "lib/common/utility.hpp" -#include "lib/rocprofiler/agent.hpp" -#include "lib/rocprofiler/context/context.hpp" -#include "lib/rocprofiler/hsa/hsa.hpp" +#include "lib/rocprofiler-sdk/agent.hpp" +#include "lib/rocprofiler-sdk/context/context.hpp" +#include "lib/rocprofiler-sdk/hsa/hsa.hpp" #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/code_object.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/code_object.hpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/code_object.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/code_object.hpp diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/defines.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/defines.hpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/defines.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/defines.hpp diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/details/CMakeLists.txt b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/details/CMakeLists.txt similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/details/CMakeLists.txt rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/details/CMakeLists.txt diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/details/ostream.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/details/ostream.hpp similarity index 99% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/details/ostream.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/details/ostream.hpp index a2fc3e2c74..fe8b9b3e8f 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/details/ostream.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/details/ostream.hpp @@ -22,7 +22,7 @@ #pragma once -#include +#include #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/hsa.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/hsa.cpp similarity index 97% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/hsa.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/hsa.cpp index ab28e68578..635edb7752 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/hsa.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/hsa.cpp @@ -20,18 +20,18 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "lib/rocprofiler/hsa/hsa.hpp" +#include "lib/rocprofiler-sdk/hsa/hsa.hpp" #include "lib/common/defines.hpp" #include "lib/common/utility.hpp" -#include "lib/rocprofiler/buffer.hpp" -#include "lib/rocprofiler/context/context.hpp" -#include "lib/rocprofiler/hsa/details/ostream.hpp" -#include "lib/rocprofiler/hsa/types.hpp" -#include "lib/rocprofiler/hsa/utils.hpp" +#include "lib/rocprofiler-sdk/buffer.hpp" +#include "lib/rocprofiler-sdk/context/context.hpp" +#include "lib/rocprofiler-sdk/hsa/details/ostream.hpp" +#include "lib/rocprofiler-sdk/hsa/types.hpp" +#include "lib/rocprofiler-sdk/hsa/utils.hpp" -#include -#include -#include +#include +#include +#include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/hsa.def.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/hsa.def.cpp similarity index 99% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/hsa.def.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/hsa.def.cpp index fb8612459f..cb14e2ecb2 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/hsa.def.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/hsa.def.cpp @@ -23,7 +23,7 @@ #if defined(ROCPROFILER_LIB_ROCPROFILER_HSA_HSA_CPP_IMPL) && \ ROCPROFILER_LIB_ROCPROFILER_HSA_HSA_CPP_IMPL == 1 -# include +# include # include "defines.hpp" # include "hsa.hpp" diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/hsa.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/hsa.hpp similarity index 98% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/hsa.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/hsa.hpp index 47db446b2d..18d7af320e 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/hsa.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/hsa.hpp @@ -22,7 +22,7 @@ #pragma once -#include +#include #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/queue.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/queue.cpp similarity index 99% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/queue.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/queue.cpp index 7cf69153cf..77c7d73a97 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/queue.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/queue.cpp @@ -20,16 +20,16 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "lib/rocprofiler/hsa/queue.hpp" +#include "lib/rocprofiler-sdk/hsa/queue.hpp" #include "lib/common/utility.hpp" -#include "lib/rocprofiler/buffer.hpp" -#include "lib/rocprofiler/context/context.hpp" -#include "lib/rocprofiler/hsa/code_object.hpp" +#include "lib/rocprofiler-sdk/buffer.hpp" +#include "lib/rocprofiler-sdk/context/context.hpp" +#include "lib/rocprofiler-sdk/hsa/code_object.hpp" #include #include #include -#include +#include #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/queue.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/queue.hpp similarity index 97% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/queue.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/queue.hpp index 1290ea211b..424a939b66 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/queue.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/queue.hpp @@ -22,14 +22,14 @@ #pragma once -#include -#include +#include +#include #include "lib/common/container/small_vector.hpp" #include "lib/common/synchronized.hpp" #include "lib/common/utility.hpp" -#include "lib/rocprofiler/hsa/agent_cache.hpp" -#include "lib/rocprofiler/hsa/aql_packet.hpp" +#include "lib/rocprofiler-sdk/hsa/agent_cache.hpp" +#include "lib/rocprofiler-sdk/hsa/aql_packet.hpp" #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/queue_controller.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/queue_controller.cpp similarity index 96% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/queue_controller.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/queue_controller.cpp index 16722f7c9f..118b0c40fc 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/queue_controller.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/queue_controller.cpp @@ -20,12 +20,12 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "lib/rocprofiler/hsa/queue_controller.hpp" -#include "lib/rocprofiler/agent.hpp" -#include "lib/rocprofiler/context/context.hpp" -#include "lib/rocprofiler/hsa/agent_cache.hpp" +#include "lib/rocprofiler-sdk/hsa/queue_controller.hpp" +#include "lib/rocprofiler-sdk/agent.hpp" +#include "lib/rocprofiler-sdk/context/context.hpp" +#include "lib/rocprofiler-sdk/hsa/agent_cache.hpp" -#include +#include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/queue_controller.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/queue_controller.hpp similarity index 97% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/queue_controller.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/queue_controller.hpp index 81ca9da6c4..1c4a8c692c 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/queue_controller.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/queue_controller.hpp @@ -22,9 +22,9 @@ #pragma once -#include +#include -#include "lib/rocprofiler/hsa/queue.hpp" +#include "lib/rocprofiler-sdk/hsa/queue.hpp" #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/types.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/types.hpp similarity index 99% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/types.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/types.hpp index 0b2831bce1..e0f9f1566f 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/types.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/types.hpp @@ -22,8 +22,8 @@ #pragma once -#include -#include +#include +#include #include "lib/common/defines.hpp" diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/utils.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/utils.hpp similarity index 99% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/utils.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/utils.hpp index 5373c0e9cf..6cd18cca84 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/hsa/utils.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/utils.hpp @@ -22,7 +22,7 @@ #pragma once -#include +#include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/intercept_table.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/intercept_table.cpp similarity index 95% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/intercept_table.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/intercept_table.cpp index 82fe0588ea..399e20bd6a 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/intercept_table.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/intercept_table.cpp @@ -20,16 +20,16 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include -#include -#include +#include +#include +#include #include "lib/common/container/stable_vector.hpp" #include "lib/common/utility.hpp" -#include "lib/rocprofiler/buffer.hpp" -#include "lib/rocprofiler/context/context.hpp" -#include "lib/rocprofiler/internal_threading.hpp" -#include "lib/rocprofiler/registration.hpp" +#include "lib/rocprofiler-sdk/buffer.hpp" +#include "lib/rocprofiler-sdk/context/context.hpp" +#include "lib/rocprofiler-sdk/internal_threading.hpp" +#include "lib/rocprofiler-sdk/registration.hpp" #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/intercept_table.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/intercept_table.hpp similarity index 97% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/intercept_table.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/intercept_table.hpp index 47f7db852d..09e91e2f9a 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/intercept_table.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/intercept_table.hpp @@ -22,7 +22,7 @@ #pragma once -#include +#include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/internal_threading.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/internal_threading.cpp similarity index 96% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/internal_threading.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/internal_threading.cpp index 7c37ae584e..2f371b6a2f 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/internal_threading.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/internal_threading.cpp @@ -20,17 +20,17 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include -#include -#include +#include +#include +#include #include "lib/common/container/stable_vector.hpp" #include "lib/common/utility.hpp" -#include "lib/rocprofiler/allocator.hpp" -#include "lib/rocprofiler/buffer.hpp" -#include "lib/rocprofiler/context/context.hpp" -#include "lib/rocprofiler/internal_threading.hpp" -#include "lib/rocprofiler/registration.hpp" +#include "lib/rocprofiler-sdk/allocator.hpp" +#include "lib/rocprofiler-sdk/buffer.hpp" +#include "lib/rocprofiler-sdk/context/context.hpp" +#include "lib/rocprofiler-sdk/internal_threading.hpp" +#include "lib/rocprofiler-sdk/registration.hpp" #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/internal_threading.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/internal_threading.hpp similarity index 96% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/internal_threading.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/internal_threading.hpp index 0eeadb2d06..ab0fad3f1e 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/internal_threading.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/internal_threading.hpp @@ -22,12 +22,12 @@ #pragma once -#include +#include #include "lib/common/container/stable_vector.hpp" #include "lib/common/defines.hpp" #include "lib/common/utility.hpp" -#include "lib/rocprofiler/allocator.hpp" +#include "lib/rocprofiler-sdk/allocator.hpp" #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling.cpp similarity index 95% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling.cpp index 75d3c7d7a1..21a5088943 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling.cpp @@ -20,10 +20,10 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include -#include +#include +#include -#include "lib/rocprofiler/registration.hpp" +#include "lib/rocprofiler-sdk/registration.hpp" namespace { diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/CMakeLists.txt b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/CMakeLists.txt similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/CMakeLists.txt rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/CMakeLists.txt diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/parser/CMakeLists.txt b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/CMakeLists.txt similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/parser/CMakeLists.txt rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/CMakeLists.txt diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/parser/correlation.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/correlation.cpp similarity index 98% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/parser/correlation.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/correlation.cpp index 85d1c3594e..1978bc3788 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/parser/correlation.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/correlation.cpp @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "lib/rocprofiler/pc_sampling/parser/correlation.hpp" +#include "lib/rocprofiler-sdk/pc_sampling/parser/correlation.hpp" template <> struct std::hash diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/parser/correlation.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/correlation.hpp similarity index 99% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/parser/correlation.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/correlation.hpp index fe634e5fbb..80a6aae96f 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/parser/correlation.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/correlation.hpp @@ -28,7 +28,7 @@ #include #include -#include "lib/rocprofiler/pc_sampling/parser/translation.hpp" +#include "lib/rocprofiler-sdk/pc_sampling/parser/translation.hpp" #if 0 template <> diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/parser/gfx11.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/gfx11.hpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/parser/gfx11.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/gfx11.hpp diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/parser/gfx9.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/gfx9.hpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/parser/gfx9.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/gfx9.hpp diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/parser/parser_types.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/parser_types.hpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/parser/parser_types.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/parser_types.hpp diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/parser/pc_record_interface.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/pc_record_interface.cpp similarity index 97% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/parser/pc_record_interface.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/pc_record_interface.cpp index 31ebde998e..fc4e824403 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/parser/pc_record_interface.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/pc_record_interface.cpp @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "lib/rocprofiler/pc_sampling/parser/pc_record_interface.hpp" +#include "lib/rocprofiler-sdk/pc_sampling/parser/pc_record_interface.hpp" uint64_t PCSamplingParserContext::alloc(pcsample_v1_t** buffer, uint64_t size) diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/parser/pc_record_interface.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/pc_record_interface.hpp similarity index 97% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/parser/pc_record_interface.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/pc_record_interface.hpp index 544f47f736..d7ea058193 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/parser/pc_record_interface.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/pc_record_interface.hpp @@ -29,8 +29,8 @@ #include #include -#include "lib/rocprofiler/pc_sampling/parser/correlation.hpp" -#include "lib/rocprofiler/pc_sampling/parser/parser_types.hpp" +#include "lib/rocprofiler-sdk/pc_sampling/parser/correlation.hpp" +#include "lib/rocprofiler-sdk/pc_sampling/parser/parser_types.hpp" struct PCSamplingData { diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/parser/rocr.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/rocr.hpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/parser/rocr.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/rocr.hpp diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/parser/tests/CMakeLists.txt b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/tests/CMakeLists.txt similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/parser/tests/CMakeLists.txt rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/tests/CMakeLists.txt diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/parser/tests/mocks.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/tests/mocks.hpp similarity index 99% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/parser/tests/mocks.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/tests/mocks.hpp index f8af248b12..a0579af6a2 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/parser/tests/mocks.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/tests/mocks.hpp @@ -31,7 +31,7 @@ #include #include -#include "lib/rocprofiler/pc_sampling/parser/correlation.hpp" +#include "lib/rocprofiler-sdk/pc_sampling/parser/correlation.hpp" #define CHECK_PARSER(x) \ { \ diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/parser/tests/pcs_parser.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/tests/pcs_parser.cpp similarity index 99% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/parser/tests/pcs_parser.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/tests/pcs_parser.cpp index 5f5ec1e28c..ec1ac93d46 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/parser/tests/pcs_parser.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/tests/pcs_parser.cpp @@ -28,8 +28,8 @@ #include #include -#include "lib/rocprofiler/pc_sampling/parser/pc_record_interface.hpp" -#include "lib/rocprofiler/pc_sampling/parser/tests/mocks.hpp" +#include "lib/rocprofiler-sdk/pc_sampling/parser/pc_record_interface.hpp" +#include "lib/rocprofiler-sdk/pc_sampling/parser/tests/mocks.hpp" #define GFXIP_MAJOR 9 diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/parser/translation.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/translation.cpp similarity index 98% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/parser/translation.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/translation.cpp index 8147ab4b27..e28c2f96f5 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/parser/translation.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/translation.cpp @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "lib/rocprofiler/pc_sampling/parser/translation.hpp" +#include "lib/rocprofiler-sdk/pc_sampling/parser/translation.hpp" pcsample_v1_t copyHostTrapSample(const perf_sample_host_trap_v1& sample) diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/parser/translation.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/translation.hpp similarity index 93% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/parser/translation.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/translation.hpp index 9cc4dac095..48101f63ee 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/pc_sampling/parser/translation.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/translation.hpp @@ -25,11 +25,11 @@ #include #include -#include "lib/rocprofiler/pc_sampling/parser/gfx11.hpp" -#include "lib/rocprofiler/pc_sampling/parser/gfx_unknown.hpp" -#include "lib/rocprofiler/pc_sampling/parser/gfx9.hpp" -#include "lib/rocprofiler/pc_sampling/parser/parser_types.hpp" -#include "lib/rocprofiler/pc_sampling/parser/rocr.hpp" +#include "lib/rocprofiler-sdk/pc_sampling/parser/gfx11.hpp" +#include "lib/rocprofiler-sdk/pc_sampling/parser/gfx_unknown.hpp" +#include "lib/rocprofiler-sdk/pc_sampling/parser/gfx9.hpp" +#include "lib/rocprofiler-sdk/pc_sampling/parser/parser_types.hpp" +#include "lib/rocprofiler-sdk/pc_sampling/parser/rocr.hpp" pcsample_v1_t copyHostTrapSample(const perf_sample_host_trap_v1& sample); diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/profile_config.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/profile_config.cpp similarity index 90% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/profile_config.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/profile_config.cpp index 6fcaf91e8a..cb4b060145 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/profile_config.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/profile_config.cpp @@ -20,15 +20,15 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include +#include #include "lib/common/synchronized.hpp" #include "lib/common/utility.hpp" -#include "lib/rocprofiler/aql/helpers.hpp" -#include "lib/rocprofiler/counters/core.hpp" -#include "lib/rocprofiler/counters/evaluate_ast.hpp" -#include "lib/rocprofiler/counters/metrics.hpp" -#include "lib/rocprofiler/hsa/agent_cache.hpp" +#include "lib/rocprofiler-sdk/aql/helpers.hpp" +#include "lib/rocprofiler-sdk/counters/core.hpp" +#include "lib/rocprofiler-sdk/counters/evaluate_ast.hpp" +#include "lib/rocprofiler-sdk/counters/metrics.hpp" +#include "lib/rocprofiler-sdk/hsa/agent_cache.hpp" extern "C" { /** diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/registration.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/registration.cpp similarity index 97% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/registration.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/registration.cpp index abfb1ad0a0..3f53b67c7f 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/registration.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/registration.cpp @@ -20,22 +20,22 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "lib/rocprofiler/registration.hpp" +#include "lib/rocprofiler-sdk/registration.hpp" #include "lib/common/environment.hpp" -#include "lib/rocprofiler/agent.hpp" -#include "lib/rocprofiler/allocator.hpp" -#include "lib/rocprofiler/context/context.hpp" -#include "lib/rocprofiler/hsa/code_object.hpp" -#include "lib/rocprofiler/hsa/hsa.hpp" -#include "lib/rocprofiler/hsa/queue.hpp" -#include "lib/rocprofiler/hsa/queue_controller.hpp" -#include "lib/rocprofiler/intercept_table.hpp" -#include "lib/rocprofiler/internal_threading.hpp" +#include "lib/rocprofiler-sdk/agent.hpp" +#include "lib/rocprofiler-sdk/allocator.hpp" +#include "lib/rocprofiler-sdk/context/context.hpp" +#include "lib/rocprofiler-sdk/hsa/code_object.hpp" +#include "lib/rocprofiler-sdk/hsa/hsa.hpp" +#include "lib/rocprofiler-sdk/hsa/queue.hpp" +#include "lib/rocprofiler-sdk/hsa/queue_controller.hpp" +#include "lib/rocprofiler-sdk/intercept_table.hpp" +#include "lib/rocprofiler-sdk/internal_threading.hpp" -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/registration.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/registration.hpp similarity index 98% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/registration.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/registration.hpp index 6824aa3777..f339ab2899 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/registration.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/registration.hpp @@ -22,7 +22,7 @@ #pragma once -#include +#include #include "lib/common/defines.hpp" #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/rocprofiler.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/rocprofiler.cpp similarity index 98% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/rocprofiler.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/rocprofiler.cpp index 9dd6e94f9d..c6c7abe308 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/rocprofiler.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/rocprofiler.cpp @@ -20,8 +20,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include -#include +#include +#include #include "lib/common/utility.hpp" diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/tests/CMakeLists.txt b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/tests/CMakeLists.txt similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/tests/CMakeLists.txt rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/tests/CMakeLists.txt diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/tests/agent.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/tests/agent.cpp similarity index 98% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/tests/agent.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/tests/agent.cpp index 810a863a1d..f4cab77147 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/tests/agent.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/tests/agent.cpp @@ -20,12 +20,12 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include -#include -#include +#include +#include +#include -#include "lib/rocprofiler/registration.hpp" -#include "lib/rocprofiler/tests/details/agent.hpp" +#include "lib/rocprofiler-sdk/registration.hpp" +#include "lib/rocprofiler-sdk/tests/details/agent.hpp" #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/tests/buffer.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/tests/buffer.cpp similarity index 94% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/tests/buffer.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/tests/buffer.cpp index 2b7939790a..07b3f41c82 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/tests/buffer.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/tests/buffer.cpp @@ -20,12 +20,12 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "lib/rocprofiler/buffer.hpp" +#include "lib/rocprofiler-sdk/buffer.hpp" #include "lib/common/units.hpp" -#include -#include -#include +#include +#include +#include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/tests/details/agent.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/tests/details/agent.cpp similarity index 99% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/tests/details/agent.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/tests/details/agent.cpp index 07ead0db9e..eb1133b193 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/tests/details/agent.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/tests/details/agent.cpp @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "lib/rocprofiler/tests/details/agent.hpp" +#include "lib/rocprofiler-sdk/tests/details/agent.hpp" #include "lib/common/filesystem.hpp" #include "lib/common/utility.hpp" diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/tests/details/agent.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/tests/details/agent.hpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/tests/details/agent.hpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/tests/details/agent.hpp diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/tests/external_correlation.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/tests/external_correlation.cpp similarity index 99% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/tests/external_correlation.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/tests/external_correlation.cpp index 4bf0242ade..cb6f4e5196 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/tests/external_correlation.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/tests/external_correlation.cpp @@ -20,16 +20,16 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include -#include +#include +#include +#include +#include #include "lib/common/defines.hpp" #include "lib/common/environment.hpp" #include "lib/common/filesystem.hpp" #include "lib/common/units.hpp" #include "lib/common/utility.hpp" -#include "rocprofiler/external_correlation.h" -#include "rocprofiler/fwd.h" #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/tests/intercept_table.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/tests/intercept_table.cpp similarity index 99% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/tests/intercept_table.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/tests/intercept_table.cpp index 63681af7f7..7403eaa103 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/tests/intercept_table.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/tests/intercept_table.cpp @@ -20,10 +20,10 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include -#include -#include -#include +#include +#include +#include +#include #include "lib/common/defines.hpp" #include "lib/common/environment.hpp" diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/tests/registration.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/tests/registration.cpp similarity index 99% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/tests/registration.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/tests/registration.cpp index de99cffbfc..fbb4a463f6 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/tests/registration.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/tests/registration.cpp @@ -20,8 +20,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include -#include +#include +#include #include "lib/common/defines.hpp" #include "lib/common/environment.hpp" diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/tests/status.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/tests/status.cpp similarity index 96% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/tests/status.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/tests/status.cpp index 64c4a55465..300b5d2a36 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/tests/status.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/tests/status.cpp @@ -20,8 +20,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include -#include +#include +#include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/tests/timestamp.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/tests/timestamp.cpp similarity index 95% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/tests/timestamp.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/tests/timestamp.cpp index 75784562b5..7d8c7c3517 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/tests/timestamp.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/tests/timestamp.cpp @@ -20,8 +20,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include -#include +#include +#include #include "lib/common/utility.hpp" diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/tests/version.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/tests/version.cpp similarity index 95% rename from projects/rocprofiler-sdk/source/lib/rocprofiler/tests/version.cpp rename to projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/tests/version.cpp index 6650c733b7..28593251d2 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/tests/version.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/tests/version.cpp @@ -20,11 +20,11 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include -#include +#include +#include +#include #include "lib/common/utility.hpp" -#include "rocprofiler/version.h" #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/xml/CMakeLists.txt b/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/xml/CMakeLists.txt deleted file mode 100644 index 34aaf4ba06..0000000000 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler/counters/xml/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -configure_file(basic_counters.xml - ${PROJECT_BINARY_DIR}/share/rocprofiler/basic_counters.xml COPYONLY) -configure_file(derived_counters.xml - ${PROJECT_BINARY_DIR}/share/rocprofiler/derived_counters.xml COPYONLY) - -install( - FILES ${PROJECT_BINARY_DIR}/share/rocprofiler/basic_counters.xml - ${PROJECT_BINARY_DIR}/share/rocprofiler/derived_counters.xml - DESTINATION share/rocprofiler - COMPONENT core) diff --git a/projects/rocprofiler-sdk/source/scripts/update-docs.sh b/projects/rocprofiler-sdk/source/scripts/update-docs.sh index 090742c273..c6660d8862 100755 --- a/projects/rocprofiler-sdk/source/scripts/update-docs.sh +++ b/projects/rocprofiler-sdk/source/scripts/update-docs.sh @@ -20,12 +20,12 @@ cmake -B build-docs ${SOURCE_DIR} -DROCPROFILER_INTERNAL_BUILD_DOCS=ON message "Changing directory to ${WORK_DIR}" cd ${WORK_DIR} -message "Generating rocprofiler.dox" +message "Generating rocprofiler-sdk.dox" cmake -DSOURCE_DIR=${SOURCE_DIR} -P ${WORK_DIR}/generate-doxyfile.cmake message "Generating doxygen xml files" -doxygen rocprofiler.dox -doxygen rocprofiler.dox +doxygen rocprofiler-sdk.dox +doxygen rocprofiler-sdk.dox message "Running doxysphinx" doxysphinx build ${WORK_DIR} ${WORK_DIR}/_build/html ${WORK_DIR}/_doxygen/html diff --git a/projects/rocprofiler-sdk/source/scripts/update-doxygen.sh b/projects/rocprofiler-sdk/source/scripts/update-doxygen.sh index b9567d8986..6fbaf72c11 100755 --- a/projects/rocprofiler-sdk/source/scripts/update-doxygen.sh +++ b/projects/rocprofiler-sdk/source/scripts/update-doxygen.sh @@ -10,7 +10,7 @@ popd pushd ${WORK_DIR} cmake -DSOURCE_DIR=${SOURCE_DIR} -P generate-doxyfile.cmake -doxygen rocprofiler.dox +doxygen rocprofiler-sdk.dox doxysphinx build ${WORK_DIR} ${WORK_DIR}/_build/html ${WORK_DIR}/_doxygen/html popd diff --git a/projects/rocprofiler-sdk/tests/kernel-tracing/CMakeLists.txt b/projects/rocprofiler-sdk/tests/kernel-tracing/CMakeLists.txt index 2ae41e7bfb..535b06fc73 100644 --- a/projects/rocprofiler-sdk/tests/kernel-tracing/CMakeLists.txt +++ b/projects/rocprofiler-sdk/tests/kernel-tracing/CMakeLists.txt @@ -5,9 +5,7 @@ cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR) project(rocprofiler-tests-kernel-tracing LANGUAGES CXX) -if(NOT TARGET rocprofiler::rocprofiler) - find_package(rocprofiler REQUIRED) -endif() +find_package(rocprofiler-sdk REQUIRED) add_library(kernel-tracing-test-tool SHARED) target_sources(kernel-tracing-test-tool PRIVATE kernel-tracing.cpp) @@ -21,7 +19,7 @@ set_target_properties( install( TARGETS kernel-tracing-test-tool - DESTINATION lib/rocprofiler + DESTINATION lib/rocprofiler-sdk COMPONENT rocprofiler-test-libs) if(ROCPROFILER_MEMCHECK_PRELOAD_ENV) diff --git a/projects/rocprofiler-sdk/tests/kernel-tracing/kernel-tracing.cpp b/projects/rocprofiler-sdk/tests/kernel-tracing/kernel-tracing.cpp index ef3f6dcc8d..b1fd32e143 100644 --- a/projects/rocprofiler-sdk/tests/kernel-tracing/kernel-tracing.cpp +++ b/projects/rocprofiler-sdk/tests/kernel-tracing/kernel-tracing.cpp @@ -34,13 +34,13 @@ #include "lib/common/filesystem.hpp" #include "serialization.hpp" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -865,8 +865,8 @@ rocprofiler_configure(uint32_t version, // generate info string auto info = std::stringstream{}; - info << id->name << " is using rocprofiler v" << major << "." << minor << "." << patch << " (" - << runtime_version << ")"; + info << id->name << " is using rocprofiler-sdk v" << major << "." << minor << "." << patch + << " (" << runtime_version << ")"; std::clog << info.str() << std::endl; diff --git a/projects/rocprofiler-sdk/tests/kernel-tracing/serialization.hpp b/projects/rocprofiler-sdk/tests/kernel-tracing/serialization.hpp index a122efe8fb..0a72a688dd 100644 --- a/projects/rocprofiler-sdk/tests/kernel-tracing/serialization.hpp +++ b/projects/rocprofiler-sdk/tests/kernel-tracing/serialization.hpp @@ -23,12 +23,12 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include