LIBXSMM 1.14 (#595)

Removed Valgrind suppression (fixed since LIBXSMM 1.11).
cp2k · Oct 30, 2019 · 42bea7c · 42bea7c
1 parent a515b01
commit 42bea7c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 23 deletions.
diff --git a/tools/toolchain/install_cp2k_toolchain.sh b/tools/toolchain/install_cp2k_toolchain.sh
@@ -639,7 +639,7 @@ if [ $ENABLE_TSAN = "__TRUE__" ] ; then
         [ "$with_reflapack" = "__DONTUSE__" ] && with_reflapack="__INSTALL__"
         export FAST_MATH_MODE=reflapack
     fi
-    echo "TSAN is enabled, canoot use libsmm"
+    echo "TSAN is enabled, cannot use libsmm"
     with_libsmm="__DONTUSE__"
 fi
 

diff --git a/tools/toolchain/scripts/install_libxsmm.sh b/tools/toolchain/scripts/install_libxsmm.sh
@@ -2,10 +2,8 @@
 [ "${BASH_SOURCE[0]}" ] && SCRIPT_NAME="${BASH_SOURCE[0]}" || SCRIPT_NAME=$0
 SCRIPT_DIR="$(cd "$(dirname "$SCRIPT_NAME")" && pwd -P)"
 
-#TODO: Remove valgrind suppressions below after upgrading to next release.
-# For details see: https://github.com/hfp/libxsmm/issues/298 .
-libxsmm_ver="1.13"
-libxsmm_sha256="47c034e169820a9633770eece0e0fdd8d4a744e09b81da2af8c2608a4625811e"
+libxsmm_ver="1.14"
+libxsmm_sha256="9c0af4509ea341d1ee2c6c19fc6f19289318c3bd4b17844efeb9e7f9691abf76"
 source "${SCRIPT_DIR}"/common_vars.sh
 source "${SCRIPT_DIR}"/tool_kit.sh
 source "${SCRIPT_DIR}"/signal_trap.sh
@@ -60,12 +58,14 @@ EOF
             # library
             cd libxsmm-${libxsmm_ver}
             make -j $NPROCS \
+                 MALLOC=0 \
                  CXX=$CXX \
                  CC=$CC \
                  FC=$FC \
                  PREFIX=${pkg_install_dir} \
                  > make.log 2>&1
             make -j $NPROCS \
+                 MALLOC=0 \
                  CXX=$CXX \
                  CC=$CC \
                  FC=$FC \
@@ -120,24 +120,6 @@ EOF
 fi
 cd "${ROOTDIR}"
 
-# ----------------------------------------------------------------------
-# Suppress reporting of known problems
-# ----------------------------------------------------------------------
-cat <<EOF >> ${INSTALLDIR}/valgrind.supp
-{
-   <FalsePositiveLibxsmm1>
-   Memcheck:Cond
-   ...
-   fun:libxsmm_otrans
-}
-{
-   <FalsePositiveLibxsmm2>
-   Memcheck:Value8
-   ...
-   fun:libxsmm_otrans
-}
-EOF
-
 # update toolchain environment
 load "${BUILDDIR}/setup_libxsmm"
 export -p > "${INSTALLDIR}/toolchain.env"