Merge branch 'master' into develop

# Conflicts: # .travis.yml # Makefile.am # Makefile.in # src/configs/config_builder.hpp # src/configs/configs.cxx # src/configs/haswell/config.cxx # src/configs/knl/config.cxx # src/configs/skx2/config.cxx # src/external/marray/include/varray_base.hpp # src/nodes/matrify.hpp
xrq-phys · Dec 24, 2020 · c866248 · c866248
2 parents a58347b + 3dd4acb
commit c866248
Show file tree

Hide file tree

Showing 32 changed files with 1,532 additions and 888 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -26,14 +26,17 @@ addons:
     packages:
     - gcc-9
     - g++-9
-    - libtbb-dev
     - clang-6.0
     - libiomp-dev
+    - libtbb-dev
+    #- binutils-2.26
 
 install:
-  - 'if [ "$CC" = "gcc" ]; then
-        export CC="gcc-9" CXX="g++-9";
-    else
+  #- 'if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+  #      export PATH=/usr/lib/binutils-2.26/bin:${PATH};
+  #  fi'
+  - if [ "$CC" = "gcc" ] ; then export CC="gcc-9" CXX="g++-9"; fi
+  - 'if [ "$CC" = "clang" ] ; then
         if [ "$TRAVIS_OS_NAME" = "linux" ]; then
             export CC="clang-6.0 -fopenmp=libiomp5" CXX="clang++-6.0 -fopenmp=libiomp5";
         else

diff --git a/Makefile.am b/Makefile.am
@@ -164,29 +164,30 @@ endif
 if ENABLE_BULLDOZER
 noinst_LTLIBRARIES += lib/libbulldozer.la
 lib_libtblis_la_LIBADD += lib/libbulldozer.la
+lib_libtblis_la_SOURCES += src/configs/bulldozer/config.cxx
 lib_libbulldozer_la_SOURCES = src/configs/bulldozer/bli_gemm_asm_d4x6_fma4.c \
-                             src/configs/bulldozer/config.cxx
+                             src/configs/bulldozer/config_ker.cxx
 lib_libbulldozer_la_CFLAGS = -O3 -mavx -mfma4 -march=bdver1 -mfpmath=sse
 lib_libbulldozer_la_CXXFLAGS = -O3 -mavx -mfma4 -march=bdver1 -mfpmath=sse
 endif
 
 if ENABLE_PILEDRIVER
 noinst_LTLIBRARIES += lib/libpiledriver.la
 lib_libtblis_la_LIBADD += lib/libpiledriver.la
+lib_libtblis_la_SOURCES += src/configs/piledriver/config.cxx
 lib_libpiledriver_la_SOURCES = src/configs/piledriver/bli_gemm_asm_d8x3.c \
-                               src/configs/piledriver/config.cxx
+                               src/configs/piledriver/config_ker.cxx
 lib_libpiledriver_la_CFLAGS = -O3 -mavx -mfma -mfma4 -march=bdver2 -mfpmath=sse -mno-tbm
 lib_libpiledriver_la_CXXFLAGS = -O3 -mavx -mfma -mfma4 -march=bdver2 -mfpmath=sse -mno-tbm
 endif
 
 if ENABLE_EXCAVATOR
 noinst_LTLIBRARIES += lib/libexcavator.la
 lib_libtblis_la_LIBADD += lib/libexcavator.la
+lib_libtblis_la_SOURCES += src/configs/excavator/config.cxx
+lib_libexcavator_la_SOURCES = src/configs/excavator/config_ker.cxx
 if !ENABLE_PILEDRIVER
-lib_libexcavator_la_SOURCES = src/configs/excavator/bli_gemm_asm_d8x3.c \
-                              src/configs/excavator/config.cxx
-else
-lib_libexcavator_la_SOURCES = src/configs/excavator/config.cxx
+lib_libexcavator_la_SOURCES += src/configs/excavator/bli_gemm_asm_d8x3.c
 endif
 lib_libexcavator_la_CFLAGS = -O3 -mavx -mavx2 -mfma -march=bdver4 -mfpmath=sse -mno-tbm
 lib_libexcavator_la_CXXFLAGS = -O3 -mavx -mavx2 -mfma -march=bdver4 -mfpmath=sse -mno-tbm
@@ -195,11 +196,10 @@ endif
 if ENABLE_ZEN
 noinst_LTLIBRARIES += lib/libzen.la
 lib_libtblis_la_LIBADD += lib/libzen.la
+lib_libtblis_la_SOURCES += src/configs/zen/config.cxx
+lib_libzen_la_SOURCES = src/configs/zen/config_ker.cxx
 if !ENABLE_HASWELL
-lib_libzen_la_SOURCES = src/configs/haswell/bli_gemm_asm_d6x8.c \
-                        src/configs/zen/config.cxx
-else
-lib_libzen_la_SOURCES = src/configs/zen/config.cxx
+lib_libzen_la_SOURCES += src/configs/haswell/bli_gemm_asm_d6x8.c
 endif
 lib_libzen_la_CFLAGS = -O3 -mavx -mavx2 -mfma -march=znver1 -mfpmath=sse
 lib_libzen_la_CXXFLAGS = -O3 -mavx -mavx2 -mfma -march=znver1 -mfpmath=sse
@@ -212,8 +212,9 @@ endif
 if ENABLE_CORE2
 noinst_LTLIBRARIES += lib/libcore2.la
 lib_libtblis_la_LIBADD += lib/libcore2.la
+lib_libtblis_la_SOURCES += src/configs/core2/config.cxx
 lib_libcore2_la_SOURCES = src/configs/core2/bli_gemm_asm_d4x4.c \
-                          src/configs/core2/config.cxx
+                          src/configs/core2/config_ker.cxx
 if ENABLE_INTEL_COMPILER
 lib_libcore2_la_CFLAGS = -O3 -xSSSE3
 lib_libcore2_la_CXXFLAGS = -O3 -xSSSE3
@@ -226,8 +227,9 @@ endif
 if ENABLE_SANDYBRIDGE
 noinst_LTLIBRARIES += lib/libsandybridge.la
 lib_libtblis_la_LIBADD += lib/libsandybridge.la
+lib_libtblis_la_SOURCES += src/configs/sandybridge/config.cxx
 lib_libsandybridge_la_SOURCES = src/configs/sandybridge/bli_gemm_asm_d8x4.c \
-                                src/configs/sandybridge/config.cxx
+                                src/configs/sandybridge/config_ker.cxx
 if ENABLE_INTEL_COMPILER
 lib_libsandybridge_la_CFLAGS = -O3 -xAVX
 lib_libsandybridge_la_CXXFLAGS = -O3 -xAVX
@@ -240,8 +242,9 @@ endif
 if ENABLE_HASWELL
 noinst_LTLIBRARIES += lib/libhaswell.la
 lib_libtblis_la_LIBADD += lib/libhaswell.la
+lib_libtblis_la_SOURCES += src/configs/haswell/config.cxx
 lib_libhaswell_la_SOURCES = src/configs/haswell/bli_gemm_asm_d6x8.c \
-                            src/configs/haswell/config.cxx
+                            src/configs/haswell/config_ker.cxx
 #                            src/configs/haswell/bli_gemm_asm_d12x4.c \
 #                            src/configs/haswell/bli_gemm_asm_d8x6.c \
 #                            src/configs/haswell/bli_gemm_asm_d4x12.c
@@ -257,12 +260,13 @@ endif
 if ENABLE_KNL
 noinst_LTLIBRARIES += lib/libknl.la
 lib_libtblis_la_LIBADD += lib/libknl.la
+lib_libtblis_la_SOURCES += src/configs/knl/config.cxx
 lib_libknl_la_SOURCES = src/configs/knl/bli_spackm_opt_24x16.c \
                         src/configs/knl/bli_dpackm_opt_24x8.c \
                         src/configs/knl/bli_dpackm_opt_30x8.c \
                         src/configs/knl/bli_sgemm_opt_24x16.c \
                         src/configs/knl/bli_dgemm_opt_24x8.c \
-                        src/configs/knl/config.cxx
+                        src/configs/knl/config_ker.cxx
 #                        src/configs/knl/bli_dgemm_opt_12x16.c \
 #                        src/configs/knl/bli_dgemm_opt_30x8.c \
 #                        src/configs/knl/bli_dgemm_opt_8x24.c \
@@ -285,22 +289,13 @@ endif
 if ENABLE_SKX1
 noinst_LTLIBRARIES += lib/libskx1.la
 lib_libtblis_la_LIBADD += lib/libskx1.la
+lib_libtblis_la_SOURCES += src/configs/skx1/config.cxx
+lib_libskx1_la_SOURCES = src/configs/skx1/config_ker.cxx
 if !ENABLE_SKX2
-if !ENABLE_HASWELL
-lib_libskx1_la_SOURCES = src/configs/haswell/bli_gemm_asm_d6x8.c \
-                         src/configs/skx2/vpu_count.cxx \
-                         src/configs/skx1/config.cxx
-else
-lib_libskx1_la_SOURCES = src/configs/skx2/vpu_count.cxx \
-                         src/configs/skx1/config.cxx
+lib_libtblis_la_SOURCES += src/configs/skx2/vpu_count.cxx
 endif
-else
 if !ENABLE_HASWELL
-lib_libskx1_la_SOURCES = src/configs/haswell/bli_gemm_asm_d6x8.c \
-                         src/configs/skx1/config.cxx
-else
-lib_libskx1_la_SOURCES = src/configs/skx1/config.cxx
-endif
+lib_libskx1_la_SOURCES += src/configs/haswell/bli_gemm_asm_d6x8.c
 endif
 if ENABLE_INTEL_COMPILER
 lib_libskx1_la_CFLAGS = -O3 -xCORE-AVX512
@@ -319,10 +314,11 @@ endif
 if ENABLE_SKX2
 noinst_LTLIBRARIES += lib/libskx2.la
 lib_libtblis_la_LIBADD += lib/libskx2.la
+lib_libtblis_la_SOURCES += src/configs/skx2/vpu_count.cxx \
+                           src/configs/skx2/config.cxx
 lib_libskx2_la_SOURCES = src/configs/skx2/bli_sgemm_opt_12x32_l2.c \
                          src/configs/skx2/bli_dgemm_opt_12x16_l2.c \
-                         src/configs/skx2/vpu_count.cxx \
-                         src/configs/skx2/config.cxx
+                         src/configs/skx2/config_ker.cxx
 #                        src/configs/skx2/bli_dgemm_opt_12x16_l1.c \
 #                         src/configs/skx2/bli_dgemm_opt_8x8_l1.c \
 #                         src/configs/skx2/bli_dgemm_opt_8x8_l2.c \