From 27631645c45fda31a9ff05361ee034e80774781f Mon Sep 17 00:00:00 2001
From: Chris Freehill <Chris.Freehill@amd.com>
Date: Tue, 19 Sep 2017 11:10:50 -0500
Subject: [PATCH] Use rel. dir instead of abs. in CMake;Have a default number
 if iterations

Change-Id: I097fd229338ed520196cc4ed1ef1d00fe538e50c


[ROCm/ROCR-Runtime commit: 7d84190c4e61b8c10ccb4844848c0c6e6dba7956]
---
 .../rocrtst/suites/test_common/CMakeLists.txt     |  2 +-
 .../rocrtst/suites/test_common/main.cc            | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/projects/rocr-runtime/rocrtst/suites/test_common/CMakeLists.txt b/projects/rocr-runtime/rocrtst/suites/test_common/CMakeLists.txt
index 60182df757..2a7daf0d99 100755
--- a/projects/rocr-runtime/rocrtst/suites/test_common/CMakeLists.txt
+++ b/projects/rocr-runtime/rocrtst/suites/test_common/CMakeLists.txt
@@ -259,7 +259,7 @@ function(build_kernel S_NAME TARG_DEV)
    "-x cl -Xclang -finclude-default-header -target amdgcn-amdh-amdhsa -mcpu=${TARG_DEV} ${BITCODE_LIBS} -cl-std=CL${OPENCL_VER} ${CL_FILE_LIST} -o ${KERNEL_DIR}/${SNAME_KERNEL}")
   add_custom_target("${TARG_NAME}" ${CLANG} ${CLANG_ARG_LIST} COMMAND
       ${CMAKE_COMMAND} -E create_symlink
-        "${PROJECT_BINARY_DIR}/${ROCRTST}" "${KERNEL_DIR}/${ROCRTST}"
+        "../${ROCRTST}" "${KERNEL_DIR}/${ROCRTST}"
      COMMENT "BUILDING KERNEL..."
      VERBATIM)
 endfunction(build_kernel)
diff --git a/projects/rocr-runtime/rocrtst/suites/test_common/main.cc b/projects/rocr-runtime/rocrtst/suites/test_common/main.cc
index 8457e34d34..67e45ba94e 100755
--- a/projects/rocr-runtime/rocrtst/suites/test_common/main.cc
+++ b/projects/rocr-runtime/rocrtst/suites/test_common/main.cc
@@ -124,9 +124,6 @@ static void RunGenericTest(TestBase *test) {
 TEST(rocrtst, Test_Example) {
   TestExample tst;
 
-  rocrtst::smi::RocmSMI hw;
-  hw.DiscoverDevices();
-
   RunGenericTest(&tst);
 }
 
@@ -180,8 +177,11 @@ int main(int argc, char** argv) {
 
   RocrTstGlobals settings;
 
+  // Set some default values
   settings.verbosity = 1;
   settings.monitor_verbosity = 1;
+  settings.num_iterations = 5;
+
 
   if (ProcessCmdline(&settings, argc, argv)) {
     return 1;
@@ -194,5 +194,14 @@ int main(int argc, char** argv) {
 
   sRocrtstGlvalues = &settings;
 
+  // Use this dummy test to get one output of monitors at the beginning
+  {
+    TestExample dummy;
+    dummy.set_monitor_devices(&sRocrtstGlvalues->monitor_devices);
+
+    std::cout << "*** Initial Hardware Monitor Values:" << std::endl;
+    DumpMonitorInfo(&dummy);
+  }
+
   return RUN_ALL_TESTS();
 }