Add m4sme_p and m4sme_e sub-configurations

.circleci/config.yml

@@ -13,10 +13,10 @@ executors:
       - image: cimg/base:2024.10
   linuxnew: # Docker using the Base Convenience Image
     docker:
-      - image: cimg/base:current-22.04
+      - image: cimg/base:current-24.04
   macos: &macos-executor # macos executor running Xcode
     macos:
-      xcode: 16.4.0
+      xcode: 26.4.1
   linuxvm: # executor type
     machine:
       image: ubuntu-2204:current
@@ -79,6 +79,7 @@ workflows:
           THR: pthreads
           CC: clang
           CXX: clang++
+          CONF: arm64--firestorm,m4sme_p,m4sme_e
 
       # cortexa15 build and fast testsuite (qemu)
       - build:
@@ -88,39 +89,25 @@ workflows:
           PACKAGES: 'gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf libc6-dev-armhf-cross qemu-system-arm qemu-user'
           TESTSUITE_WRAPPER: 'qemu-arm -cpu cortex-a15 -L /usr/arm-linux-gnueabihf/'
 
-      # cortexa57 build and fast testsuite (qemu)
+      # arm64 build and fast testsuite (gcc, qemu)
       - build:
-          CC: aarch64-linux-gnu-gcc
-          CXX: aarch64-linux-gnu-g++
-          CONF: cortexa57
-          PACKAGES: 'gcc-aarch64-linux-gnu g++-aarch64-linux-gnu libc6-dev-arm64-cross qemu-system-arm qemu-user'
-          TESTSUITE_WRAPPER: 'qemu-aarch64 -L /usr/aarch64-linux-gnu/'
+          os: linuxnew
+          CC: aarch64-linux-gnu-gcc-14
+          CXX: aarch64-linux-gnu-g++-14
+          CONF: arm64--armsve,firestorm,thunderx2,cortexa57,cortexa53 #,m4sme_p,m4sme_e --- does not currently work with gcc
+          PACKAGES: 'gcc-14-aarch64-linux-gnu g++-14-aarch64-linux-gnu libc6-dev-arm64-cross qemu-system-arm qemu-user'
+          TESTSUITE_WRAPPER: 'qemu-aarch64 -cpu XXX -L /usr/aarch64-linux-gnu/'
 
-      # Apple M1 (firestorm) build and fast testsuite (qemu)
+      # arm64 build and fast testsuite (clang, qemu)
       - build:
-          CC: aarch64-linux-gnu-gcc
-          CXX: aarch64-linux-gnu-g++
-          CONF: firestorm
-          PACKAGES: 'gcc-aarch64-linux-gnu g++-aarch64-linux-gnu libc6-dev-arm64-cross qemu-system-arm qemu-user'
-          TESTSUITE_WRAPPER: 'qemu-aarch64 -L /usr/aarch64-linux-gnu/'
-
-      # armsve build and fast testsuite (qemu)
-      - build:
-          CC: aarch64-linux-gnu-gcc-10
-          CXX: aarch64-linux-gnu-g++-10
-          CONF: armsve
-          PACKAGES: 'gcc-10-aarch64-linux-gnu g++-10-aarch64-linux-gnu libc6-dev-arm64-cross qemu-system-arm qemu-user'
-          TESTSUITE_WRAPPER: 'qemu-aarch64 -cpu max,sve=true,sve512=true -L /usr/aarch64-linux-gnu/'
-
-      # arm64 build and fast testsuite (qemu)
-      # NOTE: This entry omits the -cpu flag so that while both NEON and SVE kernels
-      # are compiled, only NEON kernels will be tested. (h/t to RuQing Xu)
-      - build:
-          CC: aarch64-linux-gnu-gcc-10
-          CXX: aarch64-linux-gnu-g++-10
-          CONF: arm64
-          PACKAGES: 'gcc-10-aarch64-linux-gnu g++-10-aarch64-linux-gnu libc6-dev-arm64-cross qemu-system-arm qemu-user'
-          TESTSUITE_WRAPPER: 'qemu-aarch64 -L /usr/aarch64-linux-gnu/'
+          os: linuxnew
+          CC: clang-18
+          CXX: clang++-18
+          CONF: arm64--armsve,firestorm,thunderx2,cortexa57,cortexa53 #,m4sme_p,m4sme_e --- does not currently work when cross-compiling
+          CFLAGS: '--target=aarch64-linux-gnu' #--sysroot=/usr/aarch64-linux-gnu'
+          LDFLAGS: '--target=aarch64-linux-gnu -fuse-ld=lld-18' #--sysroot=/usr/aarch64-linux-gnu'
+          PACKAGES: 'lld-18 clang-18 gcc-14-aarch64-linux-gnu libc6-dev-arm64-cross qemu-system-arm qemu-user'
+          TESTSUITE_WRAPPER: 'qemu-aarch64 -cpu XXX -L /usr/aarch64-linux-gnu/'
 
       # The RISC-V targets require the qemu version available in jammy or newer.
       # When CI is upgraded, the packages should be activated and do_script.sh
@@ -172,6 +159,9 @@ jobs:
       BLD:
         type: string
         default: ''
+      CFLAGS:
+        type: string
+        default: ''
       LDFLAGS:
         type: string
         default: ''
@@ -210,6 +200,7 @@ jobs:
             export CONF="<< parameters.CONF >>"
             export TEST="<< parameters.TEST >>"
             export BLD="<< parameters.BLD >>"
+            export CFLAGS="<< parameters.CFLAGS >>"
             export LDFLAGS="<< parameters.LDFLAGS >>"
             export SDE="<< parameters.SDE >>"
             export LEVEL0="<< parameters.LEVEL0 >>"
@@ -249,7 +240,7 @@ jobs:
 
             if [ "$CONF" = "generic_broadcast" ]; then
               export CONF=generic
-              export CFLAGS="-DBLIS_BBM_s=2 -DBLIS_BBM_d=2 -DBLIS_BBM_c=2 -DBLIS_BBM_z=2 -DBLIS_BBN_s=4 -DBLIS_BBN_d=4 -DBLIS_BBN_c=4 -DBLIS_BBN_z=4"
+              export CFLAGS="$CFLAGS -DBLIS_BBM_s=2 -DBLIS_BBM_d=2 -DBLIS_BBM_c=2 -DBLIS_BBM_z=2 -DBLIS_BBN_s=4 -DBLIS_BBN_d=4 -DBLIS_BBN_c=4 -DBLIS_BBN_z=4"
             fi
 
             echo "Configuration:"
@@ -267,7 +258,7 @@ jobs:
             echo "LDFLAGS           = $LDFLAGS"
             echo "TESTSUITE_WRAPPER = $TESTSUITE_WRAPPER"
 
-            $DIST_PATH/configure -p `pwd`/../install -t $THR $BLD CC=$CC $CONF
+            $DIST_PATH/configure -p `pwd`/../install -t $THR $BLD CC=$CC ${CONF%%--*}
             pwd
             ls -l
             $CC --version

CREDITS

@@ -80,6 +80,8 @@ but many others have contributed code, ideas, and feedback, including
                            @lschork2
   Dave Love                @loveshack
   Tze Meng Low                                        (The University of Texas at Austin)
+  Luis Lopez               @Luislo1                   (Universidad Complutense de Madrid)
+  Luis Costero             @luismacostero             (Universidad Complutense de Madrid)
   Ye Luo                   @ye-luo                    (Argonne National Laboratory)
   Ricardo Magana           @magania                   (Hewlett Packard Enterprise)
   Madan mohan Manokar      @madanm3                   (AMD)

ci/do_testsuite.sh

@@ -9,35 +9,69 @@ export BLIS_JR_NT=1
 export BLIS_IR_NT=1
 export BLIS_THREAD_IMPL="single"
 
-if [ "$TEST" = "FAST" -o "$TEST" = "ALL" ]; then
-	make T=1 testblis-fast
-	$DIST_PATH/testsuite/check-blistest.sh ./output.testsuite
+TESTSUITE_WRAPPER_SAVE="$TESTSUITE_WRAPPER"
 
-	for impl in $(echo $THR | sed 's/none//' | tr , ' '); do
-		export BLIS_THREAD_IMPL="$impl"
+TMP=${CONF##*--}
+for THIS_CONF in $(echo ${TMP:-${CONF%%--*}} | tr , ' '); do
+
+	echo "Testing configuration: $THIS_CONF"
+
+	if [ "${CONF%%--*}" = "arm64" ] && [ "x$TESTSUITE_WRAPPER" != "x" ]; then
+		case $THIS_CONF in
+			armsve)
+				CPU="max,sve512=on,sme=off"
+				;;
+			firestorm | thunderx2 | cortexa57 | cortexa53)
+				CPU="max,sve=off,sme=off"
+				;;
+			m4sme_*)
+				CPU="max,sve=off,sme512=on"
+				;;
+			*)
+				echo "Unknown arm64 configuration: $THIS_CONF"
+				exit 1
+				;;
+		esac
+		export TESTSUITE_WRAPPER=$(echo "$TESTSUITE_WRAPPER_SAVE" | sed "s/XXX/$CPU/")
+	fi
+
+	case $CONF in
+		*--*)
+			export BLIS_ARCH_TYPE="$THIS_CONF"
+			;;
+	esac
+
+	if [ "$TEST" = "FAST" -o "$TEST" = "ALL" ]; then
 		make T=1 testblis-fast
 		$DIST_PATH/testsuite/check-blistest.sh ./output.testsuite
-	done
-fi
-
-if [ "$TEST" = "MD" -o "$TEST" = "ALL" ]; then
-	make T=1 testblis-md
-	$DIST_PATH/testsuite/check-blistest.sh ./output.testsuite
-fi
-
-if [ "$TEST" = "SALT" -o "$TEST" = "ALL" ]; then
-	# Disable multithreading within BLIS.
-	export BLIS_JC_NT=1 BLIS_IC_NT=1 BLIS_JR_NT=1 BLIS_IR_NT=1
-	make T=1 testblis-salt
-	$DIST_PATH/testsuite/check-blistest.sh ./output.testsuite
-fi
-
-if [ "$TEST" = "1" -o "$TEST" = "ALL" ]; then
-	make T=1 testblis
-	$DIST_PATH/testsuite/check-blistest.sh ./output.testsuite
-fi
 
-export BLIS_THREAD_IMPL="single"
-make T=1 testblas
-$DIST_PATH/blastest/check-blastest.sh
+		for impl in $(echo $THR | sed 's/none//' | tr , ' '); do
+			export BLIS_THREAD_IMPL="$impl"
+			make T=1 testblis-fast
+			$DIST_PATH/testsuite/check-blistest.sh ./output.testsuite
+		done
+	fi
+
+	if [ "$TEST" = "MD" -o "$TEST" = "ALL" ]; then
+		make T=1 testblis-md
+		$DIST_PATH/testsuite/check-blistest.sh ./output.testsuite
+	fi
+
+	if [ "$TEST" = "SALT" -o "$TEST" = "ALL" ]; then
+		# Disable multithreading within BLIS.
+		export BLIS_JC_NT=1 BLIS_IC_NT=1 BLIS_JR_NT=1 BLIS_IR_NT=1
+		make T=1 testblis-salt
+		$DIST_PATH/testsuite/check-blistest.sh ./output.testsuite
+	fi
+
+	if [ "$TEST" = "1" -o "$TEST" = "ALL" ]; then
+		make T=1 testblis
+		$DIST_PATH/testsuite/check-blistest.sh ./output.testsuite
+	fi
+
+	export BLIS_THREAD_IMPL="single"
+	make T=1 testblas
+	$DIST_PATH/blastest/check-blastest.sh
+
+done