From a128867497d569837d76ea6ca09775bef3a172ef Mon Sep 17 00:00:00 2001
From: "Galantsev, Dmitrii" <dmitrii.galantsev@amd.com>
Date: Wed, 29 Nov 2023 02:36:50 -0600
Subject: [PATCH] Fix ASAN for tests and log metrics better

Change-Id: Ib495cfc28c48a4d291a89673a3b6fc13313845c7
Signed-off-by: Galantsev, Dmitrii <dmitrii.galantsev@amd.com>
---
 CMakeLists.txt                     |  2 ++
 src/rocm_smi.cc                    | 22 ++++++++++++----------
 src/rocm_smi_gpu_metrics.cc        |  4 ++--
 tests/rocm_smi_test/CMakeLists.txt |  8 --------
 4 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dafb40f0b9..3092e237dc 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -102,8 +102,10 @@ if (${ADDRESS_SANITIZER})
 
     if (BUILD_SHARED_LIBS})
         set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -shared-libsan" )
+        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -shared-libsan" )
     else ()
         set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libsan" )
+        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -static-libsan" )
     endif ()
 else ()
     ## Security breach mitigation flags
diff --git a/src/rocm_smi.cc b/src/rocm_smi.cc
index ba66636ae3..d78ac0d077 100755
--- a/src/rocm_smi.cc
+++ b/src/rocm_smi.cc
@@ -6640,19 +6640,21 @@ rsmi_dev_metrics_curr_dclk0_get(uint32_t dv_ind, GPUMetricCurrDClk0_t* current_d
   const auto gpu_metric_unit(AMDGpuMetricsUnitType_t::kMetricCurrDClock0);
   amd::smi::GPUMetricCurrDClkTbl_t tmp_curr_dclk0_tbl;
   auto status_code = rsmi_dev_gpu_metrics_info_query(dv_ind, gpu_metric_unit, tmp_curr_dclk0_tbl);
+  const auto max_num_elems =
+    static_cast<uint16_t>(std::end(*current_dclk_value) - std::begin(*current_dclk_value));
+  ostrstream << __PRETTY_FUNCTION__
+             << "\n | ======= end ======= "
+             << "\n | End Result "
+             << "\n | Device #:  " << dv_ind
+             << "\n | Metric Type: " << static_cast<AMDGpuMetricTypeId_t>(gpu_metric_unit)
+             << "\n | Metric Size: " << tmp_curr_dclk0_tbl.size()
+             << "\n | Max num of elements: " << max_num_elems
+             << "\n | Returning = " << status_code << " " << getRSMIStatusString(status_code) << " |";
+  LOG_INFO(ostrstream);
+
   if (status_code == rsmi_status_t::RSMI_STATUS_SUCCESS) {
-    const auto max_num_elems =
-      static_cast<uint16_t>(std::end(*current_dclk_value) - std::begin(*current_dclk_value));
     std::copy_n(std::begin(tmp_curr_dclk0_tbl), max_num_elems, *current_dclk_value);
   }
-  ostrstream << __PRETTY_FUNCTION__
-             << " | ======= end ======= "
-             << " | End Result "
-             << " | Device #:  " << dv_ind
-             << " | Metric Type: " << static_cast<AMDGpuMetricTypeId_t>(gpu_metric_unit)
-             << " | Metric Size: " << tmp_curr_dclk0_tbl.size()
-             << " | Returning = " << status_code << " " << getRSMIStatusString(status_code) << " |";
-  LOG_INFO(ostrstream);
 
   return status_code;
   CATCH
diff --git a/src/rocm_smi_gpu_metrics.cc b/src/rocm_smi_gpu_metrics.cc
index 11d2871ca9..48d86837ee 100755
--- a/src/rocm_smi_gpu_metrics.cc
+++ b/src/rocm_smi_gpu_metrics.cc
@@ -2607,7 +2607,7 @@ rsmi_status_t Device::run_internal_gpu_metrics_query(AMDGpuMetricsUnitType_t met
                     << " | Returning = "
                     << getRSMIStatusString(status_code)
                     << " |";
-        LOG_ERROR(ostrstream);
+        LOG_TRACE(ostrstream);
         return status_code;
       }
     }
@@ -2717,7 +2717,7 @@ rsmi_status_t rsmi_dev_gpu_metrics_info_query(uint32_t dv_ind, AMDGpuMetricsUnit
               << " | Returning = "
               << getRSMIStatusString(status_code)
               << " |";
-  LOG_ERROR(ostrstream);
+  LOG_TRACE(ostrstream);
   return status_code;
 }
 
diff --git a/tests/rocm_smi_test/CMakeLists.txt b/tests/rocm_smi_test/CMakeLists.txt
index bd7c827ce4..2253327813 100755
--- a/tests/rocm_smi_test/CMakeLists.txt
+++ b/tests/rocm_smi_test/CMakeLists.txt
@@ -21,14 +21,6 @@ message("--------Proj Lib Dir: " ${PROJECT_BINARY_DIR}/lib)
 message("--------Proj Exe Dir: " ${PROJECT_BINARY_DIR}/bin)
 message("")
 
-## Compiler flags
-set(CMAKE_CXX_FLAGS
- "${CMAKE_CXX_FLAGS} -Wall -Wextra -fno-rtti -std=c++17")
-if (${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64")
-    set(CMAKE_CXX_FLAGS
-     "${CMAKE_CXX_FLAGS} -m64 -msse -msse2")
-endif()
-
 set(SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 
 set(RSMITST "rsmitst")