[test] optimize test code

sequencer · Nov 6, 2023 · ef841e9 · ef841e9
1 parent 5dd8a91
commit ef841e9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 24 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,8 +8,6 @@ project/project
 project/target
 target/
 # test
-test_run_dir/
-run/
 verdiLog
 
 .bsp/

diff --git a/emulator/src/dpi.cc b/emulator/src/dpi.cc
@@ -46,6 +46,5 @@ void dpiCheck(
             svBit valid,
             const svBitVecVal *result,
             const svBitVecVal *fflags) {
-
    testharness_instance.dpiCheck(valid, *result, *fflags);
 }
diff --git a/emulator/src/testharness.cc b/emulator/src/testharness.cc
@@ -7,11 +7,9 @@
 
 TestHarness::TestHarness() : terminate(false) {}
 
-uint64_t TestHarness::get_t() { return getCycle(); }
-
 int TestHarness::report() {
   if (terminate == true) {
-    LOG(INFO) << fmt::format("ran {} cases, cycles = {}", cnt - 1, get_t());
+    LOG(INFO) << fmt::format("ran {} cases, cycles = {}", cnt - 1, getCycle());
     dpiFinish();
   }
   return 0;
@@ -71,7 +69,6 @@ void TestHarness::dpiInitCosim() {
 }
 
 void TestHarness::dpiPeek(svBit ready) {
-
   if (ready == 1) {
     setAvailable();
   }

diff --git a/emulator/src/testharness.h b/emulator/src/testharness.h
@@ -41,34 +41,32 @@ class TestHarness {
 public:
   explicit TestHarness();
 
-  void dpiDumpWave();
+  std::queue<testdata> test_queue;
 
-  void dpiInitCosim();
+  testdata testcase;
 
-  uint64_t get_t();
+  void initTestCases();
 
-  int report();
+  void dpiDumpWave();
 
-  uint64_t getCycle() { return ctx->time(); }
+  void dpiInitCosim();
 
   void dpiPoke(const DutInterface &toDut);
 
   void dpiPeek(svBit ready);
 
-  std::queue<testdata> test_queue;
-
-  testdata testcase;
-
-  void initTestCases();
-
   void dpiCheck(svBit valid, svBitVecVal result, svBitVecVal fflags);
 
+  uint64_t getCycle() { return ctx->time(); }
+
   void setAvailable();
 
   void clrAvailable();
 
   void reloadCase();
 
+  int report();
+
 private:
   VerilatedContext *ctx;
   VerilatedFstC tfp;

diff --git a/emulator/src/util.h b/emulator/src/util.h
@@ -2,14 +2,8 @@
 
 #include <cstdint>
 
-
 inline char *get_env_arg(const char *name) {
   char *val = std::getenv(name);
   CHECK(val != nullptr) << fmt::format("cannot find environment of name '{}'", name);
   return val;
-}
-
-inline char *get_env_arg_default(const char *name, char *default_val) {
-  char *val = std::getenv(name);
-  return val == nullptr ? default_val : val;
 }