AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[rocprofiler-systems] Apply new CMake formatting for the latest gersemi version (#1778)

Browse Source 
* Fix cmake formatting

* Updated rev. in `.pre-commit-config.yaml`

* Pin the gersemi used in CI to v0.23.1, matching the pre-commit

---------

Co-authored-by: Aleksandar Djordjevic <adjordje@amd.com>
Co-authored-by: David Galiffi <David.Galiffi@amd.com>
This commit is contained in:
Aleksandar Djordjevic
2025-11-10 19:08:44 +01:00
committed by GitHub
parent 42cc721a4b
commit f39a60ac25
15 changed files with 53 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/rocprofiler-systems-formatting.yml
+1 -1
View File
@@ -105,7 +105,7 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install -y python3-pip
python3 -m pip install gersemi
python3 -m pip install gersemi==0.23.1
- name: gersemi
working-directory: projects/rocprofiler-systems/
run: |
projects/rocprofiler-systems/.pre-commit-config.yaml
+1 -1
View File
@@ -44,7 +44,7 @@ repos:
files: \.(c|cpp|h.*)$
- repo: https://github.com/BlankSpruce/gersemi
rev: 0.19.3
rev: 0.23.1
hooks:
- id: gersemi
projects/rocprofiler-systems/cmake/ConfigCPack.cmake
+1 -2
View File
@@ -177,8 +177,7 @@ if(NOT ROCPROFSYS_BUILD_DYNINST)
timer
)
list(
APPEND
_DEBIAN_PACKAGE_DEPENDS
APPEND _DEBIAN_PACKAGE_DEPENDS
"libboost-${_BOOST_COMPONENT}-dev (>= 1.67.0)"
)
endforeach()
projects/rocprofiler-systems/cmake/DyninstBoost.cmake
+2 -4
View File
@@ -309,8 +309,7 @@ else()
foreach(c ${_boost_components})
list(APPEND Boost_LIBRARIES "optimized libboost_${c} debug libboost_${c}-gd ")
list(
APPEND
_boost_build_byproducts
APPEND _boost_build_byproducts
"{Boost_ROOT_DIR}/lib/libboost_${c}${_LIB_SUFFIX}"
)
set(Boost_${c}_LIBRARY
@@ -347,8 +346,7 @@ else()
$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${INSTALL_LIB_DIR}/${TPL_INSTALL_LIB_DIR}/libboost_${c}${_LIB_SUFFIX}>
)
list(
APPEND
_boost_build_byproducts
APPEND _boost_build_byproducts
"${Boost_ROOT_DIR}/lib/libboost_${c}${_LIB_SUFFIX}"
)
list(APPEND Boost_LIBRARIES "${Boost_${c}_LIBRARY}")
projects/rocprofiler-systems/cmake/DyninstTBB.cmake
+1 -2
View File
@@ -148,8 +148,7 @@ else()
# Generate library filenames
list(APPEND _tbb_libraries ${_tbb_${c}_lib})
list(
APPEND
_tbb_build_byproducts
APPEND _tbb_build_byproducts
"${TBB_ROOT_DIR}/lib/lib${c}${CMAKE_SHARED_LIBRARY_SUFFIX}"
)
projects/rocprofiler-systems/cmake/Modules/FindBoost.cmake
+29 -58
View File
@@ -258,8 +258,7 @@ function(_boost_get_existing_target component target_var)
# handle pythonXY and numpyXY versioned components and also python X.Y, mpi_python
# etc.
list(
APPEND
names
APPEND names
"${CMAKE_MATCH_1}${CMAKE_MATCH_2}" # python
"${CMAKE_MATCH_1}${CMAKE_MATCH_2}${CMAKE_MATCH_3}" # pythonX
"${CMAKE_MATCH_1}${CMAKE_MATCH_2}${CMAKE_MATCH_3}${CMAKE_MATCH_4}" # pythonXY
@@ -2128,8 +2127,7 @@ function(
)
if(MSVC_TOOLSET_VERSION GREATER_EQUAL 14${v})
list(
APPEND
${componentlibvar}
APPEND ${componentlibvar}
${basedir}/lib${_arch_suffix}-msvc-14.${v}
)
endif()
@@ -2137,8 +2135,7 @@ function(
elseif(MSVC_TOOLSET_VERSION GREATER_EQUAL 80)
math(EXPR _toolset_major_version "${MSVC_TOOLSET_VERSION} / 10")
list(
APPEND
${componentlibvar}
APPEND ${componentlibvar}
${basedir}/lib${_arch_suffix}-msvc-${_toolset_major_version}.0
)
endif()
@@ -2399,8 +2396,7 @@ if(NOT Boost_INCLUDE_DIR)
list(APPEND _boost_INCLUDE_SEARCH_DIRS ${BOOST_ROOT}/include ${BOOST_ROOT})
elseif(_ENV_BOOST_ROOT)
list(
APPEND
_boost_INCLUDE_SEARCH_DIRS
APPEND _boost_INCLUDE_SEARCH_DIRS
${_ENV_BOOST_ROOT}/include
${_ENV_BOOST_ROOT}
)
@@ -2408,8 +2404,7 @@ if(NOT Boost_INCLUDE_DIR)
if(Boost_NO_SYSTEM_PATHS)
list(
APPEND
_boost_INCLUDE_SEARCH_DIRS
APPEND _boost_INCLUDE_SEARCH_DIRS
NO_CMAKE_SYSTEM_PATH
NO_SYSTEM_ENVIRONMENT_PATH
)
@@ -2421,8 +2416,7 @@ if(NOT Boost_INCLUDE_DIR)
endforeach()
endif()
list(
APPEND
_boost_INCLUDE_SEARCH_DIRS
APPEND _boost_INCLUDE_SEARCH_DIRS
PATHS
C:/boost/include
C:/boost
@@ -2448,8 +2442,7 @@ if(NOT Boost_INCLUDE_DIR)
endif()
list(
APPEND
_boost_PATH_SUFFIXES
APPEND _boost_PATH_SUFFIXES
"boost-${_boost_BOOSTIFIED_VERSION}"
"boost_${_boost_BOOSTIFIED_VERSION}"
"boost/boost-${_boost_BOOSTIFIED_VERSION}"
@@ -2486,8 +2479,7 @@ if(Boost_INCLUDE_DIR)
set(Boost_VERSION_MACRO 0)
set(Boost_LIB_VERSION "")
file(
STRINGS
"${Boost_INCLUDE_DIR}/boost/version.hpp"
STRINGS "${Boost_INCLUDE_DIR}/boost/version.hpp"
_boost_VERSION_HPP_CONTENTS
REGEX "#define BOOST_(LIB_)?VERSION "
)
@@ -2742,8 +2734,7 @@ foreach(c DEBUG RELEASE)
if(BOOST_ROOT)
list(
APPEND
_boost_LIBRARY_SEARCH_DIRS_${c}
APPEND _boost_LIBRARY_SEARCH_DIRS_${c}
${BOOST_ROOT}/lib
${BOOST_ROOT}/stage/lib
)
@@ -2752,8 +2743,7 @@ foreach(c DEBUG RELEASE)
)
elseif(_ENV_BOOST_ROOT)
list(
APPEND
_boost_LIBRARY_SEARCH_DIRS_${c}
APPEND _boost_LIBRARY_SEARCH_DIRS_${c}
${_ENV_BOOST_ROOT}/lib
${_ENV_BOOST_ROOT}/stage/lib
)
@@ -2763,8 +2753,7 @@ foreach(c DEBUG RELEASE)
endif()
list(
APPEND
_boost_LIBRARY_SEARCH_DIRS_${c}
APPEND _boost_LIBRARY_SEARCH_DIRS_${c}
${Boost_INCLUDE_DIR}/lib
${Boost_INCLUDE_DIR}/../lib
${Boost_INCLUDE_DIR}/stage/lib
@@ -2777,8 +2766,7 @@ foreach(c DEBUG RELEASE)
)
if(Boost_NO_SYSTEM_PATHS)
list(
APPEND
_boost_LIBRARY_SEARCH_DIRS_${c}
APPEND _boost_LIBRARY_SEARCH_DIRS_${c}
NO_CMAKE_SYSTEM_PATH
NO_SYSTEM_ENVIRONMENT_PATH
)
@@ -2793,8 +2781,7 @@ foreach(c DEBUG RELEASE)
_boost_LIBRARY_SEARCH_DIRS_${c} "C:/boost"
)
list(
APPEND
_boost_LIBRARY_SEARCH_DIRS_${c}
APPEND _boost_LIBRARY_SEARCH_DIRS_${c}
PATHS
C:/boost/lib
C:/boost
@@ -2920,39 +2907,33 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
if(COMPONENT_PYTHON_VERSION_MINOR)
# Boost >= 1.67
list(
APPEND
_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME
APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME
"${COMPONENT_UNVERSIONED}${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}"
)
# Debian/Ubuntu (Some versions omit the 2 and/or 3 from the suffix)
list(
APPEND
_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME
APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME
"${COMPONENT_UNVERSIONED}${COMPONENT_PYTHON_VERSION_MAJOR}-py${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}"
)
list(
APPEND
_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME
APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME
"${COMPONENT_UNVERSIONED}-py${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}"
)
# Gentoo
list(
APPEND
_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME
APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME
"${COMPONENT_UNVERSIONED}-${COMPONENT_PYTHON_VERSION_MAJOR}.${COMPONENT_PYTHON_VERSION_MINOR}"
)
# RPMs
list(
APPEND
_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME
APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME
"${COMPONENT_UNVERSIONED}-${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}"
)
endif()
if(COMPONENT_PYTHON_VERSION_MAJOR AND NOT COMPONENT_PYTHON_VERSION_MINOR)
# Boost < 1.67
list(
APPEND
_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME
APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME
"${COMPONENT_UNVERSIONED}${COMPONENT_PYTHON_VERSION_MAJOR}"
)
endif()
@@ -3004,16 +2985,14 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
foreach(component IN LISTS _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME COMPONENT)
foreach(compiler IN LISTS _boost_COMPILER)
list(
APPEND
_boost_RELEASE_NAMES
APPEND _boost_RELEASE_NAMES
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}${_boost_ARCHITECTURE_TAG}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
)
endforeach()
list(
APPEND
_boost_RELEASE_NAMES
APPEND _boost_RELEASE_NAMES
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}${_boost_ARCHITECTURE_TAG}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
@@ -3024,16 +3003,14 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
foreach(compiler IN LISTS _boost_COMPILER)
list(
APPEND
_boost_RELEASE_NAMES
APPEND _boost_RELEASE_NAMES
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
)
endforeach()
list(
APPEND
_boost_RELEASE_NAMES
APPEND _boost_RELEASE_NAMES
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
@@ -3084,16 +3061,14 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
foreach(component IN LISTS _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME COMPONENT)
foreach(compiler IN LISTS _boost_COMPILER)
list(
APPEND
_boost_DEBUG_NAMES
APPEND _boost_DEBUG_NAMES
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}${_boost_ARCHITECTURE_TAG}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
)
endforeach()
list(
APPEND
_boost_DEBUG_NAMES
APPEND _boost_DEBUG_NAMES
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}${_boost_ARCHITECTURE_TAG}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
@@ -3104,16 +3079,14 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
foreach(compiler IN LISTS _boost_COMPILER)
list(
APPEND
_boost_DEBUG_NAMES
APPEND _boost_DEBUG_NAMES
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
)
endforeach()
list(
APPEND
_boost_DEBUG_NAMES
APPEND _boost_DEBUG_NAMES
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
@@ -3334,15 +3307,13 @@ if(Boost_FOUND)
unset(_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES)
foreach(dep ${_Boost_${UPPERCOMPONENT}_DEPENDENCIES})
list(
APPEND
_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES
APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES
Boost::${dep}
)
endforeach()
if(COMPONENT STREQUAL "thread")
list(
APPEND
_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES
APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES
Threads::Threads
)
endif()
projects/rocprofiler-systems/cmake/Modules/FindLibDW.cmake
+1 -2
View File
@@ -71,8 +71,7 @@ else()
if(EXISTS "${LibDW_INCLUDE_DIRS}/version.h")
file(
STRINGS
"${LibDW_INCLUDE_DIRS}/version.h"
STRINGS "${LibDW_INCLUDE_DIRS}/version.h"
_version_line
REGEX "^#define _ELFUTILS_VERSION[ \t]+[0-9]+"
)
projects/rocprofiler-systems/cmake/Modules/FindLibDebuginfod.cmake
+1 -2
View File
@@ -79,8 +79,7 @@ else()
if(EXISTS "${LibDebuginfod_INCLUDE_DIRS}/version.h")
file(
STRINGS
"${LibDebuginfod_INCLUDE_DIRS}/version.h"
STRINGS "${LibDebuginfod_INCLUDE_DIRS}/version.h"
_version_line
REGEX "^#define _ELFUTILS_VERSION[ \t]+[0-9]+"
)
projects/rocprofiler-systems/cmake/PAPI.cmake
+3 -5
View File
@@ -172,8 +172,7 @@ endif()
if("lmsensors" IN_LIST ROCPROFSYS_PAPI_COMPONENTS AND ROCPROFSYS_PAPI_LMSENSORS_ROOT_DIR)
list(
APPEND
ROCPROFSYS_PAPI_EXTRA_ENV
APPEND ROCPROFSYS_PAPI_EXTRA_ENV
PAPI_LMSENSORS_ROOT=${ROCPROFSYS_PAPI_LMSENSORS_ROOT_DIR}
)
endif()
@@ -349,7 +348,7 @@ foreach(
if(_UTIL_EXE STREQUAL "papi_hl_output_writer.py")
file(
READ
"${PROJECT_BINARY_DIR}/external/papi/source/src/high-level/scripts/${_UTIL_EXE}"
"${PROJECT_BINARY_DIR}/external/papi/source/src/high-level/scripts/${_UTIL_EXE}"
_HL_OUTPUT_WRITER
)
string(
@@ -361,8 +360,7 @@ foreach(
)
file(MAKE_DIRECTORY "${ROCPROFSYS_PAPI_INSTALL_DIR}/bin")
file(
WRITE
"${ROCPROFSYS_PAPI_INSTALL_DIR}/bin/${_UTIL_EXE}3"
WRITE "${ROCPROFSYS_PAPI_INSTALL_DIR}/bin/${_UTIL_EXE}3"
"${_HL_OUTPUT_WRITER}"
)
set(_UTIL_EXE "${_UTIL_EXE}3")
projects/rocprofiler-systems/source/lib/rocprof-sys-rt/CMakeLists.txt
+1 -2
View File
@@ -23,8 +23,7 @@ set(_sources src/RTcommon.c src/RTheap.c src/RTthread.c)
if(PLATFORM MATCHES linux)
set(_static_sources src/RTstatic_ctors_dtors_begin.c src/RTstatic_ctors_dtors_end.c)
list(
APPEND
_sources
APPEND _sources
src/RTposix.c
src/RTlinux.c
src/RTheap-linux.c
projects/rocprofiler-systems/source/lib/rocprof-sys-rt/cmake/platform.cmake
+4 -8
View File
@@ -54,8 +54,7 @@ endif()
if(PLATFORM MATCHES i386)
set(ARCH_DEFINES arch_x86)
list(
APPEND
CAP_DEFINES
APPEND CAP_DEFINES
cap_fixpoint_gen
cap_noaddr_gen
cap_stripped_binaries
@@ -66,8 +65,7 @@ if(PLATFORM MATCHES i386)
elseif(PLATFORM MATCHES x86_64 OR PLATFORM MATCHES amd64)
set(ARCH_DEFINES arch_x86_64 arch_64bit)
list(
APPEND
CAP_DEFINES
APPEND CAP_DEFINES
cap_32_64
cap_fixpoint_gen
cap_noaddr_gen
@@ -97,8 +95,7 @@ endif()
if(PLATFORM MATCHES linux)
set(OS_DEFINES os_linux)
list(
APPEND
CAP_DEFINES
APPEND CAP_DEFINES
cap_async_events
cap_binary_rewriter
cap_dwarf
@@ -109,8 +106,7 @@ if(PLATFORM MATCHES linux)
elseif(PLATFORM MATCHES cnl)
set(OS_DEFINES os_linux os_cnl)
list(
APPEND
CAP_DEFINES
APPEND CAP_DEFINES
cap_async_events
cap_binary_rewriter
cap_dwarf
projects/rocprofiler-systems/tests/rocprof-sys-binary-tests.cmake
+1 -2
View File
@@ -322,8 +322,7 @@ rocprofiler_systems_add_bin_test(
file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/rocprof-sys-tests-config")
file(
WRITE
"${PROJECT_BINARY_DIR}/rocprof-sys-tests-config/empty.cfg"
WRITE "${PROJECT_BINARY_DIR}/rocprof-sys-tests-config/empty.cfg"
"
#
# empty config file
projects/rocprofiler-systems/tests/rocprof-sys-config-tests.cmake
+1 -2
View File
@@ -27,8 +27,7 @@
# -------------------------------------------------------------------------------------- #
file(
WRITE
${CMAKE_CURRENT_BINARY_DIR}/invalid.cfg
WRITE ${CMAKE_CURRENT_BINARY_DIR}/invalid.cfg
"
ROCPROFSYS_CONFIG_FILE =
FOOBAR = ON
projects/rocprofiler-systems/tests/rocprof-sys-decode-tests.cmake
+2 -4
View File
@@ -61,13 +61,11 @@ if(MI300_DETECTED)
list(APPEND _vcn_counter_names --counter-names "VCN Activity")
list(APPEND _jpeg_counter_names --counter-names "JPEG Activity")
list(
APPEND
_vcn_rocpd_validation_rules
APPEND _vcn_rocpd_validation_rules
"${CMAKE_CURRENT_LIST_DIR}/rocpd-validation-rules/video-decode/amd-smi-rules.json"
)
list(
APPEND
_jpeg_rocpd_validation_rules
APPEND _jpeg_rocpd_validation_rules
"${CMAKE_CURRENT_LIST_DIR}/rocpd-validation-rules/jpeg-decode/amd-smi-rules.json"
)
endif()
projects/rocprofiler-systems/tests/rocprof-sys-testing.cmake
+4 -8
View File
@@ -262,8 +262,7 @@ set(rocprofiler_systems_cap_perfmon "1")
if(EXISTS "/proc/sys/kernel/perf_event_paranoid")
file(
STRINGS
"/proc/sys/kernel/perf_event_paranoid"
STRINGS "/proc/sys/kernel/perf_event_paranoid"
rocprofiler_systems_perf_event_paranoid
LIMIT_COUNT 1
)
@@ -397,8 +396,7 @@ function(ROCPROFILER_SYSTEMS_WRITE_TEST_CONFIG _FILE _ENV)
set(_CONFIG_FILE ${PROJECT_BINARY_DIR}/rocprof-sys-tests-config/${_FILE})
file(
WRITE
${_CONFIG_FILE}
WRITE ${_CONFIG_FILE}
"# auto-generated by cmake
# default values
@@ -1022,8 +1020,7 @@ function(ROCPROFILER_SYSTEMS_ADD_PYTHON_TEST)
if(NOT TEST_COMMAND)
list(
APPEND
TEST_ENVIRONMENT
APPEND TEST_ENVIRONMENT
"ROCPROFSYS_CI=ON"
"ROCPROFSYS_OUTPUT_PATH=${PROJECT_BINARY_DIR}/rocprof-sys-tests-output"
)
@@ -1359,8 +1356,7 @@ function(ROCPROFILER_SYSTEMS_ADD_BIN_TEST)
# common
list(
APPEND
TEST_ENVIRONMENT
APPEND TEST_ENVIRONMENT
"ROCPROFSYS_CI=ON"
"ROCPROFSYS_CI_TIMEOUT=${TEST_TIMEOUT}"
"ROCPROFSYS_CONFIG_FILE="