Merge branch 'master' into featSME

Author: cielavenir

.clang-format-ignore

@@ -1,3 +1,6 @@
 include/aarch64_multibinary.h
 include/aarch64_label.h
 **/aarch64/*.h
+
+include/riscv64_multibinary.h
+**/riscv64/*.h

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
       CLANGFORMAT: clang-format-18
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v4.2.2
         with:
           fetch-depth: 2
       - name: Install clang-format-18
@@ -41,7 +41,7 @@ jobs:
           - nasm
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v4.2.2
       - name: Install build dependencies (Linux)
         run: sudo apt install ${{ matrix.assembler }}
         if: runner.os == 'Linux'
@@ -58,14 +58,86 @@ jobs:
       - name: Run extended tests
         run: bash tools/test_extended.sh
 
+  run_tests_mingw_linux_64:
+    needs: check_format
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/[email protected]
+      - name: Install build dependencies (Linux)
+        run: sudo apt install nasm mingw-w64
+      - name: Build
+        shell: bash
+        run: |
+          make -j $(nproc) -f Makefile.unx programs/igzip tests arch=mingw host_cpu=x86_64
+      # wine does not seem available, hence cannot run tests.
+
+  run_tests_mingw_linux_32:
+    needs: check_format
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/[email protected]
+      - name: Install build dependencies (Linux)
+        run: sudo apt install nasm mingw-w64
+      - name: Build
+        shell: bash
+        run: |
+          make -j $(nproc) -f Makefile.unx programs/igzip tests arch=mingw host_cpu=base_aliases CC=i686-w64-mingw32-gcc
+
+  run_tests_mingw_windows_64:
+    needs: check_format
+    runs-on: windows-latest
+    steps:
+      - uses: actions/[email protected]
+      - name: Install nasm
+        uses: ilammy/[email protected]
+      - name: Build
+        shell: bash
+        run: |
+          make -j $(nproc) -f Makefile.unx programs/igzip tests SIM= arch=mingw host_cpu=x86_64 AR=x86_64-w64-mingw32-gcc-ar
+      - name: Run tests
+        shell: bash
+        run: |
+          # autoconf is missing, hence simulates test_checks.sh
+          make -j $(nproc) -f Makefile.unx check D=TEST_SEED=0 SIM= arch=mingw host_cpu=x86_64 AR=x86_64-w64-mingw32-gcc-ar
+      - name: Run extended tests
+        shell: bash
+        run: |
+          # simulates test_extended.sh
+          make -j $(nproc) -f Makefile.unx perf D=TEST_SEED=0 SIM= arch=mingw host_cpu=x86_64 AR=x86_64-w64-mingw32-gcc-ar
+          make -j $(nproc) -f Makefile.unx test D=TEST_SEED=0 SIM= arch=mingw host_cpu=x86_64 AR=x86_64-w64-mingw32-gcc-ar
+
+  # seems like i686-w64-mingw32-gcc is not available on windows runner.
+
   run_tests_windows:
     needs: check_format
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v4.2.2
       - name: Set MSVC developer prompt
-        uses: ilammy/msvc-dev-cmd@v1.6.0
+        uses: ilammy/msvc-dev-cmd@v1.13.0
       - name: Install nasm
-        uses: ilammy/setup-nasm@v1.2.0
+        uses: ilammy/setup-nasm@v1.5.2
       - name: Build
-        run: nmake -f Makefile.nmake
+        run: |
+          nmake -f Makefile.nmake || exit /b 1
+          nmake checks -f Makefile.nmake || exit /b 1
+          nmake perfs -f Makefile.nmake || exit /b 1
+      - name: Run perf apps
+        run: nmake perf -f Makefile.nmake || exit /b 1
+      - name: Run checks
+        run: nmake check -f Makefile.nmake || exit /b 1
+
+  run_tests_linux-riscv64-v:
+    needs: check_format
+    runs-on: run_tests_linux-riscv64-v
+    steps:
+      - uses: actions/[email protected]
+      - name: Build
+        run: |
+          ./autogen.sh
+          ./configure
+          bash -c 'make -j $(nproc)'
+      - name: Run tests
+        run: bash tools/test_checks.sh
+      - name: Run extended tests
+        run: bash tools/test_extended.sh

Makefile.am

@@ -29,10 +29,12 @@ other_tests_x86_64=
 other_tests_x86_32=
 other_tests_aarch64=
 other_tests_ppc64le=
+other_tests_riscv64=
 lsrc_x86_64=
 lsrc_x86_32=
 lsrc_aarch64=
 lsrc_ppc64le=
+lsrc_riscv64=
 lsrc_base_aliases=
 lsrc32=
 unit_tests32=
@@ -83,6 +85,12 @@ libisal_la_SOURCES += ${lsrc_ppc64le}
 other_tests += ${other_tests_ppc64le}
 endif
 
+if CPU_RISCV64
+ARCH=-Driscv64
+libisal_la_SOURCES += ${lsrc_riscv64}
+other_tests += ${other_tests_riscv64}
+endif
+
 if CPU_UNDEFINED
 libisal_la_SOURCES += ${lsrc_base_aliases}
 endif
@@ -131,6 +139,9 @@ endif
 if CPU_AARCH64
   as_filter = $(CC) -D__ASSEMBLY__
 endif
+if CPU_RISCV64
+  as_filter = $(CC) -D__ASSEMBLY__
+endif
 
 CCAS = $(as_filter)
 EXTRA_DIST += tools/yasm-filter.sh tools/nasm-filter.sh
@@ -142,6 +153,9 @@ AM_CCASFLAGS = ${AM_CFLAGS}
 else
 AM_CCASFLAGS = ${yasm_args} ${INCLUDE} ${src_include} ${DEFS} ${D}
 endif
+if CPU_RISCV64
+AM_CCASFLAGS = ${AM_CFLAGS}
+endif
 
 .asm.s:
 	@echo "  MKTMP   " $@;

Makefile.nmake

@@ -264,6 +264,7 @@ ex = \
 	crc_simple_test.exe \
 	crc64_example.exe \
 	igzip_example.exe \
+	igzip_inflate_example.exe \
 	igzip_sync_flush_example.exe \
 	ec_simple_example.exe \
 	ec_piggyback_example.exe
@@ -335,6 +336,8 @@ perfs = \
 
 perfs: lib $(perfs)
 $(perfs): $(@B).obj
+perf: $(perfs)
+	!$?
 
 progs = \
 	igzip.exe
@@ -354,7 +357,7 @@ isa-l.h:
 	@echo.>> $@
 	@echo #define ISAL_MAJOR_VERSION 2 >> $@
 	@echo #define ISAL_MINOR_VERSION 31 >> $@
-	@echo #define ISAL_PATCH_VERSION 0 >> $@
+	@echo #define ISAL_PATCH_VERSION 1 >> $@
 	@echo #define ISAL_MAKE_VERSION(maj, min, patch)  ((maj) * 0x10000 + (min) * 0x100 + (patch))>> $@
 	@echo #define ISAL_VERSION ISAL_MAKE_VERSION(ISAL_MAJOR_VERSION, ISAL_MINOR_VERSION, ISAL_PATCH_VERSION)>> $@
 	@echo.>> $@

Release_notes.txt

@@ -1,5 +1,5 @@
-v2.31 Intel Intelligent Storage Acceleration Library Release Notes
-==================================================================
+v2.31.1 Intel Intelligent Storage Acceleration Library Release Notes
+====================================================================
 
 RELEASE NOTE CONTENTS
 1. KNOWN ISSUES
@@ -9,14 +9,25 @@ RELEASE NOTE CONTENTS
 1. KNOWN ISSUES
 ----------------
 
-* Perf tests do not run in Windows environment.
-
 * 32-bit lib is not supported in Windows.
 
 * 32-bit lib is not validated.
 
 2. FIXED ISSUES
 ---------------
+v2.31.1
+
+* Fixed return type for PowerPC _gf_vect_mul_base function.
+* Fixed isal_deflate_icf_finish_lvl1 dispatcher for aarch64.
+* Fixed CRC compilation on aarch64.
+* Fixed MacOS-14 compilation.
+* Fixed MinGW build.
+* Fixed Clang compilation on igzip library on aarch64.
+* Fixed spelling mistakes and typos.
+* Fixed Windows build on erasure code performance applications.
+* Fixed FreeBSD build warnings.
+* Fixed compilation with YASM.
+
 v2.31
 
 * Fixed various compilation issues/warnings for different platforms.

configure.ac

@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.69)
 AC_INIT([libisal],
-        [2.31.0],
+        [2.31.1],
         [https://github.com/intel/isa-l/issues],
         [isa-l])
 AC_CONFIG_SRCDIR([])
@@ -31,22 +31,15 @@ AS_CASE([$host_cpu],
   [arm64], [CPU="aarch64"],
   [powerpc64le], [CPU="ppc64le"],
   [ppc64le], [CPU="ppc64le"],
+  [riscv64], [CPU="riscv64"],
 )
 AM_CONDITIONAL([CPU_X86_64], [test "$CPU" = "x86_64"])
 AM_CONDITIONAL([CPU_X86_32], [test "$CPU" = "x86_32"])
 AM_CONDITIONAL([CPU_AARCH64], [test "$CPU" = "aarch64"])
 AM_CONDITIONAL([CPU_PPC64LE], [test "$CPU" = "ppc64le"])
+AM_CONDITIONAL([CPU_RISCV64], [test "$CPU" = "riscv64"])
 AM_CONDITIONAL([CPU_UNDEFINED], [test "x$CPU" = "x"])
-
-if test "$CPU" = "x86_64"; then
-   is_x86=yes
-else
-   if test "$CPU" = "x86_32"; then
-      is_x86=yes
-   else
-      is_x86=no
-   fi
-fi
+AM_CONDITIONAL([HAVE_RVV], [false])
 
 # Check for programs
 AC_PROG_CC_STDC
@@ -57,6 +50,40 @@ AC_PREFIX_DEFAULT([/usr])
 AC_PROG_SED
 AC_PROG_MKDIR_P
 
+case "${CPU}" in
+
+	x86_64)
+
+		is_x86=yes
+		;;
+
+	x86_32)
+
+		is_x86=yes
+		;;
+
+	riscv64)
+
+		AC_MSG_CHECKING([checking RVV support])
+		AC_COMPILE_IFELSE(
+			[AC_LANG_PROGRAM([], [
+				__asm__ volatile(
+					".option arch, +v\n"
+					"vsetivli zero, 0, e8, m1, ta, ma\n"
+				);
+			])],
+			[AC_DEFINE([HAVE_RVV], [1], [Enable RVV instructions])
+			AM_CONDITIONAL([HAVE_RVV], [true]) rvv=yes],
+			[AM_CONDITIONAL([HAVE_RVV], [false]) rvv=no]
+		)
+		AC_MSG_RESULT([$rvv])
+		;;
+
+	*)
+		is_x86=no
+
+esac
+
 # Options
 AC_ARG_ENABLE([debug],
         AS_HELP_STRING([--enable-debug], [enable debug messages @<:@default=disabled@:>@]),

crc/Makefile.am

@@ -36,6 +36,7 @@ lsrc  += \
 lsrc_base_aliases += crc/crc_base_aliases.c
 lsrc_x86_32       += crc/crc_base_aliases.c
 lsrc_ppc64le      += crc/crc_base_aliases.c
+lsrc_riscv64      += crc/crc_base_aliases.c
 
 lsrc_x86_64 += \
 	crc/crc16_t10dif_01.asm \