TraceBuilder: signal() - add support for vector<uint32_t>

JimKnowler · Mar 16, 2021 · fa33866 · fa33866
1 parent b39f341
commit fa33866
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 0 deletions.
diff --git a/gtestverilog/lib/TraceBuilder.cpp b/gtestverilog/lib/TraceBuilder.cpp
@@ -107,6 +107,22 @@ namespace gtestverilog {
         return *this;
     }
 
+    TraceBuilder& TraceBuilder::signal(const std::vector<uint32_t>& stepValues) {
+        if (!currentPort) {
+            throw std::logic_error("unable to add signal without current port");
+        }
+
+        if (stepValues.size() == 0) {
+            throw std::logic_error("unable to add zero-length signal");
+        }
+
+        concat();
+
+        currentSignal.insert(currentSignal.end(), stepValues.begin(), stepValues.end());
+
+        return *this;
+    }
+
     TraceBuilder& TraceBuilder::repeat(size_t repetitions) {
         applyModifier([=](std::vector<PortValue>& signal) {
             std::vector<PortValue> newSignal;

diff --git a/gtestverilog/lib/TraceBuilder.h b/gtestverilog/lib/TraceBuilder.h
@@ -28,6 +28,10 @@ namespace gtestverilog {
         /// @note subsequent modifiers will be applied only to this signal, until concat() or allPorts() are called
         TraceBuilder& signal(const std::initializer_list<uint32_t>& stepValues);
 
+        /// @brief append a new signal to the current port
+        /// @note subsequent modifiers will be applied only to this signal, until concat() or allPorts() are called
+        TraceBuilder& signal(const std::vector<uint32_t>& stepValues);
+
         /// @brief repeat the current signal being added to the current port
         /// @example TraceBuilder().port(myPort).signal("abcd").repeat(2) => "abcdabcd" 
         TraceBuilder& repeat(size_t repetitions);

diff --git a/gtestverilog/test/TraceBuilder.test.cpp b/gtestverilog/test/TraceBuilder.test.cpp
@@ -282,3 +282,20 @@ TEST(TraceBuilder, ShouldFailToAddEmptyPortValueSignal) {
              .port(test_port_0).signal({})
     );
 }
+
+TEST(TraceBuilder, ShouldAddSignalFromVectorAndInitialiserList) {
+    std::vector<uint32_t> steps1 = {3, 1};
+    Trace trace = TraceBuilder()
+        .port(test_port_1).signal(steps1).repeatEachStep(2).signal({2, 4}).repeatEachStep(2);
+
+    const std::vector<Step>& steps = trace.getSteps();
+    ASSERT_EQ(steps.size(), 8);
+    ASSERT_EQ(std::get<uint32_t>(steps[0].port(test_port_1)), 3);
+    ASSERT_EQ(std::get<uint32_t>(steps[1].port(test_port_1)), 3);
+    ASSERT_EQ(std::get<uint32_t>(steps[2].port(test_port_1)), 1);
+    ASSERT_EQ(std::get<uint32_t>(steps[3].port(test_port_1)), 1);
+    ASSERT_EQ(std::get<uint32_t>(steps[4].port(test_port_1)), 2);
+    ASSERT_EQ(std::get<uint32_t>(steps[5].port(test_port_1)), 2);
+    ASSERT_EQ(std::get<uint32_t>(steps[6].port(test_port_1)), 4);
+    ASSERT_EQ(std::get<uint32_t>(steps[7].port(test_port_1)), 4);
+}