From d08346f6915bcd6e6648903d19dab16b067f0e19 Mon Sep 17 00:00:00 2001
From: Ben Sander <ben.sander@amd.com>
Date: Thu, 22 Sep 2016 17:51:52 -0500
Subject: [PATCH] Small tool, doc, sample enhancements.

- Expand message when HIP version mismatch detected.
- Doc touchup.
- change sorting of hipBusBandwidth so byte results shown at top.
-

Change-Id: Ifb4e44a5fdfb65d59c4994b11e5f13385705f7e0


[ROCm/hip-tests commit: 14ad755612ec48f831bee1d9b14be451181c1161]
---
 .../1_Utils/hipBusBandwidth/ResultDatabase.cpp     | 14 +++++++++++---
 .../1_Utils/hipBusBandwidth/hipBusBandwidth.cpp    |  4 ++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/projects/hip-tests/samples/1_Utils/hipBusBandwidth/ResultDatabase.cpp b/projects/hip-tests/samples/1_Utils/hipBusBandwidth/ResultDatabase.cpp
index 2ec686f260..4be2ea258d 100644
--- a/projects/hip-tests/samples/1_Utils/hipBusBandwidth/ResultDatabase.cpp
+++ b/projects/hip-tests/samples/1_Utils/hipBusBandwidth/ResultDatabase.cpp
@@ -7,16 +7,22 @@
 
 using namespace std;
 
+#define SORT_RETAIN_ATTS_ORDER 1
+
+
 bool ResultDatabase::Result::operator<(const Result &rhs) const
 {
     if (test < rhs.test)
         return true;
     if (test > rhs.test)
         return false;
+#if (SORT_RETAIN_ATTS_ORDER == 0) 
+    // For ties, sort by the value of the attribute:
     if (atts < rhs.atts)
         return true;
     if (atts > rhs.atts)
         return false;
+#endif
     return false; // less-operator returns false on equal
 }
 
@@ -189,7 +195,8 @@ void ResultDatabase::AddResult(const string &test_orig,
 void ResultDatabase::DumpDetailed(ostream &out)
 {
     vector<Result> sorted(results);
-    sort(sorted.begin(), sorted.end());
+
+    stable_sort(sorted.begin(), sorted.end());
 
     const int testNameW = 24 ;
     const int attW = 12;
@@ -281,7 +288,8 @@ void ResultDatabase::DumpDetailed(ostream &out)
 void ResultDatabase::DumpSummary(ostream &out)
 {
     vector<Result> sorted(results);
-    sort(sorted.begin(), sorted.end());
+
+    stable_sort(sorted.begin(), sorted.end());
 
     const int testNameW = 24 ;
     const int attW = 12;
@@ -377,7 +385,7 @@ void ResultDatabase::DumpCsv(string fileName)
     bool emptyFile;
     vector<Result> sorted(results);
 
-    sort(sorted.begin(), sorted.end());
+    stable_sort(sorted.begin(), sorted.end());
 
     //Check to see if the file is empty - if so, add the headers
     emptyFile = this->IsFileEmpty(fileName);
diff --git a/projects/hip-tests/samples/1_Utils/hipBusBandwidth/hipBusBandwidth.cpp b/projects/hip-tests/samples/1_Utils/hipBusBandwidth/hipBusBandwidth.cpp
index faff9ba6e9..a42a561ac7 100644
--- a/projects/hip-tests/samples/1_Utils/hipBusBandwidth/hipBusBandwidth.cpp
+++ b/projects/hip-tests/samples/1_Utils/hipBusBandwidth/hipBusBandwidth.cpp
@@ -49,8 +49,8 @@ std::string sizeToString(int size)
     using namespace std;
     stringstream ss;
     if (size < 0) {
-        // char (09, horiz tab) lexically sorts before " " so will cause Byte values to be displayed before kB.
-        ss << char(0x09)/*tab*/ << setfill('0') << setw(3) << -size <<  "B";
+        // char (-) lexically sorts before " " so will cause Byte values to be displayed before kB.
+        ss << "+" << setfill('0') << setw(3) << -size <<  "By";
     } else {
         ss << size << "kB";
     }