OmpSs-2-at-FPGA release 2.0.0

Author: mvidalpinol

.gitmodules

@@ -7,9 +7,9 @@
 [submodule "nanos6-fpga"]
 	path = nanos6-fpga
 	url = ../nanos6-fpga.git
-[submodule "mcxx"]
-	path = mcxx
-	url = ../mcxx.git
+[submodule "llvm"]
+	path = llvm
+	url = ../llvm.git
 [submodule "ait"]
 	path = ait
 	url = ../ait.git

Changelog.md

@@ -1,3 +1,27 @@
+# Release 2.0.0
+2023-06-28
+
+* ait
+  * Version 6.8.0
+  * Added support for `alveo_u55c` board
+  * Added support for HBM-based boards
+  * Updated bitinfo to v10
+  * Fixes for Vitis HLS and newer Vivado versions
+* mcxx
+  * Deprecated support for Mercurium compiler
+* llvm
+  * Added support for clang compiler
+* nanos6
+  * Updated with upstream repository
+* xdma
+  * Bump version to 4.3
+  * Reduce copy chunk size to workaround issues in qdma 5
+* xtasks
+  * Implemented `read_bitinfo` tool to read bitstream information from bitInfo BRAM
+* Picos OmpSs Manager (POM)
+  * Version 7.1
+  * Updated encryption key
+
 # Release 1.0.1
 2023-03-06
 

Dockerfile

@@ -309,7 +309,7 @@ WORKDIR /tmp/work/
 ADD Makefile ./
 ADD ait ./ait
 ADD extrae ./extrae
-ADD mcxx ./mcxx
+ADD llvm ./llvm
 ADD nanos6-fpga ./nanos6-fpga
 ADD ompss-at-fpga-kernel-module ./ompss-at-fpga-kernel-module
 ADD xdma ./xdma
@@ -361,13 +361,13 @@ WORKDIR /tmp/work
 
 #X86_64
 RUN make -j`nproc` PREFIX_TARGET=$INSTALLATION_PREFIX/x86_64/ompss-2/${RELEASE_TAG} PREFIX_HOST=$INSTALLATION_PREFIX/$(arch | sed 's/aarch64/arm64/g' | sed 's/armhf/arm32/g')/ompss-2/${RELEASE_TAG} TARGET=$(test $(arch) != x86_64 && echo x86_64-linux-gnu) PLATFORM=qdma \
-    EXTRAE_HOME=$INSTALLATION_PREFIX/x86_64/ompss-2/${RELEASE_TAG}/extrae MCXX_NAME=mcxx-x86_64 \
+    EXTRAE_HOME=$INSTALLATION_PREFIX/x86_64/ompss-2/${RELEASE_TAG}/extrae \
     all
 RUN make mrproper
 
 #ARM64
 RUN make -j`nproc` PREFIX_TARGET=$INSTALLATION_PREFIX/arm64/ompss-2/${RELEASE_TAG} PREFIX_HOST=$INSTALLATION_PREFIX/$(arch | sed 's/aarch64/arm64/g' | sed 's/armhf/arm32/g')/ompss-2/${RELEASE_TAG} TARGET=$(test $(arch) != aarch64 && echo aarch64-linux-gnu) \
-    EXTRAE_HOME=$INSTALLATION_PREFIX/arm64/ompss-2/${RELEASE_TAG}/extrae MCXX_NAME=mcxx-arm64 \
+    EXTRAE_HOME=$INSTALLATION_PREFIX/arm64/ompss-2/${RELEASE_TAG}/extrae \
     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" \
@@ -377,7 +377,7 @@ RUN make mrproper
 #ARM32
 #Assuming no one will compile from an arm32 platform => always setting TARGET
 #RUN make -j`nproc` PREFIX_TARGET=$INSTALLATION_PREFIX/arm32/ompss-2/${RELEASE_TAG} PREFIX_HOST=$INSTALLATION_PREFIX/$(arch | sed 's/aarch64/arm64/g' | sed 's/armhf/arm32/g')/ompss-2/${RELEASE_TAG} TARGET=arm-linux-gnueabihf \
-#    EXTRAE_HOME=$INSTALLATION_PREFIX/arm32/ompss-2/${RELEASE_TAG}/extrae MCXX_NAME=mcxx-arm32 \
+#    EXTRAE_HOME=$INSTALLATION_PREFIX/arm32/ompss-2/${RELEASE_TAG}/extrae \
 #    all
 #RUN make mrproper
 
@@ -402,9 +402,7 @@ RUN if [ "$BUILD_ONLY" = "true" ]; \
 RUN adduser --disabled-password --gecos '' ompss \
  && adduser ompss sudo \
  && echo 'ompss:ompss' | chpasswd \
- && echo "export PATH=\$PATH:$INSTALLATION_PREFIX/$(arch | sed 's/aarch64/arm64/g' | sed 's/armhf/arm32/g')/ompss-2/${RELEASE_TAG}/mcxx-arm64/bin" >>$INSTALLATION_PREFIX/$(arch | sed 's/aarch64/arm64/g' | sed 's/armhf/arm32/g')/ompss-2/${RELEASE_TAG}/environment_ompss_fpga.sh \
- && echo "export PATH=\$PATH:$INSTALLATION_PREFIX/$(arch | sed 's/aarch64/arm64/g' | sed 's/armhf/arm32/g')/ompss-2/${RELEASE_TAG}/mcxx-arm32/bin" >>$INSTALLATION_PREFIX/$(arch | sed 's/aarch64/arm64/g' | sed 's/armhf/arm32/g')/ompss-2/${RELEASE_TAG}/environment_ompss_fpga.sh \
- && echo "export PATH=\$PATH:$INSTALLATION_PREFIX/$(arch | sed 's/aarch64/arm64/g' | sed 's/armhf/arm32/g')/ompss-2/${RELEASE_TAG}/mcxx-x86_64/bin" >>$INSTALLATION_PREFIX/$(arch | sed 's/aarch64/arm64/g' | sed 's/armhf/arm32/g')/ompss-2/${RELEASE_TAG}/environment_ompss_fpga.sh \
+ && echo "export PATH=\$PATH:$INSTALLATION_PREFIX/$(arch | sed 's/aarch64/arm64/g' | sed 's/armhf/arm32/g')/ompss-2/${RELEASE_TAG}/llvm/bin" >>$INSTALLATION_PREFIX/$(arch | sed 's/aarch64/arm64/g' | sed 's/armhf/arm32/g')/ompss-2/${RELEASE_TAG}/environment_ompss_fpga.sh \
  && echo "export PATH=\$PATH:$INSTALLATION_PREFIX/$(arch | sed 's/aarch64/arm64/g' | sed 's/armhf/arm32/g')/ompss-2/${RELEASE_TAG}/ait/bin" >>$INSTALLATION_PREFIX/$(arch | sed 's/aarch64/arm64/g' | sed 's/armhf/arm32/g')/ompss-2/${RELEASE_TAG}/environment_ompss_fpga.sh \
  && echo "export PYTHONPATH=$INSTALLATION_PREFIX/$(arch | sed 's/aarch64/arm64/g' | sed 's/armhf/arm32/g')/ompss-2/${RELEASE_TAG}/ait" >>$INSTALLATION_PREFIX/$(arch | sed 's/aarch64/arm64/g' | sed 's/armhf/arm32/g')/ompss-2/${RELEASE_TAG}/environment_ompss_fpga.sh
 ADD ./dockerImageFiles/welcome_ompss_fpga.txt $INSTALLATION_PREFIX
@@ -414,9 +412,7 @@ ADD --chown=ompss:ompss ./dockerImageFiles/example ./example/
 #RUN ln -s $INSTALLATION_PREFIX/$(arch | sed 's/aarch64/arm64/g' | sed 's/armhf/arm32/g')/ompss/${RELEASE_TAG}/nanos6-fpga/share/doc/nanox/paraver_configs/ompss ./example/paraver_configs \
 RUN echo "export PATH=\$PATH:$INSTALLATION_PREFIX/$(arch | sed 's/aarch64/arm64/g' | sed 's/armhf/arm32/g')/wxparaver/bin" >>.bashrc \
  && echo "cat $INSTALLATION_PREFIX/welcome_ompss_fpga.txt" >>.bashrc \
- && echo "export PATH=\$PATH:$INSTALLATION_PREFIX/$(arch | sed 's/aarch64/arm64/g' | sed 's/armhf/arm32/g')/ompss-2/${RELEASE_TAG}/mcxx-arm64/bin" >>.bashrc \
- && echo "export PATH=\$PATH:$INSTALLATION_PREFIX/$(arch | sed 's/aarch64/arm64/g' | sed 's/armhf/arm32/g')/ompss-2/${RELEASE_TAG}/mcxx-arm32/bin" >>.bashrc \
- && echo "export PATH=\$PATH:$INSTALLATION_PREFIX/$(arch | sed 's/aarch64/arm64/g' | sed 's/armhf/arm32/g')/ompss-2/${RELEASE_TAG}/mcxx-x86_64/bin" >>.bashrc \
+ && echo "export PATH=\$PATH:$INSTALLATION_PREFIX/$(arch | sed 's/aarch64/arm64/g' | sed 's/armhf/arm32/g')/ompss-2/${RELEASE_TAG}/llvm/bin" >>.bashrc \
  && echo "export PATH=\$PATH:$INSTALLATION_PREFIX/$(arch | sed 's/aarch64/arm64/g' | sed 's/armhf/arm32/g')/ompss-2/${RELEASE_TAG}/ait/bin" >>.bashrc \
  && echo "export PYTHONPATH=$INSTALLATION_PREFIX/$(arch | sed 's/aarch64/arm64/g' | sed 's/armhf/arm32/g')/ompss-2/${RELEASE_TAG}/ait" >>.bashrc
 

Makefile

@@ -20,17 +20,13 @@ ifndef XTASKS_PLATFORM
 	XTASKS_PLATFORM := $(PLATFORM)
 endif
 
-ifndef MCXX_NAME
-	MCXX_NAME := mcxx
-endif
-
 ifndef ENVSCRIPT_NAME
 	ENVSCRIPT_NAME := environment_ompss_2_fpga.sh
 endif
 
 export CROSS_COMPILE := $(TARGET)-
 
-all: xdma-install xtasks-install nanos6-install mcxx-install ait-install envscript-install
+all: xdma-install xtasks-install nanos6-install llvm-install ait-install envscript-install
 
 .PHONY: xdma xdma-install xtasks xtasks-install
 
@@ -48,11 +44,11 @@ xtasks-install: xtasks
 	pushd $(PREFIX_TARGET)/libxtasks/lib; \
 		ln -s libxtasks-hwruntime.so libxtasks.so; popd;
 
-.PHONY: nanos6-bootstrap nanos6-config mcxx-config-force nanos6-build nanos6-install
+.PHONY: nanos6-bootstrap nanos6-config llvm-config nanos6-build nanos6-install
 
 nanos6-bootstrap:
 	cd nanos6-fpga; 	\
-	autoreconf -fiv
+	./autogen.sh
 
 ifdef EXTRAE_HOME
 WITH_EXTRAE := --with-extrae=$(EXTRAE_HOME)
@@ -81,33 +77,29 @@ nanos6-build: nanos6-config
 nanos6-install: nanos6-build
 	$(MAKE) -C nanos6-build install
 
-.PHONY: mcxx-bootstrap mcxx-config mcxx-config-force mcxx-build mcxx-install
-
-mcxx-bootstrap:
-	cd mcxx && autoreconf -fiv
-
-mcxx-config: nanos6-install
-	if [ ! -r mcxx-build/config.status ]; \
-	then	\
-		$(MAKE) mcxx-config-force; \
-	fi
-
-mcxx-config-force: mcxx-bootstrap
-	mkdir -p mcxx-build; \
-	cd mcxx-build; \
-	../mcxx/configure \
-		--prefix=$(PREFIX_HOST)/$(MCXX_NAME) \
-		--with-nanos6=$(PREFIX_TARGET)/nanos6 \
-		--target=$(TARGET) \
-		--enable-ompss-2 \
-		--disable-vectorization \
-		$(MCXX_CONFIG_FLAGS)
-
-mcxx-build: mcxx-config
-	$(MAKE) -C mcxx-build -j$(BUILDCPUS)
-
-mcxx-install: mcxx-build
-	$(MAKE) -C mcxx-build install
+.PHONY: llvm-config llvm-build llvm-install
+
+llvm-config: nanos6-install
+	mkdir -p llvm-build; \
+	cd llvm-build; \
+	cmake -G Ninja \
+	  -DCMAKE_INSTALL_PREFIX=$(PREFIX_HOST)/llvm \
+	  -DLLVM_TARGETS_TO_BUILD="X86;AArch64" \
+	  -DCMAKE_BUILD_TYPE=Release \
+	  -DCLANG_DEFAULT_NANOS6_HOME=$(PREFIX_TARGET)/nanos6 \
+	  -DLLVM_USE_SPLIT_DWARF=ON \
+	  -DLLVM_ENABLE_PROJECTS="clang" \
+	  -DLLVM_INSTALL_TOOLCHAIN_ONLY=ON \
+	  -DCMAKE_C_COMPILER=clang \
+	  -DCMAKE_CXX_COMPILER=clang++ \
+	  -DLLVM_USE_LINKER=lld \
+	../llvm/llvm
+
+llvm-build: llvm-config
+	ninja -C llvm-build
+
+llvm-install: llvm-build
+	ninja install -C llvm-build
 
 .PHONY: ait-install
 
@@ -120,7 +112,7 @@ ait-install:
 
 environment_ompss_2_fpga.sh:
 	@echo "#!/bin/bash" >environment_ompss_2_fpga.sh
-	@echo 'export PATH=$$PATH:'$(PREFIX_HOST)'/'$(MCXX_NAME)'/bin' >>environment_ompss_2_fpga.sh
+	@echo 'export PATH=$$PATH:'$(PREFIX_HOST)'/llvm/bin' >>environment_ompss_2_fpga.sh
 	@echo 'export PATH=$$PATH:'$(PREFIX_HOST)'/ait/bin' >>environment_ompss_2_fpga.sh
 	@echo 'export PYTHONPATH='$(PREFIX_HOST)'/ait' >>environment_ompss_2_fpga.sh
 
@@ -130,14 +122,14 @@ envscript-install: environment_ompss_2_fpga.sh
 .PHONY: clean mrproper
 
 clean:
-	if [ -d mcxx-build ]; then $(MAKE) -C mcxx-build clean; fi
+	if [ -d llvm-build ]; then rm llvm-build/CMakeCache/CMakeCache.txtt; fi
 	if [ -d nanos6-build ]; then $(MAKE) -C nanos6-build clean; fi
 	$(MAKE) -C xdma/src/$(PLATFORM) clean
 	$(MAKE) -C xtasks/src/$(PLATFORM) clean
 	rm -f environment_ompss_2_fpga.sh 2>/dev/null
 
 mrproper: clean
-	rm -rf mcxx-build 2>/dev/null
+	rm -rf llvm-build 2>/dev/null
 	rm -rf nanos6-build 2>/dev/null
 
 .PHONY: help
@@ -148,25 +140,22 @@ 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: zynq]"
 	@echo "  XDMA_PLATFORM        Board platform that xdma backend will target (e.g. zynq, qdma, euroexa_maxilink) [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. mcxx, ait) [def: /]"
+	@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 "  EXTRAE_HOME          Extrae installation path"
 	@echo "  BUILDCPUS            Number of processes used for building [def: nproc]"
-	@echo "  MCXX_NAME            Mercurium installation path within PREFIX_HOST [def: mcxx]"
 	@echo "  ENVSCRIPT_NAME       Environment script name within PREFIX_HOST [def: environment_ompss_2_fpga.sh]"
 	@echo "Targets:"
-	@echo "  xdma                 Build xdma library"
-	@echo "  xdma-install         Install xdma library"
-	@echo "  xtasks               Build xtasks library"
-	@echo "  xtasks-install       Install xtasks library"
-	@echo "  nanos6-bootstrap      Nanos++ configuration bootstrap"
-	@echo "  nanos6-config         Nanos++ configuration"
-	@echo "  nanos6-config-force   Force Nanos++ configuration"
-	@echo "  nanos6-build          Build Nanos++"
-	@echo "  nanos6-install        Install Nanos++"
-	@echo "  mcxx-bootstrap       Mercurium configuration bootstrap"
-	@echo "  mcxx-config          Mercurium configuration"
-	@echo "  mcxx-config-force    Force Mercurium configuration"
-	@echo "  mcxx-build           Build Mercurium"
-	@echo "  mcxx-install         Install Mercurium"
-	@echo "  envscript-install    Install environment script"
+	@echo "  xdma                  Build xdma library"
+	@echo "  xdma-install          Install xdma library"
+	@echo "  xtasks                Build xtasks library"
+	@echo "  xtasks-install        Install xtasks library"
+	@echo "  nanos6-bootstrap      Nanos6 configuration bootstrap"
+	@echo "  nanos6-config         Nanos6 configuration"
+	@echo "  nanos6-config-force   Force Nanos6 configuration"
+	@echo "  nanos6-build          Build Nanos6"
+	@echo "  nanos6-install        Install Nanos6"
+	@echo "  llvm-config           LLVM configuration"
+	@echo "  llvm-build            Build LLVM"
+	@echo "  llvm-install          Install LLVM"
+	@echo "  envscript-install     Install environment script"

ait

@@ -23,7 +23,7 @@ pushd `dirname ${BASH_SOURCE[0]}`/../ >/dev/null
   git submodule foreach git config credential.helper cache
 
   #Stash the updated subrepos and commit the changes + create the tag
-  git add ait mcxx nanos6-fpga ompss-at-fpga-kernel-module xdma xtasks Changelog.md README.md
+  git add ait llvm nanos6-fpga ompss-at-fpga-kernel-module xdma xtasks Changelog.md README.md
   git commit -m "OmpSs-2-at-FPGA release ${VERSION}"
   git tag ${VERSION}
   git push origin master --tags