diff --git a/llvm/lib/Target/X86/X86InstrSSE.td b/llvm/lib/Target/X86/X86InstrSSE.td
index 45c7ccad8dd2..6e85d74a23b4 100644
--- a/llvm/lib/Target/X86/X86InstrSSE.td
+++ b/llvm/lib/Target/X86/X86InstrSSE.td
@@ -963,22 +963,22 @@ def ANDNPDrm : PDI<0x55, MRMSrcMem, (ops VR128:$dst, VR128:$src1,f128mem:$src2),
 }
 
 let isTwoAddress = 1 in {
-def CMPPSrr : PSI<0xC2, MRMSrcReg, 
-                  (ops VR128:$dst, VR128:$src1, VR128:$src, SSECC:$cc),
-                  "cmp${cc}ps {$src, $dst|$dst, $src}",
-                  [(set VR128:$dst, (int_x86_sse_cmp_ps VR128:$src1,
-                                     VR128:$src, imm:$cc))]>;
-def CMPPSrm : PSI<0xC2, MRMSrcMem, 
-                  (ops VR128:$dst, VR128:$src1, f128mem:$src, SSECC:$cc),
-                  "cmp${cc}ps {$src, $dst|$dst, $src}",
-                  [(set VR128:$dst, (int_x86_sse_cmp_ps VR128:$src1,
-                                     (load addr:$src), imm:$cc))]>;
-def CMPPDrr : PDI<0xC2, MRMSrcReg, 
-                  (ops VR128:$dst, VR128:$src1, VR128:$src, SSECC:$cc),
-                  "cmp${cc}pd {$src, $dst|$dst, $src}", []>;
-def CMPPDrm : PDI<0xC2, MRMSrcMem, 
-                  (ops VR128:$dst, VR128:$src1, f128mem:$src, SSECC:$cc),
-                  "cmp${cc}pd {$src, $dst|$dst, $src}", []>;
+def CMPPSrr : PSIi8<0xC2, MRMSrcReg, 
+                    (ops VR128:$dst, VR128:$src1, VR128:$src, SSECC:$cc),
+                    "cmp${cc}ps {$src, $dst|$dst, $src}",
+                    [(set VR128:$dst, (int_x86_sse_cmp_ps VR128:$src1,
+                                       VR128:$src, imm:$cc))]>;
+def CMPPSrm : PSIi8<0xC2, MRMSrcMem, 
+                    (ops VR128:$dst, VR128:$src1, f128mem:$src, SSECC:$cc),
+                    "cmp${cc}ps {$src, $dst|$dst, $src}",
+                    [(set VR128:$dst, (int_x86_sse_cmp_ps VR128:$src1,
+                                       (load addr:$src), imm:$cc))]>;
+def CMPPDrr : PDIi8<0xC2, MRMSrcReg, 
+                    (ops VR128:$dst, VR128:$src1, VR128:$src, SSECC:$cc),
+                    "cmp${cc}pd {$src, $dst|$dst, $src}", []>;
+def CMPPDrm : PDIi8<0xC2, MRMSrcMem, 
+                    (ops VR128:$dst, VR128:$src1, f128mem:$src, SSECC:$cc),
+                    "cmp${cc}pd {$src, $dst|$dst, $src}", []>;
 }
 
 // Shuffle and unpack instructions