Skip to content

Commit 9ff1cd0

Browse files
ahosierahosier
committed
Update source code for RMV v1.9 release
1 parent f7de119 commit 9ff1cd0

File tree

344 files changed

+3238
-2353
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

344 files changed

+3238
-2353
lines changed

‎CMakeLists.txt

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
1+
#######################################################################################################################
2+
### Copyright (c) 2019-2024 Advanced Micro Devices, Inc. All rights reserved.
3+
### \author AMD Developer Tools Team
4+
#######################################################################################################################
5+
16
cmake_minimum_required(VERSION 3.11)
27

38
set(SYSTEM_INFO_BUILD_RDF_INTERFACES ON)
49

10+
511
## Specify the top level name of the project - this will define the solution name for Visual Studio
612
project(RMV)
713

814
# Define version information
915
set(RMV_MAJOR_VERSION 1)
10-
set(RMV_MINOR_VERSION 8)
16+
set(RMV_MINOR_VERSION 9)
1117
if (NOT RMV_BUGFIX_NUMBER)
1218
set(RMV_BUGFIX_NUMBER 0)
1319
endif ()
@@ -54,6 +60,7 @@ ELSE(WIN32)
5460
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/../../debug)
5561
ENDIF(WIN32)
5662

63+
5764
# Add for CentOS compiler warning
5865
add_definitions(-DJSON_SKIP_UNSUPPORTED_COMPILER_CHECK)
5966

@@ -116,13 +123,6 @@ set_target_properties(QtCustomWidgets
116123
PROPERTIES
117124
FOLDER Dependencies
118125
)
119-
ELSEIF(APPLE)
120-
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
121-
set_target_properties(QtCustomWidgets
122-
QtUtils
123-
PROPERTIES
124-
FOLDER Dependencies
125-
)
126126
ENDIF()
127127

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

139-
if(APPLE)
140-
set(DOCS_OUTPUT_DIR $<TARGET_FILE_DIR:RadeonMemoryVisualizer>/../Resources)
141-
else()
142-
set(DOCS_OUTPUT_DIR ${BUILD_ROOT})
143-
endif()
139+
set(DOCS_OUTPUT_DIR ${BUILD_ROOT})
144140

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

‎build/dependency_map.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! python3
22
##=============================================================================
3-
## Copyright (c) 2020-2023 Advanced Micro Devices, Inc. All rights reserved.
3+
## Copyright (c) 2020-2024 Advanced Micro Devices, Inc. All rights reserved.
44
## \author AMD Developer Tools Team
55
## \file
66
## \brief List of all external dependencies.

‎build/fetch_dependencies.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! python3
22
##=============================================================================
3-
## Copyright (c) 2020-2023 Advanced Micro Devices, Inc. All rights reserved.
3+
## Copyright (c) 2020-2024 Advanced Micro Devices, Inc. All rights reserved.
44
## \author AMD Developer Tools Team
55
## \file
66
## \brief Script to fetch all external git and/or downloadable dependencies

‎build/pre_build.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! python3
22
##=============================================================================
3-
## Copyright (c) 2020-2023 Advanced Micro Devices, Inc. All rights reserved.
3+
## Copyright (c) 2020-2024 Advanced Micro Devices, Inc. All rights reserved.
44
## \author AMD Developer Tools Team
55
## \file
66
## \brief Script to perform all necessary pre build steps. This includes:
@@ -66,7 +66,6 @@
6666
parser.add_argument("--qt", default="5.15.2", help="specify the version of QT to be used with the script (default: 5.15.2)" )
6767
parser.add_argument("--clean", action="store_true", help="delete any directories created by this script")
6868
parser.add_argument("--no-qt", action="store_true", help="build a headless version (not applicable for all products)")
69-
parser.add_argument("--build-number", default="0", help="specify the build number, primarily to be used by build machines to produce versioned builds")
7069
parser.add_argument("--update", action="store_true", help="Force fetch_dependencies script to update all dependencies")
7170
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)")
7271
parser.add_argument("--build", action="store_true", help="build all supported configurations on completion of prebuild step")
@@ -263,8 +262,6 @@ def generate_config(config):
263262
if args.qt_system:
264263
cmake_args.extend(["-DQT_SYSTEM:BOOL=TRUE"])
265264

266-
cmake_args.extend(["-DRMV_BUILD_NUMBER=" + str(args.build_number)])
267-
268265
cmake_args.extend(["-DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE=" + release_output_dir])
269266
cmake_args.extend(["-DCMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE=" + release_output_dir])
270267
cmake_args.extend(["-DCMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG=" + debug_output_dir])
@@ -387,3 +384,4 @@ def generate_config(config):
387384
minutes, seconds = divmod(time.time() - start_time, 60)
388385
log_print("Successfully completed in {0:.0f} minutes, {1:.1f} seconds".format(minutes,seconds))
389386
sys.exit(0)
387+

‎cmake/dev_tools.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#######################################################################################################################
2-
### Copyright (c) 2019-2023 Advanced Micro Devices, Inc. All rights reserved.
2+
### Copyright (c) 2019-2024 Advanced Micro Devices, Inc. All rights reserved.
33
### \author AMD Developer Tools Team
44
#######################################################################################################################
55

@@ -71,3 +71,4 @@ function(devtools_target_options name)
7171
endif ()
7272

7373
endfunction()
74+

‎cmake/devtools_qt_helper.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
#######################################################################################################################
2-
### Copyright (c) 2019-2021 Advanced Micro Devices, Inc. All rights reserved.
2+
### Copyright (c) 2019-2024 Advanced Micro Devices, Inc. All rights reserved.
33
### @author AMD Developer Tools Team
44
#######################################################################################################################
55

66
cmake_minimum_required(VERSION 3.10)
77

8+
89
# Attempt to automatically find Qt on the local machine
910
if (UNIX AND NOT APPLE)
1011
find_package(Qt6 QUIET COMPONENTS Core Widgets Network Gui Svg Test GuiPrivate CorePrivate)
@@ -143,3 +144,4 @@ if (Qt5_DIR OR Qt6_DIR)
143144
endif ()
144145
endfunction()
145146
endif ()
147+

‎source/backend/CMakeLists.txt

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
1+
#######################################################################################################################
2+
### Copyright (c) 2019-2024 Advanced Micro Devices, Inc. All rights reserved.
3+
### \author AMD Developer Tools Team
4+
#######################################################################################################################
5+
16
cmake_minimum_required(VERSION 3.10)
27
project(RmvBackend)
38

49
set(CMAKE_INCLUDE_CURRENT_DIR ON)
5-
include_directories(AFTER ../backend ../parser ../../external/rdf/rdf/inc)
10+
include_directories(AFTER ../backend ../parser ../../external/rdf/rdf/inc ../third_party)
611

712
add_definitions(-DSYSTEM_INFO_ENABLE_RDF)
813
add_definitions(-DRDF_CXX_BINDINGS)
914

1015
# List of all source files. It may be possible to have the build process call cmake to update the makefiles
1116
# only when this file has changed (ie source files have been added or removed)
17+
1218
set( SOURCES
1319
"rmt_adapter_info.cpp"
1420
"rmt_adapter_info.h"
@@ -73,10 +79,10 @@ set( SOURCES
7379
)
7480

7581
set( LINUX_SOURCES
76-
"../third_party/pevents/pevents.cpp"
77-
"../third_party/pevents/pevents.h"
82+
"rmt_include_pevents.cpp"
7883
)
7984

85+
8086
# specify output library name
8187
IF(WIN32)
8288
add_library(${PROJECT_NAME} ${SOURCES})
@@ -96,3 +102,4 @@ endforeach()
96102
ENDIF(WIN32)
97103

98104
devtools_target_options(${PROJECT_NAME})
105+

‎source/backend/rmt_adapter_info.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//=============================================================================
2-
// Copyright (c) 2020-2023 Advanced Micro Devices, Inc. All rights reserved.
2+
// Copyright (c) 2020-2024 Advanced Micro Devices, Inc. All rights reserved.
33
/// @author AMD Developer Tools Team
44
/// @file
55
/// @brief Helper function for legacy adapter information captured for the target process.

‎source/backend/rmt_adapter_info.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//=============================================================================
2-
// Copyright (c) 2020-2023 Advanced Micro Devices, Inc. All rights reserved.
2+
// Copyright (c) 2020-2024 Advanced Micro Devices, Inc. All rights reserved.
33
/// @author AMD Developer Tools Team
44
/// @file
55
/// @brief Helper function for legacy adapter information captured for the target process.

‎source/backend/rmt_atomic.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//=============================================================================
2-
// Copyright (c) 2019-2023 Advanced Micro Devices, Inc. All rights reserved.
2+
// Copyright (c) 2019-2024 Advanced Micro Devices, Inc. All rights reserved.
33
/// @author AMD Developer Tools Team
44
/// @file
55
/// @brief Implementation of atomic helper functions.

0 commit comments

Comments
 (0)