[ESI][Runtime] Fix FIFO connections through cosim

When cosimulation endpoints are instantiated, they see the ValidReady
converted signaling. This doesn't match what's in the manifest since the
connection request type includes the FIFO signaling. So the gRPC string
description of the endpoint doesn't match with the type ID from the
manifest. "Fix" this by removing the sanity check.

Author: teqdruid

frontends/PyCDE/integration_test/esi_test.py

@@ -2,15 +2,15 @@
 # RUN: rm -rf %t
 # RUN: mkdir %t && cd %t
 # RUN: %PYTHON% %s %t 2>&1
-# RUN: esi-cosim.py -- %PYTHON% %S/test_software/esi_test.py cosim env
+# RUN: esi-cosim.py --source %t -- %PYTHON% %S/test_software/esi_test.py cosim env
 
 import pycde
 from pycde import (AppID, Clock, Module, Reset, modparams, generator)
 from pycde.bsp import get_bsp
 from pycde.common import Constant, Input, Output
 from pycde.constructs import ControlReg, Reg, Wire
 from pycde.esi import ChannelService, FuncService, MMIO, MMIOReadWriteCmdType
-from pycde.types import (Bits, Channel, UInt)
+from pycde.types import (Bits, Channel, ChannelSignaling, UInt)
 from pycde.behavioral import If, Else, EndIf
 from pycde.handshake import Func
 
@@ -26,16 +26,18 @@ class LoopbackInOutAdd(Module):
 
   @generator
   def construct(ports):
-    loopback = Wire(Channel(UInt(16)))
+    loopback = Wire(Channel(UInt(16), signaling=ChannelSignaling.FIFO))
     args = FuncService.get_call_chans(AppID("add"),
                                       arg_type=UInt(24),
                                       result=loopback)
 
     ready = Wire(Bits(1))
     data, valid = args.unwrap(ready)
     plus7 = data + LoopbackInOutAdd.add_amt.value
-    data_chan, data_ready = loopback.type.wrap(plus7.as_uint(16), valid)
-    data_chan_buffered = data_chan.buffer(ports.clk, ports.rst, 5)
+    data_chan, data_ready = Channel(UInt(16), ChannelSignaling.ValidReady).wrap(
+        plus7.as_uint(16), valid)
+    data_chan_buffered = data_chan.buffer(ports.clk, ports.rst, 1,
+                                          ChannelSignaling.FIFO)
     ready.assign(data_ready)
     loopback.assign(data_chan_buffered)
 

lib/Dialect/ESI/runtime/cpp/lib/backends/Cosim.cpp

@@ -182,10 +182,6 @@ class WriteCosimChannelPort : public WriteChannelPort {
   ~WriteCosimChannelPort() = default;
 
   void connectImpl(std::optional<unsigned> bufferSize) override {
-    if (desc.type() != getType()->getID())
-      throw std::runtime_error("Channel '" + name +
-                               "' has wrong type. Expected " +
-                               getType()->getID() + ", got " + desc.type());
     if (desc.dir() != ChannelDesc::Direction::ChannelDesc_Direction_TO_SERVER)
       throw std::runtime_error("Channel '" + name +
                                "' is not a to server channel");
@@ -251,10 +247,6 @@ class ReadCosimChannelPort
 
   void connectImpl(std::optional<unsigned> bufferSize) override {
     // Sanity checking.
-    if (desc.type() != getType()->getID())
-      throw std::runtime_error("Channel '" + name +
-                               "' has wrong type. Expected " +
-                               getType()->getID() + ", got " + desc.type());
     if (desc.dir() != ChannelDesc::Direction::ChannelDesc_Direction_TO_CLIENT)
       throw std::runtime_error("Channel '" + name +
                                "' is not a to client channel");