X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=29a0551e38f0d8e5b85c27a92a6830f3a1728508;hb=c721b45edfa82397a1f286a63dbb32fbc658f1dc;hp=723fc510f67a610662b1cc41fc70f1525d5a6413;hpb=001225f0c21ce9dc476b89d3c77563f1bd1c4c2c;p=fleet.git

diff --git a/Makefile b/Makefile
index 723fc51..29a0551 100644
--- a/Makefile
+++ b/Makefile
@@ -1,37 +1,104 @@
 
-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
+cp                = -cp fleet.jar
+java              = java -Xmx500m
 
-code: fleeterpreter.jar
-	java -Xmx500m -cp lib/edu.berkeley.sbp.jar:fleeterpreter.jar edu.berkeley.fleet.interpreter.Main --dump-code < contrib/demo.fleet
+run: fleet.jar; $(java) $(cp) $(interpreter_class)
 
-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
+ifeq ($(shell uname -o),Cygwin)
+ps=\;
+else
+ps=:
+endif
 
-applet: fleeterpreter.jar
-	java -Xmx500m -cp lib/edu.berkeley.sbp.jar:fleeterpreter.jar edu.berkeley.fleet.FleetApplet < test.fleet
+fleet.jar: $(shell find src -name \*.java) $(shell find ships -name \*.ship) 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/edu.berkeley.sbp.jar -d build/class/ $(shell find src -name \*.java)
+	cd build/class/; jar xf ../../lib/edu.berkeley.sbp.jar
+	for A in `find ships -name \*.ship`;\
+	  do java -cp build/class edu.berkeley.fleet.Main expand $$A;\
+	  done
+	javac -classpath 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
+	cd build/class/; jar cmf manifest ../../$@ .
 
-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
-	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'
+## Slipway ####################################################################################
 
-clean:; rm -rf bin fleeterpreter.jar
+#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
+
+verilog_files  = $(shell find src -name \*.v)
+verilog_files += $(shell find src -name \*.inc)
+
+runfpga: fleet.jar
+	$(java) -jar fleet.jar target=fpga run
+
+upload: fleet.jar build/main.bit
+	mkdir -p build
+	rsync -zare ssh --progress --verbose build/main.bit root@bee441.cs.berkeley.edu:/var/slipway/megacz.bit
+
+uploadtest:
+	make upload
+	$(java) -jar fleet.jar target=fpga bitfile=megacz.bit test tests
+
+build/fabric.v: $(verilog_files) src/edu/berkeley/fleet/slipway/Slipway.java
+	make fleet.jar
+	mkdir -p build
+	$(java) $(cp) edu.berkeley.fleet.slipway.Slipway > build/fabric.v
+
+build/main.bit: build/fabric.v $(verilog_files)
+	make fleet.jar
+	for A in `find ships -name \*.ship`;\
+	  do java -cp build/class edu.berkeley.fleet.Main target=fpga expand $$A;\
+	  done
+	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 speed -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
+
+
+doc: fleet.jar
+	$(java) $(cp) edu.berkeley.fleet.doc.Doc < ships/Alu2.ship
+
+test:     fleet.jar; $(java) -jar fleet.jar             test tests/
+testfpga: fleet.jar; $(java) -jar fleet.jar target=fpga test tests/
+
+## API docs ####################################################################################
 
 javadoc:
 	mkdir -p doc/api
@@ -49,4 +116,46 @@ javadoc:
 		-noqualifier all \
 		-d doc/api \
 		edu.berkeley.fleet.api \
-		edu.berkeley.fleet.parser
+		edu.berkeley.fleet.assembler
+
+## Misc ####################################################################################
+
+clean:
+	rm -rf fleet.jar build
+
+## Dist ####################################################################################
+
+dist:
+	darcs record
+	darcs push /afs/research.cs.berkeley.edu/class/fleet/website/repos/fleet/
+	darcs get . --repo-name=fleet-`date +%d.%h.%y`
+	make -C fleet-`date +%d.%h.%y` fleet.jar
+	rm -rf fleet-`date +%d.%h.%y`/build
+	echo 'http://research.cs.berkeley.edu/class/fleet/repos/fleet/' > \
+	  fleet-`date +%d.%h.%y`/_darcs/prefs/defaultrepo
+	tar cvzf fleet-`date +%d.%h.%y`.tgz fleet-`date +%d.%h.%y`
+	rm -rf fleet-`date +%d.%h.%y`
+	mv fleet-`date +%d.%h.%y`.tgz /afs/research.cs.berkeley.edu/class/fleet/website/files/
+	@echo
+	@echo
+	@echo   http://research.cs.berkeley.edu/class/fleet/files/fleet-`date +%d.%h.%y`.tgz
+	@echo
+	@echo
+
+
+# you'll probably want to change this line
+ghc  = /usr/local/brian/ghc/compiler/ghc-inplace
+
+ghc += -fglasgow-exts -fallow-undecidable-instances -fallow-overlapping-instances -cpp 
+ghc += -i$(shell pwd)/build/hi/ -hidir $(shell pwd)/build/hi/ -odir $(shell pwd)/build/class/
+
+f0: fleet.jar
+	mkdir -p build/hi build/class
+	cd lib;                        $(ghc) -c -java SBP.lhs
+	cd src/edu/berkeley/fleet/f0/; $(ghc) -fglasgow-exts -cpp $(hflags)    -java Util.lhs
+	cd src/edu/berkeley/fleet/f0/; $(ghc) -fglasgow-exts -cpp $(hflags)    -java Types.lhs
+	cd src/edu/berkeley/fleet/f0/; $(ghc) -fglasgow-exts -cpp $(hflags)    -java Fleet.lhs
+	cd src/edu/berkeley/fleet/f0/; $(ghc) -fglasgow-exts -cpp $(hflags)    -java Compile.lhs
+	cd src/edu/berkeley/fleet/f0/; $(ghc) -fglasgow-exts -cpp $(hflags)    -java Main.lhs
+	$(java) -cp build/class:lib/HSbase.jar:lib/HSrts.jar:lib/HSstm.jar:fleet.jar Main
+