Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Interleave loop pre-header with SWP prologue #236

Open
wants to merge 8 commits into
base: aie-public
Choose a base branch
from
Open

Interleave loop pre-header with SWP prologue #236

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ed1b571
[AIEX] NFC: Move --aie-loop-min-tripcount option to AIELoopUtils
gbossu Nov 11, 2024
9dcbff6
[CodeGen][NFC] MachineScheduler: Properly initialize top() and bottom()
gbossu Nov 13, 2024
028d839
fixup! [SCHEDULER] Enable more abstract use of ScheduleDAGInstr
gbossu Nov 13, 2024
400acec
[AIEX] NFC: Introduce "free" and "fixed" instructions in AIE::Region
gbossu Nov 13, 2024
38e5be2
[AIEX] NFC: Prepare for BUNDLE SUnits
gbossu Nov 13, 2024
dfc8735
[AIEX] NFC: Export findEarliestRef() from AIEMaxLatencyFinder
gbossu Nov 15, 2024
baafd49
[AIE2] Baseline test to interleave SWP prologue/epilogue
gbossu Nov 11, 2024
171faec
[AIEX] Make "bottom-fixed" instructions part of the sched region
gbossu Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 2 additions & 20 deletions llvm/lib/Target/AIE/AIEBasePipelinerLoopInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@

#define DEBUG_TYPE "aie-pipeliner"
namespace llvm {
cl::opt<int> LoopMinTripCount(
"aie-loop-min-tripcount",
cl::desc("Minimum number of loop iterations (warning: applies to all loop"
" pipelining candidates)"),
cl::init(-1), cl::Hidden);
cl::opt<bool> TrackRegPressure(
"aie-pipeliner-track-regpressure",
cl::desc("Refuse SWP schedules likely to run into register spills"),
Expand Down Expand Up @@ -69,13 +64,7 @@ AIEBasePipelinerLoopInfo::AIEBasePipelinerLoopInfo(MachineInstr *EndLoop,
AIELoopUtils::getMinTripCount(*LoopBlock);
if (ParsedMinTripCount) {
MinTripCount = *ParsedMinTripCount;
LLVM_DEBUG(dbgs() << "PLI: MinTripCount from pragma = " << MinTripCount
<< "\n");
}

if (LoopMinTripCount > MinTripCount) {
MinTripCount = LoopMinTripCount;
LLVM_DEBUG(dbgs() << "PLI: MinTripCount from CL option = " << MinTripCount
LLVM_DEBUG(dbgs() << "PLI: MinTripCount from pragma/CL = " << MinTripCount
<< "\n");
}
}
Expand Down Expand Up @@ -682,18 +671,11 @@ class ZeroOverheadLoop : public AIEBasePipelinerLoopInfo {
};

ZeroOverheadLoop::Assessment ZeroOverheadLoop::accept(MachineInstr *EndLoop) {
// We are using LoopMinTripCount below just for testing purposes.
// For MIR test cases without IR, we can't encode loop-related metadata.
if (!MinTripCount && LoopMinTripCount <= 0) {
if (!MinTripCount) {
LLVM_DEBUG(dbgs() << "Unbounded loop detected!\n");
return Assessment::UnboundedLoop;
}

// Overwrite MinTripCount.
if (LoopMinTripCount > 0) {
MinTripCount = LoopMinTripCount;
}

if (MinTripCount <= 1) {
LLVM_DEBUG(dbgs() << "Not interesting MinTripCount (<=1)!\n");
return Assessment::TooLowMinTripCount;
Expand Down
14 changes: 13 additions & 1 deletion llvm/lib/Target/AIE/Utils/AIELoopUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@

#define DEBUG_TYPE "aielooputils"

namespace llvm {
cl::opt<int> LoopMinTripCount(
"aie-loop-min-tripcount",
cl::desc("Minimum number of loop iterations (warning: applies to all loop"
" pipelining candidates)"),
cl::init(-1), cl::Hidden);
} // namespace llvm

namespace llvm::AIELoopUtils {
const MDNode *getLoopID(const MachineBasicBlock &LoopBlock) {
const BasicBlock *BBLK = LoopBlock.getBasicBlock();
Expand All @@ -29,7 +37,11 @@ const MDNode *getLoopID(const MachineBasicBlock &LoopBlock) {
}

std::optional<int64_t> getMinTripCount(const MachineBasicBlock &LoopBlock) {
return getMinTripCount(getLoopID(LoopBlock));
std::optional<int64_t> MinTripCount = getMinTripCount(getLoopID(LoopBlock));
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes a lot of sense ;-)

if (LoopMinTripCount > MinTripCount.value_or(0)) {
MinTripCount = LoopMinTripCount;
}
return MinTripCount;
}

std::optional<bool> getPipelinerDisabled(const MachineBasicBlock &LoopBlock) {
Expand Down