SWDEV-457337 - Fix header alignment

Change-Id: I9f25f6c4f0d00c76b66d13162f30be11368f5b59
Signed-off-by: Dalibor Stanisavljevic <Dalibor.Stanisavljevic@amd.com>
This commit is contained in:
Dalibor Stanisavljevic
2024-04-24 11:16:06 +02:00
والد 1cee1baac2
کامیت 7b2463abe0
24فایلهای تغییر یافته به همراه983 افزوده شده و 976 حذف شده
@@ -158,11 +158,11 @@ void TestFrequenciesRead::Run(void) {
PrintDeviceHeader(processor_handles_[i]);
freq_output(CLK_TYPE_MEM, "Supported GPU Memory");
freq_output(CLK_TYPE_SYS, "Supported GPU");
freq_output(CLK_TYPE_DF, "Data Fabric Clock");
freq_output(CLK_TYPE_DCEF, "Display Controller Engine Clock");
freq_output(CLK_TYPE_SOC, "SOC Clock");
freq_output(AMDSMI_CLK_TYPE_MEM, "Supported GPU Memory");
freq_output(AMDSMI_CLK_TYPE_SYS, "Supported GPU");
freq_output(AMDSMI_CLK_TYPE_DF, "Data Fabric Clock");
freq_output(AMDSMI_CLK_TYPE_DCEF, "Display Controller Engine Clock");
freq_output(AMDSMI_CLK_TYPE_SOC, "SOC Clock");
err = amdsmi_get_gpu_pci_bandwidth(processor_handles_[i], &b);
if (err == AMDSMI_STATUS_NOT_SUPPORTED) {
@@ -104,13 +104,13 @@ void TestFrequenciesReadWrite::Run(void) {
for (uint32_t dv_ind = 0; dv_ind < num_monitor_devs(); ++dv_ind) {
PrintDeviceHeader(processor_handles_[dv_ind]);
for (uint32_t clk = CLK_TYPE_FIRST; clk <= CLK_TYPE__MAX; ++clk) {
for (uint32_t clk = AMDSMI_CLK_TYPE_FIRST; clk <= AMDSMI_CLK_TYPE__MAX; ++clk) {
amdsmi_clk = (amdsmi_clk_type_t)clk;
auto freq_read = [&]() -> bool {
// Skip CLK_TYPE_PCIE, which does not supported in rocm-smi.
// Skip AMDSMI_CLK_TYPE_PCIE, which does not supported in rocm-smi.
std::cout << amdsmi_clk << std::endl;
if (amdsmi_clk == CLK_TYPE_PCIE)
if (amdsmi_clk == AMDSMI_CLK_TYPE_PCIE)
return false;
ret = amdsmi_get_clk_freq(processor_handles_[dv_ind], amdsmi_clk, &f);
std::cout << ret << std::endl;
@@ -139,8 +139,8 @@ void TestFrequenciesReadWrite::Run(void) {
auto freq_write = [&]() {
// Set clocks to something other than the usual default of the lowest
// frequency.
// Skip CLK_TYPE_PCIE, which does not supported in rocm-smi.
if (amdsmi_clk == CLK_TYPE_PCIE)
// Skip AMDSMI_CLK_TYPE_PCIE, which does not supported in rocm-smi.
if (amdsmi_clk == AMDSMI_CLK_TYPE_PCIE)
return;
freq_bitmask = 0b01100; // Try the 3rd and 4th clocks
@@ -155,7 +155,7 @@ void TestIdInfoRead::Run(void) {
std::cout << "\t**Device Vram vendor id: "
<< vram_info.vram_vendor << std::endl;
std::cout << "\t**Device Vram size: "
<< vram_info.vram_size_mb << std::endl;
<< vram_info.vram_size << std::endl;
}
err = amdsmi_get_gpu_vendor_name(processor_handles_[i], buffer, kBufferLen);
@@ -229,7 +229,7 @@ void TestMutualExclusion::Run(void) {
CHECK_RET(ret, AMDSMI_STATUS_BUSY);
ret = amdsmi_get_gpu_fan_speed_max(processor_handles_[0], 0, &dmy_ui64);
CHECK_RET(ret, AMDSMI_STATUS_BUSY);
ret = amdsmi_get_temp_metric(processor_handles_[0], TEMPERATURE_TYPE_EDGE, AMDSMI_TEMP_CURRENT, &dmy_i64);
ret = amdsmi_get_temp_metric(processor_handles_[0], AMDSMI_TEMPERATURE_TYPE_EDGE, AMDSMI_TEMP_CURRENT, &dmy_i64);
CHECK_RET(ret, AMDSMI_STATUS_BUSY);
ret = amdsmi_reset_gpu_fan(processor_handles_[0], 0);
CHECK_RET(ret, AMDSMI_STATUS_BUSY);
@@ -239,13 +239,13 @@ void TestMutualExclusion::Run(void) {
CHECK_RET(ret, AMDSMI_STATUS_BUSY);
ret = amdsmi_get_gpu_overdrive_level(processor_handles_[0], &dmy_ui32);
CHECK_RET(ret, AMDSMI_STATUS_BUSY);
ret = amdsmi_get_clk_freq(processor_handles_[0], CLK_TYPE_SYS, &dmy_freqs);
ret = amdsmi_get_clk_freq(processor_handles_[0], AMDSMI_CLK_TYPE_SYS, &dmy_freqs);
CHECK_RET(ret, AMDSMI_STATUS_BUSY);
ret = amdsmi_get_gpu_od_volt_info(processor_handles_[0], &dmy_od_volt);
CHECK_RET(ret, AMDSMI_STATUS_BUSY);
ret = amdsmi_get_gpu_od_volt_curve_regions(processor_handles_[0], &dmy_ui32, &dmy_vlt_reg);
CHECK_RET(ret, AMDSMI_STATUS_BUSY);
ret = amdsmi_set_clk_freq(processor_handles_[0], CLK_TYPE_SYS, 0);
ret = amdsmi_set_clk_freq(processor_handles_[0], AMDSMI_CLK_TYPE_SYS, 0);
CHECK_RET(ret, AMDSMI_STATUS_BUSY);
ret = amdsmi_get_gpu_ecc_count(processor_handles_[0], AMDSMI_GPU_BLOCK_UMC, &dmy_err_cnt);
CHECK_RET(ret, AMDSMI_STATUS_BUSY);
@@ -57,15 +57,15 @@
static const std::map<uint32_t, std::string> kTempSensorNameMap = {
{TEMPERATURE_TYPE_VRAM, "Memory"},
{TEMPERATURE_TYPE_HOTSPOT, "Hotspot"},
{TEMPERATURE_TYPE_JUNCTION, "Junction"},
{TEMPERATURE_TYPE_EDGE, "Edge"},
{TEMPERATURE_TYPE_HBM_0, "HBM_0"},
{TEMPERATURE_TYPE_HBM_1, "HBM_1"},
{TEMPERATURE_TYPE_HBM_2, "HBM_2"},
{TEMPERATURE_TYPE_HBM_3, "HBM_3"},
{TEMPERATURE_TYPE_PLX, "PLX"}
{AMDSMI_TEMPERATURE_TYPE_VRAM, "Memory"},
{AMDSMI_TEMPERATURE_TYPE_HOTSPOT, "Hotspot"},
{AMDSMI_TEMPERATURE_TYPE_JUNCTION, "Junction"},
{AMDSMI_TEMPERATURE_TYPE_EDGE, "Edge"},
{AMDSMI_TEMPERATURE_TYPE_HBM_0, "HBM_0"},
{AMDSMI_TEMPERATURE_TYPE_HBM_1, "HBM_1"},
{AMDSMI_TEMPERATURE_TYPE_HBM_2, "HBM_2"},
{AMDSMI_TEMPERATURE_TYPE_HBM_3, "HBM_3"},
{AMDSMI_TEMPERATURE_TYPE_PLX, "PLX"}
};
TestTempRead::TestTempRead() : TestBase() {
set_title("AMDSMI Temp Read Test");
@@ -141,7 +141,7 @@ void TestTempRead::Run(void) {
"C" << std::endl;
}
};
for (type = TEMPERATURE_TYPE_FIRST; type <= TEMPERATURE_TYPE__MAX; ++type) {
for (type = AMDSMI_TEMPERATURE_TYPE_FIRST; type <= AMDSMI_TEMPERATURE_TYPE__MAX; ++type) {
IF_VERB(STANDARD) {
std::cout << "\t** **********" << kTempSensorNameMap.at(type) <<
" Temperatures **********" << std::endl;
@@ -220,19 +220,19 @@ const std::string GetVoltSensorNameStr(amdsmi_voltage_type_t st) {
return kVoltSensorNameMap.at(st);
}
const char *FreqEnumToStr(amdsmi_clk_type_t amdsmi_clk) {
static_assert(CLK_TYPE__MAX == CLK_TYPE_DCLK1,
static_assert(AMDSMI_CLK_TYPE__MAX == AMDSMI_CLK_TYPE_DCLK1,
"FreqEnumToStr() needs to be updated");
switch (amdsmi_clk) {
case CLK_TYPE_SYS: return "System clock";
case CLK_TYPE_DF: return "Data Fabric clock";
case CLK_TYPE_DCEF: return "Display Controller Engine clock";
case CLK_TYPE_SOC: return "SOC clock";
case CLK_TYPE_MEM: return "Memory clock";
case CLK_TYPE_PCIE: return "PCIE clock";
case CLK_TYPE_VCLK0: return "VCLK0 clock";
case CLK_TYPE_VCLK1: return "VCLK1 clock";
case CLK_TYPE_DCLK0: return "DCLK0 clock";
case CLK_TYPE_DCLK1: return "DCLK1 clock";
case AMDSMI_CLK_TYPE_SYS: return "System clock";
case AMDSMI_CLK_TYPE_DF: return "Data Fabric clock";
case AMDSMI_CLK_TYPE_DCEF: return "Display Controller Engine clock";
case AMDSMI_CLK_TYPE_SOC: return "SOC clock";
case AMDSMI_CLK_TYPE_MEM: return "Memory clock";
case AMDSMI_CLK_TYPE_PCIE: return "PCIE clock";
case AMDSMI_CLK_TYPE_VCLK0: return "VCLK0 clock";
case AMDSMI_CLK_TYPE_VCLK1: return "VCLK1 clock";
case AMDSMI_CLK_TYPE_DCLK0: return "DCLK0 clock";
case AMDSMI_CLK_TYPE_DCLK1: return "DCLK1 clock";
default: return "Invalid Clock ID";
}
}
@@ -49,28 +49,28 @@
#include "test_utils.h"
static const std::map<amdsmi_fw_block_t, const char *> kDevFWNameMap = {
{FW_ID_ASD, "asd"},
{FW_ID_CP_CE, "ce"},
{FW_ID_DMCU_ERAM, "dmcu"}, // TODO(bliu): double check
{FW_ID_MC, "mc"},
{FW_ID_CP_ME, "me"},
{FW_ID_CP_MEC1, "mec1"},
{FW_ID_CP_MEC2, "mec2"},
{FW_ID_CP_MES, "mes"},
{FW_ID_MES_KIQ, "mes_kiq"}, // TODO: double check
{FW_ID_CP_PFP, "pfp"},
{FW_ID_RLC, "rlc"},
{FW_ID_RLC_SRLG, "rlc_srlg"},
{FW_ID_RLC_SRLS, "rlc_srls"},
{FW_ID_SDMA1, "sdma1"},
{FW_ID_SDMA2, "sdma2"},
{FW_ID_PM, "pm"},
{FW_ID_PSP_SOSDRV, "sos"},
{FW_ID_TA_RAS, "ta_ras"},
{FW_ID_TA_XGMI, "ta_xgmi"},
{FW_ID_UVD, "uvd"},
{FW_ID_VCE, "vce"},
{FW_ID_VCN, "vcn"},
{AMDSMI_FW_ID_ASD, "asd"},
{AMDSMI_FW_ID_CP_CE, "ce"},
{AMDSMI_FW_ID_DMCU_ERAM, "dmcu"}, // TODO(bliu): double check
{AMDSMI_FW_ID_MC, "mc"},
{AMDSMI_FW_ID_CP_ME, "me"},
{AMDSMI_FW_ID_CP_MEC1, "mec1"},
{AMDSMI_FW_ID_CP_MEC2, "mec2"},
{AMDSMI_FW_ID_CP_MES, "mes"},
{AMDSMI_FW_ID_MES_KIQ, "mes_kiq"}, // TODO: double check
{AMDSMI_FW_ID_CP_PFP, "pfp"},
{AMDSMI_FW_ID_RLC, "rlc"},
{AMDSMI_FW_ID_RLC_SRLG, "rlc_srlg"},
{AMDSMI_FW_ID_RLC_SRLS, "rlc_srls"},
{AMDSMI_FW_ID_SDMA1, "sdma1"},
{AMDSMI_FW_ID_SDMA2, "sdma2"},
{AMDSMI_FW_ID_PM, "pm"},
{AMDSMI_FW_ID_PSP_SOSDRV, "sos"},
{AMDSMI_FW_ID_TA_RAS, "ta_ras"},
{AMDSMI_FW_ID_TA_XGMI, "ta_xgmi"},
{AMDSMI_FW_ID_UVD, "uvd"},
{AMDSMI_FW_ID_VCE, "vce"},
{AMDSMI_FW_ID_VCN, "vcn"},
};
const char *