diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Target/ARM/ARMExpandPseudoInsts.cpp | 2 | ||||
| -rw-r--r-- | lib/Target/ARM/ARMISelDAGToDAG.cpp | 2 | ||||
| -rw-r--r-- | lib/Target/ARM/ARMInstrNEON.td | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/lib/Target/ARM/ARMExpandPseudoInsts.cpp b/lib/Target/ARM/ARMExpandPseudoInsts.cpp index 35f3c25500..2de0fa60f3 100644 --- a/lib/Target/ARM/ARMExpandPseudoInsts.cpp +++ b/lib/Target/ARM/ARMExpandPseudoInsts.cpp @@ -314,7 +314,7 @@ static const NEONLdStTableEntry NEONLdStTable[] = { { ARM::VST2d16PseudoWB_fixed, ARM::VST2d16wb_fixed, false, true, false, SingleSpc, 2, 4 ,false}, { ARM::VST2d16PseudoWB_register, ARM::VST2d16wb_register, false, true, true, SingleSpc, 2, 4 ,false}, { ARM::VST2d32Pseudo, ARM::VST2d32, false, false, false, SingleSpc, 2, 2 ,false}, -{ ARM::VST2d32PseudoWB_fixed, ARM::VST2d32wb_fixed, false, true, true, SingleSpc, 2, 2 ,false}, +{ ARM::VST2d32PseudoWB_fixed, ARM::VST2d32wb_fixed, false, true, false, SingleSpc, 2, 2 ,false}, { ARM::VST2d32PseudoWB_register, ARM::VST2d32wb_register, false, true, true, SingleSpc, 2, 2 ,false}, { ARM::VST2d8Pseudo, ARM::VST2d8, false, false, false, SingleSpc, 2, 8 ,false}, { ARM::VST2d8PseudoWB_fixed, ARM::VST2d8wb_fixed, false, true, false, SingleSpc, 2, 8 ,false}, diff --git a/lib/Target/ARM/ARMISelDAGToDAG.cpp b/lib/Target/ARM/ARMISelDAGToDAG.cpp index 7bd0bace90..d66d05ac73 100644 --- a/lib/Target/ARM/ARMISelDAGToDAG.cpp +++ b/lib/Target/ARM/ARMISelDAGToDAG.cpp @@ -1822,7 +1822,7 @@ SDNode *ARMDAGToDAGISel::SelectVST(SDNode *N, bool isUpdating, unsigned NumVecs, Opc = getVLDSTRegisterUpdateOpcode(Opc); // We use a VST1 for v1i64 even if the pseudo says vld2/3/4, so // check for that explicitly too. Horribly hacky, but temporary. - if ((NumVecs != 1 && Opc != ARM::VST1q64PseudoWB_fixed) || + if ((NumVecs > 2 && Opc != ARM::VST1q64PseudoWB_fixed) || !isa<ConstantSDNode>(Inc.getNode())) Ops.push_back(isa<ConstantSDNode>(Inc.getNode()) ? Reg0 : Inc); } diff --git a/lib/Target/ARM/ARMInstrNEON.td b/lib/Target/ARM/ARMInstrNEON.td index 2c564a7e8e..1e3410221e 100644 --- a/lib/Target/ARM/ARMInstrNEON.td +++ b/lib/Target/ARM/ARMInstrNEON.td @@ -1673,12 +1673,12 @@ defm VST2q8wb : VST2QWB<{0,0,?,?}, "8">; defm VST2q16wb : VST2QWB<{0,1,?,?}, "16">; defm VST2q32wb : VST2QWB<{1,0,?,?}, "32">; -def VST2d8PseudoWB_fixed : VSTQWBPseudo<IIC_VST2u>; -def VST2d16PseudoWB_fixed : VSTQWBPseudo<IIC_VST2u>; -def VST2d32PseudoWB_fixed : VSTQWBPseudo<IIC_VST2u>; -def VST2d8PseudoWB_register : VSTQWBPseudo<IIC_VST2u>; -def VST2d16PseudoWB_register : VSTQWBPseudo<IIC_VST2u>; -def VST2d32PseudoWB_register : VSTQWBPseudo<IIC_VST2u>; +def VST2d8PseudoWB_fixed : VSTQWBfixedPseudo<IIC_VST2u>; +def VST2d16PseudoWB_fixed : VSTQWBfixedPseudo<IIC_VST2u>; +def VST2d32PseudoWB_fixed : VSTQWBfixedPseudo<IIC_VST2u>; +def VST2d8PseudoWB_register : VSTQWBregisterPseudo<IIC_VST2u>; +def VST2d16PseudoWB_register : VSTQWBregisterPseudo<IIC_VST2u>; +def VST2d32PseudoWB_register : VSTQWBregisterPseudo<IIC_VST2u>; def VST2q8PseudoWB_fixed : VSTQQWBPseudo<IIC_VST2x2u>; def VST2q16PseudoWB_fixed : VSTQQWBPseudo<IIC_VST2x2u>; |