NCC clean newCell
[fleet.git] / Makefile
index dfd59ad..45ca649 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,59 @@
 
 ## Fleeterpreter ##############################################################################
 
-cp                = -cp fleet.jar:lib/RXTXcomm.jar
+ifeq ($(impl),ml509.large)
+java              = java -Xmx500m -Dfleet.impl='edu.berkeley.fleet.fpga.ML509$$Large'
+effort = high
+opt_for = area
+xil_ver=10.1
+remote_ise = /tools/xilinx/${xil_ver}/ISE
+remote_edk = /tools/xilinx/${xil_ver}/EDK
+speed_grade = 1
+part = xc5vlx110t
+package = ff1136
+board = ml505   # ??
+runhost=goliath
+mergesort_mem=DDR2
+else
+ifeq ($(impl),bee2)
+java              = java -Xmx500m -Dfleet.impl=edu.berkeley.fleet.fpga.Bee2
+# BEE2 does not work with ISE 10.1
+xil_ver=9.1i
+remote_ise = /tools/xilinx/ISE${xil_ver}_lin/
+remote_edk = /tools/xilinx/EDK${xil_ver}/
+effort = std
+opt_for = area
+part = xc2vp70
+package = ff1704
+speed_grade=6
+runhost=bee2
+mergesort_mem=Memory
+else
+ifeq ($(impl),java)
+java              = java -Xmx500m -Dfleet.impl=edu.berkeley.fleet.interpreter.Interpreter
+mergesort_mem=Memory
+else
+ifeq ($(impl),ml509.small)
+java              = java -Xmx500m -Dfleet.impl='edu.berkeley.fleet.fpga.ML509$$Small'
+effort = std
+opt_for = area
+xil_ver=10.1
+remote_ise = /tools/xilinx/${xil_ver}/ISE
+remote_edk = /tools/xilinx/${xil_ver}/EDK
+speed_grade = 1
+part = xc5vlx110t
+package = ff1136
+board = ml505   # ??
+runhost=goliath
+mergesort_mem=Memory
+else
 java              = java -Xmx500m
+endif
+endif
+endif
+endif
+
+cp                = -cp fleet.jar:lib/RXTXcomm.jar
 
 run: fleet.jar; $(java) $(cp) $(interpreter_class)
 
@@ -21,7 +72,11 @@ fleet.jar: $(java_files) $(ship_files) src/edu/berkeley/fleet/assembler/fleet.g
        cd build/class/; jar xf ../../lib/edu.berkeley.sbp.jar
        cd build/class/; jar xf ../../lib/ibex.jar
        for A in `find ships -name \*.ship`;\
-         do java -cp fleet.jar:build/class edu.berkeley.fleet.Main expand $$A;\
+         do java \
+                -cp fleet.jar:build/class \
+                -Dfleet.impl=edu.berkeley.fleet.interpreter.Interpreter \
+                edu.berkeley.fleet.Main \
+                expand $$A;\
          done
        javac -classpath lib/com.sun.async.test.jar:lib/ibex.jar:lib/RXTXcomm.jar:build/class${ps}lib/edu.berkeley.sbp.jar -d build/class/ `find build/java -name \*.java`
        echo 'Main-Class: edu.berkeley.fleet.Main' > build/class/manifest
@@ -36,18 +91,7 @@ host = intel2950-5.eecs.berkeley.edu
 # 128Gb ram, 2x4-core.  small-config:1189s  large-config:3065s
 #host = amdr905-1.eecs.berkeley.edu
 
-remote_ise = /tools/xilinx/10.1/ISE
-remote_edk = /tools/xilinx/10.1/EDK
-
-#remote_ise = /tools/xilinx/ISE9.1i_lin
-#remote_edk = /tools/xilinx/EDK9.1i
-
-#remote_dir = /vol/hitz/home/megacz/fleet/
-#remote_dir = /tmp/megacz/fleet/
-
 remote_dir = /scratch/megacz/fleet/
-#remote_ise = /scratch/megacz/xilinx/10.1/ISE
-#remote_edk = /scratch/megacz/xilinx/10.1/EDK
 
 #host = mm2.millennium.berkeley.edu
 #remote_ise = /scratch/megacz/xilinx/ise/
@@ -55,7 +99,7 @@ remote_dir = /scratch/megacz/fleet/
 #remote_dir = /scratch/megacz/fleet/
 
 
-xilinx =  cd build/fpga;
+xilinx =  cd build/${impl};
 xilinx += LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(remote_ise)/bin/lin:$(remote_edk)/bin/lin
 xilinx += PATH=$$PATH:$(remote_ise)/bin/lin:$(remote_edk)/bin/lin
 #xilinx += XST_VERSION=9.2i
@@ -67,171 +111,195 @@ xilinx += XILINX_EDK=$(remote_edk)
 xilinx_ise = $(xilinx) $(remote_ise)/bin/lin/
 xilinx_edk = $(xilinx) $(remote_edk)/bin/lin/
 
-# ML50X
-speed_grade = 1
-part = xc5vlx110t
-package = ff1136
-board = ml505   # ??
-
 # ML410
 #part = xc4vfx60
 #package = ff1152
 #speed_grade = 11
 #board = ml410
+#runhost=goliath
 
-# BEE2
-#part = xc2vp70
-#package = 7ff1704
-
-device = ${part}${package}-${speed_grade}
-rsync = rsync --exclude=marina/images -zare ssh --progress --verbose
+device = ${part}-${package}-${speed_grade}
+rsync = rsync --exclude=.git --exclude=chips/marina/images -zare ssh --progress --verbose
 
-upload: fleet.jar build/fpga/main.bit
+upload: fleet.jar build/${impl}/main.bit
        mkdir -p build
        chmod +x misc/program.sh
-       ${rsync} ./ root@goliath:fleet/
+ifneq ($(impl),bee2)
+       ${rsync} fleet.jar build/${impl}/main.bit misc root@${runhost}:fleet/
+endif
 
-build/fpga/main.bit: $(java_files) $(ship_files)
-       make fleet.jar
-       mkdir -p build/fpga
-       $(java) $(cp) edu.berkeley.fleet.fpga.Fpga build/fpga/
-       cp src/edu/berkeley/fleet/fpga/* build/fpga || true
+build/${impl}/main.bit: $(java_files) $(ship_files)
+       make fleet.jar impl=${impl}
+       mkdir -p build/${impl}
+       $(java) $(cp) edu.berkeley.fleet.fpga.Fpga build/${impl}/
+       cp src/edu/berkeley/fleet/fpga/* build/${impl} || true
        for A in `find ships -name \*.ship`;\
-         do java -cp build/class edu.berkeley.fleet.Main target=fpga expand $$A;\
+         do $(java) -cp build/class edu.berkeley.fleet.Main target=fpga expand $$A;\
          done
        ssh ${host} 'mkdir -p ${remote_dir}'
        ${rsync} --delete ./ ${host}:${remote_dir}
-       time ssh ${host} 'make -C ${remote_dir} synth XILINX=${remote_ise} remote_ise=${remote_ise} remote_edk=${remote_edk}'
-       scp ${host}:${remote_dir}/build/fpga/main.bit build/fpga/
-       scp ${host}:${remote_dir}/build/fpga/main.ace build/fpga/
+       time ssh ${host} 'make -C ${remote_dir} synth XILINX=${remote_ise} remote_ise=${remote_ise} remote_edk=${remote_edk} impl=${impl}'
+       scp ${host}:${remote_dir}/build/${impl}/main.bit build/${impl}/
+       scp ${host}:${remote_dir}/build/${impl}/main.ace build/${impl}/ || true
 
 pcore = ${remote_edk}/hw/XilinxProcessorIPLib/pcores
 intstyle = -intstyle xflow
-effort = std
-#effort = high
-opt_for = area
-#opt_for = speed
 synth:
-       cd build/fpga; ln -sf ../../src/edu/berkeley/fleet/fpga/* .
-       cd build/fpga; ln -sf ../../src/edu/berkeley/fleet/fpga/mem/* .
-       cd build/fpga; ln -sf ../../src/edu/berkeley/fleet/fpga/ddr2/* .
-       cd build/fpga; ln -sf ../../src/edu/berkeley/fleet/fpga/dvi/* .
-       cd build/fpga; ln -sf ../../src/edu/berkeley/fleet/fpga/zbt/* .
-       rm -f build/fpga/main.lso
-       echo work                        >> build/fpga/main.lso
-       rm -f build/fpga/main.prj
-       cd build/fpga; for A in *.v;   do echo verilog work \""$$A"\"; done >> main.prj
-       cd build/fpga; for A in *.vhd; do echo vhdl    work \""$$A"\"; done >> main.prj
-       cd build/fpga; touch main.ini
-       cd build/fpga; mkdir -p tmp
-       cd build/fpga; mkdir -p xst
-       rm -rf build/fpga/_ngo
+       cd build/${impl}; ln -sf ../../src/edu/berkeley/fleet/fpga/* .
+       cd build/${impl}; ln -sf ../../src/edu/berkeley/fleet/fpga/mem/* .
+       cd build/${impl}; ln -sf ../../src/edu/berkeley/fleet/fpga/ddr2/* .
+       cd build/${impl}; ln -sf ../../src/edu/berkeley/fleet/fpga/dvi/* .
+       cd build/${impl}; ln -sf ../../src/edu/berkeley/fleet/fpga/zbt/* .
+       cd build/${impl}; ln -sf ../../src/edu/berkeley/fleet/fpga/bee2/* .
+       rm -f build/${impl}/main.lso
+       echo work                        >> build/${impl}/main.lso
+       rm -f build/${impl}/main.prj
+       cd build/${impl}; for A in *.v;   do echo verilog work \""$$A"\"; done >> main.prj
+       cd build/${impl}; for A in *.vhd; do echo vhdl    work \""$$A"\"; done >> main.prj
+       cd build/${impl}; touch main.ini
+       cd build/${impl}; mkdir -p tmp
+       cd build/${impl}; mkdir -p xst
+       rm -rf build/${impl}/_ngo
        skill xst_original
 
-       rm -f build/fpga/main.xst
-       echo "set -tmpdir ./tmp" >> build/fpga/main.xst
-       echo "set -xsthdpdir ./xst" >> build/fpga/main.xst
-       echo "set -xsthdpini main.ini" >> build/fpga/main.xst
-       echo -n "run" >> build/fpga/main.xst
-       echo -n " -ifn main.prj" >> build/fpga/main.xst
-       echo -n " -ifmt mixed" >> build/fpga/main.xst
-       echo -n " -ofn main" >> build/fpga/main.xst
-       echo -n " -ofmt NGC" >> build/fpga/main.xst
-       echo -n " -p ${device}" >> build/fpga/main.xst
-       echo -n " -top main" >> build/fpga/main.xst
-       echo -n " -opt_mode ${opt_for}" >> build/fpga/main.xst
-       echo -n " -opt_level 2" >> build/fpga/main.xst
-       echo -n " -iuc NO" >> build/fpga/main.xst
-       echo -n " -lso main.lso" >> build/fpga/main.xst
-       echo -n " -keep_hierarchy NO" >> build/fpga/main.xst
-       echo -n " -rtlview Yes" >> build/fpga/main.xst
-       echo -n " -glob_opt AllClockNets" >> build/fpga/main.xst
-       echo -n " -read_cores YES" >> build/fpga/main.xst
-       echo -n " -write_timing_constraints NO" >> build/fpga/main.xst
-       echo -n " -cross_clock_analysis YES" >> build/fpga/main.xst
-       echo -n " -hierarchy_separator /" >> build/fpga/main.xst
-       echo -n " -bus_delimiter <>" >> build/fpga/main.xst
-       echo -n " -case maintain" >> build/fpga/main.xst
-       echo -n " -slice_utilization_ratio 100" >> build/fpga/main.xst
-       echo -n " -verilog2001 YES" >> build/fpga/main.xst
-       echo -n " -fsm_extract Yes" >> build/fpga/main.xst
-       echo -n " -fsm_encoding Auto" >> build/fpga/main.xst
-       echo -n " -safe_implementation No" >> build/fpga/main.xst
-       echo -n " -fsm_style lut" >> build/fpga/main.xst
-       echo -n " -ram_extract Yes" >> build/fpga/main.xst
-       echo -n " -ram_style Auto" >> build/fpga/main.xst
-       echo -n " -rom_extract Yes" >> build/fpga/main.xst
-       echo -n " -mux_style Auto" >> build/fpga/main.xst
-       echo -n " -decoder_extract YES" >> build/fpga/main.xst
-       echo -n " -priority_extract YES" >> build/fpga/main.xst
-       echo -n " -shreg_extract YES" >> build/fpga/main.xst
-       echo -n " -shift_extract YES" >> build/fpga/main.xst
-       echo -n " -xor_collapse YES" >> build/fpga/main.xst
-       echo -n " -rom_style Auto" >> build/fpga/main.xst
-       echo -n " -mux_extract YES" >> build/fpga/main.xst
-       echo -n " -resource_sharing YES" >> build/fpga/main.xst
-       echo -n " -mult_style auto" >> build/fpga/main.xst
-       echo -n " -iobuf YES" >> build/fpga/main.xst
-       echo -n " -max_fanout 10000" >> build/fpga/main.xst
-       echo -n " -bufg 1" >> build/fpga/main.xst
-       echo -n " -register_duplication YES" >> build/fpga/main.xst
-       echo -n " -register_balancing Yes" >> build/fpga/main.xst
-       echo -n " -slice_packing Yes" >> build/fpga/main.xst
-       echo -n " -optimize_primitives Yes" >> build/fpga/main.xst
-       echo -n " -tristate2logic Yes" >> build/fpga/main.xst
-       echo -n " -use_clock_enable Yes" >> build/fpga/main.xst
-       echo -n " -use_sync_set Yes" >> build/fpga/main.xst
-       echo -n " -use_sync_reset Yes" >> build/fpga/main.xst
-       echo -n " -iob auto" >> build/fpga/main.xst
-       echo -n " -equivalent_register_removal YES" >> build/fpga/main.xst
-       echo -n " -slice_utilization_ratio_maxmargin 5" >> build/fpga/main.xst
-       echo >> build/fpga/main.xst
-
-       rm -f build/fpga/main.ut
-       echo '-w' >> build/fpga/main.ut
-       echo '-g CclkPin:PULLUP' >> build/fpga/main.ut
-       echo '-g TdoPin:PULLNONE' >> build/fpga/main.ut
-       echo '-g M1Pin:PULLDOWN' >> build/fpga/main.ut
-       echo '-g DonePin:PULLUP' >> build/fpga/main.ut
-       echo '-g DriveDone:No' >> build/fpga/main.ut
-       echo '-g StartUpClk:JTAGCLK' >> build/fpga/main.ut
-       echo '-g DONE_cycle:4' >> build/fpga/main.ut
-       echo '-g GTS_cycle:5' >> build/fpga/main.ut
-       echo '-g M0Pin:PULLUP' >> build/fpga/main.ut
-       echo '-g M2Pin:PULLUP' >> build/fpga/main.ut
-       echo '-g ProgPin:PULLUP' >> build/fpga/main.ut
-       echo '-g TckPin:PULLUP' >> build/fpga/main.ut
-       echo '-g TdiPin:PULLUP' >> build/fpga/main.ut
-       echo '-g TmsPin:PULLUP' >> build/fpga/main.ut
-       echo '-g DonePipe:No' >> build/fpga/main.ut
-       echo '-g GWE_cycle:6' >> build/fpga/main.ut
-       echo '-g LCK_cycle:NoWait' >> build/fpga/main.ut
-       echo '-g Security:NONE' >> build/fpga/main.ut
-       echo '-g Persist:No' >> build/fpga/main.ut
-
+       rm -f build/${impl}/main.xst
+       echo "set -tmpdir ./tmp" >> build/${impl}/main.xst
+       echo "set -xsthdpdir ./xst" >> build/${impl}/main.xst
+       echo "set -xsthdpini main.ini" >> build/${impl}/main.xst
+       echo -n "run" >> build/${impl}/main.xst
+       echo -n " -ifn main.prj" >> build/${impl}/main.xst
+       echo -n " -ifmt mixed" >> build/${impl}/main.xst
+       echo -n " -ofn main" >> build/${impl}/main.xst
+       echo -n " -ofmt NGC" >> build/${impl}/main.xst
+       echo -n " -p ${device}" >> build/${impl}/main.xst
+       echo -n " -top main" >> build/${impl}/main.xst
+       echo -n " -opt_mode ${opt_for}" >> build/${impl}/main.xst
+       echo -n " -opt_level 2" >> build/${impl}/main.xst
+       echo -n " -iuc NO" >> build/${impl}/main.xst
+       echo -n " -lso main.lso" >> build/${impl}/main.xst
+       echo -n " -keep_hierarchy NO" >> build/${impl}/main.xst
+       echo -n " -rtlview Yes" >> build/${impl}/main.xst
+       echo -n " -glob_opt AllClockNets" >> build/${impl}/main.xst
+       echo -n " -read_cores YES" >> build/${impl}/main.xst
+       echo -n " -write_timing_constraints NO" >> build/${impl}/main.xst
+       echo -n " -cross_clock_analysis YES" >> build/${impl}/main.xst
+       echo -n " -hierarchy_separator /" >> build/${impl}/main.xst
+       echo -n " -bus_delimiter <>" >> build/${impl}/main.xst
+       echo -n " -case maintain" >> build/${impl}/main.xst
+       echo -n " -slice_utilization_ratio 100" >> build/${impl}/main.xst
+       echo -n " -verilog2001 YES" >> build/${impl}/main.xst
+       echo -n " -fsm_extract Yes" >> build/${impl}/main.xst
+       echo -n " -fsm_encoding Auto" >> build/${impl}/main.xst
+       echo -n " -safe_implementation No" >> build/${impl}/main.xst
+       echo -n " -fsm_style lut" >> build/${impl}/main.xst
+       echo -n " -ram_extract Yes" >> build/${impl}/main.xst
+       echo -n " -ram_style Auto" >> build/${impl}/main.xst
+       echo -n " -rom_extract Yes" >> build/${impl}/main.xst
+       echo -n " -mux_style Auto" >> build/${impl}/main.xst
+       echo -n " -decoder_extract YES" >> build/${impl}/main.xst
+       echo -n " -priority_extract YES" >> build/${impl}/main.xst
+       echo -n " -shreg_extract YES" >> build/${impl}/main.xst
+       echo -n " -shift_extract YES" >> build/${impl}/main.xst
+       echo -n " -xor_collapse YES" >> build/${impl}/main.xst
+       echo -n " -rom_style Auto" >> build/${impl}/main.xst
+       echo -n " -mux_extract YES" >> build/${impl}/main.xst
+       echo -n " -resource_sharing YES" >> build/${impl}/main.xst
+       echo -n " -mult_style auto" >> build/${impl}/main.xst
+       echo -n " -iobuf YES" >> build/${impl}/main.xst
+       echo -n " -max_fanout 10000" >> build/${impl}/main.xst
+       echo -n " -bufg 1" >> build/${impl}/main.xst
+       echo -n " -register_duplication YES" >> build/${impl}/main.xst
+       echo -n " -register_balancing Yes" >> build/${impl}/main.xst
+       echo -n " -slice_packing Yes" >> build/${impl}/main.xst
+       echo -n " -optimize_primitives Yes" >> build/${impl}/main.xst
+       echo -n " -tristate2logic Yes" >> build/${impl}/main.xst
+       echo -n " -use_clock_enable Yes" >> build/${impl}/main.xst
+       echo -n " -use_sync_set Yes" >> build/${impl}/main.xst
+       echo -n " -use_sync_reset Yes" >> build/${impl}/main.xst
+       echo -n " -iob auto" >> build/${impl}/main.xst
+       echo -n " -equivalent_register_removal YES" >> build/${impl}/main.xst
+       echo -n " -slice_utilization_ratio_maxmargin 5" >> build/${impl}/main.xst
+       echo >> build/${impl}/main.xst
+
+       rm -f build/${impl}/main.ut
+ifneq ($(impl),bee2)
+       echo '-w' >> build/${impl}/main.ut
+       echo '-g CclkPin:PULLUP' >> build/${impl}/main.ut
+       echo '-g TdoPin:PULLNONE' >> build/${impl}/main.ut
+       echo '-g M1Pin:PULLDOWN' >> build/${impl}/main.ut
+       echo '-g DonePin:PULLUP' >> build/${impl}/main.ut
+       echo '-g DriveDone:No' >> build/${impl}/main.ut
+       echo '-g StartUpClk:JTAGCLK' >> build/${impl}/main.ut
+       echo '-g DONE_cycle:4' >> build/${impl}/main.ut
+       echo '-g GTS_cycle:5' >> build/${impl}/main.ut
+       echo '-g M0Pin:PULLUP' >> build/${impl}/main.ut
+       echo '-g M2Pin:PULLUP' >> build/${impl}/main.ut
+       echo '-g ProgPin:PULLUP' >> build/${impl}/main.ut
+       echo '-g TckPin:PULLUP' >> build/${impl}/main.ut
+       echo '-g TdiPin:PULLUP' >> build/${impl}/main.ut
+       echo '-g TmsPin:PULLUP' >> build/${impl}/main.ut
+       echo '-g DonePipe:No' >> build/${impl}/main.ut
+       echo '-g GWE_cycle:6' >> build/${impl}/main.ut
+       echo '-g LCK_cycle:NoWait' >> build/${impl}/main.ut
+       echo '-g Security:NONE' >> build/${impl}/main.ut
+       echo '-g Persist:No' >> build/${impl}/main.ut
+endif
+ifeq ($(impl),bee2)
+       echo '-w' >> build/${impl}/main.ut
+       echo '-g DebugBitstream:No' >> build/${impl}/main.ut
+       echo '-g Binary:no' >> build/${impl}/main.ut
+       echo '-g CRC:Enable' >> build/${impl}/main.ut
+       echo '-g ConfigRate:4' >> build/${impl}/main.ut
+       echo '-g CclkPin:PullUp' >> build/${impl}/main.ut
+       echo '-g M0Pin:PullUp' >> build/${impl}/main.ut
+       echo '-g M1Pin:PullUp' >> build/${impl}/main.ut
+       echo '-g M2Pin:PullUp' >> build/${impl}/main.ut
+       echo '-g ProgPin:PullUp' >> build/${impl}/main.ut
+       echo '-g DonePin:PullUp' >> build/${impl}/main.ut
+       echo '-g PowerdownPin:PullUp' >> build/${impl}/main.ut
+       echo '-g TckPin:PullUp' >> build/${impl}/main.ut
+       echo '-g TdiPin:PullUp' >> build/${impl}/main.ut
+       echo '-g TdoPin:PullNone' >> build/${impl}/main.ut
+       echo '-g TmsPin:PullUp' >> build/${impl}/main.ut
+       echo '-g UnusedPin:PullDown' >> build/${impl}/main.ut
+       echo '-g UserID:0xFFFFFFFF' >> build/${impl}/main.ut
+       echo '-g DCMShutdown:Disable' >> build/${impl}/main.ut
+       echo '-g DisableBandgap:No' >> build/${impl}/main.ut
+       echo '-g DCIUpdateMode:AsRequired' >> build/${impl}/main.ut
+       echo '-g StartUpClk:CClk' >> build/${impl}/main.ut
+       echo '-g DONE_cycle:4' >> build/${impl}/main.ut
+       echo '-g GTS_cycle:5' >> build/${impl}/main.ut
+       echo '-g GWE_cycle:6' >> build/${impl}/main.ut
+       echo '-g LCK_cycle:NoWait' >> build/${impl}/main.ut
+       echo '-g Security:None' >> build/${impl}/main.ut
+       echo '-g DonePipe:No' >> build/${impl}/main.ut
+       echo '-g DriveDone:No' >> build/${impl}/main.ut
+       echo '-g Encrypt:No' >> build/${impl}/main.ut
+endif
        $(xilinx_ise)xst      ${intstyle} -ifn main.xst -ofn main.syr < main.xst \
          | grep --line-buffered -v 'been backward balanced into' \
          | grep --line-buffered -v 'IDDR has been replaced by IDDR_2CLK' \
          | grep --line-buffered -v 'WARNING:Xst:616 - Invalid property'
-       cat build/fpga/*.ucf > build/fpga/main.ucf
+       cat build/${impl}/*.ucf > build/${impl}/main.ucf
        $(xilinx_ise)ngdbuild ${intstyle} -aul -dd _ngo -nt timestamp -uc main.ucf -p $(device) main.ngc main.ngd
        $(xilinx_ise)map      ${intstyle} -ol ${effort} -p $(device) -pr b -cm ${opt_for} -o main_map.ncd main.ngd main.pcf
        $(xilinx_ise)par      ${intstyle} -pl ${effort} -ol ${effort} -w main_map.ncd main.ncd main.pcf
        $(xilinx_ise)trce     ${intstyle} -e 3 -l 3 -s ${speed_grade} -xml main main.ncd -o main.twr main.pcf
        $(xilinx_ise)bitgen   ${intstyle} -f main.ut main.ncd
+ifneq ($(impl),bee2)
        $(xilinx) tcl $(remote_edk)/data/xmd/genace.tcl -jprog -hw main.bit -board ${board} -ace mainx.ace
-       mv build/fpga/mainx.ace build/fpga/main.ace   # genace throws a fit if the filename prefix is the same?
-
+       mv build/${impl}/mainx.ace build/${impl}/main.ace   # genace throws a fit if the filename prefix is the same?
+endif
 
 runserver: fleet.jar
-       java -Djava.library.path=lib -cp fleet.jar:lib/RXTXcomm.jar edu.berkeley.fleet.fpga.Server
+       $(java) -Djava.library.path=lib -cp fleet.jar:lib/RXTXcomm.jar edu.berkeley.fleet.fpga.Server
 
 test:     fleet.jar
        $(java) -jar fleet.jar             test ships/*.ship tests
-       java -cp fleet.jar edu.berkeley.fleet.dataflow.MergeSort interpreter Memory 0 256
-testfpga: fleet.jar
-       $(java) -jar fleet.jar target=fpga test ships/*.ship tests
-       java -cp fleet.jar edu.berkeley.fleet.dataflow.MergeSort fpga Memory 0 256
+       $(java) -cp fleet.jar edu.berkeley.fleet.dataflow.MergeSort ${mergesort_mem} 0 256
+
+demo: fleet.jar
+       $(java) -cp fleet.jar edu.berkeley.fleet.dataflow.SortingDemo
 
 ## Manual ####################################################################################
 
@@ -291,7 +359,10 @@ javadoc:
 
 clean:
        rm -rf fleet.jar build
-       rm -f marina/testCode/marina.xml marina/testCode/marina.v marina/testCode/marina.schematic-parasitics.spi
+       rm -f \
+         chips/marina/testCode/marina.xml \
+         chips/marina/testCode/marina.v \
+         chips/marina/testCode/marina.schematic-parasitics.spi
 
 ## Dist ####################################################################################
 
@@ -346,81 +417,79 @@ f0: fleet.jar
 electric_jar = ~/proj/electric/srcj/electric.jar
 electric = java -Xss2m -XX:MaxPermSize=128m -Xmx2000m -jar ${electric_jar}
 electric_headless = java -Xmx1500m -jar -Djava.awt.headless=true ${electric_jar} -batch
-all_electric_files = $(shell find marina/electric/ -name \*.jelib -or -path \*.delib\*)
+all_electric_files = $(shell find chips/marina/electric/ -name \*.jelib -or -path \*.delib\*)
 modname = fakeMarinaPadframe
 
-sun_server = simmons-tunnel
+sun_dir = /home/am77536/fleet
+sun_fs_server = ivans
+sun_server = simmons
 
 #sun_server = frehley  # electric team uses frehley
 #sun_server = simmons
 #sun_server = criss    # criss is used for nohupped nanosim
 #sun_server = stanley  # stanley is used for nohupped hsim
 
-testnum = 0
-
-runtest: fleet.jar marina/testCode/marina.xml marina/testCode/marina.v marina/testCode/marina.schematic-parasitics.spi
-       ${rsync} --delete ./ ${sun_server}:~/fleet/
-       time ssh -t -Y ${sun_server} 'cd ~/fleet/; make testlocal'
+#testnum = 3025
+#testnum = 3040
+#testnum = 0
+#testnum = 999
+testnum = 8888
 
-silicon: fleet.jar marina/testCode/marina.xml
-       ${rsync} --delete ./ ${sun_server}:~/fleet/
-       time ssh -t -Y ${sun_server} 'cd ~/fleet/; make siliconlocal'
+runtest: fleet.jar chips/marina/testCode/marina.xml chips/marina/testCode/marina.v chips/marina/testCode/marina.schematic-parasitics.spi
+       ${rsync} --delete ./ ${sun_fs_server}:${sun_dir}/
+       time ssh -t -Y ${sun_fs_server} 'ssh -t am77536@${sun_server} "cd ${sun_dir}/; make testlocal impl=${impl}"'
 
 spice: fleet.jar
-       cp ~/omegaCounter.spi marina/testCode/omegaCounter.spi
-       cp ~/omegaCounter-extracted.spi marina/testCode/omegaCounter-extracted.spi
-       rsync -azre ssh --delete --progress --verbose ./ ${sun_server}:~/fleet/
-       ssh -t -Y ${sun_server} 'cd ~/fleet/marina/testCode/; export PATH=/proj/async/cad/linux/bin/:$$PATH; echo -e "rcf commands\n" | hsim64 -time 90000 go.spi -o go.spi'
+       cp ~/omegaCounter.spi chips/marina/testCode/omegaCounter.spi
+       cp ~/omegaCounter-extracted.spi chips/marina/testCode/omegaCounter-extracted.spi
+       rsync -azre ssh --delete --progress --verbose ./ ${sun_fs_server}:${sun_dir}/
+       ssh -t -Y ${sun_fs_server} 'cd ${sun_dir}/chips/marina/testCode/; export PATH=/proj/async/cad/linux/bin/:$$PATH; echo -e "rcf commands\n" | hsim64 -time 90000 go.spi -o go.spi'
 
 
-testlocal: fleet.jar
-       cd marina/testCode; \
-         export PATH=/proj/async/cad/linux/bin/:$$PATH; \
-         /proj/async/cad/linux/lib/jdk1.5.0_05-linux-i586/bin/java \
-         -cp `pwd`/../../lib/com.sun.async.test.jar:`pwd`/../../fleet.jar \
-         com.sun.vlsi.chips.marina.test.MarinaTest \
-         -hsim \
-         -testNum ${testnum} || tail -n 20 marina.spi.run
+ifeq ($(impl),silicon)
+testarg=-silicon
+else
+testarg=-hsim
+endif
 
-siliconlocal: fleet.jar
-       cd marina/testCode; \
+testlocal: fleet.jar
+       cd chips/marina/testCode; \
          export PATH=/proj/async/cad/linux/bin/:$$PATH; \
-         /proj/async/cad/linux/lib/jdk1.5.0_05-linux-i586/bin/java \
-         -cp `pwd`/../../lib/com.sun.async.test.jar:`pwd`/../../fleet.jar \
+         export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/proj/async/cad/test/; \
+         /proj/async/cad/linux/lib/jdk1.6/bin/java \
+         -cp `pwd`/../../../lib/com.sun.async.test.jar:`pwd`/../../../fleet.jar \
          -Djava.library.path=/proj/async/cad/test/ \
+         -Dfleet.impl=com.sun.vlsi.chips.marina.test.Marina \
          com.sun.vlsi.chips.marina.test.MarinaTest \
-         -silicon \
-         -testNum ${testnum}
+         ${testarg} \
+         -testNum ${testnum} || tail -n 20 marina.spi.run
 
-marina/testCode/marina.xml \
-marina/testCode/marina.v \
-marina/testCode/marina.schematic-parasitics.spi: ${all_electric_files}
+chips/marina/testCode/marina.xml \
+chips/marina/testCode/marina.v \
+chips/marina/testCode/marina.schematic-parasitics.spi: ${all_electric_files}
        @echo
        @echo == Rebuilding Netlists and XML ===========================================================
-       rm -f marina/testCode/marina.v
-       rm -f marina/testCode/marina.schematic-parasitics.spi
-       rm -f marina/testCode/marina.xml
-       cd marina/testCode; \
+       rm -f chips/marina/testCode/marina.v
+       rm -f chips/marina/testCode/marina.schematic-parasitics.spi
+       rm -f chips/marina/testCode/marina.xml
+       cd chips/marina/testCode; \
          nice -n 19 ${electric_headless} -s regen.bsh ../electric/aMarinaM.jelib
 
 electric:
-       ${electric} marina/electric/aMarinaM.jelib
-
-chaing:
-       java -cp lib/com.sun.async.test.jar com.sun.async.test.ChainG marina/testCode/marina.xml
+       ${electric} chips/marina/electric/aMarinaM.jelib
 
 sync:
-       ${rsync} ${sun_server}:fleet/marina/testCode/marina\*.dump ~/ || true
-       ${rsync} ${sun_server}:fleet/marina/testCode/marina.spi.out ~/${modname}.out || true
+       ${rsync} ${sun_fs_server}:${sun_dir}/chips/marina/testCode/marina\*.dump ~/ || true
+       ${rsync} ${sun_fs_server}:${sun_dir}/chips/marina/testCode/marina.spi.out ~/${modname}.out || true
 copyin:
-       cp ~/${modname}.spi marina/testCode/marina.schematic-parasitics.spi || true
-       cp ~/${modname}.v   marina/testCode/marina.v || true
+       cp ~/${modname}.spi chips/marina/testCode/marina.schematic-parasitics.spi || true
+       cp ~/${modname}.v   chips/marina/testCode/marina.v || true
 
-marina/testCode/omegaCounter-extracted.spi: ${all_electric_files} marina/testCode/rcx.bsh
+chips/marina/testCode/omegaCounter-extracted.spi: ${all_electric_files} chips/marina/testCode/rcx.bsh
        @echo
        @echo == Extracting Layout ===========================================================
-       ssh ${sun_server} 'rm -rf /tmp/am77536; mkdir /tmp/am77536'
-       cd marina/testCode; \
+       ssh ${sun_fs_server} 'rm -rf /tmp/am77536; mkdir /tmp/am77536'
+       cd chips/marina/testCode; \
          nice -n 19 ${electric_headless} -s rcx.bsh ../electric/omegaCounter.jelib
-       mv marina/electric/starrcxt/omegaCounter.sp $@
+       mv chips/marina/electric/starrcxt/omegaCounter.sp $@