diff --git a/README.md b/README.md index 3a6af15..7744a35 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ bash conda_installer.sh -b -p $INSTALL_DIR/conda && rm conda_installer.sh source "$INSTALL_DIR/conda/etc/profile.d/conda.sh" conda env create -f examples/xc7/environment.yml conda activate xc7 -wget -qO- https://storage.googleapis.com/symbiflow-arch-defs/artifacts/prod/foss-fpga-tools/symbiflow-arch-defs/continuous/install/4/20200416-002215/symbiflow-arch-defs-install-a321d9d9.tar.xz | tar -xJ -C $INSTALL_DIR +wget -qO- https://storage.googleapis.com/symbiflow-arch-defs/artifacts/prod/foss-fpga-tools/symbiflow-arch-defs/presubmit/install/477/20200714-082108/symbiflow-arch-defs-install-8eb88e76.tar.xz | tar -xJ --one-top-level=$INSTALL_DIR/install conda deactivate ``` diff --git a/examples/xc7/counter_test/Makefile b/examples/xc7/counter_test/Makefile index b1b573c..8e416f3 100644 --- a/examples/xc7/counter_test/Makefile +++ b/examples/xc7/counter_test/Makefile @@ -21,22 +21,22 @@ ${BUILDDIR}: mkdir ${BUILDDIR} ${BUILDDIR}/${TOP}.eblif: | ${BUILDDIR} - cd ${BUILDDIR} && synth -t ${TOP} -v ${VERILOG} -d ${BITSTREAM_DEVICE} -p ${PARTNAME} + cd ${BUILDDIR} && symbiflow_synth -t ${TOP} -v ${VERILOG} -d ${BITSTREAM_DEVICE} -p ${PARTNAME} ${BUILDDIR}/${TOP}.net: ${BUILDDIR}/${TOP}.eblif - cd ${BUILDDIR} && pack -e ${TOP}.eblif -d ${DEVICE} -s ${SDC} + cd ${BUILDDIR} && symbiflow_pack -e ${TOP}.eblif -d ${DEVICE} -s ${SDC} ${BUILDDIR}/${TOP}.place: ${BUILDDIR}/${TOP}.net - cd ${BUILDDIR} && place -e ${TOP}.eblif -d ${DEVICE} -p ${PCF} -n ${TOP}.net -P ${PARTNAME} -s ${SDC} 2>&1 > /dev/null + cd ${BUILDDIR} && symbiflow_place -e ${TOP}.eblif -d ${DEVICE} -p ${PCF} -n ${TOP}.net -P ${PARTNAME} -s ${SDC} 2>&1 > /dev/null ${BUILDDIR}/${TOP}.route: ${BUILDDIR}/${TOP}.place - cd ${BUILDDIR} && route -e ${TOP}.eblif -d ${DEVICE} -s ${SDC} 2>&1 > /dev/null + cd ${BUILDDIR} && symbiflow_route -e ${TOP}.eblif -d ${DEVICE} -s ${SDC} 2>&1 > /dev/null ${BUILDDIR}/${TOP}.fasm: ${BUILDDIR}/${TOP}.route - cd ${BUILDDIR} && write_fasm -e ${TOP}.eblif -d ${DEVICE} + cd ${BUILDDIR} && symbiflow_write_fasm -e ${TOP}.eblif -d ${DEVICE} ${BUILDDIR}/${TOP}.bit: ${BUILDDIR}/${TOP}.fasm - cd ${BUILDDIR} && write_bitstream -d ${BITSTREAM_DEVICE} -f ${TOP}.fasm -p ${PARTNAME} -b ${TOP}.bit + cd ${BUILDDIR} && symbiflow_write_bitstream -d ${BITSTREAM_DEVICE} -f ${TOP}.fasm -p ${PARTNAME} -b ${TOP}.bit clean: rm -rf ${BUILDDIR} diff --git a/examples/xc7/environment.yml b/examples/xc7/environment.yml index d00ac83..4c047d9 100644 --- a/examples/xc7/environment.yml +++ b/examples/xc7/environment.yml @@ -4,7 +4,9 @@ channels: dependencies: - symbiflow::symbiflow-yosys=0.8_3925_g6bccd35a - symbiflow::symbiflow-yosys-plugins=1.0.0.7_0032_g104f4fc - - symbiflow::symbiflow-vtr=8.0.0.rc2_3575_g253f75b6d + - symbiflow::symbiflow-vtr=8.0.0.rc2_4003_g8980e4621 + - symbiflow::prjxray-tools + - symbiflow::prjxray-db - make - lxml - simplejson diff --git a/examples/xc7/linux_litex_demo/Makefile b/examples/xc7/linux_litex_demo/Makefile index 2e827e5..ba217e5 100644 --- a/examples/xc7/linux_litex_demo/Makefile +++ b/examples/xc7/linux_litex_demo/Makefile @@ -21,22 +21,22 @@ ${BUILDDIR}: ln -s ${MEM_INIT} ${BUILDDIR} ${BUILDDIR}/${TOP}.eblif: | ${BUILDDIR} - cd ${BUILDDIR} && synth -t ${TOP} -v ${VERILOG} -d ${BITSTREAM_DEVICE} -p ${PARTNAME} -x ${XDC} 2>&1 > /dev/null + cd ${BUILDDIR} && symbiflow_synth -t ${TOP} -v ${VERILOG} -d ${BITSTREAM_DEVICE} -p ${PARTNAME} -x ${XDC} 2>&1 > /dev/null ${BUILDDIR}/${TOP}.net: ${BUILDDIR}/${TOP}.eblif - cd ${BUILDDIR} && pack -e ${TOP}.eblif -d ${DEVICE} -s ${SDC} 2>&1 > /dev/null + cd ${BUILDDIR} && symbiflow_pack -e ${TOP}.eblif -d ${DEVICE} -s ${SDC} 2>&1 > /dev/null ${BUILDDIR}/${TOP}.place: ${BUILDDIR}/${TOP}.net - cd ${BUILDDIR} && place -e ${TOP}.eblif -d ${DEVICE} -p ${PCF} -n ${TOP}.net -P ${PARTNAME} -s ${SDC} 2>&1 > /dev/null + cd ${BUILDDIR} && symbiflow_place -e ${TOP}.eblif -d ${DEVICE} -p ${PCF} -n ${TOP}.net -P ${PARTNAME} -s ${SDC} 2>&1 > /dev/null ${BUILDDIR}/${TOP}.route: ${BUILDDIR}/${TOP}.place - cd ${BUILDDIR} && route -e ${TOP}.eblif -d ${DEVICE} -s ${SDC} 2>&1 > /dev/null + cd ${BUILDDIR} && symbiflow_route -e ${TOP}.eblif -d ${DEVICE} -s ${SDC} 2>&1 > /dev/null ${BUILDDIR}/${TOP}.fasm: ${BUILDDIR}/${TOP}.route - cd ${BUILDDIR} && write_fasm -e ${TOP}.eblif -d ${DEVICE} + cd ${BUILDDIR} && symbiflow_write_fasm -e ${TOP}.eblif -d ${DEVICE} ${BUILDDIR}/${TOP}.bit: ${BUILDDIR}/${TOP}.fasm - cd ${BUILDDIR} && write_bitstream -d ${BITSTREAM_DEVICE} -f ${TOP}.fasm -p ${PARTNAME} -b ${TOP}.bit + cd ${BUILDDIR} && symbiflow_write_bitstream -d ${BITSTREAM_DEVICE} -f ${TOP}.fasm -p ${PARTNAME} -b ${TOP}.bit clean: rm -rf ${BUILDDIR} diff --git a/examples/xc7/picosoc_demo/Makefile b/examples/xc7/picosoc_demo/Makefile index 2cee35b..fb70132 100644 --- a/examples/xc7/picosoc_demo/Makefile +++ b/examples/xc7/picosoc_demo/Makefile @@ -19,22 +19,22 @@ ${BUILDDIR}: mkdir ${BUILDDIR} ${BUILDDIR}/${TOP}.eblif: | ${BUILDDIR} - cd ${BUILDDIR} && synth -t ${TOP} -v ${VERILOG} -d ${BITSTREAM_DEVICE} -p ${PARTNAME} 2>&1 > /dev/null + cd ${BUILDDIR} && symbiflow_synth -t ${TOP} -v ${VERILOG} -d ${BITSTREAM_DEVICE} -p ${PARTNAME} 2>&1 > /dev/null ${BUILDDIR}/${TOP}.net: ${BUILDDIR}/${TOP}.eblif - cd ${BUILDDIR} && pack -e ${TOP}.eblif -d ${DEVICE} -s ${SDC} 2>&1 > /dev/null + cd ${BUILDDIR} && symbiflow_pack -e ${TOP}.eblif -d ${DEVICE} -s ${SDC} 2>&1 > /dev/null ${BUILDDIR}/${TOP}.place: ${BUILDDIR}/${TOP}.net - cd ${BUILDDIR} && place -e ${TOP}.eblif -d ${DEVICE} -p ${PCF} -n ${TOP}.net -P ${PARTNAME} -s ${SDC} 2>&1 > /dev/null + cd ${BUILDDIR} && symbiflow_place -e ${TOP}.eblif -d ${DEVICE} -p ${PCF} -n ${TOP}.net -P ${PARTNAME} -s ${SDC} 2>&1 > /dev/null ${BUILDDIR}/${TOP}.route: ${BUILDDIR}/${TOP}.place - cd ${BUILDDIR} && route -e ${TOP}.eblif -d ${DEVICE} -s ${SDC} 2>&1 > /dev/null + cd ${BUILDDIR} && symbiflow_route -e ${TOP}.eblif -d ${DEVICE} -s ${SDC} 2>&1 > /dev/null ${BUILDDIR}/${TOP}.fasm: ${BUILDDIR}/${TOP}.route - cd ${BUILDDIR} && write_fasm -e ${TOP}.eblif -d ${DEVICE} + cd ${BUILDDIR} && symbiflow_write_fasm -e ${TOP}.eblif -d ${DEVICE} ${BUILDDIR}/${TOP}.bit: ${BUILDDIR}/${TOP}.fasm - cd ${BUILDDIR} && write_bitstream -d ${BITSTREAM_DEVICE} -f ${TOP}.fasm -p ${PARTNAME} -b ${TOP}.bit + cd ${BUILDDIR} && symbiflow_write_bitstream -d ${BITSTREAM_DEVICE} -f ${TOP}.fasm -p ${PARTNAME} -b ${TOP}.bit clean: rm -rf ${BUILDDIR} diff --git a/examples/xc7/requirements.txt b/examples/xc7/requirements.txt index 370fd2e..a3e6a7d 100644 --- a/examples/xc7/requirements.txt +++ b/examples/xc7/requirements.txt @@ -1,2 +1,3 @@ python-constraint git+https://github.com/symbiflow/fasm +git+https://github.com/symbiflow/xc-fasm