Renamed API amdsmi_dev_get_od_volt_info
to amdsmi_get_gpu_od_volt_info
grep -rli 'amdsmi_dev_get_od_volt_info' * | xargs -i@ sed -i
's/amdsmi_dev_get_od_volt_info/amdsmi_get_gpu_od_volt_info/g' @
Change-Id: Icd8658509b28523b7c04f8d2c53efb82689e294b
[ROCm/amdsmi commit: 2bd94db02c]
This commit is contained in:
committed by
Naveen Krishna Chatradhi
parent
6229bac89b
commit
cd81fa970d
@@ -2271,7 +2271,7 @@ amdsmi_status_t amdsmi_reset_gpu(amdsmi_processor_handle processor_handle);
|
||||
*
|
||||
* @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail
|
||||
*/
|
||||
amdsmi_status_t amdsmi_dev_get_od_volt_info(amdsmi_processor_handle processor_handle,
|
||||
amdsmi_status_t amdsmi_get_gpu_od_volt_info(amdsmi_processor_handle processor_handle,
|
||||
amdsmi_od_volt_freq_data_t *odv);
|
||||
|
||||
/**
|
||||
@@ -2374,7 +2374,7 @@ amdsmi_status_t amdsmi_dev_set_od_volt_info(amdsmi_processor_handle processor_h
|
||||
* be written to @p buffer in @p num_regions.
|
||||
*
|
||||
* The number of regions to expect this function provide (@p num_regions) can
|
||||
* be obtained by calling :: amdsmi_dev_get_od_volt_info().
|
||||
* be obtained by calling :: amdsmi_get_gpu_od_volt_info().
|
||||
*
|
||||
* @param[in] processor_handle a processor handle
|
||||
*
|
||||
|
||||
@@ -2071,7 +2071,7 @@ try:
|
||||
except AmdSmiException as e:
|
||||
print(e)
|
||||
```
|
||||
## amdsmi_dev_get_od_volt_info
|
||||
## amdsmi_get_gpu_od_volt_info
|
||||
Description: This function retrieves the voltage/frequency curve information
|
||||
|
||||
Input parameters:
|
||||
@@ -2089,7 +2089,7 @@ Field | Description
|
||||
`num_regions`| The current frequency index
|
||||
|
||||
|
||||
Exceptions that can be thrown by ` amdsmi_dev_get_od_volt_info` function:
|
||||
Exceptions that can be thrown by ` amdsmi_get_gpu_od_volt_info` function:
|
||||
* `AmdSmiLibraryException`
|
||||
* `AmdSmiRetryException`
|
||||
* `AmdSmiParameterException`
|
||||
@@ -2102,7 +2102,7 @@ try:
|
||||
print("No GPUs on machine")
|
||||
else:
|
||||
for device in devices:
|
||||
amdsmi_dev_get_od_volt_info(dev)
|
||||
amdsmi_get_gpu_od_volt_info(dev)
|
||||
except AmdSmiException as e:
|
||||
print(e)
|
||||
```
|
||||
|
||||
@@ -110,7 +110,7 @@ from .amdsmi_interface import amdsmi_get_gpu_perf_level
|
||||
from .amdsmi_interface import amdsmi_set_gpu_perf_determinism_mode
|
||||
from .amdsmi_interface import amdsmi_get_gpu_overdrive_level
|
||||
from .amdsmi_interface import amdsmi_get_clk_freq
|
||||
from .amdsmi_interface import amdsmi_dev_get_od_volt_info
|
||||
from .amdsmi_interface import amdsmi_get_gpu_od_volt_info
|
||||
from .amdsmi_interface import amdsmi_get_gpu_metrics_info
|
||||
from .amdsmi_interface import amdsmi_dev_get_od_volt_curve_regions
|
||||
from .amdsmi_interface import amdsmi_get_gpu_power_profile_presets
|
||||
|
||||
@@ -2309,7 +2309,7 @@ def amdsmi_get_clk_freq(
|
||||
}
|
||||
|
||||
|
||||
def amdsmi_dev_get_od_volt_info(
|
||||
def amdsmi_get_gpu_od_volt_info(
|
||||
processor_handle: amdsmi_wrapper.amdsmi_processor_handle,
|
||||
) -> Dict[str, Any]:
|
||||
if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle):
|
||||
@@ -2319,7 +2319,7 @@ def amdsmi_dev_get_od_volt_info(
|
||||
|
||||
freq_data = amdsmi_wrapper.amdsmi_od_volt_freq_data_t()
|
||||
_check_res(
|
||||
amdsmi_wrapper. amdsmi_dev_get_od_volt_info(
|
||||
amdsmi_wrapper. amdsmi_get_gpu_od_volt_info(
|
||||
processor_handle, ctypes.byref(freq_data)
|
||||
)
|
||||
)
|
||||
|
||||
@@ -1535,9 +1535,9 @@ amdsmi_get_clk_freq.argtypes = [amdsmi_processor_handle, amdsmi_clk_type_t, ctyp
|
||||
amdsmi_reset_gpu = _libraries['libamd_smi.so'].amdsmi_reset_gpu
|
||||
amdsmi_reset_gpu.restype = amdsmi_status_t
|
||||
amdsmi_reset_gpu.argtypes = [amdsmi_processor_handle]
|
||||
amdsmi_dev_get_od_volt_info = _libraries['libamd_smi.so'].amdsmi_dev_get_od_volt_info
|
||||
amdsmi_dev_get_od_volt_info.restype = amdsmi_status_t
|
||||
amdsmi_dev_get_od_volt_info.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_od_volt_freq_data_t)]
|
||||
amdsmi_get_gpu_od_volt_info = _libraries['libamd_smi.so'].amdsmi_get_gpu_od_volt_info
|
||||
amdsmi_get_gpu_od_volt_info.restype = amdsmi_status_t
|
||||
amdsmi_get_gpu_od_volt_info.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_od_volt_freq_data_t)]
|
||||
amdsmi_get_gpu_metrics_info = _libraries['libamd_smi.so'].amdsmi_get_gpu_metrics_info
|
||||
amdsmi_get_gpu_metrics_info.restype = amdsmi_status_t
|
||||
amdsmi_get_gpu_metrics_info.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_gpu_metrics_t)]
|
||||
@@ -1861,7 +1861,7 @@ __all__ = \
|
||||
'amdsmi_get_gpu_memory_reserved_pages',
|
||||
'amdsmi_get_gpu_memory_total', 'amdsmi_get_gpu_memory_usage',
|
||||
'amdsmi_dev_get_od_volt_curve_regions',
|
||||
'amdsmi_dev_get_od_volt_info', 'amdsmi_get_gpu_overdrive_level',
|
||||
'amdsmi_get_gpu_od_volt_info', 'amdsmi_get_gpu_overdrive_level',
|
||||
'amdsmi_get_gpu_pci_bandwidth', 'amdsmi_get_gpu_pci_id',
|
||||
'amdsmi_get_gpu_pci_replay_counter',
|
||||
'amdsmi_get_gpu_pci_throughput', 'amdsmi_get_gpu_perf_level',
|
||||
|
||||
@@ -315,7 +315,7 @@ class Formatter:
|
||||
| """ + self.style.text("26 Set perf determinism mode. Api: amdsmi_set_gpu_perf_determinism_mode <bdf><clock_value>") + """ |
|
||||
| """ + self.style.text("27 Get device overdrive level. Api: amdsmi_get_gpu_overdrive_level <bdf>") + """ |
|
||||
| """ + self.style.text("28 Get device gpu clk freq. Api: amdsmi_get_clk_freq <bdf>") + """ |
|
||||
| """ + self.style.text("29 Get device od volt. Api: amdsmi_dev_get_od_volt_info <bdf>") + """ |
|
||||
| """ + self.style.text("29 Get device od volt. Api: amdsmi_get_gpu_od_volt_info <bdf>") + """ |
|
||||
| """ + self.style.text("30 Get device gpu metrics. Api: amdsmi_get_gpu_metrics_info <bdf>") + """ |
|
||||
| """ + self.style.text("31 Get device od volt curve regions. Api: amdsmi_dev_get_od_volt_curve_regions <bdf><num_regions>") + """ |
|
||||
| """ + self.style.text("32 Get device power profile presets. Api: amdsmi_get_gpu_power_profile_presets <bdf><sensor_idx>") + """ |
|
||||
@@ -811,7 +811,7 @@ commands = {
|
||||
28: [amdsmi_tool_dev_gpu_clk_freq_get, {
|
||||
"device_identifier1": [None, True]
|
||||
}],
|
||||
29: [smi_api. amdsmi_dev_get_od_volt_info, {
|
||||
29: [smi_api. amdsmi_get_gpu_od_volt_info, {
|
||||
"device_identifier1": [None, True]
|
||||
}],
|
||||
30: [smi_api. amdsmi_get_gpu_metrics_info, {
|
||||
|
||||
@@ -918,7 +918,7 @@ amdsmi_get_func_iter_value(amdsmi_func_id_iter_handle_t handle,
|
||||
{"rsmi_perf_determinism_mode_set", "amdsmi_set_gpu_perf_determinism_mode"},
|
||||
{"rsmi_dev_overdrive_level_set", " amdsmi_dev_set_overdrive_level"},
|
||||
{"rsmi_dev_vbios_version_get", "amdsmi_get_gpu_vbios_info"},
|
||||
{"rsmi_dev_od_volt_info_get", " amdsmi_dev_get_od_volt_info"},
|
||||
{"rsmi_dev_od_volt_info_get", " amdsmi_get_gpu_od_volt_info"},
|
||||
{"rsmi_dev_od_volt_info_set", " amdsmi_dev_set_od_volt_info"},
|
||||
{"rsmi_dev_od_volt_curve_regions_get", " amdsmi_dev_get_od_volt_curve_regions"},
|
||||
{"rsmi_dev_ecc_enabled_get", " amdsmi_dev_get_gpu_ecc_enabled"},
|
||||
@@ -1302,7 +1302,7 @@ amdsmi_status_t amdsmi_get_gpu_pci_throughput(
|
||||
sent, received, max_pkt_sz);
|
||||
}
|
||||
|
||||
amdsmi_status_t amdsmi_dev_get_od_volt_info(amdsmi_processor_handle processor_handle,
|
||||
amdsmi_status_t amdsmi_get_gpu_od_volt_info(amdsmi_processor_handle processor_handle,
|
||||
amdsmi_od_volt_freq_data_t *odv) {
|
||||
return rsmi_wrapper(rsmi_dev_od_volt_info_get, processor_handle,
|
||||
reinterpret_cast<rsmi_od_volt_freq_data_t*>(odv));
|
||||
|
||||
@@ -241,7 +241,7 @@ void TestMutualExclusion::Run(void) {
|
||||
CHECK_RET(ret, AMDSMI_STATUS_BUSY);
|
||||
ret = amdsmi_get_clk_freq(processor_handles_[0], CLK_TYPE_SYS, &dmy_freqs);
|
||||
CHECK_RET(ret, AMDSMI_STATUS_BUSY);
|
||||
ret = amdsmi_dev_get_od_volt_info(processor_handles_[0], &dmy_od_volt);
|
||||
ret = amdsmi_get_gpu_od_volt_info(processor_handles_[0], &dmy_od_volt);
|
||||
CHECK_RET(ret, AMDSMI_STATUS_BUSY);
|
||||
ret = amdsmi_dev_get_od_volt_curve_regions(processor_handles_[0], &dmy_ui32, &dmy_vlt_reg);
|
||||
CHECK_RET(ret, AMDSMI_STATUS_BUSY);
|
||||
@@ -279,7 +279,7 @@ void TestMutualExclusion::Run(void) {
|
||||
amdsmi_reset_gpu_fan
|
||||
amdsmi_set_gpu_fan_speed
|
||||
amdsmi_get_gpu_fan_speed_max
|
||||
amdsmi_dev_get_od_volt_info
|
||||
amdsmi_get_gpu_od_volt_info
|
||||
amdsmi_get_gpu_metrics_info
|
||||
amdsmi_dev_get_od_volt_curve_regions
|
||||
amdsmi_dev_power_max_get
|
||||
|
||||
@@ -103,7 +103,7 @@ void TestPerfDeterminism::Run(void) {
|
||||
|
||||
for (uint32_t i = 0; i < num_monitor_devs(); ++i) {
|
||||
PrintDeviceHeader(processor_handles_[i]);
|
||||
err = amdsmi_dev_get_od_volt_info(processor_handles_[i], &odv);
|
||||
err = amdsmi_get_gpu_od_volt_info(processor_handles_[i], &odv);
|
||||
if (err == AMDSMI_STATUS_NOT_SUPPORTED) {
|
||||
IF_VERB(STANDARD) {
|
||||
std::cout << "\t** Not supported on this machine" << std::endl;
|
||||
|
||||
@@ -157,20 +157,20 @@ void TestVoltCurvRead::Run(void) {
|
||||
for (uint32_t i = 0; i < num_monitor_devs(); ++i) {
|
||||
PrintDeviceHeader(processor_handles_[i]);
|
||||
|
||||
err = amdsmi_dev_get_od_volt_info(processor_handles_[i], &odv);
|
||||
err = amdsmi_get_gpu_od_volt_info(processor_handles_[i], &odv);
|
||||
if (err == AMDSMI_STATUS_NOT_SUPPORTED) {
|
||||
IF_VERB(STANDARD) {
|
||||
std::cout <<
|
||||
"\t** amdsmi_dev_get_od_volt_info: Not supported on this machine"
|
||||
"\t** amdsmi_get_gpu_od_volt_info: Not supported on this machine"
|
||||
<< std::endl;
|
||||
}
|
||||
// Verify api support checking functionality is working
|
||||
err = amdsmi_dev_get_od_volt_info(processor_handles_[i], nullptr);
|
||||
err = amdsmi_get_gpu_od_volt_info(processor_handles_[i], nullptr);
|
||||
ASSERT_EQ(err, AMDSMI_STATUS_NOT_SUPPORTED);
|
||||
} else {
|
||||
CHK_ERR_ASRT(err)
|
||||
// Verify api support checking functionality is working
|
||||
err = amdsmi_dev_get_od_volt_info(processor_handles_[i], nullptr);
|
||||
err = amdsmi_get_gpu_od_volt_info(processor_handles_[i], nullptr);
|
||||
ASSERT_EQ(err, AMDSMI_STATUS_INVAL);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user