From 957084de077e0542ed269df4ee693e1933c2b946 Mon Sep 17 00:00:00 2001 From: Laurent Morichetti Date: Fri, 1 Jul 2022 09:35:26 -0700 Subject: [PATCH] Rename project ROCTRACER -> roctracer Change-Id: I83d47025aad59dc37a53ec82452b639fc8ffb478 --- CMakeLists.txt | 20 +++++++++----------- doc/Doxyfile.in | 4 ++-- roctracer-backward-compat.cmake | 18 +++++++++--------- src/CMakeLists.txt | 17 +++++++++-------- 4 files changed, 29 insertions(+), 30 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 05a23b53a7..f710f445dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,15 +22,13 @@ cmake_minimum_required(VERSION 3.18.0) -project(ROCTRACER VERSION 4.1.0) +project(roctracer VERSION 4.1.0) + # set default ROCM_PATH if(NOT DEFINED ROCM_PATH) set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory") endif() -## Set module name -string(TOLOWER "${CMAKE_PROJECT_NAME}" ROCTRACER_NAME) - ## Build is not supported on Windows plaform if(WIN32) message(FATAL_ERROR "Windows build is not supported.") @@ -74,11 +72,11 @@ message("-----------CPACK-dir: ${CPACK_PACKAGING_INSTALL_PREFIX}") ## Packaging directives set(CPACK_GENERATOR "DEB" "RPM" "TGZ" CACHE STRING "CPACK GENERATOR DEB;RPM") set(ENABLE_LDCONFIG ON CACHE BOOL "Set library links and caches using ldconfig.") -set(CPACK_PACKAGE_NAME "${ROCTRACER_NAME}-dev") +set(CPACK_PACKAGE_NAME "${PROJECT_NAME}-dev") set(CPACK_PACKAGE_VENDOR "Advanced Micro Devices, Inc.") -set(CPACK_PACKAGE_VERSION_MAJOR ${ROCTRACER_VERSION_MAJOR}) -set(CPACK_PACKAGE_VERSION_MINOR ${ROCTRACER_VERSION_MINOR}) -set(CPACK_PACKAGE_VERSION_PATCH ${ROCTRACER_VERSION_PATCH}) +set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) +set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR}) +set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH}) set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") set(CPACK_PACKAGE_CONTACT "ROCm Profiler Support ") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "AMD ROCTRACER library") @@ -90,7 +88,7 @@ if(DEFINED ENV{ROCM_LIBPATCH_VERSION}) endif() ## Install license file -install(FILES ${CPACK_RESOURCE_FILE_LICENSE} DESTINATION share/doc/${ROCTRACER_NAME}) +install(FILES ${CPACK_RESOURCE_FILE_LICENSE} DESTINATION share/doc/${PROJECT_NAME}) ## Debian package specific variables if(DEFINED ENV{CPACK_DEBIAN_PACKAGE_RELEASE}) @@ -157,12 +155,12 @@ if(DOXYGEN_FOUND) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/doc/latex/refman.pdf" - DESTINATION share/doc/roctracer + DESTINATION share/doc/${PROJECT_NAME} RENAME "roctracer.pdf" OPTIONAL) install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/doc/html/" - DESTINATION share/html/roctracer + DESTINATION share/html/${PROJECT_NAME} OPTIONAL) endif() diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 74e1204811..988e6134bb 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -52,13 +52,13 @@ DOXYFILE_ENCODING = UTF-8 # title of most generated pages and in a few other places. # The default value is: My Project. -PROJECT_NAME = "@ROCTRACER_NAME@" +PROJECT_NAME = "@PROJECT_NAME@" # The PROJECT_NUMBER tag can be used to enter a project or revision number. This # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = @ROCTRACER_VERSION_MAJOR@.@ROCTRACER_VERSION_MINOR@.@ROCTRACER_VERSION_PATCH@ +PROJECT_NUMBER = @PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@ # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/roctracer-backward-compat.cmake b/roctracer-backward-compat.cmake index 2d019903b0..335e15884c 100644 --- a/roctracer-backward-compat.cmake +++ b/roctracer-backward-compat.cmake @@ -53,10 +53,10 @@ function(generate_wrapper_header) get_filename_component(file_name ${header_file} NAME) get_filename_component ( header_subdir ${header_file} DIRECTORY ) if(header_subdir) - set(include_statements "#include \"../../../include/${ROCTRACER_NAME}/${header_subdir}/${file_name}\"\n") + set(include_statements "#include \"../../../include/${PROJECT_NAME}/${header_subdir}/${file_name}\"\n") configure_file(${PROJECT_SOURCE_DIR}/header_template.hpp.in ${ROCT_WRAPPER_INC_DIR}/${header_subdir}/${file_name}) else() - set(include_statements "#include \"../../include/${ROCTRACER_NAME}/${file_name}\"\n") + set(include_statements "#include \"../../include/${PROJECT_NAME}/${file_name}\"\n") if(${file_name} STREQUAL "roctracer.h") set_file_contents(${PROJECT_SOURCE_DIR}/inc/${file_name}) else() @@ -72,7 +72,7 @@ function(generate_wrapper_header) set(include_guard "ROCTRACER_WRAPPER_INCLUDE_${INC_GAURD_NAME}_H") #set include statements get_filename_component(file_name ${header_file} NAME) - set(include_statements "#include \"../../include/${ROCTRACER_NAME}/${file_name}\"\n") + set(include_statements "#include \"../../include/${PROJECT_NAME}/${file_name}\"\n") configure_file(${PROJECT_SOURCE_DIR}/header_template.hpp.in ${ROCT_WRAPPER_INC_DIR}/${file_name}) endforeach() @@ -83,8 +83,8 @@ endfunction() function(create_library_symlink) file(MAKE_DIRECTORY ${ROCT_WRAPPER_LIB_DIR}) set(LIB_ROCT "libroctracer64.so") - set(MAJ_VERSION "${ROCTRACER_VERSION_MAJOR}") - set(SO_VERSION "${ROCTRACER_VERSION_STRING}") + set(MAJ_VERSION "${PROJECT_VERSION_MAJOR}") + set(SO_VERSION "${PROJECT_VERSION}") set(library_files "${LIB_ROCT}") #"${LIB_ROCT}.${MAJ_VERSION}" "${LIB_ROCT}.${SO_VERSION}") set(LIB_ROCTX64 "libroctx64.so") @@ -104,13 +104,13 @@ function(create_library_symlink) #add_custom_target(link_${LIB_TRACERTOOL} ALL # WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # COMMAND ${CMAKE_COMMAND} -E create_symlink - # ../../lib/${ROCTRACER_NAME}/${LIB_ROCTRACERTOOL} ${ROCT_WRAPPER_TOOL_DIR}/${LIB_TRACERTOOL}) + # ../../lib/${PROJECT_NAME}/${LIB_ROCTRACERTOOL} ${ROCT_WRAPPER_TOOL_DIR}/${LIB_TRACERTOOL}) endfunction() #Use template header file and generater wrapper header files generate_wrapper_header() -install(DIRECTORY ${ROCT_WRAPPER_INC_DIR} DESTINATION ${ROCTRACER_NAME}) +install(DIRECTORY ${ROCT_WRAPPER_INC_DIR} DESTINATION ${PROJECT_NAME}) create_library_symlink() -install(DIRECTORY ${ROCT_WRAPPER_LIB_DIR} DESTINATION ${ROCTRACER_NAME}) +install(DIRECTORY ${ROCT_WRAPPER_LIB_DIR} DESTINATION ${PROJECT_NAME}) #install soft link to tool -#install(DIRECTORY ${ROCT_WRAPPER_TOOL_DIR} DESTINATION ${ROCTRACER_NAME}) +#install(DIRECTORY ${ROCT_WRAPPER_TOOL_DIR} DESTINATION ${PROJECT_NAME}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 86b8dfa885..9d552b2e9c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -104,7 +104,7 @@ set(PUBLIC_HEADERS foreach(header ${PUBLIC_HEADERS}) get_filename_component(header_subdir ${header} DIRECTORY) - install(FILES ${PROJECT_SOURCE_DIR}/inc/${header} DESTINATION include/${ROCTRACER_NAME}/${header_subdir}) + install(FILES ${PROJECT_SOURCE_DIR}/inc/${header} DESTINATION include/${PROJECT_NAME}/${header_subdir}) endforeach() set(GENERATED_HEADERS @@ -113,7 +113,7 @@ set(GENERATED_HEADERS hsa_ostream_ops.h) foreach(header ${GENERATED_HEADERS}) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${header} DESTINATION include/${ROCTRACER_NAME}) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${header} DESTINATION include/${PROJECT_NAME}) endforeach() ## Build the ROCtracer library @@ -125,8 +125,8 @@ set_target_properties(roctracer PROPERTIES OUTPUT_NAME "roctracer64" DEFINE_SYMBOL "ROCTRACER_EXPORTS" LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/roctracer/exportmap - VERSION ${ROCTRACER_VERSION} - SOVERSION ${ROCTRACER_VERSION_MAJOR}) + VERSION ${PROJECT_VERSION} + SOVERSION ${PROJECT_VERSION_MAJOR}) target_compile_definitions(roctracer PUBLIC AMD_INTERNAL_BUILD @@ -154,8 +154,8 @@ set_target_properties(roctx PROPERTIES OUTPUT_NAME "roctx64" DEFINE_SYMBOL "ROCTX_EXPORTS" LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/roctx/exportmap - VERSION ${ROCTRACER_VERSION} - SOVERSION ${ROCTRACER_VERSION_MAJOR}) + VERSION ${PROJECT_VERSION} + SOVERSION ${PROJECT_VERSION_MAJOR}) target_include_directories(roctx PUBLIC $ @@ -186,12 +186,13 @@ target_include_directories(roctracer_tool target_link_libraries(roctracer_tool roctracer hsa-runtime64::hsa-runtime64 Threads::Threads atomic dl) target_link_options(roctracer_tool PRIVATE -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/tracer_tool/exportmap -Wl,--no-undefined) -install(TARGETS roctracer_tool LIBRARY DESTINATION lib/${ROCTRACER_NAME}) +install(TARGETS roctracer_tool LIBRARY DESTINATION lib/${PROJECT_NAME}) add_library(hip_stats SHARED hip_stats/hip_stats.cpp) target_compile_definitions(hip_stats PRIVATE __HIP_PLATFORM_AMD__) target_link_libraries(hip_stats roctracer stdc++fs) -install(TARGETS hip_stats LIBRARY DESTINATION lib/${ROCTRACER_NAME}) +install(TARGETS hip_stats LIBRARY DESTINATION lib/${PROJECT_NAME}) + endif() option(FILE_REORG_BACKWARD_COMPATIBILITY "Enable File Reorg with backward compatibility" ON)