minor updates to Makefile

diff --git a/Makefile b/Makefile
index 8d77e2c..7b86e6b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -29,10 +29,17 @@ fleet.jar: $(java_files) $(ship_files) src/edu/berkeley/fleet/assembler/fleet.g
 
 ## Fpga ####################################################################################
 
+# 32Gb ram, 4-core.     small-config:1019s  large-config:2530s
 host = intel2950-5.eecs.berkeley.edu
+
+# 128Gb ram, 2x4-core.  small-config:1189s  large-config:3065s
+#host = amdr905-1.eecs.berkeley.edu
+
 remote_ise = /tools/xilinx/ISE9.1i_lin
 remote_edk = /tools/xilinx/EDK9.1i
-remote_dir = /scratch/megacz/fleet/
+#remote_dir = /scratch/megacz/fleet/
+#remote_dir = /vol/hitz/home/megacz/fleet/
+remote_dir = /tmp/megacz/fleet/
 
 #host = mm2.millennium.berkeley.edu
 #remote_ise = /scratch/megacz/xilinx/ise/
@@ -303,15 +310,15 @@ lib/suncvs.jar: fleet.jar suncvs/marina suncvs/test
        cd suncvs/build; jar cvf ../../lib/suncvs.jar .
        cd suncvs/test; jar uvf ../../lib/suncvs.jar .
 
-#sun_server = frehley
-sun_server = simmons
+sun_server = frehley
+#sun_server = simmons
 
 runtest: fleet.jar
        rm lib/suncvs.jar; make lib/suncvs.jar
        rm -f suncvs/marina/testSims/isolatedInDock.spi.run
        ssh ${sun_server} 'skill nanosim'
        rsync -are ssh --delete --progress --verbose ./ ${sun_server}:~/fleet/
-       ssh ${sun_server} 'export PATH=$$PATH:/proj/async/cad/linux/bin/; cd ~/fleet/suncvs/marina/testSims; ln -s ../testCode/marina.xml ../testCode/marina.spi ../testCode/cfg .; /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 3018'
+       ssh ${sun_server} 'export PATH=$$PATH:/proj/async/cad/linux/bin/; cd ~/fleet/suncvs/marina/testSims; ln -s ../testCode/marina.xml ../testCode/marina.spi ../testCode/cfg .; /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 3021'
 
 electric:
        rsync -are ssh --progress --verbose ${sun_server}:fleet/suncvs/marina/testSims/marina.spi.out ~/marina.spi.out