X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=dfd59ad78a24c35076a22c4966adddd801f96416;hb=646beb7ce6005af440cfb270c57b9dfdf46c726a;hp=300ab4ffb739e999cb386fb739196d6532690da7;hpb=4d81599b46c2529fb1324d4a4b0d32b5b7b4c7a7;p=fleet.git

diff --git a/Makefile b/Makefile
index 300ab4f..dfd59ad 100644
--- a/Makefile
+++ b/Makefile
@@ -84,11 +84,12 @@ board = ml505   # ??
 #package = 7ff1704
 
 device = ${part}${package}-${speed_grade}
+rsync = rsync --exclude=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
@@ -99,7 +100,7 @@ build/fpga/main.bit: $(java_files) $(ship_files)
 	  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/
@@ -225,8 +226,12 @@ synth:
 runserver: fleet.jar
 	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 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
 
 ## Manual ####################################################################################
 
@@ -351,10 +356,23 @@ sun_server = simmons-tunnel
 #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 -azre ssh --delete --progress --verbose ./ ${sun_server}:~/fleet/
+	${rsync} --delete ./ ${sun_server}:~/fleet/
 	time ssh -t -Y ${sun_server} 'cd ~/fleet/; make testlocal'
 
+silicon: fleet.jar 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 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'
+
+
 testlocal: fleet.jar
 	cd marina/testCode; \
 	  export PATH=/proj/async/cad/linux/bin/:$$PATH; \
@@ -362,7 +380,17 @@ testlocal: fleet.jar
 	  -cp `pwd`/../../lib/com.sun.async.test.jar:`pwd`/../../fleet.jar \
 	  com.sun.vlsi.chips.marina.test.MarinaTest \
 	  -hsim \
-	  -testNum 3040
+	  -testNum ${testnum} || tail -n 20 marina.spi.run
+
+siliconlocal: 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 \
+	  -Djava.library.path=/proj/async/cad/test/ \
+	  com.sun.vlsi.chips.marina.test.MarinaTest \
+	  -silicon \
+	  -testNum ${testnum}
 
 marina/testCode/marina.xml \
 marina/testCode/marina.v \
@@ -382,8 +410,17 @@ chaing:
 	java -cp lib/com.sun.async.test.jar com.sun.async.test.ChainG marina/testCode/marina.xml
 
 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/marina/testCode/marina\*.dump ~/ || true
+	${rsync} ${sun_server}:fleet/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
+
+marina/testCode/omegaCounter-extracted.spi: ${all_electric_files} marina/testCode/rcx.bsh
+	@echo
+	@echo == Extracting Layout ===========================================================
+	ssh ${sun_server} 'rm -rf /tmp/am77536; mkdir /tmp/am77536'
+	cd marina/testCode; \
+	  nice -n 19 ${electric_headless} -s rcx.bsh ../electric/omegaCounter.jelib
+	mv marina/electric/starrcxt/omegaCounter.sp $@
+