Merge pull request #66 from RadeonOpenCompute/resetIterationLogic

Update how number of iterations is used in determining bandwidth

base_test.hpp

@@ -56,7 +56,7 @@ class BaseTest {
 
  public:
 
-  BaseTest(size_t num = 3);
+  BaseTest(size_t num_iter = 4);
 
   virtual ~BaseTest();
 
@@ -74,8 +74,8 @@ class BaseTest {
   virtual void Display() const = 0;
 
   // @Brief: Set number of iterations to run
-  void set_num_iteration(size_t num) {
-    num_iteration_ = num;
+  void set_num_iteration(size_t num_iter) {
+    num_iteration_ = num_iter;
     return;
   }
 

rocm_bandwidth_test.cpp

@@ -80,7 +80,7 @@ const size_t RocmBandwidthTest::LATENCY_SIZE_LIST[] = { 1,
                                 256 * 1024, 512 * 1024 };
 
 uint32_t RocmBandwidthTest::GetIterationNum() {
-  return (validate_) ? 1 : (num_iteration_ * 1.2 + 1);
+  return (validate_) ? 1 : (num_iteration_ + 1);
 }
 
 void RocmBandwidthTest::AcquireAccess(hsa_agent_t agent, void* ptr) {
@@ -816,7 +816,7 @@ RocmBandwidthTest::RocmBandwidthTest(int argc, char** argv) : BaseTest() {
   // Initialize version of the test
   version_.major_id = 2;
   version_.minor_id = 5;
-  version_.step_id = 0;
+  version_.step_id = 1;
   version_.reserved = 0;
 
   // Test impact of sleep, temp code
@@ -824,10 +824,10 @@ RocmBandwidthTest::RocmBandwidthTest(int argc, char** argv) : BaseTest() {
   bw_sleep_time_ = getenv("ROCM_BW_SLEEP_TIME");
   if (bw_sleep_time_ != NULL) {
     sleep_time_ = atoi(bw_sleep_time_);
-    if ((sleep_time_ < 0) || (sleep_time_ > 60000)) {
+    if ((sleep_time_ < 0) || (sleep_time_ > 400000)) {
       std::cout << "Unit of sleep time is defined as 10 microseconds" << std::endl;
       std::cout << "An input value of 10 implies sleep time of 100 microseconds" << std::endl;
-      std::cout << "Value of ROCM_BW_SLEEP_TIME must be between [1, 60000)" << sleep_time_ << std::endl;
+      std::cout << "Value of ROCM_BW_SLEEP_TIME must be between [1, 400000]" << sleep_time_ << std::endl;
       exit(1);
     }
     sleep_time_ *= 10;

rocm_bandwidth_test_report.cpp

@@ -134,9 +134,9 @@ double RocmBandwidthTest::GetMeanTime(std::vector<double>& vec) {
     return vec.at(0);
   }
 
+  // Number of elements is ONE plus number of iterations
   std::sort(vec.begin(), vec.end());
-  vec.erase(vec.begin(), vec.begin() + num_iteration_ * 0.1);
-  vec.erase(vec.begin() + num_iteration_, vec.end());
+  vec.erase(vec.end() - 1);
 
   double mean = 0.0;
   int num = vec.size();