From 9bb96fd87498a0bcf791e808ba2a7f1dc9209287 Mon Sep 17 00:00:00 2001 From: Kazu Hirata Date: Wed, 22 Mar 2023 00:31:48 -0700 Subject: [PATCH] [llvm] Use llvm::isNullConstant (NFC) --- llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp | 3 +-- llvm/lib/Target/AMDGPU/AMDGPUISelDAGToDAG.h | 6 +----- llvm/lib/Target/AMDGPU/R600ISelLowering.cpp | 6 ++---- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp index 5cf9497..a3667d9 100644 --- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp @@ -7386,8 +7386,7 @@ static SDValue getMemsetStores(SelectionDAG &DAG, const SDLoc &dl, FrameIndexSDNode *FI = dyn_cast(Dst); if (FI && !MFI.isFixedObjectIndex(FI->getIndex())) DstAlignCanChange = true; - bool IsZeroVal = - isa(Src) && cast(Src)->isZero(); + bool IsZeroVal = isNullConstant(Src); unsigned Limit = AlwaysInline ? ~0 : TLI.getMaxStoresPerMemset(OptSize); if (!TLI.findOptimalMemOpLowering( diff --git a/llvm/lib/Target/AMDGPU/AMDGPUISelDAGToDAG.h b/llvm/lib/Target/AMDGPU/AMDGPUISelDAGToDAG.h index ac5e9d0..a08b0fb 100644 --- a/llvm/lib/Target/AMDGPU/AMDGPUISelDAGToDAG.h +++ b/llvm/lib/Target/AMDGPU/AMDGPUISelDAGToDAG.h @@ -25,11 +25,7 @@ using namespace llvm; namespace { static inline bool isNullConstantOrUndef(SDValue V) { - if (V.isUndef()) - return true; - - ConstantSDNode *Const = dyn_cast(V); - return Const != nullptr && Const->isZero(); + return V.isUndef() || isNullConstant(V); } static inline bool getConstantValue(SDValue N, uint32_t &Out) { diff --git a/llvm/lib/Target/AMDGPU/R600ISelLowering.cpp b/llvm/lib/Target/AMDGPU/R600ISelLowering.cpp index d361df26..ad072cf 100644 --- a/llvm/lib/Target/AMDGPU/R600ISelLowering.cpp +++ b/llvm/lib/Target/AMDGPU/R600ISelLowering.cpp @@ -953,10 +953,8 @@ SDValue R600TargetLowering::lowerADDRSPACECAST(SDValue Op, unsigned SrcAS = ASC->getSrcAddressSpace(); unsigned DestAS = ASC->getDestAddressSpace(); - if (auto *ConstSrc = dyn_cast(Op.getOperand(0))) { - if (SrcAS == AMDGPUAS::FLAT_ADDRESS && ConstSrc->isZero()) - return DAG.getConstant(TM.getNullPointerValue(DestAS), SL, VT); - } + if (isNullConstant(Op.getOperand(0)) && SrcAS == AMDGPUAS::FLAT_ADDRESS) + return DAG.getConstant(TM.getNullPointerValue(DestAS), SL, VT); return Op; } -- 2.7.4