Skip to content

Commit fa8b89f

Browse files
dmitrii-galantsevdmitrii-galantsev
committed
CMAKE - Format with cmake-format
Change-Id: I08e71fc5060b1f6e0168225cc5fe66886c2044bd Signed-off-by: Galantsev, Dmitrii <dmitrii.galantsev@amd.com>
1 parent f89beb9 commit fa8b89f

18 files changed

Lines changed: 522 additions & 444 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 175 additions & 131 deletions
Large diffs are not rendered by default.

‎cmake_modules/Findrocprofiler.cmake‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ list(APPEND CMAKE_PREFIX_PATH ${ROCM_DIR})
1010

1111
find_library(
1212
${NAME}_LIBRARY
13-
NAMES ${NAME} ${NAME}64
14-
REQUIRED
15-
REGISTRY_VIEW BOTH
13+
NAMES ${NAME} ${NAME}64 REQUIRED REGISTRY_VIEW BOTH
1614
PATH_SUFFIXES lib)
1715

1816
if(NOT DEFINED (${NAME}_INCLUDE_DIR))
@@ -24,16 +22,16 @@ if(NOT DEFINED (${NAME}_INCLUDE_DIR))
2422
endif()
2523

2624
include(FindPackageHandleStandardArgs)
27-
find_package_handle_standard_args(${NAME}
25+
find_package_handle_standard_args(
26+
${NAME}
2827
FOUND_VAR ${NAME}_FOUND
29-
REQUIRED_VARS
30-
${NAME}_LIBRARY
31-
${NAME}_INCLUDE_DIR)
28+
REQUIRED_VARS ${NAME}_LIBRARY ${NAME}_INCLUDE_DIR)
3229

3330
if(${NAME}_FOUND AND NOT TARGET ${NAME}::${NAME})
3431
add_library(${NAME}::${NAME} UNKNOWN IMPORTED)
35-
set_target_properties(${NAME}::${NAME} PROPERTIES
36-
IMPORTED_LOCATION "${${NAME}_LIBRARY}"
37-
INTERFACE_COMPILE_OPTIONS "${PC_${NAME}_CFLAGS_OTHER}"
38-
INTERFACE_INCLUDE_DIRECTORIES "${${NAME}_INCLUDE_DIR}")
32+
set_target_properties(
33+
${NAME}::${NAME}
34+
PROPERTIES IMPORTED_LOCATION "${${NAME}_LIBRARY}"
35+
INTERFACE_COMPILE_OPTIONS "${PC_${NAME}_CFLAGS_OTHER}"
36+
INTERFACE_INCLUDE_DIRECTORIES "${${NAME}_INCLUDE_DIR}")
3937
endif()

‎cmake_modules/Findrvs.cmake‎

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ list(APPEND CMAKE_PREFIX_PATH ${ROCM_DIR})
1111
find_library(
1212
${NAME}_LIBRARY
1313
NAMES ${NAME} ${NAME}64 ${NAME}lib # RVS is special and is named librvslib.so
14-
REQUIRED
15-
REGISTRY_VIEW BOTH
14+
REQUIRED REGISTRY_VIEW BOTH
1615
PATH_SUFFIXES lib)
1716

1817
if(NOT DEFINED (${NAME}_INCLUDE_DIR))
@@ -24,28 +23,34 @@ if(NOT DEFINED (${NAME}_INCLUDE_DIR))
2423
endif()
2524

2625
include(FindPackageHandleStandardArgs)
27-
find_package_handle_standard_args(${NAME}
26+
find_package_handle_standard_args(
27+
${NAME}
2828
FOUND_VAR ${NAME}_FOUND
29-
REQUIRED_VARS
30-
${NAME}_LIBRARY
31-
${NAME}_INCLUDE_DIR)
29+
REQUIRED_VARS ${NAME}_LIBRARY ${NAME}_INCLUDE_DIR)
3230

3331
if(${NAME}_FOUND AND NOT TARGET ${NAME}::${NAME})
3432
add_library(${NAME}::${NAME} UNKNOWN IMPORTED)
35-
set_target_properties(${NAME}::${NAME} PROPERTIES
36-
IMPORTED_LOCATION "${${NAME}_LIBRARY}"
37-
INTERFACE_COMPILE_OPTIONS "${PC_${NAME}_CFLAGS_OTHER}"
38-
INTERFACE_INCLUDE_DIRECTORIES "${${NAME}_INCLUDE_DIR}")
39-
find_library(rocm-core
40-
NAMES rocm-core
41-
REQUIRED)
33+
set_target_properties(
34+
${NAME}::${NAME}
35+
PROPERTIES IMPORTED_LOCATION "${${NAME}_LIBRARY}"
36+
INTERFACE_COMPILE_OPTIONS "${PC_${NAME}_CFLAGS_OTHER}"
37+
INTERFACE_INCLUDE_DIRECTORIES "${${NAME}_INCLUDE_DIR}")
38+
find_library(rocm-core NAMES rocm-core REQUIRED)
4239
find_package(yaml-cpp REQUIRED)
4340
find_package(rocblas REQUIRED)
4441
find_package(hipblaslt REQUIRED)
4542
find_package(hsakmt REQUIRED)
4643
find_package(hip REQUIRED)
4744
find_package(hsa-runtime64 REQUIRED)
4845
find_package(amd_smi REQUIRED)
49-
target_link_libraries(${NAME}::${NAME} INTERFACE
50-
${rocm-core} yaml-cpp roc::rocblas roc::hipblaslt hsakmt::hsakmt hip::amdhip64 hsa-runtime64::hsa-runtime64 amd_smi)
46+
target_link_libraries(
47+
${NAME}::${NAME}
48+
INTERFACE ${rocm-core}
49+
yaml-cpp
50+
roc::rocblas
51+
roc::hipblaslt
52+
hsakmt::hsakmt
53+
hip::amdhip64
54+
hsa-runtime64::hsa-runtime64
55+
amd_smi)
5156
endif()

‎cmake_modules/rdc-config-version.cmake.in‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ set(PACKAGE_VERSION "@RDC_VERSION@")
22

33
# Check whether the requested PACKAGE_FIND_VERSION is compatible
44
if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
5-
set(PACKAGE_VERSION_COMPATIBLE FALSE)
5+
set(PACKAGE_VERSION_COMPATIBLE FALSE)
66
else()
7-
set(PACKAGE_VERSION_COMPATIBLE TRUE)
8-
if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
9-
set(PACKAGE_VERSION_EXACT TRUE)
10-
endif()
7+
set(PACKAGE_VERSION_COMPATIBLE TRUE)
8+
if("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
9+
set(PACKAGE_VERSION_EXACT TRUE)
10+
endif()
1111
endif()
12-

‎cmake_modules/rdc-config.cmake.in‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,10 @@ get_filename_component(RDC_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
1010
set(ROCM_RDC_INCLUDE_DIR "${PACKAGE_PREFIX_DIR}/${CMAKE_INSTALL_INCLUDEDIR}")
1111
set(ROCM_RDC_LIB_DIR "${PACKAGE_PREFIX_DIR}/${CMAKE_INSTALL_LIBDIR}")
1212

13-
1413
# Our library dependencies (contains definitions for IMPORTED targets)
1514
if(NOT TARGET rdc_libs AND NOT rdc_BINARY_DIR)
1615
include("${RDC_CMAKE_DIR}/rdcTargets.cmake")
1716
endif()
1817

1918
# These are IMPORTED targets created by rdcTargets.cmake
2019
set(ROCM_RDC_LIBRARIES "@CONF_LIBS@")
21-

‎cmake_modules/utils.cmake‎

Lines changed: 82 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -43,84 +43,108 @@
4343
## Parses the VERSION_STRING variable and places
4444
## the first, second and third number values in
4545
## the major, minor and patch variables.
46-
function( parse_version VERSION_STRING )
46+
function(parse_version VERSION_STRING)
4747

48-
string ( FIND ${VERSION_STRING} "-" STRING_INDEX )
48+
string(FIND ${VERSION_STRING} "-" STRING_INDEX)
4949

50-
if ( ${STRING_INDEX} GREATER -1 )
51-
math ( EXPR STRING_INDEX "${STRING_INDEX} + 1" )
52-
string ( SUBSTRING ${VERSION_STRING} ${STRING_INDEX} -1 VERSION_BUILD )
53-
endif ()
50+
if(${STRING_INDEX} GREATER -1)
51+
math(EXPR STRING_INDEX "${STRING_INDEX} + 1")
52+
string(SUBSTRING ${VERSION_STRING} ${STRING_INDEX} -1 VERSION_BUILD)
53+
endif()
5454

55-
string ( REGEX MATCHALL "[0123456789]+" VERSIONS ${VERSION_STRING} )
56-
list ( LENGTH VERSIONS VERSION_COUNT )
55+
string(REGEX MATCHALL "[0123456789]+" VERSIONS ${VERSION_STRING})
56+
list(LENGTH VERSIONS VERSION_COUNT)
5757

58-
if ( ${VERSION_COUNT} GREATER 0)
59-
list ( GET VERSIONS 0 MAJOR )
60-
set ( VERSION_MAJOR ${MAJOR} PARENT_SCOPE )
61-
set ( TEMP_VERSION_STRING "${MAJOR}" )
62-
endif ()
58+
if(${VERSION_COUNT} GREATER 0)
59+
list(GET VERSIONS 0 MAJOR)
60+
set(VERSION_MAJOR
61+
${MAJOR}
62+
PARENT_SCOPE)
63+
set(TEMP_VERSION_STRING "${MAJOR}")
64+
endif()
6365

64-
if ( ${VERSION_COUNT} GREATER 1 )
65-
list ( GET VERSIONS 1 MINOR )
66-
set ( VERSION_MINOR ${MINOR} PARENT_SCOPE )
67-
set ( TEMP_VERSION_STRING "${TEMP_VERSION_STRING}.${MINOR}" )
68-
endif ()
66+
if(${VERSION_COUNT} GREATER 1)
67+
list(GET VERSIONS 1 MINOR)
68+
set(VERSION_MINOR
69+
${MINOR}
70+
PARENT_SCOPE)
71+
set(TEMP_VERSION_STRING "${TEMP_VERSION_STRING}.${MINOR}")
72+
endif()
6973

70-
if ( ${VERSION_COUNT} GREATER 2 )
71-
list ( GET VERSIONS 2 PATCH )
72-
set ( VERSION_PATCH ${PATCH} PARENT_SCOPE )
73-
set ( TEMP_VERSION_STRING "${TEMP_VERSION_STRING}.${PATCH}" )
74-
endif ()
74+
if(${VERSION_COUNT} GREATER 2)
75+
list(GET VERSIONS 2 PATCH)
76+
set(VERSION_PATCH
77+
${PATCH}
78+
PARENT_SCOPE)
79+
set(TEMP_VERSION_STRING "${TEMP_VERSION_STRING}.${PATCH}")
80+
endif()
7581

76-
set ( VERSION_STRING "${TEMP_VERSION_STRING}" PARENT_SCOPE )
82+
set(VERSION_STRING
83+
"${TEMP_VERSION_STRING}"
84+
PARENT_SCOPE)
7785

78-
endfunction ()
86+
endfunction()
7987

8088
## Gets the current version of the repository
8189
## using versioning tags and git describe.
8290
## Passes back a packaging version string
8391
## and a library version string.
8492
function(get_version_from_tag DEFAULT_VERSION_STRING VERSION_PREFIX GIT)
85-
parse_version ( ${DEFAULT_VERSION_STRING} )
86-
87-
if ( GIT )
88-
execute_process ( COMMAND git describe --tags --dirty --long --match ${VERSION_PREFIX}-[0-9.]*
89-
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
90-
OUTPUT_VARIABLE GIT_TAG_STRING
91-
OUTPUT_STRIP_TRAILING_WHITESPACE
92-
RESULT_VARIABLE RESULT )
93-
if ( ${RESULT} EQUAL 0 )
94-
parse_version ( ${GIT_TAG_STRING} )
95-
endif ()
96-
97-
endif ()
98-
99-
set( VERSION_STRING "${VERSION_STRING}" PARENT_SCOPE )
100-
set( VERSION_MAJOR "${VERSION_MAJOR}" PARENT_SCOPE )
101-
set( VERSION_MINOR "${VERSION_MINOR}" PARENT_SCOPE )
102-
set( VERSION_PATCH "${VERSION_PATCH}" PARENT_SCOPE )
93+
parse_version(${DEFAULT_VERSION_STRING})
94+
95+
if(GIT)
96+
execute_process(
97+
COMMAND git describe --tags --dirty --long --match ${VERSION_PREFIX}-[0-9.]*
98+
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
99+
OUTPUT_VARIABLE GIT_TAG_STRING
100+
OUTPUT_STRIP_TRAILING_WHITESPACE
101+
RESULT_VARIABLE RESULT)
102+
if(${RESULT} EQUAL 0)
103+
parse_version(${GIT_TAG_STRING})
104+
endif()
105+
106+
endif()
107+
108+
set(VERSION_STRING
109+
"${VERSION_STRING}"
110+
PARENT_SCOPE)
111+
set(VERSION_MAJOR
112+
"${VERSION_MAJOR}"
113+
PARENT_SCOPE)
114+
set(VERSION_MINOR
115+
"${VERSION_MINOR}"
116+
PARENT_SCOPE)
117+
set(VERSION_PATCH
118+
"${VERSION_PATCH}"
119+
PARENT_SCOPE)
103120
endfunction()
104121

105122
function(num_change_since_prev_pkg VERSION_PREFIX)
106-
find_program(get_commits NAMES version_util.sh
107-
PATHS ${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules)
108-
if (get_commits)
109-
execute_process( COMMAND ${get_commits} -c ${VERSION_PREFIX}
110-
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
111-
OUTPUT_VARIABLE NUM_COMMITS
112-
OUTPUT_STRIP_TRAILING_WHITESPACE
113-
RESULT_VARIABLE RESULT )
114-
115-
set(NUM_COMMITS "${NUM_COMMITS}" PARENT_SCOPE )
116-
117-
if ( ${RESULT} EQUAL 0 )
118-
message("${NUM_COMMITS} were found since previous release")
123+
find_program(
124+
get_commits
125+
NAMES version_util.sh
126+
PATHS ${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules)
127+
if(get_commits)
128+
execute_process(
129+
COMMAND ${get_commits} -c ${VERSION_PREFIX}
130+
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
131+
OUTPUT_VARIABLE NUM_COMMITS
132+
OUTPUT_STRIP_TRAILING_WHITESPACE
133+
RESULT_VARIABLE RESULT)
134+
135+
set(NUM_COMMITS
136+
"${NUM_COMMITS}"
137+
PARENT_SCOPE)
138+
139+
if(${RESULT} EQUAL 0)
140+
message("${NUM_COMMITS} were found since previous release")
119141
else()
120-
message("Unable to determine number of commits since previous release")
142+
message("Unable to determine number of commits since previous release")
121143
endif()
122144
else()
123145
message("WARNING: Didn't find version_util.sh")
124-
set(NUM_COMMITS "unknown" PARENT_SCOPE )
146+
set(NUM_COMMITS
147+
"unknown"
148+
PARENT_SCOPE)
125149
endif()
126150
endfunction()

‎example/CMakeLists.txt‎

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,23 @@ option(CMAKE_EXPORT_COMPILE_COMMANDS "Export compile commands for linters and au
3333

3434
# Set compile flags
3535
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -m64 -msse -msse2")
36-
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -ggdb -DDEBUG" CACHE STRING "Flags for Debug builds")
36+
set(CMAKE_CXX_FLAGS_DEBUG
37+
"${CMAKE_CXX_FLAGS_DEBUG} -O0 -ggdb -DDEBUG"
38+
CACHE STRING "Flags for Debug builds")
3739
# note: no '-s' here unlike other CMakeLists.txt
38-
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -DNDEBUG" CACHE STRING "Flags for Release builds")
39-
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2 -g -DNDEBUG" CACHE STRING "Flags for RelWithDebInfo builds")
40-
set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -Os -DNDEBUG" CACHE STRING "Flags for MinSizeRel builds")
41-
42-
set(CMAKE_CXX_STANDARD 17 CACHE STRING "The C++ standard to use")
40+
set(CMAKE_CXX_FLAGS_RELEASE
41+
"${CMAKE_CXX_FLAGS_RELEASE} -O2 -DNDEBUG"
42+
CACHE STRING "Flags for Release builds")
43+
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
44+
"${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2 -g -DNDEBUG"
45+
CACHE STRING "Flags for RelWithDebInfo builds")
46+
set(CMAKE_CXX_FLAGS_MINSIZEREL
47+
"${CMAKE_CXX_FLAGS_MINSIZEREL} -Os -DNDEBUG"
48+
CACHE STRING "Flags for MinSizeRel builds")
49+
50+
set(CMAKE_CXX_STANDARD
51+
17
52+
CACHE STRING "The C++ standard to use")
4353
set(CMAKE_CXX_STANDARD_REQUIRED ON)
4454
set(CMAKE_CXX_EXTENSIONS OFF)
4555

@@ -55,25 +65,21 @@ include(CMakePrintHelpers)
5565

5666
# required variables
5767
if(DEFINED ENV{ROCM_PATH})
58-
set(ROCM_DIR "$ENV{ROCM_PATH}" CACHE STRING "ROCm directory.")
68+
set(ROCM_DIR
69+
"$ENV{ROCM_PATH}"
70+
CACHE STRING "ROCm directory.")
5971
else()
60-
set(ROCM_DIR "/opt/rocm" CACHE STRING "ROCm directory.")
72+
set(ROCM_DIR
73+
"/opt/rocm"
74+
CACHE STRING "ROCm directory.")
6175
endif()
6276

6377
# add package search paths
64-
set(CMAKE_PREFIX_PATH
65-
${CMAKE_PREFIX_PATH}
66-
${ROCM_DIR}
67-
)
68-
set(CMAKE_LIBRARY_PATH
69-
${CMAKE_LIBRARY_PATH}
70-
${ROCM_DIR}/lib
71-
${ROCM_DIR}/lib64
72-
)
78+
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${ROCM_DIR})
79+
set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} ${ROCM_DIR}/lib ${ROCM_DIR}/lib64)
7380

7481
# RDC provides librdc_bootstrap
75-
find_package(rdc
76-
CONFIG REQUIRED)
82+
find_package(rdc CONFIG REQUIRED)
7783

7884
message("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&")
7985
message(" Cmake Example ")
@@ -111,7 +117,6 @@ set(ROCPROFILER_EXAMPLE_EXE "rocprofiler")
111117
add_executable(${ROCPROFILER_EXAMPLE_EXE} "${ROCPROFILER_EXAMPLE_SRC_LIST}")
112118
target_link_libraries(${ROCPROFILER_EXAMPLE_EXE} pthread dl rdc_bootstrap)
113119

114-
115120
set(POLICY_EXAMPLE_SRC_LIST "policy_example.cc")
116121
cmake_print_variables(POLICY_EXAMPLE_SRC_LIST)
117122
set(POLICY_EXAMPLE_EXE "policy")

0 commit comments

Comments
 (0)