Skip to content

Commit

Permalink
[SandboxIR][NFC] Move isMemDepCandidate() and isStackSaveOrRestoreInt…
Browse files Browse the repository at this point in the history 
…rinsic() to Utils
  • Loading branch information
@vporpo
vporpo committed Oct 2, 2024
1 parent 0f973ac commit 504585d
Show file tree
Hide file tree
Showing 5 changed files with 96 additions and 92 deletions.
20 changes: 0 additions & 20 deletions llvm/include/llvm/SandboxIR/Instruction.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,26 +335,6 @@ class Instruction : public User {

// TODO: Missing functions.

bool isStackSaveOrRestoreIntrinsic() const {
auto *I = cast<llvm::Instruction>(Val);
return match(I,
PatternMatch::m_Intrinsic<llvm::Intrinsic::stackrestore>()) ||
match(I, PatternMatch::m_Intrinsic<llvm::Intrinsic::stacksave>());
}

/// We consider \p I as a Memory Dependency Candidate instruction if it
/// reads/write memory or if it has side-effects. This is used by the
/// dependency graph.
bool isMemDepCandidate() const {
auto *I = cast<llvm::Instruction>(Val);
return I->mayReadOrWriteMemory() &&
(!isa<llvm::IntrinsicInst>(I) ||
(cast<llvm::IntrinsicInst>(I)->getIntrinsicID() !=
Intrinsic::sideeffect &&
cast<llvm::IntrinsicInst>(I)->getIntrinsicID() !=
Intrinsic::pseudoprobe));
}

#ifndef NDEBUG
void dumpOS(raw_ostream &OS) const override;
#endif
Expand Down
21 changes: 21 additions & 0 deletions llvm/include/llvm/SandboxIR/Utils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,27 @@ class Utils {
return false;
return *Diff > 0;
}

static bool isStackSaveOrRestoreIntrinsic(Instruction *I) {
auto *LLVMI = cast<llvm::Instruction>(I->Val);
return match(LLVMI,
PatternMatch::m_Intrinsic<llvm::Intrinsic::stackrestore>()) ||
match(LLVMI,
PatternMatch::m_Intrinsic<llvm::Intrinsic::stacksave>());
}

/// We consider \p I as a Memory Dependency Candidate instruction if it
/// reads/write memory or if it has side-effects. This is used by the
/// dependency graph.
static bool isMemDepCandidate(Instruction *I) {
auto *LLVMI = cast<llvm::Instruction>(I->Val);
return LLVMI->mayReadOrWriteMemory() &&
(!isa<llvm::IntrinsicInst>(LLVMI) ||
(cast<llvm::IntrinsicInst>(LLVMI)->getIntrinsicID() !=
Intrinsic::sideeffect &&
cast<llvm::IntrinsicInst>(LLVMI)->getIntrinsicID() !=
Intrinsic::pseudoprobe));
}
};
} // namespace llvm::sandboxir

Expand Down
5 changes: 3 additions & 2 deletions llvm/include/llvm/Transforms/Vectorize/SandboxVectorizer/DependencyGraph.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/iterator_range.h"
#include "llvm/SandboxIR/Instruction.h"
#include "llvm/SandboxIR/Utils.h"
#include "llvm/Transforms/Vectorize/SandboxVectorizer/Interval.h"

namespace llvm::sandboxir {
Expand Down Expand Up @@ -63,10 +64,10 @@ class DGNode {
/// \Returns true if \p I is a memory dependency candidate instruction.
static bool isMemDepCandidate(Instruction *I) {
AllocaInst *Alloca;
return I->isMemDepCandidate() ||
return Utils::isMemDepCandidate(I) ||
((Alloca = dyn_cast<AllocaInst>(I)) &&
Alloca->isUsedWithInAlloca()) ||
I->isStackSaveOrRestoreIntrinsic();
Utils::isStackSaveOrRestoreIntrinsic(I);
}

Instruction *getInstruction() const { return I; }
Expand Down
70 changes: 0 additions & 70 deletions llvm/unittests/SandboxIR/SandboxIRTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1977,76 +1977,6 @@ define void @foo(i8 %v1, ptr %ptr) {
}
}

TEST_F(SandboxIRTest, Instruction_isStackSaveOrRestoreIntrinsic) {
parseIR(C, R"IR(
declare void @llvm.sideeffect()
define void @foo(i8 %v1, ptr %ptr) {
%add = add i8 %v1, %v1
%stacksave = call ptr @llvm.stacksave()
call void @llvm.stackrestore(ptr %stacksave)
call void @llvm.sideeffect()
ret void
}
)IR");
llvm::Function *LLVMF = &*M->getFunction("foo");
sandboxir::Context Ctx(C);
sandboxir::Function *F = Ctx.createFunction(LLVMF);
auto *BB = &*F->begin();
auto It = BB->begin();
auto *Add = cast<sandboxir::BinaryOperator>(&*It++);
auto *StackSave = cast<sandboxir::CallInst>(&*It++);
auto *StackRestore = cast<sandboxir::CallInst>(&*It++);
auto *Other = cast<sandboxir::CallInst>(&*It++);
auto *Ret = cast<sandboxir::ReturnInst>(&*It++);

EXPECT_FALSE(Add->isStackSaveOrRestoreIntrinsic());
EXPECT_TRUE(StackSave->isStackSaveOrRestoreIntrinsic());
EXPECT_TRUE(StackRestore->isStackSaveOrRestoreIntrinsic());
EXPECT_FALSE(Other->isStackSaveOrRestoreIntrinsic());
EXPECT_FALSE(Ret->isStackSaveOrRestoreIntrinsic());
}

TEST_F(SandboxIRTest, Instruction_isMemDepCandidate) {
parseIR(C, R"IR(
declare void @llvm.fake.use(...)
declare void @llvm.sideeffect()
declare void @llvm.pseudoprobe(i64, i64, i32, i64)
declare void @bar()
define void @foo(i8 %v1, ptr %ptr) {
%add0 = add i8 %v1, %v1
%ld0 = load i8, ptr %ptr
store i8 %v1, ptr %ptr
call void @llvm.sideeffect()
call void @llvm.pseudoprobe(i64 42, i64 1, i32 0, i64 -1)
call void @llvm.fake.use(ptr %ptr)
call void @bar()
ret void
}
)IR");
llvm::Function *LLVMF = &*M->getFunction("foo");
sandboxir::Context Ctx(C);
sandboxir::Function *F = Ctx.createFunction(LLVMF);
auto *BB = &*F->begin();
auto It = BB->begin();
auto *Add0 = cast<sandboxir::BinaryOperator>(&*It++);
auto *Ld0 = cast<sandboxir::LoadInst>(&*It++);
auto *St0 = cast<sandboxir::StoreInst>(&*It++);
auto *SideEffect0 = cast<sandboxir::CallInst>(&*It++);
auto *PseudoProbe0 = cast<sandboxir::CallInst>(&*It++);
auto *OtherIntrinsic0 = cast<sandboxir::CallInst>(&*It++);
auto *CallBar = cast<sandboxir::CallInst>(&*It++);
auto *Ret = cast<sandboxir::ReturnInst>(&*It++);

EXPECT_FALSE(Add0->isMemDepCandidate());
EXPECT_TRUE(Ld0->isMemDepCandidate());
EXPECT_TRUE(St0->isMemDepCandidate());
EXPECT_FALSE(SideEffect0->isMemDepCandidate());
EXPECT_FALSE(PseudoProbe0->isMemDepCandidate());
EXPECT_TRUE(OtherIntrinsic0->isMemDepCandidate());
EXPECT_TRUE(CallBar->isMemDepCandidate());
EXPECT_FALSE(Ret->isMemDepCandidate());
}

TEST_F(SandboxIRTest, VAArgInst) {
parseIR(C, R"IR(
define void @foo(ptr %va) {
Expand Down
72 changes: 72 additions & 0 deletions llvm/unittests/SandboxIR/UtilsTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,3 +173,75 @@ define void @foo(float %arg0, double %arg1, i8 %arg2, i64 %arg3, ptr %arg4) {
EXPECT_EQ(sandboxir::Utils::getNumBits(L2), 8u);
EXPECT_EQ(sandboxir::Utils::getNumBits(L3), 64u);
}

TEST_F(UtilsTest, Instruction_isStackSaveOrRestoreIntrinsic) {
parseIR(C, R"IR(
declare void @llvm.sideeffect()
define void @foo(i8 %v1, ptr %ptr) {
%add = add i8 %v1, %v1
%stacksave = call ptr @llvm.stacksave()
call void @llvm.stackrestore(ptr %stacksave)
call void @llvm.sideeffect()
ret void
}
)IR");
llvm::Function *LLVMF = &*M->getFunction("foo");
sandboxir::Context Ctx(C);
sandboxir::Function *F = Ctx.createFunction(LLVMF);
auto *BB = &*F->begin();
auto It = BB->begin();
auto *Add = cast<sandboxir::BinaryOperator>(&*It++);
auto *StackSave = cast<sandboxir::CallInst>(&*It++);
auto *StackRestore = cast<sandboxir::CallInst>(&*It++);
auto *Other = cast<sandboxir::CallInst>(&*It++);
auto *Ret = cast<sandboxir::ReturnInst>(&*It++);

EXPECT_FALSE(sandboxir::Utils::isStackSaveOrRestoreIntrinsic(Add));
EXPECT_TRUE(sandboxir::Utils::isStackSaveOrRestoreIntrinsic(StackSave));
EXPECT_TRUE(sandboxir::Utils::isStackSaveOrRestoreIntrinsic(StackRestore));
EXPECT_FALSE(sandboxir::Utils::isStackSaveOrRestoreIntrinsic(Other));
EXPECT_FALSE(sandboxir::Utils::isStackSaveOrRestoreIntrinsic(Ret));
}

TEST_F(UtilsTest, Instruction_isMemDepCandidate) {
parseIR(C, R"IR(
declare void @llvm.fake.use(...)
declare void @llvm.sideeffect()
declare void @llvm.pseudoprobe(i64, i64, i32, i64)
declare void @bar()
define void @foo(i8 %v1, ptr %ptr) {
%add0 = add i8 %v1, %v1
%ld0 = load i8, ptr %ptr
store i8 %v1, ptr %ptr
call void @llvm.sideeffect()
call void @llvm.pseudoprobe(i64 42, i64 1, i32 0, i64 -1)
call void @llvm.fake.use(ptr %ptr)
call void @bar()
ret void
}
)IR");
llvm::Function *LLVMF = &*M->getFunction("foo");
sandboxir::Context Ctx(C);
sandboxir::Function *F = Ctx.createFunction(LLVMF);
auto *BB = &*F->begin();
auto It = BB->begin();
auto *Add0 = cast<sandboxir::BinaryOperator>(&*It++);
auto *Ld0 = cast<sandboxir::LoadInst>(&*It++);
auto *St0 = cast<sandboxir::StoreInst>(&*It++);
auto *SideEffect0 = cast<sandboxir::CallInst>(&*It++);
auto *PseudoProbe0 = cast<sandboxir::CallInst>(&*It++);
auto *OtherIntrinsic0 = cast<sandboxir::CallInst>(&*It++);
auto *CallBar = cast<sandboxir::CallInst>(&*It++);
auto *Ret = cast<sandboxir::ReturnInst>(&*It++);

using Utils = sandboxir::Utils;

EXPECT_FALSE(Utils::isMemDepCandidate(Add0));
EXPECT_TRUE(Utils::isMemDepCandidate(Ld0));
EXPECT_TRUE(Utils::isMemDepCandidate(St0));
EXPECT_FALSE(Utils::isMemDepCandidate(SideEffect0));
EXPECT_FALSE(Utils::isMemDepCandidate(PseudoProbe0));
EXPECT_TRUE(Utils::isMemDepCandidate(OtherIntrinsic0));
EXPECT_TRUE(Utils::isMemDepCandidate(CallBar));
EXPECT_FALSE(Utils::isMemDepCandidate(Ret));
}

0 comments on commit 504585d

Please sign in to comment.