Skip to content

[SSAUpdater] Avoid scanning basic blocks to find instruction order. #123803

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

Merged
merged 3 commits into from
Jan 22, 2025
Merged

[SSAUpdater] Avoid scanning basic blocks to find instruction order. #123803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8fa00f0
[SSAUpdater] Avoid scanning basic blocks to find instruction order.
jcranmer-intel Jan 21, 2025
93e0e47
Remove redundant checks.
jcranmer-intel Jan 21, 2025
99ac764
Address review comments.
jcranmer-intel Jan 21, 2025
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
7 changes: 0 additions & 7 deletions llvm/include/llvm/Transforms/Utils/SSAUpdater.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,13 +164,6 @@ class LoadAndStorePromoter {
/// removed from the code.
void run(const SmallVectorImpl<Instruction *> &Insts);

/// Return true if the specified instruction is in the Inst list.
///
/// The Insts list is the one passed into the constructor. Clients should
/// implement this with a more efficient version if possible.
virtual bool isInstInList(Instruction *I,
const SmallVectorImpl<Instruction *> &Insts) const;

/// This hook is invoked after all the stores are found and inserted as
/// available values.
virtual void doExtraRewritesBeforeFinalDeletion() {}
Expand Down
34 changes: 12 additions & 22 deletions llvm/lib/Transforms/Utils/SSAUpdater.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,27 +432,28 @@ void LoadAndStorePromoter::run(const SmallVectorImpl<Instruction *> &Insts) {
}
}

// If so, we can queue them all as live in loads. We don't have an
// efficient way to tell which on is first in the block and don't want to
// scan large blocks, so just add all loads as live ins.
// If so, we can queue them all as live in loads.
if (!HasStore) {
for (Instruction *I : BlockUses)
LiveInLoads.push_back(cast<LoadInst>(I));
BlockUses.clear();
continue;
}

// Sort all of the interesting instructions in the block so that we don't
// have to scan a large block just to find a few instructions.
llvm::sort(
BlockUses.begin(), BlockUses.end(),
[](Instruction *A, Instruction *B) { return A->comesBefore(B); });

// Otherwise, we have mixed loads and stores (or just a bunch of stores).
// Since SSAUpdater is purely for cross-block values, we need to determine
// the order of these instructions in the block. If the first use in the
// block is a load, then it uses the live in value. The last store defines
// the live out value. We handle this by doing a linear scan of the block.
// the live out value.
Value *StoredValue = nullptr;
for (Instruction &I : *BB) {
if (LoadInst *L = dyn_cast<LoadInst>(&I)) {
// If this is a load from an unrelated pointer, ignore it.
if (!isInstInList(L, Insts)) continue;

for (Instruction *I : BlockUses) {
if (LoadInst *L = dyn_cast<LoadInst>(I)) {
// If we haven't seen a store yet, this is a live in use, otherwise
// use the stored value.
if (StoredValue) {
Expand All @@ -465,18 +466,14 @@ void LoadAndStorePromoter::run(const SmallVectorImpl<Instruction *> &Insts) {
continue;
}

if (StoreInst *SI = dyn_cast<StoreInst>(&I)) {
// If this is a store to an unrelated pointer, ignore it.
if (!isInstInList(SI, Insts)) continue;
if (StoreInst *SI = dyn_cast<StoreInst>(I)) {
updateDebugInfo(SI);

// Remember that this is the active value in the block.
StoredValue = SI->getOperand(0);
} else if (auto *AI = dyn_cast<AllocaInst>(&I)) {
} else if (auto *AI = dyn_cast<AllocaInst>(I)) {
// Check if this an alloca, in which case we treat it as a store of
// getValueToUseForAlloca.
if (!isInstInList(AI, Insts))
continue;
StoredValue = getValueToUseForAlloca(AI);
}
}
Expand Down Expand Up @@ -533,10 +530,3 @@ void LoadAndStorePromoter::run(const SmallVectorImpl<Instruction *> &Insts) {
User->eraseFromParent();
}
}

bool
LoadAndStorePromoter::isInstInList(Instruction *I,
const SmallVectorImpl<Instruction *> &Insts)
const {
return is_contained(Insts, I);
}
Loading