projects
/
fleet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
459f465
)
Makefile: add silicon/siliconlocal targets, factor out ${rsync} variable
author
Adam Megacz
<adam@megacz.com>
Thu, 20 Aug 2009 22:11:39 +0000
(15:11 -0700)
committer
Adam Megacz
<adam@megacz.com>
Sat, 22 Aug 2009 21:23:31 +0000
(14:23 -0700)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
2c4887a
..
8a3bdce
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-84,11
+84,12
@@
board = ml505 # ??
#package = 7ff1704
device = ${part}${package}-${speed_grade}
#package = 7ff1704
device = ${part}${package}-${speed_grade}
+rsync = rsync --exclude=marina/images -zare ssh --progress --verbose
upload: fleet.jar build/fpga/main.bit
mkdir -p build
chmod +x misc/program.sh
upload: fleet.jar build/fpga/main.bit
mkdir -p build
chmod +x misc/program.sh
- rsync -are ssh --progress --verbose ./ root@goliath:fleet/
+ ${rsync} ./ root@goliath:fleet/
build/fpga/main.bit: $(java_files) $(ship_files)
make fleet.jar
build/fpga/main.bit: $(java_files) $(ship_files)
make fleet.jar
@@
-99,7
+100,7
@@
build/fpga/main.bit: $(java_files) $(ship_files)
do java -cp build/class edu.berkeley.fleet.Main target=fpga expand $$A;\
done
ssh ${host} 'mkdir -p ${remote_dir}'
do java -cp build/class edu.berkeley.fleet.Main target=fpga expand $$A;\
done
ssh ${host} 'mkdir -p ${remote_dir}'
- rsync -zare ssh --progress --delete --verbose ./ ${host}:${remote_dir}
+ ${rsync} --delete ./ ${host}:${remote_dir}
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/
scp ${host}:${remote_dir}/build/fpga/main.ace build/fpga/
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/
scp ${host}:${remote_dir}/build/fpga/main.ace build/fpga/
@@
-358,9
+359,13
@@
sun_server = simmons-tunnel
testnum = 0
runtest: fleet.jar marina/testCode/marina.xml marina/testCode/marina.v marina/testCode/marina.schematic-parasitics.spi
testnum = 0
runtest: fleet.jar marina/testCode/marina.xml marina/testCode/marina.v marina/testCode/marina.schematic-parasitics.spi
- rsync -azre ssh --delete --progress --verbose ./ ${sun_server}:~/fleet/
+ ${rsync} --delete ./ ${sun_server}:~/fleet/
time ssh -t -Y ${sun_server} 'cd ~/fleet/; make testlocal'
time ssh -t -Y ${sun_server} 'cd ~/fleet/; make testlocal'
+silicon: fleet.jar marina/testCode/marina.xml
+ ${rsync} --delete ./ ${sun_server}:~/fleet/
+ time ssh -t -Y ${sun_server} 'cd ~/fleet/; make siliconlocal'
+
testlocal: fleet.jar
cd marina/testCode; \
export PATH=/proj/async/cad/linux/bin/:$$PATH; \
testlocal: fleet.jar
cd marina/testCode; \
export PATH=/proj/async/cad/linux/bin/:$$PATH; \
@@
-370,6
+375,16
@@
testlocal: fleet.jar
-hsim \
-testNum ${testnum} || tail -n 20 marina.spi.run
-hsim \
-testNum ${testnum} || tail -n 20 marina.spi.run
+siliconlocal: fleet.jar
+ cd marina/testCode; \
+ export PATH=/proj/async/cad/linux/bin/:$$PATH; \
+ /proj/async/cad/linux/lib/jdk1.5.0_05-linux-i586/bin/java \
+ -cp `pwd`/../../lib/com.sun.async.test.jar:`pwd`/../../fleet.jar \
+ -Djava.library.path=/proj/async/cad/test/ \
+ com.sun.vlsi.chips.marina.test.MarinaTest \
+ -silicon \
+ -testNum ${testnum}
+
marina/testCode/marina.xml \
marina/testCode/marina.v \
marina/testCode/marina.schematic-parasitics.spi: ${all_electric_files}
marina/testCode/marina.xml \
marina/testCode/marina.v \
marina/testCode/marina.schematic-parasitics.spi: ${all_electric_files}
@@
-388,8
+403,8
@@
chaing:
java -cp lib/com.sun.async.test.jar com.sun.async.test.ChainG marina/testCode/marina.xml
sync:
java -cp lib/com.sun.async.test.jar com.sun.async.test.ChainG marina/testCode/marina.xml
sync:
- rsync -arze ssh --progress --verbose ${sun_server}:fleet/marina/testCode/marina\*.dump ~/ || true
- rsync -arze ssh --progress --verbose ${sun_server}:fleet/marina/testCode/marina.spi.out ~/${modname}.out || true
+ ${rsync} ${sun_server}:fleet/marina/testCode/marina\*.dump ~/ || true
+ ${rsync} ${sun_server}:fleet/marina/testCode/marina.spi.out ~/${modname}.out || true
copyin:
cp ~/${modname}.spi marina/testCode/marina.schematic-parasitics.spi || true
cp ~/${modname}.v marina/testCode/marina.v || true
copyin:
cp ~/${modname}.spi marina/testCode/marina.schematic-parasitics.spi || true
cp ~/${modname}.v marina/testCode/marina.v || true