X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=32f652c59e73241ada676413eb4dc38e4555c4e1;hb=50f89d7a5b6f96b87351bd886f7b2e86595135f8;hp=220845b1d7e9c16a6e4b9aea2e1f4bbdd5fee509;hpb=b2659591cbf030b6e6fc5ff68e8f4bcceaafc58c;p=fleet.git diff --git a/Makefile b/Makefile index 220845b..32f652c 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ ## Fleeterpreter ############################################################################## -cp = -cp fleet.jar +cp = -cp fleet.jar:lib/RXTXcomm.jar java = java -Xmx500m run: fleet.jar; $(java) $(cp) $(interpreter_class) @@ -12,26 +12,24 @@ else ps=: endif -fleet.jar: $(shell find src -name \*.java) $(shell find ships -name \*.ship) src/edu/berkeley/fleet/assembler/fleet.g +java_files = $(shell find src -name \*.java) +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/edu.berkeley.sbp.jar -d build/class/ $(shell find src -name \*.java) + javac -classpath 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 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` + javac -classpath 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 cd build/class/; jar cmf manifest ../../$@ . ## Fpga #################################################################################### -#host = sting.eecs.berkeley.edu -#remote_xilinx = /opt/ISE81/ -#remote_dir = fleet/ - -host = intel2950-5.eecs.berkeley.edu +host = intel2950-3.eecs.berkeley.edu remote_xilinx = /scratch/megacz/xilinx/ remote_dir = /scratch/megacz/fleet/ @@ -45,56 +43,34 @@ 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 +device = xc4vfx60-11ff1152 upload: fleet.jar build/fpga/main.bit mkdir -p build - rsync -zare ssh --progress --verbose build/fpga/main.bit root@bee441.megacz.com:/var/slipway/megacz.bit - -uploadtest: - make upload - $(java) -jar fleet.jar target=fpga bitfile=megacz.bit test ships/*.ship tests -testmegacz: - $(java) -jar fleet.jar target=fpga bitfile=megacz.bit test ships/*.ship tests + rsync -are ssh --progress --verbose ./ root@goliath:fleet/ -build/fpga/fabric.v: $(verilog_files) src/edu/berkeley/fleet/fpga/Fpga.java +build/fpga/main.bit: $(java_files) $(ship_files) make fleet.jar mkdir -p build/fpga - $(java) $(cp) edu.berkeley.fleet.fpga.Fpga > build/fpga/fabric.v - -build/fpga/main.bit: build/fpga/fabric.v $(verilog_files) - make fleet.jar + $(java) $(cp) edu.berkeley.fleet.fpga.Fpga build/fpga/ cp src/edu/berkeley/fleet/fpga/* build/fpga for A in `find ships -name \*.ship`;\ do java -cp build/class edu.berkeley.fleet.Main target=fpga expand $$A;\ done - $(java) -cp fleet.jar edu.berkeley.fleet.fpga.Generator build/fpga/ rsync -zare ssh --progress --delete --verbose ./ ${host}:${remote_dir} time ssh ${host} 'make -C ${remote_dir} synth XILINX=${remote_xilinx}' scp ${host}:${remote_dir}/build/fpga/main.bit build/fpga/ synth: - cd build/fpga; ln -sf ../src/edu/berkeley/fleet/fpga/* . + cd build/fpga; ln -sf ../../src/edu/berkeley/fleet/fpga/* . cd build/fpga; echo work > main.lso cd build/fpga; for A in *.v; do echo verilog work \""$$A"\"; done > main.prj cd build/fpga; mkdir -p tmp cd build/fpga; mkdir -p xst rm -rf build/fpga/_ngo $(xilinx)xst -intstyle xflow -ifn main.xst -ofn main.syr < main.xst - $(xilinx)ngdbuild -intstyle xflow -dd _ngo -nt timestamp -uc main.ucf -p xc2vp70-ff1704-6 main.ngc main.ngd - $(xilinx)map -intstyle xflow -p xc2vp70-ff1704-6 -cm speed -l -pr b -k 4 -c 100 -tx off -o main_map.ncd main.ngd main.pcf + $(xilinx)ngdbuild -aul -intstyle xflow -dd _ngo -nt timestamp -uc main.ucf -p $(device) main.ngc main.ngd + $(xilinx)map -intstyle xflow -p $(device) -cm speed -l -pr b -k 4 -c 100 -tx off -o main_map.ncd main.ngd main.pcf $(xilinx)par -w -intstyle xflow -pl std -ol std -t 99 main_map.ncd main.ncd main.pcf $(xilinx)bitgen -intstyle xflow -d -f main.ut main.ncd # $(xilinx)trce -intstyle xflow -e 3 -l 3 -s 6 -xml main main.ncd -o main.twr main.pcf @@ -104,9 +80,6 @@ synth: test: fleet.jar; $(java) -jar fleet.jar test ships/*.ship tests testfpga: fleet.jar; $(java) -jar fleet.jar target=fpga test ships/*.ship tests -generate: fleet.jar - $(java) -cp fleet.jar edu.berkeley.fleet.fpga.Generator build/fpga/ - ## Manual #################################################################################### svgs = $(shell find doc -name \*.svg) @@ -116,31 +89,37 @@ svgs = $(shell find doc -name \*.svg) %.pdf: %.eps epstopdf $^ --outfile=$@ -manual: fleet.jar $(svgs:%.svg=%.pdf) +manual: archmanual toolmanual + +archmanual: fleet.jar $(svgs:%.svg=%.pdf) + $(java) -jar fleet.jar doc + cd .tmp; ln -sf ../doc/*.bib . + cd .tmp; TEXINPUTS=$$TEXINPUTS:../src/edu/berkeley/fleet/assembler/:../doc/ pdflatex FleetTwo.Manual.tex + cd .tmp; for A in *.mp; do mpost --tex=latex $$A; done + cd .tmp; TEXINPUTS=$$TEXINPUTS:../src/edu/berkeley/fleet/assembler/:../doc/ pdflatex FleetTwo.Manual.tex + open .tmp/FleetTwo.Manual.pdf +toolmanual: fleet.jar $(svgs:%.svg=%.pdf) $(java) -jar fleet.jar doc cd .tmp; ln -sf ../doc/*.bib . - cd .tmp; TEXINPUTS=$$TEXINPUTS:../src/edu/berkeley/fleet/assembler/:../doc/ pdflatex *.tex - open .tmp/*.pdf + cd .tmp; TEXINPUTS=$$TEXINPUTS:../src/edu/berkeley/fleet/assembler/:../doc/ pdflatex toolchain.tex + open .tmp/toolchain.pdf ## API docs #################################################################################### javadoc: - mkdir -p doc/api javadoc \ - -classpath lib/edu.berkeley.sbp.jar \ -linksource \ - -windowtitle "Fleet API" \ + -windowtitle "FleetCode API Documentation" \ -sourcepath src \ - -header "Fleet
API" \ + -header "FleetCode API Documentation
" \ -public \ -notree \ - -noindex \ -nonavbar \ - -stylesheetfile doc/javadoc.css \ -noqualifier all \ - -d doc/api \ - edu.berkeley.fleet.api \ - edu.berkeley.fleet.assembler + -stylesheetfile doc/javadoc.css \ + -d /afs/research.cs.berkeley.edu/class/fleet/website/code/javadoc/ \ + edu.berkeley.fleet.api + open http://fleet.cs.berkeley.edu/code/javadoc/ ## Misc #################################################################################### @@ -149,23 +128,27 @@ clean: ## 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 +#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 +# +dist: + darcs dist -d fleet + mv fleet.tar.gz /afs/research.cs.berkeley.edu/class/fleet/website/code/snapshots/fleet-`date +%y.%m.%d`.tgz # you'll probably want to change this line ghc = /usr/local/brian/ghc/compiler/ghc-inplace