Merge pull request #186 from antmicro/remove_build_upstream

Remove BUILD_UPSTREAM variable

Author: kamilrakoczy

.github/workflows/build-and-test.sh

@@ -15,12 +15,7 @@ source .github/workflows/common.sh
 
 start_section Building
 
-if [ "$BUILD_UPSTREAM" = "0" ]
-then
-	make UHDM_INSTALL_DIR=$HOME/.local-bin plugins -j`nproc`
-else
-	make UHDM_INSTALL_DIR=`pwd`/env/conda/envs/yosys-plugins/ plugins -j`nproc`
-fi
+make UHDM_INSTALL_DIR=`pwd`/env/conda/envs/yosys-plugins/ plugins -j`nproc`
 end_section
 
 ##########################################################################

.github/workflows/ci.yml

@@ -14,14 +14,6 @@ jobs:
 
   Run-tests:
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - {BUILD_UPSTREAM: "0"}
-          - {BUILD_UPSTREAM: "1"}
-
-    name: "UHDM_BUILD_UPSTREAM_YOSYS=${{matrix.BUILD_UPSTREAM}}"
 
     steps:
 
@@ -46,22 +38,18 @@ jobs:
 
     - name: ccache
       uses: hendrikmuhs/ccache-action@v1
-      with:
-        key: ${{ matrix.BUILD_UPSTREAM }}
 
     - name: Install Yosys
       run: |
         export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
         source .github/workflows/setup.sh
       env:
         OS: ${{ runner.os }}
-        BUILD_UPSTREAM: ${{ matrix.BUILD_UPSTREAM }}
 
     - name: Build and test plugins
       run: |
         export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-        if [ "$BUILD_UPSTREAM" = "1" ]; then source env/conda/bin/activate yosys-plugins; fi
+        source env/conda/bin/activate yosys-plugins
         source .github/workflows/build-and-test.sh
       env:
         OS: ${{ runner.os }}
-        BUILD_UPSTREAM: ${{ matrix.BUILD_UPSTREAM }}

.github/workflows/setup.sh

@@ -42,27 +42,8 @@ start_section Install-Yosys
     echo '=========================='
     echo 'Making env with yosys and Surelog'
     echo '=========================='
-    if [ "$BUILD_UPSTREAM" = "0" ]
-    then
-	mkdir -p ~/.local-src
-	mkdir -p ~/.local-bin
-	cd ~/.local-src
-	git clone https://github.com/antmicro/yosys.git -b uhdm-plugin
-	cd yosys
-	PREFIX=$HOME/.local-bin make CONFIG=gcc ENABLE_NDEBUG=1 -j$(nproc)
-	PREFIX=$HOME/.local-bin make install
-	cd ..
-	git clone --recursive https://github.com/chipsalliance/Surelog.git -b master
-	cd Surelog
-	pip install orderedmultidict
-	cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$HOME/.local-bin -DCMAKE_POSITION_INDEPENDENT_CODE=ON -S . -B build
-	cmake --build build -j $(nproc)
-	cmake --install build
-	cd ../..
-    else
-	make env
-	make enter
-    fi
+    make env
+    make enter
     echo $(which yosys)
     echo $(which yosys-config)
     echo $(yosys-config --datdir)

uhdm-plugin/Makefile

@@ -18,10 +18,6 @@ CPPFLAGS += -std=c++17 -Wall -W -Wextra -Werror \
               -I${UHDM_INSTALL_DIR}/include \
 	      -I${UHDM_INSTALL_DIR}/include/surelog
 
-ifeq ($(BUILD_UPSTREAM), 1)
-CXXFLAGS += -DBUILD_UPSTREAM=1
-endif
-
 CXXFLAGS += -Wno-unused-parameter
 LDFLAGS += -L${UHDM_INSTALL_DIR}/lib/uhdm -L${UHDM_INSTALL_DIR}/lib/surelog -L${UHDM_INSTALL_DIR}/lib -L${UHDM_INSTALL_DIR}/lib64/uhdm -L${UHDM_INSTALL_DIR}/lib64/surelog -L${UHDM_INSTALL_DIR}/lib64
 LDLIBS += -Wl,--whole-archive -luhdm -Wl,--no-whole-archive -lsurelog -lantlr4-runtime -lflatbuffers -lcapnp -lkj -ldl -lutil -lm -lrt -lpthread