X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=97e9b59f394ba0ae178a20b2dfcfb26abf8be6d6;hb=385617cefcb2b4442b7316bd3e8cdf658ce43c99;hp=40883fe08f5a74cac325bb9a79119e30126ee1e8;hpb=937b8c98b92ef87b2863b85fd4805e241fb1d303;p=fleet.git
diff --git a/Makefile b/Makefile
index 40883fe..97e9b59 100644
--- a/Makefile
+++ b/Makefile
@@ -1,112 +1,158 @@
## Fleeterpreter ##############################################################################
-interpreter_class = edu.berkeley.fleet.interpreter.Main
-cp = -cp fleet.jar
+cp = -cp fleet.jar:lib/RXTXcomm.jar
java = java -Xmx500m
run: fleet.jar; $(java) $(cp) $(interpreter_class)
-fleet.jar: $(shell find src -name \*.java) $(shell find ships -name \*.ship) src/edu/berkeley/fleet/assembler/fleet.g
+ifeq ($(shell uname -o 2>/dev/null),Cygwin)
+ps=\;
+else
+ps=:
+endif
+
+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 -cp 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 -cp build/class: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 ../../$@ .
-## Slipway ####################################################################################
-
-#host = sting.eecs.berkeley.edu
-#remote_xilinx = /opt/ISE81/
-#remote_dir = fleet/
+## Fpga ####################################################################################
-host = mm2.millennium.berkeley.edu
-remote_xilinx = /scratch/megacz/xilinx/
+host = intel2950-5.eecs.berkeley.edu
+remote_ise = /tools/xilinx/ISE9.1i_lin
+remote_edk = /tools/xilinx/EDK9.1i
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/
+#host = mm2.millennium.berkeley.edu
+#remote_ise = /scratch/megacz/xilinx/ise/
+#remote_edk = /scratch/megacz/xilinx/edk/
+#remote_dir = /scratch/megacz/fleet/
-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)
+xilinx = cd build/fpga;
+xilinx += LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(remote_ise)/bin/lin:$(remote_edk)/bin/lin
+xilinx += PATH=$$PATH:$(remote_ise)/bin/lin:$(remote_edk)/bin/lin
+xilinx += XST_VERSION=9.2i
+xilinx += XILINX=$(remote_ise)
+xilinx += XILINX_EDK=$(remote_edk)
-runfpga: fleet.jar
- $(java) -jar fleet.jar target=fpga run
+xilinx_ise = $(xilinx) $(remote_ise)/bin/lin/
+xilinx_edk = $(xilinx) $(remote_edk)/bin/lin/
-mrunfpga: fleet.jar build/main.bit
- mkdir -p build
- $(java) $(cp) $(interpreter_class) --dump-code
- rsync -zare ssh --progress --verbose build/main.bit root@bee441.cs.berkeley.edu:/var/slipway/megacz.bit
- #bitfile option doesn't work
- #$(java) -jar fleet.jar bitfile=megacz.bit target=fpga run
+speed_grade = 11
+device = xc4vfx60ff1152-${speed_grade}
+#device = xc2vp70-7ff1704
-build/fabric.v: $(verilog_files) src/edu/berkeley/fleet/slipway/Slipway.java
- make fleet.jar
+upload: fleet.jar build/fpga/main.bit
mkdir -p build
- $(java) $(cp) $(interpreter_class) --dump-fabric > build/fabric.v
+ chmod +x misc/program.sh
+ rsync -are ssh --progress --verbose ./ root@goliath:fleet/
-build/main.bit: build/fabric.v $(verilog_files)
+build/fpga/main.bit: $(java_files) $(ship_files)
make fleet.jar
+ mkdir -p build/fpga
+ $(java) $(cp) edu.berkeley.fleet.fpga.Fpga build/fpga/
+ cp src/edu/berkeley/fleet/fpga/* build/fpga || true
+ 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/
+ 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/
+pcore = ${remote_edk}/hw/XilinxProcessorIPLib/pcores
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/
+ cd build/fpga; ln -sf ../../src/edu/berkeley/fleet/fpga/* .
+ cd build/fpga; ln -sf ../../src/edu/berkeley/fleet/fpga/mem/* .
+ rm -f build/fpga/main.lso
+ echo work >> build/fpga/main.lso
+ rm -f build/fpga/main.prj
+ cd build/fpga; for A in *.v; do echo verilog work \""$$A"\"; done >> main.prj
+ cd build/fpga; touch main.ini
+ cd build/fpga; mkdir -p tmp
+ cd build/fpga; mkdir -p xst
+ rm -rf build/fpga/_ngo
+ skill xst_original
+ $(xilinx_ise)xst -intstyle xflow -ifn main.xst -ofn main.syr < main.xst
+ $(xilinx_ise)ngdbuild -aul -intstyle xflow -dd _ngo -nt timestamp -uc main.ucf -p $(device) main.ngc main.ngd
+ $(xilinx_ise)map -cm area -intstyle xflow -p $(device) -pr b -ol std -o main_map.ncd main.ngd main.pcf
+ $(xilinx_ise)par -w -intstyle xflow -t 99 -pl std -rl std main_map.ncd main.ncd main.pcf
+ $(xilinx_ise)bitgen -intstyle xflow -d -f main.ut main.ncd
+# $(xilinx_ise)trce -intstyle xflow -e 3 -l 3 -s ${speed_grade} -xml main main.ncd -o main.twr main.pcf
+ $(xilinx_edk)xmd -tcl $(remote_edk)/data/xmd/genace.tcl -jprog -hw main.bit -board ml410 -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
+ java -Djava.library.path=lib -cp fleet.jar:lib/RXTXcomm.jar edu.berkeley.fleet.fpga.Server
+
+test: fleet.jar; $(java) -jar fleet.jar test ships/*.ship tests
+testfpga: fleet.jar; $(java) -jar fleet.jar target=fpga test ships/*.ship tests
+
+## Manual ####################################################################################
+
+svgs = $(shell find doc -name \*.svg)
+%.eps: %.svg
+ DISPLAY= /Applications/Inkscape.app/Contents//Resources/bin/inkscape -z --export-area-drawing $^ --export-eps=$@
+
+%.pdf: %.eps
+ epstopdf $^ --outfile=$@
+
+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 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 \
+ -noqualifier all \
-stylesheetfile doc/javadoc.css \
+ -d /afs/research.cs.berkeley.edu/class/fleet/website/code/javadoc/ \
+ edu.berkeley.fleet.api
+ javadoc \
+ -linksource \
+ -windowtitle "FleetCode API Documentation" \
+ -sourcepath src \
+ -header "FleetCode API Documentation
" \
+ -public \
+ -notree \
+ -nonavbar \
-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-private/ \
+ `find src/edu/berkeley/fleet -name \*.java`
+ open http://fleet.cs.berkeley.edu/code/javadoc/
+ open http://fleet.cs.berkeley.edu/code/javadoc-private/
## Misc ####################################################################################
@@ -115,21 +161,73 @@ 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
- cp _darcs/prefs/defaultrepo 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: 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
+
+# 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 Fleet.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 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
+
+
+## Targets below are for integration with Sun-Proprietary Marina Test Chip ##############################
+
+cleansuncvs:
+ rm -rf lib/suncvs.jar suncvs
+
+lib/suncvs.jar: fleet.jar suncvs/marina suncvs/test
+ mkdir -p suncvs/build
+ cd suncvs; javac -cp ../fleet.jar: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 .
+
+runtest: fleet.jar lib/suncvs.jar
+ ssh simmons 'skill nanosim'
+ rsync -are ssh --delete --progress --verbose ./ simmons:~/fleet/
+ ssh simmons 'export PATH=$$PATH:/proj/async/cad/linux/bin/; cd ~/fleet/suncvs/marina/testSims; /proj/async/cad/linux/lib/jdk1.5.0_05-linux-i586/bin/java -cp $$HOME/fleet/fleet.jar:$$HOME/fleet/lib/suncvs.jar com.sun.vlsi.chips.marina.test.MarinaTest -testNum 3'
+
+suncvs/test:
+ mkdir -p suncvs
+ cd suncvs; cvs -d simmons:/import/async/cad/cvs co test
+
+suncvs/marina:
+ mkdir -p suncvs
+ cd suncvs; cvs -d simmons:/import/async/cad/cvs co marina
+ cd suncvs/marina; rsync -are ssh simmons:/import/async/cad/2008/marina/rkao/marina/testSims/ testSims/
+ cd suncvs/marina; rsync -are ssh simmons:/import/async/cad/2008/marina/rkao/marina/testCode/isolatedInDock.xml testCode/