From: adam <adam@megacz.com>
Date: Fri, 10 Aug 2007 13:17:14 +0000 (+0100)
Subject: update Alu3 test to use blend
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=f60e9c4ad27c957a6513fdab91fd0cff857fb444;p=fleet.git

update Alu3 test to use blend
---

diff --git a/ships/Alu3.ship b/ships/Alu3.ship
index 8c8cec6..a2cd62d 100644
--- a/ships/Alu3.ship
+++ b/ships/Alu3.ship
@@ -121,29 +121,83 @@ end
 
 
 == Test ========================================================================
-#expect 100488372224
-#expect 8
 
+#ship alu3    : Alu3
+#ship lut3    : Lut3
+#ship bitfifo : BitFifo
+#ship debug   : Debug
+
+#expect 31509911677
+#expect 1855678
+
+//#expect 1855683
+//#expect 1855683
+//#expect 1855683
+//#expect 1855683
+//#expect 1855683
+//#expect 1855683
+//#expect 1200000
+//#expect 1855683
+//#expect 1855683
+//#expect 1200000
+//#expect 1855683
+//#expect 1855683
+//#expect 1855683
+//#expect 1855683
+//#expect 1200000
+//#expect 1855683
+//#expect 1200000
+//#expect 1200000
+//#expect 1200000
+//#expect 1200000
+//#expect 1855683
+
+// 0:  100100100111110000000
+// sel 011110100001001000000
+// 1:  111000101000011000011
+// r:  111000100110111000000
+
+
+1000000:            sendto bitfifo.inEnqueue;
+0:                  sendto bitfifo.inEnqueue;
+bitfifo.inEnqueue:  [*] take, deliver;
+bitfifo.outDequeue: [*] take, sendto lut3.in2;
+lut3.in2:           [74] take, deliver;
+
+// mux on second input
+226:                sendto lut3.inLut;
+lut3.inLut:         take;
+                    [74] deliver;
+
+1855683:            sendto lut3.in1;
+0:                  sendto lut3.in1;
+lut3.in1:           take;
+                    [37] deliver;
+                    take;
+                    [37] deliver;
+
+1200000:            sendto lut3.in3;
+0:                  sendto lut3.in3;
+lut3.in3:           take;
+                    [37] deliver;
+                    take;
+                    [37] deliver;
+
+lut3.out:           [*] take, sendto alu3.in2;
 
-#ship alu3  : Alu3
-#ship debug : Debug
 
-1000000:       sendto alu3.in1;
-1200000:       sendto alu3.in2;
 0:             sendto alu3.in3;
 0:             sendto alu3.in1;
-0:             sendto alu3.in2;
 alu3.in1:      [*] take, deliver;
 alu3.in2:      [*] take, deliver;
 alu3.in3:      [*] take, deliver;
 alu3.out1:     [74] take, sendto alu3.in1;
-               [74] take, sendto alu3.in1;
-alu3.out2:     [74] take, sendto alu3.in2;
-               [74] take, sendto alu3.in2;
-alu3.out3:     [74] take, sendto alu3.in3;
-               [74] take, sendto alu3.in3;
+alu3.out2:     [74] take, sendto alu3.in3;
+alu3.out3:     [74] take;
 alu3.outBits:  [2] take, sendto debug.in;
-debug.in:      [*] take, deliver;
+
+
+debug.in:           [*] take, deliver;
 
 
 == Contributors =========================================================