From ea0c860a1a2fed7ae12f6e624471aa956d5f4ca0 Mon Sep 17 00:00:00 2001 From: Suma Hegde Date: Sat, 25 Feb 2023 05:26:14 -0500 Subject: [PATCH] Change amdsmi_device_handle to amdsmi_processor_handle grep -rli 'amdsmi_device_handle' * | xargs -i@ sed -i 's/amdsmi_device_handle/amdsmi_processor_handle/g' @ Change-Id: Ie25c51933dcc31e5b34c8070d0d5ba0e8cd05cc1 [ROCm/amdsmi commit: 3963036a05e6337e202c06959a9077d81beb7ac1] --- projects/amdsmi/README.md | 2 +- .../amdsmi/example/amd_smi_drm_example.cc | 4 +- .../amdsmi/example/amd_smi_nodrm_example.cc | 2 +- projects/amdsmi/include/amd_smi/amdsmi.h | 188 +++--- .../include/amd_smi/impl/amd_smi_system.h | 4 +- projects/amdsmi/py-interface/README.md | 2 +- .../amdsmi/py-interface/amdsmi_interface.py | 586 ++++++++++-------- .../amdsmi/py-interface/amdsmi_wrapper.py | 176 +++--- projects/amdsmi/py-interface/rocm_smi_tool.py | 2 +- projects/amdsmi/src/amd_smi/amd_smi.cc | 186 +++--- projects/amdsmi/src/amd_smi/amd_smi_system.cc | 4 +- .../functional/hw_topology_read.cc | 2 +- .../functional/perf_cntr_read_write.cc | 8 +- .../functional/perf_cntr_read_write.h | 6 +- .../amdsmi/tests/amd_smi_test/test_base.cc | 4 +- .../amdsmi/tests/amd_smi_test/test_base.h | 4 +- 16 files changed, 609 insertions(+), 571 deletions(-) diff --git a/projects/amdsmi/README.md b/projects/amdsmi/README.md index ac7ec316c3..8e7dad3d24 100755 --- a/projects/amdsmi/README.md +++ b/projects/amdsmi/README.md @@ -119,7 +119,7 @@ int main() { ret = amdsmi_get_device_handles(sockets[i], &device_count, nullptr); // Allocate the memory for the device handlers on the socket - std::vector device_handles(device_count); + std::vector device_handles(device_count); // Get all devices of the socket ret = amdsmi_get_device_handles(sockets[i], &device_count, &device_handles[0]); diff --git a/projects/amdsmi/example/amd_smi_drm_example.cc b/projects/amdsmi/example/amd_smi_drm_example.cc index d878b6e4b6..69d8945d8e 100644 --- a/projects/amdsmi/example/amd_smi_drm_example.cc +++ b/projects/amdsmi/example/amd_smi_drm_example.cc @@ -248,7 +248,7 @@ int main() { CHK_AMDSMI_RET(ret) // Allocate the memory for the device handlers on the socket - std::vector device_handles(device_count); + std::vector device_handles(device_count); // Get all devices of the socket ret = amdsmi_get_device_handles(sockets[i], &device_count, &device_handles[0]); @@ -276,7 +276,7 @@ int main() { bdf.function_number); // Get handle from BDF - amdsmi_device_handle dev_handle; + amdsmi_processor_handle dev_handle; ret = amdsmi_get_device_handle_from_bdf(bdf, &dev_handle); CHK_AMDSMI_RET(ret) diff --git a/projects/amdsmi/example/amd_smi_nodrm_example.cc b/projects/amdsmi/example/amd_smi_nodrm_example.cc index 43c01594ff..950ff16e65 100644 --- a/projects/amdsmi/example/amd_smi_nodrm_example.cc +++ b/projects/amdsmi/example/amd_smi_nodrm_example.cc @@ -100,7 +100,7 @@ int main() { CHK_AMDSMI_RET(ret) // Allocate the memory for the device handlers on the socket - std::vector device_handles(device_count); + std::vector device_handles(device_count); // Get all devices of the socket ret = amdsmi_get_device_handles(sockets[i], &device_count, &device_handles[0]); diff --git a/projects/amdsmi/include/amd_smi/amdsmi.h b/projects/amdsmi/include/amd_smi/amdsmi.h index ed8716935f..0e87262ec9 100644 --- a/projects/amdsmi/include/amd_smi/amdsmi.h +++ b/projects/amdsmi/include/amd_smi/amdsmi.h @@ -120,7 +120,7 @@ typedef enum { } amdsmi_container_types_t; //! opaque handler point to underlying implementation -typedef void *amdsmi_device_handle; +typedef void *amdsmi_processor_handle; typedef void *amdsmi_socket_handle; /** @@ -609,7 +609,7 @@ typedef enum { * Event notification data returned from event notification API */ typedef struct { - amdsmi_device_handle device_handle; //!< Handler of device that corresponds to the event + amdsmi_processor_handle device_handle; //!< Handler of device that corresponds to the event amdsmi_evt_notification_type_t event; //!< Event type char message[MAX_EVENT_NOTIFICATION_MSG_SIZE]; //!< Event message } amdsmi_evt_notification_data_t; @@ -1235,7 +1235,7 @@ amdsmi_status_t amdsmi_get_socket_info( * @param[in] socket_handle The socket to query * * @param[in,out] device_count As input, the value passed - * through this parameter is the number of ::amdsmi_device_handle's that + * through this parameter is the number of ::amdsmi_processor_handle's that * may be safely written to the memory pointed to by @p device_handles. This is the * limit on how many device handles will be written to @p device_handles. On return, @p * device_count will contain the number of device handles written to @p device_handles, @@ -1245,7 +1245,7 @@ amdsmi_status_t amdsmi_get_socket_info( * how many devices are available to read for the socket. * * @param[in,out] device_handles A pointer to a block of memory to which the - * ::amdsmi_device_handle values will be written. This value may be NULL. + * ::amdsmi_processor_handle values will be written. This value may be NULL. * In this case, this function can be used to query how many devices are * available to read. * @@ -1253,7 +1253,7 @@ amdsmi_status_t amdsmi_get_socket_info( */ amdsmi_status_t amdsmi_get_device_handles(amdsmi_socket_handle socket_handle, uint32_t *device_count, - amdsmi_device_handle* device_handles); + amdsmi_processor_handle* device_handles); /** * @brief Get the device type of the device_handle @@ -1269,7 +1269,7 @@ amdsmi_status_t amdsmi_get_device_handles(amdsmi_socket_handle socket_handle, * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_device_type(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_get_device_type(amdsmi_processor_handle device_handle, device_type_t* device_type); /** @@ -1284,7 +1284,7 @@ amdsmi_status_t amdsmi_get_device_type(amdsmi_device_handle device_handle, * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_device_handle_from_bdf(amdsmi_bdf_t bdf, amdsmi_device_handle* device_handle); +amdsmi_status_t amdsmi_get_device_handle_from_bdf(amdsmi_bdf_t bdf, amdsmi_processor_handle* device_handle); /** @} End DiscQueries */ @@ -1317,7 +1317,7 @@ amdsmi_status_t amdsmi_get_device_handle_from_bdf(amdsmi_bdf_t bdf, amdsmi_devic * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_get_id(amdsmi_device_handle device_handle, uint16_t *id); +amdsmi_status_t amdsmi_dev_get_id(amdsmi_processor_handle device_handle, uint16_t *id); /** * @brief Get the name string for a give vendor ID @@ -1350,7 +1350,7 @@ amdsmi_status_t amdsmi_dev_get_id(amdsmi_device_handle device_handle, uint16_t * * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_get_vendor_name(amdsmi_device_handle device_handle, char *name, +amdsmi_status_t amdsmi_dev_get_vendor_name(amdsmi_processor_handle device_handle, char *name, size_t len); /** @@ -1375,7 +1375,7 @@ amdsmi_status_t amdsmi_dev_get_vendor_name(amdsmi_device_handle device_handle, c * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_get_vram_vendor(amdsmi_device_handle device_handle, char *brand, +amdsmi_status_t amdsmi_dev_get_vram_vendor(amdsmi_processor_handle device_handle, char *brand, uint32_t len); /** @@ -1397,7 +1397,7 @@ amdsmi_status_t amdsmi_dev_get_vram_vendor(amdsmi_device_handle device_handle, c * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_get_subsystem_id(amdsmi_device_handle device_handle, uint16_t *id); +amdsmi_status_t amdsmi_dev_get_subsystem_id(amdsmi_processor_handle device_handle, uint16_t *id); /** * @brief Get the name string for the device subsytem @@ -1431,7 +1431,7 @@ amdsmi_status_t amdsmi_dev_get_subsystem_id(amdsmi_device_handle device_handle, * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_dev_get_subsystem_name(amdsmi_device_handle device_handle, char *name, size_t len); +amdsmi_dev_get_subsystem_name(amdsmi_processor_handle device_handle, char *name, size_t len); /** * @brief Get the drm minor number associated with this device @@ -1447,7 +1447,7 @@ amdsmi_dev_get_subsystem_name(amdsmi_device_handle device_handle, char *name, si * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_dev_get_drm_render_minor(amdsmi_device_handle device_handle, uint32_t *minor); +amdsmi_dev_get_drm_render_minor(amdsmi_processor_handle device_handle, uint32_t *minor); /** @} End IDQuer */ @@ -1474,7 +1474,7 @@ amdsmi_dev_get_drm_render_minor(amdsmi_device_handle device_handle, uint32_t *mi * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_dev_get_pci_bandwidth(amdsmi_device_handle device_handle, amdsmi_pcie_bandwidth_t *bandwidth); +amdsmi_dev_get_pci_bandwidth(amdsmi_processor_handle device_handle, amdsmi_pcie_bandwidth_t *bandwidth); /** * @brief Get the unique PCI device identifier associated for a device @@ -1508,7 +1508,7 @@ amdsmi_dev_get_pci_bandwidth(amdsmi_device_handle device_handle, amdsmi_pcie_ban * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_get_pci_id(amdsmi_device_handle device_handle, uint64_t *bdfid); +amdsmi_status_t amdsmi_dev_get_pci_id(amdsmi_processor_handle device_handle, uint64_t *bdfid); /** * @brief Get the NUMA node associated with a device @@ -1529,7 +1529,7 @@ amdsmi_status_t amdsmi_dev_get_pci_id(amdsmi_device_handle device_handle, uint64 * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_topo_get_numa_affinity(amdsmi_device_handle device_handle, uint32_t *numa_node); +amdsmi_status_t amdsmi_topo_get_numa_affinity(amdsmi_processor_handle device_handle, uint32_t *numa_node); /** * @brief Get PCIe traffic information @@ -1553,7 +1553,7 @@ amdsmi_status_t amdsmi_topo_get_numa_affinity(amdsmi_device_handle device_handle * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_get_pci_throughput(amdsmi_device_handle device_handle, uint64_t *sent, +amdsmi_status_t amdsmi_dev_get_pci_throughput(amdsmi_processor_handle device_handle, uint64_t *sent, uint64_t *received, uint64_t *max_pkt_sz); /** @@ -1575,7 +1575,7 @@ amdsmi_status_t amdsmi_dev_get_pci_throughput(amdsmi_device_handle device_handle * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_get_pci_replay_counter(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_get_pci_replay_counter(amdsmi_processor_handle device_handle, uint64_t *counter); /** @} End PCIeQuer */ @@ -1615,7 +1615,7 @@ amdsmi_status_t amdsmi_dev_get_pci_replay_counter(amdsmi_device_handle device_h * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_set_pci_bandwidth(amdsmi_device_handle device_handle, uint64_t bw_bitmask); +amdsmi_status_t amdsmi_dev_set_pci_bandwidth(amdsmi_processor_handle device_handle, uint64_t bw_bitmask); /** @} End PCIeCont */ @@ -1647,7 +1647,7 @@ amdsmi_status_t amdsmi_dev_set_pci_bandwidth(amdsmi_device_handle device_handle * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_dev_get_power_ave(amdsmi_device_handle device_handle, uint32_t sensor_ind, uint64_t *power); +amdsmi_dev_get_power_ave(amdsmi_processor_handle device_handle, uint32_t sensor_ind, uint64_t *power); /** * @brief Get the energy accumulator counter of the device with provided @@ -1677,7 +1677,7 @@ amdsmi_dev_get_power_ave(amdsmi_device_handle device_handle, uint32_t sensor_ind * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_dev_get_energy_count(amdsmi_device_handle device_handle, uint64_t *power, +amdsmi_dev_get_energy_count(amdsmi_processor_handle device_handle, uint64_t *power, float *counter_resolution, uint64_t *timestamp); /** @} End PowerQuer */ @@ -1705,7 +1705,7 @@ amdsmi_dev_get_energy_count(amdsmi_device_handle device_handle, uint64_t *power, * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t - amdsmi_dev_set_power_cap(amdsmi_device_handle device_handle, uint32_t sensor_ind, uint64_t cap); + amdsmi_dev_set_power_cap(amdsmi_processor_handle device_handle, uint32_t sensor_ind, uint64_t cap); /** * @brief Set the power performance profile @@ -1725,7 +1725,7 @@ amdsmi_status_t * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t - amdsmi_dev_set_power_profile(amdsmi_device_handle device_handle, uint32_t reserved, + amdsmi_dev_set_power_profile(amdsmi_processor_handle device_handle, uint32_t reserved, amdsmi_power_profile_preset_masks_t profile); /** @} End PowerCont*/ @@ -1758,7 +1758,7 @@ amdsmi_status_t * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_dev_get_memory_total(amdsmi_device_handle device_handle, amdsmi_memory_type_t mem_type, +amdsmi_dev_get_memory_total(amdsmi_processor_handle device_handle, amdsmi_memory_type_t mem_type, uint64_t *total); /** @@ -1782,7 +1782,7 @@ amdsmi_dev_get_memory_total(amdsmi_device_handle device_handle, amdsmi_memory_ty * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_dev_get_memory_usage(amdsmi_device_handle device_handle, amdsmi_memory_type_t mem_type, +amdsmi_dev_get_memory_usage(amdsmi_processor_handle device_handle, amdsmi_memory_type_t mem_type, uint64_t *used); /** @@ -1800,7 +1800,7 @@ amdsmi_dev_get_memory_usage(amdsmi_device_handle device_handle, amdsmi_memory_ty * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_bad_page_info(amdsmi_device_handle device_handle, uint32_t *num_pages, amdsmi_retired_page_record_t *info); +amdsmi_get_bad_page_info(amdsmi_processor_handle device_handle, uint32_t *num_pages, amdsmi_retired_page_record_t *info); /** * @brief Returns if RAS features are enabled or disabled for given block @@ -1823,7 +1823,7 @@ amdsmi_get_bad_page_info(amdsmi_device_handle device_handle, uint32_t *num_pages * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_ras_block_features_enabled(amdsmi_device_handle device_handle, amdsmi_gpu_block_t block, +amdsmi_get_ras_block_features_enabled(amdsmi_processor_handle device_handle, amdsmi_gpu_block_t block, amdsmi_ras_err_state_t *state); /** @@ -1845,7 +1845,7 @@ amdsmi_get_ras_block_features_enabled(amdsmi_device_handle device_handle, amdsmi * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_dev_get_memory_busy_percent(amdsmi_device_handle device_handle, uint32_t *busy_percent); +amdsmi_dev_get_memory_busy_percent(amdsmi_processor_handle device_handle, uint32_t *busy_percent); /** * @brief Get information about reserved ("retired") memory pages @@ -1878,7 +1878,7 @@ amdsmi_dev_get_memory_busy_percent(amdsmi_device_handle device_handle, uint32_t * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_dev_get_memory_reserved_pages(amdsmi_device_handle device_handle, uint32_t *num_pages, +amdsmi_dev_get_memory_reserved_pages(amdsmi_processor_handle device_handle, uint32_t *num_pages, amdsmi_retired_page_record_t *records); /** @} End MemQuer */ @@ -1911,7 +1911,7 @@ amdsmi_dev_get_memory_reserved_pages(amdsmi_device_handle device_handle, uint32_ * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_get_fan_rpms(amdsmi_device_handle device_handle, uint32_t sensor_ind, +amdsmi_status_t amdsmi_dev_get_fan_rpms(amdsmi_processor_handle device_handle, uint32_t sensor_ind, int64_t *speed); /** @@ -1937,7 +1937,7 @@ amdsmi_status_t amdsmi_dev_get_fan_rpms(amdsmi_device_handle device_handle, uint * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_get_fan_speed(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_get_fan_speed(amdsmi_processor_handle device_handle, uint32_t sensor_ind, int64_t *speed); /** @@ -1961,7 +1961,7 @@ amdsmi_status_t amdsmi_dev_get_fan_speed(amdsmi_device_handle device_handle, * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_get_fan_speed_max(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_get_fan_speed_max(amdsmi_processor_handle device_handle, uint32_t sensor_ind, uint64_t *max_speed); /** @@ -1990,7 +1990,7 @@ amdsmi_status_t amdsmi_dev_get_fan_speed_max(amdsmi_device_handle device_handle, * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_get_temp_metric(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_get_temp_metric(amdsmi_processor_handle device_handle, amdsmi_temperature_type_t sensor_type, amdsmi_temperature_metric_t metric, int64_t *temperature); @@ -2020,7 +2020,7 @@ amdsmi_status_t amdsmi_dev_get_temp_metric(amdsmi_device_handle device_handle, * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_get_volt_metric(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_get_volt_metric(amdsmi_processor_handle device_handle, amdsmi_voltage_type_t sensor_type, amdsmi_voltage_metric_t metric, int64_t *voltage); @@ -2044,7 +2044,7 @@ amdsmi_status_t amdsmi_dev_get_volt_metric(amdsmi_device_handle device_handle, * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_reset_fan(amdsmi_device_handle device_handle, uint32_t sensor_ind); +amdsmi_status_t amdsmi_dev_reset_fan(amdsmi_processor_handle device_handle, uint32_t sensor_ind); /** * @brief Set the fan speed for the specified device with the provided speed, @@ -2066,7 +2066,7 @@ amdsmi_status_t amdsmi_dev_reset_fan(amdsmi_device_handle device_handle, uint32_ * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_set_fan_speed(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_set_fan_speed(amdsmi_processor_handle device_handle, uint32_t sensor_ind, uint64_t speed); /** @} End PhysCont */ @@ -2098,7 +2098,7 @@ amdsmi_status_t amdsmi_dev_set_fan_speed(amdsmi_device_handle device_handle, * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_dev_get_busy_percent(amdsmi_device_handle device_handle, uint32_t *busy_percent); +amdsmi_dev_get_busy_percent(amdsmi_processor_handle device_handle, uint32_t *busy_percent); /** * @brief Get coarse grain utilization counter of the specified device @@ -2125,7 +2125,7 @@ amdsmi_dev_get_busy_percent(amdsmi_device_handle device_handle, uint32_t *busy_p * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_utilization_count(amdsmi_device_handle device_handle, +amdsmi_get_utilization_count(amdsmi_processor_handle device_handle, amdsmi_utilization_counter_t utilization_counters[], uint32_t count, uint64_t *timestamp); @@ -2142,7 +2142,7 @@ amdsmi_get_utilization_count(amdsmi_device_handle device_handle, * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_pcie_link_status(amdsmi_device_handle device_handle, amdsmi_pcie_info_t *info); +amdsmi_status_t amdsmi_get_pcie_link_status(amdsmi_processor_handle device_handle, amdsmi_pcie_info_t *info); /** * @brief Get max PCIe capabilities of the device with provided device handle. @@ -2156,7 +2156,7 @@ amdsmi_status_t amdsmi_get_pcie_link_status(amdsmi_device_handle device_handle, * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_pcie_link_caps(amdsmi_device_handle device_handle, amdsmi_pcie_info_t *info); +amdsmi_status_t amdsmi_get_pcie_link_caps(amdsmi_processor_handle device_handle, amdsmi_pcie_info_t *info); /** * @brief Get the performance level of the device @@ -2176,7 +2176,7 @@ amdsmi_status_t amdsmi_get_pcie_link_caps(amdsmi_device_handle device_handle, am * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_get_perf_level(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_get_perf_level(amdsmi_processor_handle device_handle, amdsmi_dev_perf_level_t *perf); /** @@ -2197,7 +2197,7 @@ amdsmi_status_t amdsmi_dev_get_perf_level(amdsmi_device_handle device_handle, * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_set_perf_determinism_mode(amdsmi_device_handle device_handle, uint64_t clkvalue); +amdsmi_set_perf_determinism_mode(amdsmi_processor_handle device_handle, uint64_t clkvalue); /** * @brief Get the overdrive percent associated with the device with provided @@ -2219,7 +2219,7 @@ amdsmi_set_perf_determinism_mode(amdsmi_device_handle device_handle, uint64_t cl * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_get_overdrive_level(amdsmi_device_handle device_handle, uint32_t *od); +amdsmi_status_t amdsmi_dev_get_overdrive_level(amdsmi_processor_handle device_handle, uint32_t *od); /** * @brief Get the list of possible system clock speeds of device for a @@ -2240,7 +2240,7 @@ amdsmi_status_t amdsmi_dev_get_overdrive_level(amdsmi_device_handle device_handl * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_get_gpu_clk_freq(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_get_gpu_clk_freq(amdsmi_processor_handle device_handle, amdsmi_clk_type_t clk_type, amdsmi_frequencies_t *f); /** @@ -2252,7 +2252,7 @@ amdsmi_status_t amdsmi_dev_get_gpu_clk_freq(amdsmi_device_handle device_handle, * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_reset_gpu(amdsmi_device_handle device_handle); +amdsmi_status_t amdsmi_dev_reset_gpu(amdsmi_processor_handle device_handle); /** * @brief This function retrieves the voltage/frequency curve information @@ -2271,7 +2271,7 @@ amdsmi_status_t amdsmi_dev_reset_gpu(amdsmi_device_handle device_handle); * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_get_od_volt_info(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_get_od_volt_info(amdsmi_processor_handle device_handle, amdsmi_od_volt_freq_data_t *odv); /** @@ -2291,7 +2291,7 @@ amdsmi_status_t amdsmi_dev_get_od_volt_info(amdsmi_device_handle device_handle, * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_get_gpu_metrics_info(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_get_gpu_metrics_info(amdsmi_processor_handle device_handle, amdsmi_gpu_metrics_t *pgpu_metrics); /** @@ -2313,7 +2313,7 @@ amdsmi_status_t amdsmi_dev_get_gpu_metrics_info(amdsmi_device_handle device_han * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_set_clk_range(amdsmi_device_handle device_handle, uint64_t minclkvalue, +amdsmi_status_t amdsmi_dev_set_clk_range(amdsmi_processor_handle device_handle, uint64_t minclkvalue, uint64_t maxclkvalue, amdsmi_clk_type_t clkType); @@ -2336,7 +2336,7 @@ amdsmi_status_t amdsmi_dev_set_clk_range(amdsmi_device_handle device_handle, uin * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_set_od_clk_info(amdsmi_device_handle device_handle, amdsmi_freq_ind_t level, +amdsmi_status_t amdsmi_dev_set_od_clk_info(amdsmi_processor_handle device_handle, amdsmi_freq_ind_t level, uint64_t clkvalue, amdsmi_clk_type_t clkType); @@ -2358,7 +2358,7 @@ amdsmi_status_t amdsmi_dev_set_od_clk_info(amdsmi_device_handle device_handle, * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_set_od_volt_info(amdsmi_device_handle device_handle, uint32_t vpoint, +amdsmi_status_t amdsmi_dev_set_od_volt_info(amdsmi_processor_handle device_handle, uint32_t vpoint, uint64_t clkvalue, uint64_t voltvalue); /** @@ -2396,7 +2396,7 @@ amdsmi_status_t amdsmi_dev_set_od_volt_info(amdsmi_device_handle device_handle, * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_get_od_volt_curve_regions(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_get_od_volt_curve_regions(amdsmi_processor_handle device_handle, uint32_t *num_regions, amdsmi_freq_volt_region_t *buffer); /** @@ -2431,7 +2431,7 @@ amdsmi_status_t amdsmi_dev_get_od_volt_curve_regions(amdsmi_device_handle devic * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t - amdsmi_dev_get_power_profile_presets(amdsmi_device_handle device_handle, uint32_t sensor_ind, + amdsmi_dev_get_power_profile_presets(amdsmi_processor_handle device_handle, uint32_t sensor_ind, amdsmi_power_profile_status_t *status); /** @} End PerfQuer */ @@ -2463,7 +2463,7 @@ amdsmi_status_t * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t - amdsmi_dev_set_perf_level(amdsmi_device_handle device_handle, amdsmi_dev_perf_level_t perf_lvl); + amdsmi_dev_set_perf_level(amdsmi_processor_handle device_handle, amdsmi_dev_perf_level_t perf_lvl); /** * @brief Set the PowerPlay performance level associated with the device with @@ -2482,7 +2482,7 @@ amdsmi_status_t * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t - amdsmi_dev_set_perf_level_v1(amdsmi_device_handle device_handle, amdsmi_dev_perf_level_t perf_lvl); + amdsmi_dev_set_perf_level_v1(amdsmi_processor_handle device_handle, amdsmi_dev_perf_level_t perf_lvl); /** * @brief Set the overdrive percent associated with the device with provided @@ -2523,7 +2523,7 @@ amdsmi_status_t * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_set_overdrive_level(amdsmi_device_handle device_handle, uint32_t od); +amdsmi_status_t amdsmi_dev_set_overdrive_level(amdsmi_processor_handle device_handle, uint32_t od); /** * @brief Set the overdrive percent associated with the device with provided @@ -2562,7 +2562,7 @@ amdsmi_status_t amdsmi_dev_set_overdrive_level(amdsmi_device_handle device_hand * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_set_overdrive_level_v1(amdsmi_device_handle device_handle, uint32_t od); +amdsmi_status_t amdsmi_dev_set_overdrive_level_v1(amdsmi_processor_handle device_handle, uint32_t od); /** * @brief Control the set of allowed frequencies that can be used for the @@ -2596,7 +2596,7 @@ amdsmi_status_t amdsmi_dev_set_overdrive_level_v1(amdsmi_device_handle device_h * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_set_clk_freq(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_set_clk_freq(amdsmi_processor_handle device_handle, amdsmi_clk_type_t clk_type, uint64_t freq_bitmask); /** @} End PerfCont */ @@ -2679,7 +2679,7 @@ amdsmi_get_version_str(amdsmi_sw_component_t component, char *ver_str, * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_get_ecc_count(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_get_ecc_count(amdsmi_processor_handle device_handle, amdsmi_gpu_block_t block, amdsmi_error_count_t *ec); /** @@ -2706,7 +2706,7 @@ amdsmi_status_t amdsmi_dev_get_ecc_count(amdsmi_device_handle device_handle, * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_get_ecc_enabled(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_get_ecc_enabled(amdsmi_processor_handle device_handle, uint64_t *enabled_blocks); /** @@ -2730,7 +2730,7 @@ amdsmi_status_t amdsmi_dev_get_ecc_enabled(amdsmi_device_handle device_handle, * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_get_ecc_status(amdsmi_device_handle device_handle, amdsmi_gpu_block_t block, +amdsmi_status_t amdsmi_dev_get_ecc_status(amdsmi_processor_handle device_handle, amdsmi_gpu_block_t block, amdsmi_ras_err_state_t *state); /** @@ -2868,7 +2868,7 @@ amdsmi_status_string(amdsmi_status_t status, const char **status_string); * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_dev_counter_group_supported(amdsmi_device_handle device_handle, amdsmi_event_group_t group); +amdsmi_dev_counter_group_supported(amdsmi_processor_handle device_handle, amdsmi_event_group_t group); /** * @brief Create a performance counter object @@ -2895,7 +2895,7 @@ amdsmi_dev_counter_group_supported(amdsmi_device_handle device_handle, amdsmi_ev * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_dev_create_counter(amdsmi_device_handle device_handle, amdsmi_event_type_t type, +amdsmi_dev_create_counter(amdsmi_processor_handle device_handle, amdsmi_event_type_t type, amdsmi_event_handle_t *evnt_handle); /** @@ -2971,7 +2971,7 @@ amdsmi_read_counter(amdsmi_event_handle_t evt_handle, * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t - amdsmi_counter_get_available_counters(amdsmi_device_handle device_handle, + amdsmi_counter_get_available_counters(amdsmi_processor_handle device_handle, amdsmi_event_group_t grp, uint32_t *available); /** @} End PerfCntr */ @@ -3093,7 +3093,7 @@ amdsmi_get_compute_process_gpus(uint32_t pid, uint32_t *dv_indices, * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_dev_xgmi_error_status(amdsmi_device_handle device_handle, amdsmi_xgmi_status_t *status); +amdsmi_dev_xgmi_error_status(amdsmi_processor_handle device_handle, amdsmi_xgmi_status_t *status); /** * @brief Reset the XGMI error status for a device @@ -3107,7 +3107,7 @@ amdsmi_dev_xgmi_error_status(amdsmi_device_handle device_handle, amdsmi_xgmi_sta * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_dev_reset_xgmi_error(amdsmi_device_handle device_handle); +amdsmi_dev_reset_xgmi_error(amdsmi_processor_handle device_handle); /** @} End SysInfo */ @@ -3133,7 +3133,7 @@ amdsmi_dev_reset_xgmi_error(amdsmi_device_handle device_handle); * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_topo_get_numa_node_number(amdsmi_device_handle device_handle, uint32_t *numa_node); +amdsmi_topo_get_numa_node_number(amdsmi_processor_handle device_handle, uint32_t *numa_node); /** * @brief Retrieve the weight for a connection between 2 GPUs @@ -3154,7 +3154,7 @@ amdsmi_topo_get_numa_node_number(amdsmi_device_handle device_handle, uint32_t *n * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_topo_get_link_weight(amdsmi_device_handle device_handle_src, amdsmi_device_handle device_handle_dst, +amdsmi_topo_get_link_weight(amdsmi_processor_handle device_handle_src, amdsmi_processor_handle device_handle_dst, uint64_t *weight); /** @@ -3179,7 +3179,7 @@ amdsmi_topo_get_link_weight(amdsmi_device_handle device_handle_src, amdsmi_devic * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t - amdsmi_get_minmax_bandwidth(amdsmi_device_handle device_handle_src, amdsmi_device_handle device_handle_dst, + amdsmi_get_minmax_bandwidth(amdsmi_processor_handle device_handle_src, amdsmi_processor_handle device_handle_dst, uint64_t *min_bandwidth, uint64_t *max_bandwidth); /** @@ -3205,8 +3205,8 @@ amdsmi_status_t * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_topo_get_link_type(amdsmi_device_handle device_handle_src, - amdsmi_device_handle device_handle_dst, +amdsmi_topo_get_link_type(amdsmi_processor_handle device_handle_src, + amdsmi_processor_handle device_handle_dst, uint64_t *hops, AMDSMI_IO_LINK_TYPE *type); /** @@ -3228,7 +3228,7 @@ amdsmi_topo_get_link_type(amdsmi_device_handle device_handle_src, * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_is_P2P_accessible(amdsmi_device_handle device_handle_src, amdsmi_device_handle device_handle_dst, +amdsmi_is_P2P_accessible(amdsmi_processor_handle device_handle_src, amdsmi_processor_handle device_handle_dst, bool *accessible); /** @} End HWTopo */ @@ -3277,7 +3277,7 @@ amdsmi_is_P2P_accessible(amdsmi_device_handle device_handle_src, amdsmi_device_h * amdsmi_func_id_iter_handle_t iter_handle, var_iter, sub_var_iter; * amdsmi_func_id_value_t value; * amdsmi_status_t err; - * amdsmi_device_handle device; + * amdsmi_processor_handle device; * * // Get the device handle via amdsmi_get_device_handles() * // ... ... @@ -3366,7 +3366,7 @@ amdsmi_is_P2P_accessible(amdsmi_device_handle device_handle_src, amdsmi_device_h * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_dev_open_supported_func_iterator(amdsmi_device_handle device_handle, +amdsmi_dev_open_supported_func_iterator(amdsmi_processor_handle device_handle, amdsmi_func_id_iter_handle_t *handle); /** @@ -3471,7 +3471,7 @@ amdsmi_get_func_iter_value(amdsmi_func_id_iter_handle_t handle, * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_init_event_notification(amdsmi_device_handle device_handle); +amdsmi_init_event_notification(amdsmi_processor_handle device_handle); /** * @brief Specify which events to collect for a device @@ -3500,7 +3500,7 @@ amdsmi_init_event_notification(amdsmi_device_handle device_handle); * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t - amdsmi_set_event_notification_mask(amdsmi_device_handle device_handle, uint64_t mask); + amdsmi_set_event_notification_mask(amdsmi_processor_handle device_handle, uint64_t mask); /** * @brief Collect event notifications, waiting a specified amount of time @@ -3555,7 +3555,7 @@ amdsmi_status_t * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_stop_event_notification(amdsmi_device_handle device_handle); +amdsmi_status_t amdsmi_stop_event_notification(amdsmi_processor_handle device_handle); /** @} End EvntNotif */ @@ -3569,7 +3569,7 @@ amdsmi_status_t amdsmi_stop_event_notification(amdsmi_device_handle device_handl * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_device_bdf(amdsmi_device_handle device_handle, amdsmi_bdf_t *bdf); +amdsmi_get_device_bdf(amdsmi_processor_handle device_handle, amdsmi_bdf_t *bdf); /** * @brief Returns the UUID of the device @@ -3586,7 +3586,7 @@ amdsmi_get_device_bdf(amdsmi_device_handle device_handle, amdsmi_bdf_t *bdf); * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_device_uuid(amdsmi_device_handle device_handle, unsigned int *uuid_length, char *uuid); +amdsmi_get_device_uuid(amdsmi_processor_handle device_handle, unsigned int *uuid_length, char *uuid); /*****************************************************************************/ /** @defgroup swversion SW Version Information @@ -3608,7 +3608,7 @@ amdsmi_get_device_uuid(amdsmi_device_handle device_handle, unsigned int *uuid_le * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_driver_version(amdsmi_device_handle device_handle, int *length, char *version); +amdsmi_get_driver_version(amdsmi_processor_handle device_handle, int *length, char *version); /** @} End swversion */ @@ -3632,7 +3632,7 @@ amdsmi_get_driver_version(amdsmi_device_handle device_handle, int *length, char * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_asic_info(amdsmi_device_handle device_handle, amdsmi_asic_info_t *info); +amdsmi_get_asic_info(amdsmi_processor_handle device_handle, amdsmi_asic_info_t *info); /** * @brief Returns the board part number and board information for the requested device @@ -3645,7 +3645,7 @@ amdsmi_get_asic_info(amdsmi_device_handle device_handle, amdsmi_asic_info_t *inf * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_board_info(amdsmi_device_handle device_handle, amdsmi_board_info_t *info); +amdsmi_get_board_info(amdsmi_processor_handle device_handle, amdsmi_board_info_t *info); /** * @brief Returns the power caps as currently configured in the @@ -3660,7 +3660,7 @@ amdsmi_get_board_info(amdsmi_device_handle device_handle, amdsmi_board_info_t *i * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_power_cap_info(amdsmi_device_handle device_handle, uint32_t sensor_ind, +amdsmi_get_power_cap_info(amdsmi_processor_handle device_handle, uint32_t sensor_ind, amdsmi_power_cap_info_t *info); /** @@ -3675,7 +3675,7 @@ amdsmi_get_power_cap_info(amdsmi_device_handle device_handle, uint32_t sensor_in * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_xgmi_info(amdsmi_device_handle device_handle, amdsmi_xgmi_info_t *info); +amdsmi_get_xgmi_info(amdsmi_processor_handle device_handle, amdsmi_xgmi_info_t *info); /** * @brief Returns the device capabilities as currently configured in @@ -3689,7 +3689,7 @@ amdsmi_get_xgmi_info(amdsmi_device_handle device_handle, amdsmi_xgmi_info_t *inf * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_caps_info(amdsmi_device_handle device_handle, amdsmi_gpu_caps_t *info); +amdsmi_get_caps_info(amdsmi_processor_handle device_handle, amdsmi_gpu_caps_t *info); /** @} End asicinfo */ @@ -3708,7 +3708,7 @@ amdsmi_get_caps_info(amdsmi_device_handle device_handle, amdsmi_gpu_caps_t *info * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_fw_info(amdsmi_device_handle device_handle, amdsmi_fw_info_t *info); +amdsmi_get_fw_info(amdsmi_processor_handle device_handle, amdsmi_fw_info_t *info); /** * @brief Returns the static information for the vBIOS on the device. @@ -3721,7 +3721,7 @@ amdsmi_get_fw_info(amdsmi_device_handle device_handle, amdsmi_fw_info_t *info); * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_vbios_info(amdsmi_device_handle device_handle, amdsmi_vbios_info_t *info); +amdsmi_get_vbios_info(amdsmi_processor_handle device_handle, amdsmi_vbios_info_t *info); /** @} End fwinfo */ @@ -3741,7 +3741,7 @@ amdsmi_get_vbios_info(amdsmi_device_handle device_handle, amdsmi_vbios_info_t *i * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_gpu_activity(amdsmi_device_handle device_handle, amdsmi_engine_usage_t *info); +amdsmi_get_gpu_activity(amdsmi_processor_handle device_handle, amdsmi_engine_usage_t *info); /** * @brief Returns the current power and voltage of the GPU. @@ -3754,7 +3754,7 @@ amdsmi_get_gpu_activity(amdsmi_device_handle device_handle, amdsmi_engine_usage_ * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_power_measure(amdsmi_device_handle device_handle, amdsmi_power_measure_t *info); +amdsmi_get_power_measure(amdsmi_processor_handle device_handle, amdsmi_power_measure_t *info); /** * @brief Returns the measurements of the clocks in the GPU @@ -3771,7 +3771,7 @@ amdsmi_get_power_measure(amdsmi_device_handle device_handle, amdsmi_power_measur * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_clock_measure(amdsmi_device_handle device_handle, amdsmi_clk_type_t clk_type, amdsmi_clk_measure_t *info); +amdsmi_get_clock_measure(amdsmi_processor_handle device_handle, amdsmi_clk_type_t clk_type, amdsmi_clk_measure_t *info); /** * @brief Returns the VRAM usage (both total and used memory) @@ -3786,7 +3786,7 @@ amdsmi_get_clock_measure(amdsmi_device_handle device_handle, amdsmi_clk_type_t c * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_vram_usage(amdsmi_device_handle device_handle, amdsmi_vram_info_t *info); +amdsmi_get_vram_usage(amdsmi_processor_handle device_handle, amdsmi_vram_info_t *info); /** @} End gpumon */ @@ -3810,7 +3810,7 @@ amdsmi_get_vram_usage(amdsmi_device_handle device_handle, amdsmi_vram_info_t *in * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_target_frequency_range(amdsmi_device_handle device_handle, amdsmi_clk_type_t clk_type, amdsmi_frequency_range_t *range); +amdsmi_get_target_frequency_range(amdsmi_processor_handle device_handle, amdsmi_clk_type_t clk_type, amdsmi_frequency_range_t *range); /** @} End powermon */ @@ -3841,7 +3841,7 @@ amdsmi_get_target_frequency_range(amdsmi_device_handle device_handle, amdsmi_clk * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_process_list(amdsmi_device_handle device_handle, amdsmi_process_handle *list, uint32_t *max_processes); +amdsmi_get_process_list(amdsmi_processor_handle device_handle, amdsmi_process_handle *list, uint32_t *max_processes); /** * @brief Returns the process information of a given process. @@ -3857,7 +3857,7 @@ amdsmi_get_process_list(amdsmi_device_handle device_handle, amdsmi_process_handl * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_process_info(amdsmi_device_handle device_handle, amdsmi_process_handle process, amdsmi_proc_info_t *info); +amdsmi_get_process_info(amdsmi_processor_handle device_handle, amdsmi_process_handle process, amdsmi_proc_info_t *info); /** @} End processinfo */ @@ -3878,7 +3878,7 @@ amdsmi_get_process_info(amdsmi_device_handle device_handle, amdsmi_process_handl * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_ecc_error_count(amdsmi_device_handle device_handle, amdsmi_error_count_t *ec); +amdsmi_get_ecc_error_count(amdsmi_processor_handle device_handle, amdsmi_error_count_t *ec); /** @} End eccinfo */ diff --git a/projects/amdsmi/include/amd_smi/impl/amd_smi_system.h b/projects/amdsmi/include/amd_smi/impl/amd_smi_system.h index 58eb004197..53fbf248d5 100644 --- a/projects/amdsmi/include/amd_smi/impl/amd_smi_system.h +++ b/projects/amdsmi/include/amd_smi/impl/amd_smi_system.h @@ -69,11 +69,11 @@ class AMDSmiSystem { amdsmi_status_t handle_to_socket(amdsmi_socket_handle socket_handle, AMDSmiSocket** socket); - amdsmi_status_t handle_to_device(amdsmi_device_handle device_handle, + amdsmi_status_t handle_to_device(amdsmi_processor_handle device_handle, AMDSmiProcessor** device); amdsmi_status_t gpu_index_to_handle(uint32_t gpu_index, - amdsmi_device_handle* device_handle); + amdsmi_processor_handle* device_handle); private: AMDSmiSystem() : init_flag_(AMDSMI_INIT_AMD_GPUS) {} diff --git a/projects/amdsmi/py-interface/README.md b/projects/amdsmi/py-interface/README.md index 5b20b46eff..75394dd900 100644 --- a/projects/amdsmi/py-interface/README.md +++ b/projects/amdsmi/py-interface/README.md @@ -105,7 +105,7 @@ except AmdSmiException as e: ## amdsmi_get_device_type Description: Checks the type of device with provided handle. -Input parameters: device handle as an instance of `amdsmi_device_handle` +Input parameters: device handle as an instance of `amdsmi_processor_handle` Output: Integer, type of gpu diff --git a/projects/amdsmi/py-interface/amdsmi_interface.py b/projects/amdsmi/py-interface/amdsmi_interface.py index 0e93d31111..29a8c8311f 100644 --- a/projects/amdsmi/py-interface/amdsmi_interface.py +++ b/projects/amdsmi/py-interface/amdsmi_interface.py @@ -293,11 +293,11 @@ class AmdSmiUtilizationCounterType(IntEnum): class AmdSmiEventReader: def __init__( - self, device_handle: amdsmi_wrapper.amdsmi_device_handle, *event_types + self, device_handle: amdsmi_wrapper.amdsmi_processor_handle, *event_types ): - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) if not isinstance(event_types, Iterable): raise AmdSmiParameterException( @@ -508,12 +508,12 @@ def amdsmi_get_socket_info(socket_handle): return socket_info.value.decode() -def amdsmi_get_device_handles() -> List[amdsmi_wrapper.amdsmi_device_handle]: +def amdsmi_get_device_handles() -> List[amdsmi_wrapper.amdsmi_processor_handle]: socket_handles = amdsmi_get_socket_handles() devices = [] for socket in socket_handles: device_count = ctypes.c_uint32() - null_ptr = ctypes.POINTER(amdsmi_wrapper.amdsmi_device_handle)() + null_ptr = ctypes.POINTER(amdsmi_wrapper.amdsmi_processor_handle)() _check_res( amdsmi_wrapper.amdsmi_get_device_handles( socket, @@ -522,7 +522,7 @@ def amdsmi_get_device_handles() -> List[amdsmi_wrapper.amdsmi_device_handle]: ) ) device_handles = ( - amdsmi_wrapper.amdsmi_device_handle * device_count.value)() + amdsmi_wrapper.amdsmi_processor_handle * device_count.value)() _check_res( amdsmi_wrapper.amdsmi_get_device_handles( socket, @@ -532,7 +532,7 @@ def amdsmi_get_device_handles() -> List[amdsmi_wrapper.amdsmi_device_handle]: ) devices.extend( [ - amdsmi_wrapper.amdsmi_device_handle(device_handles[dev_idx]) + amdsmi_wrapper.amdsmi_processor_handle(device_handles[dev_idx]) for dev_idx in range(device_count.value) ] ) @@ -551,11 +551,11 @@ def amdsmi_shut_down(): def amdsmi_get_device_type( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> ctypes.c_uint32: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) dev_type = amdsmi_wrapper.device_type_t() @@ -566,10 +566,10 @@ def amdsmi_get_device_type( return dev_type.value -def amdsmi_get_device_bdf(device_handle: amdsmi_wrapper.amdsmi_device_handle) -> str: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): +def amdsmi_get_device_bdf(device_handle: amdsmi_wrapper.amdsmi_processor_handle) -> str: + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) bdf_info = amdsmi_wrapper.amdsmi_bdf_t() @@ -582,11 +582,11 @@ def amdsmi_get_device_bdf(device_handle: amdsmi_wrapper.amdsmi_device_handle) -> def amdsmi_get_asic_info( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> Dict[str, Any]: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) asic_info = amdsmi_wrapper.amdsmi_asic_info_t() @@ -606,11 +606,11 @@ def amdsmi_get_asic_info( def amdsmi_get_power_cap_info( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> Dict[str, Any]: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) power_info = amdsmi_wrapper.amdsmi_power_cap_info_t() @@ -627,11 +627,11 @@ def amdsmi_get_power_cap_info( "max_power_cap": power_info.max_power_cap} def amdsmi_get_caps_info( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> Dict[str, Any]: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) gpu_caps = amdsmi_wrapper.amdsmi_gpu_caps_t() @@ -654,11 +654,11 @@ def amdsmi_get_caps_info( def amdsmi_get_vbios_info( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> Dict[str, Any]: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) vbios_info = amdsmi_wrapper.amdsmi_vbios_info_t() @@ -677,11 +677,11 @@ def amdsmi_get_vbios_info( def amdsmi_get_gpu_activity( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> Dict[str, Any]: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) engine_usage = amdsmi_wrapper.amdsmi_engine_usage_t() @@ -699,12 +699,12 @@ def amdsmi_get_gpu_activity( def amdsmi_get_clock_measure( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, clock_type: amdsmi_wrapper.amdsmi_clk_type_t, ) -> Dict[str, Any]: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) if not isinstance(clock_type, AmdSmiClkType): raise AmdSmiParameterException(clock_type, AmdSmiClkType) @@ -727,11 +727,11 @@ def amdsmi_get_clock_measure( def amdsmi_get_bad_page_info( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> Union[list, str]: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) num_pages = ctypes.c_uint32() @@ -752,12 +752,12 @@ def amdsmi_get_bad_page_info( def amdsmi_get_target_frequency_range( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, clock_type: amdsmi_wrapper.amdsmi_clk_type_t, ) -> Dict[str, Any]: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) if not isinstance(clock_type, AmdSmiClkType): raise AmdSmiParameterException(clock_type, AmdSmiClkType) @@ -780,11 +780,11 @@ def amdsmi_get_target_frequency_range( def amdsmi_get_ecc_error_count( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> Dict[str, Any]: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) error_count = amdsmi_wrapper.amdsmi_error_count_t() @@ -801,11 +801,11 @@ def amdsmi_get_ecc_error_count( def amdsmi_get_board_info( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> Dict[str, Any]: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) board_info = amdsmi_wrapper.amdsmi_board_info_t() @@ -822,11 +822,11 @@ def amdsmi_get_board_info( def amdsmi_get_ras_block_features_enabled( - device_handle: amdsmi_wrapper.amdsmi_device_handle, -) -> List[Dict[str, str]]: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + device_handle: amdsmi_wrapper.amdsmi_processor_handle, +) -> Dict[str, Any]: + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) ras_state = amdsmi_wrapper.amdsmi_ras_err_state_t() @@ -854,11 +854,11 @@ def amdsmi_get_ras_block_features_enabled( def amdsmi_get_process_list( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> List[amdsmi_wrapper.amdsmi_process_handle]: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) max_processes = ctypes.c_uint32(0) @@ -882,12 +882,12 @@ def amdsmi_get_process_list( def amdsmi_get_process_info( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, process: amdsmi_wrapper.amdsmi_process_handle, ) -> Dict[str, Any]: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) if not isinstance(process, amdsmi_wrapper.amdsmi_process_handle): @@ -920,10 +920,10 @@ def amdsmi_get_process_info( } -def amdsmi_get_device_uuid(device_handle: amdsmi_wrapper.amdsmi_device_handle) -> str: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): +def amdsmi_get_device_uuid(device_handle: amdsmi_wrapper.amdsmi_processor_handle) -> str: + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) uuid = ctypes.create_string_buffer(_AMDSMI_GPU_UUID_SIZE) @@ -941,11 +941,11 @@ def amdsmi_get_device_uuid(device_handle: amdsmi_wrapper.amdsmi_device_handle) - def amdsmi_get_driver_version( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> str: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) length = ctypes.c_int() @@ -963,11 +963,11 @@ def amdsmi_get_driver_version( def amdsmi_get_power_measure( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> Dict[str, Any]: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) power_measure = amdsmi_wrapper.amdsmi_power_measure_t() @@ -986,11 +986,11 @@ def amdsmi_get_power_measure( def amdsmi_get_fw_info( - device_handle: amdsmi_wrapper.amdsmi_device_handle + device_handle: amdsmi_wrapper.amdsmi_processor_handle ) -> List[Dict[str, Any]]: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle) + device_handle, amdsmi_wrapper.amdsmi_processor_handle) fw_info = amdsmi_wrapper.amdsmi_fw_info_t() _check_res(amdsmi_wrapper.amdsmi_get_fw_info( device_handle, ctypes.byref(fw_info))) @@ -1006,11 +1006,11 @@ def amdsmi_get_fw_info( def amdsmi_get_vram_usage( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> Dict[str, Any]: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) vram_info = amdsmi_wrapper.amdsmi_vram_info_t() @@ -1023,11 +1023,11 @@ def amdsmi_get_vram_usage( def amdsmi_get_pcie_link_status( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> Dict[str, Any]: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) pcie_info = amdsmi_wrapper.amdsmi_pcie_info_t() @@ -1041,11 +1041,11 @@ def amdsmi_get_pcie_link_status( def amdsmi_get_pcie_link_caps( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> Dict[str, Any]: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) pcie_info = amdsmi_wrapper.amdsmi_pcie_info_t() @@ -1062,18 +1062,18 @@ def amdsmi_get_device_handle_from_bdf(bdf): if bdf is None: raise AmdSmiBdfFormatException(bdf) amdsmi_bdf = _make_amdsmi_bdf_from_list(bdf) - device_handle = amdsmi_wrapper.amdsmi_device_handle() + device_handle = amdsmi_wrapper.amdsmi_processor_handle() _check_res(amdsmi_wrapper.amdsmi_get_device_handle_from_bdf( amdsmi_bdf, ctypes.byref(device_handle))) return device_handle def amdsmi_dev_get_vendor_name( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> str: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) length = ctypes.c_uint64() @@ -1089,10 +1089,10 @@ def amdsmi_dev_get_vendor_name( return vendor_name.value.decode("utf-8") -def amdsmi_dev_get_id(device_handle: amdsmi_wrapper.amdsmi_device_handle): - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): +def amdsmi_dev_get_id(device_handle: amdsmi_wrapper.amdsmi_processor_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) id = ctypes.c_uint16() @@ -1102,10 +1102,10 @@ def amdsmi_dev_get_id(device_handle: amdsmi_wrapper.amdsmi_device_handle): return id.value -def amdsmi_dev_get_vram_vendor(device_handle: amdsmi_wrapper.amdsmi_device_handle): - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): +def amdsmi_dev_get_vram_vendor(device_handle: amdsmi_wrapper.amdsmi_processor_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) length = ctypes.c_uint32() @@ -1121,10 +1121,10 @@ def amdsmi_dev_get_vram_vendor(device_handle: amdsmi_wrapper.amdsmi_device_handl return vram_vendor.value.decode("utf-8") -def amdsmi_dev_get_drm_render_minor(device_handle: amdsmi_wrapper.amdsmi_device_handle): - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): +def amdsmi_dev_get_drm_render_minor(device_handle: amdsmi_wrapper.amdsmi_processor_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) minor = ctypes.c_uint32() @@ -1137,10 +1137,10 @@ def amdsmi_dev_get_drm_render_minor(device_handle: amdsmi_wrapper.amdsmi_device_ return minor.value -def amdsmi_dev_get_subsystem_id(device_handle: amdsmi_wrapper.amdsmi_device_handle): - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): +def amdsmi_dev_get_subsystem_id(device_handle: amdsmi_wrapper.amdsmi_processor_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) id = ctypes.c_uint16() @@ -1152,10 +1152,10 @@ def amdsmi_dev_get_subsystem_id(device_handle: amdsmi_wrapper.amdsmi_device_hand return id.value -def amdsmi_dev_get_subsystem_name(device_handle: amdsmi_wrapper.amdsmi_device_handle): - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): +def amdsmi_dev_get_subsystem_name(device_handle: amdsmi_wrapper.amdsmi_processor_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) length = ctypes.c_uint64() @@ -1200,11 +1200,11 @@ def amdsmi_get_version_str(sw_component: AmdSmiSwComponent): def amdsmi_topo_get_numa_node_number( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, ): - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) numa_node_number = ctypes.c_uint32() @@ -1219,17 +1219,17 @@ def amdsmi_topo_get_numa_node_number( def amdsmi_topo_get_link_weight( - device_handle_src: amdsmi_wrapper.amdsmi_device_handle, - device_handle_dst: amdsmi_wrapper.amdsmi_device_handle, + device_handle_src: amdsmi_wrapper.amdsmi_processor_handle, + device_handle_dst: amdsmi_wrapper.amdsmi_processor_handle, ): - if not isinstance(device_handle_src, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle_src, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle_src, amdsmi_wrapper.amdsmi_device_handle + device_handle_src, amdsmi_wrapper.amdsmi_processor_handle ) - if not isinstance(device_handle_dst, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle_dst, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle_dst, amdsmi_wrapper.amdsmi_device_handle + device_handle_dst, amdsmi_wrapper.amdsmi_processor_handle ) weight = ctypes.c_uint64() @@ -1244,17 +1244,17 @@ def amdsmi_topo_get_link_weight( def amdsmi_get_minmax_bandwidth( - device_handle_src: amdsmi_wrapper.amdsmi_device_handle, - device_handle_dst: amdsmi_wrapper.amdsmi_device_handle, + device_handle_src: amdsmi_wrapper.amdsmi_processor_handle, + device_handle_dst: amdsmi_wrapper.amdsmi_processor_handle, ): - if not isinstance(device_handle_src, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle_src, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle_src, amdsmi_wrapper.amdsmi_device_handle + device_handle_src, amdsmi_wrapper.amdsmi_processor_handle ) - if not isinstance(device_handle_dst, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle_dst, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle_dst, amdsmi_wrapper.amdsmi_device_handle + device_handle_dst, amdsmi_wrapper.amdsmi_processor_handle ) min_bandwidth = ctypes.c_uint64() @@ -1273,17 +1273,17 @@ def amdsmi_get_minmax_bandwidth( def amdsmi_topo_get_link_type( - device_handle_src: amdsmi_wrapper.amdsmi_device_handle, - device_handle_dst: amdsmi_wrapper.amdsmi_device_handle, + device_handle_src: amdsmi_wrapper.amdsmi_processor_handle, + device_handle_dst: amdsmi_wrapper.amdsmi_processor_handle, ): - if not isinstance(device_handle_src, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle_src, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle_src, amdsmi_wrapper.amdsmi_device_handle + device_handle_src, amdsmi_wrapper.amdsmi_processor_handle ) - if not isinstance(device_handle_dst, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle_dst, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle_dst, amdsmi_wrapper.amdsmi_device_handle + device_handle_dst, amdsmi_wrapper.amdsmi_processor_handle ) hops = ctypes.c_uint64() @@ -1302,17 +1302,17 @@ def amdsmi_topo_get_link_type( def amdsmi_is_P2P_accessible( - device_handle_src: amdsmi_wrapper.amdsmi_device_handle, - device_handle_dst: amdsmi_wrapper.amdsmi_device_handle, + device_handle_src: amdsmi_wrapper.amdsmi_processor_handle, + device_handle_dst: amdsmi_wrapper.amdsmi_processor_handle, ): - if not isinstance(device_handle_src, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle_src, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle_src, amdsmi_wrapper.amdsmi_device_handle + device_handle_src, amdsmi_wrapper.amdsmi_processor_handle ) - if not isinstance(device_handle_dst, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle_dst, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle_dst, amdsmi_wrapper.amdsmi_device_handle + device_handle_dst, amdsmi_wrapper.amdsmi_processor_handle ) accessible = ctypes.c_bool() @@ -1326,10 +1326,10 @@ def amdsmi_is_P2P_accessible( return accessible.value -def amdsmi_get_xgmi_info(device_handle: amdsmi_wrapper.amdsmi_device_handle): - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): +def amdsmi_get_xgmi_info(device_handle: amdsmi_wrapper.amdsmi_processor_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) xgmi_info = amdsmi_wrapper.amdsmi_xgmi_info_t() @@ -1345,12 +1345,12 @@ def amdsmi_get_xgmi_info(device_handle: amdsmi_wrapper.amdsmi_device_handle): def amdsmi_dev_counter_group_supported( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, event_group: AmdSmiEventGroup, ): - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) if not isinstance(event_group, AmdSmiEventGroup): raise AmdSmiParameterException(event_group, AmdSmiEventGroup) @@ -1362,12 +1362,12 @@ def amdsmi_dev_counter_group_supported( def amdsmi_dev_create_counter( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, event_type: AmdSmiEventType, ) -> amdsmi_wrapper.amdsmi_event_handle_t: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) if not isinstance(event_type, AmdSmiEventType): raise AmdSmiParameterException(event_type, AmdSmiEventType) @@ -1432,12 +1432,12 @@ def amdsmi_read_counter( def amdsmi_counter_get_available_counters( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, event_group: AmdSmiEventGroup, ) -> int: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) if not isinstance(event_group, AmdSmiEventGroup): raise AmdSmiParameterException(event_group, AmdSmiEventGroup) @@ -1453,12 +1453,12 @@ def amdsmi_counter_get_available_counters( def amdsmi_dev_set_perf_level( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, perf_level: AmdSmiDevPerfLevel, ): - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) if not isinstance(perf_level, AmdSmiDevPerfLevel): raise AmdSmiParameterException(perf_level, AmdSmiDevPerfLevel) @@ -1468,11 +1468,11 @@ def amdsmi_dev_set_perf_level( def amdsmi_dev_get_power_profile_presets( - device_handle: amdsmi_wrapper.amdsmi_device_handle, sensor_idx: int + device_handle: amdsmi_wrapper.amdsmi_processor_handle, sensor_idx: int ) -> Dict[str, Any]: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) if not isinstance(sensor_idx, int): raise AmdSmiParameterException(sensor_idx, int) @@ -1493,21 +1493,21 @@ def amdsmi_dev_get_power_profile_presets( } -def amdsmi_dev_reset_gpu(device_handle: amdsmi_wrapper.amdsmi_device_handle): - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): +def amdsmi_dev_reset_gpu(device_handle: amdsmi_wrapper.amdsmi_processor_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) _check_res(amdsmi_wrapper.amdsmi_dev_reset_gpu(device_handle)) def amdsmi_set_perf_determinism_mode( - device_handle: amdsmi_wrapper.amdsmi_device_handle, clock_value: int + device_handle: amdsmi_wrapper.amdsmi_processor_handle, clock_value: int ): - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) if not isinstance(clock_value, int): raise AmdSmiParameterException(clock_value, int) @@ -1520,11 +1520,11 @@ def amdsmi_set_perf_determinism_mode( def amdsmi_dev_set_fan_speed( - device_handle: amdsmi_wrapper.amdsmi_device_handle, sensor_idx: int, fan_speed: int + device_handle: amdsmi_wrapper.amdsmi_processor_handle, sensor_idx: int, fan_speed: int ): - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) if not isinstance(sensor_idx, int): raise AmdSmiParameterException(sensor_idx, int) @@ -1540,11 +1540,11 @@ def amdsmi_dev_set_fan_speed( def amdsmi_dev_reset_fan( - device_handle: amdsmi_wrapper.amdsmi_device_handle, sensor_idx: int + device_handle: amdsmi_wrapper.amdsmi_processor_handle, sensor_idx: int ): - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) if not isinstance(sensor_idx, int): raise AmdSmiParameterException(sensor_idx, int) @@ -1554,13 +1554,13 @@ def amdsmi_dev_reset_fan( def amdsmi_dev_set_clk_freq( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, clk_type: AmdSmiClkType, freq_bitmask: int, ): - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) if not isinstance(clk_type, AmdSmiClkType): raise AmdSmiParameterException(clk_type, AmdSmiParameterException) @@ -1575,11 +1575,11 @@ def amdsmi_dev_set_clk_freq( def amdsmi_dev_set_overdrive_level_v1( - device_handle: amdsmi_wrapper.amdsmi_device_handle, overdrive_value: int + device_handle: amdsmi_wrapper.amdsmi_processor_handle, overdrive_value: int ): - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) if not isinstance(overdrive_value, int): raise AmdSmiParameterException(overdrive_value, int) @@ -1592,11 +1592,11 @@ def amdsmi_dev_set_overdrive_level_v1( def amdsmi_dev_set_overdrive_level( - device_handle: amdsmi_wrapper.amdsmi_device_handle, overdrive_value: int + device_handle: amdsmi_wrapper.amdsmi_processor_handle, overdrive_value: int ): - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) if not isinstance(overdrive_value, int): raise AmdSmiParameterException(overdrive_value, int) @@ -1609,11 +1609,11 @@ def amdsmi_dev_set_overdrive_level( def amdsmi_dev_open_supported_func_iterator( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> amdsmi_wrapper.amdsmi_func_id_iter_handle_t: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) obj_handle = amdsmi_wrapper.amdsmi_func_id_iter_handle_t() @@ -1626,10 +1626,10 @@ def amdsmi_dev_open_supported_func_iterator( return obj_handle -def amdsmi_dev_get_pci_id(device_handle: amdsmi_wrapper.amdsmi_device_handle): - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): +def amdsmi_dev_get_pci_id(device_handle: amdsmi_wrapper.amdsmi_processor_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) bdfid = ctypes.c_uint64() @@ -1717,11 +1717,11 @@ def amdsmi_get_func_iter_value( def amdsmi_dev_set_pci_bandwidth( - device_handle: amdsmi_wrapper.amdsmi_device_handle, bitmask: int + device_handle: amdsmi_wrapper.amdsmi_processor_handle, bitmask: int ) -> None: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) if not isinstance(bitmask, int): @@ -1742,10 +1742,10 @@ def _format_transfer_rate(transfer_rate): } -def amdsmi_dev_get_pci_bandwidth(device_handle: amdsmi_wrapper.amdsmi_device_handle): - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): +def amdsmi_dev_get_pci_bandwidth(device_handle: amdsmi_wrapper.amdsmi_processor_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) bandwidth = amdsmi_wrapper.amdsmi_pcie_bandwidth_t() @@ -1763,10 +1763,10 @@ def amdsmi_dev_get_pci_bandwidth(device_handle: amdsmi_wrapper.amdsmi_device_han } -def amdsmi_dev_get_pci_throughput(device_handle: amdsmi_wrapper.amdsmi_device_handle): - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): +def amdsmi_dev_get_pci_throughput(device_handle: amdsmi_wrapper.amdsmi_processor_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) sent = ctypes.c_uint64() @@ -1785,10 +1785,10 @@ def amdsmi_dev_get_pci_throughput(device_handle: amdsmi_wrapper.amdsmi_device_ha } -def amdsmi_dev_get_pci_replay_counter(device_handle: amdsmi_wrapper.amdsmi_device_handle): - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): +def amdsmi_dev_get_pci_replay_counter(device_handle: amdsmi_wrapper.amdsmi_processor_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) counter = ctypes.c_uint64() @@ -1801,10 +1801,10 @@ def amdsmi_dev_get_pci_replay_counter(device_handle: amdsmi_wrapper.amdsmi_devic return counter.value -def amdsmi_topo_get_numa_affinity(device_handle: amdsmi_wrapper.amdsmi_device_handle): - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): +def amdsmi_topo_get_numa_affinity(device_handle: amdsmi_wrapper.amdsmi_processor_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) numa_node = ctypes.c_uint32() @@ -1818,11 +1818,11 @@ def amdsmi_topo_get_numa_affinity(device_handle: amdsmi_wrapper.amdsmi_device_ha def amdsmi_dev_set_power_cap( - device_handle: amdsmi_wrapper.amdsmi_device_handle, sensor_ind: int, cap: int + device_handle: amdsmi_wrapper.amdsmi_processor_handle, sensor_ind: int, cap: int ) -> None: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) if not isinstance(sensor_ind, int): @@ -1838,10 +1838,10 @@ def amdsmi_dev_set_power_cap( ) -def amdsmi_dev_get_power_ave(device_handle: amdsmi_wrapper.amdsmi_device_handle, sensor_id: ctypes.c_uint32): - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): +def amdsmi_dev_get_power_ave(device_handle: amdsmi_wrapper.amdsmi_processor_handle, sensor_id: ctypes.c_uint32): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) power = ctypes.c_uint64() @@ -1855,13 +1855,13 @@ def amdsmi_dev_get_power_ave(device_handle: amdsmi_wrapper.amdsmi_device_handle, def amdsmi_dev_set_power_profile( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, reserved: int, profile: AmdSmiPowerProfilePresetMasks, ) -> None: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) if not isinstance(reserved, int): @@ -1877,10 +1877,10 @@ def amdsmi_dev_set_power_profile( ) -def amdsmi_dev_get_energy_count(device_handle: amdsmi_wrapper.amdsmi_device_handle): - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): +def amdsmi_dev_get_energy_count(device_handle: amdsmi_wrapper.amdsmi_processor_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) power = ctypes.c_uint64() @@ -1900,14 +1900,14 @@ def amdsmi_dev_get_energy_count(device_handle: amdsmi_wrapper.amdsmi_device_hand def amdsmi_dev_set_clk_range( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, min_clk_value: int, max_clk_value: int, clk_type: AmdSmiClkType, ) -> None: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) if not isinstance(min_clk_value, int): @@ -1929,10 +1929,10 @@ def amdsmi_dev_set_clk_range( ) -def amdsmi_dev_get_memory_total(device_handle: amdsmi_wrapper.amdsmi_device_handle, mem_type: AmdSmiMemoryType): - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): +def amdsmi_dev_get_memory_total(device_handle: amdsmi_wrapper.amdsmi_processor_handle, mem_type: AmdSmiMemoryType): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) if not isinstance(mem_type, AmdSmiMemoryType): @@ -1951,14 +1951,14 @@ def amdsmi_dev_get_memory_total(device_handle: amdsmi_wrapper.amdsmi_device_hand def amdsmi_dev_set_od_clk_info( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, level: AmdSmiFreqInd, value: int, clk_type: AmdSmiClkType, ) -> None: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) if not isinstance(level, AmdSmiFreqInd): @@ -1977,10 +1977,10 @@ def amdsmi_dev_set_od_clk_info( ) -def amdsmi_dev_get_memory_usage(device_handle: amdsmi_wrapper.amdsmi_device_handle, mem_type: AmdSmiMemoryType): - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): +def amdsmi_dev_get_memory_usage(device_handle: amdsmi_wrapper.amdsmi_processor_handle, mem_type: AmdSmiMemoryType): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) if not isinstance(mem_type, AmdSmiMemoryType): @@ -1999,14 +1999,14 @@ def amdsmi_dev_get_memory_usage(device_handle: amdsmi_wrapper.amdsmi_device_hand def amdsmi_dev_set_od_volt_info( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, vpoint: int, clk_value: int, volt_value: int, ) -> None: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) if not isinstance(vpoint, int): @@ -2028,10 +2028,10 @@ def amdsmi_dev_set_od_volt_info( ) -def amdsmi_dev_get_memory_busy_percent(device_handle: amdsmi_wrapper.amdsmi_device_handle): - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): +def amdsmi_dev_get_memory_busy_percent(device_handle: amdsmi_wrapper.amdsmi_processor_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) busy_percent = ctypes.c_uint32() @@ -2045,12 +2045,12 @@ def amdsmi_dev_get_memory_busy_percent(device_handle: amdsmi_wrapper.amdsmi_devi def amdsmi_dev_set_perf_level_v1( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, perf_lvl: AmdSmiDevPerfLevel, ) -> None: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) if not isinstance(perf_lvl, AmdSmiDevPerfLevel): @@ -2061,11 +2061,11 @@ def amdsmi_dev_set_perf_level_v1( def amdsmi_dev_get_fan_rpms( - device_handle: amdsmi_wrapper.amdsmi_device_handle, sensor_idx: int + device_handle: amdsmi_wrapper.amdsmi_processor_handle, sensor_idx: int ) -> int: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) if not isinstance(sensor_idx, int): raise AmdSmiParameterException(sensor_idx, int) @@ -2080,11 +2080,11 @@ def amdsmi_dev_get_fan_rpms( def amdsmi_dev_get_fan_speed( - device_handle: amdsmi_wrapper.amdsmi_device_handle, sensor_idx: int + device_handle: amdsmi_wrapper.amdsmi_processor_handle, sensor_idx: int ) -> int: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) if not isinstance(sensor_idx, int): raise AmdSmiParameterException(sensor_idx, int) @@ -2099,11 +2099,11 @@ def amdsmi_dev_get_fan_speed( def amdsmi_dev_get_fan_speed_max( - device_handle: amdsmi_wrapper.amdsmi_device_handle, sensor_idx: int + device_handle: amdsmi_wrapper.amdsmi_processor_handle, sensor_idx: int ) -> int: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) if not isinstance(sensor_idx, int): raise AmdSmiParameterException(sensor_idx, int) @@ -2118,13 +2118,13 @@ def amdsmi_dev_get_fan_speed_max( def amdsmi_dev_get_temp_metric( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, sensor_type: AmdSmiTemperatureType, metric: AmdSmiTemperatureMetric, ) -> int: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) if not isinstance(sensor_type, AmdSmiTemperatureType): raise AmdSmiParameterException(sensor_type, AmdSmiTemperatureType) @@ -2142,13 +2142,13 @@ def amdsmi_dev_get_temp_metric( def amdsmi_dev_get_volt_metric( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, sensor_type: AmdSmiVoltageType, metric: AmdSmiVoltageMetric, ) -> int: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) if not isinstance(sensor_type, AmdSmiVoltageType): raise AmdSmiParameterException(sensor_type, AmdSmiVoltageType) @@ -2166,11 +2166,11 @@ def amdsmi_dev_get_volt_metric( def amdsmi_dev_get_busy_percent( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> int: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) busy_percent = ctypes.c_uint32() @@ -2184,12 +2184,12 @@ def amdsmi_dev_get_busy_percent( def amdsmi_get_utilization_count( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, *counter_types: Tuple[AmdSmiUtilizationCounterType] ) -> List[Dict[str, Any]]: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) if not len(counter_types): raise AmdSmiLibraryException(amdsmi_wrapper.AMDSMI_STATUS_INVAL) @@ -2230,11 +2230,11 @@ def amdsmi_get_utilization_count( def amdsmi_dev_get_perf_level( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> str: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) perf = amdsmi_wrapper.amdsmi_dev_perf_level_t() @@ -2253,12 +2253,26 @@ def amdsmi_dev_get_perf_level( return result -def amdsmi_dev_get_overdrive_level( - device_handle: amdsmi_wrapper.amdsmi_device_handle, -) -> int: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): +def amdsmi_set_perf_determinism_mode( + device_handle: amdsmi_wrapper.amdsmi_processor_handle, clkvalue: int +) -> None: + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle + ) + if not isinstance(clkvalue, int): + raise AmdSmiParameterException(clkvalue, int) + + _check_res(amdsmi_wrapper.amdsmi_set_perf_determinism_mode( + device_handle, clkvalue)) + + +def amdsmi_dev_get_overdrive_level( + device_handle: amdsmi_wrapper.amdsmi_processor_handle, +) -> int: + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): + raise AmdSmiParameterException( + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) od_level = ctypes.c_uint32() @@ -2272,11 +2286,11 @@ def amdsmi_dev_get_overdrive_level( def amdsmi_dev_get_gpu_clk_freq( - device_handle: amdsmi_wrapper.amdsmi_device_handle, clk_type: AmdSmiClkType + device_handle: amdsmi_wrapper.amdsmi_processor_handle, clk_type: AmdSmiClkType ) -> Dict[str, Any]: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) if not isinstance(clk_type, AmdSmiClkType): raise AmdSmiParameterException(clk_type, AmdSmiClkType) @@ -2296,11 +2310,11 @@ def amdsmi_dev_get_gpu_clk_freq( def amdsmi_dev_get_od_volt_info( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> Dict[str, Any]: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) freq_data = amdsmi_wrapper.amdsmi_od_volt_freq_data_t() @@ -2333,11 +2347,11 @@ def amdsmi_dev_get_od_volt_info( def amdsmi_dev_get_gpu_metrics_info( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> Dict[str, Any]: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) gpu_metrics = amdsmi_wrapper.amdsmi_gpu_metrics_t() @@ -2386,11 +2400,11 @@ def amdsmi_dev_get_gpu_metrics_info( def amdsmi_dev_get_od_volt_curve_regions( - device_handle: amdsmi_wrapper.amdsmi_device_handle, num_regions: int + device_handle: amdsmi_wrapper.amdsmi_processor_handle, num_regions: int ) -> List[Dict[str, Any]]: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) if not isinstance(num_regions, int): raise AmdSmiParameterException(num_regions, int) @@ -2424,12 +2438,36 @@ def amdsmi_dev_get_od_volt_curve_regions( return result -def amdsmi_dev_get_ecc_count( - device_handle: amdsmi_wrapper.amdsmi_device_handle, block: AmdSmiGpuBlock -) -> Dict[str, int]: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): +def amdsmi_dev_get_power_profile_presets( + device_handle: amdsmi_wrapper.amdsmi_processor_handle, sensor_idx: int +) -> Dict[str, Any]: + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle + ) + if not isinstance(sensor_idx, int): + raise AmdSmiParameterException(sensor_idx, int) + + status = amdsmi_wrapper.amdsmi_power_profile_status_t() + _check_res( + amdsmi_wrapper. amdsmi_dev_get_power_profile_presets( + device_handle, sensor_idx, ctypes.byref(status) + ) + ) + + return { + "available_profiles": status.available_profiles, + "current": status.current, + "num_profiles": status.num_profiles, + } + + +def amdsmi_dev_get_ecc_count( + device_handle: amdsmi_wrapper.amdsmi_processor_handle, block: AmdSmiGpuBlock +) -> Dict[str, int]: + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): + raise AmdSmiParameterException( + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) if not isinstance(block, AmdSmiGpuBlock): @@ -2448,11 +2486,11 @@ def amdsmi_dev_get_ecc_count( def amdsmi_dev_get_ecc_enabled( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> int: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) blocks = ctypes.c_uint64(0) @@ -2465,11 +2503,11 @@ def amdsmi_dev_get_ecc_enabled( def amdsmi_dev_get_ecc_status( - device_handle: amdsmi_wrapper.amdsmi_device_handle, block: AmdSmiGpuBlock + device_handle: amdsmi_wrapper.amdsmi_processor_handle, block: AmdSmiGpuBlock ) -> AmdSmiRasErrState: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) if not isinstance(block, AmdSmiGpuBlock): @@ -2566,11 +2604,11 @@ def amdsmi_get_compute_process_gpus(pid: int) -> List[int]: def amdsmi_dev_xgmi_error_status( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> AmdSmiXgmiStatus: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) status = amdsmi_wrapper.amdsmi_xgmi_status_t() @@ -2583,22 +2621,22 @@ def amdsmi_dev_xgmi_error_status( def amdsmi_dev_reset_xgmi_error( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> None: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) _check_res(amdsmi_wrapper.amdsmi_dev_reset_xgmi_error(device_handle)) def amdsmi_dev_get_memory_reserved_pages( - device_handle: amdsmi_wrapper.amdsmi_device_handle, + device_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> Union[list, str]: - if not isinstance(device_handle, amdsmi_wrapper.amdsmi_device_handle): + if not isinstance(device_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( - device_handle, amdsmi_wrapper.amdsmi_device_handle + device_handle, amdsmi_wrapper.amdsmi_processor_handle ) num_pages = ctypes.c_uint32() diff --git a/projects/amdsmi/py-interface/amdsmi_wrapper.py b/projects/amdsmi/py-interface/amdsmi_wrapper.py index fbb3b5de19..105c190480 100644 --- a/projects/amdsmi/py-interface/amdsmi_wrapper.py +++ b/projects/amdsmi/py-interface/amdsmi_wrapper.py @@ -229,7 +229,7 @@ CONTAINER_DOCKER = 1 c__EA_amdsmi_container_types_t = ctypes.c_uint32 # enum amdsmi_container_types_t = c__EA_amdsmi_container_types_t amdsmi_container_types_t__enumvalues = c__EA_amdsmi_container_types_t__enumvalues -amdsmi_device_handle = ctypes.POINTER(None) +amdsmi_processor_handle = ctypes.POINTER(None) amdsmi_socket_handle = ctypes.POINTER(None) # values for enumeration 'c__EA_device_type_t' @@ -1416,161 +1416,161 @@ amdsmi_get_device_handles.restype = amdsmi_status_t amdsmi_get_device_handles.argtypes = [amdsmi_socket_handle, ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(ctypes.POINTER(None))] amdsmi_get_device_type = _libraries['libamd_smi.so'].amdsmi_get_device_type amdsmi_get_device_type.restype = amdsmi_status_t -amdsmi_get_device_type.argtypes = [amdsmi_device_handle, ctypes.POINTER(c__EA_device_type_t)] +amdsmi_get_device_type.argtypes = [amdsmi_processor_handle, ctypes.POINTER(c__EA_device_type_t)] amdsmi_get_device_handle_from_bdf = _libraries['libamd_smi.so'].amdsmi_get_device_handle_from_bdf amdsmi_get_device_handle_from_bdf.restype = amdsmi_status_t amdsmi_get_device_handle_from_bdf.argtypes = [amdsmi_bdf_t, ctypes.POINTER(ctypes.POINTER(None))] amdsmi_dev_get_id = _libraries['libamd_smi.so'].amdsmi_dev_get_id amdsmi_dev_get_id.restype = amdsmi_status_t -amdsmi_dev_get_id.argtypes = [amdsmi_device_handle, ctypes.POINTER(ctypes.c_uint16)] +amdsmi_dev_get_id.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint16)] amdsmi_dev_get_vendor_name = _libraries['libamd_smi.so'].amdsmi_dev_get_vendor_name amdsmi_dev_get_vendor_name.restype = amdsmi_status_t -amdsmi_dev_get_vendor_name.argtypes = [amdsmi_device_handle, ctypes.POINTER(ctypes.c_char), size_t] +amdsmi_dev_get_vendor_name.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_char), size_t] uint32_t = ctypes.c_uint32 amdsmi_dev_get_vram_vendor = _libraries['libamd_smi.so'].amdsmi_dev_get_vram_vendor amdsmi_dev_get_vram_vendor.restype = amdsmi_status_t -amdsmi_dev_get_vram_vendor.argtypes = [amdsmi_device_handle, ctypes.POINTER(ctypes.c_char), uint32_t] +amdsmi_dev_get_vram_vendor.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_char), uint32_t] amdsmi_dev_get_subsystem_id = _libraries['libamd_smi.so'].amdsmi_dev_get_subsystem_id amdsmi_dev_get_subsystem_id.restype = amdsmi_status_t -amdsmi_dev_get_subsystem_id.argtypes = [amdsmi_device_handle, ctypes.POINTER(ctypes.c_uint16)] +amdsmi_dev_get_subsystem_id.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint16)] amdsmi_dev_get_subsystem_name = _libraries['libamd_smi.so'].amdsmi_dev_get_subsystem_name amdsmi_dev_get_subsystem_name.restype = amdsmi_status_t -amdsmi_dev_get_subsystem_name.argtypes = [amdsmi_device_handle, ctypes.POINTER(ctypes.c_char), size_t] +amdsmi_dev_get_subsystem_name.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_char), size_t] amdsmi_dev_get_drm_render_minor = _libraries['libamd_smi.so'].amdsmi_dev_get_drm_render_minor amdsmi_dev_get_drm_render_minor.restype = amdsmi_status_t -amdsmi_dev_get_drm_render_minor.argtypes = [amdsmi_device_handle, ctypes.POINTER(ctypes.c_uint32)] +amdsmi_dev_get_drm_render_minor.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32)] amdsmi_dev_get_pci_bandwidth = _libraries['libamd_smi.so'].amdsmi_dev_get_pci_bandwidth amdsmi_dev_get_pci_bandwidth.restype = amdsmi_status_t -amdsmi_dev_get_pci_bandwidth.argtypes = [amdsmi_device_handle, ctypes.POINTER(struct_c__SA_amdsmi_pcie_bandwidth_t)] +amdsmi_dev_get_pci_bandwidth.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_pcie_bandwidth_t)] amdsmi_dev_get_pci_id = _libraries['libamd_smi.so'].amdsmi_dev_get_pci_id amdsmi_dev_get_pci_id.restype = amdsmi_status_t -amdsmi_dev_get_pci_id.argtypes = [amdsmi_device_handle, ctypes.POINTER(ctypes.c_uint64)] +amdsmi_dev_get_pci_id.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint64)] amdsmi_topo_get_numa_affinity = _libraries['libamd_smi.so'].amdsmi_topo_get_numa_affinity amdsmi_topo_get_numa_affinity.restype = amdsmi_status_t -amdsmi_topo_get_numa_affinity.argtypes = [amdsmi_device_handle, ctypes.POINTER(ctypes.c_uint32)] +amdsmi_topo_get_numa_affinity.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32)] amdsmi_dev_get_pci_throughput = _libraries['libamd_smi.so'].amdsmi_dev_get_pci_throughput amdsmi_dev_get_pci_throughput.restype = amdsmi_status_t -amdsmi_dev_get_pci_throughput.argtypes = [amdsmi_device_handle, ctypes.POINTER(ctypes.c_uint64), ctypes.POINTER(ctypes.c_uint64), ctypes.POINTER(ctypes.c_uint64)] +amdsmi_dev_get_pci_throughput.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint64), ctypes.POINTER(ctypes.c_uint64), ctypes.POINTER(ctypes.c_uint64)] amdsmi_dev_get_pci_replay_counter = _libraries['libamd_smi.so'].amdsmi_dev_get_pci_replay_counter amdsmi_dev_get_pci_replay_counter.restype = amdsmi_status_t -amdsmi_dev_get_pci_replay_counter.argtypes = [amdsmi_device_handle, ctypes.POINTER(ctypes.c_uint64)] +amdsmi_dev_get_pci_replay_counter.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint64)] amdsmi_dev_set_pci_bandwidth = _libraries['libamd_smi.so'].amdsmi_dev_set_pci_bandwidth amdsmi_dev_set_pci_bandwidth.restype = amdsmi_status_t -amdsmi_dev_set_pci_bandwidth.argtypes = [amdsmi_device_handle, uint64_t] +amdsmi_dev_set_pci_bandwidth.argtypes = [amdsmi_processor_handle, uint64_t] amdsmi_dev_get_power_ave = _libraries['libamd_smi.so'].amdsmi_dev_get_power_ave amdsmi_dev_get_power_ave.restype = amdsmi_status_t -amdsmi_dev_get_power_ave.argtypes = [amdsmi_device_handle, uint32_t, ctypes.POINTER(ctypes.c_uint64)] +amdsmi_dev_get_power_ave.argtypes = [amdsmi_processor_handle, uint32_t, ctypes.POINTER(ctypes.c_uint64)] amdsmi_dev_get_energy_count = _libraries['libamd_smi.so'].amdsmi_dev_get_energy_count amdsmi_dev_get_energy_count.restype = amdsmi_status_t -amdsmi_dev_get_energy_count.argtypes = [amdsmi_device_handle, ctypes.POINTER(ctypes.c_uint64), ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_uint64)] +amdsmi_dev_get_energy_count.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint64), ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_uint64)] amdsmi_dev_set_power_cap = _libraries['libamd_smi.so'].amdsmi_dev_set_power_cap amdsmi_dev_set_power_cap.restype = amdsmi_status_t -amdsmi_dev_set_power_cap.argtypes = [amdsmi_device_handle, uint32_t, uint64_t] +amdsmi_dev_set_power_cap.argtypes = [amdsmi_processor_handle, uint32_t, uint64_t] amdsmi_dev_set_power_profile = _libraries['libamd_smi.so'].amdsmi_dev_set_power_profile amdsmi_dev_set_power_profile.restype = amdsmi_status_t -amdsmi_dev_set_power_profile.argtypes = [amdsmi_device_handle, uint32_t, amdsmi_power_profile_preset_masks_t] +amdsmi_dev_set_power_profile.argtypes = [amdsmi_processor_handle, uint32_t, amdsmi_power_profile_preset_masks_t] amdsmi_dev_get_memory_total = _libraries['libamd_smi.so'].amdsmi_dev_get_memory_total amdsmi_dev_get_memory_total.restype = amdsmi_status_t -amdsmi_dev_get_memory_total.argtypes = [amdsmi_device_handle, amdsmi_memory_type_t, ctypes.POINTER(ctypes.c_uint64)] +amdsmi_dev_get_memory_total.argtypes = [amdsmi_processor_handle, amdsmi_memory_type_t, ctypes.POINTER(ctypes.c_uint64)] amdsmi_dev_get_memory_usage = _libraries['libamd_smi.so'].amdsmi_dev_get_memory_usage amdsmi_dev_get_memory_usage.restype = amdsmi_status_t -amdsmi_dev_get_memory_usage.argtypes = [amdsmi_device_handle, amdsmi_memory_type_t, ctypes.POINTER(ctypes.c_uint64)] +amdsmi_dev_get_memory_usage.argtypes = [amdsmi_processor_handle, amdsmi_memory_type_t, ctypes.POINTER(ctypes.c_uint64)] amdsmi_get_bad_page_info = _libraries['libamd_smi.so'].amdsmi_get_bad_page_info amdsmi_get_bad_page_info.restype = amdsmi_status_t -amdsmi_get_bad_page_info.argtypes = [amdsmi_device_handle, ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(struct_c__SA_amdsmi_retired_page_record_t)] +amdsmi_get_bad_page_info.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(struct_c__SA_amdsmi_retired_page_record_t)] amdsmi_get_ras_block_features_enabled = _libraries['libamd_smi.so'].amdsmi_get_ras_block_features_enabled amdsmi_get_ras_block_features_enabled.restype = amdsmi_status_t -amdsmi_get_ras_block_features_enabled.argtypes = [amdsmi_device_handle, amdsmi_gpu_block_t, ctypes.POINTER(c__EA_amdsmi_ras_err_state_t)] +amdsmi_get_ras_block_features_enabled.argtypes = [amdsmi_processor_handle, amdsmi_gpu_block_t, ctypes.POINTER(c__EA_amdsmi_ras_err_state_t)] amdsmi_dev_get_memory_busy_percent = _libraries['libamd_smi.so'].amdsmi_dev_get_memory_busy_percent amdsmi_dev_get_memory_busy_percent.restype = amdsmi_status_t -amdsmi_dev_get_memory_busy_percent.argtypes = [amdsmi_device_handle, ctypes.POINTER(ctypes.c_uint32)] +amdsmi_dev_get_memory_busy_percent.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32)] amdsmi_dev_get_memory_reserved_pages = _libraries['libamd_smi.so'].amdsmi_dev_get_memory_reserved_pages amdsmi_dev_get_memory_reserved_pages.restype = amdsmi_status_t -amdsmi_dev_get_memory_reserved_pages.argtypes = [amdsmi_device_handle, ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(struct_c__SA_amdsmi_retired_page_record_t)] +amdsmi_dev_get_memory_reserved_pages.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(struct_c__SA_amdsmi_retired_page_record_t)] amdsmi_dev_get_fan_rpms = _libraries['libamd_smi.so'].amdsmi_dev_get_fan_rpms amdsmi_dev_get_fan_rpms.restype = amdsmi_status_t -amdsmi_dev_get_fan_rpms.argtypes = [amdsmi_device_handle, uint32_t, ctypes.POINTER(ctypes.c_int64)] +amdsmi_dev_get_fan_rpms.argtypes = [amdsmi_processor_handle, uint32_t, ctypes.POINTER(ctypes.c_int64)] amdsmi_dev_get_fan_speed = _libraries['libamd_smi.so'].amdsmi_dev_get_fan_speed amdsmi_dev_get_fan_speed.restype = amdsmi_status_t -amdsmi_dev_get_fan_speed.argtypes = [amdsmi_device_handle, uint32_t, ctypes.POINTER(ctypes.c_int64)] +amdsmi_dev_get_fan_speed.argtypes = [amdsmi_processor_handle, uint32_t, ctypes.POINTER(ctypes.c_int64)] amdsmi_dev_get_fan_speed_max = _libraries['libamd_smi.so'].amdsmi_dev_get_fan_speed_max amdsmi_dev_get_fan_speed_max.restype = amdsmi_status_t -amdsmi_dev_get_fan_speed_max.argtypes = [amdsmi_device_handle, uint32_t, ctypes.POINTER(ctypes.c_uint64)] +amdsmi_dev_get_fan_speed_max.argtypes = [amdsmi_processor_handle, uint32_t, ctypes.POINTER(ctypes.c_uint64)] amdsmi_dev_get_temp_metric = _libraries['libamd_smi.so'].amdsmi_dev_get_temp_metric amdsmi_dev_get_temp_metric.restype = amdsmi_status_t -amdsmi_dev_get_temp_metric.argtypes = [amdsmi_device_handle, amdsmi_temperature_type_t, amdsmi_temperature_metric_t, ctypes.POINTER(ctypes.c_int64)] +amdsmi_dev_get_temp_metric.argtypes = [amdsmi_processor_handle, amdsmi_temperature_type_t, amdsmi_temperature_metric_t, ctypes.POINTER(ctypes.c_int64)] amdsmi_dev_get_volt_metric = _libraries['libamd_smi.so'].amdsmi_dev_get_volt_metric amdsmi_dev_get_volt_metric.restype = amdsmi_status_t -amdsmi_dev_get_volt_metric.argtypes = [amdsmi_device_handle, amdsmi_voltage_type_t, amdsmi_voltage_metric_t, ctypes.POINTER(ctypes.c_int64)] +amdsmi_dev_get_volt_metric.argtypes = [amdsmi_processor_handle, amdsmi_voltage_type_t, amdsmi_voltage_metric_t, ctypes.POINTER(ctypes.c_int64)] amdsmi_dev_reset_fan = _libraries['libamd_smi.so'].amdsmi_dev_reset_fan amdsmi_dev_reset_fan.restype = amdsmi_status_t -amdsmi_dev_reset_fan.argtypes = [amdsmi_device_handle, uint32_t] +amdsmi_dev_reset_fan.argtypes = [amdsmi_processor_handle, uint32_t] amdsmi_dev_set_fan_speed = _libraries['libamd_smi.so'].amdsmi_dev_set_fan_speed amdsmi_dev_set_fan_speed.restype = amdsmi_status_t -amdsmi_dev_set_fan_speed.argtypes = [amdsmi_device_handle, uint32_t, uint64_t] +amdsmi_dev_set_fan_speed.argtypes = [amdsmi_processor_handle, uint32_t, uint64_t] amdsmi_dev_get_busy_percent = _libraries['libamd_smi.so'].amdsmi_dev_get_busy_percent amdsmi_dev_get_busy_percent.restype = amdsmi_status_t -amdsmi_dev_get_busy_percent.argtypes = [amdsmi_device_handle, ctypes.POINTER(ctypes.c_uint32)] +amdsmi_dev_get_busy_percent.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32)] amdsmi_get_utilization_count = _libraries['libamd_smi.so'].amdsmi_get_utilization_count amdsmi_get_utilization_count.restype = amdsmi_status_t -amdsmi_get_utilization_count.argtypes = [amdsmi_device_handle, struct_c__SA_amdsmi_utilization_counter_t * 0, uint32_t, ctypes.POINTER(ctypes.c_uint64)] +amdsmi_get_utilization_count.argtypes = [amdsmi_processor_handle, struct_c__SA_amdsmi_utilization_counter_t * 0, uint32_t, ctypes.POINTER(ctypes.c_uint64)] amdsmi_get_pcie_link_status = _libraries['libamd_smi.so'].amdsmi_get_pcie_link_status amdsmi_get_pcie_link_status.restype = amdsmi_status_t -amdsmi_get_pcie_link_status.argtypes = [amdsmi_device_handle, ctypes.POINTER(struct_c__SA_amdsmi_pcie_info_t)] +amdsmi_get_pcie_link_status.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_pcie_info_t)] amdsmi_get_pcie_link_caps = _libraries['libamd_smi.so'].amdsmi_get_pcie_link_caps amdsmi_get_pcie_link_caps.restype = amdsmi_status_t -amdsmi_get_pcie_link_caps.argtypes = [amdsmi_device_handle, ctypes.POINTER(struct_c__SA_amdsmi_pcie_info_t)] +amdsmi_get_pcie_link_caps.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_pcie_info_t)] amdsmi_dev_get_perf_level = _libraries['libamd_smi.so'].amdsmi_dev_get_perf_level amdsmi_dev_get_perf_level.restype = amdsmi_status_t -amdsmi_dev_get_perf_level.argtypes = [amdsmi_device_handle, ctypes.POINTER(c__EA_amdsmi_dev_perf_level_t)] +amdsmi_dev_get_perf_level.argtypes = [amdsmi_processor_handle, ctypes.POINTER(c__EA_amdsmi_dev_perf_level_t)] amdsmi_set_perf_determinism_mode = _libraries['libamd_smi.so'].amdsmi_set_perf_determinism_mode amdsmi_set_perf_determinism_mode.restype = amdsmi_status_t -amdsmi_set_perf_determinism_mode.argtypes = [amdsmi_device_handle, uint64_t] +amdsmi_set_perf_determinism_mode.argtypes = [amdsmi_processor_handle, uint64_t] amdsmi_dev_get_overdrive_level = _libraries['libamd_smi.so'].amdsmi_dev_get_overdrive_level amdsmi_dev_get_overdrive_level.restype = amdsmi_status_t -amdsmi_dev_get_overdrive_level.argtypes = [amdsmi_device_handle, ctypes.POINTER(ctypes.c_uint32)] +amdsmi_dev_get_overdrive_level.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32)] amdsmi_dev_get_gpu_clk_freq = _libraries['libamd_smi.so'].amdsmi_dev_get_gpu_clk_freq amdsmi_dev_get_gpu_clk_freq.restype = amdsmi_status_t -amdsmi_dev_get_gpu_clk_freq.argtypes = [amdsmi_device_handle, amdsmi_clk_type_t, ctypes.POINTER(struct_c__SA_amdsmi_frequencies_t)] +amdsmi_dev_get_gpu_clk_freq.argtypes = [amdsmi_processor_handle, amdsmi_clk_type_t, ctypes.POINTER(struct_c__SA_amdsmi_frequencies_t)] amdsmi_dev_reset_gpu = _libraries['libamd_smi.so'].amdsmi_dev_reset_gpu amdsmi_dev_reset_gpu.restype = amdsmi_status_t -amdsmi_dev_reset_gpu.argtypes = [amdsmi_device_handle] +amdsmi_dev_reset_gpu.argtypes = [amdsmi_processor_handle] amdsmi_dev_get_od_volt_info = _libraries['libamd_smi.so'].amdsmi_dev_get_od_volt_info amdsmi_dev_get_od_volt_info.restype = amdsmi_status_t -amdsmi_dev_get_od_volt_info.argtypes = [amdsmi_device_handle, ctypes.POINTER(struct_c__SA_amdsmi_od_volt_freq_data_t)] +amdsmi_dev_get_od_volt_info.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_od_volt_freq_data_t)] amdsmi_dev_get_gpu_metrics_info = _libraries['libamd_smi.so'].amdsmi_dev_get_gpu_metrics_info amdsmi_dev_get_gpu_metrics_info.restype = amdsmi_status_t -amdsmi_dev_get_gpu_metrics_info.argtypes = [amdsmi_device_handle, ctypes.POINTER(struct_c__SA_amdsmi_gpu_metrics_t)] +amdsmi_dev_get_gpu_metrics_info.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_gpu_metrics_t)] amdsmi_dev_set_clk_range = _libraries['libamd_smi.so'].amdsmi_dev_set_clk_range amdsmi_dev_set_clk_range.restype = amdsmi_status_t -amdsmi_dev_set_clk_range.argtypes = [amdsmi_device_handle, uint64_t, uint64_t, amdsmi_clk_type_t] +amdsmi_dev_set_clk_range.argtypes = [amdsmi_processor_handle, uint64_t, uint64_t, amdsmi_clk_type_t] amdsmi_dev_set_od_clk_info = _libraries['libamd_smi.so'].amdsmi_dev_set_od_clk_info amdsmi_dev_set_od_clk_info.restype = amdsmi_status_t -amdsmi_dev_set_od_clk_info.argtypes = [amdsmi_device_handle, amdsmi_freq_ind_t, uint64_t, amdsmi_clk_type_t] +amdsmi_dev_set_od_clk_info.argtypes = [amdsmi_processor_handle, amdsmi_freq_ind_t, uint64_t, amdsmi_clk_type_t] amdsmi_dev_set_od_volt_info = _libraries['libamd_smi.so'].amdsmi_dev_set_od_volt_info amdsmi_dev_set_od_volt_info.restype = amdsmi_status_t -amdsmi_dev_set_od_volt_info.argtypes = [amdsmi_device_handle, uint32_t, uint64_t, uint64_t] +amdsmi_dev_set_od_volt_info.argtypes = [amdsmi_processor_handle, uint32_t, uint64_t, uint64_t] amdsmi_dev_get_od_volt_curve_regions = _libraries['libamd_smi.so'].amdsmi_dev_get_od_volt_curve_regions amdsmi_dev_get_od_volt_curve_regions.restype = amdsmi_status_t -amdsmi_dev_get_od_volt_curve_regions.argtypes = [amdsmi_device_handle, ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(struct_c__SA_amdsmi_freq_volt_region_t)] +amdsmi_dev_get_od_volt_curve_regions.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(struct_c__SA_amdsmi_freq_volt_region_t)] amdsmi_dev_get_power_profile_presets = _libraries['libamd_smi.so'].amdsmi_dev_get_power_profile_presets amdsmi_dev_get_power_profile_presets.restype = amdsmi_status_t -amdsmi_dev_get_power_profile_presets.argtypes = [amdsmi_device_handle, uint32_t, ctypes.POINTER(struct_c__SA_amdsmi_power_profile_status_t)] +amdsmi_dev_get_power_profile_presets.argtypes = [amdsmi_processor_handle, uint32_t, ctypes.POINTER(struct_c__SA_amdsmi_power_profile_status_t)] amdsmi_dev_set_perf_level = _libraries['libamd_smi.so'].amdsmi_dev_set_perf_level amdsmi_dev_set_perf_level.restype = amdsmi_status_t -amdsmi_dev_set_perf_level.argtypes = [amdsmi_device_handle, amdsmi_dev_perf_level_t] +amdsmi_dev_set_perf_level.argtypes = [amdsmi_processor_handle, amdsmi_dev_perf_level_t] amdsmi_dev_set_perf_level_v1 = _libraries['libamd_smi.so'].amdsmi_dev_set_perf_level_v1 amdsmi_dev_set_perf_level_v1.restype = amdsmi_status_t -amdsmi_dev_set_perf_level_v1.argtypes = [amdsmi_device_handle, amdsmi_dev_perf_level_t] +amdsmi_dev_set_perf_level_v1.argtypes = [amdsmi_processor_handle, amdsmi_dev_perf_level_t] amdsmi_dev_set_overdrive_level = _libraries['libamd_smi.so'].amdsmi_dev_set_overdrive_level amdsmi_dev_set_overdrive_level.restype = amdsmi_status_t -amdsmi_dev_set_overdrive_level.argtypes = [amdsmi_device_handle, uint32_t] +amdsmi_dev_set_overdrive_level.argtypes = [amdsmi_processor_handle, uint32_t] amdsmi_dev_set_overdrive_level_v1 = _libraries['libamd_smi.so'].amdsmi_dev_set_overdrive_level_v1 amdsmi_dev_set_overdrive_level_v1.restype = amdsmi_status_t -amdsmi_dev_set_overdrive_level_v1.argtypes = [amdsmi_device_handle, uint32_t] +amdsmi_dev_set_overdrive_level_v1.argtypes = [amdsmi_processor_handle, uint32_t] amdsmi_dev_set_clk_freq = _libraries['libamd_smi.so'].amdsmi_dev_set_clk_freq amdsmi_dev_set_clk_freq.restype = amdsmi_status_t -amdsmi_dev_set_clk_freq.argtypes = [amdsmi_device_handle, amdsmi_clk_type_t, uint64_t] +amdsmi_dev_set_clk_freq.argtypes = [amdsmi_processor_handle, amdsmi_clk_type_t, uint64_t] amdsmi_get_version = _libraries['libamd_smi.so'].amdsmi_get_version amdsmi_get_version.restype = amdsmi_status_t amdsmi_get_version.argtypes = [ctypes.POINTER(struct_c__SA_amdsmi_version_t)] @@ -1579,22 +1579,22 @@ amdsmi_get_version_str.restype = amdsmi_status_t amdsmi_get_version_str.argtypes = [amdsmi_sw_component_t, ctypes.POINTER(ctypes.c_char), uint32_t] amdsmi_dev_get_ecc_count = _libraries['libamd_smi.so'].amdsmi_dev_get_ecc_count amdsmi_dev_get_ecc_count.restype = amdsmi_status_t -amdsmi_dev_get_ecc_count.argtypes = [amdsmi_device_handle, amdsmi_gpu_block_t, ctypes.POINTER(struct_c__SA_amdsmi_error_count_t)] +amdsmi_dev_get_ecc_count.argtypes = [amdsmi_processor_handle, amdsmi_gpu_block_t, ctypes.POINTER(struct_c__SA_amdsmi_error_count_t)] amdsmi_dev_get_ecc_enabled = _libraries['libamd_smi.so'].amdsmi_dev_get_ecc_enabled amdsmi_dev_get_ecc_enabled.restype = amdsmi_status_t -amdsmi_dev_get_ecc_enabled.argtypes = [amdsmi_device_handle, ctypes.POINTER(ctypes.c_uint64)] +amdsmi_dev_get_ecc_enabled.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint64)] amdsmi_dev_get_ecc_status = _libraries['libamd_smi.so'].amdsmi_dev_get_ecc_status amdsmi_dev_get_ecc_status.restype = amdsmi_status_t -amdsmi_dev_get_ecc_status.argtypes = [amdsmi_device_handle, amdsmi_gpu_block_t, ctypes.POINTER(c__EA_amdsmi_ras_err_state_t)] +amdsmi_dev_get_ecc_status.argtypes = [amdsmi_processor_handle, amdsmi_gpu_block_t, ctypes.POINTER(c__EA_amdsmi_ras_err_state_t)] amdsmi_status_string = _libraries['libamd_smi.so'].amdsmi_status_string amdsmi_status_string.restype = amdsmi_status_t amdsmi_status_string.argtypes = [amdsmi_status_t, ctypes.POINTER(ctypes.POINTER(ctypes.c_char))] amdsmi_dev_counter_group_supported = _libraries['libamd_smi.so'].amdsmi_dev_counter_group_supported amdsmi_dev_counter_group_supported.restype = amdsmi_status_t -amdsmi_dev_counter_group_supported.argtypes = [amdsmi_device_handle, amdsmi_event_group_t] +amdsmi_dev_counter_group_supported.argtypes = [amdsmi_processor_handle, amdsmi_event_group_t] amdsmi_dev_create_counter = _libraries['libamd_smi.so'].amdsmi_dev_create_counter amdsmi_dev_create_counter.restype = amdsmi_status_t -amdsmi_dev_create_counter.argtypes = [amdsmi_device_handle, amdsmi_event_type_t, ctypes.POINTER(ctypes.c_uint64)] +amdsmi_dev_create_counter.argtypes = [amdsmi_processor_handle, amdsmi_event_type_t, ctypes.POINTER(ctypes.c_uint64)] amdsmi_dev_destroy_counter = _libraries['libamd_smi.so'].amdsmi_dev_destroy_counter amdsmi_dev_destroy_counter.restype = amdsmi_status_t amdsmi_dev_destroy_counter.argtypes = [amdsmi_event_handle_t] @@ -1606,7 +1606,7 @@ amdsmi_read_counter.restype = amdsmi_status_t amdsmi_read_counter.argtypes = [amdsmi_event_handle_t, ctypes.POINTER(struct_c__SA_amdsmi_counter_value_t)] amdsmi_counter_get_available_counters = _libraries['libamd_smi.so'].amdsmi_counter_get_available_counters amdsmi_counter_get_available_counters.restype = amdsmi_status_t -amdsmi_counter_get_available_counters.argtypes = [amdsmi_device_handle, amdsmi_event_group_t, ctypes.POINTER(ctypes.c_uint32)] +amdsmi_counter_get_available_counters.argtypes = [amdsmi_processor_handle, amdsmi_event_group_t, ctypes.POINTER(ctypes.c_uint32)] amdsmi_get_compute_process_info = _libraries['libamd_smi.so'].amdsmi_get_compute_process_info amdsmi_get_compute_process_info.restype = amdsmi_status_t amdsmi_get_compute_process_info.argtypes = [ctypes.POINTER(struct_c__SA_amdsmi_process_info_t), ctypes.POINTER(ctypes.c_uint32)] @@ -1618,28 +1618,28 @@ amdsmi_get_compute_process_gpus.restype = amdsmi_status_t amdsmi_get_compute_process_gpus.argtypes = [uint32_t, ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(ctypes.c_uint32)] amdsmi_dev_xgmi_error_status = _libraries['libamd_smi.so'].amdsmi_dev_xgmi_error_status amdsmi_dev_xgmi_error_status.restype = amdsmi_status_t -amdsmi_dev_xgmi_error_status.argtypes = [amdsmi_device_handle, ctypes.POINTER(c__EA_amdsmi_xgmi_status_t)] +amdsmi_dev_xgmi_error_status.argtypes = [amdsmi_processor_handle, ctypes.POINTER(c__EA_amdsmi_xgmi_status_t)] amdsmi_dev_reset_xgmi_error = _libraries['libamd_smi.so'].amdsmi_dev_reset_xgmi_error amdsmi_dev_reset_xgmi_error.restype = amdsmi_status_t -amdsmi_dev_reset_xgmi_error.argtypes = [amdsmi_device_handle] +amdsmi_dev_reset_xgmi_error.argtypes = [amdsmi_processor_handle] amdsmi_topo_get_numa_node_number = _libraries['libamd_smi.so'].amdsmi_topo_get_numa_node_number amdsmi_topo_get_numa_node_number.restype = amdsmi_status_t -amdsmi_topo_get_numa_node_number.argtypes = [amdsmi_device_handle, ctypes.POINTER(ctypes.c_uint32)] +amdsmi_topo_get_numa_node_number.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32)] amdsmi_topo_get_link_weight = _libraries['libamd_smi.so'].amdsmi_topo_get_link_weight amdsmi_topo_get_link_weight.restype = amdsmi_status_t -amdsmi_topo_get_link_weight.argtypes = [amdsmi_device_handle, amdsmi_device_handle, ctypes.POINTER(ctypes.c_uint64)] +amdsmi_topo_get_link_weight.argtypes = [amdsmi_processor_handle, amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint64)] amdsmi_get_minmax_bandwidth = _libraries['libamd_smi.so'].amdsmi_get_minmax_bandwidth amdsmi_get_minmax_bandwidth.restype = amdsmi_status_t -amdsmi_get_minmax_bandwidth.argtypes = [amdsmi_device_handle, amdsmi_device_handle, ctypes.POINTER(ctypes.c_uint64), ctypes.POINTER(ctypes.c_uint64)] +amdsmi_get_minmax_bandwidth.argtypes = [amdsmi_processor_handle, amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint64), ctypes.POINTER(ctypes.c_uint64)] amdsmi_topo_get_link_type = _libraries['libamd_smi.so'].amdsmi_topo_get_link_type amdsmi_topo_get_link_type.restype = amdsmi_status_t -amdsmi_topo_get_link_type.argtypes = [amdsmi_device_handle, amdsmi_device_handle, ctypes.POINTER(ctypes.c_uint64), ctypes.POINTER(c__EA_AMDSMI_IO_LINK_TYPE)] +amdsmi_topo_get_link_type.argtypes = [amdsmi_processor_handle, amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint64), ctypes.POINTER(c__EA_AMDSMI_IO_LINK_TYPE)] amdsmi_is_P2P_accessible = _libraries['libamd_smi.so'].amdsmi_is_P2P_accessible amdsmi_is_P2P_accessible.restype = amdsmi_status_t -amdsmi_is_P2P_accessible.argtypes = [amdsmi_device_handle, amdsmi_device_handle, ctypes.POINTER(ctypes.c_bool)] +amdsmi_is_P2P_accessible.argtypes = [amdsmi_processor_handle, amdsmi_processor_handle, ctypes.POINTER(ctypes.c_bool)] amdsmi_dev_open_supported_func_iterator = _libraries['libamd_smi.so'].amdsmi_dev_open_supported_func_iterator amdsmi_dev_open_supported_func_iterator.restype = amdsmi_status_t -amdsmi_dev_open_supported_func_iterator.argtypes = [amdsmi_device_handle, ctypes.POINTER(ctypes.POINTER(struct_amdsmi_func_id_iter_handle))] +amdsmi_dev_open_supported_func_iterator.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.POINTER(struct_amdsmi_func_id_iter_handle))] amdsmi_dev_open_supported_variant_iterator = _libraries['libamd_smi.so'].amdsmi_dev_open_supported_variant_iterator amdsmi_dev_open_supported_variant_iterator.restype = amdsmi_status_t amdsmi_dev_open_supported_variant_iterator.argtypes = [amdsmi_func_id_iter_handle_t, ctypes.POINTER(ctypes.POINTER(struct_amdsmi_func_id_iter_handle))] @@ -1654,70 +1654,70 @@ amdsmi_get_func_iter_value.restype = amdsmi_status_t amdsmi_get_func_iter_value.argtypes = [amdsmi_func_id_iter_handle_t, ctypes.POINTER(union_c__UA_amdsmi_func_id_value_t)] amdsmi_init_event_notification = _libraries['libamd_smi.so'].amdsmi_init_event_notification amdsmi_init_event_notification.restype = amdsmi_status_t -amdsmi_init_event_notification.argtypes = [amdsmi_device_handle] +amdsmi_init_event_notification.argtypes = [amdsmi_processor_handle] amdsmi_set_event_notification_mask = _libraries['libamd_smi.so'].amdsmi_set_event_notification_mask amdsmi_set_event_notification_mask.restype = amdsmi_status_t -amdsmi_set_event_notification_mask.argtypes = [amdsmi_device_handle, uint64_t] +amdsmi_set_event_notification_mask.argtypes = [amdsmi_processor_handle, uint64_t] amdsmi_get_event_notification = _libraries['libamd_smi.so'].amdsmi_get_event_notification amdsmi_get_event_notification.restype = amdsmi_status_t amdsmi_get_event_notification.argtypes = [ctypes.c_int32, ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(struct_c__SA_amdsmi_evt_notification_data_t)] amdsmi_stop_event_notification = _libraries['libamd_smi.so'].amdsmi_stop_event_notification amdsmi_stop_event_notification.restype = amdsmi_status_t -amdsmi_stop_event_notification.argtypes = [amdsmi_device_handle] +amdsmi_stop_event_notification.argtypes = [amdsmi_processor_handle] amdsmi_get_device_bdf = _libraries['libamd_smi.so'].amdsmi_get_device_bdf amdsmi_get_device_bdf.restype = amdsmi_status_t -amdsmi_get_device_bdf.argtypes = [amdsmi_device_handle, ctypes.POINTER(union_c__UA_amdsmi_bdf_t)] +amdsmi_get_device_bdf.argtypes = [amdsmi_processor_handle, ctypes.POINTER(union_c__UA_amdsmi_bdf_t)] amdsmi_get_device_uuid = _libraries['libamd_smi.so'].amdsmi_get_device_uuid amdsmi_get_device_uuid.restype = amdsmi_status_t -amdsmi_get_device_uuid.argtypes = [amdsmi_device_handle, ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(ctypes.c_char)] +amdsmi_get_device_uuid.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(ctypes.c_char)] amdsmi_get_driver_version = _libraries['libamd_smi.so'].amdsmi_get_driver_version amdsmi_get_driver_version.restype = amdsmi_status_t -amdsmi_get_driver_version.argtypes = [amdsmi_device_handle, ctypes.POINTER(ctypes.c_int32), ctypes.POINTER(ctypes.c_char)] +amdsmi_get_driver_version.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_int32), ctypes.POINTER(ctypes.c_char)] amdsmi_get_asic_info = _libraries['libamd_smi.so'].amdsmi_get_asic_info amdsmi_get_asic_info.restype = amdsmi_status_t -amdsmi_get_asic_info.argtypes = [amdsmi_device_handle, ctypes.POINTER(struct_c__SA_amdsmi_asic_info_t)] +amdsmi_get_asic_info.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_asic_info_t)] amdsmi_get_board_info = _libraries['libamd_smi.so'].amdsmi_get_board_info amdsmi_get_board_info.restype = amdsmi_status_t -amdsmi_get_board_info.argtypes = [amdsmi_device_handle, ctypes.POINTER(struct_c__SA_amdsmi_board_info_t)] +amdsmi_get_board_info.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_board_info_t)] amdsmi_get_power_cap_info = _libraries['libamd_smi.so'].amdsmi_get_power_cap_info amdsmi_get_power_cap_info.restype = amdsmi_status_t -amdsmi_get_power_cap_info.argtypes = [amdsmi_device_handle, uint32_t, ctypes.POINTER(struct_c__SA_amdsmi_power_cap_info_t)] +amdsmi_get_power_cap_info.argtypes = [amdsmi_processor_handle, uint32_t, ctypes.POINTER(struct_c__SA_amdsmi_power_cap_info_t)] amdsmi_get_xgmi_info = _libraries['libamd_smi.so'].amdsmi_get_xgmi_info amdsmi_get_xgmi_info.restype = amdsmi_status_t -amdsmi_get_xgmi_info.argtypes = [amdsmi_device_handle, ctypes.POINTER(struct_c__SA_amdsmi_xgmi_info_t)] +amdsmi_get_xgmi_info.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_xgmi_info_t)] amdsmi_get_caps_info = _libraries['libamd_smi.so'].amdsmi_get_caps_info amdsmi_get_caps_info.restype = amdsmi_status_t -amdsmi_get_caps_info.argtypes = [amdsmi_device_handle, ctypes.POINTER(struct_c__SA_amdsmi_gpu_caps_t)] +amdsmi_get_caps_info.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_gpu_caps_t)] amdsmi_get_fw_info = _libraries['libamd_smi.so'].amdsmi_get_fw_info amdsmi_get_fw_info.restype = amdsmi_status_t -amdsmi_get_fw_info.argtypes = [amdsmi_device_handle, ctypes.POINTER(struct_c__SA_amdsmi_fw_info_t)] +amdsmi_get_fw_info.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_fw_info_t)] amdsmi_get_vbios_info = _libraries['libamd_smi.so'].amdsmi_get_vbios_info amdsmi_get_vbios_info.restype = amdsmi_status_t -amdsmi_get_vbios_info.argtypes = [amdsmi_device_handle, ctypes.POINTER(struct_c__SA_amdsmi_vbios_info_t)] +amdsmi_get_vbios_info.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_vbios_info_t)] amdsmi_get_gpu_activity = _libraries['libamd_smi.so'].amdsmi_get_gpu_activity amdsmi_get_gpu_activity.restype = amdsmi_status_t -amdsmi_get_gpu_activity.argtypes = [amdsmi_device_handle, ctypes.POINTER(struct_c__SA_amdsmi_engine_usage_t)] +amdsmi_get_gpu_activity.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_engine_usage_t)] amdsmi_get_power_measure = _libraries['libamd_smi.so'].amdsmi_get_power_measure amdsmi_get_power_measure.restype = amdsmi_status_t -amdsmi_get_power_measure.argtypes = [amdsmi_device_handle, ctypes.POINTER(struct_c__SA_amdsmi_power_measure_t)] +amdsmi_get_power_measure.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_power_measure_t)] amdsmi_get_clock_measure = _libraries['libamd_smi.so'].amdsmi_get_clock_measure amdsmi_get_clock_measure.restype = amdsmi_status_t -amdsmi_get_clock_measure.argtypes = [amdsmi_device_handle, amdsmi_clk_type_t, ctypes.POINTER(struct_c__SA_amdsmi_clk_measure_t)] +amdsmi_get_clock_measure.argtypes = [amdsmi_processor_handle, amdsmi_clk_type_t, ctypes.POINTER(struct_c__SA_amdsmi_clk_measure_t)] amdsmi_get_vram_usage = _libraries['libamd_smi.so'].amdsmi_get_vram_usage amdsmi_get_vram_usage.restype = amdsmi_status_t -amdsmi_get_vram_usage.argtypes = [amdsmi_device_handle, ctypes.POINTER(struct_c__SA_amdsmi_vram_info_t)] +amdsmi_get_vram_usage.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_vram_info_t)] amdsmi_get_target_frequency_range = _libraries['libamd_smi.so'].amdsmi_get_target_frequency_range amdsmi_get_target_frequency_range.restype = amdsmi_status_t -amdsmi_get_target_frequency_range.argtypes = [amdsmi_device_handle, amdsmi_clk_type_t, ctypes.POINTER(struct_c__SA_amdsmi_frequency_range_t)] +amdsmi_get_target_frequency_range.argtypes = [amdsmi_processor_handle, amdsmi_clk_type_t, ctypes.POINTER(struct_c__SA_amdsmi_frequency_range_t)] amdsmi_get_process_list = _libraries['libamd_smi.so'].amdsmi_get_process_list amdsmi_get_process_list.restype = amdsmi_status_t -amdsmi_get_process_list.argtypes = [amdsmi_device_handle, ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(ctypes.c_uint32)] +amdsmi_get_process_list.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(ctypes.c_uint32)] amdsmi_get_process_info = _libraries['libamd_smi.so'].amdsmi_get_process_info amdsmi_get_process_info.restype = amdsmi_status_t -amdsmi_get_process_info.argtypes = [amdsmi_device_handle, amdsmi_process_handle, ctypes.POINTER(struct_c__SA_amdsmi_proc_info_t)] +amdsmi_get_process_info.argtypes = [amdsmi_processor_handle, amdsmi_process_handle, ctypes.POINTER(struct_c__SA_amdsmi_proc_info_t)] amdsmi_get_ecc_error_count = _libraries['libamd_smi.so'].amdsmi_get_ecc_error_count amdsmi_get_ecc_error_count.restype = amdsmi_status_t -amdsmi_get_ecc_error_count.argtypes = [amdsmi_device_handle, ctypes.POINTER(struct_c__SA_amdsmi_error_count_t)] +amdsmi_get_ecc_error_count.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_error_count_t)] __all__ = \ ['AMDSMI_CNTR_CMD_START', 'AMDSMI_CNTR_CMD_STOP', 'AMDSMI_COARSE_GRAIN_GFX_ACTIVITY', @@ -1882,7 +1882,7 @@ __all__ = \ 'amdsmi_dev_set_pci_bandwidth', 'amdsmi_dev_set_perf_level', 'amdsmi_dev_set_perf_level_v1', 'amdsmi_dev_set_power_cap', 'amdsmi_dev_set_power_profile', 'amdsmi_dev_xgmi_error_status', - 'amdsmi_device_handle', 'amdsmi_engine_usage_t', + 'amdsmi_processor_handle', 'amdsmi_engine_usage_t', 'amdsmi_error_count_t', 'amdsmi_event_group_t', 'amdsmi_event_group_t__enumvalues', 'amdsmi_event_handle_t', 'amdsmi_event_type_t', 'amdsmi_event_type_t__enumvalues', diff --git a/projects/amdsmi/py-interface/rocm_smi_tool.py b/projects/amdsmi/py-interface/rocm_smi_tool.py index 9df8409ca0..93c973f3fd 100644 --- a/projects/amdsmi/py-interface/rocm_smi_tool.py +++ b/projects/amdsmi/py-interface/rocm_smi_tool.py @@ -234,7 +234,7 @@ class Formatter: self.print_dict(result) elif isinstance(result, list): self.print_list(result) - elif isinstance(result, smi_api.amdsmi_wrapper.amdsmi_device_handle): + elif isinstance(result, smi_api.amdsmi_wrapper.amdsmi_processor_handle): self.print_handle("\n" + result) else: print(result) diff --git a/projects/amdsmi/src/amd_smi/amd_smi.cc b/projects/amdsmi/src/amd_smi/amd_smi.cc index 9cdffd582b..ec9109c26e 100644 --- a/projects/amdsmi/src/amd_smi/amd_smi.cc +++ b/projects/amdsmi/src/amd_smi/amd_smi.cc @@ -76,7 +76,7 @@ static bool initialized_lib = false; } \ } while (0) -static amdsmi_status_t get_gpu_device_from_handle(amdsmi_device_handle device_handle, +static amdsmi_status_t get_gpu_device_from_handle(amdsmi_processor_handle device_handle, amd::smi::AMDSmiGPUDevice** gpudevice) { AMDSMI_CHECK_INIT(); @@ -99,7 +99,7 @@ static amdsmi_status_t get_gpu_device_from_handle(amdsmi_device_handle device_ha template amdsmi_status_t rsmi_wrapper(F && f, - amdsmi_device_handle device_handle, Args &&... args) { + amdsmi_processor_handle device_handle, Args &&... args) { AMDSMI_CHECK_INIT(); @@ -216,7 +216,7 @@ amdsmi_status_t amdsmi_get_socket_info( amdsmi_status_t amdsmi_get_device_handles(amdsmi_socket_handle socket_handle, uint32_t* device_count, - amdsmi_device_handle* device_handles) { + amdsmi_processor_handle* device_handles) { AMDSMI_CHECK_INIT(); if (device_count == nullptr) { @@ -243,13 +243,13 @@ amdsmi_status_t amdsmi_get_device_handles(amdsmi_socket_handle socket_handle, // Copy the device handles for (uint32_t i = 0; i < *device_count; i++) { - device_handles[i] = reinterpret_cast(devices[i]); + device_handles[i] = reinterpret_cast(devices[i]); } return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_device_type(amdsmi_device_handle device_handle , +amdsmi_status_t amdsmi_get_device_type(amdsmi_processor_handle device_handle , device_type_t* device_type) { AMDSMI_CHECK_INIT(); @@ -267,7 +267,7 @@ amdsmi_status_t amdsmi_get_device_type(amdsmi_device_handle device_handle , } amdsmi_status_t -amdsmi_get_device_bdf(amdsmi_device_handle device_handle, amdsmi_bdf_t *bdf) { +amdsmi_get_device_bdf(amdsmi_processor_handle device_handle, amdsmi_bdf_t *bdf) { AMDSMI_CHECK_INIT(); @@ -286,7 +286,7 @@ amdsmi_get_device_bdf(amdsmi_device_handle device_handle, amdsmi_bdf_t *bdf) { return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_board_info(amdsmi_device_handle device_handle, amdsmi_board_info_t *board_info) { +amdsmi_status_t amdsmi_get_board_info(amdsmi_processor_handle device_handle, amdsmi_board_info_t *board_info) { AMDSMI_CHECK_INIT(); @@ -319,7 +319,7 @@ amdsmi_status_t amdsmi_get_board_info(amdsmi_device_handle device_handle, amdsmi return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_dev_get_temp_metric(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_get_temp_metric(amdsmi_processor_handle device_handle, amdsmi_temperature_type_t sensor_type, amdsmi_temperature_metric_t metric, int64_t *temperature) { @@ -346,7 +346,7 @@ amdsmi_status_t amdsmi_dev_get_temp_metric(amdsmi_device_handle device_handle, return amdsmi_status; } -amdsmi_status_t amdsmi_get_vram_usage(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_get_vram_usage(amdsmi_processor_handle device_handle, amdsmi_vram_info_t *vram_info) { AMDSMI_CHECK_INIT(); @@ -388,7 +388,7 @@ amdsmi_status_t amdsmi_get_vram_usage(amdsmi_device_handle device_handle, return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_caps_info(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_get_caps_info(amdsmi_processor_handle device_handle, amdsmi_gpu_caps_t *info) { AMDSMI_CHECK_INIT(); @@ -478,42 +478,42 @@ amdsmi_status_t amdsmi_get_caps_info(amdsmi_device_handle device_handle, return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_dev_get_fan_rpms(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_get_fan_rpms(amdsmi_processor_handle device_handle, uint32_t sensor_ind, int64_t *speed) { return rsmi_wrapper(rsmi_dev_fan_rpms_get, device_handle, sensor_ind, speed); } -amdsmi_status_t amdsmi_dev_get_fan_speed(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_get_fan_speed(amdsmi_processor_handle device_handle, uint32_t sensor_ind, int64_t *speed) { return rsmi_wrapper(rsmi_dev_fan_speed_get, device_handle, sensor_ind, speed); } -amdsmi_status_t amdsmi_dev_get_fan_speed_max(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_get_fan_speed_max(amdsmi_processor_handle device_handle, uint32_t sensor_ind, uint64_t *max_speed) { return rsmi_wrapper(rsmi_dev_fan_speed_max_get, device_handle, sensor_ind, max_speed); } -amdsmi_status_t amdsmi_dev_reset_fan(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_reset_fan(amdsmi_processor_handle device_handle, uint32_t sensor_ind) { return rsmi_wrapper(rsmi_dev_fan_reset, device_handle, sensor_ind); } -amdsmi_status_t amdsmi_dev_set_fan_speed(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_set_fan_speed(amdsmi_processor_handle device_handle, uint32_t sensor_ind, uint64_t speed) { return rsmi_wrapper(rsmi_dev_fan_speed_set, device_handle, sensor_ind, speed); } -amdsmi_status_t amdsmi_dev_get_id(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_get_id(amdsmi_processor_handle device_handle, uint16_t *id) { return rsmi_wrapper(rsmi_dev_id_get, device_handle, id); } // TODO(bliu) : add fw info from libdrm -amdsmi_status_t amdsmi_get_fw_info(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_get_fw_info(amdsmi_processor_handle device_handle, amdsmi_fw_info_t *info) { const std::map fw_in_rsmi = { { FW_ID_ASD, RSMI_FW_BLOCK_ASD}, @@ -559,7 +559,7 @@ amdsmi_status_t amdsmi_get_fw_info(amdsmi_device_handle device_handle, } amdsmi_status_t -amdsmi_get_asic_info(amdsmi_device_handle device_handle, amdsmi_asic_info_t *info) { +amdsmi_get_asic_info(amdsmi_processor_handle device_handle, amdsmi_asic_info_t *info) { AMDSMI_CHECK_INIT(); @@ -622,34 +622,34 @@ amdsmi_get_asic_info(amdsmi_device_handle device_handle, amdsmi_asic_info_t *inf } -amdsmi_status_t amdsmi_dev_get_subsystem_id(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_get_subsystem_id(amdsmi_processor_handle device_handle, uint16_t *id) { return rsmi_wrapper(rsmi_dev_subsystem_id_get, device_handle, id); } amdsmi_status_t amdsmi_dev_get_subsystem_name( - amdsmi_device_handle device_handle, + amdsmi_processor_handle device_handle, char *name, size_t len) { return rsmi_wrapper(rsmi_dev_subsystem_name_get, device_handle, name, len); } amdsmi_status_t amdsmi_dev_get_vendor_name( - amdsmi_device_handle device_handle, char *name, size_t len) { + amdsmi_processor_handle device_handle, char *name, size_t len) { return rsmi_wrapper(rsmi_dev_vendor_name_get, device_handle, name, len); } -amdsmi_status_t amdsmi_dev_get_vram_vendor(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_get_vram_vendor(amdsmi_processor_handle device_handle, char *brand, uint32_t len) { return rsmi_wrapper(rsmi_dev_vram_vendor_get, device_handle, brand, len); } amdsmi_status_t -amdsmi_init_event_notification(amdsmi_device_handle device_handle) { +amdsmi_init_event_notification(amdsmi_processor_handle device_handle) { return rsmi_wrapper(rsmi_event_notification_init, device_handle); } amdsmi_status_t - amdsmi_set_event_notification_mask(amdsmi_device_handle device_handle, + amdsmi_set_event_notification_mask(amdsmi_processor_handle device_handle, uint64_t mask) { return rsmi_wrapper(rsmi_event_notification_mask_set, device_handle, mask); } @@ -686,17 +686,17 @@ amdsmi_status_t } amdsmi_status_t amdsmi_stop_event_notification( - amdsmi_device_handle device_handle) { + amdsmi_processor_handle device_handle) { return rsmi_wrapper(rsmi_event_notification_stop, device_handle); } amdsmi_status_t amdsmi_dev_counter_group_supported( - amdsmi_device_handle device_handle, amdsmi_event_group_t group) { + amdsmi_processor_handle device_handle, amdsmi_event_group_t group) { return rsmi_wrapper(rsmi_dev_counter_group_supported, device_handle, static_cast(group)); } -amdsmi_status_t amdsmi_dev_create_counter(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_create_counter(amdsmi_processor_handle device_handle, amdsmi_event_type_t type, amdsmi_event_handle_t *evnt_handle) { return rsmi_wrapper(rsmi_dev_counter_create, device_handle, static_cast(type), @@ -727,7 +727,7 @@ amdsmi_read_counter(amdsmi_event_handle_t evt_handle, } amdsmi_status_t - amdsmi_counter_get_available_counters(amdsmi_device_handle device_handle, + amdsmi_counter_get_available_counters(amdsmi_processor_handle device_handle, amdsmi_event_group_t grp, uint32_t *available) { return rsmi_wrapper(rsmi_counter_available_counters_get, device_handle, static_cast(grp), @@ -735,12 +735,12 @@ amdsmi_status_t } amdsmi_status_t -amdsmi_topo_get_numa_node_number(amdsmi_device_handle device_handle, uint32_t *numa_node) { +amdsmi_topo_get_numa_node_number(amdsmi_processor_handle device_handle, uint32_t *numa_node) { return rsmi_wrapper(rsmi_topo_get_numa_node_number, device_handle, numa_node); } amdsmi_status_t -amdsmi_topo_get_link_weight(amdsmi_device_handle device_handle_src, amdsmi_device_handle device_handle_dst, +amdsmi_topo_get_link_weight(amdsmi_processor_handle device_handle_src, amdsmi_processor_handle device_handle_dst, uint64_t *weight) { AMDSMI_CHECK_INIT(); @@ -758,7 +758,7 @@ amdsmi_topo_get_link_weight(amdsmi_device_handle device_handle_src, amdsmi_devic } amdsmi_status_t - amdsmi_get_minmax_bandwidth(amdsmi_device_handle device_handle_src, amdsmi_device_handle device_handle_dst, + amdsmi_get_minmax_bandwidth(amdsmi_processor_handle device_handle_src, amdsmi_processor_handle device_handle_dst, uint64_t *min_bandwidth, uint64_t *max_bandwidth) { AMDSMI_CHECK_INIT(); @@ -776,7 +776,7 @@ amdsmi_status_t } amdsmi_status_t -amdsmi_topo_get_link_type(amdsmi_device_handle device_handle_src, amdsmi_device_handle device_handle_dst, +amdsmi_topo_get_link_type(amdsmi_processor_handle device_handle_src, amdsmi_processor_handle device_handle_dst, uint64_t *hops, AMDSMI_IO_LINK_TYPE *type) { AMDSMI_CHECK_INIT(); @@ -794,8 +794,8 @@ amdsmi_topo_get_link_type(amdsmi_device_handle device_handle_src, amdsmi_device_ } amdsmi_status_t -amdsmi_is_P2P_accessible(amdsmi_device_handle device_handle_src, - amdsmi_device_handle device_handle_dst, +amdsmi_is_P2P_accessible(amdsmi_processor_handle device_handle_src, + amdsmi_processor_handle device_handle_dst, bool *accessible) { AMDSMI_CHECK_INIT(); @@ -814,7 +814,7 @@ amdsmi_is_P2P_accessible(amdsmi_device_handle device_handle_src, // TODO(bliu) : other xgmi related information amdsmi_status_t -amdsmi_get_xgmi_info(amdsmi_device_handle device_handle, amdsmi_xgmi_info_t *info) { +amdsmi_get_xgmi_info(amdsmi_processor_handle device_handle, amdsmi_xgmi_info_t *info) { AMDSMI_CHECK_INIT(); if (info == nullptr) @@ -824,18 +824,18 @@ amdsmi_get_xgmi_info(amdsmi_device_handle device_handle, amdsmi_xgmi_info_t *inf } amdsmi_status_t -amdsmi_dev_xgmi_error_status(amdsmi_device_handle device_handle, amdsmi_xgmi_status_t *status) { +amdsmi_dev_xgmi_error_status(amdsmi_processor_handle device_handle, amdsmi_xgmi_status_t *status) { return rsmi_wrapper(rsmi_dev_xgmi_error_status, device_handle, reinterpret_cast(status)); } amdsmi_status_t -amdsmi_dev_reset_xgmi_error(amdsmi_device_handle device_handle) { +amdsmi_dev_reset_xgmi_error(amdsmi_processor_handle device_handle) { return rsmi_wrapper(rsmi_dev_xgmi_error_reset, device_handle); } amdsmi_status_t -amdsmi_dev_open_supported_func_iterator(amdsmi_device_handle device_handle, +amdsmi_dev_open_supported_func_iterator(amdsmi_processor_handle device_handle, amdsmi_func_id_iter_handle_t *handle) { AMDSMI_CHECK_INIT(); @@ -1008,7 +1008,7 @@ amdsmi_get_compute_process_gpus(uint32_t pid, uint32_t *dv_indices, return amd::smi::rsmi_to_amdsmi_status(r); } -amdsmi_status_t amdsmi_dev_get_ecc_count(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_get_ecc_count(amdsmi_processor_handle device_handle, amdsmi_gpu_block_t block, amdsmi_error_count_t *ec) { AMDSMI_CHECK_INIT(); @@ -1018,7 +1018,7 @@ amdsmi_status_t amdsmi_dev_get_ecc_count(amdsmi_device_handle device_handle, static_cast(block), reinterpret_cast(ec)); } -amdsmi_status_t amdsmi_dev_get_ecc_enabled(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_get_ecc_enabled(amdsmi_processor_handle device_handle, uint64_t *enabled_blocks) { AMDSMI_CHECK_INIT(); @@ -1027,7 +1027,7 @@ amdsmi_status_t amdsmi_dev_get_ecc_enabled(amdsmi_device_handle device_handle, return rsmi_wrapper(rsmi_dev_ecc_enabled_get, device_handle, enabled_blocks); } -amdsmi_status_t amdsmi_dev_get_ecc_status(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_get_ecc_status(amdsmi_processor_handle device_handle, amdsmi_gpu_block_t block, amdsmi_ras_err_state_t *state) { AMDSMI_CHECK_INIT(); @@ -1040,7 +1040,7 @@ amdsmi_status_t amdsmi_dev_get_ecc_status(amdsmi_device_handle device_handle, } amdsmi_status_t -amdsmi_dev_get_busy_percent(amdsmi_device_handle device_handle, +amdsmi_dev_get_busy_percent(amdsmi_processor_handle device_handle, uint32_t *busy_percent) { AMDSMI_CHECK_INIT(); @@ -1050,7 +1050,7 @@ amdsmi_dev_get_busy_percent(amdsmi_device_handle device_handle, busy_percent); } amdsmi_status_t amdsmi_dev_get_gpu_metrics_info( - amdsmi_device_handle device_handle, + amdsmi_processor_handle device_handle, amdsmi_gpu_metrics_t *pgpu_metrics) { AMDSMI_CHECK_INIT(); @@ -1061,7 +1061,7 @@ amdsmi_status_t amdsmi_dev_get_gpu_metrics_info( } amdsmi_status_t -amdsmi_get_power_cap_info(amdsmi_device_handle device_handle, +amdsmi_get_power_cap_info(amdsmi_processor_handle device_handle, uint32_t sensor_ind, amdsmi_power_cap_info_t *info) { AMDSMI_CHECK_INIT(); @@ -1120,14 +1120,14 @@ amdsmi_get_power_cap_info(amdsmi_device_handle device_handle, } amdsmi_status_t - amdsmi_dev_set_power_cap(amdsmi_device_handle device_handle, + amdsmi_dev_set_power_cap(amdsmi_processor_handle device_handle, uint32_t sensor_ind, uint64_t cap) { return rsmi_wrapper(rsmi_dev_power_cap_set, device_handle, sensor_ind, cap); } amdsmi_status_t -amdsmi_dev_get_power_ave(amdsmi_device_handle device_handle, +amdsmi_dev_get_power_ave(amdsmi_processor_handle device_handle, uint32_t sensor_ind, uint64_t *power) { AMDSMI_CHECK_INIT(); @@ -1137,7 +1137,7 @@ amdsmi_dev_get_power_ave(amdsmi_device_handle device_handle, sensor_ind, power); } amdsmi_status_t - amdsmi_dev_get_power_profile_presets(amdsmi_device_handle device_handle, + amdsmi_dev_get_power_profile_presets(amdsmi_processor_handle device_handle, uint32_t sensor_ind, amdsmi_power_profile_status_t *status) { AMDSMI_CHECK_INIT(); @@ -1150,19 +1150,19 @@ amdsmi_status_t } amdsmi_status_t amdsmi_set_perf_determinism_mode( - amdsmi_device_handle device_handle, uint64_t clkvalue) { + amdsmi_processor_handle device_handle, uint64_t clkvalue) { return rsmi_wrapper(rsmi_perf_determinism_mode_set, device_handle, clkvalue); } amdsmi_status_t - amdsmi_dev_set_power_profile(amdsmi_device_handle device_handle, + amdsmi_dev_set_power_profile(amdsmi_processor_handle device_handle, uint32_t reserved, amdsmi_power_profile_preset_masks_t profile) { return rsmi_wrapper(rsmi_dev_power_profile_set, device_handle, reserved, static_cast(profile)); } -amdsmi_status_t amdsmi_dev_get_perf_level(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_get_perf_level(amdsmi_processor_handle device_handle, amdsmi_dev_perf_level_t *perf) { AMDSMI_CHECK_INIT(); @@ -1172,33 +1172,33 @@ amdsmi_status_t amdsmi_dev_get_perf_level(amdsmi_device_handle device_handle, reinterpret_cast(perf)); } amdsmi_status_t - amdsmi_dev_set_perf_level(amdsmi_device_handle device_handle, + amdsmi_dev_set_perf_level(amdsmi_processor_handle device_handle, amdsmi_dev_perf_level_t perf_lvl) { return rsmi_wrapper(rsmi_dev_perf_level_set, device_handle, static_cast(perf_lvl)); } amdsmi_status_t - amdsmi_dev_set_perf_level_v1(amdsmi_device_handle device_handle, + amdsmi_dev_set_perf_level_v1(amdsmi_processor_handle device_handle, amdsmi_dev_perf_level_t perf_lvl) { return rsmi_wrapper(rsmi_dev_perf_level_set_v1, device_handle, static_cast(perf_lvl)); } -amdsmi_status_t amdsmi_dev_set_pci_bandwidth(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_set_pci_bandwidth(amdsmi_processor_handle device_handle, uint64_t bw_bitmask) { return rsmi_wrapper(rsmi_dev_pci_bandwidth_set, device_handle, bw_bitmask); } -amdsmi_status_t amdsmi_dev_get_pci_bandwidth(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_get_pci_bandwidth(amdsmi_processor_handle device_handle, amdsmi_pcie_bandwidth_t *bandwidth) { return rsmi_wrapper(rsmi_dev_pci_bandwidth_get, device_handle, reinterpret_cast(bandwidth)); } // TODO(bliu): other frequencies in amdsmi_clk_type_t -amdsmi_status_t amdsmi_dev_get_gpu_clk_freq(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_get_gpu_clk_freq(amdsmi_processor_handle device_handle, amdsmi_clk_type_t clk_type, amdsmi_frequencies_t *f) { AMDSMI_CHECK_INIT(); @@ -1242,7 +1242,7 @@ amdsmi_status_t amdsmi_dev_get_gpu_clk_freq(amdsmi_device_handle device_handle, reinterpret_cast(f)); } -amdsmi_status_t amdsmi_dev_set_clk_freq(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_set_clk_freq(amdsmi_processor_handle device_handle, amdsmi_clk_type_t clk_type, uint64_t freq_bitmask) { AMDSMI_CHECK_INIT(); @@ -1258,60 +1258,60 @@ amdsmi_status_t amdsmi_dev_set_clk_freq(amdsmi_device_handle device_handle, static_cast(clk_type), freq_bitmask); } amdsmi_status_t -amdsmi_dev_get_memory_reserved_pages(amdsmi_device_handle device_handle, +amdsmi_dev_get_memory_reserved_pages(amdsmi_processor_handle device_handle, uint32_t *num_pages, amdsmi_retired_page_record_t *records) { return rsmi_wrapper(rsmi_dev_memory_reserved_pages_get, device_handle, num_pages, reinterpret_cast(records)); } -amdsmi_status_t amdsmi_dev_get_memory_total(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_get_memory_total(amdsmi_processor_handle device_handle, amdsmi_memory_type_t mem_type, uint64_t *total) { return rsmi_wrapper(rsmi_dev_memory_total_get, device_handle, static_cast(mem_type), total); } -amdsmi_status_t amdsmi_dev_get_memory_usage(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_get_memory_usage(amdsmi_processor_handle device_handle, amdsmi_memory_type_t mem_type, uint64_t *used) { return rsmi_wrapper(rsmi_dev_memory_usage_get, device_handle, static_cast(mem_type), used); } amdsmi_status_t amdsmi_dev_get_overdrive_level( - amdsmi_device_handle device_handle, + amdsmi_processor_handle device_handle, uint32_t *od) { return rsmi_wrapper(rsmi_dev_overdrive_level_get, device_handle, od); } amdsmi_status_t amdsmi_dev_set_overdrive_level( - amdsmi_device_handle device_handle, uint32_t od) { + amdsmi_processor_handle device_handle, uint32_t od) { return rsmi_wrapper(rsmi_dev_overdrive_level_set, device_handle, od); } amdsmi_status_t amdsmi_dev_get_pci_replay_counter( - amdsmi_device_handle device_handle, uint64_t *counter) { + amdsmi_processor_handle device_handle, uint64_t *counter) { return rsmi_wrapper(rsmi_dev_pci_replay_counter_get, device_handle, counter); } amdsmi_status_t amdsmi_dev_get_pci_throughput( - amdsmi_device_handle device_handle, + amdsmi_processor_handle device_handle, uint64_t *sent, uint64_t *received, uint64_t *max_pkt_sz) { return rsmi_wrapper(rsmi_dev_pci_throughput_get, device_handle, sent, received, max_pkt_sz); } -amdsmi_status_t amdsmi_dev_get_od_volt_info(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_get_od_volt_info(amdsmi_processor_handle device_handle, amdsmi_od_volt_freq_data_t *odv) { return rsmi_wrapper(rsmi_dev_od_volt_info_get, device_handle, reinterpret_cast(odv)); } amdsmi_status_t amdsmi_dev_get_od_volt_curve_regions( - amdsmi_device_handle device_handle, + amdsmi_processor_handle device_handle, uint32_t *num_regions, amdsmi_freq_volt_region_t *buffer) { return rsmi_wrapper(rsmi_dev_od_volt_curve_regions_get, device_handle, num_regions, reinterpret_cast(buffer)); } -amdsmi_status_t amdsmi_dev_get_volt_metric(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_get_volt_metric(amdsmi_processor_handle device_handle, amdsmi_voltage_type_t sensor_type, amdsmi_voltage_metric_t metric, int64_t *voltage) { return rsmi_wrapper(rsmi_dev_volt_metric_get, device_handle, @@ -1319,7 +1319,7 @@ amdsmi_status_t amdsmi_dev_get_volt_metric(amdsmi_device_handle device_handle, static_cast(metric), voltage); } -amdsmi_status_t amdsmi_dev_set_od_clk_info(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_set_od_clk_info(amdsmi_processor_handle device_handle, amdsmi_freq_ind_t level, uint64_t clkvalue, amdsmi_clk_type_t clkType) { @@ -1328,13 +1328,13 @@ amdsmi_status_t amdsmi_dev_set_od_clk_info(amdsmi_device_handle device_handle, static_cast(clkType)); } -amdsmi_status_t amdsmi_dev_set_od_volt_info(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_set_od_volt_info(amdsmi_processor_handle device_handle, uint32_t vpoint, uint64_t clkvalue, uint64_t voltvalue) { return rsmi_wrapper(rsmi_dev_od_volt_info_set, device_handle, vpoint, clkvalue, voltvalue); } -amdsmi_status_t amdsmi_dev_set_clk_range(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_set_clk_range(amdsmi_processor_handle device_handle, uint64_t minclkvalue, uint64_t maxclkvalue, amdsmi_clk_type_t clkType) { @@ -1344,17 +1344,17 @@ amdsmi_status_t amdsmi_dev_set_clk_range(amdsmi_device_handle device_handle, } amdsmi_status_t amdsmi_dev_set_overdrive_level_v1( - amdsmi_device_handle device_handle, + amdsmi_processor_handle device_handle, uint32_t od) { return rsmi_wrapper(rsmi_dev_overdrive_level_set_v1, device_handle, od); } -amdsmi_status_t amdsmi_dev_reset_gpu(amdsmi_device_handle device_handle) { +amdsmi_status_t amdsmi_dev_reset_gpu(amdsmi_processor_handle device_handle) { return rsmi_wrapper(rsmi_dev_gpu_reset, device_handle); } -amdsmi_status_t amdsmi_get_utilization_count(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_get_utilization_count(amdsmi_processor_handle device_handle, amdsmi_utilization_counter_t utilization_counters[], uint32_t count, uint64_t *timestamp) { @@ -1363,32 +1363,32 @@ amdsmi_status_t amdsmi_get_utilization_count(amdsmi_device_handle device_handle, count, timestamp); } amdsmi_status_t amdsmi_dev_get_memory_busy_percent( - amdsmi_device_handle device_handle, + amdsmi_processor_handle device_handle, uint32_t *busy_percent) { return rsmi_wrapper(rsmi_dev_memory_busy_percent_get, device_handle, busy_percent); } -amdsmi_status_t amdsmi_dev_get_energy_count(amdsmi_device_handle device_handle, +amdsmi_status_t amdsmi_dev_get_energy_count(amdsmi_processor_handle device_handle, uint64_t *power, float *counter_resolution, uint64_t *timestamp) { return rsmi_wrapper(rsmi_dev_energy_count_get, device_handle, power, counter_resolution, timestamp); } amdsmi_status_t amdsmi_dev_get_drm_render_minor( - amdsmi_device_handle device_handle, uint32_t *minor) { + amdsmi_processor_handle device_handle, uint32_t *minor) { return rsmi_wrapper(rsmi_dev_drm_render_minor_get, device_handle, minor); } amdsmi_status_t amdsmi_dev_get_pci_id( - amdsmi_device_handle device_handle, uint64_t *bdfid) { + amdsmi_processor_handle device_handle, uint64_t *bdfid) { return rsmi_wrapper(rsmi_dev_pci_id_get, device_handle, bdfid); } amdsmi_status_t amdsmi_topo_get_numa_affinity( - amdsmi_device_handle device_handle, uint32_t *numa_node) { + amdsmi_processor_handle device_handle, uint32_t *numa_node) { return rsmi_wrapper(rsmi_topo_numa_affinity_get, device_handle, numa_node); } @@ -1418,7 +1418,7 @@ amdsmi_status_t amdsmi_get_version_str(amdsmi_sw_component_t component, } amdsmi_status_t -amdsmi_get_vbios_info(amdsmi_device_handle device_handle, amdsmi_vbios_info_t *info) { +amdsmi_get_vbios_info(amdsmi_processor_handle device_handle, amdsmi_vbios_info_t *info) { AMDSMI_CHECK_INIT(); if (info == nullptr) { @@ -1463,7 +1463,7 @@ amdsmi_get_vbios_info(amdsmi_device_handle device_handle, amdsmi_vbios_info_t *i } amdsmi_status_t -amdsmi_get_gpu_activity(amdsmi_device_handle device_handle, amdsmi_engine_usage_t *info) { +amdsmi_get_gpu_activity(amdsmi_processor_handle device_handle, amdsmi_engine_usage_t *info) { AMDSMI_CHECK_INIT(); if (info == nullptr) { @@ -1488,7 +1488,7 @@ amdsmi_get_gpu_activity(amdsmi_device_handle device_handle, amdsmi_engine_usage_ } amdsmi_status_t -amdsmi_get_clock_measure(amdsmi_device_handle device_handle, amdsmi_clk_type_t clk_type, amdsmi_clk_measure_t *info) { +amdsmi_get_clock_measure(amdsmi_processor_handle device_handle, amdsmi_clk_type_t clk_type, amdsmi_clk_measure_t *info) { AMDSMI_CHECK_INIT(); if (info == nullptr) { @@ -1543,7 +1543,7 @@ amdsmi_get_clock_measure(amdsmi_device_handle device_handle, amdsmi_clk_type_t c } amdsmi_status_t -amdsmi_get_ras_block_features_enabled(amdsmi_device_handle device_handle, amdsmi_gpu_block_t block, amdsmi_ras_err_state_t *state) { +amdsmi_get_ras_block_features_enabled(amdsmi_processor_handle device_handle, amdsmi_gpu_block_t block, amdsmi_ras_err_state_t *state) { AMDSMI_CHECK_INIT(); if (state == nullptr || block > AMDSMI_GPU_BLOCK_LAST) { @@ -1567,7 +1567,7 @@ amdsmi_get_ras_block_features_enabled(amdsmi_device_handle device_handle, amdsmi } amdsmi_status_t -amdsmi_get_bad_page_info(amdsmi_device_handle device_handle, uint32_t *num_pages, amdsmi_retired_page_record_t *info) { +amdsmi_get_bad_page_info(amdsmi_processor_handle device_handle, uint32_t *num_pages, amdsmi_retired_page_record_t *info) { AMDSMI_CHECK_INIT(); if (num_pages == nullptr) { @@ -1594,7 +1594,7 @@ amdsmi_get_bad_page_info(amdsmi_device_handle device_handle, uint32_t *num_pages } amdsmi_status_t -amdsmi_get_ecc_error_count(amdsmi_device_handle device_handle, amdsmi_error_count_t *ec) { +amdsmi_get_ecc_error_count(amdsmi_processor_handle device_handle, amdsmi_error_count_t *ec) { AMDSMI_CHECK_INIT(); if (ec == nullptr) { @@ -1621,7 +1621,7 @@ amdsmi_get_ecc_error_count(amdsmi_device_handle device_handle, amdsmi_error_coun } amdsmi_status_t -amdsmi_get_process_list(amdsmi_device_handle device_handle, amdsmi_process_handle *list, uint32_t *max_processes) { +amdsmi_get_process_list(amdsmi_processor_handle device_handle, amdsmi_process_handle *list, uint32_t *max_processes) { AMDSMI_CHECK_INIT(); if (max_processes == nullptr) { @@ -1669,7 +1669,7 @@ amdsmi_get_process_list(amdsmi_device_handle device_handle, amdsmi_process_handl } amdsmi_status_t -amdsmi_get_process_info(amdsmi_device_handle device_handle, amdsmi_process_handle process, amdsmi_proc_info_t *info) { +amdsmi_get_process_info(amdsmi_processor_handle device_handle, amdsmi_process_handle process, amdsmi_proc_info_t *info) { AMDSMI_CHECK_INIT(); if (info == nullptr) { @@ -1694,7 +1694,7 @@ amdsmi_get_process_info(amdsmi_device_handle device_handle, amdsmi_process_handl } amdsmi_status_t -amdsmi_get_power_measure(amdsmi_device_handle device_handle, amdsmi_power_measure_t *info) { +amdsmi_get_power_measure(amdsmi_processor_handle device_handle, amdsmi_power_measure_t *info) { AMDSMI_CHECK_INIT(); if (info == nullptr) { @@ -1737,7 +1737,7 @@ amdsmi_get_power_measure(amdsmi_device_handle device_handle, amdsmi_power_measur } amdsmi_status_t -amdsmi_get_target_frequency_range(amdsmi_device_handle device_handle, amdsmi_clk_type_t clk_type, amdsmi_frequency_range_t *range) { +amdsmi_get_target_frequency_range(amdsmi_processor_handle device_handle, amdsmi_clk_type_t clk_type, amdsmi_frequency_range_t *range) { AMDSMI_CHECK_INIT(); if (range == nullptr || clk_type > CLK_TYPE__MAX) { @@ -1788,7 +1788,7 @@ amdsmi_get_target_frequency_range(amdsmi_device_handle device_handle, amdsmi_clk } amdsmi_status_t -amdsmi_get_driver_version(amdsmi_device_handle device_handle, int *length, char *version) { +amdsmi_get_driver_version(amdsmi_processor_handle device_handle, int *length, char *version) { AMDSMI_CHECK_INIT(); if (length == nullptr || version == nullptr) { @@ -1806,7 +1806,7 @@ amdsmi_get_driver_version(amdsmi_device_handle device_handle, int *length, char } amdsmi_status_t -amdsmi_get_device_uuid(amdsmi_device_handle device_handle, unsigned int *uuid_length, char *uuid) { +amdsmi_get_device_uuid(amdsmi_processor_handle device_handle, unsigned int *uuid_length, char *uuid) { AMDSMI_CHECK_INIT(); if (uuid_length == nullptr || uuid == nullptr) { @@ -1854,7 +1854,7 @@ amdsmi_get_device_uuid(amdsmi_device_handle device_handle, unsigned int *uuid_le } amdsmi_status_t -amdsmi_get_pcie_link_status(amdsmi_device_handle device_handle, amdsmi_pcie_info_t *info){ +amdsmi_get_pcie_link_status(amdsmi_processor_handle device_handle, amdsmi_pcie_info_t *info){ AMDSMI_CHECK_INIT(); if (info == nullptr) { @@ -1873,7 +1873,7 @@ amdsmi_get_pcie_link_status(amdsmi_device_handle device_handle, amdsmi_pcie_info return status; } -amdsmi_status_t amdsmi_get_pcie_link_caps(amdsmi_device_handle device_handle, amdsmi_pcie_info_t *info) { +amdsmi_status_t amdsmi_get_pcie_link_caps(amdsmi_processor_handle device_handle, amdsmi_pcie_info_t *info) { AMDSMI_CHECK_INIT(); if (info == nullptr) { @@ -1932,13 +1932,13 @@ amdsmi_status_t amdsmi_get_pcie_link_caps(amdsmi_device_handle device_handle, am } amdsmi_status_t amdsmi_get_device_handle_from_bdf(amdsmi_bdf_t bdf, - amdsmi_device_handle* device_handle) + amdsmi_processor_handle* device_handle) { amdsmi_status_t status; uint32_t socket_count = 0; uint32_t device_count = AMDSMI_MAX_DEVICES; - amdsmi_device_handle devs[AMDSMI_MAX_DEVICES]; + amdsmi_processor_handle devs[AMDSMI_MAX_DEVICES]; AMDSMI_CHECK_INIT(); diff --git a/projects/amdsmi/src/amd_smi/amd_smi_system.cc b/projects/amdsmi/src/amd_smi/amd_smi_system.cc index 8f52dd2bb5..d81dfb0c00 100644 --- a/projects/amdsmi/src/amd_smi/amd_smi_system.cc +++ b/projects/amdsmi/src/amd_smi/amd_smi_system.cc @@ -165,7 +165,7 @@ amdsmi_status_t AMDSmiSystem::handle_to_socket( } amdsmi_status_t AMDSmiSystem::handle_to_device( - amdsmi_device_handle device_handle, + amdsmi_processor_handle device_handle, AMDSmiProcessor** device) { if (device_handle == nullptr || device == nullptr) { return AMDSMI_STATUS_INVAL; @@ -181,7 +181,7 @@ amdsmi_status_t AMDSmiSystem::handle_to_device( } amdsmi_status_t AMDSmiSystem::gpu_index_to_handle(uint32_t gpu_index, - amdsmi_device_handle* device_handle) { + amdsmi_processor_handle* device_handle) { if (device_handle == nullptr) return AMDSMI_STATUS_INVAL; diff --git a/projects/amdsmi/tests/amd_smi_test/functional/hw_topology_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/hw_topology_read.cc index a7fdc9029d..f46c33627d 100755 --- a/projects/amdsmi/tests/amd_smi_test/functional/hw_topology_read.cc +++ b/projects/amdsmi/tests/amd_smi_test/functional/hw_topology_read.cc @@ -113,7 +113,7 @@ void TestHWTopologyRead::Run(void) { std::vector numa_numbers(num_devices); for (uint32_t dv_ind = 0; dv_ind < num_devices; ++dv_ind) { - amdsmi_device_handle dev_handle = device_handles_[dv_ind]; + amdsmi_processor_handle dev_handle = device_handles_[dv_ind]; err = amdsmi_topo_get_numa_node_number(dev_handle, &numa_numbers[dv_ind]); if (err != AMDSMI_STATUS_SUCCESS) { if (err == AMDSMI_STATUS_NOT_SUPPORTED) { diff --git a/projects/amdsmi/tests/amd_smi_test/functional/perf_cntr_read_write.cc b/projects/amdsmi/tests/amd_smi_test/functional/perf_cntr_read_write.cc index e223be4715..a37ff24027 100755 --- a/projects/amdsmi/tests/amd_smi_test/functional/perf_cntr_read_write.cc +++ b/projects/amdsmi/tests/amd_smi_test/functional/perf_cntr_read_write.cc @@ -110,7 +110,7 @@ void TestPerfCntrReadWrite::Close() { // Refactor this to handle different event groups once we have > 1 event group -void TestPerfCntrReadWrite::CountEvents(amdsmi_device_handle dv_ind, +void TestPerfCntrReadWrite::CountEvents(amdsmi_processor_handle dv_ind, amdsmi_event_type_t evnt, amdsmi_counter_value_t *val, int32_t sleep_sec) { amdsmi_event_handle_t evt_handle; amdsmi_status_t ret; @@ -157,7 +157,7 @@ static const uint64_t kVg20Level1Bandwidth = 23; // 23 GB/sec void -TestPerfCntrReadWrite::testEventsIndividually(amdsmi_device_handle dv_ind) { +TestPerfCntrReadWrite::testEventsIndividually(amdsmi_processor_handle dv_ind) { amdsmi_status_t ret; amdsmi_counter_value_t val; uint64_t throughput; @@ -231,7 +231,7 @@ TestPerfCntrReadWrite::testEventsIndividually(amdsmi_device_handle dv_ind) { } void -TestPerfCntrReadWrite::testEventsSimultaneously(amdsmi_device_handle dv_ind) { +TestPerfCntrReadWrite::testEventsSimultaneously(amdsmi_processor_handle dv_ind) { amdsmi_status_t ret; amdsmi_counter_value_t val; uint32_t avail_counters; @@ -352,7 +352,7 @@ void TestPerfCntrReadWrite::Run(void) { } for (uint32_t dv_ind = 0; dv_ind < num_monitor_devs(); ++dv_ind) { - amdsmi_device_handle dev_handle = device_handles_[dv_ind]; + amdsmi_processor_handle dev_handle = device_handles_[dv_ind]; PrintDeviceHeader(dev_handle); try { testEventsIndividually(dev_handle); diff --git a/projects/amdsmi/tests/amd_smi_test/functional/perf_cntr_read_write.h b/projects/amdsmi/tests/amd_smi_test/functional/perf_cntr_read_write.h index 96e29199dd..1aef41d396 100755 --- a/projects/amdsmi/tests/amd_smi_test/functional/perf_cntr_read_write.h +++ b/projects/amdsmi/tests/amd_smi_test/functional/perf_cntr_read_write.h @@ -72,11 +72,11 @@ class TestPerfCntrReadWrite : public TestBase { virtual void DisplayTestInfo(void); private: - void CountEvents(amdsmi_device_handle dv_ind, + void CountEvents(amdsmi_processor_handle dv_ind, amdsmi_event_type_t evnt, amdsmi_counter_value_t *val, int32_t sleep_sec = 1); - void testEventsIndividually(amdsmi_device_handle dv_ind); - void testEventsSimultaneously(amdsmi_device_handle dv_ind); + void testEventsIndividually(amdsmi_processor_handle dv_ind); + void testEventsSimultaneously(amdsmi_processor_handle dv_ind); }; class PerfCntrEvtGrp { diff --git a/projects/amdsmi/tests/amd_smi_test/test_base.cc b/projects/amdsmi/tests/amd_smi_test/test_base.cc index 2ae7662076..3b4d93c9fd 100644 --- a/projects/amdsmi/tests/amd_smi_test/test_base.cc +++ b/projects/amdsmi/tests/amd_smi_test/test_base.cc @@ -131,7 +131,7 @@ void TestBase::SetUp(uint64_t init_flags) { } ASSERT_EQ(err, AMDSMI_STATUS_SUCCESS); - std::vector device_handles(device_count); + std::vector device_handles(device_count); err = amdsmi_get_device_handles(sockets_[i], &device_count, &device_handles[0]); if (err != AMDSMI_STATUS_SUCCESS) { @@ -159,7 +159,7 @@ void TestBase::SetUp(uint64_t init_flags) { return; } -void TestBase::PrintDeviceHeader(amdsmi_device_handle dv_ind) { +void TestBase::PrintDeviceHeader(amdsmi_processor_handle dv_ind) { amdsmi_status_t err; uint16_t val_ui16; amdsmi_asic_info_t info; diff --git a/projects/amdsmi/tests/amd_smi_test/test_base.h b/projects/amdsmi/tests/amd_smi_test/test_base.h index 9d98ccb628..935e265239 100644 --- a/projects/amdsmi/tests/amd_smi_test/test_base.h +++ b/projects/amdsmi/tests/amd_smi_test/test_base.h @@ -121,11 +121,11 @@ class TestBase { protected: void MakeHeaderStr(const char *inStr, std::string *outStr) const; - void PrintDeviceHeader(amdsmi_device_handle dv_ind); + void PrintDeviceHeader(amdsmi_processor_handle dv_ind); bool setup_failed_; ///< Record that setup failed to return ierr in Run uint32_t num_monitor_devs_; ///< Number of monitor devices found ///< device handles - amdsmi_device_handle device_handles_[MAX_MONITOR_DEVICES]; + amdsmi_processor_handle device_handles_[MAX_MONITOR_DEVICES]; uint32_t socket_count_; ///< socket count std::vector sockets_; ///< sockets