Fixed amdsmi_get_utilization_count() wrapper generation

Signed-off-by: Maisam Arif <Maisam.Arif@amd.com>
Change-Id: Ifd59fca042c4b3b0fc53e100b6892c6b4f7b3e95

py-interface/README.md

@@ -1925,19 +1925,19 @@ except AmdSmiException as e:
 
 ### amdsmi_get_utilization_count
 
-Description: Get coarse grain utilization counter of the specified device
+Description: Get coarse/fine grain utilization counter of the specified device
 
 Input parameters:
 
 * `processor_handle` handle for the given device
-* `counter_types` variable number of counter types desired
+* `counter_types` List of AmdSmiUtilizationCounterType counters requested
 
 Output: List containing dictionaries with fields
 
 Field | Description
 ---|---
 `timestamp` | The timestamp when the counter is retreived - Resolution: 1 ns
-`Dictionary for each counter` | <table> <thead><tr><th> Subfield </th><th>Description</th></tr></thead><tbody><tr><td>`type`</td><td>Type of utilization counter</td></tr><tr><td>`value`</td><td>Value gotten for utilization counter</td></tr></tbody></table>
+`Dictionary for each counter` | <table> <thead><tr><th> Subfield </th><th>Description</th></tr></thead><tbody><tr><td>`type`</td><td>Counter that was requested</td></tr><tr><td>`value`</td><td>Value gotten for utilization counter</td></tr></tbody></table>
 
 Exceptions that can be thrown by `amdsmi_get_utilization_count` function:
 
@@ -1957,13 +1957,17 @@ try:
             utilization = amdsmi_get_utilization_count(
                             device,
                             AmdSmiUtilizationCounterType.COARSE_GRAIN_GFX_ACTIVITY
-                            )
+                        )
             print(utilization)
             utilization = amdsmi_get_utilization_count(
                             device,
-                            AmdSmiUtilizationCounterType.COARSE_GRAIN_GFX_ACTIVITY,
-                            AmdSmiUtilizationCounterType.COARSE_GRAIN_MEM_ACTIVITY
-                            )
+                            [AmdSmiUtilizationCounterType.COARSE_GRAIN_GFX_ACTIVITY,
+                            AmdSmiUtilizationCounterType.COARSE_GRAIN_MEM_ACTIVITY,
+                            AmdSmiUtilizationCounterType.COARSE_DECODER_ACTIVITY,
+                            AmdSmiUtilizationCounterType.FINE_GRAIN_GFX_ACTIVITY,
+                            AmdSmiUtilizationCounterType.FINE_GRAIN_MEM_ACTIVITY,
+                            AmdSmiUtilizationCounterType.FINE_DECODER_ACTIVITY]
+                        )
             print(utilization)
 except AmdSmiException as e:
     print(e)

py-interface/amdsmi_interface.py

@@ -3402,6 +3402,14 @@ def amdsmi_get_utilization_count(
         raise AmdSmiParameterException(
             processor_handle, amdsmi_wrapper.amdsmi_processor_handle
         )
+
+    # Enforce List typing
+    if not isinstance(counter_types, list):
+        counter_types = [counter_types]
+
+    counter_types = list(set(counter_types))
+
+    # Validate Inputs
     if len(counter_types) == 0:
         raise AmdSmiLibraryException(amdsmi_wrapper.AMDSMI_STATUS_INVAL)
     counters = []

py-interface/amdsmi_wrapper.py

@@ -759,6 +759,19 @@ amdsmi_card_form_factor_t = ctypes.c_uint32 # enum
 class struct_amdsmi_pcie_info_t(Structure):
     pass
 
+class struct_pcie_static_(Structure):
+    pass
+
+struct_pcie_static_._pack_ = 1 # source:False
+struct_pcie_static_._fields_ = [
+    ('max_pcie_width', ctypes.c_uint16),
+    ('PADDING_0', ctypes.c_ubyte * 2),
+    ('max_pcie_speed', ctypes.c_uint32),
+    ('pcie_interface_version', ctypes.c_uint32),
+    ('slot_type', amdsmi_card_form_factor_t),
+    ('reserved', ctypes.c_uint64 * 10),
+]
+
 class struct_pcie_metric_(Structure):
     pass
 
@@ -777,19 +790,6 @@ struct_pcie_metric_._fields_ = [
     ('reserved', ctypes.c_uint64 * 13),
 ]
 
-class struct_pcie_static_(Structure):
-    pass
-
-struct_pcie_static_._pack_ = 1 # source:False
-struct_pcie_static_._fields_ = [
-    ('max_pcie_width', ctypes.c_uint16),
-    ('PADDING_0', ctypes.c_ubyte * 2),
-    ('max_pcie_speed', ctypes.c_uint32),
-    ('pcie_interface_version', ctypes.c_uint32),
-    ('slot_type', amdsmi_card_form_factor_t),
-    ('reserved', ctypes.c_uint64 * 10),
-]
-
 struct_amdsmi_pcie_info_t._pack_ = 1 # source:False
 struct_amdsmi_pcie_info_t._fields_ = [
     ('pcie_static', struct_pcie_static_),
@@ -2069,7 +2069,7 @@ amdsmi_set_gpu_fan_speed.restype = amdsmi_status_t
 amdsmi_set_gpu_fan_speed.argtypes = [amdsmi_processor_handle, uint32_t, uint64_t]
 amdsmi_get_utilization_count = _libraries['libamd_smi.so'].amdsmi_get_utilization_count
 amdsmi_get_utilization_count.restype = amdsmi_status_t
-amdsmi_get_utilization_count.argtypes = [amdsmi_processor_handle, struct_amdsmi_utilization_counter_t * 0, uint32_t, ctypes.POINTER(ctypes.c_uint64)]
+amdsmi_get_utilization_count.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_amdsmi_utilization_counter_t), uint32_t, ctypes.POINTER(ctypes.c_uint64)]
 amdsmi_get_gpu_perf_level = _libraries['libamd_smi.so'].amdsmi_get_gpu_perf_level
 amdsmi_get_gpu_perf_level.restype = amdsmi_status_t
 amdsmi_get_gpu_perf_level.argtypes = [amdsmi_processor_handle, ctypes.POINTER(amdsmi_dev_perf_level_t)]