diff options
author | Nate Begeman <natebegeman@mac.com> | 2005-10-13 18:34:58 +0000 |
---|---|---|
committer | Nate Begeman <natebegeman@mac.com> | 2005-10-13 18:34:58 +0000 |
commit | bfd65a05c96988d175dec57b0b59e7dca2be04c1 (patch) | |
tree | a6dda3b465858c7235f1fb492c05c5caa7a9fd00 | |
parent | 67a44cd3aa26003a6bc2cd755516c9cc12c36ca0 (diff) | |
download | external_llvm-bfd65a05c96988d175dec57b0b59e7dca2be04c1.zip external_llvm-bfd65a05c96988d175dec57b0b59e7dca2be04c1.tar.gz external_llvm-bfd65a05c96988d175dec57b0b59e7dca2be04c1.tar.bz2 |
Fix the remaining DAGCombiner issues pointed out by sabre. This should fix
the remainder of the failures introduced by my patch last night.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@23714 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/CodeGen/SelectionDAG/DAGCombiner.cpp | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/lib/CodeGen/SelectionDAG/DAGCombiner.cpp index 0a20d9c..61b377d 100644 --- a/lib/CodeGen/SelectionDAG/DAGCombiner.cpp +++ b/lib/CodeGen/SelectionDAG/DAGCombiner.cpp @@ -801,10 +801,9 @@ SDOperand DAGCombiner::visitAND(SDNode *N) { // fold (zext_inreg (extload x)) -> (zextload x) if (N1C && N0.getOpcode() == ISD::EXTLOAD) { MVT::ValueType EVT = cast<VTSDNode>(N0.getOperand(3))->getVT(); - // If the type of the zext_inreg and the extload match, and we're running - // before Legalize, or the resulting zextload is legal on the target, then - // go ahead and do the fold. - if ((N1C->getValue() == (1ULL << MVT::getSizeInBits(EVT))-1) && + // If we zero all the possible extended bits, then we can turn this into + // a zextload if we are running before legalize or the operation is legal. + if (MaskedValueIsZero(SDOperand(N,0), ~0ULL<<MVT::getSizeInBits(EVT),TLI) && (!AfterLegalize || TLI.isOperationLegal(ISD::ZEXTLOAD, EVT))) { SDOperand ExtLoad = DAG.getExtLoad(ISD::ZEXTLOAD, VT, N0.getOperand(0), N0.getOperand(1), N0.getOperand(2), @@ -817,12 +816,10 @@ SDOperand DAGCombiner::visitAND(SDNode *N) { // fold (zext_inreg (sextload x)) -> (zextload x) iff load has one use if (N1C && N0.getOpcode() == ISD::SEXTLOAD && N0.Val->hasNUsesOfValue(1, 0)) { MVT::ValueType EVT = cast<VTSDNode>(N0.getOperand(3))->getVT(); - // If the type of the zext_inreg and the extload match, and we're running - // before Legalize, or the resulting zextload is legal on the target, then - // go ahead and do the fold. - if ((N1C->getValue() == (1ULL << MVT::getSizeInBits(EVT))-1) && - (!AfterLegalize || - TargetLowering::Legal == TLI.getOperationAction(ISD::ZEXTLOAD, EVT))) { + // If we zero all the possible extended bits, then we can turn this into + // a zextload if we are running before legalize or the operation is legal. + if (MaskedValueIsZero(SDOperand(N,0), ~0ULL<<MVT::getSizeInBits(EVT),TLI) && + (!AfterLegalize || TLI.isOperationLegal(ISD::ZEXTLOAD, EVT))) { SDOperand ExtLoad = DAG.getExtLoad(ISD::ZEXTLOAD, VT, N0.getOperand(0), N0.getOperand(1), N0.getOperand(2), EVT); @@ -1324,25 +1321,23 @@ SDOperand DAGCombiner::visitSIGN_EXTEND_INREG(SDNode *N) { // fold (sext_inreg (extload x)) -> (sextload x) if (N0.getOpcode() == ISD::EXTLOAD && EVT == cast<VTSDNode>(N0.getOperand(3))->getVT() && - (!AfterLegalize || - (TargetLowering::Legal == TLI.getOperationAction(ISD::SEXTLOAD, EVT)))) { + (!AfterLegalize || TLI.isOperationLegal(ISD::SEXTLOAD, EVT))) { SDOperand ExtLoad = DAG.getExtLoad(ISD::SEXTLOAD, VT, N0.getOperand(0), N0.getOperand(1), N0.getOperand(2), EVT); - CombineTo(N0.Val, ExtLoad, ExtLoad.getOperand(0)); WorkList.push_back(N); + CombineTo(N0.Val, ExtLoad, ExtLoad.getValue(1)); return SDOperand(); } // fold (sext_inreg (zextload x)) -> (sextload x) iff load has one use if (N0.getOpcode() == ISD::ZEXTLOAD && N0.Val->hasNUsesOfValue(1, 0) && EVT == cast<VTSDNode>(N0.getOperand(3))->getVT() && - (!AfterLegalize || - (TargetLowering::Legal == TLI.getOperationAction(ISD::SEXTLOAD, EVT)))) { + (!AfterLegalize || TLI.isOperationLegal(ISD::SEXTLOAD, EVT))) { SDOperand ExtLoad = DAG.getExtLoad(ISD::SEXTLOAD, VT, N0.getOperand(0), N0.getOperand(1), N0.getOperand(2), EVT); - CombineTo(N0.Val, ExtLoad, ExtLoad.getOperand(0)); WorkList.push_back(N); + CombineTo(N0.Val, ExtLoad, ExtLoad.getValue(1)); return SDOperand(); } return SDOperand(); |