Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Deployment checks #678

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Deployment checks #678

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b0ce32d
add firmware versions and others in -g
Nov 23, 2023
9a0b74a
Print details on VBIOS and FW versions
Nov 24, 2023
328c298
cleanup
Nov 24, 2023
39e7745
removed unused smi cmake variable
Jan 12, 2024
5f7b238
indentation fixes
Jan 12, 2024
bd97ca4
check return error
Jan 19, 2024
37db9a7
issue fix
Jan 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions include/rvs_util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,30 @@
#include <iostream>
#include <map>
using std::map;
struct fm_ver{
uint64_t asd;
uint64_t ce;
uint64_t dmcu;
uint64_t mc;
uint64_t me;
uint64_t mec;
uint64_t mec2;
uint64_t pfp;
uint64_t rlc;
uint64_t rlc_srlc;
uint64_t rlc_srlg;
uint64_t rlc_srls;
uint64_t sdma;
uint64_t sdma2;
uint64_t smc;
uint64_t sos;
uint64_t ta_ras;
uint64_t ta_xgmi;
uint64_t uvd;
uint64_t vce;
uint64_t vcn;
// end fwver
};

extern bool is_positive_integer(const std::string& str_val);

Expand Down
11 changes: 10 additions & 1 deletion rvs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,18 @@ if(BUILD_ADDRESS_SANITIZER)
else()
set(ASAN_LIB_PATH "$ENV{LD_LIBRARY_PATH}")
endif()
# check if ROCM-SMI is installed
if(DEFINED RVS_ROCMSMI)
manoj-freyr marked this conversation as resolved.
Show resolved Hide resolved
if(NOT RVS_ROCMSMI EQUAL 1)
if(NOT EXISTS "${ROCM_SMI_LIB_DIR}/lib${ROCM_SMI_LIB}.so")
message("ERROR: rocm_smi library can't be found!...")
RETURN()
endif()
endif()
endif()

## define include directories
include_directories(./ ../ ${YAML_CPP_INCLUDE_DIRS})
include_directories(./ ../ ${YAML_CPP_INCLUDE_DIRS} ${ROCM_SMI_INC_DIR})
## define lib directories
link_directories(${CMAKE_CURRENT_BINARY_DIR} ${RVS_LIB_DIR} ${ROCT_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ASAN_LIB_PATH})

Expand Down
1 change: 0 additions & 1 deletion rvs/include/rvsexec.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ class exec {
void do_help(void);
void do_version(void);
int do_gpu_list(void);

int do_yaml(const std::string& config_file);
int do_yaml(yaml_data_type_t data_type, const std::string& data);
int do_yaml_properties(const YAML::Node& node,
Expand Down
2 changes: 2 additions & 0 deletions rvs/src/rvsexec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,8 @@ void rvs::exec::do_help() {
cout << "-h --help Display usage information and exit.\n";
}



//! Reports list of AMD GPUs presnt in the system
int rvs::exec::do_gpu_list() {
cout << "\nROCm Validation Suite (version " << LIB_VERSION_STRING << ")\n\n";
Expand Down
104 changes: 102 additions & 2 deletions src/rvs_util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,40 @@
#include "include/gpu_util.h"
#include <vector>
#include <string>
#include <limits>
#include <regex>
#include <iomanip>
#include <fstream>
#include <algorithm>
#include "hip/hip_runtime.h"
#include "hip/hip_runtime_api.h"
#include "rocm_smi/rocm_smi.h"


/**
returns the current OS name
**/
std::string getOSName(){
std::ifstream rel_file("/etc/os-release");
if(!rel_file.good()){
std::cout << "No /etc/os-release file, cant fetch details " << std::endl;
return std::string{};
}
std::string line;
while (std::getline(rel_file, line))
{
auto found = line.find("NAME") ;
manoj-freyr marked this conversation as resolved.
Show resolved Hide resolved
if (found!=std::string::npos){
found = line.find('\"');
auto endquote = line.find_last_of('\"');
if(found == std::string::npos || endquote == std::string::npos)
return std::string{};
std::string os_name = line.substr(found+1, endquote-found-1 );
return os_name;
}
}
}

/**
* splits a std::string based on a given delimiter
* @param str_val input std::string
Expand Down Expand Up @@ -182,6 +209,65 @@ bool fetch_gpu_list(int hip_num_gpu_devices, map<int, uint16_t>& gpus_device_ind
return amd_gpus_found;
}

void firmware_version_get(int idx, rsmi_fw_block_t blk, uint64_t* val){
auto ret = rsmi_dev_firmware_version_get(idx, blk, val);
if (ret != RSMI_STATUS_SUCCESS)
*val = std::numeric_limits<uint64_t>::max();
}

void fill_firmware_versions(int idx, fm_ver& fmver){
firmware_version_get(idx, RSMI_FW_BLOCK_ASD ,&fmver.asd);
firmware_version_get(idx, RSMI_FW_BLOCK_CE ,&fmver.ce);
firmware_version_get(idx, RSMI_FW_BLOCK_DMCU ,&fmver.dmcu);
firmware_version_get(idx, RSMI_FW_BLOCK_MC ,&fmver.mc);
firmware_version_get(idx, RSMI_FW_BLOCK_ME ,&fmver.me);
firmware_version_get(idx, RSMI_FW_BLOCK_MEC ,&fmver.mec);
firmware_version_get(idx, RSMI_FW_BLOCK_MEC2 ,&fmver.mec2);
firmware_version_get(idx, RSMI_FW_BLOCK_PFP ,&fmver.pfp);
firmware_version_get(idx, RSMI_FW_BLOCK_RLC ,&fmver.rlc);
firmware_version_get(idx, RSMI_FW_BLOCK_RLC_SRLC ,&fmver.rlc_srlc);
firmware_version_get(idx, RSMI_FW_BLOCK_RLC_SRLG ,&fmver.rlc_srlg);
firmware_version_get(idx, RSMI_FW_BLOCK_RLC_SRLS ,&fmver.rlc_srls);
firmware_version_get(idx, RSMI_FW_BLOCK_SDMA ,&fmver.sdma);
firmware_version_get(idx, RSMI_FW_BLOCK_SDMA2 ,&fmver.sdma2);
firmware_version_get(idx, RSMI_FW_BLOCK_SMC ,&fmver.smc);
firmware_version_get(idx, RSMI_FW_BLOCK_SOS ,&fmver.sos);
firmware_version_get(idx, RSMI_FW_BLOCK_TA_RAS ,&fmver.ta_ras);
firmware_version_get(idx, RSMI_FW_BLOCK_TA_XGMI ,&fmver.ta_xgmi);
firmware_version_get(idx, RSMI_FW_BLOCK_UVD ,&fmver.uvd);
firmware_version_get(idx, RSMI_FW_BLOCK_VCE ,&fmver.vce);
firmware_version_get(idx, RSMI_FW_BLOCK_VCN ,&fmver.vcn);
}

std::string cleanprint(uint64_t val){
std::string tmp{"NA"};
if ( val != std::numeric_limits<uint64_t>::max())
tmp = std::to_string(val);
return tmp;
}
void print_fmversions(const fm_ver& fmver){
std::cout << " BLOCK_ASD : " << cleanprint(fmver.asd) << "\n"
<< " BLOCK_CE : " << cleanprint(fmver.ce) << "\n"
<< " BLOCK_DMCU : " << cleanprint(fmver.dmcu) << "\n"
<< " BLOCK_MC : " << cleanprint(fmver.mc) << "\n"
<< " BLOCK_ME : " << cleanprint(fmver.me) << "\n"
<< " BLOCK_MEC : " << cleanprint(fmver.mec) << "\n"
<< " BLOCK_MEC2 : " << cleanprint(fmver.mec2) << "\n"
<< " BLOCK_PFP : " << cleanprint(fmver.pfp) << "\n"
<< " BLOCK_RLC : " << cleanprint(fmver.rlc) << "\n"
<< " BLOCK_RLC_SRLC: " << cleanprint(fmver.rlc_srlc) << "\n"
<< " BLOCK_RLC_SRLG: " << cleanprint(fmver.rlc_srlg) << "\n"
<< " BLOCK_RLC_SRLS: " << cleanprint(fmver.rlc_srls) << "\n"
<< " BLOCK_SDMA : " << cleanprint(fmver.sdma) << "\n"
<< " BLOCK_SDMA2 : " << cleanprint(fmver.sdma2) << "\n"
<< " BLOCK_SMC : " << cleanprint(fmver.smc) << "\n"
<< " BLOCK_SOS : " << cleanprint(fmver.sos) << "\n"
<< " BLOCK_TA_RAS : " << cleanprint(fmver.ta_ras) << "\n"
<< " BLOCK_TA_XGMI : " << cleanprint(fmver.ta_xgmi) << "\n"
<< " BLOCK_UVD : " << cleanprint(fmver.uvd) << "\n"
<< " BLOCK_VCE : " << cleanprint(fmver.vce) << "\n"
<< " BLOCK_VCN : " << cleanprint(fmver.vcn) << std::endl;
}

int display_gpu_info (void) {

Expand All @@ -191,8 +277,9 @@ int display_gpu_info (void) {
int32_t node_id;
int32_t gpu_id;
int32_t device_id;
char vbios_ver[1024];
fm_ver fmver;
};

char buff[1024];
int hip_num_gpu_devices;
std::string errmsg = " No supported GPUs available.";
Expand All @@ -203,6 +290,7 @@ int display_gpu_info (void) {
std::cout << std::endl << errmsg << std::endl;
return 0;
}
rsmi_init(0);
for (int i = 0; i < hip_num_gpu_devices; i++) {
hipDeviceProp_t props;
hipGetDeviceProperties(&props, i);
Expand Down Expand Up @@ -231,9 +319,17 @@ int display_gpu_info (void) {
info.node_id = node_id;
info.gpu_id = gpu_id;
info.device_id = dev_id;
auto ret = rsmi_dev_vbios_version_get(i, info.vbios_ver, 1024);// check returns TODO
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Check return value ?

info.fmver = {};
fill_firmware_versions(i, info.fmver);
gpu_info_list.push_back(info);

}
std::string rcm{ROCM_PATH};
if (rcm.find('/') != std::string::npos){
rcm = rcm.substr(rcm.find_last_of('/')+1);
manoj-freyr marked this conversation as resolved.
Show resolved Hide resolved
}
std::cout << rcm << " Running on " << getOSName() << std::endl;
manoj-freyr marked this conversation as resolved.
Show resolved Hide resolved
std::sort(gpu_info_list.begin(), gpu_info_list.end(),
[](const struct device_info& a, const struct device_info& b) {
return a.node_id < b.node_id; });
Expand All @@ -242,10 +338,14 @@ int display_gpu_info (void) {
for (const auto& info : gpu_info_list) {
std::cout << info.bus << " - GPU[" << std::setw(2) << info.node_id
<< " - " << std::setw(5) << info.gpu_id << "] " << info.name
<< " (Device " << info.device_id << ")\n";
<< " (Device " << info.device_id << ")" << "\n"
<<" VBIOS Version:" << std::string(info.vbios_ver) << "\n"
<< " FirmWare Versions are: \n";
print_fmversions(info.fmver);
}
} else {
std::cout << std::endl << errmsg << std::endl;
}
rsmi_shut_down();
return 0;
}