From 30e532229ef21ab0889fb752273ad35edcce4298 Mon Sep 17 00:00:00 2001 From: Cullen Rhodes Date: Wed, 5 Feb 2025 16:36:06 +0000 Subject: [PATCH 1/2] [MISched][NFC] Remove unused heuristic NextDefUse from enum Heuristic was removed in 46533e614b78 due to being ineffective. --- llvm/include/llvm/CodeGen/MachineScheduler.h | 2 +- llvm/lib/CodeGen/MachineScheduler.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/llvm/include/llvm/CodeGen/MachineScheduler.h b/llvm/include/llvm/CodeGen/MachineScheduler.h index e1f1a1efecc72..1a3640f27cb98 100644 --- a/llvm/include/llvm/CodeGen/MachineScheduler.h +++ b/llvm/include/llvm/CodeGen/MachineScheduler.h @@ -1080,7 +1080,7 @@ class GenericSchedulerBase : public MachineSchedStrategy { enum CandReason : uint8_t { NoCand, Only1, PhysReg, RegExcess, RegCritical, Stall, Cluster, Weak, RegMax, ResourceReduce, ResourceDemand, BotHeightReduce, BotPathReduce, - TopDepthReduce, TopPathReduce, NextDefUse, NodeOrder}; + TopDepthReduce, TopPathReduce, NodeOrder}; #ifndef NDEBUG static const char *getReasonStr(GenericSchedulerBase::CandReason Reason); diff --git a/llvm/lib/CodeGen/MachineScheduler.cpp b/llvm/lib/CodeGen/MachineScheduler.cpp index df90077b15f33..42dc2f148f598 100644 --- a/llvm/lib/CodeGen/MachineScheduler.cpp +++ b/llvm/lib/CodeGen/MachineScheduler.cpp @@ -3236,7 +3236,6 @@ const char *GenericSchedulerBase::getReasonStr( case TopPathReduce: return "TOP-PATH "; case BotHeightReduce:return "BOT-HEIGHT"; case BotPathReduce: return "BOT-PATH "; - case NextDefUse: return "DEF-USE "; case NodeOrder: return "ORDER "; }; llvm_unreachable("Unknown reason!"); From 6bb66387fb2f7a965760ab39904ba49ddcf6d436 Mon Sep 17 00:00:00 2001 From: Cullen Rhodes Date: Wed, 5 Feb 2025 16:52:59 +0000 Subject: [PATCH 2/2] run clang-format Format of GenericSchedulerBase::getReasonStr switch is preferred, so I've disabled clang-format there --- llvm/include/llvm/CodeGen/MachineScheduler.h | 20 +++++++++++++++++--- llvm/lib/CodeGen/MachineScheduler.cpp | 2 ++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/llvm/include/llvm/CodeGen/MachineScheduler.h b/llvm/include/llvm/CodeGen/MachineScheduler.h index 1a3640f27cb98..5b001cc4dad5e 100644 --- a/llvm/include/llvm/CodeGen/MachineScheduler.h +++ b/llvm/include/llvm/CodeGen/MachineScheduler.h @@ -1078,9 +1078,23 @@ class GenericSchedulerBase : public MachineSchedStrategy { /// Represent the type of SchedCandidate found within a single queue. /// pickNodeBidirectional depends on these listed by decreasing priority. enum CandReason : uint8_t { - NoCand, Only1, PhysReg, RegExcess, RegCritical, Stall, Cluster, Weak, - RegMax, ResourceReduce, ResourceDemand, BotHeightReduce, BotPathReduce, - TopDepthReduce, TopPathReduce, NodeOrder}; + NoCand, + Only1, + PhysReg, + RegExcess, + RegCritical, + Stall, + Cluster, + Weak, + RegMax, + ResourceReduce, + ResourceDemand, + BotHeightReduce, + BotPathReduce, + TopDepthReduce, + TopPathReduce, + NodeOrder + }; #ifndef NDEBUG static const char *getReasonStr(GenericSchedulerBase::CandReason Reason); diff --git a/llvm/lib/CodeGen/MachineScheduler.cpp b/llvm/lib/CodeGen/MachineScheduler.cpp index 42dc2f148f598..adad8bf3c8c29 100644 --- a/llvm/lib/CodeGen/MachineScheduler.cpp +++ b/llvm/lib/CodeGen/MachineScheduler.cpp @@ -3220,6 +3220,7 @@ void GenericSchedulerBase::setPolicy(CandPolicy &Policy, bool IsPostRA, #ifndef NDEBUG const char *GenericSchedulerBase::getReasonStr( GenericSchedulerBase::CandReason Reason) { + // clang-format off switch (Reason) { case NoCand: return "NOCAND "; case Only1: return "ONLY1 "; @@ -3238,6 +3239,7 @@ const char *GenericSchedulerBase::getReasonStr( case BotPathReduce: return "BOT-PATH "; case NodeOrder: return "ORDER "; }; + // clang-format on llvm_unreachable("Unknown reason!"); }