Merge pull request #327 from esa-tu-darmstadt/feature/ci-refresh

Refresh CI configurations
esa-tu-darmstadt · May 24, 2022 · 5439305 · 5439305
2 parents e7ca1b2 + 56793a2
commit 5439305
Show file tree

Hide file tree

Showing 2 changed files with 80 additions and 95 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -38,17 +38,21 @@ test_tapasco_rockylinux_8:
   tags:
     - High
   script:
-    - apt-get -y update && apt-get -y install unzip git zip findutils curl default-jdk
+    - apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install unzip git zip findutils curl default-jdk
     - ./tapasco-init.sh && source tapasco-setup.sh
     - cd ${TAPASCO_HOME_TOOLFLOW}/scala
     - ./gradlew test
 
-test_tapasco_ubuntu_16_04:
-  image: ubuntu:xenial
+test_tapasco_ubuntu_18_04:
+  image: ubuntu:18.04
   extends: .test_tapasco_ubuntu
 
-test_tapasco_ubuntu_18_04:
-  image: ubuntu:bionic
+test_tapasco_ubuntu_20_04:
+  image: ubuntu:20.04
+  extends: .test_tapasco_ubuntu
+
+test_tapasco_ubuntu_22_04:
+  image: ubuntu:22.04
   extends: .test_tapasco_ubuntu
 
 .test_tapasco_fedora:
@@ -63,16 +67,12 @@ test_tapasco_ubuntu_18_04:
     - cd ${TAPASCO_HOME_TOOLFLOW}/scala
     - ./gradlew test
 
-test_tapasco_fedora_30:
-  image: fedora:30
+test_tapasco_fedora_36:
+  image: fedora:36
   extends: .test_tapasco_fedora
   before_script:
   - dnf -y install which findutils java-11-openjdk
 
-test_tapasco_fedora_31:
-  image: fedora:31
-  extends: .test_tapasco_fedora
-
 .build_scala_tapasco_centos:
   stage: build_scala_toolflow
   retry: 2
@@ -85,6 +85,10 @@ test_tapasco_fedora_31:
     - ./tapasco-init.sh && source tapasco-setup.sh
     - cd ${TAPASCO_HOME_TOOLFLOW}/scala
     - tapasco-build-toolflow
+    - ./gradlew buildRPM
+  artifacts:
+    paths:
+      - toolflow/scala/build/distributions/tapasco-2021-01.x86_64.rpm
 
 build_scala_tapasco_centos_7:
   image: centos:7
@@ -111,16 +115,12 @@ build_scala_tapasco_rockylinux_8:
     paths:
       - toolflow/scala/build/distributions/tapasco-2021-01.x86_64.rpm
 
-build_scala_tapasco_fedora_30:
-  image: fedora:30
+build_scala_tapasco_fedora_36:
+  image: fedora:36
   extends: .build_scala_tapasco_fedora
   before_script:
     - dnf -y install which findutils java-11-openjdk
 
-build_scala_tapasco_fedora_31:
-  image: fedora:31
-  extends: .build_scala_tapasco_fedora
-
 .build_scala_tapasco_ubuntu:
   stage: build_scala_toolflow
   retry: 2
@@ -138,12 +138,16 @@ build_scala_tapasco_fedora_31:
     paths:
       - toolflow/scala/build/distributions/tapasco_2021-01_amd64.deb
 
-build_scala_tapasco_ubuntu_16_04:
-  image: ubuntu:xenial
+build_scala_tapasco_ubuntu_18_04:
+  image: ubuntu:18.04
   extends: .build_scala_tapasco_ubuntu
 
-build_scala_tapasco_ubuntu_18_04:
-  image: ubuntu:bionic
+build_scala_tapasco_ubuntu_20_04:
+  image: ubuntu:20.04
+  extends: .build_scala_tapasco_ubuntu
+
+build_scala_tapasco_ubuntu_22_04:
+  image: ubuntu:22.04
   extends: .build_scala_tapasco_ubuntu
 
 # build kernel module
@@ -164,38 +168,48 @@ build_scala_tapasco_ubuntu_18_04:
     paths:
       - runtime/kernel/tlkm.ko
 
-build_kernel_ubuntu_16_04:
-  image: ubuntu:xenial
+build_kernel_ubuntu_18_04:
+  image: ubuntu:18.04
   extends: .build_kernel_ubuntu
 
-build_kernel_ubuntu_18_04:
-  image: ubuntu:bionic
+build_kernel_ubuntu_20_04:
+  image: ubuntu:20.04
   extends: .build_kernel_ubuntu
 
-build_kernel_ubuntu_16_04_debug:
+build_kernel_ubuntu_22_04:
+  image: ubuntu:22.04
+  extends: .build_kernel_ubuntu
+
+build_kernel_ubuntu_18_04_debug:
   variables:
     MODE: "all"
-  image: ubuntu:xenial
+  image: ubuntu:18.04
   extends: .build_kernel_ubuntu
 
-build_kernel_ubuntu_18_04_debug:
+build_kernel_ubuntu_20_04_debug:
+  variables:
+    MODE: "all"
+  image: ubuntu:20.04
+  extends: .build_kernel_ubuntu
+
+build_kernel_ubuntu_22_04_debug:
   variables:
     MODE: "all"
-  image: ubuntu:bionic
+  image: ubuntu:22.04
   extends: .build_kernel_ubuntu
 
 build_kernel_arm32v7_debug:
   stage: build_kernel
   variables:
     MODE: "all"
-  image: arm32v7/ubuntu:16.04
+  image: arm32v7/ubuntu:18.04
   extends: .build_kernel_ubuntu
 
 build_kernel_arm64v8_debug:
   stage: build_kernel
   variables:
     MODE: "all"
-  image: arm64v8/ubuntu:16.04
+  image: arm64v8/ubuntu:18.04
   extends: .build_kernel_ubuntu
 
 .build_kernel_fedora:
@@ -224,24 +238,14 @@ build_kernel_rockylinux_8_debug:
     MODE: "all"
   extends: .build_kernel_fedora
 
-build_kernel_fedora_30:
-  image: fedora:30
-  extends: .build_kernel_fedora
-
-build_kernel_fedora_31:
-  image: fedora:31
-  extends: .build_kernel_fedora
-
-build_kernel_fedora_30_debug:
-  variables:
-    MODE: "all"
-  image: fedora:30
+build_kernel_fedora_36:
+  image: fedora:36
   extends: .build_kernel_fedora
 
-build_kernel_fedora_31_debug:
+build_kernel_fedora_36_debug:
   variables:
     MODE: "all"
-  image: fedora:31
+  image: fedora:36
   extends: .build_kernel_fedora
 
 .build_tapasco:
@@ -282,42 +286,36 @@ build_tapasco_rockylinux_8_debug:
   image: rockylinux:8
   extends: .build_tapasco_fedora
 
-build_tapasco_fedora_30:
-  image: fedora:30
-  extends: .build_tapasco_fedora
-
-build_tapasco_fedora_31:
-  image: fedora:31
+build_tapasco_fedora_36:
+  image: fedora:36
   extends: .build_tapasco_fedora
 
-build_tapasco_fedora_30_debug:
+build_tapasco_fedora_36_debug:
   variables:
     MODE: "debug"
-  image: fedora:30
-  extends: .build_tapasco_fedora
-
-build_tapasco_fedora_31_debug:
-  variables:
-    MODE: "debug"
-  image: fedora:31
+  image: fedora:36
   extends: .build_tapasco_fedora
 
 .build_tapasco_ubuntu:
   variables:
     PACKAGE_TYPE: "DEB"
   before_script:
-    - apt-get -y update && apt-get -y install build-essential linux-headers-generic python3 cmake libelf-dev libncurses-dev git curl
+    - apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential linux-headers-generic python3 cmake libelf-dev libncurses-dev git curl
   artifacts:
     paths:
       - build/tapasco-*-Linux.deb
   extends: .build_tapasco
 
-build_tapasco_ubuntu_16_04:
-  image: ubuntu:xenial
+build_tapasco_ubuntu_18_04:
+  image: ubuntu:18.04
   extends: .build_tapasco_ubuntu
 
-build_tapasco_ubuntu_18_04:
-  image: ubuntu:bionic
+build_tapasco_ubuntu_20_04:
+  image: ubuntu:20.04
+  extends: .build_tapasco_ubuntu
+
+build_tapasco_ubuntu_22_04:
+  image: ubuntu:22.04
   extends: .build_tapasco_ubuntu
 
 build_tapasco_ubuntu_16_04_cross:
@@ -336,36 +334,22 @@ build_tapasco_ubuntu_16_04_clang:
     - apt-get -y update && apt-get -y install build-essential linux-headers-generic python3 cmake curl libelf-dev libncurses-dev git clang
   extends: .build_tapasco_ubuntu
 
-build_tapasco_ubuntu_16_04_debug:
-  variables:
-    MODE: "debug"
-  image: ubuntu:xenial
-  extends: .build_tapasco_ubuntu
-
 build_tapasco_ubuntu_18_04_debug:
   variables:
     MODE: "debug"
-  image: ubuntu:bionic
+  image: ubuntu:18.04
   extends: .build_tapasco_ubuntu
 
-build_tapasco_arm32v7_debug:
+build_tapasco_ubuntu_20_04_debug:
   variables:
     MODE: "debug"
-  image: arm32v7/ubuntu:16.04
-  before_script:
-    - apt-get -y update && apt-get -y install build-essential linux-headers-generic python3 cmake libelf-dev libncurses-dev git rpm curl
-    - curl http://launchpadlibrarian.net/332033977/libprotobuf10_3.0.0-9ubuntu5_armhf.deb -o /tmp/libprotobuf.deb
-    - curl http://launchpadlibrarian.net/332033978/libprotoc10_3.0.0-9ubuntu5_armhf.deb -o /tmp/libprotoc.deb
-    - curl http://launchpadlibrarian.net/332033979/protobuf-compiler_3.0.0-9ubuntu5_armhf.deb -o /tmp/protobuf.deb
-    - dpkg -i /tmp/libprotobuf.deb
-    - dpkg -i /tmp/libprotoc.deb
-    - dpkg -i /tmp/protobuf.deb
+  image: ubuntu:20.04
   extends: .build_tapasco_ubuntu
 
-build_tapasco_arm64v8_debug:
+build_tapasco_ubuntu_22_04_debug:
   variables:
     MODE: "debug"
-  image: arm64v8/ubuntu:16.04
+  image: ubuntu:22.04
   extends: .build_tapasco_ubuntu
 
 build_tapasco_ubuntu_16_04_cross_debug:
@@ -386,7 +370,7 @@ tapasco_compose_ubuntu:
     XILINXD_LICENSE_FILE: "/opt/cad/keys/xilinx"
   tags:
     - CAD
-  image: ubuntu:bionic
+  image: ubuntu:18.04
   dependencies:
     - build_scala_tapasco_ubuntu_18_04
   script:
@@ -412,11 +396,11 @@ tapasco_compose_ubuntu:
   tags:
     - CAD
     - High
-  image: fedora:30
+  image: rockylinux:8
   dependencies:
-    - build_scala_tapasco_fedora_30
+    - build_scala_tapasco_rockylinux_8
   before_script:
-    - dnf -y install which unzip git zip tar findutils libX11 gcc gcc-c++ python3
+    - dnf -y install which unzip git zip tar findutils libX11 gcc gcc-c++ python3 langpacks-en
     - ln -s /lib64/libtinfo.so.6 /lib64/libtinfo.so.5
   script:
     - source $XILINX_VIVADO/settings64.sh
@@ -496,7 +480,7 @@ tapasco_compose_pcie:
     PLATFORM: "vc709"
   extends: .tapasco_compose
 
-# do runs without for synthesis for all other plattforms
+# do runs without synthesis for all other plattforms
 .tapasco_compose_no_synth:
   variables:
     FLAGS: "--skipSynthesis"

diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@ Supported FPGA devices
 ----------------------
 
 * Zynq-based: PYNQ-Z1, ZC706, ZedBoard, Ultra96V2, ZCU102
-* PCIe cards: VC709, NetFPGA-SUME, VCU108, VCU118, VCU1525, Alveo U250, Alveo U280, BittWare XUP-VVH
+* PCIe cards: VC709, NetFPGA-SUME, VCU108, VCU118, VCU1525, Alveo U250, Alveo U280, BittWare XUP-VVH, PRO DESIGN HAWK
 
 
 System Requirements
@@ -55,14 +55,14 @@ To use TaPaSCo, you'll need working installations of
 If you want to use the High-Level Synthesis flow for generating custom IP
 cores, you will also need:
 
-*   Vivado HLS 2017.4+
+*   Vivado HLS 2017.4+ _or_ Vitis HLS 2020.2+
 
 Check that at least the following are in your `$PATH`:
 
 *   `vivado` - If not source `path/to/vivado/settings64.sh`
 *   `git`
 *   `bash`
-*   \[`vivado_hls`\] - Since Vivado 2018.1 this is included in `vivado`
+*   \[`vivado_hls`,`vitis_hls`\] - Since Vivado 2018.1 this is included in `vivado`
 
 When using *Ubuntu*, ensure that the following packages are installed:
 
@@ -205,8 +205,9 @@ We provided pre-compiled packages for many popular Linux distributions. All pack
 
 | Distribution | Kernel Driver | Kernel Driver (Debug) | Runtime | Runtime (Debug) | Toolflow |
 |:-------------|:-------------:|:---------------------:|:-------:|:---------------:|:--------:|
-| Ubuntu 16.04 | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_ubuntu_16_04) | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_ubuntu_16_04_debug) | [DEB](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2021.01.0-Linux.deb?job=build_tapasco_ubuntu_16_04) | [DEB](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2021.01.0-Linux.deb?job=build_tapasco_ubuntu_16_04_debug) | [DEB](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/toolflow/scala/build/distributions/tapasco_2021-01_amd64.deb?job=build_scala_tapasco_ubuntu_16_04) |
-| Ubuntu 18.04 | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_ubuntu_18_04) | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_ubuntu_18_04_debug) | [DEB](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2021.01.0-Linux.deb?job=build_tapasco_ubuntu_18_04) | [DEB](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2021.01.0-Linux.deb?job=build_tapasco_ubuntu_18_04_debug) | [DEB](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/toolflow/scala/build/distributions/tapasco_2021-01_amd64.deb?job=build_scala_tapasco_ubuntu_18_04) |
-| Fedora 30 | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_fedora_30) | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_fedora_30_debug) | [RPM](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2021.01.0-Linux.rpm?job=build_tapasco_fedora_30) | [RPM](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2021.01.0-Linux.rpm?job=build_tapasco_fedora_30_debug) | [RPM](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/toolflow/scala/build/distributions/tapasco-2021-01.x86_64.rpm?job=build_scala_tapasco_fedora_30) |
-| Fedora 31 | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_fedora_31) | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_fedora_31_debug) | [RPM](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2021.01.0-Linux.rpm?job=build_tapasco_fedora_31) | [RPM](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2021.01.0-Linux.rpm?job=build_tapasco_fedora_31_debug) | [RPM](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/toolflow/scala/build/distributions/tapasco-2021-01.x86_64.rpm?job=build_scala_tapasco_fedora_31) | 
+| Ubuntu 18.04 | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_ubuntu_18_04) | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_ubuntu_18_04_debug) | [DEB](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2021.1.0-Linux.deb?job=build_tapasco_ubuntu_18_04) | [DEB](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2021.1.0-Linux.deb?job=build_tapasco_ubuntu_18_04_debug) | [DEB](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/toolflow/scala/build/distributions/tapasco_2021-01_amd64.deb?job=build_scala_tapasco_ubuntu_18_04) |
+| Ubuntu 20.04 | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_ubuntu_20_04) | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_ubuntu_20_04_debug) | [DEB](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2021.1.0-Linux.deb?job=build_tapasco_ubuntu_20_04) | [DEB](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2021.1.0-Linux.deb?job=build_tapasco_ubuntu_20_04_debug) | [DEB](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/toolflow/scala/build/distributions/tapasco_2021-01_amd64.deb?job=build_scala_tapasco_ubuntu_20_04) |
+| Ubuntu 22.04 | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_ubuntu_22_04) | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_ubuntu_22_04_debug) | [DEB](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2021.1.0-Linux.deb?job=build_tapasco_ubuntu_22_04) | [DEB](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2021.1.0-Linux.deb?job=build_tapasco_ubuntu_22_04_debug) | [DEB](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/toolflow/scala/build/distributions/tapasco_2021-01_amd64.deb?job=build_scala_tapasco_ubuntu_22_04) |
+| Rocky Linux 8 | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_rockylinux_8) | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_rockylinux_8_debug) | [RPM](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2021.1.0-Linux.rpm?job=build_tapasco_rockylinux_8) | [RPM](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2021-01.x86_64.rpm?job=build_tapasco_rockylinux_8_debug) | [RPM](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/toolflow/scala/build/distributions/tapasco-2021-01.x86_64.rpm?job=build_scala_tapasco_rockylinux_8) |
+| Fedora 36 | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_fedora_36) | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_fedora_36_debug) | [RPM](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2021.1.0-Linux.rpm?job=build_tapasco_fedora_36) | [RPM](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2021.1.0-Linux.rpm?job=build_tapasco_fedora_36_debug) | [RPM](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/toolflow/scala/build/distributions/tapasco-2021-01.x86_64.rpm?job=build_scala_tapasco_fedora_36) |