## Fleeterpreter ##############################################################################
-cp = -cp fleet.jar:lib/RXTXcomm.jar
+ifeq ($(impl),ml509)
+java = java -Xmx500m -Dfleet.impl='edu.berkeley.fleet.fpga.ML509$$Large'
+effort = high
+opt_for = area
+xil_ver=10.1
+else
+ifeq ($(impl),bee2)
+java = java -Xmx500m -Dfleet.impl=edu.berkeley.fleet.fpga.Bee2
+# BEE2 does not work with ISE 10.1
+xil_ver=9.1i
+effort = high
+opt_for = area
+else
+ifeq ($(impl),java)
+java = java -Xmx500m -Dfleet.impl=edu.berkeley.fleet.interpreter.Interpreter
+else
+ifeq ($(impl),small)
+java = java -Xmx500m -Dfleet.impl='edu.berkeley.fleet.fpga.ML509$$Small'
+effort = std
+opt_for = area
+xil_ver=10.1
+else
java = java -Xmx500m
+endif
+endif
+endif
+endif
+
+cp = -cp fleet.jar:lib/RXTXcomm.jar
run: fleet.jar; $(java) $(cp) $(interpreter_class)
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/RXTXcomm.jar:lib/edu.berkeley.sbp.jar -d build/class/ $(shell find src -name \*.java)
+ 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
+ cd build/class/; jar xf ../../lib/ibex.jar
for A in `find ships -name \*.ship`;\
- do java -cp build/class edu.berkeley.fleet.Main expand $$A;\
+ do java \
+ -cp fleet.jar:build/class \
+ -Dfleet.impl=edu.berkeley.fleet.interpreter.Interpreter \
+ edu.berkeley.fleet.Main \
+ expand $$A;\
done
- javac -classpath lib/RXTXcomm.jar:build/class${ps}lib/edu.berkeley.sbp.jar -d build/class/ `find build/java -name \*.java`
+ 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`
echo 'Main-Class: edu.berkeley.fleet.Main' > build/class/manifest
- cd build/class/; jar cmf manifest ../../$@ .
+ jar cmf build/class/manifest $@ ships -C build/class .
## Fpga ####################################################################################
+# 32Gb ram, 4-core. small-config:1019s large-config:2530s
host = intel2950-5.eecs.berkeley.edu
-remote_ise = /tools/xilinx/ISE9.1i_lin
-remote_edk = /tools/xilinx/EDK9.1i
+
+# 128Gb ram, 2x4-core. small-config:1189s large-config:3065s
+#host = amdr905-1.eecs.berkeley.edu
+
remote_dir = /scratch/megacz/fleet/
+remote_ise = /tools/xilinx/${xil_ver}/ISE
+remote_edk = /tools/xilinx/${xil_ver}/EDK
+
#host = mm2.millennium.berkeley.edu
#remote_ise = /scratch/megacz/xilinx/ise/
xilinx = cd build/fpga;
xilinx += LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(remote_ise)/bin/lin:$(remote_edk)/bin/lin
xilinx += PATH=$$PATH:$(remote_ise)/bin/lin:$(remote_edk)/bin/lin
-xilinx += XST_VERSION=9.2i
+#xilinx += XST_VERSION=9.2i
xilinx += XILINX=$(remote_ise)
+xilinx += XIL_XST_HIDEMESSAGES=hdl_and_low_levels
+xilinx += XIL_PAR_DESIGN_CHECK_VERBOSE=1
xilinx += XILINX_EDK=$(remote_edk)
xilinx_ise = $(xilinx) $(remote_ise)/bin/lin/
xilinx_edk = $(xilinx) $(remote_edk)/bin/lin/
-speed_grade = 11
-device = xc4vfx60ff1152-${speed_grade}
-#device = xc2vp70-7ff1704
+# ML50X
+speed_grade = 1
+part = xc5vlx110t
+package = ff1136
+board = ml505 # ??
+
+# ML410
+#part = xc4vfx60
+#package = ff1152
+#speed_grade = 11
+#board = ml410
+
+# BEE2
+#part = xc2vp70
+#package = 7ff1704
+
+device = ${part}${package}-${speed_grade}
+rsync = rsync --exclude=.git --exclude=chips/marina/images -zare ssh --progress --verbose
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
+ make fleet.jar impl=${impl}
mkdir -p build/fpga
$(java) $(cp) edu.berkeley.fleet.fpga.Fpga build/fpga/
cp src/edu/berkeley/fleet/fpga/* build/fpga || true
for A in `find ships -name \*.ship`;\
- do java -cp build/class edu.berkeley.fleet.Main target=fpga expand $$A;\
+ do $(java) -cp build/class edu.berkeley.fleet.Main target=fpga expand $$A;\
done
- rsync -zare ssh --progress --delete --verbose ./ ${host}:${remote_dir}
- time ssh ${host} 'make -C ${remote_dir} synth XILINX=${remote_ise} remote_ise=${remote_ise} remote_edk=${remote_edk}'
+ 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/fpga/main.bit build/fpga/
+ scp ${host}:${remote_dir}/build/fpga/main.ace build/fpga/
pcore = ${remote_edk}/hw/XilinxProcessorIPLib/pcores
+intstyle = -intstyle xflow
synth:
cd build/fpga; ln -sf ../../src/edu/berkeley/fleet/fpga/* .
cd build/fpga; ln -sf ../../src/edu/berkeley/fleet/fpga/mem/* .
+ cd build/fpga; ln -sf ../../src/edu/berkeley/fleet/fpga/ddr2/* .
+ cd build/fpga; ln -sf ../../src/edu/berkeley/fleet/fpga/dvi/* .
+ cd build/fpga; ln -sf ../../src/edu/berkeley/fleet/fpga/zbt/* .
rm -f build/fpga/main.lso
echo work >> build/fpga/main.lso
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
echo -n " -ifmt mixed" >> build/fpga/main.xst
echo -n " -ofn main" >> build/fpga/main.xst
echo -n " -ofmt NGC" >> build/fpga/main.xst
- echo -n " -p xc4vfx60-11ff1152" >> build/fpga/main.xst
+ echo -n " -p ${device}" >> build/fpga/main.xst
echo -n " -top main" >> build/fpga/main.xst
- echo -n " -opt_mode area" >> build/fpga/main.xst
+ echo -n " -opt_mode ${opt_for}" >> build/fpga/main.xst
echo -n " -opt_level 2" >> build/fpga/main.xst
echo -n " -iuc NO" >> build/fpga/main.xst
echo -n " -lso main.lso" >> build/fpga/main.xst
echo '-g Security:NONE' >> build/fpga/main.ut
echo '-g Persist:No' >> build/fpga/main.ut
- $(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 -cm area -intstyle xflow -p $(device) -pr b -ol high -o main_map.ncd main.ngd main.pcf
- $(xilinx_ise)par -w -intstyle xflow -t 99 -pl high -rl high main_map.ncd main.ncd main.pcf
- $(xilinx_ise)bitgen -intstyle xflow -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 mainx.ace
+ $(xilinx_ise)xst ${intstyle} -ifn main.xst -ofn main.syr < main.xst \
+ | grep --line-buffered -v 'been backward balanced into' \
+ | grep --line-buffered -v 'IDDR has been replaced by IDDR_2CLK' \
+ | grep --line-buffered -v 'WARNING:Xst:616 - Invalid property'
+ cat build/fpga/*.ucf > build/fpga/main.ucf
+ $(xilinx_ise)ngdbuild ${intstyle} -aul -dd _ngo -nt timestamp -uc main.ucf -p $(device) main.ngc main.ngd
+ $(xilinx_ise)map ${intstyle} -ol ${effort} -p $(device) -pr b -cm ${opt_for} -o main_map.ncd main.ngd main.pcf
+ $(xilinx_ise)par ${intstyle} -pl ${effort} -ol ${effort} -w main_map.ncd main.ncd main.pcf
+ $(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
+ $(xilinx) tcl $(remote_edk)/data/xmd/genace.tcl -jprog -hw main.bit -board ${board} -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
- java -Djava.library.path=lib -cp fleet.jar:lib/RXTXcomm.jar edu.berkeley.fleet.fpga.Server
+ $(java) -Djava.library.path=lib -cp fleet.jar:lib/RXTXcomm.jar edu.berkeley.fleet.fpga.Server
+
+test: fleet.jar
+ $(java) -jar fleet.jar test ships/*.ship tests
+ $(java) -cp fleet.jar edu.berkeley.fleet.dataflow.MergeSort Memory 0 256
-test: fleet.jar; $(java) -jar fleet.jar test ships/*.ship tests
-testfpga: fleet.jar; $(java) -jar fleet.jar target=fpga test ships/*.ship tests
+demo: fleet.jar
+ $(java) -cp fleet.jar edu.berkeley.fleet.dataflow.SortingDemo
## Manual ####################################################################################
clean:
rm -rf fleet.jar build
+ rm -f \
+ chips/marina/testCode/marina.xml \
+ chips/marina/testCode/marina.v \
+ chips/marina/testCode/marina.schematic-parasitics.spi
## Dist ####################################################################################
darcs dist -d fleet
mv fleet.tar.gz /afs/research.cs.berkeley.edu/class/fleet/website/code/snapshots/fleet-`date +%Y.%m.%d`.tgz
mkdir -p .build
- rm -f lib/suncvs.jar
cd .build; for A in ../fleet.jar ../lib/*.jar; do jar xvf $$A; done
cd .build; jar cvf /afs/research.cs.berkeley.edu/class/fleet/website/code/snapshots/fleet-`date +%Y.%m.%d`.jar .
rm -rf .build
+ echo
+ echo http://fleet.cs.berkeley.edu/code/snapshots/fleet-`date +%Y.%m.%d`.jar
+ echo
# you'll probably want to change this line
ghc = /usr/local/brian/ghc/compiler/ghc-inplace
## Targets below are for integration with Sun-Proprietary Marina Test Chip ##############################
-cleansuncvs:
- rm -rf lib/suncvs.jar suncvs
-
-lib/suncvs.jar: fleet.jar suncvs/marina suncvs/test
- rm -rf suncvs/test/manuals
- mkdir -p suncvs/build
- cd suncvs; javac -cp ../fleet.jar: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: fleet.jar
- rm lib/suncvs.jar; make lib/suncvs.jar
- rm -f suncvs/marina/testSims/isolatedInDock.spi.run
- ssh simmons 'skill nanosim'
- rsync -are ssh --delete --progress --verbose ./ simmons:~/fleet/
- ssh simmons 'export PATH=$$PATH:/proj/async/cad/linux/bin/; cp -r /import/async/cad/2008/marina/rkao/marina/testSims/* ~/fleet/suncvs/marina/testSims/; cp -r /import/async/cad/2008/marina/rkao/marina/testCode/*.xml ~/fleet/suncvs/marina/testCode/; cd ~/fleet/suncvs/marina/testSims; /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 3004'
-
-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
+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\*)
+modname = fakeMarinaPadframe
+
+sun_server = simmons-tunnel
+
+#sun_server = frehley # electric team uses frehley
+#sun_server = simmons
+#sun_server = criss # criss is used for nohupped nanosim
+#sun_server = stanley # stanley is used for nohupped hsim
+
+testnum = 0
+
+runtest: fleet.jar chips/marina/testCode/marina.xml chips/marina/testCode/marina.v chips/marina/testCode/marina.schematic-parasitics.spi
+ ${rsync} --delete ./ ${sun_server}:~/fleet/
+ time ssh -t -Y ${sun_server} 'cd ~/fleet/; make testlocal impl=${impl}'
+
+silicon: fleet.jar chips/marina/testCode/marina.xml
+ ${rsync} --delete ./ ${sun_server}:~/fleet/
+ time ssh -t -Y ${sun_server} 'cd ~/fleet/; make siliconlocal impl=${impl}'
+
+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_server}:~/fleet/
+ ssh -t -Y ${sun_server} 'cd ~/fleet/chips/marina/testCode/; export PATH=/proj/async/cad/linux/bin/:$$PATH; echo -e "rcf commands\n" | hsim64 -time 90000 go.spi -o go.spi'
+
+
+testlocal: fleet.jar
+ cd chips/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 \
+ -Dfleet.impl=com.sun.vlsi.chips.marina.test.Marina \
+ com.sun.vlsi.chips.marina.test.MarinaTest \
+ -hsim \
+ -testNum ${testnum} || tail -n 20 marina.spi.run
+
+siliconlocal: fleet.jar
+ cd chips/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/ \
+ -Dfleet.impl=com.sun.vlsi.chips.marina.test.Marina \
+ com.sun.vlsi.chips.marina.test.MarinaTest \
+ -silicon \
+ -testNum ${testnum}
+
+chips/marina/testCode/marina.xml \
+chips/marina/testCode/marina.v \
+chips/marina/testCode/marina.schematic-parasitics.spi: ${all_electric_files}
+ @echo
+ @echo == Rebuilding Netlists and XML ===========================================================
+ rm -f chips/marina/testCode/marina.v
+ 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
+
+electric:
+ ${electric} chips/marina/electric/aMarinaM.jelib
+
+sync:
+ ${rsync} ${sun_server}:fleet/chips/marina/testCode/marina\*.dump ~/ || true
+ ${rsync} ${sun_server}:fleet/chips/marina/testCode/marina.spi.out ~/${modname}.out || true
+copyin:
+ cp ~/${modname}.spi chips/marina/testCode/marina.schematic-parasitics.spi || true
+ cp ~/${modname}.v chips/marina/testCode/marina.v || true
+
+chips/marina/testCode/omegaCounter-extracted.spi: ${all_electric_files} chips/marina/testCode/rcx.bsh
+ @echo
+ @echo == Extracting Layout ===========================================================
+ ssh ${sun_server} 'rm -rf /tmp/am77536; mkdir /tmp/am77536'
+ cd chips/marina/testCode; \
+ nice -n 19 ${electric_headless} -s rcx.bsh ../electric/omegaCounter.jelib
+ mv chips/marina/electric/starrcxt/omegaCounter.sp $@
projects / fleet.git / blobdiff