Add tests

Author: rachitnigam

fud/filament.py

@@ -184,9 +184,9 @@ def interface_gen(file: SourceType.Path) -> SourceType.Stream:
             """
             cmd = " ".join(
                 [
-                    config["stages", self.name, "exec"],
+                    config["stages", FilamentStage.name, "exec"],
                     "--library",
-                    config["stages", self.name, "library"],
+                    config["stages", FilamentStage.name, "library"],
                     "--dump-interface",
                     # We should only run this after the module has been type
                     # checked.

primitives/reshape.fil

@@ -204,15 +204,17 @@ comp CollectValid[W, N]<'G:1>(
   let Bits = log2(N)+1; assume Bits > 0;
 
   // Increment the index if the value on the stream is valid
-  idx := new Prev[Bits, 1]<'G>(mux.out);
+  idx := new Prev[Bits, 1]<'G>(reset.out);
   one := new Const[Bits, 1]<'G>();
+  zero_idx := new Const[Bits, 0]<'G>();
   add := new Add[Bits]<'G>(idx.prev, one.out);
   mux := new Mux[Bits]<'G>(valid, add.out, idx.prev);
+  reset := new Mux[Bits]<'G>(max_reached.out, zero_idx.out, mux.out);
 
   // Are all the blocks valid?
   n := new Const[Bits, N]<'G>();
-  n_sub_1 := new Sub[Bits]<'G>(n.out, one.out);
-  max_reached := new Eq[Bits]<'G>(n_sub_1.out, idx.prev);
+  // n_sub_1 := new Sub[Bits]<'G>(n.out, one.out);
+  max_reached := new Eq[Bits]<'G>(n.out, idx.prev);
   block_valid = max_reached.out;
 
   // Take the location index points to within the output block and assign the

primitives/state.fil

@@ -94,10 +94,10 @@ comp Counter[W, N]<'G:1>(
   add := new Add[Bits]<'G>(counter.prev, one.out);
 
   max := new Const[Bits, N]<'G>();
-  eq := new Eq[Bits]<'G>(counter.prev, max.out);
+  eq := new Eq[Bits]<'G>(add.out, max.out);
 
   zero := new Const[Bits, 0]<'G>();
-  mux := new Mux[Bits]<'G>(eq.out, counter.prev, zero.out);
+  mux := new Mux[Bits]<'G>(eq.out, zero.out, add.out);
 
   resized := new ZeroExtend[Bits, W]<'G>(counter.prev);
 

runt.toml

@@ -26,9 +26,9 @@ cmd = """
 
 [[tests]]
 name = "run"
-paths = ["tests/run/*.fil"]
+paths = ["tests/run/**/*.fil"]
 cmd = """
-fud e -s cocotb.data {}.data --to cocotb-out {} -s filament.flags ' --show-models' -q
+fud e -s cocotb.data {}.data --to cocotb-out {} -s filament.flags ' --show-models' -s filament.library "." -q
 """
 
 # ============= Testing primitive implementations =============

tests/run/primitives/collect-valid.expect

@@ -0,0 +1,2 @@
+{"o1": {"0": [0], "1": [1], "2": [1], "3": [0], "4": [0], "5": [5], "6": [5], "7": [5], "8": [5]}, "o2": {"0": [0], "1": [0], "2": [2], "3": [0], "4": [0], "5": [0], "6": [0], "7": [0], "8": [8]}, "val": {"0": [0], "1": [0], "2": [1], "3": [0], "4": [0], "5": [0], "6": [0], "7": [0], "8": [1]}, "cycles": 9}
+

tests/run/primitives/collect-valid.fil

@@ -0,0 +1,17 @@
+import "primitives/core.fil";
+import "primitives/reshape.fil";
+
+comp main<'G:1>(
+  en: interface['G],
+  in: ['G, 'G+1] 32,
+  valid: ['G, 'G+1] 1,
+) -> (
+  o1: ['G, 'G+1] 32,
+  o2: ['G, 'G+1] 32,
+  val: ['G, 'G+1] 1
+) {
+  cv := new CollectValid[32, 2]<'G>(in, valid);
+  o1 = cv.out{0};
+  o2 = cv.out{1};
+  val = cv.block_valid;
+}

tests/run/primitives/collect-valid.fil.data

@@ -0,0 +1,4 @@
+{
+  "in": [1,2,3,4,5,6,7,8,9],
+  "valid": [1,1,0,0,1,0,0,1,0]
+}

tests/run/primitives/counter.expect

@@ -0,0 +1,2 @@
+{"count": {"0": [0], "1": [1], "2": [2], "3": [0], "4": [1], "5": [2]}, "cycles": 6}
+

tests/run/primitives/counter.fil

@@ -0,0 +1,6 @@
+import "primitives/state.fil";
+
+comp main<'G:1>(en: interface['G], in: ['G, 'G+1] 32) -> (count: ['G, 'G+1] 32) {
+  counter := new Counter[32, 3]<'G>();
+  count = counter.out;
+}

tests/run/primitives/counter.fil.data

@@ -0,0 +1,3 @@
+{
+  "in": [1,2,3,4,5,6]
+}