Skip to content

Conversation

@kazutakahirata
Copy link
Contributor

No description provided.

@llvmbot
Copy link
Member

llvmbot commented Apr 27, 2025

@llvm/pr-subscribers-backend-amdgpu

Author: Kazu Hirata (kazutakahirata)

Changes

Full diff: https://github.com/llvm/llvm-project/pull/137492.diff

1 Files Affected:

  • (modified) llvm/lib/Target/AMDGPU/AMDGPUIGroupLP.cpp (+22-27)
diff --git a/llvm/lib/Target/AMDGPU/AMDGPUIGroupLP.cpp b/llvm/lib/Target/AMDGPU/AMDGPUIGroupLP.cpp
index 4ff49c1e46dfe..a2b7cd088093a 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPUIGroupLP.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPUIGroupLP.cpp
@@ -1046,17 +1046,16 @@ class MFMAExpInterleaveOpt final : public IGLPStrategy {
       if (!SyncPipe.size())
         return false;
 
-      auto SuccSize = std::count_if(
-          SU->Succs.begin(), SU->Succs.end(),
-          [](const SDep &Succ) { return Succ.getKind() == SDep::Data; });
+      auto SuccSize = llvm::count_if(SU->Succs, [](const SDep &Succ) {
+        return Succ.getKind() == SDep::Data;
+      });
       if (SuccSize >= Size)
         return false;
 
       if (HasIntermediary) {
         for (auto Succ : SU->Succs) {
-          auto SuccSize = std::count_if(
-              Succ.getSUnit()->Succs.begin(), Succ.getSUnit()->Succs.end(),
-              [](const SDep &SuccSucc) {
+          auto SuccSize =
+              llvm::count_if(Succ.getSUnit()->Succs, [](const SDep &SuccSucc) {
                 return SuccSucc.getKind() == SDep::Data;
               });
           if (SuccSize >= Size)
@@ -1087,17 +1086,16 @@ class MFMAExpInterleaveOpt final : public IGLPStrategy {
       if (!SyncPipe.size())
         return false;
 
-      auto SuccSize = std::count_if(
-          SU->Succs.begin(), SU->Succs.end(),
-          [](const SDep &Succ) { return Succ.getKind() == SDep::Data; });
+      auto SuccSize = llvm::count_if(SU->Succs, [](const SDep &Succ) {
+        return Succ.getKind() == SDep::Data;
+      });
       if (SuccSize >= Size)
         return true;
 
       if (HasIntermediary) {
         for (auto Succ : SU->Succs) {
-          auto SuccSize = std::count_if(
-              Succ.getSUnit()->Succs.begin(), Succ.getSUnit()->Succs.end(),
-              [](const SDep &SuccSucc) {
+          auto SuccSize =
+              llvm::count_if(Succ.getSUnit()->Succs, [](const SDep &SuccSucc) {
                 return SuccSucc.getKind() == SDep::Data;
               });
           if (SuccSize >= Size)
@@ -1474,18 +1472,17 @@ bool MFMAExpInterleaveOpt::analyzeDAG(const SIInstrInfo *TII) {
   MFMAChainLength = MFMAPipeCount / MFMAChains;
 
   // The number of bit pack operations that depend on a single V_EXP
-  unsigned PackSuccCount = std::count_if(
-      PackSUs.begin(), PackSUs.end(), [this, &TempExp](SUnit *VPack) {
+  unsigned PackSuccCount =
+      llvm::count_if(PackSUs, [this, &TempExp](SUnit *VPack) {
         return DAG->IsReachable(VPack, *TempExp);
       });
 
   // The number of bit pack operations an MFMA depends on
   unsigned PackPredCount =
-      std::count_if((*TempMFMA)->Preds.begin(), (*TempMFMA)->Preds.end(),
-                    [&isBitPack](SDep &Pred) {
-                      auto Opc = Pred.getSUnit()->getInstr()->getOpcode();
-                      return isBitPack(Opc);
-                    });
+      llvm::count_if((*TempMFMA)->Preds, [&isBitPack](SDep &Pred) {
+        auto Opc = Pred.getSUnit()->getInstr()->getOpcode();
+        return isBitPack(Opc);
+      });
 
   auto *PackPred = llvm::find_if((*TempMFMA)->Preds, [&isBitPack](SDep &Pred) {
     auto Opc = Pred.getSUnit()->getInstr()->getOpcode();
@@ -1499,20 +1496,18 @@ bool MFMAExpInterleaveOpt::analyzeDAG(const SIInstrInfo *TII) {
   ExpRequirement = 0;
   // How many MFMAs depend on a single bit pack operation
   MFMAEnablement =
-      std::count_if(PackPred->getSUnit()->Succs.begin(),
-                    PackPred->getSUnit()->Succs.end(), [&TII](SDep &Succ) {
-                      return TII->isMFMAorWMMA(*Succ.getSUnit()->getInstr());
-                    });
+      llvm::count_if(PackPred->getSUnit()->Succs, [&TII](SDep &Succ) {
+        return TII->isMFMAorWMMA(*Succ.getSUnit()->getInstr());
+      });
 
   // The number of MFMAs that depend on a single V_EXP
   MFMAEnablement *= PackSuccCount;
 
   // The number of V_EXPs required to resolve all dependencies for an MFMA
   ExpRequirement =
-      std::count_if(ExpPipeCands.begin(), ExpPipeCands.end(),
-                    [this, &PackPred](SUnit *ExpBase) {
-                      return DAG->IsReachable(PackPred->getSUnit(), ExpBase);
-                    });
+      llvm::count_if(ExpPipeCands, [this, &PackPred](SUnit *ExpBase) {
+        return DAG->IsReachable(PackPred->getSUnit(), ExpBase);
+      });
 
   ExpRequirement *= PackPredCount;
   return true;

@kazutakahirata kazutakahirata merged commit 4f71e1e into llvm:main Apr 27, 2025
13 checks passed
@kazutakahirata kazutakahirata deleted the cleanup_001_range_llvm_count_if_AMDGPU branch April 27, 2025 07:05
IanWood1 pushed a commit to IanWood1/llvm-project that referenced this pull request May 6, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants