From 780ebc7ee53c605e9184e12a7d8b68d62353f070 Mon Sep 17 00:00:00 2001 From: Kevin McAfee Date: Fri, 10 Jan 2025 21:59:42 +0000 Subject: [PATCH 1/2] [NFC][NVPTX] Small style cleanup for NVPTXISelDAGToDAG.* --- llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp | 10 ++++++---- llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.h | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp b/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp index 1341f8a8fca1f..29b377c5739c1 100644 --- a/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp +++ b/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp @@ -2479,8 +2479,9 @@ bool NVPTXDAGToDAGISel::SelectDirectAddr(SDValue N, SDValue &Address) { } // symbol+offset -bool NVPTXDAGToDAGISel::SelectADDRsi_imp( - SDNode *OpNode, SDValue Addr, SDValue &Base, SDValue &Offset, MVT mvt) { +bool NVPTXDAGToDAGISel::SelectADDRsi_imp(SDNode *OpNode, SDValue Addr, + SDValue &Base, SDValue &Offset, + MVT VT) { if (isAddLike(Addr)) { if (ConstantSDNode *CN = dyn_cast(Addr.getOperand(1))) { SDValue base = Addr.getOperand(0); @@ -2507,8 +2508,9 @@ bool NVPTXDAGToDAGISel::SelectADDRsi64(SDNode *OpNode, SDValue Addr, } // register+offset -bool NVPTXDAGToDAGISel::SelectADDRri_imp( - SDNode *OpNode, SDValue Addr, SDValue &Base, SDValue &Offset, MVT mvt) { +bool NVPTXDAGToDAGISel::SelectADDRri_imp(SDNode *OpNode, SDValue Addr, + SDValue &Base, SDValue &Offset, + MVT VT) { if (FrameIndexSDNode *FIN = dyn_cast(Addr)) { Base = CurDAG->getTargetFrameIndex(FIN->getIndex(), mvt); Offset = CurDAG->getTargetConstant(0, SDLoc(OpNode), mvt); diff --git a/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.h b/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.h index 4b67a370c3fe0..8cadde8a82264 100644 --- a/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.h +++ b/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.h @@ -106,13 +106,13 @@ class LLVM_LIBRARY_VISIBILITY NVPTXDAGToDAGISel : public SelectionDAGISel { bool SelectDirectAddr(SDValue N, SDValue &Address); bool SelectADDRri_imp(SDNode *OpNode, SDValue Addr, SDValue &Base, - SDValue &Offset, MVT mvt); + SDValue &Offset, MVT VT); bool SelectADDRri(SDNode *OpNode, SDValue Addr, SDValue &Base, SDValue &Offset); bool SelectADDRri64(SDNode *OpNode, SDValue Addr, SDValue &Base, SDValue &Offset); bool SelectADDRsi_imp(SDNode *OpNode, SDValue Addr, SDValue &Base, - SDValue &Offset, MVT mvt); + SDValue &Offset, MVT VT); bool SelectADDRsi(SDNode *OpNode, SDValue Addr, SDValue &Base, SDValue &Offset); bool SelectADDRsi64(SDNode *OpNode, SDValue Addr, SDValue &Base, From 237c17c3c0fff3806f8e740778f9a6400a9f2966 Mon Sep 17 00:00:00 2001 From: Kevin McAfee Date: Fri, 10 Jan 2025 23:06:00 +0000 Subject: [PATCH 2/2] fix --- llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp b/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp index 29b377c5739c1..39f5571692058 100644 --- a/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp +++ b/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp @@ -2486,8 +2486,8 @@ bool NVPTXDAGToDAGISel::SelectADDRsi_imp(SDNode *OpNode, SDValue Addr, if (ConstantSDNode *CN = dyn_cast(Addr.getOperand(1))) { SDValue base = Addr.getOperand(0); if (SelectDirectAddr(base, Base)) { - Offset = CurDAG->getTargetConstant(CN->getZExtValue(), SDLoc(OpNode), - mvt); + Offset = + CurDAG->getTargetConstant(CN->getZExtValue(), SDLoc(OpNode), VT); return true; } } @@ -2512,8 +2512,8 @@ bool NVPTXDAGToDAGISel::SelectADDRri_imp(SDNode *OpNode, SDValue Addr, SDValue &Base, SDValue &Offset, MVT VT) { if (FrameIndexSDNode *FIN = dyn_cast(Addr)) { - Base = CurDAG->getTargetFrameIndex(FIN->getIndex(), mvt); - Offset = CurDAG->getTargetConstant(0, SDLoc(OpNode), mvt); + Base = CurDAG->getTargetFrameIndex(FIN->getIndex(), VT); + Offset = CurDAG->getTargetConstant(0, SDLoc(OpNode), VT); return true; } if (Addr.getOpcode() == ISD::TargetExternalSymbol || @@ -2528,7 +2528,7 @@ bool NVPTXDAGToDAGISel::SelectADDRri_imp(SDNode *OpNode, SDValue Addr, if (FrameIndexSDNode *FIN = dyn_cast(Addr.getOperand(0))) // Constant offset from frame ref. - Base = CurDAG->getTargetFrameIndex(FIN->getIndex(), mvt); + Base = CurDAG->getTargetFrameIndex(FIN->getIndex(), VT); else Base = Addr.getOperand(0);