Bump minimum NASM version to 2.14.01

NASM version 2.14.01 supports all x86 ISA in this library.
Since this version has been out since 2018, it is safe to
only permit the library to be compiled with this minimum version,
as announced in issue #297.

Signed-off-by: Pablo de Lara <[email protected]>

Author: pablodelara

Makefile.nmake

@@ -193,13 +193,11 @@ objs = \
 	bin\mem_multibinary.obj
 
 INCLUDES   = -I./ -Ierasure_code/ -Iraid/ -Icrc/ -Iigzip/ -Iprograms/ -Imem/ -Iinclude/ -Itests/fuzz/ -Iexamples/ec/
-# Modern asm feature level, consider upgrading nasm before decreasing feature_level
-FEAT_FLAGS = -DHAVE_AS_KNOWS_AVX512 -DAS_FEATURE_LEVEL=10
 CFLAGS_REL = -O2 -DNDEBUG /Z7 /Gy
 CFLAGS_DBG = -Od -DDEBUG /Z7
 LINKFLAGS  = -nologo -incremental:no -debug
-CFLAGS     = $(CFLAGS_REL) -nologo -D_USE_MATH_DEFINES $(FEAT_FLAGS) $(INCLUDES) $(D)
-AFLAGS     = -f win64 $(FEAT_FLAGS) $(INCLUDES) $(D)
+CFLAGS     = $(CFLAGS_REL) -nologo -D_USE_MATH_DEFINES $(INCLUDES) $(D)
+AFLAGS     = -f win64 $(INCLUDES) $(D)
 CC         = cl
 # or CC    = icl -Qstd=c99
 AS         = nasm

README.md

@@ -39,8 +39,7 @@ Building ISA-L
 * Optional: Manual generation requires help2man package.
 
 x86_64:
-* Assembler: nasm. Version 2.15 or later suggested (other versions of nasm
-  may build but with limited function [support](doc/build.md)).
+* Assembler: nasm. 2.14.01 minimum version required [support](doc/build.md)).
 * Compiler: gcc, clang, icc or VC compiler.
 
 aarch64:

Release_notes.txt

@@ -141,6 +141,9 @@ v2.10
 
 v2.32
 
+* General:
+  - Minimum NASM version required for x86 architecture is 2.14.01 now.
+
 * RISCV support.
   - Initial riscv64 support with runtime and build-time CPU feature detection.
 

configure.ac

@@ -135,31 +135,9 @@ int main(int argc, char **argv)
 
     if test x"$nasm_feature_level" = x"1"; then
       AC_MSG_CHECKING([for modern nasm])
-      AC_LANG_CONFTEST([AC_LANG_SOURCE([[pblendvb xmm2, xmm1;]])])
-      sed -i -e '/pblendvb/!d' conftest.c
-      if nasm -f elf64 conftest.c 2> /dev/null; then
-        AC_MSG_RESULT([yes])
-        nasm_feature_level=4
-      else
-        AC_MSG_RESULT([no])
-      fi
-    fi
-    if test x"$nasm_feature_level" = x"4"; then
-      AC_MSG_CHECKING([for optional nasm AVX512 support])
-      AC_LANG_CONFTEST([AC_LANG_SOURCE([[vinserti32x8 zmm0, ymm1, 1;]])])
-      sed -i -e '/vinsert/!d' conftest.c
-      if nasm -f elf64  conftest.c 2> /dev/null; then
-        AC_MSG_RESULT([yes])
-        nasm_feature_level=6
-      else
-        AC_MSG_RESULT([no])
-      fi
-    fi
-    if test x"$nasm_feature_level" = x"6"; then
-      AC_MSG_CHECKING([for additional nasm AVX512 support])
       AC_LANG_CONFTEST([AC_LANG_SOURCE([[vpcompressb zmm0 {k1}, zmm1;]])])
       sed -i -e '/vpcompressb/!d' conftest.c
-      if nasm -f elf64  conftest.c 2> /dev/null; then
+      if nasm -f elf64 conftest.c 2> /dev/null; then
         AC_MSG_RESULT([yes])
         nasm_feature_level=10
       else
@@ -181,29 +159,6 @@ int main(int argc, char **argv)
     fi
 
     if test x"$as_feature_level" = x"1"; then
-      AC_MSG_CHECKING([for modern $AS])
-      AC_LANG_CONFTEST([AC_LANG_SOURCE([[pblendvb xmm2, xmm1;]])])
-      sed -i -e '/pblendvb/!d' conftest.c
-      if $AS -f elf64 conftest.c 2> /dev/null; then
-        AC_MSG_RESULT([yes])
-        as_feature_level=4
-      else
-        AC_MSG_RESULT([no])
-      fi
-    fi
-    if test x"$as_feature_level" = x"4"; then
-      AC_MSG_CHECKING([for optional as AVX512 support])
-      AC_LANG_CONFTEST([AC_LANG_SOURCE([[vinserti32x8 zmm0, ymm1, 1;]])])
-      sed -i -e '/vinsert/!d' conftest.c
-      if $AS -f elf64  conftest.c 2> /dev/null; then
-        AC_MSG_RESULT([yes])
-        as_feature_level=6
-      else
-        AC_MSG_RESULT([no])
-      fi
-    fi
-    if test x"$as_feature_level" = x"6"; then
-      AC_MSG_CHECKING([for additional as AVX512 support])
       AC_LANG_CONFTEST([AC_LANG_SOURCE([[vpcompressb zmm0, k1, zmm1;]])])
       sed -i -e '/vpcompressb/!d' conftest.c
       if $AS -f elf64  conftest.c 2> /dev/null; then
@@ -215,8 +170,8 @@ int main(int argc, char **argv)
     fi
   fi
 
-  if test $as_feature_level -lt 2 ; then
-    AC_MSG_ERROR([No modern nasm found as required. Nasm should be v2.11.01 or later (v2.13 for AVX512).])
+  if test $as_feature_level -lt 10 ; then
+    AC_MSG_ERROR([No modern nasm found as required. Nasm should be v2.14.01 or later.])
   fi
 
   case $host_os in
@@ -227,23 +182,13 @@ int main(int argc, char **argv)
        *)        arch=unknown asm_args="-f elf64";;
   esac
 
-  AC_DEFINE_UNQUOTED(AS_FEATURE_LEVEL, [$as_feature_level], [Assembler feature level.])
-  if test $as_feature_level -ge 6 ; then
-    AC_DEFINE(HAVE_AS_KNOWS_AVX512, [1], [Assembler can do AVX512.])
-    have_as_knows_avx512=yes
-  else
-    AC_MSG_RESULT([Assembler does not understand AVX512 opcodes.  Consider upgrading for best performance.])
-  fi
-
   AM_CONDITIONAL(USE_NASM, test x"$AS" = x"nasm")
-  AM_CONDITIONAL(WITH_AVX512, test x"$have_as_knows_avx512" = x"yes")
   AC_SUBST([asm_args])
   AM_CONDITIONAL(DARWIN, test x"$arch" = x"darwin")
   AC_MSG_RESULT([Using $AS args target "$arch" "$asm_args"])
 else
   # Disable below conditionals if not x86
   AM_CONDITIONAL(USE_NASM, test "x" = "y")
-  AM_CONDITIONAL(WITH_AVX512, test "x" = "y")
   AM_CONDITIONAL(DARWIN, test "x" = "y")
 fi
 

crc/crc16_t10dif_by16_10.asm

@@ -51,8 +51,6 @@
 %define FUNCTION_NAME crc16_t10dif_by16_10
 %endif
 
-%if (AS_FEATURE_LEVEL) >= 10
-
 [bits 64]
 default rel
 
@@ -576,10 +574,3 @@ dq 0x8786858483828100, 0x8f8e8d8c8b8a8988
 dq 0x0706050403020100, 0x000e0d0c0b0a0908
 dq 0x8080808080808080, 0x0f0e0d0c0b0a0908
 dq 0x8080808080808080, 0x8080808080808080
-
-%else  ; Assembler doesn't understand these opcodes. Add empty symbol for windows.
-%ifidn __OUTPUT_FORMAT__, win64
-global no_ %+ FUNCTION_NAME
-no_ %+ FUNCTION_NAME %+ :
-%endif
-%endif ; (AS_FEATURE_LEVEL) >= 10

crc/crc32_gzip_refl_by16_10.asm

@@ -59,8 +59,6 @@
 %define FUNCTION_NAME crc32_gzip_refl_by16_10
 %endif
 
-%if (AS_FEATURE_LEVEL) >= 10
-
 %define	fetch_dist	1024
 
 [bits 64]
@@ -534,10 +532,3 @@ pshufb_shift_table:
 mask:  dq     0xFFFFFFFFFFFFFFFF, 0x0000000000000000
 mask2: dq     0xFFFFFFFF00000000, 0xFFFFFFFFFFFFFFFF
 mask3: dq     0x8080808080808080, 0x8080808080808080
-
-%else  ; Assembler doesn't understand these opcodes. Add empty symbol for windows.
-%ifidn __OUTPUT_FORMAT__, win64
-global no_ %+ FUNCTION_NAME
-no_ %+ FUNCTION_NAME %+ :
-%endif
-%endif ; (AS_FEATURE_LEVEL) >= 10

crc/crc32_ieee_by16_10.asm

@@ -51,8 +51,6 @@
 %define FUNCTION_NAME crc32_ieee_by16_10
 %endif
 
-%if (AS_FEATURE_LEVEL) >= 10
-
 [bits 64]
 default rel
 
@@ -557,10 +555,3 @@ dq 0x8786858483828100, 0x8f8e8d8c8b8a8988
 dq 0x0706050403020100, 0x000e0d0c0b0a0908
 dq 0x8080808080808080, 0x0f0e0d0c0b0a0908
 dq 0x8080808080808080, 0x8080808080808080
-
-%else  ; Assembler doesn't understand these opcodes. Add empty symbol for windows.
-%ifidn __OUTPUT_FORMAT__, win64
-global no_ %+ FUNCTION_NAME
-no_ %+ FUNCTION_NAME %+ :
-%endif
-%endif ; (AS_FEATURE_LEVEL) >= 10

crc/crc32_iscsi_by16_10.asm

@@ -51,8 +51,6 @@
 %define FUNCTION_NAME crc32_iscsi_by16_10
 %endif
 
-%if (AS_FEATURE_LEVEL) >= 10
-
 [bits 64]
 default rel
 
@@ -504,10 +502,3 @@ dq 0x0706050403020100, 0x000e0d0c0b0a0908
 mask:  dq     0xFFFFFFFFFFFFFFFF, 0x0000000000000000
 mask2: dq     0xFFFFFFFF00000000, 0xFFFFFFFFFFFFFFFF
 mask3: dq     0x8080808080808080, 0x8080808080808080
-
-%else  ; Assembler doesn't understand these opcodes. Add empty symbol for windows.
-%ifidn __OUTPUT_FORMAT__, win64
-global no_ %+ FUNCTION_NAME
-no_ %+ FUNCTION_NAME %+ :
-%endif
-%endif ; (AS_FEATURE_LEVEL) >= 10

crc/crc64_iso_norm_by16_10.asm

@@ -41,8 +41,6 @@
 %define FUNCTION_NAME crc64_iso_norm_by16_10
 %endif
 
-%if (AS_FEATURE_LEVEL) >= 10
-
 %define	fetch_dist	1024
 
 [bits 64]
@@ -463,11 +461,3 @@ dw      0x0000, 0x0001, 0x0003, 0x0007,
 dw      0x000f, 0x001f, 0x003f, 0x007f,
 dw      0x00ff, 0x01ff, 0x03ff, 0x07ff,
 dw      0x0fff, 0x1fff, 0x3fff, 0x7fff,
-
-
-%else  ; Assembler doesn't understand these opcodes. Add empty symbol for windows.
-%ifidn __OUTPUT_FORMAT__, win64
-global no_ %+ FUNCTION_NAME
-no_ %+ FUNCTION_NAME %+ :
-%endif
-%endif ; (AS_FEATURE_LEVEL) >= 10

crc/crc64_iso_refl_by16_10.asm

@@ -41,8 +41,6 @@
 %define FUNCTION_NAME crc64_iso_refl_by16_10
 %endif
 
-%if (AS_FEATURE_LEVEL) >= 10
-
 %define	fetch_dist	1024
 
 [bits 64]
@@ -474,10 +472,3 @@ dq 0x0706050403020100, 0x000e0d0c0b0a0908
 mask:  dq     0xFFFFFFFFFFFFFFFF, 0x0000000000000000
 mask2: dq     0xFFFFFFFF00000000, 0xFFFFFFFFFFFFFFFF
 mask3: dq     0x8080808080808080, 0x8080808080808080
-
-%else  ; Assembler doesn't understand these opcodes. Add empty symbol for windows.
-%ifidn __OUTPUT_FORMAT__, win64
-global no_ %+ FUNCTION_NAME
-no_ %+ FUNCTION_NAME %+ :
-%endif
-%endif ; (AS_FEATURE_LEVEL) >= 10