Skip to content

Commit

Permalink
Update source code for RMV v1.9 release
Browse files Browse the repository at this point in the history
  • Loading branch information
ahosier committed Apr 24, 2024
1 parent f7de119 commit 9ff1cd0
Show file tree
Hide file tree
Showing 344 changed files with 3,238 additions and 2,353 deletions.
27 changes: 11 additions & 16 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
#######################################################################################################################
### Copyright (c) 2019-2024 Advanced Micro Devices, Inc. All rights reserved.
### \author AMD Developer Tools Team
#######################################################################################################################

cmake_minimum_required(VERSION 3.11)

set(SYSTEM_INFO_BUILD_RDF_INTERFACES ON)


## Specify the top level name of the project - this will define the solution name for Visual Studio
project(RMV)

# Define version information
set(RMV_MAJOR_VERSION 1)
set(RMV_MINOR_VERSION 8)
set(RMV_MINOR_VERSION 9)
if (NOT RMV_BUGFIX_NUMBER)
set(RMV_BUGFIX_NUMBER 0)
endif ()
Expand Down Expand Up @@ -54,6 +60,7 @@ ELSE(WIN32)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/../../debug)
ENDIF(WIN32)


# Add for CentOS compiler warning
add_definitions(-DJSON_SKIP_UNSUPPORTED_COMPILER_CHECK)

Expand Down Expand Up @@ -116,13 +123,6 @@ set_target_properties(QtCustomWidgets
PROPERTIES
FOLDER Dependencies
)
ELSEIF(APPLE)
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
set_target_properties(QtCustomWidgets
QtUtils
PROPERTIES
FOLDER Dependencies
)
ENDIF()

IF(WIN32)
Expand All @@ -136,11 +136,7 @@ ENDIF(WIN32)
# This is evaluated at project build time - not at CMake generation time
set(BUILD_ROOT $<$<CONFIG:debug>:${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG}>$<$<CONFIG:release>:${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE}>)

if(APPLE)
set(DOCS_OUTPUT_DIR $<TARGET_FILE_DIR:RadeonMemoryVisualizer>/../Resources)
else()
set(DOCS_OUTPUT_DIR ${BUILD_ROOT})
endif()
set(DOCS_OUTPUT_DIR ${BUILD_ROOT})

# group sphinx source files into a sphinx folder
file(GLOB SPHINX_DOC_FILES ${SPHINX_DOC_FILES} ${CMAKE_SOURCE_DIR}/documentation/source/*.rst)
Expand Down Expand Up @@ -168,9 +164,6 @@ if(SPHINX_EXECUTABLE)
# Sphinx has proper dependency checking, so this works as expected.
# Once built, clean up any unneeded files.
add_custom_target(Documentation ALL SOURCES ${ALL_SPHINX_FILES} ${RELEASE_DOCS} DEPENDS sphinx_output)
if(APPLE)
add_dependencies(Documentation RadeonMemoryVisualizer)
endif()
add_custom_command(MAIN_DEPENDENCY ${SPHINX_DOC_MAIN} OUTPUT sphinx_output
COMMAND ${CMAKE_COMMAND} -E echo "building Sphinx documentation"
COMMAND ${SPHINX_EXECUTABLE} ${CMAKE_SOURCE_DIR}/documentation/source ${DOCS_OUTPUT_DIR}/help/rmv/. -t ${SPHINX_OPTION}
Expand Down Expand Up @@ -201,3 +194,5 @@ add_custom_command(TARGET Documentation POST_BUILD
COMMAND ${CMAKE_COMMAND} -E make_directory ${DOCS_OUTPUT_DIR}/samples
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/samples/sample_trace.rmv ${DOCS_OUTPUT_DIR}/samples/.
)


2 changes: 1 addition & 1 deletion build/dependency_map.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! python3
##=============================================================================
## Copyright (c) 2020-2023 Advanced Micro Devices, Inc. All rights reserved.
## Copyright (c) 2020-2024 Advanced Micro Devices, Inc. All rights reserved.
## \author AMD Developer Tools Team
## \file
## \brief List of all external dependencies.
Expand Down
2 changes: 1 addition & 1 deletion build/fetch_dependencies.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! python3
##=============================================================================
## Copyright (c) 2020-2023 Advanced Micro Devices, Inc. All rights reserved.
## Copyright (c) 2020-2024 Advanced Micro Devices, Inc. All rights reserved.
## \author AMD Developer Tools Team
## \file
## \brief Script to fetch all external git and/or downloadable dependencies
Expand Down
6 changes: 2 additions & 4 deletions build/pre_build.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! python3
##=============================================================================
## Copyright (c) 2020-2023 Advanced Micro Devices, Inc. All rights reserved.
## Copyright (c) 2020-2024 Advanced Micro Devices, Inc. All rights reserved.
## \author AMD Developer Tools Team
## \file
## \brief Script to perform all necessary pre build steps. This includes:
Expand Down Expand Up @@ -66,7 +66,6 @@
parser.add_argument("--qt", default="5.15.2", help="specify the version of QT to be used with the script (default: 5.15.2)" )
parser.add_argument("--clean", action="store_true", help="delete any directories created by this script")
parser.add_argument("--no-qt", action="store_true", help="build a headless version (not applicable for all products)")
parser.add_argument("--build-number", default="0", help="specify the build number, primarily to be used by build machines to produce versioned builds")
parser.add_argument("--update", action="store_true", help="Force fetch_dependencies script to update all dependencies")
parser.add_argument("--output", default=output_root, help="specify the output location for generated cmake and build output files (default = OS specific subdirectory of location of PreBuild.py script)")
parser.add_argument("--build", action="store_true", help="build all supported configurations on completion of prebuild step")
Expand Down Expand Up @@ -263,8 +262,6 @@ def generate_config(config):
if args.qt_system:
cmake_args.extend(["-DQT_SYSTEM:BOOL=TRUE"])

cmake_args.extend(["-DRMV_BUILD_NUMBER=" + str(args.build_number)])

cmake_args.extend(["-DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE=" + release_output_dir])
cmake_args.extend(["-DCMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE=" + release_output_dir])
cmake_args.extend(["-DCMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG=" + debug_output_dir])
Expand Down Expand Up @@ -387,3 +384,4 @@ def generate_config(config):
minutes, seconds = divmod(time.time() - start_time, 60)
log_print("Successfully completed in {0:.0f} minutes, {1:.1f} seconds".format(minutes,seconds))
sys.exit(0)

3 changes: 2 additions & 1 deletion cmake/dev_tools.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#######################################################################################################################
### Copyright (c) 2019-2023 Advanced Micro Devices, Inc. All rights reserved.
### Copyright (c) 2019-2024 Advanced Micro Devices, Inc. All rights reserved.
### \author AMD Developer Tools Team
#######################################################################################################################

Expand Down Expand Up @@ -71,3 +71,4 @@ function(devtools_target_options name)
endif ()

endfunction()

4 changes: 3 additions & 1 deletion cmake/devtools_qt_helper.cmake
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
#######################################################################################################################
### Copyright (c) 2019-2021 Advanced Micro Devices, Inc. All rights reserved.
### Copyright (c) 2019-2024 Advanced Micro Devices, Inc. All rights reserved.
### @author AMD Developer Tools Team
#######################################################################################################################

cmake_minimum_required(VERSION 3.10)


# Attempt to automatically find Qt on the local machine
if (UNIX AND NOT APPLE)
find_package(Qt6 QUIET COMPONENTS Core Widgets Network Gui Svg Test GuiPrivate CorePrivate)
Expand Down Expand Up @@ -143,3 +144,4 @@ if (Qt5_DIR OR Qt6_DIR)
endif ()
endfunction()
endif ()

13 changes: 10 additions & 3 deletions source/backend/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
#######################################################################################################################
### Copyright (c) 2019-2024 Advanced Micro Devices, Inc. All rights reserved.
### \author AMD Developer Tools Team
#######################################################################################################################

cmake_minimum_required(VERSION 3.10)
project(RmvBackend)

set(CMAKE_INCLUDE_CURRENT_DIR ON)
include_directories(AFTER ../backend ../parser ../../external/rdf/rdf/inc)
include_directories(AFTER ../backend ../parser ../../external/rdf/rdf/inc ../third_party)

add_definitions(-DSYSTEM_INFO_ENABLE_RDF)
add_definitions(-DRDF_CXX_BINDINGS)

# List of all source files. It may be possible to have the build process call cmake to update the makefiles
# only when this file has changed (ie source files have been added or removed)

set( SOURCES
"rmt_adapter_info.cpp"
"rmt_adapter_info.h"
Expand Down Expand Up @@ -73,10 +79,10 @@ set( SOURCES
)

set( LINUX_SOURCES
"../third_party/pevents/pevents.cpp"
"../third_party/pevents/pevents.h"
"rmt_include_pevents.cpp"
)


# specify output library name
IF(WIN32)
add_library(${PROJECT_NAME} ${SOURCES})
Expand All @@ -96,3 +102,4 @@ endforeach()
ENDIF(WIN32)

devtools_target_options(${PROJECT_NAME})

2 changes: 1 addition & 1 deletion source/backend/rmt_adapter_info.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//=============================================================================
// Copyright (c) 2020-2023 Advanced Micro Devices, Inc. All rights reserved.
// Copyright (c) 2020-2024 Advanced Micro Devices, Inc. All rights reserved.
/// @author AMD Developer Tools Team
/// @file
/// @brief Helper function for legacy adapter information captured for the target process.
Expand Down
2 changes: 1 addition & 1 deletion source/backend/rmt_adapter_info.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//=============================================================================
// Copyright (c) 2020-2023 Advanced Micro Devices, Inc. All rights reserved.
// Copyright (c) 2020-2024 Advanced Micro Devices, Inc. All rights reserved.
/// @author AMD Developer Tools Team
/// @file
/// @brief Helper function for legacy adapter information captured for the target process.
Expand Down
2 changes: 1 addition & 1 deletion source/backend/rmt_atomic.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//=============================================================================
// Copyright (c) 2019-2023 Advanced Micro Devices, Inc. All rights reserved.
// Copyright (c) 2019-2024 Advanced Micro Devices, Inc. All rights reserved.
/// @author AMD Developer Tools Team
/// @file
/// @brief Implementation of atomic helper functions.
Expand Down
2 changes: 1 addition & 1 deletion source/backend/rmt_atomic.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//=============================================================================
// Copyright (c) 2019-2023 Advanced Micro Devices, Inc. All rights reserved.
// Copyright (c) 2019-2024 Advanced Micro Devices, Inc. All rights reserved.
/// @author AMD Developer Tools Team
/// @file
/// @brief Definition of platform-abstracted atomic functions.
Expand Down
2 changes: 1 addition & 1 deletion source/backend/rmt_configuration.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//=============================================================================
// Copyright (c) 2019-2023 Advanced Micro Devices, Inc. All rights reserved.
// Copyright (c) 2019-2024 Advanced Micro Devices, Inc. All rights reserved.
/// @author AMD Developer Tools Team
/// @file
/// @brief Global configuration values for the RMT backend.
Expand Down
2 changes: 1 addition & 1 deletion source/backend/rmt_data_profile.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//=============================================================================
// Copyright (c) 2019-2023 Advanced Micro Devices, Inc. All rights reserved.
// Copyright (c) 2019-2024 Advanced Micro Devices, Inc. All rights reserved.
/// @author AMD Developer Tools Team
/// @file
/// @brief Structures for profiling the RMT data for future parsing.
Expand Down
Loading

0 comments on commit 9ff1cd0

Please sign in to comment.