touch main.ini in Makefile

[fleet.git] / Makefile

diff --git a/Makefile b/Makefile
index 4f2fd8f..2aef6c0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -56,6 +56,7 @@ device = xc4vfx60ff1152-${speed_grade}
 
 upload: fleet.jar build/fpga/main.bit
        mkdir -p build
+       chmod +x misc/program.sh
        rsync -are ssh --progress --verbose ./ root@goliath:fleet/
 
 build/fpga/main.bit: $(java_files) $(ship_files)
@@ -79,17 +80,19 @@ synth:
        rm -f build/fpga/main.prj
        cd build/fpga; for A in *.v;   do echo verilog work \""$$A"\"; done >> main.prj
        cd build/fpga; for A in *.vhd; do echo vhdl    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 -intstyle xflow -p $(device) -pr b -ol std -o main_map.ncd main.ngd main.pcf
+       $(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 main.ace
+       $(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
@@ -184,3 +187,29 @@ f0: fleet.jar
        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: suncvs/marina suncvs/test
+       mkdir -p suncvs/build
+       cd suncvs; javac -cp 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: lib/suncvs.jar fleet.jar 
+       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 ~/fleet/fleet.jar -cp ~/fleet/lib/suncvs.jar com.sun.vlsi.chips.marina.test.MarinaTest'
+
+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/
+