Index: llvm/trunk/test/MC/X86/CLFLUSHOPT-32.s
===================================================================
--- llvm/trunk/test/MC/X86/CLFLUSHOPT-32.s
+++ llvm/trunk/test/MC/X86/CLFLUSHOPT-32.s
@@ -0,0 +1,26 @@
+// RUN: llvm-mc -triple i386-unknown-unknown --show-encoding %s | FileCheck %s
+
+// CHECK: clflushopt -485498096(%edx,%eax,4) 
+// CHECK: encoding: [0x66,0x0f,0xae,0xbc,0x82,0x10,0xe3,0x0f,0xe3]         
+clflushopt -485498096(%edx,%eax,4) 
+
+// CHECK: clflushopt 485498096(%edx,%eax,4) 
+// CHECK: encoding: [0x66,0x0f,0xae,0xbc,0x82,0xf0,0x1c,0xf0,0x1c]         
+clflushopt 485498096(%edx,%eax,4) 
+
+// CHECK: clflushopt 485498096(%edx) 
+// CHECK: encoding: [0x66,0x0f,0xae,0xba,0xf0,0x1c,0xf0,0x1c]         
+clflushopt 485498096(%edx) 
+
+// CHECK: clflushopt 485498096 
+// CHECK: encoding: [0x66,0x0f,0xae,0x3d,0xf0,0x1c,0xf0,0x1c]         
+clflushopt 485498096 
+
+// CHECK: clflushopt 64(%edx,%eax) 
+// CHECK: encoding: [0x66,0x0f,0xae,0x7c,0x02,0x40]         
+clflushopt 64(%edx,%eax) 
+
+// CHECK: clflushopt (%edx) 
+// CHECK: encoding: [0x66,0x0f,0xae,0x3a]         
+clflushopt (%edx) 
+
Index: llvm/trunk/test/MC/X86/CLFLUSHOPT-64.s
===================================================================
--- llvm/trunk/test/MC/X86/CLFLUSHOPT-64.s
+++ llvm/trunk/test/MC/X86/CLFLUSHOPT-64.s
@@ -0,0 +1,26 @@
+// RUN: llvm-mc -triple x86_64-unknown-unknown --show-encoding %s | FileCheck %s
+
+// CHECK: clflushopt 485498096 
+// CHECK: encoding: [0x66,0x0f,0xae,0x3c,0x25,0xf0,0x1c,0xf0,0x1c]         
+clflushopt 485498096 
+
+// CHECK: clflushopt 64(%rdx) 
+// CHECK: encoding: [0x66,0x0f,0xae,0x7a,0x40]         
+clflushopt 64(%rdx) 
+
+// CHECK: clflushopt 64(%rdx,%rax,4) 
+// CHECK: encoding: [0x66,0x0f,0xae,0x7c,0x82,0x40]         
+clflushopt 64(%rdx,%rax,4) 
+
+// CHECK: clflushopt -64(%rdx,%rax,4) 
+// CHECK: encoding: [0x66,0x0f,0xae,0x7c,0x82,0xc0]         
+clflushopt -64(%rdx,%rax,4) 
+
+// CHECK: clflushopt 64(%rdx,%rax) 
+// CHECK: encoding: [0x66,0x0f,0xae,0x7c,0x02,0x40]         
+clflushopt 64(%rdx,%rax) 
+
+// CHECK: clflushopt (%rdx) 
+// CHECK: encoding: [0x66,0x0f,0xae,0x3a]         
+clflushopt (%rdx) 
+
Index: llvm/trunk/test/MC/X86/CLFSH-32.s
===================================================================
--- llvm/trunk/test/MC/X86/CLFSH-32.s
+++ llvm/trunk/test/MC/X86/CLFSH-32.s
@@ -0,0 +1,26 @@
+// RUN: llvm-mc -triple i386-unknown-unknown --show-encoding %s | FileCheck %s
+
+// CHECK: clflush -485498096(%edx,%eax,4) 
+// CHECK: encoding: [0x0f,0xae,0xbc,0x82,0x10,0xe3,0x0f,0xe3]         
+clflush -485498096(%edx,%eax,4) 
+
+// CHECK: clflush 485498096(%edx,%eax,4) 
+// CHECK: encoding: [0x0f,0xae,0xbc,0x82,0xf0,0x1c,0xf0,0x1c]         
+clflush 485498096(%edx,%eax,4) 
+
+// CHECK: clflush 485498096(%edx) 
+// CHECK: encoding: [0x0f,0xae,0xba,0xf0,0x1c,0xf0,0x1c]         
+clflush 485498096(%edx) 
+
+// CHECK: clflush 485498096 
+// CHECK: encoding: [0x0f,0xae,0x3d,0xf0,0x1c,0xf0,0x1c]         
+clflush 485498096 
+
+// CHECK: clflush 64(%edx,%eax) 
+// CHECK: encoding: [0x0f,0xae,0x7c,0x02,0x40]         
+clflush 64(%edx,%eax) 
+
+// CHECK: clflush (%edx) 
+// CHECK: encoding: [0x0f,0xae,0x3a]         
+clflush (%edx) 
+
Index: llvm/trunk/test/MC/X86/CLFSH-64.s
===================================================================
--- llvm/trunk/test/MC/X86/CLFSH-64.s
+++ llvm/trunk/test/MC/X86/CLFSH-64.s
@@ -0,0 +1,26 @@
+// RUN: llvm-mc -triple x86_64-unknown-unknown --show-encoding %s | FileCheck %s
+
+// CHECK: clflush 485498096 
+// CHECK: encoding: [0x0f,0xae,0x3c,0x25,0xf0,0x1c,0xf0,0x1c]         
+clflush 485498096 
+
+// CHECK: clflush 64(%rdx) 
+// CHECK: encoding: [0x0f,0xae,0x7a,0x40]         
+clflush 64(%rdx) 
+
+// CHECK: clflush 64(%rdx,%rax,4) 
+// CHECK: encoding: [0x0f,0xae,0x7c,0x82,0x40]         
+clflush 64(%rdx,%rax,4) 
+
+// CHECK: clflush -64(%rdx,%rax,4) 
+// CHECK: encoding: [0x0f,0xae,0x7c,0x82,0xc0]         
+clflush -64(%rdx,%rax,4) 
+
+// CHECK: clflush 64(%rdx,%rax) 
+// CHECK: encoding: [0x0f,0xae,0x7c,0x02,0x40]         
+clflush 64(%rdx,%rax) 
+
+// CHECK: clflush (%rdx) 
+// CHECK: encoding: [0x0f,0xae,0x3a]         
+clflush (%rdx) 
+