X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=959a27d6373b629d553d0f4ef87896a741c78886;hb=dd7cc0f058f63794f94e7168c333a2866f5b59c1;hp=62b79837560b2071e9992a6cbba491949cc85a2c;hpb=37684cbca9bf8eda37fe7af3845cf135f66aafdf;p=fleet.git

diff --git a/Makefile b/Makefile
index 62b7983..959a27d 100644
--- a/Makefile
+++ b/Makefile
@@ -17,12 +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/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/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 .
 
@@ -35,8 +36,8 @@ 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/10.1/ISE
+remote_edk = /tools/xilinx/10.1/EDK
 
 #remote_ise = /tools/xilinx/ISE9.1i_lin
 #remote_edk = /tools/xilinx/EDK9.1i
@@ -45,8 +46,8 @@ host = intel2950-5.eecs.berkeley.edu
 #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
+#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/
@@ -101,6 +102,7 @@ build/fpga/main.bit: $(java_files) $(ship_files)
 	rsync -zare ssh --progress --delete --verbose ./ ${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/
 
 pcore = ${remote_edk}/hw/XilinxProcessorIPLib/pcores
 intstyle = -intstyle xflow
@@ -210,15 +212,14 @@ synth:
 	  | 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'
-	#rm build/fpga/dvi.ucf
 	cat build/fpga/*.ucf > build/fpga/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
-#	$(xilinx_edk)xmd -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?
+	$(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?
 
 
 runserver: fleet.jar
@@ -285,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 ####################################################################################
 
@@ -310,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
@@ -337,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