diff --git a/.clangd b/.clangd index 349e6b2778..9d5bae9cfe 100644 --- a/.clangd +++ b/.clangd @@ -1,6 +1,6 @@ CompileFlags: Remove: -W* - Add: [-Wall, -Wno-c++20-designator, -pedantic] + Add: [-Wall, -Wno-c++20-designator, -pedantic, -Wno-sign-conversion] Compiler: clang++ # list here: https://clang.llvm.org/extra/clang-tidy/checks/list.html diff --git a/rocm_smi/include/rocm_smi/rocm_smi_main.h b/rocm_smi/include/rocm_smi/rocm_smi_main.h index 5e3221ac2e..82c1171fdb 100644 --- a/rocm_smi/include/rocm_smi/rocm_smi_main.h +++ b/rocm_smi/include/rocm_smi/rocm_smi_main.h @@ -108,7 +108,7 @@ class RocmSMI { io_link_map_; std::map dev_ind_to_node_ind_map_; void AddToDeviceList(std::string dev_name, uint64_t bdfid = 0); - typedef struct { + typedef struct rsmi_device_enumeration_t { uint32_t card_index = std::numeric_limits::max(); std::string dev_name = ""; std::string drm_render_path = ""; diff --git a/rocm_smi/src/rocm_smi.cc b/rocm_smi/src/rocm_smi.cc index 628417a7c8..32d813b76f 100644 --- a/rocm_smi/src/rocm_smi.cc +++ b/rocm_smi/src/rocm_smi.cc @@ -59,7 +59,6 @@ using amd::smi::monitorTypesToString; using amd::smi::getRSMIStatusString; using amd::smi::AMDGpuMetricTypeId_t; -auto &devInfoTypesStrings = amd::smi::Device::devInfoTypesStrings; static const uint32_t kMaxOverdriveLevel = 20; static const float kEnergyCounterResolution = 15.3F; @@ -918,7 +917,6 @@ rsmi_status_t rsmi_ras_feature_info_get( TRY rsmi_status_t ret; std::string feature_line; - std::string tmp_str; std::ostringstream ss; ss << __PRETTY_FUNCTION__ << " | ======= start ======="; LOG_TRACE(ss); @@ -1137,7 +1135,7 @@ rsmi_dev_vendor_id_get(uint32_t dv_ind, uint16_t *id) { } CHK_SUPPORT_NAME_ONLY(id) int ret_kfd = 0; - uint32_t node_id; + uint32_t node_id = 0; rsmi_status_t ret = get_id(dv_ind, amd::smi::kDevVendorID, id); bool need_fallback = false; if (ret != RSMI_STATUS_SUCCESS) { @@ -1585,7 +1583,6 @@ static rsmi_status_t get_od_clk_volt_info(uint32_t dv_ind, const std::string KTAG_MCLK{"MCLK:"}; const std::string KTAG_SCLK{"SCLK:"}; const std::string KTAG_OD_RANGE{"OD_RANGE:"}; - const std::string KTAG_OD_VDDGFX_OFFSET{"OD_VDDGFX_OFFSET:"}; const std::string KTAG_FIRST_FREQ_IDX{"0:"}; amd::smi::TextFileTagContents_t txt_power_dev_od_voltage(val_vec); @@ -2070,7 +2067,6 @@ rsmi_dev_firmware_version_get(uint32_t dv_ind, rsmi_fw_block_t block, LOG_TRACE(ss); CHK_SUPPORT_VAR(fw_version, block) - std::string val_str; amd::smi::DevInfoTypes dev_type; static const std::map kFWBlockTypeMap = { @@ -2719,7 +2715,6 @@ static std::string get_vendor_name_from_id(uint16_t vendor_id) { static rsmi_status_t get_dev_name_from_id(uint32_t dv_ind, char *name, size_t len, eNameStrType typ) { std::string ln; - std::string token1; rsmi_status_t ret; uint16_t device_id; uint16_t vendor_id; @@ -5917,11 +5912,7 @@ rsmi_dev_compute_partition_set(uint32_t dv_ind, ss << __PRETTY_FUNCTION__ << " | about to try writing |" << newComputePartitionStr - << "| size of string = " << newComputePartitionStr.size() - << "| size of c-string = "<< std::dec - << sizeof(newComputePartitionStr.c_str())/sizeof(newComputePartitionStr[0]) - << "| sizeof string = " << std::dec - << sizeof(newComputePartitionStr); + << "| size of string = " << newComputePartitionStr.size(); LOG_DEBUG(ss); GET_DEV_FROM_INDX DEVICE_MUTEX @@ -6174,7 +6165,6 @@ rsmi_dev_compute_partition_xcp_config_set(uint32_t dv_ind, if (!amd::smi::is_sudo_user()) { return RSMI_STATUS_PERMISSION; } - std::string currentXcpConfig = ""; std::string newXcpConfigStr = ""; std::string availableXcpConfigsStr = ""; const int kLen30 = 30; @@ -6248,11 +6238,7 @@ rsmi_dev_compute_partition_xcp_config_set(uint32_t dv_ind, ss << __PRETTY_FUNCTION__ << " | about to try writing |" << newXcpConfigStr - << "| size of string = " << newXcpConfigStr.size() - << "| size of c-string = "<< std::dec - << sizeof(newXcpConfigStr.c_str())/sizeof(newXcpConfigStr[0]) - << "| sizeof string = " << std::dec - << sizeof(newXcpConfigStr); + << "| size of string = " << newXcpConfigStr.size(); LOG_DEBUG(ss); GET_DEV_FROM_INDX DEVICE_MUTEX diff --git a/rocm_smi/src/rocm_smi_binary_parser.cc b/rocm_smi/src/rocm_smi_binary_parser.cc index 2aa318f81f..0ffc51af38 100644 --- a/rocm_smi/src/rocm_smi_binary_parser.cc +++ b/rocm_smi/src/rocm_smi_binary_parser.cc @@ -21,13 +21,7 @@ */ #include "rocm_smi/rocm_smi_binary_parser.h" -#include "rocm_smi/rocm_smi_common.h" // Should go before rocm_smi.h #include "rocm_smi/rocm_smi.h" -#include "rocm_smi/rocm_smi_main.h" -#include "rocm_smi/rocm_smi_utils.h" -#include "rocm_smi/rocm_smi_exception.h" -#include "rocm_smi/rocm_smi_device.h" -#include "rocm_smi/rocm_smi_logger.h" #include #include diff --git a/rocm_smi/src/rocm_smi_device.cc b/rocm_smi/src/rocm_smi_device.cc index 0d970d390a..84a738c822 100755 --- a/rocm_smi/src/rocm_smi_device.cc +++ b/rocm_smi/src/rocm_smi_device.cc @@ -1797,7 +1797,7 @@ rsmi_status_t Device::isRestartInProgress(bool *isRestartInProgress, if ((success == true) && (!out.empty())) { isSystemAMDGPUModuleLive = containsString(out, "live"); } - if (isAMDGPUModuleLive) { + if (*isAMDGPUModuleLive) { deviceRestartInProgress = false; } *isRestartInProgress = deviceRestartInProgress; @@ -1866,7 +1866,7 @@ rsmi_status_t storeParameter(uint32_t dv_ind) { template <> rsmi_status_t storeParameter(uint32_t dv_ind) { rsmi_status_t returnStatus = RSMI_STATUS_SUCCESS; - uint32_t kDatalength = 128; + const uint32_t kDatalength = 128; char data[kDatalength]; bool doesFileExist; std::tie(doesFileExist, std::ignore) = readTmpFile(dv_ind, "boot", diff --git a/tests/amd_smi_test/functional/version_read.cc b/tests/amd_smi_test/functional/version_read.cc index 5a0b826651..7952742f28 100644 --- a/tests/amd_smi_test/functional/version_read.cc +++ b/tests/amd_smi_test/functional/version_read.cc @@ -20,8 +20,6 @@ * THE SOFTWARE. */ -#include - #include #include @@ -58,8 +56,6 @@ void TestVersionRead::Close() { TestBase::Close(); } -static const uint32_t kVerMaxStrLen = 80; - void TestVersionRead::Run(void) { amdsmi_status_t err; amdsmi_version_t ver = {0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, nullptr};