improving C++ tb

esl-epfl · Feb 2, 2024 · 6adf95d · 6adf95d
1 parent 8cd358d
commit 6adf95d
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 12 deletions.
diff --git a/core-v-mini-mcu.core b/core-v-mini-mcu.core
@@ -193,6 +193,8 @@ filesets:
 
   tb-verilator:
     files:
+    - tb/XHEEP_CmdLineOptions.hh: { is_include_file: true }
+    - tb/XHEEP_CmdLineOptions.cpp
     - tb/tb_top.cpp
     file_type: cppSource
 
@@ -203,6 +205,8 @@ filesets:
 
   tb-sc-verilator:
     files:
+    - tb/XHEEP_CmdLineOptions.hh: { is_include_file: true }
+    - tb/XHEEP_CmdLineOptions.cpp
     - tb/tb_sc_top.cpp
     file_type: cppSource
 

diff --git a/tb/XHEEP_CmdLineOptions.cpp b/tb/XHEEP_CmdLineOptions.cpp
@@ -1,11 +1,11 @@
 #include "XHEEP_CmdLineOptions.hh"
+#include <iostream>
+#include <string>
 
 XHEEP_CmdLineOptions::XHEEP_CmdLineOptions(int argc, char* argv[]) // define default constructor
 {
-    this->run_all = false;
     this->argc = argc;
     this->argv = argv;
-
 }
 
 std::string XHEEP_CmdLineOptions::getCmdOption(int argc, char* argv[], const std::string& option)
@@ -29,7 +29,8 @@ bool XHEEP_CmdLineOptions::get_use_openocd()
 
   std::string arg_openocd = this->getCmdOption(this->argc, this->argv, "+openOCD=");;
 
-  use_openocd = false;
+  bool use_openocd = false;
+
   if(arg_openocd.empty()){
     std::cout<<"[TESTBENCH]: No OpenOCD is used"<<std::endl;
   } else {
@@ -44,7 +45,7 @@ bool XHEEP_CmdLineOptions::get_use_openocd()
 std::string XHEEP_CmdLineOptions::get_firmware()
 {
 
-  std::string firmware; = this->getCmdOption(this->argc, this->argv, "+firmware=");;
+  std::string firmware = this->getCmdOption(this->argc, this->argv, "+firmware=");
 
   if(firmware.empty()){
     std::cout<<"[TESTBENCH]: No firmware  specified"<<std::endl;
@@ -59,7 +60,7 @@ std::string XHEEP_CmdLineOptions::get_firmware()
 unsigned int XHEEP_CmdLineOptions::get_max_sim_time(bool& run_all)
 {
 
-  std::string arg_max_sim_time; = this->getCmdOption(this->argc, this->argv, "+max_sim_time=");;
+  std::string arg_max_sim_time = this->getCmdOption(this->argc, this->argv, "+max_sim_time=");
   unsigned int max_sim_time;
 
   max_sim_time     = 0;
@@ -95,5 +96,5 @@ unsigned int XHEEP_CmdLineOptions::get_boot_sel()
     }
   }
 
-  return boot_sel
+  return boot_sel;
 }
diff --git a/tb/XHEEP_CmdLineOptions.hh b/tb/XHEEP_CmdLineOptions.hh
@@ -1,19 +1,21 @@
 #ifndef XHEEP_TB_UTIL_H
 #define XHEEP_TB_UTIL_H
 
+#include <iostream>
+
 class XHEEP_CmdLineOptions // declare Calculator class
 {
 
   public: // public members
-    XHEEP_CmdLineOptions(int argc, char* argv[])(); // default constructor
+    XHEEP_CmdLineOptions(int argc, char* argv[]); // default constructor
 
-    std:string getCmdOption(int argc, char* argv[], const std::string& option); // get options from cmd lines
+    std::string getCmdOption(int argc, char* argv[], const std::string& option); // get options from cmd lines
     bool get_use_openocd();
     std::string get_firmware();
     unsigned int get_max_sim_time(bool& run_all);
-    unsigned int get_boot_sel()
+    unsigned int get_boot_sel();
     int argc;
-    char* argv[];
+    char** argv;
 
 };
 

diff --git a/tb/tb_sc_top.cpp b/tb/tb_sc_top.cpp
@@ -8,6 +8,7 @@
 #include "systemc.h"
 #include <stdlib.h>
 #include <iostream>
+#include "XHEEP_CmdLineOptions.hh"
 
 
 SC_MODULE(testbench)
@@ -44,6 +45,24 @@ int sc_main (int argc, char * argv[])
 
   Verilated::commandArgs(argc, argv);
 
+  XHEEP_CmdLineOptions* cmd_lines_options = new XHEEP_CmdLineOptions(argc,argv);
+
+  use_openocd = cmd_lines_options->get_use_openocd();
+  firmware = cmd_lines_options->get_firmware();
+
+  if(firmware.empty() && use_openocd==false)
+      exit(EXIT_FAILURE);
+
+  max_sim_time = cmd_lines_options->get_max_sim_time(run_all);
+
+  boot_sel     = cmd_lines_options->get_boot_sel();
+
+  if(boot_sel == 1) {
+    std::cout<<"[TESTBENCH]: ERROR: Executing from SPI is not supported (yet) in Verilator"<<std::endl;
+    std::cout<<"exit simulation..."<<std::endl;
+    exit(EXIT_FAILURE);
+  }
+
   Vtestharness dut("testharness");
 
   testbench tb("testbench");

diff --git a/tb/tb_top.cpp b/tb/tb_top.cpp
@@ -43,7 +43,7 @@ int main (int argc, char * argv[])
   dut->trace (m_trace, 99);
   m_trace->open ("waveform.vcd");
 
-  XHEEP_CmdLineOptions* cmd_lines_options = new XHEEP_CmdLineOptions(arcg,argv);
+  XHEEP_CmdLineOptions* cmd_lines_options = new XHEEP_CmdLineOptions(argc,argv);
 
   use_openocd = cmd_lines_options->get_use_openocd();
   firmware = cmd_lines_options->get_firmware();
@@ -58,7 +58,7 @@ int main (int argc, char * argv[])
   if(boot_sel == 1) {
     std::cout<<"[TESTBENCH]: ERROR: Executing from SPI is not supported (yet) in Verilator"<<std::endl;
     std::cout<<"exit simulation..."<<std::endl;
-    return -1;
+    exit(EXIT_FAILURE);
   }
 
   svSetScope(svGetScopeFromName("TOP.testharness"));