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

esiaccel/types.py

@@ -15,6 +15,7 @@ from __future__ import annotations
 from . import esiCppAccel as cpp
 
 from typing import TYPE_CHECKING
+
 if TYPE_CHECKING:
   from .accelerator import HWModule
 
@@ -26,22 +27,33 @@ import traceback
 
 def _get_esi_type(cpp_type: cpp.Type):
   """Get the wrapper class for a C++ type."""
-  for cpp_type_cls, fn in __esi_mapping.items():
+  if isinstance(cpp_type, cpp.ChannelType):
+    return _get_esi_type(cpp_type.inner)
+
+  for cpp_type_cls, wrapper_cls in __esi_mapping.items():
     if isinstance(cpp_type, cpp_type_cls):
-      return fn(cpp_type)
-  return ESIType(cpp_type)
+      return wrapper_cls.wrap_cpp(cpp_type)
+  return ESIType.wrap_cpp(cpp_type)
 
 
-# Mapping from C++ types to functions constructing the Python object
-# corresponding to that type.
-__esi_mapping: Dict[Type, Callable] = {
-    cpp.ChannelType: lambda cpp_type: _get_esi_type(cpp_type.inner)
-}
+# Mapping from C++ types to wrapper classes
+__esi_mapping: Dict[Type, Type] = {}
 
 
 class ESIType:
 
-  def __init__(self, cpp_type: cpp.Type):
+  def __init__(self, id: str):
+    self._init_from_cpp(cpp.Type(id))
+
+  @classmethod
+  def wrap_cpp(cls, cpp_type: cpp.Type):
+    """Wrap a C++ ESI type with its corresponding Python ESI Type."""
+    instance = cls.__new__(cls)
+    instance._init_from_cpp(cpp_type)
+    return instance
+
+  def _init_from_cpp(self, cpp_type: cpp.Type):
+    """Initialize instance attributes from a C++ type object."""
     self.cpp_type = cpp_type
 
   @property
@@ -86,6 +98,9 @@ class ESIType:
 
 class VoidType(ESIType):
 
+  def __init__(self, id: str):
+    self._init_from_cpp(cpp.VoidType(id))
+
   def is_valid(self, obj) -> Tuple[bool, Optional[str]]:
     if obj is not None:
       return (False, f"void type cannot must represented by None, not {obj}")
@@ -110,8 +125,8 @@ __esi_mapping[cpp.VoidType] = VoidType
 
 class BitsType(ESIType):
 
-  def __init__(self, cpp_type: cpp.BitsType):
-    self.cpp_type: cpp.BitsType = cpp_type
+  def __init__(self, id: str, width: int):
+    self._init_from_cpp(cpp.BitsType(id, width))
 
   def is_valid(self, obj) -> Tuple[bool, Optional[str]]:
     if not isinstance(obj, (bytearray, bytes, list)):
@@ -143,8 +158,8 @@ __esi_mapping[cpp.BitsType] = BitsType
 
 class IntType(ESIType):
 
-  def __init__(self, cpp_type: cpp.IntegerType):
-    self.cpp_type: cpp.IntegerType = cpp_type
+  def __init__(self, id: str, width: int):
+    self._init_from_cpp(cpp.IntegerType(id, width))
 
   @property
   def bit_width(self) -> int:
@@ -153,6 +168,9 @@ class IntType(ESIType):
 
 class UIntType(IntType):
 
+  def __init__(self, id: str, width: int):
+    self._init_from_cpp(cpp.UIntType(id, width))
+
   def is_valid(self, obj) -> Tuple[bool, Optional[str]]:
     if not isinstance(obj, int):
       return (False, f"must be an int, not {type(obj)}")
@@ -176,6 +194,9 @@ __esi_mapping[cpp.UIntType] = UIntType
 
 class SIntType(IntType):
 
+  def __init__(self, id: str, width: int):
+    self._init_from_cpp(cpp.SIntType(id, width))
+
   def is_valid(self, obj) -> Tuple[bool, Optional[str]]:
     if not isinstance(obj, int):
       return (False, f"must be an int, not {type(obj)}")
@@ -203,11 +224,16 @@ __esi_mapping[cpp.SIntType] = SIntType
 
 class StructType(ESIType):
 
-  def __init__(self, cpp_type: cpp.StructType):
-    self.cpp_type = cpp_type
-    self.fields: List[Tuple[str, ESIType]] = [
-        (name, _get_esi_type(ty)) for (name, ty) in cpp_type.fields
-    ]
+  def __init__(self, id: str, fields: List[Tuple[str, "ESIType"]]):
+    # Convert Python ESIType fields to cpp Type fields
+    cpp_fields = [(name, field_type.cpp_type) for name, field_type in fields]
+    self._init_from_cpp(cpp.StructType(id, cpp_fields))
+
+  def _init_from_cpp(self, cpp_type: cpp.StructType):
+    """Initialize instance attributes from a C++ type object."""
+    super()._init_from_cpp(cpp_type)
+    # For wrap_cpp path, we need to convert C++ fields back to Python
+    self.fields = [(name, _get_esi_type(ty)) for (name, ty) in cpp_type.fields]
 
   @property
   def bit_width(self) -> int:
@@ -219,6 +245,8 @@ class StructType(ESIType):
   def is_valid(self, obj) -> Tuple[bool, Optional[str]]:
     fields_count = 0
     if not isinstance(obj, dict):
+      if not hasattr(obj, "__dict__"):
+        return (False, "must be a dict or have __dict__ attribute")
       obj = obj.__dict__
 
     for (fname, ftype) in self.fields:
@@ -234,14 +262,20 @@ class StructType(ESIType):
 
   def serialize(self, obj) -> bytearray:
     ret = bytearray()
-    for (fname, ftype) in reversed(self.fields):
+    if not isinstance(obj, dict):
+      obj = obj.__dict__
+    ordered_fields = reversed(
+        self.fields) if self.cpp_type.reverse else self.fields
+    for (fname, ftype) in ordered_fields:
       fval = obj[fname]
       ret.extend(ftype.serialize(fval))
     return ret
 
   def deserialize(self, data: bytearray) -> Tuple[Dict[str, Any], bytearray]:
     ret = {}
-    for (fname, ftype) in reversed(self.fields):
+    ordered_fields = reversed(
+        self.fields) if self.cpp_type.reverse else self.fields
+    for (fname, ftype) in ordered_fields:
       (fval, data) = ftype.deserialize(data)
       ret[fname] = fval
     return (ret, data)
@@ -252,8 +286,12 @@ __esi_mapping[cpp.StructType] = StructType
 
 class ArrayType(ESIType):
 
-  def __init__(self, cpp_type: cpp.ArrayType):
-    self.cpp_type = cpp_type
+  def __init__(self, id: str, element_type: "ESIType", size: int):
+    self._init_from_cpp(cpp.ArrayType(id, element_type.cpp_type, size))
+
+  def _init_from_cpp(self, cpp_type: cpp.ArrayType):
+    """Initialize instance attributes from a C++ type object."""
+    super()._init_from_cpp(cpp_type)
     self.element_type = _get_esi_type(cpp_type.element)
     self.size = cpp_type.size
 
@@ -304,7 +342,9 @@ class Port:
     if not supports_host:
       raise TypeError(f"unsupported type: {reason}")
 
-    self.cpp_port.connect(buffer_size)
+    opts = cpp.ConnectOptions()
+    opts.buffer_size = buffer_size
+    self.cpp_port.connect(opts)
     return self
 
   def disconnect(self):
@@ -370,8 +410,8 @@ class BundlePort:
       return super().__new__(CallbackPort)
     if isinstance(cpp_port, cpp.MMIORegion):
       return super().__new__(MMIORegion)
-    if isinstance(cpp_port, cpp.Telemetry):
-      return super().__new__(TelemetryPort)
+    if isinstance(cpp_port, cpp.Metric):
+      return super().__new__(MetricPort)
     return super().__new__(cls)
 
   def __init__(self, owner: HWModule, cpp_port: cpp.BundlePort):
@@ -507,7 +547,7 @@ class CallbackPort(BundlePort):
     self.connected = True
 
 
-class TelemetryPort(BundlePort):
+class MetricPort(BundlePort):
   """Telemetry ports report an individual piece of information from the
   acceelerator. The method of accessing telemetry will likely change in the
   future."""

esiaccel/utils.py

@@ -4,6 +4,7 @@
 
 from . import codegen
 
+import platform
 from pathlib import Path
 import subprocess
 import sys
@@ -13,16 +14,23 @@ _thisdir = Path(__file__).absolute().resolve().parent
 
 def run_esiquery():
   """Run the esiquery executable with the same arguments as this script."""
-  esiquery = _thisdir / "bin" / "esiquery"
+  if platform.system() == "Windows":
+    esiquery = _thisdir / "esiquery.exe"
+  else:
+    esiquery = _thisdir / "bin" / "esiquery"
   return subprocess.call([esiquery] + sys.argv[1:])
 
 
 def run_esi_cosim():
   """Run the esi-cosim.py script with the same arguments as this script."""
   import importlib.util
-  esi_cosim = _thisdir / "bin" / "esi-cosim.py"
+  if platform.system() == "Windows":
+    esi_cosim = _thisdir / "esi-cosim.py"
+  else:
+    esi_cosim = _thisdir / "bin" / "esi-cosim.py"
   spec = importlib.util.spec_from_file_location("esi_cosim", esi_cosim)
   assert spec is not None
+  assert spec.loader is not None
   cosim_import = importlib.util.module_from_spec(spec)
   spec.loader.exec_module(cosim_import)
   return cosim_import.__main__(sys.argv)
@@ -32,5 +40,15 @@ def run_cppgen():
   return codegen.run()
 
 
-def get_cmake_dir():
+def get_cmake_dir() -> Path:
   return _thisdir / "cmake"
+
+
+def get_dll_dir() -> Path:
+  """Return the directory where the ESI dll's are located"""
+  import sys
+  import os
+  if sys.platform == "win32":
+    return _thisdir
+  else:
+    return _thisdir / "lib"

{esiaccel-0.1.4.dev31.dist-info → esiaccel-0.2.3.dev80.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: esiaccel
-Version: 0.1.4.dev31
+Version: 0.2.3.dev80
 Summary: ESI accelerators runtime
 Author-email: John Demme <John.Demme@microsoft.com>
 License: ==============================================================================

esiaccel-0.2.3.dev80.dist-info/RECORD

@@ -0,0 +1,58 @@
+esiaccel/CosimBackend.dll,sha256=WsYLiG3cIttOml8ny9Njfr8lgLfO2UspeNb29z7Z-9M,634368
+esiaccel/CosimBackend.lib,sha256=RjY1bWCyxi-PtXFiDHtunmM0UT8vpl_m-CNCCaMqdnc,2180566
+esiaccel/CosimRpc.dll,sha256=44uYkGUJjNF5Wws-yBw2KuKT2MzdlzZpdT0x7tMHI5M,7044096
+esiaccel/CosimRpc.lib,sha256=FZt1QsMRNtDjWVZp_5aqTq5DVBo8BodUy-Zc0_KAXkU,3615226
+esiaccel/ESICppRuntime.dll,sha256=AfWGIMvdzj1qMkBx2q3f_qYLbK0ww8QbQEOBiPnblps,4495360
+esiaccel/ESICppRuntime.lib,sha256=Autv7_UNy9EMWCueiEVkjxY72PagFVz2u3KvLV8LCFk,16556242
+esiaccel/EsiCosimDpiServer.dll,sha256=9ns3g54_CdOTdw6_j79xrGjSgXDdT3dCV1EA_vDUmcU,512512
+esiaccel/EsiCosimDpiServer.lib,sha256=ZNNl0AsT-O4QXrzFNGsY7vVElYEywOL6aiOy7nCJOpc,1153606
+esiaccel/MtiPli.dll,sha256=c_RmAWqfQmNCx1eaSudLaEXPdytRIbLVLFNmptcb8UM,14848
+esiaccel/MtiPli.lib,sha256=7r8KNdR2EpFEAZ-GBIlnwV3b4_bpjg5PUpQ9vYqOJww,14570
+esiaccel/__init__.py,sha256=kQGIPdInC-YoumE8uVqmfAckqcTGmCnMJGtWZzCc2lE,1270
+esiaccel/abseil_dll.dll,sha256=z6OYn9rgcn_NaYIG19JtNGkGJXnyECwTJ8nVW4t4PvY,2002432
+esiaccel/accelerator.py,sha256=wv1EXaRZlXtyHeBA-_uKycBjn-lVxj83AYeIVlutVRs,4466
+esiaccel/cares.dll,sha256=Gklp21IWShGybAbFhUs6bJecDG7rBS3jZrllG7lWmJw,200704
+esiaccel/codegen.py,sha256=QaBNVwcsCyYWmhEesQsXp72rV-8dVC9G33K4YR6PxRo,6577
+esiaccel/esi-cosim.py,sha256=P7n3SBgKPnXynwghY5zK1FmpqZkbC_YxfVIvNNQNl6Q,3817
+esiaccel/esiCppAccel.cp312-win_amd64.pyd,sha256=E43DpY0FDzaycz2oz-vaeAGMOLCxbHbXdANOiYfGLYw,290304
+esiaccel/esiquery.exe,sha256=rpYtOIN18TRmGNFQdQ4iWquqG9uh8PvX7Os8FwDW8Cg,475136
+esiaccel/libcrypto-3-x64.dll,sha256=3G4D_aIsqXmeDjc8ZyGVTvdtPiA1YKA3egorXgALnWQ,5326336
+esiaccel/libprotobuf.dll,sha256=-vtzg2rh6IGAJpWOyhzOpXc9Nfcx9MyvouKBs49hlBw,12089344
+esiaccel/libssl-3-x64.dll,sha256=TvNJRc86Hj67LBHgNxBOqzcKay2miFCtQMW6NvV18XQ,871424
+esiaccel/re2.dll,sha256=mPqwlW4I_3e4cgOaBVObJOgu-stfJyXKinAmJJcl6js,1214464
+esiaccel/types.py,sha256=pTF2J5cSlyrpq6pBZ9Xd9--NuIOpR4JkEYNicf6ffkM,19097
+esiaccel/utils.py,sha256=q-8fmgJ9tUvmBsIvqZiZ7u845IJhOjvjYTQLhhrNYl0,1515
+esiaccel/zlib1.dll,sha256=GFQuaEY4-GUYg4WtQlHOen8j4ODxUlfITZ48VkPPhDE,90112
+esiaccel/cmake/esiaccelConfig.cmake,sha256=BEnPuGZ7OqOZuTuXl3wjRraw93nf-UznJT-EChKmu9c,1782
+esiaccel/cosim/Cosim_CycleCount.sv,sha256=dcxn_9l469IJvZvW4onObmgRMQyeG_zhTu11QtD-0zs,2385
+esiaccel/cosim/Cosim_DpiPkg.sv,sha256=9qGn1VyAVrzBP5At1thV6xrovg0WghICD01Zz9J221E,3458
+esiaccel/cosim/Cosim_Endpoint.sv,sha256=-XXrGvvk6hdiZ-Ex6_QtdKXXUwKJLKSvpTUK3o0gPZ8,7589
+esiaccel/cosim/Cosim_Manifest.sv,sha256=vl9b6XieEkP880IBw1ferekBnDJwFanZZggJJGertXM,1123
+esiaccel/cosim/driver.cpp,sha256=Lvmo03pzzhoswdxAtdXAm-oU6UkfTyl1LgoCpyDzLhY,3842
+esiaccel/cosim/driver.sv,sha256=LAkFEXTwX3KKwZLSzYZFwMPWxZwVStuhUsfecHHpGzU,1890
+esiaccel/cosim/questa.py,sha256=2xALwRzsOFZ1_xk3f2d849GMvGspNCK4XL8zVDBjXlA,4626
+esiaccel/cosim/simulator.py,sha256=oTZCUrDT_YCR5bMzgtlQ39JLSlxCmYt_tpTGQ2PLRxU,13994
+esiaccel/cosim/verilator.py,sha256=dwiEkKOem5OKPV9AK6O1ohr22MTsyDxBVnriDRFoVa8,2877
+esiaccel/include/esi/Accelerator.h,sha256=f-fbqWMUKgNISuf9T7UDN36xMqYm0qHBLAzASFGpieo,9318
+esiaccel/include/esi/CLI.h,sha256=LLLWpvE7JDuwNyuCSjLj3sGsAh1BenOh1W7MbhAf3WQ,2619
+esiaccel/include/esi/Common.h,sha256=7bXy9bRt4C7oeO6SBm8BneujbL17fbPM6K7YMqazvLE,6155
+esiaccel/include/esi/Context.h,sha256=Bd698megdjlsmGsKQjsw3JE9vTuKLQjIrn-DrWRpkFw,2686
+esiaccel/include/esi/Design.h,sha256=KbynfLZ6Y2PXomq-c9IKXRZGmeHFTObWTfvjL8G6X-c,5040
+esiaccel/include/esi/Engines.h,sha256=bbGbhXjYMpIpXh_DR0OS57zyGQUIDXh_S7xHX3su0Y0,4831
+esiaccel/include/esi/Logging.h,sha256=sHqMcpp0lNIHkIEyvSm-BBWx4zXXh6NOATCgZpgzYI4,8944
+esiaccel/include/esi/Manifest.h,sha256=ZdIu_vXXLS4bwOoISFo-sFjzvB9x5ddYmNmaknyF0ds,2110
+esiaccel/include/esi/Ports.h,sha256=FQn7ckL_biFBKRSe_lMinW-24a3PzmW0TSorHxI8Ts0,19351
+esiaccel/include/esi/Services.h,sha256=MERULjcAaS5A1bCu7YXOU09ZfqyatQUvOt5xpwrYNqE,17165
+esiaccel/include/esi/Types.h,sha256=SyTU3YteKWQJ7HuUK4G6f1sQDBJ7nhHh-r1OMpH4MVY,11416
+esiaccel/include/esi/Utils.h,sha256=KPd75GajIFeTBVJocXBjwsJqhbZg-ShWZCIe3oQdBss,3061
+esiaccel/include/esi/Values.h,sha256=1xXxNV2oUr84At3Y7aXBqbiPZxyJXeUbhycl0O0fUtk,11074
+esiaccel/include/esi/backends/Cosim.h,sha256=Y8s2krmqNqrNJT5qG9Wy9oQzgRpIt3dhcAjYjOXHmTA,2575
+esiaccel/include/esi/backends/RpcClient.h,sha256=ZMPJkZTSedcyPEfbNGkzMUcb_C0SjCNbueDmH9C2SX8,3168
+esiaccel/include/esi/backends/RpcServer.h,sha256=aWCtNxUT9PB3dibEgcMWDudpJ5VX_UCahld_lxoD5dU,2570
+esiaccel/include/esi/backends/Trace.h,sha256=kx4wwLH3a0ndmRUdaDyYGZ1SP83zlpFrk30Nw8ZrJJA,3286
+esiaccel-0.2.3.dev80.dist-info/licenses/LICENSE,sha256=vtnVnB8_lN1yPYcA5MeT56R8UsQtBhyzZLBvu_KMf7I,13468
+esiaccel-0.2.3.dev80.dist-info/METADATA,sha256=JIGvHzZLELkjO_NpWJazh_OsHrNNj-IzbFe3rUJxx1s,16147
+esiaccel-0.2.3.dev80.dist-info/WHEEL,sha256=KUuBC6lxAbHCKilKua8R9W_TM71_-9Sg5uEP3uDWcoU,101
+esiaccel-0.2.3.dev80.dist-info/entry_points.txt,sha256=_CuNLV0fyTURxRREFwpzGycifZW_-7-MyuJNEwKK9J8,137
+esiaccel-0.2.3.dev80.dist-info/top_level.txt,sha256=fYWTWMDK4PDu4ePQ9NtcFHas2k8-d1kWhTs2avPpgB4,9
+esiaccel-0.2.3.dev80.dist-info/RECORD,,