Merge pull request #43 from RadeonOpenCompute/printLaunchCmd

Print launch command

main.cpp

@@ -54,7 +54,7 @@ int main(int argc, char** argv) {
   if (argc == 1) {
     argc++;
     argv[1] = (char*)"-a";
-    setenv("ROCM_BW_DEFAULT_RUN", "false", true);
+    setenv("ROCM_BW_DEFAULT_RUN", "true", true);
   }
 
   // Create the Bandwidth test object

rocm_bandwidth_test.cpp

@@ -789,7 +789,7 @@ RocmBandwidthTest::RocmBandwidthTest(int argc, char** argv) : BaseTest() {
   // Initialize version of the test
   version_.major_id = 2;
   version_.minor_id = 3;
-  version_.step_id = 1;
+  version_.step_id = 2;
   version_.reserved = 0;
 
   bw_iter_cnt_ = getenv("ROCM_BW_ITER_CNT");

rocm_bandwidth_test.hpp

@@ -394,6 +394,7 @@ class RocmBandwidthTest : public BaseTest {
 
   RocmBandwidthVersion version_;
   void PrintVersion() const;
+  void PrintLaunchCmd() const;
   std::string GetVersion() const;
 
   // Used to help count agent_info

rocm_bandwidth_test_print.cpp

@@ -79,9 +79,39 @@ void RocmBandwidthTest::PrintHelpScreen() {
   std::cout << "\t\t Case 7: rocm_bandwidth_test -a or -s x -d y with -l and -v" << std::endl;
   std::cout << std::endl;
 
+  std::cout << std::endl;
+
+}
+
+// @brief: Print the cmdline used to run the test
+void RocmBandwidthTest::PrintLaunchCmd() const {
+
+  uint32_t format = 10;
+  std::cout.setf(ios::left);
 
   std::cout << std::endl;
+  std::cout.width(format);
+  std::cout << "";
+  std::cout << "Launch Command is: ";
+
+  // Print the exe value
+  std::cout << usr_argv_[0];
 
+  // Return for default run
+  if (bw_default_run_ != NULL) {
+    std::cout << " (rocm_bandwidth -a + rocm_bandwidth -A)";
+    std::cout << std::endl;
+    std::cout << std::endl;
+    return;
+  }
+
+  // Print launch parameters for non-default runs
+  for (uint32_t idx = 1; idx < usr_argc_; idx++) {
+    std::cout << " " << usr_argv_[idx];
+  }
+  
+  std::cout << std::endl;
+  std::cout << std::endl;
 }
 
 // @brief: Print the version of the test
@@ -94,6 +124,9 @@ void RocmBandwidthTest::PrintVersion() const {
   std::cout.width(format);
   std::cout << "";
   std::cout << "RocmBandwidthTest Version: " << GetVersion() << std::endl;
+  
+  // Print launch command
+  PrintLaunchCmd();
 }
 
 // @brief: Print the topology of Memory Pools and Devices present in system