Convert files to build with nasm or yasm

Signed-off-by: Greg Tucker <greg.b.tucker@intel.com>
2015-11-18 15:52:20 -07:00 · 2015-11-18 15:52:20 -07:00 · bc4dfc9bbc
commit bc4dfc9bbc
parent 00c1efc109
38 changed files with 133 additions and 74 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -5,7 +5,7 @@ AM_MAKEFLAGS = --no-print-directory
 noinst_HEADERS =
 pkginclude_HEADERS = include/test.h
 noinst_LTLIBRARIES =
-INCLUDE = -I $(srcdir)/include
+INCLUDE = -I $(srcdir)/include/
 AM_CFLAGS = ${my_CFLAGS} ${INCLUDE} ${D}

 lsrc=
@ -23,6 +23,7 @@ unit_tests32=
 perf_tests32=

 # Include units
+
 include erasure_code/Makefile.am

 # LIB version info not necessarily the same as package version
@ -65,10 +66,18 @@ test: $(addsuffix .run,$(unit_tests))
 	$<
 	@echo Completed run: $<

-# Support for yasm
-CCAS = ${srcdir}/tools/yasm-filter.sh
-EXTRA_DIST += tools/yasm-filter.sh
-AM_CCASFLAGS = ${yasm_args} ${INCLUDE}
+# Support for yasm/nasm
+if USE_YASM
+  as_filter = ${srcdir}/tools/yasm-filter.sh
+endif
+if USE_NASM
+  as_filter = ${srcdir}/tools/nasm-filter.sh
+  as_include = $(addprefix -I ${srcdir}/,$(sort $(dir $(lsrc))))
+endif
+
+CCAS = $(as_filter)
+EXTRA_DIST += tools/yasm-filter.sh tools/nasm-filter.sh
+AM_CCASFLAGS = ${yasm_args} ${INCLUDE} ${as_include} ${DEFS} ${D}

 .asm.s:
 	@echo "  MKTMP   " $@;
@ -89,7 +98,7 @@ isa-l.h:
 	@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 ''			>> $@
-	@for unit in ${extern_hdrs}; do echo "#include <isa-l/$$unit>" | sed -e 's;include/;;' >> $@; done
+	@for unit in $(sort $(extern_hdrs)); do echo "#include <isa-l/$$unit>" | sed -e 's;include/;;' >> $@; done
 	@echo '#endif //_ISAL_H_'	>> $@


--- a/2
+++ b/2
@ -5,7 +5,7 @@ Intel(R) Intelligent Storage Acceleration Library
 Build Prerequisites
 ===================

-ISA-L requires yasm version 1.2 or later.
+ISA-L requires yasm version 1.2.0 or later or nasm v2.11.01 or later.

 Building ISA-L
 ==============
--- a/erasure_code/gf_2vect_dot_prod_avx.asm
+++ b/erasure_code/gf_2vect_dot_prod_avx.asm
@ -255,13 +255,13 @@ func(gf_2vect_dot_prod_avx)
 	mov	dest1, [dest1]
 	SSTR	dest1_m, dest1

-.loop16
+.loop16:
 	vpxor	xp1, xp1
 	vpxor	xp2, xp2
 	mov	tmp, mul_array
 	xor	vec_i, vec_i

-.next_vect
+.next_vect:
 	SLDR	src, src_m
 	mov	ptr, [src+vec_i]

@ -331,7 +331,7 @@ endproc_frame
 section .data

 align 16
-mask0f: ddq 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f
+mask0f: dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f

 ;;;       func                  core, ver, snum
 slversion gf_2vect_dot_prod_avx, 02,  05,  0191
--- a/erasure_code/gf_2vect_dot_prod_avx2.asm
+++ b/erasure_code/gf_2vect_dot_prod_avx2.asm
@ -268,13 +268,13 @@ func(gf_2vect_dot_prod_avx2)
 	mov	dest1, [dest1]
 	SSTR	dest1_m, dest1

-.loop32
+.loop32:
 	vpxor	xp1, xp1
 	vpxor	xp2, xp2
 	mov	tmp, mul_array
 	xor	vec_i, vec_i

-.next_vect
+.next_vect:
 	SLDR	src, src_m
 	mov	ptr, [src+vec_i]

--- a/erasure_code/gf_2vect_dot_prod_sse.asm
+++ b/erasure_code/gf_2vect_dot_prod_sse.asm
@ -255,13 +255,13 @@ func(gf_2vect_dot_prod_sse)
 	mov	dest1, [dest1]
 	SSTR 	dest1_m, dest1

-.loop16
+.loop16:
 	pxor	xp1, xp1
 	pxor	xp2, xp2
 	mov	tmp, mul_array
 	xor	vec_i, vec_i

-.next_vect
+.next_vect:
 	SLDR 	src, src_m
 	mov	ptr, [src+vec_i]

@ -333,7 +333,7 @@ endproc_frame
 section .data

 align 16
-mask0f: ddq 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f
+mask0f: dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f

 ;;;       func                  core, ver, snum
 slversion gf_2vect_dot_prod_sse, 00,  04,  0062
--- a/erasure_code/gf_2vect_mad_avx.asm
+++ b/erasure_code/gf_2vect_mad_avx.asm
@ -178,7 +178,7 @@ func(gf_2vect_mad_avx)
 	XLDR	xtmpd1, [dest1+len]	;backup the last 16 bytes in dest
 	XLDR	xtmpd2, [dest2+len]	;backup the last 16 bytes in dest

-.loop16
+.loop16:
 	XLDR	xd1, [dest1+pos]		;Get next dest vector
 	XLDR	xd2, [dest2+pos]		;Get next dest vector
 .loop16_overlap:
@ -230,7 +230,7 @@ endproc_frame
 section .data

 align 16
-mask0f: ddq 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f
+mask0f: dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f

 ;;;       func             core, ver, snum
 slversion gf_2vect_mad_avx, 02,  01,  0204
--- a/erasure_code/gf_2vect_mad_avx2.asm
+++ b/erasure_code/gf_2vect_mad_avx2.asm
@ -192,7 +192,7 @@ func(gf_2vect_mad_avx2)
 	XLDR	xtmpd1, [dest1+len]	;backup the last 16 bytes in dest
 	XLDR	xtmpd2, [dest2+len]	;backup the last 16 bytes in dest

-.loop32
+.loop32:
 	XLDR	xd1, [dest1+pos]		;Get next dest vector
 	XLDR	xd2, [dest2+pos]		;Get next dest vector
 .loop32_overlap:
--- a/erasure_code/gf_2vect_mad_sse.asm
+++ b/erasure_code/gf_2vect_mad_sse.asm
@ -233,7 +233,7 @@ section .data
 align 16

 mask0f:
-	ddq 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f
+	dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f

 ;;;       func             core, ver, snum
 slversion gf_2vect_mad_sse, 00,  01,  0203
--- a/erasure_code/gf_3vect_dot_prod_avx.asm
+++ b/erasure_code/gf_3vect_dot_prod_avx.asm
@ -371,7 +371,7 @@ endproc_frame
 section .data

 align 16
-mask0f: ddq 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f
+mask0f: dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f

 ;;;       func                  core, ver, snum
 slversion gf_3vect_dot_prod_avx, 02,  05,  0192
--- a/erasure_code/gf_3vect_dot_prod_sse.asm
+++ b/erasure_code/gf_3vect_dot_prod_sse.asm
@ -372,7 +372,7 @@ endproc_frame
 section .data

 align 16
-mask0f: ddq 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f
+mask0f: dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f

 ;;;       func                  core, ver, snum
 slversion gf_3vect_dot_prod_sse, 00,  06,  0063
--- a/erasure_code/gf_3vect_mad_avx.asm
+++ b/erasure_code/gf_3vect_mad_avx.asm
@ -280,9 +280,9 @@ endproc_frame
 section .data

 align 16
-mask0f: ddq 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f
+mask0f: dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
 constip16:
-	ddq 0xf0f1f2f3f4f5f6f7f8f9fafbfcfdfeff
+	dq 0xf8f9fafbfcfdfeff, 0xf0f1f2f3f4f5f6f7

 ;;;       func             core, ver, snum
 slversion gf_3vect_mad_avx, 02,  01,  0207
--- a/erasure_code/gf_3vect_mad_avx2.asm
+++ b/erasure_code/gf_3vect_mad_avx2.asm
@ -310,8 +310,8 @@ section .data

 align 32
 constip32:
-	ddq 0xf0f1f2f3f4f5f6f7f8f9fafbfcfdfeff
-	ddq 0xe0e1e2e3e4e5e6e7e8e9eaebecedeeef
+	dq 0xf8f9fafbfcfdfeff, 0xf0f1f2f3f4f5f6f7
+	dq 0xe8e9eaebecedeeef, 0xe0e1e2e3e4e5e6e7

 ;;;       func              core, ver, snum
 slversion gf_3vect_mad_avx2, 04,  01,  0208
--- a/erasure_code/gf_3vect_mad_sse.asm
+++ b/erasure_code/gf_3vect_mad_sse.asm
@ -290,9 +290,9 @@ section .data
 align 16

 mask0f:
-	ddq 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f
+	dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
 constip16:
-	ddq 0xf0f1f2f3f4f5f6f7f8f9fafbfcfdfeff
+	dq 0xf8f9fafbfcfdfeff, 0xf0f1f2f3f4f5f6f7

 ;;;       func             core, ver, snum
 slversion gf_3vect_mad_sse, 00,  01,  0206
--- a/erasure_code/gf_4vect_dot_prod_avx.asm
+++ b/erasure_code/gf_4vect_dot_prod_avx.asm
@ -435,7 +435,7 @@ endproc_frame
 section .data

 align 16
-mask0f:	ddq 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f
+mask0f:	dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f

 ;;;       func                  core, ver, snum
 slversion gf_4vect_dot_prod_avx, 02,  05,  0193
--- a/erasure_code/gf_4vect_dot_prod_sse.asm
+++ b/erasure_code/gf_4vect_dot_prod_sse.asm
@ -437,7 +437,7 @@ endproc_frame
 section .data

 align 16
-mask0f:	ddq 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f
+mask0f:	dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f

 ;;;       func                  core, ver, snum
 slversion gf_4vect_dot_prod_sse, 00,  06,  0064
--- a/erasure_code/gf_4vect_mad_avx.asm
+++ b/erasure_code/gf_4vect_mad_avx.asm
@ -328,9 +328,9 @@ endproc_frame
 section .data

 align 16
-mask0f:	ddq 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f
+mask0f:	dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
 constip16:
-	ddq 0xf0f1f2f3f4f5f6f7f8f9fafbfcfdfeff
+	dq 0xf8f9fafbfcfdfeff, 0xf0f1f2f3f4f5f6f7

 ;;;       func             core, ver, snum
 slversion gf_4vect_mad_avx, 02,  01,  020a
--- a/erasure_code/gf_4vect_mad_avx2.asm
+++ b/erasure_code/gf_4vect_mad_avx2.asm
@ -335,8 +335,8 @@ endproc_frame
 section .data
 align 32
 constip32:
-	ddq 0xf0f1f2f3f4f5f6f7f8f9fafbfcfdfeff
-	ddq 0xe0e1e2e3e4e5e6e7e8e9eaebecedeeef
+	dq 0xf8f9fafbfcfdfeff, 0xf0f1f2f3f4f5f6f7
+	dq 0xe8e9eaebecedeeef, 0xe0e1e2e3e4e5e6e7

 ;;;       func              core, ver, snum
 slversion gf_4vect_mad_avx2, 04,  01,  020b
--- a/erasure_code/gf_4vect_mad_sse.asm
+++ b/erasure_code/gf_4vect_mad_sse.asm
@ -334,9 +334,9 @@ section .data
 align 16

 mask0f:
-	ddq 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f
+	dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
 constip16:
-	ddq 0xf0f1f2f3f4f5f6f7f8f9fafbfcfdfeff
+	dq 0xf8f9fafbfcfdfeff, 0xf0f1f2f3f4f5f6f7

 ;;;       func             core, ver, snum
 slversion gf_4vect_mad_sse, 00,  01,  0209
--- a/erasure_code/gf_5vect_dot_prod_avx.asm
+++ b/erasure_code/gf_5vect_dot_prod_avx.asm
@ -297,7 +297,7 @@ endproc_frame
 section .data

 align 16
-mask0f:	ddq 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f
+mask0f:	dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f

 ;;;       func                  core, ver, snum
 slversion gf_5vect_dot_prod_avx, 02,  04,  0194
--- a/erasure_code/gf_5vect_dot_prod_sse.asm
+++ b/erasure_code/gf_5vect_dot_prod_sse.asm
@ -298,7 +298,7 @@ endproc_frame
 section .data

 align 16
-mask0f:	ddq 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f
+mask0f:	dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f

 ;;;       func                  core, ver, snum
 slversion gf_5vect_dot_prod_sse, 00,  05,  0065
--- a/erasure_code/gf_5vect_mad_avx.asm
+++ b/erasure_code/gf_5vect_mad_avx.asm
@ -357,9 +357,9 @@ endproc_frame
 section .data

 align 16
-mask0f:	ddq 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f
+mask0f:	dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
 constip16:
-	ddq 0xf0f1f2f3f4f5f6f7f8f9fafbfcfdfeff
+	dq 0xf8f9fafbfcfdfeff, 0xf0f1f2f3f4f5f6f7

 ;;;       func             core, ver, snum
 slversion gf_5vect_mad_avx, 02,  01,  020d
--- a/erasure_code/gf_5vect_mad_avx2.asm
+++ b/erasure_code/gf_5vect_mad_avx2.asm
@ -356,8 +356,8 @@ endproc_frame
 section .data
 align 32
 constip32:
-	ddq 0xf0f1f2f3f4f5f6f7f8f9fafbfcfdfeff
-	ddq 0xe0e1e2e3e4e5e6e7e8e9eaebecedeeef
+	dq 0xf8f9fafbfcfdfeff, 0xf0f1f2f3f4f5f6f7
+	dq 0xe8e9eaebecedeeef, 0xe0e1e2e3e4e5e6e7

 ;;;       func             core, ver, snum
 slversion gf_5vect_mad_avx2, 04,  01,  020e
--- a/erasure_code/gf_5vect_mad_sse.asm
+++ b/erasure_code/gf_5vect_mad_sse.asm
@ -365,9 +365,9 @@ section .data
 align 16

 mask0f:
-	ddq 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f
+	dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
 constip16:
-	ddq 0xf0f1f2f3f4f5f6f7f8f9fafbfcfdfeff
+	dq 0xf8f9fafbfcfdfeff, 0xf0f1f2f3f4f5f6f7

 ;;;       func             core, ver, snum
 slversion gf_5vect_mad_sse, 00,  01,  020c
--- a/erasure_code/gf_6vect_dot_prod_avx.asm
+++ b/erasure_code/gf_6vect_dot_prod_avx.asm
@ -309,7 +309,7 @@ endproc_frame
 section .data

 align 16
-mask0f:	ddq 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f
+mask0f:	dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f

 ;;;       func                  core, ver, snum
 slversion gf_6vect_dot_prod_avx, 02,  04,  0195
--- a/erasure_code/gf_6vect_dot_prod_sse.asm
+++ b/erasure_code/gf_6vect_dot_prod_sse.asm
@ -309,7 +309,7 @@ endproc_frame
 section .data

 align 16
-mask0f:	ddq 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f
+mask0f:	dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f

 ;;;       func                  core, ver, snum
 slversion gf_6vect_dot_prod_sse, 00,  05,  0066
--- a/erasure_code/gf_6vect_mad_avx.asm
+++ b/erasure_code/gf_6vect_mad_avx.asm
@ -386,9 +386,9 @@ endproc_frame
 section .data

 align 16
-mask0f:	ddq 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f
+mask0f:	dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
 constip16:
-	ddq 0xf0f1f2f3f4f5f6f7f8f9fafbfcfdfeff
+	dq 0xf8f9fafbfcfdfeff, 0xf0f1f2f3f4f5f6f7

 ;;;       func             core, ver, snum
 slversion gf_6vect_mad_avx, 02,  01,  0210
--- a/erasure_code/gf_6vect_mad_avx2.asm
+++ b/erasure_code/gf_6vect_mad_avx2.asm
@ -393,8 +393,8 @@ endproc_frame
 section .data
 align 32
 constip32:
-	ddq 0xf0f1f2f3f4f5f6f7f8f9fafbfcfdfeff
-	ddq 0xe0e1e2e3e4e5e6e7e8e9eaebecedeeef
+	dq 0xf8f9fafbfcfdfeff, 0xf0f1f2f3f4f5f6f7
+	dq 0xe8e9eaebecedeeef, 0xe0e1e2e3e4e5e6e7

 ;;;       func              core, ver, snum
 slversion gf_6vect_mad_avx2, 04,  01,  0211
--- a/erasure_code/gf_6vect_mad_sse.asm
+++ b/erasure_code/gf_6vect_mad_sse.asm
@ -398,9 +398,9 @@ section .data

 align 16

-mask0f: ddq 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f
+mask0f: dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
 constip16:
-	ddq 0xf0f1f2f3f4f5f6f7f8f9fafbfcfdfeff
+	dq 0xf8f9fafbfcfdfeff, 0xf0f1f2f3f4f5f6f7

 ;;;       func             core, ver, snum
 slversion gf_6vect_mad_sse, 00,  01,  020f
--- a/erasure_code/gf_vect_dot_prod_avx.asm
+++ b/erasure_code/gf_vect_dot_prod_avx.asm
@ -265,7 +265,7 @@ section .data
 align 16

 mask0f:
-ddq 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f
+dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f

 ;;;       func                 core, ver, snum
 slversion gf_vect_dot_prod_avx, 02,  05,  0061
--- a/erasure_code/gf_vect_dot_prod_sse.asm
+++ b/erasure_code/gf_vect_dot_prod_sse.asm
@ -265,7 +265,7 @@ section .data

 align 16

-mask0f:	ddq 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f
+mask0f:	dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f

 ;;;       func                 core, ver, snum
 slversion gf_vect_dot_prod_sse, 00,  05,  0060
--- a/erasure_code/gf_vect_mad_avx.asm
+++ b/erasure_code/gf_vect_mad_avx.asm
@ -190,7 +190,7 @@ section .data

 align 16

-mask0f: ddq 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f
+mask0f: dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f

 ;;;       func            core, ver, snum
 slversion gf_vect_mad_avx, 02,  01,  0201
--- a/erasure_code/gf_vect_mad_sse.asm
+++ b/erasure_code/gf_vect_mad_sse.asm
@ -191,7 +191,7 @@ section .data

 align 16

-mask0f: ddq 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f
+mask0f: dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f

 ;;;       func            core, ver, snum
 slversion gf_vect_mad_sse, 00,  01,  0200
--- a/erasure_code/gf_vect_mul_avx.asm
+++ b/erasure_code/gf_vect_mul_avx.asm
@ -158,7 +158,7 @@ section .data
 align 16

 mask0f:
-ddq 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f
+dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f

 ;;;       func             core, ver, snum
 slversion gf_vect_mul_avx, 01,   03,  0036
--- a/erasure_code/gf_vect_mul_sse.asm
+++ b/erasure_code/gf_vect_mul_sse.asm
@ -164,7 +164,7 @@ section .data

 align 16
 mask0f:
-ddq 0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f
+dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f

 ;;;       func        core, ver, snum
 slversion gf_vect_mul_sse, 00,   03,  0034
--- a/include/types.h
+++ b/include/types.h
@ -41,7 +41,7 @@
 extern "C" {
 #endif

-#ifdef __WIN32__
+#ifdef _WIN32
 #ifdef __MINGW32__
 # include <_mingw.h>
 #endif
--- a/make.inc
+++ b/make.inc
@ -80,7 +80,7 @@ ifeq ($(arch),mingw)
 endif


-INCLUDE   = $(patsubst %,-I%,$(subst :, ,$(VPATH)))
+INCLUDE   = $(patsubst %,-I%/,$(subst :, ,$(VPATH)))
 CFLAGS   = $(CFLAGS_$(arch)) $(CFLAGS_$(CC)) $(DEBUG) -O2 $(DEFINES) $(INCLUDE)
 ASFLAGS  = $(ASFLAGS_$(arch)) $(ASFLAGS_$(CC)) $(DEBUG_$(AS)) $(DEFINES) $(INCLUDE)
 ARFLAGS  = $(ARFLAGS_$(arch))
@ -110,35 +110,31 @@ perf_testswin64 = $(perf_tests)
 # Build and run unit tests, performance tests, etc.
 all_tests = $(notdir $(sort $(perf_tests$(arch)) $(check_tests$(arch)) $(unit_tests$(arch)) $(examples$(arch)) $(other_tests)))
 all_unit_tests = $(notdir $(sort $(check_tests$(arch)) $(unit_tests$(arch))))
+all_perf_tests = $(notdir $(sort $(perf_tests$(arch))))

 $(all_unit_tests): % : %.c $(lib_name)
-$(sort $(notdir $(perf_tests$(arch)))): % : %.c $(lib_name)
-$(sort $(examples$(arch))): % : %.c $(lib_name)
-$(sort $(other_tests)): % : %.c $(lib_name)
+$(all_perf_tests): % : %.c $(lib_name)
+$(sort $(notdir $(examples$(arch)))): % : %.c $(lib_name)
+$(sort $(notdir $(other_tests))): % : %.c $(lib_name)

 sim test trace: $(addsuffix .run,$(all_unit_tests))
-
-perf: $(addsuffix .run,$(notdir $(perf_tests$(arch))))
-ex:   $(examples$(arch))
+perf: $(addsuffix .run,$(all_perf_tests))
+ex:   $(notdir $(examples$(arch)))
 all: lib $(all_tests)
-other: $(other_tests)
+other: $(notdir $(other_tests))
 tests: $(all_unit_tests)
-perfs: $(notdir $(perf_tests$(arch)))
+perfs: $(all_perf_tests)
 check test perf: SIM=
 trace: SIMFLAGS = -debugtrace
 check test sim:
 	@echo Finished running $@

-#$(foreach c, $^, ./$c )
-#for i in $^; do ./$$i ; done
-
 $(objs): | $(O)
 $(O): ; mkdir -p $(O)

-
 # Build rule to run tests
-%.run: %
-	$(SIM) $(@D)/$<
+$(addsuffix .run,$(all_tests)): %.run : %
+	$(SIM) ./$<
 	@echo Completed run: $<

 # Other build rules
@ -233,7 +229,7 @@ rpt_name = perf_report_$(shell uname -n)_$(shell date +%y%m%d).perf

 perf_report:
 	echo Results for $(rpt_name) >> $(rpt_name)
-	$(MAKE) -k perf | tee -a $(rpt_name)
+	$(MAKE) -f Makefile.unx -k perf | tee -a $(rpt_name)
 	@echo Summary:
 	-grep runtime $(rpt_name)

--- a/tools/nasm-filter.sh
+++ b/tools/nasm-filter.sh
@ -0,0 +1,47 @@
+#/bin/sh
+
+# Filter out unnecessary options added by automake
+
+while [ -n "$*" ]; do
+    case "$1" in
+	-f | -o | -D )
+	    # Supported options with arg
+	    options="$options $1 $2"
+	    shift
+	    shift
+	    ;;
+	-I | -i )
+	    options="$options $1 $2/"
+	    shift
+	    shift
+	    ;;
+	--prefix* )
+	    # Supported options without arg
+	    options="$options $1"
+	    shift
+	    ;;
+	-I* | -i* )
+	    options="$options $1/"
+	    shift
+	    ;;
+	-D* ) # For defines we need to remove spaces
+	    case "$1" in
+		*' '* ) ;;
+		*) options="$options $1" ;;
+	    esac
+	    shift
+	    ;;
+	#-blah )
+	# Unsupported options with args - none known
+	-* )
+	    # Unsupported options with no args
+	    shift
+	    ;;
+	* )
+	    args="$args $1"
+	    shift
+	    ;;
+    esac
+done
+
+nasm $options $args
--- a/tools/yasm-filter.sh
+++ b/tools/yasm-filter.sh
@ -15,6 +15,13 @@ while [ -n "$*" ]; do
 	    options="$options $1"
 	    shift
 	    ;;
+	-D* ) # For defines we need to remove spaces
+	    case "$1" in
+		*' '* ) ;;
+		*) options="$options $1" ;;
+	    esac
+	    shift
+	    ;;
 	#-blah )
 	# Unsupported options with args - none known
 	-* )