From 02c9a72fddb1c8176e9469551ea989def49fdaca Mon Sep 17 00:00:00 2001
From: Victor van den Elzen <victor.vde@gmail.com>
Date: Wed, 11 Nov 2009 08:09:03 +0100
Subject: [PATCH] Update test files

Remove references to DREX instructions
---
 test/addr64x.asm   |  4 ----
 test/br2148476.asm |  8 ++++----
 test/expimp.asm    |  6 +-----
 test/fmsub.asm     | 19 -------------------
 test/pinsr16.asm   |  1 +
 test/pinsr32.asm   |  1 +
 test/pinsr64.asm   |  2 +-
 test/zerobyte.asm  |  5 +----
 8 files changed, 9 insertions(+), 37 deletions(-)
 delete mode 100644 test/fmsub.asm

diff --git a/test/addr64x.asm b/test/addr64x.asm
index 5aa63879..c7a64f5d 100644
--- a/test/addr64x.asm
+++ b/test/addr64x.asm
@@ -1,9 +1,5 @@
 ;Testname=O0; Arguments=-O0 -fbin -oaddr64.bin; Files=stdout stderr addr64.bin
 ;Testname=O1; Arguments=-O1 -fbin -oaddr64.bin; Files=stdout stderr addr64.bin
-;Testname=O2; Arguments=-O2 -fbin -oaddr64.bin; Files=stdout stderr addr64.bin
-;Testname=O3; Arguments=-O3 -fbin -oaddr64.bin; Files=stdout stderr addr64.bin
-;Testname=O4; Arguments=-O4 -fbin -oaddr64.bin; Files=stdout stderr addr64.bin
-;Testname=O5; Arguments=-O5 -fbin -oaddr64.bin; Files=stdout stderr addr64.bin
 ;Testname=Ox; Arguments=-Ox -fbin -oaddr64.bin; Files=stdout stderr addr64.bin
 	bits	64
 	mov	rdx,[rax]
diff --git a/test/br2148476.asm b/test/br2148476.asm
index 1b263c98..b1ff0e8f 100644
--- a/test/br2148476.asm
+++ b/test/br2148476.asm
@@ -1,4 +1,4 @@
-;Testname=test; Arguments=-fbin -obr2148476.bin; Files=.stdout .stderr br2148476.bin
+;Testname=test; Arguments=-fbin -obr2148476.bin; Files=stdout stderr br2148476.bin
 
 	bits 64
 
@@ -87,7 +87,7 @@
 	cvttps2dq xmm0, xmm1
 	cvttps2dq xmm0, [rdi]
 	cvttps2dq xmm0, oword [rdi]
-	
+
 	cvttps2pi mm0, xmm1
 	cvttps2pi mm0, [rdi]
 	cvttps2pi mm0, qword [rdi]
@@ -105,7 +105,7 @@
 	cvttss2si rax, xmm1
 	cvttss2si rax, [rdi]
 	cvttss2si rax, dword [rdi]
-	
+
 	vcvtdq2pd xmm0, xmm1
 	vcvtdq2pd xmm0, [rdi]
 	vcvtdq2pd xmm0, qword [rdi]
@@ -205,7 +205,7 @@
 	vcvttps2dq ymm0, ymm1
 	vcvttps2dq ymm0, [rdi]
 	vcvttps2dq ymm0, yword [rdi]
-	
+
 	vcvttsd2si eax, xmm1
 	vcvttsd2si eax, [rdi]	; Compatibility
 	vcvttsd2si eax, qword [rdi]
diff --git a/test/expimp.asm b/test/expimp.asm
index 77839770..89e32a14 100644
--- a/test/expimp.asm
+++ b/test/expimp.asm
@@ -1,9 +1,5 @@
 ;Testname=O0; Arguments=-O0 -fbin -oexpimp.bin; Files=stdout stderr expimp.bin
 ;Testname=O1; Arguments=-O1 -fbin -oexpimp.bin; Files=stdout stderr expimp.bin
-;Testname=O2; Arguments=-O2 -fbin -oexpimp.bin; Files=stdout stderr expimp.bin
-;Testname=O3; Arguments=-O3 -fbin -oexpimp.bin; Files=stdout stderr expimp.bin
-;Testname=O4; Arguments=-O4 -fbin -oexpimp.bin; Files=stdout stderr expimp.bin
-;Testname=O5; Arguments=-O5 -fbin -oexpimp.bin; Files=stdout stderr expimp.bin
 ;Testname=Ox; Arguments=-Ox -fbin -oexpimp.bin; Files=stdout stderr expimp.bin
 ;Testname=error-O0; Arguments=-O0 -fbin -oexpimp.bin -DERROR; Files=stdout stderr expimp.bin
 ;Testname=error-Ox; Arguments=-Ox -fbin -oexpimp.bin -DERROR; Files=stdout stderr expimp.bin
@@ -46,7 +42,7 @@
 	imul dx,word 3			; Explicit
 	imul dx,strict byte 3		; Explicit Strict
 	imul dx,strict word 3		; Explicit Strict
-		
+
 ;
 ; Same thing with branches
 ;
diff --git a/test/fmsub.asm b/test/fmsub.asm
deleted file mode 100644
index b58273fd..00000000
--- a/test/fmsub.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-;Testname=unoptimized; Arguments=-O0 -fbin -ofmsub.bin; Files=stdout stderr fmsub.bin
-;Testname=optimized;   Arguments=-Ox -fbin -ofmsub.bin; Files=stdout stderr fmsub.bin
-
-	bits 64
-
-	fmsubps xmm0,xmm0,xmm1,xmm2
-	fmsubps xmm0,xmm0,xmm1,[rax]
-	fmsubps xmm0,xmm0,xmm1,[rax+0x77]
-	fmsubps xmm0,xmm0,xmm1,[rax+0x7777]
-	fmsubps xmm1,xmm2,xmm3,xmm1
-	fmsubps xmm1,xmm2,[rax],xmm1
-	fmsubps xmm1,xmm2,[rax+0x77],xmm1
-	fmsubps xmm1,xmm2,[rax+0x7777],xmm1
-	fmsubps xmm0,[rax],xmm2,xmm0
-	fmsubps xmm0,[rax+0x77],xmm2,xmm0
-	fmsubps xmm0,[rax+0x7777],xmm2,xmm0
-	fmsubps xmm14,[rax],xmm2,xmm14
-	fmsubps xmm14,[rax+0x77],xmm2,xmm14
-	fmsubps xmm14,[rax+0x7777],xmm2,xmm14
diff --git a/test/pinsr16.asm b/test/pinsr16.asm
index f971598c..0159839a 100644
--- a/test/pinsr16.asm
+++ b/test/pinsr16.asm
@@ -1,3 +1,4 @@
+;Testname=test; Arguments=-O0 -fbin -opinsr16.bin; Files=stdout stderr pinsr16.bin
 	bits 16
 
 	pinsrw mm0,eax,0
diff --git a/test/pinsr32.asm b/test/pinsr32.asm
index 834d1866..24b3e585 100644
--- a/test/pinsr32.asm
+++ b/test/pinsr32.asm
@@ -1,3 +1,4 @@
+;Testname=test; Arguments=-O0 -fbin -opinsr32.bin; Files=stdout stderr pinsr32.bin
 	bits 32
 
 	pinsrw mm0,eax,0
diff --git a/test/pinsr64.asm b/test/pinsr64.asm
index bf837e9e..8eedfddc 100644
--- a/test/pinsr64.asm
+++ b/test/pinsr64.asm
@@ -1,3 +1,4 @@
+;Testname=test; Arguments=-O0 -fbin -opinsr64.bin; Files=stdout stderr pinsr64.bin
 	bits 64
 
 	pinsrw mm0,eax,0
@@ -65,4 +66,3 @@
 	vpinsrq xmm5,xmm1,rsi,0
 	vpinsrq xmm6,xmm2,[rcx],0
 	vpinsrq xmm7,xmm3,qword [rdx],0
-	
\ No newline at end of file
diff --git a/test/zerobyte.asm b/test/zerobyte.asm
index ce531b57..c3a0441a 100644
--- a/test/zerobyte.asm
+++ b/test/zerobyte.asm
@@ -3,7 +3,7 @@
 
 	mov eax,bar-foo
 
-foo:	
+foo:
 	add al,r10b
 bar:
 
@@ -20,6 +20,3 @@ bar:
 	verr r8w
 	verw ax
 	verw r8w
-
-	fmaddps xmm0,xmm0,xmm0,xmm0
-	fmaddps xmm8,xmm8,xmm8,xmm8
-- 
2.11.4.GIT