improve marina testing scripts

[fleet.git] / Makefile

diff --git a/Makefile b/Makefile
index 8c32d77..d52a2f7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -86,8 +86,8 @@ synth:
        skill xst_original
        $(xilinx_ise)xst -intstyle xflow -ifn main.xst -ofn main.syr < main.xst
        $(xilinx_ise)ngdbuild -aul -intstyle xflow -dd _ngo -nt timestamp -uc main.ucf -p $(device) main.ngc main.ngd
-       $(xilinx_ise)map -cm area -intstyle xflow -p $(device) -pr b -ol std -o main_map.ncd main.ngd main.pcf
-       $(xilinx_ise)par -w -intstyle xflow -t 99 -pl std -rl std main_map.ncd main.ncd main.pcf
+       $(xilinx_ise)map -cm area -intstyle xflow -p $(device) -pr b -ol high -o main_map.ncd main.ngd main.pcf
+       $(xilinx_ise)par -w -intstyle xflow -t 99 -pl high -rl high main_map.ncd main.ncd main.pcf
        $(xilinx_ise)bitgen -intstyle xflow -d -f main.ut main.ncd
 #      $(xilinx_ise)trce -intstyle xflow -e 3 -l 3 -s ${speed_grade} -xml main main.ncd -o main.twr main.pcf
        $(xilinx_edk)xmd -tcl $(remote_edk)/data/xmd/genace.tcl -jprog -hw main.bit -board ml410 -ace mainx.ace
@@ -179,9 +179,14 @@ clean:
 #      @echo
 #
 
-dist:
+dist: fleet.jar
        darcs dist -d fleet
-       mv fleet.tar.gz /afs/research.cs.berkeley.edu/class/fleet/website/code/snapshots/fleet-`date +%y.%m.%d`.tgz
+       mv fleet.tar.gz /afs/research.cs.berkeley.edu/class/fleet/website/code/snapshots/fleet-`date +%Y.%m.%d`.tgz
+       mkdir -p .build
+       rm -f lib/suncvs.jar
+       cd .build; for A in ../fleet.jar ../lib/*.jar; do jar xvf $$A; done
+       cd .build; jar cvf /afs/research.cs.berkeley.edu/class/fleet/website/code/snapshots/fleet-`date +%Y.%m.%d`.jar .
+       rm -rf .build
 
 # you'll probably want to change this line
 ghc  = /usr/local/brian/ghc/compiler/ghc-inplace
@@ -205,15 +210,19 @@ f0: fleet.jar
 cleansuncvs:
        rm -rf lib/suncvs.jar suncvs
 
-lib/suncvs.jar: suncvs/marina suncvs/test
+lib/suncvs.jar: fleet.jar suncvs/marina suncvs/test
+       rm -rf suncvs/test/manuals
        mkdir -p suncvs/build
-       cd suncvs; javac -cp test/javamake.jar:test/jcommon.jar:test/jfreechart.jar -d build `find . -name \*.java`
+       cd suncvs; javac -cp ../fleet.jar:test/javamake.jar:test/jcommon.jar:test/jfreechart.jar -d build `find . -name \*.java`
        cd suncvs/build; jar cvf ../../lib/suncvs.jar .
        cd suncvs/test; jar uvf ../../lib/suncvs.jar .
 
-runtest: lib/suncvs.jar fleet.jar 
+runtest: fleet.jar
+       rm lib/suncvs.jar; make lib/suncvs.jar
+       rm -f suncvs/marina/testSims/isolatedInDock.spi.run
+       ssh simmons 'skill nanosim'
        rsync -are ssh --delete --progress --verbose ./ simmons:~/fleet/
-       ssh simmons 'export PATH=$$PATH:/proj/async/cad/linux/bin/; cd ~/fleet/suncvs/marina/testSims; /proj/async/cad/linux/lib/jdk1.5.0_05-linux-i586/bin/java -cp ~/fleet/fleet.jar -cp ~/fleet/lib/suncvs.jar com.sun.vlsi.chips.marina.test.MarinaTest'
+       ssh simmons 'export PATH=$$PATH:/proj/async/cad/linux/bin/; cd ~/fleet/suncvs/marina/testSims; /proj/async/cad/linux/lib/jdk1.5.0_05-linux-i586/bin/java -cp $$HOME/fleet/fleet.jar:$$HOME/fleet/lib/suncvs.jar com.sun.vlsi.chips.marina.test.MarinaTest -testNum 3001'
 
 suncvs/test:
        mkdir -p suncvs