From 90c6dfa3187d64e05c77b496a27ae2e843a69fa9 Mon Sep 17 00:00:00 2001 From: Karol Gugala Date: Tue, 9 Jun 2020 12:23:39 +0200 Subject: [PATCH 1/3] Simplify toolchain installation Signed-off-by: Karol Gugala --- .travis.yml | 44 +++++++++++++++++++++++--------------------- README.md | 13 +++++-------- 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/.travis.yml b/.travis.yml index 38498da..0898694 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,28 +15,30 @@ before_install: - export LANG="en_US.UTF-8" install: - - wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh - - bash miniconda.sh -b -p $HOME/miniconda - - source "$HOME/miniconda/etc/profile.d/conda.sh" - - hash -r - - conda config --set always_yes yes --set changeps1 no - - conda config --add channels conda-forge - - conda config --add channels symbiflow - - conda update -q conda + - export INSTALL_DIR=/opt/symbiflow + - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh + - bash Miniconda3-latest-Linux-x86_64.sh -b -p $INSTALL_DIR/conda && rm Miniconda3-latest-Linux-x86_64.sh + - source $INSTALL_DIR/conda/etc/profile.d/conda.sh + - conda update -y -q conda + - 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 + - conda install -y -c symbiflow -c conda-forge vtr=8.0.0.rc2_3575_g253f75b6d + - conda install -y make lxml simplejson intervaltree git pip - conda activate - - conda install -c symbiflow yosys - - conda install -c symbiflow yosys-plugins - - conda install -c symbiflow vtr=8.0.0.rc2_3575_g253f75b6d - - conda install lxml simplejson intervaltree python-constraint git pip + - pip install python-constraint - pip install git+https://github.com/symbiflow/fasm - - wget "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" + - conda deactivate script: - - tar -xf symbiflow-arch-defs-install-a321d9d9.tar.xz - - export PATH=$TRAVIS_BUILD_DIR/install/bin:$PATH - - cd $TRAVIS_BUILD_DIR/counter_test - - make - - cd $TRAVIS_BUILD_DIR/picosoc_demo - - make - - cd $TRAVIS_BUILD_DIR/linux_litex_demo - - make + - export INSTALL_DIR=/opt/symbiflow + - # adding symbiflow toolchain binaries to PATH + - export PATH=$INSTALL_DIR/install/bin:$PATH + - source $INSTALL_DIR/conda/etc/profile.d/conda.sh + - conda activate + - git clone https://github.com/SymbiFlow/symbiflow-examples && cd symbiflow-examples + - # counter example + - pushd counter_test && make && popd + - # picosoc example + - pushd picosoc_demo && make && popd + - # litex example + - pushd linux_litex_demo && make && popd diff --git a/README.md b/README.md index ed22244..bc31b55 100644 --- a/README.md +++ b/README.md @@ -45,16 +45,13 @@ INSTALL_DIR=/opt/symbiflow wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh bash Miniconda3-latest-Linux-x86_64.sh -b -p $INSTALL_DIR/conda && rm Miniconda3-latest-Linux-x86_64.sh source $INSTALL_DIR/conda/etc/profile.d/conda.sh -conda config --set always_yes yes --set changeps1 no -conda config --add channels conda-forge -conda config --add channels symbiflow -conda update -q conda +conda update -y -q conda 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 -c symbiflow yosys -conda install -c symbiflow yosys-plugins -conda install -c symbiflow vtr=8.0.0.rc2_3575_g253f75b6d -conda install python-constraint make lxml simplejson intervaltree git pip +conda install -y -c symbiflow yosys yosys-plugins +conda install -y -c symbiflow -c conda-forge vtr=8.0.0.rc2_3575_g253f75b6d +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 ``` From f6fa9bca5e7a3dfce6cc130fa8b073f94925c308 Mon Sep 17 00:00:00 2001 From: Karol Gugala Date: Tue, 9 Jun 2020 13:33:58 +0200 Subject: [PATCH 2/3] install vtr no gui Signed-off-by: Karol Gugala --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0898694..b5d1408 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ install: - conda update -y -q conda - 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 - - conda install -y -c symbiflow -c conda-forge vtr=8.0.0.rc2_3575_g253f75b6d + - conda install -y -c antmicro vtr-no-gui - conda install -y make lxml simplejson intervaltree git pip - conda activate - pip install python-constraint From c036f805f23054a0d83f81ab8d9f4a502ce5b03c Mon Sep 17 00:00:00 2001 From: Karol Gugala Date: Tue, 9 Jun 2020 15:53:59 +0200 Subject: [PATCH 3/3] use vtr-no-gui from symbiflow Signed-off-by: Karol Gugala --- .travis.yml | 3 +-- README.md | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index b5d1408..5cb2611 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,8 +21,7 @@ install: - source $INSTALL_DIR/conda/etc/profile.d/conda.sh - conda update -y -q conda - 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 - - conda install -y -c antmicro vtr-no-gui + - 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 diff --git a/README.md b/README.md index bc31b55..9c0a311 100644 --- a/README.md +++ b/README.md @@ -47,8 +47,7 @@ bash Miniconda3-latest-Linux-x86_64.sh -b -p $INSTALL_DIR/conda && rm Miniconda3 source $INSTALL_DIR/conda/etc/profile.d/conda.sh conda update -y -q conda 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 -conda install -y -c symbiflow -c conda-forge vtr=8.0.0.rc2_3575_g253f75b6d +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