From a45d2e168446997f494cd65313ac085fdb14815f Mon Sep 17 00:00:00 2001 From: Deepak Mewar Date: Wed, 27 Dec 2023 10:27:09 -0500 Subject: [PATCH] amdsmi wrapper generated for updated amdsmi_get_metrics_table Change-Id: Id55a5647064998d8f546c806f857a8745afe52ea [ROCm/amdsmi commit: 4ecf25e8826c7192326ada7d7e2c749986c024f7] --- .../amdsmi/py-interface/amdsmi_wrapper.py | 86 +++++++++++++++++-- 1 file changed, 77 insertions(+), 9 deletions(-) diff --git a/projects/amdsmi/py-interface/amdsmi_wrapper.py b/projects/amdsmi/py-interface/amdsmi_wrapper.py index d7836d1316..7e6c421905 100644 --- a/projects/amdsmi/py-interface/amdsmi_wrapper.py +++ b/projects/amdsmi/py-interface/amdsmi_wrapper.py @@ -1717,6 +1717,75 @@ struct_amdsmi_dpm_level_t._fields_ = [ ] amdsmi_dpm_level_t = struct_amdsmi_dpm_level_t +class struct_amdsmi_hsmp_metric_table_t(Structure): + pass + +struct_amdsmi_hsmp_metric_table_t._pack_ = 1 # source:False +struct_amdsmi_hsmp_metric_table_t._fields_ = [ + ('accumulation_counter', ctypes.c_uint32), + ('max_socket_temperature', ctypes.c_uint32), + ('max_vr_temperature', ctypes.c_uint32), + ('max_hbm_temperature', ctypes.c_uint32), + ('max_socket_temperature_acc', ctypes.c_uint64), + ('max_vr_temperature_acc', ctypes.c_uint64), + ('max_hbm_temperature_acc', ctypes.c_uint64), + ('socket_power_limit', ctypes.c_uint32), + ('max_socket_power_limit', ctypes.c_uint32), + ('socket_power', ctypes.c_uint32), + ('PADDING_0', ctypes.c_ubyte * 4), + ('timestamp', ctypes.c_uint64), + ('socket_energy_acc', ctypes.c_uint64), + ('ccd_energy_acc', ctypes.c_uint64), + ('xcd_energy_acc', ctypes.c_uint64), + ('aid_energy_acc', ctypes.c_uint64), + ('hbm_energy_acc', ctypes.c_uint64), + ('cclk_frequency_limit', ctypes.c_uint32), + ('gfxclk_frequency_limit', ctypes.c_uint32), + ('fclk_frequency', ctypes.c_uint32), + ('uclk_frequency', ctypes.c_uint32), + ('socclk_frequency', ctypes.c_uint32 * 4), + ('vclk_frequency', ctypes.c_uint32 * 4), + ('dclk_frequency', ctypes.c_uint32 * 4), + ('lclk_frequency', ctypes.c_uint32 * 4), + ('gfxclk_frequency_acc', ctypes.c_uint64 * 8), + ('cclk_frequency_acc', ctypes.c_uint64 * 96), + ('max_cclk_frequency', ctypes.c_uint32), + ('min_cclk_frequency', ctypes.c_uint32), + ('max_gfxclk_frequency', ctypes.c_uint32), + ('min_gfxclk_frequency', ctypes.c_uint32), + ('fclk_frequency_table', ctypes.c_uint32 * 4), + ('uclk_frequency_table', ctypes.c_uint32 * 4), + ('socclk_frequency_table', ctypes.c_uint32 * 4), + ('vclk_frequency_table', ctypes.c_uint32 * 4), + ('dclk_frequency_table', ctypes.c_uint32 * 4), + ('lclk_frequency_table', ctypes.c_uint32 * 4), + ('max_lclk_dpm_range', ctypes.c_uint32), + ('min_lclk_dpm_range', ctypes.c_uint32), + ('xgmi_width', ctypes.c_uint32), + ('xgmi_bitrate', ctypes.c_uint32), + ('xgmi_read_bandwidth_acc', ctypes.c_uint64 * 8), + ('xgmi_write_bandwidth_acc', ctypes.c_uint64 * 8), + ('socket_c0_residency', ctypes.c_uint32), + ('socket_gfx_busy', ctypes.c_uint32), + ('dram_bandwidth_utilization', ctypes.c_uint32), + ('PADDING_1', ctypes.c_ubyte * 4), + ('socket_c0_residency_acc', ctypes.c_uint64), + ('socket_gfx_busy_acc', ctypes.c_uint64), + ('dram_bandwidth_acc', ctypes.c_uint64), + ('max_dram_bandwidth', ctypes.c_uint32), + ('PADDING_2', ctypes.c_ubyte * 4), + ('dram_bandwidth_utilization_acc', ctypes.c_uint64), + ('pcie_bandwidth_acc', ctypes.c_uint64 * 4), + ('prochot_residency_acc', ctypes.c_uint32), + ('ppt_residency_acc', ctypes.c_uint32), + ('socket_thm_residency_acc', ctypes.c_uint32), + ('vr_thm_residency_acc', ctypes.c_uint32), + ('hbm_thm_residency_acc', ctypes.c_uint32), + ('spare', ctypes.c_uint32), + ('gfxclk_frequency', ctypes.c_uint32 * 8), +] + +amdsmi_hsmp_metric_table_t = struct_amdsmi_hsmp_metric_table_t uint64_t = ctypes.c_uint64 amdsmi_init = _libraries['libamd_smi.so'].amdsmi_init amdsmi_init.restype = amdsmi_status_t @@ -2326,12 +2395,9 @@ amdsmi_get_cpu_current_xgmi_bw.argtypes = [amdsmi_processor_handle, amdsmi_link_ amdsmi_get_metrics_table_version = _libraries['libamd_smi.so'].amdsmi_get_metrics_table_version amdsmi_get_metrics_table_version.restype = amdsmi_status_t amdsmi_get_metrics_table_version.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32)] -class struct_hsmp_metric_table(Structure): - pass - amdsmi_get_metrics_table = _libraries['libamd_smi.so'].amdsmi_get_metrics_table amdsmi_get_metrics_table.restype = amdsmi_status_t -amdsmi_get_metrics_table.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_hsmp_metric_table)] +amdsmi_get_metrics_table.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_amdsmi_hsmp_metric_table_t)] amdsmi_first_online_core_on_cpu_socket = _libraries['libamd_smi.so'].amdsmi_first_online_core_on_cpu_socket amdsmi_first_online_core_on_cpu_socket.restype = amdsmi_status_t amdsmi_first_online_core_on_cpu_socket.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32)] @@ -2646,9 +2712,10 @@ __all__ = \ 'amdsmi_gpu_counter_group_supported', 'amdsmi_gpu_create_counter', 'amdsmi_gpu_destroy_counter', 'amdsmi_gpu_metrics_t', 'amdsmi_gpu_read_counter', 'amdsmi_gpu_xgmi_error_status', - 'amdsmi_init', 'amdsmi_init_flags_t', - 'amdsmi_init_gpu_event_notification', 'amdsmi_io_bw_encoding_t', - 'amdsmi_io_link_type_t', 'amdsmi_is_P2P_accessible', + 'amdsmi_hsmp_metric_table_t', 'amdsmi_init', + 'amdsmi_init_flags_t', 'amdsmi_init_gpu_event_notification', + 'amdsmi_io_bw_encoding_t', 'amdsmi_io_link_type_t', + 'amdsmi_is_P2P_accessible', 'amdsmi_is_gpu_power_management_enabled', 'amdsmi_link_id_bw_type_t', 'amdsmi_memory_page_status_t', 'amdsmi_memory_partition_type_t', 'amdsmi_memory_type_t', @@ -2708,6 +2775,7 @@ __all__ = \ 'struct_amdsmi_freq_volt_region_t', 'struct_amdsmi_frequencies_t', 'struct_amdsmi_frequency_range_t', 'struct_amdsmi_fw_info_t', 'struct_amdsmi_gpu_cache_info_t', 'struct_amdsmi_gpu_metrics_t', + 'struct_amdsmi_hsmp_metric_table_t', 'struct_amdsmi_link_id_bw_type_t', 'struct_amdsmi_name_value_t', 'struct_amdsmi_od_vddc_point_t', 'struct_amdsmi_od_volt_curve_t', 'struct_amdsmi_od_volt_freq_data_t', @@ -2724,5 +2792,5 @@ __all__ = \ 'struct_amdsmi_vram_info_t', 'struct_amdsmi_vram_usage_t', 'struct_amdsmi_xgmi_info_t', 'struct_cache_', 'struct_engine_usage_', 'struct_fields_', 'struct_fw_info_list_', - 'struct_hsmp_metric_table', 'struct_memory_usage_', 'uint32_t', - 'uint64_t', 'uint8_t', 'union_amdsmi_bdf_t'] + 'struct_memory_usage_', 'uint32_t', 'uint64_t', 'uint8_t', + 'union_amdsmi_bdf_t']