projects / fleet.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
add new urjtag-based code, fjmem
[fleet.git] / Makefile
diff --git a/Makefile b/Makefile
index fb6cc23..cbcad7a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,7 @@ remote_ise = /tools/xilinx/${xil_ver}/ISE
 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
@@ -42,6 +43,7 @@ remote_ise = /tools/xilinx/${xil_ver}/ISE
 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
@@ -68,7 +70,7 @@ ship_files = $(shell find ships -name \*.ship)
 fleet.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)
+       javac -classpath lib/electric.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
        cd build/class/; jar xf ../../lib/ibex.jar
        for A in `find ships -name \*.ship`;\
@@ -78,7 +80,7 @@ fleet.jar: $(java_files) $(ship_files) src/edu/berkeley/fleet/assembler/fleet.g
                 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 lib/electric.jar:lib/ibex.jar:lib/RXTXcomm.jar:build/class${ps}lib/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 .
 
@@ -86,12 +88,14 @@ 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
+#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/
@@ -125,7 +129,8 @@ upload: fleet.jar build/${impl}/main.bit
        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/
+       ssh -t root@${runhost} 'cd fleet; jtag < misc/jtag-commands'
 endif
 
 build/${impl}/main.bit: $(java_files) $(ship_files)
@@ -139,8 +144,9 @@ 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
@@ -151,6 +157,7 @@ synth:
        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
@@ -287,6 +294,15 @@ endif
        $(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)
+       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) tcl $(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
@@ -416,7 +432,7 @@ f0: fleet.jar
 
 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
+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
 
@@ -438,14 +454,17 @@ sun_server_user = am77536
 #testnum = 3025
 #testnum = 3040
 #testnum = 7777
+testnum = 0
 #testnum = 999
 #testnum = 0
-testnum = 8887
-#testnum = 8889
+#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}/
+       ${rsync} --delete -L lib/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 .
 
@@ -462,13 +481,16 @@ else
 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=com.sun.vlsi.chips.marina.test.Marina com.sun.vlsi.chips.marina.test.MarinaTest -silicon -testNum 0'
 
 testlocal: fleet.jar
        cd chips/marina/testCode; \
          export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/proj/async/cad/test/; \
          java \
-         -cp `pwd`/../../../lib/com.sun.async.test.jar:`pwd`/../../../fleet.jar \
+         -cp ~/proj/electric/srcj/electric.jar:`pwd`/../../../lib/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 \
The FleetCode -- http://fleet.cs.berkeley.edu/