dissertation_thesis/ariths-gen-mig
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added instantiation of wires and buses from inputs. Hopefully fixed now.

Browse Source
This commit is contained in:
honzastor 2024-03-28 00:06:53 +01:00
parent cd3441ff00
commit da733cf44e
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ariths_gen/core/arithmetic_circuits/general_circuit.py
View File

@ -30,16 +30,22 @@ class GeneralCircuit():
self.inputs = [] self.inputs = []
input_names = "abcdefghijklmnopqrstuvwxyz" # This should be enough.. input_names = "abcdefghijklmnopqrstuvwxyz" # This should be enough..
assert len(input_names) >= len(inputs) assert len(input_names) >= len(inputs)
for i, input_bus in enumerate(inputs): for i, input in enumerate(inputs):
attr_name = input_names[i] attr_name = input_names[i]
full_prefix = f"{self.prefix}_{input_bus.prefix}" if self.inner_component else f"{input_bus.prefix}" full_prefix = f"{self.prefix}_{input.prefix}" if self.inner_component else f"{input.prefix}"
bus = Bus(prefix=full_prefix, wires_list=input_bus.bus) if isinstance(input, Bus):
setattr(self, attr_name, bus) bus = Bus(prefix=full_prefix, wires_list=input.bus)
self.inputs.append(bus) setattr(self, attr_name, bus)
self.inputs.append(bus)
# If the input bus is an output bus, connect it
if input.is_output_bus():
getattr(self, attr_name).connect_bus(connecting_bus=input)
else:
wire = Wire(name=input.name, prefix=full_prefix)
setattr(self, attr_name, wire)
self.inputs.append(wire)
# If the input bus is an output bus, connect it
if input_bus.is_output_bus():
getattr(self, attr_name).connect_bus(connecting_bus=input_bus)
else: else:
self.inputs = inputs self.inputs = inputs

4
tests/test_all.py
View File

@ -337,7 +337,7 @@ def test_mac():
def test_direct(): def test_direct():
class err_circuit(GeneralCircuit): class err_circuit(GeneralCircuit):
def __init__(self, prefix: str = "", name: str = "adder", inner_component: bool = True, a: Bus = Bus(), b: Bus = Bus()): def __init__(self, a: Bus = Bus(), b: Bus = Bus(), prefix: str = "", name: str = "adder", inner_component: bool = False):
super().__init__(prefix=prefix, name=name, out_N=(a.N + 1), inner_component=inner_component, inputs=[a, b]) super().__init__(prefix=prefix, name=name, out_N=(a.N + 1), inner_component=inner_component, inputs=[a, b])
self.N = 1 self.N = 1
self.prefix = prefix self.prefix = prefix
@ -389,4 +389,6 @@ if __name__ == "__main__":
test_unsigned_add() test_unsigned_add()
test_signed_add() test_signed_add()
test_mac() test_mac()
test_direct()
test_wire_as_bus()
print("Python tests were successful!") print("Python tests were successful!")