Merge branch 'main' into hops

Author: gilbertmike

accelforge/frontend/arch/components.py

@@ -1,4 +1,5 @@
 import copy
+import enum
 import itertools
 import logging
 from numbers import Number
@@ -1303,6 +1304,10 @@ def _render_node_color(self) -> str:
         return "#E0EEFF"
 
 
+class TopologySpec(str, enum.Enum):
+    MESH = "mesh"
+
+
 class Network(Component, Leaf):
     """
     Defines a network component.
@@ -1339,6 +1344,11 @@ class Network(Component, Leaf):
     value for the bits_per_action of all actions of this component.
     """
 
+    topology: TopologySpec = TopologySpec.MESH
+    """
+    The topology of the network.
+    """
+
     def _render_node_shape(self) -> str:
         return "Msquare"
 

accelforge/model/_looptree/latency/memory.py

@@ -14,12 +14,8 @@
 
 from accelforge.model._looptree.reuse.symbolic import BuffetStats
 from accelforge.util._eval_expressions import MATH_FUNCS, eval_expression
-<<<<<<< HEAD
 from accelforge.util._sympy.broadcast_max import Max, Min, MaxGeqZero
-=======
-from accelforge.util._sympy.broadcast_max import Max, Min
 from accelforge.util._basetypes import EvalableList
->>>>>>> main
 import symengine as se
 
 

accelforge/model/run_model.py

@@ -43,7 +43,6 @@ def run_model(
     )
 
     latency = component_latency(reuse, job.flattened_arch, pmapping, spec)
-    print(latency)
     try:
         overall_latency = MaxGeqZero(*latency.values())
     except Exception as e:

tests/input_files/networked/flat.yaml

@@ -7,24 +7,34 @@ arch:
     leak_power: 0
     tensors: {keep: All}
     actions:
-    - {name: read, energy: 100, latency: 0}
-    - {name: write, energy: 100, latency: 0}
+    - {name: read, energy: 0, throughput: inf}
+    - {name: write, energy: 0, throughput: inf}
 
   - !Array
     name: Array
     spatial:
     - {name: X, fanout: 4}
     - {name: Y, fanout: 4}
     nodes:
+    - !Memory
+      name: GlobalBuffer
+      size: inf
+      area: 0
+      leak_power: 0
+      tensors: {keep: ~MainMemory, may_keep: All}
+      actions:
+      - {name: read, energy: 0, throughput: inf}
+      - {name: write, energy: 0, throughput: inf}
+
     - !Memory
       name: RowBuffer
       size: inf
       area: 0
       leak_power: 0
       tensors: {keep: input, may_keep: input}
       actions:
-      - {name: read, energy: 5, latency: 1}
-      - {name: write, energy: 5, latency: 0}
+      - {name: read, energy: 5, throughput: 1}
+      - {name: write, energy: 5, throughput: inf}
       spatial:
       - {name: X, fanout: 4}
 
@@ -35,8 +45,8 @@ arch:
       leak_power: 0
       tensors: {keep: output, may_keep: output}
       actions:
-      - {name: read, energy: 5, latency: 0}
-      - {name: write, energy: 5, latency: 0}
+      - {name: read, energy: 5, throughput: inf}
+      - {name: write, energy: 5, throughput: inf}
       spatial:
       - {name: Y, fanout: 4}
 
@@ -47,8 +57,8 @@ arch:
       leak_power: 0
       tensors: {keep: weight, may_keep: weight}
       actions:
-      - {name: read, energy: 5, latency: 1}
-      - {name: write, energy: 5, latency: 0}
+      - {name: read, energy: 5, throughput: inf}
+      - {name: write, energy: 5, throughput: inf}
       spatial:
       - {name: X, fanout: 2}
       - {name: Y, fanout: 2}
@@ -58,8 +68,7 @@ arch:
       area: 0
       leak_power: 0
       actions:
-      - {name: hops, energy: 1, latency: 0}
-
+      - {name: hops, energy: 1, throughput: inf}
 
   - !Memory
     name: Scratchpad
@@ -68,12 +77,12 @@ arch:
     leak_power: 0
     tensors: {keep: weight, may_keep: weight}
     actions:
-    - {name: read, energy: 1, latency: 0}
-    - {name: write, energy: 1, latency: 0}
+    - {name: read, energy: 1, throughput: inf}
+    - {name: write, energy: 1, throughput: inf}
 
   - !Compute
     name: MAC
     area: 0
     leak_power: 0
     actions:
-    - {name: compute, energy: 1, latency: 0}
+    - {name: compute, energy: 1, throughput: inf}

tests/input_files/networked/hierarchical.yaml

@@ -7,8 +7,8 @@ arch:
     leak_power: 0
     tensors: {keep: All}
     actions:
-    - {name: read, energy: 100, latency: 1e-9}
-    - {name: write, energy: 100, latency: 1e-9}
+    - {name: read, energy: 0, throughput: 1e9}
+    - {name: write, energy: 0, throughput: 1e9}
 
   - !Memory
     name: GlobalBuffer
@@ -17,15 +17,15 @@ arch:
     leak_power: 0
     tensors: {keep: ~MainMemory, may_keep: All}
     actions:
-    - {name: read, energy: 10, latency: 1e-9/4}
-    - {name: write, energy: 10, latency: 1e-9/4}
+    - {name: read, energy: 0, throughput: 4e9}
+    - {name: write, energy: 0, throughput: 4e9}
 
   - !Network
     name: PeArray
     area: 0
     leak_power: 0
     actions:
-    - {name: hops, energy: 5, latency: 1e-9/4}
+    - {name: hops, energy: 1, throughput: 4e9}
 
   - !Memory
     name: Scratchpad
@@ -34,8 +34,8 @@ arch:
     leak_power: 0
     tensors: {keep: All}
     actions:
-    - {name: read, energy: 2, latency: 1e-9/16}
-    - {name: write, energy: 2, latency: 1e-9/16}
+    - {name: read, energy: 0, throughput: 16e9}
+    - {name: write, energy: 0, throughput: 16e9}
     spatial:
     - {name: X, fanout: 2}
     - {name: Y, fanout: 2}
@@ -45,14 +45,14 @@ arch:
     area: 0
     leak_power: 0
     actions:
-    - {name: hops, energy: 1, latency: 1e-9/16}
+    - {name: hops, energy: 1, throughput: 16e9}
 
   - !Compute
     name: MAC
     area: 0
     leak_power: 0
     actions:
-    - {name: compute, energy: 1, latency: 1e-9}
+    - {name: compute, energy: 0, throughput: 1e9}
     spatial:
     - {name: X, fanout: 2}
     - {name: Y, fanout: 2}

tests/input_files/networked/hierarchical_1d.yaml

@@ -7,8 +7,8 @@ arch:
     leak_power: 0
     tensors: {keep: All}
     actions:
-    - {name: read, energy: 0, latency: 0}
-    - {name: write, energy: 0, latency: 0}
+    - {name: read, energy: 0, throughput: inf}
+    - {name: write, energy: 0, throughput: inf}
 
   - !Memory
     name: GlobalBuffer
@@ -17,16 +17,16 @@ arch:
     leak_power: 0
     tensors: {keep: ~MainMemory, may_keep: All}
     actions:
-    - {name: read, energy: 0, latency: 0}
-    - {name: write, energy: 0, latency: 0}
+    - {name: read, energy: 0, throughput: inf}
+    - {name: write, energy: 0, throughput: inf}
 
   - !Network
     name: PeArray
     area: 0
     leak_power: 0
     total_latency: "max_hops"
     actions:
-    - {name: hops, energy: 1, latency: 1}
+    - {name: hops, energy: 1, throughput: 1}
 
   - !Memory
     name: Scratchpad
@@ -35,8 +35,8 @@ arch:
     leak_power: 0
     tensors: {keep: All}
     actions:
-    - {name: read, energy: 0, latency: 0}
-    - {name: write, energy: 0, latency: 0}
+    - {name: read, energy: 0, throughput: inf}
+    - {name: write, energy: 0, throughput: inf}
     spatial:
     - {name: X, fanout: 4}
 
@@ -45,13 +45,13 @@ arch:
     area: 0
     leak_power: 0
     actions:
-    - {name: hops, energy: 1, latency: 0}
+    - {name: hops, energy: 1, throughput: inf}
 
   - !Compute
     name: MAC
     area: 0
     leak_power: 0
     actions:
-    - {name: compute, energy: 0, latency: 0}
+    - {name: compute, energy: 0, throughput: inf}
     spatial:
     - {name: X, fanout: 2}

tests/input_files/networked/rack.yaml

@@ -27,6 +27,7 @@ def test_flat(self):
         spec = af.Spec.from_yaml(
             INPUT_FILES_DIR / "flat.yaml",
         )
+        print(spec.arch.nodes["NoC"])
         self.assertIn("NoC", spec.arch.nodes)
         self.assertEqual(spec.arch.nodes["NoC"].get_fanout(), 1)
         self.assertEqual(