correct nets for experiment2

diff --git a/experiments2/nets2.txt b/experiments2/nets2.txt
index 22ddba7acefba92b4674ef0e9214743d668eab96..50010dfb902e6f51baaf1a1de33206f070420c83 100644 (file)
--- a/experiments2/nets2.txt
+++ b/experiments2/nets2.txt
@@ -1,45 +1,8 @@
 part_sig_add
 part_sig_add

-mux0
-mux1
-mux2
-gtc
-reorder
-gt1
-mux0$$2
-mux1$$3
-mux2$$4
-gtc$$1
-reorder$$5
-eq1
-mux0$$7
-mux1$$8
-mux2$$9
-gtc$$6
-reorder$$10
-ge1
-mux0$$12
-mux1$$13
-mux2$$14
-gtc$$11
-reorder$$15
-gt2
-mux0$$17
-mux1$$18
-mux2$$19
-gtc$$16
-reorder$$20
-eq2
-mux0$$22
-mux1$$23
-mux2$$24
-gtc$$21
-reorder$$25
-ge2
-ripple
-add1
-ripple$$26
-add2
-ripple$$27
-add3
-ls1
-pmux1
+sm0
+sm1
+sm2
+pr1
+pr2
+pr3
+ls_1

diff --git a/experiments2/test_partsig.py b/experiments2/test_partsig.py
index 73a63339e23d16805287378608f3d678bc4aeabf..447f88c3298a1cb687054df0a183d0d322de6d21 100644 (file)
--- a/experiments2/test_partsig.py
+++ b/experiments2/test_partsig.py
@@ -17,7 +17,8 @@ class TestLS(Elaboratable):
         self.a = PartitionedSignal(partpoints, width, name="a")
         self.b = PartitionedSignal(partpoints, width, name="b")
         self.ls_output = Signal(width) # left shift
         self.a = PartitionedSignal(partpoints, width, name="a")
         self.b = PartitionedSignal(partpoints, width, name="b")
         self.ls_output = Signal(width) # left shift

-        self.dummy_output = Signal(width) # left shift
+        self.dummy_output = Signal(width)
+        self.dummy_mask = Signal(self.partpoints.shape()) 

 
     def elaborate(self, platform):
         m = Module()
 
     def elaborate(self, platform):
         m = Module()


@@ -26,6 +27,8 @@ class TestLS(Elaboratable):
         self.a.set_module(m)
         self.b.set_module(m)
         # left shift
         self.a.set_module(m)
         self.b.set_module(m)
         # left shift

+        wid = len(self.partpoints)
+        sync += self.dummy_mask.eq(self.partpoints) 

         sync += self.dummy_output.eq(self.b.sig) # stops sigs being ignored
         sync += self.ls_output.eq(self.a << self.b)
         ppts = self.partpoints
         sync += self.dummy_output.eq(self.b.sig) # stops sigs being ignored
         sync += self.ls_output.eq(self.a << self.b)
         ppts = self.partpoints


@@ -35,7 +38,8 @@ class TestLS(Elaboratable):
     def ports(self):
         return [self.a.sig, self.b.sig,
                 self.ls_output,
     def ports(self):
         return [self.a.sig, self.b.sig,
                 self.ls_output,

-                self.dummy_output]
+                self.dummy_output,
+                self.dummy_mask]

 
 
 # XXX this is for coriolis2 experimentation
 
 
 # XXX this is for coriolis2 experimentation