From e037cde86b4f9288f6c3abacc129b0863e2cc1d3 Mon Sep 17 00:00:00 2001 From: muthusamy Date: Tue, 24 Sep 2024 11:19:42 +0000 Subject: [PATCH] amdsmi: Optimizing go shim to default pick amdsmi Optimizing go shim to default pick amdsmi and other code cleanup in goshim. Signed-off-by: muthusamy Change-Id: I0e6a2d28404cbb751d2b6e90c793b359fec9be13 --- goamdsmi_shim/CMakeLists.txt | 25 ++-------- goamdsmi_shim/goamdsmi_shim64Config.in | 14 ------ goamdsmi_shim/smiwrapper/amdsmi_go_shim.c | 58 ----------------------- 3 files changed, 5 insertions(+), 92 deletions(-) delete mode 100644 goamdsmi_shim/goamdsmi_shim64Config.in diff --git a/goamdsmi_shim/CMakeLists.txt b/goamdsmi_shim/CMakeLists.txt index 7a4a202bb0..dceee4e29e 100644 --- a/goamdsmi_shim/CMakeLists.txt +++ b/goamdsmi_shim/CMakeLists.txt @@ -6,20 +6,12 @@ # cmake_minimum_required(VERSION 3.5.0) -message("*******************************************************************") +message("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&") message(" CMake AMD goamdsmi_shim Library ") -message("*******************************************************************") - -option(WITH_AMDSMI "Support unified cpu and gpu" ON) +message("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&") set(AMDSMI_DIR "" CACHE PATH "path to amdsmi installation") -if(WITH_AMDSMI) -add_definitions(-DAMDSMI_BUILD) -add_definitions(-DENABLE_ESMI_LIB) -#include(deps/SetupAmdsmi.cmake) -endif() - if(ENABLE_DEBUG_LEVEL) add_definitions(-DENABLE_DEBUG_LEVEL=${ENABLE_DEBUG_LEVEL}) message("**** Enabling Debug Level=${ENABLE_DEBUG_LEVEL} ****") @@ -51,11 +43,6 @@ message("SOVERSION: ${SO_VERSION_STRING}") project(${GOAMDSMI_SHIM_TARGET}) -# Create a configure file to get version info from within library -configure_file( - "${PROJECT_SOURCE_DIR}/${GOAMDSMI_SHIM_TARGET}Config.in" - "${PROJECT_SOURCE_DIR}/include/${GOAMDSMI_SHIM_TARGET}Config.h") - if (NOT DEFINED CPACK_PACKAGE_VENDOR) set(CPACK_PACKAGE_VENDOR "AMD") endif() @@ -109,11 +96,9 @@ add_library(${GOAMDSMI_SHIM_TARGET} SHARED target_link_libraries(${GOAMDSMI_SHIM_TARGET} pthread rt m) -if(WITH_AMDSMI) - target_link_libraries(${GOAMDSMI_SHIM_TARGET} amd_smi) - target_link_libraries(${GOAMDSMI_SHIM_TARGET} -L${AMDSMI_DIR}/lib) - target_link_libraries(${GOAMDSMI_SHIM_TARGET} -L${AMDSMI_DIR}/lib64) -endif() +target_link_libraries(${GOAMDSMI_SHIM_TARGET} amd_smi) +target_link_libraries(${GOAMDSMI_SHIM_TARGET} -L${AMDSMI_DIR}/lib) +target_link_libraries(${GOAMDSMI_SHIM_TARGET} -L${AMDSMI_DIR}/lib64) ## Set the VERSION and SOVERSION values set_property(TARGET ${GOAMDSMI_SHIM_TARGET} PROPERTY diff --git a/goamdsmi_shim/goamdsmi_shim64Config.in b/goamdsmi_shim/goamdsmi_shim64Config.in deleted file mode 100644 index b12a6f0b59..0000000000 --- a/goamdsmi_shim/goamdsmi_shim64Config.in +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: MIT -# Copyright (c) 2024, Advanced Micro Devices, Inc. - -#ifndef INCLUDE_GOAMDSMI_SHIM64CONFIG_H_ -#define INCLUDE_GOAMDSMI_SHIM64CONFIG_H_ - -// This file is generated on build. - -#define goamdsmi_shim_VERSION_MAJOR @goamdsmi_shim_VERSION_MAJOR@ -#define goamdsmi_shim_VERSION_MINOR @goamdsmi_shim_VERSION_MINOR@ -#define goamdsmi_shim_VERSION_PATCH @goamdsmi_shim_VERSION_PATCH@ -#define goamdsmi_shim_VERSION_BUILD "@goamdsmi_shim_VERSION_BUILD@" - -#endif // INCLUDE_GOAMDSMI_SHIM_SMI64CONFIG_H_ diff --git a/goamdsmi_shim/smiwrapper/amdsmi_go_shim.c b/goamdsmi_shim/smiwrapper/amdsmi_go_shim.c index 599b44a307..9056be84b9 100644 --- a/goamdsmi_shim/smiwrapper/amdsmi_go_shim.c +++ b/goamdsmi_shim/smiwrapper/amdsmi_go_shim.c @@ -39,13 +39,10 @@ #include #include #include "amdsmi_go_shim.h" -#ifdef AMDSMI_BUILD #include -#endif #include #define nullptr ((void*)0) -#ifdef AMDSMI_BUILD #define MAX_SOCKET_ACROSS_SYSTEM 4 #define CPU_0 0 #define GPU_SENSOR_0 0 @@ -94,15 +91,6 @@ goamdsmi_status_t is_file_present(const char* driver_name, const char* file_name return GOAMDSMI_STATUS_FAILURE; } -goamdsmi_status_t go_shim_amdsmi_present() -{ - if((GOAMDSMI_STATUS_SUCCESS == is_file_present(AMDSMI_DRIVER_NAME, AMDSMI_LIB_FILE)) || (GOAMDSMI_STATUS_SUCCESS == is_file_present(AMDSMI_DRIVER_NAME, AMDSMI_LIB64_FILE))) - { - return GOAMDSMI_STATUS_SUCCESS; - } - return GOAMDSMI_STATUS_FAILURE; -} - goamdsmi_status_t check_amdgpu_driver() { return is_file_present(AMDGPU_DRIVER_NAME, AMDGPU_INITSTATE_FILE); @@ -143,13 +131,6 @@ goamdsmi_status_t go_shim_amdsmiapu_init(goamdsmi_Init_t goamdsmi_Init) } } -#if 0 - if(GOAMDSMI_STATUS_FAILURE == go_shim_amdsmi_present()) - { - if (enable_debug_level(GOAMDSMI_DEBUG_LEVEL_1)) {printf("AMDSMI, Failed, AMDSMI not present in the System, missing \"%s\" (or) \"%s\"\n", AMDSMI_LIB_FILE, AMDSMI_LIB64_FILE);} - return GOAMDSMI_STATUS_FAILURE; - } -#endif if ((GOAMDSMI_STATUS_SUCCESS == check_amdgpu_driver()) && (GOAMDSMI_STATUS_SUCCESS == check_hsmp_driver())) { @@ -693,42 +674,3 @@ uint64_t goamdsmi_gpu_dev_gpu_memory_total_get(uint32_t dv_ind) return gpu_memory_total; } -#else -////////////////////////////////////////////////------------CPU------------//////////////////////////////////////////////// -bool goamdsmi_cpu_init() {return false;} -uint32_t goamdsmi_cpu_threads_per_core_get() {return GOAMDSMI_VALUE_0;} -uint32_t goamdsmi_cpu_number_of_threads_get() {return GOAMDSMI_VALUE_0;} -uint32_t goamdsmi_cpu_number_of_sockets_get() {return GOAMDSMI_VALUE_0;} -uint64_t goamdsmi_cpu_core_energy_get(uint32_t thread_index) {return GOAMDSMI_UINT64_MAX;} -uint64_t goamdsmi_cpu_socket_energy_get(uint32_t socket_index) {return GOAMDSMI_UINT64_MAX;} -uint32_t goamdsmi_cpu_prochot_status_get(uint32_t socket_index) {return GOAMDSMI_UINT32_MAX;} -uint32_t goamdsmi_cpu_socket_power_get(uint32_t socket_index) {return GOAMDSMI_UINT32_MAX;} -uint32_t goamdsmi_cpu_socket_power_cap_get(uint32_t socket_index) {return GOAMDSMI_UINT32_MAX;} -uint32_t goamdsmi_cpu_core_boostlimit_get(uint32_t thread_index) {return GOAMDSMI_UINT32_MAX;} - -////////////////////////////////////////////////------------GPU------------//////////////////////////////////////////////// -bool goamdsmi_gpu_init() {return false;} -bool goamdsmi_gpu_shutdown() {return false;} -uint32_t goamdsmi_gpu_num_monitor_devices() {return GOAMDSMI_VALUE_0;} -char* goamdsmi_gpu_dev_name_get(uint32_t dv_ind) {return NULL;} -uint16_t goamdsmi_gpu_dev_id_get(uint32_t dv_ind) {return GOAMDSMI_UINT16_MAX;} -uint64_t goamdsmi_gpu_dev_pci_id_get(uint32_t dv_ind) {return GOAMDSMI_UINT64_MAX;} -char* goamdsmi_gpu_dev_vendor_name_get(uint32_t dv_ind) {return NULL;} -char* goamdsmi_gpu_dev_vbios_version_get(uint32_t dv_ind) {return NULL;} -uint64_t goamdsmi_gpu_dev_power_cap_get(uint32_t dv_ind) {return GOAMDSMI_UINT64_MAX;} -uint64_t goamdsmi_gpu_dev_power_get(uint32_t dv_ind) {return GOAMDSMI_UINT64_MAX;} -uint64_t goamdsmi_gpu_dev_temp_metric_get(uint32_t dv_ind, uint32_t sensor, uint32_t metric) {return GOAMDSMI_UINT64_MAX;} -uint32_t goamdsmi_gpu_dev_overdrive_level_get(uint32_t dv_ind) {return GOAMDSMI_UINT32_MAX;} -uint32_t goamdsmi_gpu_dev_mem_overdrive_level_get(uint32_t dv_ind) {return GOAMDSMI_UINT32_MAX;} -uint32_t goamdsmi_gpu_dev_perf_level_get(uint32_t dv_ind) {return GOAMDSMI_UINT32_MAX;} -uint64_t goamdsmi_gpu_dev_gpu_clk_freq_get_sclk(uint32_t dv_ind) {return GOAMDSMI_UINT64_MAX;} -uint64_t goamdsmi_gpu_dev_gpu_clk_freq_get_mclk(uint32_t dv_ind) {return GOAMDSMI_UINT64_MAX;} -uint64_t goamdsmi_gpu_od_volt_freq_range_min_get_sclk(uint32_t dv_ind) {return GOAMDSMI_UINT64_MAX;} -uint64_t goamdsmi_gpu_od_volt_freq_range_min_get_mclk(uint32_t dv_ind) {return GOAMDSMI_UINT64_MAX;} -uint64_t goamdsmi_gpu_od_volt_freq_range_max_get_sclk(uint32_t dv_ind) {return GOAMDSMI_UINT64_MAX;} -uint64_t goamdsmi_gpu_od_volt_freq_range_max_get_mclk(uint32_t dv_ind) {return GOAMDSMI_UINT64_MAX;} -uint32_t goamdsmi_gpu_dev_gpu_busy_percent_get(uint32_t dv_ind) {return GOAMDSMI_UINT32_MAX;} -uint64_t goamdsmi_gpu_dev_gpu_memory_busy_percent_get(uint32_t dv_ind) {return GOAMDSMI_UINT64_MAX;} -uint64_t goamdsmi_gpu_dev_gpu_memory_usage_get(uint32_t dv_ind) {return GOAMDSMI_UINT64_MAX;} -uint64_t goamdsmi_gpu_dev_gpu_memory_total_get(uint32_t dv_ind) {return GOAMDSMI_UINT64_MAX;} -#endif