SWDEV-375271 - Renamed AmdSmiClockType to AmdSmiClkType

Change-Id: I6af34f7c4701584357ae5ec1315fbc425f2a9f82


[ROCm/amdsmi commit: 9d345c5797]
Dieser Commit ist enthalten in:
Dalibor Stanisavljevic
2022-12-28 12:55:15 +01:00
Ursprung 5844ac7c28
Commit 3f6ba87ef1
4 geänderte Dateien mit 33 neuen und 33 gelöschten Zeilen
+11 -11
Datei anzeigen
@@ -663,7 +663,7 @@ Description: Returns the clock measure for the given GPU
Input parameters:
* `device_handle` device which to query
* `clock_type` one of `AmdSmiClockType` enum values:
* `clock_type` one of `AmdSmiClkType` enum values:
Field | Description
---|---
@@ -701,7 +701,7 @@ try:
print("No GPUs on machine")
else:
for device in devices:
clock_measure = amdsmi_get_clock_measure(device, AmdSmiClockType.GFX)
clock_measure = amdsmi_get_clock_measure(device, AmdSmiClkType.GFX)
print(clock_measure['cur_clk'])
print(clock_measure['avg_clk'])
print(clock_measure['min_clk'])
@@ -901,7 +901,7 @@ Description: Returns the supported frequency target range for the given GPU
Input parameters:
* `device_handle` device which to query
* `clock_type` one of `AmdSmiClockType` enum values:
* `clock_type` one of `AmdSmiClkType` enum values:
Field | Description
---|---
@@ -941,21 +941,21 @@ try:
for device in devices:
print("=============== GFX DOMAIN ================")
freq_range = amdsmi_get_target_frequency_range(device,
AmdSmiClockType.GFX)
AmdSmiClkType.GFX)
print(freq_range['supported_upper_bound'])
print(freq_range['supported_lower_bound'])
print(freq_range['current_upper_bound'])
print(freq_range['current_lower_bound'])
print("=============== MEM DOMAIN ================")
freq_range = amdsmi_get_target_frequency_range(device,
AmdSmiClockType.MEM)
AmdSmiClkType.MEM)
print(freq_range['supported_upper_bound'])
print(freq_range['supported_lower_bound'])
print(freq_range['current_upper_bound'])
print(freq_range['current_lower_bound'])
print("=============== VCLK0 DOMAIN ================")
freq_range = amdsmi_get_target_frequency_range(device,
AmdSmiClockType.VCLK0)
AmdSmiClkType.VCLK0)
print(freq_range['supported_upper_bound'])
print(freq_range['supported_lower_bound'])
print(freq_range['current_upper_bound'])
@@ -1461,7 +1461,7 @@ try:
print("No GPUs on machine")
else:
for device in devices:
amdsmi_dev_set_clk_range(device, 0, 1000, AmdSmiClockType.AMDSMI_CLK_TYPE_SYS)
amdsmi_dev_set_clk_range(device, 0, 1000, AmdSmiClkType.AMDSMI_CLK_TYPE_SYS)
except AmdSmiException as e:
print(e)
```
@@ -1774,7 +1774,7 @@ try:
device,
AmdSmiFreqInd.AMDSMI_FREQ_IND_MAX,
1000,
AmdSmiClockType.AMDSMI_CLK_TYPE_SYS
AmdSmiClkType.AMDSMI_CLK_TYPE_SYS
)
except AmdSmiException as e:
print(e)
@@ -2221,7 +2221,7 @@ try:
print("No GPUs on machine")
else:
for device in devices:
amdsmi_dev_get_gpu_clk_freq(device, AmdSmiClockType.SYS)
amdsmi_dev_get_gpu_clk_freq(device, AmdSmiClkType.SYS)
except AmdSmiException as e:
print(e)
```
@@ -2705,7 +2705,7 @@ specified clock
Input parameters:
* `device_handle` handle for the given device
* `clk_type` the type of clock for which the set of frequencies will be modified
as AmdSmiClockType
as AmdSmiClkType
* `freq_bitmask` bitmask indicating the indices of the frequencies that are to
be enabled (1) and disabled (0). Only the lowest ::amdsmi_frequencies_t.num_supported
bits of this mask are relevant.
@@ -2726,7 +2726,7 @@ try:
else:
for device in devices:
freq_bitmask = 0
amdsmi_dev_set_clk_freq(device, AmdSmiClockType.GFX, freq_bitmask)
amdsmi_dev_set_clk_freq(device, AmdSmiClkType.GFX, freq_bitmask)
except AmdSmiException as e:
print(e)
```
+1 -1
Datei anzeigen
@@ -186,7 +186,7 @@ from .amdsmi_interface import AmdSmiContainerTypes
from .amdsmi_interface import AmdSmiDeviceType
from .amdsmi_interface import AmdSmiMmIp
from .amdsmi_interface import AmdSmiFWBlock
from .amdsmi_interface import AmdSmiClockType
from .amdsmi_interface import AmdSmiClkType
from .amdsmi_interface import AmdSmiTemperatureType
from .amdsmi_interface import AmdSmiDevPerfLevel
from .amdsmi_interface import AmdSmiSwComponent
@@ -104,7 +104,7 @@ class AmdSmiFWBlock(IntEnum):
FW_ID_DMCU = amdsmi_wrapper.FW_ID_DMCU
class AmdSmiClockType(IntEnum):
class AmdSmiClkType(IntEnum):
SYS = amdsmi_wrapper.CLK_TYPE_SYS
GFX = amdsmi_wrapper.CLK_TYPE_GFX
DF = amdsmi_wrapper.CLK_TYPE_DF
@@ -746,8 +746,8 @@ def amdsmi_get_clock_measure(
raise AmdSmiParameterException(
device_handle, amdsmi_wrapper.amdsmi_device_handle
)
if not isinstance(clock_type, AmdSmiClockType):
raise AmdSmiParameterException(clock_type, AmdSmiClockType)
if not isinstance(clock_type, AmdSmiClkType):
raise AmdSmiParameterException(clock_type, AmdSmiClkType)
clock_measure = amdsmi_wrapper.amdsmi_clk_measure_t()
_check_res(
@@ -862,8 +862,8 @@ def amdsmi_get_target_frequency_range(
raise AmdSmiParameterException(
device_handle, amdsmi_wrapper.amdsmi_device_handle
)
if not isinstance(clock_type, AmdSmiClockType):
raise AmdSmiParameterException(clock_type, AmdSmiClockType)
if not isinstance(clock_type, AmdSmiClkType):
raise AmdSmiParameterException(clock_type, AmdSmiClkType)
freq_range = amdsmi_wrapper.amdsmi_frequency_range_t()
_check_res(
@@ -1653,14 +1653,14 @@ def amdsmi_dev_reset_fan(
def amdsmi_dev_set_clk_freq(
device_handle: amdsmi_wrapper.amdsmi_device_handle,
clk_type: AmdSmiClockType,
clk_type: AmdSmiClkType,
freq_bitmask: int,
):
if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle):
raise AmdSmiParameterException(
device_handle, amdsmi_wrapper.amdsmi_device_handle
)
if not isinstance(clk_type, AmdSmiClockType):
if not isinstance(clk_type, AmdSmiClkType):
raise AmdSmiParameterException(clk_type, AmdSmiParameterException)
if not isinstance(freq_bitmask, int):
raise AmdSmiParameterException(freq_bitmask, int)
@@ -2001,7 +2001,7 @@ def amdsmi_dev_set_clk_range(
device_handle: amdsmi_wrapper.amdsmi_device_handle,
min_clk_value: int,
max_clk_value: int,
clk_type: AmdSmiClockType,
clk_type: AmdSmiClkType,
) -> None:
if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle):
raise AmdSmiParameterException(
@@ -2014,8 +2014,8 @@ def amdsmi_dev_set_clk_range(
if not isinstance(max_clk_value, int):
raise AmdSmiParameterException(min_clk_value, int)
if not isinstance(clk_type, AmdSmiClockType):
raise AmdSmiParameterException(clk_type, AmdSmiClockType)
if not isinstance(clk_type, AmdSmiClkType):
raise AmdSmiParameterException(clk_type, AmdSmiClkType)
_check_res(
amdsmi_wrapper.amdsmi_dev_set_clk_range(
@@ -2052,7 +2052,7 @@ def amdsmi_dev_set_od_clk_info(
device_handle: amdsmi_wrapper.amdsmi_device_handle,
level: AmdSmiFreqInd,
value: int,
clk_type: AmdSmiClockType,
clk_type: AmdSmiClkType,
) -> None:
if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle):
raise AmdSmiParameterException(
@@ -2065,8 +2065,8 @@ def amdsmi_dev_set_od_clk_info(
if not isinstance(value, int):
raise AmdSmiParameterException(value, int)
if not isinstance(clk_type, AmdSmiClockType):
raise AmdSmiParameterException(clk_type, AmdSmiClockType)
if not isinstance(clk_type, AmdSmiClkType):
raise AmdSmiParameterException(clk_type, AmdSmiClkType)
_check_res(
amdsmi_wrapper. amdsmi_dev_set_od_clk_info(
@@ -2384,14 +2384,14 @@ def amdsmi_dev_get_overdrive_level(
def amdsmi_dev_get_gpu_clk_freq(
device_handle: amdsmi_wrapper.amdsmi_device_handle, clk_type: AmdSmiClockType
device_handle: amdsmi_wrapper.amdsmi_device_handle, clk_type: AmdSmiClkType
) -> Dict[str, Any]:
if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle):
raise AmdSmiParameterException(
device_handle, amdsmi_wrapper.amdsmi_device_handle
)
if not isinstance(clk_type, AmdSmiClockType):
raise AmdSmiParameterException(clk_type, AmdSmiClockType)
if not isinstance(clk_type, AmdSmiClkType):
raise AmdSmiParameterException(clk_type, AmdSmiClkType)
freq = amdsmi_wrapper.amdsmi_frequencies_t()
_check_res(
@@ -491,7 +491,7 @@ def amdsmi_tool_dev_pci_bandwidth_set(dev, dic):
def amdsmi_tool_dev_gpu_clk_freq_get(dev):
result = {}
for clock_type in smi_api.AmdSmiClockType:
for clock_type in smi_api.AmdSmiClkType:
try:
value = smi_api. amdsmi_dev_get_gpu_clk_freq(dev, clock_type)
result.update({clock_type.name: value})
@@ -618,7 +618,7 @@ def amdsmi_tool_dev_clk_range_set(dev, dic):
result = {}
min_clk = dic["min_clk"]
max_clk = dic["max_clk"]
for clock_type in smi_api.AmdSmiClockType:
for clock_type in smi_api.AmdSmiClkType:
try:
value = smi_api.amdsmi_dev_set_clk_range(dev, min_clk, max_clk, clock_type)
result.update({clock_type.name: value})
@@ -641,7 +641,7 @@ def amdsmi_tool_dev_counter_group_supported(dev):
def amdsmi_tool_dev_gpu_clk_freq_set(dev, dic):
result = {}
freq_bitmask = dic["freq_bitmask"]
for clock_type in smi_api.AmdSmiClockType:
for clock_type in smi_api.AmdSmiClkType:
try:
value = smi_api. amdsmi_dev_set_clk_freq(dev, clock_type, freq_bitmask)
result.update({clock_type.name: value})
@@ -654,10 +654,10 @@ def amdsmi_tool_dev_od_clk_info_set(dev, dic):
result = {}
value = dic["value"]
for freq_ind in smi_api.AmdSmiFreqInd:
for clock_type in smi_api.AmdSmiClockType:
for clock_type in smi_api.AmdSmiClkType:
try:
value = smi_api. amdsmi_dev_set_od_clk_info(dev, freq_ind, value, clock_type)
result.update({"AmdSmiFreqInd: " + freq_ind.name + ", AmdSmiClockType: " + clock_type.name: value})
result.update({"AmdSmiFreqInd: " + freq_ind.name + ", AmdSmiClkType: " + clock_type.name: value})
except smi_api.AmdSmiException as e:
print("{},{}:\t{}".format(freq_ind.name, clock_type.name, e))