From 023c701cfba1487b7c15223936ab0627505a4795 Mon Sep 17 00:00:00 2001 From: Joanna Brozek Date: Fri, 12 Jun 2020 12:24:24 +0200 Subject: [PATCH 1/6] Add Litex example Signed-off-by: Joanna Brozek --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index fffe746..c157849 100644 --- a/README.md +++ b/README.md @@ -97,6 +97,15 @@ pushd examples/xc7/counter_test && make clean && TARGET="basys3" make && popd # picosoc example pushd examples/xc7/picosoc_demo && make && popd # litex example +wget https://raw.githubusercontent.com/enjoy-digital/litex/master/litex_setup.py +chmod +x litex_setup.py +./litex_setup.py init +./litex_setup.py install +wget https://static.dev.sifive.com/dev-tools/riscv64-unknown-elf-gcc-8.1.0-2019.01.0-x86_64-linux-ubuntu14.tar.gz +tar -xf riscv64-unknown-elf-gcc-8.1.0-2019.01.0-x86_64-linux-ubuntu14.tar.gz +export PATH=$PATH:$PWD/riscv64-unknown-elf-gcc-8.1.0-2019.01.0-x86_64-linux-ubuntu14/bin/ +pushd litex/litex/boards/targets && ./arty.py --toolchain symbiflow --cpu-type vexriscv --build && popd +# linux litex example pushd examples/xc7/linux_litex_demo && make && popd ``` From 0a29a88a1a524f4e3ade3012b5f8f63e38051670 Mon Sep 17 00:00:00 2001 From: Joanna Brozek Date: Fri, 12 Jun 2020 12:58:33 +0200 Subject: [PATCH 2/6] Add conda env file Signed-off-by: Joanna Brozek --- README.md | 24 ++++++------------------ eos-s3.yml | 16 ++++++++++++++++ eos-s3_requirements.txt | 4 ++++ xc7.yml | 16 ++++++++++++++++ xc7_requirements.txt | 2 ++ 5 files changed, 44 insertions(+), 18 deletions(-) create mode 100644 eos-s3.yml create mode 100644 eos-s3_requirements.txt create mode 100644 xc7.yml create mode 100644 xc7_requirements.txt diff --git a/README.md b/README.md index c157849..21b9fc7 100644 --- a/README.md +++ b/README.md @@ -35,14 +35,9 @@ For the Artix-7 devices: INSTALL_DIR="/opt/symbiflow/xc7" bash conda_installer.sh -b -p $INSTALL_DIR/conda && rm conda_installer.sh source "$INSTALL_DIR/conda/etc/profile.d/conda.sh" -conda update -y -q conda - +conda env create -f xc7.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 -conda install -y -c symbiflow yosys yosys-plugins vtr-no-gui -conda install -y make lxml simplejson intervaltree git pip -conda activate -pip install python-constraint -pip install git+https://github.com/symbiflow/fasm conda deactivate ``` @@ -52,16 +47,9 @@ For the EOS S3 devices: INSTALL_DIR="/opt/symbiflow/eos-s3" bash conda_installer.sh -b -p $INSTALL_DIR/conda && rm conda_installer.sh source "$INSTALL_DIR/conda/etc/profile.d/conda.sh" -conda update -y -q conda - +conda env create -f eos-s3.yml +conda activate eos-s3 wget -qO- https://storage.googleapis.com/symbiflow-arch-defs-install/quicklogic/arch-defs-install-eos-s3-f7880e1f.tar.xz | tar -xJ -C $INSTALL_DIR -conda install -y -c antmicro/label/ql yosys yosys-plugins vtr-no-gui -conda install -y make lxml simplejson intervaltree git pip -conda activate -pip install python-constraint -pip install git+https://github.com/symbiflow/fasm -pip install git+https://github.com/antmicro/quicklogic-fasm -pip install git+https://github.com/antmicro/quicklogic-fasm-utils conda deactivate ``` @@ -89,7 +77,7 @@ export INSTALL_DIR="/opt/symbiflow/xc7" # adding symbiflow toolchain binaries to PATH export PATH="$INSTALL_DIR/install/bin:$PATH" source "$INSTALL_DIR/conda/etc/profile.d/conda.sh" -conda activate +conda activate xc7 git clone https://github.com/SymbiFlow/symbiflow-examples && cd symbiflow-examples # counter example pushd examples/xc7/counter_test && TARGET="arty" make && popd @@ -120,7 +108,7 @@ export INSTALL_DIR="/opt/symbiflow/eos-s3" # adding symbiflow toolchain binaries to PATH export PATH="$INSTALL_DIR/install/bin:$PATH" source "$INSTALL_DIR/conda/etc/profile.d/conda.sh" -conda activate +conda activate eos-s3 git clone https://github.com/SymbiFlow/symbiflow-examples && cd symbiflow-examples pushd examples/eos-s3 && make && popd ``` diff --git a/eos-s3.yml b/eos-s3.yml new file mode 100644 index 0000000..efb04b9 --- /dev/null +++ b/eos-s3.yml @@ -0,0 +1,16 @@ +name: eos-s3 +channels: + - antmicro/label/ql +dependencies: + - antmicro/label/ql::yosys + - antmicro/label/ql::yosys-plugins + - antmicro/label/ql::vtr + - make + - lxml + - simplejson + - intervaltree + - git + - pip + # Packages installed from PyPI + - pip: + - -r file:eos-s3_requirements.txt diff --git a/eos-s3_requirements.txt b/eos-s3_requirements.txt new file mode 100644 index 0000000..b7bb117 --- /dev/null +++ b/eos-s3_requirements.txt @@ -0,0 +1,4 @@ +python-constraint +-e git+https://github.com/symbiflow/fasm#egg=fasm +-e git+https://github.com/antmicro/quicklogic-fasm#egg=quicklogic-fasm +-e git+https://github.com/antmicro/quicklogic-fasm-utils#egg=quicklogic-fasm-utils diff --git a/xc7.yml b/xc7.yml new file mode 100644 index 0000000..3f7fc58 --- /dev/null +++ b/xc7.yml @@ -0,0 +1,16 @@ +name: xc7 +channels: + - symbiflow +dependencies: + - symbiflow::yosys + - symbiflow::yosys-plugins=1.0.0.7_0032_g104f4fc + - symbiflow::symbiflow-vtr=8.0.0.rc2_3575_g253f75b6d + - make + - lxml + - simplejson + - intervaltree + - git + - pip + # Packages installed from PyPI + - pip: + - -r file:xc7_requirements.txt diff --git a/xc7_requirements.txt b/xc7_requirements.txt new file mode 100644 index 0000000..e6b6892 --- /dev/null +++ b/xc7_requirements.txt @@ -0,0 +1,2 @@ +python-constraint +-e git+https://github.com/symbiflow/fasm#egg=fasm From de0714fba06982b8d4b5d161cc17e99389cc6297 Mon Sep 17 00:00:00 2001 From: Joanna Brozek Date: Thu, 18 Jun 2020 17:15:42 +0200 Subject: [PATCH 3/6] Update conda packages from symbiflow channel Signed-off-by: Joanna Brozek --- xc7.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xc7.yml b/xc7.yml index 3f7fc58..e32386b 100644 --- a/xc7.yml +++ b/xc7.yml @@ -2,8 +2,8 @@ name: xc7 channels: - symbiflow dependencies: - - symbiflow::yosys - - symbiflow::yosys-plugins=1.0.0.7_0032_g104f4fc + - symbiflow::symbiflow-yosys + - symbiflow::symbiflow-yosys-plugins=1.0.0.7_0032_g104f4fc - symbiflow::symbiflow-vtr=8.0.0.rc2_3575_g253f75b6d - make - lxml From 5438933e5128031eb4e0a0cfa710b4fbb4b8e11f Mon Sep 17 00:00:00 2001 From: Joanna Brozek Date: Fri, 19 Jun 2020 09:05:50 +0200 Subject: [PATCH 4/6] Move conda env files to separate directories Signed-off-by: Joanna Brozek --- README.md | 4 ++-- eos-s3.yml => examples/eos-s3/eos-s3.yml | 0 .../eos-s3/eos-s3_requirements.txt | 0 xc7.yml => examples/xc7/xc7.yml | 0 xc7_requirements.txt => examples/xc7/xc7_requirements.txt | 0 5 files changed, 2 insertions(+), 2 deletions(-) rename eos-s3.yml => examples/eos-s3/eos-s3.yml (100%) rename eos-s3_requirements.txt => examples/eos-s3/eos-s3_requirements.txt (100%) rename xc7.yml => examples/xc7/xc7.yml (100%) rename xc7_requirements.txt => examples/xc7/xc7_requirements.txt (100%) diff --git a/README.md b/README.md index 21b9fc7..3992c28 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ For the Artix-7 devices: INSTALL_DIR="/opt/symbiflow/xc7" 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 xc7.yml +conda env create -f examples/xc7/xc7.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 conda deactivate @@ -47,7 +47,7 @@ For the EOS S3 devices: INSTALL_DIR="/opt/symbiflow/eos-s3" 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 eos-s3.yml +conda env create -f examples/eos-s3/eos-s3.yml conda activate eos-s3 wget -qO- https://storage.googleapis.com/symbiflow-arch-defs-install/quicklogic/arch-defs-install-eos-s3-f7880e1f.tar.xz | tar -xJ -C $INSTALL_DIR conda deactivate diff --git a/eos-s3.yml b/examples/eos-s3/eos-s3.yml similarity index 100% rename from eos-s3.yml rename to examples/eos-s3/eos-s3.yml diff --git a/eos-s3_requirements.txt b/examples/eos-s3/eos-s3_requirements.txt similarity index 100% rename from eos-s3_requirements.txt rename to examples/eos-s3/eos-s3_requirements.txt diff --git a/xc7.yml b/examples/xc7/xc7.yml similarity index 100% rename from xc7.yml rename to examples/xc7/xc7.yml diff --git a/xc7_requirements.txt b/examples/xc7/xc7_requirements.txt similarity index 100% rename from xc7_requirements.txt rename to examples/xc7/xc7_requirements.txt From 19bac178e76a9ffb44234bf80f1371d202361bef Mon Sep 17 00:00:00 2001 From: Joanna Brozek Date: Fri, 19 Jun 2020 11:37:11 +0200 Subject: [PATCH 5/6] Remove redundant arg from pip requirements list Signed-off-by: Joanna Brozek --- examples/eos-s3/eos-s3_requirements.txt | 6 +++--- examples/xc7/xc7_requirements.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/eos-s3/eos-s3_requirements.txt b/examples/eos-s3/eos-s3_requirements.txt index b7bb117..fc75d5e 100644 --- a/examples/eos-s3/eos-s3_requirements.txt +++ b/examples/eos-s3/eos-s3_requirements.txt @@ -1,4 +1,4 @@ python-constraint --e git+https://github.com/symbiflow/fasm#egg=fasm --e git+https://github.com/antmicro/quicklogic-fasm#egg=quicklogic-fasm --e git+https://github.com/antmicro/quicklogic-fasm-utils#egg=quicklogic-fasm-utils +git+https://github.com/symbiflow/fasm +git+https://github.com/antmicro/quicklogic-fasm +git+https://github.com/antmicro/quicklogic-fasm-utils diff --git a/examples/xc7/xc7_requirements.txt b/examples/xc7/xc7_requirements.txt index e6b6892..370fd2e 100644 --- a/examples/xc7/xc7_requirements.txt +++ b/examples/xc7/xc7_requirements.txt @@ -1,2 +1,2 @@ python-constraint --e git+https://github.com/symbiflow/fasm#egg=fasm +git+https://github.com/symbiflow/fasm From fa435ba298a4fa5a61f6bd65dc187303bf4879b1 Mon Sep 17 00:00:00 2001 From: Joanna Brozek Date: Mon, 22 Jun 2020 09:19:21 +0200 Subject: [PATCH 6/6] Rename conda environment files Signed-off-by: Joanna Brozek --- README.md | 4 ++-- examples/eos-s3/{eos-s3.yml => environment.yml} | 2 +- examples/eos-s3/{eos-s3_requirements.txt => requirements.txt} | 0 examples/xc7/{xc7.yml => environment.yml} | 2 +- examples/xc7/{xc7_requirements.txt => requirements.txt} | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename examples/eos-s3/{eos-s3.yml => environment.yml} (87%) rename examples/eos-s3/{eos-s3_requirements.txt => requirements.txt} (100%) rename examples/xc7/{xc7.yml => environment.yml} (89%) rename examples/xc7/{xc7_requirements.txt => requirements.txt} (100%) diff --git a/README.md b/README.md index 3992c28..5a6a4a4 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ For the Artix-7 devices: INSTALL_DIR="/opt/symbiflow/xc7" 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/xc7.yml +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 conda deactivate @@ -47,7 +47,7 @@ For the EOS S3 devices: INSTALL_DIR="/opt/symbiflow/eos-s3" 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/eos-s3/eos-s3.yml +conda env create -f examples/eos-s3/environment.yml conda activate eos-s3 wget -qO- https://storage.googleapis.com/symbiflow-arch-defs-install/quicklogic/arch-defs-install-eos-s3-f7880e1f.tar.xz | tar -xJ -C $INSTALL_DIR conda deactivate diff --git a/examples/eos-s3/eos-s3.yml b/examples/eos-s3/environment.yml similarity index 87% rename from examples/eos-s3/eos-s3.yml rename to examples/eos-s3/environment.yml index efb04b9..1e43f56 100644 --- a/examples/eos-s3/eos-s3.yml +++ b/examples/eos-s3/environment.yml @@ -13,4 +13,4 @@ dependencies: - pip # Packages installed from PyPI - pip: - - -r file:eos-s3_requirements.txt + - -r file:requirements.txt diff --git a/examples/eos-s3/eos-s3_requirements.txt b/examples/eos-s3/requirements.txt similarity index 100% rename from examples/eos-s3/eos-s3_requirements.txt rename to examples/eos-s3/requirements.txt diff --git a/examples/xc7/xc7.yml b/examples/xc7/environment.yml similarity index 89% rename from examples/xc7/xc7.yml rename to examples/xc7/environment.yml index e32386b..4b0db61 100644 --- a/examples/xc7/xc7.yml +++ b/examples/xc7/environment.yml @@ -13,4 +13,4 @@ dependencies: - pip # Packages installed from PyPI - pip: - - -r file:xc7_requirements.txt + - -r file:requirements.txt diff --git a/examples/xc7/xc7_requirements.txt b/examples/xc7/requirements.txt similarity index 100% rename from examples/xc7/xc7_requirements.txt rename to examples/xc7/requirements.txt