From c525a6deb7fb0d29bfbf00f7d5e4a667ce7c3b08 Mon Sep 17 00:00:00 2001 From: Arif Ali Date: Thu, 25 Jan 2024 07:35:37 +0000 Subject: [PATCH] Update all configs and scripts * Add Make files to compile from distro mpich and openblas * Add CONFIG.rpi5 to add extra tuning for it * Fine tune make_hpl.sh so that it's more dynamic --- .gitignore | 2 + configs/Make.rpi4-mpich-distro | 183 +++++++++++++++++++++++++++++++++ configs/Make.rpi5-mpich-distro | 183 +++++++++++++++++++++++++++++++++ scripts/CONFIG | 22 +--- scripts/CONFIG.rpi4 | 21 ++++ scripts/CONFIG.rpi5 | 21 ++++ scripts/make_hpl.sh | 7 +- scripts/make_mpich.sh | 2 + 8 files changed, 417 insertions(+), 24 deletions(-) create mode 100644 .gitignore create mode 100644 configs/Make.rpi4-mpich-distro create mode 100644 configs/Make.rpi5-mpich-distro mode change 100644 => 120000 scripts/CONFIG create mode 100644 scripts/CONFIG.rpi4 create mode 100644 scripts/CONFIG.rpi5 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..01042bd --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +configs/HPL.out* +configs/hpccoutf.txt diff --git a/configs/Make.rpi4-mpich-distro b/configs/Make.rpi4-mpich-distro new file mode 100644 index 0000000..f3ed6ea --- /dev/null +++ b/configs/Make.rpi4-mpich-distro @@ -0,0 +1,183 @@ +# +# -- High Performance Computing Linpack Benchmark (HPL) +# HPL - 2.3 - December 2, 2018 +# Antoine P. Petitet +# University of Tennessee, Knoxville +# Innovative Computing Laboratory +# (C) Copyright 2000-2008 All Rights Reserved +# +# -- Copyright notice and Licensing terms: +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions, and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# 3. All advertising materials mentioning features or use of this +# software must display the following acknowledgement: +# This product includes software developed at the University of +# Tennessee, Knoxville, Innovative Computing Laboratory. +# +# 4. The name of the University, the name of the Laboratory, or the +# names of its contributors may not be used to endorse or promote +# products derived from this software without specific written +# permission. +# +# -- Disclaimer: +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE UNIVERSITY +# OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# ###################################################################### +# +# ---------------------------------------------------------------------- +# - shell -------------------------------------------------------------- +# ---------------------------------------------------------------------- +# +SHELL = /bin/sh +# +CD = cd +CP = cp +LN_S = ln -fs +MKDIR = mkdir -p +RM = /bin/rm -f +TOUCH = touch +# +# ---------------------------------------------------------------------- +# - Platform identifier ------------------------------------------------ +# ---------------------------------------------------------------------- +# +ARCH = rpi4-mpich-distro +# +# ---------------------------------------------------------------------- +# - HPL Directory Structure / HPL library ------------------------------ +# ---------------------------------------------------------------------- +# +TOPdir = $(HOME)/rpi-hpl-workdir/hpl-2.3 +INCdir = $(TOPdir)/include +BINdir = $(TOPdir)/bin/$(ARCH) +LIBdir = $(TOPdir)/lib/$(ARCH) +# +HPLlib = $(LIBdir)/libhpl.a +# +# ---------------------------------------------------------------------- +# - Message Passing library (MPI) -------------------------------------- +# ---------------------------------------------------------------------- +# MPinc tells the C compiler where to find the Message Passing library +# header files, MPlib is defined to be the name of the library to be +# used. The variable MPdir is only used for defining MPinc and MPlib. +# +MPdir = +MPinc = -I/usr/include/aarch64-linux-gnu/mpich +MPlib = /usr/lib/aarch64-linux-gnu/libmpich.a -lucp -lucs -lhwloc +# +# ---------------------------------------------------------------------- +# - Linear Algebra library (BLAS or VSIPL) ----------------------------- +# ---------------------------------------------------------------------- +# LAinc tells the C compiler where to find the Linear Algebra library +# header files, LAlib is defined to be the name of the library to be +# used. The variable LAdir is only used for defining LAinc and LAlib. +# +LAdir = /usr/lib/aarch64-linux-gnu +LAinc = +LAlib = $(LAdir)/libopenblas.a -lpthread -lm +# +# ---------------------------------------------------------------------- +# - F77 / C interface -------------------------------------------------- +# ---------------------------------------------------------------------- +# You can skip this section if and only if you are not planning to use +# a BLAS library featuring a Fortran 77 interface. Otherwise, it is +# necessary to fill out the F2CDEFS variable with the appropriate +# options. **One and only one** option should be chosen in **each** of +# the 3 following categories: +# +# 1) name space (How C calls a Fortran 77 routine) +# +# -DAdd_ : all lower case and a suffixed underscore (Suns, +# Intel, ...), [default] +# -DNoChange : all lower case (IBM RS6000), +# -DUpCase : all upper case (Cray), +# -DAdd__ : the FORTRAN compiler in use is f2c. +# +# 2) C and Fortran 77 integer mapping +# +# -DF77_INTEGER=int : Fortran 77 INTEGER is a C int, [default] +# -DF77_INTEGER=long : Fortran 77 INTEGER is a C long, +# -DF77_INTEGER=short : Fortran 77 INTEGER is a C short. +# +# 3) Fortran 77 string handling +# +# -DStringSunStyle : The string address is passed at the string loca- +# tion on the stack, and the string length is then +# passed as an F77_INTEGER after all explicit +# stack arguments, [default] +# -DStringStructPtr : The address of a structure is passed by a +# Fortran 77 string, and the structure is of the +# form: struct {char *cp; F77_INTEGER len;}, +# -DStringStructVal : A structure is passed by value for each Fortran +# 77 string, and the structure is of the form: +# struct {char *cp; F77_INTEGER len;}, +# -DStringCrayStyle : Special option for Cray machines, which uses +# Cray fcd (fortran character descriptor) for +# interoperation. +# +F2CDEFS = +# +# ---------------------------------------------------------------------- +# - HPL includes / libraries / specifics ------------------------------- +# ---------------------------------------------------------------------- +# +HPL_INCLUDES = -I$(INCdir) -I$(INCdir)/$(ARCH) $(MPinc) +HPL_LIBS = $(HPLlib) $(LAlib) $(MPlib) -lrt -lbacktrace +# +# - Compile time options ----------------------------------------------- +# +# -DHPL_COPY_L force the copy of the panel L before bcast; +# -DHPL_CALL_CBLAS call the cblas interface; +# -DHPL_CALL_VSIPL call the vsip library; +# -DHPL_DETAILED_TIMING enable detailed timers; +# +# By default HPL will: +# *) not copy L before broadcast, +# *) call the BLAS Fortran 77 interface, +# *) not display detailed timing information. +# +HPL_OPTS = -DHPL_DETAILED_TIMING -DHPL_PROGRESS_REPORT -DHPL_CALL_CBLAS +# +# ---------------------------------------------------------------------- +# +HPL_DEFS = $(F2CDEFS) $(HPL_OPTS) $(HPL_INCLUDES) +# +# ---------------------------------------------------------------------- +# - Compilers / linkers - Optimization flags --------------------------- +# ---------------------------------------------------------------------- +# +CC = gcc +CCNOOPT = $(HPL_DEFS) +CCFLAGS = $(HPL_DEFS) -fomit-frame-pointer -O3 -funroll-loops -W -Wall -mtune=cortex-a72 +# +# On some platforms, it is necessary to use the Fortran linker to find +# the Fortran internals used in the BLAS library. +# +LINKER = $(CC) +LINKFLAGS = $(CCFLAGS) +# +ARCHIVER = ar +ARFLAGS = r +RANLIB = echo +# +# ---------------------------------------------------------------------- diff --git a/configs/Make.rpi5-mpich-distro b/configs/Make.rpi5-mpich-distro new file mode 100644 index 0000000..eb83f2c --- /dev/null +++ b/configs/Make.rpi5-mpich-distro @@ -0,0 +1,183 @@ +# +# -- High Performance Computing Linpack Benchmark (HPL) +# HPL - 2.3 - December 2, 2018 +# Antoine P. Petitet +# University of Tennessee, Knoxville +# Innovative Computing Laboratory +# (C) Copyright 2000-2008 All Rights Reserved +# +# -- Copyright notice and Licensing terms: +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions, and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# 3. All advertising materials mentioning features or use of this +# software must display the following acknowledgement: +# This product includes software developed at the University of +# Tennessee, Knoxville, Innovative Computing Laboratory. +# +# 4. The name of the University, the name of the Laboratory, or the +# names of its contributors may not be used to endorse or promote +# products derived from this software without specific written +# permission. +# +# -- Disclaimer: +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE UNIVERSITY +# OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# ###################################################################### +# +# ---------------------------------------------------------------------- +# - shell -------------------------------------------------------------- +# ---------------------------------------------------------------------- +# +SHELL = /bin/sh +# +CD = cd +CP = cp +LN_S = ln -fs +MKDIR = mkdir -p +RM = /bin/rm -f +TOUCH = touch +# +# ---------------------------------------------------------------------- +# - Platform identifier ------------------------------------------------ +# ---------------------------------------------------------------------- +# +ARCH = rpi5-mpich-distro +# +# ---------------------------------------------------------------------- +# - HPL Directory Structure / HPL library ------------------------------ +# ---------------------------------------------------------------------- +# +TOPdir = $(HOME)/rpi-hpl-workdir/hpl-2.3 +INCdir = $(TOPdir)/include +BINdir = $(TOPdir)/bin/$(ARCH) +LIBdir = $(TOPdir)/lib/$(ARCH) +# +HPLlib = $(LIBdir)/libhpl.a +# +# ---------------------------------------------------------------------- +# - Message Passing library (MPI) -------------------------------------- +# ---------------------------------------------------------------------- +# MPinc tells the C compiler where to find the Message Passing library +# header files, MPlib is defined to be the name of the library to be +# used. The variable MPdir is only used for defining MPinc and MPlib. +# +MPdir = +MPinc = -I/usr/include/aarch64-linux-gnu/mpich +MPlib = /usr/lib/aarch64-linux-gnu/libmpich.a -lucp -lucs -lhwloc +# +# ---------------------------------------------------------------------- +# - Linear Algebra library (BLAS or VSIPL) ----------------------------- +# ---------------------------------------------------------------------- +# LAinc tells the C compiler where to find the Linear Algebra library +# header files, LAlib is defined to be the name of the library to be +# used. The variable LAdir is only used for defining LAinc and LAlib. +# +LAdir = /usr/lib/aarch64-linux-gnu +LAinc = +LAlib = $(LAdir)/libopenblas.a -lpthread -lm +# +# ---------------------------------------------------------------------- +# - F77 / C interface -------------------------------------------------- +# ---------------------------------------------------------------------- +# You can skip this section if and only if you are not planning to use +# a BLAS library featuring a Fortran 77 interface. Otherwise, it is +# necessary to fill out the F2CDEFS variable with the appropriate +# options. **One and only one** option should be chosen in **each** of +# the 3 following categories: +# +# 1) name space (How C calls a Fortran 77 routine) +# +# -DAdd_ : all lower case and a suffixed underscore (Suns, +# Intel, ...), [default] +# -DNoChange : all lower case (IBM RS6000), +# -DUpCase : all upper case (Cray), +# -DAdd__ : the FORTRAN compiler in use is f2c. +# +# 2) C and Fortran 77 integer mapping +# +# -DF77_INTEGER=int : Fortran 77 INTEGER is a C int, [default] +# -DF77_INTEGER=long : Fortran 77 INTEGER is a C long, +# -DF77_INTEGER=short : Fortran 77 INTEGER is a C short. +# +# 3) Fortran 77 string handling +# +# -DStringSunStyle : The string address is passed at the string loca- +# tion on the stack, and the string length is then +# passed as an F77_INTEGER after all explicit +# stack arguments, [default] +# -DStringStructPtr : The address of a structure is passed by a +# Fortran 77 string, and the structure is of the +# form: struct {char *cp; F77_INTEGER len;}, +# -DStringStructVal : A structure is passed by value for each Fortran +# 77 string, and the structure is of the form: +# struct {char *cp; F77_INTEGER len;}, +# -DStringCrayStyle : Special option for Cray machines, which uses +# Cray fcd (fortran character descriptor) for +# interoperation. +# +F2CDEFS = +# +# ---------------------------------------------------------------------- +# - HPL includes / libraries / specifics ------------------------------- +# ---------------------------------------------------------------------- +# +HPL_INCLUDES = -I$(INCdir) -I$(INCdir)/$(ARCH) $(MPinc) +HPL_LIBS = $(HPLlib) $(LAlib) $(MPlib) -lrt -lbacktrace +# +# - Compile time options ----------------------------------------------- +# +# -DHPL_COPY_L force the copy of the panel L before bcast; +# -DHPL_CALL_CBLAS call the cblas interface; +# -DHPL_CALL_VSIPL call the vsip library; +# -DHPL_DETAILED_TIMING enable detailed timers; +# +# By default HPL will: +# *) not copy L before broadcast, +# *) call the BLAS Fortran 77 interface, +# *) not display detailed timing information. +# +HPL_OPTS = -DHPL_DETAILED_TIMING -DHPL_PROGRESS_REPORT -DHPL_CALL_CBLAS +# +# ---------------------------------------------------------------------- +# +HPL_DEFS = $(F2CDEFS) $(HPL_OPTS) $(HPL_INCLUDES) +# +# ---------------------------------------------------------------------- +# - Compilers / linkers - Optimization flags --------------------------- +# ---------------------------------------------------------------------- +# +CC = gcc +CCNOOPT = $(HPL_DEFS) +CCFLAGS = $(HPL_DEFS) -fomit-frame-pointer -O3 -funroll-loops -W -Wall -mtune=cortex-a76 +# +# On some platforms, it is necessary to use the Fortran linker to find +# the Fortran internals used in the BLAS library. +# +LINKER = $(CC) +LINKFLAGS = $(CCFLAGS) +# +ARCHIVER = ar +ARFLAGS = r +RANLIB = echo +# +# ---------------------------------------------------------------------- diff --git a/scripts/CONFIG b/scripts/CONFIG deleted file mode 100644 index a03c528..0000000 --- a/scripts/CONFIG +++ /dev/null @@ -1,21 +0,0 @@ -# -# Default variables that we want to use in all of our scripts -# -export DOWNLOADS=~/Downloads -export WORKDIR=~/rpi-hpl-workdir -export RESULTSDIR=${WORKDIR}/results -export SCRIPTSDIR=${PWD} -export SERVICES="snap.lxd.daemon snap.lxd.daemon.unix.socket postfix systemd-timesyncd wpa_supplicant snapd snapd.apparmor.service systemd-resolved snapd.service snapd.socket" - -# -# Flags based on https://en.wikichip.org/wiki/arm_holdings/microarchitectures/cortex-a72 -# -export COMMON_FLAGS="-mtune=cortex-a72" - -# -# This variable masks the fact if you want to write to output file or not -# With a system that has SD card that is non-performant, then this value -# with 1 may slow the overall HPL benchmark down -# -WRITE_OUT_FILE=0 - diff --git a/scripts/CONFIG b/scripts/CONFIG new file mode 120000 index 0000000..bffb61a --- /dev/null +++ b/scripts/CONFIG @@ -0,0 +1 @@ +CONFIG.rpi5 \ No newline at end of file diff --git a/scripts/CONFIG.rpi4 b/scripts/CONFIG.rpi4 new file mode 100644 index 0000000..a03c528 --- /dev/null +++ b/scripts/CONFIG.rpi4 @@ -0,0 +1,21 @@ +# +# Default variables that we want to use in all of our scripts +# +export DOWNLOADS=~/Downloads +export WORKDIR=~/rpi-hpl-workdir +export RESULTSDIR=${WORKDIR}/results +export SCRIPTSDIR=${PWD} +export SERVICES="snap.lxd.daemon snap.lxd.daemon.unix.socket postfix systemd-timesyncd wpa_supplicant snapd snapd.apparmor.service systemd-resolved snapd.service snapd.socket" + +# +# Flags based on https://en.wikichip.org/wiki/arm_holdings/microarchitectures/cortex-a72 +# +export COMMON_FLAGS="-mtune=cortex-a72" + +# +# This variable masks the fact if you want to write to output file or not +# With a system that has SD card that is non-performant, then this value +# with 1 may slow the overall HPL benchmark down +# +WRITE_OUT_FILE=0 + diff --git a/scripts/CONFIG.rpi5 b/scripts/CONFIG.rpi5 new file mode 100644 index 0000000..77ed1ea --- /dev/null +++ b/scripts/CONFIG.rpi5 @@ -0,0 +1,21 @@ +# +# Default variables that we want to use in all of our scripts +# +export DOWNLOADS=~/Downloads +export WORKDIR=~/rpi-hpl-workdir +export RESULTSDIR=${WORKDIR}/results +export SCRIPTSDIR=${PWD} +export SERVICES="snap.lxd.daemon snap.lxd.daemon.unix.socket postfix systemd-timesyncd wpa_supplicant snapd snapd.apparmor.service systemd-resolved snapd.service snapd.socket" + +# +# Flags based on https://en.wikichip.org/wiki/arm_holdings/microarchitectures/cortex-a76 +# +export COMMON_FLAGS="-mtune=cortex-a76" + +# +# This variable masks the fact if you want to write to output file or not +# With a system that has SD card that is non-performant, then this value +# with 1 may slow the overall HPL benchmark down +# +WRITE_OUT_FILE=0 + diff --git a/scripts/make_hpl.sh b/scripts/make_hpl.sh index 022ea6b..429c3fa 100755 --- a/scripts/make_hpl.sh +++ b/scripts/make_hpl.sh @@ -4,6 +4,7 @@ version=2.3 package=hpl +arch=rpi5-mpich-distro rm -rf ${package}-${version} rm -rf ${WORKDIR}/${package}-${version} @@ -13,6 +14,6 @@ cd ${WORKDIR} tar xfz ${DOWNLOADS}/${package}-${version}.tar.gz cd ${package}-${version} -cp ${SCRIPTSDIR}/../configs/Make.rpi4-mpich . -make arch=rpi4-mpich -j 3 clean_arch -make arch=rpi4-mpich -j 3 install +cp ${SCRIPTSDIR}/../configs/Make.${arch} . +make arch=${arch} -j 3 clean_arch +make arch=${arch} -j 3 install diff --git a/scripts/make_mpich.sh b/scripts/make_mpich.sh index b2b49df..69eabf9 100755 --- a/scripts/make_mpich.sh +++ b/scripts/make_mpich.sh @@ -1,5 +1,7 @@ #!/bin/bash +. CONFIG + version=3.3.2 package=mpich