Fix incorrect serialization of channel fifo config.

`register_push_outputs` and `register_pop_outputs` were swapped! PiperOrigin-RevId: 694686860
google · Nov 9, 2024 · 4d1423f · 4d1423f
1 parent 9552b36
commit 4d1423f
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 2 deletions.
diff --git a/xls/ir/channel.cc b/xls/ir/channel.cc
@@ -116,8 +116,8 @@ std::string Channel::ToString() const {
           "fifo_depth=%d, bypass=%s, "
           "register_push_outputs=%s, register_pop_outputs=%s, ",
           fifo_config->depth(), fifo_config->bypass() ? "true" : "false",
-          fifo_config->register_pop_outputs() ? "true" : "false",
-          fifo_config->register_push_outputs() ? "true" : "false");
+          fifo_config->register_push_outputs() ? "true" : "false",
+          fifo_config->register_pop_outputs() ? "true" : "false");
     }
   }
 

diff --git a/xls/ir/channel_test.cc b/xls/ir/channel_test.cc
@@ -156,6 +156,45 @@ TEST(ChannelTest, StreamingChannelWithFifoDepth) {
   EXPECT_EQ(ch.GetStrictness(), ChannelStrictness::kProvenMutuallyExclusive);
 }
 
+TEST(ChannelTest, StreamingChannelWithFifoConfigSerializesFifoConfigCorrectly) {
+  Package p("my_package");
+
+  auto ch_with_fifo_config = [&](FifoConfig fifo_config) {
+    return StreamingChannel(
+        "my_channel", 42, ChannelOps::kSendReceive, p.GetBitsType(32), {},
+        /*fifo_config=*/fifo_config, FlowControl::kNone,
+        ChannelStrictness::kProvenMutuallyExclusive, ChannelMetadataProto());
+  };
+  EXPECT_THAT(ch_with_fifo_config(FifoConfig(/*depth=*/123, /*bypass=*/false,
+                                             /*register_push_outputs=*/false,
+                                             /*register_pop_outputs=*/false))
+                  .ToString(),
+              AllOf(HasSubstr("fifo_depth=123"), HasSubstr("bypass=false"),
+                    HasSubstr("register_push_outputs=false"),
+                    HasSubstr("register_pop_outputs=false")));
+  EXPECT_THAT(ch_with_fifo_config(FifoConfig(/*depth=*/123, /*bypass=*/true,
+                                             /*register_push_outputs=*/false,
+                                             /*register_pop_outputs=*/false))
+                  .ToString(),
+              AllOf(HasSubstr("fifo_depth=123"), HasSubstr("bypass=true"),
+                    HasSubstr("register_push_outputs=false"),
+                    HasSubstr("register_pop_outputs=false")));
+  EXPECT_THAT(ch_with_fifo_config(FifoConfig(/*depth=*/123, /*bypass=*/false,
+                                             /*register_push_outputs=*/true,
+                                             /*register_pop_outputs=*/false))
+                  .ToString(),
+              AllOf(HasSubstr("fifo_depth=123"), HasSubstr("bypass=false"),
+                    HasSubstr("register_push_outputs=true"),
+                    HasSubstr("register_pop_outputs=false")));
+  EXPECT_THAT(ch_with_fifo_config(FifoConfig(/*depth=*/123, /*bypass=*/false,
+                                             /*register_push_outputs=*/false,
+                                             /*register_pop_outputs=*/true))
+                  .ToString(),
+              AllOf(HasSubstr("fifo_depth=123"), HasSubstr("bypass=false"),
+                    HasSubstr("register_push_outputs=false"),
+                    HasSubstr("register_pop_outputs=true")));
+}
+
 TEST(ChannelTest, StreamingToStringParses) {
   Package p("my_package");
   std::vector<Value> initial_values = {