Updates

Allow for alpha and beta releases

Author: mvidalpinol

Dockerfile

@@ -101,7 +101,7 @@ ARG RELEASE_TAG
 #LIBNUMA
 WORKDIR /tmp/work/
 
-ARG numactl_ver=2.0.18
+ARG numactl_ver=2.0.19
 RUN wget "https://github.com/numactl/numactl/releases/download/v${numactl_ver}/numactl-${numactl_ver}.tar.gz" \
  && tar -zxf numactl-${numactl_ver}.tar.gz \
  && rm numactl-${numactl_ver}.tar.gz
@@ -110,9 +110,6 @@ WORKDIR /tmp/work/numactl-${numactl_ver}
 
 RUN autoreconf -ifv
 
-# We need to patch syscall.c to add arm32 set_mempolicy_home_node syscall number (450)
-RUN sed -Ei '144s/(.*)/\1\ \|\|\ defined\(__arm__\)/' syscall.c
-
 #ARM64
 RUN ./configure --prefix=$INSTALLATION_PREFIX/arm64/libnuma --host=aarch64-linux-gnu \
  && make install \
@@ -131,12 +128,13 @@ RUN ./configure --prefix=$INSTALLATION_PREFIX/x86_64/libnuma --host=x86_64-linux
 #HWLOC
 WORKDIR /tmp/work/
 
-ARG hwloc_ver=2.9.3
-RUN wget "https://download.open-mpi.org/release/hwloc/v2.9/hwloc-${hwloc_ver}.tar.gz" \
- && tar -zxf hwloc-${hwloc_ver}.tar.gz \
- && rm hwloc-${hwloc_ver}.tar.gz
+ARG hwloc_ver_long=2.12.2
+ARG hwloc_ver_short=2.12
+RUN wget "https://download.open-mpi.org/release/hwloc/v${hwloc_ver_short}/hwloc-${hwloc_ver_long}.tar.gz" \
+ && tar -zxf hwloc-${hwloc_ver_long}.tar.gz \
+ && rm hwloc-${hwloc_ver_long}.tar.gz
 
-WORKDIR /tmp/work/hwloc-${hwloc_ver}
+WORKDIR /tmp/work/hwloc-${hwloc_ver_long}
 
 RUN autoreconf -ifv
 
@@ -174,10 +172,9 @@ WORKDIR /tmp/work
 
 #ARM64
 RUN make \
-    TARGET=aarch64-linux-gnu \
+    TARGET_ARCH=arm64 \
     PREFIX_TARGET=$INSTALLATION_PREFIX/arm64/ompss-2/${RELEASE_TAG} \
     PREFIX_HOST=$INSTALLATION_PREFIX/x86_64/ompss-2/${RELEASE_TAG} \
-    OVNI_CONFIG_FLAGS="-DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc" \
     NANOS6_CONFIG_FLAGS="--with-libnuma=$INSTALLATION_PREFIX/arm64/libnuma --with-symbol-resolution=indirect" \
     hwloc_CFLAGS="-I$INSTALLATION_PREFIX/arm64/hwloc/include" \
     hwloc_LIBS="-L$INSTALLATION_PREFIX/arm64/hwloc/lib -lhwloc" \
@@ -189,10 +186,9 @@ RUN make \
 
 #ARM32
 RUN make \
-    TARGET=arm-linux-gnueabihf \
+    TARGET_ARCH=arm32 \
     PREFIX_TARGET=$INSTALLATION_PREFIX/arm32/ompss-2/${RELEASE_TAG} \
     PREFIX_HOST=$INSTALLATION_PREFIX/x86_64/ompss-2/${RELEASE_TAG} \
-    OVNI_CONFIG_FLAGS="-DCMAKE_C_COMPILER=arm-linux-gnueabihf-gcc" \
     NANOS6_CONFIG_FLAGS="--with-libnuma=$INSTALLATION_PREFIX/arm32/libnuma --with-symbol-resolution=indirect" \
     hwloc_CFLAGS="-I$INSTALLATION_PREFIX/arm32/hwloc/include" \
     hwloc_LIBS="-L$INSTALLATION_PREFIX/arm32/hwloc/lib -lhwloc" \

Makefile

@@ -4,8 +4,18 @@ ifndef BUILDCPUS
 	BUILDCPUS := $(shell nproc)
 endif
 
-ifndef TARGET
-	TARGET := $(gcc -dumpmachine)
+ifndef TARGET_ARCH
+	TARGET := $(shell gcc -dumpmachine)
+else
+ifeq ($(TARGET_ARCH),arm64)
+	TARGET := aarch64-linux-gnu
+	export CROSS_COMPILE := $(TARGET)-
+else
+ifeq ($(TARGET_ARCH),arm32)
+	TARGET := arm-linux-gnueabihf
+	export CROSS_COMPILE := $(TARGET)-
+endif
+endif
 endif
 
 ifndef PLATFORM
@@ -20,7 +30,17 @@ ifndef XTASKS_PLATFORM
 	XTASKS_PLATFORM := $(PLATFORM)
 endif
 
-export CROSS_COMPILE := $(TARGET)-
+ifndef PREFIX
+	PREFIX := /opt/bsc
+endif
+
+ifndef PREFIX_TARGET
+	PREFIX_TARGET := $(PREFIX)
+endif
+
+ifndef PREFIX_HOST
+	PREFIX_HOST := $(PREFIX)
+endif
 
 all: xdma-install xtasks-install ovni-install nanos6-install llvm-install ait-install envscript-install
 
@@ -46,7 +66,7 @@ ovni-config:
 	cmake \
 	  -DCMAKE_INSTALL_PREFIX=$(PREFIX_TARGET)/libovni \
 	  -DUSE_MPI=OFF \
-	  $(OVNI_CONFIG_FLAGS) \
+	  -DCMAKE_C_COMPILER=$(CROSS_COMPILE)gcc \
 	../ovni
 
 ovni-build: ovni-config
@@ -116,9 +136,17 @@ llvm-install: llvm-build
 .PHONY: ait-install
 
 ait-install:
+ifeq ($(AIT_EXTRA_CONFIG),offline)
+	cd ait; \
+	export DEB_PYTHON_INSTALL_LAYOUT=deb_system; \
+	rm -rf $(PREFIX_HOST)/ait; \
+	python3 ./setup.py bdist_wheel; \
+	python3 -m pip install ./dist/ait_bsc-*.whl --no-index -t $(PREFIX_HOST)/ait
+else
 	export DEB_PYTHON_INSTALL_LAYOUT=deb_system; \
 	rm -rf $(PREFIX_HOST)/ait; \
 	python3 -m pip install ./ait -t $(PREFIX_HOST)/ait
+endif
 
 .PHONY: envscript-install
 
@@ -153,8 +181,8 @@ help:
 	@echo "  PLATFORM             Fallback board platform that xtasks and xdma backends will target if no specific one has been defined (e.g. zynq, qdma) [def: qdma]"
 	@echo "  XDMA_PLATFORM        Board platform that xdma backend will target (e.g. zynq, qdma) [def: PLATFORM]"
 	@echo "  XTASKS_PLATFORM      Board platform that xtasks backend will target (e.g. zynq, qdma) [def: PLATFORM]"
-	@echo "  PREFIX_HOST          Installation prefix for the host tools (e.g. llvm, ait) [def: /]"
-	@echo "  PREFIX_TARGET        Installation prefix for the target tools (e.g. nanos6, libxdma) [def: /]"
+	@echo "  PREFIX_HOST          Installation prefix for the host tools (e.g. llvm, ait) [def: /opt/bsc]"
+	@echo "  PREFIX_TARGET        Installation prefix for the target tools (e.g. nanos6, libxdma) [def: /opt/bsc]"
 	@echo "  BUILDCPUS            Number of processes used for building [def: nproc]"
 	@echo "Targets:"
 	@echo "  xdma                  Build xdma library"

dockerImageFiles/example/README.md

@@ -11,19 +11,23 @@ The example comes with a Makefile that allows easily building the bitstream (and
 ##### Environment setup
 
 The environment variables that we may need to set up for the compilation process are:
- * `CROSS_COMPILE` [Def: ""] Cross compiler prefix. The docker image has the tool-chain supporting:
-   * `aarch64-linux-gnu-` (ARM 64bits).
-   * `arm-linux-gnueabihf-` (ARM 32bits).
- * `CFLAGS` [Def: ""] Compiler flags.
- * `LDFLAGS` [Def: ""] Linker flags.
- * `PETALINUX_BUILD` [Def: ""] Petalinux project directory (only needed when building boot files)
 
-**NOTE: Do not source petalinux and/or vivado settings as they may break toolchain configuration.**
+* `CROSS_COMPILE` [Def: ""] Cross compiler prefix. The docker image supports the following cross-compilers:
+  * `aarch64-linux-gnu-` (ARM 64bits).
+  * `arm-linux-gnueabihf-` (ARM 32bits).
+* `NANOS6_HOME` [Def: ""] Path to Nanos6 library to be used during compilation. The docker image has the following Nanos6 installations:
+  * `/opt/bsc/x86_64/ompss-2/RELEASE_TAG/nanos6/` (Will be used by default)
+  * `/opt/bsc/arm64/ompss-2/RELEASE_TAG/nanos6/`
+  * `/opt/bsc/arm32/ompss-2/RELEASE_TAG/nanos6/`
+* `CFLAGS` [Def: ""] Compiler flags.
+* `LDFLAGS` [Def: ""] Linker flags.
+* `PETALINUX_BUILD` [Def: ""] Petalinux project directory (only needed when building boot files)
 
 For example, we will set the following environment variables to build the example application for the ZCU102:
 
 ```bash
 export CROSS_COMPILE=aarch64-linux-gnu-
+export NANOS6_HOME=/opt/bsc/arm64/ompss-2/RELEASE_TAG/nanos6/
 ```
 
 ##### Bitstream
@@ -48,8 +52,6 @@ Assuming that Xilinx software version 2021.1 is available in `/opt/xilinx` folde
 export PATH=$PATH:/opt/xilinx/Vivado/2021.1/bin
 ```
 
-**NOTE: Do not source vivado settings as it may break the toolchain configuration.**
-
 ##### Boot Files
 
 The Makefile has a target to build the boot once the bitstream has been created.
@@ -74,8 +76,9 @@ make dotprodut-p dotproduct-d dotproduct-i
 
 We should copy the files to the board and after that we can proceed with the following steps.
 The files should include at least:
- * dotproduct.bin (bitstream).
- * dotproduct-d, dotproduct-i, dotproduct-p (executables).
+
+* dotproduct.bin (bitstream).
+* dotproduct-d, dotproduct-i, dotproduct-p (executables).
 
 ##### Load the bitstream
 

scripts/commit_release.sh

@@ -9,7 +9,7 @@ VERSION=$1
 #NOTE: Ensure running in the repo root dir
 pushd $(dirname ${BASH_SOURCE[0]})/../ >/dev/null
 
-  CHANGELOG_VER=$(head -n1 Changelog.md | grep -oE "[0-9.]*(-rc[0-9]*)?")
+  CHANGELOG_VER=$(head -n1 Changelog.md | grep -oE "[0-9.]*(-alpha|-beta|-rc[0-9]*)?")
   if [ "$CHANGELOG_VER" != "$VERSION" ] ; then
     echo -e "ERROR:\tThe changelog version does not match the release version"
     column -t -s ':' <<< "
@@ -25,7 +25,7 @@ pushd $(dirname ${BASH_SOURCE[0]})/../ >/dev/null
   fi
 
   # Set user-guide URL
-  sed -i "s/\(user-guide-\)\([0-9]\|[.]\)*\(-rc[0-9]*\)\?/\1${VERSION}/" README.md
+  sed -i "s/\(user-guide-\)\([0-9]\|[.]\)*\(-alpha\|-beta\|-rc[0-9]*\)\?/\1${VERSION}/" README.md
 
   # Enable the cache mode for credentials in meta-repository and every submodule
   git config credential.helper cache
@@ -38,8 +38,8 @@ pushd $(dirname ${BASH_SOURCE[0]})/../ >/dev/null
     #git submodule foreach git push origin ompss-2-at-fpga-release/${VERSION}
     #git submodule foreach git credential-cache exit
 
-    git push origin --delete $(git tag --list '[0-9]\.[0-9]\.[0-9]-rc[0-9]*')
-    git tag --delete $(git tag --list '[0-9]\.[0-9]\.[0-9]-rc[0-9]*')
+    git tag --list '[0-9]\.[0-9]\.[0-9]-rc[0-9]*' | xargs --no-run-if-empty git push origin --delete
+    git tag --list '[0-9]\.[0-9]\.[0-9]-rc[0-9]*' | xargs --no-run-if-empty git tag --delete
   fi
 
   # Stash the updated subrepos and commit the changes + create the tag