From 1d0005a69ac812ea0ff069052daf4c2ea0242a48 Mon Sep 17 00:00:00 2001 From: Tim Gymnich Date: Sat, 29 Mar 2025 11:51:29 +0100 Subject: [GlobalISel][NFC] Rename GISelKnownBits to GISelValueTracking (#133466) - rename `GISelKnownBits` to `GISelValueTracking` to analyze more than just `KnownBits` in the future --- .../Target/AMDGPU/AMDGPUPostLegalizerCombiner.cpp | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'llvm/lib/Target/AMDGPU/AMDGPUPostLegalizerCombiner.cpp') diff --git a/llvm/lib/Target/AMDGPU/AMDGPUPostLegalizerCombiner.cpp b/llvm/lib/Target/AMDGPU/AMDGPUPostLegalizerCombiner.cpp index 888817e52e35..b2a8143b82ab 100644 --- a/llvm/lib/Target/AMDGPU/AMDGPUPostLegalizerCombiner.cpp +++ b/llvm/lib/Target/AMDGPU/AMDGPUPostLegalizerCombiner.cpp @@ -20,7 +20,7 @@ #include "llvm/CodeGen/GlobalISel/CombinerHelper.h" #include "llvm/CodeGen/GlobalISel/CombinerInfo.h" #include "llvm/CodeGen/GlobalISel/GIMatchTableExecutorImpl.h" -#include "llvm/CodeGen/GlobalISel/GISelKnownBits.h" +#include "llvm/CodeGen/GlobalISel/GISelValueTracking.h" #include "llvm/CodeGen/GlobalISel/GenericMachineInstrs.h" #include "llvm/CodeGen/GlobalISel/MIPatternMatch.h" #include "llvm/CodeGen/MachineDominators.h" @@ -53,7 +53,7 @@ protected: public: AMDGPUPostLegalizerCombinerImpl( MachineFunction &MF, CombinerInfo &CInfo, const TargetPassConfig *TPC, - GISelKnownBits &KB, GISelCSEInfo *CSEInfo, + GISelValueTracking &VT, GISelCSEInfo *CSEInfo, const AMDGPUPostLegalizerCombinerImplRuleConfig &RuleConfig, const GCNSubtarget &STI, MachineDominatorTree *MDT, const LegalizerInfo *LI); @@ -129,12 +129,12 @@ private: AMDGPUPostLegalizerCombinerImpl::AMDGPUPostLegalizerCombinerImpl( MachineFunction &MF, CombinerInfo &CInfo, const TargetPassConfig *TPC, - GISelKnownBits &KB, GISelCSEInfo *CSEInfo, + GISelValueTracking &VT, GISelCSEInfo *CSEInfo, const AMDGPUPostLegalizerCombinerImplRuleConfig &RuleConfig, const GCNSubtarget &STI, MachineDominatorTree *MDT, const LegalizerInfo *LI) - : Combiner(MF, CInfo, TPC, &KB, CSEInfo), RuleConfig(RuleConfig), STI(STI), + : Combiner(MF, CInfo, TPC, &VT, CSEInfo), RuleConfig(RuleConfig), STI(STI), TII(*STI.getInstrInfo()), - Helper(Observer, B, /*IsPreLegalize*/ false, &KB, MDT, LI, STI), + Helper(Observer, B, /*IsPreLegalize*/ false, &VT, MDT, LI, STI), #define GET_GICOMBINER_CONSTRUCTOR_INITS #include "AMDGPUGenPostLegalizeGICombiner.inc" #undef GET_GICOMBINER_CONSTRUCTOR_INITS @@ -218,7 +218,7 @@ bool AMDGPUPostLegalizerCombinerImpl::matchUCharToFloat( unsigned SrcSize = MRI.getType(SrcReg).getSizeInBits(); assert(SrcSize == 16 || SrcSize == 32 || SrcSize == 64); const APInt Mask = APInt::getHighBitsSet(SrcSize, SrcSize - 8); - return Helper.getKnownBits()->maskedValueIsZero(SrcReg, Mask); + return Helper.getValueTracking()->maskedValueIsZero(SrcReg, Mask); } return false; @@ -421,14 +421,14 @@ bool AMDGPUPostLegalizerCombinerImpl::matchCombine_s_mul_u64( if (MRI.getType(Src0) != LLT::scalar(64)) return false; - if (KB->getKnownBits(Src1).countMinLeadingZeros() >= 32 && - KB->getKnownBits(Src0).countMinLeadingZeros() >= 32) { + if (VT->getKnownBits(Src1).countMinLeadingZeros() >= 32 && + VT->getKnownBits(Src0).countMinLeadingZeros() >= 32) { NewOpcode = AMDGPU::G_AMDGPU_S_MUL_U64_U32; return true; } - if (KB->computeNumSignBits(Src1) >= 33 && - KB->computeNumSignBits(Src0) >= 33) { + if (VT->computeNumSignBits(Src1) >= 33 && + VT->computeNumSignBits(Src0) >= 33) { NewOpcode = AMDGPU::G_AMDGPU_S_MUL_I64_I32; return true; } @@ -462,8 +462,8 @@ void AMDGPUPostLegalizerCombiner::getAnalysisUsage(AnalysisUsage &AU) const { AU.addRequired(); AU.setPreservesCFG(); getSelectionDAGFallbackAnalysisUsage(AU); - AU.addRequired(); - AU.addPreserved(); + AU.addRequired(); + AU.addPreserved(); if (!IsOptNone) { AU.addRequired(); AU.addPreserved(); @@ -492,7 +492,7 @@ bool AMDGPUPostLegalizerCombiner::runOnMachineFunction(MachineFunction &MF) { const AMDGPULegalizerInfo *LI = static_cast(ST.getLegalizerInfo()); - GISelKnownBits *KB = &getAnalysis().get(MF); + GISelValueTracking *VT = &getAnalysis().get(MF); MachineDominatorTree *MDT = IsOptNone ? nullptr : &getAnalysis().getDomTree(); @@ -504,7 +504,7 @@ bool AMDGPUPostLegalizerCombiner::runOnMachineFunction(MachineFunction &MF) { CInfo.ObserverLvl = CombinerInfo::ObserverLevel::SinglePass; // Legalizer performs DCE, so a full DCE pass is unnecessary. CInfo.EnableFullDCE = false; - AMDGPUPostLegalizerCombinerImpl Impl(MF, CInfo, TPC, *KB, /*CSEInfo*/ nullptr, + AMDGPUPostLegalizerCombinerImpl Impl(MF, CInfo, TPC, *VT, /*CSEInfo*/ nullptr, RuleConfig, ST, MDT, LI); return Impl.combineMachineInstrs(); } @@ -514,7 +514,7 @@ INITIALIZE_PASS_BEGIN(AMDGPUPostLegalizerCombiner, DEBUG_TYPE, "Combine AMDGPU machine instrs after legalization", false, false) INITIALIZE_PASS_DEPENDENCY(TargetPassConfig) -INITIALIZE_PASS_DEPENDENCY(GISelKnownBitsAnalysis) +INITIALIZE_PASS_DEPENDENCY(GISelValueTrackingAnalysis) INITIALIZE_PASS_END(AMDGPUPostLegalizerCombiner, DEBUG_TYPE, "Combine AMDGPU machine instrs after legalization", false, false) -- cgit v1.2.3