maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[X86] Don't pass ParitySrc array into isAddSubOrSubAddMask. Instead use a bool output parameter to get the real piece of info we care about. NFC 

The ParitySrc array is more of an implementation detail. A single bool to get the final parity is sufficient.

llvm-svn: 333935
This commit is contained in:
Craig Topper 2018-06-04 17:58:45 +00:00
parent 838c07c531
commit 1f956e2c5f
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
llvm/lib/Target/X86/X86ISelLowering.cpp
View File

@ -30452,8 +30452,9 @@ static SDValue combineTargetShuffle(SDValue N, SelectionDAG &DAG,
/// Checks if the shuffle mask takes subsequent elements /// Checks if the shuffle mask takes subsequent elements
/// alternately from two vectors. /// alternately from two vectors.
/// For example <0, 5, 2, 7> or <8, 1, 10, 3, 12, 5, 14, 7> are both correct. /// For example <0, 5, 2, 7> or <8, 1, 10, 3, 12, 5, 14, 7> are both correct.
static bool isAddSubOrSubAddMask(ArrayRef<int> Mask, int ParitySrc[2]) { static bool isAddSubOrSubAddMask(ArrayRef<int> Mask, bool &Op0Even) {
int ParitySrc[2] = {-1, -1};
unsigned Size = Mask.size(); unsigned Size = Mask.size();
for (unsigned i = 0; i != Size; ++i) { for (unsigned i = 0; i != Size; ++i) {
int M = Mask[i]; int M = Mask[i];
@ -30475,6 +30476,7 @@ static bool isAddSubOrSubAddMask(ArrayRef<int> Mask, int ParitySrc[2]) {
if (ParitySrc[0] < 0 || ParitySrc[1] < 0 || ParitySrc[0] == ParitySrc[1]) if (ParitySrc[0] < 0 || ParitySrc[1] < 0 || ParitySrc[0] == ParitySrc[1])
return false; return false;
Op0Even = ParitySrc[0] == 0;
return true; return true;
} }
@ -30533,13 +30535,13 @@ static bool isAddSubOrSubAdd(SDNode *N, const X86Subtarget &Subtarget,
} }
ArrayRef<int> Mask = cast<ShuffleVectorSDNode>(N)->getMask(); ArrayRef<int> Mask = cast<ShuffleVectorSDNode>(N)->getMask();
int ParitySrc[2] = {-1, -1}; bool Op0Even;
if (!isAddSubOrSubAddMask(Mask, ParitySrc)) if (!isAddSubOrSubAddMask(Mask, Op0Even))
return false; return false;
// It's a subadd if the vector in the even parity is an FADD. // It's a subadd if the vector in the even parity is an FADD.
IsSubAdd = ParitySrc[0] == 0 ? V1->getOpcode() == ISD::FADD IsSubAdd = Op0Even ? V1->getOpcode() == ISD::FADD
: V2->getOpcode() == ISD::FADD; : V2->getOpcode() == ISD::FADD;
Opnd0 = LHS; Opnd0 = LHS;
Opnd1 = RHS; Opnd1 = RHS;
@ -30576,13 +30578,13 @@ static SDValue combineShuffleToFMAddSub(SDNode *N,
// Check for correct shuffle mask. // Check for correct shuffle mask.
ArrayRef<int> Mask = cast<ShuffleVectorSDNode>(N)->getMask(); ArrayRef<int> Mask = cast<ShuffleVectorSDNode>(N)->getMask();
int ParitySrc[2] = {-1, -1}; bool Op0Even;
if (!isAddSubOrSubAddMask(Mask, ParitySrc)) if (!isAddSubOrSubAddMask(Mask, Op0Even))
return SDValue(); return SDValue();
// FMAddSub takes zeroth operand from FMSub node. // FMAddSub takes zeroth operand from FMSub node.
SDLoc DL(N); SDLoc DL(N);
bool IsSubAdd = ParitySrc[0] == 0 ? Op0 == FMAdd : Op1 == FMAdd; bool IsSubAdd = Op0Even ? Op0 == FMAdd : Op1 == FMAdd;
unsigned Opcode = IsSubAdd ? X86ISD::FMSUBADD : X86ISD::FMADDSUB; unsigned Opcode = IsSubAdd ? X86ISD::FMSUBADD : X86ISD::FMADDSUB;
return DAG.getNode(Opcode, DL, VT, FMAdd.getOperand(0), FMAdd.getOperand(1), return DAG.getNode(Opcode, DL, VT, FMAdd.getOperand(0), FMAdd.getOperand(1),
FMAdd.getOperand(2)); FMAdd.getOperand(2));