Skip to content

[SandboxVec][DAG] Add MemDGNode::MemSuccs #127253

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 1 commit into from
Feb 16, 2025
Merged

[SandboxVec][DAG] Add MemDGNode::MemSuccs #127253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 17 additions & 0 deletions llvm/include/llvm/Transforms/Vectorize/SandboxVectorizer/DependencyGraph.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ class DGNode {
virtual ~DGNode();
/// \Returns the number of unscheduled successors.
unsigned getNumUnscheduledSuccs() const { return UnscheduledSuccs; }
// TODO: Make this private?
void decrUnscheduledSuccs() {
assert(UnscheduledSuccs > 0 && "Counting error!");
--UnscheduledSuccs;
Expand Down Expand Up @@ -214,6 +215,8 @@ class MemDGNode final : public DGNode {
MemDGNode *NextMemN = nullptr;
/// Memory predecessors.
DenseSet<MemDGNode *> MemPreds;
/// Memory successors.
DenseSet<MemDGNode *> MemSuccs;
friend class PredIterator; // For MemPreds.
/// Creates both edges: this<->N.
void setNextNode(MemDGNode *N) {
Expand Down Expand Up @@ -265,10 +268,20 @@ class MemDGNode final : public DGNode {
[[maybe_unused]] auto Inserted = MemPreds.insert(PredN).second;
assert(Inserted && "PredN already exists!");
assert(PredN != this && "Trying to add a dependency to self!");
PredN->MemSuccs.insert(this);
if (!Scheduled) {
++PredN->UnscheduledSuccs;
}
}
/// Removes the memory dependency PredN->this. This also updates the
/// UnscheduledSuccs counter of PredN if this node has not been scheduled.
void removeMemPred(MemDGNode *PredN) {
MemPreds.erase(PredN);
PredN->MemSuccs.erase(this);
if (!Scheduled) {
PredN->decrUnscheduledSuccs();
}
}
/// \Returns true if there is a memory dependency N->this.
bool hasMemPred(DGNode *N) const {
if (auto *MN = dyn_cast<MemDGNode>(N))
Expand All @@ -279,6 +292,10 @@ class MemDGNode final : public DGNode {
iterator_range<DenseSet<MemDGNode *>::const_iterator> memPreds() const {
return make_range(MemPreds.begin(), MemPreds.end());
}
/// \Returns all memory dependency successors.
iterator_range<DenseSet<MemDGNode *>::const_iterator> memSuccs() const {
return make_range(MemSuccs.begin(), MemSuccs.end());
}
#ifndef NDEBUG
virtual void print(raw_ostream &OS, bool PrintDeps = true) const override;
#endif // NDEBUG
Expand Down
40 changes: 39 additions & 1 deletion llvm/unittests/Transforms/Vectorize/SandboxVectorizer/DependencyGraphTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,9 @@ define void @foo(ptr %ptr, i8 %v0, i8 %v1) {
EXPECT_THAT(N1->memPreds(), testing::ElementsAre(N0));
EXPECT_TRUE(N2->preds(DAG).empty());

// Check memSuccs().
EXPECT_THAT(N0->memSuccs(), testing::ElementsAre(N1));

// Check UnscheduledSuccs.
EXPECT_EQ(N0->getNumUnscheduledSuccs(), 1u); // N1
EXPECT_EQ(N1->getNumUnscheduledSuccs(), 0u);
Expand All @@ -268,6 +271,41 @@ define void @foo(ptr %ptr, i8 %v0, i8 %v1) {
EXPECT_TRUE(N0->scheduled());
}

TEST_F(DependencyGraphTest, AddRemoveMemPred) {
parseIR(C, R"IR(
define void @foo(ptr %ptr, i8 %v0, i8 %v1) {
store i8 %v0, ptr %ptr
store i8 %v1, ptr %ptr
ret void
}
)IR");
llvm::Function *LLVMF = &*M->getFunction("foo");
sandboxir::Context Ctx(C);
auto *F = Ctx.createFunction(LLVMF);
auto *BB = &*F->begin();
auto It = BB->begin();
auto *S0 = cast<sandboxir::StoreInst>(&*It++);
auto *S1 = cast<sandboxir::StoreInst>(&*It++);

sandboxir::DependencyGraph DAG(getAA(*LLVMF), Ctx);
DAG.extend({&*BB->begin(), BB->getTerminator()});
auto *N0 = cast<sandboxir::MemDGNode>(DAG.getNode(S0));
auto *N1 = cast<sandboxir::MemDGNode>(DAG.getNode(S1));

// Check removeMemPred().
EXPECT_FALSE(N0->memSuccs().empty());
EXPECT_EQ(N0->getNumUnscheduledSuccs(), 1u);
N1->removeMemPred(N0);
EXPECT_TRUE(N1->memPreds().empty());
EXPECT_EQ(N0->getNumUnscheduledSuccs(), 0u);

// Check addMemPred().
N1->addMemPred(N0);
EXPECT_THAT(N1->memPreds(), testing::UnorderedElementsAre(N0));
EXPECT_THAT(N0->memSuccs(), testing::UnorderedElementsAre(N1));
EXPECT_THAT(N0->getNumUnscheduledSuccs(), 1u);
}

TEST_F(DependencyGraphTest, Preds) {
parseIR(C, R"IR(
declare ptr @bar(i8)
Expand Down Expand Up @@ -533,7 +571,7 @@ define void @foo(ptr noalias %ptr0, ptr noalias %ptr1) {
EXPECT_TRUE(RetN->preds(DAG).empty());
}

TEST_F(DependencyGraphTest, VolatileSotres) {
TEST_F(DependencyGraphTest, VolatileStores) {
parseIR(C, R"IR(
define void @foo(ptr noalias %ptr0, ptr noalias %ptr1, i8 %v) {
store volatile i8 %v, ptr %ptr0
Expand Down