najaeda 0.2.9__cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl → 0.2.11__cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl

najaeda/netlist.py

@@ -72,6 +72,35 @@ def get_snl_path_from_id_list(id_list: list) -> naja.SNLPath:
     return path
 
 
+class Attribute:
+    def __init__(self, snlAttribute):
+        self.snlAttribute = snlAttribute
+
+    def __str__(self):
+        return str(self.snlAttribute)
+
+    def get_name(self):
+        """
+        :return: the name of the attribute.
+        :rtype: str
+        """
+        return self.snlAttribute.getName()
+
+    def has_value(self):
+        """
+        :return: True if the attribute has a value.
+        :rtype: bool
+        """
+        return self.snlAttribute.hasValue()
+
+    def get_value(self):
+        """
+        :return: the value of the attribute.
+        :rtype: str
+        """
+        return self.snlAttribute.getValue()
+
+
 class Equipotential:
     """Class that represents the term and wraps
     some of the snl occurrence API.
@@ -423,6 +452,25 @@ class Net:
         yield from self.get_design_terms()
         yield from self.get_inst_terms()
 
+    def get_attributes(self) -> Iterator[Attribute]:
+        """Iterate over the attributes of this Net.
+
+        :return: the attributes of this Net.
+        :rtype: Iterator[Attribute]
+        """
+        if hasattr(self, "net"):
+            snlnet = self.net
+            for attribute in snlnet.getAttributes():
+                yield Attribute(attribute)
+
+    def count_attributes(self) -> int:
+        """Count the attributes of this Net.
+
+        :return: the number of attributes of this Net.
+        :rtype: int
+        """
+        return sum(1 for _ in self.get_attributes())
+
 
 def get_snl_term_for_ids(pathIDs, termIDs):
     path = get_snl_path_from_id_list(pathIDs)
@@ -638,6 +686,24 @@ class Term:
         elif snlterm.getDirection() == naja.SNLTerm.Direction.InOut:
             return Term.Direction.INOUT
 
+    def get_attributes(self) -> Iterator[Attribute]:
+        """Iterate over the attributes of this Term.
+
+        :return: the attributes of this Term.
+        :rtype: Iterator[Attribute]
+        """
+        snlterm = get_snl_term_for_ids(self.pathIDs, self.termIDs)
+        for attribute in snlterm.getAttributes():
+            yield Attribute(attribute)
+
+    def count_attributes(self) -> int:
+        """Count the attributes of this Term.
+
+        :return: the number of attributes of this Term.
+        :rtype: int
+        """
+        return sum(1 for _ in self.get_attributes())
+
     def get_combinatorial_inputs(self):
         """Get all combinatorial input terms of this instance.
 
@@ -894,35 +960,6 @@ def get_instance_by_path(names: list):
     return get_top().get_child_instance(names)
 
 
-class Attribute:
-    def __init__(self, snlAttribute):
-        self.snlAttribute = snlAttribute
-
-    def __str__(self):
-        return str(self.snlAttribute)
-
-    def get_name(self):
-        """
-        :return: the name of the attribute.
-        :rtype: str
-        """
-        return self.snlAttribute.getName()
-
-    def has_value(self):
-        """
-        :return: True if the attribute has a value.
-        :rtype: bool
-        """
-        return self.snlAttribute.hasValue()
-
-    def get_value(self):
-        """
-        :return: the value of the attribute.
-        :rtype: str
-        """
-        return self.snlAttribute.getValue()
-
-
 class Instance:
     """Class that represents an instance in the design hierarchy.
     """
@@ -1831,7 +1868,7 @@ def apply_constant_propagation():
         naja.NLUniverse.get().applyConstantPropagation()
 
 
-def get_max_fanout() -> int:
+def get_max_fanout() -> list:
     """Get the maximum fanout of the top design.
 
     :return: the maximum fanout of the top design.
@@ -1842,10 +1879,10 @@ def get_max_fanout() -> int:
         top = naja.NLUniverse.get().getTopDesign()
         if top is not None:
             return naja.NLUniverse.get().getMaxFanout()
-    return 0
+    return [0]
 
 
-def get_max_logic_level() -> int:
+def get_max_logic_level() -> list:
     """Get the maximum logic level of the top design.
 
     :return: the maximum logic level of the top design.
@@ -1856,4 +1893,4 @@ def get_max_logic_level() -> int:
         top = naja.NLUniverse.get().getTopDesign()
         if top is not None:
             return naja.NLUniverse.get().getMaxLogicLevel()
-    return 0
+    return [0]

najaeda/primitives/xilinx.py

@@ -6,6 +6,20 @@ import logging
 from najaeda import naja
 
 
+def constructSequentialPrimitive(design, clk):
+    input_terms = []
+    output_terms = []
+    for term in design.getBitTerms():
+        if term == clk:
+            pass
+        if term.getDirection() == naja.SNLTerm.Direction.Input:
+            input_terms.append(term)
+        elif term.getDirection() == naja.SNLTerm.Direction.Output:
+            output_terms.append(term)
+    naja.SNLDesign.addClockToOutputsArcs(clk, output_terms)
+    naja.SNLDesign.addInputsToClockArcs(input_terms, clk)
+
+
 def constructIBUF(lib):
     ibuf = naja.SNLDesign.createPrimitive(lib, "IBUF")
     i = naja.SNLScalarTerm.create(ibuf, naja.SNLTerm.Direction.Input, "I")
@@ -47,7 +61,7 @@ def constructDSP48E1(lib):
     naja.SNLBusTerm.create(dsp48e1, naja.SNLTerm.Direction.Input, 47, 0, "PCIN")
     naja.SNLBusTerm.create(dsp48e1, naja.SNLTerm.Direction.Input, 3, 0, "ALUMODE")
     naja.SNLBusTerm.create(dsp48e1, naja.SNLTerm.Direction.Input, 2, 0, "CARRYINSEL")
-    naja.SNLScalarTerm.create(dsp48e1, naja.SNLTerm.Direction.Input, "CLK")
+    clk = naja.SNLScalarTerm.create(dsp48e1, naja.SNLTerm.Direction.Input, "CLK")
     naja.SNLBusTerm.create(dsp48e1, naja.SNLTerm.Direction.Input, 4, 0, "INMODE")
     naja.SNLBusTerm.create(dsp48e1, naja.SNLTerm.Direction.Input, 6, 0, "OPMODE")
     naja.SNLBusTerm.create(dsp48e1, naja.SNLTerm.Direction.Input, 29, 0, "A")
@@ -97,6 +111,7 @@ def constructDSP48E1(lib):
     naja.SNLParameter.create_boolean(dsp48e1, "USE_DPORT", False)
     naja.SNLParameter.create_string(dsp48e1, "USE_MULT", "MULTIPLY")
     naja.SNLParameter.create_string(dsp48e1, "USE_SIMD", "ONE48")
+    constructSequentialPrimitive(dsp48e1, clk)
 
 
 def constructINV(lib):
@@ -281,20 +296,25 @@ def constructFDSE(lib):
 
 def constructRAM32M(lib):
     ram32m = naja.SNLDesign.createPrimitive(lib, "RAM32M")
-    naja.SNLBusTerm.create(ram32m, naja.SNLTerm.Direction.Output, 1, 0, "DOA")
-    naja.SNLBusTerm.create(ram32m, naja.SNLTerm.Direction.Output, 1, 0, "DOB")
-    naja.SNLBusTerm.create(ram32m, naja.SNLTerm.Direction.Output, 1, 0, "DOC")
-    naja.SNLBusTerm.create(ram32m, naja.SNLTerm.Direction.Output, 1, 0, "DOD")
-    naja.SNLBusTerm.create(ram32m, naja.SNLTerm.Direction.Input, 4, 0, "ADDRA")
-    naja.SNLBusTerm.create(ram32m, naja.SNLTerm.Direction.Input, 4, 0, "ADDRB")
-    naja.SNLBusTerm.create(ram32m, naja.SNLTerm.Direction.Input, 4, 0, "ADDRC")
-    naja.SNLBusTerm.create(ram32m, naja.SNLTerm.Direction.Input, 4, 0, "ADDRD")
-    naja.SNLBusTerm.create(ram32m, naja.SNLTerm.Direction.Input, 1, 0, "DIA")
-    naja.SNLBusTerm.create(ram32m, naja.SNLTerm.Direction.Input, 1, 0, "DIB")
-    naja.SNLBusTerm.create(ram32m, naja.SNLTerm.Direction.Input, 1, 0, "DIC")
-    naja.SNLBusTerm.create(ram32m, naja.SNLTerm.Direction.Input, 1, 0, "DID")
-    naja.SNLScalarTerm.create(ram32m, naja.SNLTerm.Direction.Input, "WCLK")
-    naja.SNLScalarTerm.create(ram32m, naja.SNLTerm.Direction.Input, "WE")
+    doa = naja.SNLBusTerm.create(ram32m, naja.SNLTerm.Direction.Output, 1, 0, "DOA")
+    dob = naja.SNLBusTerm.create(ram32m, naja.SNLTerm.Direction.Output, 1, 0, "DOB")
+    doc = naja.SNLBusTerm.create(ram32m, naja.SNLTerm.Direction.Output, 1, 0, "DOC")
+    dod = naja.SNLBusTerm.create(ram32m, naja.SNLTerm.Direction.Output, 1, 0, "DOD")
+    addra = naja.SNLBusTerm.create(ram32m, naja.SNLTerm.Direction.Input, 4, 0, "ADDRA")
+    addrb = naja.SNLBusTerm.create(ram32m, naja.SNLTerm.Direction.Input, 4, 0, "ADDRB")
+    addrc = naja.SNLBusTerm.create(ram32m, naja.SNLTerm.Direction.Input, 4, 0, "ADDRC")
+    addrd = naja.SNLBusTerm.create(ram32m, naja.SNLTerm.Direction.Input, 4, 0, "ADDRD")
+    naja.SNLDesign.addCombinatorialArcs(doa, list(addra.getBits()))
+    naja.SNLDesign.addCombinatorialArcs(dob, list(addrb.getBits()))
+    naja.SNLDesign.addCombinatorialArcs(doc, list(addrc.getBits()))
+    naja.SNLDesign.addCombinatorialArcs(dod, list(addrd.getBits()))
+    dia = naja.SNLBusTerm.create(ram32m, naja.SNLTerm.Direction.Input, 1, 0, "DIA")
+    dib = naja.SNLBusTerm.create(ram32m, naja.SNLTerm.Direction.Input, 1, 0, "DIB")
+    dic = naja.SNLBusTerm.create(ram32m, naja.SNLTerm.Direction.Input, 1, 0, "DIC")
+    did = naja.SNLBusTerm.create(ram32m, naja.SNLTerm.Direction.Input, 1, 0, "DID")
+    wclk = naja.SNLScalarTerm.create(ram32m, naja.SNLTerm.Direction.Input, "WCLK")
+    we = naja.SNLScalarTerm.create(ram32m, naja.SNLTerm.Direction.Input, "WE")
+    naja.SNLDesign.addInputsToClockArcs([dia, dib, dic, did, we], wclk)
     naja.SNLParameter.create_binary(ram32m, "INIT_A", 64, 0)
     naja.SNLParameter.create_binary(ram32m, "INIT_B", 64, 0)
     naja.SNLParameter.create_binary(ram32m, "INIT_C", 64, 0)
@@ -303,50 +323,80 @@ def constructRAM32M(lib):
 
 def constructRAM64M(lib):
     ram64m = naja.SNLDesign.createPrimitive(lib, "RAM64M")
-    naja.SNLScalarTerm.create(ram64m, naja.SNLTerm.Direction.Output, "DOA")
-    naja.SNLScalarTerm.create(ram64m, naja.SNLTerm.Direction.Output, "DOB")
-    naja.SNLScalarTerm.create(ram64m, naja.SNLTerm.Direction.Output, "DOC")
-    naja.SNLScalarTerm.create(ram64m, naja.SNLTerm.Direction.Output, "DOD")
-    naja.SNLBusTerm.create(ram64m, naja.SNLTerm.Direction.Input, 5, 0, "ADDRA")
-    naja.SNLBusTerm.create(ram64m, naja.SNLTerm.Direction.Input, 5, 0, "ADDRB")
-    naja.SNLBusTerm.create(ram64m, naja.SNLTerm.Direction.Input, 5, 0, "ADDRC")
-    naja.SNLBusTerm.create(ram64m, naja.SNLTerm.Direction.Input, 5, 0, "ADDRD")
-    naja.SNLScalarTerm.create(ram64m, naja.SNLTerm.Direction.Input, "DIA")
-    naja.SNLScalarTerm.create(ram64m, naja.SNLTerm.Direction.Input, "DIB")
-    naja.SNLScalarTerm.create(ram64m, naja.SNLTerm.Direction.Input, "DIC")
-    naja.SNLScalarTerm.create(ram64m, naja.SNLTerm.Direction.Input, "DID")
-    naja.SNLScalarTerm.create(ram64m, naja.SNLTerm.Direction.Input, "WCLK")
-    naja.SNLScalarTerm.create(ram64m, naja.SNLTerm.Direction.Input, "WE")
+    doa = naja.SNLScalarTerm.create(ram64m, naja.SNLTerm.Direction.Output, "DOA")
+    dob = naja.SNLScalarTerm.create(ram64m, naja.SNLTerm.Direction.Output, "DOB")
+    doc = naja.SNLScalarTerm.create(ram64m, naja.SNLTerm.Direction.Output, "DOC")
+    dod = naja.SNLScalarTerm.create(ram64m, naja.SNLTerm.Direction.Output, "DOD")
+    addra = naja.SNLBusTerm.create(ram64m, naja.SNLTerm.Direction.Input, 5, 0, "ADDRA")
+    addrb = naja.SNLBusTerm.create(ram64m, naja.SNLTerm.Direction.Input, 5, 0, "ADDRB")
+    addrc = naja.SNLBusTerm.create(ram64m, naja.SNLTerm.Direction.Input, 5, 0, "ADDRC")
+    addrd = naja.SNLBusTerm.create(ram64m, naja.SNLTerm.Direction.Input, 5, 0, "ADDRD")
+    naja.SNLDesign.addCombinatorialArcs(doa, list(addra.getBits()))
+    naja.SNLDesign.addCombinatorialArcs(dob, list(addrb.getBits()))
+    naja.SNLDesign.addCombinatorialArcs(doc, list(addrc.getBits()))
+    naja.SNLDesign.addCombinatorialArcs(dod, list(addrd.getBits()))
+    dia = naja.SNLScalarTerm.create(ram64m, naja.SNLTerm.Direction.Input, "DIA")
+    dib = naja.SNLScalarTerm.create(ram64m, naja.SNLTerm.Direction.Input, "DIB")
+    dic = naja.SNLScalarTerm.create(ram64m, naja.SNLTerm.Direction.Input, "DIC")
+    did = naja.SNLScalarTerm.create(ram64m, naja.SNLTerm.Direction.Input, "DID")
+    wclk = naja.SNLScalarTerm.create(ram64m, naja.SNLTerm.Direction.Input, "WCLK")
+    we = naja.SNLScalarTerm.create(ram64m, naja.SNLTerm.Direction.Input, "WE")
+    naja.SNLDesign.addInputsToClockArcs([dia, dib, dic, did, we], wclk)
     naja.SNLParameter.create_binary(ram64m, "INIT_A", 64, 0)
     naja.SNLParameter.create_binary(ram64m, "INIT_B", 64, 0)
     naja.SNLParameter.create_binary(ram64m, "INIT_C", 64, 0)
     naja.SNLParameter.create_binary(ram64m, "INIT_D", 64, 0)
+    naja.SNLParameter.create_binary(ram64m, "IS_WCLK_INVERTED", 1, 0)
 
 
 def constructRAMB18E1(lib):
+    a_inputs = []
+    b_inputs = []
+    a_outputs = []
+    b_outputs = []
     ramb18e1 = naja.SNLDesign.createPrimitive(lib, "RAMB18E1")
-    naja.SNLBusTerm.create(ramb18e1, naja.SNLTerm.Direction.Input, 13, 0, "ADDRARDADDR")
-    naja.SNLBusTerm.create(ramb18e1, naja.SNLTerm.Direction.Input, 13, 0, "ADDRBWRADDR")
-    naja.SNLScalarTerm.create(ramb18e1, naja.SNLTerm.Direction.Input, "CLKARDCLK")
-    naja.SNLScalarTerm.create(ramb18e1, naja.SNLTerm.Direction.Input, "CLKBWRCLK")
-    naja.SNLBusTerm.create(ramb18e1, naja.SNLTerm.Direction.Input, 15, 0, "DIADI")
-    naja.SNLBusTerm.create(ramb18e1, naja.SNLTerm.Direction.Input, 15, 0, "DIBDI")
-    naja.SNLBusTerm.create(ramb18e1, naja.SNLTerm.Direction.Input, 1, 0, "DIPADIP")
-    naja.SNLBusTerm.create(ramb18e1, naja.SNLTerm.Direction.Input, 1, 0, "DIPBDIP")
-    naja.SNLBusTerm.create(ramb18e1, naja.SNLTerm.Direction.Output, 15, 0, "DOADO")
-    naja.SNLBusTerm.create(ramb18e1, naja.SNLTerm.Direction.Output, 15, 0, "DOBDO")
-    naja.SNLBusTerm.create(ramb18e1, naja.SNLTerm.Direction.Output, 1, 0, "DOPADOP")
-    naja.SNLBusTerm.create(ramb18e1, naja.SNLTerm.Direction.Output, 1, 0, "DOPBDOP")
-    naja.SNLScalarTerm.create(ramb18e1, naja.SNLTerm.Direction.Input, "ENARDEN")
-    naja.SNLScalarTerm.create(ramb18e1, naja.SNLTerm.Direction.Input, "ENBWREN")
-    naja.SNLScalarTerm.create(ramb18e1, naja.SNLTerm.Direction.Input, "REGCEAREGCE")
-    naja.SNLScalarTerm.create(ramb18e1, naja.SNLTerm.Direction.Input, "REGCEB")
-    naja.SNLScalarTerm.create(ramb18e1, naja.SNLTerm.Direction.Input, "RSTRAMARSTRAM")
-    naja.SNLScalarTerm.create(ramb18e1, naja.SNLTerm.Direction.Input, "RSTRAMB")
-    naja.SNLScalarTerm.create(ramb18e1, naja.SNLTerm.Direction.Input, "RSTREGARSTREG")
-    naja.SNLScalarTerm.create(ramb18e1, naja.SNLTerm.Direction.Input, "RSTREGB")
-    naja.SNLBusTerm.create(ramb18e1, naja.SNLTerm.Direction.Input, 1, 0, "WEA")
-    naja.SNLBusTerm.create(ramb18e1, naja.SNLTerm.Direction.Input, 3, 0, "WEBWE")
+    addra = naja.SNLBusTerm.create(ramb18e1, naja.SNLTerm.Direction.Input, 13, 0, "ADDRARDADDR")
+    a_inputs.extend(list(addra.getBits()))
+    addrb = naja.SNLBusTerm.create(ramb18e1, naja.SNLTerm.Direction.Input, 13, 0, "ADDRBWRADDR")
+    b_inputs.extend(list(addrb.getBits()))
+    clka = naja.SNLScalarTerm.create(ramb18e1, naja.SNLTerm.Direction.Input, "CLKARDCLK")
+    clkb = naja.SNLScalarTerm.create(ramb18e1, naja.SNLTerm.Direction.Input, "CLKBWRCLK")
+    diadi = naja.SNLBusTerm.create(ramb18e1, naja.SNLTerm.Direction.Input, 15, 0, "DIADI")
+    a_inputs.extend(list(diadi.getBits()))
+    dibdi = naja.SNLBusTerm.create(ramb18e1, naja.SNLTerm.Direction.Input, 15, 0, "DIBDI")
+    b_inputs.extend(list(dibdi.getBits()))
+    dipadip = naja.SNLBusTerm.create(ramb18e1, naja.SNLTerm.Direction.Input, 1, 0, "DIPADIP")
+    a_inputs.extend(list(dipadip.getBits()))
+    dipbdip = naja.SNLBusTerm.create(ramb18e1, naja.SNLTerm.Direction.Input, 1, 0, "DIPBDIP")
+    b_inputs.extend(list(dipbdip.getBits()))
+    doado = naja.SNLBusTerm.create(ramb18e1, naja.SNLTerm.Direction.Output, 15, 0, "DOADO")
+    a_outputs.extend(list(doado.getBits()))
+    dobdo = naja.SNLBusTerm.create(ramb18e1, naja.SNLTerm.Direction.Output, 15, 0, "DOBDO")
+    b_outputs.extend(list(dobdo.getBits()))
+    dopadop = naja.SNLBusTerm.create(ramb18e1, naja.SNLTerm.Direction.Output, 1, 0, "DOPADOP")
+    a_outputs.extend(list(dopadop.getBits()))
+    dopbdop = naja.SNLBusTerm.create(ramb18e1, naja.SNLTerm.Direction.Output, 1, 0, "DOPBDOP")
+    b_outputs.extend(list(dopbdop.getBits()))
+    enarden = naja.SNLScalarTerm.create(ramb18e1, naja.SNLTerm.Direction.Input, "ENARDEN")
+    a_inputs.append(enarden)
+    enbwren = naja.SNLScalarTerm.create(ramb18e1, naja.SNLTerm.Direction.Input, "ENBWREN")
+    b_inputs.append(enbwren)
+    regcear = naja.SNLScalarTerm.create(ramb18e1, naja.SNLTerm.Direction.Input, "REGCEAREGCE")
+    a_inputs.append(regcear)
+    regceb = naja.SNLScalarTerm.create(ramb18e1, naja.SNLTerm.Direction.Input, "REGCEB")
+    b_inputs.append(regceb)
+    rstrama = naja.SNLScalarTerm.create(ramb18e1, naja.SNLTerm.Direction.Input, "RSTRAMARSTRAM")
+    a_inputs.append(rstrama)
+    rstramb = naja.SNLScalarTerm.create(ramb18e1, naja.SNLTerm.Direction.Input, "RSTRAMB")
+    b_inputs.append(rstramb)
+    rstregar = naja.SNLScalarTerm.create(ramb18e1, naja.SNLTerm.Direction.Input, "RSTREGARSTREG")
+    a_inputs.append(rstregar)
+    rstregb = naja.SNLScalarTerm.create(ramb18e1, naja.SNLTerm.Direction.Input, "RSTREGB")
+    b_inputs.append(rstregb)
+    wea = naja.SNLBusTerm.create(ramb18e1, naja.SNLTerm.Direction.Input, 1, 0, "WEA")
+    a_inputs.extend(list(wea.getBits()))
+    webwe = naja.SNLBusTerm.create(ramb18e1, naja.SNLTerm.Direction.Input, 3, 0, "WEBWE")
+    b_inputs.extend(list(webwe.getBits()))
     naja.SNLParameter.create_decimal(ramb18e1, "DOA_REG", 0)
     naja.SNLParameter.create_decimal(ramb18e1, "DOB_REG", 0)
     naja.SNLParameter.create_binary(ramb18e1, "INIT_A", 18, 0x00000)
@@ -366,43 +416,93 @@ def constructRAMB18E1(lib):
     naja.SNLParameter.create_string(ramb18e1, "WRITE_MODE_B", "WRITE_FIRST")
     naja.SNLParameter.create_decimal(ramb18e1, "WRITE_WIDTH_A", 0)
     naja.SNLParameter.create_decimal(ramb18e1, "WRITE_WIDTH_B", 0)
+    naja.SNLDesign.addInputsToClockArcs(a_inputs, clka)
+    naja.SNLDesign.addInputsToClockArcs(b_inputs, clkb)
+    naja.SNLDesign.addClockToOutputsArcs(clka, a_outputs)
+    naja.SNLDesign.addClockToOutputsArcs(clkb, b_outputs)
 
 
 def constructRAMB36E1(lib):
+    a_inputs = []
+    b_inputs = []
+    a_outputs = []
+    b_outputs = []
     ramb36e1 = naja.SNLDesign.createPrimitive(lib, "RAMB36E1")
-    naja.SNLBusTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, 15, 0, "ADDRARDADDR")
-    naja.SNLBusTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, 15, 0, "ADDRBWRADDR")
-    naja.SNLScalarTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, "CASCADEINA")
-    naja.SNLScalarTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, "CASCADEINB")
-    naja.SNLScalarTerm.create(ramb36e1, naja.SNLTerm.Direction.Output, "CASCADEOUTA")
-    naja.SNLScalarTerm.create(ramb36e1, naja.SNLTerm.Direction.Output, "CASCADEOUTB")
-    naja.SNLScalarTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, "CLKARDCLK")
-    naja.SNLScalarTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, "CLKBWRCLK")
-    naja.SNLScalarTerm.create(ramb36e1, naja.SNLTerm.Direction.Output, "DBITERR")
-    naja.SNLBusTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, 31, 0, "DIADI")
-    naja.SNLBusTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, 31, 0, "DIBDI")
-    naja.SNLBusTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, 3, 0, "DIPADIP")
-    naja.SNLBusTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, 3, 0, "DIPBDIP")
-    naja.SNLBusTerm.create(ramb36e1, naja.SNLTerm.Direction.Output, 31, 0, "DOADO")
-    naja.SNLBusTerm.create(ramb36e1, naja.SNLTerm.Direction.Output, 31, 0, "DOBDO")
-    naja.SNLBusTerm.create(ramb36e1, naja.SNLTerm.Direction.Output, 3, 0, "DOPADOP")
-    naja.SNLBusTerm.create(ramb36e1, naja.SNLTerm.Direction.Output, 3, 0, "DOPBDOP")
-    naja.SNLBusTerm.create(ramb36e1, naja.SNLTerm.Direction.Output, 7, 0, "ECCPARITY")
-    naja.SNLScalarTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, "ENARDEN")
-    naja.SNLScalarTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, "ENBWREN")
-    naja.SNLScalarTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, "INJECTDBITERR")
-    naja.SNLScalarTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, "INJECTSBITERR")
-    naja.SNLBusTerm.create(ramb36e1, naja.SNLTerm.Direction.Output, 8, 0, "RDADDRECC")
-    naja.SNLScalarTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, "REGCEAREGCE")
-    naja.SNLScalarTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, "REGCEB")
-    naja.SNLScalarTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, "RSTRAMARSTRAM")
-    naja.SNLScalarTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, "RSTRAMB")
-    naja.SNLScalarTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, "RSTREGARSTREG")
-    naja.SNLScalarTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, "RSTREGB")
-    naja.SNLScalarTerm.create(ramb36e1, naja.SNLTerm.Direction.Output, "SBITERR")
-    naja.SNLBusTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, 3, 0, "WEA")
-    naja.SNLBusTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, 7, 0, "WEBWE")
-
+    addra = naja.SNLBusTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, 15, 0, "ADDRARDADDR")
+    a_inputs.extend(list(addra.getBits()))
+    addrb = naja.SNLBusTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, 15, 0, "ADDRBWRADDR")
+    b_inputs.extend(list(addrb.getBits()))
+    cascadeina = naja.SNLScalarTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, "CASCADEINA")
+    a_inputs.append(cascadeina)
+    cascadeinb = naja.SNLScalarTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, "CASCADEINB")
+    b_inputs.append(cascadeinb)
+    cascadeouta = naja.SNLScalarTerm.create(ramb36e1, naja.SNLTerm.Direction.Output, "CASCADEOUTA")
+    a_outputs.append(cascadeouta)
+    cascadeoutb = naja.SNLScalarTerm.create(ramb36e1, naja.SNLTerm.Direction.Output, "CASCADEOUTB")
+    b_outputs.append(cascadeoutb)
+    clka = naja.SNLScalarTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, "CLKARDCLK")
+    clkb = naja.SNLScalarTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, "CLKBWRCLK")
+    dbiterr = naja.SNLScalarTerm.create(ramb36e1, naja.SNLTerm.Direction.Output, "DBITERR")
+    a_outputs.append(dbiterr)  # not sure about which kind of modeling to put here...
+    diadi = naja.SNLBusTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, 31, 0, "DIADI")
+    a_inputs.extend(list(diadi.getBits()))
+    dibdi = naja.SNLBusTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, 31, 0, "DIBDI")
+    b_inputs.extend(list(dibdi.getBits()))
+    dipadip = naja.SNLBusTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, 3, 0, "DIPADIP")
+    a_inputs.extend(list(dipadip.getBits()))
+    dipbdip = naja.SNLBusTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, 3, 0, "DIPBDIP")
+    b_inputs.extend(list(dipbdip.getBits()))
+    doado = naja.SNLBusTerm.create(ramb36e1, naja.SNLTerm.Direction.Output, 31, 0, "DOADO")
+    a_outputs.extend(list(doado.getBits()))
+    dobdo = naja.SNLBusTerm.create(ramb36e1, naja.SNLTerm.Direction.Output, 31, 0, "DOBDO")
+    b_outputs.extend(list(dobdo.getBits()))
+    dopadop = naja.SNLBusTerm.create(ramb36e1, naja.SNLTerm.Direction.Output, 3, 0, "DOPADOP")
+    a_outputs.extend(list(dopadop.getBits()))
+    dopbdop = naja.SNLBusTerm.create(ramb36e1, naja.SNLTerm.Direction.Output, 3, 0, "DOPBDOP")
+    b_outputs.extend(list(dopbdop.getBits()))
+    eccparity = naja.SNLBusTerm.create(ramb36e1, naja.SNLTerm.Direction.Output, 7, 0, "ECCPARITY")
+    # not sure about which kind of modeling to put here.
+    a_outputs.extend(list(eccparity.getBits()))
+    enarden = naja.SNLScalarTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, "ENARDEN")
+    a_inputs.append(enarden)
+    enbwren = naja.SNLScalarTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, "ENBWREN")
+    b_inputs.append(enbwren)
+    injectdbiterr = naja.SNLScalarTerm.create(
+        ramb36e1, naja.SNLTerm.Direction.Input, "INJECTDBITERR"
+    )
+    injectsbiterr = naja.SNLScalarTerm.create(
+        ramb36e1, naja.SNLTerm.Direction.Input, "INJECTSBITERR"
+    )
+    a_inputs.append(injectdbiterr)  # not sure about which kind of modeling to put here.
+    a_inputs.append(injectsbiterr)  # not sure about which kind of modeling to put here.
+    rdaddrecc = naja.SNLBusTerm.create(ramb36e1, naja.SNLTerm.Direction.Output, 8, 0, "RDADDRECC")
+    a_outputs.extend(list(rdaddrecc.getBits()))
+    regcearegce = naja.SNLScalarTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, "REGCEAREGCE")
+    a_inputs.append(regcearegce)
+    regceb = naja.SNLScalarTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, "REGCEB")
+    b_inputs.append(regceb)
+    rstramarstram = naja.SNLScalarTerm.create(
+        ramb36e1, naja.SNLTerm.Direction.Input, "RSTRAMARSTRAM"
+    )
+    a_inputs.append(rstramarstram)
+    rstramb = naja.SNLScalarTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, "RSTRAMB")
+    b_inputs.append(rstramb)
+    rstregarstreg = naja.SNLScalarTerm.create(
+        ramb36e1, naja.SNLTerm.Direction.Input, "RSTREGARSTREG"
+    )
+    a_inputs.append(rstregarstreg)
+    rstregb = naja.SNLScalarTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, "RSTREGB")
+    b_inputs.append(rstregb)
+    sbiterr = naja.SNLScalarTerm.create(ramb36e1, naja.SNLTerm.Direction.Output, "SBITERR")
+    a_outputs.append(sbiterr)  # not sure about which kind of modeling to put here.
+    wea = naja.SNLBusTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, 3, 0, "WEA")
+    a_inputs.extend(list(wea.getBits()))
+    webwe = naja.SNLBusTerm.create(ramb36e1, naja.SNLTerm.Direction.Input, 7, 0, "WEBWE")
+    b_inputs.extend(list(webwe.getBits()))
+    naja.SNLDesign.addInputsToClockArcs(a_inputs, clka)
+    naja.SNLDesign.addInputsToClockArcs(b_inputs, clkb)
+    naja.SNLDesign.addClockToOutputsArcs(clka, a_outputs)
+    naja.SNLDesign.addClockToOutputsArcs(clkb, b_outputs)
     naja.SNLParameter.create_decimal(ramb36e1, "DOA_REG", 0)
     naja.SNLParameter.create_decimal(ramb36e1, "DOB_REG", 0)
     naja.SNLParameter.create_binary(ramb36e1, "INIT_A", 36, 0)

{najaeda-0.2.9.dist-info → najaeda-0.2.11.dist-info}/METADATA

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

{najaeda-0.2.9.dist-info → najaeda-0.2.11.dist-info}/RECORD

@@ -1,25 +1,25 @@
-najaeda-0.2.9.dist-info/WHEEL,sha256=O-kQWbnqYG0EPiwFvyyj4v3pknaA3HygCBC7AmJ4_ZE,158
-najaeda-0.2.9.dist-info/METADATA,sha256=GMUJC6rYW2tPNfdLcHNehuXdBa5yuOhnFaSFa8gwbek,3655
-najaeda-0.2.9.dist-info/RECORD,,
-najaeda-0.2.9.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-najaeda-0.2.9.dist-info/licenses/AUTHORS,sha256=7NYEGDAX_1QZvCCHfq8YVXC5ZbwH_pbNI8DcSmm70GU,377
-najaeda/libnaja_python.so,sha256=oiZCw1kAVHmZpaWxZMs5HPMqtlvX6ad1q4F0dZLG5ng,1954081
+najaeda-0.2.11.dist-info/WHEEL,sha256=O-kQWbnqYG0EPiwFvyyj4v3pknaA3HygCBC7AmJ4_ZE,158
+najaeda-0.2.11.dist-info/METADATA,sha256=ZsUuSVVSJ8dJzc6WxNuIn-tdwcrH9C3uIFC0ZkMOpQQ,3656
+najaeda-0.2.11.dist-info/RECORD,,
+najaeda-0.2.11.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+najaeda-0.2.11.dist-info/licenses/AUTHORS,sha256=7NYEGDAX_1QZvCCHfq8YVXC5ZbwH_pbNI8DcSmm70GU,377
+najaeda/libnaja_python.so,sha256=gALZELp7XXePA96d6aJPaL2xJIq6YzFWDwwFeoqppR0,1954817
 najaeda/_version.py,sha256=c-4hT20dyE-3BcdzOqR0vd92E7ydR5u2c-VmCc6oU8A,332
-najaeda/libnaja_nl.so,sha256=DKFF61GRSJ9HN-EAi4CWId0TAOMo04a5vZzsO8wabN4,1646960
-najaeda/naja.so,sha256=h2gNvM88NyTILN5qs3J2BJlP2l9f47wEw6Ufk4LKSR0,206561
+najaeda/libnaja_nl.so,sha256=OsVNt5Xg3ZiLX9_LYibN2oT486Q673338vzsBeIo8RQ,1646968
+najaeda/naja.so,sha256=tsg_vPNAoHoNETtKiaG4Bo-siSH3kOs-1f0Y8dfWxIo,206561
 najaeda/pandas_stats.py,sha256=yOb4ka965U7rN4D6AwvSGmRyeT_O7Ed-5cmT8BFbfeo,1070
 najaeda/stats.py,sha256=g1F1CEBNVvGgzINOI7sK83123cCbclLDmyUjuep3-EU,16107
-najaeda/libnaja_metrics.so,sha256=weTjkcgBVv_aY8Mdr2zPSJv2NtQoMgQYXJKAYrgEsRA,206361
+najaeda/libnaja_metrics.so,sha256=OiBunO0ZP4r1Gpr9a9nxn9DVgIURtWOhK42M2S2lQ_s,276505
 najaeda/libnaja_bne.so,sha256=ejZf2Zl2AXQagN41HIj8x-3oeoyEffcPTPR0YeY40ng,272577
 najaeda/__init__.py,sha256=6QrOzlqTfd558FH9Zm6ve54IzkHaDJ8ZO8hTCaEwsL8,218
 najaeda/libnaja_opt.so,sha256=oFT5aS0zO_0UJMBCqEtOnVJeQgDytasPBBtfrGsBZbA,348713
-najaeda/netlist.py,sha256=iDaELvPq9irnAPmk6F7LqjP0W6w9uUpb3b_UG900Q-g,63744
+najaeda/netlist.py,sha256=ul6AMYWKDuAOmo_1P0z8KBiClfcQdhff_XBlYeTnmGk,64921
 najaeda/net_visitor.py,sha256=P_esjibYb-wBDuF-AyF7es9sJYw1Ha8RhTPu-qKe7G4,1940
-najaeda/libnaja_dnl.so,sha256=ErtKaZ2RWYxG_lqmzQXCFakI8yRItTXQEFSvDlaSCQc,276937
+najaeda/libnaja_dnl.so,sha256=nQYOVvmV2dZ2qYkVhp7zhAZ3Ny8X8ay_xsujYV8L6YM,276985
 najaeda/instance_visitor.py,sha256=JMsPSQaWNiDjxS05rxg83a0PIsrOIuTi9G35hkwdibs,1530
 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/xilinx.py,sha256=dBzS0bDF9e3kGqadwJDW2H3LmvNfh-AZCU7Hup9ScQQ,31401
 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