najaeda 0.1.23__cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl → 0.1.24__cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl

najaeda/netlist.py

@@ -363,7 +363,10 @@ class Net:
         return sum(1 for _ in self.get_inst_terms())
 
     def get_design_terms(self):
-        """
+        """Return an iterator over the design terminals of the net.
+        This includes only the terminals that are part of the current design.
+        The iterator will yield Term objects bit per bit.
+
         :return: an iterator over the design terminals of the net.
         :rtype: Iterator[Term]
         """
@@ -372,8 +375,18 @@ class Net:
         for term in self.net.getBitTerms():
             yield Term(self.pathIDs, term)
 
-    def get_terms(self):
+    def count_design_terms(self) -> int:
+        """Count the design terminals of this net.
+
+        :return: the number of design terminals of this net.
+        :rtype: int
         """
+        return sum(1 for _ in self.get_design_terms())
+
+    def get_terms(self):
+        """Return an iterator over the terminals of the net.
+        This includes both design and instance terminals.
+
         :return: an iterator over the terminals of the net.
         :rtype: Iterator[Term]
         """
@@ -1479,6 +1492,7 @@ class VerilogConfig:
 
 def load_verilog(files: Union[str, List[str]], config: VerilogConfig = None) -> Instance:
     """Load verilog files into the top design.
+
     :param files: a list of verilog files to load or a single file.
     :param config: the configuration to use when loading the files.
     :return: the top Instance.
@@ -1499,6 +1513,7 @@ def load_verilog(files: Union[str, List[str]], config: VerilogConfig = None) ->
 
 def load_liberty(files: Union[str, List[str]]):
     """Load liberty files.
+
     :param files: a list of liberty files to load or a single file.
     """
     if isinstance(files, str):
@@ -1515,11 +1530,14 @@ def load_primitives(name: str):
     Currently supported libraries are:
 
     - xilinx
+    - yosys
     """
     if name == "xilinx":
         from najaeda.primitives import xilinx
-
         xilinx.load(__get_top_db())
+    elif name == "yosys":
+        from najaeda.primitives import yosys
+        yosys.load(__get_top_db())
     else:
         raise ValueError(f"Unknown primitives library: {name}")
 

najaeda/primitives/yosys.py

@@ -0,0 +1,189 @@
+# SPDX-FileCopyrightText: 2024 The Naja authors <https://github.com/najaeda/naja/blob/main/AUTHORS>
+#
+# SPDX-License-Identifier: Apache-2.0
+
+import logging
+from najaeda import naja
+
+
+def constructAND(lib):
+    and2 = naja.SNLDesign.createPrimitive(lib, "$_AND_")
+    naja.SNLScalarTerm.create(and2, naja.SNLTerm.Direction.Input, "A")
+    naja.SNLScalarTerm.create(and2, naja.SNLTerm.Direction.Input, "B")
+    naja.SNLScalarTerm.create(and2, naja.SNLTerm.Direction.Output, "Y")
+    and2.setTruthTable(0x8)
+
+
+def constructOR(lib):
+    or2 = naja.SNLDesign.createPrimitive(lib, "$_OR_")
+    naja.SNLScalarTerm.create(or2, naja.SNLTerm.Direction.Input, "A")
+    naja.SNLScalarTerm.create(or2, naja.SNLTerm.Direction.Input, "B")
+    naja.SNLScalarTerm.create(or2, naja.SNLTerm.Direction.Output, "Y")
+    or2.setTruthTable(0xE)
+
+
+def constructXOR(lib):
+    xor2 = naja.SNLDesign.createPrimitive(lib, "$_XOR_")
+    naja.SNLScalarTerm.create(xor2, naja.SNLTerm.Direction.Input, "A")
+    naja.SNLScalarTerm.create(xor2, naja.SNLTerm.Direction.Input, "B")
+    naja.SNLScalarTerm.create(xor2, naja.SNLTerm.Direction.Output, "Y")
+    xor2.setTruthTable(0x6)
+
+
+def constructMUX(lib):
+    mux2 = naja.SNLDesign.createPrimitive(lib, "$_MUX_")
+    naja.SNLScalarTerm.create(mux2, naja.SNLTerm.Direction.Input, "A")
+    naja.SNLScalarTerm.create(mux2, naja.SNLTerm.Direction.Input, "B")
+    naja.SNLScalarTerm.create(mux2, naja.SNLTerm.Direction.Input, "S")
+    naja.SNLScalarTerm.create(mux2, naja.SNLTerm.Direction.Output, "Y")
+    mux2.setTruthTable(0xCA)
+
+
+def constructNOT(lib):
+    not_gate = naja.SNLDesign.createPrimitive(lib, "$_NOT_")
+    naja.SNLScalarTerm.create(not_gate, naja.SNLTerm.Direction.Input, "A")
+    naja.SNLScalarTerm.create(not_gate, naja.SNLTerm.Direction.Output, "Y")
+    not_gate.setTruthTable(0b01)
+
+
+def constructDFFP(lib):
+    dffp = naja.SNLDesign.createPrimitive(lib, "$_DFF_P_")
+    naja.SNLScalarTerm.create(dffp, naja.SNLTerm.Direction.Input, "C")
+    naja.SNLScalarTerm.create(dffp, naja.SNLTerm.Direction.Input, "D")
+    naja.SNLScalarTerm.create(dffp, naja.SNLTerm.Direction.Output, "Q")
+
+
+def constructDFFE_PP(lib):
+    dffe_pp = naja.SNLDesign.createPrimitive(lib, "$_DFFE_PP_")
+    naja.SNLScalarTerm.create(dffe_pp, naja.SNLTerm.Direction.Input, "C")
+    naja.SNLScalarTerm.create(dffe_pp, naja.SNLTerm.Direction.Input, "D")
+    naja.SNLScalarTerm.create(dffe_pp, naja.SNLTerm.Direction.Input, "E")
+    naja.SNLScalarTerm.create(dffe_pp, naja.SNLTerm.Direction.Output, "Q")
+
+
+def constructDFFE_PN(lib):
+    dffe_pn = naja.SNLDesign.createPrimitive(lib, "$_DFFE_PN_")
+    naja.SNLScalarTerm.create(dffe_pn, naja.SNLTerm.Direction.Input, "C")
+    naja.SNLScalarTerm.create(dffe_pn, naja.SNLTerm.Direction.Input, "D")
+    naja.SNLScalarTerm.create(dffe_pn, naja.SNLTerm.Direction.Input, "E")
+    naja.SNLScalarTerm.create(dffe_pn, naja.SNLTerm.Direction.Output, "Q")
+
+
+def constructDFF_PP0(lib):
+    dffe_pp0 = naja.SNLDesign.createPrimitive(lib, "$_DFF_PP0_")
+    naja.SNLScalarTerm.create(dffe_pp0, naja.SNLTerm.Direction.Input, "C")
+    naja.SNLScalarTerm.create(dffe_pp0, naja.SNLTerm.Direction.Input, "D")
+    naja.SNLScalarTerm.create(dffe_pp0, naja.SNLTerm.Direction.Output, "Q")
+    naja.SNLScalarTerm.create(dffe_pp0, naja.SNLTerm.Direction.Input, "R")
+
+
+def constructDFF_PP1(lib):
+    dffe_pp1 = naja.SNLDesign.createPrimitive(lib, "$_DFF_PP1_")
+    naja.SNLScalarTerm.create(dffe_pp1, naja.SNLTerm.Direction.Input, "C")
+    naja.SNLScalarTerm.create(dffe_pp1, naja.SNLTerm.Direction.Input, "D")
+    naja.SNLScalarTerm.create(dffe_pp1, naja.SNLTerm.Direction.Output, "Q")
+    naja.SNLScalarTerm.create(dffe_pp1, naja.SNLTerm.Direction.Input, "R")
+
+
+def constructDFFE_PP0P(lib):
+    dffe_pp0p = naja.SNLDesign.createPrimitive(lib, "$_DFFE_PP0P_")
+    naja.SNLScalarTerm.create(dffe_pp0p, naja.SNLTerm.Direction.Input, "C")
+    naja.SNLScalarTerm.create(dffe_pp0p, naja.SNLTerm.Direction.Input, "D")
+    naja.SNLScalarTerm.create(dffe_pp0p, naja.SNLTerm.Direction.Input, "E")
+    naja.SNLScalarTerm.create(dffe_pp0p, naja.SNLTerm.Direction.Output, "Q")
+    naja.SNLScalarTerm.create(dffe_pp0p, naja.SNLTerm.Direction.Input, "R")
+
+
+def constructDFFE_PP1P(lib):
+    dffe_pp1p = naja.SNLDesign.createPrimitive(lib, "$_DFFE_PP1P_")
+    naja.SNLScalarTerm.create(dffe_pp1p, naja.SNLTerm.Direction.Input, "C")
+    naja.SNLScalarTerm.create(dffe_pp1p, naja.SNLTerm.Direction.Input, "D")
+    naja.SNLScalarTerm.create(dffe_pp1p, naja.SNLTerm.Direction.Input, "E")
+    naja.SNLScalarTerm.create(dffe_pp1p, naja.SNLTerm.Direction.Output, "Q")
+    naja.SNLScalarTerm.create(dffe_pp1p, naja.SNLTerm.Direction.Input, "R")
+
+
+def constructDFFE_PP0N(lib):
+    dffe_pp0n = naja.SNLDesign.createPrimitive(lib, "$_DFFE_PP0N_")
+    naja.SNLScalarTerm.create(dffe_pp0n, naja.SNLTerm.Direction.Input, "C")
+    naja.SNLScalarTerm.create(dffe_pp0n, naja.SNLTerm.Direction.Input, "D")
+    naja.SNLScalarTerm.create(dffe_pp0n, naja.SNLTerm.Direction.Input, "E")
+    naja.SNLScalarTerm.create(dffe_pp0n, naja.SNLTerm.Direction.Output, "Q")
+    naja.SNLScalarTerm.create(dffe_pp0n, naja.SNLTerm.Direction.Input, "R")
+
+
+def constructSDFF_PP0(lib):
+    sdff_pp0 = naja.SNLDesign.createPrimitive(lib, "$_SDFF_PP0_")
+    naja.SNLScalarTerm.create(sdff_pp0, naja.SNLTerm.Direction.Input, "C")
+    naja.SNLScalarTerm.create(sdff_pp0, naja.SNLTerm.Direction.Input, "D")
+    naja.SNLScalarTerm.create(sdff_pp0, naja.SNLTerm.Direction.Output, "Q")
+    naja.SNLScalarTerm.create(sdff_pp0, naja.SNLTerm.Direction.Input, "R")
+
+
+def constructSDFFE_PP0N(lib):
+    sdffe_pp0n = naja.SNLDesign.createPrimitive(lib, "$_SDFFE_PP0N_")
+    naja.SNLScalarTerm.create(sdffe_pp0n, naja.SNLTerm.Direction.Input, "C")
+    naja.SNLScalarTerm.create(sdffe_pp0n, naja.SNLTerm.Direction.Input, "D")
+    naja.SNLScalarTerm.create(sdffe_pp0n, naja.SNLTerm.Direction.Input, "E")
+    naja.SNLScalarTerm.create(sdffe_pp0n, naja.SNLTerm.Direction.Output, "Q")
+    naja.SNLScalarTerm.create(sdffe_pp0n, naja.SNLTerm.Direction.Input, "R")
+
+
+def constructSDFFE_PN0P(lib):
+    sdffe_pn0p = naja.SNLDesign.createPrimitive(lib, "$_SDFFE_PN0P_")
+    naja.SNLScalarTerm.create(sdffe_pn0p, naja.SNLTerm.Direction.Input, "C")
+    naja.SNLScalarTerm.create(sdffe_pn0p, naja.SNLTerm.Direction.Input, "D")
+    naja.SNLScalarTerm.create(sdffe_pn0p, naja.SNLTerm.Direction.Input, "E")
+    naja.SNLScalarTerm.create(sdffe_pn0p, naja.SNLTerm.Direction.Output, "Q")
+    naja.SNLScalarTerm.create(sdffe_pn0p, naja.SNLTerm.Direction.Input, "R")
+
+
+def constructSDFFE_PN0N(lib):
+    sdffe_pn0n = naja.SNLDesign.createPrimitive(lib, "$_SDFFE_PN0N_")
+    naja.SNLScalarTerm.create(sdffe_pn0n, naja.SNLTerm.Direction.Input, "C")
+    naja.SNLScalarTerm.create(sdffe_pn0n, naja.SNLTerm.Direction.Input, "D")
+    naja.SNLScalarTerm.create(sdffe_pn0n, naja.SNLTerm.Direction.Input, "E")
+    naja.SNLScalarTerm.create(sdffe_pn0n, naja.SNLTerm.Direction.Output, "Q")
+    naja.SNLScalarTerm.create(sdffe_pn0n, naja.SNLTerm.Direction.Input, "R")
+
+
+def constructSDFFCE_PP0P(lib):
+    sdffce_pp0p = naja.SNLDesign.createPrimitive(lib, "$_SDFFCE_PP0P_")
+    naja.SNLScalarTerm.create(sdffce_pp0p, naja.SNLTerm.Direction.Input, "C")
+    naja.SNLScalarTerm.create(sdffce_pp0p, naja.SNLTerm.Direction.Input, "D")
+    naja.SNLScalarTerm.create(sdffce_pp0p, naja.SNLTerm.Direction.Input, "E")
+    naja.SNLScalarTerm.create(sdffce_pp0p, naja.SNLTerm.Direction.Output, "Q")
+    naja.SNLScalarTerm.create(sdffce_pp0p, naja.SNLTerm.Direction.Input, "R")
+
+
+def constructSDFFCE_PN0N(lib):
+    sdffce_pn0n = naja.SNLDesign.createPrimitive(lib, "$_SDFFCE_PN0N_")
+    naja.SNLScalarTerm.create(sdffce_pn0n, naja.SNLTerm.Direction.Input, "C")
+    naja.SNLScalarTerm.create(sdffce_pn0n, naja.SNLTerm.Direction.Input, "D")
+    naja.SNLScalarTerm.create(sdffce_pn0n, naja.SNLTerm.Direction.Input, "E")
+    naja.SNLScalarTerm.create(sdffce_pn0n, naja.SNLTerm.Direction.Output, "Q")
+    naja.SNLScalarTerm.create(sdffce_pn0n, naja.SNLTerm.Direction.Input, "R")
+
+
+def load(db):
+    logging.info("Loading Yosys primitives")
+    lib = naja.NLLibrary.createPrimitives(db, "yosys")
+    constructAND(lib)
+    constructOR(lib)
+    constructXOR(lib)
+    constructMUX(lib)
+    constructNOT(lib)
+    constructDFFP(lib)
+    constructDFFE_PP(lib)
+    constructDFFE_PN(lib)
+    constructDFF_PP0(lib)
+    constructDFF_PP1(lib)
+    constructDFFE_PP0P(lib)
+    constructDFFE_PP1P(lib)
+    constructDFFE_PP0N(lib)
+    constructSDFF_PP0(lib)
+    constructSDFFE_PP0N(lib)
+    constructSDFFE_PN0P(lib)
+    constructSDFFE_PN0N(lib)
+    constructSDFFCE_PP0P(lib)
+    constructSDFFCE_PN0N(lib)

{najaeda-0.1.23.dist-info → najaeda-0.1.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: najaeda
-Version: 0.1.23
+Version: 0.1.24
 Summary: Naja EDA Python package
 Author-Email: Naja Authors <contact@keplertech.io>
 License: Apache License 2.0

{najaeda-0.1.23.dist-info → najaeda-0.1.24.dist-info}/RECORD

@@ -1,12 +1,17 @@
-najaeda/libnaja_python.so,sha256=DAtUOtN6J-u6yMtHJGm8mqfb_vsgNP1fLKVAqKviKno,1882297
-najaeda/libnaja_nl.so,sha256=9njx8rqW1n06PwcjaPPC_u89k0l1zGjL-w1jc_IJ8ec,1581224
-najaeda/naja.so,sha256=JEGNGoPD4mdBNyRKDrZjbdcxEM3TQPxXzxURHh-pCbw,206521
+najaeda-0.1.24.dist-info/WHEEL,sha256=A3mvWTV2IcEc7qLoVrqpNTZ0QD1zGDiFoYw9zZpB5kA,158
+najaeda-0.1.24.dist-info/METADATA,sha256=lDGwE7Obzgqwy7l70oK7xEsyYsisAYE1pQJwvbcUV_A,3046
+najaeda-0.1.24.dist-info/RECORD,,
+najaeda-0.1.24.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+najaeda-0.1.24.dist-info/licenses/AUTHORS,sha256=7NYEGDAX_1QZvCCHfq8YVXC5ZbwH_pbNI8DcSmm70GU,377
+najaeda/libnaja_python.so,sha256=1_Qi0NU7zbDxtIwnUN0A0FWL4krFMsoYVYB-sqZqiJM,1885729
+najaeda/libnaja_nl.so,sha256=jo5MHqPetOFnO5VElmM1bXtna9lk1RCuiU_ScPF97ak,1646832
+najaeda/naja.so,sha256=FlFyOYoOfNiigS7D3dOAEUphQb-G0Ils2Ac3T9ElBxo,206521
 najaeda/pandas_stats.py,sha256=yOb4ka965U7rN4D6AwvSGmRyeT_O7Ed-5cmT8BFbfeo,1070
 najaeda/stats.py,sha256=wackXsf0x24ic9v-UifECHj4t5yveUWssMDZp2B057A,16187
-najaeda/libnaja_bne.so,sha256=bxIctDmrveTSgKI4YOlhJb06X8PrzoqchQWN0PYNoMc,271329
+najaeda/libnaja_bne.so,sha256=41X1JqKAY6ydVaLZ6NI1qSJgC1MBcIkrCLq0z5nCjNU,272577
 najaeda/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-najaeda/libnaja_opt.so,sha256=ByP9waRBJlZ83gRLFqFknM9hsfpFYyN4zib60YaepdQ,346169
-najaeda/netlist.py,sha256=RA8jMz9uwwlLSLVli5mzqI5Z3RS6mk9YuFol-7SeEIM,53647
+najaeda/libnaja_opt.so,sha256=l7VnRKnJRRy7IVVNTNjXILZrpgYFes6IlCJ0wK1dOAA,348881
+najaeda/netlist.py,sha256=ZFL00PMhc2pl_uu9_c3_lj65gSjD93zYvfbEFBLZhjg,54309
 najaeda/net_visitor.py,sha256=P_esjibYb-wBDuF-AyF7es9sJYw1Ha8RhTPu-qKe7G4,1940
 najaeda/libnaja_dnl.so,sha256=zkSbBWj0qCH6wE2gueif9tKoj6xrN7p9Gk01pHUkGBE,276041
 najaeda/instance_visitor.py,sha256=JMsPSQaWNiDjxS05rxg83a0PIsrOIuTi9G35hkwdibs,1530
@@ -14,6 +19,7 @@ najaeda/native/stats.py,sha256=t50hhE9pEFNtlssjES0A-K9TsO_2ZSUAb-e9L3Rt6yc,13063
 najaeda/native/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 najaeda/primitives/xilinx.py,sha256=Ka-jlu-OxixEZ_yR_niXLHtaUL8HxT1Bg9H9Kpnr4ns,26551
 najaeda/primitives/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+najaeda/primitives/yosys.py,sha256=g1L70AUJoPCkd9B-b9aW4Pzc1AeR9KyIHoXvneW_UEU,8584
 najaeda/docs/requirements.txt,sha256=1XIBGTIplm2arC9HhDCfLuAjozGdVSXkqmOj8ybuT6U,121
 najaeda/docs/.readthedocs.yaml,sha256=nN_Psro-YdfPcIiueZkJcZepts68g23rqVThhKnmVRw,790
 najaeda/docs/source/netlist_classes.rst,sha256=Zrha9MQVEdEwxmP2zhgC0K3iioZXXerzeFoOz5SrOXM,132
@@ -29,11 +35,6 @@ najaeda/docs/source/api.rst,sha256=47VCPyF4Py_1cklZ3q9fmOMhqqI17rxwU_VUJETfCwY,1
 najaeda/docs/source/term.rst,sha256=QKWT6u1xjEjusvcZYknKQ-M83ibohO5y1EYTQnnXqak,690
 najaeda/docs/source/instance.rst,sha256=7B2IBB0p32Tb4qvOCE77OlrQaYpFADvmTlq1q8eyVqw,458
 najaeda/docs/source/conf.py,sha256=XqCFo29gZCbaoPe1xEan9ZonYyQW5NZnWHGEWrB7p8Q,2021
-najaeda-0.1.23.dist-info/WHEEL,sha256=A3mvWTV2IcEc7qLoVrqpNTZ0QD1zGDiFoYw9zZpB5kA,158
-najaeda-0.1.23.dist-info/METADATA,sha256=fUZcD04Cf0r8tlSQgRGVIOQ9NeRfMJYPNLdAR5UcSZE,3046
-najaeda-0.1.23.dist-info/RECORD,,
-najaeda-0.1.23.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-najaeda-0.1.23.dist-info/licenses/AUTHORS,sha256=7NYEGDAX_1QZvCCHfq8YVXC5ZbwH_pbNI8DcSmm70GU,377
 najaeda.libs/libtbbmalloc-8bd2c113.so.2.15,sha256=t7EmHeYI7vtRrpUMImjQuzDv3a1gs8-lcUxotcVs3mA,198281
 najaeda.libs/libcapnp-1-d562dcbf.1.0.so,sha256=oATbFuRyIBdV6dWAaarYlY3DDt3Wvyp1nC5FvgRIyzw,1152985
 najaeda.libs/libtbb-58378cc2.so.12.15,sha256=yxzhDOGKoZHEHYUULdSu-uH9-Hr1Wh8JygBizKBxc_U,404105