Merge remote-tracking branch 'origin/mapping_to_cgra' into vector-acc…

…um-unit-tests

compiler/sam-outputs/onyx-dot/masked_broadcast.gv

@@ -0,0 +1,27 @@
+digraph SAM {
+    comment="X=ss01,B=ss01,c=s0"
+    0 [comment="type=fiberlookup,index=i,tensor=B,mode=0,format=compressed,src=true,root=true" label="FiberLookup i: B\ncompressed" color=green4 shape=box style=filled type="fiberlookup" index="i" tensor="B" mode="0" format="compressed" src="true" root="true"]
+    1 [comment="type=repsiggen,index=i" label="RepeatSignalGenerator i" color=cyan3 shape=box style=filled type="repsiggen" index="i"]
+    2 [comment="type=repeat,index=i,tensor=c,root=true" label="Repeat i: B" color=cyan2 shape=box style=filled type="repeat" index="i" tensor="c" root="true"]
+    3 [comment="type=fiberlookup,index=i,tensor=c,mode=0,format=compressed,src=true,root=false" label="FiberLookup i: c\ncompressed" color=green4 shape=box style=filled type="fiberlookup" index="i" tensor="c" mode="0" format="compressed" src="true" root="false"]
+    4 [comment="type=fiberlookup,index=j,tensor=B,mode=1,format=compressed,src=true,root=false" label="FiberLookup j: B\ncompressed" color=green4 shape=box style=filled type="fiberlookup" index="j" tensor="B" mode="1" format="compressed" src="true" root="false"]
+    5 [comment="type=intersect,index=j" label="intersect j" color=purple shape=box style=filled type="intersect" index="j"]
+    6 [comment="type=arrayvals,tensor=c" label="Array Vals: c" color=green2 shape=box style=filled type="arrayvals" tensor="c"]
+    7 [comment="type=fiberwrite,index=i,tensor=X,mode=0,format=compressed,segsize=2,crdsize=B0_dim,sink=true" label="FiberWrite i: X0\ncompressed" color=green3 shape=box style=filled type="fiberwrite" index="i" tensor="X" mode="0" format="compressed" segsize="2" crdsize="B0_dim" sink="true"]
+    8 [comment="type=fiberwrite,index=j,tensor=X,mode=1,format=compressed,segsize=B0_dim+1,crdsize=B0_dim*B1_dim,sink=true" label="FiberWrite j: X1\ncompressed" color=green3 shape=box style=filled type="fiberwrite" index="j" tensor="X" mode="1" format="compressed" segsize="B0_dim+1" crdsize="B0_dim*B1_dim" sink="true"]
+    9 [comment="type=fiberwrite,mode=vals,tensor=X,size=1*B0_dim*B1_dim,sink=true" label="FiberWrite Vals: X" color=green3 shape=box style=filled type="fiberwrite" tensor="X" mode="vals" size="1*B0_dim*B1_dim" sink="true"]
+    10 [comment="type=broadcast" shape=point style=invis type="broadcast"]
+    0 -> 10 [label="crd" style=dashed type="crd"]
+    10 -> 1 [label="crd" style=dashed type="crd"]
+    1 -> 2 [label="repsig" style=dotted type="repsig"]
+    2 -> 3 [label="ref" style=bold type="ref"]
+    0 -> 4 [label="ref" style=bold type="ref"]
+    3 -> 5 [label="ref_in-c" style=bold type="ref" comment="in-c"]
+    3 -> 5 [label="crd_in-c" style=dashed type="crd" comment="in-c"]
+    4 -> 5 [label="ref_in-B", style=bold type="ref" comment="in-B"]
+    4 -> 5 [label="crd_in-B", style=dashed type="crd" comment="in-B"]
+    5 -> 6 [label="ref_out-c", style=bold type="ref" comment="out-c"]
+    10 -> 7 [label="crd", style=dashed type="crd"]
+    5 -> 8 [label="crd", style=dashed type="crd"]
+    6 -> 9 [label="val", type="val"]
+}

compiler/sam-outputs/onyx-dot/spmm_ijk_crddrop.gv

@@ -0,0 +1,55 @@
+digraph SAM {
+    comment="X=ss01,B=dd01,C=ss10"
+    17 [comment="type=fiberlookup,index=i,tensor=B,mode=0,format=dense,src=true,root=true" label="FiberLookup i: B0\ndense" color=green4 shape=box style=filled type="fiberlookup" index="i" tensor="B" mode="0" format="dense" src="true" root="true"]
+    16 [comment="type=broadcast" shape=point style=invis type="broadcast"]
+    2 [comment="type=fiberwrite,index=i,tensor=X,mode=0,format=compressed,segsize=2,crdsize=B0_dim,sink=true" label="FiberWrite i: X0\ncompressed" color=green3 shape=box style=filled type="fiberwrite" index="i" tensor="X" mode="0" format="compressed" segsize="2" crdsize="B0_dim" sink="true"]
+    15 [comment="type=repsiggen,index=i" label="RepeatSignalGenerator i" color=cyan3 shape=box style=filled type="repsiggen" index="i"]
+    14 [comment="type=repeat,index=i,tensor=C,root=true" label="Repeat i: C" color=cyan2 shape=box style=filled type="repeat" index="i" tensor="C" root="true"]
+    13 [comment="type=fiberlookup,index=j,tensor=C,mode=1,format=compressed,src=true,root=false" label="FiberLookup j: C1\ncompressed" color=green4 shape=box style=filled type="fiberlookup" index="j" tensor="C" mode="1" format="compressed" src="true" root="false"]
+    12 [comment="type=broadcast" shape=point style=invis type="broadcast"]
+    1 [comment="type=fiberwrite,index=j,tensor=X,mode=1,format=compressed,segsize=B0_dim+1,crdsize=B0_dim*C1_dim,sink=true" label="FiberWrite j: X1\ncompressed" color=green3 shape=box style=filled type="fiberwrite" index="j" tensor="X" mode="1" format="compressed" segsize="B0_dim+1" crdsize="B0_dim*C1_dim" sink="true"]
+    11 [comment="type=repsiggen,index=j" label="RepeatSignalGenerator j" color=cyan3 shape=box style=filled type="repsiggen" index="j"]
+    10 [comment="type=repeat,index=j,tensor=B,root=false" label="Repeat j: B" color=cyan2 shape=box style=filled type="repeat" index="j" tensor="B" root="false"]
+    8 [comment="type=fiberlookup,index=k,tensor=B,mode=1,format=dense,src=true,root=false" label="FiberLookup k: B1\ndense" color=green4 shape=box style=filled type="fiberlookup" index="k" tensor="B" mode="1" format="dense" src="true" root="false"]
+    7 [comment="type=intersect,index=k" label="intersect k" color=purple shape=box style=filled type="intersect" index="k"]
+    5 [comment="type=arrayvals,tensor=B" label="Array Vals: B" color=green2 shape=box style=filled type="arrayvals" tensor="B"]
+    4 [comment="type=mul" label="Mul" color=brown shape=box style=filled type="mul"]
+    3 [comment="type=reduce" label="Reduce" color=brown shape=box style=filled type="reduce"]
+    0 [comment="type=fiberwrite,mode=vals,tensor=X,size=1*B0_dim*C1_dim,sink=true" label="FiberWrite Vals: X" color=green3 shape=box style=filled type="fiberwrite" tensor="X" mode="vals" size="1*B0_dim*C1_dim" sink="true"]
+    6 [comment="type=arrayvals,tensor=C" label="Array Vals: C" color=green2 shape=box style=filled type="arrayvals" tensor="C"]
+    9 [comment="type=fiberlookup,index=k,tensor=C,mode=0,format=compressed,src=true,root=false" label="FiberLookup k: C0\ncompressed" color=green4 shape=box style=filled type="fiberlookup" index="k" tensor="C" mode="0" format="compressed" src="true" root="false"]
+    18 [comment="type=crddrop,outer=i,inner=j" label="CrdDrop i,j" color=orange shape=box style=filled type="crddrop" outer="i" inner="j"]
+    19 [comment="type=crddrop,outer=j,inner=k" label="CrdDrop j,k" color=orange shape=box style=filled type="crddrop" outer="j" inner="k"]
+
+    17 -> 16 [label="crd" style=dashed type="crd" comment=""]
+    # 16 -> 2 [label="crd" style=dashed type="crd"]
+    16 -> 15 [label="crd" style=dashed type="crd"]
+    15 -> 14 [label="repsig" style=dotted type="repsig"]
+    14 -> 13 [label="ref" style=bold type="ref"]
+    13 -> 12 [label="crd" style=dashed type="crd" comment=""]
+    # 12 -> 1 [label="crd" style=dashed type="crd"]
+    12 -> 11 [label="crd" style=dashed type="crd"]
+    11 -> 10 [label="repsig" style=dotted type="repsig"]
+    10 -> 8 [label="ref" style=bold type="ref"]
+    8 -> 7 [label="crd_in-B" style=dashed type="crd" comment="in-B"]
+    7 -> 5 [label="ref_out-B" style=bold type="ref" comment="out-B"]
+    5 -> 4 [label="val" type="val"]
+    # 4 -> 3 [label="val" type="val"]
+    3 -> 0 [label="val" type="val"]
+    7 -> 6 [label="ref_out-C" style=bold type="ref" comment="out-C"]
+    6 -> 4 [label="val" type="val"]
+    8 -> 7 [label="ref_in-B" style=bold type="ref" comment="in-B"]
+    13 -> 9 [label="ref" style=bold type="ref" comment=""]
+    9 -> 7 [label="crd_in-C" style=dashed type="crd" comment="in-C"]
+    9 -> 7 [label="ref_in-C" style=bold type="ref" comment="in-C"]
+    17 -> 10 [label="ref" style=bold type="ref" comment=""]
+
+    4 -> 19 [label="val_inner-k" type="val" comment="inner-k"]
+    12 -> 19 [label="crd_outer-j" style=dashed type="crd" comment="outer-j"]
+    18 -> 1 [label="crd_inner-j" style=dashed type="crd" comment="inner-j"]
+    19 -> 3 [label="val_inner-k" type="val" comment="inner-k"]
+
+    19 -> 18 [label="crd_inner-j" style=dashed type="crd" comment="inner-j"] 
+    16 -> 18 [label="crd_outer-i" style=dashed type="crd" comment="outer-i"] 
+    18 -> 2 [label="crd_outer-i" style=dashed type="crd" comment="outer-i"] 
+}

compiler/sam-outputs/onyx-dot/trans_masked_broadcast.gv

@@ -0,0 +1,27 @@
+digraph SAM {
+    comment="X=ss01,B=ss01,c=s0"
+    0 [comment="type=fiberlookup,index=i,tensor=B,mode=0,format=compressed,src=true,root=true" label="FiberLookup i: B\ncompressed" color=green4 shape=box style=filled type="fiberlookup" index="i" tensor="B" mode="0" format="compressed" src="true" root="true"]
+    1 [comment="type=fiberlookup,index=i,tensor=c,mode=0,format=compressed,src=true,root=true" label="FiberLookup i: c\ncompressed" color=green4 shape=box style=filled type="fiberlookup" index="i" tensor="c" mode="0" format="compressed" src="true" root="true"]
+    2 [comment="type=intersect,index=i" label="intersect i" color=purple shape=box style=filled type="intersect" index="i"]
+    3 [comment="type=fiberlookup,index=j,tensor=B,mode=1,format=compressed,src=true,root=false" label="FiberLookup j: B\ncompressed" color=green4 shape=box style=filled type="fiberlookup" index="j" tensor="B" mode="1" format="compressed" src="true" root="false"]
+    4 [comment="type=repsiggen,index=j" label="RepeatSignalGenerator j" color=cyan3 shape=box style=filled type="repsiggen" index="j"]
+    5 [comment="type=repeat,index=j,tensor=c,root=false" label="Repeat j: B" color=cyan2 shape=box style=filled type="repeat" index="j" tensor="c" root="false"]
+    6 [comment="type=arrayvals,tensor=c" label="Array Vals: c" color=green2 shape=box style=filled type="arrayvals" tensor="c"]
+    7 [comment="type=fiberwrite,index=i,tensor=X,mode=0,format=compressed,segsize=2,crdsize=B0_dim,sink=true" label="FiberWrite i: X0\ncompressed" color=green3 shape=box style=filled type="fiberwrite" index="i" tensor="X" mode="0" format="compressed" segsize="2" crdsize="B0_dim" sink="true"]
+    8 [comment="type=fiberwrite,index=j,tensor=X,mode=1,format=compressed,segsize=B0_dim+1,crdsize=B0_dim*B1_dim,sink=true" label="FiberWrite j: X1\ncompressed" color=green3 shape=box style=filled type="fiberwrite" index="j" tensor="X" mode="1" format="compressed" segsize="B0_dim+1" crdsize="B0_dim*B1_dim" sink="true"]
+    9 [comment="type=fiberwrite,mode=vals,tensor=X,size=1*B0_dim*B1_dim,sink=true" label="FiberWrite Vals: X" color=green3 shape=box style=filled type="fiberwrite" tensor="X" mode="vals" size="1*B0_dim*B1_dim" sink="true"]
+    10 [comment="type=broadcast" shape=point style=invis type="broadcast"]
+    0 -> 2 [label="ref_in-B" style=bold type="ref" comment="in-B"]
+    0 -> 2 [label="crd_in-B" style=dashed type="crd" comment="in-B"]
+    1 -> 2 [label="ref_in-c" style=bold type="ref" comment="in-c"]
+    1 -> 2 [label="crd_in-c" style=dashed type="crd" comment="in-c"]
+    2 -> 3 [label="ref_out-B" style=bold type="ref" comment="out-B"]
+    2 -> 7 [label="crd" style=dashed type="crd"]
+    3 -> 10 [label="crd" style=dashed type="crd"]
+    10 -> 4 [label="crd" style=dashed type="crd"]
+    10 -> 8 [label="crd" style=dashed type="crd"]
+    4 -> 5 [label="repsig" style=dotted type="repsig"]
+    2 -> 5 [label="ref_out-c" style=bold type="ref" comment="out-c"]
+    5 -> 6 [label="ref" style=bold type="ref"]
+    6 -> 9 [label="val" type="val"]
+}

sam/onyx/hw_nodes/compute_node.py

@@ -85,7 +85,7 @@ def connect(self, other, edge, kwargs=None):
             pe = self.get_name()
             new_conns = {
                 f'pe_to_reduce': [
-                    ([(pe, "res"), (other_red, f"data_in")], 17),
+                    ([(pe, "res"), (other_red, f"reduce_data_in")], 17),
                 ]
             }
             return new_conns
@@ -155,13 +155,22 @@ def configure(self, attributes):
         comment = attributes['comment'].strip('"')
         print(c_op)
         op_code = 0
+        # configuring via sam, it is a sparse app
+        use_dense = False
+        # mapping to pe only, configuring only the pe, ignore the reduce
+        pe_only = True
+        # data I/O should interface with other primitive outside of the cluster
+        pe_in_external = 1
         if c_op == 'mul':
             op_code = 1
         elif c_op == 'add' and 'sub=1' not in comment:
             op_code = 0
         elif c_op == 'add' and 'sub=1' in comment:
             op_code = 2
         cfg_kwargs = {
-            'op': op_code
+            'op': op_code,
+            'use_dense': use_dense,
+            'pe_only': pe_only,
+            'pe_in_external': pe_in_external
         }
-        return op_code, cfg_kwargs
+        return (op_code, use_dense, pe_only, pe_in_external), cfg_kwargs

sam/onyx/hw_nodes/merge_node.py

@@ -77,7 +77,7 @@ def connect(self, other, edge, kwargs=None):
             other_red = other.get_name()
             new_conns = {
                 f'merge_to_reduce_inner': [
-                    ([(merge, f"cmrg_coord_out_{0}"), (other_red, f"data_in")], 17),
+                    ([(merge, f"cmrg_coord_out_{0}"), (other_red, f"reduce_data_in")], 17),
                 ]
             }
 

sam/onyx/hw_nodes/reduce_node.py

@@ -39,7 +39,7 @@ def connect(self, other, edge, kwargs=None):
             new_conns = {
                 'reduce_to_wr_scan': [
                     # send output to rd scanner
-                    ([(red, "data_out"), (wr_scan, "data_in")], 17),
+                    ([(red, "reduce_data_out"), (wr_scan, "data_in")], 17),
                     # ([(red, "eos_out"), (wr_scan, "eos_in_0")], 1),
                     # ([(wr_scan, "ready_out_0"), (red, "ready_in")], 1),
                     # ([(red, "valid_out"), (wr_scan, "valid_in_0")], 1),
@@ -53,7 +53,7 @@ def connect(self, other, edge, kwargs=None):
             new_conns = {
                 'reduce_to_reduce': [
                     # send output to rd scanner
-                    ([(red, "data_out"), (other_red, "data_in")], 17),
+                    ([(red, "reduce_data_out"), (other_red, "reduce_data_in")], 17),
                     # ([(red, "eos_out"), (wr_scan, "eos_in_0")], 1),
                     # ([(wr_scan, "ready_out_0"), (red, "ready_in")], 1),
                     # ([(red, "valid_out"), (wr_scan, "valid_in_0")], 1),
@@ -72,7 +72,7 @@ def connect(self, other, edge, kwargs=None):
             new_conns = {
                 f'reduce_to_pe_{other_conn}': [
                     # send output to rd scanner
-                    ([(red, "data_out"), (pe, f"data{other_conn}")], 17),
+                    ([(red, "reduce_data_out"), (pe, f"data{other_conn}")], 17),
                     # ([(red, "eos_out"), (wr_scan, "eos_in_0")], 1),
                     # ([(wr_scan, "ready_out_0"), (red, "ready_in")], 1),
                     # ([(red, "valid_out"), (wr_scan, "valid_in_0")], 1),
@@ -102,7 +102,19 @@ def connect(self, other, edge, kwargs=None):
     def configure(self, attributes):
         # TODO
         stop_lvl = 2
+        # bypassing the fifos in the pe, get result in a single cycle
+        pe_only = False
+        # configuring both the pe and the reduce
+        pe_connected_to_reduce = True
+        # data I/O to and from the PE should be internal with the reduce
+        pe_in_external = 0
+        # op is set to integer add for the PE TODO: make this configurable in the sam graph
+        op = 0
         cfg_kwargs = {
-            'stop_lvl': stop_lvl
+            'stop_lvl': stop_lvl,
+            'pe_connected_to_reduce': pe_connected_to_reduce,
+            'pe_only': pe_only,
+            'pe_in_external': pe_in_external,
+            'op': op
         }
-        return stop_lvl, cfg_kwargs
+        return (stop_lvl, pe_connected_to_reduce, pe_only, pe_in_external, op), cfg_kwargs