RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-19 02:52:53 +02:00
Code Issues Projects Releases Wiki Activity

push fast-math check for machine-combiner reassociations into instruction-type check; NFC

Browse Source 
This makes it simpler to add instruction types that don't depend on fast-math.

llvm-svn: 243596
This commit is contained in:
Sanjay Patel 2015-07-30 00:04:21 +00:00
parent a4c7b9e720
commit 1a04fcfdba
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Target/X86/X86InstrInfo.cpp
View File

@ -6348,8 +6348,8 @@ static bool hasReassocSibling(const MachineInstr &Inst, bool &Commuted) {
// TODO: There are many more machine instruction opcodes to match: // TODO: There are many more machine instruction opcodes to match:
// 1. Other data types (integer, vectors) // 1. Other data types (integer, vectors)
// 2. Other math / logic operations (and, or) // 2. Other math / logic operations (and, or)
static bool isAssociativeAndCommutative(unsigned Opcode) { static bool isAssociativeAndCommutative(const MachineInstr &Inst) {
switch (Opcode) { switch (Inst.getOpcode()) {
case X86::ADDSDrr: case X86::ADDSDrr:
case X86::ADDSSrr: case X86::ADDSSrr:
case X86::VADDSDrr: case X86::VADDSDrr:
@ -6358,7 +6358,7 @@ static bool isAssociativeAndCommutative(unsigned Opcode) {
case X86::MULSSrr: case X86::MULSSrr:
case X86::VMULSDrr: case X86::VMULSDrr:
case X86::VMULSSrr: case X86::VMULSSrr:
return true; return Inst.getParent()->getParent()->getTarget().Options.UnsafeFPMath;
default: default:
return false; return false;
} }
@ -6374,7 +6374,7 @@ static bool isReassocCandidate(const MachineInstr &Inst, bool &Commuted) {
// 2. The instruction must have virtual register definitions for its // 2. The instruction must have virtual register definitions for its
// operands in the same basic block. // operands in the same basic block.
// 3. The instruction must have a reassociable sibling. // 3. The instruction must have a reassociable sibling.
if (isAssociativeAndCommutative(Inst.getOpcode()) && if (isAssociativeAndCommutative(Inst) &&
hasVirtualRegDefsInBasicBlock(Inst, Inst.getParent()) && hasVirtualRegDefsInBasicBlock(Inst, Inst.getParent()) &&
hasReassocSibling(Inst, Commuted)) hasReassocSibling(Inst, Commuted))
return true; return true;
@ -6391,9 +6391,6 @@ static bool isReassocCandidate(const MachineInstr &Inst, bool &Commuted) {
// that pattern. // that pattern.
bool X86InstrInfo::getMachineCombinerPatterns(MachineInstr &Root, bool X86InstrInfo::getMachineCombinerPatterns(MachineInstr &Root,
SmallVectorImpl<MachineCombinerPattern::MC_PATTERN> &Patterns) const { SmallVectorImpl<MachineCombinerPattern::MC_PATTERN> &Patterns) const {
if (!Root.getParent()->getParent()->getTarget().Options.UnsafeFPMath)
return false;
// TODO: There is nothing x86-specific here except the instruction type. // TODO: There is nothing x86-specific here except the instruction type.
// This logic could be hoisted into the machine combiner pass itself. // This logic could be hoisted into the machine combiner pass itself.