Makefile tweaks

[fleet.git] / Makefile

diff --git a/Makefile b/Makefile
index 71565b7..1393c48 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,19 +2,22 @@
 ## Fleeterpreter ##############################################################################
 
 interpreter_class = edu.berkeley.fleet.interpreter.Main
-cp                = lib/edu.berkeley.sbp.jar:fleeterpreter.jar
+cp                = -cp fleet.jar
 java              = java -Xmx500m
 
-run: fleeterpreter.jar
-       $(java) -cp $(cp) $(interpreter_class) < contrib/demo.fleet
+run: fleet.jar; $(java) $(cp) $(interpreter_class)
 
-fleeterpreter.jar: $(shell find src -name \*.java) src/edu/berkeley/fleet/assembler/fleet.g
-       mkdir -p bin/edu/berkeley/fleet/assembler/
-       cp src/edu/berkeley/fleet/assembler/fleet.g bin/edu/berkeley/fleet/assembler/
-       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: $(interpreter_class)' > bin/manifest
-       cd bin; jar cvmf manifest ../$@ .
+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 -cp 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`
+       echo 'Main-Class: edu.berkeley.fleet.Main' > build/class/manifest
+       cd build/class/; jar cmf manifest ../../$@ .
 
 
 ## Slipway ####################################################################################
@@ -41,15 +44,30 @@ 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)'
+verilog_files  = $(shell find src -name \*.v)
+verilog_files += $(shell find src -name \*.inc)
 
-build/main.bit: fleeterpreter.jar contrib/demo.ships $(shell find src -name \*.v)
+runfpga: fleet.jar
+       $(java) -jar fleet.jar target=fpga run
+
+upload: fleet.jar build/main.bit
        mkdir -p build
-       $(java) -cp $(cp) $(interpreter_class) --dump-fabric < contrib/demo.ships | tee build/fabric.v
+       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) $(interpreter_class) --dump-fabric > 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/
@@ -63,12 +81,17 @@ synth:
        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)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/
+
 ## API docs ####################################################################################
 
 javadoc:
@@ -92,8 +115,26 @@ javadoc:
 ## Misc ####################################################################################
 
 clean:
-       rm -rf bin fleeterpreter.jar
-       @mv build/fabric.balsa .
-       rm -rf build/*
-       @mv fabric.balsa build
+       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
+
+