From bd0c4efc34f6098f13b3c3358bc379f3c72a809c Mon Sep 17 00:00:00 2001
From: Chris Freehill <Chris.Freehill@amd.com>
Date: Sun, 11 Feb 2018 21:42:25 -0600
Subject: [PATCH] Completely disable rocm-smi from rocrtst until rocm-smi-lib
 is updated

Change-Id: I5cce06a2bbde7a3a48e391022c793a462794c6d1
---
 rocrtst/samples/CMakeLists.txt            | 2 +-
 rocrtst/suites/test_common/CMakeLists.txt | 2 +-
 rocrtst/suites/test_common/main.cc        | 6 ++++--
 rocrtst/suites/test_common/test_base.h    | 9 ++++++---
 rocrtst/suites/test_common/test_common.cc | 3 ++-
 rocrtst/suites/test_common/test_common.h  | 8 ++++++--
 6 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/rocrtst/samples/CMakeLists.txt b/rocrtst/samples/CMakeLists.txt
index 8bd6c17fd2..e8f5f7501d 100755
--- a/rocrtst/samples/CMakeLists.txt
+++ b/rocrtst/samples/CMakeLists.txt
@@ -283,7 +283,7 @@ set (HSACO_TARG_LIST "" CACHE INTERNAL HSACO_TARG_LIST)
 
 set(KERN_SUFFIX "kernels.hsaco")
 set(BITCODE_PREF "-Xclang -mlink-bitcode-file -Xclang")
-set(BITCODE_PREF "${BITCODE_PREF} ${OPENCL_LIB_DIR}")
+set(BITCODE_PREF "${BITCODE_PREF} ${OPENCL_LIB_DIR}/bitcode")
 
 set(COMMON_BITCODE_LIBS "${BITCODE_PREF}/opencl.amdgcn.bc")
 set(COMMON_BITCODE_LIBS
diff --git a/rocrtst/suites/test_common/CMakeLists.txt b/rocrtst/suites/test_common/CMakeLists.txt
index e8db4c1388..885bc51497 100755
--- a/rocrtst/suites/test_common/CMakeLists.txt
+++ b/rocrtst/suites/test_common/CMakeLists.txt
@@ -287,7 +287,7 @@ set (HSACO_TARG_LIST "" CACHE INTERNAL HSACO_TARG_LIST)
 
 set(KERN_SUFFIX "kernels.hsaco")
 set(BITCODE_PREF "-Xclang -mlink-bitcode-file -Xclang")
-set(BITCODE_PREF "${BITCODE_PREF} ${OPENCL_LIB_DIR}")
+set(BITCODE_PREF "${BITCODE_PREF} ${OPENCL_LIB_DIR}/bitcode")
 
 set(COMMON_BITCODE_LIBS "${BITCODE_PREF}/opencl.amdgcn.bc")
 set(COMMON_BITCODE_LIBS
diff --git a/rocrtst/suites/test_common/main.cc b/rocrtst/suites/test_common/main.cc
index 539392bce2..58c0f71c14 100755
--- a/rocrtst/suites/test_common/main.cc
+++ b/rocrtst/suites/test_common/main.cc
@@ -59,10 +59,12 @@
 #include "suites/test_common/main.h"
 #include "suites/test_common/test_common.h"
 
+#if ENABLE_SMI
 #include "rocm_smi/rocm_smi.h"
+#endif
 
 static RocrTstGlobals *sRocrtstGlvalues = nullptr;
-#if 0
+#if ENABLE_SMI
 static bool GetMonitorDevices(const std::shared_ptr<amd::smi::Device> &d,
                                                                     void *p) {
   std::string val_str;
@@ -216,7 +218,7 @@ int main(int argc, char** argv) {
     return 1;
   }
   sRocrtstGlvalues = &settings;
-#if 0
+#if ENABLE_SMI
   amd::smi::RocmSMI hw;
   hw.DiscoverDevices();
   hw.IterateSMIDevices(
diff --git a/rocrtst/suites/test_common/test_base.h b/rocrtst/suites/test_common/test_base.h
index 38373dd5db..05594128d6 100755
--- a/rocrtst/suites/test_common/test_base.h
+++ b/rocrtst/suites/test_common/test_base.h
@@ -50,8 +50,9 @@
 #include <vector>
 
 #include "common/base_rocr.h"
+#if ENABLE_SMI
 #include "rocm_smi/rocm_smi.h"
-
+#endif
 class TestBase : public rocrtst::BaseRocR {
  public:
   TestBase(void);
@@ -79,7 +80,7 @@ class TestBase : public rocrtst::BaseRocR {
   const std::string & description(void) const {return description_;}
 
   void set_description(std::string d);
-
+#if ENABLE_SMI
   void set_monitor_devices(
             std::vector<std::shared_ptr<amd::smi::Device>> *m) {
     monitor_devices_ = m;
@@ -88,10 +89,12 @@ class TestBase : public rocrtst::BaseRocR {
                                                  monitor_devices(void) const {
     return monitor_devices_;
   }
-
+#endif
  private:
   std::string description_;
+#if ENABLE_SMI
   std::vector<std::shared_ptr<amd::smi::Device>> *monitor_devices_;
+#endif
 };
 
 #endif  // ROCRTST_SUITES_TEST_COMMON_TEST_BASE_H_
diff --git a/rocrtst/suites/test_common/test_common.cc b/rocrtst/suites/test_common/test_common.cc
index c9f888a74a..3f769abc80 100755
--- a/rocrtst/suites/test_common/test_common.cc
+++ b/rocrtst/suites/test_common/test_common.cc
@@ -120,7 +120,7 @@ uint32_t ProcessCmdline(RocrTstGlobals* test, int arg_cnt, char** arg_list) {
   }
   return 0;
 }
-
+#if ENABLE_SMI
 void DumpMonitorInfo(const TestBase *test) {
   int ret = 0;
   uint32_t value;
@@ -204,3 +204,4 @@ void DumpMonitorInfo(const TestBase *test) {
   }
   std::cout << delim << std::endl;
 }
+#endif 
\ No newline at end of file
diff --git a/rocrtst/suites/test_common/test_common.h b/rocrtst/suites/test_common/test_common.h
index abf4cd7fe5..7edc02024b 100755
--- a/rocrtst/suites/test_common/test_common.h
+++ b/rocrtst/suites/test_common/test_common.h
@@ -48,18 +48,22 @@
 
 #include <memory>
 #include <vector>
-
+#if ENABLE_SMI
 #include "rocm_smi/rocm_smi.h"
-
+#endif
 struct RocrTstGlobals {
   uint32_t verbosity;
   uint32_t monitor_verbosity;
   uint32_t num_iterations;
+#if ENABLE_SMI
   std::vector<std::shared_ptr<amd::smi::Device>> monitor_devices;
+#endif
 };
 
 uint32_t ProcessCmdline(RocrTstGlobals* test, int arg_cnt, char** arg_list);
 
+#if ENABLE_SMI
 void DumpMonitorInfo(const TestBase *test);
+#endif
 
 #endif  // ROCRTST_SUITES_TEST_COMMON_TEST_COMMON_H_