X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=56f94d15054f2aeec7b08877dcfde31da73f7569;hb=dedfac6beabb6d57ef4cc9b164cce1ea1b4da1af;hp=723fc510f67a610662b1cc41fc70f1525d5a6413;hpb=05a6bc0a9e61356ecf66e72314c52438a93a0a68;p=fleet.git

diff --git a/Makefile b/Makefile
index 723fc51..56f94d1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,37 +1,75 @@
 
-go: fleeterpreter.jar
-	java -Xmx500m -cp lib/edu.berkeley.sbp.jar:fleeterpreter.jar edu.berkeley.fleet.interpreter.Main
+## Fleeterpreter ##############################################################################
 
-run: fleeterpreter.jar
-	java -Xmx500m -cp lib/edu.berkeley.sbp.jar:fleeterpreter.jar edu.berkeley.fleet.interpreter.Main < contrib/demo.fleet
-
-code: fleeterpreter.jar
-	java -Xmx500m -cp lib/edu.berkeley.sbp.jar:fleeterpreter.jar edu.berkeley.fleet.interpreter.Main --dump-code < contrib/demo.fleet
+interpreter_class = edu.berkeley.fleet.interpreter.Main
+cp                = lib/edu.berkeley.sbp.jar:fleeterpreter.jar
+java              = java -Xmx500m
 
-fabric:
-	make fleeterpreter.jar
-	java -Xmx500m -cp lib/edu.berkeley.sbp.jar:fleeterpreter.jar edu.berkeley.fleet.interpreter.Main --dump-fabric < contrib/demo.ships | tee ../fleet3/src/fabric.v
-fabric.balsa: fleeterpreter.jar
-	java -Xmx500m -cp lib/edu.berkeley.sbp.jar:fleeterpreter.jar edu.berkeley.fleet.interpreter.Main --dump-fabric < contrib/demo.ships > fabric.balsa
-	cat fabric.balsa
-
-applet: fleeterpreter.jar
-	java -Xmx500m -cp lib/edu.berkeley.sbp.jar:fleeterpreter.jar edu.berkeley.fleet.FleetApplet < test.fleet
+run: fleeterpreter.jar
+	$(java) -cp $(cp) $(interpreter_class) < contrib/demo.fleet
 
 fleeterpreter.jar: $(shell find src -name \*.java) src/edu/berkeley/fleet/parser/fleet.g
 	mkdir -p bin/edu/berkeley/fleet/parser/
 	cp src/edu/berkeley/fleet/parser/fleet.g bin/edu/berkeley/fleet/parser/
 	javac -cp lib/edu.berkeley.sbp.jar -d bin $(shell find src -name \*.java)
 	cd bin; jar xvf ../lib/edu.berkeley.sbp.jar
-	echo 'Main-Class: edu.berkeley.fleet.interpreter.Main' > bin/manifest
+	echo 'Main-Class: $(interpreter_class)' > bin/manifest
 	cd bin; jar cvmf manifest ../$@ .
 
-program:
-	make code
-	scp fleet.bin root@bee441.cs.berkeley.edu:
-#	ssh root@bee441.cs.berkeley.edu 'user_unprogram 1;user_program 1 main.bit; echo ok; ./a.out /dev/selectmap1 fleet.bin'
 
-clean:; rm -rf bin fleeterpreter.jar
+## Slipway ####################################################################################
+
+#host = sting.eecs.berkeley.edu
+#remote_xilinx = /opt/ISE81/
+#remote_dir = fleet/
+
+host = mm2.millennium.berkeley.edu
+remote_xilinx = /scratch/megacz/xilinx/
+remote_dir = /scratch/megacz/fleet/
+
+xilinx =  cd build; 
+xilinx += LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(XILINX)/bin/lin
+xilinx += XILINX=$(XILINX)
+xilinx += PATH=$$PATH:$(XILINX)/bin/lin
+xilinx += $(XILINX)/bin/lin/
+
+remote_run =  skill a.out;
+remote_run += user_unprogram 1;
+remote_run += user_program 1 main.bit;
+remote_run += echo compiling;
+remote_run += gcc test.c;
+remote_run += echo running;
+remote_run +=  ./a.out /dev/selectmap1 fleet.bin
+
+runfpga: build/main.bit
+	$(java) -cp $(cp) $(interpreter_class) --dump-code < contrib/demo.fleet
+	mv fleet.bin build
+	rsync -zare ssh --progress --verbose build/fleet.bin build/main.bit src/edu/berkeley/fleet/slipway/test.c root@bee441.cs.berkeley.edu:
+	ssh root@bee441.cs.berkeley.edu '$(remote_run)'
+
+build/main.bit: fleeterpreter.jar contrib/demo.ships $(shell find src -name \*.v)
+	mkdir -p build
+	$(java) -cp $(cp) $(interpreter_class) --dump-fabric < contrib/demo.ships | tee build/fabric.v
+	rsync -zare ssh --progress --delete --verbose ./ ${host}:${remote_dir}
+	ssh ${host} 'make -C ${remote_dir} synth XILINX=${remote_xilinx}'
+	scp ${host}:${remote_dir}/build/main.bit build/
+
+synth:
+	cd build; ln -sf ../src/edu/berkeley/fleet/slipway/* .
+	cd build; echo work > main.lso
+	cd build; for A in *.v; do echo verilog work \""$$A"\"; done > main.prj
+	cd build; mkdir -p tmp
+	cd build; mkdir -p xst
+	rm -rf build/_ngo
+	$(xilinx)xst -intstyle ise -ifn main.xst -ofn main.syr < main.xst
+	$(xilinx)ngdbuild -intstyle ise -dd _ngo -nt timestamp -uc main.ucf -p xc2vp70-ff1704-6 main.ngc main.ngd
+	$(xilinx)map -intstyle ise -p xc2vp70-ff1704-6 -cm area -l -pr b -k 4 -c 100 -tx off -o main_map.ncd main.ngd main.pcf
+	$(xilinx)par -w -intstyle ise -pl std -ol std -t 99 main_map.ncd main.ncd main.pcf
+	$(xilinx)bitgen -intstyle ise -d -f main.ut main.ncd
+#	$(xilinx)trce -intstyle ise -e 3 -l 3 -s 6 -xml main main.ncd -o main.twr main.pcf
+
+
+## API docs ####################################################################################
 
 javadoc:
 	mkdir -p doc/api
@@ -50,3 +88,12 @@ javadoc:
 		-d doc/api \
 		edu.berkeley.fleet.api \
 		edu.berkeley.fleet.parser
+
+## Misc ####################################################################################
+
+clean:
+	rm -rf bin fleeterpreter.jar
+	@mv build/fabric.balsa .
+	rm -rf build/*
+	@mv fabric.balsa build
+