AI/rocm-systems
2
0
Forka 0
Codice Problemi Pull Request Actions Pacchetti Progetti Rilasci Wiki Attività

General fixes for CI

Sfoglia il codice sorgente 
Change-Id: I16e4d1fbc71a378eba6738c6953760e8e4de525e
This commit is contained in:
Ammar ELWazir
2024-06-07 11:14:39 -05:00
parent c312e9b0f1
commit db82c5ef62
4 ha cambiato i file con 66 aggiunte e 53 eliminazioni
Scarica il file Patch Scarica il file Diff Expand all files Collapse all files
tests-v2/microbenchmarks/CMakeLists.txt
+38 -31
Vedi File
@@ -1,36 +1,43 @@
# Set the HIP language runtime link flags as FindHIP does not set them.
set(CMAKE_INSTALL_TESTDIR test/${PROJECT_NAME})
set(CMAKE_EXECUTABLE_RUNTIME_HIP_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG})
set(CMAKE_EXECUTABLE_RUNTIME_HIP_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG_SEP})
set(CMAKE_EXECUTABLE_RPATH_LINK_HIP_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_CXX_FLAG})
find_library(ROCM_SMI_LIB rocm_smi64 HINTS ${ROCM_PATH}/lib)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${ROCM_PATH}/lib/cmake/hip")
set(CMAKE_HIP_ARCHITECTURES OFF)
if(DEFINED ROCM_PATH)
set(HIP_ROOT_DIR "${ROCM_PATH}/bin")
endif()
find_package(HIP REQUIRED MODULE)
if(ROCM_SMI_LIB)
# Set the HIP language runtime link flags as FindHIP does not set them.
set(CMAKE_INSTALL_TESTDIR test/${PROJECT_NAME})
set(CMAKE_EXECUTABLE_RUNTIME_HIP_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG})
set(CMAKE_EXECUTABLE_RUNTIME_HIP_FLAG_SEP
${CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG_SEP})
set(CMAKE_EXECUTABLE_RPATH_LINK_HIP_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_CXX_FLAG})
set(TEST_DIR ${PROJECT_SOURCE_DIR}/tests-v2/microbenchmarks)
file(GLOB TEST_SRC_FILE ${TEST_DIR}/*.cpp)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${ROCM_PATH}/lib/cmake/hip")
set(CMAKE_HIP_ARCHITECTURES OFF)
if(DEFINED ROCM_PATH)
set(HIP_ROOT_DIR "${ROCM_PATH}/bin")
endif()
find_package(HIP REQUIRED MODULE)
set_source_files_properties(${TEST_SRC_FILE} PROPERTIES HIP_SOURCE_PROPERTY_FORMAT 1)
hip_add_executable(pcie_bw_test ${TEST_SRC_FILE})
add_test(
NAME pcie_bw_test
COMMAND $<TARGET_FILE:pcie_bw_test>
WORKING_DIRECTORY "${PROJECT_BINARY_DIR}")
set_tests_properties(
pcie_bw_test
PROPERTIES LABELS "v2;benchmarks" ENVIRONMENT "${ROCPROFILER_MEMCHECK_PRELOAD_ENV}"
SKIP_REGULAR_EXPRESSION "SIGBUS error. Aborting test" DISABLED TRUE)
set(TEST_DIR ${PROJECT_SOURCE_DIR}/tests-v2/microbenchmarks)
file(GLOB TEST_SRC_FILE ${TEST_DIR}/*.cpp)
target_link_libraries(pcie_bw_test PRIVATE rocm_smi64)
target_link_options(pcie_bw_test PRIVATE "-Wl,--build-id=md5")
set_target_properties(
pcie_bw_test PROPERTIES RUNTIME_OUTPUT_DIRECTORY
"${PROJECT_BINARY_DIR}/tests-v2/microbenchmarks")
install(
TARGETS pcie_bw_test
RUNTIME DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/tests/microbenchmarks
set_source_files_properties(${TEST_SRC_FILE} PROPERTIES HIP_SOURCE_PROPERTY_FORMAT 1)
hip_add_executable(pcie_bw_test ${TEST_SRC_FILE})
add_test(
NAME pcie_bw_test
COMMAND $<TARGET_FILE:pcie_bw_test>
WORKING_DIRECTORY "${PROJECT_BINARY_DIR}")
set_tests_properties(
pcie_bw_test
PROPERTIES LABELS "v2;benchmarks" ENVIRONMENT
"${ROCPROFILER_MEMCHECK_PRELOAD_ENV}" SKIP_REGULAR_EXPRESSION
"SIGBUS error. Aborting test" DISABLED TRUE)
target_link_libraries(pcie_bw_test PRIVATE ${ROCM_SMI_LIB})
target_link_options(pcie_bw_test PRIVATE "-Wl,--build-id=md5")
set_target_properties(
pcie_bw_test PROPERTIES RUNTIME_OUTPUT_DIRECTORY
"${PROJECT_BINARY_DIR}/tests-v2/microbenchmarks")
install(
TARGETS pcie_bw_test
RUNTIME
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/tests/microbenchmarks
COMPONENT tests)
endif()
tests-v2/unittests/profiler/CMakeLists.txt
+1 -3
Vedi File
@@ -27,8 +27,6 @@ find_library(PCIACCESS_LIBRARIES pciaccess REQUIRED)
enable_testing()
find_package(GTest REQUIRED)
find_library(GDB rocm-dbgapi PATHS ${ROCM_PATH} REQUIRED)
# Getting Source files for ROCProfiler, Hardware, HSA, Memory, Session, Counters, Utils
set(CORE_MEMORY_DIR ${PROJECT_SOURCE_DIR}/src/core/memory)
file(GLOB CORE_MEMORY_SRC_FILES ${CORE_MEMORY_DIR}/*.cpp)
@@ -123,7 +121,7 @@ target_compile_definitions(
target_link_libraries(
runUnitTests PRIVATE rocprofiler-v2 ${AQLPROFILE_LIB} hsa-runtime64::hsa-runtime64
GTest::gtest GTest::gtest_main stdc++fs ${PCIACCESS_LIBRARIES} ${GDB} dw elf c dl)
GTest::gtest GTest::gtest_main stdc++fs ${PCIACCESS_LIBRARIES} dw elf c dl)
add_dependencies(tests runUnitTests)
install(TARGETS runUnitTests