esiaccel 0.1.4.dev31__cp310-cp310-win_amd64.whl → 0.2.3.dev80__cp310-cp310-win_amd64.whl

esiaccel/include/esi/Common.h

@@ -20,6 +20,7 @@
 #include <cstdint>
 #include <map>
 #include <optional>
+#include <span>
 #include <stdexcept>
 #include <string>
 #include <vector>
@@ -42,6 +43,13 @@ struct AppID {
     return name == other.name && idx == other.idx;
   }
   bool operator!=(const AppID &other) const { return !(*this == other); }
+  friend std::ostream &operator<<(std::ostream &os, const AppID &id);
+
+  std::string toString() const {
+    if (idx.has_value())
+      return name + "[" + std::to_string(idx.value()) + "]";
+    return name;
+  }
 };
 bool operator<(const AppID &a, const AppID &b);
 
@@ -49,8 +57,10 @@ class AppIDPath : public std::vector<AppID> {
 public:
   using std::vector<AppID>::vector;
 
-  AppIDPath operator+(const AppIDPath &b);
+  AppIDPath operator+(const AppIDPath &b) const;
+  AppIDPath parent() const;
   std::string toStr() const;
+  friend std::ostream &operator<<(std::ostream &os, const AppIDPath &path);
 };
 bool operator<(const AppIDPath &a, const AppIDPath &b);
 
@@ -104,6 +114,8 @@ class MessageData {
 public:
   /// Adopts the data vector buffer.
   MessageData() = default;
+  MessageData(std::span<const uint8_t> data)
+      : data(data.data(), data.data() + data.size()) {}
   MessageData(std::vector<uint8_t> &data) : data(std::move(data)) {}
   MessageData(std::vector<uint8_t> &&data) : data(std::move(data)) {}
   MessageData(const uint8_t *data, size_t size) : data(data, data + size) {}
@@ -114,11 +126,17 @@ public:
   /// Get the data as a vector of bytes.
   const std::vector<uint8_t> &getData() const { return data; }
 
+  /// Implicit conversion to a vector/span of bytes, to play nice with other
+  /// APIs that accept bytearray-like things.
+  operator const std::vector<uint8_t> &() const { return data; }
+  operator std::span<const uint8_t>() const { return data; }
+
   /// Move the data out of this object.
   std::vector<uint8_t> takeData() { return std::move(data); }
 
   /// Get the size of the data in bytes.
   size_t getSize() const { return data.size(); }
+  size_t size() const { return getSize(); }
 
   /// Returns true if this message contains no data.
   bool empty() const { return data.empty(); }
@@ -151,7 +169,6 @@ private:
 } // namespace esi
 
 std::ostream &operator<<(std::ostream &, const esi::ModuleInfo &);
-std::ostream &operator<<(std::ostream &, const esi::AppID &);
 
 //===----------------------------------------------------------------------===//
 // Functions which should be in the standard library.

esiaccel/include/esi/Context.h

@@ -20,23 +20,30 @@
 #include "esi/Types.h"
 
 #include <exception>
+#include <map>
 #include <memory>
-#include <optional>
+#include <vector>
 
 namespace esi {
 class AcceleratorConnection;
 
 /// AcceleratorConnections, Accelerators, and Manifests must all share a
-/// context. It owns all the types, uniquifying them.
+/// context. It owns all the types, uniquifying them. It also owns the
+/// connections (which own the Accelerators). When it is destroyed, all
+/// connections are disconnected and the objects are destroyed.
 class Context {
 public:
-  Context() : logger(std::make_unique<ConsoleLogger>(Logger::Level::Warning)) {}
-  Context(std::unique_ptr<Logger> logger) : logger(std::move(logger)) {}
+  Context();
+  Context(std::unique_ptr<Logger> logger);
+  ~Context();
+
+  /// Disconnect from all accelerators associated with this context.
+  void disconnectAll();
 
   /// Create a context with a specific logger type.
   template <typename T, typename... Args>
-  static Context withLogger(Args &&...args) {
-    return Context(std::make_unique<T>(args...));
+  static std::unique_ptr<Context> withLogger(Args &&...args) {
+    return std::make_unique<Context>(std::make_unique<T>(args...));
   }
 
   /// Resolve a type id to the type.
@@ -49,9 +56,9 @@ public:
   /// Register a type with the context. Takes ownership of the pointer type.
   void registerType(Type *type);
 
-  /// Connect to an accelerator backend.
-  std::unique_ptr<AcceleratorConnection> connect(std::string backend,
-                                                 std::string connection);
+  /// Connect to an accelerator backend. Retains ownership internally and
+  /// returns a non-owning pointer.
+  AcceleratorConnection *connect(std::string backend, std::string connection);
 
   /// Register a logger with the accelerator. Assumes ownership of the logger.
   void setLogger(std::unique_ptr<Logger> logger) {
@@ -63,6 +70,7 @@ public:
 
 private:
   std::unique_ptr<Logger> logger;
+  std::vector<std::unique_ptr<AcceleratorConnection>> connections;
 
 private:
   using TypeCache = std::map<Type::ID, std::unique_ptr<Type>>;

esiaccel/include/esi/Design.h

@@ -45,11 +45,15 @@ class Service;
 
 /// Represents either the top level or an instance of a hardware module.
 class HWModule {
+public:
+  HWModule(const HWModule &) = delete;
+  HWModule &operator=(const HWModule &) = delete;
+
 protected:
   HWModule(std::optional<ModuleInfo> info,
            std::vector<std::unique_ptr<Instance>> children,
            std::vector<services::Service *> services,
-           std::vector<std::unique_ptr<BundlePort>> &ports);
+           std::vector<std::unique_ptr<BundlePort>> &&ports);
 
 public:
   virtual ~HWModule() = default;
@@ -112,11 +116,12 @@ public:
   Instance(AppID id, std::optional<ModuleInfo> info,
            std::vector<std::unique_ptr<Instance>> children,
            std::vector<services::Service *> services,
-           std::vector<std::unique_ptr<BundlePort>> &ports)
-      : HWModule(info, std::move(children), services, ports), id(id) {}
+           std::vector<std::unique_ptr<BundlePort>> &&ports)
+      : HWModule(info, std::move(children), services, std::move(ports)),
+        id(id) {}
 
   /// Get the instance's ID, which it will always have.
-  const AppID getID() const { return id; }
+  AppID getID() const { return id; }
 
 protected:
   const AppID id;

esiaccel/include/esi/Manifest.h

@@ -65,8 +65,6 @@ private:
 
 } // namespace esi
 
-std::ostream &operator<<(std::ostream &os, const esi::AppID &id);
-std::ostream &operator<<(std::ostream &, const esi::AppIDPath &);
 std::ostream &operator<<(std::ostream &, const esi::ModuleInfo &);
 
 #endif // ESI_MANIFEST_H

esiaccel/include/esi/Ports.h

@@ -35,13 +35,81 @@ using PortMap = std::map<std::string, ChannelPort &>;
 /// but used by higher level APIs which add types.
 class ChannelPort {
 public:
-  ChannelPort(const Type *type) : type(type) {}
+  ChannelPort(const Type *type);
   virtual ~ChannelPort() {}
 
-  /// Set up a connection to the accelerator. The buffer size is optional and
-  /// should be considered merely a hint. Individual implementations use it
-  /// however they like. The unit is number of messages of the port type.
-  virtual void connect(std::optional<unsigned> bufferSize = std::nullopt) = 0;
+  struct ConnectOptions {
+    /// The buffer size is optional and should be considered merely a hint.
+    /// Individual implementations use it however they like. The unit is number
+    /// of messages of the port type.
+    std::optional<unsigned> bufferSize = std::nullopt;
+
+    /// If the type of this port is a window, translate the incoming/outgoing
+    /// data into its underlying ('into') type. For 'into' types without lists,
+    /// just re-arranges the data fields from the lowered type to the 'into'
+    /// type.
+    ///
+    /// If this option is false, no translation is done and the data is
+    /// passed through as-is. Same is true for non-windowed types.
+    ///
+    /// For messages with lists, only two types are supported:
+    ///   1) Parallel encoding includes any 'header' data with each frame. Said
+    ///      header data is the same across all frames, so this encoding is
+    ///      inefficient but is commonly used for on-chip streaming interfaces.
+    ///      Each frame contains a 'last' field to indicate the end of the list.
+    ///      In cases where 'numItems' is greater than 1, a field named
+    ///      '<listField>_size' indicates the number of valid items in that
+    ///      frame.
+    ///   2) Serial (bulk transfer) encoding, where a 'header' frame precedes
+    ///      the list data frame. Said header frame contains a 'count' field
+    ///      indicating the number of items in the list.  Importantly, the
+    ///      header frame is always re-transmitted after the specified number of
+    ///      list items have been sent. If the 'count' field is zero, the end of
+    ///      the list has been reached. If it is non-zero, the message has not
+    ///      been completely transmitted and reading should continue until a
+    ///      'count' of zero is received.
+    ///
+    /// In both cases, the host-side MessageData contains the complete header
+    /// followed by the list data. In other words, header data is not duplicated
+    /// in the returned message. So for a windowed type with header fields and
+    /// a list of (x,y) coordinates, the host memory layout would be:
+    /// ```
+    /// struct ExampleList {
+    ///   uint32_t headerField2; // SystemVerilog ordering
+    ///   uint32_t headerField1;
+    ///   size_t   list_length; // Number list items
+    ///   struct { uint16_t y, x; } list_data[];
+    /// }
+    /// ```
+    ///
+    /// In a parallel encoding, each frame's wire format (from hardware) is:
+    /// ```
+    /// struct ExampleListFrame {
+    ///   uint8_t list_last; // Non-zero indicates last item in list
+    ///   struct { uint16_t y, x; } list_data[numItems]; // SV field ordering
+    ///   uint32_t headerField2; // SV struct ordering (reversed)
+    ///   uint32_t headerField1;
+    /// }
+    /// ```
+    ///
+    /// Important note: for consistency, preserves SystemVerilog struct field
+    /// ordering! So it's the opposite of C struct ordering.
+    ///
+    /// Implementation status:
+    ///   - Only parallel list encoding is supported.
+    ///   - Fields must be byte-aligned.
+    ///
+    /// See the CIRCT documentation (or td files) for more details on windowed
+    /// messages.
+    bool translateMessage = true;
+
+    ConnectOptions(std::optional<unsigned> bufferSize = std::nullopt,
+                   bool translateMessage = true)
+        : bufferSize(bufferSize), translateMessage(translateMessage) {}
+  };
+
+  /// Set up a connection to the accelerator.
+  virtual void connect(const ConnectOptions &options = ConnectOptions()) = 0;
   virtual void disconnect() = 0;
   virtual bool isConnected() const = 0;
 
@@ -64,13 +132,74 @@ public:
 protected:
   const Type *type;
 
+  /// Instructions for translating windowed types. Precomputes and optimizes a
+  /// list of copy operations.
+  struct TranslationInfo {
+    TranslationInfo(const WindowType *windowType) : windowType(windowType) {}
+
+    /// Precompute and optimize the copy operations for translating frames.
+    void precomputeFrameInfo();
+
+    /// The window type being translated.
+    const WindowType *windowType;
+
+    /// A copy operation for translating between frame data and the translation.
+    /// Run this during the translation.
+    struct CopyOp {
+      /// Offset in the incoming/outgoing frame data.
+      size_t frameOffset;
+      /// Offset in the translation buffer.
+      size_t bufferOffset;
+      /// Number of bytes to copy.
+      size_t size;
+    };
+
+    /// Information about a list field within a frame (for parallel encoding).
+    /// Note: Currently only numItems == 1 is supported (one list element per
+    /// frame).
+    struct ListFieldInfo {
+      /// Name of the list field.
+      std::string fieldName;
+      /// Offset of the list data array in the frame.
+      size_t dataOffset;
+      /// Size of each list element in bytes.
+      size_t elementSize;
+      /// Offset of the 'last' field in the frame.
+      size_t lastFieldOffset;
+      /// Offset in the translation buffer where list length is stored.
+      size_t listLengthBufferOffset;
+      /// Offset in the translation buffer where list data starts.
+      size_t listDataBufferOffset;
+    };
+
+    /// Information about each frame in the windowed type.
+    struct FrameInfo {
+      /// The total size of a frame in bytes.
+      size_t expectedSize;
+      /// Precomputed copy operations for translating this frame (non-list
+      /// fields).
+      std::vector<CopyOp> copyOps;
+      /// Information about list fields in this frame (parallel encoding).
+      /// Currently only one list field per frame is supported.
+      std::optional<ListFieldInfo> listField;
+    };
+    /// Precomputed information about each frame.
+    std::vector<FrameInfo> frames;
+    /// Size of the 'into' type in bytes (for fixed-size types).
+    /// For types with lists, this is the size of the fixed header portion.
+    size_t intoTypeBytes = 0;
+    /// True if the window contains a list field (variable-size message).
+    bool hasListField = false;
+  };
+  std::unique_ptr<TranslationInfo> translationInfo;
+
   /// Method called by poll() to actually poll the channel if the channel is
   /// connected.
   virtual bool pollImpl() { return false; }
 
   /// Called by all connect methods to let backends initiate the underlying
   /// connections.
-  virtual void connectImpl(std::optional<unsigned> bufferSize) {}
+  virtual void connectImpl(const ConnectOptions &options) {}
 };
 
 /// A ChannelPort which sends data to the accelerator.
@@ -78,9 +207,11 @@ class WriteChannelPort : public ChannelPort {
 public:
   using ChannelPort::ChannelPort;
 
-  virtual void
-  connect(std::optional<unsigned> bufferSize = std::nullopt) override {
-    connectImpl(bufferSize);
+  virtual void connect(const ConnectOptions &options = {}) override {
+    translateMessages = options.translateMessage && translationInfo;
+    if (translateMessages)
+      translationInfo->precomputeFrameInfo();
+    connectImpl(options);
     connected = true;
   }
   virtual void disconnect() override { connected = false; }
@@ -88,12 +219,72 @@ public:
 
   /// A very basic blocking write API. Will likely change for performance
   /// reasons.
-  virtual void write(const MessageData &) = 0;
+  void write(const MessageData &data) {
+    if (translateMessages) {
+      assert(translationBuffer.empty() &&
+             "Cannot call write() with pending translated messages");
+      translateOutgoing(data);
+      for (auto &msg : translationBuffer)
+        writeImpl(msg);
+      translationBuffer.clear();
+    } else {
+      writeImpl(data);
+    }
+  }
+
+  /// A basic non-blocking write API. Returns true if any of the data was queued
+  /// and/or sent. If the data type is a window a 'true' return does not
+  /// indicate that the message has been completely written. The 'flush' method
+  /// can be used to check that the entire buffer has been written. It is
+  /// invalid for backends to always return false (i.e. backends must eventually
+  /// ensure that writes may succeed).
+  bool tryWrite(const MessageData &data) {
+    if (translateMessages) {
+      // Do not accept a new message if there are pending messages to flush.
+      if (!flush())
+        return false;
+      assert(translationBuffer.empty() &&
+             "Translation buffer should be empty after successful flush");
+      translateOutgoing(data);
+      flush();
+      return true;
+    } else {
+      return tryWriteImpl(data);
+    }
+  }
+  /// Flush any buffered data. Returns true if all data was flushed.
+  ///
+  /// If `translateMessages` is false, calling `flush()` will immediately return
+  /// true and perform no action, as there is no buffered data to flush.
+  bool flush() {
+    while (translationBufferIdx < translationBuffer.size()) {
+      if (!tryWriteImpl(translationBuffer[translationBufferIdx]))
+        return false;
+      ++translationBufferIdx;
+    }
+    translationBuffer.clear();
+    translationBufferIdx = 0;
+    return true;
+  }
 
-  /// A basic non-blocking write API. Returns true if the data was written.
-  /// It is invalid for backends to always return false (i.e. backends must
-  /// eventually ensure that writes may succeed).
-  virtual bool tryWrite(const MessageData &data) = 0;
+protected:
+  /// Implementation for write(). Subclasses must implement this.
+  virtual void writeImpl(const MessageData &) = 0;
+
+  /// Implementation for tryWrite(). Subclasses must implement this.
+  virtual bool tryWriteImpl(const MessageData &data) = 0;
+
+  /// Whether to translate outgoing data if the port type is a window type. Set
+  /// by the connect() method.
+  bool translateMessages = false;
+  /// If tryWrite cannot write all the messages of a windowed type at once, it
+  /// stores them here and writes them out one by one on subsequent calls.
+  std::vector<MessageData> translationBuffer;
+  /// Index of the next message to write in translationBuffer.
+  size_t translationBufferIdx = 0;
+  /// Translate outgoing data if the port type is a window type. Append the new
+  /// message 'chunks' to translationBuffer.
+  void translateOutgoing(const MessageData &data);
 
 private:
   volatile bool connected = false;
@@ -105,15 +296,18 @@ public:
   UnknownWriteChannelPort(const Type *type, std::string errmsg)
       : WriteChannelPort(type), errmsg(errmsg) {}
 
-  void connect(std::optional<unsigned> bufferSize = std::nullopt) override {
+  void connect(const ConnectOptions &options = {}) override {
     throw std::runtime_error(errmsg);
   }
-  void write(const MessageData &) override { throw std::runtime_error(errmsg); }
-  bool tryWrite(const MessageData &) override {
+
+protected:
+  void writeImpl(const MessageData &) override {
+    throw std::runtime_error(errmsg);
+  }
+  bool tryWriteImpl(const MessageData &) override {
     throw std::runtime_error(errmsg);
   }
 
-protected:
   std::string errmsg;
 };
 
@@ -143,7 +337,7 @@ public:
   //===--------------------------------------------------------------------===//
 
   virtual void connect(std::function<bool(MessageData)> callback,
-                       std::optional<unsigned> bufferSize = std::nullopt);
+                       const ConnectOptions &options = {});
 
   //===--------------------------------------------------------------------===//
   // Polling mode methods: To use futures or blocking reads, connect without any
@@ -154,8 +348,7 @@ public:
   static constexpr uint64_t DefaultMaxDataQueueMsgs = 32;
 
   /// Connect to the channel in polling mode.
-  virtual void
-  connect(std::optional<unsigned> bufferSize = std::nullopt) override;
+  virtual void connect(const ConnectOptions &options = {}) override;
 
   /// Asynchronous read.
   virtual std::future<MessageData> readAsync();
@@ -184,6 +377,20 @@ protected:
   /// Backends call this callback when new data is available.
   std::function<bool(MessageData)> callback;
 
+  /// Window translation support.
+  std::vector<uint8_t> translationBuffer;
+  /// Index of the next expected frame (for multi-frame windows).
+  size_t nextFrameIndex = 0;
+  /// For list fields: accumulated list data across frames.
+  std::vector<uint8_t> listDataBuffer;
+  /// Flag to track whether we're in the middle of accumulating list data.
+  bool accumulatingListData = false;
+  /// Reset translation state buffers and indices.
+  void resetTranslationState();
+  /// Translate incoming data if the port type is a window type. Returns true if
+  /// the message has been completely received.
+  bool translateIncoming(MessageData &data);
+
   //===--------------------------------------------------------------------===//
   // Polling mode members.
   //===--------------------------------------------------------------------===//
@@ -206,10 +413,10 @@ public:
       : ReadChannelPort(type), errmsg(errmsg) {}
 
   void connect(std::function<bool(MessageData)> callback,
-               std::optional<unsigned> bufferSize = std::nullopt) override {
+               const ConnectOptions &options = ConnectOptions()) override {
     throw std::runtime_error(errmsg);
   }
-  void connect(std::optional<unsigned> bufferSize = std::nullopt) override {
+  void connect(const ConnectOptions &options = ConnectOptions()) override {
     throw std::runtime_error(errmsg);
   }
   std::future<MessageData> readAsync() override {