From 65eed73f4db002f76e469882d3cf96825f043ecc Mon Sep 17 00:00:00 2001 From: Naveen Krishna Chatradhi Date: Thu, 7 Dec 2023 06:46:48 -0800 Subject: [PATCH] amd-smi: fix cpu specific apis and header 1. provide prototype and documentation for esmi specific api. define structures and update classes as required 2. update cmake files as required and add esmi api to the amdsmi esmi integration example. Change-Id: I753ec176f9b381e74c9646525dfd9075237bf8d9 --- example/amdsmi_esmi_intg_example.cc | 630 +++++----------------- include/amd_smi/amdsmi.h | 309 +++++------ include/amd_smi/impl/amd_smi_cpu_core.h | 76 --- include/amd_smi/impl/amd_smi_cpu_socket.h | 81 --- include/amd_smi/impl/amd_smi_processor.h | 11 +- include/amd_smi/impl/amd_smi_socket.h | 34 +- include/amd_smi/impl/amd_smi_system.h | 35 +- src/amd_smi/amd_smi.cc | 627 ++++++++++----------- src/amd_smi/amd_smi_cpu_core.cc | 62 --- src/amd_smi/amd_smi_cpu_socket.cc | 72 --- src/amd_smi/amd_smi_socket.cc | 28 + src/amd_smi/amd_smi_system.cc | 257 ++++----- 12 files changed, 752 insertions(+), 1470 deletions(-) delete mode 100644 include/amd_smi/impl/amd_smi_cpu_core.h delete mode 100644 include/amd_smi/impl/amd_smi_cpu_socket.h delete mode 100644 src/amd_smi/amd_smi_cpu_core.cc delete mode 100644 src/amd_smi/amd_smi_cpu_socket.cc diff --git a/example/amdsmi_esmi_intg_example.cc b/example/amdsmi_esmi_intg_example.cc index e79a30cbd7..da83dd868d 100644 --- a/example/amdsmi_esmi_intg_example.cc +++ b/example/amdsmi_esmi_intg_example.cc @@ -86,7 +86,7 @@ int main(int argc, char **argv) { // Get all sockets uint32_t socket_count = 0; - ret = amdsmi_get_cpusocket_handles(&socket_count, nullptr); + /*ret = amdsmi_get_cpusocket_handles(&socket_count, nullptr); CHK_AMDSMI_RET(ret) // Allocate the memory for the sockets @@ -94,528 +94,170 @@ int main(int argc, char **argv) { // Get the sockets of the system ret = amdsmi_get_cpusocket_handles(&socket_count, &sockets[0]); + CHK_AMDSMI_RET(ret)*/ + ret = amdsmi_get_socket_handles(&socket_count, nullptr); + CHK_AMDSMI_RET(ret) + // Allocate the memory for the sockets + vector sockets(socket_count); + // Get the sockets of the system + ret = amdsmi_get_socket_handles(&socket_count, &sockets[0]); CHK_AMDSMI_RET(ret) - cout << "Total Socket: " << socket_count << endl; - // For each socket, get identifier and cores for (uint8_t i = 0; i < socket_count; i++) { - // Get Socket info - uint32_t socket_info = 0; - ret = amdsmi_get_cpusocket_info(sockets[i], socket_info); - CHK_AMDSMI_RET(ret) - cout << "Socket " << socket_info << endl; - - // Get the core count available for the socket. + uint32_t cpu_count = 0; uint32_t core_count = 0; - ret = amdsmi_get_cpucore_handles(sockets[i], &core_count, nullptr); + processor_type_t processor_type = AMD_CPU; + ret = amdsmi_get_processor_handles_by_type(sockets[i], processor_type, nullptr, &cpu_count); CHK_AMDSMI_RET(ret) - - // Allocate the memory for the cpu core handles on the socket - vector processor_handles(core_count); - // Get all cores of the socket - ret = amdsmi_get_cpucore_handles(sockets[i], - &core_count, &processor_handles[0]); + vector plist(cpu_count); + ret = amdsmi_get_processor_handles_by_type(sockets[i], processor_type, &plist[0], &cpu_count); CHK_AMDSMI_RET(ret) - cout << "core_count=" << core_count << endl; - - ret = amdsmi_get_cpu_hsmp_proto_ver(sockets[i], &proto_ver); + cout << endl; + // Read core count for each sockets + processor_type = AMD_CPU_CORE; + ret = amdsmi_get_processor_handles_by_type(sockets[i], processor_type, nullptr, &core_count); CHK_AMDSMI_RET(ret) - - cout<<"\n------------------------------------------"; - cout<<"\n| HSMP Proto Version | "<< proto_ver <<"\t\t |"<< endl; - cout<<"------------------------------------------\n"; - - ret = amdsmi_get_cpu_smu_fw_version(sockets[i], &smu_fw); + vector core_list(core_count); + ret = amdsmi_get_processor_handles_by_type(sockets[i], processor_type, &core_list[0], &core_count); CHK_AMDSMI_RET(ret) + for (int index = 0; index < plist.size(); index++) { + socket_count = plist.size(); + ret = amdsmi_get_cpu_hsmp_proto_ver(plist[i], &proto_ver); + CHK_AMDSMI_RET(ret) - cout<<"\n------------------------------------------"; - cout<<"\n| SMU FW Version | " - <<(unsigned)smu_fw.major<<"." - <<(unsigned)smu_fw.minor<<"." - <<(unsigned)smu_fw.debug - <<"\t\t |"< 0 && retVal < SHOWLINESZ) - cout << str; - else - cout <<"error writing to buffer" << endl; + uint32_t prochot; + cout<<"\n-------------------------------------------------"; + cout<<"\n| Sensor Name\t\t\t |"; + for (uint32_t i = 0; i < socket_count; i++) { + cout< 0 && retVal < SHOWLINESZ) + cout << str; + else + cout <<"error writing to buffer" << endl; - cout<<"--------------------------------------------------------------"; - cout<<"\n| CPU["<(socket_power)/1000<<"\t|"; - } else { - err_bits |= 1 << ret; - cout<<" NA (Err:" <(power_limit)/1000<<"\t|"; - } else { - err_bits |= 1 << ret; - cout<<" NA (Err:" <(power_max)/1000<<"\t|"; - } else { - err_bits |= 1 << ret; - cout<<" NA (Err:" <>input_power; - ret = amdsmi_get_cpu_socket_power_cap_max(sockets[i], i, &power_max); - CHK_AMDSMI_RET(ret) - if ((ret == AMDSMI_STATUS_SUCCESS) && (input_power > power_max)) { - cout<<"Input power is more than max power limit," - " limiting to "<(power_max)/1000<<"Watts\n"; - input_power = power_max; - } - ret = amdsmi_set_cpu_socket_power_cap(sockets[i], i, input_power); - CHK_AMDSMI_RET(ret) - if (!ret) { - cout<<"Socket["<(input_power)/1000<<" Watts successfully\n"; - } - cout<<"\n-------------------------------------------------\n"; - - uint8_t mode; - const char *err_str; - cout <<"Enter the power efficiency mode to be set[0, 1 or 2]:\n"; - cin>>mode; - ret = amdsmi_set_cpu_pwr_efficiency_mode(sockets[i], i, mode); - CHK_AMDSMI_RET(ret) - - if (ret != AMDSMI_STATUS_SUCCESS) { - cout<<"Failed to set power efficiency mode for socket["<(svi_power)/1000<<"\t|"; - } else { - err_bits |= 1 << ret; - cout<<" NA (Err:" <>boost_limit; - ret = amdsmi_set_cpu_core_boostlimit(processor_handles[i], i, boost_limit); - CHK_AMDSMI_RET(ret) - - if(ret != AMDSMI_STATUS_SUCCESS) - cout<<"Failed: to set core"<<"["<(socket_power)/1000<<"\t|"; + } else { + err_bits |= 1 << ret; + cout<<" NA (Err:" <(power_limit)/1000<<"\t|"; + } else { + err_bits |= 1 << ret; + cout<<" NA (Err:" <(power_max)/1000<<"\t|"; + } else { + err_bits |= 1 << ret; + cout<<" NA (Err:" <>min; - cout<<"\nEnter the XGMI max value to be set:\n"; - cin>>max; - - ret = amdsmi_set_cpu_xgmi_width(sockets[i], min, max); - CHK_AMDSMI_RET(ret) - - if(ret) - cout<<"Failed: to set xGMI link width, Err["<>min_link_width; - cout<<"\nEnter the GMI3 link width max value to be set:\n"; - cin>>max_link_width; - - ret = amdsmi_set_cpu_gmi3_link_width_range(sockets[i], i, min_link_width, max_link_width); - CHK_AMDSMI_RET(ret) - - if(ret) - cout<<"Failed to set gmi3 link width for socket["<>pstate; - ret = amdsmi_cpu_apb_disable(sockets[i], i, pstate); - CHK_AMDSMI_RET(ret) - - if(ret) - cout<<"Failed: to set socket["<>rate_ctrl; - - ret = amdsmi_set_cpu_pcie_link_rate(sockets[i], i, rate_ctrl, &prev_mode); - CHK_AMDSMI_RET(ret) - - if(ret != AMDSMI_STATUS_SUCCESS) - cout<<"Failed to set pcie link rate control for socket["<>max_pstate; - cout<<"\nEnter the min_pstate to be set:\n"; - cin>>min_pstate; - - ret = amdsmi_set_cpu_df_pstate_range(sockets[i], i, max_pstate, min_pstate); - CHK_AMDSMI_RET(ret) - - if(ret != AMDSMI_STATUS_SUCCESS) - cout<<"Failed to set df pstate range, Err["<(1) ; - ret = amdsmi_get_cpu_current_io_bandwidth(sockets[i], i, io_link, &bw); - CHK_AMDSMI_RET(ret) - - if(ret != AMDSMI_STATUS_SUCCESS) - cout<<"Failed to get io bandwidth width for socket ["<(1<>input_power; + ret = amdsmi_get_cpu_socket_power_cap_max(plist[i], &power_max); + CHK_AMDSMI_RET(ret) + if ((ret == AMDSMI_STATUS_SUCCESS) && (input_power > power_max)) { + cout<<"Input power is more than max power limit," + " limiting to "<(power_max)/1000<<"Watts\n"; + input_power = power_max; + } + ret = amdsmi_set_cpu_socket_power_cap(plist[i], input_power); + CHK_AMDSMI_RET(ret) + if (!ret) { + cout<<"Socket["<(input_power)/1000<<" Watts successfully\n"; + } + cout<<"\n-------------------------------------------------\n"; } - cout<<"\n-------------------------------------------------\n"; - } // Clean up resources allocated at amdsmi_init ret = amdsmi_shut_down(); diff --git a/include/amd_smi/amdsmi.h b/include/amd_smi/amdsmi.h index c25c6e6381..6946663574 100644 --- a/include/amd_smi/amdsmi.h +++ b/include/amd_smi/amdsmi.h @@ -71,7 +71,8 @@ typedef enum { AMDSMI_INIT_AMD_CPUS = (1 << 0), AMDSMI_INIT_AMD_GPUS = (1 << 1), AMDSMI_INIT_NON_AMD_CPUS = (1 << 2), - AMDSMI_INIT_NON_AMD_GPUS = (1 << 3) + AMDSMI_INIT_NON_AMD_GPUS = (1 << 3), + AMDSMI_INIT_AMD_APUS = (AMDSMI_INIT_AMD_CPUS | AMDSMI_INIT_AMD_GPUS) } amdsmi_init_flags_t; /* Maximum size definitions AMDSMI */ @@ -1626,32 +1627,67 @@ amdsmi_status_t amdsmi_get_socket_info( #ifdef ENABLE_ESMI_LIB /** - * @brief Get information about the given cpu socket + * @brief Get information about the given processor * - * @details This function retrieves cpu socket information. The @p socket_handle must - * be provided to retrieve the Socket ID. + * @details This function retrieves processor information. The @p processor_handle must + * be provided to retrieve the processor ID. * - * @param[in] socket_handle a socket handle + * @param[in] processor_handle a processor handle * - * @param[out] sockid The id of the socket. + * @param[out] name The id of the processor. + * + * @param[in] len the length of the caller provided buffer @p name. * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpusocket_info(amdsmi_cpusocket_handle socket_handle, uint32_t sockid); +amdsmi_status_t amdsmi_get_processor_info( + amdsmi_processor_handle processor_handle, + size_t len, char *name); /** - * @brief Get information about the given cpu core + * @brief Get respective processor counts from the processor handles * - * @details This function retrieves cpu core information. The @p core_handle must - * be provided to retrieve the core ID. + * @details This function retrieves respective processor counts information. + * The @p processor_handle must be provided to retrieve the processor ID. * - * @param[in] core_handle a processor handle + * @param[in] processor_handles A pointer to a block of memory to which the + * ::amdsmi_processor_handle values will be written. This value may be NULL. * - * @param[out] coreid The id of the core. + * @param[in] processor_count total processor count per socket + * + * @param[out] nr_cpusockets Total number of cpu sockets + * + * @param[out] nr_cpucores Total number of cpu cores + * + * @param[out] nr_gpus Total number of gpu devices * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpucore_info(amdsmi_processor_handle core_handle, uint32_t coreid); +amdsmi_status_t amdsmi_get_processor_count_from_handles(amdsmi_processor_handle* processor_handles, + uint32_t* processor_count, uint32_t* nr_cpusockets, + uint32_t* nr_cpucores, uint32_t* nr_gpus); + +/** + * @brief Get processor list as per processor type + * + * @details This function retrieves processor list as per the processor type + * from the total processor handles list. + * The @p list of processor_handles and processor type must be provided. + * + * @param[in] socket_handle socket handle + * + * @param[in] processor_type processor type + * + * @param[out] processor_handles list of processor handles as per processor type + * + * @param[out] processor_count processor count as per processor type selected + * + * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail + */ +amdsmi_status_t amdsmi_get_processor_handles_by_type(amdsmi_socket_handle socket_handle, + processor_type_t processor_type, + amdsmi_processor_handle* processor_handles, + uint32_t* processor_count); #endif /** @@ -5340,27 +5376,25 @@ amdsmi_get_gpu_metrics_log(amdsmi_processor_handle processor_handle); * @brief Get the core energy for a given core. * * @param[in] processor_handle Cpu core which to query - * @param[in] core_ind - cpu core index * * @param[in,out] penergy - Input buffer to return the core energy * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t amdsmi_get_cpu_core_energy(amdsmi_processor_handle processor_handle, - uint32_t core_ind, uint64_t *penergy); + uint64_t *penergy); /** * @brief Get the socket energy for a given socket. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * * @param[in,out] penergy - Input buffer to return the socket energy * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_socket_energy(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint64_t *penergy); +amdsmi_status_t amdsmi_get_cpu_socket_energy(amdsmi_processor_handle processor_handle, + uint64_t *penergy); /** @} */ @@ -5372,43 +5406,41 @@ amdsmi_status_t amdsmi_get_cpu_socket_energy(amdsmi_cpusocket_handle socket_hand /** * @brief Get SMU Firmware Version. * - * @param[in] socket_handle Cpu socket which to query + * @param[in] processor_handle Cpu socket which to query * @param[in,out] amdsmi_smu_fw - Input buffer to return the firmware version * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_smu_fw_version(amdsmi_cpusocket_handle socket_handle, - amdsmi_smu_fw_version_t *amdsmi_smu_fw); +amdsmi_status_t amdsmi_get_cpu_smu_fw_version(amdsmi_processor_handle processor_handle, + amdsmi_smu_fw_version_t *amdsmi_smu_fw); /** * @brief Get HSMP protocol Version. * - * @param[in] socket_handle Cpu socket which to query + * @param[in] processor_handle Cpu socket which to query * @param[in,out] proto_ver - Input buffer to return the protocol version * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_hsmp_proto_ver(amdsmi_cpusocket_handle socket_handle, - uint32_t *proto_ver); +amdsmi_status_t amdsmi_get_cpu_hsmp_proto_ver(amdsmi_processor_handle processor_handle, + uint32_t *proto_ver); /** * @brief Get normalized status of the processor's PROCHOT status. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * * @param[in,out] prochot - Input buffer to return the procohot status. * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_prochot_status(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *prochot); +amdsmi_status_t amdsmi_get_cpu_prochot_status(amdsmi_processor_handle processor_handle, + uint32_t *prochot); /** * @brief Get Data fabric clock and Memory clock in MHz. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * * @param[in,out] fclk - Input buffer to return fclk * @@ -5416,27 +5448,25 @@ amdsmi_status_t amdsmi_get_cpu_prochot_status(amdsmi_cpusocket_handle socket_han * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_fclk_mclk(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *fclk, uint32_t *mclk); +amdsmi_status_t amdsmi_get_cpu_fclk_mclk(amdsmi_processor_handle processor_handle, + uint32_t *fclk, uint32_t *mclk); /** * @brief Get core clock in MHz. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * * @param[in,out] cclk - Input buffer to return core clock * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_cclk_limit(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *cclk); +amdsmi_status_t amdsmi_get_cpu_cclk_limit(amdsmi_processor_handle processor_handle, + uint32_t *cclk); /** * @brief Get current active frequency limit of the socket. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * * @param[in,out] freq - Input buffer to return frequency value in MHz * @@ -5444,14 +5474,13 @@ amdsmi_status_t amdsmi_get_cpu_cclk_limit(amdsmi_cpusocket_handle socket_handle, * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_socket_current_active_freq_limit(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint16_t *freq, char **src_type); +amdsmi_status_t amdsmi_get_cpu_socket_current_active_freq_limit(amdsmi_processor_handle processor_handle, + uint16_t *freq, char **src_type); /** * @brief Get socket frequency range. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * * @param[in,out] fmax - Input buffer to return maximum frequency * @@ -5459,21 +5488,20 @@ amdsmi_status_t amdsmi_get_cpu_socket_current_active_freq_limit(amdsmi_cpusocket * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_socket_freq_range(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint16_t *fmax, uint16_t *fmin); +amdsmi_status_t amdsmi_get_cpu_socket_freq_range(amdsmi_processor_handle processor_handle, + uint16_t *fmax, uint16_t *fmin); /** * @brief Get socket frequency limit of the core. * * @param[in] processor_handle Cpu core which to query - * @param[in] core_ind - core index * * @param[in,out] freq - Input buffer to return frequency. * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t amdsmi_get_cpu_core_current_freq_limit(amdsmi_processor_handle processor_handle, - uint32_t core_ind, uint32_t *freq); + uint32_t *freq); /** @} */ @@ -5485,80 +5513,74 @@ amdsmi_status_t amdsmi_get_cpu_core_current_freq_limit(amdsmi_processor_handle p /** * @brief Get the socket power. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * * @param[in,out] ppower - Input buffer to return socket power * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_socket_power(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *ppower); +amdsmi_status_t amdsmi_get_cpu_socket_power(amdsmi_processor_handle processor_handle, + uint32_t *ppower); /** * @brief Get the socket power cap. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * * @param[in,out] pcap - Input buffer to return power cap. * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_socket_power_cap(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *pcap); +amdsmi_status_t amdsmi_get_cpu_socket_power_cap(amdsmi_processor_handle processor_handle, + uint32_t *pcap); /** * @brief Get the maximum power cap value for a given socket. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * * @param[in,out] pmax - Input buffer to return maximum power limit value * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_socket_power_cap_max(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *pmax); +amdsmi_status_t amdsmi_get_cpu_socket_power_cap_max(amdsmi_processor_handle processor_handle, + uint32_t *pmax); /** * @brief Get the SVI based power telemetry for all rails. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * * @param[in,out] power - Input buffer to return svi based power value * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_pwr_svi_telemetry_all_rails(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *power); +amdsmi_status_t amdsmi_get_cpu_pwr_svi_telemetry_all_rails(amdsmi_processor_handle processor_handle, + uint32_t *power); /** * @brief Set the power cap value for a given socket. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * * @param[in] power - Input power limit value * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_set_cpu_socket_power_cap(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t pcap); +amdsmi_status_t amdsmi_set_cpu_socket_power_cap(amdsmi_processor_handle processor_handle, + uint32_t pcap); /** * @brief Set the power efficiency profile policy. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * * @param[in] mode - mode to be set * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_set_cpu_pwr_efficiency_mode(amdsmi_cpusocket_handle socket_handle, - uint8_t sock_ind, uint8_t mode); +amdsmi_status_t amdsmi_set_cpu_pwr_efficiency_mode(amdsmi_processor_handle processor_handle, + uint8_t mode); /** @} */ @@ -5571,53 +5593,49 @@ amdsmi_status_t amdsmi_set_cpu_pwr_efficiency_mode(amdsmi_cpusocket_handle socke * @brief Get the core boost limit. * * @param[in] processor_handle Cpu core which to query - * @param[in] core_ind - core index * * @param[in,out] pboostlimit - Input buffer to fill the boostlimit value * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t amdsmi_get_cpu_core_boostlimit(amdsmi_processor_handle processor_handle, - uint32_t core_ind, uint32_t *pboostlimit); + uint32_t *pboostlimit); /** * @brief Get the socket c0 residency. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * * @param[in,out] pc0_residency - Input buffer to fill the c0 residency value * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_socket_c0_residency(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *pc0_residency); +amdsmi_status_t amdsmi_get_cpu_socket_c0_residency(amdsmi_processor_handle processor_handle, + uint32_t *pc0_residency); /** * @brief Set the core boostlimit value. * * @param[in] processor_handle Cpu core which to query - * @param[in] core_ind - core index * * @param[in] boostlimit - boostlimit value to be set * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t amdsmi_set_cpu_core_boostlimit(amdsmi_processor_handle processor_handle, - uint32_t core_ind, uint32_t boostlimit); + uint32_t boostlimit); /** * @brief Set the socket boostlimit value. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * * @param[in] boostlimit - boostlimit value to be set * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_set_cpu_socket_boostlimit(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t boostlimit); +amdsmi_status_t amdsmi_set_cpu_socket_boostlimit(amdsmi_processor_handle processor_handle, + uint32_t boostlimit); /** @} */ @@ -5629,13 +5647,13 @@ amdsmi_status_t amdsmi_set_cpu_socket_boostlimit(amdsmi_cpusocket_handle socket_ /** * @brief Get the DDR bandwidth data. * - * @param[in] socket_handle Cpu socket which to query + * @param[in] processor_handle Cpu socket which to query * @param[in,out] ddr_bw - Input buffer to fill ddr bandwidth data * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_ddr_bw(amdsmi_cpusocket_handle socket_handle, - amdsmi_ddr_bw_metrics_t *ddr_bw); +amdsmi_status_t amdsmi_get_cpu_ddr_bw(amdsmi_processor_handle processor_handle, + amdsmi_ddr_bw_metrics_t *ddr_bw); /** @} */ @@ -5647,15 +5665,14 @@ amdsmi_status_t amdsmi_get_cpu_ddr_bw(amdsmi_cpusocket_handle socket_handle, /** * @brief Get socket temperature. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * * @param[in,out] ptmon - Input buffer to fill temperature value * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_socket_temperature(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *ptmon); +amdsmi_status_t amdsmi_get_cpu_socket_temperature(amdsmi_processor_handle processor_handle, + uint32_t *ptmon); /** @} */ @@ -5667,41 +5684,41 @@ amdsmi_status_t amdsmi_get_cpu_socket_temperature(amdsmi_cpusocket_handle socket /** * @brief Get DIMM temperature range and refresh rate. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * @param[in] dimm_addr - DIMM address * @param[in,out] rate - Input buffer to fill temperature range and refresh rate value * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_dimm_temp_range_and_refresh_rate(amdsmi_cpusocket_handle socket_handle, - uint8_t sock_ind, uint8_t dimm_addr, amdsmi_temp_range_refresh_rate_t *rate); +amdsmi_status_t amdsmi_get_cpu_dimm_temp_range_and_refresh_rate(amdsmi_processor_handle processor_handle, + uint8_t dimm_addr, + amdsmi_temp_range_refresh_rate_t *rate); /** * @brief Get DIMM power consumption. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * @param[in] dimm_addr - DIMM address * @param[in,out] rate - Input buffer to fill power consumption value * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_dimm_power_consumption(amdsmi_cpusocket_handle socket_handle, - uint8_t sock_ind, uint8_t dimm_addr, amdsmi_dimm_power_t *dimm_pow); +amdsmi_status_t amdsmi_get_cpu_dimm_power_consumption(amdsmi_processor_handle processor_handle, + uint8_t dimm_addr, + amdsmi_dimm_power_t *dimm_pow); /** * @brief Get DIMM thermal sensor value. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * @param[in] dimm_addr - DIMM address * @param[in,out] dimm_temp - Input buffer to fill temperature value * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_dimm_thermal_sensor(amdsmi_cpusocket_handle socket_handle, - uint8_t sock_ind, uint8_t dimm_addr, amdsmi_dimm_thermal_t *dimm_temp); +amdsmi_status_t amdsmi_get_cpu_dimm_thermal_sensor(amdsmi_processor_handle processor_handle, + uint8_t dimm_addr, + amdsmi_dimm_thermal_t *dimm_temp); /** @} */ @@ -5713,13 +5730,13 @@ amdsmi_status_t amdsmi_get_cpu_dimm_thermal_sensor(amdsmi_cpusocket_handle socke /** * @brief Set xgmi width. * - * @param[in] socket_handle Cpu socket which to query + * @param[in] processor_handle Cpu socket which to query * @param[in] min - Minimum xgmi width to be set * @param[in] max - maximum xgmi width to be set * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_set_cpu_xgmi_width(amdsmi_cpusocket_handle socket_handle, - uint8_t min, uint8_t max); +amdsmi_status_t amdsmi_set_cpu_xgmi_width(amdsmi_processor_handle processor_handle, + uint8_t min, uint8_t max); /** @} */ @@ -5731,15 +5748,14 @@ amdsmi_status_t amdsmi_set_cpu_xgmi_width(amdsmi_cpusocket_handle socket_handle, /** * @brief Set gmi3 link width range. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * @param[in] min_link_width - minimum link width to be set. * @param[in] max_link_width - maximum link width to be set. * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_set_cpu_gmi3_link_width_range(amdsmi_cpusocket_handle socket_handle, - uint8_t sock_ind, uint8_t min_link_width, uint8_t max_link_width); +amdsmi_status_t amdsmi_set_cpu_gmi3_link_width_range(amdsmi_processor_handle processor_handle, + uint8_t min_link_width, uint8_t max_link_width); /** @} */ @@ -5751,78 +5767,72 @@ amdsmi_status_t amdsmi_set_cpu_gmi3_link_width_range(amdsmi_cpusocket_handle soc /** * @brief Enable APB. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_cpu_apb_enable(amdsmi_cpusocket_handle socket_handle, uint32_t sock_ind); +amdsmi_status_t amdsmi_cpu_apb_enable(amdsmi_processor_handle processor_handle); /** * @brief Disable APB. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * * @param[in] pstate - pstate value to be set * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_cpu_apb_disable(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint8_t pstate); +amdsmi_status_t amdsmi_cpu_apb_disable(amdsmi_processor_handle processor_handle, + uint8_t pstate); /** * @brief Set NBIO lclk dpm level value. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * @param[in] nbio_id - nbio index * @param[in] min - minimum value to be set * @param[in] max - maximum value to be set * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_set_cpu_socket_lclk_dpm_level(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint8_t nbio_id, uint8_t min, uint8_t max); +amdsmi_status_t amdsmi_set_cpu_socket_lclk_dpm_level(amdsmi_processor_handle processor_handle, + uint8_t nbio_id, uint8_t min, uint8_t max); /** * @brief Get NBIO LCLK dpm level. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * @param[in] nbio_id - nbio index * @param[in,out] nbio - Input buffer to fill lclk dpm level * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_socket_lclk_dpm_level(amdsmi_cpusocket_handle socket_handle, - uint8_t sock_ind, uint8_t nbio_id, amdsmi_dpm_level_t *nbio); +amdsmi_status_t amdsmi_get_cpu_socket_lclk_dpm_level(amdsmi_processor_handle processor_handle, + uint8_t nbio_id, amdsmi_dpm_level_t *nbio); /** * @brief Set pcie link rate. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * @param[in] rate_ctrl - rate control value to be set. * @param[in,out] prev_mode - Input buffer to fill previous rate control value. * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_set_cpu_pcie_link_rate(amdsmi_cpusocket_handle socket_handle, - uint8_t sock_ind, uint8_t rate_ctrl, uint8_t *prev_mode); +amdsmi_status_t amdsmi_set_cpu_pcie_link_rate(amdsmi_processor_handle processor_handle, + uint8_t rate_ctrl, uint8_t *prev_mode); /** * @brief Set df pstate range. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * @param[in] max_pstate - maximum pstate value to be set * @param[in] min_pstate - minimum pstate value to be set * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_set_cpu_df_pstate_range(amdsmi_cpusocket_handle socket_handle, - uint8_t sock_ind, uint8_t max_pstate, uint8_t min_pstate); +amdsmi_status_t amdsmi_set_cpu_df_pstate_range(amdsmi_processor_handle processor_handle, + uint8_t max_pstate, uint8_t min_pstate); /** @} */ @@ -5834,27 +5844,26 @@ amdsmi_status_t amdsmi_set_cpu_df_pstate_range(amdsmi_cpusocket_handle socket_ha /** * @brief Get current input output bandwidth. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * @param[in] link - link id and bw type to which io bandwidth to be obtained * @param[in,out] io_bw - Input buffer to fill bandwidth data * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_current_io_bandwidth(amdsmi_cpusocket_handle socket_handle, - uint8_t sock_ind, amdsmi_link_id_bw_type_t link, uint32_t *io_bw); +amdsmi_status_t amdsmi_get_cpu_current_io_bandwidth(amdsmi_processor_handle processor_handle, + amdsmi_link_id_bw_type_t link, uint32_t *io_bw); /** * @brief Get current input output bandwidth. * - * @param[in] socket_handle Cpu socket which to query + * @param[in] processor_handle Cpu socket which to query * @param[in] link - link id and bw type to which xgmi bandwidth to be obtained * @param[in,out] xgmi_bw - Input buffer to fill bandwidth data * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_cpu_current_xgmi_bw(amdsmi_cpusocket_handle socket_handle, - amdsmi_link_id_bw_type_t link, uint32_t *xgmi_bw); +amdsmi_status_t amdsmi_get_cpu_current_xgmi_bw(amdsmi_processor_handle processor_handle, + amdsmi_link_id_bw_type_t link, uint32_t *xgmi_bw); /** @} */ @@ -5866,25 +5875,24 @@ amdsmi_status_t amdsmi_get_cpu_current_xgmi_bw(amdsmi_cpusocket_handle socket_ha /** * @brief Get metrics table version * - * @param[in] socket_handle Cpu socket which to query + * @param[in] processor_handle Cpu socket which to query * @param[in,out] metrics_version input buffer to return the metrics table version. * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_metrics_table_version(amdsmi_cpusocket_handle socket_handle, - uint32_t *metrics_version); +amdsmi_status_t amdsmi_get_metrics_table_version(amdsmi_processor_handle processor_handle, + uint32_t *metrics_version); /** * @brief Get metrics table * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index + * @param[in] processor_handle Cpu socket which to query * @param[in,out] metrics_table input buffer to return the metrics table. * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_metrics_table(amdsmi_cpusocket_handle socket_handle, uint8_t sock_ind, - struct hsmp_metric_table *metrics_table); +amdsmi_status_t amdsmi_get_metrics_table(amdsmi_processor_handle processor_handle, + struct hsmp_metric_table *metrics_table); /** @} */ @@ -5896,15 +5904,14 @@ amdsmi_status_t amdsmi_get_metrics_table(amdsmi_cpusocket_handle socket_handle, /** * @brief Get first online core on socket. * - * @param[in] socket_handle Cpu socket which to query - * @param[in] sock_ind - socket index. + * @param[in] processor_handle Cpu socket which to query * - * @param[in,out] sockets - Input buffer to fill first online core on socket data + * @param[in,out] pcore_ind - Input buffer to fill first online core on socket data * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_first_online_core_on_cpu_socket(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *pcore_ind); +amdsmi_status_t amdsmi_first_online_core_on_cpu_socket(amdsmi_processor_handle processor_handle, + uint32_t *pcore_ind); /** * @brief Get a description of provided AMDSMI error status for esmi errors. diff --git a/include/amd_smi/impl/amd_smi_cpu_core.h b/include/amd_smi/impl/amd_smi_cpu_core.h deleted file mode 100644 index e623cf7b47..0000000000 --- a/include/amd_smi/impl/amd_smi_cpu_core.h +++ /dev/null @@ -1,76 +0,0 @@ -/* - * ============================================================================= - * The University of Illinois/NCSA - * Open Source License (NCSA) - * - * Copyright (c) 2023, Advanced Micro Devices, Inc. - * All rights reserved. - * - * Developed by: - * - * AMD Research and AMD ROC Software Development - * - * Advanced Micro Devices, Inc. - * - * www.amd.com - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal with the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * - Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimers. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimers in - * the documentation and/or other materials provided with the distribution. - * - Neither the names of , - * nor the names of its contributors may be used to endorse or promote - * products derived from this Software without specific prior written - * permission. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS WITH THE SOFTWARE. - * - */ - -#ifndef AMD_SMI_INCLUDE_AMD_SMI_CPU_CORE_H_ -#define AMD_SMI_INCLUDE_AMD_SMI_CPU_CORE_H_ - -#include -#include -#include -#include "amd_smi/amdsmi.h" -#include "amd_smi/impl/amd_smi_processor.h" - -namespace amd { -namespace smi { - -/*Subclass CPU Core*/ -class AMDSmiCpuCore : public AMDSmiProcessor { -public: - explicit AMDSmiCpuCore(const uint32_t& core_idx):AMDSmiProcessor(AMD_CPU_CORE),core_idx_(core_idx) {} - - virtual ~AMDSmiCpuCore() {} - - const uint32_t& get_core_id() const { return core_idx_; } - void add_processor(AMDSmiProcessor* processor) { processors_.push_back(processor); } - std::vector& get_processors() { return processors_;} - amdsmi_status_t get_processor_count(uint32_t* processor_count) const; - -private: - uint32_t core_idx_; - std::vector processors_; -}; - -} // namespace smi -} // namespace amd - -#endif // AMD_SMI_INCLUDE_AMD_SMI_CPU_CORE_H_ diff --git a/include/amd_smi/impl/amd_smi_cpu_socket.h b/include/amd_smi/impl/amd_smi_cpu_socket.h deleted file mode 100644 index 9403db201d..0000000000 --- a/include/amd_smi/impl/amd_smi_cpu_socket.h +++ /dev/null @@ -1,81 +0,0 @@ -/* - * ============================================================================= - * The University of Illinois/NCSA - * Open Source License (NCSA) - * - * Copyright (c) 2023, Advanced Micro Devices, Inc. - * All rights reserved. - * - * Developed by: - * - * AMD Research and AMD ROC Software Development - * - * Advanced Micro Devices, Inc. - * - * www.amd.com - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal with the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * - Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimers. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimers in - * the documentation and/or other materials provided with the distribution. - * - Neither the names of , - * nor the names of its contributors may be used to endorse or promote - * products derived from this Software without specific prior written - * permission. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS WITH THE SOFTWARE. - * - */ - -#ifndef AMD_SMI_INCLUDE_AMD_SMI_CPU_SOCKET_H_ -#define AMD_SMI_INCLUDE_AMD_SMI_CPU_SOCKET_H_ - -#include -#include -#include -#include "amd_smi/amdsmi.h" -#include "amd_smi/impl/amd_smi_processor.h" -#include "amd_smi/impl/amd_smi_cpu_core.h" - -namespace amd { -namespace smi { - -/*Subclass CPU Socket*/ -class AMDSmiCpuSocket : public AMDSmiProcessor { - public: - explicit AMDSmiCpuSocket(const uint32_t& id):AMDSmiProcessor(AMD_CPU),socket_identifier_(id) {} - - virtual ~AMDSmiCpuSocket() {} - - amdsmi_status_t get_cpu_vendor() { return AMDSMI_STATUS_SUCCESS; } - uint32_t get_cpu_id() const { return cpu_id_; } - const uint32_t& get_socket_id() const { return socket_identifier_; } - - void add_processor(AMDSmiProcessor* processor) { processors_.push_back(processor); } - std::vector& get_processors() { return processors_;} - amdsmi_status_t get_processor_count(uint32_t* processor_count) const; - - private: - uint32_t cpu_id_; - uint32_t socket_identifier_; - std::vector processors_; -}; - -} // namespace smi -} // namespace amd - -#endif // AMD_SMI_INCLUDE_AMD_SMI_CPU_SOCKET_H_ diff --git a/include/amd_smi/impl/amd_smi_processor.h b/include/amd_smi/impl/amd_smi_processor.h index 2e20f2b75f..8188438e96 100644 --- a/include/amd_smi/impl/amd_smi_processor.h +++ b/include/amd_smi/impl/amd_smi_processor.h @@ -44,6 +44,7 @@ #ifndef AMD_SMI_INCLUDE_AMD_SMI_PROCESSOR_H_ #define AMD_SMI_INCLUDE_AMD_SMI_PROCESSOR_H_ +#include #include "amd_smi/amdsmi.h" namespace amd { @@ -51,14 +52,18 @@ namespace smi { class AMDSmiProcessor { public: - explicit AMDSmiProcessor(processor_type_t processor) : processor_type_(processor) {} + explicit AMDSmiProcessor(processor_type_t type) : processor_type_(type) {} + explicit AMDSmiProcessor(processor_type_t type, uint32_t index) : processor_type_(type), pindex_(index) {} + explicit AMDSmiProcessor(const std::string& id) : processor_identifier_(id) {} virtual ~AMDSmiProcessor() {} processor_type_t get_processor_type() const { return processor_type_;} + const std::string& get_processor_id() const { return processor_identifier_;} + uint32_t get_processor_index() const { return pindex_;} private: processor_type_t processor_type_; + uint32_t pindex_; + std::string processor_identifier_; }; - - } // namespace smi } // namespace amd diff --git a/include/amd_smi/impl/amd_smi_socket.h b/include/amd_smi/impl/amd_smi_socket.h index e8a3ab567a..dbbfdae970 100644 --- a/include/amd_smi/impl/amd_smi_socket.h +++ b/include/amd_smi/impl/amd_smi_socket.h @@ -56,14 +56,46 @@ namespace smi { class AMDSmiSocket { public: explicit AMDSmiSocket(const std::string& id) : socket_identifier_(id) {} + explicit AMDSmiSocket(uint32_t index) : sindex_(index) {} ~AMDSmiSocket(); const std::string& get_socket_id() const { return socket_identifier_;} - void add_processor(AMDSmiProcessor* processor) { processors_.push_back(processor); } + uint32_t get_socket_index() { return sindex_;} + void add_processor(AMDSmiProcessor* processor) { + switch (processor->get_processor_type()) { + case AMD_GPU: + processors_.push_back(processor); + break; + case AMD_CPU: + cpu_processors_.push_back(processor); + break; + case AMD_CPU_CORE: + cpu_core_processors_.push_back(processor); + break; + default: + break; + } + } std::vector& get_processors() { return processors_;} + std::vector& get_processors(processor_type_t type) { + switch (type) { + case AMD_GPU: + return processors_; + case AMD_CPU: + return cpu_processors_; + case AMD_CPU_CORE: + return cpu_core_processors_; + default: + return processors_; + } + } amdsmi_status_t get_processor_count(uint32_t* processor_count) const; + amdsmi_status_t get_processor_count(processor_type_t type, uint32_t* processor_count) const; private: + uint32_t sindex_; std::string socket_identifier_; std::vector processors_; + std::vector cpu_processors_; + std::vector cpu_core_processors_; }; } // namespace smi diff --git a/include/amd_smi/impl/amd_smi_system.h b/include/amd_smi/impl/amd_smi_system.h index 596c909204..9e1004aa3c 100644 --- a/include/amd_smi/impl/amd_smi_system.h +++ b/include/amd_smi/impl/amd_smi_system.h @@ -50,9 +50,6 @@ #include "amd_smi/impl/amd_smi_socket.h" #include "amd_smi/impl/amd_smi_processor.h" #include "amd_smi/impl/amd_smi_drm.h" -#ifdef ENABLE_ESMI_LIB -#include "amd_smi/impl/amd_smi_cpu_socket.h" -#endif namespace amd { namespace smi { @@ -78,25 +75,6 @@ class AMDSmiSystem { amdsmi_status_t gpu_index_to_handle(uint32_t gpu_index, amdsmi_processor_handle* processor_handle); -#ifdef ENABLE_ESMI_LIB - std::vector& get_cpu_sockets() {return cpu_sockets_;} - - amdsmi_status_t handle_to_cpusocket(amdsmi_cpusocket_handle cpusock_handle, - AMDSmiCpuSocket** cpu_socket); - - amdsmi_status_t cpu_index_to_handle(uint32_t cpu_index, - amdsmi_cpusocket_handle* cpusock_handle); - - amdsmi_status_t get_cpu_sockets(uint32_t *socks); - - amdsmi_status_t get_cpu_cores(uint32_t *cpus); - - amdsmi_status_t get_threads_per_core(uint32_t *threads); - - amdsmi_status_t get_cpu_family(uint32_t *family); - - amdsmi_status_t get_cpu_model(uint32_t *model); -#endif private: AMDSmiSystem() : init_flag_(AMDSMI_INIT_AMD_GPUS) {} @@ -106,23 +84,12 @@ class AMDSmiSystem { */ amdsmi_status_t get_gpu_socket_id(uint32_t index, std::string& socketid); amdsmi_status_t populate_amd_gpu_devices(); + amdsmi_status_t populate_amd_cpus(); uint64_t init_flag_; AMDSmiDrm drm_; std::vector sockets_; std::set processors_; // Track valid processors -#ifdef ENABLE_ESMI_LIB - amdsmi_status_t populate_amd_cpus(); - std::vector cpu_sockets_; - static uint32_t sockets; - static uint32_t cpus; - static uint32_t threads; - static uint32_t family; - static uint32_t model; -#endif }; - - - } // namespace smi } // namespace amd diff --git a/src/amd_smi/amd_smi.cc b/src/amd_smi/amd_smi.cc index d9bfbc9e91..30faf129ec 100644 --- a/src/amd_smi/amd_smi.cc +++ b/src/amd_smi/amd_smi.cc @@ -69,13 +69,12 @@ #include "amd_smi/impl/amd_smi_utils.h" #include "amd_smi/impl/amd_smi_processor.h" #include "rocm_smi/rocm_smi_logger.h" -#ifdef ENABLE_ESMI_LIB - #include "amd_smi/impl/amd_smi_cpu_socket.h" - #include "amd_smi/impl/amd_smi_cpu_core.h" -#endif static bool initialized_lib = false; +#define SIZE 10 +char proc_id[SIZE] = "\0"; + #define AMDSMI_CHECK_INIT() do { \ if (!initialized_lib) { \ return AMDSMI_STATUS_NOT_INIT; \ @@ -103,49 +102,6 @@ static amdsmi_status_t get_gpu_device_from_handle(amdsmi_processor_handle proces return AMDSMI_STATUS_NOT_SUPPORTED; } -#ifdef ENABLE_ESMI_LIB -static amdsmi_status_t get_cpu_socket_from_handle(amdsmi_cpusocket_handle socket_handle, - amd::smi::AMDSmiCpuSocket** cpusocket) { - - AMDSMI_CHECK_INIT(); - - if (socket_handle == nullptr || cpusocket == nullptr) - return AMDSMI_STATUS_INVAL; - - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = amd::smi::AMDSmiSystem::getInstance() - .handle_to_cpusocket(socket_handle, &socket); - if (r != AMDSMI_STATUS_SUCCESS) return r; - - if (socket->get_processor_type() == AMD_CPU) { - *cpusocket = static_cast(socket_handle); - return AMDSMI_STATUS_SUCCESS; - } - - return AMDSMI_STATUS_NOT_SUPPORTED; -} - -static amdsmi_status_t get_cpu_core_from_handle(amdsmi_processor_handle processor_handle, - amd::smi::AMDSmiCpuCore** cpucore) { - - AMDSMI_CHECK_INIT(); - if (processor_handle == nullptr || cpucore == nullptr) - return AMDSMI_STATUS_INVAL; - - amd::smi::AMDSmiProcessor* core = nullptr; - amdsmi_status_t r = amd::smi::AMDSmiSystem::getInstance() - .handle_to_processor(processor_handle, &core); - if (r != AMDSMI_STATUS_SUCCESS) return r; - - if (core->get_processor_type() == AMD_CPU_CORE) { - *cpucore = static_cast(processor_handle); - return AMDSMI_STATUS_SUCCESS; - } - - return AMDSMI_STATUS_NOT_SUPPORTED; -} -#endif - template amdsmi_status_t rsmi_wrapper(F && f, amdsmi_processor_handle processor_handle, Args &&... args) { @@ -163,24 +119,6 @@ amdsmi_status_t rsmi_wrapper(F && f, return amd::smi::rsmi_to_amdsmi_status(rstatus); } -#ifdef ENABLE_ESMI_LIB -template -amdsmi_status_t esmi_wrapper(F && f, - amdsmi_processor_handle processor_handle, Args &&... args) { - - AMDSMI_CHECK_INIT(); - - amd::smi::AMDSmiCpuSocket* cpu_socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(processor_handle, &cpu_socket); - if (r != AMDSMI_STATUS_SUCCESS) return r; - - uint32_t cpu_index = cpu_socket->get_cpu_id(); - auto estatus = std::forward(f)(cpu_index, - std::forward(args)...); - return amd::smi::esmi_to_amdsmi_status(estatus); -} -#endif - amdsmi_status_t amdsmi_init(uint64_t flags) { if (initialized_lib) @@ -232,37 +170,6 @@ amdsmi_status_code_to_string(amdsmi_status_t status, const char **status_string) return AMDSMI_STATUS_SUCCESS; } -#ifdef ENABLE_ESMI_LIB -amdsmi_status_t amdsmi_get_cpusocket_handles(uint32_t *socket_count, - amdsmi_cpusocket_handle* socket_handles) { - - AMDSMI_CHECK_INIT(); - if (socket_count == nullptr) { - return AMDSMI_STATUS_INVAL; - } - - std::vector& sockets - = amd::smi::AMDSmiSystem::getInstance().get_cpu_sockets(); - uint32_t socket_size = static_cast(sockets.size()); - - // Get the socket size - if (socket_handles == nullptr) { - *socket_count = socket_size; - return AMDSMI_STATUS_SUCCESS; - } - - // If the socket_handles can hold all sockets, return all of them. - *socket_count = *socket_count >= socket_size ? socket_size : *socket_count; - - // Copy the cpu socket handles - for (uint32_t i = 0; i < *socket_count; i++) { - socket_handles[i] = reinterpret_cast(sockets[i]); - } - - return AMDSMI_STATUS_SUCCESS; -} -#endif - amdsmi_status_t amdsmi_get_socket_handles(uint32_t *socket_count, amdsmi_socket_handle* socket_handles) { @@ -313,40 +220,23 @@ amdsmi_status_t amdsmi_get_socket_info( } #ifdef ENABLE_ESMI_LIB -amdsmi_status_t amdsmi_get_cpusocket_info( - amdsmi_cpusocket_handle socket_handle, - uint32_t sock_id) { +amdsmi_status_t amdsmi_get_processor_info( + amdsmi_processor_handle processor_handle, + size_t len, char *name) { + char proc_id[10]; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) { + if (processor_handle == nullptr || name == nullptr) { return AMDSMI_STATUS_INVAL; } - amd::smi::AMDSmiCpuSocket* socket = nullptr; + amd::smi::AMDSmiProcessor* processor = nullptr; amdsmi_status_t r = amd::smi::AMDSmiSystem::getInstance() - .handle_to_cpusocket(socket_handle, &socket); + .handle_to_processor(processor_handle, &processor); if (r != AMDSMI_STATUS_SUCCESS) return r; - sock_id = socket->get_socket_id(); - - return AMDSMI_STATUS_SUCCESS; -} - -amdsmi_status_t amdsmi_get_cpucore_info( - amdsmi_processor_handle core_handle, - uint32_t core_id) { - AMDSMI_CHECK_INIT(); - - if (core_handle == nullptr) { - return AMDSMI_STATUS_INVAL; - } - - amd::smi::AMDSmiProcessor* core = nullptr; - amdsmi_status_t r = amd::smi::AMDSmiSystem::getInstance() - .handle_to_processor(core_handle, &core); - if (r != AMDSMI_STATUS_SUCCESS) return r; - - core_id = static_cast(core)->get_core_id(); + sprintf(proc_id, "%d", processor->get_processor_index()); + strncpy(name, proc_id, len); return AMDSMI_STATUS_SUCCESS; } @@ -388,34 +278,63 @@ amdsmi_status_t amdsmi_get_processor_handles(amdsmi_socket_handle socket_handle, } #ifdef ENABLE_ESMI_LIB -amdsmi_status_t amdsmi_get_cpucore_handles(amdsmi_cpusocket_handle socket_handle, - uint32_t* processor_count, - amdsmi_processor_handle* processor_handles) { +amdsmi_status_t amdsmi_get_processor_count_from_handles(amdsmi_processor_handle* processor_handles, + uint32_t* processor_count, uint32_t* nr_cpusockets, + uint32_t* nr_cpucores, uint32_t* nr_gpus) { + AMDSMI_CHECK_INIT(); + uint32_t count_cpusockets = 0; + uint32_t count_cpucores = 0; + uint32_t count_gpus = 0; + processor_type_t processor_type; + + if (processor_count == nullptr || processor_handles == nullptr) { + return AMDSMI_STATUS_INVAL; + } + + for (uint32_t i = 0; i < *processor_count; i++) { + amdsmi_status_t r = amdsmi_get_processor_type(processor_handles[i], + &processor_type); + if (r != AMDSMI_STATUS_SUCCESS) return r; + + if(processor_type == AMD_CPU) { + count_cpusockets++; + } else if(processor_type == AMD_CPU_CORE) { + count_cpucores++; + } else if(processor_type == AMD_GPU) { + count_gpus++; + } + } + *nr_cpusockets = count_cpusockets; + *nr_cpucores = count_cpucores; + *nr_gpus = count_gpus; + + return AMDSMI_STATUS_SUCCESS; +} + +amdsmi_status_t amdsmi_get_processor_handles_by_type(amdsmi_socket_handle socket_handle, + processor_type_t processor_type, + amdsmi_processor_handle* processor_handles, + uint32_t* processor_count) { + AMDSMI_CHECK_INIT(); if (processor_count == nullptr) { return AMDSMI_STATUS_INVAL; } // Get the socket object via socket handle. - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = amd::smi::AMDSmiSystem::getInstance() - .handle_to_cpusocket(socket_handle, &socket); + amd::smi::AMDSmiSocket* socket = nullptr; + amdsmi_status_t r = amd::smi::AMDSmiSystem::getInstance().handle_to_socket(socket_handle, &socket); if (r != AMDSMI_STATUS_SUCCESS) return r; - - - std::vector& processors = socket->get_processors(); + std::vector& processors = socket->get_processors(processor_type); uint32_t processor_size = static_cast(processors.size()); - // Get the processor count only if (processor_handles == nullptr) { *processor_count = processor_size; return AMDSMI_STATUS_SUCCESS; } - // If the processor_handles can hold all processors, return all of them. *processor_count = *processor_count >= processor_size ? processor_size : *processor_count; - // Copy the processor handles for (uint32_t i = 0; i < *processor_count; i++) { processor_handles[i] = reinterpret_cast(processors[i]); @@ -423,8 +342,9 @@ amdsmi_status_t amdsmi_get_cpucore_handles(amdsmi_cpusocket_handle socket_handle return AMDSMI_STATUS_SUCCESS; } -#endif + +#endif amdsmi_status_t amdsmi_get_processor_type(amdsmi_processor_handle processor_handle , processor_type_t* processor_type) { @@ -2640,7 +2560,7 @@ amdsmi_get_gpu_metrics_avg_soc_clock_frequency(amdsmi_processor_handle processor return rsmi_wrapper(rsmi_dev_metrics_avg_soc_clock_frequency_get, processor_handle, clock_frequency_value); -} +} amdsmi_status_t amdsmi_get_gpu_metrics_avg_uclock_frequency(amdsmi_processor_handle processor_handle, @@ -2764,7 +2684,7 @@ amdsmi_get_gpu_metrics_log(amdsmi_processor_handle processor_handle) #ifdef ENABLE_ESMI_LIB -amdsmi_status_t amdsmi_get_cpu_hsmp_proto_ver(amdsmi_cpusocket_handle socket_handle, +amdsmi_status_t amdsmi_get_cpu_hsmp_proto_ver(amdsmi_processor_handle processor_handle, uint32_t *proto_ver) { amdsmi_status_t status; @@ -2772,14 +2692,9 @@ amdsmi_status_t amdsmi_get_cpu_hsmp_proto_ver(amdsmi_cpusocket_handle socket_han AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); - if (r != AMDSMI_STATUS_SUCCESS) - return r; - status = static_cast(esmi_hsmp_proto_ver_get(&hsmp_proto_ver)); *proto_ver = hsmp_proto_ver; @@ -2789,27 +2704,22 @@ amdsmi_status_t amdsmi_get_cpu_hsmp_proto_ver(amdsmi_cpusocket_handle socket_han return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_cpu_smu_fw_version(amdsmi_cpusocket_handle socket_handle, - amdsmi_smu_fw_version_t *amdsmi_smu_fw) +amdsmi_status_t amdsmi_get_cpu_smu_fw_version(amdsmi_processor_handle processor_handle, + amdsmi_smu_fw_version_t *amdsmi_smu_fw) { amdsmi_status_t status; struct smu_fw_version smu_fw; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); - if (r != AMDSMI_STATUS_SUCCESS) - return r; - status = static_cast(esmi_smu_fw_version_get(&smu_fw)); amdsmi_smu_fw->major = smu_fw.major; - amdsmi_smu_fw->minor = smu_fw.minor; - amdsmi_smu_fw->debug = smu_fw.debug; + amdsmi_smu_fw->minor = smu_fw.minor; + amdsmi_smu_fw->debug = smu_fw.debug; if (status != AMDSMI_STATUS_SUCCESS) return status; @@ -2818,21 +2728,23 @@ amdsmi_status_t amdsmi_get_cpu_smu_fw_version(amdsmi_cpusocket_handle socket_han } amdsmi_status_t amdsmi_get_cpu_core_energy(amdsmi_processor_handle processor_handle, - uint32_t core_ind, uint64_t *penergy) + uint64_t *penergy) { amdsmi_status_t status; uint64_t core_input; + uint32_t core_ind; AMDSMI_CHECK_INIT(); if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuCore* core = nullptr; - amdsmi_status_t r = get_cpu_core_from_handle(processor_handle, &core); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + core_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_core_energy_get(core_ind, &core_input)); *penergy = core_input; @@ -2843,22 +2755,24 @@ amdsmi_status_t amdsmi_get_cpu_core_energy(amdsmi_processor_handle processor_han } -amdsmi_status_t amdsmi_get_cpu_socket_energy(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint64_t *penergy) +amdsmi_status_t amdsmi_get_cpu_socket_energy(amdsmi_processor_handle processor_handle, + uint64_t *penergy) { amdsmi_status_t status; uint64_t pkg_input; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_socket_energy_get(sock_ind, &pkg_input)); *penergy = pkg_input; @@ -2868,22 +2782,24 @@ amdsmi_status_t amdsmi_get_cpu_socket_energy(amdsmi_cpusocket_handle socket_hand return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_cpu_prochot_status(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *prochot) +amdsmi_status_t amdsmi_get_cpu_prochot_status(amdsmi_processor_handle processor_handle, + uint32_t *prochot) { amdsmi_status_t status; uint32_t phot; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_prochot_status_get(sock_ind, &phot)); *prochot = phot; @@ -2893,22 +2809,24 @@ amdsmi_status_t amdsmi_get_cpu_prochot_status(amdsmi_cpusocket_handle socket_han return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_cpu_fclk_mclk(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *fclk, uint32_t *mclk) +amdsmi_status_t amdsmi_get_cpu_fclk_mclk(amdsmi_processor_handle processor_handle, + uint32_t *fclk, uint32_t *mclk) { amdsmi_status_t status; uint32_t f_clk, m_clk; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_fclk_mclk_get(sock_ind, &f_clk, &m_clk)); *fclk = f_clk; *mclk = m_clk; @@ -2919,22 +2837,24 @@ amdsmi_status_t amdsmi_get_cpu_fclk_mclk(amdsmi_cpusocket_handle socket_handle, return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_cpu_cclk_limit(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *cclk) +amdsmi_status_t amdsmi_get_cpu_cclk_limit(amdsmi_processor_handle processor_handle, + uint32_t *cclk) { amdsmi_status_t status; uint32_t c_clk; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_cclk_limit_get(sock_ind, &c_clk)); *cclk = c_clk; @@ -2944,22 +2864,24 @@ amdsmi_status_t amdsmi_get_cpu_cclk_limit(amdsmi_cpusocket_handle socket_handle, return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_cpu_socket_current_active_freq_limit(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint16_t *freq, char **src_type) +amdsmi_status_t amdsmi_get_cpu_socket_current_active_freq_limit(amdsmi_processor_handle processor_handle, + uint16_t *freq, char **src_type) { amdsmi_status_t status; uint16_t limit; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_socket_current_active_freq_limit_get(sock_ind, &limit, src_type)); *freq = limit; @@ -2969,23 +2891,25 @@ amdsmi_status_t amdsmi_get_cpu_socket_current_active_freq_limit(amdsmi_cpusocket return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_cpu_socket_freq_range(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint16_t *fmax, uint16_t *fmin) +amdsmi_status_t amdsmi_get_cpu_socket_freq_range(amdsmi_processor_handle processor_handle, + uint16_t *fmax, uint16_t *fmin) { amdsmi_status_t status; uint16_t f_max; uint16_t f_min; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_socket_freq_range_get(sock_ind, &f_max, &f_min)); *fmax = f_max; *fmin = f_min; @@ -2997,21 +2921,23 @@ amdsmi_status_t amdsmi_get_cpu_socket_freq_range(amdsmi_cpusocket_handle socket_ } amdsmi_status_t amdsmi_get_cpu_core_current_freq_limit(amdsmi_processor_handle processor_handle, - uint32_t core_ind, uint32_t *freq) + uint32_t *freq) { amdsmi_status_t status; uint32_t c_clk; + uint32_t core_ind; AMDSMI_CHECK_INIT(); if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuCore* core = nullptr; - amdsmi_status_t r = get_cpu_core_from_handle(processor_handle, &core); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + core_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_current_freq_limit_core_get(core_ind, &c_clk)); *freq = c_clk; @@ -3022,22 +2948,24 @@ amdsmi_status_t amdsmi_get_cpu_core_current_freq_limit(amdsmi_processor_handle p } -amdsmi_status_t amdsmi_get_cpu_socket_power(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *ppower) +amdsmi_status_t amdsmi_get_cpu_socket_power(amdsmi_processor_handle processor_handle, + uint32_t *ppower) { amdsmi_status_t status; uint32_t avg_power; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_socket_power_get(sock_ind, &avg_power)); *ppower = avg_power; @@ -3047,22 +2975,24 @@ amdsmi_status_t amdsmi_get_cpu_socket_power(amdsmi_cpusocket_handle socket_handl return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_cpu_socket_power_cap(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *pcap) +amdsmi_status_t amdsmi_get_cpu_socket_power_cap(amdsmi_processor_handle processor_handle, + uint32_t *pcap) { amdsmi_status_t status; uint32_t p_cap; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_socket_power_cap_get(sock_ind, &p_cap)); *pcap = p_cap; @@ -3072,22 +3002,24 @@ amdsmi_status_t amdsmi_get_cpu_socket_power_cap(amdsmi_cpusocket_handle socket_h return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_cpu_socket_power_cap_max(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *pmax) +amdsmi_status_t amdsmi_get_cpu_socket_power_cap_max(amdsmi_processor_handle processor_handle, + uint32_t *pmax) { amdsmi_status_t status; uint32_t p_max; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_socket_power_cap_max_get(sock_ind, &p_max)); *pmax = p_max; @@ -3097,22 +3029,24 @@ amdsmi_status_t amdsmi_get_cpu_socket_power_cap_max(amdsmi_cpusocket_handle sock return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_cpu_pwr_svi_telemetry_all_rails(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *power) +amdsmi_status_t amdsmi_get_cpu_pwr_svi_telemetry_all_rails(amdsmi_processor_handle processor_handle, + uint32_t *power) { amdsmi_status_t status; uint32_t pow; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_pwr_svi_telemetry_all_rails_get(sock_ind, &pow)); *power = pow; @@ -3122,21 +3056,23 @@ amdsmi_status_t amdsmi_get_cpu_pwr_svi_telemetry_all_rails(amdsmi_cpusocket_hand return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_set_cpu_socket_power_cap(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t pcap) +amdsmi_status_t amdsmi_set_cpu_socket_power_cap(amdsmi_processor_handle processor_handle, + uint32_t pcap) { amdsmi_status_t status; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_socket_power_cap_set(sock_ind, pcap)); if (status != AMDSMI_STATUS_SUCCESS) @@ -3145,21 +3081,23 @@ amdsmi_status_t amdsmi_set_cpu_socket_power_cap(amdsmi_cpusocket_handle socket_h return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_set_cpu_pwr_efficiency_mode(amdsmi_cpusocket_handle socket_handle, - uint8_t sock_ind, uint8_t mode) +amdsmi_status_t amdsmi_set_cpu_pwr_efficiency_mode(amdsmi_processor_handle processor_handle, + uint8_t mode) { amdsmi_status_t status; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_pwr_efficiency_mode_set(sock_ind, mode)); if (status != AMDSMI_STATUS_SUCCESS) @@ -3169,21 +3107,23 @@ amdsmi_status_t amdsmi_set_cpu_pwr_efficiency_mode(amdsmi_cpusocket_handle socke } amdsmi_status_t amdsmi_get_cpu_core_boostlimit(amdsmi_processor_handle processor_handle, - uint32_t core_ind, uint32_t *pboostlimit) + uint32_t *pboostlimit) { amdsmi_status_t status; uint32_t boostlimit; + uint32_t core_ind; AMDSMI_CHECK_INIT(); if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuCore* core = nullptr; - amdsmi_status_t r = get_cpu_core_from_handle(processor_handle, &core); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + core_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_core_boostlimit_get(core_ind, &boostlimit)); *pboostlimit = boostlimit; @@ -3193,22 +3133,24 @@ amdsmi_status_t amdsmi_get_cpu_core_boostlimit(amdsmi_processor_handle processor return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_cpu_socket_c0_residency(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *pc0_residency) +amdsmi_status_t amdsmi_get_cpu_socket_c0_residency(amdsmi_processor_handle processor_handle, + uint32_t *pc0_residency) { amdsmi_status_t status; uint32_t res; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_socket_c0_residency_get(sock_ind, &res)); *pc0_residency = res; @@ -3219,20 +3161,22 @@ amdsmi_status_t amdsmi_get_cpu_socket_c0_residency(amdsmi_cpusocket_handle socke } amdsmi_status_t amdsmi_set_cpu_core_boostlimit(amdsmi_processor_handle processor_handle, - uint32_t core_ind, uint32_t boostlimit) + uint32_t boostlimit) { amdsmi_status_t status; + uint32_t core_ind; AMDSMI_CHECK_INIT(); if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuCore* core = nullptr; - amdsmi_status_t r = get_cpu_core_from_handle(processor_handle, &core); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + core_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_core_boostlimit_set(core_ind, boostlimit)); if (status != AMDSMI_STATUS_SUCCESS) @@ -3241,21 +3185,23 @@ amdsmi_status_t amdsmi_set_cpu_core_boostlimit(amdsmi_processor_handle processor return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_set_cpu_socket_boostlimit(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t boostlimit) +amdsmi_status_t amdsmi_set_cpu_socket_boostlimit(amdsmi_processor_handle processor_handle, + uint32_t boostlimit) { amdsmi_status_t status; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_socket_boostlimit_set(sock_ind, boostlimit)); if (status != AMDSMI_STATUS_SUCCESS) @@ -3264,22 +3210,17 @@ amdsmi_status_t amdsmi_set_cpu_socket_boostlimit(amdsmi_cpusocket_handle socket_ return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_cpu_ddr_bw(amdsmi_cpusocket_handle socket_handle, - amdsmi_ddr_bw_metrics_t *ddr_bw) +amdsmi_status_t amdsmi_get_cpu_ddr_bw(amdsmi_processor_handle processor_handle, + amdsmi_ddr_bw_metrics_t *ddr_bw) { amdsmi_status_t status; struct ddr_bw_metrics ddr; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); - if (r != AMDSMI_STATUS_SUCCESS) - return r; - status = static_cast(esmi_ddr_bw_get(&ddr)); if (status != AMDSMI_STATUS_SUCCESS) return status; @@ -3291,22 +3232,24 @@ amdsmi_status_t amdsmi_get_cpu_ddr_bw(amdsmi_cpusocket_handle socket_handle, return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_cpu_socket_temperature(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *ptmon) +amdsmi_status_t amdsmi_get_cpu_socket_temperature(amdsmi_processor_handle processor_handle, + uint32_t *ptmon) { amdsmi_status_t status; uint32_t tmon; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_socket_temperature_get(sock_ind, &tmon)); if (status != AMDSMI_STATUS_SUCCESS) return status; @@ -3317,22 +3260,25 @@ amdsmi_status_t amdsmi_get_cpu_socket_temperature(amdsmi_cpusocket_handle socket } amdsmi_status_t amdsmi_get_cpu_dimm_temp_range_and_refresh_rate( - amdsmi_cpusocket_handle socket_handle, - uint8_t sock_ind, uint8_t dimm_addr, amdsmi_temp_range_refresh_rate_t *rate) + amdsmi_processor_handle processor_handle, + uint8_t dimm_addr, amdsmi_temp_range_refresh_rate_t *rate) { amdsmi_status_t status; struct temp_range_refresh_rate dimm_rate; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_dimm_temp_range_and_refresh_rate_get( sock_ind, dimm_addr, &dimm_rate)); if (status != AMDSMI_STATUS_SUCCESS) @@ -3344,22 +3290,24 @@ amdsmi_status_t amdsmi_get_cpu_dimm_temp_range_and_refresh_rate( return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_cpu_dimm_power_consumption(amdsmi_cpusocket_handle socket_handle, - uint8_t sock_ind, uint8_t dimm_addr, amdsmi_dimm_power_t *dimm_pow) +amdsmi_status_t amdsmi_get_cpu_dimm_power_consumption(amdsmi_processor_handle processor_handle, + uint8_t dimm_addr, amdsmi_dimm_power_t *dimm_pow) { amdsmi_status_t status; struct dimm_power d_power; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_dimm_power_consumption_get(sock_ind, dimm_addr, &d_power)); if (status != AMDSMI_STATUS_SUCCESS) @@ -3372,22 +3320,24 @@ amdsmi_status_t amdsmi_get_cpu_dimm_power_consumption(amdsmi_cpusocket_handle so return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_cpu_dimm_thermal_sensor(amdsmi_cpusocket_handle socket_handle, - uint8_t sock_ind, uint8_t dimm_addr, amdsmi_dimm_thermal_t *dimm_temp) +amdsmi_status_t amdsmi_get_cpu_dimm_thermal_sensor(amdsmi_processor_handle processor_handle, + uint8_t dimm_addr, amdsmi_dimm_thermal_t *dimm_temp) { amdsmi_status_t status; struct dimm_thermal d_sensor; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_dimm_thermal_sensor_get(sock_ind, dimm_addr, &d_sensor)); if (status != AMDSMI_STATUS_SUCCESS) @@ -3400,21 +3350,16 @@ amdsmi_status_t amdsmi_get_cpu_dimm_thermal_sensor(amdsmi_cpusocket_handle socke return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_set_cpu_xgmi_width(amdsmi_cpusocket_handle socket_handle, +amdsmi_status_t amdsmi_set_cpu_xgmi_width(amdsmi_processor_handle processor_handle, uint8_t min, uint8_t max) { amdsmi_status_t status; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); - if (r != AMDSMI_STATUS_SUCCESS) - return r; - status = static_cast(esmi_xgmi_width_set(min, max)); if (status != AMDSMI_STATUS_SUCCESS) return status; @@ -3422,21 +3367,23 @@ amdsmi_status_t amdsmi_set_cpu_xgmi_width(amdsmi_cpusocket_handle socket_handle, return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_set_cpu_gmi3_link_width_range(amdsmi_cpusocket_handle socket_handle, - uint8_t sock_ind, uint8_t min_link_width, uint8_t max_link_width) +amdsmi_status_t amdsmi_set_cpu_gmi3_link_width_range(amdsmi_processor_handle processor_handle, + uint8_t min_link_width, uint8_t max_link_width) { amdsmi_status_t status; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_gmi3_link_width_range_set(sock_ind, min_link_width, max_link_width)); if (status != AMDSMI_STATUS_SUCCESS) @@ -3445,20 +3392,22 @@ amdsmi_status_t amdsmi_set_cpu_gmi3_link_width_range(amdsmi_cpusocket_handle soc return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_cpu_apb_enable(amdsmi_cpusocket_handle socket_handle, uint32_t sock_ind) +amdsmi_status_t amdsmi_cpu_apb_enable(amdsmi_processor_handle processor_handle) { amdsmi_status_t status; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_apb_enable(sock_ind)); if (status != AMDSMI_STATUS_SUCCESS) return status; @@ -3466,21 +3415,23 @@ amdsmi_status_t amdsmi_cpu_apb_enable(amdsmi_cpusocket_handle socket_handle, uin return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_cpu_apb_disable(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint8_t pstate) +amdsmi_status_t amdsmi_cpu_apb_disable(amdsmi_processor_handle processor_handle, + uint8_t pstate) { amdsmi_status_t status; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_apb_disable(sock_ind, pstate)); if (status != AMDSMI_STATUS_SUCCESS) return status; @@ -3488,21 +3439,23 @@ amdsmi_status_t amdsmi_cpu_apb_disable(amdsmi_cpusocket_handle socket_handle, return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_set_cpu_socket_lclk_dpm_level(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint8_t nbio_id, uint8_t min, uint8_t max) +amdsmi_status_t amdsmi_set_cpu_socket_lclk_dpm_level(amdsmi_processor_handle processor_handle, + uint8_t nbio_id, uint8_t min, uint8_t max) { amdsmi_status_t status; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_socket_lclk_dpm_level_set(sock_ind, nbio_id, min, max)); if (status != AMDSMI_STATUS_SUCCESS) return status; @@ -3510,22 +3463,24 @@ amdsmi_status_t amdsmi_set_cpu_socket_lclk_dpm_level(amdsmi_cpusocket_handle soc return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_cpu_socket_lclk_dpm_level(amdsmi_cpusocket_handle socket_handle, - uint8_t sock_ind, uint8_t nbio_id, amdsmi_dpm_level_t *nbio) +amdsmi_status_t amdsmi_get_cpu_socket_lclk_dpm_level(amdsmi_processor_handle processor_handle, + uint8_t nbio_id, amdsmi_dpm_level_t *nbio) { amdsmi_status_t status; struct dpm_level nb; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_socket_lclk_dpm_level_get(sock_ind, nbio_id, &nb)); if (status != AMDSMI_STATUS_SUCCESS) @@ -3537,21 +3492,23 @@ amdsmi_status_t amdsmi_get_cpu_socket_lclk_dpm_level(amdsmi_cpusocket_handle soc return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_set_cpu_pcie_link_rate(amdsmi_cpusocket_handle socket_handle, - uint8_t sock_ind, uint8_t rate_ctrl, uint8_t *prev_mode) +amdsmi_status_t amdsmi_set_cpu_pcie_link_rate(amdsmi_processor_handle processor_handle, + uint8_t rate_ctrl, uint8_t *prev_mode) { amdsmi_status_t status; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_pcie_link_rate_set(sock_ind, rate_ctrl, prev_mode)); if (status != AMDSMI_STATUS_SUCCESS) @@ -3560,21 +3517,23 @@ amdsmi_status_t amdsmi_set_cpu_pcie_link_rate(amdsmi_cpusocket_handle socket_han return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_set_cpu_df_pstate_range(amdsmi_cpusocket_handle socket_handle, - uint8_t sock_ind, uint8_t max_pstate, uint8_t min_pstate) +amdsmi_status_t amdsmi_set_cpu_df_pstate_range(amdsmi_processor_handle processor_handle, + uint8_t max_pstate, uint8_t min_pstate) { amdsmi_status_t status; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_df_pstate_range_set(sock_ind, max_pstate, min_pstate)); if (status != AMDSMI_STATUS_SUCCESS) @@ -3583,36 +3542,39 @@ amdsmi_status_t amdsmi_set_cpu_df_pstate_range(amdsmi_cpusocket_handle socket_ha return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_cpu_current_io_bandwidth(amdsmi_cpusocket_handle socket_handle, - uint8_t sock_ind, amdsmi_link_id_bw_type_t link, uint32_t *io_bw) +amdsmi_status_t amdsmi_get_cpu_current_io_bandwidth(amdsmi_processor_handle processor_handle, + amdsmi_link_id_bw_type_t link, uint32_t *io_bw) { amdsmi_status_t status; uint32_t bw; struct link_id_bw_type io_link; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + + io_link.link_name = link.link_name; + io_link.bw_type = static_cast(link.bw_type); + status = static_cast(esmi_current_io_bandwidth_get(sock_ind, io_link, &bw)); if (status != AMDSMI_STATUS_SUCCESS) return status; - link.link_name = io_link.link_name; - link.bw_type = static_cast(io_link.bw_type); *io_bw = bw; return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_cpu_current_xgmi_bw(amdsmi_cpusocket_handle socket_handle, +amdsmi_status_t amdsmi_get_cpu_current_xgmi_bw(amdsmi_processor_handle processor_handle, amdsmi_link_id_bw_type_t link, uint32_t *xgmi_bw) { amdsmi_status_t status; @@ -3621,26 +3583,22 @@ amdsmi_status_t amdsmi_get_cpu_current_xgmi_bw(amdsmi_cpusocket_handle socket_ha AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); - if (r != AMDSMI_STATUS_SUCCESS) - return r; + io_link.link_name = link.link_name; + io_link.bw_type= static_cast(link.bw_type); status = static_cast(esmi_current_xgmi_bw_get(io_link, &bw)); if (status != AMDSMI_STATUS_SUCCESS) return status; - link.link_name = io_link.link_name; - link.bw_type= static_cast(io_link.bw_type); *xgmi_bw = bw; return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_metrics_table_version(amdsmi_cpusocket_handle socket_handle, +amdsmi_status_t amdsmi_get_metrics_table_version(amdsmi_processor_handle processor_handle, uint32_t *metrics_version) { amdsmi_status_t status; @@ -3648,14 +3606,9 @@ amdsmi_status_t amdsmi_get_metrics_table_version(amdsmi_cpusocket_handle socket_ AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); - if (r != AMDSMI_STATUS_SUCCESS) - return r; - status = static_cast(esmi_metrics_table_version_get(&metrics_tbl_ver)); *metrics_version = metrics_tbl_ver; @@ -3665,22 +3618,24 @@ amdsmi_status_t amdsmi_get_metrics_table_version(amdsmi_cpusocket_handle socket_ return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_metrics_table(amdsmi_cpusocket_handle socket_handle, uint8_t sock_ind, +amdsmi_status_t amdsmi_get_metrics_table(amdsmi_processor_handle processor_handle, struct hsmp_metric_table *metrics_table) { amdsmi_status_t status; struct hsmp_metric_table metrics_tbl; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_metrics_table_get(sock_ind, &metrics_tbl)); *metrics_table = metrics_tbl; @@ -3690,22 +3645,24 @@ amdsmi_status_t amdsmi_get_metrics_table(amdsmi_cpusocket_handle socket_handle, return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_first_online_core_on_cpu_socket(amdsmi_cpusocket_handle socket_handle, - uint32_t sock_ind, uint32_t *pcore_ind) +amdsmi_status_t amdsmi_first_online_core_on_cpu_socket(amdsmi_processor_handle processor_handle, + uint32_t *pcore_ind) { amdsmi_status_t status; uint32_t online_core; + uint8_t sock_ind; AMDSMI_CHECK_INIT(); - if (socket_handle == nullptr) + if (processor_handle == nullptr) return AMDSMI_STATUS_INVAL; - amd::smi::AMDSmiCpuSocket* socket = nullptr; - amdsmi_status_t r = get_cpu_socket_from_handle(socket_handle, &socket); + amdsmi_status_t r = amdsmi_get_processor_info(processor_handle, SIZE, proc_id); if (r != AMDSMI_STATUS_SUCCESS) return r; + sock_ind = (uint8_t)std::stoi(proc_id, NULL, 0); + status = static_cast(esmi_first_online_core_on_socket(sock_ind, &online_core)); if (status != AMDSMI_STATUS_SUCCESS) return status; diff --git a/src/amd_smi/amd_smi_cpu_core.cc b/src/amd_smi/amd_smi_cpu_core.cc deleted file mode 100644 index 9f96517157..0000000000 --- a/src/amd_smi/amd_smi_cpu_core.cc +++ /dev/null @@ -1,62 +0,0 @@ -/* - * ============================================================================= - * The University of Illinois/NCSA - * Open Source License (NCSA) - * - * Copyright (c) 2023, Advanced Micro Devices, Inc. - * All rights reserved. - * - * Developed by: - * - * AMD Research and AMD ROC Software Development - * - * Advanced Micro Devices, Inc. - * - * www.amd.com - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal with the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * - Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimers. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimers in - * the documentation and/or other materials provided with the distribution. - * - Neither the names of , - * nor the names of its contributors may be used to endorse or promote - * products derived from this Software without specific prior written - * permission. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS WITH THE SOFTWARE. - * - */ - -#include -#include "amd_smi/impl/amd_smi_cpu_core.h" - -namespace amd { -namespace smi { -AMDSmiCpuCore::~AMDSmiCpuCore() { - for (uint32_t i = 0; i < processors_.size(); i++) { - delete processors_[i]; - } - processors_.clear(); -} - -amdsmi_status_t AMDSmiCpuCore::get_processor_count(uint32_t* processor_count) const { - *processor_count = static_cast(processors_.size()); - return AMDSMI_STATUS_SUCCESS; -} - -} // namespace smi -} // namespace amd diff --git a/src/amd_smi/amd_smi_cpu_socket.cc b/src/amd_smi/amd_smi_cpu_socket.cc deleted file mode 100644 index 0fc90adc7c..0000000000 --- a/src/amd_smi/amd_smi_cpu_socket.cc +++ /dev/null @@ -1,72 +0,0 @@ -/* - * ============================================================================= - * The University of Illinois/NCSA - * Open Source License (NCSA) - * - * Copyright (c) 2023, Advanced Micro Devices, Inc. - * All rights reserved. - * - * Developed by: - * - * AMD Research and AMD ROC Software Development - * - * Advanced Micro Devices, Inc. - * - * www.amd.com - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal with the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * - Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimers. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimers in - * the documentation and/or other materials provided with the distribution. - * - Neither the names of , - * nor the names of its contributors may be used to endorse or promote - * products derived from this Software without specific prior written - * permission. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS WITH THE SOFTWARE. - * - */ - -#include -#include "amd_smi/impl/amd_smi_cpu_socket.h" -#include - -namespace amd { -namespace smi { - -AMDSmiCpuSocket::~AMDSmiCpuSocket() {} - -amdsmi_status_t AMDSmiCpuSocket::set_socket_id(uint32_t idx, uint32_t socket_id) { - socket_id = idx; - return AMDSMI_STATUS_SUCCESS; -} - -amdsmi_status_t AMDSmiCpuSocket::get_cpu_vendor() { - uint32_t eax, ebx, ecx, edx; - - if (!__get_cpuid(0, &eax, &ebx, &ecx, &edx)) - return AMDSMI_STATUS_IO; - - /* check if the value in ebx, ecx, edx matches "AuthenticAMD" string */ - if (ebx != 0x68747541 || ecx != 0x444d4163 || edx != 0x69746e65) - return AMDSMI_STATUS_NON_AMD_CPU; - - return AMDSMI_STATUS_SUCCESS; -} - -} // namespace smi -} // namespace amd diff --git a/src/amd_smi/amd_smi_socket.cc b/src/amd_smi/amd_smi_socket.cc index cf2cfc3f9e..9481f9702d 100644 --- a/src/amd_smi/amd_smi_socket.cc +++ b/src/amd_smi/amd_smi_socket.cc @@ -53,6 +53,14 @@ AMDSmiSocket::~AMDSmiSocket() { delete processors_[i]; } processors_.clear(); + for (uint32_t i = 0; i < cpu_processors_.size(); i++) { + delete cpu_processors_[i]; + } + cpu_processors_.clear(); + for (uint32_t i = 0; i < cpu_core_processors_.size(); i++) { + delete cpu_core_processors_[i]; + } + cpu_core_processors_.clear(); } amdsmi_status_t AMDSmiSocket::get_processor_count(uint32_t* processor_count) const { @@ -60,6 +68,26 @@ amdsmi_status_t AMDSmiSocket::get_processor_count(uint32_t* processor_count) con return AMDSMI_STATUS_SUCCESS; } +amdsmi_status_t AMDSmiSocket::get_processor_count(processor_type_t type, uint32_t* processor_count) const { + amdsmi_status_t ret = AMDSMI_STATUS_SUCCESS; + switch (type) { + case AMD_GPU: + *processor_count = static_cast(processors_.size()); + break; + case AMD_CPU: + *processor_count = static_cast(cpu_processors_.size()); + break; + case AMD_CPU_CORE: + *processor_count = static_cast(cpu_core_processors_.size()); + break; + default: + *processor_count = 0; + ret = AMDSMI_STATUS_INVAL; + break; + } + return ret; +} + } // namespace smi } // namespace amd diff --git a/src/amd_smi/amd_smi_system.cc b/src/amd_smi/amd_smi_system.cc index e9fa857bdf..3480cbef41 100644 --- a/src/amd_smi/amd_smi_system.cc +++ b/src/amd_smi/amd_smi_system.cc @@ -53,16 +53,65 @@ namespace amd { namespace smi { -#ifdef ENABLE_ESMI_LIB -uint32_t AMDSmiSystem::sockets = 0; -uint32_t AMDSmiSystem::cpus = 0; -uint32_t AMDSmiSystem::threads = 0; -uint32_t AMDSmiSystem::family = 0; -uint32_t AMDSmiSystem::model = 0; -#endif #define AMD_SMI_INIT_FLAG_RESRV_TEST1 0x800000000000000 //!< Reserved for test +static amdsmi_status_t get_cpu_family(uint32_t *cpu_family) { + amdsmi_status_t ret; + ret = static_cast(esmi_cpu_family_get(cpu_family)); + + if (ret != AMDSMI_STATUS_SUCCESS) { + std::cout << "Failed to get cpu family, Err["<(esmi_cpu_model_get(cpu_model)); + + if (ret != AMDSMI_STATUS_SUCCESS) { + std::cout << "Failed to get cpu model, Err["<(esmi_number_of_cpus_get(num_cpus)); + + if (ret != AMDSMI_STATUS_SUCCESS) { + std::cout << "Failed to get number of cpus, Err["<(esmi_threads_per_core_get(threads_per_core)); + + if (ret != AMDSMI_STATUS_SUCCESS) { + std::cout << "Failed to get threads per core, Err["<(esmi_number_of_sockets_get(num_socks)); + + if (ret != AMDSMI_STATUS_SUCCESS) { + std::cout << "Failed to get number of sockets, Err["<get_cpu_vendor(); /* esmi is for AMD cpus, if its not AMD CPU, we are not going to initialise esmi */ - if (!amd_smi_status) { - amd_smi_status = static_cast(esmi_init()); - if (amd_smi_status != AMDSMI_STATUS_SUCCESS){ - std::cout<<"\tESMI Not initialized, drivers not found " << std::endl; - return amd_smi_status; - } + amd_smi_status = static_cast(esmi_init()); + if (amd_smi_status != AMDSMI_STATUS_SUCCESS){ + std::cout<<"\tESMI Not initialized, drivers not found " << std::endl; + return amd_smi_status; } - amd_smi_status = get_cpu_sockets(&sockets); - amd_smi_status = get_cpu_cores(&cpus); - amd_smi_status = get_threads_per_core(&threads); - amd_smi_status = get_cpu_family(&family); - amd_smi_status = get_cpu_model(&model); - std::cout << "\n***********************EPYC METRICS***********************" << std::endl; - std::cout <<"| NR_SOCKETS | "< 1) { - std::cout <<"| THREADS PER CORE | "<get_socket_id() == cpu_socket_id) { - socket = cpu_sockets_[j]; + AMDSmiSocket* socket = nullptr; + for (uint32_t j = 0; j < sockets_.size(); j++) { + if (sockets_[j]->get_socket_id() == cpu_socket_id) { + socket = sockets_[j]; break; } } if (socket == nullptr) { - socket = new AMDSmiCpuSocket(cpu_socket_id); - cpu_sockets_.push_back(socket); + socket = new AMDSmiSocket(cpu_socket_id); + sockets_.push_back(socket); } + AMDSmiProcessor* cpusocket = new AMDSmiProcessor(AMD_CPU, i); + socket->add_processor(cpusocket); + processors_.insert(cpusocket); - for (uint32_t k = 0; k < cpus/threads; k++) { - AMDSmiCpuCore* core = new AMDSmiCpuCore(k); + for (uint32_t k = 0; k < (cpus/threads)/sockets; k++) { + AMDSmiProcessor* core = new AMDSmiProcessor(AMD_CPU_CORE, k); socket->add_processor(core); processors_.insert(core); } } - std::cout << std::endl; return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t AMDSmiSystem::get_cpu_sockets(uint32_t *num_socks) { - amdsmi_status_t ret; - ret = static_cast(esmi_number_of_sockets_get(num_socks)); - sockets = *num_socks; - if (ret != AMDSMI_STATUS_SUCCESS) { - std::cout << "Failed to get number of sockets, Err["<(esmi_number_of_cpus_get(num_cpus)); - cpus = *num_cpus; - - if (ret != AMDSMI_STATUS_SUCCESS) { - std::cout << "Failed to get number of cpus, Err["<(esmi_threads_per_core_get(threads_per_core)); - threads = *threads_per_core; - - if (ret != AMDSMI_STATUS_SUCCESS) { - std::cout << "Failed to get threads per core, Err["<(esmi_cpu_family_get(cpu_family)); - family = *cpu_family; - - if (ret != AMDSMI_STATUS_SUCCESS) { - std::cout << "Failed to get cpu family, Err["<(esmi_cpu_model_get(cpu_model)); - model = *cpu_model; - - if (ret != AMDSMI_STATUS_SUCCESS) { - std::cout << "Failed to get cpu model, Err["<(socket_handle); - - // double check handlers is here - if (std::find(cpu_sockets_.begin(), cpu_sockets_.end(), *socket) - != cpu_sockets_.end()) { - return AMDSMI_STATUS_SUCCESS; - } - return AMDSMI_STATUS_INVAL; - } -#endif - amdsmi_status_t AMDSmiSystem::handle_to_processor( amdsmi_processor_handle processor_handle, AMDSmiProcessor** processor) { @@ -378,28 +335,6 @@ amdsmi_status_t AMDSmiSystem::gpu_index_to_handle(uint32_t gpu_index, return AMDSMI_STATUS_INVAL; } -#ifdef ENABLE_ESMI_LIB -amdsmi_status_t AMDSmiSystem::cpu_index_to_handle(uint32_t cpu_index, - amdsmi_cpusocket_handle* cpu_handle) { - if (cpu_handle == nullptr) - return AMDSMI_STATUS_INVAL; - - auto iter = cpu_sockets_.begin(); - for (; iter != cpu_sockets_.end(); iter++) { - auto cur_socket = (*iter); - if (cur_socket->get_processor_type() != AMD_CPU) - continue; - amd::smi::AMDSmiCpuSocket* cpu_socket = - static_cast(cur_socket); - uint32_t cur_cpu_index = cpu_socket->get_cpu_id(); - if (cpu_index == cur_cpu_index) { - *cpu_handle = cur_socket; - return AMDSMI_STATUS_SUCCESS; - } - } - return AMDSMI_STATUS_INVAL; -} -#endif } // namespace smi } // namespace amd