Remove YASM support

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

Author: pablodelara

Makefile.am

@@ -129,10 +129,7 @@ test: $(addsuffix .run,$(unit_tests))
 	$<
 	@echo Completed run: $<
 
-# Support for yasm/nasm/gas
-if USE_YASM
-  as_filter = ${srcdir}/tools/yasm-filter.sh
-endif
+# Support for nasm/gas
 if USE_NASM
   as_filter = ${srcdir}/tools/nasm-filter.sh
 endif
@@ -144,14 +141,14 @@ if CPU_RISCV64
 endif
 
 CCAS = $(as_filter)
-EXTRA_DIST += tools/yasm-filter.sh tools/nasm-filter.sh
-EXTRA_DIST += tools/yasm-cet-filter.sh tools/nasm-cet-filter.sh
+EXTRA_DIST += tools/nasm-filter.sh
+EXTRA_DIST += tools/nasm-cet-filter.sh
 
 AM_CFLAGS = ${my_CFLAGS} ${INCLUDE} $(src_include) ${ARCH} ${D}
 if CPU_AARCH64
 AM_CCASFLAGS = ${AM_CFLAGS}
 else
-AM_CCASFLAGS = ${yasm_args} ${INCLUDE} ${src_include} ${DEFS} ${D}
+AM_CCASFLAGS = ${asm_args} ${INCLUDE} ${src_include} ${DEFS} ${D}
 endif
 if CPU_RISCV64
 AM_CCASFLAGS = ${AM_CFLAGS}

Makefile.nmake

@@ -193,7 +193,7 @@ 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/yasm before decreasing feature_level
+# 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

README.md

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

configure.ac

@@ -92,7 +92,7 @@ AS_IF([test "x$enable_debug" = "xyes"], [
         AC_DEFINE(ENABLE_DEBUG, [1], [Debug messages.])
 ])
 
-# If this build is for x86, look for yasm and nasm
+# If this build is for x86, look for nasm
 if test x"$is_x86" = x"yes"; then
   AC_MSG_CHECKING([whether Intel CET is enabled])
   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
@@ -122,48 +122,8 @@ int main(int argc, char **argv)
 		LDFLAGS=""]
 )
 
-  # Pick an assembler yasm or nasm
+  # Pick NASM assembler
   if test x"$AS" = x""; then
-    # Check for yasm and yasm features
-    yasm_feature_level=0
-    AC_CHECK_PROG(HAVE_YASM, yasm, yes, no)
-    if test "$HAVE_YASM" = "yes"; then
-       yasm_feature_level=1
-    else
-       AC_MSG_RESULT([no yasm])
-    fi
-    if test x"$yasm_feature_level" = x"1"; then
-       AC_MSG_CHECKING([for modern yasm])
-       AC_LANG_CONFTEST([AC_LANG_SOURCE([[vmovdqa %xmm0, %xmm1;]])])
-       if yasm -f elf64 -p gas conftest.c ; then
-         AC_MSG_RESULT([yes])
-         yasm_feature_level=4
-       else
-         AC_MSG_RESULT([no])
-       fi
-    fi
-    if test x"$yasm_feature_level" = x"4"; then
-       AC_MSG_CHECKING([for optional yasm AVX512 support])
-       AC_LANG_CONFTEST([AC_LANG_SOURCE([[vpshufb %zmm0, %zmm1, %zmm2;]])])
-       if yasm -f elf64 -p gas conftest.c 2> /dev/null; then
-         AC_MSG_RESULT([yes])
-         yasm_feature_level=6
-       else
-         AC_MSG_RESULT([no])
-       fi
-    fi
-    if test x"$yasm_feature_level" = x"6"; then
-      AC_MSG_CHECKING([for additional yasm AVX512 support])
-      AC_LANG_CONFTEST([AC_LANG_SOURCE([[vpcompressb zmm0, k1, zmm1;]])])
-      sed -i -e '/vpcompressb/!d' conftest.c
-      if yasm -f elf64  conftest.c 2> /dev/null; then
-        AC_MSG_RESULT([yes])
-        yasm_feature_level=10
-      else
-        AC_MSG_RESULT([no])
-      fi
-    fi
-
     # Check for nasm and nasm features
     nasm_feature_level=0
     AC_CHECK_PROG(HAVE_NASM, nasm, yes, no)
@@ -207,13 +167,8 @@ int main(int argc, char **argv)
       fi
     fi
 
-    if test $nasm_feature_level -ge $yasm_feature_level ; then
-      AS=nasm
-      as_feature_level=$nasm_feature_level
-    else
-      AS=yasm
-      as_feature_level=$yasm_feature_level
-    fi
+    AS=nasm
+    as_feature_level=$nasm_feature_level
 
   else
     # Check for $AS supported features
@@ -261,26 +216,17 @@ int main(int argc, char **argv)
   fi
 
   if test $as_feature_level -lt 2 ; then
-    AC_MSG_ERROR([No modern nasm or yasm found as required. Nasm should be v2.11.01 or later (v2.13 for AVX512) and yasm should be 1.2.0 or later.])
+    AC_MSG_ERROR([No modern nasm found as required. Nasm should be v2.11.01 or later (v2.13 for AVX512).])
   fi
 
   case $host_os in
-       *linux*)  arch=linux   yasm_args="-f elf64";;
-       *darwin*) arch=darwin  yasm_args="-f macho64 --prefix=_ ";;
-       *netbsd*) arch=netbsd  yasm_args="-f elf64";;
-       *mingw*)  arch=mingw   yasm_args="-f win64";;
-       *)        arch=unknown yasm_args="-f elf64";;
+       *linux*)  arch=linux   asm_args="-f elf64";;
+       *darwin*) arch=darwin  asm_args="-f macho64 --prefix=_ ";;
+       *netbsd*) arch=netbsd  asm_args="-f elf64";;
+       *mingw*)  arch=mingw   asm_args="-f win64";;
+       *)        arch=unknown asm_args="-f elf64";;
   esac
 
-  # Fix for nasm missing windows features
-  if test x"$arch" = x"mingw"; then
-    AS=yasm
-    as_feature_level=$yasm_feature_level
-    if test $as_feature_level -lt 2 ; then
-      AC_MSG_ERROR([Mingw build requires Yasm 1.2.0 or later.])
-    fi
-  fi
-
   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.])
@@ -289,15 +235,13 @@ int main(int argc, char **argv)
     AC_MSG_RESULT([Assembler does not understand AVX512 opcodes.  Consider upgrading for best performance.])
   fi
 
-  AM_CONDITIONAL(USE_YASM, test x"$AS" = x"yasm")
   AM_CONDITIONAL(USE_NASM, test x"$AS" = x"nasm")
   AM_CONDITIONAL(WITH_AVX512, test x"$have_as_knows_avx512" = x"yes")
-  AC_SUBST([yasm_args])
+  AC_SUBST([asm_args])
   AM_CONDITIONAL(DARWIN, test x"$arch" = x"darwin")
-  AC_MSG_RESULT([Using $AS args target "$arch" "$yasm_args"])
+  AC_MSG_RESULT([Using $AS args target "$arch" "$asm_args"])
 else
   # Disable below conditionals if not x86
-  AM_CONDITIONAL(USE_YASM, test "x" = "y")
   AM_CONDITIONAL(USE_NASM, test "x" = "y")
   AM_CONDITIONAL(WITH_AVX512, test "x" = "y")
   AM_CONDITIONAL(DARWIN, test "x" = "y")

doc/build.md

@@ -5,8 +5,8 @@
 NASM: For x86-64 builds it is highly recommended to get an up-to-date version of
 [nasm] that can understand the latest instruction sets. Building with an older
 assembler version is often possible but the library may lack some function
-versions for the best performance. For example, as a minimum, nasm v2.11.01 or
-yasm 1.2.0 can be used to build a limited functionality library but it will not
+versions for the best performance. For example, as a minimum, nasm v2.11.01
+can be used to build a limited functionality library but it will not
 include any function versions with AVX2, AVX512, or optimizations for many
 processors before the assembler's build. The configure or make tools can run
 tests to check the assembler's knowledge of new instructions and change build

make.inc

@@ -53,7 +53,6 @@ AS  = nasm
 AWK = awk
 
 DEBUG      = -g
-DEBUG_yasm = -g dwarf2
 DEBUG_nasm = -g
 
 # Default arch= build options
@@ -239,7 +238,7 @@ $(addsuffix .run,$(all_tests)): %.run : %
 # Other build rules
 msg = $(if $(DEBUG),DEBUG) $(patsubst 32,32-bit,$(host_cpu)) $D
 
-# yasm/nasm assembly files
+# nasm assembly files
 $(O)/%.o: %.asm
 	@echo "  ---> Building $< $(msg)"
 	@$(AS) $(ASFLAGS) -o $@ $<

tools/gen_nmake.mk

@@ -19,7 +19,7 @@ Makefile.nmake tst.nmake: FORCE
 	@echo ''			>> $@
 	@echo ''			>> $@
 	@echo 'INCLUDES   = $(INCLUDE)'	>> $@
-	@echo '# Modern asm feature level, consider upgrading nasm/yasm before decreasing feature_level'	>> $@
+	@echo '# Modern asm feature level, consider upgrading nasm before decreasing feature_level'	>> $@
 	@echo 'FEAT_FLAGS = -DHAVE_AS_KNOWS_AVX512 -DAS_FEATURE_LEVEL=10'	>> $@
 	@echo 'CFLAGS_REL = -O2 -DNDEBUG /Z7 /Gy'		>> $@
 	@echo 'CFLAGS_DBG = -Od -DDEBUG /Z7'			>> $@