diff --git a/CMakeLists.txt b/CMakeLists.txt index 4062a2a7bd..5b024faee1 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -161,12 +161,12 @@ if(PYTHON3 AND PIP3) python_wrapper DEPENDS clang_tools_extract COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/amdsmi_wrapper - COMMAND cp -r ${CMAKE_CURRENT_SOURCE_DIR}/include/amd_smi/amd_smi.h ${CMAKE_CURRENT_BINARY_DIR}/amdsmi_wrapper + COMMAND cp -r ${CMAKE_CURRENT_SOURCE_DIR}/include/amd_smi/amdsmi.h ${CMAKE_CURRENT_BINARY_DIR}/amdsmi_wrapper COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/amdsmi_wrapper/amd_smi COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/rocm_smi/include/rocm_smi/kfd_ioctl.h ${CMAKE_CURRENT_BINARY_DIR}/amdsmi_wrapper/amd_smi/ COMMAND - python3 ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.py ${CMAKE_CURRENT_BINARY_DIR}/amdsmi_wrapper/amd_smi.h + python3 ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.py ${CMAKE_CURRENT_BINARY_DIR}/amdsmi_wrapper/amdsmi.h ${CMAKE_CURRENT_BINARY_DIR}/amdsmi_wrapper/ ${CMAKE_CURRENT_BINARY_DIR}/amdsmi_wrapper/ COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/amdsmi_wrapper/amdsmi_wrapper.py ${CMAKE_CURRENT_SOURCE_DIR}/py-interface/ diff --git a/README.md b/README.md index fb89d2706f..954fa8832b 100755 --- a/README.md +++ b/README.md @@ -79,7 +79,7 @@ A simple "Hello World" type program that displays the temperature of detected de ```c++ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" int main() { amdsmi_status_t ret; diff --git a/docs/amd_smi_doxygen.cfg b/docs/amd_smi_doxygen.cfg index 7c13ff4afa..3e9779a09a 100644 --- a/docs/amd_smi_doxygen.cfg +++ b/docs/amd_smi_doxygen.cfg @@ -760,7 +760,7 @@ WARN_LOGFILE = # Note: If this tag is empty the current directory is searched. INPUT = @CMAKE_CURRENT_SOURCE_DIR@/../README.md \ - @CMAKE_CURRENT_SOURCE_DIR@/../include/amd_smi/amd_smi.h + @CMAKE_CURRENT_SOURCE_DIR@/../include/amd_smi/amdsmi.h # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses diff --git a/example/amd_smi_drm_example.cc b/example/amd_smi_drm_example.cc index f885704578..173d09576a 100644 --- a/example/amd_smi_drm_example.cc +++ b/example/amd_smi_drm_example.cc @@ -44,7 +44,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include #include #include diff --git a/example/amd_smi_nodrm_example.cc b/example/amd_smi_nodrm_example.cc index f9e08d5ff5..35059ece90 100644 --- a/example/amd_smi_nodrm_example.cc +++ b/example/amd_smi_nodrm_example.cc @@ -44,7 +44,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include #include #include diff --git a/include/amd_smi/amd_smi.h b/include/amd_smi/amdsmi.h similarity index 97% rename from include/amd_smi/amd_smi.h rename to include/amd_smi/amdsmi.h index 89b7f8141d..e58fbb3472 100644 --- a/include/amd_smi/amd_smi.h +++ b/include/amd_smi/amdsmi.h @@ -41,11 +41,11 @@ * */ -#ifndef INCLUDE_AMD_SMI_H_ -#define INCLUDE_AMD_SMI_H_ +#ifndef INCLUDE_AMDSMI_H_ +#define INCLUDE_AMDSMI_H_ /** - * @file amd_smi.h + * @file amdsmi.h * @brief AMD System Management Interface API */ @@ -88,7 +88,7 @@ typedef enum amdsmi_init_flags { #define AMDSMI_TIME_FORMAT "%02d:%02d:%02d.%03d" #define AMDSMI_DATE_FORMAT "%04d-%02d-%02d:%02d:%02d:%02d.%03d" -typedef enum amdsmi_mm_ip { MM_UVD, MM_VCE, MM_VCN, MM__MAX } amdsmi_mm_ip_t; +typedef enum amdsmi_mm_ip { AMDSMI_MM_UVD, AMDSMI_MM_VCE, AMDSMI_MM_VCN, AMDSMI_MM__MAX } amdsmi_mm_ip_t; typedef enum amdsmi_container_types { CONTAINER_LXC, @@ -1100,7 +1100,7 @@ typedef struct { */ typedef struct amdsmi_pcie_info { uint16_t pcie_lanes; - uint16_t pcie_speed; + uint32_t pcie_speed; } amdsmi_pcie_info_t; /** * @brief This structure contains information specific to a process. @@ -2151,30 +2151,30 @@ amdsmi_utilization_count_get(amdsmi_device_handle device_handle, /** * @brief Get current PCIE info of the device with provided device handle. * - * @details Given a device handle @p dev, this function returns PCIE info of the + * @details Given a device handle @p device_handle, this function returns PCIE info of the * given device. * - * @param[in] dev a device handle + * @param[in] device_handle a device handle * * @param[out] info amdsmi_pcie_info_t struct which will hold all the extracted PCIE info data. * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_pcie_link_status(amdsmi_device_handle dev, amdsmi_pcie_info_t *info); +amdsmi_status_t amdsmi_get_pcie_link_status(amdsmi_device_handle device_handle, amdsmi_pcie_info_t *info); /** * @brief Get max PCIe capabilities of the device with provided device handle. * - * @details Given a device handle @p dev, this function returns PCIe caps info of the + * @details Given a device handle @p device_handle, this function returns PCIe caps info of the * given device. * - * @param[in] dev a device handle + * @param[in] device_handle a device handle * * @param[out] info amdsmi_pcie_info_t struct which will hold all the extracted PCIe caps data. * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_pcie_link_caps(amdsmi_device_handle dev, amdsmi_pcie_info_t *info); +amdsmi_status_t amdsmi_get_pcie_link_caps(amdsmi_device_handle device_handle, amdsmi_pcie_info_t *info); /** * @brief Get the performance level of the device @@ -3580,19 +3580,19 @@ amdsmi_status_t amdsmi_event_notification_stop(amdsmi_device_handle device_handl /** * @brief Returns BDF of the given device * - * @param[in] dev Device which to query + * @param[in] device_handle Device which to query * * @param[out] bdf Reference to BDF. Must be allocated by user. * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_device_bdf(amdsmi_device_handle dev, amdsmi_bdf_t *bdf); +amdsmi_get_device_bdf(amdsmi_device_handle device_handle, amdsmi_bdf_t *bdf); /** * @brief Returns the UUID of the device * - * @param[in] dev Device which to query + * @param[in] device_handle Device which to query * * @param[in,out] uuid_length Length of the uuid string. As input, must be * equal or greater than SMI_GPU_UUID_SIZE and be allocated by @@ -3604,7 +3604,7 @@ amdsmi_get_device_bdf(amdsmi_device_handle dev, 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 dev, unsigned int *uuid_length, char *uuid); +amdsmi_get_device_uuid(amdsmi_device_handle device_handle, unsigned int *uuid_length, char *uuid); /*****************************************************************************/ /** @defgroup swversion SW Version Information @@ -3614,7 +3614,7 @@ amdsmi_get_device_uuid(amdsmi_device_handle dev, unsigned int *uuid_length, char /** * @brief Returns the driver version information * - * @param[in] dev Device which to query + * @param[in] device_handle Device which to query * * @param[in,out] length As input parameter length of the user allocated * string buffer. As output parameter length of the returned @@ -3626,7 +3626,7 @@ amdsmi_get_device_uuid(amdsmi_device_handle dev, unsigned int *uuid_length, char * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_driver_version(amdsmi_device_handle dev, int *length, char *version); +amdsmi_get_driver_version(amdsmi_device_handle device_handle, int *length, char *version); /** @} End swversion */ @@ -3642,7 +3642,7 @@ amdsmi_get_driver_version(amdsmi_device_handle dev, int *length, char *version); * the family, the vendor ID, the subvendor ID, the device ID, * the revision ID and the serial number. * - * @param[in] dev Device which to query + * @param[in] device_handle Device which to query * * @param[out] info Reference to static asic information structure. * Must be allocated by user. @@ -3650,12 +3650,12 @@ amdsmi_get_driver_version(amdsmi_device_handle dev, int *length, char *version); * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_asic_info(amdsmi_device_handle dev, amdsmi_asic_info_t *info); +amdsmi_get_asic_info(amdsmi_device_handle device_handle, amdsmi_asic_info_t *info); /** * @brief Returns the board part number and board information for the requested device * - * @param[in] dev Device which to query + * @param[in] device_handle Device which to query * * @param[out] info Reference to board info structure. * Must be allocated by user. @@ -3663,13 +3663,13 @@ amdsmi_get_asic_info(amdsmi_device_handle dev, amdsmi_asic_info_t *info); * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_board_info(amdsmi_device_handle dev, amdsmi_board_info_t *info); +amdsmi_get_board_info(amdsmi_device_handle device_handle, amdsmi_board_info_t *info); /** * @brief Returns the power caps as currently configured in the * system. * - * @param[in] dev Device which to query + * @param[in] device_handle Device which to query * @param[in] sensor_ind A 0-based sensor index. Normally, this will be 0. * If a device has more than one sensor, it could be greater than 0. * @param[out] info Reference to power caps information structure. Must be @@ -3678,13 +3678,13 @@ amdsmi_get_board_info(amdsmi_device_handle dev, amdsmi_board_info_t *info); * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_power_cap_info(amdsmi_device_handle dev, uint32_t sensor_ind, +amdsmi_get_power_cap_info(amdsmi_device_handle device_handle, uint32_t sensor_ind, amdsmi_power_cap_info_t *info); /** * @brief Returns XGMI information for the GPU. * - * @param[in] dev Device which to query + * @param[in] device_handle Device which to query * * @param[out] info Reference to xgmi information structure. Must be * allocated by user. @@ -3693,13 +3693,13 @@ amdsmi_get_power_cap_info(amdsmi_device_handle dev, uint32_t sensor_ind, * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_xgmi_info(amdsmi_device_handle dev, amdsmi_xgmi_info_t *info); +amdsmi_get_xgmi_info(amdsmi_device_handle device_handle, amdsmi_xgmi_info_t *info); /** * @brief Returns the device capabilities as currently configured in * the system * - * @param[in] dev Device which to query + * @param[in] device_handle Device which to query * * @param[out] info Reference to caps information structure. Must be * allocated by user. @@ -3707,7 +3707,7 @@ amdsmi_get_xgmi_info(amdsmi_device_handle dev, amdsmi_xgmi_info_t *info); * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_caps_info(amdsmi_device_handle dev, amdsmi_gpu_caps_t *info); +amdsmi_get_caps_info(amdsmi_device_handle device_handle, amdsmi_gpu_caps_t *info); /** @} End asicinfo */ @@ -3719,19 +3719,19 @@ amdsmi_get_caps_info(amdsmi_device_handle dev, amdsmi_gpu_caps_t *info); /** * @brief Returns the firmware versions running on the device. * - * @param[in] dev Device which to query + * @param[in] device_handle Device which to query * * @param[out] info Reference to the fw info. Must be allocated by user. * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_fw_info(amdsmi_device_handle dev, amdsmi_fw_info_t *info); +amdsmi_get_fw_info(amdsmi_device_handle device_handle, amdsmi_fw_info_t *info); /** * @brief Returns the static information for the vBIOS on the device. * - * @param[in] dev Device which to query + * @param[in] device_handle Device which to query * * @param[out] info Reference to static vBIOS information. * Must be allocated by user. @@ -3739,7 +3739,7 @@ amdsmi_get_fw_info(amdsmi_device_handle dev, 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 dev, amdsmi_vbios_info_t *info); +amdsmi_get_vbios_info(amdsmi_device_handle device_handle, amdsmi_vbios_info_t *info); /** @} End fwinfo */ @@ -3752,34 +3752,34 @@ amdsmi_get_vbios_info(amdsmi_device_handle dev, amdsmi_vbios_info_t *info); * @brief Returns the current usage of the GPU engines (GFX, MM and MEM). * Each usage is reported as a percentage from 0-100%. * - * @param[in] dev Device which to query + * @param[in] device_handle Device which to query * * @param[out] info Reference to the gpu engine usage structure. Must be allocated by user. * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_gpu_activity(amdsmi_device_handle dev, amdsmi_engine_usage_t *info); +amdsmi_get_gpu_activity(amdsmi_device_handle device_handle, amdsmi_engine_usage_t *info); /** * @brief Returns the current power and voltage of the GPU. * The voltage is in units of mV and the power in units of W. * - * @param[in] dev Device which to query + * @param[in] device_handle Device which to query * * @param[out] info Reference to the gpu power structure. Must be allocated by user. * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_power_measure(amdsmi_device_handle dev, amdsmi_power_measure_t *info); +amdsmi_get_power_measure(amdsmi_device_handle device_handle, amdsmi_power_measure_t *info); /** * @brief Returns the measurements of the clocks in the GPU * for the GFX and multimedia engines and Memory. This call * reports the averages over 1s in MHz. * - * @param[in] dev Device which to query + * @param[in] device_handle Device which to query * * @param[in] clk_type Enum representing the clock type to query. * @@ -3789,13 +3789,13 @@ amdsmi_get_power_measure(amdsmi_device_handle dev, amdsmi_power_measure_t *info) * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_clock_measure(amdsmi_device_handle dev, amdsmi_clk_type_t clk_type, amdsmi_clk_measure_t *info); +amdsmi_get_clock_measure(amdsmi_device_handle device_handle, amdsmi_clk_type_t clk_type, amdsmi_clk_measure_t *info); /** * @brief Returns temperature measurements of the GPU. * The results are in °C. * - * @param[in] dev Device which to query + * @param[in] device_handle Device which to query * * @param[in] temp_type Enum representing the temperature type to query. * @@ -3805,13 +3805,13 @@ amdsmi_get_clock_measure(amdsmi_device_handle dev, amdsmi_clk_type_t clk_type, a * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_temperature_measure(amdsmi_device_handle dev, amdsmi_temperature_type_t temp_type, amdsmi_temperature_t *info); +amdsmi_get_temperature_measure(amdsmi_device_handle device_handle, amdsmi_temperature_type_t temp_type, amdsmi_temperature_t *info); /** * @brief Returns temperature limit of the GPU. * The results are in °C. * - * @param[in] dev Device which to query + * @param[in] device_handle Device which to query * * @param[in] temp_type Enum representing the temperature type to query. * @@ -3821,13 +3821,13 @@ amdsmi_get_temperature_measure(amdsmi_device_handle dev, amdsmi_temperature_type * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_temperature_limit(amdsmi_device_handle dev, amdsmi_temperature_type_t temp_type, amdsmi_temperature_limit_t *limit); +amdsmi_get_temperature_limit(amdsmi_device_handle device_handle, amdsmi_temperature_type_t temp_type, amdsmi_temperature_limit_t *limit); /** * @brief Returns power limit of the GPU. * The results are in W. * - * @param[in] dev Device which to query + * @param[in] device_handle Device which to query * * @param[out] limit Reference to the power limit. * Must be allocated by user. @@ -3835,13 +3835,13 @@ amdsmi_get_temperature_limit(amdsmi_device_handle dev, amdsmi_temperature_type_t * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_power_limit(amdsmi_device_handle dev, amdsmi_power_limit_t *limit); +amdsmi_get_power_limit(amdsmi_device_handle device_handle, amdsmi_power_limit_t *power); /** * @brief Returns the VRAM usage (both total and used memory) * in MegaBytes. * - * @param[in] dev Device which to query + * @param[in] device_handle Device which to query * * * @param[out] info Reference to vram information. @@ -3850,7 +3850,7 @@ amdsmi_get_power_limit(amdsmi_device_handle dev, amdsmi_power_limit_t *limit); * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_vram_usage(amdsmi_device_handle dev, amdsmi_vram_info_t *info); +amdsmi_get_vram_usage(amdsmi_device_handle device_handle, amdsmi_vram_info_t *info); /** @} End gpumon */ @@ -3863,7 +3863,7 @@ amdsmi_get_vram_usage(amdsmi_device_handle dev, amdsmi_vram_info_t *info); * @brief Returns current and supported frequency range * for the specified clock type. * - * @param[in] dev Device which to query + * @param[in] device_handle Device which to query * * @param[in] clk_type Clock type for which to get current and supported * frequency range. @@ -3874,7 +3874,7 @@ amdsmi_get_vram_usage(amdsmi_device_handle dev, amdsmi_vram_info_t *info); * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_target_frequency_range(amdsmi_device_handle dev, amdsmi_clk_type_t clk_type, amdsmi_frequency_range_t *range); +amdsmi_get_target_frequency_range(amdsmi_device_handle device_handle, amdsmi_clk_type_t clk_type, amdsmi_frequency_range_t *range); /** @} End powermon */ @@ -3891,7 +3891,7 @@ amdsmi_get_target_frequency_range(amdsmi_device_handle dev, amdsmi_clk_type_t cl * sets max_processes to 0, the total number of processes will be * returned. * - * @param[in] dev Device which to query + * @param[in] device_handle Device which to query * * @param[out] list Reference to a user-provided buffer where the process * list will be returned. This buffer must contain at least @@ -3905,12 +3905,12 @@ amdsmi_get_target_frequency_range(amdsmi_device_handle dev, amdsmi_clk_type_t cl * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_process_list(amdsmi_device_handle dev, amdsmi_process_handle *list, uint32_t *max_processes); +amdsmi_get_process_list(amdsmi_device_handle device_handle, amdsmi_process_handle *list, uint32_t *max_processes); /** * @brief Returns the process information of a given process. * - * @param[in] dev Device which to query + * @param[in] device_handle Device which to query * * @param[in] process Handle of process to query. * @@ -3920,7 +3920,7 @@ amdsmi_get_process_list(amdsmi_device_handle dev, amdsmi_process_handle *list, u * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_process_info(amdsmi_device_handle dev, amdsmi_process_handle process, amdsmi_proc_info_t *info); +amdsmi_get_process_info(amdsmi_device_handle device_handle, amdsmi_process_handle process, amdsmi_proc_info_t *info); /** @} End processinfo */ @@ -3933,7 +3933,7 @@ amdsmi_get_process_info(amdsmi_device_handle dev, amdsmi_process_handle process, * @brief Returns the number of ECC errors (correctable and * uncorrectable) in the given GPU. * - * @param[in] dev Device which to query + * @param[in] device_handle Device which to query * * @param[out] ec Reference to ecc error count structure. * Must be allocated by user. @@ -3941,11 +3941,11 @@ amdsmi_get_process_info(amdsmi_device_handle dev, amdsmi_process_handle process, * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_ecc_error_count(amdsmi_device_handle dev, amdsmi_error_count_t *ec); +amdsmi_get_ecc_error_count(amdsmi_device_handle device_handle, amdsmi_error_count_t *ec); /** @} End eccinfo */ #ifdef __cplusplus } #endif // __cplusplus -#endif // INCLUDE_AMD_SMI_H_ +#endif // INCLUDE_AMDSMI_H_ diff --git a/include/amd_smi/impl/amd_smi_device.h b/include/amd_smi/impl/amd_smi_device.h index 2f736ddc09..86a7623d2d 100644 --- a/include/amd_smi/impl/amd_smi_device.h +++ b/include/amd_smi/impl/amd_smi_device.h @@ -44,7 +44,7 @@ #ifndef AMD_SMI_INCLUDE_AMD_SMI_DEVICE_H_ #define AMD_SMI_INCLUDE_AMD_SMI_DEVICE_H_ -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" namespace amd { namespace smi { diff --git a/include/amd_smi/impl/amd_smi_drm.h b/include/amd_smi/impl/amd_smi_drm.h index ba42fcb8e6..d4c0630470 100644 --- a/include/amd_smi/impl/amd_smi_drm.h +++ b/include/amd_smi/impl/amd_smi_drm.h @@ -48,7 +48,7 @@ #include #include #include // NOLINT -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "amd_smi/impl/amd_smi_lib_loader.h" namespace amd { diff --git a/include/amd_smi/impl/amd_smi_gpu_device.h b/include/amd_smi/impl/amd_smi_gpu_device.h index 9183083e09..10ea7fc8ed 100644 --- a/include/amd_smi/impl/amd_smi_gpu_device.h +++ b/include/amd_smi/impl/amd_smi_gpu_device.h @@ -44,7 +44,7 @@ #ifndef AMD_SMI_INCLUDE_IMPL_AMD_SMI_GPU_DEVICE_H_ #define AMD_SMI_INCLUDE_IMPL_AMD_SMI_GPU_DEVICE_H_ -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "amd_smi/impl/amd_smi_device.h" #include "amd_smi/impl/amd_smi_drm.h" #include "shared_mutex.h" // NOLINT diff --git a/include/amd_smi/impl/amd_smi_lib_loader.h b/include/amd_smi/impl/amd_smi_lib_loader.h index 8f579f7563..39898128be 100644 --- a/include/amd_smi/impl/amd_smi_lib_loader.h +++ b/include/amd_smi/impl/amd_smi_lib_loader.h @@ -26,7 +26,7 @@ THE SOFTWARE. #include #include #include // NOLINT(build/c++11) -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" namespace amd { diff --git a/include/amd_smi/impl/amd_smi_socket.h b/include/amd_smi/impl/amd_smi_socket.h index c4d50a88e9..5f114bdc4b 100644 --- a/include/amd_smi/impl/amd_smi_socket.h +++ b/include/amd_smi/impl/amd_smi_socket.h @@ -47,7 +47,7 @@ #include #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "amd_smi/impl/amd_smi_device.h" namespace amd { diff --git a/include/amd_smi/impl/amd_smi_system.h b/include/amd_smi/impl/amd_smi_system.h index 6e4b043075..c83a86eb3c 100644 --- a/include/amd_smi/impl/amd_smi_system.h +++ b/include/amd_smi/impl/amd_smi_system.h @@ -46,7 +46,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "amd_smi/impl/amd_smi_socket.h" #include "amd_smi/impl/amd_smi_device.h" #include "amd_smi/impl/amd_smi_drm.h" diff --git a/include/amd_smi/impl/amd_smi_utils.h b/include/amd_smi/impl/amd_smi_utils.h index 177d042a0d..256ae9642b 100644 --- a/include/amd_smi/impl/amd_smi_utils.h +++ b/include/amd_smi/impl/amd_smi_utils.h @@ -21,7 +21,7 @@ #ifndef AMD_SMI_INCLUDE_AMD_SMI_UTILS_H_ #define AMD_SMI_INCLUDE_AMD_SMI_UTILS_H_ -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "amd_smi/impl/amd_smi_gpu_device.h" #include "rocm_smi/rocm_smi_utils.h" diff --git a/py-interface/amdsmi_exception.py b/py-interface/amdsmi_exception.py index 8702f64194..2659a44fe0 100644 --- a/py-interface/amdsmi_exception.py +++ b/py-interface/amdsmi_exception.py @@ -42,12 +42,10 @@ class AmdSmiRetCode(IntEnum): UNEXPECTED_DATA = amdsmi_wrapper.AMDSMI_STATUS_UNEXPECTED_DATA ERR_BUSY = amdsmi_wrapper.AMDSMI_STATUS_BUSY REFCOUNT_OVERFLOW = amdsmi_wrapper.AMDSMI_STATUS_REFCOUNT_OVERFLOW - LIB_START = amdsmi_wrapper.AMDSMI_LIB_START FAIL_LOAD_MODULE = amdsmi_wrapper.AMDSMI_STATUS_FAIL_LOAD_MODULE FAIL_LOAD_SYMBOL = amdsmi_wrapper.AMDSMI_STATUS_FAIL_LOAD_SYMBOL DRM_ERROR = amdsmi_wrapper.AMDSMI_STATUS_DRM_ERROR ERR_IO = amdsmi_wrapper.AMDSMI_STATUS_IO - FAULT = amdsmi_wrapper.AMDSMI_STATUS_FAULT API_FAILED = amdsmi_wrapper.AMDSMI_STATUS_API_FAILED TIMEOUT = amdsmi_wrapper.AMDSMI_STATUS_TIMEOUT NO_SLOT = amdsmi_wrapper.AMDSMI_STATUS_NO_SLOT @@ -97,11 +95,9 @@ class AmdSmiLibraryException(AmdSmiException): AmdSmiRetCode.NO_DATA: "AMDSMI_STATUS_NO_DATA - No data was found for given input", AmdSmiRetCode.UNEXPECTED_DATA: "AMDSMI_STATUS_UNEXPECTED_DATA - The data read or provided was unexpected", AmdSmiRetCode.REFCOUNT_OVERFLOW: "AMDSMI_STATUS_REFCOUNT_OVERFLOW - Internal reference counter exceeded INT32_MAX", - AmdSmiRetCode.LIB_START: "AMDSMI_LIB_START - Lib start status", AmdSmiRetCode.FAIL_LOAD_MODULE: "AMDSMI_STATUS_FAIL_LOAD_MODULE - Fail to load lib", AmdSmiRetCode.FAIL_LOAD_SYMBOL: "AMDSMI_STATUS_FAIL_LOAD_SYMBOL - Fail to load symbol", AmdSmiRetCode.DRM_ERROR: "AMDSMI_STATUS_DRM_ERROR - Error when called libdrm", - AmdSmiRetCode.FAULT: "AMDSMI_STATUS_FAULT - Bad address", AmdSmiRetCode.API_FAILED: "AMDSMI_STATUS_API_FAILED - API call failed", AmdSmiRetCode.TIMEOUT: "AMDSMI_STATUS_TIMEOUT - Timeout in API call", AmdSmiRetCode.NO_SLOT: "AMDSMI_STATUS_NO_SLOT - No more free slot", diff --git a/py-interface/amdsmi_interface.py b/py-interface/amdsmi_interface.py index c14c178f9e..4e1cfd6081 100644 --- a/py-interface/amdsmi_interface.py +++ b/py-interface/amdsmi_interface.py @@ -51,9 +51,9 @@ class AmdSmiDeviceType(IntEnum): class AmdSmiMmIp(IntEnum): - UVD = amdsmi_wrapper.MM_UVD - VCE = amdsmi_wrapper.MM_VCE - VCN = amdsmi_wrapper.MM_VCN + UVD = amdsmi_wrapper.AMDSMI_MM_UVD + VCE = amdsmi_wrapper.AMDSMI_MM_VCE + VCN = amdsmi_wrapper.AMDSMI_MM_VCN class AmdSmiFWBlock(IntEnum): diff --git a/py-interface/amdsmi_wrapper.py b/py-interface/amdsmi_wrapper.py index dd7f043f90..18b9c9f1d1 100644 --- a/py-interface/amdsmi_wrapper.py +++ b/py-interface/amdsmi_wrapper.py @@ -193,15 +193,15 @@ amdsmi_init_flags_t__enumvalues = amdsmi_init_flags__enumvalues # values for enumeration 'amdsmi_mm_ip' amdsmi_mm_ip__enumvalues = { - 0: 'MM_UVD', - 1: 'MM_VCE', - 2: 'MM_VCN', - 3: 'MM__MAX', + 0: 'AMDSMI_MM_UVD', + 1: 'AMDSMI_MM_VCE', + 2: 'AMDSMI_MM_VCN', + 3: 'AMDSMI_MM__MAX', } -MM_UVD = 0 -MM_VCE = 1 -MM_VCN = 2 -MM__MAX = 3 +AMDSMI_MM_UVD = 0 +AMDSMI_MM_VCE = 1 +AMDSMI_MM_VCN = 2 +AMDSMI_MM__MAX = 3 amdsmi_mm_ip = ctypes.c_uint32 # enum amdsmi_mm_ip_t = amdsmi_mm_ip amdsmi_mm_ip_t__enumvalues = amdsmi_mm_ip__enumvalues @@ -424,6 +424,15 @@ amdsmi_xgmi_info_t = amdsmi_xgmi_info class amdsmi_gpu_caps(Structure): pass +class amdsmi_gpu_caps_1(Structure): + pass + +amdsmi_gpu_caps_1._pack_ = 1 # source:False +amdsmi_gpu_caps_1._fields_ = [ + ('mm_ip_count', ctypes.c_ubyte), + ('mm_ip_list', ctypes.c_ubyte * 8), +] + class amdsmi_gpu_caps_0(Structure): pass @@ -435,15 +444,6 @@ amdsmi_gpu_caps_0._fields_ = [ ('PADDING_0', ctypes.c_ubyte * 2), ] -class amdsmi_gpu_caps_1(Structure): - pass - -amdsmi_gpu_caps_1._pack_ = 1 # source:False -amdsmi_gpu_caps_1._fields_ = [ - ('mm_ip_count', ctypes.c_ubyte), - ('mm_ip_list', ctypes.c_ubyte * 8), -] - amdsmi_gpu_caps._pack_ = 1 # source:False amdsmi_gpu_caps._fields_ = [ ('gfx', amdsmi_gpu_caps_0), @@ -644,6 +644,16 @@ amdsmi_process_handle = ctypes.c_uint32 class amdsmi_process_info(Structure): pass +class amdsmi_process_info_1(Structure): + pass + +amdsmi_process_info_1._pack_ = 1 # source:False +amdsmi_process_info_1._fields_ = [ + ('gtt_mem', ctypes.c_uint64), + ('cpu_mem', ctypes.c_uint64), + ('vram_mem', ctypes.c_uint64), +] + class amdsmi_process_info_0(Structure): pass @@ -656,16 +666,6 @@ amdsmi_process_info_0._fields_ = [ ('dec', ctypes.c_uint16 * 8), ] -class amdsmi_process_info_1(Structure): - pass - -amdsmi_process_info_1._pack_ = 1 # source:False -amdsmi_process_info_1._fields_ = [ - ('gtt_mem', ctypes.c_uint64), - ('cpu_mem', ctypes.c_uint64), - ('vram_mem', ctypes.c_uint64), -] - amdsmi_process_info._pack_ = 1 # source:False amdsmi_process_info._fields_ = [ ('name', ctypes.c_char * 32), @@ -1296,7 +1296,8 @@ class amdsmi_pcie_info(Structure): amdsmi_pcie_info._pack_ = 1 # source:False amdsmi_pcie_info._fields_ = [ ('pcie_lanes', ctypes.c_uint16), - ('pcie_speed', ctypes.c_uint16), + ('PADDING_0', ctypes.c_ubyte * 2), + ('pcie_speed', ctypes.c_uint32), ] amdsmi_pcie_info_t = amdsmi_pcie_info @@ -1391,7 +1392,8 @@ __all__ = \ 'AMDSMI_MEM_PAGE_STATUS_UNRESERVABLE', 'AMDSMI_MEM_TYPE_FIRST', 'AMDSMI_MEM_TYPE_GTT', 'AMDSMI_MEM_TYPE_LAST', 'AMDSMI_MEM_TYPE_VIS_VRAM', 'AMDSMI_MEM_TYPE_VRAM', - 'AMDSMI_PWR_PROF_PRST_3D_FULL_SCR_MASK', + 'AMDSMI_MM_UVD', 'AMDSMI_MM_VCE', 'AMDSMI_MM_VCN', + 'AMDSMI_MM__MAX', 'AMDSMI_PWR_PROF_PRST_3D_FULL_SCR_MASK', 'AMDSMI_PWR_PROF_PRST_BOOTUP_DEFAULT', 'AMDSMI_PWR_PROF_PRST_COMPUTE_MASK', 'AMDSMI_PWR_PROF_PRST_CUSTOM_MASK', @@ -1441,15 +1443,14 @@ __all__ = \ 'FW_ID_SDMA2', 'FW_ID_SDMA3', 'FW_ID_SDMA4', 'FW_ID_SDMA5', 'FW_ID_SDMA6', 'FW_ID_SDMA7', 'FW_ID_SMC', 'FW_ID_SMU', 'FW_ID_TA_RAS', 'FW_ID_UVD', 'FW_ID_VCE', 'FW_ID_VCN', - 'FW_ID_XGMI', 'FW_ID__MAX', 'MM_UVD', 'MM_VCE', 'MM_VCN', - 'MM__MAX', 'NON_AMD_CPU', 'NON_AMD_GPU', 'TEMPERATURE_TYPE_EDGE', - 'TEMPERATURE_TYPE_FIRST', 'TEMPERATURE_TYPE_HBM_0', - 'TEMPERATURE_TYPE_HBM_1', 'TEMPERATURE_TYPE_HBM_2', - 'TEMPERATURE_TYPE_HBM_3', 'TEMPERATURE_TYPE_JUNCTION', - 'TEMPERATURE_TYPE_PLX', 'TEMPERATURE_TYPE_VRAM', - 'TEMPERATURE_TYPE__MAX', 'UNKNOWN', '_AMDSMI_IO_LINK_TYPE', - 'amdsmi_asic_info_t', 'amdsmi_bdf_t', 'amdsmi_bit_field', - 'amdsmi_bit_field_t', 'amdsmi_board_info_t', + 'FW_ID_XGMI', 'FW_ID__MAX', 'NON_AMD_CPU', 'NON_AMD_GPU', + 'TEMPERATURE_TYPE_EDGE', 'TEMPERATURE_TYPE_FIRST', + 'TEMPERATURE_TYPE_HBM_0', 'TEMPERATURE_TYPE_HBM_1', + 'TEMPERATURE_TYPE_HBM_2', 'TEMPERATURE_TYPE_HBM_3', + 'TEMPERATURE_TYPE_JUNCTION', 'TEMPERATURE_TYPE_PLX', + 'TEMPERATURE_TYPE_VRAM', 'TEMPERATURE_TYPE__MAX', 'UNKNOWN', + '_AMDSMI_IO_LINK_TYPE', 'amdsmi_asic_info_t', 'amdsmi_bdf_t', + 'amdsmi_bit_field', 'amdsmi_bit_field_t', 'amdsmi_board_info_t', 'amdsmi_clk_measure_t', 'amdsmi_clk_type', 'amdsmi_clk_type_t', 'amdsmi_clk_type_t__enumvalues', 'amdsmi_container_types', 'amdsmi_container_types_t', @@ -1590,15 +1591,15 @@ amdsmi_init_flags_t__enumvalues = amdsmi_init_flags__enumvalues # values for enumeration 'amdsmi_mm_ip' amdsmi_mm_ip__enumvalues = { - 0: 'MM_UVD', - 1: 'MM_VCE', - 2: 'MM_VCN', - 3: 'MM__MAX', + 0: 'AMDSMI_MM_UVD', + 1: 'AMDSMI_MM_VCE', + 2: 'AMDSMI_MM_VCN', + 3: 'AMDSMI_MM__MAX', } -MM_UVD = 0 -MM_VCE = 1 -MM_VCN = 2 -MM__MAX = 3 +AMDSMI_MM_UVD = 0 +AMDSMI_MM_VCE = 1 +AMDSMI_MM_VCN = 2 +AMDSMI_MM__MAX = 3 amdsmi_mm_ip = ctypes.c_uint32 # enum amdsmi_mm_ip_t = amdsmi_mm_ip amdsmi_mm_ip_t__enumvalues = amdsmi_mm_ip__enumvalues @@ -1700,7 +1701,8 @@ amdsmi_status_t = ctypes.c_uint32 # enum __all__ += \ ['AMDSMI_INIT_ALL_DEVICES', 'AMDSMI_INIT_AMD_CPUS', 'AMDSMI_INIT_AMD_GPUS', 'AMDSMI_INIT_NON_AMD_CPUS', - 'AMDSMI_INIT_NON_AMD_GPUS', 'AMDSMI_LIB_START', + 'AMDSMI_INIT_NON_AMD_GPUS', 'AMDSMI_LIB_START', 'AMDSMI_MM_UVD', + 'AMDSMI_MM_VCE', 'AMDSMI_MM_VCN', 'AMDSMI_MM__MAX', 'AMDSMI_STATUS_API_FAILED', 'AMDSMI_STATUS_BUSY', 'AMDSMI_STATUS_DRM_ERROR', 'AMDSMI_STATUS_FAIL_LOAD_MODULE', 'AMDSMI_STATUS_FAIL_LOAD_SYMBOL', 'AMDSMI_STATUS_FAULT', @@ -1718,9 +1720,8 @@ __all__ += \ 'AMDSMI_STATUS_SUCCESS', 'AMDSMI_STATUS_TIMEOUT', 'AMDSMI_STATUS_UNEXPECTED_DATA', 'AMDSMI_STATUS_UNEXPECTED_SIZE', 'AMDSMI_STATUS_UNKNOWN_ERROR', 'AMD_CPU', 'AMD_GPU', - 'CONTAINER_DOCKER', 'CONTAINER_LXC', 'MM_UVD', 'MM_VCE', 'MM_VCN', - 'MM__MAX', 'NON_AMD_CPU', 'NON_AMD_GPU', 'UNKNOWN', - 'amdsmi_container_types', 'amdsmi_container_types_t', + 'CONTAINER_DOCKER', 'CONTAINER_LXC', 'NON_AMD_CPU', 'NON_AMD_GPU', + 'UNKNOWN', 'amdsmi_container_types', 'amdsmi_container_types_t', 'amdsmi_container_types_t__enumvalues', 'amdsmi_device_handle', 'amdsmi_init_flags', 'amdsmi_init_flags_t', 'amdsmi_init_flags_t__enumvalues', 'amdsmi_mm_ip', diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0126410db4..37d4961916 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -39,7 +39,7 @@ set(SRC_LIST "${SRC_DIR}/fdinfo.cc" "${CMN_SRC_LIST}") set(INC_LIST - "${INC_DIR}/amd_smi.h" + "${INC_DIR}/amdsmi.h" "${INC_DIR}/impl/amd_smi_common.h" "${INC_DIR}/impl/amd_smi_device.h" "${INC_DIR}/impl/amd_smi_drm.h" @@ -113,7 +113,7 @@ install( LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT ${AMD_SMI_COMPONENT}) -install(FILES ${PROJECT_SOURCE_DIR}/include/amd_smi/amd_smi.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/amd_smi) +install(FILES ${PROJECT_SOURCE_DIR}/include/amd_smi/amdsmi.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/amd_smi) install(FILES ${PROJECT_SOURCE_DIR}/include/amd_smi/${AMD_SMI_TARGET}Config.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/amd_smi) install(FILES ${PROJECT_SOURCE_DIR}/rocm_smi/include/rocm_smi/kfd_ioctl.h @@ -138,7 +138,7 @@ if(DOXYGEN_FOUND AND LATEX_FOUND) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/latex/refman.tex COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile - DEPENDS ${PROJECT_SOURCE_DIR}/docs/amd_smi_doxygen.cfg "${PROJECT_SOURCE_DIR}/include/amd_smi/amd_smi.h" + DEPENDS ${PROJECT_SOURCE_DIR}/docs/amd_smi_doxygen.cfg "${PROJECT_SOURCE_DIR}/include/amd_smi/amdsmi.h" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/latex/refman.pdf diff --git a/src/amd_smi/amd_smi.cc b/src/amd_smi/amd_smi.cc index 48e2237200..1b7313d869 100644 --- a/src/amd_smi/amd_smi.cc +++ b/src/amd_smi/amd_smi.cc @@ -56,7 +56,7 @@ #include #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "amd_smi/impl/fdinfo.h" #include "amd_smi/impl/amd_smi_common.h" #include "amd_smi/impl/amd_smi_system.h" @@ -418,21 +418,21 @@ amdsmi_status_t amdsmi_get_caps_info(amdsmi_device_handle device_handle, if (r != AMDSMI_STATUS_SUCCESS) return r; for (j = 0; j < uvd; j++) - info->mm.mm_ip_list[count++] = MM_UVD; + info->mm.mm_ip_list[count++] = AMDSMI_MM_UVD; r = gpu_device->amdgpu_query_hw_ip(AMDGPU_INFO_HW_IP_COUNT, AMDGPU_HW_IP_UVD_ENC, sizeof(struct drm_amdgpu_info_device), &uvd_enc); if (r != AMDSMI_STATUS_SUCCESS) return r; for (j = 0; j < uvd_enc; j++) - info->mm.mm_ip_list[count++] = MM_UVD; + info->mm.mm_ip_list[count++] = AMDSMI_MM_UVD; r = gpu_device->amdgpu_query_hw_ip(AMDGPU_INFO_HW_IP_COUNT, AMDGPU_HW_IP_VCE, sizeof(struct drm_amdgpu_info_device), &vce); if (r != AMDSMI_STATUS_SUCCESS) return r; for (j = 0; j < vce; j++) - info->mm.mm_ip_list[count++] = MM_VCE; + info->mm.mm_ip_list[count++] = AMDSMI_MM_VCE; /* VCN is shared DEC/ENC check only ENC */ r = gpu_device->amdgpu_query_hw_ip(AMDGPU_INFO_HW_IP_COUNT, @@ -441,7 +441,7 @@ amdsmi_status_t amdsmi_get_caps_info(amdsmi_device_handle device_handle, if (r != AMDSMI_STATUS_SUCCESS) return r; for (j = 0; j < vcn_enc; j++) - info->mm.mm_ip_list[count++] = MM_VCN; + info->mm.mm_ip_list[count++] = AMDSMI_MM_VCN; info->mm.mm_ip_count = static_cast(count); @@ -485,7 +485,7 @@ amdsmi_status_t amdsmi_dev_id_get(amdsmi_device_handle device_handle, } // TODO(bliu) : add fw info from libdrm -amdsmi_status_t amdsmi_get_fw_info(amdsmi_device_handle dev, +amdsmi_status_t amdsmi_get_fw_info(amdsmi_device_handle device_handle, amdsmi_fw_info_t *info) { const std::map fw_in_rsmi = { { FW_ID_ASD, RSMI_FW_BLOCK_ASD}, @@ -517,7 +517,7 @@ amdsmi_status_t amdsmi_get_fw_info(amdsmi_device_handle dev, // collect all rsmi supported fw block for (auto ite = fw_in_rsmi.begin(); ite != fw_in_rsmi.end(); ite ++) { - auto status = rsmi_wrapper(rsmi_dev_firmware_version_get, dev, + auto status = rsmi_wrapper(rsmi_dev_firmware_version_get, device_handle, (*ite).second, &(info->fw_info_list[info->num_fw_info].fw_version)); if (status == AMDSMI_STATUS_SUCCESS) { @@ -1308,14 +1308,14 @@ amdsmi_status_t amdsmi_version_str_get(amdsmi_sw_component_t component, } amdsmi_status_t -amdsmi_get_vbios_info(amdsmi_device_handle dev, amdsmi_vbios_info_t *info) { +amdsmi_get_vbios_info(amdsmi_device_handle device_handle, amdsmi_vbios_info_t *info) { if (info == nullptr) { return AMDSMI_STATUS_INVAL; } struct drm_amdgpu_info_vbios vbios = {}; amd::smi::AMDSmiGPUDevice* gpu_device = - static_cast(dev); + static_cast(device_handle); amdsmi_status_t status; if (gpu_device->check_if_drm_is_supported()){ @@ -1332,7 +1332,7 @@ amdsmi_get_vbios_info(amdsmi_device_handle dev, amdsmi_vbios_info_t *info) { // get vbios version string from rocm_smi char vbios_version[AMDSMI_NORMAL_STRING_LENGTH]; - status = rsmi_wrapper(rsmi_dev_vbios_version_get, dev, + status = rsmi_wrapper(rsmi_dev_vbios_version_get, device_handle, vbios_version, AMDSMI_NORMAL_STRING_LENGTH); @@ -1346,16 +1346,16 @@ amdsmi_get_vbios_info(amdsmi_device_handle dev, amdsmi_vbios_info_t *info) { } amdsmi_status_t -amdsmi_get_gpu_activity(amdsmi_device_handle dev, amdsmi_engine_usage_t *info) { +amdsmi_get_gpu_activity(amdsmi_device_handle device_handle, amdsmi_engine_usage_t *info) { if (info == nullptr) { return AMDSMI_STATUS_INVAL; } amdsmi_gpu_metrics_t metrics = {}; amd::smi::AMDSmiGPUDevice* gpu_device = - static_cast(dev); + static_cast(device_handle); amdsmi_status_t status; - status = amdsmi_dev_gpu_metrics_info_get(dev, &metrics); + status = amdsmi_dev_gpu_metrics_info_get(device_handle, &metrics); if (status != AMDSMI_STATUS_SUCCESS) { return status; } @@ -1367,41 +1367,40 @@ amdsmi_get_gpu_activity(amdsmi_device_handle dev, amdsmi_engine_usage_t *info) { } amdsmi_status_t -amdsmi_get_power_limit(amdsmi_device_handle dev, amdsmi_power_limit_t *limit) { - if (limit == nullptr) { +amdsmi_get_power_limit(amdsmi_device_handle device_handle, amdsmi_power_limit_t *power) { + if (power == nullptr) { return AMDSMI_STATUS_INVAL; } amd::smi::AMDSmiGPUDevice* gpu_device = - static_cast(dev); + static_cast(device_handle); amdsmi_status_t status; int power_limit; status = smi_amdgpu_get_power_cap(gpu_device, &power_limit); if (status != AMDSMI_STATUS_SUCCESS) { return status; } - limit->limit = (uint16_t)(power_limit); + power->limit = (uint16_t)(power_limit); return AMDSMI_STATUS_SUCCESS; } amdsmi_status_t -amdsmi_get_clock_measure(amdsmi_device_handle dev, amdsmi_clk_type_t clk_type, amdsmi_clk_measure_t *info) { +amdsmi_get_clock_measure(amdsmi_device_handle device_handle, amdsmi_clk_type_t clk_type, amdsmi_clk_measure_t *info) { if (info == nullptr) { return AMDSMI_STATUS_INVAL; } - if (clk_type >= CLK_TYPE__MAX) { - printf("Domain value greater or equals CLK_TYPE__MAX value. Return code: %d", AMDSMI_STATUS_INVAL); + if (clk_type > CLK_TYPE__MAX) { return AMDSMI_STATUS_INVAL; } amdsmi_gpu_metrics_t metrics = {}; amd::smi::AMDSmiGPUDevice* gpu_device = - static_cast(dev); + static_cast(device_handle); amdsmi_status_t status; - status = amdsmi_dev_gpu_metrics_info_get(dev, &metrics); + status = amdsmi_dev_gpu_metrics_info_get(device_handle, &metrics); if (status != AMDSMI_STATUS_SUCCESS) { return status; } @@ -1438,12 +1437,12 @@ amdsmi_get_clock_measure(amdsmi_device_handle dev, amdsmi_clk_type_t clk_type, a } amdsmi_status_t -amdsmi_get_temperature_limit(amdsmi_device_handle dev, amdsmi_temperature_type_t temp_type, amdsmi_temperature_limit_t *limit) { - if (limit == nullptr || temp_type >= TEMPERATURE_TYPE__MAX) { +amdsmi_get_temperature_limit(amdsmi_device_handle device_handle, amdsmi_temperature_type_t temp_type, amdsmi_temperature_limit_t *temp) { + if (temp == nullptr || temp_type > TEMPERATURE_TYPE__MAX) { return AMDSMI_STATUS_INVAL; } amd::smi::AMDSmiGPUDevice* gpu_device = - static_cast(dev); + static_cast(device_handle); amdsmi_status_t status; std::string name; std::string path; @@ -1469,12 +1468,12 @@ amdsmi_get_temperature_limit(amdsmi_device_handle dev, amdsmi_temperature_type_t for (int count = 1; ; count++) { std::string local_path = path + "/temp" + std::to_string(count); - std::string temp = local_path + "_label"; + std::string local_temp = local_path + "_label"; char f_name[10]; - std::ifstream file(temp.c_str(), std::ifstream::in); + std::ifstream file(local_temp.c_str(), std::ifstream::in); if (!file.is_open()) { - printf("Failed to open file: %s \n", temp.c_str()); + printf("Failed to open file: %s \n", local_temp.c_str()); return AMDSMI_STATUS_API_FAILED; } @@ -1482,11 +1481,11 @@ amdsmi_get_temperature_limit(amdsmi_device_handle dev, amdsmi_temperature_type_t if (!strstr(name.c_str(), f_name)) { int readTemp = 0; - temp = local_path + "_crit"; - std::ifstream file2(temp.c_str(), std::ifstream::in); + local_temp = local_path + "_crit"; + std::ifstream file2(local_temp.c_str(), std::ifstream::in); if (!file2.is_open()) { - printf("Failed to open file: %s \n", temp.c_str()); + printf("Failed to open file: %s \n", local_temp.c_str()); return AMDSMI_STATUS_API_FAILED; } @@ -1494,7 +1493,7 @@ amdsmi_get_temperature_limit(amdsmi_device_handle dev, amdsmi_temperature_type_t if (!sscanf(f_name, "%d", &readTemp)) { return AMDSMI_STATUS_API_FAILED; } - limit->limit = (uint16_t)(readTemp / 1000); + temp->limit = (uint16_t)(readTemp / 1000); break; } file.close(); @@ -1503,16 +1502,16 @@ amdsmi_get_temperature_limit(amdsmi_device_handle dev, amdsmi_temperature_type_t return AMDSMI_STATUS_SUCCESS; } amdsmi_status_t -amdsmi_get_temperature_measure(amdsmi_device_handle dev, amdsmi_temperature_type_t temp_type, amdsmi_temperature_t *info) { +amdsmi_get_temperature_measure(amdsmi_device_handle device_handle, amdsmi_temperature_type_t temp_type, amdsmi_temperature_t *info) { if (info == nullptr || temp_type > TEMPERATURE_TYPE__MAX) { return AMDSMI_STATUS_INVAL; } amdsmi_gpu_metrics_t metrics; amd::smi::AMDSmiGPUDevice* gpu_device = - static_cast(dev); + static_cast(device_handle); amdsmi_status_t status; - status = amdsmi_dev_gpu_metrics_info_get(dev, &metrics); + status = amdsmi_dev_gpu_metrics_info_get(device_handle, &metrics); if (status != AMDSMI_STATUS_SUCCESS) { return status; } @@ -1578,13 +1577,13 @@ 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 dev, amdsmi_error_count_t *ec) { +amdsmi_get_ecc_error_count(amdsmi_device_handle device_handle, amdsmi_error_count_t *ec) { if (ec == nullptr) { return AMDSMI_STATUS_INVAL; } amd::smi::AMDSmiGPUDevice* gpu_device = - static_cast(dev); + static_cast(device_handle); amdsmi_status_t status; if (gpu_device->check_if_drm_is_supported()){ status = smi_amdgpu_get_ecc_error_count(gpu_device, ec); @@ -1600,7 +1599,7 @@ amdsmi_get_ecc_error_count(amdsmi_device_handle dev, amdsmi_error_count_t *ec) { } amdsmi_status_t -amdsmi_get_process_list(amdsmi_device_handle dev, amdsmi_process_handle *list, uint32_t *max_processes) { +amdsmi_get_process_list(amdsmi_device_handle device_handle, amdsmi_process_handle *list, uint32_t *max_processes) { if (max_processes == nullptr) { return AMDSMI_STATUS_INVAL; } @@ -1610,7 +1609,7 @@ amdsmi_get_process_list(amdsmi_device_handle dev, amdsmi_process_handle *list, u uint64_t size = 0; amdsmi_status_t status; amd::smi::AMDSmiGPUDevice* gpu_device = - static_cast(dev); + static_cast(device_handle); if (gpu_device->check_if_drm_is_supported()){ amdsmi_bdf_t bdf = gpu_device->get_bdf(); status = gpuvsmi_get_pids(bdf, pids, &size); @@ -1643,13 +1642,13 @@ amdsmi_get_process_list(amdsmi_device_handle dev, amdsmi_process_handle *list, u } amdsmi_status_t -amdsmi_get_process_info(amdsmi_device_handle dev, amdsmi_process_handle process, amdsmi_proc_info_t *info) { +amdsmi_get_process_info(amdsmi_device_handle device_handle, amdsmi_process_handle process, amdsmi_proc_info_t *info) { if (info == nullptr) { return AMDSMI_STATUS_INVAL; } amd::smi::AMDSmiGPUDevice* gpu_device = - static_cast(dev); + static_cast(device_handle); amdsmi_status_t status; if (gpu_device->check_if_drm_is_supported()) { status = gpuvsmi_get_pid_info(gpu_device->get_bdf(), process, *info); @@ -1663,24 +1662,24 @@ amdsmi_get_process_info(amdsmi_device_handle dev, amdsmi_process_handle process, } amdsmi_status_t -amdsmi_get_power_measure(amdsmi_device_handle dev, amdsmi_power_measure_t *info) { +amdsmi_get_power_measure(amdsmi_device_handle device_handle, amdsmi_power_measure_t *info) { if (info == nullptr) { return AMDSMI_STATUS_INVAL; } amdsmi_gpu_metrics_t metrics = {}; amd::smi::AMDSmiGPUDevice* gpu_device = - static_cast(dev); + static_cast(device_handle); amdsmi_status_t status; - status = amdsmi_dev_gpu_metrics_info_get(dev, &metrics); + status = amdsmi_dev_gpu_metrics_info_get(device_handle, &metrics); if (status != AMDSMI_STATUS_SUCCESS) { return status; } int64_t voltage_read = 0; - status = amdsmi_dev_volt_metric_get(dev, AMDSMI_VOLT_TYPE_VDDGFX, AMDSMI_VOLT_CURRENT, &voltage_read); + status = amdsmi_dev_volt_metric_get(device_handle, AMDSMI_VOLT_TYPE_VDDGFX, AMDSMI_VOLT_CURRENT, &voltage_read); if (status != AMDSMI_STATUS_SUCCESS) { return status; } @@ -1694,18 +1693,18 @@ amdsmi_get_power_measure(amdsmi_device_handle dev, amdsmi_power_measure_t *info) } amdsmi_status_t -amdsmi_get_target_frequency_range(amdsmi_device_handle dev, amdsmi_clk_type_t clk_type, amdsmi_frequency_range_t *range) { +amdsmi_get_target_frequency_range(amdsmi_device_handle device_handle, amdsmi_clk_type_t clk_type, amdsmi_frequency_range_t *range) { if (range == nullptr || clk_type > CLK_TYPE__MAX) { return AMDSMI_STATUS_INVAL; } amdsmi_gpu_metrics_t metrics = {}; amd::smi::AMDSmiGPUDevice* gpu_device = - static_cast(dev); + static_cast(device_handle); amdsmi_status_t status; int min = 0, max = 0; - status = amdsmi_dev_gpu_metrics_info_get(dev, &metrics); + status = amdsmi_dev_gpu_metrics_info_get(device_handle, &metrics); if (status != AMDSMI_STATUS_SUCCESS) { return status; } @@ -1740,26 +1739,26 @@ amdsmi_get_target_frequency_range(amdsmi_device_handle dev, amdsmi_clk_type_t cl } amdsmi_status_t -amdsmi_get_driver_version(amdsmi_device_handle dev, int *length, char *version) { +amdsmi_get_driver_version(amdsmi_device_handle device_handle, int *length, char *version) { if (length == nullptr || version == nullptr) { return AMDSMI_STATUS_INVAL; } amdsmi_status_t status = AMDSMI_STATUS_SUCCESS; amd::smi::AMDSmiGPUDevice* gpu_device = - static_cast(dev); + static_cast(device_handle); status = smi_amdgpu_get_driver_version(gpu_device, length, version); return status; } amdsmi_status_t -amdsmi_get_device_uuid(amdsmi_device_handle dev, unsigned int *uuid_length, char *uuid) { +amdsmi_get_device_uuid(amdsmi_device_handle device_handle, unsigned int *uuid_length, char *uuid) { if (uuid_length == nullptr || uuid == nullptr) { return AMDSMI_STATUS_INVAL; } amd::smi::AMDSmiGPUDevice* gpu_device = - static_cast(dev); + static_cast(device_handle); amdsmi_status_t status = AMDSMI_STATUS_SUCCESS; SMIGPUDEVICE_MUTEX(gpu_device->get_mutex()) @@ -1770,7 +1769,7 @@ amdsmi_get_device_uuid(amdsmi_device_handle dev, unsigned int *uuid_length, char const uint8_t fcn = 0xff; std::string path = "/sys/class/drm/" + gpu_device->get_gpu_path() + "/device/uuid_info"; - status = amdsmi_get_asic_info(dev, &asic_info); + status = amdsmi_get_asic_info(device_handle, &asic_info); if (status != AMDSMI_STATUS_SUCCESS) { printf("Getting asic info failed. Return code: %d", status); return status; @@ -1796,14 +1795,14 @@ amdsmi_get_device_uuid(amdsmi_device_handle dev, unsigned int *uuid_length, char } amdsmi_status_t -amdsmi_get_pcie_link_status(amdsmi_device_handle dev, amdsmi_pcie_info_t *info){ +amdsmi_get_pcie_link_status(amdsmi_device_handle device_handle, amdsmi_pcie_info_t *info){ if (info == nullptr) { return AMDSMI_STATUS_INVAL; } amdsmi_status_t status = AMDSMI_STATUS_SUCCESS; amdsmi_gpu_metrics_t metric_info = {}; status = amdsmi_dev_gpu_metrics_info_get( - dev, &metric_info); + device_handle, &metric_info); if (status != AMDSMI_STATUS_SUCCESS) return status; @@ -1813,14 +1812,14 @@ amdsmi_get_pcie_link_status(amdsmi_device_handle dev, amdsmi_pcie_info_t *info){ return status; } -amdsmi_status_t amdsmi_get_pcie_link_caps(amdsmi_device_handle dev, amdsmi_pcie_info_t *info) { +amdsmi_status_t amdsmi_get_pcie_link_caps(amdsmi_device_handle device_handle, amdsmi_pcie_info_t *info) { if (info == nullptr) { return AMDSMI_STATUS_INVAL; } amdsmi_status_t status = AMDSMI_STATUS_SUCCESS; amd::smi::AMDSmiGPUDevice* gpu_device = - static_cast(dev); + static_cast(device_handle); SMIGPUDEVICE_MUTEX(gpu_device->get_mutex()) @@ -1855,7 +1854,7 @@ amdsmi_status_t amdsmi_get_pcie_link_caps(amdsmi_device_handle dev, amdsmi_pcie_ return AMDSMI_STATUS_API_FAILED; } - status = amdsmi_get_asic_info(dev, &asic_info); + status = amdsmi_get_asic_info(device_handle, &asic_info); if (status != AMDSMI_STATUS_SUCCESS) return status; diff --git a/src/amd_smi/amd_smi_uuid.cc b/src/amd_smi/amd_smi_uuid.cc index 321b8935d6..cbf41244ef 100644 --- a/src/amd_smi/amd_smi_uuid.cc +++ b/src/amd_smi/amd_smi_uuid.cc @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "amd_smi/impl/amd_smi_uuid.h" #include diff --git a/src/amd_smi/fdinfo.cc b/src/amd_smi/fdinfo.cc index d1f29c9e71..03e00012ca 100644 --- a/src/amd_smi/fdinfo.cc +++ b/src/amd_smi/fdinfo.cc @@ -28,7 +28,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "amd_smi/impl/amd_smi_utils.h" extern "C" { diff --git a/tests/amd_smi_test/functional/api_support_read.cc b/tests/amd_smi_test/functional/api_support_read.cc index 161ef4a0a1..8b5d686df8 100755 --- a/tests/amd_smi_test/functional/api_support_read.cc +++ b/tests/amd_smi_test/functional/api_support_read.cc @@ -50,7 +50,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "api_support_read.h" #include "../test_common.h" #include "../test_utils.h" diff --git a/tests/amd_smi_test/functional/err_cnt_read.cc b/tests/amd_smi_test/functional/err_cnt_read.cc index 65da0a689b..5e9d623a34 100755 --- a/tests/amd_smi_test/functional/err_cnt_read.cc +++ b/tests/amd_smi_test/functional/err_cnt_read.cc @@ -47,7 +47,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "err_cnt_read.h" #include "../test_common.h" diff --git a/tests/amd_smi_test/functional/evt_notif_read_write.cc b/tests/amd_smi_test/functional/evt_notif_read_write.cc index 7c5df286b2..c342ddd8e3 100755 --- a/tests/amd_smi_test/functional/evt_notif_read_write.cc +++ b/tests/amd_smi_test/functional/evt_notif_read_write.cc @@ -49,7 +49,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "evt_notif_read_write.h" #include "../test_common.h" #include "../test_utils.h" diff --git a/tests/amd_smi_test/functional/fan_read.cc b/tests/amd_smi_test/functional/fan_read.cc index fbca38495d..6571eb1ccd 100755 --- a/tests/amd_smi_test/functional/fan_read.cc +++ b/tests/amd_smi_test/functional/fan_read.cc @@ -49,7 +49,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "fan_read.h" #include "../test_common.h" diff --git a/tests/amd_smi_test/functional/fan_read_write.cc b/tests/amd_smi_test/functional/fan_read_write.cc index 17f2c4c710..33eb5cd3be 100755 --- a/tests/amd_smi_test/functional/fan_read_write.cc +++ b/tests/amd_smi_test/functional/fan_read_write.cc @@ -49,7 +49,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "fan_read_write.h" #include "../test_common.h" diff --git a/tests/amd_smi_test/functional/frequencies_read.cc b/tests/amd_smi_test/functional/frequencies_read.cc index c1eeb0b786..04988b9073 100755 --- a/tests/amd_smi_test/functional/frequencies_read.cc +++ b/tests/amd_smi_test/functional/frequencies_read.cc @@ -50,7 +50,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "frequencies_read.h" #include "../test_common.h" diff --git a/tests/amd_smi_test/functional/frequencies_read_write.cc b/tests/amd_smi_test/functional/frequencies_read_write.cc index 360d41f221..a034bbaf99 100755 --- a/tests/amd_smi_test/functional/frequencies_read_write.cc +++ b/tests/amd_smi_test/functional/frequencies_read_write.cc @@ -53,7 +53,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "frequencies_read_write.h" #include "../test_common.h" diff --git a/tests/amd_smi_test/functional/gpu_busy_read.cc b/tests/amd_smi_test/functional/gpu_busy_read.cc index 391977645e..0d6243cc33 100755 --- a/tests/amd_smi_test/functional/gpu_busy_read.cc +++ b/tests/amd_smi_test/functional/gpu_busy_read.cc @@ -50,7 +50,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "gpu_busy_read.h" #include "../test_common.h" diff --git a/tests/amd_smi_test/functional/gpu_metrics_read.cc b/tests/amd_smi_test/functional/gpu_metrics_read.cc index a901d37b7e..ce4a77ec55 100644 --- a/tests/amd_smi_test/functional/gpu_metrics_read.cc +++ b/tests/amd_smi_test/functional/gpu_metrics_read.cc @@ -51,7 +51,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "gpu_metrics_read.h" #include "../test_common.h" diff --git a/tests/amd_smi_test/functional/hw_topology_read.cc b/tests/amd_smi_test/functional/hw_topology_read.cc index eef78d646a..a7fdc9029d 100755 --- a/tests/amd_smi_test/functional/hw_topology_read.cc +++ b/tests/amd_smi_test/functional/hw_topology_read.cc @@ -51,7 +51,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "hw_topology_read.h" #include "../test_common.h" diff --git a/tests/amd_smi_test/functional/id_info_read.cc b/tests/amd_smi_test/functional/id_info_read.cc index a9a4527e75..6fe791891c 100755 --- a/tests/amd_smi_test/functional/id_info_read.cc +++ b/tests/amd_smi_test/functional/id_info_read.cc @@ -48,7 +48,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "id_info_read.h" #include "../test_common.h" diff --git a/tests/amd_smi_test/functional/init_shutdown_refcount.cc b/tests/amd_smi_test/functional/init_shutdown_refcount.cc index 8e2393dfe9..23841aab06 100755 --- a/tests/amd_smi_test/functional/init_shutdown_refcount.cc +++ b/tests/amd_smi_test/functional/init_shutdown_refcount.cc @@ -53,7 +53,7 @@ #include "init_shutdown_refcount.h" #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "../test_common.h" extern int32_t diff --git a/tests/amd_smi_test/functional/mem_page_info_read.cc b/tests/amd_smi_test/functional/mem_page_info_read.cc index f9fa27a135..d4620a8b60 100755 --- a/tests/amd_smi_test/functional/mem_page_info_read.cc +++ b/tests/amd_smi_test/functional/mem_page_info_read.cc @@ -48,7 +48,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "mem_page_info_read.h" #include "../test_common.h" diff --git a/tests/amd_smi_test/functional/mem_util_read.cc b/tests/amd_smi_test/functional/mem_util_read.cc index 67a7d14aa7..beeb185e46 100755 --- a/tests/amd_smi_test/functional/mem_util_read.cc +++ b/tests/amd_smi_test/functional/mem_util_read.cc @@ -49,7 +49,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "mem_util_read.h" #include "../test_common.h" diff --git a/tests/amd_smi_test/functional/metrics_counter_read.cc b/tests/amd_smi_test/functional/metrics_counter_read.cc index 9cd838673a..db422aa0c9 100644 --- a/tests/amd_smi_test/functional/metrics_counter_read.cc +++ b/tests/amd_smi_test/functional/metrics_counter_read.cc @@ -51,7 +51,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "metrics_counter_read.h" #include "../test_common.h" diff --git a/tests/amd_smi_test/functional/mutual_exclusion.cc b/tests/amd_smi_test/functional/mutual_exclusion.cc index 9ef1e7c662..9ef4a5d827 100755 --- a/tests/amd_smi_test/functional/mutual_exclusion.cc +++ b/tests/amd_smi_test/functional/mutual_exclusion.cc @@ -51,7 +51,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "mutual_exclusion.h" #include "../test_common.h" diff --git a/tests/amd_smi_test/functional/overdrive_read.cc b/tests/amd_smi_test/functional/overdrive_read.cc index d1b301252a..df169f266f 100755 --- a/tests/amd_smi_test/functional/overdrive_read.cc +++ b/tests/amd_smi_test/functional/overdrive_read.cc @@ -50,7 +50,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "overdrive_read.h" #include "../test_common.h" diff --git a/tests/amd_smi_test/functional/overdrive_read_write.cc b/tests/amd_smi_test/functional/overdrive_read_write.cc index 8453305f72..2a888b5d9b 100755 --- a/tests/amd_smi_test/functional/overdrive_read_write.cc +++ b/tests/amd_smi_test/functional/overdrive_read_write.cc @@ -49,7 +49,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "overdrive_read_write.h" #include "../test_common.h" diff --git a/tests/amd_smi_test/functional/pci_read_write.cc b/tests/amd_smi_test/functional/pci_read_write.cc index 7a5844145b..6f37e54309 100755 --- a/tests/amd_smi_test/functional/pci_read_write.cc +++ b/tests/amd_smi_test/functional/pci_read_write.cc @@ -49,7 +49,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "pci_read_write.h" #include "../test_common.h" diff --git a/tests/amd_smi_test/functional/perf_cntr_read_write.cc b/tests/amd_smi_test/functional/perf_cntr_read_write.cc index 9b8a6c4870..730afbe2cb 100755 --- a/tests/amd_smi_test/functional/perf_cntr_read_write.cc +++ b/tests/amd_smi_test/functional/perf_cntr_read_write.cc @@ -54,7 +54,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "perf_cntr_read_write.h" #include "../test_common.h" diff --git a/tests/amd_smi_test/functional/perf_determinism.cc b/tests/amd_smi_test/functional/perf_determinism.cc index 62c0215cbc..2b81f5b65e 100644 --- a/tests/amd_smi_test/functional/perf_determinism.cc +++ b/tests/amd_smi_test/functional/perf_determinism.cc @@ -53,7 +53,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "perf_determinism.h" #include "../test_common.h" diff --git a/tests/amd_smi_test/functional/perf_level_read.cc b/tests/amd_smi_test/functional/perf_level_read.cc index 49ba6cfc28..fb0219a440 100755 --- a/tests/amd_smi_test/functional/perf_level_read.cc +++ b/tests/amd_smi_test/functional/perf_level_read.cc @@ -50,7 +50,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "perf_level_read.h" #include "../test_common.h" diff --git a/tests/amd_smi_test/functional/perf_level_read_write.cc b/tests/amd_smi_test/functional/perf_level_read_write.cc index e4a39c0d9a..f7f5e6259a 100755 --- a/tests/amd_smi_test/functional/perf_level_read_write.cc +++ b/tests/amd_smi_test/functional/perf_level_read_write.cc @@ -50,7 +50,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "perf_level_read_write.h" #include "../test_common.h" diff --git a/tests/amd_smi_test/functional/power_cap_read_write.cc b/tests/amd_smi_test/functional/power_cap_read_write.cc index e5e9649d6b..35b8ec2978 100755 --- a/tests/amd_smi_test/functional/power_cap_read_write.cc +++ b/tests/amd_smi_test/functional/power_cap_read_write.cc @@ -52,7 +52,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "power_cap_read_write.h" #include "../test_common.h" diff --git a/tests/amd_smi_test/functional/power_read.cc b/tests/amd_smi_test/functional/power_read.cc index 11b3149347..da53582ca6 100755 --- a/tests/amd_smi_test/functional/power_read.cc +++ b/tests/amd_smi_test/functional/power_read.cc @@ -50,7 +50,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "power_read.h" #include "../test_common.h" diff --git a/tests/amd_smi_test/functional/power_read_write.cc b/tests/amd_smi_test/functional/power_read_write.cc index c675d49b43..f4e8261b9b 100755 --- a/tests/amd_smi_test/functional/power_read_write.cc +++ b/tests/amd_smi_test/functional/power_read_write.cc @@ -52,7 +52,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "power_read_write.h" #include "../test_common.h" diff --git a/tests/amd_smi_test/functional/process_info_read.cc b/tests/amd_smi_test/functional/process_info_read.cc index 56733bb6d7..3e6e7befbe 100755 --- a/tests/amd_smi_test/functional/process_info_read.cc +++ b/tests/amd_smi_test/functional/process_info_read.cc @@ -50,7 +50,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "process_info_read.h" #include "../test_common.h" diff --git a/tests/amd_smi_test/functional/sys_info_read.cc b/tests/amd_smi_test/functional/sys_info_read.cc index da40d37395..c567c26745 100755 --- a/tests/amd_smi_test/functional/sys_info_read.cc +++ b/tests/amd_smi_test/functional/sys_info_read.cc @@ -50,7 +50,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "sys_info_read.h" #include "../test_common.h" #include "../test_utils.h" diff --git a/tests/amd_smi_test/functional/temp_read.cc b/tests/amd_smi_test/functional/temp_read.cc index 7575fcb70e..0988783c27 100755 --- a/tests/amd_smi_test/functional/temp_read.cc +++ b/tests/amd_smi_test/functional/temp_read.cc @@ -51,7 +51,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "temp_read.h" #include "../test_common.h" diff --git a/tests/amd_smi_test/functional/version_read.cc b/tests/amd_smi_test/functional/version_read.cc index e22d811fb9..42e00e0c30 100755 --- a/tests/amd_smi_test/functional/version_read.cc +++ b/tests/amd_smi_test/functional/version_read.cc @@ -50,7 +50,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "version_read.h" #include "../test_common.h" diff --git a/tests/amd_smi_test/functional/volt_freq_curv_read.cc b/tests/amd_smi_test/functional/volt_freq_curv_read.cc index 2fc7479f4e..ed3d075f50 100755 --- a/tests/amd_smi_test/functional/volt_freq_curv_read.cc +++ b/tests/amd_smi_test/functional/volt_freq_curv_read.cc @@ -50,7 +50,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "volt_freq_curv_read.h" #include "../test_common.h" diff --git a/tests/amd_smi_test/functional/volt_read.cc b/tests/amd_smi_test/functional/volt_read.cc index ec89d9f57a..c643fcce38 100644 --- a/tests/amd_smi_test/functional/volt_read.cc +++ b/tests/amd_smi_test/functional/volt_read.cc @@ -51,7 +51,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "volt_read.h" #include "../test_common.h" diff --git a/tests/amd_smi_test/functional/xgmi_read_write.cc b/tests/amd_smi_test/functional/xgmi_read_write.cc index bd110bbfee..148825f55a 100755 --- a/tests/amd_smi_test/functional/xgmi_read_write.cc +++ b/tests/amd_smi_test/functional/xgmi_read_write.cc @@ -49,7 +49,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "xgmi_read_write.h" #include "../test_common.h" diff --git a/tests/amd_smi_test/main.cc b/tests/amd_smi_test/main.cc index 0c0d51be46..791f38120f 100644 --- a/tests/amd_smi_test/main.cc +++ b/tests/amd_smi_test/main.cc @@ -48,7 +48,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include #include "test_common.h" #include "test_base.h" diff --git a/tests/amd_smi_test/test_base.cc b/tests/amd_smi_test/test_base.cc index e0d96c6448..539a888835 100644 --- a/tests/amd_smi_test/test_base.cc +++ b/tests/amd_smi_test/test_base.cc @@ -45,7 +45,7 @@ #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "test_base.h" #include "test_common.h" #include diff --git a/tests/amd_smi_test/test_base.h b/tests/amd_smi_test/test_base.h index bf2a45ff88..9d98ccb628 100644 --- a/tests/amd_smi_test/test_base.h +++ b/tests/amd_smi_test/test_base.h @@ -47,7 +47,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" // The max devices can be monitored #define MAX_MONITOR_DEVICES 128 diff --git a/tests/amd_smi_test/test_common.cc b/tests/amd_smi_test/test_common.cc index 1177e90caa..033694f3f0 100644 --- a/tests/amd_smi_test/test_common.cc +++ b/tests/amd_smi_test/test_common.cc @@ -53,7 +53,7 @@ #include "test_base.h" #include "test_common.h" -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" static const std::map kDevPerfLvlNameMap = { diff --git a/tests/amd_smi_test/test_common.h b/tests/amd_smi_test/test_common.h index cc729a9409..d8ab88fcda 100644 --- a/tests/amd_smi_test/test_common.h +++ b/tests/amd_smi_test/test_common.h @@ -50,7 +50,7 @@ #include #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" struct AMDSMITstGlobals { uint32_t verbosity; diff --git a/tests/amd_smi_test/test_utils.cc b/tests/amd_smi_test/test_utils.cc index f902eb2477..d6127eb7a1 100644 --- a/tests/amd_smi_test/test_utils.cc +++ b/tests/amd_smi_test/test_utils.cc @@ -45,7 +45,7 @@ #include -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" #include "test_utils.h" static const std::map kDevFWNameMap = { diff --git a/tests/amd_smi_test/test_utils.h b/tests/amd_smi_test/test_utils.h index 26fabc1c26..b85841d808 100644 --- a/tests/amd_smi_test/test_utils.h +++ b/tests/amd_smi_test/test_utils.h @@ -46,7 +46,7 @@ #ifndef TESTS_AMD_SMI_TEST_TEST_UTILS_H_ #define TESTS_AMD_SMI_TEST_TEST_UTILS_H_ -#include "amd_smi/amd_smi.h" +#include "amd_smi/amdsmi.h" const char * NameFromFWEnum(amdsmi_fw_block_t blk);