remote_edk = /tools/xilinx/${xil_ver}/EDK
speed_grade = 1
part = xc5vlx110t
+bsdfile=virtex5/data/xc5vlx110t_ff1738_1532.bsd
package = ff1136
board = ml505 # ??
runhost=goliath
remote_edk = /tools/xilinx/${xil_ver}/EDK
speed_grade = 1
part = xc5vlx110t
+bsdfile=virtex5/data/xc5vlx110t_ff1738_1532.bsd
package = ff1136
board = ml505 # ??
runhost=goliath
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
+upstream/sbp/edu.berkeley.sbp.jar:
+ git submodule init
+ git submodule update
+ cd upstream/sbp; make edu.berkeley.sbp.jar
+fleet.jar: upstream/sbp/edu.berkeley.sbp.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 -classpath lib/com.sun.async.test.jar:lib/ibex.jar: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
+ javac -classpath ~/proj/electric/srcj/electric.jar:lib/ibex.jar:lib/RXTXcomm.jar:upstream/sbp/edu.berkeley.sbp.jar -d build/class/ $(shell find src -name \*.java)
+ cd build/class/; jar xf ../../upstream/sbp/edu.berkeley.sbp.jar
cd build/class/; jar xf ../../lib/ibex.jar
for A in `find ships -name \*.ship`;\
do java \
edu.berkeley.fleet.Main \
expand $$A;\
done
- javac -classpath lib/com.sun.async.test.jar:lib/ibex.jar:lib/RXTXcomm.jar:build/class${ps}lib/edu.berkeley.sbp.jar -d build/class/ `find build/java -name \*.java`
+ javac -classpath ~/proj/electric/srcj/electric.jar:lib/ibex.jar:lib/RXTXcomm.jar:build/class${ps}upstream/sbp/edu.berkeley.sbp.jar -d build/class/ `find build/java -name \*.java`
echo 'Main-Class: edu.berkeley.fleet.Main' > build/class/manifest
jar cmf build/class/manifest $@ ships -C build/class .
# 32Gb ram, 4-core. small-config:1019s large-config:2530s
host = intel2950-5.eecs.berkeley.edu
+#host = intel2950-4.eecs.berkeley.edu
# 128Gb ram, 2x4-core. small-config:1189s large-config:3065s
#host = amdr905-1.eecs.berkeley.edu
-remote_dir = /scratch/megacz/fleet/
+#remote_dir = /scratch/megacz/fleet/
+remote_dir = /tmp/megacz/fleet/
#host = mm2.millennium.berkeley.edu
#remote_ise = /scratch/megacz/xilinx/ise/
mkdir -p build
chmod +x misc/program.sh
ifneq ($(impl),bee2)
- ${rsync} fleet.jar build/${impl}/main.bit misc root@${runhost}:fleet/
+ ${rsync} ./ root@${runhost}:fleet/
endif
build/${impl}/main.bit: $(java_files) $(ship_files)
ssh ${host} 'mkdir -p ${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} impl=${impl}'
- scp ${host}:${remote_dir}/build/${impl}/main.bit build/${impl}/
- scp ${host}:${remote_dir}/build/${impl}/main.ace build/${impl}/ || true
+ scp ${host}:${remote_dir}/build/${impl}/main.bit build/${impl}/
+ scp ${host}:${remote_dir}/build/${impl}/main.ace build/${impl}/ || true
+ scp ${host}:${remote_dir}/build/${impl}/main.svf build/${impl}/ || true
pcore = ${remote_edk}/hw/XilinxProcessorIPLib/pcores
intstyle = -intstyle xflow
cd build/${impl}; ln -sf ../../src/edu/berkeley/fleet/fpga/dvi/* .
cd build/${impl}; ln -sf ../../src/edu/berkeley/fleet/fpga/zbt/* .
cd build/${impl}; ln -sf ../../src/edu/berkeley/fleet/fpga/bee2/* .
+ cd build/${impl}; ln -sf ../../src/edu/berkeley/fleet/fpga/fjmem/* .
rm -f build/${impl}/main.lso
echo work >> build/${impl}/main.lso
rm -f build/${impl}/main.prj
$(xilinx_ise)trce ${intstyle} -e 3 -l 3 -s ${speed_grade} -xml main main.ncd -o main.twr main.pcf
$(xilinx_ise)bitgen ${intstyle} -f main.ut main.ncd
ifneq ($(impl),bee2)
- $(xilinx) tcl $(remote_edk)/data/xmd/genace.tcl -jprog -hw main.bit -board ${board} -ace mainx.ace
+ echo "cleancablelock" > build/${impl}/impact.cmd
+ echo "setMode -bs" >> build/${impl}/impact.cmd
+ echo "setCable -port svf -file main.svf" >> build/${impl}/impact.cmd
+ echo "addDevice -p 1 -file $(remote_ise)/${bsdfile}" >> build/${impl}/impact.cmd
+ echo "assignFile -p 1 -file main.bit" >> build/${impl}/impact.cmd
+ echo "program -p 1" >> build/${impl}/impact.cmd
+ echo "quit" >> build/${impl}/impact.cmd
+ $(xilinx_ise)impact -batch < impact.cmd
+
+ $(xilinx) tclsh $(remote_edk)/data/xmd/genace.tcl -jprog -hw main.bit -board ${board} -ace mainx.ace
mv build/${impl}/mainx.ace build/${impl}/main.ace # genace throws a fit if the filename prefix is the same?
endif
runserver: fleet.jar
- $(java) -Djava.library.path=lib -cp fleet.jar:lib/RXTXcomm.jar edu.berkeley.fleet.fpga.Server
+ $(java) -cp fleet.jar:lib/RXTXcomm.jar edu.berkeley.fleet.fpga.Server
test: fleet.jar
$(java) -jar fleet.jar test ships/*.ship tests
electric_jar = ~/proj/electric/srcj/electric.jar
electric = java -Xss2m -XX:MaxPermSize=128m -Xmx2000m -jar ${electric_jar}
-electric_headless = java -Xmx1500m -jar -Djava.awt.headless=true ${electric_jar} -batch
-all_electric_files = $(shell find chips/marina/electric/ -name \*.jelib -or -path \*.delib\*)
+electric_headless = java -Xmx1500m -jar -Djava.util.prefs.PreferencesFactory=com.sun.electric.database.text.EmptyPreferencesFactory -Djava.awt.headless=true ${electric_jar} -batch
+all_electric_files = $(shell find chips/marina/electric -name \*.jelib -or -path \*.delib/\* | grep -v :)
modname = fakeMarinaPadframe
sun_dir = /home/am77536/fleet
sun_fs_server = ivans
sun_server = simmons
+sun_server_user = am77536
+
+#sun_dir = /root/fleet
+#sun_fs_server = vm
+#sun_server = localhost
+#sun_server_user = root
#sun_server = frehley # electric team uses frehley
#sun_server = simmons
#testnum = 3025
#testnum = 3040
-#testnum = 0
+#testnum = 7777
+testnum = 0
#testnum = 999
-testnum = 8888
+#testnum = 0
+#testnum = 8887
+#testnum = 0
+#testnum = 6666
runtest: fleet.jar chips/marina/testCode/marina.xml chips/marina/testCode/marina.v chips/marina/testCode/marina.schematic-parasitics.spi
+ scp ${sun_fs_server}:${sun_dir}/chips/marina/testCode/out.dat . || true
${rsync} --delete ./ ${sun_fs_server}:${sun_dir}/
- time ssh -t -Y ${sun_fs_server} 'ssh -t am77536@${sun_server} "cd ${sun_dir}/; make testlocal impl=${impl}"'
+ ${rsync} --delete -L ~/proj/electric/srcj/electric.jar ${sun_fs_server}:/home/am77536/proj/electric/srcj/
+ time ssh -t -Y ${sun_fs_server} 'ssh -t ${sun_server_user}@${sun_server} "bash --login -c \"make -C ${sun_dir} testlocal impl=${impl}\""'
+ scp ${sun_fs_server}:${sun_dir}/chips/marina/testCode/out.dat .
spice: fleet.jar
cp ~/omegaCounter.spi chips/marina/testCode/omegaCounter.spi
cp ~/omegaCounter-extracted.spi chips/marina/testCode/omegaCounter-extracted.spi
rsync -azre ssh --delete --progress --verbose ./ ${sun_fs_server}:${sun_dir}/
- ssh -t -Y ${sun_fs_server} 'cd ${sun_dir}/chips/marina/testCode/; export PATH=/proj/async/cad/linux/bin/:$$PATH; echo -e "rcf commands\n" | hsim64 -time 90000 go.spi -o go.spi'
+ ssh -t -Y ${sun_fs_server} 'cd ${sun_dir}/chips/marina/testCode/; echo -e "rcf commands\n" | hsim64 -time 90000 go.spi -o go.spi'
ifeq ($(impl),silicon)
testarg=-hsim
endif
+urjtag: fleet.jar chips/marina/testCode/marina.xml
+ ${rsync} --delete ./ root@goliath:fleet/
+ ${rsync} --delete ~/proj/electric/srcj/electric.jar root@goliath:electric.jar
+ ssh -t root@goliath 'cd fleet/chips/marina/testCode; java -cp ../../../fleet.jar:/root/electric.jar -Dfleet.impl=edu.berkeley.fleet.marina.Marina edu.berkeley.fleet.marina.MarinaTest -silicon -testNum 0'
+
testlocal: fleet.jar
cd chips/marina/testCode; \
- export PATH=/proj/async/cad/linux/bin/:$$PATH; \
- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/proj/async/cad/test/; \
- /proj/async/cad/linux/lib/jdk1.6/bin/java \
- -cp `pwd`/../../../lib/com.sun.async.test.jar:`pwd`/../../../fleet.jar \
+ export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/proj/async/cad/test/; \
+ java \
+ -cp ~/proj/electric/srcj/electric.jar:`pwd`/../../../fleet.jar \
-Djava.library.path=/proj/async/cad/test/ \
- -Dfleet.impl=com.sun.vlsi.chips.marina.test.Marina \
- com.sun.vlsi.chips.marina.test.MarinaTest \
+ -Dfleet.impl=edu.berkeley.fleet.marina.Marina \
+ edu.berkeley.fleet.marina.MarinaTest \
${testarg} \
-testNum ${testnum} || tail -n 20 marina.spi.run
rm -f chips/marina/testCode/marina.schematic-parasitics.spi
rm -f chips/marina/testCode/marina.xml
cd chips/marina/testCode; \
- nice -n 19 ${electric_headless} -s regen.bsh ../electric/aMarinaM.jelib
+ nice -n 19 ${electric_headless} -s regen.bsh ../electric/aMarinaM.delib
electric:
- ${electric} chips/marina/electric/aMarinaM.jelib
+ ${electric} chips/marina/electric/aMarinaM.delib
sync:
${rsync} ${sun_fs_server}:${sun_dir}/chips/marina/testCode/marina\*.dump ~/ || true
@echo == Extracting Layout ===========================================================
ssh ${sun_fs_server} 'rm -rf /tmp/am77536; mkdir /tmp/am77536'
cd chips/marina/testCode; \
- nice -n 19 ${electric_headless} -s rcx.bsh ../electric/omegaCounter.jelib
+ nice -n 19 ${electric_headless} -s rcx.bsh ../electric/omegaCounter.delib
mv chips/marina/electric/starrcxt/omegaCounter.sp $@