X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=959a27d6373b629d553d0f4ef87896a741c78886;hb=a9f94a821394151a990b875d7ae635448a892ff2;hp=8e8e05b6b2ba28fc5b232fc64d67e3d7ad5af02f;hpb=c362bbd8cae20dd2a08e704e1ce3fc5a4f3f7072;p=fleet.git diff --git a/Makefile b/Makefile index 8e8e05b..959a27d 100644 --- a/Makefile +++ b/Makefile @@ -17,13 +17,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;\ 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 . @@ -286,6 +286,7 @@ javadoc: clean: rm -rf fleet.jar build + rm -f marina/testCode/marina.xml marina/testCode/marina.v marina/testCode/marina.schematic-parasitics.spi ## Dist #################################################################################### @@ -311,7 +312,6 @@ 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 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 @@ -338,41 +338,54 @@ f0: fleet.jar ## Targets below are for integration with Sun-Proprietary Marina Test Chip ############################## -cleansuncvs: - rm -rf lib/suncvs.jar suncvs +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\*) +modname = fakeMarinaPadframe -lib/suncvs.jar: fleet.jar suncvs/marina suncvs/test - rm -rf suncvs/test/manuals - mkdir -p suncvs/build - for A in api marina two util; do rsync -a src/edu/berkeley/fleet/$$A/ suncvs/marina/testCode/edu/berkeley/fleet/$$A/; done - cd suncvs; javac -cp 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 . +sun_server = simmons-tunnel -sun_server = frehley +#sun_server = frehley # electric team uses frehley #sun_server = simmons - -runtest: fleet.jar - rm lib/suncvs.jar; make lib/suncvs.jar - cp lib/suncvs.jar suncvs/marina/testCode/MarinaTest.jar - ssh ${sun_server} 'skill nanosim' - rsync -are ssh --delete --progress --verbose ./ ${sun_server}:~/fleet/ - ssh -Y ${sun_server} 'export PATH=/proj/async/cad/linux/bin/:$$PATH; cd ~/fleet/suncvs/marina/testCode; /proj/async/cad/linux/lib/jdk1.5.0_05-linux-i586/bin/java -cp $$HOME/fleet/lib/suncvs.jar com.sun.vlsi.chips.marina.test.MarinaTest -testNum 3' +#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/ + time ssh -t -Y ${sun_server} 'cd ~/fleet/; make testlocal' + +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 + +marina/testCode/marina.xml \ +marina/testCode/marina.v \ +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.jelib electric: - rsync -are ssh --progress --verbose ${sun_server}:fleet/suncvs/marina/testSims/marina.spi.out ~/marina.spi.out - java -Xmx900m -jar /Applications/electric.jar suncvs/marina/electric/aMarinaM.jelib - -suncvs/test: - mkdir -p suncvs - cd suncvs; cvs -d ${sun_server}:/import/async/cad/cvs co test - -suncvs/marina: - mkdir -p suncvs - cd suncvs; cvs -d ${sun_server}:/import/async/cad/cvs co marina + ${electric} marina/electric/aMarinaM.jelib -chaing: lib/suncvs.jar - java -cp lib/suncvs.jar com.sun.async.test.ChainG suncvs/marina/testCode/marina.xml +chaing: + java -cp lib/com.sun.async.test.jar com.sun.async.test.ChainG marina/testCode/marina.xml -syncspi: - rsync -are ssh --progress --verbose frehley:fleet/suncvs/marina/testCode/marina.spi.out ~/marina.spi.out +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 +copyin: + cp ~/${modname}.spi marina/testCode/marina.schematic-parasitics.spi || true + cp ~/${modname}.v marina/testCode/marina.v || true