From 8f3861e1d9ab117a452646b9ef7042fd1b3d9638 Mon Sep 17 00:00:00 2001 From: Charis Poag Date: Wed, 6 Dec 2023 03:25:38 -0600 Subject: [PATCH 1/5] Add vcn and jpeg activity Changes: - Add new engine field vcn_activity (from 1.4/1.5 gpu_metrics - Updated log output to enhance view of gpu_metric data as json pretty print - Added new fields provided in 1.5 - Added unit overview in python API, CLI is WIP Signed-off-by: Charis Poag Change-Id: I7d9f29e7ecc35dcd0697814c222cdd02b0d5518e --- amdsmi_cli/amdsmi_commands.py | 32 ++++-- include/amd_smi/amdsmi.h | 134 ++++++++++++++-------- include/amd_smi/impl/amd_smi_gpu_device.h | 1 + py-interface/README.md | 117 ++++++++++--------- py-interface/amdsmi_interface.py | 8 ++ py-interface/amdsmi_wrapper.py | 6 + src/amd_smi/amd_smi.cc | 28 ++++- src/amd_smi/amd_smi_utils.cc | 19 ++- 8 files changed, 229 insertions(+), 116 deletions(-) diff --git a/amdsmi_cli/amdsmi_commands.py b/amdsmi_cli/amdsmi_commands.py index e8ec181d25..aa2ea7adeb 100644 --- a/amdsmi_cli/amdsmi_commands.py +++ b/amdsmi_cli/amdsmi_commands.py @@ -24,6 +24,7 @@ import logging import sys import threading import time +import json from _version import __version__ from amdsmi_helpers import AMDSMIHelpers @@ -941,7 +942,9 @@ class AMDSMICommands(): # Put the metrics table in the debug logs try: - logging.debug("GPU Metrics table for %s | %s", gpu_id, amdsmi_interface.amdsmi_get_gpu_metrics_info(args.gpu)) + gpu_metric_output = amdsmi_interface.amdsmi_get_gpu_metrics_info(args.gpu) + gpu_metric_str = json.dumps(gpu_metric_output, indent=4) + logging.debug("GPU Metrics table for %s | %s", gpu_id, gpu_metric_str) except amdsmi_exception.AmdSmiLibraryException as e: logging.debug("Unabled to load GPU Metrics table for %s | %s", gpu_id, e.err_info) @@ -963,14 +966,30 @@ class AMDSMICommands(): engine_usage['gfx_usage'] = engine_usage.pop('gfx_activity') engine_usage['mem_usage'] = engine_usage.pop('umc_activity') engine_usage['mm_ip_usage'] = engine_usage.pop('mm_activity') - + engine_usage['vcn_activities'] = gpu_metric_output.pop('vcn_activity') + engine_usage['jpeg_activities[AID0]'] = gpu_metric_output.pop('jpeg_activities[AID0]') + engine_usage['jpeg_activities[AID1]'] = gpu_metric_output.pop('jpeg_activities[AID1]') + engine_usage['jpeg_activities[AID2]'] = gpu_metric_output.pop('jpeg_activities[AID2]') + engine_usage['jpeg_activities[AID3]'] = gpu_metric_output.pop('jpeg_activities[AID3]') for key, value in engine_usage.items(): - if value == 65535: + if not isinstance(value, list) and value > 100: engine_usage[key] = "N/A" + elif isinstance(value, list): + engine_usage[key] = ["N/A" if v > 100 else v for v in value] if self.logger.is_human_readable_format(): - if engine_usage[key] != "N/A": - unit = '%' + unit = '%' + if isinstance(value, list): + engine_usage[key] = [f"{v} {unit}" if str(v) != "N/A" else str(v) for v in engine_usage[key]] + save_value = engine_usage[key] + pretty_array = "[" + for i in range(len(save_value)): + if (i+1 != len(save_value)): + pretty_array += save_value[i] + ", " + else: + pretty_array += save_value[i] + "]" + engine_usage[key] = pretty_array + elif not isinstance(value, list) and engine_usage[key] != "N/A": engine_usage[key] = f"{value} {unit}" values_dict['usage'] = engine_usage @@ -1225,9 +1244,6 @@ class AMDSMICommands(): logging.debug("Failed to get pcie replay rollover counter for gpu %s | %s", gpu_id, e.get_error_info()) try: - # nak_info = amdsmi_interface.amdsmi_get_gpu_pci_nak_info(args.gpu) - # pcie_dict['nak_sent_count'] = nak_info['nak_sent_count'] - # pcie_dict['nak_received_count'] = nak_info['nak_received_count'] pcie_dict['nak_sent_count'] = "N/A" pcie_dict['nak_received_count'] = "N/A" except amdsmi_exception.AmdSmiLibraryException as e: diff --git a/include/amd_smi/amdsmi.h b/include/amd_smi/amdsmi.h index 6dff3c3306..c25c6e6381 100644 --- a/include/amd_smi/amdsmi.h +++ b/include/amd_smi/amdsmi.h @@ -88,6 +88,55 @@ typedef enum { #define AMDSMI_GPU_UUID_SIZE 38 +/** + * @brief The following structure holds the gpu metrics values for a device. + */ + +/** + * @brief Unit conversion factor for HBM temperatures + */ +#define CENTRIGRADE_TO_MILLI_CENTIGRADE 1000 + +/** + * @brief This should match NUM_HBM_INSTANCES + */ +#define AMDSMI_NUM_HBM_INSTANCES 4 + +/** + * @brief This should match MAX_NUM_VCN + */ +#define AMDSMI_MAX_NUM_VCN 4 + +/** + * @brief This should match MAX_NUM_CLKS + */ +#define AMDSMI_MAX_NUM_CLKS 4 + +/** + * @brief This should match MAX_NUM_XGMI_LINKS + */ +#define AMDSMI_MAX_NUM_XGMI_LINKS 8 + +/** + * @brief This should match MAX_NUM_GFX_CLKS + */ +#define AMDSMI_MAX_NUM_GFX_CLKS 8 + +/** + * @brief This should match AMDSMI_MAX_AID + */ +#define AMDSMI_MAX_AID 4 + +/** + * @brief This should match AMDSMI_MAX_ENGINES + */ +#define AMDSMI_MAX_ENGINES 8 + +/** + * @brief This should match AMDSMI_MAX_NUM_JPEG (8*4=32) + */ +#define AMDSMI_MAX_NUM_JPEG 32 + /* string format */ #define AMDSMI_TIME_FORMAT "%02d:%02d:%02d.%03d" #define AMDSMI_DATE_FORMAT "%04d-%02d-%02d:%02d:%02d:%02d.%03d" @@ -544,6 +593,12 @@ typedef struct { uint32_t reserved[4]; } amdsmi_clk_info_t; +/** + * amdsmi_engine_usage_t: + * This structure holds common + * GPU activity values seen in both BM or + * SRIOV + **/ typedef struct { uint32_t gfx_activity; uint32_t umc_activity; @@ -1137,41 +1192,6 @@ typedef struct { /// \endcond } amd_metrics_table_header_t; -/** - * @brief The following structure holds the gpu metrics values for a device. - */ - -/** - * @brief Unit conversion factor for HBM temperatures - */ -#define CENTRIGRADE_TO_MILLI_CENTIGRADE 1000 - -/** - * @brief This should match NUM_HBM_INSTANCES - */ -#define AMDSMI_NUM_HBM_INSTANCES 4 - -/** - * @brief This should match MAX_NUM_VCN - */ -#define AMDSMI_MAX_NUM_VCN 4 - -/** - * @brief This should match MAX_NUM_CLKS - */ -#define AMDSMI_MAX_NUM_CLKS 4 - -/** - * @brief This should match MAX_NUM_XGMI_LINKS - */ -#define AMDSMI_MAX_NUM_XGMI_LINKS 8 - -/** - * @brief This should match MAX_NUM_GFX_CLKS - */ -#define AMDSMI_MAX_NUM_GFX_CLKS 8 - - typedef struct { // TODO(amd) Doxygen documents // Note: This structure is extended to fit the needs of different GPU metric @@ -1191,7 +1211,7 @@ typedef struct { /* * v1.0 Base */ - // Temperature + // Temperature (C) uint16_t temperature_edge; uint16_t temperature_hotspot; uint16_t temperature_mem; @@ -1199,19 +1219,19 @@ typedef struct { uint16_t temperature_vrsoc; uint16_t temperature_vrmem; - // Utilization + // Utilization (%) uint16_t average_gfx_activity; uint16_t average_umc_activity; // memory controller uint16_t average_mm_activity; // UVD or VCN - // Power/Energy + // Power (W) /Energy (15.259uJ per 1ns) uint16_t average_socket_power; uint64_t energy_accumulator; // v1 mod. (32->64) // Driver attached timestamp (in ns) uint64_t system_clock_counter; // v1 mod. (moved from top of struct) - // Average clocks + // Average clocks (MHz) uint16_t average_gfxclk_frequency; uint16_t average_socclk_frequency; uint16_t average_uclk_frequency; @@ -1220,7 +1240,7 @@ typedef struct { uint16_t average_vclk1_frequency; uint16_t average_dclk1_frequency; - // Current clocks + // Current clocks (MHz) uint16_t current_gfxclk; uint16_t current_socclk; uint16_t current_uclk; @@ -1232,10 +1252,10 @@ typedef struct { // Throttle status uint32_t throttle_status; - // Fans + // Fans (RPM) uint16_t current_fan_speed; - // Link width/speed + // Link width (number of lanes) /speed (0.1 GT/s) uint16_t pcie_link_width; // v1 mod.(8->16) uint16_t pcie_link_speed; // in 0.1 GT/s; v1 mod. (8->16) @@ -1274,19 +1294,19 @@ typedef struct { uint16_t current_socket_power; // Utilization (%) - uint16_t vcn_activity[AMDSMI_MAX_NUM_VCN]; // VCN instances activity percent (encode/decode) + uint16_t vcn_activity[AMDSMI_MAX_NUM_VCN]; // Clock Lock Status. Each bit corresponds to clock instance uint32_t gfxclk_lock_status; - // XGMI bus width and bitrate (in Gbps) + // XGMI bus width and bitrate (in GB/s) uint16_t xgmi_link_width; uint16_t xgmi_link_speed; - // PCIE accumulated bandwidth (GB/sec) + // PCIe accumulated bandwidth (GB/sec) uint64_t pcie_bandwidth_acc; - // PCIE instantaneous bandwidth (GB/sec) + // PCIe instantaneous bandwidth (GB/sec) uint64_t pcie_bandwidth_inst; // PCIE L0 to recovery state transition accumulated count @@ -1298,15 +1318,33 @@ typedef struct { // PCIE replay rollover accumulated count uint64_t pcie_replay_rover_count_acc; - // XGMI accumulated data transfer size(KiloBytes) + // XGMI accumulated data transfer size (KB) uint64_t xgmi_read_data_acc[AMDSMI_MAX_NUM_XGMI_LINKS]; uint64_t xgmi_write_data_acc[AMDSMI_MAX_NUM_XGMI_LINKS]; - // Current clock frequencies + // Current clock frequencies (MHz) uint16_t current_gfxclks[AMDSMI_MAX_NUM_GFX_CLKS]; uint16_t current_socclks[AMDSMI_MAX_NUM_CLKS]; uint16_t current_vclk0s[AMDSMI_MAX_NUM_CLKS]; uint16_t current_dclk0s[AMDSMI_MAX_NUM_CLKS]; + + /* + * v1.5 additions + */ + // Memory Bandwidth Usage Accumulated (GB/sec) + uint64_t mem_bandwidth_acc; + + // Memory Bandwidth Maximum (GB/sec) + uint32_t mem_max_bandwidth; + + // PCIE NAK sent accumulated count + uint32_t pcie_nak_sent_count_acc; + + // PCIE NAK received accumulated count + uint32_t pcie_nak_rcvd_count_acc; + + // JPEG activity % per AID + uint16_t jpeg_activity[AMDSMI_MAX_NUM_JPEG]; /// \endcond } amdsmi_gpu_metrics_t; diff --git a/include/amd_smi/impl/amd_smi_gpu_device.h b/include/amd_smi/impl/amd_smi_gpu_device.h index 61290a5f37..b512ce3e76 100644 --- a/include/amd_smi/impl/amd_smi_gpu_device.h +++ b/include/amd_smi/impl/amd_smi_gpu_device.h @@ -48,6 +48,7 @@ #include "amd_smi/impl/amd_smi_processor.h" #include "amd_smi/impl/amd_smi_drm.h" #include "shared_mutex.h" // NOLINT +#include "rocm_smi/rocm_smi_logger.h" namespace amd { namespace smi { diff --git a/py-interface/README.md b/py-interface/README.md index 013c3477b1..3dc1df88ed 100644 --- a/py-interface/README.md +++ b/py-interface/README.md @@ -2117,63 +2117,68 @@ Input parameters: Output: Dictionary with fields -Field | Description -`---|--- -`temperature_edge` | edge temperature value -`temperature_hotspot` | hotspot temperature value -`temperature_mem` | memory temperature value -`temperature_vrgfx` | vrgfx temperature value -`temperature_vrsoc` | vrsoc temperature value -`temperature_vrmem` | vrmem temperature value -`average_gfx_activity` | average gfx activity -`average_umc_activity` | average umc activity -`average_mm_activity` | average mm activity -`average_socket_power` | average socket power -`energy_accumulator` | energy accumulator value -`system_clock_counter` | system clock counter -`average_gfxclk_frequency` | average gfx clock frequency -`average_socclk_frequency` | average soc clock frequency -`average_uclk_frequency` | average uclk frequency -`average_vclk0_frequency` | average vclk0 frequency -`average_dclk0_frequency` | average dclk0 frequency -`average_vclk1_frequency` | average vclk1 frequency -`average_dclk1_frequency` | average dclk1 frequency -`current_gfxclk` | current gfx clock -`current_socclk` | current soc clock -`current_uclk` | current uclk -`current_vclk0` | current vclk0 -`current_dclk0` | current dclk0 -`current_vclk1` | current vclk1 -`current_dclk1` | current dclk1 -`throttle_status` | current throttle status -`current_fan_speed` | current fan speed -`pcie_link_width` | pcie link width -`pcie_link_speed` | pcie link speed +| Field | Description |Unit| +|-------|-------------|----| +`temperature_edge` | Edge temperature value | Celsius (C) +`temperature_hotspot` | Hotspot (aka junction) temperature value | Celsius (C) +`temperature_mem` | Memory temperature value | Celsius (C) +`temperature_vrgfx` | vrgfx temperature value | Celsius (C) +`temperature_vrsoc` | vrsoc temperature value | Celsius (C) +`temperature_vrmem` | vrmem temperature value | Celsius (C) +`average_gfx_activity` | Average gfx activity | % +`average_umc_activity` | Average umc activity | % +`average_mm_activity` | Average mm activity | % +`average_socket_power` | Average socket power | W +`energy_accumulator` | Energy accumulated with a 15.3 uJ resolution over 1ns | uJ +`system_clock_counter` | System clock counter | ns +`average_gfxclk_frequency` | Average gfx clock frequency | MHz +`average_socclk_frequency` | Average soc clock frequency | MHz +`average_uclk_frequency` | Average uclk frequency | MHz +`average_vclk0_frequency` | Average vclk0 frequency | MHz +`average_dclk0_frequency` | Average dclk0 frequency | MHz +`average_vclk1_frequency` | Average vclk1 frequency | MHz +`average_dclk1_frequency` | Average dclk1 frequency | MHz +`current_gfxclk` | Current gfx clock | MHz +`current_socclk` | Current soc clock | MHz +`current_uclk` | Current uclk | MHz +`current_vclk0` | Current vclk0 | MHz +`current_dclk0` | Current dclk0 | MHz +`current_vclk1` | Current vclk1 | MHz +`current_dclk1` | Current dclk1 | MHz +`throttle_status` | Current throttle status | MHz +`current_fan_speed` | Current fan speed | RPM +`pcie_link_width` | PCIe link width (number of lanes) | lanes +`pcie_link_speed` | PCIe link speed in 0.1 GT/s (Giga Transfers per second) | GT/s `padding` | padding -`gfx_activity_acc` | gfx activity acc -`mem_activity_acc` | mem activity acc -`temperature_hbm` | list of hbm temperatures -`firmware_timestamp` | timestamp from PMFW -`voltage_soc` | soc voltage -`voltage_gfx` | gfx voltage -`voltage_mem` | mem voltage -`indep_throttle_status` | asic independent throttle status -`current_socket_power` | current socket power -`vcn_activity` | list of encoding and decoding engine utilizations -`gfxclk_lock_status` | gfx clock lock status -`xgmi_link_width` | XGMI bus width -`xgmi_link_speed` | XGMI bitrate (in Gbps) -`pcie_bandwidth_acc` | PCIE accumulated bandwidth (GB/sec) -`pcie_bandwidth_inst` | PCIE instantaneous bandwidth (GB/sec) -`pcie_l0_to_recov_count_acc` | PCIE L0 to recovery state transition accumulated count -`pcie_replay_count_acc` | PCIE replay accumulated count -`pcie_replay_rover_count_acc` | PCIE replay rollover accumulated count -`xgmi_read_data_acc` | XGMI accumulated read data transfer size(KiloBytes) -`xgmi_write_data_acc` | XGMI accumulated write data transfer size(KiloBytes) -`current_gfxclks` | list of current gfx clock frequencies -`current_socclks` | list of current soc clock frequencies -`current_vclk0s` | list of current v0 clock frequencies -`current_dclk0s` | list of current d0 clock frequencies +`gfx_activity_acc` | gfx activity accumulated | % +`mem_activity_acc` | Memory activity accumulated | % +`temperature_hbm` | list of hbm temperatures | Celsius (C) +`firmware_timestamp` | timestamp from PMFW (10ns resolution) | ns +`voltage_soc` | soc voltage | mV +`voltage_gfx` | gfx voltage | mV +`voltage_mem` | mem voltage | mV +`indep_throttle_status` | ASIC independent throttle status (see drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h for bit flags) | +`current_socket_power` | Current socket power (also known as instant socket power) | W +`vcn_activity` | List of VCN encode/decode engine utilization per AID | % +`gfxclk_lock_status` | Clock lock status. Each bit corresponds to clock instance. | +`xgmi_link_width` | XGMI bus width | lanes +`xgmi_link_speed` | XGMI bitrate | GB/s +`pcie_bandwidth_acc` | PCIe accumulated bandwidth | GB/s +`pcie_bandwidth_inst` | PCIe instantaneous bandwidth | GB/s +`pcie_l0_to_recov_count_acc` | PCIe L0 to recovery state transition accumulated count | +`pcie_replay_count_acc` | PCIe replay accumulated count | +`pcie_replay_rover_count_acc` | PCIe replay rollover accumulated count | +`xgmi_read_data_acc` | XGMI accumulated read data transfer size (KiloBytes) | KB +`xgmi_write_data_acc` | XGMI accumulated write data transfer size (KiloBytes) | KB +`current_gfxclks` | List of current gfx clock frequencies | MHz +`current_socclks` | List of current soc clock frequencies | MHz +`current_vclk0s` | List of current v0 clock frequencies | MHz +`current_dclk0s` | List of current d0 clock frequencies | MHz +`mem_bandwidth_acc` | Memory bandwidth usage accumulated | GB/s +`mem_max_bandwidth` | Maximum memory bandwidth usage accumulated | GB/s +`pcie_nak_sent_count_acc` | PCIe NAC sent count accumulated | +`pcie_nak_rcvd_count_acc` | PCIe NAC received count accumulated | +`jpeg_activitys[AID]` | List of JPEG engine activity for each AID (X=0-3) | % Exceptions that can be thrown by `amdsmi_get_gpu_metrics_info` function: diff --git a/py-interface/amdsmi_interface.py b/py-interface/amdsmi_interface.py index dc4a92452e..18e563c198 100644 --- a/py-interface/amdsmi_interface.py +++ b/py-interface/amdsmi_interface.py @@ -2978,6 +2978,14 @@ def amdsmi_get_gpu_metrics_info( "current_socclks": list(gpu_metrics.current_socclks), "current_vclk0s": list(gpu_metrics.current_vclk0s), "current_dclk0s": list(gpu_metrics.current_dclk0s), + "mem_bandwidth_acc": gpu_metrics.mem_bandwidth_acc, + "mem_max_bandwidth": gpu_metrics.mem_max_bandwidth, + "pcie_nak_sent_count_acc": gpu_metrics.pcie_nak_sent_count_acc, + "pcie_nak_rcvd_count_acc": gpu_metrics.pcie_nak_rcvd_count_acc, + "jpeg_activities[AID0]": list(gpu_metrics.jpeg_activities)[:8], + "jpeg_activities[AID1]": list(gpu_metrics.jpeg_activities)[8:16], + "jpeg_activities[AID2]": list(gpu_metrics.jpeg_activities)[16:24], + "jpeg_activities[AID3]": list(gpu_metrics.jpeg_activities)[24:32], } diff --git a/py-interface/amdsmi_wrapper.py b/py-interface/amdsmi_wrapper.py index dccdcd81f2..78fc72bb5f 100644 --- a/py-interface/amdsmi_wrapper.py +++ b/py-interface/amdsmi_wrapper.py @@ -894,6 +894,7 @@ amdsmi_clk_info_t = struct_amdsmi_clk_info_t class struct_amdsmi_engine_usage_t(Structure): pass + struct_amdsmi_engine_usage_t._pack_ = 1 # source:False struct_amdsmi_engine_usage_t._fields_ = [ ('gfx_activity', ctypes.c_uint32), @@ -1514,6 +1515,11 @@ struct_amdsmi_gpu_metrics_t._fields_ = [ ('current_socclks', ctypes.c_uint16 * 4), ('current_vclk0s', ctypes.c_uint16 * 4), ('current_dclk0s', ctypes.c_uint16 * 4), + ('mem_bandwidth_acc', ctypes.c_uint64), + ('mem_max_bandwidth', ctypes.c_uint32), + ('pcie_nak_sent_count_acc', ctypes.c_uint32), + ('pcie_nak_rcvd_count_acc', ctypes.c_uint32), + ('jpeg_activities', ctypes.c_uint16 * 32), ] amdsmi_gpu_metrics_t = struct_amdsmi_gpu_metrics_t diff --git a/src/amd_smi/amd_smi.cc b/src/amd_smi/amd_smi.cc index 917784d582..d9bfbc9e91 100644 --- a/src/amd_smi/amd_smi.cc +++ b/src/amd_smi/amd_smi.cc @@ -68,6 +68,7 @@ #include "amd_smi/impl/amdgpu_drm.h" #include "amd_smi/impl/amd_smi_utils.h" #include "amd_smi/impl/amd_smi_processor.h" +#include "rocm_smi/rocm_smi_logger.h" #ifdef ENABLE_ESMI_LIB #include "amd_smi/impl/amd_smi_cpu_socket.h" #include "amd_smi/impl/amd_smi_cpu_core.h" @@ -1154,9 +1155,32 @@ amdsmi_status_t amdsmi_get_gpu_metrics_info( amdsmi_gpu_metrics_t *pgpu_metrics) { AMDSMI_CHECK_INIT(); // nullptr api supported - - return rsmi_wrapper(rsmi_dev_gpu_metrics_info_get, processor_handle, + amdsmi_status_t ret = + rsmi_wrapper(rsmi_dev_gpu_metrics_info_get, processor_handle, reinterpret_cast(pgpu_metrics)); + // WARNING: TEMPORARY - awaiting 1.5 update from amdgpu driver/firmware + // intended to be removed later + // START: REMOVE WHATS BELOW ME + uint8_t content_ver = pgpu_metrics->common_header.content_revision; + int8_t format_ver = pgpu_metrics->common_header.format_revision; + const uint8_t expected_format_ver = 1; + const uint8_t expected_content_ver = 4; + if (ret == AMDSMI_STATUS_SUCCESS && + (format_ver == expected_format_ver && + content_ver <= expected_content_ver)) { + std::ostringstream ss; + ss << __PRETTY_FUNCTION__ << " | SET JPEG_ACTIVITY to MAX_UINT16, " + << "detected content version: " << std::dec << +content_ver + << "; format version: " << std::dec << +format_ver + << "; awaiting 1.5 metrics remove once released"; + LOG_ALWAYS(ss); + std::fill_n(&pgpu_metrics->jpeg_activity[0], + (sizeof(pgpu_metrics->jpeg_activity) / + sizeof(pgpu_metrics->jpeg_activity[0])), + std::numeric_limits::max()); + } + // END: REMOVE WHATS ABOVE ME + return ret; } diff --git a/src/amd_smi/amd_smi_utils.cc b/src/amd_smi/amd_smi_utils.cc index 2b16250dc3..79d9103699 100644 --- a/src/amd_smi/amd_smi_utils.cc +++ b/src/amd_smi/amd_smi_utils.cc @@ -43,6 +43,7 @@ #include "amd_smi/impl/amd_smi_utils.h" #include "shared_mutex.h" // NOLINT +#include "rocm_smi/rocm_smi_logger.h" static const uint32_t kAmdGpuId = 0x1002; @@ -153,6 +154,20 @@ amdsmi_status_t smi_amdgpu_get_board_info(amd::smi::AMDSmiGPUDevice* device, amd fgets(info->product_name, sizeof(info->product_name), fp); fclose(fp); } + std::ostringstream ss; + ss << __PRETTY_FUNCTION__ + << "Returning status = AMDSMI_STATUS_SUCCESS" + << " | model_number_path = " << model_number_path + << "; info->model_number: " << info->model_number + << "\n product_serial_path = " << product_serial_path + << "; info->product_serial: " << info->product_serial + << "\n fru_id_path = " << fru_id_path + << "; info->fru_id: " << info->fru_id + << "\n manufacturer_name_path = " << manufacturer_name_path + << "; info->manufacturer_name: " << info->manufacturer_name + << "\n product_name_path = " << product_name_path + << "; info->product_name: " << info->product_name; + LOG_INFO(ss); return AMDSMI_STATUS_SUCCESS; } @@ -236,8 +251,8 @@ amdsmi_status_t smi_amdgpu_get_ranges(amd::smi::AMDSmiGPUDevice* device, amdsmi_ unsigned int dpm_level, freq; char firstChar = line[0]; - if (firstChar == 'S'){ - if (sscanf(line.c_str(), "%c: %d%s", &single_char, &sleep_freq, str) <= 2){ + if (firstChar == 'S') { + if (sscanf(line.c_str(), "%c: %d%s", &single_char, &sleep_freq, str) <= 2) { ranges.close(); return AMDSMI_STATUS_NO_DATA; } From 65eed73f4db002f76e469882d3cf96825f043ecc Mon Sep 17 00:00:00 2001 From: Naveen Krishna Chatradhi Date: Thu, 7 Dec 2023 06:46:48 -0800 Subject: [PATCH 2/5] amd-smi: fix cpu specific apis and header 1. provide prototype and documentation for esmi specific api. define structures and update classes as required 2. update cmake files as required and add esmi api to the amdsmi esmi integration example. Change-Id: I753ec176f9b381e74c9646525dfd9075237bf8d9 --- example/amdsmi_esmi_intg_example.cc | 630 +++++----------------- include/amd_smi/amdsmi.h | 309 +++++------ include/amd_smi/impl/amd_smi_cpu_core.h | 76 --- include/amd_smi/impl/amd_smi_cpu_socket.h | 81 --- include/amd_smi/impl/amd_smi_processor.h | 11 +- include/amd_smi/impl/amd_smi_socket.h | 34 +- include/amd_smi/impl/amd_smi_system.h | 35 +- src/amd_smi/amd_smi.cc | 627 ++++++++++----------- src/amd_smi/amd_smi_cpu_core.cc | 62 --- src/amd_smi/amd_smi_cpu_socket.cc | 72 --- src/amd_smi/amd_smi_socket.cc | 28 + src/amd_smi/amd_smi_system.cc | 257 ++++----- 12 files changed, 752 insertions(+), 1470 deletions(-) delete mode 100644 include/amd_smi/impl/amd_smi_cpu_core.h delete mode 100644 include/amd_smi/impl/amd_smi_cpu_socket.h delete mode 100644 src/amd_smi/amd_smi_cpu_core.cc delete mode 100644 src/amd_smi/amd_smi_cpu_socket.cc diff --git a/example/amdsmi_esmi_intg_example.cc b/example/amdsmi_esmi_intg_example.cc index e79a30cbd7..da83dd868d 100644 --- a/example/amdsmi_esmi_intg_example.cc +++ b/example/amdsmi_esmi_intg_example.cc @@ -86,7 +86,7 @@ int main(int argc, char **argv) { // Get all sockets uint32_t socket_count = 0; - ret = amdsmi_get_cpusocket_handles(&socket_count, nullptr); + /*ret = amdsmi_get_cpusocket_handles(&socket_count, nullptr); CHK_AMDSMI_RET(ret) // Allocate the memory for the sockets @@ -94,528 +94,170 @@ int main(int argc, char **argv) { // Get the sockets of the system ret = amdsmi_get_cpusocket_handles(&socket_count, &sockets[0]); + CHK_AMDSMI_RET(ret)*/ + ret = amdsmi_get_socket_handles(&socket_count, nullptr); + CHK_AMDSMI_RET(ret) + // Allocate the memory for the sockets + vector sockets(socket_count); + // Get the sockets of the system + ret = amdsmi_get_socket_handles(&socket_count, &sockets[0]); CHK_AMDSMI_RET(ret) - cout << "Total Socket: " << socket_count << endl; - // For each socket, get identifier and cores for (uint8_t i = 0; i < socket_count; i++) { - // Get Socket info - uint32_t socket_info = 0; - ret = amdsmi_get_cpusocket_info(sockets[i], socket_info); - CHK_AMDSMI_RET(ret) - cout << "Socket " << socket_info << endl; - - // Get the core count available for the socket. + uint32_t cpu_count = 0; uint32_t core_count = 0; - ret = amdsmi_get_cpucore_handles(sockets[i], &core_count, nullptr); + processor_type_t processor_type = AMD_CPU; + ret = amdsmi_get_processor_handles_by_type(sockets[i], processor_type, nullptr, &cpu_count); CHK_AMDSMI_RET(ret) - - // Allocate the memory for the cpu core handles on the socket - vector processor_handles(core_count); - // Get all cores of the socket - ret = amdsmi_get_cpucore_handles(sockets[i], - &core_count, &processor_handles[0]); + vector plist(cpu_count); + ret = amdsmi_get_processor_handles_by_type(sockets[i], processor_type, &plist[0], &cpu_count); CHK_AMDSMI_RET(ret) - cout << "core_count=" << core_count << endl; - - ret = amdsmi_get_cpu_hsmp_proto_ver(sockets[i], &proto_ver); + cout << endl; + // Read core count for each sockets + processor_type = AMD_CPU_CORE; + ret = amdsmi_get_processor_handles_by_type(sockets[i], processor_type, nullptr, &core_count); CHK_AMDSMI_RET(ret) - - cout<<"\n------------------------------------------"; - cout<<"\n| HSMP Proto Version | "<< proto_ver <<"\t\t |"<< endl; - cout<<"------------------------------------------\n"; - - ret = amdsmi_get_cpu_smu_fw_version(sockets[i], &smu_fw); + vector core_list(core_count); + ret = amdsmi_get_processor_handles_by_type(sockets[i], processor_type, &core_list[0], &core_count); CHK_AMDSMI_RET(ret) + for (int index = 0; index < plist.size(); index++) { + socket_count = plist.size(); + ret = amdsmi_get_cpu_hsmp_proto_ver(plist[i], &proto_ver); + CHK_AMDSMI_RET(ret) - cout<<"\n------------------------------------------"; - cout<<"\n| SMU FW Version | " - <<(unsigned)smu_fw.major<<"." - <<(unsigned)smu_fw.minor<<"." - <<(unsigned)smu_fw.debug - <<"\t\t |"< 0 && retVal < SHOWLINESZ) - cout << str; - else - cout <<"error writing to buffer" << endl; + uint32_t prochot; + cout<<"\n-------------------------------------------------"; + cout<<"\n| Sensor Name\t\t\t |"; + for (uint32_t i = 0; i < socket_count; i++) { + cout< 0 && retVal < SHOWLINESZ) + cout << str; + else + cout <<"error writing to buffer" << endl; - cout<<"--------------------------------------------------------------"; - cout<<"\n| CPU["<(socket_power)/1000<<"\t|"; - } else { - err_bits |= 1 << ret; - cout<<" NA (Err:" <(power_limit)/1000<<"\t|"; - } else { - err_bits |= 1 << ret; - cout<<" NA (Err:" <(power_max)/1000<<"\t|"; - } else { - err_bits |= 1 << ret; - cout<<" NA (Err:" <>input_power; - ret = amdsmi_get_cpu_socket_power_cap_max(sockets[i], i, &power_max); - CHK_AMDSMI_RET(ret) - if ((ret == AMDSMI_STATUS_SUCCESS) && (input_power > power_max)) { - cout<<"Input power is more than max power limit," - " limiting to "<(power_max)/1000<<"Watts\n"; - input_power = power_max; - } - ret = amdsmi_set_cpu_socket_power_cap(sockets[i], i, input_power); - CHK_AMDSMI_RET(ret) - if (!ret) { - cout<<"Socket["<(input_power)/1000<<" Watts successfully\n"; - } - cout<<"\n-------------------------------------------------\n"; - - uint8_t mode; - const char *err_str; - cout <<"Enter the power efficiency mode to be set[0, 1 or 2]:\n"; - cin>>mode; - ret = amdsmi_set_cpu_pwr_efficiency_mode(sockets[i], i, mode); - CHK_AMDSMI_RET(ret) - - if (ret != AMDSMI_STATUS_SUCCESS) { - cout<<"Failed to set power efficiency mode for socket["<(svi_power)/1000<<"\t|"; - } else { - err_bits |= 1 << ret; - cout<<" NA (Err:" <>boost_limit; - ret = amdsmi_set_cpu_core_boostlimit(processor_handles[i], i, boost_limit); - CHK_AMDSMI_RET(ret) - - if(ret != AMDSMI_STATUS_SUCCESS) - cout<<"Failed: to set core"<<"["<(socket_power)/1000<<"\t|"; + } else { + err_bits |= 1 << ret; + cout<<" NA (Err:" <(power_limit)/1000<<"\t|"; + } else { + err_bits |= 1 << ret; + cout<<" NA (Err:" <(power_max)/1000<<"\t|"; + } else { + err_bits |= 1 << ret; + cout<<" NA (Err:" <>min; - cout<<"\nEnter the XGMI max value to be set:\n"; - cin>>max; - - ret = amdsmi_set_cpu_xgmi_width(sockets[i], min, max); - CHK_AMDSMI_RET(ret) - - if(ret) - cout<<"Failed: to set xGMI link width, Err["<>min_link_width; - cout<<"\nEnter the GMI3 link width max value to be set:\n"; - cin>>max_link_width; - - ret = amdsmi_set_cpu_gmi3_link_width_range(sockets[i], i, min_link_width, max_link_width); - CHK_AMDSMI_RET(ret) - - if(ret) - cout<<"Failed to set gmi3 link width for socket["<>pstate; - ret = amdsmi_cpu_apb_disable(sockets[i], i, pstate); - CHK_AMDSMI_RET(ret) - - if(ret) - cout<<"Failed: to set socket["<>rate_ctrl; - - ret = amdsmi_set_cpu_pcie_link_rate(sockets[i], i, rate_ctrl, &prev_mode); - CHK_AMDSMI_RET(ret) - - if(ret != AMDSMI_STATUS_SUCCESS) - cout<<"Failed to set pcie link rate control for socket["<>max_pstate; - cout<<"\nEnter the min_pstate to be set:\n"; - cin>>min_pstate; - - ret = amdsmi_set_cpu_df_pstate_range(sockets[i], i, max_pstate, min_pstate); - CHK_AMDSMI_RET(ret) - - if(ret != AMDSMI_STATUS_SUCCESS) - cout<<"Failed to set df pstate range, Err["<(1) ; - ret = amdsmi_get_cpu_current_io_bandwidth(sockets[i], i, io_link, &bw); - CHK_AMDSMI_RET(ret) - - if(ret != AMDSMI_STATUS_SUCCESS) - cout<<"Failed to get io bandwidth width for socket ["<(1<>input_power; + ret = amdsmi_get_cpu_socket_power_cap_max(plist[i], &power_max); + CHK_AMDSMI_RET(ret) + if ((ret == AMDSMI_STATUS_SUCCESS) && (input_power > power_max)) { + cout<<"Input power is more than max power limit," + " limiting to "<(power_max)/1000<<"Watts\n"; + input_power = power_max; + } + ret = amdsmi_set_cpu_socket_power_cap(plist[i], input_power); + CHK_AMDSMI_RET(ret) + if (!ret) { + cout<<"Socket["<(input_power)/1000<<" Watts successfully\n"; + } + cout<<"\n-------------------------------------------------\n"; } - cout<<"\n-------------------------------------------------\n"; - } // Clean up resources allocated at amdsmi_init ret = amdsmi_shut_down(); diff --git a/include/amd_smi/amdsmi.h b/include/amd_smi/amdsmi.h index c25c6e6381..6946663574 100644 --- a/include/amd_smi/amdsmi.h +++ b/include/amd_smi/amdsmi.h @@ -71,7 +71,8 @@ typedef enum { AMDSMI_INIT_AMD_CPUS = (1 << 0), AMDSMI_INIT_AMD_GPUS = (1 << 1), AMDSMI_INIT_NON_AMD_CPUS = (1 << 2), - AMDSMI_INIT_NON_AMD_GPUS = (1 << 3) + AMDSMI_INIT_NON_AMD_GPUS = (1 << 3), + AMDSMI_INIT_AMD_APUS = (AMDSMI_INIT_AMD_CPUS | AMDSMI_INIT_AMD_GPUS) } amdsmi_init_flags_t; /* Maximum size definitions AMDSMI */ @@ -1626,32 +1627,67 @@ amdsmi_status_t amdsmi_get_socket_info( #ifdef ENABLE_ESMI_LIB /** - * @brief Get information about the given cpu socket + * @brief Get information about the given processor * - * @details This function retrieves cpu socket information. The @p socket_handle must - * be provided to retrieve the Socket ID. + * @details This function retrieves processor information. The @p processor_handle must + * be provided to retrieve the processor ID. * - * @param[in] socket_handle a socket handle + * @param[in] processor_handle a processor handle * - * @param[out] sockid The id of the socket. + * @param[out] name The id of the processor. + * + * @param[in] len the length of the caller provided buffer @p name. * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpusocket_info(amdsmi_cpusocket_handle socket_handle, uint32_t sockid); +amdsmi_status_t amdsmi_get_processor_info( + amdsmi_processor_handle processor_handle, + size_t len, char *name); /** - * @brief Get information about the given cpu core + * @brief Get respective processor counts from the processor handles * - * @details This function retrieves cpu core information. The @p core_handle must - * be provided to retrieve the core ID. + * @details This function retrieves respective processor counts information. + * The @p processor_handle must be provided to retrieve the processor ID. * - * @param[in] core_handle a processor handle + * @param[in] processor_handles A pointer to a block of memory to which the + * ::amdsmi_processor_handle values will be written. This value may be NULL. * - * @param[out] coreid The id of the core. + * @param[in] processor_count total processor count per socket + * + * @param[out] nr_cpusockets Total number of cpu sockets + * + * @param[out] nr_cpucores Total number of cpu cores + * + * @param[out] nr_gpus Total number of gpu devices * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpucore_info(amdsmi_processor_handle core_handle, uint32_t coreid); +amdsmi_status_t amdsmi_get_processor_count_from_handles(amdsmi_processor_handle* processor_handles, + uint32_t* processor_count, uint32_t* nr_cpusockets, + uint32_t* nr_cpucores, uint32_t* nr_gpus); + +/** + * @brief Get processor list as per processor type + * + * @details This function retrieves processor list as per the processor type + * from the total processor handles list. + * The @p list of processor_handles and processor type must be provided. + * + * @param[in] socket_handle socket handle + * + * @param[in] processor_type processor type + * + * @param[out] processor_handles list of processor handles as per processor type + * + * @param[out] processor_count processor count as per processor type selected + * + * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail + */ +amdsmi_status_t amdsmi_get_processor_handles_by_type(amdsmi_socket_handle socket_handle, + processor_type_t processor_type, + amdsmi_processor_handle* processor_handles, + uint32_t* processor_count); #endif /** @@ -5340,27 +5376,25 @@ amdsmi_get_gpu_metrics_log(amdsmi_processor_handle processor_handle); * @brief Get the core energy for a given core. * * @param[in] processor_handle Cpu core which to query - * @param[in] core_ind - cpu core index * * @param[in,out] penergy - Input buffer to return the core energy * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t amdsmi_get_cpu_core_energy(amdsmi_processor_handle processor_handle, - uint32_t core_ind, uint64_t *penergy); + uint64_t *penergy); /** * @brief Get the socket energy for a given socket. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * * @param[in,out] penergy - Input buffer to return the socket energy * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_socket_energy(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint64_t *penergy); +amdsmi_status_t amdsmi_get_cpu_socket_energy(amdsmi_processor_handle processor_handle, + uint64_t *penergy); /** @} */ @@ -5372,43 +5406,41 @@ amdsmi_status_t amdsmi_get_cpu_socket_energy(amdsmi_cpusocket_handle socket_hand /** * @brief Get SMU Firmware Version. * - * @param[in] socket_handle Cpu socket which to query + * @param[in] processor_handle Cpu socket which to query * @param[in,out] amdsmi_smu_fw - Input buffer to return the firmware version * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_smu_fw_version(amdsmi_cpusocket_handle socket_handle, - amdsmi_smu_fw_version_t *amdsmi_smu_fw); +amdsmi_status_t amdsmi_get_cpu_smu_fw_version(amdsmi_processor_handle processor_handle, + amdsmi_smu_fw_version_t *amdsmi_smu_fw); /** * @brief Get HSMP protocol Version. * - * @param[in] socket_handle Cpu socket which to query + * @param[in] processor_handle Cpu socket which to query * @param[in,out] proto_ver - Input buffer to return the protocol version * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_hsmp_proto_ver(amdsmi_cpusocket_handle socket_handle, - uint32_t *proto_ver); +amdsmi_status_t amdsmi_get_cpu_hsmp_proto_ver(amdsmi_processor_handle processor_handle, + uint32_t *proto_ver); /** * @brief Get normalized status of the processor's PROCHOT status. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * * @param[in,out] prochot - Input buffer to return the procohot status. * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_prochot_status(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *prochot); +amdsmi_status_t amdsmi_get_cpu_prochot_status(amdsmi_processor_handle processor_handle, + uint32_t *prochot); /** * @brief Get Data fabric clock and Memory clock in MHz. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * * @param[in,out] fclk - Input buffer to return fclk * @@ -5416,27 +5448,25 @@ amdsmi_status_t amdsmi_get_cpu_prochot_status(amdsmi_cpusocket_handle socket_han * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_fclk_mclk(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *fclk, uint32_t *mclk); +amdsmi_status_t amdsmi_get_cpu_fclk_mclk(amdsmi_processor_handle processor_handle, + uint32_t *fclk, uint32_t *mclk); /** * @brief Get core clock in MHz. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * * @param[in,out] cclk - Input buffer to return core clock * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_cclk_limit(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *cclk); +amdsmi_status_t amdsmi_get_cpu_cclk_limit(amdsmi_processor_handle processor_handle, + uint32_t *cclk); /** * @brief Get current active frequency limit of the socket. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * * @param[in,out] freq - Input buffer to return frequency value in MHz * @@ -5444,14 +5474,13 @@ amdsmi_status_t amdsmi_get_cpu_cclk_limit(amdsmi_cpusocket_handle socket_handle, * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_socket_current_active_freq_limit(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint16_t *freq, char **src_type); +amdsmi_status_t amdsmi_get_cpu_socket_current_active_freq_limit(amdsmi_processor_handle processor_handle, + uint16_t *freq, char **src_type); /** * @brief Get socket frequency range. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * * @param[in,out] fmax - Input buffer to return maximum frequency * @@ -5459,21 +5488,20 @@ amdsmi_status_t amdsmi_get_cpu_socket_current_active_freq_limit(amdsmi_cpusocket * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_socket_freq_range(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint16_t *fmax, uint16_t *fmin); +amdsmi_status_t amdsmi_get_cpu_socket_freq_range(amdsmi_processor_handle processor_handle, + uint16_t *fmax, uint16_t *fmin); /** * @brief Get socket frequency limit of the core. * * @param[in] processor_handle Cpu core which to query - * @param[in] core_ind - core index * * @param[in,out] freq - Input buffer to return frequency. * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t amdsmi_get_cpu_core_current_freq_limit(amdsmi_processor_handle processor_handle, - uint32_t core_ind, uint32_t *freq); + uint32_t *freq); /** @} */ @@ -5485,80 +5513,74 @@ amdsmi_status_t amdsmi_get_cpu_core_current_freq_limit(amdsmi_processor_handle p /** * @brief Get the socket power. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * * @param[in,out] ppower - Input buffer to return socket power * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_socket_power(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *ppower); +amdsmi_status_t amdsmi_get_cpu_socket_power(amdsmi_processor_handle processor_handle, + uint32_t *ppower); /** * @brief Get the socket power cap. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * * @param[in,out] pcap - Input buffer to return power cap. * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_socket_power_cap(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *pcap); +amdsmi_status_t amdsmi_get_cpu_socket_power_cap(amdsmi_processor_handle processor_handle, + uint32_t *pcap); /** * @brief Get the maximum power cap value for a given socket. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * * @param[in,out] pmax - Input buffer to return maximum power limit value * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_socket_power_cap_max(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *pmax); +amdsmi_status_t amdsmi_get_cpu_socket_power_cap_max(amdsmi_processor_handle processor_handle, + uint32_t *pmax); /** * @brief Get the SVI based power telemetry for all rails. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * * @param[in,out] power - Input buffer to return svi based power value * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_pwr_svi_telemetry_all_rails(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *power); +amdsmi_status_t amdsmi_get_cpu_pwr_svi_telemetry_all_rails(amdsmi_processor_handle processor_handle, + uint32_t *power); /** * @brief Set the power cap value for a given socket. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * * @param[in] power - Input power limit value * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_set_cpu_socket_power_cap(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t pcap); +amdsmi_status_t amdsmi_set_cpu_socket_power_cap(amdsmi_processor_handle processor_handle, + uint32_t pcap); /** * @brief Set the power efficiency profile policy. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * * @param[in] mode - mode to be set * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_set_cpu_pwr_efficiency_mode(amdsmi_cpusocket_handle socket_handle, - uint8_t sock_ind, uint8_t mode); +amdsmi_status_t amdsmi_set_cpu_pwr_efficiency_mode(amdsmi_processor_handle processor_handle, + uint8_t mode); /** @} */ @@ -5571,53 +5593,49 @@ amdsmi_status_t amdsmi_set_cpu_pwr_efficiency_mode(amdsmi_cpusocket_handle socke * @brief Get the core boost limit. * * @param[in] processor_handle Cpu core which to query - * @param[in] core_ind - core index * * @param[in,out] pboostlimit - Input buffer to fill the boostlimit value * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t amdsmi_get_cpu_core_boostlimit(amdsmi_processor_handle processor_handle, - uint32_t core_ind, uint32_t *pboostlimit); + uint32_t *pboostlimit); /** * @brief Get the socket c0 residency. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * * @param[in,out] pc0_residency - Input buffer to fill the c0 residency value * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_socket_c0_residency(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *pc0_residency); +amdsmi_status_t amdsmi_get_cpu_socket_c0_residency(amdsmi_processor_handle processor_handle, + uint32_t *pc0_residency); /** * @brief Set the core boostlimit value. * * @param[in] processor_handle Cpu core which to query - * @param[in] core_ind - core index * * @param[in] boostlimit - boostlimit value to be set * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t amdsmi_set_cpu_core_boostlimit(amdsmi_processor_handle processor_handle, - uint32_t core_ind, uint32_t boostlimit); + uint32_t boostlimit); /** * @brief Set the socket boostlimit value. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * * @param[in] boostlimit - boostlimit value to be set * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_set_cpu_socket_boostlimit(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t boostlimit); +amdsmi_status_t amdsmi_set_cpu_socket_boostlimit(amdsmi_processor_handle processor_handle, + uint32_t boostlimit); /** @} */ @@ -5629,13 +5647,13 @@ amdsmi_status_t amdsmi_set_cpu_socket_boostlimit(amdsmi_cpusocket_handle socket_ /** * @brief Get the DDR bandwidth data. * - * @param[in] socket_handle Cpu socket which to query + * @param[in] processor_handle Cpu socket which to query * @param[in,out] ddr_bw - Input buffer to fill ddr bandwidth data * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_ddr_bw(amdsmi_cpusocket_handle socket_handle, - amdsmi_ddr_bw_metrics_t *ddr_bw); +amdsmi_status_t amdsmi_get_cpu_ddr_bw(amdsmi_processor_handle processor_handle, + amdsmi_ddr_bw_metrics_t *ddr_bw); /** @} */ @@ -5647,15 +5665,14 @@ amdsmi_status_t amdsmi_get_cpu_ddr_bw(amdsmi_cpusocket_handle socket_handle, /** * @brief Get socket temperature. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * * @param[in,out] ptmon - Input buffer to fill temperature value * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_socket_temperature(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *ptmon); +amdsmi_status_t amdsmi_get_cpu_socket_temperature(amdsmi_processor_handle processor_handle, + uint32_t *ptmon); /** @} */ @@ -5667,41 +5684,41 @@ amdsmi_status_t amdsmi_get_cpu_socket_temperature(amdsmi_cpusocket_handle socket /** * @brief Get DIMM temperature range and refresh rate. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * @param[in] dimm_addr - DIMM address * @param[in,out] rate - Input buffer to fill temperature range and refresh rate value * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_dimm_temp_range_and_refresh_rate(amdsmi_cpusocket_handle socket_handle, - uint8_t sock_ind, uint8_t dimm_addr, amdsmi_temp_range_refresh_rate_t *rate); +amdsmi_status_t amdsmi_get_cpu_dimm_temp_range_and_refresh_rate(amdsmi_processor_handle processor_handle, + uint8_t dimm_addr, + amdsmi_temp_range_refresh_rate_t *rate); /** * @brief Get DIMM power consumption. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * @param[in] dimm_addr - DIMM address * @param[in,out] rate - Input buffer to fill power consumption value * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_dimm_power_consumption(amdsmi_cpusocket_handle socket_handle, - uint8_t sock_ind, uint8_t dimm_addr, amdsmi_dimm_power_t *dimm_pow); +amdsmi_status_t amdsmi_get_cpu_dimm_power_consumption(amdsmi_processor_handle processor_handle, + uint8_t dimm_addr, + amdsmi_dimm_power_t *dimm_pow); /** * @brief Get DIMM thermal sensor value. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * @param[in] dimm_addr - DIMM address * @param[in,out] dimm_temp - Input buffer to fill temperature value * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_dimm_thermal_sensor(amdsmi_cpusocket_handle socket_handle, - uint8_t sock_ind, uint8_t dimm_addr, amdsmi_dimm_thermal_t *dimm_temp); +amdsmi_status_t amdsmi_get_cpu_dimm_thermal_sensor(amdsmi_processor_handle processor_handle, + uint8_t dimm_addr, + amdsmi_dimm_thermal_t *dimm_temp); /** @} */ @@ -5713,13 +5730,13 @@ amdsmi_status_t amdsmi_get_cpu_dimm_thermal_sensor(amdsmi_cpusocket_handle socke /** * @brief Set xgmi width. * - * @param[in] socket_handle Cpu socket which to query + * @param[in] processor_handle Cpu socket which to query * @param[in] min - Minimum xgmi width to be set * @param[in] max - maximum xgmi width to be set * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_set_cpu_xgmi_width(amdsmi_cpusocket_handle socket_handle, - uint8_t min, uint8_t max); +amdsmi_status_t amdsmi_set_cpu_xgmi_width(amdsmi_processor_handle processor_handle, + uint8_t min, uint8_t max); /** @} */ @@ -5731,15 +5748,14 @@ amdsmi_status_t amdsmi_set_cpu_xgmi_width(amdsmi_cpusocket_handle socket_handle, /** * @brief Set gmi3 link width range. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * @param[in] min_link_width - minimum link width to be set. * @param[in] max_link_width - maximum link width to be set. * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_set_cpu_gmi3_link_width_range(amdsmi_cpusocket_handle socket_handle, - uint8_t sock_ind, uint8_t min_link_width, uint8_t max_link_width); +amdsmi_status_t amdsmi_set_cpu_gmi3_link_width_range(amdsmi_processor_handle processor_handle, + uint8_t min_link_width, uint8_t max_link_width); /** @} */ @@ -5751,78 +5767,72 @@ amdsmi_status_t amdsmi_set_cpu_gmi3_link_width_range(amdsmi_cpusocket_handle soc /** * @brief Enable APB. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_cpu_apb_enable(amdsmi_cpusocket_handle socket_handle, uint32_t sock_ind); +amdsmi_status_t amdsmi_cpu_apb_enable(amdsmi_processor_handle processor_handle); /** * @brief Disable APB. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * * @param[in] pstate - pstate value to be set * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_cpu_apb_disable(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint8_t pstate); +amdsmi_status_t amdsmi_cpu_apb_disable(amdsmi_processor_handle processor_handle, + uint8_t pstate); /** * @brief Set NBIO lclk dpm level value. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * @param[in] nbio_id - nbio index * @param[in] min - minimum value to be set * @param[in] max - maximum value to be set * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_set_cpu_socket_lclk_dpm_level(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint8_t nbio_id, uint8_t min, uint8_t max); +amdsmi_status_t amdsmi_set_cpu_socket_lclk_dpm_level(amdsmi_processor_handle processor_handle, + uint8_t nbio_id, uint8_t min, uint8_t max); /** * @brief Get NBIO LCLK dpm level. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * @param[in] nbio_id - nbio index * @param[in,out] nbio - Input buffer to fill lclk dpm level * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_socket_lclk_dpm_level(amdsmi_cpusocket_handle socket_handle, - uint8_t sock_ind, uint8_t nbio_id, amdsmi_dpm_level_t *nbio); +amdsmi_status_t amdsmi_get_cpu_socket_lclk_dpm_level(amdsmi_processor_handle processor_handle, + uint8_t nbio_id, amdsmi_dpm_level_t *nbio); /** * @brief Set pcie link rate. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * @param[in] rate_ctrl - rate control value to be set. * @param[in,out] prev_mode - Input buffer to fill previous rate control value. * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_set_cpu_pcie_link_rate(amdsmi_cpusocket_handle socket_handle, - uint8_t sock_ind, uint8_t rate_ctrl, uint8_t *prev_mode); +amdsmi_status_t amdsmi_set_cpu_pcie_link_rate(amdsmi_processor_handle processor_handle, + uint8_t rate_ctrl, uint8_t *prev_mode); /** * @brief Set df pstate range. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * @param[in] max_pstate - maximum pstate value to be set * @param[in] min_pstate - minimum pstate value to be set * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_set_cpu_df_pstate_range(amdsmi_cpusocket_handle socket_handle, - uint8_t sock_ind, uint8_t max_pstate, uint8_t min_pstate); +amdsmi_status_t amdsmi_set_cpu_df_pstate_range(amdsmi_processor_handle processor_handle, + uint8_t max_pstate, uint8_t min_pstate); /** @} */ @@ -5834,27 +5844,26 @@ amdsmi_status_t amdsmi_set_cpu_df_pstate_range(amdsmi_cpusocket_handle socket_ha /** * @brief Get current input output bandwidth. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * @param[in] link - link id and bw type to which io bandwidth to be obtained * @param[in,out] io_bw - Input buffer to fill bandwidth data * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_current_io_bandwidth(amdsmi_cpusocket_handle socket_handle, - uint8_t sock_ind, amdsmi_link_id_bw_type_t link, uint32_t *io_bw); +amdsmi_status_t amdsmi_get_cpu_current_io_bandwidth(amdsmi_processor_handle processor_handle, + amdsmi_link_id_bw_type_t link, uint32_t *io_bw); /** * @brief Get current input output bandwidth. * - * @param[in] socket_handle Cpu socket which to query + * @param[in] processor_handle Cpu socket which to query * @param[in] link - link id and bw type to which xgmi bandwidth to be obtained * @param[in,out] xgmi_bw - Input buffer to fill bandwidth data * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_current_xgmi_bw(amdsmi_cpusocket_handle socket_handle, - amdsmi_link_id_bw_type_t link, uint32_t *xgmi_bw); +amdsmi_status_t amdsmi_get_cpu_current_xgmi_bw(amdsmi_processor_handle processor_handle, + amdsmi_link_id_bw_type_t link, uint32_t *xgmi_bw); /** @} */ @@ -5866,25 +5875,24 @@ amdsmi_status_t amdsmi_get_cpu_current_xgmi_bw(amdsmi_cpusocket_handle socket_ha /** * @brief Get metrics table version * - * @param[in] socket_handle Cpu socket which to query + * @param[in] processor_handle Cpu socket which to query * @param[in,out] metrics_version input buffer to return the metrics table version. * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_metrics_table_version(amdsmi_cpusocket_handle socket_handle, - uint32_t *metrics_version); +amdsmi_status_t amdsmi_get_metrics_table_version(amdsmi_processor_handle processor_handle, + uint32_t *metrics_version); /** * @brief Get metrics table * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * @param[in,out] metrics_table input buffer to return the metrics table. * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_metrics_table(amdsmi_cpusocket_handle socket_handle, uint8_t sock_ind, - struct hsmp_metric_table *metrics_table); +amdsmi_status_t amdsmi_get_metrics_table(amdsmi_processor_handle processor_handle, + struct hsmp_metric_table *metrics_table); /** @} */ @@ -5896,15 +5904,14 @@ amdsmi_status_t amdsmi_get_metrics_table(amdsmi_cpusocket_handle socket_handle, /** * @brief Get first online core on socket. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index. + * @param[in] processor_handle Cpu socket which to query * - * @param[in,out] sockets - Input buffer to fill first online core on socket data + * @param[in,out] pcore_ind - Input buffer to fill first online core on socket data * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_first_online_core_on_cpu_socket(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *pcore_ind); +amdsmi_status_t amdsmi_first_online_core_on_cpu_socket(amdsmi_processor_handle processor_handle, + uint32_t *pcore_ind); /** * @brief Get a description of provided AMDSMI error status for esmi errors. diff --git a/include/amd_smi/impl/amd_smi_cpu_core.h b/include/amd_smi/impl/amd_smi_cpu_core.h deleted file mode 100644 index e623cf7b47..0000000000 --- a/include/amd_smi/impl/amd_smi_cpu_core.h +++ /dev/null @@ -1,76 +0,0 @@ -/* - * ============================================================================= - * The University of Illinois/NCSA - * Open Source License (NCSA) - * - * Copyright (c) 2023, Advanced Micro Devices, Inc. - * All rights reserved. - * - * Developed by: - * - * AMD Research and AMD ROC Software Development - * - * Advanced Micro Devices, Inc. - * - * www.amd.com - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal with the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * - Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimers. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimers in - * the documentation and/or other materials provided with the distribution. - * - Neither the names of , - * nor the names of its contributors may be used to endorse or promote - * products derived from this Software without specific prior written - * permission. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS WITH THE SOFTWARE. - * - */ - -#ifndef AMD_SMI_INCLUDE_AMD_SMI_CPU_CORE_H_ -#define AMD_SMI_INCLUDE_AMD_SMI_CPU_CORE_H_ - -#include -#include -#include -#include "amd_smi/amdsmi.h" -#include "amd_smi/impl/amd_smi_processor.h" - -namespace amd { -namespace smi { - -/*Subclass CPU Core*/ -class AMDSmiCpuCore : public AMDSmiProcessor { -public: - explicit AMDSmiCpuCore(const uint32_t& core_idx):AMDSmiProcessor(AMD_CPU_CORE),core_idx_(core_idx) {} - - virtual ~AMDSmiCpuCore() {} - - const uint32_t& get_core_id() const { return core_idx_; } - void add_processor(AMDSmiProcessor* processor) { processors_.push_back(processor); } - std::vector& get_processors() { return processors_;} - amdsmi_status_t get_processor_count(uint32_t* processor_count) const; - -private: - uint32_t core_idx_; - std::vector processors_; -}; - -} // namespace smi -} // namespace amd - -#endif // AMD_SMI_INCLUDE_AMD_SMI_CPU_CORE_H_ diff --git a/include/amd_smi/impl/amd_smi_cpu_socket.h b/include/amd_smi/impl/amd_smi_cpu_socket.h deleted file mode 100644 index 9403db201d..0000000000 --- a/include/amd_smi/impl/amd_smi_cpu_socket.h +++ /dev/null @@ -1,81 +0,0 @@ -/* - * ============================================================================= - * The University of Illinois/NCSA - * Open Source License (NCSA) - * - * Copyright (c) 2023, Advanced Micro Devices, Inc. - * All rights reserved. - * - * Developed by: - * - * AMD Research and AMD ROC Software Development - * - * Advanced Micro Devices, Inc. - * - * www.amd.com - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal with the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * - Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimers. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimers in - * the documentation and/or other materials provided with the distribution. - * - Neither the names of , - * nor the names of its contributors may be used to endorse or promote - * products derived from this Software without specific prior written - * permission. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS WITH THE SOFTWARE. - * - */ - -#ifndef AMD_SMI_INCLUDE_AMD_SMI_CPU_SOCKET_H_ -#define AMD_SMI_INCLUDE_AMD_SMI_CPU_SOCKET_H_ - -#include -#include -#include -#include "amd_smi/amdsmi.h" -#include "amd_smi/impl/amd_smi_processor.h" -#include "amd_smi/impl/amd_smi_cpu_core.h" - -namespace amd { -namespace smi { - -/*Subclass CPU Socket*/ -class AMDSmiCpuSocket : public AMDSmiProcessor { - public: - explicit AMDSmiCpuSocket(const uint32_t& id):AMDSmiProcessor(AMD_CPU),socket_identifier_(id) {} - - virtual ~AMDSmiCpuSocket() {} - - amdsmi_status_t get_cpu_vendor() { return AMDSMI_STATUS_SUCCESS; } - uint32_t get_cpu_id() const { return cpu_id_; } - const uint32_t& get_socket_id() const { return socket_identifier_; } - - void add_processor(AMDSmiProcessor* processor) { processors_.push_back(processor); } - std::vector& get_processors() { return processors_;} - amdsmi_status_t get_processor_count(uint32_t* processor_count) const; - - private: - uint32_t cpu_id_; - uint32_t socket_identifier_; - std::vector processors_; -}; - -} // namespace smi -} // namespace amd - -#endif // AMD_SMI_INCLUDE_AMD_SMI_CPU_SOCKET_H_ diff --git a/include/amd_smi/impl/amd_smi_processor.h b/include/amd_smi/impl/amd_smi_processor.h index 2e20f2b75f..8188438e96 100644 --- a/include/amd_smi/impl/amd_smi_processor.h +++ b/include/amd_smi/impl/amd_smi_processor.h @@ -44,6 +44,7 @@ #ifndef AMD_SMI_INCLUDE_AMD_SMI_PROCESSOR_H_ #define AMD_SMI_INCLUDE_AMD_SMI_PROCESSOR_H_ +#include #include "amd_smi/amdsmi.h" namespace amd { @@ -51,14 +52,18 @@ namespace smi { class AMDSmiProcessor { public: - explicit AMDSmiProcessor(processor_type_t processor) : processor_type_(processor) {} + explicit AMDSmiProcessor(processor_type_t type) : processor_type_(type) {} + explicit AMDSmiProcessor(processor_type_t type, uint32_t index) : processor_type_(type), pindex_(index) {} + explicit AMDSmiProcessor(const std::string& id) : processor_identifier_(id) {} virtual ~AMDSmiProcessor() {} processor_type_t get_processor_type() const { return processor_type_;} + const std::string& get_processor_id() const { return processor_identifier_;} + uint32_t get_processor_index() const { return pindex_;} private: processor_type_t processor_type_; + uint32_t pindex_; + std::string processor_identifier_; }; - - } // namespace smi } // namespace amd diff --git a/include/amd_smi/impl/amd_smi_socket.h b/include/amd_smi/impl/amd_smi_socket.h index e8a3ab567a..dbbfdae970 100644 --- a/include/amd_smi/impl/amd_smi_socket.h +++ b/include/amd_smi/impl/amd_smi_socket.h @@ -56,14 +56,46 @@ namespace smi { class AMDSmiSocket { public: explicit AMDSmiSocket(const std::string& id) : socket_identifier_(id) {} + explicit AMDSmiSocket(uint32_t index) : sindex_(index) {} ~AMDSmiSocket(); const std::string& get_socket_id() const { return socket_identifier_;} - void add_processor(AMDSmiProcessor* processor) { processors_.push_back(processor); } + uint32_t get_socket_index() { return sindex_;} + void add_processor(AMDSmiProcessor* processor) { + switch (processor->get_processor_type()) { + case AMD_GPU: + processors_.push_back(processor); + break; + case AMD_CPU: + cpu_processors_.push_back(processor); + break; + case AMD_CPU_CORE: + cpu_core_processors_.push_back(processor); + break; + default: + break; + } + } std::vector& get_processors() { return processors_;} + std::vector& get_processors(processor_type_t type) { + switch (type) { + case AMD_GPU: + return processors_; + case AMD_CPU: + return cpu_processors_; + case AMD_CPU_CORE: + return cpu_core_processors_; + default: + return processors_; + } + } amdsmi_status_t get_processor_count(uint32_t* processor_count) const; + amdsmi_status_t get_processor_count(processor_type_t type, uint32_t* processor_count) const; private: + uint32_t sindex_; std::string socket_identifier_; std::vector processors_; + std::vector cpu_processors_; + std::vector cpu_core_processors_; }; } // namespace smi diff --git a/include/amd_smi/impl/amd_smi_system.h b/include/amd_smi/impl/amd_smi_system.h index 596c909204..9e1004aa3c 100644 --- a/include/amd_smi/impl/amd_smi_system.h +++ b/include/amd_smi/impl/amd_smi_system.h @@ -50,9 +50,6 @@ #include "amd_smi/impl/amd_smi_socket.h" #include "amd_smi/impl/amd_smi_processor.h" #include "amd_smi/impl/amd_smi_drm.h" -#ifdef ENABLE_ESMI_LIB -#include "amd_smi/impl/amd_smi_cpu_socket.h" -#endif namespace amd { namespace smi { @@ -78,25 +75,6 @@ class AMDSmiSystem { amdsmi_status_t gpu_index_to_handle(uint32_t gpu_index, amdsmi_processor_handle* processor_handle); -#ifdef ENABLE_ESMI_LIB - std::vector& get_cpu_sockets() {return cpu_sockets_;} - - amdsmi_status_t handle_to_cpusocket(amdsmi_cpusocket_handle cpusock_handle, - AMDSmiCpuSocket** cpu_socket); - - amdsmi_status_t cpu_index_to_handle(uint32_t cpu_index, - amdsmi_cpusocket_handle* cpusock_handle); - - amdsmi_status_t get_cpu_sockets(uint32_t *socks); - - amdsmi_status_t get_cpu_cores(uint32_t *cpus); - - amdsmi_status_t get_threads_per_core(uint32_t *threads); - - amdsmi_status_t get_cpu_family(uint32_t *family); - - amdsmi_status_t get_cpu_model(uint32_t *model); -#endif private: AMDSmiSystem() : init_flag_(AMDSMI_INIT_AMD_GPUS) {} @@ -106,23 +84,12 @@ class AMDSmiSystem { */ amdsmi_status_t get_gpu_socket_id(uint32_t index, std::string& socketid); amdsmi_status_t populate_amd_gpu_devices(); + amdsmi_status_t populate_amd_cpus(); uint64_t init_flag_; AMDSmiDrm drm_; std::vector sockets_; std::set processors_; // Track valid processors -#ifdef ENABLE_ESMI_LIB - amdsmi_status_t populate_amd_cpus(); - std::vector cpu_sockets_; - static uint32_t sockets; - static uint32_t cpus; - static uint32_t threads; - static uint32_t family; - static uint32_t model; -#endif }; - - - } // namespace smi } // namespace amd diff --git a/src/amd_smi/amd_smi.cc b/src/amd_smi/amd_smi.cc index d9bfbc9e91..30faf129ec 100644 --- a/src/amd_smi/amd_smi.cc +++ b/src/amd_smi/amd_smi.cc @@ -69,13 +69,12 @@ #include "amd_smi/impl/amd_smi_utils.h" #include "amd_smi/impl/amd_smi_processor.h" #include "rocm_smi/rocm_smi_logger.h" -#ifdef ENABLE_ESMI_LIB - #include "amd_smi/impl/amd_smi_cpu_socket.h" - #include "amd_smi/impl/amd_smi_cpu_core.h" -#endif static bool initialized_lib = false; +#define SIZE 10 +char proc_id[SIZE] = "\0"; + #define AMDSMI_CHECK_INIT() do { \ if (!initialized_lib) { \ return AMDSMI_STATUS_NOT_INIT; \ @@ -103,49 +102,6 @@ static amdsmi_status_t get_gpu_device_from_handle(amdsmi_processor_handle proces return AMDSMI_STATUS_NOT_SUPPORTED; } -#ifdef ENABLE_ESMI_LIB -static amdsmi_status_t get_cpu_socket_from_handle(amdsmi_cpusocket_handle socket_handle, - amd::smi::AMDSmiCpuSocket** cpusocket) { - - AMDSMI_CHECK_INIT(); - - if (socket_handle == nullptr || cpusocket == nullptr) - return AMDSMI_STATUS_INVAL; - - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = amd::smi::AMDSmiSystem::getInstance() - .handle_to_cpusocket(socket_handle, &socket); - if (r != AMDSMI_STATUS_SUCCESS) return r; - - if (socket->get_processor_type() == AMD_CPU) { - *cpusocket = static_cast(socket_handle); - return AMDSMI_STATUS_SUCCESS; - } - - return AMDSMI_STATUS_NOT_SUPPORTED; -} - -static amdsmi_status_t get_cpu_core_from_handle(amdsmi_processor_handle processor_handle, - amd::smi::AMDSmiCpuCore** cpucore) { - - AMDSMI_CHECK_INIT(); - if (processor_handle == nullptr || cpucore == nullptr) - return AMDSMI_STATUS_INVAL; - - amd::smi::AMDSmiProcessor* core = nullptr; - amdsmi_status_t r = amd::smi::AMDSmiSystem::getInstance() - .handle_to_processor(processor_handle, &core); - if (r != AMDSMI_STATUS_SUCCESS) return r; - - if (core->get_processor_type() == AMD_CPU_CORE) { - *cpucore = static_cast(processor_handle); - return AMDSMI_STATUS_SUCCESS; - } - - return AMDSMI_STATUS_NOT_SUPPORTED; -} -#endif - template amdsmi_status_t rsmi_wrapper(F && f, amdsmi_processor_handle processor_handle, Args &&... args) { @@ -163,24 +119,6 @@ amdsmi_status_t rsmi_wrapper(F && f, return amd::smi::rsmi_to_amdsmi_status(rstatus); } -#ifdef ENABLE_ESMI_LIB -template -amdsmi_status_t esmi_wrapper(F && f, - amdsmi_processor_handle processor_handle, Args &&... args) { - - AMDSMI_CHECK_INIT(); - - amd::smi::AMDSmiCpuSocket* cpu_socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(processor_handle, &cpu_socket); - if (r != AMDSMI_STATUS_SUCCESS) return r; - - uint32_t cpu_index = cpu_socket->get_cpu_id(); - auto estatus = std::forward(f)(cpu_index, - std::forward(args)...); - return amd::smi::esmi_to_amdsmi_status(estatus); -} -#endif - amdsmi_status_t amdsmi_init(uint64_t flags) { if (initialized_lib) @@ -232,37 +170,6 @@ amdsmi_status_code_to_string(amdsmi_status_t status, const char **status_string) return AMDSMI_STATUS_SUCCESS; } -#ifdef ENABLE_ESMI_LIB -amdsmi_status_t amdsmi_get_cpusocket_handles(uint32_t *socket_count, - amdsmi_cpusocket_handle* socket_handles) { - - AMDSMI_CHECK_INIT(); - if (socket_count == nullptr) { - return AMDSMI_STATUS_INVAL; - } - - std::vector& sockets - = amd::smi::AMDSmiSystem::getInstance().get_cpu_sockets(); - uint32_t socket_size = static_cast(sockets.size()); - - // Get the socket size - if (socket_handles == nullptr) { - *socket_count = socket_size; - return AMDSMI_STATUS_SUCCESS; - } - - // If the socket_handles can hold all sockets, return all of them. - *socket_count = *socket_count >= socket_size ? socket_size : *socket_count; - - // Copy the cpu socket handles - for (uint32_t i = 0; i < *socket_count; i++) { - socket_handles[i] = reinterpret_cast(sockets[i]); - } - - return AMDSMI_STATUS_SUCCESS; -} -#endif - amdsmi_status_t amdsmi_get_socket_handles(uint32_t *socket_count, amdsmi_socket_handle* socket_handles) { @@ -313,40 +220,23 @@ amdsmi_status_t amdsmi_get_socket_info( } #ifdef ENABLE_ESMI_LIB -amdsmi_status_t amdsmi_get_cpusocket_info( - amdsmi_cpusocket_handle socket_handle, - uint32_t sock_id) { +amdsmi_status_t amdsmi_get_processor_info( + amdsmi_processor_handle processor_handle, + size_t len, char *name) { + char proc_id[10]; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) { + if (processor_handle == nullptr || name == nullptr) { return AMDSMI_STATUS_INVAL; } - amd::smi::AMDSmiCpuSocket* socket = nullptr; + amd::smi::AMDSmiProcessor* processor = nullptr; amdsmi_status_t r = amd::smi::AMDSmiSystem::getInstance() - .handle_to_cpusocket(socket_handle, &socket); + .handle_to_processor(processor_handle, &processor); if (r != AMDSMI_STATUS_SUCCESS) return r; - sock_id = socket->get_socket_id(); - - return AMDSMI_STATUS_SUCCESS; -} - -amdsmi_status_t amdsmi_get_cpucore_info( - amdsmi_processor_handle core_handle, - uint32_t core_id) { - AMDSMI_CHECK_INIT(); - - if (core_handle == nullptr) { - return AMDSMI_STATUS_INVAL; - } - - amd::smi::AMDSmiProcessor* core = nullptr; - amdsmi_status_t r = amd::smi::AMDSmiSystem::getInstance() - .handle_to_processor(core_handle, &core); - if (r != AMDSMI_STATUS_SUCCESS) return r; - - core_id = static_cast(core)->get_core_id(); + sprintf(proc_id, "%d", processor->get_processor_index()); + strncpy(name, proc_id, len); return AMDSMI_STATUS_SUCCESS; } @@ -388,34 +278,63 @@ amdsmi_status_t amdsmi_get_processor_handles(amdsmi_socket_handle socket_handle, } #ifdef ENABLE_ESMI_LIB -amdsmi_status_t amdsmi_get_cpucore_handles(amdsmi_cpusocket_handle socket_handle, - uint32_t* processor_count, - amdsmi_processor_handle* processor_handles) { +amdsmi_status_t amdsmi_get_processor_count_from_handles(amdsmi_processor_handle* processor_handles, + uint32_t* processor_count, uint32_t* nr_cpusockets, + uint32_t* nr_cpucores, uint32_t* nr_gpus) { + AMDSMI_CHECK_INIT(); + uint32_t count_cpusockets = 0; + uint32_t count_cpucores = 0; + uint32_t count_gpus = 0; + processor_type_t processor_type; + + if (processor_count == nullptr || processor_handles == nullptr) { + return AMDSMI_STATUS_INVAL; + } + + for (uint32_t i = 0; i < *processor_count; i++) { + amdsmi_status_t r = amdsmi_get_processor_type(processor_handles[i], + &processor_type); + if (r != AMDSMI_STATUS_SUCCESS) return r; + + if(processor_type == AMD_CPU) { + count_cpusockets++; + } else if(processor_type == AMD_CPU_CORE) { + count_cpucores++; + } else if(processor_type == AMD_GPU) { + count_gpus++; + } + } + *nr_cpusockets = count_cpusockets; + *nr_cpucores = count_cpucores; + *nr_gpus = count_gpus; + + return AMDSMI_STATUS_SUCCESS; +} + +amdsmi_status_t amdsmi_get_processor_handles_by_type(amdsmi_socket_handle socket_handle, + processor_type_t processor_type, + amdsmi_processor_handle* processor_handles, + uint32_t* processor_count) { + AMDSMI_CHECK_INIT(); if (processor_count == nullptr) { return AMDSMI_STATUS_INVAL; } // Get the socket object via socket handle. - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = amd::smi::AMDSmiSystem::getInstance() - .handle_to_cpusocket(socket_handle, &socket); + amd::smi::AMDSmiSocket* socket = nullptr; + amdsmi_status_t r = amd::smi::AMDSmiSystem::getInstance().handle_to_socket(socket_handle, &socket); if (r != AMDSMI_STATUS_SUCCESS) return r; - - - std::vector& processors = socket->get_processors(); + std::vector& processors = socket->get_processors(processor_type); uint32_t processor_size = static_cast(processors.size()); - // Get the processor count only if (processor_handles == nullptr) { *processor_count = processor_size; return AMDSMI_STATUS_SUCCESS; } - // If the processor_handles can hold all processors, return all of them. *processor_count = *processor_count >= processor_size ? processor_size : *processor_count; - // Copy the processor handles for (uint32_t i = 0; i < *processor_count; i++) { processor_handles[i] = reinterpret_cast(processors[i]); @@ -423,8 +342,9 @@ amdsmi_status_t amdsmi_get_cpucore_handles(amdsmi_cpusocket_handle socket_handle return AMDSMI_STATUS_SUCCESS; } -#endif + +#endif amdsmi_status_t amdsmi_get_processor_type(amdsmi_processor_handle processor_handle , processor_type_t* processor_type) { @@ -2640,7 +2560,7 @@ amdsmi_get_gpu_metrics_avg_soc_clock_frequency(amdsmi_processor_handle processor return rsmi_wrapper(rsmi_dev_metrics_avg_soc_clock_frequency_get, processor_handle, clock_frequency_value); -} +} amdsmi_status_t amdsmi_get_gpu_metrics_avg_uclock_frequency(amdsmi_processor_handle processor_handle, @@ -2764,7 +2684,7 @@ amdsmi_get_gpu_metrics_log(amdsmi_processor_handle processor_handle) #ifdef ENABLE_ESMI_LIB -amdsmi_status_t amdsmi_get_cpu_hsmp_proto_ver(amdsmi_cpusocket_handle socket_handle, +amdsmi_status_t amdsmi_get_cpu_hsmp_proto_ver(amdsmi_processor_handle processor_handle, uint32_t *proto_ver) { amdsmi_status_t status; @@ -2772,14 +2692,9 @@ amdsmi_status_t amdsmi_get_cpu_hsmp_proto_ver(amdsmi_cpusocket_handle socket_han AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); - if (r != AMDSMI_STATUS_SUCCESS) - return r; - status = static_cast(esmi_hsmp_proto_ver_get(&hsmp_proto_ver)); *proto_ver = hsmp_proto_ver; @@ -2789,27 +2704,22 @@ amdsmi_status_t amdsmi_get_cpu_hsmp_proto_ver(amdsmi_cpusocket_handle socket_han return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_cpu_smu_fw_version(amdsmi_cpusocket_handle socket_handle, - amdsmi_smu_fw_version_t *amdsmi_smu_fw) +amdsmi_status_t amdsmi_get_cpu_smu_fw_version(amdsmi_processor_handle processor_handle, + amdsmi_smu_fw_version_t *amdsmi_smu_fw) { amdsmi_status_t status; struct smu_fw_version smu_fw; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); - if (r != AMDSMI_STATUS_SUCCESS) - return r; - status = static_cast(esmi_smu_fw_version_get(&smu_fw)); amdsmi_smu_fw->major = smu_fw.major; - amdsmi_smu_fw->minor = smu_fw.minor; - amdsmi_smu_fw->debug = smu_fw.debug; + amdsmi_smu_fw->minor = smu_fw.minor; + amdsmi_smu_fw->debug = smu_fw.debug; if (status != AMDSMI_STATUS_SUCCESS) return status; @@ -2818,21 +2728,23 @@ amdsmi_status_t amdsmi_get_cpu_smu_fw_version(amdsmi_cpusocket_handle socket_han } amdsmi_status_t amdsmi_get_cpu_core_energy(amdsmi_processor_handle processor_handle, - uint32_t core_ind, uint64_t *penergy) + uint64_t *penergy) { amdsmi_status_t status; uint64_t core_input; + uint32_t core_ind; AMDSMI_CHECK_INIT(); if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuCore* core = nullptr; - amdsmi_status_t r = get_cpu_core_from_handle(processor_handle, &core); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + core_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_core_energy_get(core_ind, &core_input)); *penergy = core_input; @@ -2843,22 +2755,24 @@ amdsmi_status_t amdsmi_get_cpu_core_energy(amdsmi_processor_handle processor_han } -amdsmi_status_t amdsmi_get_cpu_socket_energy(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint64_t *penergy) +amdsmi_status_t amdsmi_get_cpu_socket_energy(amdsmi_processor_handle processor_handle, + uint64_t *penergy) { amdsmi_status_t status; uint64_t pkg_input; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_socket_energy_get(sock_ind, &pkg_input)); *penergy = pkg_input; @@ -2868,22 +2782,24 @@ amdsmi_status_t amdsmi_get_cpu_socket_energy(amdsmi_cpusocket_handle socket_hand return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_cpu_prochot_status(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *prochot) +amdsmi_status_t amdsmi_get_cpu_prochot_status(amdsmi_processor_handle processor_handle, + uint32_t *prochot) { amdsmi_status_t status; uint32_t phot; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_prochot_status_get(sock_ind, &phot)); *prochot = phot; @@ -2893,22 +2809,24 @@ amdsmi_status_t amdsmi_get_cpu_prochot_status(amdsmi_cpusocket_handle socket_han return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_cpu_fclk_mclk(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *fclk, uint32_t *mclk) +amdsmi_status_t amdsmi_get_cpu_fclk_mclk(amdsmi_processor_handle processor_handle, + uint32_t *fclk, uint32_t *mclk) { amdsmi_status_t status; uint32_t f_clk, m_clk; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_fclk_mclk_get(sock_ind, &f_clk, &m_clk)); *fclk = f_clk; *mclk = m_clk; @@ -2919,22 +2837,24 @@ amdsmi_status_t amdsmi_get_cpu_fclk_mclk(amdsmi_cpusocket_handle socket_handle, return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_cpu_cclk_limit(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *cclk) +amdsmi_status_t amdsmi_get_cpu_cclk_limit(amdsmi_processor_handle processor_handle, + uint32_t *cclk) { amdsmi_status_t status; uint32_t c_clk; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_cclk_limit_get(sock_ind, &c_clk)); *cclk = c_clk; @@ -2944,22 +2864,24 @@ amdsmi_status_t amdsmi_get_cpu_cclk_limit(amdsmi_cpusocket_handle socket_handle, return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_cpu_socket_current_active_freq_limit(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint16_t *freq, char **src_type) +amdsmi_status_t amdsmi_get_cpu_socket_current_active_freq_limit(amdsmi_processor_handle processor_handle, + uint16_t *freq, char **src_type) { amdsmi_status_t status; uint16_t limit; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_socket_current_active_freq_limit_get(sock_ind, &limit, src_type)); *freq = limit; @@ -2969,23 +2891,25 @@ amdsmi_status_t amdsmi_get_cpu_socket_current_active_freq_limit(amdsmi_cpusocket return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_cpu_socket_freq_range(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint16_t *fmax, uint16_t *fmin) +amdsmi_status_t amdsmi_get_cpu_socket_freq_range(amdsmi_processor_handle processor_handle, + uint16_t *fmax, uint16_t *fmin) { amdsmi_status_t status; uint16_t f_max; uint16_t f_min; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_socket_freq_range_get(sock_ind, &f_max, &f_min)); *fmax = f_max; *fmin = f_min; @@ -2997,21 +2921,23 @@ amdsmi_status_t amdsmi_get_cpu_socket_freq_range(amdsmi_cpusocket_handle socket_ } amdsmi_status_t amdsmi_get_cpu_core_current_freq_limit(amdsmi_processor_handle processor_handle, - uint32_t core_ind, uint32_t *freq) + uint32_t *freq) { amdsmi_status_t status; uint32_t c_clk; + uint32_t core_ind; AMDSMI_CHECK_INIT(); if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuCore* core = nullptr; - amdsmi_status_t r = get_cpu_core_from_handle(processor_handle, &core); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + core_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_current_freq_limit_core_get(core_ind, &c_clk)); *freq = c_clk; @@ -3022,22 +2948,24 @@ amdsmi_status_t amdsmi_get_cpu_core_current_freq_limit(amdsmi_processor_handle p } -amdsmi_status_t amdsmi_get_cpu_socket_power(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *ppower) +amdsmi_status_t amdsmi_get_cpu_socket_power(amdsmi_processor_handle processor_handle, + uint32_t *ppower) { amdsmi_status_t status; uint32_t avg_power; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_socket_power_get(sock_ind, &avg_power)); *ppower = avg_power; @@ -3047,22 +2975,24 @@ amdsmi_status_t amdsmi_get_cpu_socket_power(amdsmi_cpusocket_handle socket_handl return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_cpu_socket_power_cap(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *pcap) +amdsmi_status_t amdsmi_get_cpu_socket_power_cap(amdsmi_processor_handle processor_handle, + uint32_t *pcap) { amdsmi_status_t status; uint32_t p_cap; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_socket_power_cap_get(sock_ind, &p_cap)); *pcap = p_cap; @@ -3072,22 +3002,24 @@ amdsmi_status_t amdsmi_get_cpu_socket_power_cap(amdsmi_cpusocket_handle socket_h return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_cpu_socket_power_cap_max(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *pmax) +amdsmi_status_t amdsmi_get_cpu_socket_power_cap_max(amdsmi_processor_handle processor_handle, + uint32_t *pmax) { amdsmi_status_t status; uint32_t p_max; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_socket_power_cap_max_get(sock_ind, &p_max)); *pmax = p_max; @@ -3097,22 +3029,24 @@ amdsmi_status_t amdsmi_get_cpu_socket_power_cap_max(amdsmi_cpusocket_handle sock return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_cpu_pwr_svi_telemetry_all_rails(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *power) +amdsmi_status_t amdsmi_get_cpu_pwr_svi_telemetry_all_rails(amdsmi_processor_handle processor_handle, + uint32_t *power) { amdsmi_status_t status; uint32_t pow; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_pwr_svi_telemetry_all_rails_get(sock_ind, &pow)); *power = pow; @@ -3122,21 +3056,23 @@ amdsmi_status_t amdsmi_get_cpu_pwr_svi_telemetry_all_rails(amdsmi_cpusocket_hand return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_set_cpu_socket_power_cap(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t pcap) +amdsmi_status_t amdsmi_set_cpu_socket_power_cap(amdsmi_processor_handle processor_handle, + uint32_t pcap) { amdsmi_status_t status; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_socket_power_cap_set(sock_ind, pcap)); if (status != AMDSMI_STATUS_SUCCESS) @@ -3145,21 +3081,23 @@ amdsmi_status_t amdsmi_set_cpu_socket_power_cap(amdsmi_cpusocket_handle socket_h return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_set_cpu_pwr_efficiency_mode(amdsmi_cpusocket_handle socket_handle, - uint8_t sock_ind, uint8_t mode) +amdsmi_status_t amdsmi_set_cpu_pwr_efficiency_mode(amdsmi_processor_handle processor_handle, + uint8_t mode) { amdsmi_status_t status; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_pwr_efficiency_mode_set(sock_ind, mode)); if (status != AMDSMI_STATUS_SUCCESS) @@ -3169,21 +3107,23 @@ amdsmi_status_t amdsmi_set_cpu_pwr_efficiency_mode(amdsmi_cpusocket_handle socke } amdsmi_status_t amdsmi_get_cpu_core_boostlimit(amdsmi_processor_handle processor_handle, - uint32_t core_ind, uint32_t *pboostlimit) + uint32_t *pboostlimit) { amdsmi_status_t status; uint32_t boostlimit; + uint32_t core_ind; AMDSMI_CHECK_INIT(); if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuCore* core = nullptr; - amdsmi_status_t r = get_cpu_core_from_handle(processor_handle, &core); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + core_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_core_boostlimit_get(core_ind, &boostlimit)); *pboostlimit = boostlimit; @@ -3193,22 +3133,24 @@ amdsmi_status_t amdsmi_get_cpu_core_boostlimit(amdsmi_processor_handle processor return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_cpu_socket_c0_residency(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *pc0_residency) +amdsmi_status_t amdsmi_get_cpu_socket_c0_residency(amdsmi_processor_handle processor_handle, + uint32_t *pc0_residency) { amdsmi_status_t status; uint32_t res; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_socket_c0_residency_get(sock_ind, &res)); *pc0_residency = res; @@ -3219,20 +3161,22 @@ amdsmi_status_t amdsmi_get_cpu_socket_c0_residency(amdsmi_cpusocket_handle socke } amdsmi_status_t amdsmi_set_cpu_core_boostlimit(amdsmi_processor_handle processor_handle, - uint32_t core_ind, uint32_t boostlimit) + uint32_t boostlimit) { amdsmi_status_t status; + uint32_t core_ind; AMDSMI_CHECK_INIT(); if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuCore* core = nullptr; - amdsmi_status_t r = get_cpu_core_from_handle(processor_handle, &core); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + core_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_core_boostlimit_set(core_ind, boostlimit)); if (status != AMDSMI_STATUS_SUCCESS) @@ -3241,21 +3185,23 @@ amdsmi_status_t amdsmi_set_cpu_core_boostlimit(amdsmi_processor_handle processor return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_set_cpu_socket_boostlimit(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t boostlimit) +amdsmi_status_t amdsmi_set_cpu_socket_boostlimit(amdsmi_processor_handle processor_handle, + uint32_t boostlimit) { amdsmi_status_t status; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_socket_boostlimit_set(sock_ind, boostlimit)); if (status != AMDSMI_STATUS_SUCCESS) @@ -3264,22 +3210,17 @@ amdsmi_status_t amdsmi_set_cpu_socket_boostlimit(amdsmi_cpusocket_handle socket_ return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_cpu_ddr_bw(amdsmi_cpusocket_handle socket_handle, - amdsmi_ddr_bw_metrics_t *ddr_bw) +amdsmi_status_t amdsmi_get_cpu_ddr_bw(amdsmi_processor_handle processor_handle, + amdsmi_ddr_bw_metrics_t *ddr_bw) { amdsmi_status_t status; struct ddr_bw_metrics ddr; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); - if (r != AMDSMI_STATUS_SUCCESS) - return r; - status = static_cast(esmi_ddr_bw_get(&ddr)); if (status != AMDSMI_STATUS_SUCCESS) return status; @@ -3291,22 +3232,24 @@ amdsmi_status_t amdsmi_get_cpu_ddr_bw(amdsmi_cpusocket_handle socket_handle, return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_cpu_socket_temperature(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *ptmon) +amdsmi_status_t amdsmi_get_cpu_socket_temperature(amdsmi_processor_handle processor_handle, + uint32_t *ptmon) { amdsmi_status_t status; uint32_t tmon; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_socket_temperature_get(sock_ind, &tmon)); if (status != AMDSMI_STATUS_SUCCESS) return status; @@ -3317,22 +3260,25 @@ amdsmi_status_t amdsmi_get_cpu_socket_temperature(amdsmi_cpusocket_handle socket } amdsmi_status_t amdsmi_get_cpu_dimm_temp_range_and_refresh_rate( - amdsmi_cpusocket_handle socket_handle, - uint8_t sock_ind, uint8_t dimm_addr, amdsmi_temp_range_refresh_rate_t *rate) + amdsmi_processor_handle processor_handle, + uint8_t dimm_addr, amdsmi_temp_range_refresh_rate_t *rate) { amdsmi_status_t status; struct temp_range_refresh_rate dimm_rate; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_dimm_temp_range_and_refresh_rate_get( sock_ind, dimm_addr, &dimm_rate)); if (status != AMDSMI_STATUS_SUCCESS) @@ -3344,22 +3290,24 @@ amdsmi_status_t amdsmi_get_cpu_dimm_temp_range_and_refresh_rate( return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_cpu_dimm_power_consumption(amdsmi_cpusocket_handle socket_handle, - uint8_t sock_ind, uint8_t dimm_addr, amdsmi_dimm_power_t *dimm_pow) +amdsmi_status_t amdsmi_get_cpu_dimm_power_consumption(amdsmi_processor_handle processor_handle, + uint8_t dimm_addr, amdsmi_dimm_power_t *dimm_pow) { amdsmi_status_t status; struct dimm_power d_power; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_dimm_power_consumption_get(sock_ind, dimm_addr, &d_power)); if (status != AMDSMI_STATUS_SUCCESS) @@ -3372,22 +3320,24 @@ amdsmi_status_t amdsmi_get_cpu_dimm_power_consumption(amdsmi_cpusocket_handle so return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_cpu_dimm_thermal_sensor(amdsmi_cpusocket_handle socket_handle, - uint8_t sock_ind, uint8_t dimm_addr, amdsmi_dimm_thermal_t *dimm_temp) +amdsmi_status_t amdsmi_get_cpu_dimm_thermal_sensor(amdsmi_processor_handle processor_handle, + uint8_t dimm_addr, amdsmi_dimm_thermal_t *dimm_temp) { amdsmi_status_t status; struct dimm_thermal d_sensor; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_dimm_thermal_sensor_get(sock_ind, dimm_addr, &d_sensor)); if (status != AMDSMI_STATUS_SUCCESS) @@ -3400,21 +3350,16 @@ amdsmi_status_t amdsmi_get_cpu_dimm_thermal_sensor(amdsmi_cpusocket_handle socke return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_set_cpu_xgmi_width(amdsmi_cpusocket_handle socket_handle, +amdsmi_status_t amdsmi_set_cpu_xgmi_width(amdsmi_processor_handle processor_handle, uint8_t min, uint8_t max) { amdsmi_status_t status; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); - if (r != AMDSMI_STATUS_SUCCESS) - return r; - status = static_cast(esmi_xgmi_width_set(min, max)); if (status != AMDSMI_STATUS_SUCCESS) return status; @@ -3422,21 +3367,23 @@ amdsmi_status_t amdsmi_set_cpu_xgmi_width(amdsmi_cpusocket_handle socket_handle, return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_set_cpu_gmi3_link_width_range(amdsmi_cpusocket_handle socket_handle, - uint8_t sock_ind, uint8_t min_link_width, uint8_t max_link_width) +amdsmi_status_t amdsmi_set_cpu_gmi3_link_width_range(amdsmi_processor_handle processor_handle, + uint8_t min_link_width, uint8_t max_link_width) { amdsmi_status_t status; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_gmi3_link_width_range_set(sock_ind, min_link_width, max_link_width)); if (status != AMDSMI_STATUS_SUCCESS) @@ -3445,20 +3392,22 @@ amdsmi_status_t amdsmi_set_cpu_gmi3_link_width_range(amdsmi_cpusocket_handle soc return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_cpu_apb_enable(amdsmi_cpusocket_handle socket_handle, uint32_t sock_ind) +amdsmi_status_t amdsmi_cpu_apb_enable(amdsmi_processor_handle processor_handle) { amdsmi_status_t status; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_apb_enable(sock_ind)); if (status != AMDSMI_STATUS_SUCCESS) return status; @@ -3466,21 +3415,23 @@ amdsmi_status_t amdsmi_cpu_apb_enable(amdsmi_cpusocket_handle socket_handle, uin return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_cpu_apb_disable(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint8_t pstate) +amdsmi_status_t amdsmi_cpu_apb_disable(amdsmi_processor_handle processor_handle, + uint8_t pstate) { amdsmi_status_t status; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_apb_disable(sock_ind, pstate)); if (status != AMDSMI_STATUS_SUCCESS) return status; @@ -3488,21 +3439,23 @@ amdsmi_status_t amdsmi_cpu_apb_disable(amdsmi_cpusocket_handle socket_handle, return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_set_cpu_socket_lclk_dpm_level(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint8_t nbio_id, uint8_t min, uint8_t max) +amdsmi_status_t amdsmi_set_cpu_socket_lclk_dpm_level(amdsmi_processor_handle processor_handle, + uint8_t nbio_id, uint8_t min, uint8_t max) { amdsmi_status_t status; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_socket_lclk_dpm_level_set(sock_ind, nbio_id, min, max)); if (status != AMDSMI_STATUS_SUCCESS) return status; @@ -3510,22 +3463,24 @@ amdsmi_status_t amdsmi_set_cpu_socket_lclk_dpm_level(amdsmi_cpusocket_handle soc return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_cpu_socket_lclk_dpm_level(amdsmi_cpusocket_handle socket_handle, - uint8_t sock_ind, uint8_t nbio_id, amdsmi_dpm_level_t *nbio) +amdsmi_status_t amdsmi_get_cpu_socket_lclk_dpm_level(amdsmi_processor_handle processor_handle, + uint8_t nbio_id, amdsmi_dpm_level_t *nbio) { amdsmi_status_t status; struct dpm_level nb; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_socket_lclk_dpm_level_get(sock_ind, nbio_id, &nb)); if (status != AMDSMI_STATUS_SUCCESS) @@ -3537,21 +3492,23 @@ amdsmi_status_t amdsmi_get_cpu_socket_lclk_dpm_level(amdsmi_cpusocket_handle soc return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_set_cpu_pcie_link_rate(amdsmi_cpusocket_handle socket_handle, - uint8_t sock_ind, uint8_t rate_ctrl, uint8_t *prev_mode) +amdsmi_status_t amdsmi_set_cpu_pcie_link_rate(amdsmi_processor_handle processor_handle, + uint8_t rate_ctrl, uint8_t *prev_mode) { amdsmi_status_t status; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_pcie_link_rate_set(sock_ind, rate_ctrl, prev_mode)); if (status != AMDSMI_STATUS_SUCCESS) @@ -3560,21 +3517,23 @@ amdsmi_status_t amdsmi_set_cpu_pcie_link_rate(amdsmi_cpusocket_handle socket_han return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_set_cpu_df_pstate_range(amdsmi_cpusocket_handle socket_handle, - uint8_t sock_ind, uint8_t max_pstate, uint8_t min_pstate) +amdsmi_status_t amdsmi_set_cpu_df_pstate_range(amdsmi_processor_handle processor_handle, + uint8_t max_pstate, uint8_t min_pstate) { amdsmi_status_t status; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_df_pstate_range_set(sock_ind, max_pstate, min_pstate)); if (status != AMDSMI_STATUS_SUCCESS) @@ -3583,36 +3542,39 @@ amdsmi_status_t amdsmi_set_cpu_df_pstate_range(amdsmi_cpusocket_handle socket_ha return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_cpu_current_io_bandwidth(amdsmi_cpusocket_handle socket_handle, - uint8_t sock_ind, amdsmi_link_id_bw_type_t link, uint32_t *io_bw) +amdsmi_status_t amdsmi_get_cpu_current_io_bandwidth(amdsmi_processor_handle processor_handle, + amdsmi_link_id_bw_type_t link, uint32_t *io_bw) { amdsmi_status_t status; uint32_t bw; struct link_id_bw_type io_link; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + + io_link.link_name = link.link_name; + io_link.bw_type = static_cast(link.bw_type); + status = static_cast(esmi_current_io_bandwidth_get(sock_ind, io_link, &bw)); if (status != AMDSMI_STATUS_SUCCESS) return status; - link.link_name = io_link.link_name; - link.bw_type = static_cast(io_link.bw_type); *io_bw = bw; return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_cpu_current_xgmi_bw(amdsmi_cpusocket_handle socket_handle, +amdsmi_status_t amdsmi_get_cpu_current_xgmi_bw(amdsmi_processor_handle processor_handle, amdsmi_link_id_bw_type_t link, uint32_t *xgmi_bw) { amdsmi_status_t status; @@ -3621,26 +3583,22 @@ amdsmi_status_t amdsmi_get_cpu_current_xgmi_bw(amdsmi_cpusocket_handle socket_ha AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); - if (r != AMDSMI_STATUS_SUCCESS) - return r; + io_link.link_name = link.link_name; + io_link.bw_type= static_cast(link.bw_type); status = static_cast(esmi_current_xgmi_bw_get(io_link, &bw)); if (status != AMDSMI_STATUS_SUCCESS) return status; - link.link_name = io_link.link_name; - link.bw_type= static_cast(io_link.bw_type); *xgmi_bw = bw; return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_metrics_table_version(amdsmi_cpusocket_handle socket_handle, +amdsmi_status_t amdsmi_get_metrics_table_version(amdsmi_processor_handle processor_handle, uint32_t *metrics_version) { amdsmi_status_t status; @@ -3648,14 +3606,9 @@ amdsmi_status_t amdsmi_get_metrics_table_version(amdsmi_cpusocket_handle socket_ AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); - if (r != AMDSMI_STATUS_SUCCESS) - return r; - status = static_cast(esmi_metrics_table_version_get(&metrics_tbl_ver)); *metrics_version = metrics_tbl_ver; @@ -3665,22 +3618,24 @@ amdsmi_status_t amdsmi_get_metrics_table_version(amdsmi_cpusocket_handle socket_ return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_metrics_table(amdsmi_cpusocket_handle socket_handle, uint8_t sock_ind, +amdsmi_status_t amdsmi_get_metrics_table(amdsmi_processor_handle processor_handle, struct hsmp_metric_table *metrics_table) { amdsmi_status_t status; struct hsmp_metric_table metrics_tbl; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_metrics_table_get(sock_ind, &metrics_tbl)); *metrics_table = metrics_tbl; @@ -3690,22 +3645,24 @@ amdsmi_status_t amdsmi_get_metrics_table(amdsmi_cpusocket_handle socket_handle, return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_first_online_core_on_cpu_socket(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *pcore_ind) +amdsmi_status_t amdsmi_first_online_core_on_cpu_socket(amdsmi_processor_handle processor_handle, + uint32_t *pcore_ind) { amdsmi_status_t status; uint32_t online_core; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_first_online_core_on_socket(sock_ind, &online_core)); if (status != AMDSMI_STATUS_SUCCESS) return status; diff --git a/src/amd_smi/amd_smi_cpu_core.cc b/src/amd_smi/amd_smi_cpu_core.cc deleted file mode 100644 index 9f96517157..0000000000 --- a/src/amd_smi/amd_smi_cpu_core.cc +++ /dev/null @@ -1,62 +0,0 @@ -/* - * ============================================================================= - * The University of Illinois/NCSA - * Open Source License (NCSA) - * - * Copyright (c) 2023, Advanced Micro Devices, Inc. - * All rights reserved. - * - * Developed by: - * - * AMD Research and AMD ROC Software Development - * - * Advanced Micro Devices, Inc. - * - * www.amd.com - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal with the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * - Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimers. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimers in - * the documentation and/or other materials provided with the distribution. - * - Neither the names of , - * nor the names of its contributors may be used to endorse or promote - * products derived from this Software without specific prior written - * permission. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS WITH THE SOFTWARE. - * - */ - -#include -#include "amd_smi/impl/amd_smi_cpu_core.h" - -namespace amd { -namespace smi { -AMDSmiCpuCore::~AMDSmiCpuCore() { - for (uint32_t i = 0; i < processors_.size(); i++) { - delete processors_[i]; - } - processors_.clear(); -} - -amdsmi_status_t AMDSmiCpuCore::get_processor_count(uint32_t* processor_count) const { - *processor_count = static_cast(processors_.size()); - return AMDSMI_STATUS_SUCCESS; -} - -} // namespace smi -} // namespace amd diff --git a/src/amd_smi/amd_smi_cpu_socket.cc b/src/amd_smi/amd_smi_cpu_socket.cc deleted file mode 100644 index 0fc90adc7c..0000000000 --- a/src/amd_smi/amd_smi_cpu_socket.cc +++ /dev/null @@ -1,72 +0,0 @@ -/* - * ============================================================================= - * The University of Illinois/NCSA - * Open Source License (NCSA) - * - * Copyright (c) 2023, Advanced Micro Devices, Inc. - * All rights reserved. - * - * Developed by: - * - * AMD Research and AMD ROC Software Development - * - * Advanced Micro Devices, Inc. - * - * www.amd.com - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal with the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * - Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimers. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimers in - * the documentation and/or other materials provided with the distribution. - * - Neither the names of , - * nor the names of its contributors may be used to endorse or promote - * products derived from this Software without specific prior written - * permission. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS WITH THE SOFTWARE. - * - */ - -#include -#include "amd_smi/impl/amd_smi_cpu_socket.h" -#include - -namespace amd { -namespace smi { - -AMDSmiCpuSocket::~AMDSmiCpuSocket() {} - -amdsmi_status_t AMDSmiCpuSocket::set_socket_id(uint32_t idx, uint32_t socket_id) { - socket_id = idx; - return AMDSMI_STATUS_SUCCESS; -} - -amdsmi_status_t AMDSmiCpuSocket::get_cpu_vendor() { - uint32_t eax, ebx, ecx, edx; - - if (!__get_cpuid(0, &eax, &ebx, &ecx, &edx)) - return AMDSMI_STATUS_IO; - - /* check if the value in ebx, ecx, edx matches "AuthenticAMD" string */ - if (ebx != 0x68747541 || ecx != 0x444d4163 || edx != 0x69746e65) - return AMDSMI_STATUS_NON_AMD_CPU; - - return AMDSMI_STATUS_SUCCESS; -} - -} // namespace smi -} // namespace amd diff --git a/src/amd_smi/amd_smi_socket.cc b/src/amd_smi/amd_smi_socket.cc index cf2cfc3f9e..9481f9702d 100644 --- a/src/amd_smi/amd_smi_socket.cc +++ b/src/amd_smi/amd_smi_socket.cc @@ -53,6 +53,14 @@ AMDSmiSocket::~AMDSmiSocket() { delete processors_[i]; } processors_.clear(); + for (uint32_t i = 0; i < cpu_processors_.size(); i++) { + delete cpu_processors_[i]; + } + cpu_processors_.clear(); + for (uint32_t i = 0; i < cpu_core_processors_.size(); i++) { + delete cpu_core_processors_[i]; + } + cpu_core_processors_.clear(); } amdsmi_status_t AMDSmiSocket::get_processor_count(uint32_t* processor_count) const { @@ -60,6 +68,26 @@ amdsmi_status_t AMDSmiSocket::get_processor_count(uint32_t* processor_count) con return AMDSMI_STATUS_SUCCESS; } +amdsmi_status_t AMDSmiSocket::get_processor_count(processor_type_t type, uint32_t* processor_count) const { + amdsmi_status_t ret = AMDSMI_STATUS_SUCCESS; + switch (type) { + case AMD_GPU: + *processor_count = static_cast(processors_.size()); + break; + case AMD_CPU: + *processor_count = static_cast(cpu_processors_.size()); + break; + case AMD_CPU_CORE: + *processor_count = static_cast(cpu_core_processors_.size()); + break; + default: + *processor_count = 0; + ret = AMDSMI_STATUS_INVAL; + break; + } + return ret; +} + } // namespace smi } // namespace amd diff --git a/src/amd_smi/amd_smi_system.cc b/src/amd_smi/amd_smi_system.cc index e9fa857bdf..3480cbef41 100644 --- a/src/amd_smi/amd_smi_system.cc +++ b/src/amd_smi/amd_smi_system.cc @@ -53,16 +53,65 @@ namespace amd { namespace smi { -#ifdef ENABLE_ESMI_LIB -uint32_t AMDSmiSystem::sockets = 0; -uint32_t AMDSmiSystem::cpus = 0; -uint32_t AMDSmiSystem::threads = 0; -uint32_t AMDSmiSystem::family = 0; -uint32_t AMDSmiSystem::model = 0; -#endif #define AMD_SMI_INIT_FLAG_RESRV_TEST1 0x800000000000000 //!< Reserved for test +static amdsmi_status_t get_cpu_family(uint32_t *cpu_family) { + amdsmi_status_t ret; + ret = static_cast(esmi_cpu_family_get(cpu_family)); + + if (ret != AMDSMI_STATUS_SUCCESS) { + std::cout << "Failed to get cpu family, Err["<(esmi_cpu_model_get(cpu_model)); + + if (ret != AMDSMI_STATUS_SUCCESS) { + std::cout << "Failed to get cpu model, Err["<(esmi_number_of_cpus_get(num_cpus)); + + if (ret != AMDSMI_STATUS_SUCCESS) { + std::cout << "Failed to get number of cpus, Err["<(esmi_threads_per_core_get(threads_per_core)); + + if (ret != AMDSMI_STATUS_SUCCESS) { + std::cout << "Failed to get threads per core, Err["<(esmi_number_of_sockets_get(num_socks)); + + if (ret != AMDSMI_STATUS_SUCCESS) { + std::cout << "Failed to get number of sockets, Err["<get_cpu_vendor(); /* esmi is for AMD cpus, if its not AMD CPU, we are not going to initialise esmi */ - if (!amd_smi_status) { - amd_smi_status = static_cast(esmi_init()); - if (amd_smi_status != AMDSMI_STATUS_SUCCESS){ - std::cout<<"\tESMI Not initialized, drivers not found " << std::endl; - return amd_smi_status; - } + amd_smi_status = static_cast(esmi_init()); + if (amd_smi_status != AMDSMI_STATUS_SUCCESS){ + std::cout<<"\tESMI Not initialized, drivers not found " << std::endl; + return amd_smi_status; } - amd_smi_status = get_cpu_sockets(&sockets); - amd_smi_status = get_cpu_cores(&cpus); - amd_smi_status = get_threads_per_core(&threads); - amd_smi_status = get_cpu_family(&family); - amd_smi_status = get_cpu_model(&model); - std::cout << "\n***********************EPYC METRICS***********************" << std::endl; - std::cout <<"| NR_SOCKETS | "< 1) { - std::cout <<"| THREADS PER CORE | "<get_socket_id() == cpu_socket_id) { - socket = cpu_sockets_[j]; + AMDSmiSocket* socket = nullptr; + for (uint32_t j = 0; j < sockets_.size(); j++) { + if (sockets_[j]->get_socket_id() == cpu_socket_id) { + socket = sockets_[j]; break; } } if (socket == nullptr) { - socket = new AMDSmiCpuSocket(cpu_socket_id); - cpu_sockets_.push_back(socket); + socket = new AMDSmiSocket(cpu_socket_id); + sockets_.push_back(socket); } + AMDSmiProcessor* cpusocket = new AMDSmiProcessor(AMD_CPU, i); + socket->add_processor(cpusocket); + processors_.insert(cpusocket); - for (uint32_t k = 0; k < cpus/threads; k++) { - AMDSmiCpuCore* core = new AMDSmiCpuCore(k); + for (uint32_t k = 0; k < (cpus/threads)/sockets; k++) { + AMDSmiProcessor* core = new AMDSmiProcessor(AMD_CPU_CORE, k); socket->add_processor(core); processors_.insert(core); } } - std::cout << std::endl; return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t AMDSmiSystem::get_cpu_sockets(uint32_t *num_socks) { - amdsmi_status_t ret; - ret = static_cast(esmi_number_of_sockets_get(num_socks)); - sockets = *num_socks; - if (ret != AMDSMI_STATUS_SUCCESS) { - std::cout << "Failed to get number of sockets, Err["<(esmi_number_of_cpus_get(num_cpus)); - cpus = *num_cpus; - - if (ret != AMDSMI_STATUS_SUCCESS) { - std::cout << "Failed to get number of cpus, Err["<(esmi_threads_per_core_get(threads_per_core)); - threads = *threads_per_core; - - if (ret != AMDSMI_STATUS_SUCCESS) { - std::cout << "Failed to get threads per core, Err["<(esmi_cpu_family_get(cpu_family)); - family = *cpu_family; - - if (ret != AMDSMI_STATUS_SUCCESS) { - std::cout << "Failed to get cpu family, Err["<(esmi_cpu_model_get(cpu_model)); - model = *cpu_model; - - if (ret != AMDSMI_STATUS_SUCCESS) { - std::cout << "Failed to get cpu model, Err["<(socket_handle); - - // double check handlers is here - if (std::find(cpu_sockets_.begin(), cpu_sockets_.end(), *socket) - != cpu_sockets_.end()) { - return AMDSMI_STATUS_SUCCESS; - } - return AMDSMI_STATUS_INVAL; - } -#endif - amdsmi_status_t AMDSmiSystem::handle_to_processor( amdsmi_processor_handle processor_handle, AMDSmiProcessor** processor) { @@ -378,28 +335,6 @@ amdsmi_status_t AMDSmiSystem::gpu_index_to_handle(uint32_t gpu_index, return AMDSMI_STATUS_INVAL; } -#ifdef ENABLE_ESMI_LIB -amdsmi_status_t AMDSmiSystem::cpu_index_to_handle(uint32_t cpu_index, - amdsmi_cpusocket_handle* cpu_handle) { - if (cpu_handle == nullptr) - return AMDSMI_STATUS_INVAL; - - auto iter = cpu_sockets_.begin(); - for (; iter != cpu_sockets_.end(); iter++) { - auto cur_socket = (*iter); - if (cur_socket->get_processor_type() != AMD_CPU) - continue; - amd::smi::AMDSmiCpuSocket* cpu_socket = - static_cast(cur_socket); - uint32_t cur_cpu_index = cpu_socket->get_cpu_id(); - if (cpu_index == cur_cpu_index) { - *cpu_handle = cur_socket; - return AMDSMI_STATUS_SUCCESS; - } - } - return AMDSMI_STATUS_INVAL; -} -#endif } // namespace smi } // namespace amd From 94d3c563a38ea309fe15d9b4fbaad6f4d14ba306 Mon Sep 17 00:00:00 2001 From: Naveen Krishna Chatradhi Date: Thu, 7 Dec 2023 07:30:31 -0800 Subject: [PATCH 3/5] amdsmi: py-interface: Add python interface for esmi api Change-Id: I4a3ab1168a7d1bf011ecc9c508e111c281503520 --- py-interface/README.md | 566 +++++++++++++++++++-------- py-interface/__init__.py | 14 +- py-interface/amdsmi_interface.py | 634 ++++++++++++++++++++++--------- py-interface/amdsmi_wrapper.py | 124 +++--- 4 files changed, 940 insertions(+), 398 deletions(-) diff --git a/py-interface/README.md b/py-interface/README.md index 3dc1df88ed..f10852cb9c 100644 --- a/py-interface/README.md +++ b/py-interface/README.md @@ -5124,40 +5124,17 @@ except AmdSmiException as e: ## CPU APIs -### amdsmi_get_cpusocket_handles - -**Note: CURRENTLY HARDCODED TO RETURN DUMMY DATA** -Description: Returns list of cpusocket handle objects on current machine - -Input parameters: `None` - -Output: List of cpusocket handle objects - -Exceptions that can be thrown by `amdsmi_get_cpusocket_handles` function: - -* `AmdSmiLibraryException` - -Example: - -```python -try: - sockets = amdsmi_get_cpusocket_handles() - print('Socket numbers: {}'.format(len(sockets))) -except AmdSmiException as e: - print(e) -``` - -### amdsmi_get_cpusocket_info +### amdsmi_get_processor_info **Note: CURRENTLY HARDCODED TO RETURN EMPTY VALUES** -Description: Return cpu socket index +Description: Return processor name Input parameters: -`socket_handle` cpu socket handle +`processor_handle` processor handle -Output: Socket index +Output: Processor name -Exceptions that can be thrown by `amdsmi_get_cpusocket_info` function: +Exceptions that can be thrown by `amdsmi_get_processor_info` function: * `AmdSmiLibraryException` @@ -5165,38 +5142,12 @@ Example: ```python try: - socket_handles = amdsmi_get_cpusocket_handles() - if len(socket_handles) == 0: - print("No CPU sockets on machine") + processor_handles = amdsmi_get_processor_handles() + if len(processor_handles) == 0: + print("No processors on machine") else: - for socket in socket_handles: - print(amdsmi_get_cpusocket_info(socket)) -except AmdSmiException as e: - print(e) -``` - -### amdsmi_get_cpucore_handles - -Description: Returns list of CPU core handle objects on current machine - -Input parameters: `None` - -Output: List of CPU core handle objects - -Exceptions that can be thrown by `amdsmi_get_cpucore_handles` function: - -* `AmdSmiLibraryException` - -Example: - -```python -try: - core_handles = amdsmi_get_cpucore_handles() - if len(core_handles) == 0: - print("No CPU cores on machine") - else: - for core in core_handles: - print(amdsmi_get_cpucore_info(core)) + for processor in processor_handles: + print(amdsmi_get_processor_info(processor)) except AmdSmiException as e: print(e) ``` @@ -5215,12 +5166,12 @@ Example: ```python try: - socket_handles = amdsmi_get_cpusocket_handles() - if len(socket_handles) == 0: + processor_handles = amdsmi_get_processor_handles() + if len(processor_handles) == 0: print("No CPU sockets on machine") else: - for socket in socket_handles: - version = amdsmi_get_cpu_hsmp_proto_ver(socket) + for processor in processor_handles: + version = amdsmi_get_cpu_hsmp_proto_ver(processor) print(version) except AmdSmiException as e: print(e) @@ -5240,12 +5191,12 @@ Example: ```python try: - socket_handles = amdsmi_get_cpusocket_handles() - if len(socket_handles) == 0: + processor_handles = amdsmi_get_processor_handles() + if len(processor_handles) == 0: print("No CPU sockets on machine") else: - for socket in socket_handles: - version = amdsmi_get_cpu_smu_fw_version(socket) + for processor in processor_handles: + version = amdsmi_get_cpu_smu_fw_version(processor) print(version['debug']) print(version['minor']) print(version['major']) @@ -5267,12 +5218,12 @@ Example: ```python try: - socket_handles = amdsmi_get_cpusocket_handles() - if len(socket_handles) == 0: + processor_handles = amdsmi_get_processor_handles() + if len(processor_handles) == 0: print("No CPU sockets on machine") else: - for socket in socket_handles: - prochot = amdsmi_get_cpu_prochot_status(socket) + for processor in processor_handles: + prochot = amdsmi_get_cpu_prochot_status(processor) print(prochot) except AmdSmiException as e: print(e) @@ -5292,12 +5243,12 @@ Example: ```python try: - socket_handles = amdsmi_get_cpusocket_handles() - if len(socket_handles) == 0: + processor_handles = amdsmi_get_processor_handles() + if len(processor_handles) == 0: print("No CPU sockets on machine") else: - for socket in socket_handles: - clk = amdsmi_get_cpu_fclk_mclk(socket) + for processor in processor_handles: + clk = amdsmi_get_cpu_fclk_mclk(processor) for fclk, mclk in clk.items(): print(fclk) print(mclk) @@ -5319,12 +5270,12 @@ Example: ```python try: - socket_handles = amdsmi_get_cpusocket_handles() - if len(socket_handles) == 0: + processor_handles = amdsmi_get_processor_handles() + if len(processor_handles) == 0: print("No CPU sockets on machine") else: - for socket in socket_handles: - cclk_limit = amdsmi_get_cpu_cclk_limit(socket) + for processor in processor_handles: + cclk_limit = amdsmi_get_cpu_cclk_limit(processor) print(cclk_limit) except AmdSmiException as e: print(e) @@ -5344,12 +5295,12 @@ Example: ```python try: - socket_handles = amdsmi_get_cpusocket_handles() - if len(socket_handles) == 0: + processor_handles = amdsmi_get_processor_handles() + if len(processor_handles) == 0: print("No CPU sockets on machine") else: - for socket in socket_handles: - freq_limit = amdsmi_get_cpu_socket_current_active_freq_limit(socket) + for processor in processor_handles: + freq_limit = amdsmi_get_cpu_socket_current_active_freq_limit(processor) for freq, src in freq_limit.items(): print(freq) print(src) @@ -5371,12 +5322,12 @@ Example: ```python try: - socket_handles = amdsmi_get_cpusocket_handles() - if len(socket_handles) == 0: + processor_handles = amdsmi_get_processor_handles() + if len(processor_handles) == 0: print("No CPU sockets on machine") else: - for socket in socket_handles: - freq_range = amdsmi_get_cpu_socket_freq_range(socket) + for processor in processor_handles: + freq_range = amdsmi_get_cpu_socket_freq_range(processor) for fmax, fmin in freq_range.items(): print(fmax) print(fmin) @@ -5398,12 +5349,12 @@ Example: ```python try: - core_handles = amdsmi_get_cpucore_handles() - if len(core_handles) == 0: + processor_handles = amdsmi_get_processor_handles() + if len(processor_handles) == 0: print("No CPU cores on machine") else: - for core in core_handles: - freq_limit = amdsmi_get_cpu_core_current_freq_limit(core) + for processor in processor_handles: + freq_limit = amdsmi_get_cpu_core_current_freq_limit(processor) print(freq_limit) except AmdSmiException as e: print(e) @@ -5423,12 +5374,12 @@ Example: ```python try: - socket_handles = amdsmi_get_cpusocket_handles() - if len(socket_handles) == 0: + processor_handles = amdsmi_get_processor_handles() + if len(processor_handles) == 0: print("No CPU sockets on machine") else: - for socket in socket_handles: - sock_power = amdsmi_get_cpu_socket_power(socket) + for processor in processor_handles: + sock_power = amdsmi_get_cpu_socket_power(processor) print(sock_power) except AmdSmiException as e: print(e) @@ -5448,12 +5399,12 @@ Example: ```python try: - socket_handles = amdsmi_get_cpusocket_handles() - if len(socket_handles) == 0: + processor_handles = amdsmi_get_processor_handles() + if len(processor_handles) == 0: print("No CPU sockets on machine") else: - for socket in socket_handles: - sock_power = amdsmi_get_cpu_socket_power_cap(socket) + for processor in processor_handles: + sock_power = amdsmi_get_cpu_socket_power_cap(processor) print(sock_power) except AmdSmiException as e: print(e) @@ -5473,12 +5424,12 @@ Example: ```python try: - socket_handles = amdsmi_get_cpusocket_handles() - if len(socket_handles) == 0: + processor_handles = amdsmi_get_processor_handles() + if len(processor_handles) == 0: print("No CPU sockets on machine") else: - for socket in socket_handles: - sock_power = amdsmi_get_cpu_socket_power_cap_max(socket) + for processor in processor_handles: + sock_power = amdsmi_get_cpu_socket_power_cap_max(processor) print(sock_power) except AmdSmiException as e: print(e) @@ -5498,12 +5449,12 @@ Example: ```python try: - socket_handles = amdsmi_get_cpusocket_handles() - if len(socket_handles) == 0: + processor_handles = amdsmi_get_processor_handles() + if len(processor_handles) == 0: print("No CPU sockets on machine") else: - for socket in socket_handles: - power = amdsmi_get_cpu_pwr_svi_telemetry_all_rails(socket) + for processor in processor_handles: + power = amdsmi_get_cpu_pwr_svi_telemetry_all_rails(processor) print(power) except AmdSmiException as e: print(e) @@ -5513,7 +5464,7 @@ except AmdSmiException as e: Description: Set the power cap value for a given socket. -Input: socket index, amdsmi socket power cap value +Input: amdsmi socket power cap value Exceptions that can be thrown by `amdsmi_set_cpu_socket_power_cap` function: @@ -5523,12 +5474,12 @@ Example: ```python try: - socket_handles = amdsmi_get_cpusocket_handles() - if len(socket_handles) == 0: + processor_handles = amdsmi_get_processor_handles() + if len(processor_handles) == 0: print("No CPU sockets on machine") else: - for socket in socket_handles: - power = amdsmi_set_cpu_socket_power_cap(socket, 0, 1000) + for processor in processor_handles: + power = amdsmi_set_cpu_socket_power_cap(processor, 1000) except AmdSmiException as e: print(e) ``` @@ -5537,7 +5488,7 @@ except AmdSmiException as e: Description: Set the power efficiency profile policy. -Input: socket index, mode(0, 1, or 2) +Input: mode(0, 1, or 2) Exceptions that can be thrown by `amdsmi_set_cpu_pwr_efficiency_mode` function: @@ -5547,12 +5498,12 @@ Example: ```python try: - socket_handles = amdsmi_get_cpusocket_handles() - if len(socket_handles) == 0: + processor_handles = amdsmi_get_processor_handles() + if len(processor_handles) == 0: print("No CPU sockets on machine") else: - for socket in socket_handles: - policy = amdsmi_set_cpu_pwr_efficiency_mode(socket, 0, 0) + for processor in processor_handles: + policy = amdsmi_set_cpu_pwr_efficiency_mode(processor, 0) except AmdSmiException as e: print(e) ``` @@ -5571,12 +5522,12 @@ Example: ```python try: - core_handles = amdsmi_get_cpucore_handles() - if len(core_handles) == 0: + processor_handles = amdsmi_get_processor_handles() + if len(processor_handles) == 0: print("No CPU cores on machine") else: - for core in core_handles: - boost_limit = amdsmi_get_cpu_core_boostlimit(core) + for processor in processor_handles: + boost_limit = amdsmi_get_cpu_core_boostlimit(processor) print(boost_limit) except AmdSmiException as e: print(e) @@ -5596,12 +5547,12 @@ Example: ```python try: - socket_handles = amdsmi_get_cpusocket_handles() - if len(socket_handles) == 0: + processor_handles = amdsmi_get_processor_handles() + if len(processor_handles) == 0: print("No CPU sockets on machine") else: - for socket in socket_handles: - c0_residency = amdsmi_get_cpu_socket_c0_residency(socket) + for processor in processor_handles: + c0_residency = amdsmi_get_cpu_socket_c0_residency(processor) print(c0_residency) except AmdSmiException as e: print(e) @@ -5621,12 +5572,12 @@ Example: ```python try: - core_handles = amdsmi_get_cpucore_handles() - if len(core_handles) == 0: + processor_handles = amdsmi_get_processor_handles() + if len(processor_handles) == 0: print("No CPU cores on machine") else: - for core in core_handles: - boost_limit = amdsmi_set_cpu_core_boostlimit(core, 1000) + for processor in processor_handles: + boost_limit = amdsmi_set_cpu_core_boostlimit(processor, 1000) except AmdSmiException as e: print(e) ``` @@ -5645,12 +5596,12 @@ Example: ```python try: - socket_handles = amdsmi_get_cpusocket_handles() - if len(socket_handles) == 0: + processor_handles = amdsmi_get_processor_handles() + if len(processor_handles) == 0: print("No CPU sockets on machine") else: - for socket in socket_handles: - boost_limit = amdsmi_set_cpu_socket_boostlimit(socket, 1000) + for processor in processor_handles: + boost_limit = amdsmi_set_cpu_socket_boostlimit(processor, 1000) except AmdSmiException as e: print(e) ``` @@ -5669,12 +5620,12 @@ Example: ```python try: - socket_handles = amdsmi_get_cpusocket_handles() - if len(socket_handles) == 0: + processor_handles = amdsmi_get_processor_handles() + if len(processor_handles) == 0: print("No CPU sockets on machine") else: - for socket in socket_handles: - ddr_bw = amdsmi_get_cpu_ddr_bw(socket) + for processor in processor_handles: + ddr_bw = amdsmi_get_cpu_ddr_bw(processor) print(ddr_bw['max_bw']) print(ddr_bw['utilized_bw']) print(ddr_bw['utilized_pct']) @@ -5696,12 +5647,12 @@ Example: ```python try: - socket_handles = amdsmi_get_cpusocket_handles() - if len(socket_handles) == 0: + processor_handles = amdsmi_get_processor_handles() + if len(processor_handles) == 0: print("No CPU sockets on machine") else: - for socket in socket_handles: - ptmon = amdsmi_get_cpu_socket_temperature(socket) + for processor in processor_handles: + ptmon = amdsmi_get_cpu_socket_temperature(processor) print(ptmon) except AmdSmiException as e: print(e) @@ -5721,12 +5672,12 @@ Example: ```python try: - socket_handles = amdsmi_get_cpusocket_handles() - if len(socket_handles) == 0: + processor_handles = amdsmi_get_processor_handles() + if len(processor_handles) == 0: print("No CPU sockets on machine") else: - for socket in socket_handles: - dimm = amdsmi_get_cpu_dimm_temp_range_and_refresh_rate(socket) + for processor in processor_handles: + dimm = amdsmi_get_cpu_dimm_temp_range_and_refresh_rate(processor) print(dimm['range']) print(dimm['ref_rate']) except AmdSmiException as e: @@ -5747,12 +5698,12 @@ Example: ```python try: - socket_handles = amdsmi_get_cpusocket_handles() - if len(socket_handles) == 0: + processor_handles = amdsmi_get_processor_handles() + if len(processor_handles) == 0: print("No CPU sockets on machine") else: - for socket in socket_handles: - dimm = amdsmi_get_cpu_dimm_power_consumption(socket) + for processor in processor_handles: + dimm = amdsmi_get_cpu_dimm_power_consumption(processor) print(dimm['power']) print(dimm['update_rate']) print(dimm['dimm_addr']) @@ -5774,12 +5725,12 @@ Example: ```python try: - socket_handles = amdsmi_get_cpusocket_handles() - if len(socket_handles) == 0: + processor_handles = amdsmi_get_processor_handles() + if len(processor_handles) == 0: print("No CPU sockets on machine") else: - for socket in socket_handles: - dimm = amdsmi_get_cpu_dimm_thermal_sensor(socket) + for processor in processor_handles: + dimm = amdsmi_get_cpu_dimm_thermal_sensor(processor) print(dimm['sensor']) print(dimm['update_rate']) print(dimm['dimm_addr']) @@ -5802,12 +5753,313 @@ Example: ```python try: - socket_handles = amdsmi_get_cpusocket_handles() - if len(socket_handles) == 0: + processor_handles = amdsmi_get_processor_handles() + if len(processor_handles) == 0: print("No CPU sockets on machine") else: - for socket in socket_handles: - xgmi_width = amdsmi_set_cpu_xgmi_width(socket, 0, 100) + for processor in processor_handles: + xgmi_width = amdsmi_set_cpu_xgmi_width(processor, 0, 100) +except AmdSmiException as e: + print(e) +``` + +### amdsmi_set_cpu_gmi3_link_width_range + +Description: Set gmi3 link width range. + +Input: minimum & maximum link width to be set. + +Exceptions that can be thrown by `amdsmi_set_cpu_gmi3_link_width_range` function: + +* `AmdSmiLibraryException` + +Example: + +```python +try: + processor_handles = amdsmi_get_processor_handles() + if len(processor_handles) == 0: + print("No CPU sockets on machine") + else: + for processor in processor_handles: + gmi_link_width = amdsmi_set_cpu_gmi3_link_width_range(processor, 0, 100) +except AmdSmiException as e: + print(e) +``` + +### amdsmi_cpu_apb_enable + +Description: Enable APB. + +Input: amdsmi processor handle + +Exceptions that can be thrown by `amdsmi_cpu_apb_enable` function: + +* `AmdSmiLibraryException` + +Example: + +```python +try: + processor_handles = amdsmi_get_processor_handles() + if len(processor_handles) == 0: + print("No CPU sockets on machine") + else: + for processor in processor_handles: + apb_enable = amdsmi_cpu_apb_enable(processor) +except AmdSmiException as e: + print(e) +``` + +### amdsmi_cpu_apb_disable + +Description: Disable APB. + +Input: pstate value + +Exceptions that can be thrown by `amdsmi_cpu_apb_disable` function: + +* `AmdSmiLibraryException` + +Example: + +```python +try: + processor_handles = amdsmi_get_processor_handles() + if len(processor_handles) == 0: + print("No CPU sockets on machine") + else: + for processor in processor_handles: + apb_disable = amdsmi_cpu_apb_disable(processor, 0) +except AmdSmiException as e: + print(e) +``` + +### amdsmi_set_cpu_socket_lclk_dpm_level + +Description: Set NBIO lclk dpm level value. + +Input: nbio id, min value, max value + +Exceptions that can be thrown by `amdsmi_set_cpu_socket_lclk_dpm_level` function: + +* `AmdSmiLibraryException` + +Example: + +```python +try: + processor_handles = amdsmi_get_processor_handles() + if len(processor_handles) == 0: + print("No CPU sockets on machine") + else: + for socket in socket_handles: + nbio = amdsmi_set_cpu_socket_lclk_dpm_level(socket, 0, 0, 2) +except AmdSmiException as e: + print(e) +``` + +### amdsmi_get_cpu_socket_lclk_dpm_level + +Description: Get NBIO LCLK dpm level. + +Output: nbio id + +Exceptions that can be thrown by `amdsmi_get_cpu_socket_lclk_dpm_level` function: + +* `AmdSmiLibraryException` + +Example: + +```python +try: + processor_handles = amdsmi_get_processor_handles() + if len(processor_handles) == 0: + print("No CPU sockets on machine") + else: + for processor in processor_handles: + nbio = amdsmi_get_cpu_socket_lclk_dpm_level(processor) + print(nbio['max_dpm_level']) + print(nbio['max_dpm_level']) +except AmdSmiException as e: + print(e) +``` + +### amdsmi_set_cpu_pcie_link_rate + +Description: Set pcie link rate. + +Input: rate control value + +Exceptions that can be thrown by `amdsmi_set_cpu_pcie_link_rate` function: + +* `AmdSmiLibraryException` + +Example: + +```python +try: + processor_handles = amdsmi_get_processor_handles() + if len(processor_handles) == 0: + print("No CPU sockets on machine") + else: + for processor in processor_handles: + link_rate = amdsmi_set_cpu_pcie_link_rate(processor, 0, 0) +except AmdSmiException as e: + print(e) +``` + +### amdsmi_set_cpu_df_pstate_range + +Description: Set df pstate range. + +Input: max pstate, min pstate + +Exceptions that can be thrown by `amdsmi_set_cpu_df_pstate_range` function: + +* `AmdSmiLibraryException` + +Example: + +```python +try: + processor_handles = amdsmi_get_processor_handles() + if len(processor_handles) == 0: + print("No CPU sockets on machine") + else: + for processor in processor_handles: + pstate_range = amdsmi_set_cpu_df_pstate_range(processor, 0, 2) +except AmdSmiException as e: + print(e) +``` + +### amdsmi_get_cpu_current_io_bandwidth + +Description: Get current input output bandwidth. + +Output: link id and bw type to which io bandwidth to be obtained + +Exceptions that can be thrown by `amdsmi_get_cpu_current_io_bandwidth` function: + +* `AmdSmiLibraryException` + +Example: + +```python +try: + processor_handles = amdsmi_get_processor_handles() + if len(processor_handles) == 0: + print("No CPU sockets on machine") + else: + for processor in processor_handles: + io_bw = amdsmi_get_cpu_current_io_bandwidth(processor) + print(io_bw) +except AmdSmiException as e: + print(e) +``` + +### amdsmi_get_cpu_current_xgmi_bw + +Description: Get current xgmi bandwidth. + +Output: amdsmi link id and bw type to which xgmi bandwidth to be obtained + +Exceptions that can be thrown by `amdsmi_get_cpu_current_xgmi_bw` function: + +* `AmdSmiLibraryException` + +Example: + +```python +try: + processor_handles = amdsmi_get_processor_handles() + if len(processor_handles) == 0: + print("No CPU sockets on machine") + else: + for processor in processor_handles: + xgmi_bw = amdsmi_get_cpu_current_xgmi_bw(processor) + print(xgmi_bw) +except AmdSmiException as e: + print(e) +``` + +### amdsmi_get_metrics_table_version + +Description: Get metrics table version. + +Output: amdsmi metrics table version + +Exceptions that can be thrown by `amdsmi_get_metrics_table_version` function: + +* `AmdSmiLibraryException` + +Example: + +```python +try: + processor_handles = amdsmi_get_processor_handles() + if len(processor_handles) == 0: + print("No CPU sockets on machine") + else: + for processor in processor_handles: + met_ver = amdsmi_get_metrics_table_version(processor) + print(met_ver) +except AmdSmiException as e: + print(e) +``` + +### amdsmi_get_metrics_table + +Description: Get metrics table + +Output: metric table data + +Exceptions that can be thrown by `amdsmi_get_metrics_table` function: + +* `AmdSmiLibraryException` + +Example: + +```python +try: + processor_handles = amdsmi_get_processor_handles() + if len(processor_handles) == 0: + print("No CPU sockets on machine") + else: + for processor in processor_handles: + mtbl = amdsmi_get_metrics_table(processor) + print(mtbl['accumulation_counter']) + print(mtbl['max_socket_temperature']) + print(mtbl['max_vr_temperature']) + print(mtbl['max_hbm_temperature']) + print(mtbl['socket_power_limit']) + print(mtbl['max_socket_power_limit']) + print(mtbl['socket_power']) +except AmdSmiException as e: + print(e) +``` + +### amdsmi_first_online_core_on_cpu_socket + +Description: Get first online core on cpu socket. + +Output: first online core on cpu socket + +Exceptions that can be thrown by `amdsmi_first_online_core_on_cpu_socket` function: + +* `AmdSmiLibraryException` + +Example: + +```python +try: + processor_handles = amdsmi_get_processor_handles() + if len(processor_handles) == 0: + print("No CPU sockets on machine") + else: + for processor in processor_handles: + pcore_ind = amdsmi_first_online_core_on_cpu_socket(processor) + print(pcore_ind) except AmdSmiException as e: print(e) ``` diff --git a/py-interface/__init__.py b/py-interface/__init__.py index 2c54cfff33..9646c50d77 100644 --- a/py-interface/__init__.py +++ b/py-interface/__init__.py @@ -32,8 +32,8 @@ from .amdsmi_interface import amdsmi_get_socket_info # ESMI Dependent Functions try: from .amdsmi_interface import amdsmi_get_cpusocket_handles - from .amdsmi_interface import amdsmi_get_cpusocket_info from .amdsmi_interface import amdsmi_get_cpucore_handles + from .amdsmi_interface import amdsmi_get_processor_info from .amdsmi_interface import amdsmi_get_cpu_hsmp_proto_ver from .amdsmi_interface import amdsmi_get_cpu_smu_fw_version from .amdsmi_interface import amdsmi_get_cpu_core_energy @@ -60,6 +60,18 @@ try: from .amdsmi_interface import amdsmi_get_cpu_dimm_power_consumption from .amdsmi_interface import amdsmi_get_cpu_dimm_thermal_sensor from .amdsmi_interface import amdsmi_set_cpu_xgmi_width + from .amdsmi_interface import amdsmi_set_cpu_gmi3_link_width_range + from .amdsmi_interface import amdsmi_cpu_apb_enable + from .amdsmi_interface import amdsmi_cpu_apb_disable + from .amdsmi_interface import amdsmi_set_cpu_socket_lclk_dpm_level + from .amdsmi_interface import amdsmi_get_cpu_socket_lclk_dpm_level + from .amdsmi_interface import amdsmi_set_cpu_pcie_link_rate + from .amdsmi_interface import amdsmi_set_cpu_df_pstate_range + from .amdsmi_interface import amdsmi_get_cpu_current_io_bandwidth + from .amdsmi_interface import amdsmi_get_cpu_current_xgmi_bw + from .amdsmi_interface import amdsmi_get_metrics_table_version + from .amdsmi_interface import amdsmi_get_metrics_table + from .amdsmi_interface import amdsmi_first_online_core_on_cpu_socket except AttributeError: pass diff --git a/py-interface/amdsmi_interface.py b/py-interface/amdsmi_interface.py index 18e563c198..e8da93e771 100644 --- a/py-interface/amdsmi_interface.py +++ b/py-interface/amdsmi_interface.py @@ -42,6 +42,7 @@ class AmdSmiInitFlags(IntEnum): INIT_ALL_PROCESSORS = amdsmi_wrapper.AMDSMI_INIT_ALL_PROCESSORS INIT_AMD_CPUS = amdsmi_wrapper.AMDSMI_INIT_AMD_CPUS INIT_AMD_GPUS = amdsmi_wrapper.AMDSMI_INIT_AMD_GPUS + INIT_AMD_APUS = amdsmi_wrapper.AMDSMI_INIT_AMD_APUS INIT_NON_AMD_CPUS = amdsmi_wrapper.AMDSMI_INIT_NON_AMD_CPUS INIT_NON_AMD_GPUS = amdsmi_wrapper.AMDSMI_INIT_NON_AMD_GPUS @@ -555,7 +556,7 @@ def amdsmi_get_socket_handles() -> List[amdsmi_wrapper.amdsmi_socket_handle]: return sockets -def amdsmi_get_cpusocket_handles() -> List[amdsmi_wrapper.amdsmi_cpusocket_handle]: +def amdsmi_get_cpusocket_handles() -> List[amdsmi_wrapper.amdsmi_socket_handle]: """ Function that gets cpu socket handles. Wraps the same named function call. @@ -565,24 +566,38 @@ def amdsmi_get_cpusocket_handles() -> List[amdsmi_wrapper.amdsmi_cpusocket_handl Returns: `List`: List containing all of the found cpu socket handles. """ - socket_count = ctypes.c_uint32(0) - null_ptr = ctypes.POINTER(amdsmi_wrapper.amdsmi_cpusocket_handle)() - _check_res( - amdsmi_wrapper.amdsmi_get_cpusocket_handles( - ctypes.byref(socket_count), null_ptr) - ) - socket_handles = (amdsmi_wrapper.amdsmi_cpusocket_handle * - socket_count.value)() - _check_res( - amdsmi_wrapper.amdsmi_get_cpusocket_handles( - ctypes.byref(socket_count), socket_handles) - ) - sockets = [ - amdsmi_wrapper.amdsmi_cpusocket_handle(socket_handles[sock_idx]) - for sock_idx in range(socket_count.value) - ] + socket_handles = amdsmi_get_socket_handles() + cpu_handles = [] + type = amdsmi_wrapper.AMD_CPU + for socket in socket_handles: + cpu_count = ctypes.c_uint32() + null_ptr = ctypes.POINTER(amdsmi_wrapper.amdsmi_processor_handle)() + _check_res( + amdsmi_wrapper.amdsmi_get_processor_handles_by_type( + socket, + type, + null_ptr, + ctypes.byref(cpu_count), + ) + ) + processor_handles = ( + amdsmi_wrapper.amdsmi_processor_handle * cpu_count.value)() + _check_res( + amdsmi_wrapper.amdsmi_get_processor_handles_by_type( + socket, + type, + processor_handles, + ctypes.byref(cpu_count) + ) + ) + cpu_handles.extend( + [ + amdsmi_wrapper.amdsmi_processor_handle(processor_handles[dev_idx]) + for dev_idx in range(cpu_count.value) + ] + ) + return cpu_handles - return sockets def amdsmi_get_socket_info(socket_handle): if not isinstance(socket_handle, amdsmi_wrapper.amdsmi_socket_handle): @@ -597,18 +612,20 @@ def amdsmi_get_socket_info(socket_handle): return socket_info.value.decode() -def amdsmi_get_cpusocket_info(socket_handle): - if not isinstance(socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle): +def amdsmi_get_processor_info(processor_handle): + if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle) + processor_handle, amdsmi_wrapper.amdsmi_processor_handle) + processor_info = ctypes.create_string_buffer(128) - socket_id = ctypes.c_uint32() + core_id = ctypes.c_uint32() _check_res( - amdsmi_wrapper.amdsmi_get_cpusocket_info( - socket_handle, socket_id) + amdsmi_wrapper.amdsmi_get_processor_info( + processor_handle, ctypes.c_size_t(128), processor_info) ) - return socket_id + return processor_info.value.decode() + def amdsmi_get_processor_handles() -> List[amdsmi_wrapper.amdsmi_processor_handle]: socket_handles = amdsmi_get_socket_handles() @@ -642,62 +659,66 @@ def amdsmi_get_processor_handles() -> List[amdsmi_wrapper.amdsmi_processor_handl return devices def amdsmi_get_cpucore_handles() -> List[amdsmi_wrapper.amdsmi_processor_handle]: - socket_handles = amdsmi_get_cpusocket_handles() - processors = [] + socket_handles = amdsmi_get_socket_handles() + core_handles = [] + type = amdsmi_wrapper.AMD_CPU_CORE + for socket in socket_handles: - processor_count = ctypes.c_uint32() + core_count = ctypes.c_uint32() null_ptr = ctypes.POINTER(amdsmi_wrapper.amdsmi_processor_handle)() _check_res( - amdsmi_wrapper.amdsmi_get_cpucore_handles( + amdsmi_wrapper.amdsmi_get_processor_handles_by_type( socket, - ctypes.byref(processor_count), + type, null_ptr, + ctypes.byref(core_count), ) ) - processor_handles = ( - amdsmi_wrapper.amdsmi_processor_handle * processor_count.value)() + c_handles = ( + amdsmi_wrapper.amdsmi_processor_handle * core_count.value)() _check_res( - amdsmi_wrapper.amdsmi_get_cpucore_handles( + amdsmi_wrapper.amdsmi_get_processor_handles_by_type( socket, - ctypes.byref(processor_count), - processor_handles, + type, + c_handles, + ctypes.byref(core_count) ) ) - processors.extend( + core_handles.extend( [ - amdsmi_wrapper.amdsmi_processor_handle(processor_handles[dev_idx]) - for dev_idx in range(processor_count.value) + amdsmi_wrapper.amdsmi_processor_handle(c_handles[dev_idx]) + for dev_idx in range(core_count.value) ] ) + return core_handles - return processors def amdsmi_get_cpu_hsmp_proto_ver( - socket_handle: amdsmi_wrapper.amdsmi_cpusocket_handle, + processor_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> int: - if not isinstance(socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle): + if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle + processor_handle, amdsmi_wrapper.amdsmi_processor_handle ) proto_ver = ctypes.c_uint32() _check_res( amdsmi_wrapper.amdsmi_get_cpu_hsmp_proto_ver( - socket_handle, ctypes.byref(proto_ver) + processor_handle, ctypes.byref(proto_ver) ) ) return proto_ver.value -def amdsmi_get_cpu_smu_fw_version(socket_handle: amdsmi_wrapper.amdsmi_cpusocket_handle): - if not isinstance(socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle): +def amdsmi_get_cpu_smu_fw_version(processor_handle: amdsmi_wrapper.amdsmi_processor_handle): + if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle + processor_handle, amdsmi_wrapper.amdsmi_processor_handle ) smu_fw = amdsmi_wrapper.amdsmi_smu_fw_version_t() - _check_res(amdsmi_wrapper.amdsmi_get_cpu_smu_fw_version(socket_handle, smu_fw)) + _check_res(amdsmi_wrapper.amdsmi_get_cpu_smu_fw_version(processor_handle, smu_fw)) return { "smu_fw_debug_ver_num": smu_fw.debug, @@ -706,77 +727,69 @@ def amdsmi_get_cpu_smu_fw_version(socket_handle: amdsmi_wrapper.amdsmi_cpusocket } def amdsmi_get_cpu_core_energy( - processor_handle: amdsmi_wrapper.amdsmi_processor_handle, core_idx: int + processor_handle: amdsmi_wrapper.amdsmi_processor_handle ) -> int: if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( processor_handle, amdsmi_wrapper.amdsmi_processor_handle ) - if not isinstance(core_idx, int): - raise AmdSmiParameterException(core_idx, int) penergy = ctypes.c_uint64() _check_res( amdsmi_wrapper.amdsmi_get_cpu_core_energy( - processor_handle, core_idx, ctypes.byref(penergy) + processor_handle, ctypes.byref(penergy) ) ) return penergy.value def amdsmi_get_cpu_socket_energy( - socket_handle: amdsmi_wrapper.amdsmi_cpusocket_handle, sock_idx: int + processor_handle: amdsmi_wrapper.amdsmi_processor_handle ) -> int: - if not isinstance(socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle): + if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle + processor_handle, amdsmi_wrapper.amdsmi_processor_handle ) - if not isinstance(sock_idx, int): - raise AmdSmiParameterException(sock_idx, int) penergy = ctypes.c_uint64() _check_res( amdsmi_wrapper.amdsmi_get_cpu_socket_energy( - socket_handle, sock_idx, ctypes.byref(penergy) + processor_handle, ctypes.byref(penergy) ) ) return penergy.value def amdsmi_get_cpu_prochot_status( - socket_handle: amdsmi_wrapper.amdsmi_cpusocket_handle, sock_idx: int + processor_handle: amdsmi_wrapper.amdsmi_processor_handle ) -> int: - if not isinstance(socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle): + if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle + processor_handle, amdsmi_wrapper.amdsmi_processor_handle ) - if not isinstance(sock_idx, int): - raise AmdSmiParameterException(sock_idx, int) prochot = ctypes.c_uint32() _check_res( - amdsmi_wrapper.amdsmi_get_cpu_socket_energy( - socket_handle, sock_idx, ctypes.byref(prochot) + amdsmi_wrapper.amdsmi_get_cpu_prochot_status( + processor_handle, ctypes.byref(prochot) ) ) return prochot.value def amdsmi_get_cpu_fclk_mclk( - socket_handle: amdsmi_wrapper.amdsmi_cpusocket_handle, sock_idx: int + processor_handle: amdsmi_wrapper.amdsmi_processor_handle ): - if not isinstance(socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle): + if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle + processor_handle, amdsmi_wrapper.amdsmi_processor_handle ) - if not isinstance(sock_idx, int): - raise AmdSmiParameterException(sock_idx, int) fclk = ctypes.c_uint32() mclk = ctypes.c_uint32() _check_res( amdsmi_wrapper.amdsmi_get_cpu_fclk_mclk( - socket_handle, sock_idx, ctypes.byref(fclk), ctypes.byref(mclk) + processor_handle, ctypes.byref(fclk), ctypes.byref(mclk) ) ) @@ -786,59 +799,53 @@ def amdsmi_get_cpu_fclk_mclk( } def amdsmi_get_cpu_cclk_limit( - socket_handle: amdsmi_wrapper.amdsmi_cpusocket_handle, sock_idx: int + processor_handle: amdsmi_wrapper.amdsmi_processor_handle ) -> int: - if not isinstance(socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle): + if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle + processor_handle, amdsmi_wrapper.amdsmi_processor_handle ) - if not isinstance(sock_idx, int): - raise AmdSmiParameterException(sock_idx, int) cclk = ctypes.c_uint32() _check_res( amdsmi_wrapper.amdsmi_get_cpu_cclk_limit( - socket_handle, sock_idx, ctypes.byref(cclk) + processor_handle, ctypes.byref(cclk) ) ) return cclk.value def amdsmi_get_cpu_socket_current_active_freq_limit( - socket_handle: amdsmi_wrapper.amdsmi_cpusocket_handle, sock_idx: int + processor_handle: amdsmi_wrapper.amdsmi_processor_handle ) -> int: - if not isinstance(socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle): + if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle + processor_handle, amdsmi_wrapper.amdsmi_processor_handle ) - if not isinstance(sock_idx, int): - raise AmdSmiParameterException(sock_idx, int) freq = ctypes.c_uint16() src_type = ctypes.pointer(ctypes.pointer(ctypes.c_char())) _check_res( amdsmi_wrapper.amdsmi_get_cpu_socket_current_active_freq_limit( - socket_handle, sock_idx, ctypes.byref(freq), src_type + processor_handle, ctypes.byref(freq), src_type ) ) return freq.value def amdsmi_get_cpu_socket_freq_range( - socket_handle: amdsmi_wrapper.amdsmi_cpusocket_handle, sock_idx: int + processor_handle: amdsmi_wrapper.amdsmi_processor_handle ): - if not isinstance(socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle): + if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle + processor_handle, amdsmi_wrapper.amdsmi_processor_handle ) - if not isinstance(sock_idx, int): - raise AmdSmiParameterException(sock_idx, int) freq_max = ctypes.c_uint16() freq_min = ctypes.c_uint16() _check_res( amdsmi_wrapper.amdsmi_get_cpu_socket_freq_range( - socket_handle, sock_idx, ctypes.byref(freq_max), ctypes.byref(freq_min) + processor_handle, ctypes.byref(freq_max), ctypes.byref(freq_min) ) ) @@ -848,223 +855,198 @@ def amdsmi_get_cpu_socket_freq_range( } def amdsmi_get_cpu_core_current_freq_limit( - processor_handle: amdsmi_wrapper.amdsmi_processor_handle, core_idx: int + processor_handle: amdsmi_wrapper.amdsmi_processor_handle ) -> int: if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( processor_handle, amdsmi_wrapper.amdsmi_processor_handle ) - if not isinstance(core_idx, int): - raise AmdSmiParameterException(core_idx, int) freq = ctypes.c_uint32() _check_res( amdsmi_wrapper.amdsmi_get_cpu_core_current_freq_limit( - processor_handle, core_idx, ctypes.byref(freq) + processor_handle, ctypes.byref(freq) ) ) return freq.value def amdsmi_get_cpu_socket_power( - socket_handle: amdsmi_wrapper.amdsmi_cpusocket_handle, sock_idx: int + processor_handle: amdsmi_wrapper.amdsmi_processor_handle ) -> int: - if not isinstance(socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle): + if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle + processor_handle, amdsmi_wrapper.amdsmi_processor_handle ) - if not isinstance(sock_idx, int): - raise AmdSmiParameterException(sock_idx, int) ppower = ctypes.c_uint32() _check_res( amdsmi_wrapper.amdsmi_get_cpu_socket_power( - socket_handle, sock_idx, ctypes.byref(ppower) + processor_handle, ctypes.byref(ppower) ) ) return ppower.value def amdsmi_get_cpu_socket_power_cap( - socket_handle: amdsmi_wrapper.amdsmi_cpusocket_handle, sock_idx: int + processor_handle: amdsmi_wrapper.amdsmi_processor_handle ) -> int: - if not isinstance(socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle): + if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle + processor_handle, amdsmi_wrapper.amdsmi_processor_handle ) - if not isinstance(sock_idx, int): - raise AmdSmiParameterException(sock_idx, int) pcap = ctypes.c_uint32() _check_res( amdsmi_wrapper.amdsmi_get_cpu_socket_power_cap( - socket_handle, sock_idx, ctypes.byref(pcap) + processor_handle, ctypes.byref(pcap) ) ) return pcap.value def amdsmi_get_cpu_socket_power_cap_max( - socket_handle: amdsmi_wrapper.amdsmi_cpusocket_handle, sock_idx: int + processor_handle: amdsmi_wrapper.amdsmi_processor_handle ) -> int: - if not isinstance(socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle): + if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle + processor_handle, amdsmi_wrapper.amdsmi_processor_handle ) - if not isinstance(sock_idx, int): - raise AmdSmiParameterException(sock_idx, int) pmax = ctypes.c_uint32() _check_res( amdsmi_wrapper.amdsmi_get_cpu_socket_power_cap_max( - socket_handle, sock_idx, ctypes.byref(pmax) + processor_handle, ctypes.byref(pmax) ) ) return pmax.value def amdsmi_get_cpu_pwr_svi_telemetry_all_rails( - socket_handle: amdsmi_wrapper.amdsmi_cpusocket_handle, sock_idx: int + processor_handle: amdsmi_wrapper.amdsmi_processor_handle ) -> int: - if not isinstance(socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle): + if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle + processor_handle, amdsmi_wrapper.amdsmi_processor_handle ) - if not isinstance(sock_idx, int): - raise AmdSmiParameterException(sock_idx, int) power = ctypes.c_uint32() _check_res( amdsmi_wrapper.amdsmi_get_cpu_pwr_svi_telemetry_all_rails( - socket_handle, sock_idx, ctypes.byref(power) + processor_handle, ctypes.byref(power) ) ) return power.value def amdsmi_set_cpu_socket_power_cap( - socket_handle: amdsmi_wrapper.amdsmi_cpusocket_handle, sock_idx: int, power_cap: int + processor_handle: amdsmi_wrapper.amdsmi_processor_handle, power_cap: int ): - if not isinstance(socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle): + if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle + processor_handle, amdsmi_wrapper.amdsmi_processor_handle ) - if not isinstance(sock_idx, int): - raise AmdSmiParameterException(sock_idx, int) if not isinstance(power_cap, int): raise AmdSmiParameterException(power_cap, int) - sock_idx = ctypes.c_uint32(sock_idx) + power_cap = ctypes.c_uint32(power_cap) _check_res( amdsmi_wrapper.amdsmi_set_cpu_socket_power_cap( - processor_handle, sock_idx, power_cap) + processor_handle, power_cap) ) def amdsmi_set_cpu_pwr_efficiency_mode( - socket_handle: amdsmi_wrapper.amdsmi_cpusocket_handle, sock_idx: int, mode: int + processor_handle: amdsmi_wrapper.amdsmi_processor_handle, mode: int ): - if not isinstance(socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle): + if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle + processor_handle, amdsmi_wrapper.amdsmi_processor_handle ) - if not isinstance(sock_idx, int): - raise AmdSmiParameterException(sock_idx, int) if not isinstance(mode, int): raise AmdSmiParameterException(mode, int) - sock_idx = ctypes.c_uint8(sock_idx) mode = ctypes.c_uint8(mode) _check_res( amdsmi_wrapper.amdsmi_set_cpu_pwr_efficiency_mode( - socket_handle, sock_idx, mode) + processor_handle, mode) ) def amdsmi_get_cpu_core_boostlimit( - processor_handle: amdsmi_wrapper.amdsmi_processor_handle, core_idx: int + processor_handle: amdsmi_wrapper.amdsmi_processor_handle ) -> int: if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( processor_handle, amdsmi_wrapper.amdsmi_processor_handle ) - if not isinstance(core_idx, int): - raise AmdSmiParameterException(core_idx, int) boostlimit = ctypes.c_uint32() _check_res( amdsmi_wrapper.amdsmi_get_cpu_core_boostlimit( - processor_handle, core_idx, ctypes.byref(boostlimit) + processor_handle, ctypes.byref(boostlimit) ) ) return boostlimit.value def amdsmi_get_cpu_socket_c0_residency( - socket_handle: amdsmi_wrapper.amdsmi_cpusocket_handle, sock_idx: int + processor_handle: amdsmi_wrapper.amdsmi_processor_handle ) -> int: - if not isinstance(socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle): + if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle + processor_handle, amdsmi_wrapper.amdsmi_processor_handle ) - if not isinstance(sock_idx, int): - raise AmdSmiParameterException(sock_idx, int) c0_residency = ctypes.c_uint32() _check_res( amdsmi_wrapper.amdsmi_get_cpu_socket_c0_residency( - socket_handle, sock_idx, ctypes.byref(c0_residency) + processor_handle, ctypes.byref(c0_residency) ) ) return c0_residency.value def amdsmi_set_cpu_core_boostlimit( - processor_handle: amdsmi_wrapper.amdsmi_processor_handle, core_idx: int, boostlimit: int + processor_handle: amdsmi_wrapper.amdsmi_processor_handle, boostlimit: int ): if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( processor_handle, amdsmi_wrapper.amdsmi_processor_handle ) - if not isinstance(core_idx, int): - raise AmdSmiParameterException(core_idx, int) if not isinstance(boostlimit, int): raise AmdSmiParameterException(boostlimit, int) - core_idx = ctypes.c_uint32(core_idx) boostlimit = ctypes.c_uint32(boostlimit) _check_res( amdsmi_wrapper.amdsmi_set_cpu_core_boostlimit( - processor_handle, core_idx, boostlimit) + processor_handle, boostlimit) ) def amdsmi_set_cpu_socket_boostlimit( - socket_handle: amdsmi_wrapper.amdsmi_cpusocket_handle, sock_idx: int, boostlimit: int + processor_handle: amdsmi_wrapper.amdsmi_processor_handle, boostlimit: int ): - if not isinstance(socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle): + if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle + processor_handle, amdsmi_wrapper.amdsmi_processor_handle ) - if not isinstance(sock_idx, int): - raise AmdSmiParameterException(sock_idx, int) if not isinstance(boostlimit, int): raise AmdSmiParameterException(boostlimit, int) - sock_idx = ctypes.c_uint32(sock_idx) boostlimit = ctypes.c_uint32(boostlimit) _check_res( amdsmi_wrapper.amdsmi_set_cpu_socket_boostlimit( - socket_handle, sock_idx, boostlimit) + processor_handle, boostlimit) ) -def amdsmi_get_cpu_ddr_bw(socket_handle: amdsmi_wrapper.amdsmi_cpusocket_handle): - if not isinstance(socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle): +def amdsmi_get_cpu_ddr_bw(processor_handle: amdsmi_wrapper.amdsmi_processor_handle): + if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle + processor_handle, amdsmi_wrapper.amdsmi_processor_handle ) ddr_bw = amdsmi_wrapper.amdsmi_ddr_bw_metrics_t() - _check_res(amdsmi_wrapper.amdsmi_get_cpu_ddr_bw(socket_handle, ddr_bw)) + _check_res(amdsmi_wrapper.amdsmi_get_cpu_ddr_bw(processor_handle, ddr_bw)) return { "ddr_bw_max_bw": ddr_bw.max_bw, @@ -1073,39 +1055,36 @@ def amdsmi_get_cpu_ddr_bw(socket_handle: amdsmi_wrapper.amdsmi_cpusocket_handle) } def amdsmi_get_cpu_socket_temperature( - socket_handle: amdsmi_wrapper.amdsmi_cpusocket_handle, sock_idx: int + processor_handle: amdsmi_wrapper.amdsmi_processor_handle ) -> int: - if not isinstance(socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle): + if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle + processor_handle, amdsmi_wrapper.amdsmi_processor_handle ) - if not isinstance(sock_idx, int): - raise AmdSmiParameterException(sock_idx, int) ptmon = ctypes.c_uint32() + _check_res( amdsmi_wrapper.amdsmi_get_cpu_socket_temperature( - socket_handle, sock_idx, ctypes.byref(ptmon) + processor_handle, ctypes.byref(ptmon) ) ) return ptmon.value def amdsmi_get_cpu_dimm_temp_range_and_refresh_rate( - socket_handle: amdsmi_wrapper.amdsmi_cpusocket_handle, - sock_idx: int, dimm_addr: int): - if not isinstance(socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle): + processor_handle: amdsmi_wrapper.amdsmi_processor_handle, + dimm_addr: int): + if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle + processor_handle, amdsmi_wrapper.amdsmi_processor_handle ) - if not isinstance(sock_idx, int): - raise AmdSmiParameterException(sock_idx, int) if not isinstance(dimm_addr, int): raise AmdSmiParameterException(dimm_addr, int) dimm = amdsmi_wrapper.amdsmi_temp_range_refresh_rate_t() - _check_res(amdsmi_wrapper.amdsmi_get_cpu_dimm_temp_range_and_refresh_rate(socket_handle, dimm)) + _check_res(amdsmi_wrapper.amdsmi_get_cpu_dimm_temp_range_and_refresh_rate(processor_handle, dimm)) return { "dimm_temperature_range": dimm.range, @@ -1113,20 +1092,18 @@ def amdsmi_get_cpu_dimm_temp_range_and_refresh_rate( } def amdsmi_get_cpu_dimm_power_consumption( - socket_handle: amdsmi_wrapper.amdsmi_cpusocket_handle, - sock_idx: int, dimm_addr: int): - if not isinstance(socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle): + processor_handle: amdsmi_wrapper.amdsmi_processor_handle, + dimm_addr: int): + if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle + processor_handle, amdsmi_wrapper.amdsmi_processor_handle ) - if not isinstance(sock_idx, int): - raise AmdSmiParameterException(sock_idx, int) if not isinstance(dimm_addr, int): raise AmdSmiParameterException(dimm_addr, int) dimm = amdsmi_wrapper.amdsmi_dimm_power_t() - _check_res(amdsmi_wrapper.amdsmi_get_cpu_dimm_power_consumption(socket_handle, dimm)) + _check_res(amdsmi_wrapper.amdsmi_get_cpu_dimm_power_consumption(processor_handle, dimm)) return { "dimm_power_consumed": dimm.power, @@ -1135,20 +1112,18 @@ def amdsmi_get_cpu_dimm_power_consumption( } def amdsmi_get_cpu_dimm_thermal_sensor( - socket_handle: amdsmi_wrapper.amdsmi_cpusocket_handle, - sock_idx: int, dimm_addr: int): - if not isinstance(socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle): + processor_handle: amdsmi_wrapper.amdsmi_processor_handle, + dimm_addr: int): + if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle + processor_handle, amdsmi_wrapper.amdsmi_processor_handle ) - if not isinstance(sock_idx, int): - raise AmdSmiParameterException(sock_idx, int) if not isinstance(dimm_addr, int): raise AmdSmiParameterException(dimm_addr, int) dimm_thermal = amdsmi_wrapper.amdsmi_dimm_thermal_t() - _check_res(amdsmi_wrapper.amdsmi_get_cpu_dimm_thermal_sensor(socket_handle, dimm_thermal)) + _check_res(amdsmi_wrapper.amdsmi_get_cpu_dimm_thermal_sensor(processor_handle, dimm_thermal)) return { "dimm_thermal_sensor_value": dimm_thermal.sensor, @@ -1158,11 +1133,11 @@ def amdsmi_get_cpu_dimm_thermal_sensor( } def amdsmi_set_cpu_xgmi_width( - socket_handle: amdsmi_wrapper.amdsmi_cpusocket_handle, min_width: int, max_width: int + processor_handle: amdsmi_wrapper.amdsmi_processor_handle, min_width: int, max_width: int ): - if not isinstance(socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle): + if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - socket_handle, amdsmi_wrapper.amdsmi_cpusocket_handle + processor_handle, amdsmi_wrapper.amdsmi_processor_handle ) if not isinstance(min_width, int): raise AmdSmiParameterException(min_width, int) @@ -1174,9 +1149,294 @@ def amdsmi_set_cpu_xgmi_width( _check_res( amdsmi_wrapper.amdsmi_set_cpu_xgmi_width( - socket_handle, min_width, max_width) + processor_handle, min_width, max_width) ) +def amdsmi_set_cpu_gmi3_link_width_range( + processor_handle: amdsmi_wrapper.amdsmi_processor_handle, + min_link_width: int, max_link_width: int +): + if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): + raise AmdSmiParameterException( + processor_handle, amdsmi_wrapper.amdsmi_processor_handle + ) + if not isinstance(min_link_width, int): + raise AmdSmiParameterException(min_link_width, int) + if not isinstance(max_link_width, int): + raise AmdSmiParameterException(max_link_width, int) + + min_link_width = ctypes.c_uint8(min_link_width) + max_link_width = ctypes.c_uint8(max_link_width) + + _check_res( + amdsmi_wrapper.amdsmi_set_cpu_gmi3_link_width_range( + processor_handle, min_link_width, max_link_width) + ) + +def amdsmi_cpu_apb_enable( + processor_handle: amdsmi_wrapper.amdsmi_processor_handle +): + if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): + raise AmdSmiParameterException( + processor_handle, amdsmi_wrapper.amdsmi_processor_handle + ) + + _check_res( + amdsmi_wrapper.amdsmi_cpu_apb_enable(processor_handle) + ) + +def amdsmi_cpu_apb_disable( + processor_handle: amdsmi_wrapper.amdsmi_processor_handle, + pstate: int +): + if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): + raise AmdSmiParameterException( + processor_handle, amdsmi_wrapper.amdsmi_processor_handle + ) + if not isinstance(pstate, int): + raise AmdSmiParameterException(pstate, int) + + pstate = ctypes.c_uint8(pstate) + + _check_res( + amdsmi_wrapper.amdsmi_cpu_apb_disable( + processor_handle, pstate) + ) + +def amdsmi_set_cpu_socket_lclk_dpm_level( + processor_handle: amdsmi_wrapper.amdsmi_processor_handle, + nbio_id: int, min_val: int, max_val: int +): + if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): + raise AmdSmiParameterException( + processor_handle, amdsmi_wrapper.amdsmi_processor_handle + ) + if not isinstance(nbio_id, int): + raise AmdSmiParameterException(nbio_id, int) + if not isinstance(min_val, int): + raise AmdSmiParameterException(min_val, int) + if not isinstance(max_val, int): + raise AmdSmiParameterException(max_val, int) + + nbio_id = ctypes.c_uint8(nbio_id) + min_val = ctypes.c_uint8(min_val) + max_val = ctypes.c_uint8(max_val) + + _check_res( + amdsmi_wrapper.amdsmi_set_cpu_socket_lclk_dpm_level( + processor_handle, nbio_id, min_val, max_val) + ) + +def amdsmi_get_cpu_socket_lclk_dpm_level( + processor_handle: amdsmi_wrapper.amdsmi_processor_handle, + nbio_id: int +): + if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): + raise AmdSmiParameterException( + processor_handle, amdsmi_wrapper.amdsmi_processor_handle + ) + if not isinstance(nbio_id, int): + raise AmdSmiParameterException(nbio_id, int) + + nbio_id = ctypes.c_uint8(nbio_id) + dpm_level = amdsmi_wrapper.amdsmi_dpm_level_t() + + _check_res(amdsmi_wrapper.amdsmi_get_cpu_socket_lclk_dpm_level(processor_handle, nbio_id, dpm_level)) + + return { + "nbio_max_dpm_level": nbio.max_dpm_level, + "nbio_min_dpm_level": nbio.min_dpm_level + } + +def amdsmi_set_cpu_pcie_link_rate( + processor_handle: amdsmi_wrapper.amdsmi_processor_handle, + rate_ctrl: int +): + if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): + raise AmdSmiParameterException( + processor_handle, amdsmi_wrapper.amdsmi_processor_handle + ) + if not isinstance(rate_ctrl, int): + raise AmdSmiParameterException(rate_ctrl, int) + + rate_ctrl = ctypes.c_uint8(rate_ctrl) + prev_mode = ctypes.c_uint8() + + _check_res( + amdsmi_wrapper.amdsmi_set_cpu_pcie_link_rate( + processor_handle, rate_ctrl, ctypes.byref(prev_mode)) + ) + +def amdsmi_set_cpu_df_pstate_range( + processor_handle: amdsmi_wrapper.amdsmi_processor_handle, + max_pstate: int, min_pstate: int +): + if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): + raise AmdSmiParameterException( + processor_handle, amdsmi_wrapper.amdsmi_processor_handle + ) + if not isinstance(max_pstate, int): + raise AmdSmiParameterException(max_pstate, int) + if not isinstance(min_pstate, int): + raise AmdSmiParameterException(min_pstate, int) + + max_pstate = ctypes.c_uint8(max_pstate) + min_pstate = ctypes.c_uint8(min_pstate) + + _check_res( + amdsmi_wrapper.amdsmi_set_cpu_df_pstate_range( + processor_handle, max_pstate, min_pstate)) + +def amdsmi_get_cpu_current_io_bandwidth( + processor_handle: amdsmi_wrapper.amdsmi_processor_handle, + encoding: int, + link_name: str +): + if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): + raise AmdSmiParameterException( + processor_handle, amdsmi_wrapper.amdsmi_processor_handle + ) + + link = amdsmi_wrapper.amdsmi_link_id_bw_type_t() + link.bw_type = ctypes.c_uint32(encoding) + link.link_name = ctypes.create_string_buffer(link_name.encode('utf-8')) + io_bw = ctypes.c_uint32() + + _check_res( + amdsmi_wrapper.amdsmi_get_cpu_current_io_bandwidth( + processor_handle, link, ctypes.byref(io_bw)) + ) + + return io_bw.value + +def amdsmi_get_cpu_current_xgmi_bw( + processor_handle: amdsmi_wrapper.amdsmi_processor_handle, + encoding: int, + link_name: str +): + if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): + raise AmdSmiParameterException( + processor_handle, amdsmi_wrapper.amdsmi_processor_handle + ) + + link = amdsmi_wrapper.amdsmi_link_id_bw_type_t() + link.bw_type = ctypes.c_uint32(encoding) + link.link_name = ctypes.create_string_buffer(link_name.encode('utf-8')) + xgmi_bw = ctypes.c_uint32() + + _check_res( + amdsmi_wrapper.amdsmi_get_cpu_current_xgmi_bw( + processor_handle, link, ctypes.byref(xgmi_bw)) + ) + + return xgmi_bw.value + +def amdsmi_get_metrics_table_version( + processor_handle: amdsmi_wrapper.amdsmi_processor_handle +): + if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): + raise AmdSmiParameterException( + processor_handle, amdsmi_wrapper.amdsmi_processor_handle + ) + + metric_tbl_version = ctypes.c_uint32() + + _check_res( + amdsmi_wrapper.amdsmi_get_metrics_table_version( + processor_handle, ctypes.byref(metric_tbl_version)) + ) + + return metric_tbl_version.value + +def amdsmi_get_metrics_table( + processor_handle: amdsmi_wrapper.amdsmi_processor_handle +): + if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): + raise AmdSmiParameterException( + processor_handle, amdsmi_wrapper.amdsmi_processor_handle + ) + + mtbl = amdsmi_wrapper.struct_hsmp_metric_table() + + _check_res(amdsmi_wrapper.amdsmi_get_metrics_table(processor_handle, mtbl)) + + return { + "mtbl_accumulation_counter": mtbl.accumulation_counter, + "mtbl_max_socket_temperature": mtbl.max_socket_temperature, + "mtbl_max_vr_temperature": mtbl.max_vr_temperature, + "mtbl_max_hbm_temperature": mtbl.max_hbm_temperature, + "mtbl_max_socket_temperature_acc": mtbl.max_socket_temperature_acc, + "mtbl_max_vr_temperature_acc": mtbl.max_vr_temperature_acc, + "mtbl_max_hbm_temperature_acc": mtbl.max_hbm_temperature_acc, + "mtbl_socket_power_limit": mtbl.socket_power_limit, + "mtbl_max_socket_power_limit": mtbl.max_socket_power_limit, + "mtbl_socket_power": mtbl.socket_power, + "mtbl_timestamp": mtbl.timestamp, + "mtbl_socket_energy_acc": mtbl.socket_energy_acc, + "mtbl_ccd_energy_acc": mtbl.ccd_energy_acc, + "mtbl_xcd_energy_acc": mtbl.xcd_energy_acc, + "mtbl_aid_energy_acc": mtbl.aid_energy_acc, + "mtbl_hbm_energy_acc": mtbl.hbm_energy_acc, + "mtbl_cclk_frequency_limit": mtbl.cclk_frequency_limit, + "mtbl_gfxclk_frequency_limit": mtbl.gfxclk_frequency_limit, + "mtbl_fclk_frequency": mtbl.fclk_frequency, + "mtbl_uclk_frequency": mtbl.uclk_frequency, + "mtbl_socclk_frequency": mtbl.socclk_frequency, + "mtbl_vclk_frequency": mtbl.vclk_frequency, + "mtbl_dclk_frequency": mtbl.dclk_frequency, + "mtbl_lclk_frequency": mtbl.lclk_frequency, + "mtbl_fclk_frequency_table": mtbl.fclk_frequency_table, + "mtbl_uclk_frequency_table": mtbl.uclk_frequency_table, + "mtbl_socclk_frequency_table": mtbl.socclk_frequency_table, + "mtbl_vclk_frequency_table": mtbl.vclk_frequency_table, + "mtbl_dclk_frequency_table": mtbl.dclk_frequency_table, + "mtbl_lclk_frequency_table": mtbl.lclk_frequency_table, + "mtbl_cclk_frequency_acc": mtbl.cclk_frequency_acc, + "mtbl_gfxclk_frequency_acc": mtbl.gfxclk_frequency_acc, + "mtbl_gfxclk_frequency": mtbl.gfxclk_frequency, + "mtbl_max_cclk_frequency": mtbl.max_cclk_frequency, + "mtbl_min_cclk_frequency": mtbl.min_cclk_frequency, + "mtbl_max_gfxclk_frequency": mtbl.max_gfxclk_frequency, + "mtbl_min_gfxclk_frequency": mtbl.min_gfxclk_frequency, + "mtbl_max_lclk_dpm_range": mtbl.max_lclk_dpm_range, + "mtbl_min_lclk_dpm_range": mtbl.min_lclk_dpm_range, + "mtbl_xgmi_width": mtbl.xgmi_width, + "mtbl_xgmi_bitrate": mtbl.xgmi_bitrate, + "mtbl_xgmi_read_bandwidth_acc": mtbl.xgmi_read_bandwidth_acc, + "mtbl_xgmi_write_bandwidth_acc": mtbl.xgmi_write_bandwidth_acc, + "mtbl_socket_c0_residency": mtbl.socket_c0_residency, + "mtbl_socket_gfx_busy": mtbl.socket_gfx_busy, + "mtbl_dram_bandwidth_utilization": mtbl.dram_bandwidth_utilization, + "mtbl_socket_c0_residency_acc": mtbl.socket_c0_residency_acc, + "mtbl_socket_gfx_busy_acc": mtbl.socket_gfx_busy_acc, + "mtbl_dram_bandwidth_acc": mtbl.dram_bandwidth_acc, + "mtbl_max_dram_bandwidth": mtbl.max_dram_bandwidth, + "mtbl_dram_bandwidth_utilization_acc": mtbl.dram_bandwidth_utilization_acc, + "mtbl_pcie_bandwidth_acc": mtbl.pcie_bandwidth_acc, + "mtbl_prochot_residency_acc": mtbl.prochot_residency_acc, + "mtbl_ppt_residency_acc": mtbl.ppt_residency_acc, + "mtbl_socket_thm_residency_acc": mtbl.socket_thm_residency_acc, + "mtbl_vr_thm_residency_acc": mtbl.vr_thm_residency_acc, + "mtbl_hbm_thm_residency_acc": mtbl.hbm_thm_residency_acc + } + +def amdsmi_first_online_core_on_cpu_socket( + processor_handle: amdsmi_wrapper.amdsmi_processor_handle +): + if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): + raise AmdSmiParameterException( + processor_handle, amdsmi_wrapper.amdsmi_processor_handle + ) + + pcore_ind = ctypes.c_uint32() + + _check_res( + amdsmi_wrapper.amdsmi_first_online_core_on_cpu_socket( + processor_handle, ctypes.byref(pcore_ind)) + ) + + return pcore_ind.value + def amdsmi_init(flag=AmdSmiInitFlags.INIT_AMD_GPUS): if not isinstance(flag, AmdSmiInitFlags): raise AmdSmiParameterException(flag, AmdSmiInitFlags) diff --git a/py-interface/amdsmi_wrapper.py b/py-interface/amdsmi_wrapper.py index 78fc72bb5f..c0047ff1be 100644 --- a/py-interface/amdsmi_wrapper.py +++ b/py-interface/amdsmi_wrapper.py @@ -181,6 +181,16 @@ try: except OSError as error: print(error) print("Unable to find amdsmi library try installing amd-smi-lib from your package manager") +class FunctionFactoryStub: + def __getattr__(self, _): + return ctypes.CFUNCTYPE(lambda y:y) + +# libraries['FIXME_STUB'] explanation +# As you did not list (-l libraryname.so) a library that exports this function +# This is a non-working stub instead. +# You can either re-run clan2py with -l /path/to/library.so +# Or manually fix this by comment the ctypes.CDLL loading +_libraries['FIXME_STUB'] = FunctionFactoryStub() # ctypes.CDLL('FIXME_STUB') @@ -191,12 +201,14 @@ amdsmi_init_flags_t__enumvalues = { 2: 'AMDSMI_INIT_AMD_GPUS', 4: 'AMDSMI_INIT_NON_AMD_CPUS', 8: 'AMDSMI_INIT_NON_AMD_GPUS', + 3: 'AMDSMI_INIT_AMD_APUS', } AMDSMI_INIT_ALL_PROCESSORS = 0 AMDSMI_INIT_AMD_CPUS = 1 AMDSMI_INIT_AMD_GPUS = 2 AMDSMI_INIT_NON_AMD_CPUS = 4 AMDSMI_INIT_NON_AMD_GPUS = 8 +AMDSMI_INIT_AMD_APUS = 3 amdsmi_init_flags_t = ctypes.c_uint32 # enum # values for enumeration 'amdsmi_mm_ip_t' @@ -1715,24 +1727,26 @@ amdsmi_shut_down.argtypes = [] amdsmi_get_socket_handles = _libraries['libamd_smi.so'].amdsmi_get_socket_handles amdsmi_get_socket_handles.restype = amdsmi_status_t amdsmi_get_socket_handles.argtypes = [ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(ctypes.POINTER(None))] -amdsmi_get_cpusocket_handles = _libraries['libamd_smi.so'].amdsmi_get_cpusocket_handles +amdsmi_get_cpusocket_handles = _libraries['FIXME_STUB'].amdsmi_get_cpusocket_handles amdsmi_get_cpusocket_handles.restype = amdsmi_status_t amdsmi_get_cpusocket_handles.argtypes = [ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(ctypes.POINTER(None))] size_t = ctypes.c_uint64 amdsmi_get_socket_info = _libraries['libamd_smi.so'].amdsmi_get_socket_info amdsmi_get_socket_info.restype = amdsmi_status_t amdsmi_get_socket_info.argtypes = [amdsmi_socket_handle, size_t, ctypes.POINTER(ctypes.c_char)] -uint32_t = ctypes.c_uint32 -amdsmi_get_cpusocket_info = _libraries['libamd_smi.so'].amdsmi_get_cpusocket_info -amdsmi_get_cpusocket_info.restype = amdsmi_status_t -amdsmi_get_cpusocket_info.argtypes = [amdsmi_cpusocket_handle, uint32_t] -amdsmi_get_cpucore_info = _libraries['libamd_smi.so'].amdsmi_get_cpucore_info -amdsmi_get_cpucore_info.restype = amdsmi_status_t -amdsmi_get_cpucore_info.argtypes = [amdsmi_processor_handle, uint32_t] +amdsmi_get_processor_info = _libraries['libamd_smi.so'].amdsmi_get_processor_info +amdsmi_get_processor_info.restype = amdsmi_status_t +amdsmi_get_processor_info.argtypes = [amdsmi_processor_handle, size_t, ctypes.POINTER(ctypes.c_char)] +amdsmi_get_processor_count_from_handles = _libraries['libamd_smi.so'].amdsmi_get_processor_count_from_handles +amdsmi_get_processor_count_from_handles.restype = amdsmi_status_t +amdsmi_get_processor_count_from_handles.argtypes = [ctypes.POINTER(ctypes.POINTER(None)), ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(ctypes.c_uint32)] +amdsmi_get_processor_handles_by_type = _libraries['libamd_smi.so'].amdsmi_get_processor_handles_by_type +amdsmi_get_processor_handles_by_type.restype = amdsmi_status_t +amdsmi_get_processor_handles_by_type.argtypes = [amdsmi_socket_handle, processor_type_t, ctypes.POINTER(ctypes.POINTER(None)), ctypes.POINTER(ctypes.c_uint32)] amdsmi_get_processor_handles = _libraries['libamd_smi.so'].amdsmi_get_processor_handles amdsmi_get_processor_handles.restype = amdsmi_status_t amdsmi_get_processor_handles.argtypes = [amdsmi_socket_handle, ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(ctypes.POINTER(None))] -amdsmi_get_cpucore_handles = _libraries['libamd_smi.so'].amdsmi_get_cpucore_handles +amdsmi_get_cpucore_handles = _libraries['FIXME_STUB'].amdsmi_get_cpucore_handles amdsmi_get_cpucore_handles.restype = amdsmi_status_t amdsmi_get_cpucore_handles.argtypes = [amdsmi_cpusocket_handle, ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(ctypes.POINTER(None))] amdsmi_get_processor_type = _libraries['libamd_smi.so'].amdsmi_get_processor_type @@ -1750,6 +1764,7 @@ amdsmi_get_gpu_revision.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctyp amdsmi_get_gpu_vendor_name = _libraries['libamd_smi.so'].amdsmi_get_gpu_vendor_name amdsmi_get_gpu_vendor_name.restype = amdsmi_status_t amdsmi_get_gpu_vendor_name.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_char), size_t] +uint32_t = ctypes.c_uint32 amdsmi_get_gpu_vram_vendor = _libraries['libamd_smi.so'].amdsmi_get_gpu_vram_vendor amdsmi_get_gpu_vram_vendor.restype = amdsmi_status_t amdsmi_get_gpu_vram_vendor.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_char), uint32_t] @@ -2204,122 +2219,122 @@ amdsmi_get_gpu_metrics_log.restype = amdsmi_status_t amdsmi_get_gpu_metrics_log.argtypes = [amdsmi_processor_handle] amdsmi_get_cpu_core_energy = _libraries['libamd_smi.so'].amdsmi_get_cpu_core_energy amdsmi_get_cpu_core_energy.restype = amdsmi_status_t -amdsmi_get_cpu_core_energy.argtypes = [amdsmi_processor_handle, uint32_t, ctypes.POINTER(ctypes.c_uint64)] +amdsmi_get_cpu_core_energy.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint64)] amdsmi_get_cpu_socket_energy = _libraries['libamd_smi.so'].amdsmi_get_cpu_socket_energy amdsmi_get_cpu_socket_energy.restype = amdsmi_status_t -amdsmi_get_cpu_socket_energy.argtypes = [amdsmi_cpusocket_handle, uint32_t, ctypes.POINTER(ctypes.c_uint64)] +amdsmi_get_cpu_socket_energy.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint64)] amdsmi_get_cpu_smu_fw_version = _libraries['libamd_smi.so'].amdsmi_get_cpu_smu_fw_version amdsmi_get_cpu_smu_fw_version.restype = amdsmi_status_t -amdsmi_get_cpu_smu_fw_version.argtypes = [amdsmi_cpusocket_handle, ctypes.POINTER(struct_amdsmi_smu_fw_version_t)] +amdsmi_get_cpu_smu_fw_version.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_amdsmi_smu_fw_version_t)] amdsmi_get_cpu_hsmp_proto_ver = _libraries['libamd_smi.so'].amdsmi_get_cpu_hsmp_proto_ver amdsmi_get_cpu_hsmp_proto_ver.restype = amdsmi_status_t -amdsmi_get_cpu_hsmp_proto_ver.argtypes = [amdsmi_cpusocket_handle, ctypes.POINTER(ctypes.c_uint32)] +amdsmi_get_cpu_hsmp_proto_ver.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32)] amdsmi_get_cpu_prochot_status = _libraries['libamd_smi.so'].amdsmi_get_cpu_prochot_status amdsmi_get_cpu_prochot_status.restype = amdsmi_status_t -amdsmi_get_cpu_prochot_status.argtypes = [amdsmi_cpusocket_handle, uint32_t, ctypes.POINTER(ctypes.c_uint32)] +amdsmi_get_cpu_prochot_status.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32)] amdsmi_get_cpu_fclk_mclk = _libraries['libamd_smi.so'].amdsmi_get_cpu_fclk_mclk amdsmi_get_cpu_fclk_mclk.restype = amdsmi_status_t -amdsmi_get_cpu_fclk_mclk.argtypes = [amdsmi_cpusocket_handle, uint32_t, ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(ctypes.c_uint32)] +amdsmi_get_cpu_fclk_mclk.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(ctypes.c_uint32)] amdsmi_get_cpu_cclk_limit = _libraries['libamd_smi.so'].amdsmi_get_cpu_cclk_limit amdsmi_get_cpu_cclk_limit.restype = amdsmi_status_t -amdsmi_get_cpu_cclk_limit.argtypes = [amdsmi_cpusocket_handle, uint32_t, ctypes.POINTER(ctypes.c_uint32)] +amdsmi_get_cpu_cclk_limit.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32)] amdsmi_get_cpu_socket_current_active_freq_limit = _libraries['libamd_smi.so'].amdsmi_get_cpu_socket_current_active_freq_limit amdsmi_get_cpu_socket_current_active_freq_limit.restype = amdsmi_status_t -amdsmi_get_cpu_socket_current_active_freq_limit.argtypes = [amdsmi_cpusocket_handle, uint32_t, ctypes.POINTER(ctypes.c_uint16), ctypes.POINTER(ctypes.POINTER(ctypes.c_char))] +amdsmi_get_cpu_socket_current_active_freq_limit.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint16), ctypes.POINTER(ctypes.POINTER(ctypes.c_char))] amdsmi_get_cpu_socket_freq_range = _libraries['libamd_smi.so'].amdsmi_get_cpu_socket_freq_range amdsmi_get_cpu_socket_freq_range.restype = amdsmi_status_t -amdsmi_get_cpu_socket_freq_range.argtypes = [amdsmi_cpusocket_handle, uint32_t, ctypes.POINTER(ctypes.c_uint16), ctypes.POINTER(ctypes.c_uint16)] +amdsmi_get_cpu_socket_freq_range.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint16), ctypes.POINTER(ctypes.c_uint16)] amdsmi_get_cpu_core_current_freq_limit = _libraries['libamd_smi.so'].amdsmi_get_cpu_core_current_freq_limit amdsmi_get_cpu_core_current_freq_limit.restype = amdsmi_status_t -amdsmi_get_cpu_core_current_freq_limit.argtypes = [amdsmi_processor_handle, uint32_t, ctypes.POINTER(ctypes.c_uint32)] +amdsmi_get_cpu_core_current_freq_limit.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32)] amdsmi_get_cpu_socket_power = _libraries['libamd_smi.so'].amdsmi_get_cpu_socket_power amdsmi_get_cpu_socket_power.restype = amdsmi_status_t -amdsmi_get_cpu_socket_power.argtypes = [amdsmi_cpusocket_handle, uint32_t, ctypes.POINTER(ctypes.c_uint32)] +amdsmi_get_cpu_socket_power.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32)] amdsmi_get_cpu_socket_power_cap = _libraries['libamd_smi.so'].amdsmi_get_cpu_socket_power_cap amdsmi_get_cpu_socket_power_cap.restype = amdsmi_status_t -amdsmi_get_cpu_socket_power_cap.argtypes = [amdsmi_cpusocket_handle, uint32_t, ctypes.POINTER(ctypes.c_uint32)] +amdsmi_get_cpu_socket_power_cap.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32)] amdsmi_get_cpu_socket_power_cap_max = _libraries['libamd_smi.so'].amdsmi_get_cpu_socket_power_cap_max amdsmi_get_cpu_socket_power_cap_max.restype = amdsmi_status_t -amdsmi_get_cpu_socket_power_cap_max.argtypes = [amdsmi_cpusocket_handle, uint32_t, ctypes.POINTER(ctypes.c_uint32)] +amdsmi_get_cpu_socket_power_cap_max.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32)] amdsmi_get_cpu_pwr_svi_telemetry_all_rails = _libraries['libamd_smi.so'].amdsmi_get_cpu_pwr_svi_telemetry_all_rails amdsmi_get_cpu_pwr_svi_telemetry_all_rails.restype = amdsmi_status_t -amdsmi_get_cpu_pwr_svi_telemetry_all_rails.argtypes = [amdsmi_cpusocket_handle, uint32_t, ctypes.POINTER(ctypes.c_uint32)] +amdsmi_get_cpu_pwr_svi_telemetry_all_rails.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32)] amdsmi_set_cpu_socket_power_cap = _libraries['libamd_smi.so'].amdsmi_set_cpu_socket_power_cap amdsmi_set_cpu_socket_power_cap.restype = amdsmi_status_t -amdsmi_set_cpu_socket_power_cap.argtypes = [amdsmi_cpusocket_handle, uint32_t, uint32_t] +amdsmi_set_cpu_socket_power_cap.argtypes = [amdsmi_processor_handle, uint32_t] uint8_t = ctypes.c_uint8 amdsmi_set_cpu_pwr_efficiency_mode = _libraries['libamd_smi.so'].amdsmi_set_cpu_pwr_efficiency_mode amdsmi_set_cpu_pwr_efficiency_mode.restype = amdsmi_status_t -amdsmi_set_cpu_pwr_efficiency_mode.argtypes = [amdsmi_cpusocket_handle, uint8_t, uint8_t] +amdsmi_set_cpu_pwr_efficiency_mode.argtypes = [amdsmi_processor_handle, uint8_t] amdsmi_get_cpu_core_boostlimit = _libraries['libamd_smi.so'].amdsmi_get_cpu_core_boostlimit amdsmi_get_cpu_core_boostlimit.restype = amdsmi_status_t -amdsmi_get_cpu_core_boostlimit.argtypes = [amdsmi_processor_handle, uint32_t, ctypes.POINTER(ctypes.c_uint32)] +amdsmi_get_cpu_core_boostlimit.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32)] amdsmi_get_cpu_socket_c0_residency = _libraries['libamd_smi.so'].amdsmi_get_cpu_socket_c0_residency amdsmi_get_cpu_socket_c0_residency.restype = amdsmi_status_t -amdsmi_get_cpu_socket_c0_residency.argtypes = [amdsmi_cpusocket_handle, uint32_t, ctypes.POINTER(ctypes.c_uint32)] +amdsmi_get_cpu_socket_c0_residency.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32)] amdsmi_set_cpu_core_boostlimit = _libraries['libamd_smi.so'].amdsmi_set_cpu_core_boostlimit amdsmi_set_cpu_core_boostlimit.restype = amdsmi_status_t -amdsmi_set_cpu_core_boostlimit.argtypes = [amdsmi_processor_handle, uint32_t, uint32_t] +amdsmi_set_cpu_core_boostlimit.argtypes = [amdsmi_processor_handle, uint32_t] amdsmi_set_cpu_socket_boostlimit = _libraries['libamd_smi.so'].amdsmi_set_cpu_socket_boostlimit amdsmi_set_cpu_socket_boostlimit.restype = amdsmi_status_t -amdsmi_set_cpu_socket_boostlimit.argtypes = [amdsmi_cpusocket_handle, uint32_t, uint32_t] +amdsmi_set_cpu_socket_boostlimit.argtypes = [amdsmi_processor_handle, uint32_t] amdsmi_get_cpu_ddr_bw = _libraries['libamd_smi.so'].amdsmi_get_cpu_ddr_bw amdsmi_get_cpu_ddr_bw.restype = amdsmi_status_t -amdsmi_get_cpu_ddr_bw.argtypes = [amdsmi_cpusocket_handle, ctypes.POINTER(struct_amdsmi_ddr_bw_metrics_t)] +amdsmi_get_cpu_ddr_bw.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_amdsmi_ddr_bw_metrics_t)] amdsmi_get_cpu_socket_temperature = _libraries['libamd_smi.so'].amdsmi_get_cpu_socket_temperature amdsmi_get_cpu_socket_temperature.restype = amdsmi_status_t -amdsmi_get_cpu_socket_temperature.argtypes = [amdsmi_cpusocket_handle, uint32_t, ctypes.POINTER(ctypes.c_uint32)] +amdsmi_get_cpu_socket_temperature.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32)] amdsmi_get_cpu_dimm_temp_range_and_refresh_rate = _libraries['libamd_smi.so'].amdsmi_get_cpu_dimm_temp_range_and_refresh_rate amdsmi_get_cpu_dimm_temp_range_and_refresh_rate.restype = amdsmi_status_t -amdsmi_get_cpu_dimm_temp_range_and_refresh_rate.argtypes = [amdsmi_cpusocket_handle, uint8_t, uint8_t, ctypes.POINTER(struct_amdsmi_temp_range_refresh_rate_t)] +amdsmi_get_cpu_dimm_temp_range_and_refresh_rate.argtypes = [amdsmi_processor_handle, uint8_t, ctypes.POINTER(struct_amdsmi_temp_range_refresh_rate_t)] amdsmi_get_cpu_dimm_power_consumption = _libraries['libamd_smi.so'].amdsmi_get_cpu_dimm_power_consumption amdsmi_get_cpu_dimm_power_consumption.restype = amdsmi_status_t -amdsmi_get_cpu_dimm_power_consumption.argtypes = [amdsmi_cpusocket_handle, uint8_t, uint8_t, ctypes.POINTER(struct_amdsmi_dimm_power_t)] +amdsmi_get_cpu_dimm_power_consumption.argtypes = [amdsmi_processor_handle, uint8_t, ctypes.POINTER(struct_amdsmi_dimm_power_t)] amdsmi_get_cpu_dimm_thermal_sensor = _libraries['libamd_smi.so'].amdsmi_get_cpu_dimm_thermal_sensor amdsmi_get_cpu_dimm_thermal_sensor.restype = amdsmi_status_t -amdsmi_get_cpu_dimm_thermal_sensor.argtypes = [amdsmi_cpusocket_handle, uint8_t, uint8_t, ctypes.POINTER(struct_amdsmi_dimm_thermal_t)] +amdsmi_get_cpu_dimm_thermal_sensor.argtypes = [amdsmi_processor_handle, uint8_t, ctypes.POINTER(struct_amdsmi_dimm_thermal_t)] amdsmi_set_cpu_xgmi_width = _libraries['libamd_smi.so'].amdsmi_set_cpu_xgmi_width amdsmi_set_cpu_xgmi_width.restype = amdsmi_status_t -amdsmi_set_cpu_xgmi_width.argtypes = [amdsmi_cpusocket_handle, uint8_t, uint8_t] +amdsmi_set_cpu_xgmi_width.argtypes = [amdsmi_processor_handle, uint8_t, uint8_t] amdsmi_set_cpu_gmi3_link_width_range = _libraries['libamd_smi.so'].amdsmi_set_cpu_gmi3_link_width_range amdsmi_set_cpu_gmi3_link_width_range.restype = amdsmi_status_t -amdsmi_set_cpu_gmi3_link_width_range.argtypes = [amdsmi_cpusocket_handle, uint8_t, uint8_t, uint8_t] +amdsmi_set_cpu_gmi3_link_width_range.argtypes = [amdsmi_processor_handle, uint8_t, uint8_t] amdsmi_cpu_apb_enable = _libraries['libamd_smi.so'].amdsmi_cpu_apb_enable amdsmi_cpu_apb_enable.restype = amdsmi_status_t -amdsmi_cpu_apb_enable.argtypes = [amdsmi_cpusocket_handle, uint32_t] +amdsmi_cpu_apb_enable.argtypes = [amdsmi_processor_handle] amdsmi_cpu_apb_disable = _libraries['libamd_smi.so'].amdsmi_cpu_apb_disable amdsmi_cpu_apb_disable.restype = amdsmi_status_t -amdsmi_cpu_apb_disable.argtypes = [amdsmi_cpusocket_handle, uint32_t, uint8_t] +amdsmi_cpu_apb_disable.argtypes = [amdsmi_processor_handle, uint8_t] amdsmi_set_cpu_socket_lclk_dpm_level = _libraries['libamd_smi.so'].amdsmi_set_cpu_socket_lclk_dpm_level amdsmi_set_cpu_socket_lclk_dpm_level.restype = amdsmi_status_t -amdsmi_set_cpu_socket_lclk_dpm_level.argtypes = [amdsmi_cpusocket_handle, uint32_t, uint8_t, uint8_t, uint8_t] +amdsmi_set_cpu_socket_lclk_dpm_level.argtypes = [amdsmi_processor_handle, uint8_t, uint8_t, uint8_t] amdsmi_get_cpu_socket_lclk_dpm_level = _libraries['libamd_smi.so'].amdsmi_get_cpu_socket_lclk_dpm_level amdsmi_get_cpu_socket_lclk_dpm_level.restype = amdsmi_status_t -amdsmi_get_cpu_socket_lclk_dpm_level.argtypes = [amdsmi_cpusocket_handle, uint8_t, uint8_t, ctypes.POINTER(struct_amdsmi_dpm_level_t)] +amdsmi_get_cpu_socket_lclk_dpm_level.argtypes = [amdsmi_processor_handle, uint8_t, ctypes.POINTER(struct_amdsmi_dpm_level_t)] amdsmi_set_cpu_pcie_link_rate = _libraries['libamd_smi.so'].amdsmi_set_cpu_pcie_link_rate amdsmi_set_cpu_pcie_link_rate.restype = amdsmi_status_t -amdsmi_set_cpu_pcie_link_rate.argtypes = [amdsmi_cpusocket_handle, uint8_t, uint8_t, ctypes.POINTER(ctypes.c_ubyte)] +amdsmi_set_cpu_pcie_link_rate.argtypes = [amdsmi_processor_handle, uint8_t, ctypes.POINTER(ctypes.c_ubyte)] amdsmi_set_cpu_df_pstate_range = _libraries['libamd_smi.so'].amdsmi_set_cpu_df_pstate_range amdsmi_set_cpu_df_pstate_range.restype = amdsmi_status_t -amdsmi_set_cpu_df_pstate_range.argtypes = [amdsmi_cpusocket_handle, uint8_t, uint8_t, uint8_t] +amdsmi_set_cpu_df_pstate_range.argtypes = [amdsmi_processor_handle, uint8_t, uint8_t] amdsmi_get_cpu_current_io_bandwidth = _libraries['libamd_smi.so'].amdsmi_get_cpu_current_io_bandwidth amdsmi_get_cpu_current_io_bandwidth.restype = amdsmi_status_t -amdsmi_get_cpu_current_io_bandwidth.argtypes = [amdsmi_cpusocket_handle, uint8_t, amdsmi_link_id_bw_type_t, ctypes.POINTER(ctypes.c_uint32)] +amdsmi_get_cpu_current_io_bandwidth.argtypes = [amdsmi_processor_handle, amdsmi_link_id_bw_type_t, ctypes.POINTER(ctypes.c_uint32)] amdsmi_get_cpu_current_xgmi_bw = _libraries['libamd_smi.so'].amdsmi_get_cpu_current_xgmi_bw amdsmi_get_cpu_current_xgmi_bw.restype = amdsmi_status_t -amdsmi_get_cpu_current_xgmi_bw.argtypes = [amdsmi_cpusocket_handle, amdsmi_link_id_bw_type_t, ctypes.POINTER(ctypes.c_uint32)] +amdsmi_get_cpu_current_xgmi_bw.argtypes = [amdsmi_processor_handle, amdsmi_link_id_bw_type_t, ctypes.POINTER(ctypes.c_uint32)] 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_cpusocket_handle, ctypes.POINTER(ctypes.c_uint32)] +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_cpusocket_handle, uint8_t, ctypes.POINTER(struct_hsmp_metric_table)] +amdsmi_get_metrics_table.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_hsmp_metric_table)] 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_cpusocket_handle, uint32_t, ctypes.POINTER(ctypes.c_uint32)] +amdsmi_first_online_core_on_cpu_socket.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32)] amdsmi_get_esmi_err_msg = _libraries['libamd_smi.so'].amdsmi_get_esmi_err_msg amdsmi_get_esmi_err_msg.restype = ctypes.POINTER(ctypes.POINTER(ctypes.c_char)) amdsmi_get_esmi_err_msg.argtypes = [amdsmi_status_t, ctypes.POINTER(ctypes.POINTER(ctypes.c_char))] @@ -2364,9 +2379,10 @@ __all__ = \ 'AMDSMI_GPU_BLOCK_SEM', 'AMDSMI_GPU_BLOCK_SMN', 'AMDSMI_GPU_BLOCK_UMC', 'AMDSMI_GPU_BLOCK_XGMI_WAFL', 'AMDSMI_HSMP_TIMEOUT', 'AMDSMI_INIT_ALL_PROCESSORS', - 'AMDSMI_INIT_AMD_CPUS', 'AMDSMI_INIT_AMD_GPUS', - 'AMDSMI_INIT_NON_AMD_CPUS', 'AMDSMI_INIT_NON_AMD_GPUS', - 'AMDSMI_INVALID_POWER', 'AMDSMI_IOLINK_TYPE_NUMIOLINKTYPES', + 'AMDSMI_INIT_AMD_APUS', 'AMDSMI_INIT_AMD_CPUS', + 'AMDSMI_INIT_AMD_GPUS', 'AMDSMI_INIT_NON_AMD_CPUS', + 'AMDSMI_INIT_NON_AMD_GPUS', 'AMDSMI_INVALID_POWER', + 'AMDSMI_IOLINK_TYPE_NUMIOLINKTYPES', 'AMDSMI_IOLINK_TYPE_PCIEXPRESS', 'AMDSMI_IOLINK_TYPE_SIZE', 'AMDSMI_IOLINK_TYPE_UNDEFINED', 'AMDSMI_IOLINK_TYPE_XGMI', 'AMDSMI_MEM_PAGE_STATUS_PENDING', @@ -2526,8 +2542,7 @@ __all__ = \ 'amdsmi_get_cpu_socket_power', 'amdsmi_get_cpu_socket_power_cap', 'amdsmi_get_cpu_socket_power_cap_max', 'amdsmi_get_cpu_socket_temperature', 'amdsmi_get_cpucore_handles', - 'amdsmi_get_cpucore_info', 'amdsmi_get_cpusocket_handles', - 'amdsmi_get_cpusocket_info', 'amdsmi_get_energy_count', + 'amdsmi_get_cpusocket_handles', 'amdsmi_get_energy_count', 'amdsmi_get_esmi_err_msg', 'amdsmi_get_fw_info', 'amdsmi_get_gpu_activity', 'amdsmi_get_gpu_asic_info', 'amdsmi_get_gpu_available_counters', @@ -2619,8 +2634,11 @@ __all__ = \ 'amdsmi_get_minmax_bandwidth_between_processors', 'amdsmi_get_pcie_link_caps', 'amdsmi_get_pcie_link_status', 'amdsmi_get_power_cap_info', 'amdsmi_get_power_info', + 'amdsmi_get_processor_count_from_handles', 'amdsmi_get_processor_handle_from_bdf', - 'amdsmi_get_processor_handles', 'amdsmi_get_processor_type', + 'amdsmi_get_processor_handles', + 'amdsmi_get_processor_handles_by_type', + 'amdsmi_get_processor_info', 'amdsmi_get_processor_type', 'amdsmi_get_socket_handles', 'amdsmi_get_socket_info', 'amdsmi_get_temp_metric', 'amdsmi_get_utilization_count', 'amdsmi_get_xgmi_info', 'amdsmi_gpu_block_t', From 19030e5b720df27b083e0d5ed25f02078841aec2 Mon Sep 17 00:00:00 2001 From: Naveen Krishna Chatradhi Date: Thu, 7 Dec 2023 07:33:17 -0800 Subject: [PATCH 4/5] amdsmi_cli: Add support for CPU specific API in amdsmi_cli tool - Add support for only CPU if only the hsmp driver is driver is present. - Add support for both the amdgpu and amdcpu's if both the amdgpu driver and cpu's are present. - Add support for socket power metrics - Add support for hsmp proto type version, prochot status, read current fclkmclk freq and current cclk freq limit, c0 residency, lclk dpm level range, socket frequency range - Add CPU socket current frequency limit. - Update tool for API's IO bandwidth, XGMI bandwidth, power telemetry rails, APB enable and APB disable API's - Add support set_pow_limit, set_xgmi_link_width, set_lclk_dpm_level, core_boost_limit, curr_active_freq_core_limit, set_soc_boost_limit and set_core_boost_limit. - Add support for the following cpu related API's in tool core_energy, socket energy, set power efficiency mode, ddr bandwidth, cpu temperature, dimm temperature range rate, dimm power consumption and dimm thermal temperature. - Add support for set_gmi3_link_width, set_pcie_lnk_rate, set_df_pstate_range Change-Id: I5a35d1cceeb7df0bc8b7116df7c27bb7f376e839 --- amdsmi_cli/amdsmi_commands.py | 837 +++++++++++++++++++++++++++++++++- amdsmi_cli/amdsmi_helpers.py | 304 +++++++++++- amdsmi_cli/amdsmi_init.py | 46 +- amdsmi_cli/amdsmi_logger.py | 71 +++ amdsmi_cli/amdsmi_parser.py | 141 +++++- 5 files changed, 1345 insertions(+), 54 deletions(-) diff --git a/amdsmi_cli/amdsmi_commands.py b/amdsmi_cli/amdsmi_commands.py index aa2ea7adeb..a38adcfde4 100644 --- a/amdsmi_cli/amdsmi_commands.py +++ b/amdsmi_cli/amdsmi_commands.py @@ -42,20 +42,45 @@ class AMDSMICommands(): def __init__(self, format='human_readable', destination='stdout') -> None: self.helpers = AMDSMIHelpers() self.logger = AMDSMILogger(format=format, destination=destination) + self.device_handles = [] + self.cpu_handles = [] + self.core_handles = [] try: self.device_handles = amdsmi_interface.amdsmi_get_processor_handles() except amdsmi_exception.AmdSmiLibraryException as e: if e.err_code in (amdsmi_interface.amdsmi_wrapper.AMDSMI_STATUS_NOT_INIT, amdsmi_interface.amdsmi_wrapper.AMDSMI_STATUS_DRIVER_NOT_LOADED): logging.error('Unable to get devices, driver not initialized (amdgpu not found in modules)') - sys.exit(-1) else: raise e if len(self.device_handles) == 0: - logging.error('Unable to detect any devices, check if driver is initialized (amdgpu not found in modules)') - sys.exit(-1) + logging.info('Unable to detect any devices, check if driver is initialized (amdgpu not found in modules)') + # Fetch CPU handles + try: + self.cpu_handles = amdsmi_interface.amdsmi_get_cpusocket_handles() + except amdsmi_exception.AmdSmiLibraryException as e: + if e.err_code in (amdsmi_interface.amdsmi_wrapper.AMDSMI_STATUS_NOT_INIT, + amdsmi_interface.amdsmi_wrapper.AMDSMI_NO_DRV): + + logging.info('Unable to get CPU devices, hsmp driver not loaded') + else: + raise e + + # core handles + try: + self.core_handles = amdsmi_interface.amdsmi_get_cpucore_handles() + except amdsmi_exception.AmdSmiLibraryException as e: + if e.err_code in (amdsmi_interface.amdsmi_wrapper.AMDSMI_STATUS_NOT_INIT, + amdsmi_interface.amdsmi_wrapper.AMDSMI_NO_DRV): + logging.info('Unable to get CORE devices, hsmp driver not loaded') + else: + raise e + + if (len(self.device_handles) == 0 and len(self.cpu_handles) == 0 and len(self.core_handles) == 0): + logging.error('Unable to detect any devices, check if amdgpu and hsmp drivers are initialized') + sys.exit(-1) self.stop = '' @@ -135,14 +160,77 @@ class AMDSMICommands(): self.logger.print_output() - def static(self, args, multiple_devices=False, gpu=None, asic=None, - bus=None, vbios=None, limit=None, driver=None, ras=None, - board=None, numa=None, vram=None, cache=None, partition=None, - dfc_ucode=None, fb_info=None, num_vf=None): + def get_static_cpu(self, args, multiple_devices=False, cpu=None): + """Get Static information for target cpu + + Args: + args (Namespace): Namespace containing the parsed CLI args + multiple_devices (bool, optional): True if checking for multiple devices. Defaults to False. + cpu (device_handle, optional): device_handle for target device. Defaults to None. + + Returns: + None: Print output via AMDSMILogger to destination + """ + + if (cpu): + args.cpu = cpu + + #store cpu args that are applicable to the current platform + curr_platform_cpu_args = ["smu", "interface_ver"] + curr_platform_cpu_values = [args.smu, args.interface_ver] + + if (not any(curr_platform_cpu_values)): + for arg in curr_platform_cpu_args: + setattr(args, arg, True) + + if (len(self.cpu_handles)): + handled_multiple_cpus, device_handle = self.helpers.handle_cpus(args, + self.logger, + self.get_static_cpu) + if handled_multiple_cpus: + return # This function is recursive + args.cpu = device_handle + # get cpu id for logging + cpu_id = self.helpers.get_cpu_id_from_device_handle(args.cpu) + logging.debug(f"Static Arg information for CPU {cpu_id} on {self.helpers.os_info()}") + + static_dict = {} + + if (args.smu): + try: + smu = amdsmi_interface.amdsmi_get_cpu_smu_fw_version(args.cpu) + static_dict["smu"] = {"FW_VERSION" : f"{ smu['smu_fw_major_ver_num']}" + f":{smu['smu_fw_minor_ver_num']}:{smu['smu_fw_debug_ver_num']}"} + except amdsmi_exception.AmdSmiLibraryException as e: + static_dict["smu"] = "N/A" + logging.debug("Failed to get SMU FW for cpu %s | %s", cpu_id, e.get_error_info()) + + if (args.interface_ver): + static_dict["interface_version"] = {} + try: + intf_ver = amdsmi_interface.amdsmi_get_cpu_hsmp_proto_ver(args.cpu) + static_dict["interface_version"]["proto version"] = intf_ver + except amdsmi_exception.AmdSmiLibraryException as e: + static_dict["interface_version"]["proto version"] = "N/A" + logging.debug("Failed to get proto version for cpu %s | %s", cpu_id, e.get_error_info()) + + multiple_devices_csv_override = False + self.logger.store_cpu_output(args.cpu, 'values', static_dict) + if multiple_devices: + self.logger.store_multiple_device_output() + return # Skip printing when there are multiple devices + self.logger.print_output(multiple_device_enabled=multiple_devices_csv_override) + + + def get_static_gpu(self, args, multiple_devices=False, gpu=None, asic=None, bus=None, vbios=None, + limit=None, driver=None, ras=None, board=None, numa=None, vram=None, + cache=None, partition=None, dfc_ucode=None, fb_info=None, num_vf=None): """Get Static information for target gpu Args: args (Namespace): Namespace containing the parsed CLI args + current_platform_args (list): gpu supported platform arguments + current_platform_values (list): gpu supported platform values for each argument multiple_devices (bool, optional): True if checking for multiple devices. Defaults to False. gpu (device_handle, optional): device_handle for target device. Defaults to None. asic (bool, optional): Value override for args.asic. Defaults to None. @@ -160,13 +248,10 @@ class AMDSMICommands(): fb_info (bool, optional): Value override for args.fb_info. Defaults to None. num_vf (bool, optional): Value override for args.num_vf. Defaults to None. - Raises: - IndexError: Index error if gpu list is empty - Returns: None: Print output via AMDSMILogger to destination """ - # Set args.* to passed in arguments + if gpu: args.gpu = gpu if asic: @@ -214,26 +299,20 @@ class AMDSMICommands(): current_platform_args += ["dfc_ucode", "fb_info", "num_vf"] current_platform_values += [args.dfc_ucode, args.fb_info, args.num_vf] - # Handle No GPU passed - if args.gpu == None: - args.gpu = self.device_handles + if (not any(current_platform_values)): + for arg in current_platform_args: + setattr(args, arg, True) - # Handle multiple GPUs - handled_multiple_gpus, device_handle = self.helpers.handle_gpus(args, self.logger, self.static) + handled_multiple_gpus, device_handle = self.helpers.handle_gpus(args, self.logger, self.get_static_gpu) if handled_multiple_gpus: return # This function is recursive args.gpu = device_handle - # Get gpu_id for logging gpu_id = self.helpers.get_gpu_id_from_device_handle(args.gpu) logging.debug(f"Static Arg information for GPU {gpu_id} on {self.helpers.os_info()}") logging.debug(f"Applicable Args: {current_platform_args}") logging.debug(f"Arg Values: {current_platform_values}") - # Set the platform applicable args to True if no args are set - if not any(current_platform_values): - for arg in current_platform_args: - setattr(args, arg, True) static_dict = {} @@ -588,10 +667,84 @@ class AMDSMICommands(): if multiple_devices: self.logger.store_multiple_device_output() return # Skip printing when there are multiple devices - self.logger.print_output(multiple_device_enabled=multiple_devices_csv_override) + def static(self, args, multiple_devices=False, gpu=None, asic=None, + bus=None, vbios=None, limit=None, driver=None, ras=None, + board=None, numa=None, vram=None, cache=None, partition=None, + dfc_ucode=None, fb_info=None, num_vf=None, cpu=None, + interface_ver=None): + """Get Static information for target gpu and cpu + + Args: + args (Namespace): Namespace containing the parsed CLI args + multiple_devices (bool, optional): True if checking for multiple devices. Defaults to False. + gpu (device_handle, optional): device_handle for target device. Defaults to None. + asic (bool, optional): Value override for args.asic. Defaults to None. + bus (bool, optional): Value override for args.bus. Defaults to None. + vbios (bool, optional): Value override for args.vbios. Defaults to None. + limit (bool, optional): Value override for args.limit. Defaults to None. + driver (bool, optional): Value override for args.driver. Defaults to None. + ras (bool, optional): Value override for args.ras. Defaults to None. + board (bool, optional): Value override for args.board. Defaults to None. + numa (bool, optional): Value override for args.numa. Defaults to None. + vram (bool, optional): Value override for args.vram. Defaults to None. + cache (bool, optional): Value override for args.cache. Defaults to None. + partition (bool, optional): Value override for args.partition. Defaults to None. + dfc_ucode (bool, optional): Value override for args.dfc_ucode. Defaults to None. + fb_info (bool, optional): Value override for args.fb_info. Defaults to None. + num_vf (bool, optional): Value override for args.num_vf. Defaults to None. + cpu (cpu_handle, optional): cpu_handle for target device. Defaults to None. + interface_ver (bool, optional): Value override for args.interface_ver. Defaults to None + + Raises: + IndexError: Index error if gpu list is empty + + Returns: + None: Print output via AMDSMILogger to destination + """ + # Set args.* to passed in arguments + if gpu: + args.gpu = gpu + if cpu: + args.cpu = cpu + if interface_ver: + args.interface_ver = interface_ver + + gpus = args.gpu + cpus = args.cpu + + gpu_options = any([args.gpu, args.asic, args.bus, args.vbios, args.driver, args.vram, args.cache, args.board]) + cpu_options = any([args.smu, args.interface_ver]) + + # Handle No GPU passed + if args.gpu == None: + args.gpu = self.device_handles + + # Handle No CPU passed + if args.cpu == None: + args.cpu = self.cpu_handles + + if (len(self.cpu_handles) and (((not gpus) and (not cpus)) or cpus)): + self.get_static_cpu(args, cpu) + else: + logging.info("No CPU devices present") + + if (len(self.device_handles) and (((not gpus) and (not cpus)) or gpus)): + self.logger.clear_multiple_devices_ouput() + self.get_static_gpu(args, multiple_devices, gpu, asic, + bus, vbios, limit, driver, ras, + board, numa, vram, cache, partition, + dfc_ucode, fb_info, num_vf) + else: + logging.info("No GPU devices present") + + if (len(self.cpu_handles) == 0 and len(self.device_handles) == 0): + logging.error("No CPU and GPU devices present") + sys.exit(-1) + + def firmware(self, args, multiple_devices=False, gpu=None, fw_list=True): """ Get Firmware information for target gpu @@ -787,7 +940,7 @@ class AMDSMICommands(): self.logger.print_output() - def metric(self, args, multiple_devices=False, watching_output=False, gpu=None, + def metric_gpu(self, args, multiple_devices=False, watching_output=False, gpu=None, usage=None, watch=None, watch_time=None, iterations=None, power=None, clock=None, temperature=None, ecc=None, ecc_block=None, pcie=None, fan=None, voltage_curve=None, overdrive=None, perf_level=None, @@ -916,7 +1069,7 @@ class AMDSMICommands(): # Store output from multiple devices for device_handle in args.gpu: - self.metric(args, multiple_devices=True, watching_output=watching_output, gpu=device_handle) + self.metric_gpu(args, multiple_devices=True, watching_output=watching_output, gpu=device_handle) # Reload original gpus args.gpu = stored_gpus @@ -1480,6 +1633,642 @@ class AMDSMICommands(): self.logger.store_watch_output(multiple_device_enabled=False) + def metric_cpu(self, args, multiple_devices=False, cpu=None, power_metrics=None, prochot=None, + freq_metrics=None, c0_res=None, lclk_dpm_level=None,pwr_svi_telemtry_rails=None, + io_bandwidth=None, xgmi_bandwidth=None, enable_apb=None, disable_apb=None, + set_pow_limit=None, set_xgmi_link_width=None, set_lclk_dpm_level=None, + set_soc_boost_limit=None, metrics_ver=None, metrics_table=None, socket_energy=None, + set_pwr_eff_mode=None, ddr_bandwidth=None, cpu_temp=None, dimm_temp_range_rate=None, + dimm_pow_conumption=None, dimm_thermal_sensor=None, set_gmi3_link_width=None, + set_pcie_lnk_rate=None, set_df_pstate_range=None): + """Get Metric information for target cpu + + Args: + args (Namespace): Namespace containing the parsed CLI args + multiple_devices (bool, optional): True if checking for multiple devices. Defaults to False. + cpu (cpu_handle, optional): device_handle for target device. Defaults to None. + + Returns: + None: Print output via AMDSMILogger to destination + """ + + if (cpu): + args.cpu = cpu + if (power_metrics): + args.cpu_power_metrics = power_metrics + if (prochot): + args.cpu_prochot = prochot + if (freq_metrics): + args.cpu_freq_metrics = freq_metrics + if (c0_res): + args.cpu_c0_res = c0_res + if (lclk_dpm_level): + args.cpu_lclk_dpm_level = lclk_dpm_level + if (pwr_svi_telemtry_rails): + args.cpu_pwr_svi_telemtry_rails = pwr_svi_telemtry_rails + if (io_bandwidth): + args.cpu_io_bandwidth = io_bandwidth + if (xgmi_bandwidth): + args.cpu_xgmi_bandwidth = xgmi_bandwidth + if (enable_apb): + args.cpu_enable_apb = enable_apb + if (disable_apb): + args.cpu_disable_apb = disable_apb + if (set_pow_limit): + args.set_cpu_pow_limit = set_pow_limit + if (set_xgmi_link_width): + args.set_xgmi_link_width = set_xgmi_link_width + if (set_lclk_dpm_level): + args.set_lclk_dpm_level = set_lclk_dpm_level + if (set_soc_boost_limit): + args.set_soc_boost_limit = set_soc_boost_limit + if (metrics_ver): + args.cpu_metrics_ver = metrics_ver + if (metrics_table): + args.cpu_metrics_table = metrics_table + if (socket_energy): + args.socket_energy = socket_energy + if (set_pwr_eff_mode): + args.set_cpu_pwr_eff_mode = set_pwr_eff_mode + if (ddr_bandwidth): + args.set_cpu_pwr_eff_mode = ddr_bandwidth + if (cpu_temp): + args.cpu_temp = cpu_temp + if (dimm_temp_range_rate): + args.cpu_dimm_temp_range_rate = dimm_temp_range_rate + if (dimm_pow_conumption): + args.cpu_dimm_pow_conumption = dimm_pow_conumption + if (dimm_thermal_sensor): + args.cpu_dimm_thermal_sensor = dimm_thermal_sensor + if (set_gmi3_link_width): + args.set_cpu_gmi3_link_width = set_gmi3_link_width + if (set_pcie_lnk_rate): + args.set_cpu_pcie_lnk_rate = set_pcie_lnk_rate + if (set_df_pstate_range): + args.set_cpu_df_pstate_range = set_df_pstate_range + + + #store cpu args that are applicable to the current platform + curr_platform_cpu_args = ["cpu_power_metrics", "cpu_prochot", "cpu_freq_metrics", + "cpu_c0_res", "cpu_lclk_dpm_level", "cpu_pwr_svi_telemtry_rails", + "cpu_io_bandwidth", "cpu_xgmi_bandwidth", "cpu_disable_apb", + "set_cpu_pow_limit","set_cpu_xgmi_link_width", "set_cpu_lclk_dpm_level", + "set_soc_boost_limit", "cpu_metrics_ver", "cpu_metrics_table", + "socket_energy", "set_cpu_pwr_eff_mode", "cpu_ddr_bandwidth", + "cpu_temp", "cpu_dimm_temp_range_rate", "cpu_dimm_pow_conumption", + "cpu_dimm_thermal_sensor", "set_cpu_gmi3_link_width", "set_cpu_pcie_lnk_rate", + "set_cpu_df_pstate_range"] + curr_platform_cpu_values = [args.cpu_power_metrics, args.cpu_prochot, args.cpu_freq_metrics, + args.cpu_c0_res, args.cpu_lclk_dpm_level, args.cpu_pwr_svi_telemtry_rails, + args.cpu_io_bandwidth, args.cpu_xgmi_bandwidth, args.cpu_disable_apb, + args.set_cpu_pow_limit, args.set_cpu_xgmi_link_width, args.set_cpu_lclk_dpm_level, + args.set_soc_boost_limit, args.cpu_metrics_ver, args.cpu_metrics_table, + args.socket_energy, args.set_cpu_pwr_eff_mode, args.cpu_ddr_bandwidth, + args.cpu_temp, args.cpu_dimm_temp_range_rate, args.cpu_dimm_pow_conumption, + args.cpu_dimm_thermal_sensor, args.set_cpu_gmi3_link_width, args.set_cpu_pcie_lnk_rate, + args.set_cpu_df_pstate_range] + + + # Handle No CPU passed + if args.cpu == None: + args.cpu = self.cpu_handles + + if (not any(curr_platform_cpu_values)): + for arg in curr_platform_cpu_args: + if arg not in("cpu_lclk_dpm_level", "cpu_io_bandwidth", "cpu_xgmi_bandwidth", "cpu_disable_apb", + "set_cpu_pow_limit", "set_cpu_xgmi_link_width", "set_cpu_lclk_dpm_level", + "set_soc_boost_limit", "set_cpu_pwr_eff_mode", "cpu_dimm_temp_range_rate", + "cpu_dimm_temp_range_rate", "cpu_dimm_pow_conumption", "cpu_dimm_thermal_sensor", + "set_cpu_gmi3_link_width", "set_cpu_pcie_lnk_rate", "set_cpu_df_pstate_range"): + setattr(args, arg, True) + + if (len(self.cpu_handles)): + handled_multiple_cpus, device_handle = self.helpers.handle_cpus(args, + self.logger, + self.metric_cpu) + if handled_multiple_cpus: + return # This function is recursive + args.cpu = device_handle + # get cpu id for logging + cpu_id = self.helpers.get_cpu_id_from_device_handle(args.cpu) + logging.debug(f"Metric Arg information for CPU {cpu_id} on {self.helpers.os_info()}") + + static_dict = {} + if (args.cpu_power_metrics): + static_dict["power_metrics"] = {} + try: + soc_pow = amdsmi_interface.amdsmi_get_cpu_socket_power(args.cpu) + static_dict["power_metrics"]["socket power"] = soc_pow + except amdsmi_exception.AmdSmiLibraryException as e: + static_dict["power_metrics"]["socket power"] = "N/A" + logging.debug("Failed to get socket power for cpu %s | %s", cpu_id, e.get_error_info()) + + try: + soc_pow_limit = amdsmi_interface.amdsmi_get_cpu_socket_power_cap(args.cpu) + static_dict["power_metrics"]["socket power limit"] = soc_pow_limit + except amdsmi_exception.AmdSmiLibraryException as e: + static_dict["power_metrics"]["socket power limit"] = "N/A" + logging.debug("Failed to get socket power limit for cpu %s | %s", cpu_id, e.get_error_info()) + + try: + soc_max_pow_limit = amdsmi_interface.amdsmi_get_cpu_socket_power_cap_max(args.cpu) + static_dict["power_metrics"]["socket max power limit"] = soc_max_pow_limit + except amdsmi_exception.AmdSmiLibraryException as e: + static_dict["power_metrics"]["socket max power limit"] = "N/A" + logging.debug("Failed to get max socket power limit for cpu %s | %s", cpu_id, e.get_error_info()) + + if (args.cpu_prochot): + static_dict["prochot"] = {} + try: + proc_status = amdsmi_interface.amdsmi_get_cpu_prochot_status(args.cpu) + static_dict["prochot"]["prochot_status"] = proc_status + except amdsmi_exception.AmdSmiLibraryException as e: + static_dict["prochot"]["prochot_status"] = "N/A" + logging.debug("Failed to get prochot status for cpu %s | %s", cpu_id, e.get_error_info()) + + if (args.cpu_freq_metrics): + static_dict["freq_metrics"] = {} + try: + fclk_mclk = amdsmi_interface.amdsmi_get_cpu_fclk_mclk(args.cpu) + static_dict["freq_metrics"]["fclkmemclk"] = fclk_mclk + except amdsmi_exception.AmdSmiLibraryException as e: + static_dict["freq_metrics"]["fclkmemclk"] = "N/A" + logging.debug("Failed to get current fclkmemclk freq for cpu %s | %s", cpu_id, e.get_error_info()) + + try: + cclk_freq = amdsmi_interface.amdsmi_get_cpu_cclk_limit(args.cpu) + static_dict["freq_metrics"]["cclkfreqlimit"] = cclk_freq + except amdsmi_exception.AmdSmiLibraryException as e: + static_dict["freq_metrics"]["cclkfreqlimit"] = "N/A" + logging.debug("Failed to get current cclk freq for cpu %s | %s", cpu_id, e.get_error_info()) + + try: + soc_cur_freq_limit = amdsmi_interface.amdsmi_get_cpu_socket_current_active_freq_limit(args.cpu) + static_dict["freq_metrics"]["soc_current_active_freq_limit"] = soc_cur_freq_limit + except amdsmi_exception.AmdSmiLibraryException as e: + static_dict["freq_metrics"]["soc_current_active_freq_limit"] = "N/A" + logging.debug("Failed to get socket current freq limit for cpu %s | %s", cpu_id, e.get_error_info()) + + try: + soc_freq_range = amdsmi_interface.amdsmi_get_cpu_socket_freq_range(args.cpu) + static_dict["freq_metrics"]["soc_freq_range"] = soc_freq_range + except amdsmi_exception.AmdSmiLibraryException as e: + static_dict["freq_metrics"]["soc_freq_range"] = "N/A" + logging.debug("Failed to get socket freq range for cpu %s | %s", cpu_id, e.get_error_info()) + + if (args.cpu_c0_res): + static_dict["c0_residency"] = {} + try: + residency = amdsmi_interface.amdsmi_get_cpu_socket_c0_residency(args.cpu) + static_dict["c0_residency"]["residency"] = residency + except amdsmi_exception.AmdSmiLibraryException as e: + static_dict["c0_residency"]["residency"] = "N/A" + logging.debug("Failed to get C0 residency for cpu %s | %s", cpu_id, e.get_error_info()) + + if (args.cpu_lclk_dpm_level): + static_dict["socket_dpm"] = {} + try: + dpm_val = amdsmi_interface.amdsmi_get_cpu_socket_lclk_dpm_level(args.cpu, + args.cpu_lclk_dpm_level[0][0]) + static_dict["socket_dpm"]["dpml_level_range"] = dpm_val + except amdsmi_exception.AmdSmiLibraryException as e: + static_dict["socket_dpm"]["dpml_level_range"] = dpm_val + logging.debug("Failed to get socket dpm level range for cpu %s | %s", cpu_id, e.get_error_info()) + + if (args.cpu_pwr_svi_telemtry_rails): + static_dict["svi_telemetry_all_rails"] = {} + try: + power = amdsmi_interface.amdsmi_get_cpu_pwr_svi_telemetry_all_rails(args.cpu) + static_dict["svi_telemetry_all_rails"]["power"] = power + except amdsmi_exception.AmdSmiLibraryException as e: + static_dict["c0_residency"]["residency"] = "N/A" + logging.debug("Failed to get svi telemetry all rails for cpu %s | %s", cpu_id, e.get_error_info()) + if (args.cpu_io_bandwidth): + static_dict["io_bandwidth"] = {} + try: + bandwidth = amdsmi_interface.amdsmi_get_cpu_current_io_bandwidth(args.cpu, + int(args.cpu_io_bandwidth[0][0]), + args.cpu_io_bandwidth[0][1]) + static_dict["io_bandwidth"]["band_width"] = bandwidth + except amdsmi_exception.AmdSmiLibraryException as e: + static_dict["io_bandwidth"]["band_width"] = "N/A" + logging.debug("Failed to get io bandwidth for cpu %s | %s", cpu_id, e.get_error_info()) + if (args.cpu_xgmi_bandwidth): + static_dict["xgmi_bandwidth"] = {} + try: + bandwidth = amdsmi_interface.amdsmi_get_cpu_current_xgmi_bw(args.cpu, + int(args.cpu_xgmi_bandwidth[0][0]), + args.cpu_xgmi_bandwidth[0][1]) + static_dict["xgmi_bandwidth"]["band_width"] = bandwidth + except amdsmi_exception.AmdSmiLibraryException as e: + static_dict["xgmi_bandwidth"]["band_width"] = "N/A" + logging.debug("Failed to get xgmi bandwidth for cpu %s | %s", cpu_id, e.get_error_info()) + if (args.cpu_enable_apb): + static_dict["apbenable"] = {} + try: + amdsmi_interface.amdsmi_cpu_apb_enable(args.cpu) + static_dict["apbenable"]["state"] = "Enabled DF - Pstate performance boost algorithm" + except amdsmi_exception.AmdSmiLibraryException as e: + static_dict["apbenable"]["state"] = "N/A" + logging.debug("Failed to enable APB for cpu %s | %s", cpu_id, e.get_error_info()) + + if (args.cpu_disable_apb): + static_dict["apbdisable"] = {} + try: + amdsmi_interface.amdsmi_cpu_apb_disable(args.cpu, args.cpu_disable_apb[0][0]) + static_dict["apbdisable"]["state"] = "Disabled DF - Pstate performance boost algorithm" + except amdsmi_exception.AmdSmiLibraryException as e: + static_dict["apbdisable"]["state"] = "N/A" + logging.debug("Failed to enable APB for cpu %s | %s", cpu_id, e.get_error_info()) + + if (args.set_cpu_pow_limit): + static_dict["set_pow_limit"] = {} + try: + amdsmi_interface.amdsmi_set_cpu_socket_power_cap(args.cpu, args.set_cpu_pow_limit[0][0]) + static_dict["set_pow_limit"]["Response"] = "Set Operation successful" + except amdsmi_exception.AmdSmiLibraryException as e: + static_dict["set_pow_limit"]["Response"] = "Set Operation successful" + logging.debug("Failed to set power limit for cpu %s | %s", cpu_id, e.get_error_info()) + + if (args.set_cpu_xgmi_link_width): + static_dict["set_xgmi_link_width"] = {} + try: + amdsmi_interface.amdsmi_set_cpu_xgmi_width(args.cpu, args.set_cpu_xgmi_link_width[0][0], + args.set_cpu_xgmi_link_width[0][1]) + static_dict["set_xgmi_link_width"]["Response"] = "Set Operation successful" + except amdsmi_exception.AmdSmiLibraryException as e: + static_dict["set_xgmi_link_width"]["Response"] = "N/A" + logging.debug("Failed to set xgmi link width for cpu %s | %s", cpu_id, e.get_error_info()) + + if (args.set_cpu_lclk_dpm_level): + static_dict["set_lclk_dpm_level"] = {} + try: + amdsmi_interface.amdsmi_set_cpu_socket_lclk_dpm_level(args.cpu, args.set_cpu_lclk_dpm_level[0][0], + args.set_cpu_lclk_dpm_level[0][1], + args.set_cpu_lclk_dpm_level[0][2]) + static_dict["set_lclk_dpm_level"]["Response"] = "Set Operation successful" + except amdsmi_exception.AmdSmiLibraryException as e: + static_dict["set_lclk_dpm_level"]["Response"] = "N/A" + logging.debug("Failed to set lclk dpm level for cpu %s | %s", cpu_id, e.get_error_info()) + if (args.set_soc_boost_limit): + static_dict["set_soc_boost_limit"] = {} + try: + amdsmi_interface.amdsmi_set_cpu_socket_boostlimit(args.cpu, args.set_soc_boost_limit[0][0]) + static_dict["set_soc_boost_limit"]["Response"] = "Set Operation successful" + except amdsmi_exception.AmdSmiLibraryException as e: + static_dict["set_soc_boost_limit"]["Response"] = "N/A" + logging.debug("Failed to set socket boost limit for cpu %s | %s", cpu_id, e.get_error_info()) + + if (args.cpu_metrics_ver): + static_dict["metric_version"] = {} + try: + version = amdsmi_interface.amdsmi_get_metrics_table_version(args.cpu) + static_dict["metric_version"]["version"] = version + except amdsmi_exception.AmdSmiLibraryException as e: + static_dict["metric_version"]["version"] = "N/A" + logging.debug("Failed to get metrics table version for cpu %s | %s", cpu_id, e.get_error_info()) + + if (args.cpu_metrics_table): + static_dict["metrics_table"] = {} + static_dict["metrics_table"]["response"] = "N/A" + # Note:- amdsmi_get_metrics_table has been disabled as there is fix needed in the library API and will be + # in next version + """try: + metrics_table = amdsmi_interface.amdsmi_get_metrics_table(args.cpu) + static_dict["metrics_table"]["response"] = metrics_table + except amdsmi_exception.AmdSmiLibraryException as e: + static_dict["metrics_table"]["response"] = "N/A" + logging.debug("Failed to get metrics table for cpu %s | %s", cpu_id, e.get_error_info())""" + + if (args.socket_energy): + static_dict["socket_energy"] = {} + try: + energy = amdsmi_interface.amdsmi_get_cpu_socket_energy(args.cpu) + static_dict["socket_energy"]["response"] = energy + except amdsmi_exception.AmdSmiLibraryException as e: + static_dict["socket_energy"]["response"] = "N/A" + logging.debug("Failed to get socket energy for cpu %s | %s", cpu_id, e.get_error_info()) + + if(args.set_cpu_pwr_eff_mode): + static_dict["set_pwr_eff_mode"] = {} + try: + amdsmi_interface.amdsmi_set_cpu_pwr_efficiency_mode(args.cpu, args.set_cpu_pwr_eff_mode[0][0]) + static_dict["set_pwr_eff_mode"]["Response"] = "Set Operation successful" + except amdsmi_exception.AmdSmiLibraryException as e: + static_dict["set_pwr_eff_mode"]["Response"] = "N/A" + logging.debug("Failed to set power efficiency mode for cpu %s | %s", cpu_id, e.get_error_info()) + + if (args.cpu_ddr_bandwidth): + static_dict["ddr_bandwidth"] = {} + try: + resp = amdsmi_interface.amdsmi_get_cpu_ddr_bw(args.cpu) + static_dict["ddr_bandwidth"]["response"] = resp + except amdsmi_exception.AmdSmiLibraryException as e: + static_dict["ddr_bandwidth"]["response"] = "N/A" + logging.debug("Failed to get ddr bandwdith for cpu %s | %s", cpu_id, e.get_error_info()) + + if (args.cpu_temp): + static_dict["cpu_temp"] = {} + try: + resp = amdsmi_interface.amdsmi_get_cpu_socket_temperature(args.cpu) + static_dict["cpu_temp"]["response"] = resp + except amdsmi_exception.AmdSmiLibraryException as e: + static_dict["cpu_temp"]["response"] = "N/A" + logging.debug("Failed to get cpu temperature for cpu %s | %s", cpu_id, e.get_error_info()) + + if (args.cpu_dimm_temp_range_rate): + static_dict["dimm_temp_range_rate"] = {} + try: + resp = amdsmi_interface.amdsmi_get_cpu_dimm_temp_range_and_refresh_rate(args.cpu, args.cpu_dimm_temp_range_rate[0][0]) + static_dict["dimm_temp_range_rate"]["response"] = resp + except amdsmi_exception.AmdSmiLibraryException as e: + static_dict["dimm_temp_range_rate"]["response"] = "N/A" + logging.debug("Failed to get dimm temperature range and refresh rate for cpu %s | %s", cpu_id, e.get_error_info()) + + if (args.cpu_dimm_pow_conumption): + static_dict["dimm_pow_conumption"] = {} + try: + resp = amdsmi_interface.amdsmi_get_cpu_dimm_power_consumption(args.cpu, args.cpu_dimm_pow_conumption[0][0]) + static_dict["dimm_pow_conumption"]["response"] = resp + except amdsmi_exception.AmdSmiLibraryException as e: + static_dict["dimm_pow_conumption"]["response"] = "N/A" + logging.debug("Failed to get dimm temperature range and refresh rate for cpu %s | %s", cpu_id, e.get_error_info()) + + if (args.cpu_dimm_thermal_sensor): + static_dict["dimm_thermal_sensor"] = {} + try: + resp = amdsmi_interface.amdsmi_get_cpu_dimm_thermal_sensor(args.cpu, args.cpu_dimm_thermal_sensor[0][0]) + static_dict["dimm_thermal_sensor"]["response"] = resp + except amdsmi_exception.AmdSmiLibraryException as e: + static_dict["dimm_thermal_sensor"]["response"] = "N/A" + logging.debug("Failed to get dimm temperature range and refresh rate for cpu %s | %s", cpu_id, e.get_error_info()) + + if (args.set_cpu_gmi3_link_width): + static_dict["set_gmi3_link_width"] = {} + try: + amdsmi_interface.amdsmi_set_cpu_gmi3_link_width_range(args.cpu, args.set_cpu_gmi3_link_width[0][0], + args.set_cpu_gmi3_link_width[0][1]) + static_dict["set_gmi3_link_width"]["response"] = "Set Operation successful" + except amdsmi_exception.AmdSmiLibraryException as e: + static_dict["set_gmi3_link_width"]["response"] = "N/A" + logging.debug("Failed to set gmi3 link width for cpu %s | %s", cpu_id, e.get_error_info()) + + if (args.set_cpu_pcie_lnk_rate): + static_dict["set_pcie_lnk_rate"] = {} + try: + resp = amdsmi_interface.amdsmi_set_cpu_pcie_link_rate(args.cpu, args.set_cpu_pcie_lnk_rate[0][0]) + static_dict["set_pcie_lnk_rate"]["prev_mode"] = resp + except amdsmi_exception.AmdSmiLibraryException as e: + static_dict["set_pcie_lnk_rate"]["prev_mode"] = "N/A" + logging.debug("Failed to set pcie link rate for cpu %s | %s", cpu_id, e.get_error_info()) + + if (args.set_cpu_df_pstate_range): + static_dict["set_df_pstate_range"] = {} + try: + amdsmi_interface.amdsmi_set_cpu_df_pstate_range(args.cpu, args.set_cpu_df_pstate_range[0][0], + args.set_cpu_df_pstate_range[0][1]) + static_dict["set_df_pstate_range"]["response"] = "Set Operation successful" + except amdsmi_exception.AmdSmiLibraryException as e: + static_dict["set_df_pstate_range"]["response"] = "N/A" + logging.debug("Failed to set df pstate range for cpu %s | %s", cpu_id, e.get_error_info()) + + multiple_devices_csv_override = False + self.logger.store_cpu_output(args.cpu, 'values', static_dict) + if multiple_devices: + self.logger.store_multiple_device_output() + return # Skip printing when there are multiple devices + self.logger.print_output(multiple_device_enabled=multiple_devices_csv_override) + + + def metric_core(self, args, multiple_devices=False, core=None, boost_limit=None, + curr_active_freq_core_limit=None, set_core_boost_limit=None, core_energy=None): + """Get Static information for target core + + Args: + args (Namespace): Namespace containing the parsed CLI args + multiple_devices (bool, optional): True if checking for multiple devices. Defaults to False. + core (device_handle, optional): device_handle for target device. Defaults to None. + + Returns: + None: Print output via AMDSMILogger to destination + """ + if core: + args.core = core + if boost_limit: + args.core_boost_limit = boost_limit + if curr_active_freq_core_limit: + args.core_curr_active_freq_core_limit = curr_active_freq_core_limit + if set_core_boost_limit: + args.set_core_boost_limit = boost_limit + if core_energy: + args.core_energy = core_energy + + #store core args that are applicable to the current platform + curr_platform_core_args = ["core_boost_limit", "core_curr_active_freq_core_limit", + "set_core_boost_limit","core_energy"] + curr_platform_core_values = [args.core_boost_limit, args.core_curr_active_freq_core_limit, + args.set_core_boost_limit, args.core_energy] + + # Handle No core passed + if args.core == None: + args.core = self.core_handles + + if (not any(curr_platform_core_values)): + for arg in curr_platform_core_args: + if arg not in (["set_core_boost_limit"]): + setattr(args, arg, True) + + if (len(self.core_handles)): + handled_multiple_cores, device_handle = self.helpers.handle_cores(args, + self.logger, + self.metric_core) + if handled_multiple_cores: + return # This function is recursive + args.core = device_handle + # get core id for logging + core_id = self.helpers.get_core_id_from_device_handle(args.core) + logging.debug(f"Static Arg information for Core {core_id} on {self.helpers.os_info()}") + + static_dict = {} + if (args.core_boost_limit): + static_dict["boost_limit"] ={} + + try: + boost_limit = amdsmi_interface.amdsmi_get_cpu_core_boostlimit(args.core) + static_dict["boost_limit"]["value"] = boost_limit + except amdsmi_exception.AmdSmiLibraryException as e: + static_dict["boost_limit"]["value"] = "N/A" + logging.debug("Failed to get core boost limit for core %s | %s", core_id, e.get_error_info()) + if (args.core_curr_active_freq_core_limit): + static_dict["curr_active_freq_core_limit"] = {} + + try: + freq = amdsmi_interface.amdsmi_get_cpu_core_current_freq_limit(args.core) + static_dict["curr_active_freq_core_limit"]["value"] = freq + except amdsmi_exception.AmdSmiLibraryException as e: + static_dict["curr_active_freq_core_limit"]["value"] = "N/A" + logging.debug("Failed to get current active frequency core for core %s | %s", core_id, e.get_error_info()) + + if (args.set_core_boost_limit): + static_dict["set_core_boost_limit"] = {} + try: + amdsmi_interface.amdsmi_set_cpu_core_boostlimit(args.core, args.set_core_boost_limit[0][0]) + static_dict["set_core_boost_limit"]["Response"] = "Set Operation successful" + except amdsmi_exception.AmdSmiLibraryException as e: + static_dict["set_core_boost_limit"]["Response"] = "N/A" + logging.debug("Failed to set core boost limit for cpu %s | %s", core_id, e.get_error_info()) + + + if (args.core_energy): + static_dict["core_energy"] ={} + try: + energy = amdsmi_interface.amdsmi_get_cpu_core_energy(args.core) + static_dict["core_energy"]["value"] = energy + except amdsmi_exception.AmdSmiLibraryException as e: + static_dict["core_energy"]["value"] = "N/A" + logging.debug("Failed to get core energy for core %s | %s", core_id, e.get_error_info()) + + + multiple_devices_csv_override = False + self.logger.store_core_output(args.core, 'values', static_dict) + if multiple_devices: + self.logger.store_multiple_device_output() + return # Skip printing when there are multiple devices + self.logger.print_output(multiple_device_enabled=multiple_devices_csv_override) + + + def metric(self, args, multiple_devices=False, watching_output=False, gpu=None, + usage=None, watch=None, watch_time=None, iterations=None, power=None, + clock=None, temperature=None, ecc=None, ecc_block=None, pcie=None, + fan=None, voltage_curve=None, overdrive=None, perf_level=None, + xgmi_err=None, energy=None, mem_usage=None, schedule=None, + guard=None, guest_data=None, fb_usage=None, xgmi=None,cpu=None, + cpu_power_metrics=None, prochot=None, freq_metrics=None, c0_res=None, + lclk_dpm_level=None,pwr_svi_telemtry_rails=None, io_bandwidth=None, + xgmi_bandwidth=None, enable_apb=None, disable_apb=None,set_pow_limit=None, + set_xgmi_link_width=None, set_lclk_dpm_level=None, set_soc_boost_limit=None, + metrics_ver=None, metrics_table=None, socket_energy=None,set_pwr_eff_mode=None, + ddr_bandwidth=None, cpu_temp=None, dimm_temp_range_rate=None,dimm_pow_conumption=None, + dimm_thermal_sensor=None, set_gmi3_link_width=None, set_pcie_lnk_rate=None, + set_df_pstate_range=None, core=None, boost_limit=None, + curr_active_freq_core_limit=None, set_core_boost_limit=None, core_energy=None): + """Get Metric information for target gpu + + Args: + args (Namespace): Namespace containing the parsed CLI args + multiple_devices (bool, optional): True if checking for multiple devices. Defaults to False. + watching_output (bool, optional): True if watch option has been set. Defaults to False. + gpu (device_handle, optional): device_handle for target device. Defaults to None. + usage (bool, optional): Value override for args.usage. Defaults to None. + watch (Positive int, optional): Value override for args.watch. Defaults to None. + watch_time (Positive int, optional): Value override for args.watch_time. Defaults to None. + iterations (Positive int, optional): Value override for args.iterations. Defaults to None. + power (bool, optional): Value override for args.power. Defaults to None. + clock (bool, optional): Value override for args.clock. Defaults to None. + temperature (bool, optional): Value override for args.temperature. Defaults to None. + ecc (bool, optional): Value override for args.ecc. Defaults to None. + ecc_block (bool, optional): Value override for args.ecc. Defaults to None. + pcie (bool, optional): Value override for args.pcie. Defaults to None. + fan (bool, optional): Value override for args.fan. Defaults to None. + voltage_curve (bool, optional): Value override for args.voltage_curve. Defaults to None. + overdrive (bool, optional): Value override for args.overdrive. Defaults to None. + perf_level (bool, optional): Value override for args.perf_level. Defaults to None. + xgmi_err (bool, optional): Value override for args.xgmi_err. Defaults to None. + energy (bool, optional): Value override for args.energy. Defaults to None. + mem_usage (bool, optional): Value override for args.mem_usage. Defaults to None. + schedule (bool, optional): Value override for args.schedule. Defaults to None. + guard (bool, optional): Value override for args.guard. Defaults to None. + guest_data (bool, optional): Value override for args.guest_data. Defaults to None. + fb_usage (bool, optional): Value override for args.fb_usage. Defaults to None. + xgmi (bool, optional): Value override for args.xgmi. Defaults to None. + cpu_power_metrics (bool, optional): Value override for args.cpu_power_metrics. Defaults to None + prochot (bool, optional): Value override for args.prochot. Defaults to None. + freq_metrics (bool, optional): Value override for args.freq_metrics. Defaults to None. + c0_res (bool, optional): Value override for args.c0_res. Defaults to None + lclk_dpm_level (list, optional): Value override for args.lclk_dpm_level. Defaults to None + pwr_svi_telemtry_rails (list, optional): value override for args.pwr_svi_telemtry_rails. Defaults to None + io_bandwidth (list, optional): value override for args.io_bandwidth. Defaults to None + xgmi_bandwidth (list, optional): value override for args.xgmi_bandwidth. Defaults to None + enable_apb (bool, optional): Value override for args.enable_apb. Defaults to None + disable_apb (bool, optional): Value override for args.disable_apb. Defaults to None + set_pow_limit (bool, optional): Value override for args.cpu_set_pow_limit. Defaults to None + set_xgmi_link_width (list, optional): Value override for args.set_cpu_xgmi_link_width. Defaults to None + set_lclk_dpm_level (bool, optional): Value override for args.set_cpu_lclk_dpm_level. Defaults to None + boost_limit (bool, optional): Value override for args.boost_limit. Defaults to None + set_soc_boost_limit (list, optional): Value override for args.set_soc_boost_limit. Defaults to None + metrics_ver (bool, optional): Value override for args.cpu_metrics_ver. Defaults to None + metrics_table (bool, optional): Value override for args.cpu_metrics_table. Defaults to None + socket_energy (bool, optional): Value override for args.socket_energy. Defaults to None + set_pwr_eff_mode (list, optional): Value override for args.set_cpu_pwr_eff_mode. Defaults to None + ddr_bandwidth (bool, optional): Value override for args.ddr_bandwidth. Defaults to None + cpu_temp (bool, optional): Value override for args.cpu_temp. Defaults to None + dimm_temp_range_rate (bool, optional): Value override for args.cpu_dimm_temp_range_rate. Defaults to None + dimm_pow_conumption (bool, optional): Value override for args.cpu_dimm_pow_conumption. Defaults to None + dimm_thermal_sensor (bool, optional): Value override for args.cpu_dimm_thermal_sensor. Defaults to None + set_gmi3_link_width (list, optional): Value override for args.set_cpu_gmi3_link_width. Defaults to None + set_pcie_lnk_rate (list, optional): Value override for args.set_cpu_pcie_lnk_rate. Defaults to None + set_df_pstate_range (list, optional): Value override for args.set_cpu_df_pstate_range. Defaults to None + + Raises: + IndexError: Index error if gpu list is empty + + Returns: + None: Print output via AMDSMILogger to destination + """ + gpus = args.gpu + cpus= args.cpu + cores = args.core + gpu_options = any([args.gpu, args.usage,args.watch, args.watch_time, args.iterations, + args.power, args.clock, args.temperature, args.ecc, args.ecc_block, + args.pcie, args.fan, args.voltage_curve, args.overdrive, args.perf_level, + args.xgmi_err, args.energy, args.mem_usage]) + cpu_options = any([args.cpu, args.cpu_power_metrics, args.cpu_prochot, + args.cpu_freq_metrics, args.cpu_c0_res, args.cpu_lclk_dpm_level, + args.cpu_pwr_svi_telemtry_rails, args.cpu_io_bandwidth, args.cpu_xgmi_bandwidth, + args.cpu_enable_apb, args.cpu_disable_apb, args.set_cpu_pow_limit, + args.set_cpu_xgmi_link_width, args.set_cpu_lclk_dpm_level, + args.set_soc_boost_limit,args.cpu_metrics_ver, args.cpu_metrics_table, + args.socket_energy, args.set_cpu_pwr_eff_mode,args.cpu_ddr_bandwidth, + args.cpu_temp, args.cpu_dimm_temp_range_rate, args.cpu_dimm_pow_conumption, + args.cpu_dimm_thermal_sensor, args.set_cpu_gmi3_link_width, + args.set_cpu_pcie_lnk_rate, args.set_cpu_df_pstate_range]) + + core_options = any([args.core_boost_limit, args.core_curr_active_freq_core_limit, + args.set_core_boost_limit, args.core_energy]) + if ((len(self.device_handles) and ((((not gpus) and (not cpus) and (not cores)) or gpus) + and not cpu_options and not core_options))): + self.metric_gpu( args, multiple_devices, watching_output, gpu, + usage, watch, watch_time, iterations, power, + clock, temperature, ecc, ecc_block, pcie, + fan, voltage_curve, overdrive, perf_level, + xgmi_err, energy, mem_usage, schedule, + guard, guest_data, fb_usage, xgmi) + + if ((len(self.cpu_handles) and ((((not gpus) and (not cpus) and (not cores)) or cpus) + and not gpu_options and not core_options))): + self.logger.clear_multiple_devices_ouput() + self.metric_cpu(args, multiple_devices, cpu, cpu_power_metrics, prochot, + freq_metrics, c0_res, lclk_dpm_level, pwr_svi_telemtry_rails, + io_bandwidth, xgmi_bandwidth, enable_apb, disable_apb, + set_pow_limit,set_xgmi_link_width, set_lclk_dpm_level, + set_soc_boost_limit, metrics_ver, metrics_table, socket_energy, + set_pwr_eff_mode,ddr_bandwidth, cpu_temp, dimm_temp_range_rate, + dimm_pow_conumption,dimm_thermal_sensor, set_gmi3_link_width, + set_pcie_lnk_rate, set_df_pstate_range) + + + if ((len(self.core_handles) and ((((not gpus) and (not cpus) and (not cores)) or cores) + and not gpu_options and not cpu_options))): + self.logger.clear_multiple_devices_ouput() + self.metric_core(args, multiple_devices, core, boost_limit, + curr_active_freq_core_limit, set_core_boost_limit, + core_energy) + + if (len(self.cpu_handles) == 0 and len(self.device_handles) == 0 and + len(self.core_handles) == 0): + logging.error("No CPU and GPU devices present") + sys.exit(-1) + def process(self, args, multiple_devices=False, watching_output=False, gpu=None, general=None, engine=None, pid=None, name=None, watch=None, watch_time=None, iterations=None): diff --git a/amdsmi_cli/amdsmi_helpers.py b/amdsmi_cli/amdsmi_helpers.py index 9e08bfbc70..91879e721c 100644 --- a/amdsmi_cli/amdsmi_helpers.py +++ b/amdsmi_cli/amdsmi_helpers.py @@ -116,6 +116,97 @@ class AMDSMIHelpers(): return self._is_windows + def get_cpu_choices(self): + """Return dictionary of possible CPU choices and string of the output: + Dictionary will be in format: cpus[ID]: Device Handle) + String output will be in format: + "ID: 0 " + params: + None + return: + (dict, str) : (cpu_choices, cpu_choices_str) + """ + cpu_choices = {} + cpu_choices_str = "" + #import pdb;pdb.set_trace() + try: + cpu_handles = [] + # amdsmi_get_cpusocket_handles() returns the cpu socket handles stored for cpu_id + cpu_handles = amdsmi_interface.amdsmi_get_cpusocket_handles() + except amdsmi_interface.AmdSmiLibraryException as e: + if e.err_code in (amdsmi_interface.amdsmi_wrapper.AMDSMI_STATUS_NOT_INIT, + amdsmi_interface.amdsmi_wrapper.AMDSMI_STATUS_DRIVER_NOT_LOADED): + logging.info('Unable to get device choices, driver not initialized (amdhsmp not found in modules)') + else: + raise e + if len(cpu_handles) == 0: + logging.info('Unable to find any devices, check if driver is initialized (amdhsmp not found in modules)') + else: + # Handle spacing for the gpu_choices_str + max_padding = int(math.log10(len(cpu_handles))) + 1 + + for cpu_id, device_handle in enumerate(cpu_handles): + cpu_choices[str(cpu_id)] = { + "Device Handle": device_handle + } + if cpu_id == 0: + id_padding = max_padding + else: + id_padding = max_padding - int(math.log10(cpu_id)) + cpu_choices_str += f"ID: {cpu_id}\n" + + # Add the all option to the gpu_choices + cpu_choices["all"] = "all" + cpu_choices_str += f" all{' ' * max_padding}| Selects all devices\n" + + return (cpu_choices, cpu_choices_str) + + def get_core_choices(self): + """Return dictionary of possible Core choices and string of the output: + Dictionary will be in format: coress[ID]: Device Handle) + String output will be in format: + "ID: 0 " + params: + None + return: + (dict, str) : (core_choices, core_choices_str) + """ + core_choices = {} + core_choices_str = "" + + try: + core_handles = [] + # amdsmi_get_cpucore_handles() returns the core handles stored for core_id + core_handles = amdsmi_interface.amdsmi_get_cpucore_handles() + except amdsmi_interface.AmdSmiLibraryException as e: + if e.err_code in (amdsmi_interface.amdsmi_wrapper.AMDSMI_STATUS_NOT_INIT, + amdsmi_interface.amdsmi_wrapper.AMDSMI_STATUS_DRIVER_NOT_LOADED): + logging.info('Unable to get device choices, driver not initialized (amdhsmp not found in modules)') + else: + raise e + if len(core_handles) == 0: + logging.info('Unable to find any devices, check if driver is initialized (amdhsmp not found in modules)') + else: + # Handle spacing for the gpu_choices_str + max_padding = int(math.log10(len(core_handles))) + 1 + + for core_id, device_handle in enumerate(core_handles): + core_choices[str(core_id)] = { + "Device Handle": device_handle + } + if core_id == 0: + id_padding = max_padding + else: + id_padding = max_padding - int(math.log10(core_id)) + core_choices_str += f"ID: 0 - {len(core_handles) - 1}\n" + + # Add the all option to the core_choices + core_choices["all"] = "all" + core_choices_str += f" all{' ' * max_padding}| Selects all devices\n" + + return (core_choices, core_choices_str) + + def get_output_format(self): """Returns the output format read from sys.argv Returns: @@ -142,6 +233,7 @@ class AMDSMIHelpers(): """ gpu_choices = {} gpu_choices_str = "" + device_handles = [] try: # amdsmi_get_processor_handles returns the device_handles storted for gpu_id @@ -149,36 +241,34 @@ class AMDSMIHelpers(): except amdsmi_interface.AmdSmiLibraryException as e: if e.err_code in (amdsmi_interface.amdsmi_wrapper.AMDSMI_STATUS_NOT_INIT, amdsmi_interface.amdsmi_wrapper.AMDSMI_STATUS_DRIVER_NOT_LOADED): - logging.error('Unable to get device choices, driver not initialized (amdgpu not found in modules)') - sys.exit(-1) + logging.info('Unable to get device choices, driver not initialized (amdgpu not found in modules)') else: raise e if len(device_handles) == 0: - logging.error('Unable to find any devices, check if driver is initialized (amdgpu not found in modules)') - sys.exit(-1) + logging.info('Unable to find any devices, check if driver is initialized (amdgpu not found in modules)') + else: + # Handle spacing for the gpu_choices_str + max_padding = int(math.log10(len(device_handles))) + 1 - # Handle spacing for the gpu_choices_str - max_padding = int(math.log10(len(device_handles))) + 1 + for gpu_id, device_handle in enumerate(device_handles): + bdf = amdsmi_interface.amdsmi_get_gpu_device_bdf(device_handle) + uuid = amdsmi_interface.amdsmi_get_gpu_device_uuid(device_handle) + gpu_choices[str(gpu_id)] = { + "BDF": bdf, + "UUID": uuid, + "Device Handle": device_handle, + } - for gpu_id, device_handle in enumerate(device_handles): - bdf = amdsmi_interface.amdsmi_get_gpu_device_bdf(device_handle) - uuid = amdsmi_interface.amdsmi_get_gpu_device_uuid(device_handle) - gpu_choices[str(gpu_id)] = { - "BDF": bdf, - "UUID": uuid, - "Device Handle": device_handle, - } + if gpu_id == 0: + id_padding = max_padding + else: + id_padding = max_padding - int(math.log10(gpu_id)) + gpu_choices_str += f"ID: {gpu_id}{' ' * id_padding}| BDF: {bdf} | UUID: {uuid}\n" - if gpu_id == 0: - id_padding = max_padding - else: - id_padding = max_padding - int(math.log10(gpu_id)) - gpu_choices_str += f"ID: {gpu_id}{' ' * id_padding}| BDF: {bdf} | UUID: {uuid}\n" - - # Add the all option to the gpu_choices - gpu_choices["all"] = "all" - gpu_choices_str += f" all{' ' * max_padding}| Selects all devices\n" + # Add the all option to the gpu_choices + gpu_choices["all"] = "all" + gpu_choices_str += f" all{' ' * max_padding}| Selects all devices\n" return (gpu_choices, gpu_choices_str) @@ -234,11 +324,89 @@ class AMDSMIHelpers(): return True, selected_device_handles - def handle_gpus(self, args, logger, subcommand): + def get_device_handles_from_cpu_selections(self, cpu_selections: List[str], cpu_choices=None): + """Convert provided cpu_selections to device_handles + + Args: + cpu_selections (list[str]): Selected CPU ID(s): + ex: ID:0 + cpu_choices (dict{cpu_choices}): This is a dictionary of the possible cpu_choices + Returns: + (True, list[device_handles]): Returns a list of all the cpu_selections converted to + amdsmi device_handles + (False, str): Return False, and the first input that failed to be converted + """ + if 'all' in cpu_selections: + return (True, amdsmi_interface.amdsmi_get_cpusocket_handles()) + + if isinstance(cpu_selections, str): + cpu_selections = [cpu_selections] + + if cpu_choices is None: + cpu_choices = self.get_cpu_choices()[0] + + selected_device_handles = [] + for cpu_selection in cpu_selections: + valid_cpu_choice = False + for cpu_id, cpu_info in cpu_choices.items(): + device_handle = cpu_info['Device Handle'] + + # Check if passed gpu is a gpu ID + if cpu_selection == cpu_id: + selected_device_handles.append(device_handle) + valid_cpu_choice = True + break + if not valid_cpu_choice: + logging.debug(f"AMDSMIHelpers.get_device_handles_from_cpu_selections - Unable to convert {cpu_selection}") + return False, cpu_selection + return True, selected_device_handles + + + def get_device_handles_from_core_selections(self, core_selections: List[str], core_choices=None): + """Convert provided core_selections to device_handles + + Args: + core_selections (list[str]): Selected CORE ID(s): + ex: ID:0 + core_choices (dict{core_choices}): This is a dictionary of the possible core_choices + Returns: + (True, list[device_handles]): Returns a list of all the core_selections converted to + amdsmi device_handles + (False, str): Return False, and the first input that failed to be converted + """ + if 'all' in core_selections: + return (True, amdsmi_interface.amdsmi_get_cpucore_handles()) + + if isinstance(core_selections, str): + core_selections = [core_selections] + + if core_choices is None: + core_choices = self.get_core_choices()[0] + + selected_device_handles = [] + for core_selection in core_selections: + valid_cpu_choice = False + for core_id, core_info in core_choices.items(): + device_handle = core_info['Device Handle'] + + # Check if passed core is a core ID + if core_selection == core_id: + selected_device_handles.append(device_handle) + valid_core_choice = True + break + if not valid_core_choice: + logging.debug(f"AMDSMIHelpers.get_device_handles_from_core_selections - Unable to convert {core_selection}") + return False, core_selection + return True, selected_device_handles + + + def handle_gpus(self, args,logger, subcommand): """This function will run execute the subcommands based on the number of gpus passed in via args. params: args - argparser args to pass to subcommand + current_platform_args (list) - GPU supported platform arguments + current_platform_values (list) - GPU supported values for the arguments logger (AMDSMILogger) - Logger to print out output subcommand (AMDSMICommands) - Function that can handle multiple gpus @@ -260,11 +428,72 @@ class AMDSMIHelpers(): args.gpu = args.gpu[0] return False, args.gpu else: - raise IndexError("args.gpu should not be an empty list") + logging.debug("args.gpu has an empty list") else: return False, args.gpu + def handle_cpus(self, args, logger, subcommand): + """This function will run execute the subcommands based on the number + of cpus passed in via args. + params: + args - argparser args to pass to subcommand + logger (AMDSMILogger) - Logger to print out output + subcommand (AMDSMICommands) - Function that can handle multiple gpus + + return: + tuple(bool, device_handle) : + bool - True if executed subcommand for multiple devices + device_handle - Return the device_handle if the list of devices is a length of 1 + (handled_multiple_gpus, device_handle) + + """ + if isinstance(args.cpu, list): + if len(args.cpu) > 1: + for device_handle in args.cpu: + # Handle multiple_devices to print all output at once + subcommand(args, multiple_devices=True, cpu=device_handle) + logger.print_output(multiple_device_enabled=True) + return True, args.cpu + elif len(args.cpu) == 1: + args.cpu = args.cpu[0] + return False, args.cpu + else: + logging.debug("args.cpu has empty list") + else: + return False, args.cpu + + def handle_cores(self, args, logger, subcommand): + """This function will run execute the subcommands based on the number + of cores passed in via args. + params: + args - argparser args to pass to subcommand + logger (AMDSMILogger) - Logger to print out output + subcommand (AMDSMICommands) - Function that can handle multiple gpus + + return: + tuple(bool, device_handle) : + bool - True if executed subcommand for multiple devices + device_handle - Return the device_handle if the list of devices is a length of 1 + (handled_multiple_gpus, device_handle) + + """ + if isinstance(args.core, list): + if len(args.core) > 1: + for device_handle in args.core: + # Handle multiple_devices to print all output at once + subcommand(args, multiple_devices=True, core=device_handle) + logger.print_output(multiple_device_enabled=True) + return True, args.core + elif len(args.core) == 1: + args.core = args.core[0] + return False, args.core + else: + logging.debug("args.core has empty list") + else: + return False, args.core + + def handle_watch(self, args, subcommand, logger): """This function will run the subcommand multiple times based on the passed watch, watch_time, and iterations passed in. @@ -326,6 +555,31 @@ class AMDSMIHelpers(): "Unable to find gpu ID from device_handle") + def get_cpu_id_from_device_handle(self, input_device_handle): + """Get the cpu index from the device_handle. + amdsmi_interface.amdsmi_get_cpusocket_handles() returns the list of device_handles in order of cpu_index + """ + device_handles = amdsmi_interface.amdsmi_get_cpusocket_handles() + for cpu_index, device_handle in enumerate(device_handles): + if input_device_handle.value == device_handle.value: + return cpu_index + raise amdsmi_exception.AmdSmiParameterException(input_device_handle, + amdsmi_interface.amdsmi_wrapper.amdsmi_processor_handle, + "Unable to find cpu ID from device_handle") + + def get_core_id_from_device_handle(self, input_device_handle): + """Get the core index from the device_handle. + amdsmi_interface.amdsmi_get_cpusocket_handles() returns the list of device_handles in order of cpu_index + """ + device_handles = amdsmi_interface.amdsmi_get_cpucore_handles() + for core_index, device_handle in enumerate(device_handles): + if input_device_handle.value == device_handle.value: + return core_index + raise amdsmi_exception.AmdSmiParameterException(input_device_handle, + amdsmi_interface.amdsmi_wrapper.amdsmi_processor_handle, + "Unable to find core ID from device_handle") + + def get_amd_gpu_bdfs(self): """Return a list of GPU BDFs visibile to amdsmi diff --git a/amdsmi_cli/amdsmi_init.py b/amdsmi_cli/amdsmi_init.py index 8e56cbbd3a..dc742d091a 100644 --- a/amdsmi_cli/amdsmi_init.py +++ b/amdsmi_cli/amdsmi_init.py @@ -53,17 +53,41 @@ def check_amdgpu_driver(): return False +def check_amdhsmp_driver(): + """ Returns true if amd hsmp is found in the list of initialized modules """ + amd_cpu_status_file = Path("/sys/module/amd_hsmp/initstate") + if amd_cpu_status_file.exists(): + if amd_cpu_status_file.read_text(encoding="ascii").strip() == "live": + return True + return False + + def init_amdsmi(flag=amdsmi_interface.AmdSmiInitFlags.INIT_AMD_GPUS): """ Initializes AMDSMI Raises: err: AmdSmiLibraryException if not successful """ + gpu_flag = False; + cpu_flag = False; + + # Check if both the amdgpu and amdhsmp driver is up and handle error gracefully + if check_amdgpu_driver() and check_amdhsmp_driver(): + # init AMD APUS + try: + amdsmi_interface.amdsmi_init(amdsmi_interface.AmdSmiInitFlags.INIT_AMD_APUS) + except (amdsmi_interface.AmdSmiLibraryException, amdsmi_interface.AmdSmiParameterException) as e: + if e.err_code in (amdsmi_interface.amdsmi_wrapper.AMDSMI_STATUS_NOT_INIT, + amdsmi_interface.amdsmi_wrapper.AMDSMI_STATUS_DRIVER_NOT_LOADED): + logging.error("Drivers not loaded (amdgpu and hsmp drivers not found in modules)") + sys.exit(-1) + else: + raise e # # Check if amdgpu driver is up & Handle error gracefully - if check_amdgpu_driver(): + elif check_amdgpu_driver(): # Only init AMD GPUs for now, waiting for future support for AMD CPUs try: - amdsmi_interface.amdsmi_init(flag) + amdsmi_interface.amdsmi_init(amdsmi_interface.AmdSmiInitFlags.INIT_AMD_GPUS) except (amdsmi_interface.AmdSmiLibraryException, amdsmi_interface.AmdSmiParameterException) as e: if e.err_code in (amdsmi_interface.amdsmi_wrapper.AMDSMI_STATUS_NOT_INIT, amdsmi_interface.amdsmi_wrapper.AMDSMI_STATUS_DRIVER_NOT_LOADED): @@ -72,9 +96,23 @@ def init_amdsmi(flag=amdsmi_interface.AmdSmiInitFlags.INIT_AMD_GPUS): else: raise e logging.debug("AMDSMI initialized successfully, but initstate was not live") + + elif check_amdhsmp_driver(): + # Only init AMD CPUs + try: + amdsmi_interface.amdsmi_init(amdsmi_interface.AmdSmiInitFlags.INIT_AMD_CPUS) + cpu_flag = True + except (amdsmi_interface.AmdSmiLibraryException, amdsmi_interface.AmdSmiParameterException) as e: + if e.err_code in (amdsmi_interface.amdsmi_wrapper.AMDSMI_STATUS_NOT_INIT, + amdsmi_interface.amdsmi_wrapper.AMDSMI_STATUS_DRIVER_NOT_LOADED): + logging.error("Driver not loaded (hsmp not found in modules)") + sys.exit(-1) + else: + raise e else: - logging.error("Driver not found (amdgpu not found in modules)") - sys.exit(-1) + pass + + logging.debug("AMDSMI initialized successfully") def shut_down_amdsmi(): diff --git a/amdsmi_cli/amdsmi_logger.py b/amdsmi_cli/amdsmi_logger.py index fb2c2dbecf..52286918b8 100644 --- a/amdsmi_cli/amdsmi_logger.py +++ b/amdsmi_cli/amdsmi_logger.py @@ -72,6 +72,8 @@ class AMDSMILogger(): def is_human_readable_format(self): return self.format == self.LoggerFormat.human_readable.value + def clear_multiple_devices_ouput(self): + self.multiple_device_output.clear() def _capitalize_keys(self, input_dict): output_dict = {} @@ -216,6 +218,75 @@ class AMDSMILogger(): self._store_output_amdsmi(gpu_id=gpu_id, argument=argument, data=data) + def store_cpu_output(self, device_handle, argument, data): + """ Convert device handle to cpu id and store output + params: + device_handle - device handle object to the target device output + argument (str) - key to store data + data (dict | list) - Data store against argument + return: + Nothing + """ + cpu_id = self.helpers.get_cpu_id_from_device_handle(device_handle) + self._store_cpu_output_amdsmi(cpu_id=cpu_id, argument=argument, data=data) + + + def store_core_output(self, device_handle, argument, data): + """ Convert device handle to core id and store output + params: + device_handle - device handle object to the target device output + argument (str) - key to store data + data (dict | list) - Data store against argument + return: + Nothing + """ + core_id = self.helpers.get_core_id_from_device_handle(device_handle) + self._store_core_output_amdsmi(core_id=core_id, argument=argument, data=data) + + def _store_core_output_amdsmi(self, core_id, argument, data): + if argument == 'timestamp': # Make sure timestamp is the first element in the output + self.output['timestamp'] = int(time.time()) + + if self.is_json_format() or self.is_human_readable_format(): + self.output['core'] = int(core_id) + if argument == 'values' and isinstance(data, dict): + self.output.update(data) + else: + self.output[argument] = data + elif self.is_csv_format(): + self.output['core'] = int(core_id) + + if argument == 'values' or isinstance(data, dict): + flat_dict = self.flatten_dict(data) + self.output.update(flat_dict) + else: + self.output[argument] = data + else: + raise amdsmi_cli_exceptions(self, "Invalid output format given, only json, csv, and human_readable supported") + + + def _store_cpu_output_amdsmi(self, cpu_id, argument, data): + if argument == 'timestamp': # Make sure timestamp is the first element in the output + self.output['timestamp'] = int(time.time()) + + if self.is_json_format() or self.is_human_readable_format(): + self.output['cpu'] = int(cpu_id) + if argument == 'values' and isinstance(data, dict): + self.output.update(data) + else: + self.output[argument] = data + elif self.is_csv_format(): + self.output['cpu'] = int(cpu_id) + + if argument == 'values' or isinstance(data, dict): + flat_dict = self.flatten_dict(data) + self.output.update(flat_dict) + else: + self.output[argument] = data + else: + raise amdsmi_cli_exceptions(self, "Invalid output format given, only json, csv, and human_readable supported") + + def _store_output_amdsmi(self, gpu_id, argument, data): if argument == 'timestamp': # Make sure timestamp is the first element in the output self.output['timestamp'] = int(time.time()) diff --git a/amdsmi_cli/amdsmi_parser.py b/amdsmi_cli/amdsmi_parser.py index 4828854cd6..3a1496bc15 100644 --- a/amdsmi_cli/amdsmi_parser.py +++ b/amdsmi_cli/amdsmi_parser.py @@ -72,6 +72,8 @@ class AMDSMIParser(argparse.ArgumentParser): # Helper variables self.helpers = AMDSMIHelpers() self.gpu_choices, self.gpu_choices_str = self.helpers.get_gpu_choices() + self.cpu_choices, self.cpu_choices_str = self.helpers.get_cpu_choices() + self.core_choices, self.core_choices_str = self.helpers.get_core_choices() self.vf_choices = ['3', '2', '1'] version_string = f"Version: {__version__}" @@ -233,6 +235,56 @@ class AMDSMIParser(argparse.ArgumentParser): return _GPUSelectAction + def _cpu_select(self, cpu_choices): + """ Custom argparse action to return the device handle(s) for the cpu(s) selected + This will set the destination (args.cpu) to a list of 1 or more device handles + If 1 or more device handles are not found then raise an ArgumentError for the first invalid cpu seen + """ + amdsmi_helpers = self.helpers + class _CPUSelectAction(argparse.Action): + ouputformat=self.helpers.get_output_format() + # Checks the values + def __call__(self, parser, args, values, option_string=None): + if "all" in cpu_choices: + del cpu_choices["all"] + status, selected_device_handles = amdsmi_helpers.get_device_handles_from_cpu_selections(cpu_selections=values, + cpu_choices=cpu_choices) + if status: + setattr(args, self.dest, selected_device_handles) + else: + if selected_device_handles == '': + raise amdsmi_cli_exceptions.AmdSmiMissingParameterValueException("--cpu", _CPUSelectAction.ouputformat) + else: + raise amdsmi_cli_exceptions.AmdSmiDeviceNotFoundException(selected_device_handles, + _CPUSelectAction.ouputformat) + return _CPUSelectAction + + + def _core_select(self, core_choices): + """ Custom argparse action to return the device handle(s) for the core(s) selected + This will set the destination (args.core) to a list of 1 or more device handles + If 1 or more device handles are not found then raise an ArgumentError for the first invalid core seen + """ + amdsmi_helpers = self.helpers + class _CoreSelectAction(argparse.Action): + ouputformat=self.helpers.get_output_format() + # Checks the values + def __call__(self, parser, args, values, option_string=None): + if "all" in core_choices: + del core_choices["all"] + status, selected_device_handles = amdsmi_helpers.get_device_handles_from_core_selections(core_selections=values, + core_choices=core_choices) + if status: + setattr(args, self.dest, selected_device_handles) + else: + if selected_device_handles == '': + raise amdsmi_cli_exceptions.AmdSmiMissingParameterValueException("--core", _CoreSelectAction.ouputformat) + else: + raise amdsmi_cli_exceptions.AmdSmiDeviceNotFoundException(selected_device_handles, + _CoreSelectAction.ouputformat) + return _CoreSelectAction + + def _add_command_modifiers(self, subcommand_parser): json_help = "Displays output in JSON format (human readable by default)." csv_help = "Displays output in CSV format (human readable by default)." @@ -274,11 +326,18 @@ class AMDSMIParser(argparse.ArgumentParser): gpu_help = f"Select a GPU ID, BDF, or UUID from the possible choices:\n{self.gpu_choices_str}" vf_help = "Gets general information about the specified VF (timeslice, fb info, …).\ \nAvailable only on virtualization OSs" + cpu_help = f"Select a CPU ID from the possible choices:\n{self.cpu_choices_str}" + core_help = f"Select a Core ID from the possible choices:\n{self.core_choices_str}" + # Mutually Exclusive Args within the subparser device_args = subcommand_parser.add_mutually_exclusive_group(required=required) device_args.add_argument('-g', '--gpu', action=self._gpu_select(self.gpu_choices), nargs='+', help=gpu_help) + device_args.add_argument('-U', '--cpu', action=self._cpu_select(self.cpu_choices), + nargs='+', help=cpu_help) + device_args.add_argument('-O', '--core', action=self._core_select(self.core_choices), + nargs='+', help=core_help) if self.helpers.is_hypervisor(): device_args.add_argument('-v', '--vf', action='store', nargs='+', @@ -345,11 +404,16 @@ class AMDSMIParser(argparse.ArgumentParser): fb_help = "Displays Frame Buffer information" num_vf_help = "Displays number of supported and enabled VFs" + # Options arguments help text for cpu + smu_help = "All SMU FW information" + interface_help = "Displays hsmp interface version" + # Create static subparser static_parser = subparsers.add_parser('static', help=static_help, description=static_subcommand_help) static_parser._optionals.title = static_optionals_title static_parser.formatter_class=lambda prog: AMDSMISubparserHelpFormatter(prog) static_parser.set_defaults(func=func) + cpu_group = static_parser.add_argument_group("CPU Option") # Add Universal Arguments self._add_command_modifiers(static_parser) @@ -363,7 +427,8 @@ class AMDSMIParser(argparse.ArgumentParser): static_parser.add_argument('-v', '--vram', action='store_true', required=False, help=vram_help) static_parser.add_argument('-c', '--cache', action='store_true', required=False, help=cache_help) static_parser.add_argument('-B', '--board', action='store_true', required=False, help=board_help) - + cpu_group.add_argument('-s', '--smu', action='store_true', required=False, help=smu_help) + cpu_group.add_argument('-i', '--interface_ver', action='store_true', required=False, help=interface_help) # Options to display on Hypervisors and Baremetal if self.helpers.is_hypervisor() or self.helpers.is_baremetal(): static_parser.add_argument('-r', '--ras', action='store_true', required=False, help=ras_help) @@ -475,11 +540,55 @@ class AMDSMIParser(argparse.ArgumentParser): fb_usage_help = "Displays total and used Frame Buffer usage information" xgmi_help = "Table of current XGMI metrics information" + # Help text for cpu options + cpu_power_metrics_help = "Cpu power metrics" + cpu_proc_help = "Displays prochot status" + cpu_freq_help = "Displays currentFclkMemclk frequencies and cclk frequency limit" + cpu_c0_res_help = "Displays C0 residency" + cpu_lclk_dpm_help = "Displays lclk dpm level range. Requires socket ID and nbio id as inputs" + cpu_pwr_svi_telemtry_rails_help = "Displays svi based telemetry for all rails" + cpu_io_bandwidth_help = "Displays current IO bandwidth for the selected CPU.\ + \n input parameters are bandwidth type(1) and link ID encodings\ + \n i.e. P2, P3, G0 - G7" + cpu_xgmi_bandwidth_help = "Displays current XGMI bandwidth for the selected CPU\ + \n input parameters are bandwidth type(1,2,4) and link ID encodings\ + \n i.e. P2, P3, G0 - G7" + cpu_enable_apb_help = "Enables the DF p-state performance boost algorithm" + cpu_disable_apb_help = "Disables the DF p-state performance boost alogorithm." + "Input parameter is DFPstate (0 -3 )" + set_cpu_pow_limit_help = "Set power limit for the given socket. Input parameter is \ +power limit value." + set_cpu_xgmi_link_width_help = "Set max and Min linkwidth. Input parameters are \ +min and max link width values" + set_cpu_lclk_dpm_level_help = "Sets the max and min dpm level on a given NBIO. Inpur parameters are \ +die_index, min dpm, max dpm." + core_boost_limit_help = "Get booslimit for the selected cores" + core_curr_active_freq_core_limit_help = "Get Current CCLK limit set per Core" + set_soc_boost_limit_help = "Sets the boost limit for the given socket. Input parameter is \ +socket limit value" + set_core_boost_limit_help = "Sets the boost limit for the given core. Input parameter is \ +core limit value" + cpu_metrics_ver_help = "Displays metrics table version" + cpu_metrics_table_help = "Displays metric table" + core_energy_help = "Displays core energy for the selected core" + socket_energy_help = "Displays socket energy for the selected socket" + set_cpu_pwr_eff_mode_help = "Sets the power efficency mode policy. Input parameter is mode." + cpu_ddr_bandwidth_help = "Displays per socket max ddr bw, current utilized bw and current utilized ddr bw in percentage" + cpu_temp_help = "Displays cpu socket temperature" + cpu_dimm_temp_range_rate_help = "Displays dimm temperature range and refresh rate" + cpu_dimm_pow_conumption_help = "Displays dimm power conumption" + cpu_dimm_thermal_sensor_help = "Displays dimm thermal sensor" + set_cpu_gmi3_link_width_help = "Sets max and min gmi3 link width range" + set_cpu_pcie_lnk_rate_help = "Sets pcie link rate" + set_cpu_df_pstate_range_help = "Sets max and min df-pstates" + # Create metric subparser metric_parser = subparsers.add_parser('metric', help=metric_help, description=metric_subcommand_help) metric_parser._optionals.title = metric_optionals_title metric_parser.formatter_class=lambda prog: AMDSMISubparserHelpFormatter(prog) metric_parser.set_defaults(func=func) + cpu_group = metric_parser.add_argument_group("CPU Option") + set_group = metric_parser.add_argument_group("Set Options") # Add Universal Arguments self._add_command_modifiers(metric_parser) @@ -519,6 +628,36 @@ class AMDSMIParser(argparse.ArgumentParser): metric_parser.add_argument('-f', '--fb_usage', action='store_true', required=False, help=fb_usage_help) metric_parser.add_argument('-m', '--xgmi', action='store_true', required=False, help=xgmi_help) + cpu_group.add_argument('--cpu_power_metrics', action='store_true', required=False, help=cpu_power_metrics_help) + cpu_group.add_argument('--cpu_prochot', action='store_true', required=False, help=cpu_proc_help) + cpu_group.add_argument('--cpu_freq_metrics', action='store_true', required=False, help=cpu_freq_help) + cpu_group.add_argument('--cpu_c0_res', action='store_true', required=False, help=cpu_c0_res_help) + cpu_group.add_argument('--cpu_lclk_dpm_level', action='append', required=False, type=int, nargs=1, metavar=("NBIOID"), help=cpu_lclk_dpm_help) + cpu_group.add_argument('--cpu_pwr_svi_telemtry_rails', action='store_true', required=False, help=cpu_pwr_svi_telemtry_rails_help) + cpu_group.add_argument('--cpu_io_bandwidth', action='append', required=False, nargs=2, metavar=("IO_BW","LINKID_NAME"), help=cpu_io_bandwidth_help) + cpu_group.add_argument('--cpu_xgmi_bandwidth', action='append', required=False, nargs=2, metavar=("XGMI_BW","LINKID_NAME"), help=cpu_xgmi_bandwidth_help) + cpu_group.add_argument('--cpu_enable_apb', action='store_true', required=False, help=cpu_enable_apb_help) + cpu_group.add_argument('--cpu_disable_apb', action='append', required=False, type=int, nargs=1, metavar=("DF_PSTATE"), help=cpu_disable_apb_help) + set_group.add_argument('--set_cpu_pow_limit', action='append', required=False, type=int, nargs=1, metavar=("POW_LIMIT"),help=set_cpu_pow_limit_help) + set_group.add_argument('--set_cpu_xgmi_link_width', action='append', required=False, type=int, nargs=2, metavar=("MIN_WIDTH", "MAX_WIDTH"), help=set_cpu_xgmi_link_width_help) + set_group.add_argument('--set_cpu_lclk_dpm_level', action='append', required=False, type=int, nargs=3, metavar=("NBIOID", "MIN_DPM", "MAX_DPM"),help=set_cpu_lclk_dpm_level_help) + cpu_group.add_argument('--core_boost_limit', action='store_true', required=False, help=core_boost_limit_help) + cpu_group.add_argument('--core_curr_active_freq_core_limit', action='store_true', required=False, help=core_curr_active_freq_core_limit_help) + set_group.add_argument('--set_soc_boost_limit', action='append', required=False, type=int, nargs=1, metavar=("BOOST_LIMIT"), help=set_soc_boost_limit_help) + set_group.add_argument('--set_core_boost_limit', action='append', required=False, type=int, nargs=1, metavar=("BOOST_LIMIT"), help=set_core_boost_limit_help) + cpu_group.add_argument('--cpu_metrics_ver', action='store_true', required=False, help=cpu_metrics_ver_help) + cpu_group.add_argument('--cpu_metrics_table', action='store_true', required=False, help=cpu_metrics_table_help) + cpu_group.add_argument('--core_energy', action='store_true', required=False, help=core_energy_help) + cpu_group.add_argument('--socket_energy', action='store_true', required=False, help=socket_energy_help) + set_group.add_argument('--set_cpu_pwr_eff_mode', action='append', required=False, type=int, nargs=1, metavar=("MODE"), help=set_cpu_pwr_eff_mode_help) + cpu_group.add_argument('--cpu_ddr_bandwidth', action='store_true', required=False, help=cpu_ddr_bandwidth_help) + cpu_group.add_argument('--cpu_temp', action='store_true', required=False, help=cpu_temp_help) + cpu_group.add_argument('--cpu_dimm_temp_range_rate', action='append', required=False, type=int, nargs=1, metavar=("DIMM_ADDR"), help=cpu_dimm_temp_range_rate_help) + cpu_group.add_argument('--cpu_dimm_pow_conumption', action='append', required=False, type=int, nargs=1, metavar=("DIMM_ADDR"), help=cpu_dimm_pow_conumption_help) + cpu_group.add_argument('--cpu_dimm_thermal_sensor', action='append', required=False, type=int, nargs=1, metavar=("DIMM_ADDR"), help=cpu_dimm_thermal_sensor_help) + set_group.add_argument('--set_cpu_gmi3_link_width', action='append', required=False, type=int, nargs=2, metavar=("MIN_LW", "MAX_LW"), help=set_cpu_gmi3_link_width_help) + set_group.add_argument('--set_cpu_pcie_lnk_rate', action='append', required=False, type=int, nargs=1, metavar=("LINK_RATE"), help=set_cpu_pcie_lnk_rate_help) + set_group.add_argument('--set_cpu_df_pstate_range', action='append', required=False, type=int, nargs=2, metavar=("MAX_PSTATE", "MIN_PSTATE"), help=set_cpu_df_pstate_range_help) def _add_process_parser(self, subparsers, func): if self.helpers.is_hypervisor(): From 5ff5af0b5a24927b1761ae954ec0b466188c1f39 Mon Sep 17 00:00:00 2001 From: Charis Poag Date: Tue, 19 Dec 2023 02:49:52 -0600 Subject: [PATCH 5/5] Fix GPU metric tests & cleanup test output - CLI: Added average_power to display if current_power is empty - CLI: fixed PCIe current_speed not displaying GT/s - ROCm API: 1.3 & 1.4 -> commented out setting avg clocks to current clock value (leave as max uint value, not re-assign; these are not same values) -> commented out setting current_socket_power = average_power (leave as max uint value, not re-assign; these are not same values) -> For all non-array clocks, placed value in first array[0] to keep outputs consistent (helps xcd calc) - ROCm API: rsmi_dev_metrics_curr_gfxclk_get fixed to count XCDs using backwards compatible rsmi_dev_gpu_metrics_info_get. - ^ Fixes XCD count overall + assigning clock[0] in 1.3 to curr freq - AMD SMI API: amdsmi_get_gpu_metrics_info() initialized all new 1.5 metric values for all lower metric tables - AMD SMI API: wrapper -> fix is here + returns correct AMD SMI return - AMD SMI API: wrapper -> now displays amdsmi return status as string in logs - gpu_metrics_read.cc -> now has better overview of backwards compatible output - gpu_metrics_read.cc -> Cleaned up output, added units, and display all array output Signed-off-by: Charis Poag Change-Id: Id5b60ded5b0ed2cdf0f96ca72c79e356f0410960 --- amdsmi_cli/amdsmi_commands.py | 6 +- include/amd_smi/amdsmi.h | 6 +- rocm_smi/src/rocm_smi.cc | 21 +- rocm_smi/src/rocm_smi_gpu_metrics.cc | 70 ++- src/amd_smi/amd_smi.cc | 22 +- .../functional/gpu_metrics_read.cc | 588 +++++++++++++++--- 6 files changed, 600 insertions(+), 113 deletions(-) diff --git a/amdsmi_cli/amdsmi_commands.py b/amdsmi_cli/amdsmi_commands.py index a38adcfde4..b4f6bea6d2 100644 --- a/amdsmi_cli/amdsmi_commands.py +++ b/amdsmi_cli/amdsmi_commands.py @@ -1173,7 +1173,7 @@ class AMDSMICommands(): power_dict['current_power'] = power_info['current_socket_power'] if power_dict['current_power'] == "N/A": - power_dict['current_power'] = power_info['average_socket_power'] + power_dict['average_power'] = power_info['average_socket_power'] power_dict['current_gfx_voltage'] = power_info['gfx_voltage'] power_dict['current_soc_voltage'] = power_info['soc_voltage'] @@ -1365,7 +1365,9 @@ class AMDSMICommands(): if self.logger.is_human_readable_format(): unit = 'GT/s' - pcie_link_status['current_speed'] = f"{pcie_link_status['pcie_speed']} {unit}" + pcie_dict['current_lanes'] = f"{pcie_link_status['pcie_lanes']} lanes" + pcie_dict['current_speed'] = f"{pcie_dict['current_speed']} GT/s" + except amdsmi_exception.AmdSmiLibraryException as e: logging.debug("Failed to get pcie link status for gpu %s | %s", gpu_id, e.get_error_info()) diff --git a/include/amd_smi/amdsmi.h b/include/amd_smi/amdsmi.h index 6946663574..aaf7eabc5f 100644 --- a/include/amd_smi/amdsmi.h +++ b/include/amd_smi/amdsmi.h @@ -1332,6 +1332,9 @@ typedef struct { /* * v1.5 additions */ + // JPEG activity % per AID + uint16_t jpeg_activity[AMDSMI_MAX_NUM_JPEG]; + // Memory Bandwidth Usage Accumulated (GB/sec) uint64_t mem_bandwidth_acc; @@ -1343,9 +1346,6 @@ typedef struct { // PCIE NAK received accumulated count uint32_t pcie_nak_rcvd_count_acc; - - // JPEG activity % per AID - uint16_t jpeg_activity[AMDSMI_MAX_NUM_JPEG]; /// \endcond } amdsmi_gpu_metrics_t; diff --git a/rocm_smi/src/rocm_smi.cc b/rocm_smi/src/rocm_smi.cc index 988708675d..88fda5dd74 100755 --- a/rocm_smi/src/rocm_smi.cc +++ b/rocm_smi/src/rocm_smi.cc @@ -6800,23 +6800,26 @@ rsmi_dev_metrics_curr_gfxclk_get(uint32_t dv_ind, GPUMetricCurrGfxClk_t* current } const auto gpu_metric_unit(AMDGpuMetricsUnitType_t::kMetricCurrGfxClock); - amd::smi::GPUMetricCurrGfxClkTbl_t tmp_curr_gfxclk_tbl{}; - auto status_code = rsmi_dev_gpu_metrics_info_query(dv_ind, gpu_metric_unit, tmp_curr_gfxclk_tbl); - if (status_code == rsmi_status_t::RSMI_STATUS_SUCCESS) { - const auto max_num_elems = - static_cast(std::end(*current_gfxclk_value) - std::begin(*current_gfxclk_value)); - std::copy_n(std::begin(tmp_curr_gfxclk_tbl), max_num_elems, *current_gfxclk_value); + rsmi_gpu_metrics_t gpu = {}; + auto status = rsmi_dev_gpu_metrics_info_get(dv_ind, &gpu); + if (status == rsmi_status_t::RSMI_STATUS_SUCCESS) { + std::copy_n(std::begin(gpu.current_gfxclks), + static_cast( + sizeof(gpu.current_gfxclks)/sizeof(gpu.current_gfxclks[0])), + *current_gfxclk_value); } ostrstream << __PRETTY_FUNCTION__ << " | ======= end ======= " << " | End Result " << " | Device #: " << dv_ind << " | Metric Type: " << static_cast(gpu_metric_unit) - << " | Metric Size: " << tmp_curr_gfxclk_tbl.size() - << " | Returning = " << status_code << " " << getRSMIStatusString(status_code) << " |"; + << " | Metric Size: " << static_cast( + sizeof(gpu.current_gfxclks)/sizeof(gpu.current_gfxclks[0])) + << " | Returning = " << status << " " + << getRSMIStatusString(status) << " |"; LOG_INFO(ostrstream); - return status_code; + return status; CATCH } diff --git a/rocm_smi/src/rocm_smi_gpu_metrics.cc b/rocm_smi/src/rocm_smi_gpu_metrics.cc index 11d2871ca9..2887d3021f 100755 --- a/rocm_smi/src/rocm_smi_gpu_metrics.cc +++ b/rocm_smi/src/rocm_smi_gpu_metrics.cc @@ -836,29 +836,35 @@ rsmi_status_t init_max_public_gpu_matrics(AMGpuMetricsPublicLatest_t& rsmi_gpu_m rsmi_gpu_metrics.pcie_replay_count_acc = init_max_uint_types(); rsmi_gpu_metrics.pcie_replay_rover_count_acc = init_max_uint_types(); - std::fill(std::begin(rsmi_gpu_metrics.xgmi_read_data_acc), - std::end(rsmi_gpu_metrics.xgmi_read_data_acc), - init_max_uint_types()); + std::fill_n(&rsmi_gpu_metrics.xgmi_read_data_acc[0], + (sizeof(rsmi_gpu_metrics.xgmi_read_data_acc) / + sizeof(rsmi_gpu_metrics.xgmi_read_data_acc[0])), + std::numeric_limits::max()); - std::fill(std::begin(rsmi_gpu_metrics.xgmi_write_data_acc), - std::end(rsmi_gpu_metrics.xgmi_write_data_acc), - init_max_uint_types()); + std::fill_n(&rsmi_gpu_metrics.xgmi_write_data_acc[0], + (sizeof(rsmi_gpu_metrics.xgmi_write_data_acc) / + sizeof(rsmi_gpu_metrics.xgmi_write_data_acc[0])), + std::numeric_limits::max()); - std::fill(std::begin(rsmi_gpu_metrics.current_gfxclks), - std::end(rsmi_gpu_metrics.current_gfxclks), - init_max_uint_types()); + std::fill_n(&rsmi_gpu_metrics.current_gfxclks[0], + (sizeof(rsmi_gpu_metrics.current_gfxclks) / + sizeof(rsmi_gpu_metrics.current_gfxclks[0])), + std::numeric_limits::max()); - std::fill(std::begin(rsmi_gpu_metrics.current_socclks), - std::end(rsmi_gpu_metrics.current_socclks), - init_max_uint_types()); + std::fill_n(&rsmi_gpu_metrics.current_socclks[0], + (sizeof(rsmi_gpu_metrics.current_socclks) / + sizeof(rsmi_gpu_metrics.current_socclks[0])), + std::numeric_limits::max()); - std::fill(std::begin(rsmi_gpu_metrics.current_vclk0s), - std::end(rsmi_gpu_metrics.current_vclk0s), - init_max_uint_types()); + std::fill_n(&rsmi_gpu_metrics.current_vclk0s[0], + (sizeof(rsmi_gpu_metrics.current_vclk0s) / + sizeof(rsmi_gpu_metrics.current_vclk0s[0])), + std::numeric_limits::max()); - std::fill(std::begin(rsmi_gpu_metrics.current_dclk0s), - std::end(rsmi_gpu_metrics.current_dclk0s), - init_max_uint_types()); + std::fill_n(&rsmi_gpu_metrics.current_dclk0s[0], + (sizeof(rsmi_gpu_metrics.current_dclk0s) / + sizeof(rsmi_gpu_metrics.current_dclk0s[0])), + std::numeric_limits::max()); ostrstream << __PRETTY_FUNCTION__ << " | ======= end ======= " @@ -1016,22 +1022,22 @@ AMGpuMetricsPublicLatestTupl_t GpuMetricsBase_v14_t::copy_internal_to_external_m // Note: Backwards compatibility -> Handling extra/exception cases // related to earlier versions (1.3) metrics_public_init.current_gfxclk = metrics_public_init.current_gfxclks[0]; - metrics_public_init.average_gfxclk_frequency = metrics_public_init.current_gfxclks[0]; + // metrics_public_init.average_gfxclk_frequency = metrics_public_init.current_gfxclks[0]; metrics_public_init.current_socclk = metrics_public_init.current_socclks[0]; - metrics_public_init.average_socclk_frequency = metrics_public_init.current_socclks[0]; + // metrics_public_init.average_socclk_frequency = metrics_public_init.current_socclks[0]; metrics_public_init.current_vclk0 = metrics_public_init.current_vclk0s[0]; - metrics_public_init.average_vclk0_frequency = metrics_public_init.current_vclk0s[0]; + // metrics_public_init.average_vclk0_frequency = metrics_public_init.current_vclk0s[0]; metrics_public_init.current_vclk1 = metrics_public_init.current_vclk0s[1]; - metrics_public_init.average_vclk1_frequency = metrics_public_init.current_vclk0s[1]; + // metrics_public_init.average_vclk1_frequency = metrics_public_init.current_vclk0s[1]; metrics_public_init.current_dclk0 = metrics_public_init.current_dclk0s[0]; - metrics_public_init.average_dclk0_frequency = metrics_public_init.current_dclk0s[0]; + // metrics_public_init.average_dclk0_frequency = metrics_public_init.current_dclk0s[0]; metrics_public_init.current_dclk1 = metrics_public_init.current_dclk0s[1]; - metrics_public_init.average_dclk1_frequency = metrics_public_init.current_dclk0s[1]; + // metrics_public_init.average_dclk1_frequency = metrics_public_init.current_dclk0s[1]; return metrics_public_init; }(); @@ -1407,7 +1413,7 @@ AMGpuMetricsPublicLatestTupl_t GpuMetricsBase_v13_t::copy_internal_to_external_m metrics_public_init.average_mm_activity = m_gpu_metrics_tbl.m_average_mm_activity; // Power/Energy - metrics_public_init.average_socket_power = m_gpu_metrics_tbl.m_average_socket_power; // 1.3 and 1.4 have the same value + // metrics_public_init.average_socket_power = m_gpu_metrics_tbl.m_average_socket_power; // 1.3 and 1.4 have the same value metrics_public_init.energy_accumulator = m_gpu_metrics_tbl.m_energy_accumulator; // Driver attached timestamp (in ns) @@ -1424,9 +1430,13 @@ AMGpuMetricsPublicLatestTupl_t GpuMetricsBase_v13_t::copy_internal_to_external_m // Current clocks metrics_public_init.current_gfxclk = m_gpu_metrics_tbl.m_current_gfxclk; + metrics_public_init.current_gfxclks[0] = m_gpu_metrics_tbl.m_current_gfxclk; metrics_public_init.current_socclk = m_gpu_metrics_tbl.m_current_socclk; + metrics_public_init.current_socclks[0] = m_gpu_metrics_tbl.m_current_socclk; metrics_public_init.current_vclk0 = m_gpu_metrics_tbl.m_current_vclk0; + metrics_public_init.current_vclk0s[0] = m_gpu_metrics_tbl.m_current_vclk0; metrics_public_init.current_dclk0 = m_gpu_metrics_tbl.m_current_dclk0; + metrics_public_init.current_dclk0s[0] = m_gpu_metrics_tbl.m_current_dclk0; metrics_public_init.current_uclk = m_gpu_metrics_tbl.m_current_uclk; metrics_public_init.current_vclk1 = m_gpu_metrics_tbl.m_current_vclk1; metrics_public_init.current_dclk1 = m_gpu_metrics_tbl.m_current_dclk1; @@ -1467,7 +1477,7 @@ AMGpuMetricsPublicLatestTupl_t GpuMetricsBase_v13_t::copy_internal_to_external_m // // Note: Backwards compatibility -> Handling extra/exception cases // related to earlier versions (1.2) - metrics_public_init.current_socket_power = metrics_public_init.average_socket_power; + // metrics_public_init.current_socket_power = metrics_public_init.average_socket_power; return metrics_public_init; }(); @@ -2798,6 +2808,14 @@ rsmi_dev_gpu_metrics_info_get(uint32_t dv_ind, rsmi_gpu_metrics_t* smu) { assert(smu != nullptr); if (smu == nullptr) { status_code = rsmi_status_t::RSMI_STATUS_INVALID_ARGS; + ostrstream << __PRETTY_FUNCTION__ + << " | ======= end ======= " + << " | Fail " + << " | Device #: " << dv_ind + << " | Returning = " + << getRSMIStatusString(status_code) + << " |"; + LOG_ERROR(ostrstream); return status_code; } diff --git a/src/amd_smi/amd_smi.cc b/src/amd_smi/amd_smi.cc index 30faf129ec..ae4b5af69b 100644 --- a/src/amd_smi/amd_smi.cc +++ b/src/amd_smi/amd_smi.cc @@ -116,7 +116,13 @@ amdsmi_status_t rsmi_wrapper(F && f, uint32_t gpu_index = gpu_device->get_gpu_id(); auto rstatus = std::forward(f)(gpu_index, std::forward(args)...); - return amd::smi::rsmi_to_amdsmi_status(rstatus); + r = amd::smi::rsmi_to_amdsmi_status(rstatus); + std::ostringstream ss; + const char *status_string; + amdsmi_status_code_to_string(r, &status_string); + ss << __PRETTY_FUNCTION__ << " | returning status = " << status_string; + LOG_INFO(ss); + return r; } amdsmi_status_t @@ -1098,7 +1104,21 @@ amdsmi_status_t amdsmi_get_gpu_metrics_info( (sizeof(pgpu_metrics->jpeg_activity) / sizeof(pgpu_metrics->jpeg_activity[0])), std::numeric_limits::max()); + pgpu_metrics->mem_bandwidth_acc = + static_cast(std::numeric_limits::max()); + pgpu_metrics->mem_max_bandwidth = + static_cast(std::numeric_limits::max()); + pgpu_metrics->pcie_nak_sent_count_acc = + static_cast(std::numeric_limits::max()); + pgpu_metrics->pcie_nak_rcvd_count_acc = + static_cast(std::numeric_limits::max()); } + std::ostringstream ss; + const char *status_string; + amdsmi_status_code_to_string(ret, &status_string); + ss << __PRETTY_FUNCTION__ + << " | END, returning status = " << status_string; + LOG_TRACE(ss); // END: REMOVE WHATS ABOVE ME return ret; } diff --git a/tests/amd_smi_test/functional/gpu_metrics_read.cc b/tests/amd_smi_test/functional/gpu_metrics_read.cc index 571bb30585..33af655534 100644 --- a/tests/amd_smi_test/functional/gpu_metrics_read.cc +++ b/tests/amd_smi_test/functional/gpu_metrics_read.cc @@ -98,12 +98,17 @@ void TestGpuMetricsRead::Run(void) { for (uint32_t i = 0; i < num_monitor_devs(); ++i) { PrintDeviceHeader(processor_handles_[i]); + std::cout << "Device #" << std::to_string(i) << "\n"; IF_VERB(STANDARD) { std::cout << "\t**GPU METRICS: Using static struct (Backwards Compatibility):\n"; } amdsmi_gpu_metrics_t smu; err = amdsmi_get_gpu_metrics_info(processor_handles_[i], &smu); + const char *status_string; + amdsmi_status_code_to_string(err, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_info(): " << status_string + << "\n"; if (err != AMDSMI_STATUS_SUCCESS) { if (err == AMDSMI_STATUS_NOT_SUPPORTED) { IF_VERB(STANDARD) { @@ -115,8 +120,21 @@ void TestGpuMetricsRead::Run(void) { } else { CHK_ERR_ASRT(err); IF_VERB(STANDARD) { + std::cout << "METRIC TABLE HEADER:\n"; + std::cout << "structure_size=" << std::dec + << static_cast(smu.common_header.structure_size) << '\n'; + std::cout << "format_revision=" << std::dec + << static_cast(smu.common_header.format_revision) << '\n'; + std::cout << "content_revision=" << std::dec + << static_cast(smu.common_header.content_revision) << '\n'; + std::cout << "\n"; + std::cout << "TIME STAMPS (ns):\n"; std::cout << std::dec << "system_clock_counter=" << smu.system_clock_counter << '\n'; + std::cout << "firmware_timestamp (10ns resolution)=" << std::dec + << smu.firmware_timestamp << '\n'; + std::cout << "\n"; + std::cout << "TEMPERATURES (C):\n"; std::cout << std::dec << "temperature_edge=" << smu.temperature_edge << '\n'; std::cout << std::dec << "temperature_hotspot=" @@ -129,16 +147,39 @@ void TestGpuMetricsRead::Run(void) { << smu.temperature_vrsoc << '\n'; std::cout << std::dec << "temperature_vrmem=" << smu.temperature_vrmem << '\n'; + for (int i = 0; i < AMDSMI_NUM_HBM_INSTANCES; ++i) { + std::cout << "temperature_hbm[" << i << "]=" << std::dec << + smu.temperature_hbm[i] << '\n'; + } + std::cout << "\n"; + std::cout << "UTILIZATION (%):\n"; std::cout << std::dec << "average_gfx_activity=" << smu.average_gfx_activity << '\n'; std::cout << std::dec << "average_umc_activity=" << smu.average_umc_activity << '\n'; std::cout << std::dec << "average_mm_activity=" << smu.average_mm_activity << '\n'; + std::cout << std::dec << "jpeg_activity= ["; + uint16_t size = static_cast( + sizeof(smu.jpeg_activity)/sizeof(smu.jpeg_activity[0])); + for (uint16_t i= 0; i < size; i++) { + if (i+1 < size) { + std::cout << std::dec << smu.jpeg_activity[i] << ", "; + } else { + std::cout << std::dec << smu.jpeg_activity[i]; + } + } + std::cout << std::dec << "]\n"; + std::cout << "\n"; + std::cout << "POWER (W)/ENERGY (15.259uJ per 1ns):\n"; std::cout << std::dec << "average_socket_power=" << smu.average_socket_power << '\n'; + std::cout << std::dec << "current_socket_power=" + << smu.current_socket_power << '\n'; std::cout << std::dec << "energy_accumulator=" << smu.energy_accumulator << '\n'; + std::cout << "\n"; + std::cout << "AVG CLOCKS (MHz):\n"; std::cout << std::dec << "average_gfxclk_frequency=" << smu.average_gfxclk_frequency << '\n'; std::cout << std::dec << "average_gfxclk_frequency=" @@ -153,417 +194,820 @@ void TestGpuMetricsRead::Run(void) { << smu.average_vclk1_frequency << '\n'; std::cout << std::dec << "average_dclk1_frequency=" << smu.average_dclk1_frequency << '\n'; + std::cout << "\n"; + std::cout << "CURRENT CLOCKS (MHz):\n"; std::cout << std::dec << "current_gfxclk=" << smu.current_gfxclk << '\n'; + std::cout << std::dec << "current_gfxclks= ["; + size = static_cast( + sizeof(smu.current_gfxclks)/sizeof(smu.current_gfxclks[0])); + for (uint16_t i= 0; i < size; i++) { + if (i+1 < size) { + std::cout << std::dec << smu.current_gfxclks[i] << ", "; + } else { + std::cout << std::dec << smu.current_gfxclks[i]; + } + } + std::cout << std::dec << "]\n"; std::cout << std::dec << "current_socclk=" << smu.current_socclk << '\n'; + std::cout << std::dec << "current_socclks= ["; + size = static_cast( + sizeof(smu.current_socclks)/sizeof(smu.current_socclks[0])); + for (uint16_t i= 0; i < size; i++) { + if (i+1 < size) { + std::cout << std::dec << smu.current_socclks[i] << ", "; + } else { + std::cout << std::dec << smu.current_socclks[i]; + } + } + std::cout << std::dec << "]\n"; std::cout << std::dec << "current_uclk=" << smu.current_uclk << '\n'; std::cout << std::dec << "current_vclk0=" << smu.current_vclk0 << '\n'; + std::cout << std::dec << "current_vclk0s= ["; + size = static_cast( + sizeof(smu.current_vclk0s)/sizeof(smu.current_vclk0s[0])); + for (uint16_t i= 0; i < size; i++) { + if (i+1 < size) { + std::cout << std::dec << smu.current_vclk0s[i] << ", "; + } else { + std::cout << std::dec << smu.current_vclk0s[i]; + } + } + std::cout << std::dec << "]\n"; std::cout << std::dec << "current_dclk0=" << smu.current_dclk0 << '\n'; + std::cout << std::dec << "current_dclk0s= ["; + size = static_cast( + sizeof(smu.current_dclk0s)/sizeof(smu.current_dclk0s[0])); + for (uint16_t i= 0; i < size; i++) { + if (i+1 < size) { + std::cout << std::dec << smu.current_dclk0s[i] << ", "; + } else { + std::cout << std::dec << smu.current_dclk0s[i]; + } + } + std::cout << std::dec << "]\n"; std::cout << std::dec << "current_vclk1=" << smu.current_vclk1 << '\n'; std::cout << std::dec << "current_dclk1=" << smu.current_dclk1 << '\n'; + std::cout << "\n"; + std::cout << "TROTTLE STATUS:\n"; std::cout << std::dec << "throttle_status=" << smu.throttle_status << '\n'; + std::cout << "\n"; + std::cout << "FAN SPEED:\n"; std::cout << std::dec << "current_fan_speed=" << smu.current_fan_speed << '\n'; + std::cout << "\n"; + std::cout << "LINK WIDTH (number of lanes) /SPEED (0.1 GT/s):\n"; std::cout << "pcie_link_width=" << std::to_string(smu.pcie_link_width) << '\n'; - std::cout << "pcie_link_width=" + std::cout << "pcie_link_speed=" << std::to_string(smu.pcie_link_speed) << '\n'; + std::cout << "xgmi_link_width=" + << std::to_string(smu.xgmi_link_width) << '\n'; + std::cout << "xgmi_link_speed=" + << std::to_string(smu.xgmi_link_speed) << '\n'; + + std::cout << "\n"; + std::cout << "Utilization Accumulated(%):\n"; std::cout << "gfx_activity_acc=" << std::dec << smu.gfx_activity_acc << '\n'; std::cout << "mem_activity_acc=" << std::dec << smu.mem_activity_acc << '\n'; - for (int i = 0; i < AMDSMI_NUM_HBM_INSTANCES; ++i) { - std::cout << "temperature_hbm[" << i << "]=" << std::dec << - smu.temperature_hbm[i] << '\n'; + std::cout << "\n"; + std::cout << "XGMI ACCUMULATED DATA TRANSFER SIZE (KB):\n"; + std::cout << std::dec << "xgmi_read_data_acc= ["; + size = static_cast( + sizeof(smu.xgmi_read_data_acc)/sizeof(smu.xgmi_read_data_acc[0])); + for (uint16_t i= 0; i < size; i++) { + if (i+1 < size) { + std::cout << std::dec << smu.xgmi_read_data_acc[i] << ", "; + } else { + std::cout << std::dec << smu.xgmi_read_data_acc[i]; + } } + std::cout << std::dec << "]\n"; + std::cout << std::dec << "xgmi_write_data_acc= ["; + size = static_cast( + sizeof(smu.xgmi_write_data_acc)/sizeof(smu.xgmi_write_data_acc[0])); + for (uint16_t i= 0; i < size; i++) { + if (i+1 < size) { + std::cout << std::dec << smu.xgmi_write_data_acc[i] << ", "; + } else { + std::cout << std::dec << smu.xgmi_write_data_acc[i]; + } + } + std::cout << std::dec << "]\n"; + std::cout << "mem_bandwidth_acc=" << std::dec + << smu.mem_bandwidth_acc << "\n"; + std::cout << "mem_max_bandwidth=" << std::dec + << smu.mem_max_bandwidth << "\n"; + std::cout << "pcie_nak_sent_count_acc=" << std::dec + << smu.pcie_nak_sent_count_acc << "\n"; + std::cout << "pcie_nak_rcvd_count_acc=" << std::dec + << smu.pcie_nak_rcvd_count_acc << "\n"; } } // Verify api support checking functionality is working err = amdsmi_get_gpu_metrics_info(processor_handles_[i], nullptr); + DISPLAY_AMDSMI_ERR(err); ASSERT_EQ(err, AMDSMI_STATUS_INVAL); } - // + auto val_ui16 = uint16_t(0); auto val_ui32 = uint32_t(0); auto val_ui64 = uint64_t(0); auto status_code(amdsmi_status_t::AMDSMI_STATUS_SUCCESS); for (uint32_t i = 0; i < num_monitor_devs(); ++i) { PrintDeviceHeader(processor_handles_[i]); + std::cout << "Device #" << std::to_string(i) << "\n"; auto temp_edge_value = val_ui16; status_code = amdsmi_get_gpu_metrics_temp_edge(processor_handles_[i], &temp_edge_value); if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_temp_edge(): " << status_string << "\n"; } auto temp_hotspot_value = val_ui16; status_code = amdsmi_get_gpu_metrics_temp_hotspot(processor_handles_[i], &temp_hotspot_value); - CHK_ERR_ASRT(status_code); + if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { + CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_temp_hotspot(): " << status_string << "\n"; + } auto temp_mem_value = val_ui16; status_code = amdsmi_get_gpu_metrics_temp_mem(processor_handles_[i], &temp_mem_value); - CHK_ERR_ASRT(status_code); + if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { + CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_temp_mem(): " << status_string << "\n"; + } auto temp_vrgfx_value = val_ui16; status_code = amdsmi_get_gpu_metrics_temp_vrgfx(processor_handles_[i], &temp_vrgfx_value); if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_temp_vrgfx(): " << status_string << "\n"; } auto temp_vrsoc_value = val_ui16; status_code = amdsmi_get_gpu_metrics_temp_vrsoc(processor_handles_[i], &temp_vrsoc_value); - CHK_ERR_ASRT(status_code); + if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { + CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_temp_vrsoc(): " << status_string << "\n"; + } auto temp_vrmem_value = val_ui16; status_code = amdsmi_get_gpu_metrics_temp_vrmem(processor_handles_[i], &temp_vrmem_value); if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_temp_vrmem(): " << status_string << "\n"; } gpu_metric_temp_hbm_t temp_hbm_values; status_code = amdsmi_get_gpu_metrics_temp_hbm(processor_handles_[i], &temp_hbm_values); - CHK_ERR_ASRT(status_code); + if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { + CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_temp_hbm(): " << status_string << "\n"; + } auto temp_curr_socket_power_value = val_ui16; status_code = amdsmi_get_gpu_metrics_curr_socket_power(processor_handles_[i], &temp_curr_socket_power_value); if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_curr_socket_power(): " << status_string << "\n"; } auto temp_energy_accum_value = val_ui64; status_code = amdsmi_get_gpu_metrics_energy_acc(processor_handles_[i], &temp_energy_accum_value); - CHK_ERR_ASRT(status_code); + if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { + CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_energy_acc(): " << status_string << "\n"; + } auto temp_avg_socket_power_value = val_ui16; status_code = amdsmi_get_gpu_metrics_avg_socket_power(processor_handles_[i], &temp_avg_socket_power_value); if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_temp_edge(): " << status_string << "\n"; } auto temp_avg_gfx_activity_value = val_ui16; status_code = amdsmi_get_gpu_metrics_avg_gfx_activity(processor_handles_[i], &temp_avg_gfx_activity_value); - CHK_ERR_ASRT(status_code); + if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { + CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_avg_gfx_activity(): " << status_string << "\n"; + } auto temp_avg_umc_activity_value = val_ui16; status_code = amdsmi_get_gpu_metrics_avg_umc_activity(processor_handles_[i], &temp_avg_umc_activity_value); - CHK_ERR_ASRT(status_code); + if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { + CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_avg_umc_activity(): " << status_string << "\n"; + } auto temp_avg_mm_activity_value = val_ui16; status_code = amdsmi_get_gpu_metrics_avg_mm_activity(processor_handles_[i], &temp_avg_mm_activity_value); if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_avg_mm_activity(): " << status_string << "\n"; } gpu_metric_vcn_activity_t temp_vcn_values; status_code = amdsmi_get_gpu_metrics_vcn_activity(processor_handles_[i], &temp_vcn_values); if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_vcn_activity(): " << status_string << "\n"; } auto temp_mem_activity_accum_value = val_ui32; status_code = amdsmi_get_gpu_metrics_mem_activity_acc(processor_handles_[i], &temp_mem_activity_accum_value); - CHK_ERR_ASRT(status_code); + if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { + CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_mem_activity_acc(): " << status_string << "\n"; + } auto temp_gfx_activity_accum_value = val_ui32; status_code = amdsmi_get_gpu_metrics_gfx_activity_acc(processor_handles_[i], &temp_gfx_activity_accum_value); - CHK_ERR_ASRT(status_code); + if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { + CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_gfx_activity_acc(): " << status_string << "\n"; + } auto temp_avg_gfx_clock_freq_value = val_ui16; status_code = amdsmi_get_gpu_metrics_avg_gfx_clock_frequency(processor_handles_[i], &temp_avg_gfx_clock_freq_value); if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_avg_gfx_clock_frequency(): " << status_string << "\n"; } auto temp_avg_soc_clock_freq_value = val_ui16; status_code = amdsmi_get_gpu_metrics_avg_soc_clock_frequency(processor_handles_[i], &temp_avg_soc_clock_freq_value); if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_avg_soc_clock_frequency(): " << status_string << "\n"; } auto temp_avg_uclock_freq_value = val_ui16; status_code = amdsmi_get_gpu_metrics_avg_uclock_frequency(processor_handles_[i], &temp_avg_uclock_freq_value); if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_avg_uclock_frequency(): " << status_string << "\n"; } auto temp_avg_vclock0_freq_value = val_ui16; status_code = amdsmi_get_gpu_metrics_avg_vclock0_frequency(processor_handles_[i], &temp_avg_vclock0_freq_value); if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_avg_vclock0_frequency(): " << status_string << "\n"; } auto temp_avg_dclock0_freq_value = val_ui16; status_code = amdsmi_get_gpu_metrics_avg_dclock0_frequency(processor_handles_[i], &temp_avg_dclock0_freq_value); if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_avg_dclock0_frequency(): " << status_string << "\n"; } auto temp_avg_vclock1_freq_value = val_ui16; status_code = amdsmi_get_gpu_metrics_avg_vclock1_frequency(processor_handles_[i], &temp_avg_vclock1_freq_value); if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_avg_vclock1_frequency(): " << status_string << "\n"; } auto temp_avg_dclock1_freq_value = val_ui16; status_code = amdsmi_get_gpu_metrics_avg_dclock1_frequency(processor_handles_[i], &temp_avg_dclock1_freq_value); if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_avg_dclock1_frequency(): " << status_string << "\n"; } auto temp_curr_vclk1_value = val_ui16; status_code = amdsmi_get_gpu_metrics_curr_vclk1(processor_handles_[i], &temp_curr_vclk1_value); if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_curr_vclk1(): " << status_string << "\n"; } auto temp_curr_dclk1_value = val_ui16; status_code = amdsmi_get_gpu_metrics_curr_dclk1(processor_handles_[i], &temp_curr_dclk1_value); if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_curr_dclk1(): " << status_string << "\n"; } auto temp_curr_uclk_value = val_ui16; status_code = amdsmi_get_gpu_metrics_curr_uclk(processor_handles_[i], &temp_curr_uclk_value); - CHK_ERR_ASRT(status_code); + if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { + CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_curr_uclk(): " << status_string << "\n"; + } gpu_metric_curr_dclk0_t temp_curr_dclk0_values; status_code = amdsmi_get_gpu_metrics_curr_dclk0(processor_handles_[i], &temp_curr_dclk0_values); if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_curr_dclk0(): " << status_string << "\n"; } gpu_metric_curr_gfxclk_t temp_curr_gfxclk_values; status_code = amdsmi_get_gpu_metrics_curr_gfxclk(processor_handles_[i], &temp_curr_gfxclk_values); if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_curr_gfxclk(): " << status_string << "\n"; } gpu_metric_curr_socclk_t temp_curr_socclk_values; status_code = amdsmi_get_gpu_metrics_curr_socclk(processor_handles_[i], &temp_curr_socclk_values); if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_curr_socclk(): " << status_string << "\n"; } gpu_metric_curr_vclk0_t temp_curr_vclk0_values; status_code = amdsmi_get_gpu_metrics_curr_vclk0(processor_handles_[i], &temp_curr_vclk0_values); if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_curr_vclk0(): " << status_string << "\n"; } auto temp_indep_throttle_status_value = val_ui64; status_code = amdsmi_get_gpu_metrics_indep_throttle_status(processor_handles_[i], &temp_indep_throttle_status_value); if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_indep_throttle_status(): " << status_string << "\n"; } auto temp_throttle_status_value = val_ui32; status_code = amdsmi_get_gpu_metrics_throttle_status(processor_handles_[i], &temp_throttle_status_value); - CHK_ERR_ASRT(status_code); + if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { + CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_throttle_status(): " << status_string << "\n"; + } auto temp_gfxclk_lock_status_value = val_ui32; status_code = amdsmi_get_gpu_metrics_gfxclk_lock_status(processor_handles_[i], &temp_gfxclk_lock_status_value); if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_gfxclk_lock_status(): " << status_string << "\n"; } auto temp_curr_fan_speed_value = val_ui16; status_code = amdsmi_get_gpu_metrics_curr_fan_speed(processor_handles_[i], &temp_curr_fan_speed_value); if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_curr_fan_speed(): " << status_string << "\n"; } auto temp_pcie_link_width_value = val_ui16; status_code = amdsmi_get_gpu_metrics_pcie_link_width(processor_handles_[i], &temp_pcie_link_width_value); - CHK_ERR_ASRT(status_code); + if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { + CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_pcie_link_width(): " << status_string << "\n"; + } auto temp_pcie_link_speed_value = val_ui16; status_code = amdsmi_get_gpu_metrics_pcie_link_speed(processor_handles_[i], &temp_pcie_link_speed_value); - CHK_ERR_ASRT(status_code); + if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { + CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_pcie_link_speed(): " << status_string << "\n"; + } auto temp_pcie_bandwidth_accum_value = val_ui64; status_code = amdsmi_get_gpu_metrics_pcie_bandwidth_acc(processor_handles_[i], &temp_pcie_bandwidth_accum_value); if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_pcie_bandwidth_acc(): " << status_string << "\n"; } auto temp_pcie_bandwidth_inst_value = val_ui64; status_code = amdsmi_get_gpu_metrics_pcie_bandwidth_inst(processor_handles_[i], &temp_pcie_bandwidth_inst_value); if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_pcie_bandwidth_inst(): " << status_string << "\n"; } auto temp_pcie_l0_recov_count_accum_value = val_ui64; status_code = amdsmi_get_gpu_metrics_pcie_l0_recov_count_acc(processor_handles_[i], &temp_pcie_l0_recov_count_accum_value); if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_pcie_l0_recov_count_acc(): " << status_string << "\n"; } auto temp_pcie_replay_count_accum_value = val_ui64; status_code = amdsmi_get_gpu_metrics_pcie_replay_count_acc(processor_handles_[i], &temp_pcie_replay_count_accum_value); if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_pcie_replay_count_acc(): " << status_string << "\n"; } auto temp_pcie_replay_rover_count_accum_value = val_ui64; status_code = amdsmi_get_gpu_metrics_pcie_replay_rover_count_acc(processor_handles_[i], &temp_pcie_replay_rover_count_accum_value); if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_pcie_replay_rover_count_acc(): " << status_string << "\n"; } auto temp_xgmi_link_width_value = val_ui16; status_code = amdsmi_get_gpu_metrics_xgmi_link_width(processor_handles_[i], &temp_xgmi_link_width_value); if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_xgmi_link_width(): " << status_string << "\n"; } auto temp_xgmi_link_speed_value = val_ui16; status_code = amdsmi_get_gpu_metrics_xgmi_link_speed(processor_handles_[i], &temp_xgmi_link_speed_value); if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_xgmi_link_speed(): " << status_string << "\n"; } gpu_metric_xgmi_read_data_acc_t temp_xgmi_read_values; status_code = amdsmi_get_gpu_metrics_xgmi_read_data(processor_handles_[i], &temp_xgmi_read_values); if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_xgmi_read_data(): " << status_string << "\n"; } gpu_metric_xgmi_write_data_acc_t temp_xgmi_write_values; status_code = amdsmi_get_gpu_metrics_xgmi_write_data(processor_handles_[i], &temp_xgmi_write_values); if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_xgmi_write_data(): " << status_string << "\n"; } auto temp_voltage_soc_value = val_ui16; status_code = amdsmi_get_gpu_metrics_volt_soc(processor_handles_[i], &temp_voltage_soc_value); if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_volt_soc(): " << status_string << "\n"; } auto temp_voltage_gfx_value = val_ui16; status_code = amdsmi_get_gpu_metrics_volt_gfx(processor_handles_[i], &temp_voltage_gfx_value); if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_volt_gfx(): " << status_string << "\n"; } auto temp_voltage_mem_value = val_ui16; status_code = amdsmi_get_gpu_metrics_volt_mem(processor_handles_[i], &temp_voltage_mem_value); if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_volt_mem(): " << status_string << "\n"; } auto temp_system_clock_counter_value = val_ui64; status_code = amdsmi_get_gpu_metrics_system_clock_counter(processor_handles_[i], &temp_system_clock_counter_value); - CHK_ERR_ASRT(status_code); + if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { + CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_system_clock_counter(): " << status_string << "\n"; + } auto temp_firmware_timestamp_value = val_ui64; status_code = amdsmi_get_gpu_metrics_firmware_timestamp(processor_handles_[i], &temp_firmware_timestamp_value); - CHK_ERR_ASRT(status_code); + if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { + CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_firmware_timestamp(): " << status_string << "\n"; + } auto temp_xcd_counter_value = val_ui16; status_code = amdsmi_get_gpu_metrics_xcd_counter(processor_handles_[i], &temp_xcd_counter_value); if (status_code != AMDSMI_STATUS_NOT_SUPPORTED) { CHK_ERR_ASRT(status_code); + } else { + const char *status_string; + amdsmi_status_code_to_string(status_code, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_metrics_xcd_counter(): " << status_string << "\n"; } IF_VERB(STANDARD) { std::cout << "\n"; std::cout << "\t[Temperature]" << "\n"; - std::cout << "\t -> temp_edge(): " << temp_edge_value << "\n"; - std::cout << "\t -> temp_hotspot(): " << temp_hotspot_value << "\n"; - std::cout << "\t -> temp_mem(): " << temp_mem_value << "\n"; - std::cout << "\t -> temp_vrgfx(): " << temp_vrgfx_value << "\n"; - std::cout << "\t -> temp_vrsoc(): " << temp_vrsoc_value << "\n"; - std::cout << "\t -> temp_vrmem(): " << temp_vrmem_value << "\n"; - std::cout << "\t -> temp_hbm(): " << temp_hbm_values << "\n"; + std::cout << "\t -> temp_edge(): " << std::dec << temp_edge_value << "\n"; + std::cout << "\t -> temp_hotspot(): " << std::dec << temp_hotspot_value << "\n"; + std::cout << "\t -> temp_mem(): " << std::dec << temp_mem_value << "\n"; + std::cout << "\t -> temp_vrgfx(): " << std::dec << temp_vrgfx_value << "\n"; + std::cout << "\t -> temp_vrsoc(): " << std::dec << temp_vrsoc_value << "\n"; + std::cout << "\t -> temp_vrmem(): " << std::dec << temp_vrmem_value << "\n"; + std::cout << "\t -> temp_hbm(temp_hbm_values): ["; + uint16_t size = static_cast( + sizeof(temp_hbm_values) / sizeof(temp_hbm_values[0])); + for (uint16_t i = 0; i < size; i++) { + if (i + 1 < size) { + std::cout << std::dec << temp_hbm_values[i] << ", "; + } else { + std::cout << std::dec << temp_hbm_values[i]; + } + } + std::cout << std::dec << "]\n"; std::cout << "\n"; std::cout << "\t[Power/Energy]" << "\n"; - std::cout << "\t -> current_socket_power(): " << temp_curr_socket_power_value << "\n"; - std::cout << "\t -> energy_accum(): " << temp_energy_accum_value << "\n"; - std::cout << "\t -> average_socket_power(): " << temp_avg_socket_power_value << "\n"; + std::cout << "\t -> current_socket_power(): " << std::dec << temp_curr_socket_power_value << "\n"; + std::cout << "\t -> energy_accum(): " << std::dec << temp_energy_accum_value << "\n"; + std::cout << "\t -> average_socket_power(): " << std::dec << temp_avg_socket_power_value << "\n"; std::cout << "\n"; std::cout << "\t[Utilization]" << "\n"; - std::cout << "\t -> average_gfx_activity(): " << temp_avg_gfx_activity_value << "\n"; - std::cout << "\t -> average_umc_activity(): " << temp_avg_umc_activity_value << "\n"; - std::cout << "\t -> average_mm_activity(): " << temp_avg_mm_activity_value << "\n"; - std::cout << "\t -> vcn_activity(): " << temp_vcn_values << "\n"; - std::cout << "\t -> mem_activity_accum(): " << temp_mem_activity_accum_value << "\n"; - std::cout << "\t -> gfx_activity_accum(): " << temp_gfx_activity_accum_value << "\n"; + std::cout << "\t -> average_gfx_activity(): " << std::dec << temp_avg_gfx_activity_value << "\n"; + std::cout << "\t -> average_umc_activity(): " << std::dec << temp_avg_umc_activity_value << "\n"; + std::cout << "\t -> average_mm_activity(): " << std::dec << temp_avg_mm_activity_value << "\n"; + std::cout << "\t -> vcn_activity(temp_vcn_values): ["; + size = static_cast( + sizeof(temp_vcn_values) / sizeof(temp_vcn_values[0])); + for (uint16_t i = 0; i < size; i++) { + if (i + 1 < size) { + std::cout << std::dec << temp_vcn_values[i] << ", "; + } else { + std::cout << std::dec << temp_vcn_values[i]; + } + } + std::cout << std::dec << "]\n"; + std::cout << "\t -> mem_activity_accum(): " << std::dec << temp_mem_activity_accum_value << "\n"; + std::cout << "\t -> gfx_activity_accum(): " << std::dec << temp_gfx_activity_accum_value << "\n"; std::cout << "\n"; std::cout << "\t[Average Clock]" << "\n"; - std::cout << "\t -> average_gfx_clock_frequency(): " << temp_avg_gfx_clock_freq_value << "\n"; - std::cout << "\t -> average_soc_clock_frequency(): " << temp_avg_soc_clock_freq_value << "\n"; - std::cout << "\t -> average_uclock_frequency(): " << temp_avg_uclock_freq_value << "\n"; - std::cout << "\t -> average_vclock0_frequency(): " << temp_avg_vclock0_freq_value << "\n"; - std::cout << "\t -> average_dclock0_frequency(): " << temp_avg_dclock0_freq_value << "\n"; - std::cout << "\t -> average_vclock1_frequency(): " << temp_avg_vclock1_freq_value << "\n"; - std::cout << "\t -> average_dclock1_frequency(): " << temp_avg_dclock1_freq_value << "\n"; + std::cout << "\t -> average_gfx_clock_frequency(): " << std::dec << temp_avg_gfx_clock_freq_value << "\n"; + std::cout << "\t -> average_soc_clock_frequency(): " << std::dec << temp_avg_soc_clock_freq_value << "\n"; + std::cout << "\t -> average_uclock_frequency(): " << std::dec << temp_avg_uclock_freq_value << "\n"; + std::cout << "\t -> average_vclock0_frequency(): " << std::dec << std::dec << temp_avg_vclock0_freq_value << "\n"; + std::cout << "\t -> average_dclock0_frequency(): " << std::dec << temp_avg_dclock0_freq_value << "\n"; + std::cout << "\t -> average_vclock1_frequency(): " << std::dec << temp_avg_vclock1_freq_value << "\n"; + std::cout << "\t -> average_dclock1_frequency(): " << std::dec << temp_avg_dclock1_freq_value << "\n"; std::cout << "\n"; std::cout << "\t[Current Clock]" << "\n"; - std::cout << "\t -> current_vclock1(): " << temp_curr_vclk1_value << "\n"; - std::cout << "\t -> current_dclock1(): " << temp_curr_dclk1_value << "\n"; - std::cout << "\t -> current_uclock(): " << temp_curr_uclk_value << "\n"; - std::cout << "\t -> current_dclk0(): " << temp_curr_dclk0_values << "\n"; - std::cout << "\t -> current_gfxclk(): " << temp_curr_gfxclk_values << "\n"; - std::cout << "\t -> current_soc_clock(): " << temp_curr_socclk_values << "\n"; - std::cout << "\t -> current_vclk0(): " << temp_curr_vclk0_values << "\n"; + std::cout << "\t -> current_vclock1(): " << std::dec << temp_curr_vclk1_value << "\n"; + std::cout << "\t -> current_dclock1(): " << std::dec << temp_curr_dclk1_value << "\n"; + std::cout << "\t -> current_uclock(): " << std::dec << temp_curr_uclk_value << "\n"; + std::cout << "\t -> current_dclk0(temp_curr_dclk0_values): ["; + size = static_cast( + sizeof(temp_curr_dclk0_values) / sizeof(temp_curr_dclk0_values[0])); + for (uint16_t i = 0; i < size; i++) { + if (i + 1 < size) { + std::cout << std::dec << temp_curr_dclk0_values[i] << ", "; + } else { + std::cout << std::dec << temp_curr_dclk0_values[i]; + } + } + std::cout << std::dec << "]\n"; + std::cout << "\t -> current_gfxclk(temp_curr_gfxclk_values): ["; + size = static_cast( + sizeof(temp_curr_gfxclk_values) / sizeof(temp_curr_gfxclk_values[0])); + for (uint16_t i = 0; i < size; i++) { + if (i + 1 < size) { + std::cout << std::dec << temp_curr_gfxclk_values[i] << ", "; + } else { + std::cout << std::dec << temp_curr_gfxclk_values[i]; + } + } + std::cout << std::dec << "]\n"; + std::cout << "\t -> current_soc_clock(temp_curr_socclk_values): ["; + size = static_cast( + sizeof(temp_curr_socclk_values) / sizeof(temp_curr_socclk_values[0])); + for (uint16_t i = 0; i < size; i++) { + if (i + 1 < size) { + std::cout << std::dec << temp_curr_socclk_values[i] << ", "; + } else { + std::cout << std::dec << temp_curr_socclk_values[i]; + } + } + std::cout << std::dec << "]\n"; + std::cout << "\t -> current_vclk0(temp_curr_vclk0_values): ["; + size = static_cast( + sizeof(temp_curr_vclk0_values) / sizeof(temp_curr_vclk0_values[0])); + for (uint16_t i = 0; i < size; i++) { + if (i + 1 < size) { + std::cout << std::dec << temp_curr_vclk0_values[i] << ", "; + } else { + std::cout << std::dec << temp_curr_vclk0_values[i]; + } + } + std::cout << std::dec << "]\n"; std::cout << "\n"; std::cout << "\t[Throttle]" << "\n"; - std::cout << "\t -> indep_throttle_status(): " << temp_indep_throttle_status_value << "\n"; - std::cout << "\t -> throttle_status(): " << temp_throttle_status_value << "\n"; + std::cout << "\t -> indep_throttle_status(): " << std::dec << temp_indep_throttle_status_value << "\n"; + std::cout << "\t -> throttle_status(): " << std::dec << temp_throttle_status_value << "\n"; std::cout << "\n"; std::cout << "\t[Gfx Clock Lock]" << "\n"; - std::cout << "\t -> gfxclk_lock_status(): " << temp_gfxclk_lock_status_value << "\n"; + std::cout << "\t -> gfxclk_lock_status(): " << std::dec << temp_gfxclk_lock_status_value << "\n"; std::cout << "\n"; std::cout << "\t[Current Fan Speed]" << "\n"; - std::cout << "\t -> current_fan_speed(): " << temp_curr_fan_speed_value << "\n"; + std::cout << "\t -> current_fan_speed(): " << std::dec << temp_curr_fan_speed_value << "\n"; std::cout << "\n"; std::cout << "\t[Link/Bandwidth/Speed]" << "\n"; - std::cout << "\t -> pcie_link_width(): " << temp_pcie_link_width_value << "\n"; - std::cout << "\t -> pcie_link_speed(): " << temp_pcie_link_speed_value << "\n"; - std::cout << "\t -> pcie_bandwidth_accum(): " << temp_pcie_bandwidth_accum_value << "\n"; - std::cout << "\t -> pcie_bandwidth_inst(): " << temp_pcie_bandwidth_inst_value << "\n"; - std::cout << "\t -> pcie_l0_recov_count_accum(): " << temp_pcie_l0_recov_count_accum_value << "\n"; - std::cout << "\t -> pcie_replay_count_accum(): " << temp_pcie_replay_count_accum_value << "\n"; - std::cout << "\t -> pcie_replay_rollover_count_accum(): " << temp_pcie_replay_rover_count_accum_value << "\n"; - std::cout << "\t -> xgmi_link_width(): " << temp_xgmi_link_width_value << "\n"; - std::cout << "\t -> xgmi_link_speed(): " << temp_xgmi_link_speed_value << "\n"; - std::cout << "\t -> xgmi_read_data(): " << temp_xgmi_read_values << "\n"; - std::cout << "\t -> xgmi_write_data(): " << temp_xgmi_write_values << "\n"; + std::cout << "\t -> pcie_link_width(): " << std::dec << temp_pcie_link_width_value << "\n"; + std::cout << "\t -> pcie_link_speed(): " << std::dec << temp_pcie_link_speed_value << "\n"; + std::cout << "\t -> pcie_bandwidth_accum(): " << std::dec << std::dec << temp_pcie_bandwidth_accum_value << "\n"; + std::cout << "\t -> pcie_bandwidth_inst(): " << std::dec << temp_pcie_bandwidth_inst_value << "\n"; + std::cout << "\t -> pcie_l0_recov_count_accum(): " << std::dec << std::dec << temp_pcie_l0_recov_count_accum_value << "\n"; + std::cout << "\t -> pcie_replay_count_accum(): " << std::dec << temp_pcie_replay_count_accum_value << "\n"; + std::cout << "\t -> pcie_replay_rollover_count_accum(): " << std::dec << temp_pcie_replay_rover_count_accum_value << "\n"; + std::cout << "\t -> xgmi_link_width(): " << std::dec << temp_xgmi_link_width_value << "\n"; + std::cout << "\t -> xgmi_link_speed(): " << std::dec << std::dec << temp_xgmi_link_speed_value << "\n"; + std::cout << "\t -> xgmi_read_data(temp_xgmi_read_values): "; + size = static_cast( + sizeof(temp_xgmi_read_values) / sizeof(temp_xgmi_read_values[0])); + for (uint16_t i = 0; i < size; i++) { + if (i + 1 < size) { + std::cout << std::dec << temp_xgmi_read_values[i] << ", "; + } else { + std::cout << std::dec << temp_xgmi_read_values[i]; + } + } + std::cout << std::dec << "]\n"; + std::cout << "\t -> xgmi_write_data(temp_xgmi_write_values): ["; + size = static_cast( + sizeof(temp_xgmi_write_values) / sizeof(temp_xgmi_write_values[0])); + for (uint16_t i = 0; i < size; i++) { + if (i + 1 < size) { + std::cout << std::dec << temp_xgmi_write_values[i] << ", "; + } else { + std::cout << std::dec << temp_xgmi_write_values[i]; + } + } + std::cout << std::dec << "]\n"; std::cout << "\n"; std::cout << "\t[Voltage]" << "\n"; - std::cout << "\t -> voltage_soc(): " << temp_voltage_soc_value << "\n"; - std::cout << "\t -> voltage_gfx(): " << temp_voltage_gfx_value << "\n"; - std::cout << "\t -> voltage_mem(): " << temp_voltage_mem_value << "\n"; + std::cout << "\t -> voltage_soc(): " << std::dec << temp_voltage_soc_value << "\n"; + std::cout << "\t -> voltage_gfx(): " << std::dec << temp_voltage_gfx_value << "\n"; + std::cout << "\t -> voltage_mem(): " << std::dec << temp_voltage_mem_value << "\n"; std::cout << "\n"; std::cout << "\t[Timestamp]" << "\n"; - std::cout << "\t -> system_clock_counter(): " << temp_system_clock_counter_value << "\n"; - std::cout << "\t -> firmware_timestamp(): " << temp_firmware_timestamp_value << "\n"; + std::cout << "\t -> system_clock_counter(): " << std::dec << temp_system_clock_counter_value << "\n"; + std::cout << "\t -> firmware_timestamp(): " << std::dec << temp_firmware_timestamp_value << "\n"; std::cout << "\n"; - std::cout << "\t[XCD CounterVoltage]" << "\n"; - std::cout << "\t -> xcd_counter(): " << temp_xcd_counter_value << "\n"; + std::cout << "\t[XCD Counter]" << "\n"; + std::cout << "\t -> xcd_counter(): " << std::dec << temp_xcd_counter_value << "\n"; std::cout << "\n\n"; } }