Merge branch 'amd-dev' into amd-master 20221212
Change-Id: I3dbaaae0e157487afbab1efb96d6f854c1249125
Signed-off-by: Galantsev, Dmitrii <dmitrii.galantsev@amd.com>
[ROCm/amdsmi commit: 5db4424549]
This commit is contained in:
@@ -369,9 +369,9 @@ int main() {
|
||||
if (!num_pages) {
|
||||
printf("\tNo bad pages found.\n");
|
||||
} else {
|
||||
amdsmi_retired_page_record_t bad_page_info[num_pages] = {};
|
||||
std::vector<amdsmi_retired_page_record_t> bad_page_info(num_pages);
|
||||
ret = amdsmi_get_bad_page_info(device_handles[j], &num_pages,
|
||||
bad_page_info);
|
||||
bad_page_info.data());
|
||||
CHK_AMDSMI_RET(ret)
|
||||
for (uint32_t page_it = 0; page_it < num_pages; page_it += 1) {
|
||||
printf(" Page[%d]\n", page_it);
|
||||
|
||||
@@ -252,9 +252,9 @@ int main() {
|
||||
if (!num_pages) {
|
||||
printf("\tNo bad pages found.\n");
|
||||
} else {
|
||||
amdsmi_retired_page_record_t bad_page_info[num_pages] = {};
|
||||
std::vector<amdsmi_retired_page_record_t> bad_page_info(num_pages);
|
||||
ret = amdsmi_get_bad_page_info(device_handles[j], &num_pages,
|
||||
bad_page_info);
|
||||
bad_page_info.data());
|
||||
CHK_AMDSMI_RET(ret)
|
||||
for (uint32_t page_it = 0; page_it < num_pages; page_it += 1) {
|
||||
printf(" Page[%d]\n", page_it);
|
||||
|
||||
@@ -1,6 +1,12 @@
|
||||
# Required Defines first:
|
||||
option(INSTALL_GTEST "Install GTest (only useful if GTest is not already installed)" OFF)
|
||||
|
||||
# Help tests find libraries at runtime
|
||||
set(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags")
|
||||
set(CMAKE_INSTALL_RPATH
|
||||
"\$ORIGIN:\$ORIGIN/../../../lib"
|
||||
CACHE STRING "RUNPATH for tests. Helps find libgtest.so and libamd_smi.so")
|
||||
|
||||
# Try to find googletest
|
||||
find_package(GTest 1.11.0)
|
||||
|
||||
@@ -58,7 +64,9 @@ add_executable(${TEST} ${tstSources} ${functionalSources})
|
||||
|
||||
target_link_libraries(${TEST} amd_smi c stdc++ pthread GTest::gtest_main)
|
||||
|
||||
# Install tests and gtest
|
||||
# TODO: Remove GTest from here in the future and rely on INSTALL_GTEST?
|
||||
install(
|
||||
TARGETS ${TEST}
|
||||
TARGETS ${TEST} gtest gtest_main
|
||||
DESTINATION ${SHARE_INSTALL_PREFIX}/tests/amd_smi
|
||||
COMPONENT tests)
|
||||
|
||||
Reference in New Issue
Block a user