switch Fpga.java back to 12 lanes, add CarrySaveAdder

diff --git a/src/edu/berkeley/fleet/fpga/Fpga.java b/src/edu/berkeley/fleet/fpga/Fpga.java
index 3c359dc..cd54016 100644 (file)
--- a/src/edu/berkeley/fleet/fpga/Fpga.java
+++ b/src/edu/berkeley/fleet/fpga/Fpga.java
@@ -65,23 +65,25 @@ public class Fpga extends FleetTwoFleet {
         this.top = top;
         debugShip = createShip("Debug",     "debug");
 
-        int LANES = 6;
+        int LANES = 12;
+        //int LANES = 1;
 
-        createShip("Memory",    "memory1");
+        createShip("Memory",            "memory1");
+        createShip("CarrySaveAdder",    "csa1");
 
         if (LANES>1)
             createShip("Memory",    "memory2");
 
         for(int i=0; i<LANES; i++) {
             createShip("Fifo",      "fifo"+i);
-            createShip("Fifo",      "fifo"+i+"x");
             createShip("Alu2",      "alu"+i);
-            createShip("Alu2",      "alu"+i+"x");
         }
         createShip("Rotator",   "rotator");
         createShip("Lut3",      "lut");
+        /*
         createShip("Rotator",   "rotator_");
         createShip("Lut3",      "lut_");
+        */
 
         if (LANES<=1)
             createShip("Fifo",      "fifo_extra");