Renumber SSE execution domains for better code size.

SSEDomainFix will collapse to the domain with the lower number when it has a
choice. The SSEPackedSingle domain often has smaller instructions, so prefer
that.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@99952 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Target/X86/X86InstrInfo.cpp b/lib/Target/X86/X86InstrInfo.cpp
index 614a211..d9b0960 100644
--- a/lib/Target/X86/X86InstrInfo.cpp
+++ b/lib/Target/X86/X86InstrInfo.cpp
@@ -3663,20 +3663,20 @@
 // by intrinsics.
 static const unsigned ReplaceableInstrs[][3] = {
   //PackedInt       PackedSingle     PackedDouble
-  { X86::MOVDQAmr,  X86::MOVAPSmr,   X86::MOVAPDmr  },
-  { X86::MOVDQArm,  X86::MOVAPSrm,   X86::MOVAPDrm  },
-  { X86::MOVDQArr,  X86::MOVAPSrr,   X86::MOVAPDrr  },
-  { X86::MOVDQUmr,  X86::MOVUPSmr,   X86::MOVUPDmr  },
-  { X86::MOVDQUrm,  X86::MOVUPSrm,   X86::MOVUPDrm  },
-  { X86::MOVNTDQmr, X86::MOVNTPSmr,  X86::MOVNTPDmr },
-  { X86::PANDNrm,   X86::ANDNPSrm,   X86::ANDNPDrm  },
-  { X86::PANDNrr,   X86::ANDNPSrr,   X86::ANDNPDrr  },
-  { X86::PANDrm,    X86::ANDPSrm,    X86::ANDPDrm   },
-  { X86::PANDrr,    X86::ANDPSrr,    X86::ANDPDrr   },
-  { X86::PORrm,     X86::ORPSrm,     X86::ORPDrm    },
-  { X86::PORrr,     X86::ORPSrr,     X86::ORPDrr    },
-  { X86::PXORrm,    X86::XORPSrm,    X86::XORPDrm   },
-  { X86::PXORrr,    X86::XORPSrr,    X86::XORPDrr   },
+  { X86::MOVAPSmr,   X86::MOVAPDmr,  X86::MOVDQAmr  },
+  { X86::MOVAPSrm,   X86::MOVAPDrm,  X86::MOVDQArm  },
+  { X86::MOVAPSrr,   X86::MOVAPDrr,  X86::MOVDQArr  },
+  { X86::MOVUPSmr,   X86::MOVUPDmr,  X86::MOVDQUmr  },
+  { X86::MOVUPSrm,   X86::MOVUPDrm,  X86::MOVDQUrm  },
+  { X86::MOVNTPSmr,  X86::MOVNTPDmr, X86::MOVNTDQmr },
+  { X86::ANDNPSrm,   X86::ANDNPDrm,  X86::PANDNrm   },
+  { X86::ANDNPSrr,   X86::ANDNPDrr,  X86::PANDNrr   },
+  { X86::ANDPSrm,    X86::ANDPDrm,   X86::PANDrm    },
+  { X86::ANDPSrr,    X86::ANDPDrr,   X86::PANDrr    },
+  { X86::ORPSrm,     X86::ORPDrm,    X86::PORrm     },
+  { X86::ORPSrr,     X86::ORPDrr,    X86::PORrr     },
+  { X86::XORPSrm,    X86::XORPDrm,   X86::PXORrm    },
+  { X86::XORPSrr,    X86::XORPDrr,   X86::PXORrr    },
 };
 
 // FIXME: Some shuffle and unpack instructions have equivalents in different
@@ -3692,8 +3692,8 @@
 std::pair<uint16_t, uint16_t>
 X86InstrInfo::GetSSEDomain(const MachineInstr *MI) const {
   uint16_t domain = (MI->getDesc().TSFlags >> X86II::SSEDomainShift) & 3;
-  return std::make_pair(domain, domain != NotSSEDomain &&
-                                lookup(MI->getOpcode(), domain) ? 0xe : 0);
+  return std::make_pair(domain,
+                        domain && lookup(MI->getOpcode(), domain) ? 0xe : 0);
 }
 
 void X86InstrInfo::SetSSEDomain(MachineInstr *MI, unsigned Domain) const {