- Notifications
You must be signed in to change notification settings - Fork14.5k
release/21.x: [RISCV] Remove incorrect and untested FrameIndex support from SelectAddrRegImm9. (#148779)#148913
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Conversation
@lenary What do you think about merging this PR to the release branch? |
@llvm/pr-subscribers-backend-risc-v Author: None (llvmbot) ChangesBackport63d099a Requested by: @topperc Full diff:https://github.com/llvm/llvm-project/pull/148913.diff 1 Files Affected:
diff --git a/llvm/lib/Target/RISCV/RISCVISelDAGToDAG.cpp b/llvm/lib/Target/RISCV/RISCVISelDAGToDAG.cppindex 666c76b21e631..880e6b0d48892 100644--- a/llvm/lib/Target/RISCV/RISCVISelDAGToDAG.cpp+++ b/llvm/lib/Target/RISCV/RISCVISelDAGToDAG.cpp@@ -2936,8 +2936,8 @@ bool RISCVDAGToDAGISel::SelectAddrRegImm(SDValue Addr, SDValue &Base, /// Similar to SelectAddrRegImm, except that the offset is restricted to uimm9. bool RISCVDAGToDAGISel::SelectAddrRegImm9(SDValue Addr, SDValue &Base, SDValue &Offset) {- if (SelectAddrFrameIndex(Addr, Base, Offset))- return true;+ // FIXME: Support FrameIndex. Need to teach eliminateFrameIndex that only+ // a 9-bit immediate can be folded. SDLoc DL(Addr); MVT VT = Addr.getSimpleValueType();@@ -2947,8 +2947,8 @@ bool RISCVDAGToDAGISel::SelectAddrRegImm9(SDValue Addr, SDValue &Base, if (isUInt<9>(CVal)) { Base = Addr.getOperand(0);- if (auto *FIN = dyn_cast<FrameIndexSDNode>(Base))- Base = CurDAG->getTargetFrameIndex(FIN->getIndex(), VT);+ // FIXME: Support FrameIndex. Need to teach eliminateFrameIndex that only+ // a 9-bit immediate can be folded. Offset = CurDAG->getSignedTargetConstant(CVal, DL, VT); return true; } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
LGTM.
…ddrRegImm9. (llvm#148779)To fold a FrameIndex, we need to teach eliminateFrameIndex to respectthe uimm9 range.(cherry picked from commit63d099a)
@topperc (or anyone else). If you would like to add a note about this fix in the release notes (completely optional). Please reply to this comment with a one or two sentence description of the fix. When you are done, please add the release:note label to this PR. |
Backport63d099a
Requested by:@topperc