[AMDGPU] Partially revert my llvm::less_second patch (#136615)

kazutakahirata · web-flow · commit 515564aa6ebe · 2025-04-21T14:55:08.000-07:00
This patch partially reverts: commit 5e1b0f9 Author: Kazu Hirata <kazu@google.com> Date: Fri Apr 18 10:05:55 2025 -0700 to fix: LLVM :: CodeGen/AMDGPU/sched-group-barrier-pipeline-solver.mir LLVM :: CodeGen/AMDGPU/sched-group-barrier-pre-RA.mir under LLVM_ENABLE_EXPENSIVE_CHECKS.
diff --git a/llvm/lib/Target/AMDGPU/AMDGPUIGroupLP.cpp b/llvm/lib/Target/AMDGPU/AMDGPUIGroupLP.cpp
@@ -589,7 +589,7 @@ void PipelineSolver::populateReadyList(
   }
 
   if (UseCostHeur)
-    llvm::sort(ReadyList, llvm::less_second());
+    std::sort(ReadyList.begin(), ReadyList.end(), llvm::less_second());
 
   assert(ReadyList.size() == CurrSU.second.size());
 }

Original file line number	Diff line number	Diff line change
`@@ -589,7 +589,7 @@ void PipelineSolver::populateReadyList(`
`589`	`589`	`}`
`590`	`590`
`591`	`591`	`if (UseCostHeur)`
`592`		`- llvm::sort(ReadyList, llvm::less_second());`
	`592`	`+ std::sort(ReadyList.begin(), ReadyList.end(), llvm::less_second());`
`593`	`593`
`594`	`594`	`assert(ReadyList.size() == CurrSU.second.size());`
`595`	`595`	`}`