X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=bcd8f97aa2f97b2d976cc8f7c55303bbf70246b2;hb=dbcf636e6f8cb306afa96f0d4b9dde7cc5ed22e3;hp=8cca58cc60f7e446d8c769caa04ba9552f18bd6e;hpb=2ebcc8c9013fa761b472131407c5b0320eaa8bed;p=fleet.git

diff --git a/Makefile b/Makefile
index 8cca58c..bcd8f97 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,17 @@
 
 ## Fleeterpreter ##############################################################################
 
-cp                = -cp fleet.jar:lib/RXTXcomm.jar
+ifeq ($(impl),ml509)
+java              = java -Xmx500m -Dfleet.impl=edu.berkeley.fleet.fpga.Fpga
+else
+ifeq ($(impl),java)
+java              = java -Xmx500m -Dfleet.impl=edu.berkeley.fleet.interpreter.Interpreter
+else
 java              = java -Xmx500m
+endif
+endif
+
+cp                = -cp fleet.jar:lib/RXTXcomm.jar
 
 run: fleet.jar; $(java) $(cp) $(interpreter_class)
 
@@ -17,13 +26,13 @@ ship_files = $(shell find ships -name \*.ship)
 fleet.jar: $(java_files) $(ship_files) src/edu/berkeley/fleet/assembler/fleet.g
 	mkdir -p build/class/edu/berkeley/fleet/assembler/
 	cp src/edu/berkeley/fleet/assembler/fleet.g build/class/edu/berkeley/fleet/assembler/
-	javac -classpath lib/ibex.jar:lib/RXTXcomm.jar:lib/edu.berkeley.sbp.jar -d build/class/ $(shell find src -name \*.java)
+	javac -classpath lib/com.sun.async.test.jar:lib/ibex.jar:lib/RXTXcomm.jar:lib/edu.berkeley.sbp.jar -d build/class/ $(shell find src -name \*.java)
 	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 edu.berkeley.fleet.Main expand $$A;\
 	  done
-	javac -classpath lib/ibex.jar:lib/RXTXcomm.jar:build/class${ps}lib/edu.berkeley.sbp.jar -d build/class/ `find build/java -name \*.java`
+	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
 	jar cmf build/class/manifest $@ ships -C build/class .
 
@@ -36,11 +45,12 @@ 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
+# BEE2 does not work with ISE 10.1
+#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_ise = /tools/xilinx/ISE9.1i_lin
+remote_edk = /tools/xilinx/EDK9.1i
 
 #remote_dir = /vol/hitz/home/megacz/fleet/
 #remote_dir = /tmp/megacz/fleet/
@@ -84,11 +94,12 @@ board = ml505   # ??
 #package = 7ff1704
 
 device = ${part}${package}-${speed_grade}
+rsync = rsync --exclude=chips/marina/images -zare ssh --progress --verbose
 
 upload: fleet.jar build/fpga/main.bit
 	mkdir -p build
 	chmod +x misc/program.sh
-	rsync -are ssh --progress --verbose ./ root@goliath:fleet/
+	${rsync} ./ root@goliath:fleet/
 
 build/fpga/main.bit: $(java_files) $(ship_files)
 	make fleet.jar
@@ -96,10 +107,10 @@ build/fpga/main.bit: $(java_files) $(ship_files)
 	$(java) $(cp) edu.berkeley.fleet.fpga.Fpga build/fpga/
 	cp src/edu/berkeley/fleet/fpga/* build/fpga || 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 -zare ssh --progress --delete --verbose ./ ${host}:${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/
@@ -223,10 +234,11 @@ synth:
 
 
 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
-testfpga: fleet.jar; $(java) -jar fleet.jar target=fpga test ships/*.ship tests
+test:     fleet.jar
+	$(java) -jar fleet.jar             test ships/*.ship tests
+	$(java) -cp fleet.jar edu.berkeley.fleet.dataflow.MergeSort Memory 0 256
 
 ## Manual ####################################################################################
 
@@ -286,7 +298,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 ####################################################################################
 
@@ -341,7 +356,7 @@ 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
@@ -351,40 +366,70 @@ sun_server = simmons-tunnel
 #sun_server = criss    # criss is used for nohupped nanosim
 #sun_server = stanley  # stanley is used for nohupped hsim
 
-runtest: fleet.jar marina/testCode/marina.xml marina/testCode/marina.v marina/testCode/marina.schematic-parasitics.spi
-	rsync -azre ssh --delete --progress --verbose ./ ${sun_server}:~/fleet/
+testnum = 0
+
+runtest: fleet.jar chips/marina/testCode/marina.xml chips/marina/testCode/marina.v chips/marina/testCode/marina.schematic-parasitics.spi
+	${rsync} --delete ./ ${sun_server}:~/fleet/
 	time ssh -t -Y ${sun_server} 'cd ~/fleet/; make testlocal'
 
+silicon: fleet.jar chips/marina/testCode/marina.xml
+	${rsync} --delete ./ ${sun_server}:~/fleet/
+	time ssh -t -Y ${sun_server} 'cd ~/fleet/; make siliconlocal'
+
+spice: fleet.jar
+	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_server}:~/fleet/
+	ssh -t -Y ${sun_server} 'cd ~/fleet/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; \
+	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 \
-	  -cp `pwd`/../../../fleet.jar \
+	  -cp `pwd`/../../../lib/com.sun.async.test.jar:`pwd`/../../../fleet.jar \
+	  -Dfleet.impl=com.sun.vlsi.chips.marina.test.Marina \
 	  com.sun.vlsi.chips.marina.test.MarinaTest \
 	  -hsim \
-	  -testNum 3040
+	  -testNum ${testnum} || tail -n 20 marina.spi.run
+
+siliconlocal: 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 \
+	  -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}
 
-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; \
-	  nice -n 19 ${electric_headless} -s regen.bsh ../electric/aMarinaM.delib
+	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.delib
-
-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 -arze ssh --progress --verbose ${sun_server}:fleet/marina/testCode/marina\*.dump ~/ || true
-	rsync -arze ssh --progress --verbose ${sun_server}:fleet/marina/testCode/marina.spi.out ~/${modname}.out || true
+	${rsync} ${sun_server}:fleet/chips/marina/testCode/marina\*.dump ~/ || true
+	${rsync} ${sun_server}:fleet/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
+
+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 chips/marina/testCode; \
+	  nice -n 19 ${electric_headless} -s rcx.bsh ../electric/omegaCounter.jelib
+	mv chips/marina/electric/starrcxt/omegaCounter.sp $@
+