From: H.J. Lu <hjl.tools@gmail.com>
Date: Mon, 14 Sep 2009 14:44:58 +0000 (+0000)
Subject: 2009-09-14  H.J. Lu  <hongjiu.lu@intel.com>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bc2ae10b4da259820cef097108a7ebf6c8b13521;p=binutils-gdb.git

2009-09-14  H.J. Lu  <hongjiu.lu@intel.com>

	* gas/i386/merom.[ds]: Renamed to ...
	* gas/i386/ssse3.[ds]: This.

	* gas/i386/nops-1-merom.d: Renamed to ...
	* gas/i386/nops-1-core2.d: This.

	* gas/i386/nops-2-merom.d: Renamed to ...
	* gas/i386/nops-2-core2.d: This.

	* gas/i386/prescott.[ds]: Renamed to ...
	* gas/i386/sse3.[ds]: This.

	* gas/i386/x86-64-merom.[ds]: Renamed to ...
	* gas/i386/x86-64-ssse3.[ds]: This.

	* gas/i386/x86-64-nops-1-merom.d: Renamed to ...
	* gas/i386/x86-64-nops-1-core2.d: This.

	* gas/i386/x86-64-prescott.[ds]: Renamed to ...
	* gas/i386/x86-64-sse3.[ds]: This.

	* gas/i386/i386.exp: Updated.
---

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index fa5023f5590..3b799430b1b 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,28 @@
+2009-09-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* gas/i386/merom.[ds]: Renamed to ...
+	* gas/i386/ssse3.[ds]: This.
+
+	* gas/i386/nops-1-merom.d: Renamed to ...
+	* gas/i386/nops-1-core2.d: This.
+
+	* gas/i386/nops-2-merom.d: Renamed to ...
+	* gas/i386/nops-2-core2.d: This.
+
+	* gas/i386/prescott.[ds]: Renamed to ...
+	* gas/i386/sse3.[ds]: This.
+
+	* gas/i386/x86-64-merom.[ds]: Renamed to ...
+	* gas/i386/x86-64-ssse3.[ds]: This.
+
+	* gas/i386/x86-64-nops-1-merom.d: Renamed to ...
+	* gas/i386/x86-64-nops-1-core2.d: This.
+
+	* gas/i386/x86-64-prescott.[ds]: Renamed to ...
+	* gas/i386/x86-64-sse3.[ds]: This.
+
+	* gas/i386/i386.exp: Updated.
+
 2009-09-14  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR gas/10636
diff --git a/gas/testsuite/gas/i386/i386.exp b/gas/testsuite/gas/i386/i386.exp
index fc6748200e8..c93ebc20fbf 100644
--- a/gas/testsuite/gas/i386/i386.exp
+++ b/gas/testsuite/gas/i386/i386.exp
@@ -44,7 +44,7 @@ if [expr ([istarget "i*86-*-*"] ||  [istarget "x86_64-*-*"]) && [gas_32_check]]
     run_dump_test "ssemmx2"
     run_dump_test "sse2"
     run_dump_test "sub"
-    run_dump_test "prescott"
+    run_dump_test "sse3"
     run_dump_test "sib"
     run_dump_test "sib-intel"
     run_dump_test "disp"
@@ -59,7 +59,7 @@ if [expr ([istarget "i*86-*-*"] ||  [istarget "x86_64-*-*"]) && [gas_32_check]]
     run_list_test "cr-err" ""
     run_dump_test "svme"
     run_dump_test "amdfam10"
-    run_dump_test "merom"
+    run_dump_test "ssse3"
     run_dump_test "rep"
     run_dump_test "rep-suffix"
     run_dump_test "fp"
@@ -70,10 +70,10 @@ if [expr ([istarget "i*86-*-*"] ||  [istarget "x86_64-*-*"]) && [gas_32_check]]
     run_dump_test "nops-1-i386-i686"
     run_dump_test "nops-1-i686"
     run_dump_test "nops-1-k8"
-    run_dump_test "nops-1-merom"
+    run_dump_test "nops-1-core2"
     run_dump_test "nops-2"
     run_dump_test "nops-2-i386"
-    run_dump_test "nops-2-merom"
+    run_dump_test "nops-2-core2"
     run_dump_test "nops-3"
     run_dump_test "nops-3-i386"
     run_dump_test "nops-3-i686"
@@ -238,12 +238,12 @@ if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check]] t
     run_dump_test "x86-64-amdfam10"
     run_dump_test "x86-64-vmx"
     run_dump_test "immed64"
-    run_dump_test "x86-64-prescott"
+    run_dump_test "x86-64-sse3"
     run_dump_test "x86-64-crx"
     run_dump_test "x86-64-crx-suffix"
     run_dump_test "x86-64-drx"
     run_dump_test "x86-64-drx-suffix"
-    run_dump_test "x86-64-merom"
+    run_dump_test "x86-64-ssse3"
     run_dump_test "x86-64-rep"
     run_dump_test "x86-64-rep-suffix"
     run_dump_test "x86-64-cbw"
@@ -256,7 +256,7 @@ if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check]] t
     run_dump_test "x86-64-nops-1"
     run_dump_test "x86-64-nops-1-k8"
     run_dump_test "x86-64-nops-1-nocona"
-    run_dump_test "x86-64-nops-1-merom"
+    run_dump_test "x86-64-nops-1-core2"
     run_dump_test "x86-64-nops-1-pentium"
     run_dump_test "x86-64-nops-2"
     run_dump_test "x86-64-nops-3"
diff --git a/gas/testsuite/gas/i386/merom.d b/gas/testsuite/gas/i386/merom.d
deleted file mode 100644
index 9baa234e45f..00000000000
--- a/gas/testsuite/gas/i386/merom.d
+++ /dev/null
@@ -1,73 +0,0 @@
-#objdump: -dw
-#name: i386 merom
-
-.*: +file format .*
-
-Disassembly of section .text:
-
-0+000 <foo>:
-   0:	0f 38 01 01[ 	]+phaddw \(%ecx\),%mm0
-   4:	0f 38 01 c1[ 	]+phaddw %mm1,%mm0
-   8:	66 0f 38 01 01[ 	]+phaddw \(%ecx\),%xmm0
-   d:	66 0f 38 01 c1[ 	]+phaddw %xmm1,%xmm0
-  12:	0f 38 02 01[ 	]+phaddd \(%ecx\),%mm0
-  16:	0f 38 02 c1[ 	]+phaddd %mm1,%mm0
-  1a:	66 0f 38 02 01[ 	]+phaddd \(%ecx\),%xmm0
-  1f:	66 0f 38 02 c1[ 	]+phaddd %xmm1,%xmm0
-  24:	0f 38 03 01[ 	]+phaddsw \(%ecx\),%mm0
-  28:	0f 38 03 c1[ 	]+phaddsw %mm1,%mm0
-  2c:	66 0f 38 03 01[ 	]+phaddsw \(%ecx\),%xmm0
-  31:	66 0f 38 03 c1[ 	]+phaddsw %xmm1,%xmm0
-  36:	0f 38 05 01[ 	]+phsubw \(%ecx\),%mm0
-  3a:	0f 38 05 c1[ 	]+phsubw %mm1,%mm0
-  3e:	66 0f 38 05 01[ 	]+phsubw \(%ecx\),%xmm0
-  43:	66 0f 38 05 c1[ 	]+phsubw %xmm1,%xmm0
-  48:	0f 38 06 01[ 	]+phsubd \(%ecx\),%mm0
-  4c:	0f 38 06 c1[ 	]+phsubd %mm1,%mm0
-  50:	66 0f 38 06 01[ 	]+phsubd \(%ecx\),%xmm0
-  55:	66 0f 38 06 c1[ 	]+phsubd %xmm1,%xmm0
-  5a:	0f 38 07 01[ 	]+phsubsw \(%ecx\),%mm0
-  5e:	0f 38 07 c1[ 	]+phsubsw %mm1,%mm0
-  62:	66 0f 38 07 01[ 	]+phsubsw \(%ecx\),%xmm0
-  67:	66 0f 38 07 c1[ 	]+phsubsw %xmm1,%xmm0
-  6c:	0f 38 04 01[ 	]+pmaddubsw \(%ecx\),%mm0
-  70:	0f 38 04 c1[ 	]+pmaddubsw %mm1,%mm0
-  74:	66 0f 38 04 01[ 	]+pmaddubsw \(%ecx\),%xmm0
-  79:	66 0f 38 04 c1[ 	]+pmaddubsw %xmm1,%xmm0
-  7e:	0f 38 0b 01[ 	]+pmulhrsw \(%ecx\),%mm0
-  82:	0f 38 0b c1[ 	]+pmulhrsw %mm1,%mm0
-  86:	66 0f 38 0b 01[ 	]+pmulhrsw \(%ecx\),%xmm0
-  8b:	66 0f 38 0b c1[ 	]+pmulhrsw %xmm1,%xmm0
-  90:	0f 38 00 01[ 	]+pshufb \(%ecx\),%mm0
-  94:	0f 38 00 c1[ 	]+pshufb %mm1,%mm0
-  98:	66 0f 38 00 01[ 	]+pshufb \(%ecx\),%xmm0
-  9d:	66 0f 38 00 c1[ 	]+pshufb %xmm1,%xmm0
-  a2:	0f 38 08 01[ 	]+psignb \(%ecx\),%mm0
-  a6:	0f 38 08 c1[ 	]+psignb %mm1,%mm0
-  aa:	66 0f 38 08 01[ 	]+psignb \(%ecx\),%xmm0
-  af:	66 0f 38 08 c1[ 	]+psignb %xmm1,%xmm0
-  b4:	0f 38 09 01[ 	]+psignw \(%ecx\),%mm0
-  b8:	0f 38 09 c1[ 	]+psignw %mm1,%mm0
-  bc:	66 0f 38 09 01[ 	]+psignw \(%ecx\),%xmm0
-  c1:	66 0f 38 09 c1[ 	]+psignw %xmm1,%xmm0
-  c6:	0f 38 0a 01[ 	]+psignd \(%ecx\),%mm0
-  ca:	0f 38 0a c1[ 	]+psignd %mm1,%mm0
-  ce:	66 0f 38 0a 01[ 	]+psignd \(%ecx\),%xmm0
-  d3:	66 0f 38 0a c1[ 	]+psignd %xmm1,%xmm0
-  d8:	0f 3a 0f 01 02[ 	]+palignr \$0x2,\(%ecx\),%mm0
-  dd:	0f 3a 0f c1 02[ 	]+palignr \$0x2,%mm1,%mm0
-  e2:	66 0f 3a 0f 01 02[ 	]+palignr \$0x2,\(%ecx\),%xmm0
-  e8:	66 0f 3a 0f c1 02[ 	]+palignr \$0x2,%xmm1,%xmm0
-  ee:	0f 38 1c 01[ 	]+pabsb  \(%ecx\),%mm0
-  f2:	0f 38 1c c1[ 	]+pabsb  %mm1,%mm0
-  f6:	66 0f 38 1c 01[ 	]+pabsb  \(%ecx\),%xmm0
-  fb:	66 0f 38 1c c1[ 	]+pabsb  %xmm1,%xmm0
- 100:	0f 38 1d 01[ 	]+pabsw  \(%ecx\),%mm0
- 104:	0f 38 1d c1[ 	]+pabsw  %mm1,%mm0
- 108:	66 0f 38 1d 01[ 	]+pabsw  \(%ecx\),%xmm0
- 10d:	66 0f 38 1d c1[ 	]+pabsw  %xmm1,%xmm0
- 112:	0f 38 1e 01[ 	]+pabsd  \(%ecx\),%mm0
- 116:	0f 38 1e c1[ 	]+pabsd  %mm1,%mm0
- 11a:	66 0f 38 1e 01[ 	]+pabsd  \(%ecx\),%xmm0
- 11f:	66 0f 38 1e c1[ 	]+pabsd  %xmm1,%xmm0
-#pass
diff --git a/gas/testsuite/gas/i386/merom.s b/gas/testsuite/gas/i386/merom.s
deleted file mode 100644
index 154d2f8ddb3..00000000000
--- a/gas/testsuite/gas/i386/merom.s
+++ /dev/null
@@ -1,70 +0,0 @@
-#Merom New Instructions
-
-	.text
-foo:
-	phaddw		(%ecx),%mm0
-	phaddw		%mm1,%mm0
-	phaddw		(%ecx),%xmm0
-	phaddw		%xmm1,%xmm0
-	phaddd		(%ecx),%mm0
-	phaddd		%mm1,%mm0
-	phaddd		(%ecx),%xmm0
-	phaddd		%xmm1,%xmm0
-	phaddsw		(%ecx),%mm0
-	phaddsw		%mm1,%mm0
-	phaddsw		(%ecx),%xmm0
-	phaddsw		%xmm1,%xmm0
-	phsubw		(%ecx),%mm0
-	phsubw		%mm1,%mm0
-	phsubw		(%ecx),%xmm0
-	phsubw		%xmm1,%xmm0
-	phsubd		(%ecx),%mm0
-	phsubd		%mm1,%mm0
-	phsubd		(%ecx),%xmm0
-	phsubd		%xmm1,%xmm0
-	phsubsw		(%ecx),%mm0
-	phsubsw		%mm1,%mm0
-	phsubsw		(%ecx),%xmm0
-	phsubsw		%xmm1,%xmm0
-	pmaddubsw	(%ecx),%mm0
-	pmaddubsw	%mm1,%mm0
-	pmaddubsw	(%ecx),%xmm0
-	pmaddubsw	%xmm1,%xmm0
-	pmulhrsw	(%ecx),%mm0
-	pmulhrsw	%mm1,%mm0
-	pmulhrsw	(%ecx),%xmm0
-	pmulhrsw	%xmm1,%xmm0
-	pshufb		(%ecx),%mm0
-	pshufb		%mm1,%mm0
-	pshufb		(%ecx),%xmm0
-	pshufb		%xmm1,%xmm0
-	psignb		(%ecx),%mm0
-	psignb		%mm1,%mm0
-	psignb		(%ecx),%xmm0
-	psignb		%xmm1,%xmm0
-	psignw		(%ecx),%mm0
-	psignw		%mm1,%mm0
-	psignw		(%ecx),%xmm0
-	psignw		%xmm1,%xmm0
-	psignd		(%ecx),%mm0
-	psignd		%mm1,%mm0
-	psignd		(%ecx),%xmm0
-	psignd		%xmm1,%xmm0
-	palignr		$0x2,(%ecx),%mm0
-	palignr		$0x2,%mm1,%mm0
-	palignr		$0x2,(%ecx),%xmm0
-	palignr		$0x2,%xmm1,%xmm0
-	pabsb		(%ecx),%mm0
-	pabsb		%mm1,%mm0
-	pabsb		(%ecx),%xmm0
-	pabsb		%xmm1,%xmm0
-	pabsw		(%ecx),%mm0
-	pabsw		%mm1,%mm0
-	pabsw		(%ecx),%xmm0
-	pabsw		%xmm1,%xmm0
-	pabsd		(%ecx),%mm0
-	pabsd		%mm1,%mm0
-	pabsd		(%ecx),%xmm0
-	pabsd		%xmm1,%xmm0
-
-	.p2align	4,0
diff --git a/gas/testsuite/gas/i386/nops-1-core2.d b/gas/testsuite/gas/i386/nops-1-core2.d
new file mode 100644
index 00000000000..58632d79e65
--- /dev/null
+++ b/gas/testsuite/gas/i386/nops-1-core2.d
@@ -0,0 +1,156 @@
+#as: -mtune=core2
+#source: nops-1.s
+#objdump: -drw
+#name: i386 -mtune=core2 nops 1
+
+.*: +file format .*
+
+Disassembly of section .text:
+
+0+ <nop15>:
+[	 ]*0:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*1:[	 ]+66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+%cs:0x0\(%eax,%eax,1\)
+
+0+10 <nop14>:
+[	 ]*10:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*11:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*12:[	 ]+66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+%cs:0x0\(%eax,%eax,1\)
+
+0+20 <nop13>:
+[	 ]*20:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*21:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*22:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*23:[	 ]+66 66 66 66 2e 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+%cs:0x0\(%eax,%eax,1\)
+
+0+30 <nop12>:
+[	 ]*30:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*31:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*32:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*33:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*34:[	 ]+66 66 66 2e 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+%cs:0x0\(%eax,%eax,1\)
+
+0+40 <nop11>:
+[	 ]*40:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*41:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*42:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*43:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*44:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*45:[	 ]+66 66 2e 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+%cs:0x0\(%eax,%eax,1\)
+
+0+50 <nop10>:
+[	 ]*50:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*51:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*52:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*53:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*54:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*55:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*56:[	 ]+66 2e 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+%cs:0x0\(%eax,%eax,1\)
+
+0+60 <nop9>:
+[	 ]*60:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*61:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*62:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*63:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*64:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*65:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*66:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*67:[	 ]+66 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+0x0\(%eax,%eax,1\)
+
+0+70 <nop8>:
+[	 ]*70:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*71:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*72:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*73:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*74:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*75:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*76:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*77:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*78:[	 ]+0f 1f 84 00 00 00 00 00[	 ]+nopl[ 	]+0x0\(%eax,%eax,1\)
+
+0+80 <nop7>:
+[	 ]*80:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*81:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*82:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*83:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*84:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*85:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*86:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*87:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*88:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*89:[	 ]+0f 1f 80 00 00 00 00[	 ]+nopl[ 	]+0x0\(%eax\)
+
+0+90 <nop6>:
+[	 ]*90:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*91:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*92:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*93:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*94:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*95:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*96:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*97:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*98:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*99:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*9a:[	 ]+66 0f 1f 44 00 00[	 ]+nopw[ 	]+0x0\(%eax,%eax,1\)
+
+0+a0 <nop5>:
+[	 ]*a0:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*a1:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*a2:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*a3:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*a4:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*a5:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*a6:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*a7:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*a8:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*a9:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*aa:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*ab:[	 ]+0f 1f 44 00 00[	 ]+nopl[ 	]+0x0\(%eax,%eax,1\)
+
+0+b0 <nop4>:
+[	 ]*b0:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*b1:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*b2:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*b3:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*b4:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*b5:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*b6:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*b7:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*b8:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*b9:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*ba:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*bb:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*bc:[	 ]+0f 1f 40 00[	 ]+nopl[ 	]+0x0\(%eax\)
+
+0+c0 <nop3>:
+[	 ]*c0:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*c1:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*c2:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*c3:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*c4:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*c5:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*c6:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*c7:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*c8:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*c9:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*ca:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*cb:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*cc:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*cd:[	 ]+0f 1f 00[	 ]+nopl[ 	]+\(%eax\)
+
+0+d0 <nop2>:
+[	 ]*d0:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*d1:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*d2:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*d3:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*d4:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*d5:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*d6:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*d7:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*d8:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*d9:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*da:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*db:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*dc:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*dd:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*de:[	 ]+66 90[	 ]+xchg[ 	]+%ax,%ax
+#pass
diff --git a/gas/testsuite/gas/i386/nops-1-merom.d b/gas/testsuite/gas/i386/nops-1-merom.d
deleted file mode 100644
index 90668e56f07..00000000000
--- a/gas/testsuite/gas/i386/nops-1-merom.d
+++ /dev/null
@@ -1,156 +0,0 @@
-#as: -mtune=merom
-#source: nops-1.s
-#objdump: -drw
-#name: i386 -mtune=merom nops 1
-
-.*: +file format .*
-
-Disassembly of section .text:
-
-0+ <nop15>:
-[	 ]*0:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*1:[	 ]+66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+%cs:0x0\(%eax,%eax,1\)
-
-0+10 <nop14>:
-[	 ]*10:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*11:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*12:[	 ]+66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+%cs:0x0\(%eax,%eax,1\)
-
-0+20 <nop13>:
-[	 ]*20:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*21:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*22:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*23:[	 ]+66 66 66 66 2e 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+%cs:0x0\(%eax,%eax,1\)
-
-0+30 <nop12>:
-[	 ]*30:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*31:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*32:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*33:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*34:[	 ]+66 66 66 2e 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+%cs:0x0\(%eax,%eax,1\)
-
-0+40 <nop11>:
-[	 ]*40:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*41:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*42:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*43:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*44:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*45:[	 ]+66 66 2e 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+%cs:0x0\(%eax,%eax,1\)
-
-0+50 <nop10>:
-[	 ]*50:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*51:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*52:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*53:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*54:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*55:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*56:[	 ]+66 2e 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+%cs:0x0\(%eax,%eax,1\)
-
-0+60 <nop9>:
-[	 ]*60:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*61:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*62:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*63:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*64:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*65:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*66:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*67:[	 ]+66 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+0x0\(%eax,%eax,1\)
-
-0+70 <nop8>:
-[	 ]*70:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*71:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*72:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*73:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*74:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*75:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*76:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*77:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*78:[	 ]+0f 1f 84 00 00 00 00 00[	 ]+nopl[ 	]+0x0\(%eax,%eax,1\)
-
-0+80 <nop7>:
-[	 ]*80:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*81:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*82:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*83:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*84:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*85:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*86:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*87:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*88:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*89:[	 ]+0f 1f 80 00 00 00 00[	 ]+nopl[ 	]+0x0\(%eax\)
-
-0+90 <nop6>:
-[	 ]*90:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*91:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*92:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*93:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*94:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*95:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*96:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*97:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*98:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*99:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*9a:[	 ]+66 0f 1f 44 00 00[	 ]+nopw[ 	]+0x0\(%eax,%eax,1\)
-
-0+a0 <nop5>:
-[	 ]*a0:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*a1:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*a2:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*a3:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*a4:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*a5:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*a6:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*a7:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*a8:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*a9:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*aa:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*ab:[	 ]+0f 1f 44 00 00[	 ]+nopl[ 	]+0x0\(%eax,%eax,1\)
-
-0+b0 <nop4>:
-[	 ]*b0:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*b1:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*b2:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*b3:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*b4:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*b5:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*b6:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*b7:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*b8:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*b9:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*ba:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*bb:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*bc:[	 ]+0f 1f 40 00[	 ]+nopl[ 	]+0x0\(%eax\)
-
-0+c0 <nop3>:
-[	 ]*c0:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*c1:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*c2:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*c3:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*c4:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*c5:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*c6:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*c7:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*c8:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*c9:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*ca:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*cb:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*cc:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*cd:[	 ]+0f 1f 00[	 ]+nopl[ 	]+\(%eax\)
-
-0+d0 <nop2>:
-[	 ]*d0:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*d1:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*d2:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*d3:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*d4:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*d5:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*d6:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*d7:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*d8:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*d9:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*da:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*db:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*dc:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*dd:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*de:[	 ]+66 90[	 ]+xchg[ 	]+%ax,%ax
-#pass
diff --git a/gas/testsuite/gas/i386/nops-2-core2.d b/gas/testsuite/gas/i386/nops-2-core2.d
new file mode 100644
index 00000000000..ba7506dce61
--- /dev/null
+++ b/gas/testsuite/gas/i386/nops-2-core2.d
@@ -0,0 +1,182 @@
+#as: -march=i386 -mtune=core2
+#source: nops-2.s
+#objdump: -drw
+#name: i386 -march=i386 -mtune=core2 nops 2
+
+.*: +file format .*
+
+Disassembly of section .text:
+
+0+ <nop>:
+[	 ]*0:[	 ]+0f be f0[	 ]+movsbl[ 	]+%al,%esi
+[	 ]*3:[	 ]+8d b6 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
+[	 ]*9:[	 ]+8d bc 27 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi,%eiz,1\),%edi
+
+0+10 <nop15>:
+[	 ]*10:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*11:[	 ]+eb 0d[	 ]+jmp[ 	]+20[ 	]+<nop14>
+[	 ]*13:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*14:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*15:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*16:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*17:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*18:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*19:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*1a:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*1b:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*1c:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*1d:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*1e:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*1f:[	 ]+90[	 ]+nop[ 	]*
+
+0+20 <nop14>:
+[	 ]*20:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*21:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*22:[	 ]+8d b4 26 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi,%eiz,1\),%esi
+[	 ]*29:[	 ]+8d bc 27 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi,%eiz,1\),%edi
+
+0+30 <nop13>:
+[	 ]*30:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*31:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*32:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*33:[	 ]+8d b6 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
+[	 ]*39:[	 ]+8d bc 27 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi,%eiz,1\),%edi
+
+0+40 <nop12>:
+[	 ]*40:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*41:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*42:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*43:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*44:[	 ]+8d b6 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
+[	 ]*4a:[	 ]+8d bf 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi\),%edi
+
+0+50 <nop11>:
+[	 ]*50:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*51:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*52:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*53:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*54:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*55:[	 ]+8d 74 26 00[	 ]+lea[ 	]+0x0\(%esi,%eiz,1\),%esi
+[	 ]*59:[	 ]+8d bc 27 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi,%eiz,1\),%edi
+
+0+60 <nop10>:
+[	 ]*60:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*61:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*62:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*63:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*64:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*65:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*66:[	 ]+8d 76 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
+[	 ]*69:[	 ]+8d bc 27 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi,%eiz,1\),%edi
+
+0+70 <nop9>:
+[	 ]*70:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*71:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*72:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*73:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*74:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*75:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*76:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*77:[	 ]+89 f6[	 ]+mov[ 	]+%esi,%esi
+[	 ]*79:[	 ]+8d bc 27 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi,%eiz,1\),%edi
+
+0+80 <nop8>:
+[	 ]*80:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*81:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*82:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*83:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*84:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*85:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*86:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*87:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*88:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*89:[	 ]+8d b4 26 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi,%eiz,1\),%esi
+
+0+90 <nop7>:
+[	 ]*90:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*91:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*92:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*93:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*94:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*95:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*96:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*97:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*98:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*99:[	 ]+8d b4 26 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi,%eiz,1\),%esi
+
+0+a0 <nop6>:
+[	 ]*a0:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*a1:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*a2:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*a3:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*a4:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*a5:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*a6:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*a7:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*a8:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*a9:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*aa:[	 ]+8d b6 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
+
+0+b0 <nop5>:
+[	 ]*b0:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*b1:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*b2:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*b3:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*b4:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*b5:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*b6:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*b7:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*b8:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*b9:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*ba:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*bb:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*bc:[	 ]+8d 74 26 00[	 ]+lea[ 	]+0x0\(%esi,%eiz,1\),%esi
+
+0+c0 <nop4>:
+[	 ]*c0:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*c1:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*c2:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*c3:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*c4:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*c5:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*c6:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*c7:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*c8:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*c9:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*ca:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*cb:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*cc:[	 ]+8d 74 26 00[	 ]+lea[ 	]+0x0\(%esi,%eiz,1\),%esi
+
+0+d0 <nop3>:
+[	 ]*d0:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*d1:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*d2:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*d3:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*d4:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*d5:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*d6:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*d7:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*d8:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*d9:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*da:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*db:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*dc:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*dd:[	 ]+8d 76 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
+
+0+e0 <nop2>:
+[	 ]*e0:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*e1:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*e2:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*e3:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*e4:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*e5:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*e6:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*e7:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*e8:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*e9:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*ea:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*eb:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*ec:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*ed:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*ee:[	 ]+66 90[ 	]+xchg[ 	]+%ax,%ax
+#pass
diff --git a/gas/testsuite/gas/i386/nops-2-merom.d b/gas/testsuite/gas/i386/nops-2-merom.d
deleted file mode 100644
index 6cf50d04e8a..00000000000
--- a/gas/testsuite/gas/i386/nops-2-merom.d
+++ /dev/null
@@ -1,182 +0,0 @@
-#as: -march=i386 -mtune=merom
-#source: nops-2.s
-#objdump: -drw
-#name: i386 -march=i386 -mtune=merom nops 2
-
-.*: +file format .*
-
-Disassembly of section .text:
-
-0+ <nop>:
-[	 ]*0:[	 ]+0f be f0[	 ]+movsbl[ 	]+%al,%esi
-[	 ]*3:[	 ]+8d b6 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
-[	 ]*9:[	 ]+8d bc 27 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi,%eiz,1\),%edi
-
-0+10 <nop15>:
-[	 ]*10:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*11:[	 ]+eb 0d[	 ]+jmp[ 	]+20[ 	]+<nop14>
-[	 ]*13:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*14:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*15:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*16:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*17:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*18:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*19:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*1a:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*1b:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*1c:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*1d:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*1e:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*1f:[	 ]+90[	 ]+nop[ 	]*
-
-0+20 <nop14>:
-[	 ]*20:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*21:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*22:[	 ]+8d b4 26 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi,%eiz,1\),%esi
-[	 ]*29:[	 ]+8d bc 27 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi,%eiz,1\),%edi
-
-0+30 <nop13>:
-[	 ]*30:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*31:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*32:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*33:[	 ]+8d b6 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
-[	 ]*39:[	 ]+8d bc 27 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi,%eiz,1\),%edi
-
-0+40 <nop12>:
-[	 ]*40:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*41:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*42:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*43:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*44:[	 ]+8d b6 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
-[	 ]*4a:[	 ]+8d bf 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi\),%edi
-
-0+50 <nop11>:
-[	 ]*50:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*51:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*52:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*53:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*54:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*55:[	 ]+8d 74 26 00[	 ]+lea[ 	]+0x0\(%esi,%eiz,1\),%esi
-[	 ]*59:[	 ]+8d bc 27 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi,%eiz,1\),%edi
-
-0+60 <nop10>:
-[	 ]*60:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*61:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*62:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*63:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*64:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*65:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*66:[	 ]+8d 76 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
-[	 ]*69:[	 ]+8d bc 27 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi,%eiz,1\),%edi
-
-0+70 <nop9>:
-[	 ]*70:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*71:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*72:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*73:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*74:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*75:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*76:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*77:[	 ]+89 f6[	 ]+mov[ 	]+%esi,%esi
-[	 ]*79:[	 ]+8d bc 27 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi,%eiz,1\),%edi
-
-0+80 <nop8>:
-[	 ]*80:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*81:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*82:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*83:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*84:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*85:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*86:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*87:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*88:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*89:[	 ]+8d b4 26 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi,%eiz,1\),%esi
-
-0+90 <nop7>:
-[	 ]*90:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*91:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*92:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*93:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*94:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*95:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*96:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*97:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*98:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*99:[	 ]+8d b4 26 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi,%eiz,1\),%esi
-
-0+a0 <nop6>:
-[	 ]*a0:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*a1:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*a2:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*a3:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*a4:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*a5:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*a6:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*a7:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*a8:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*a9:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*aa:[	 ]+8d b6 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
-
-0+b0 <nop5>:
-[	 ]*b0:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*b1:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*b2:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*b3:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*b4:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*b5:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*b6:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*b7:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*b8:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*b9:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*ba:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*bb:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*bc:[	 ]+8d 74 26 00[	 ]+lea[ 	]+0x0\(%esi,%eiz,1\),%esi
-
-0+c0 <nop4>:
-[	 ]*c0:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*c1:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*c2:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*c3:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*c4:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*c5:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*c6:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*c7:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*c8:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*c9:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*ca:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*cb:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*cc:[	 ]+8d 74 26 00[	 ]+lea[ 	]+0x0\(%esi,%eiz,1\),%esi
-
-0+d0 <nop3>:
-[	 ]*d0:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*d1:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*d2:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*d3:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*d4:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*d5:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*d6:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*d7:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*d8:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*d9:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*da:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*db:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*dc:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*dd:[	 ]+8d 76 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
-
-0+e0 <nop2>:
-[	 ]*e0:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*e1:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*e2:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*e3:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*e4:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*e5:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*e6:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*e7:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*e8:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*e9:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*ea:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*eb:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*ec:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*ed:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*ee:[	 ]+66 90[ 	]+xchg[ 	]+%ax,%ax
-#pass
diff --git a/gas/testsuite/gas/i386/prescott.d b/gas/testsuite/gas/i386/prescott.d
deleted file mode 100644
index ed385096abf..00000000000
--- a/gas/testsuite/gas/i386/prescott.d
+++ /dev/null
@@ -1,39 +0,0 @@
-#objdump: -dw
-#name: i386 prescott
-
-.*: +file format .*
-
-Disassembly of section .text:
-
-0+000 <foo>:
-   0:	66 0f d0 01 [ 	]*addsubpd \(%ecx\),%xmm0
-   4:	66 0f d0 ca [ 	]*addsubpd %xmm2,%xmm1
-   8:	f2 0f d0 13 [ 	]*addsubps \(%ebx\),%xmm2
-   c:	f2 0f d0 dc [ 	]*addsubps %xmm4,%xmm3
-  10:	df 88 90 90 90 90 [ 	]*fisttp -0x6f6f6f70\(%eax\)
-  16:	db 88 90 90 90 90 [ 	]*fisttpl -0x6f6f6f70\(%eax\)
-  1c:	dd 88 90 90 90 90 [ 	]*fisttpll -0x6f6f6f70\(%eax\)
-  22:	66 0f 7c 65 00 [ 	]*haddpd 0x0\(%ebp\),%xmm4
-  27:	66 0f 7c ee [ 	]*haddpd %xmm6,%xmm5
-  2b:	f2 0f 7c 37 [ 	]*haddps \(%edi\),%xmm6
-  2f:	f2 0f 7c f8 [ 	]*haddps %xmm0,%xmm7
-  33:	66 0f 7d c1 [ 	]*hsubpd %xmm1,%xmm0
-  37:	66 0f 7d 0a [ 	]*hsubpd \(%edx\),%xmm1
-  3b:	f2 0f 7d d2 [ 	]*hsubps %xmm2,%xmm2
-  3f:	f2 0f 7d 1c 24 [ 	]*hsubps \(%esp\),%xmm3
-  44:	f2 0f f0 2e [ 	]*lddqu  \(%esi\),%xmm5
-  48:	0f 01 c8 [ 	]*monitor %eax,%ecx,%edx
-  4b:	0f 01 c8 [ 	]*monitor %eax,%ecx,%edx
-  4e:	f2 0f 12 f7 [ 	]*movddup %xmm7,%xmm6
-  52:	f2 0f 12 38 [ 	]*movddup \(%eax\),%xmm7
-  56:	f3 0f 16 01 [ 	]*movshdup \(%ecx\),%xmm0
-  5a:	f3 0f 16 ca [ 	]*movshdup %xmm2,%xmm1
-  5e:	f3 0f 12 13 [ 	]*movsldup \(%ebx\),%xmm2
-  62:	f3 0f 12 dc [ 	]*movsldup %xmm4,%xmm3
-  66:	0f 01 c9 [ 	]*mwait  %eax,%ecx
-  69:	0f 01 c9 [ 	]*mwait  %eax,%ecx
-  6c:	67 0f 01 c8 [ 	]*monitor %ax,%ecx,%edx
-  70:	67 0f 01 c8 [ 	]*monitor %ax,%ecx,%edx
-  74:	f2 0f 12 38 [ 	]*movddup \(%eax\),%xmm7
-  78:	f2 0f 12 38 [ 	]*movddup \(%eax\),%xmm7
-#pass
diff --git a/gas/testsuite/gas/i386/prescott.s b/gas/testsuite/gas/i386/prescott.s
deleted file mode 100644
index 6049c9766ec..00000000000
--- a/gas/testsuite/gas/i386/prescott.s
+++ /dev/null
@@ -1,37 +0,0 @@
-#Prescott New Instructions
-
-	.text
-foo:
-	addsubpd	(%ecx),%xmm0
-	addsubpd	%xmm2,%xmm1
-	addsubps	(%ebx),%xmm2
-	addsubps	%xmm4,%xmm3
-	fisttp		0x90909090(%eax)
-	fisttpl		0x90909090(%eax)
-	fisttpll	0x90909090(%eax)
-	haddpd		0x0(%ebp),%xmm4
-	haddpd		%xmm6,%xmm5
-	haddps		(%edi),%xmm6
-	haddps		%xmm0,%xmm7
-	hsubpd		%xmm1,%xmm0
-	hsubpd		(%edx),%xmm1
-	hsubps		%xmm2,%xmm2
-	hsubps		(%esp,1),%xmm3
-	lddqu		(%esi),%xmm5
-	monitor
-	monitor		%eax,%ecx,%edx
-	movddup		%xmm7,%xmm6
-	movddup		(%eax),%xmm7
-	movshdup	(%ecx),%xmm0
-	movshdup	%xmm2,%xmm1
-	movsldup	(%ebx),%xmm2
-	movsldup	%xmm4,%xmm3
-	mwait
-	mwait		%eax,%ecx
-
-	monitor		%ax,%ecx,%edx
-	addr16 monitor
-
-	.intel_syntax noprefix
-	movddup xmm7,[eax]
-	movddup xmm7,QWORD PTR [eax]
diff --git a/gas/testsuite/gas/i386/sse3.d b/gas/testsuite/gas/i386/sse3.d
new file mode 100644
index 00000000000..73ea486e9e4
--- /dev/null
+++ b/gas/testsuite/gas/i386/sse3.d
@@ -0,0 +1,39 @@
+#objdump: -dw
+#name: i386 SSE3
+
+.*: +file format .*
+
+Disassembly of section .text:
+
+0+000 <foo>:
+   0:	66 0f d0 01 [ 	]*addsubpd \(%ecx\),%xmm0
+   4:	66 0f d0 ca [ 	]*addsubpd %xmm2,%xmm1
+   8:	f2 0f d0 13 [ 	]*addsubps \(%ebx\),%xmm2
+   c:	f2 0f d0 dc [ 	]*addsubps %xmm4,%xmm3
+  10:	df 88 90 90 90 90 [ 	]*fisttp -0x6f6f6f70\(%eax\)
+  16:	db 88 90 90 90 90 [ 	]*fisttpl -0x6f6f6f70\(%eax\)
+  1c:	dd 88 90 90 90 90 [ 	]*fisttpll -0x6f6f6f70\(%eax\)
+  22:	66 0f 7c 65 00 [ 	]*haddpd 0x0\(%ebp\),%xmm4
+  27:	66 0f 7c ee [ 	]*haddpd %xmm6,%xmm5
+  2b:	f2 0f 7c 37 [ 	]*haddps \(%edi\),%xmm6
+  2f:	f2 0f 7c f8 [ 	]*haddps %xmm0,%xmm7
+  33:	66 0f 7d c1 [ 	]*hsubpd %xmm1,%xmm0
+  37:	66 0f 7d 0a [ 	]*hsubpd \(%edx\),%xmm1
+  3b:	f2 0f 7d d2 [ 	]*hsubps %xmm2,%xmm2
+  3f:	f2 0f 7d 1c 24 [ 	]*hsubps \(%esp\),%xmm3
+  44:	f2 0f f0 2e [ 	]*lddqu  \(%esi\),%xmm5
+  48:	0f 01 c8 [ 	]*monitor %eax,%ecx,%edx
+  4b:	0f 01 c8 [ 	]*monitor %eax,%ecx,%edx
+  4e:	f2 0f 12 f7 [ 	]*movddup %xmm7,%xmm6
+  52:	f2 0f 12 38 [ 	]*movddup \(%eax\),%xmm7
+  56:	f3 0f 16 01 [ 	]*movshdup \(%ecx\),%xmm0
+  5a:	f3 0f 16 ca [ 	]*movshdup %xmm2,%xmm1
+  5e:	f3 0f 12 13 [ 	]*movsldup \(%ebx\),%xmm2
+  62:	f3 0f 12 dc [ 	]*movsldup %xmm4,%xmm3
+  66:	0f 01 c9 [ 	]*mwait  %eax,%ecx
+  69:	0f 01 c9 [ 	]*mwait  %eax,%ecx
+  6c:	67 0f 01 c8 [ 	]*monitor %ax,%ecx,%edx
+  70:	67 0f 01 c8 [ 	]*monitor %ax,%ecx,%edx
+  74:	f2 0f 12 38 [ 	]*movddup \(%eax\),%xmm7
+  78:	f2 0f 12 38 [ 	]*movddup \(%eax\),%xmm7
+#pass
diff --git a/gas/testsuite/gas/i386/sse3.s b/gas/testsuite/gas/i386/sse3.s
new file mode 100644
index 00000000000..051dfb08237
--- /dev/null
+++ b/gas/testsuite/gas/i386/sse3.s
@@ -0,0 +1,37 @@
+# SSE3 New Instructions
+
+	.text
+foo:
+	addsubpd	(%ecx),%xmm0
+	addsubpd	%xmm2,%xmm1
+	addsubps	(%ebx),%xmm2
+	addsubps	%xmm4,%xmm3
+	fisttp		0x90909090(%eax)
+	fisttpl		0x90909090(%eax)
+	fisttpll	0x90909090(%eax)
+	haddpd		0x0(%ebp),%xmm4
+	haddpd		%xmm6,%xmm5
+	haddps		(%edi),%xmm6
+	haddps		%xmm0,%xmm7
+	hsubpd		%xmm1,%xmm0
+	hsubpd		(%edx),%xmm1
+	hsubps		%xmm2,%xmm2
+	hsubps		(%esp,1),%xmm3
+	lddqu		(%esi),%xmm5
+	monitor
+	monitor		%eax,%ecx,%edx
+	movddup		%xmm7,%xmm6
+	movddup		(%eax),%xmm7
+	movshdup	(%ecx),%xmm0
+	movshdup	%xmm2,%xmm1
+	movsldup	(%ebx),%xmm2
+	movsldup	%xmm4,%xmm3
+	mwait
+	mwait		%eax,%ecx
+
+	monitor		%ax,%ecx,%edx
+	addr16 monitor
+
+	.intel_syntax noprefix
+	movddup xmm7,[eax]
+	movddup xmm7,QWORD PTR [eax]
diff --git a/gas/testsuite/gas/i386/ssse3.d b/gas/testsuite/gas/i386/ssse3.d
new file mode 100644
index 00000000000..4be12fbd6c4
--- /dev/null
+++ b/gas/testsuite/gas/i386/ssse3.d
@@ -0,0 +1,73 @@
+#objdump: -dw
+#name: i386 SSSE3
+
+.*: +file format .*
+
+Disassembly of section .text:
+
+0+000 <foo>:
+   0:	0f 38 01 01[ 	]+phaddw \(%ecx\),%mm0
+   4:	0f 38 01 c1[ 	]+phaddw %mm1,%mm0
+   8:	66 0f 38 01 01[ 	]+phaddw \(%ecx\),%xmm0
+   d:	66 0f 38 01 c1[ 	]+phaddw %xmm1,%xmm0
+  12:	0f 38 02 01[ 	]+phaddd \(%ecx\),%mm0
+  16:	0f 38 02 c1[ 	]+phaddd %mm1,%mm0
+  1a:	66 0f 38 02 01[ 	]+phaddd \(%ecx\),%xmm0
+  1f:	66 0f 38 02 c1[ 	]+phaddd %xmm1,%xmm0
+  24:	0f 38 03 01[ 	]+phaddsw \(%ecx\),%mm0
+  28:	0f 38 03 c1[ 	]+phaddsw %mm1,%mm0
+  2c:	66 0f 38 03 01[ 	]+phaddsw \(%ecx\),%xmm0
+  31:	66 0f 38 03 c1[ 	]+phaddsw %xmm1,%xmm0
+  36:	0f 38 05 01[ 	]+phsubw \(%ecx\),%mm0
+  3a:	0f 38 05 c1[ 	]+phsubw %mm1,%mm0
+  3e:	66 0f 38 05 01[ 	]+phsubw \(%ecx\),%xmm0
+  43:	66 0f 38 05 c1[ 	]+phsubw %xmm1,%xmm0
+  48:	0f 38 06 01[ 	]+phsubd \(%ecx\),%mm0
+  4c:	0f 38 06 c1[ 	]+phsubd %mm1,%mm0
+  50:	66 0f 38 06 01[ 	]+phsubd \(%ecx\),%xmm0
+  55:	66 0f 38 06 c1[ 	]+phsubd %xmm1,%xmm0
+  5a:	0f 38 07 01[ 	]+phsubsw \(%ecx\),%mm0
+  5e:	0f 38 07 c1[ 	]+phsubsw %mm1,%mm0
+  62:	66 0f 38 07 01[ 	]+phsubsw \(%ecx\),%xmm0
+  67:	66 0f 38 07 c1[ 	]+phsubsw %xmm1,%xmm0
+  6c:	0f 38 04 01[ 	]+pmaddubsw \(%ecx\),%mm0
+  70:	0f 38 04 c1[ 	]+pmaddubsw %mm1,%mm0
+  74:	66 0f 38 04 01[ 	]+pmaddubsw \(%ecx\),%xmm0
+  79:	66 0f 38 04 c1[ 	]+pmaddubsw %xmm1,%xmm0
+  7e:	0f 38 0b 01[ 	]+pmulhrsw \(%ecx\),%mm0
+  82:	0f 38 0b c1[ 	]+pmulhrsw %mm1,%mm0
+  86:	66 0f 38 0b 01[ 	]+pmulhrsw \(%ecx\),%xmm0
+  8b:	66 0f 38 0b c1[ 	]+pmulhrsw %xmm1,%xmm0
+  90:	0f 38 00 01[ 	]+pshufb \(%ecx\),%mm0
+  94:	0f 38 00 c1[ 	]+pshufb %mm1,%mm0
+  98:	66 0f 38 00 01[ 	]+pshufb \(%ecx\),%xmm0
+  9d:	66 0f 38 00 c1[ 	]+pshufb %xmm1,%xmm0
+  a2:	0f 38 08 01[ 	]+psignb \(%ecx\),%mm0
+  a6:	0f 38 08 c1[ 	]+psignb %mm1,%mm0
+  aa:	66 0f 38 08 01[ 	]+psignb \(%ecx\),%xmm0
+  af:	66 0f 38 08 c1[ 	]+psignb %xmm1,%xmm0
+  b4:	0f 38 09 01[ 	]+psignw \(%ecx\),%mm0
+  b8:	0f 38 09 c1[ 	]+psignw %mm1,%mm0
+  bc:	66 0f 38 09 01[ 	]+psignw \(%ecx\),%xmm0
+  c1:	66 0f 38 09 c1[ 	]+psignw %xmm1,%xmm0
+  c6:	0f 38 0a 01[ 	]+psignd \(%ecx\),%mm0
+  ca:	0f 38 0a c1[ 	]+psignd %mm1,%mm0
+  ce:	66 0f 38 0a 01[ 	]+psignd \(%ecx\),%xmm0
+  d3:	66 0f 38 0a c1[ 	]+psignd %xmm1,%xmm0
+  d8:	0f 3a 0f 01 02[ 	]+palignr \$0x2,\(%ecx\),%mm0
+  dd:	0f 3a 0f c1 02[ 	]+palignr \$0x2,%mm1,%mm0
+  e2:	66 0f 3a 0f 01 02[ 	]+palignr \$0x2,\(%ecx\),%xmm0
+  e8:	66 0f 3a 0f c1 02[ 	]+palignr \$0x2,%xmm1,%xmm0
+  ee:	0f 38 1c 01[ 	]+pabsb  \(%ecx\),%mm0
+  f2:	0f 38 1c c1[ 	]+pabsb  %mm1,%mm0
+  f6:	66 0f 38 1c 01[ 	]+pabsb  \(%ecx\),%xmm0
+  fb:	66 0f 38 1c c1[ 	]+pabsb  %xmm1,%xmm0
+ 100:	0f 38 1d 01[ 	]+pabsw  \(%ecx\),%mm0
+ 104:	0f 38 1d c1[ 	]+pabsw  %mm1,%mm0
+ 108:	66 0f 38 1d 01[ 	]+pabsw  \(%ecx\),%xmm0
+ 10d:	66 0f 38 1d c1[ 	]+pabsw  %xmm1,%xmm0
+ 112:	0f 38 1e 01[ 	]+pabsd  \(%ecx\),%mm0
+ 116:	0f 38 1e c1[ 	]+pabsd  %mm1,%mm0
+ 11a:	66 0f 38 1e 01[ 	]+pabsd  \(%ecx\),%xmm0
+ 11f:	66 0f 38 1e c1[ 	]+pabsd  %xmm1,%xmm0
+#pass
diff --git a/gas/testsuite/gas/i386/ssse3.s b/gas/testsuite/gas/i386/ssse3.s
new file mode 100644
index 00000000000..4c81222a911
--- /dev/null
+++ b/gas/testsuite/gas/i386/ssse3.s
@@ -0,0 +1,70 @@
+# SSSE3 New Instructions
+
+	.text
+foo:
+	phaddw		(%ecx),%mm0
+	phaddw		%mm1,%mm0
+	phaddw		(%ecx),%xmm0
+	phaddw		%xmm1,%xmm0
+	phaddd		(%ecx),%mm0
+	phaddd		%mm1,%mm0
+	phaddd		(%ecx),%xmm0
+	phaddd		%xmm1,%xmm0
+	phaddsw		(%ecx),%mm0
+	phaddsw		%mm1,%mm0
+	phaddsw		(%ecx),%xmm0
+	phaddsw		%xmm1,%xmm0
+	phsubw		(%ecx),%mm0
+	phsubw		%mm1,%mm0
+	phsubw		(%ecx),%xmm0
+	phsubw		%xmm1,%xmm0
+	phsubd		(%ecx),%mm0
+	phsubd		%mm1,%mm0
+	phsubd		(%ecx),%xmm0
+	phsubd		%xmm1,%xmm0
+	phsubsw		(%ecx),%mm0
+	phsubsw		%mm1,%mm0
+	phsubsw		(%ecx),%xmm0
+	phsubsw		%xmm1,%xmm0
+	pmaddubsw	(%ecx),%mm0
+	pmaddubsw	%mm1,%mm0
+	pmaddubsw	(%ecx),%xmm0
+	pmaddubsw	%xmm1,%xmm0
+	pmulhrsw	(%ecx),%mm0
+	pmulhrsw	%mm1,%mm0
+	pmulhrsw	(%ecx),%xmm0
+	pmulhrsw	%xmm1,%xmm0
+	pshufb		(%ecx),%mm0
+	pshufb		%mm1,%mm0
+	pshufb		(%ecx),%xmm0
+	pshufb		%xmm1,%xmm0
+	psignb		(%ecx),%mm0
+	psignb		%mm1,%mm0
+	psignb		(%ecx),%xmm0
+	psignb		%xmm1,%xmm0
+	psignw		(%ecx),%mm0
+	psignw		%mm1,%mm0
+	psignw		(%ecx),%xmm0
+	psignw		%xmm1,%xmm0
+	psignd		(%ecx),%mm0
+	psignd		%mm1,%mm0
+	psignd		(%ecx),%xmm0
+	psignd		%xmm1,%xmm0
+	palignr		$0x2,(%ecx),%mm0
+	palignr		$0x2,%mm1,%mm0
+	palignr		$0x2,(%ecx),%xmm0
+	palignr		$0x2,%xmm1,%xmm0
+	pabsb		(%ecx),%mm0
+	pabsb		%mm1,%mm0
+	pabsb		(%ecx),%xmm0
+	pabsb		%xmm1,%xmm0
+	pabsw		(%ecx),%mm0
+	pabsw		%mm1,%mm0
+	pabsw		(%ecx),%xmm0
+	pabsw		%xmm1,%xmm0
+	pabsd		(%ecx),%mm0
+	pabsd		%mm1,%mm0
+	pabsd		(%ecx),%xmm0
+	pabsd		%xmm1,%xmm0
+
+	.p2align	4,0
diff --git a/gas/testsuite/gas/i386/x86-64-merom.d b/gas/testsuite/gas/i386/x86-64-merom.d
deleted file mode 100644
index 4593e526ef2..00000000000
--- a/gas/testsuite/gas/i386/x86-64-merom.d
+++ /dev/null
@@ -1,73 +0,0 @@
-#objdump: -dw
-#name: x86-64 merom
-
-.*: +file format .*
-
-Disassembly of section .text:
-
-0+000 <foo>:
-   0:	0f 38 01 01[ 	]+phaddw \(%rcx\),%mm0
-   4:	0f 38 01 c1[ 	]+phaddw %mm1,%mm0
-   8:	66 0f 38 01 01[ 	]+phaddw \(%rcx\),%xmm0
-   d:	66 0f 38 01 c1[ 	]+phaddw %xmm1,%xmm0
-  12:	0f 38 02 01[ 	]+phaddd \(%rcx\),%mm0
-  16:	0f 38 02 c1[ 	]+phaddd %mm1,%mm0
-  1a:	66 0f 38 02 01[ 	]+phaddd \(%rcx\),%xmm0
-  1f:	66 0f 38 02 c1[ 	]+phaddd %xmm1,%xmm0
-  24:	0f 38 03 01[ 	]+phaddsw \(%rcx\),%mm0
-  28:	0f 38 03 c1[ 	]+phaddsw %mm1,%mm0
-  2c:	66 0f 38 03 01[ 	]+phaddsw \(%rcx\),%xmm0
-  31:	66 0f 38 03 c1[ 	]+phaddsw %xmm1,%xmm0
-  36:	0f 38 05 01[ 	]+phsubw \(%rcx\),%mm0
-  3a:	0f 38 05 c1[ 	]+phsubw %mm1,%mm0
-  3e:	66 0f 38 05 01[ 	]+phsubw \(%rcx\),%xmm0
-  43:	66 0f 38 05 c1[ 	]+phsubw %xmm1,%xmm0
-  48:	0f 38 06 01[ 	]+phsubd \(%rcx\),%mm0
-  4c:	0f 38 06 c1[ 	]+phsubd %mm1,%mm0
-  50:	66 0f 38 06 01[ 	]+phsubd \(%rcx\),%xmm0
-  55:	66 0f 38 06 c1[ 	]+phsubd %xmm1,%xmm0
-  5a:	0f 38 07 01[ 	]+phsubsw \(%rcx\),%mm0
-  5e:	0f 38 07 c1[ 	]+phsubsw %mm1,%mm0
-  62:	66 0f 38 07 01[ 	]+phsubsw \(%rcx\),%xmm0
-  67:	66 0f 38 07 c1[ 	]+phsubsw %xmm1,%xmm0
-  6c:	0f 38 04 01[ 	]+pmaddubsw \(%rcx\),%mm0
-  70:	0f 38 04 c1[ 	]+pmaddubsw %mm1,%mm0
-  74:	66 0f 38 04 01[ 	]+pmaddubsw \(%rcx\),%xmm0
-  79:	66 0f 38 04 c1[ 	]+pmaddubsw %xmm1,%xmm0
-  7e:	0f 38 0b 01[ 	]+pmulhrsw \(%rcx\),%mm0
-  82:	0f 38 0b c1[ 	]+pmulhrsw %mm1,%mm0
-  86:	66 0f 38 0b 01[ 	]+pmulhrsw \(%rcx\),%xmm0
-  8b:	66 0f 38 0b c1[ 	]+pmulhrsw %xmm1,%xmm0
-  90:	0f 38 00 01[ 	]+pshufb \(%rcx\),%mm0
-  94:	0f 38 00 c1[ 	]+pshufb %mm1,%mm0
-  98:	66 0f 38 00 01[ 	]+pshufb \(%rcx\),%xmm0
-  9d:	66 0f 38 00 c1[ 	]+pshufb %xmm1,%xmm0
-  a2:	0f 38 08 01[ 	]+psignb \(%rcx\),%mm0
-  a6:	0f 38 08 c1[ 	]+psignb %mm1,%mm0
-  aa:	66 0f 38 08 01[ 	]+psignb \(%rcx\),%xmm0
-  af:	66 0f 38 08 c1[ 	]+psignb %xmm1,%xmm0
-  b4:	0f 38 09 01[ 	]+psignw \(%rcx\),%mm0
-  b8:	0f 38 09 c1[ 	]+psignw %mm1,%mm0
-  bc:	66 0f 38 09 01[ 	]+psignw \(%rcx\),%xmm0
-  c1:	66 0f 38 09 c1[ 	]+psignw %xmm1,%xmm0
-  c6:	0f 38 0a 01[ 	]+psignd \(%rcx\),%mm0
-  ca:	0f 38 0a c1[ 	]+psignd %mm1,%mm0
-  ce:	66 0f 38 0a 01[ 	]+psignd \(%rcx\),%xmm0
-  d3:	66 0f 38 0a c1[ 	]+psignd %xmm1,%xmm0
-  d8:	0f 3a 0f 01 02[ 	]+palignr \$0x2,\(%rcx\),%mm0
-  dd:	0f 3a 0f c1 02[ 	]+palignr \$0x2,%mm1,%mm0
-  e2:	66 0f 3a 0f 01 02[ 	]+palignr \$0x2,\(%rcx\),%xmm0
-  e8:	66 0f 3a 0f c1 02[ 	]+palignr \$0x2,%xmm1,%xmm0
-  ee:	0f 38 1c 01[ 	]+pabsb  \(%rcx\),%mm0
-  f2:	0f 38 1c c1[ 	]+pabsb  %mm1,%mm0
-  f6:	66 0f 38 1c 01[ 	]+pabsb  \(%rcx\),%xmm0
-  fb:	66 0f 38 1c c1[ 	]+pabsb  %xmm1,%xmm0
- 100:	0f 38 1d 01[ 	]+pabsw  \(%rcx\),%mm0
- 104:	0f 38 1d c1[ 	]+pabsw  %mm1,%mm0
- 108:	66 0f 38 1d 01[ 	]+pabsw  \(%rcx\),%xmm0
- 10d:	66 0f 38 1d c1[ 	]+pabsw  %xmm1,%xmm0
- 112:	0f 38 1e 01[ 	]+pabsd  \(%rcx\),%mm0
- 116:	0f 38 1e c1[ 	]+pabsd  %mm1,%mm0
- 11a:	66 0f 38 1e 01[ 	]+pabsd  \(%rcx\),%xmm0
- 11f:	66 0f 38 1e c1[ 	]+pabsd  %xmm1,%xmm0
-#pass
diff --git a/gas/testsuite/gas/i386/x86-64-merom.s b/gas/testsuite/gas/i386/x86-64-merom.s
deleted file mode 100644
index a70654db3e1..00000000000
--- a/gas/testsuite/gas/i386/x86-64-merom.s
+++ /dev/null
@@ -1,70 +0,0 @@
-#Merom New Instructions
-
-	.text
-foo:
-	phaddw		(%rcx),%mm0
-	phaddw		%mm1,%mm0
-	phaddw		(%rcx),%xmm0
-	phaddw		%xmm1,%xmm0
-	phaddd		(%rcx),%mm0
-	phaddd		%mm1,%mm0
-	phaddd		(%rcx),%xmm0
-	phaddd		%xmm1,%xmm0
-	phaddsw		(%rcx),%mm0
-	phaddsw		%mm1,%mm0
-	phaddsw		(%rcx),%xmm0
-	phaddsw		%xmm1,%xmm0
-	phsubw		(%rcx),%mm0
-	phsubw		%mm1,%mm0
-	phsubw		(%rcx),%xmm0
-	phsubw		%xmm1,%xmm0
-	phsubd		(%rcx),%mm0
-	phsubd		%mm1,%mm0
-	phsubd		(%rcx),%xmm0
-	phsubd		%xmm1,%xmm0
-	phsubsw		(%rcx),%mm0
-	phsubsw		%mm1,%mm0
-	phsubsw		(%rcx),%xmm0
-	phsubsw		%xmm1,%xmm0
-	pmaddubsw	(%rcx),%mm0
-	pmaddubsw	%mm1,%mm0
-	pmaddubsw	(%rcx),%xmm0
-	pmaddubsw	%xmm1,%xmm0
-	pmulhrsw	(%rcx),%mm0
-	pmulhrsw	%mm1,%mm0
-	pmulhrsw	(%rcx),%xmm0
-	pmulhrsw	%xmm1,%xmm0
-	pshufb		(%rcx),%mm0
-	pshufb		%mm1,%mm0
-	pshufb		(%rcx),%xmm0
-	pshufb		%xmm1,%xmm0
-	psignb		(%rcx),%mm0
-	psignb		%mm1,%mm0
-	psignb		(%rcx),%xmm0
-	psignb		%xmm1,%xmm0
-	psignw		(%rcx),%mm0
-	psignw		%mm1,%mm0
-	psignw		(%rcx),%xmm0
-	psignw		%xmm1,%xmm0
-	psignd		(%rcx),%mm0
-	psignd		%mm1,%mm0
-	psignd		(%rcx),%xmm0
-	psignd		%xmm1,%xmm0
-	palignr		$0x2,(%rcx),%mm0
-	palignr		$0x2,%mm1,%mm0
-	palignr		$0x2,(%rcx),%xmm0
-	palignr		$0x2,%xmm1,%xmm0
-	pabsb		(%rcx),%mm0
-	pabsb		%mm1,%mm0
-	pabsb		(%rcx),%xmm0
-	pabsb		%xmm1,%xmm0
-	pabsw		(%rcx),%mm0
-	pabsw		%mm1,%mm0
-	pabsw		(%rcx),%xmm0
-	pabsw		%xmm1,%xmm0
-	pabsd		(%rcx),%mm0
-	pabsd		%mm1,%mm0
-	pabsd		(%rcx),%xmm0
-	pabsd		%xmm1,%xmm0
-
-	.p2align	4,0
diff --git a/gas/testsuite/gas/i386/x86-64-nops-1-core2.d b/gas/testsuite/gas/i386/x86-64-nops-1-core2.d
new file mode 100644
index 00000000000..9f28894a095
--- /dev/null
+++ b/gas/testsuite/gas/i386/x86-64-nops-1-core2.d
@@ -0,0 +1,156 @@
+#as: -mtune=core2
+#source: nops-1.s
+#objdump: -drw
+#name: x86-64 -mtune=core2 nops 1
+
+.*: +file format .*
+
+Disassembly of section .text:
+
+0+ <nop15>:
+[	 ]*0:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*1:[	 ]+66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+%cs:0x0\(%rax,%rax,1\)
+
+0+10 <nop14>:
+[	 ]*10:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*11:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*12:[	 ]+66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+%cs:0x0\(%rax,%rax,1\)
+
+0+20 <nop13>:
+[	 ]*20:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*21:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*22:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*23:[	 ]+66 66 66 66 2e 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+%cs:0x0\(%rax,%rax,1\)
+
+0+30 <nop12>:
+[	 ]*30:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*31:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*32:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*33:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*34:[	 ]+66 66 66 2e 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+%cs:0x0\(%rax,%rax,1\)
+
+0+40 <nop11>:
+[	 ]*40:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*41:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*42:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*43:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*44:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*45:[	 ]+66 66 2e 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+%cs:0x0\(%rax,%rax,1\)
+
+0+50 <nop10>:
+[	 ]*50:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*51:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*52:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*53:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*54:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*55:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*56:[	 ]+66 2e 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+%cs:0x0\(%rax,%rax,1\)
+
+0+60 <nop9>:
+[	 ]*60:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*61:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*62:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*63:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*64:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*65:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*66:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*67:[	 ]+66 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+0x0\(%rax,%rax,1\)
+
+0+70 <nop8>:
+[	 ]*70:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*71:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*72:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*73:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*74:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*75:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*76:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*77:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*78:[	 ]+0f 1f 84 00 00 00 00 00[	 ]+nopl[ 	]+0x0\(%rax,%rax,1\)
+
+0+80 <nop7>:
+[	 ]*80:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*81:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*82:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*83:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*84:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*85:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*86:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*87:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*88:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*89:[	 ]+0f 1f 80 00 00 00 00[	 ]+nopl[ 	]+0x0\(%rax\)
+
+0+90 <nop6>:
+[	 ]*90:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*91:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*92:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*93:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*94:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*95:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*96:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*97:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*98:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*99:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*9a:[	 ]+66 0f 1f 44 00 00[	 ]+nopw[ 	]+0x0\(%rax,%rax,1\)
+
+0+a0 <nop5>:
+[	 ]*a0:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*a1:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*a2:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*a3:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*a4:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*a5:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*a6:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*a7:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*a8:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*a9:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*aa:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*ab:[	 ]+0f 1f 44 00 00[	 ]+nopl[ 	]+0x0\(%rax,%rax,1\)
+
+0+b0 <nop4>:
+[	 ]*b0:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*b1:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*b2:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*b3:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*b4:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*b5:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*b6:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*b7:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*b8:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*b9:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*ba:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*bb:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*bc:[	 ]+0f 1f 40 00[	 ]+nopl[ 	]+0x0\(%rax\)
+
+0+c0 <nop3>:
+[	 ]*c0:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*c1:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*c2:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*c3:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*c4:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*c5:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*c6:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*c7:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*c8:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*c9:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*ca:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*cb:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*cc:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*cd:[	 ]+0f 1f 00[	 ]+nopl[ 	]+\(%rax\)
+
+0+d0 <nop2>:
+[	 ]*d0:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*d1:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*d2:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*d3:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*d4:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*d5:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*d6:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*d7:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*d8:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*d9:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*da:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*db:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*dc:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*dd:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*de:[	 ]+66 90[	 ]+xchg[ 	]+%ax,%ax
+#pass
diff --git a/gas/testsuite/gas/i386/x86-64-nops-1-merom.d b/gas/testsuite/gas/i386/x86-64-nops-1-merom.d
deleted file mode 100644
index b6c77323291..00000000000
--- a/gas/testsuite/gas/i386/x86-64-nops-1-merom.d
+++ /dev/null
@@ -1,156 +0,0 @@
-#as: -mtune=merom
-#source: nops-1.s
-#objdump: -drw
-#name: x86-64 -mtune=merom nops 1
-
-.*: +file format .*
-
-Disassembly of section .text:
-
-0+ <nop15>:
-[	 ]*0:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*1:[	 ]+66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+%cs:0x0\(%rax,%rax,1\)
-
-0+10 <nop14>:
-[	 ]*10:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*11:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*12:[	 ]+66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+%cs:0x0\(%rax,%rax,1\)
-
-0+20 <nop13>:
-[	 ]*20:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*21:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*22:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*23:[	 ]+66 66 66 66 2e 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+%cs:0x0\(%rax,%rax,1\)
-
-0+30 <nop12>:
-[	 ]*30:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*31:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*32:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*33:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*34:[	 ]+66 66 66 2e 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+%cs:0x0\(%rax,%rax,1\)
-
-0+40 <nop11>:
-[	 ]*40:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*41:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*42:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*43:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*44:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*45:[	 ]+66 66 2e 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+%cs:0x0\(%rax,%rax,1\)
-
-0+50 <nop10>:
-[	 ]*50:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*51:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*52:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*53:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*54:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*55:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*56:[	 ]+66 2e 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+%cs:0x0\(%rax,%rax,1\)
-
-0+60 <nop9>:
-[	 ]*60:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*61:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*62:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*63:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*64:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*65:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*66:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*67:[	 ]+66 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+0x0\(%rax,%rax,1\)
-
-0+70 <nop8>:
-[	 ]*70:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*71:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*72:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*73:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*74:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*75:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*76:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*77:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*78:[	 ]+0f 1f 84 00 00 00 00 00[	 ]+nopl[ 	]+0x0\(%rax,%rax,1\)
-
-0+80 <nop7>:
-[	 ]*80:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*81:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*82:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*83:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*84:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*85:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*86:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*87:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*88:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*89:[	 ]+0f 1f 80 00 00 00 00[	 ]+nopl[ 	]+0x0\(%rax\)
-
-0+90 <nop6>:
-[	 ]*90:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*91:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*92:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*93:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*94:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*95:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*96:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*97:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*98:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*99:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*9a:[	 ]+66 0f 1f 44 00 00[	 ]+nopw[ 	]+0x0\(%rax,%rax,1\)
-
-0+a0 <nop5>:
-[	 ]*a0:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*a1:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*a2:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*a3:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*a4:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*a5:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*a6:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*a7:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*a8:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*a9:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*aa:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*ab:[	 ]+0f 1f 44 00 00[	 ]+nopl[ 	]+0x0\(%rax,%rax,1\)
-
-0+b0 <nop4>:
-[	 ]*b0:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*b1:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*b2:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*b3:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*b4:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*b5:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*b6:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*b7:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*b8:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*b9:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*ba:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*bb:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*bc:[	 ]+0f 1f 40 00[	 ]+nopl[ 	]+0x0\(%rax\)
-
-0+c0 <nop3>:
-[	 ]*c0:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*c1:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*c2:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*c3:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*c4:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*c5:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*c6:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*c7:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*c8:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*c9:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*ca:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*cb:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*cc:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*cd:[	 ]+0f 1f 00[	 ]+nopl[ 	]+\(%rax\)
-
-0+d0 <nop2>:
-[	 ]*d0:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*d1:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*d2:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*d3:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*d4:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*d5:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*d6:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*d7:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*d8:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*d9:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*da:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*db:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*dc:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*dd:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*de:[	 ]+66 90[	 ]+xchg[ 	]+%ax,%ax
-#pass
diff --git a/gas/testsuite/gas/i386/x86-64-prescott.d b/gas/testsuite/gas/i386/x86-64-prescott.d
deleted file mode 100644
index 2ceba67481c..00000000000
--- a/gas/testsuite/gas/i386/x86-64-prescott.d
+++ /dev/null
@@ -1,39 +0,0 @@
-#objdump: -dw
-#name: x86-64 prescott
-
-.*: +file format .*
-
-Disassembly of section .text:
-
-0+000 <foo>:
-   0:	66 0f d0 01 [ 	]*addsubpd \(%rcx\),%xmm0
-   4:	66 0f d0 ca [ 	]*addsubpd %xmm2,%xmm1
-   8:	f2 0f d0 13 [ 	]*addsubps \(%rbx\),%xmm2
-   c:	f2 0f d0 dc [ 	]*addsubps %xmm4,%xmm3
-  10:	df 88 90 90 90 00 [ 	]*fisttp 0x909090\(%rax\)
-  16:	db 88 90 90 90 00 [ 	]*fisttpl 0x909090\(%rax\)
-  1c:	dd 88 90 90 90 00 [ 	]*fisttpll 0x909090\(%rax\)
-  22:	66 0f 7c 65 00 [ 	]*haddpd 0x0\(%rbp\),%xmm4
-  27:	66 0f 7c ee [ 	]*haddpd %xmm6,%xmm5
-  2b:	f2 0f 7c 37 [ 	]*haddps \(%rdi\),%xmm6
-  2f:	f2 0f 7c f8 [ 	]*haddps %xmm0,%xmm7
-  33:	66 0f 7d c1 [ 	]*hsubpd %xmm1,%xmm0
-  37:	66 0f 7d 0a [ 	]*hsubpd \(%rdx\),%xmm1
-  3b:	f2 0f 7d d2 [ 	]*hsubps %xmm2,%xmm2
-  3f:	f2 0f 7d 1c 24 [ 	]*hsubps \(%rsp\),%xmm3
-  44:	f2 0f f0 2e [ 	]*lddqu  \(%rsi\),%xmm5
-  48:	0f 01 c8 [ 	]*monitor %rax,%rcx,%rdx
-  4b:	0f 01 c8 [ 	]*monitor %rax,%rcx,%rdx
-  4e:	f2 0f 12 f7 [ 	]*movddup %xmm7,%xmm6
-  52:	f2 0f 12 38 [ 	]*movddup \(%rax\),%xmm7
-  56:	f3 0f 16 01 [ 	]*movshdup \(%rcx\),%xmm0
-  5a:	f3 0f 16 ca [ 	]*movshdup %xmm2,%xmm1
-  5e:	f3 0f 12 13 [ 	]*movsldup \(%rbx\),%xmm2
-  62:	f3 0f 12 dc [ 	]*movsldup %xmm4,%xmm3
-  66:	0f 01 c9 [ 	]*mwait  %rax,%rcx
-  69:	0f 01 c9 [ 	]*mwait  %rax,%rcx
-  6c:	67 0f 01 c8 [ 	]*monitor %eax,%rcx,%rdx
-  70:	67 0f 01 c8 [ 	]*monitor %eax,%rcx,%rdx
-  74:	f2 0f 12 38 [ 	]*movddup \(%rax\),%xmm7
-  78:	f2 0f 12 38 [ 	]*movddup \(%rax\),%xmm7
-#pass
diff --git a/gas/testsuite/gas/i386/x86-64-prescott.s b/gas/testsuite/gas/i386/x86-64-prescott.s
deleted file mode 100644
index 123a3e9702d..00000000000
--- a/gas/testsuite/gas/i386/x86-64-prescott.s
+++ /dev/null
@@ -1,37 +0,0 @@
-#Prescott New Instructions
-
-	.text
-foo:
-	addsubpd	(%rcx),%xmm0
-	addsubpd	%xmm2,%xmm1
-	addsubps	(%rbx),%xmm2
-	addsubps	%xmm4,%xmm3
-	fisttp		0x909090(%rax)
-	fisttpl		0x909090(%rax)
-	fisttpll	0x909090(%rax)
-	haddpd		0x0(%rbp),%xmm4
-	haddpd		%xmm6,%xmm5
-	haddps		(%rdi),%xmm6
-	haddps		%xmm0,%xmm7
-	hsubpd		%xmm1,%xmm0
-	hsubpd		(%rdx),%xmm1
-	hsubps		%xmm2,%xmm2
-	hsubps		(%rsp,1),%xmm3
-	lddqu		(%rsi),%xmm5
-	monitor
-	monitor		%rax,%rcx,%rdx
-	movddup		%xmm7,%xmm6
-	movddup		(%rax),%xmm7
-	movshdup	(%rcx),%xmm0
-	movshdup	%xmm2,%xmm1
-	movsldup	(%rbx),%xmm2
-	movsldup	%xmm4,%xmm3
-	mwait
-	mwait		%rax,%rcx
-
-	monitor		%eax,%rcx,%rdx
-	addr32 monitor
-
-	.intel_syntax noprefix
-	movddup xmm7,[rax]
-	movddup xmm7,QWORD PTR [rax]
diff --git a/gas/testsuite/gas/i386/x86-64-sse3.d b/gas/testsuite/gas/i386/x86-64-sse3.d
new file mode 100644
index 00000000000..c6c25422ae3
--- /dev/null
+++ b/gas/testsuite/gas/i386/x86-64-sse3.d
@@ -0,0 +1,39 @@
+#objdump: -dw
+#name: x86-64 SSE3
+
+.*: +file format .*
+
+Disassembly of section .text:
+
+0+000 <foo>:
+   0:	66 0f d0 01 [ 	]*addsubpd \(%rcx\),%xmm0
+   4:	66 0f d0 ca [ 	]*addsubpd %xmm2,%xmm1
+   8:	f2 0f d0 13 [ 	]*addsubps \(%rbx\),%xmm2
+   c:	f2 0f d0 dc [ 	]*addsubps %xmm4,%xmm3
+  10:	df 88 90 90 90 00 [ 	]*fisttp 0x909090\(%rax\)
+  16:	db 88 90 90 90 00 [ 	]*fisttpl 0x909090\(%rax\)
+  1c:	dd 88 90 90 90 00 [ 	]*fisttpll 0x909090\(%rax\)
+  22:	66 0f 7c 65 00 [ 	]*haddpd 0x0\(%rbp\),%xmm4
+  27:	66 0f 7c ee [ 	]*haddpd %xmm6,%xmm5
+  2b:	f2 0f 7c 37 [ 	]*haddps \(%rdi\),%xmm6
+  2f:	f2 0f 7c f8 [ 	]*haddps %xmm0,%xmm7
+  33:	66 0f 7d c1 [ 	]*hsubpd %xmm1,%xmm0
+  37:	66 0f 7d 0a [ 	]*hsubpd \(%rdx\),%xmm1
+  3b:	f2 0f 7d d2 [ 	]*hsubps %xmm2,%xmm2
+  3f:	f2 0f 7d 1c 24 [ 	]*hsubps \(%rsp\),%xmm3
+  44:	f2 0f f0 2e [ 	]*lddqu  \(%rsi\),%xmm5
+  48:	0f 01 c8 [ 	]*monitor %rax,%rcx,%rdx
+  4b:	0f 01 c8 [ 	]*monitor %rax,%rcx,%rdx
+  4e:	f2 0f 12 f7 [ 	]*movddup %xmm7,%xmm6
+  52:	f2 0f 12 38 [ 	]*movddup \(%rax\),%xmm7
+  56:	f3 0f 16 01 [ 	]*movshdup \(%rcx\),%xmm0
+  5a:	f3 0f 16 ca [ 	]*movshdup %xmm2,%xmm1
+  5e:	f3 0f 12 13 [ 	]*movsldup \(%rbx\),%xmm2
+  62:	f3 0f 12 dc [ 	]*movsldup %xmm4,%xmm3
+  66:	0f 01 c9 [ 	]*mwait  %rax,%rcx
+  69:	0f 01 c9 [ 	]*mwait  %rax,%rcx
+  6c:	67 0f 01 c8 [ 	]*monitor %eax,%rcx,%rdx
+  70:	67 0f 01 c8 [ 	]*monitor %eax,%rcx,%rdx
+  74:	f2 0f 12 38 [ 	]*movddup \(%rax\),%xmm7
+  78:	f2 0f 12 38 [ 	]*movddup \(%rax\),%xmm7
+#pass
diff --git a/gas/testsuite/gas/i386/x86-64-sse3.s b/gas/testsuite/gas/i386/x86-64-sse3.s
new file mode 100644
index 00000000000..6d04afddb8c
--- /dev/null
+++ b/gas/testsuite/gas/i386/x86-64-sse3.s
@@ -0,0 +1,37 @@
+# 64bit SSE3 New Instructions
+
+	.text
+foo:
+	addsubpd	(%rcx),%xmm0
+	addsubpd	%xmm2,%xmm1
+	addsubps	(%rbx),%xmm2
+	addsubps	%xmm4,%xmm3
+	fisttp		0x909090(%rax)
+	fisttpl		0x909090(%rax)
+	fisttpll	0x909090(%rax)
+	haddpd		0x0(%rbp),%xmm4
+	haddpd		%xmm6,%xmm5
+	haddps		(%rdi),%xmm6
+	haddps		%xmm0,%xmm7
+	hsubpd		%xmm1,%xmm0
+	hsubpd		(%rdx),%xmm1
+	hsubps		%xmm2,%xmm2
+	hsubps		(%rsp,1),%xmm3
+	lddqu		(%rsi),%xmm5
+	monitor
+	monitor		%rax,%rcx,%rdx
+	movddup		%xmm7,%xmm6
+	movddup		(%rax),%xmm7
+	movshdup	(%rcx),%xmm0
+	movshdup	%xmm2,%xmm1
+	movsldup	(%rbx),%xmm2
+	movsldup	%xmm4,%xmm3
+	mwait
+	mwait		%rax,%rcx
+
+	monitor		%eax,%rcx,%rdx
+	addr32 monitor
+
+	.intel_syntax noprefix
+	movddup xmm7,[rax]
+	movddup xmm7,QWORD PTR [rax]
diff --git a/gas/testsuite/gas/i386/x86-64-ssse3.d b/gas/testsuite/gas/i386/x86-64-ssse3.d
new file mode 100644
index 00000000000..f8a8142c054
--- /dev/null
+++ b/gas/testsuite/gas/i386/x86-64-ssse3.d
@@ -0,0 +1,73 @@
+#objdump: -dw
+#name: x86-64 SSSE3
+
+.*: +file format .*
+
+Disassembly of section .text:
+
+0+000 <foo>:
+   0:	0f 38 01 01[ 	]+phaddw \(%rcx\),%mm0
+   4:	0f 38 01 c1[ 	]+phaddw %mm1,%mm0
+   8:	66 0f 38 01 01[ 	]+phaddw \(%rcx\),%xmm0
+   d:	66 0f 38 01 c1[ 	]+phaddw %xmm1,%xmm0
+  12:	0f 38 02 01[ 	]+phaddd \(%rcx\),%mm0
+  16:	0f 38 02 c1[ 	]+phaddd %mm1,%mm0
+  1a:	66 0f 38 02 01[ 	]+phaddd \(%rcx\),%xmm0
+  1f:	66 0f 38 02 c1[ 	]+phaddd %xmm1,%xmm0
+  24:	0f 38 03 01[ 	]+phaddsw \(%rcx\),%mm0
+  28:	0f 38 03 c1[ 	]+phaddsw %mm1,%mm0
+  2c:	66 0f 38 03 01[ 	]+phaddsw \(%rcx\),%xmm0
+  31:	66 0f 38 03 c1[ 	]+phaddsw %xmm1,%xmm0
+  36:	0f 38 05 01[ 	]+phsubw \(%rcx\),%mm0
+  3a:	0f 38 05 c1[ 	]+phsubw %mm1,%mm0
+  3e:	66 0f 38 05 01[ 	]+phsubw \(%rcx\),%xmm0
+  43:	66 0f 38 05 c1[ 	]+phsubw %xmm1,%xmm0
+  48:	0f 38 06 01[ 	]+phsubd \(%rcx\),%mm0
+  4c:	0f 38 06 c1[ 	]+phsubd %mm1,%mm0
+  50:	66 0f 38 06 01[ 	]+phsubd \(%rcx\),%xmm0
+  55:	66 0f 38 06 c1[ 	]+phsubd %xmm1,%xmm0
+  5a:	0f 38 07 01[ 	]+phsubsw \(%rcx\),%mm0
+  5e:	0f 38 07 c1[ 	]+phsubsw %mm1,%mm0
+  62:	66 0f 38 07 01[ 	]+phsubsw \(%rcx\),%xmm0
+  67:	66 0f 38 07 c1[ 	]+phsubsw %xmm1,%xmm0
+  6c:	0f 38 04 01[ 	]+pmaddubsw \(%rcx\),%mm0
+  70:	0f 38 04 c1[ 	]+pmaddubsw %mm1,%mm0
+  74:	66 0f 38 04 01[ 	]+pmaddubsw \(%rcx\),%xmm0
+  79:	66 0f 38 04 c1[ 	]+pmaddubsw %xmm1,%xmm0
+  7e:	0f 38 0b 01[ 	]+pmulhrsw \(%rcx\),%mm0
+  82:	0f 38 0b c1[ 	]+pmulhrsw %mm1,%mm0
+  86:	66 0f 38 0b 01[ 	]+pmulhrsw \(%rcx\),%xmm0
+  8b:	66 0f 38 0b c1[ 	]+pmulhrsw %xmm1,%xmm0
+  90:	0f 38 00 01[ 	]+pshufb \(%rcx\),%mm0
+  94:	0f 38 00 c1[ 	]+pshufb %mm1,%mm0
+  98:	66 0f 38 00 01[ 	]+pshufb \(%rcx\),%xmm0
+  9d:	66 0f 38 00 c1[ 	]+pshufb %xmm1,%xmm0
+  a2:	0f 38 08 01[ 	]+psignb \(%rcx\),%mm0
+  a6:	0f 38 08 c1[ 	]+psignb %mm1,%mm0
+  aa:	66 0f 38 08 01[ 	]+psignb \(%rcx\),%xmm0
+  af:	66 0f 38 08 c1[ 	]+psignb %xmm1,%xmm0
+  b4:	0f 38 09 01[ 	]+psignw \(%rcx\),%mm0
+  b8:	0f 38 09 c1[ 	]+psignw %mm1,%mm0
+  bc:	66 0f 38 09 01[ 	]+psignw \(%rcx\),%xmm0
+  c1:	66 0f 38 09 c1[ 	]+psignw %xmm1,%xmm0
+  c6:	0f 38 0a 01[ 	]+psignd \(%rcx\),%mm0
+  ca:	0f 38 0a c1[ 	]+psignd %mm1,%mm0
+  ce:	66 0f 38 0a 01[ 	]+psignd \(%rcx\),%xmm0
+  d3:	66 0f 38 0a c1[ 	]+psignd %xmm1,%xmm0
+  d8:	0f 3a 0f 01 02[ 	]+palignr \$0x2,\(%rcx\),%mm0
+  dd:	0f 3a 0f c1 02[ 	]+palignr \$0x2,%mm1,%mm0
+  e2:	66 0f 3a 0f 01 02[ 	]+palignr \$0x2,\(%rcx\),%xmm0
+  e8:	66 0f 3a 0f c1 02[ 	]+palignr \$0x2,%xmm1,%xmm0
+  ee:	0f 38 1c 01[ 	]+pabsb  \(%rcx\),%mm0
+  f2:	0f 38 1c c1[ 	]+pabsb  %mm1,%mm0
+  f6:	66 0f 38 1c 01[ 	]+pabsb  \(%rcx\),%xmm0
+  fb:	66 0f 38 1c c1[ 	]+pabsb  %xmm1,%xmm0
+ 100:	0f 38 1d 01[ 	]+pabsw  \(%rcx\),%mm0
+ 104:	0f 38 1d c1[ 	]+pabsw  %mm1,%mm0
+ 108:	66 0f 38 1d 01[ 	]+pabsw  \(%rcx\),%xmm0
+ 10d:	66 0f 38 1d c1[ 	]+pabsw  %xmm1,%xmm0
+ 112:	0f 38 1e 01[ 	]+pabsd  \(%rcx\),%mm0
+ 116:	0f 38 1e c1[ 	]+pabsd  %mm1,%mm0
+ 11a:	66 0f 38 1e 01[ 	]+pabsd  \(%rcx\),%xmm0
+ 11f:	66 0f 38 1e c1[ 	]+pabsd  %xmm1,%xmm0
+#pass
diff --git a/gas/testsuite/gas/i386/x86-64-ssse3.s b/gas/testsuite/gas/i386/x86-64-ssse3.s
new file mode 100644
index 00000000000..f298ba6d55f
--- /dev/null
+++ b/gas/testsuite/gas/i386/x86-64-ssse3.s
@@ -0,0 +1,70 @@
+# 64bit SSSE3 New Instructions
+
+	.text
+foo:
+	phaddw		(%rcx),%mm0
+	phaddw		%mm1,%mm0
+	phaddw		(%rcx),%xmm0
+	phaddw		%xmm1,%xmm0
+	phaddd		(%rcx),%mm0
+	phaddd		%mm1,%mm0
+	phaddd		(%rcx),%xmm0
+	phaddd		%xmm1,%xmm0
+	phaddsw		(%rcx),%mm0
+	phaddsw		%mm1,%mm0
+	phaddsw		(%rcx),%xmm0
+	phaddsw		%xmm1,%xmm0
+	phsubw		(%rcx),%mm0
+	phsubw		%mm1,%mm0
+	phsubw		(%rcx),%xmm0
+	phsubw		%xmm1,%xmm0
+	phsubd		(%rcx),%mm0
+	phsubd		%mm1,%mm0
+	phsubd		(%rcx),%xmm0
+	phsubd		%xmm1,%xmm0
+	phsubsw		(%rcx),%mm0
+	phsubsw		%mm1,%mm0
+	phsubsw		(%rcx),%xmm0
+	phsubsw		%xmm1,%xmm0
+	pmaddubsw	(%rcx),%mm0
+	pmaddubsw	%mm1,%mm0
+	pmaddubsw	(%rcx),%xmm0
+	pmaddubsw	%xmm1,%xmm0
+	pmulhrsw	(%rcx),%mm0
+	pmulhrsw	%mm1,%mm0
+	pmulhrsw	(%rcx),%xmm0
+	pmulhrsw	%xmm1,%xmm0
+	pshufb		(%rcx),%mm0
+	pshufb		%mm1,%mm0
+	pshufb		(%rcx),%xmm0
+	pshufb		%xmm1,%xmm0
+	psignb		(%rcx),%mm0
+	psignb		%mm1,%mm0
+	psignb		(%rcx),%xmm0
+	psignb		%xmm1,%xmm0
+	psignw		(%rcx),%mm0
+	psignw		%mm1,%mm0
+	psignw		(%rcx),%xmm0
+	psignw		%xmm1,%xmm0
+	psignd		(%rcx),%mm0
+	psignd		%mm1,%mm0
+	psignd		(%rcx),%xmm0
+	psignd		%xmm1,%xmm0
+	palignr		$0x2,(%rcx),%mm0
+	palignr		$0x2,%mm1,%mm0
+	palignr		$0x2,(%rcx),%xmm0
+	palignr		$0x2,%xmm1,%xmm0
+	pabsb		(%rcx),%mm0
+	pabsb		%mm1,%mm0
+	pabsb		(%rcx),%xmm0
+	pabsb		%xmm1,%xmm0
+	pabsw		(%rcx),%mm0
+	pabsw		%mm1,%mm0
+	pabsw		(%rcx),%xmm0
+	pabsw		%xmm1,%xmm0
+	pabsd		(%rcx),%mm0
+	pabsd		%mm1,%mm0
+	pabsd		(%rcx),%xmm0
+	pabsd		%xmm1,%xmm0
+
+	.p2align	4,0