AI/rocm-systems
2
0
Garpu 0
Kode Masalah Tarik Permintaan Actions Packages Projects Rilis Wiki Kegiatan

Use "_t" suffix consistently for RSMI types

Telusuri Sumber
This commit is contained in:
Chris Freehill
2019-03-02 16:30:30 -06:00
orang tua fb5f41fc10
melakukan bc0d801478
16 mengubah file dengan 212 tambahan dan 161 penghapusan
Download Patch File Download Diff File Expand all files Collapse all files
tests/rocm_smi_test/functional/err_cnt_read.cc
+3 -3
Melihat File
@@ -93,17 +93,17 @@ void TestErrCntRead::Run(void) {
PrintDeviceHeader(i);
for (uint32_t b = RSMI_GPU_BLOCK_FIRST; b <= RSMI_GPU_BLOCK_LAST; ++b) {
err = rsmi_dev_error_count_get(i, static_cast<rsmi_gpu_block>(b), &ec);
err = rsmi_dev_error_count_get(i, static_cast<rsmi_gpu_block_t>(b), &ec);
if (err == RSMI_STATUS_NOT_SUPPORTED) {
std::cout << "\t**Error Count for " <<
GetBlockNameStr(static_cast<rsmi_gpu_block>(b)) <<
GetBlockNameStr(static_cast<rsmi_gpu_block_t>(b)) <<
": Not supported on this machine" << std::endl;
} else {
CHK_ERR_ASRT(err)
IF_VERB(STANDARD) {
std::cout << "\t**Error counts for " <<
GetBlockNameStr(static_cast<rsmi_gpu_block>(b)) << " block: "
GetBlockNameStr(static_cast<rsmi_gpu_block_t>(b)) << " block: "
<< std::endl;
std::cout << "\t\tCorrectable errors: " << ec.correctable_err
<< std::endl;
tests/rocm_smi_test/functional/frequencies_read.cc
+3 -3
Melihat File
@@ -85,7 +85,7 @@ void TestFrequenciesRead::Close() {
}
static void print_frequencies(rsmi_frequencies *f, uint32_t *l = nullptr) {
static void print_frequencies(rsmi_frequencies_t *f, uint32_t *l = nullptr) {
assert(f != nullptr);
for (uint32_t j = 0; j < f->num_supported; ++j) {
std::cout << "\t** " << j << ": " << f->frequency[j];
@@ -104,8 +104,8 @@ static void print_frequencies(rsmi_frequencies *f, uint32_t *l = nullptr) {
void TestFrequenciesRead::Run(void) {
rsmi_status_t err;
rsmi_frequencies f;
rsmi_pcie_bandwidth b;
rsmi_frequencies_t f;
rsmi_pcie_bandwidth_t b;
TestBase::Run();
tests/rocm_smi_test/functional/frequencies_read_write.cc
+1 -1
Melihat File
@@ -91,7 +91,7 @@ void TestFrequenciesReadWrite::Close() {
void TestFrequenciesReadWrite::Run(void) {
rsmi_status_t ret;
rsmi_frequencies f;
rsmi_frequencies_t f;
uint32_t freq_bitmask;
rsmi_clk_type rsmi_clk;
tests/rocm_smi_test/functional/pci_read_write.cc
+1 -1
Melihat File
@@ -87,7 +87,7 @@ void TestPciReadWrite::Close() {
void TestPciReadWrite::Run(void) {
rsmi_status_t ret;
rsmi_pcie_bandwidth bw;
rsmi_pcie_bandwidth_t bw;
uint32_t freq_bitmask;
uint64_t sent, received, max_pkt_sz;
tests/rocm_smi_test/functional/perf_level_read.cc
+1 -1
Melihat File
@@ -87,7 +87,7 @@ void TestPerfLevelRead::Close() {
void TestPerfLevelRead::Run(void) {
rsmi_status_t err;
rsmi_dev_perf_level pfl;
rsmi_dev_perf_level_t pfl;
TestBase::Run();
tests/rocm_smi_test/functional/perf_level_read_write.cc
+4 -4
Melihat File
@@ -54,7 +54,7 @@
#include "rocm_smi_test/functional/perf_level_read_write.h"
#include "rocm_smi_test/test_common.h"
static const std::map<rsmi_dev_perf_level, const char *> kDevPerfLvlNameMap = {
static const std::map<rsmi_dev_perf_level_t, const char *> kDevPerfLvlNameMap = {
{RSMI_DEV_PERF_LEVEL_AUTO, "RSMI_DEV_PERF_LEVEL_AUTO"},
{RSMI_DEV_PERF_LEVEL_LOW, "RSMI_DEV_PERF_LEVEL_LOW"},
{RSMI_DEV_PERF_LEVEL_HIGH, "RSMI_DEV_PERF_LEVEL_HIGH"},
@@ -102,7 +102,7 @@ void TestPerfLevelReadWrite::Close() {
void TestPerfLevelReadWrite::Run(void) {
rsmi_status_t ret;
rsmi_dev_perf_level pfl, orig_pfl;
rsmi_dev_perf_level_t pfl, orig_pfl;
TestBase::Run();
@@ -125,11 +125,11 @@ void TestPerfLevelReadWrite::Run(void) {
IF_VERB(STANDARD) {
std::cout << "Set Performance Level to " <<
kDevPerfLvlNameMap.at(static_cast<rsmi_dev_perf_level>(pfl_i)) <<
kDevPerfLvlNameMap.at(static_cast<rsmi_dev_perf_level_t>(pfl_i)) <<
" ..." << std::endl;
}
ret = rsmi_dev_perf_level_set(dv_ind,
static_cast<rsmi_dev_perf_level>(pfl_i));
static_cast<rsmi_dev_perf_level_t>(pfl_i));
CHK_ERR_ASRT(ret)
ret = rsmi_dev_perf_level_get(dv_ind, &pfl);
CHK_ERR_ASRT(ret)
tests/rocm_smi_test/functional/power_read_write.cc
+7 -7
Melihat File
@@ -88,7 +88,7 @@ void TestPowerReadWrite::Close() {
}
static const char *
power_profile_string(rsmi_power_profile_preset_masks profile) {
power_profile_string(rsmi_power_profile_preset_masks_t profile) {
switch (profile) {
case RSMI_PWR_PROF_PRST_CUSTOM_MASK:
return "CUSTOM";
@@ -111,7 +111,7 @@ power_profile_string(rsmi_power_profile_preset_masks profile) {
void TestPowerReadWrite::Run(void) {
rsmi_status_t ret;
rsmi_power_profile_status status;
rsmi_power_profile_status_t status;
TestBase::Run();
@@ -127,7 +127,7 @@ void TestPowerReadWrite::Run(void) {
while (tmp <= RSMI_PWR_PROF_PRST_LAST) {
if ((tmp & status.available_profiles) == tmp) {
std::cout << "\t" <<
power_profile_string((rsmi_power_profile_preset_masks)tmp) <<
power_profile_string((rsmi_power_profile_preset_masks_t)tmp) <<
std::endl;
}
tmp = tmp << 1;
@@ -136,11 +136,11 @@ void TestPowerReadWrite::Run(void) {
power_profile_string(status.current) << std::endl;
}
rsmi_power_profile_preset_masks orig_profile = status.current;
rsmi_power_profile_preset_masks_t orig_profile = status.current;
// Try setting the profile to a different power profile
rsmi_bit_field diff_profiles;
rsmi_power_profile_preset_masks new_prof;
rsmi_bit_field_t diff_profiles;
rsmi_power_profile_preset_masks_t new_prof;
diff_profiles = status.available_profiles & (~status.current);
if (diff_profiles & RSMI_PWR_PROF_PRST_COMPUTE_MASK) {
@@ -162,7 +162,7 @@ void TestPowerReadWrite::Run(void) {
ret = rsmi_dev_power_profile_set(dv_ind, 0, new_prof);
CHK_ERR_ASRT(ret)
rsmi_dev_perf_level pfl;
rsmi_dev_perf_level_t pfl;
ret = rsmi_dev_perf_level_get(dv_ind, &pfl);
CHK_ERR_ASRT(ret)
ASSERT_EQ(pfl, RSMI_DEV_PERF_LEVEL_MANUAL);
tests/rocm_smi_test/functional/sys_info_read.cc
+1 -1
Melihat File
@@ -89,7 +89,7 @@ void TestSysInfoRead::Run(void) {
rsmi_status_t err;
uint64_t val_ui64;
char buffer[80];
rsmi_version ver = {0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, nullptr};
rsmi_version_t ver = {0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, nullptr};
TestBase::Run();
tests/rocm_smi_test/functional/temp_read.cc
+1 -1
Melihat File
@@ -94,7 +94,7 @@ void TestTempRead::Run(void) {
for (uint32_t i = 0; i < num_monitor_devs(); ++i) {
PrintDeviceHeader(i);
auto print_temp_metric = [&](rsmi_temperature_metric met,
auto print_temp_metric = [&](rsmi_temperature_metric_t met,
std::string label) {
err = rsmi_dev_temp_metric_get(i, 0, met, &val_i64);
tests/rocm_smi_test/functional/version_read.cc
+1 -1
Melihat File
@@ -86,7 +86,7 @@ void TestVersionRead::Close() {
void TestVersionRead::Run(void) {
rsmi_status_t err;
rsmi_version ver = {0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, nullptr};
rsmi_version_t ver = {0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, nullptr};
TestBase::Run();
tests/rocm_smi_test/functional/volt_freq_curv_read.cc
+8 -8
Melihat File
@@ -100,7 +100,7 @@ static void pt_rng_mV(std::string title, rsmi_range *r) {
" mV" << std::endl;
}
static void print_pnt(rsmi_od_vddc_point *pt) {
static void print_pnt(rsmi_od_vddc_point_t *pt) {
std::cout << "\t\t** Frequency: " << pt->frequency/1000000 << "MHz" <<
std::endl;
std::cout << "\t\t** Voltage: " << pt->voltage << "mV" << std::endl;
@@ -113,7 +113,7 @@ static void pt_vddc_curve(rsmi_od_volt_curve *c) {
}
}
static void print_rsmi_od_volt_freq_data(rsmi_od_volt_freq_data *odv) {
static void print_rsmi_od_volt_freq_data_t(rsmi_od_volt_freq_data_t *odv) {
assert(odv != nullptr);
std::cout.setf(std::ios::dec, std::ios::basefield);
@@ -131,13 +131,13 @@ static void print_rsmi_od_volt_freq_data(rsmi_od_volt_freq_data *odv) {
odv->num_regions << std::endl;
}
static void print_odv_region(rsmi_freq_volt_region *region) {
static void print_odv_region(rsmi_freq_volt_region_t *region) {
pt_rng_Mhz("\t\tFrequency range:", &region->freq_range);
pt_rng_mV("\t\tVoltage range:", &region->volt_range);
}
static void print_rsmi_od_volt_freq_regions(uint32_t num_regions,
rsmi_freq_volt_region *regions) {
rsmi_freq_volt_region_t *regions) {
for (uint32_t i = 0; i < num_regions; ++i) {
std::cout << "\tRegion " << i << ":" << std::endl;
print_odv_region(&regions[i]);
@@ -146,7 +146,7 @@ static void print_rsmi_od_volt_freq_regions(uint32_t num_regions,
void TestVoltCurvRead::Run(void) {
rsmi_status_t err;
rsmi_od_volt_freq_data odv;
rsmi_od_volt_freq_data_t odv;
TestBase::Run();
@@ -167,11 +167,11 @@ void TestVoltCurvRead::Run(void) {
if (err == RSMI_STATUS_SUCCESS) {
std::cout << "\t**Frequency-voltage curve data:" << std::endl;
print_rsmi_od_volt_freq_data(&odv);
print_rsmi_od_volt_freq_data_t(&odv);
rsmi_freq_volt_region *regions;
rsmi_freq_volt_region_t *regions;
uint32_t num_regions;
regions = new rsmi_freq_volt_region[odv.num_regions];
regions = new rsmi_freq_volt_region_t[odv.num_regions];
ASSERT_TRUE(regions != nullptr);
num_regions = odv.num_regions;