Skip to content

[SandboxIR] Switch more Instruction::create() to InsertPosition #111213

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
Oct 4, 2024
Merged

[SandboxIR] Switch more Instruction::create() to InsertPosition #111213

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
4 changes: 2 additions & 2 deletions llvm/include/llvm/SandboxIR/Instruction.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2475,11 +2475,11 @@ class CmpInst : public SingleLLVMInstructionImpl<llvm::CmpInst> {
using Predicate = llvm::CmpInst::Predicate;

static CmpInst *create(Predicate Pred, Value *S1, Value *S2,
Instruction *InsertBefore, Context &Ctx,
InsertPosition Pos, Context &Ctx,
const Twine &Name = "");
static CmpInst *createWithCopiedFlags(Predicate Pred, Value *S1, Value *S2,
const Instruction *FlagsSource,
Instruction *InsertBefore, Context &Ctx,
InsertPosition Pos, Context &Ctx,
const Twine &Name = "");
void setPredicate(Predicate P);
void swapOperands();
Expand Down
66 changes: 0 additions & 66 deletions llvm/lib/SandboxIR/Context.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,72 +595,6 @@ FCmpInst *Context::createFCmpInst(llvm::FCmpInst *I) {
auto NewPtr = std::unique_ptr<FCmpInst>(new FCmpInst(I, *this));
return cast<FCmpInst>(registerValue(std::move(NewPtr)));
}
CmpInst *CmpInst::create(Predicate P, Value *S1, Value *S2,
Instruction *InsertBefore, Context &Ctx,
const Twine &Name) {
auto &Builder = Ctx.getLLVMIRBuilder();
Builder.SetInsertPoint(InsertBefore->getTopmostLLVMInstruction());
auto *LLVMI = Builder.CreateCmp(P, S1->Val, S2->Val, Name);
if (dyn_cast<llvm::ICmpInst>(LLVMI))
return Ctx.createICmpInst(cast<llvm::ICmpInst>(LLVMI));
return Ctx.createFCmpInst(cast<llvm::FCmpInst>(LLVMI));
}
CmpInst *CmpInst::createWithCopiedFlags(Predicate P, Value *S1, Value *S2,
const Instruction *F,
Instruction *InsertBefore, Context &Ctx,
const Twine &Name) {
CmpInst *Inst = create(P, S1, S2, InsertBefore, Ctx, Name);
cast<llvm::CmpInst>(Inst->Val)->copyIRFlags(F->Val);
return Inst;
}

Type *CmpInst::makeCmpResultType(Type *OpndType) {
if (auto *VT = dyn_cast<VectorType>(OpndType)) {
// TODO: Cleanup when we have more complete support for
// sandboxir::VectorType
return OpndType->getContext().getType(llvm::VectorType::get(
llvm::Type::getInt1Ty(OpndType->getContext().LLVMCtx),
cast<llvm::VectorType>(VT->LLVMTy)->getElementCount()));
}
return Type::getInt1Ty(OpndType->getContext());
}

void CmpInst::setPredicate(Predicate P) {
Ctx.getTracker()
.emplaceIfTracking<
GenericSetter<&CmpInst::getPredicate, &CmpInst::setPredicate>>(this);
cast<llvm::CmpInst>(Val)->setPredicate(P);
}

void CmpInst::swapOperands() {
if (ICmpInst *IC = dyn_cast<ICmpInst>(this))
IC->swapOperands();
else
cast<FCmpInst>(this)->swapOperands();
}

void ICmpInst::swapOperands() {
Ctx.getTracker().emplaceIfTracking<CmpSwapOperands>(this);
cast<llvm::ICmpInst>(Val)->swapOperands();
}

void FCmpInst::swapOperands() {
Ctx.getTracker().emplaceIfTracking<CmpSwapOperands>(this);
cast<llvm::FCmpInst>(Val)->swapOperands();
}

#ifndef NDEBUG
void CmpInst::dumpOS(raw_ostream &OS) const {
dumpCommonPrefix(OS);
dumpCommonSuffix(OS);
}

void CmpInst::dump() const {
dumpOS(dbgs());
dbgs() << "\n";
}
#endif // NDEBUG

Value *Context::getValue(llvm::Value *V) const {
auto It = LLVMValueToValueMap.find(V);
if (It != LLVMValueToValueMap.end())
Expand Down
64 changes: 64 additions & 0 deletions llvm/lib/SandboxIR/Instruction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -927,6 +927,70 @@ void PHINode::removeIncomingValueIf(function_ref<bool(unsigned)> Predicate) {
}
}

CmpInst *CmpInst::create(Predicate P, Value *S1, Value *S2, InsertPosition Pos,
Context &Ctx, const Twine &Name) {
auto &Builder = setInsertPos(Pos);
auto *LLVMI = Builder.CreateCmp(P, S1->Val, S2->Val, Name);
if (dyn_cast<llvm::ICmpInst>(LLVMI))
return Ctx.createICmpInst(cast<llvm::ICmpInst>(LLVMI));
return Ctx.createFCmpInst(cast<llvm::FCmpInst>(LLVMI));
}
CmpInst *CmpInst::createWithCopiedFlags(Predicate P, Value *S1, Value *S2,
const Instruction *F,
InsertPosition Pos, Context &Ctx,
const Twine &Name) {
CmpInst *Inst = create(P, S1, S2, Pos, Ctx, Name);
cast<llvm::CmpInst>(Inst->Val)->copyIRFlags(F->Val);
return Inst;
}

Type *CmpInst::makeCmpResultType(Type *OpndType) {
if (auto *VT = dyn_cast<VectorType>(OpndType)) {
// TODO: Cleanup when we have more complete support for
// sandboxir::VectorType
return OpndType->getContext().getType(llvm::VectorType::get(
llvm::Type::getInt1Ty(OpndType->getContext().LLVMCtx),
cast<llvm::VectorType>(VT->LLVMTy)->getElementCount()));
}
return Type::getInt1Ty(OpndType->getContext());
}

void CmpInst::setPredicate(Predicate P) {
Ctx.getTracker()
.emplaceIfTracking<
GenericSetter<&CmpInst::getPredicate, &CmpInst::setPredicate>>(this);
cast<llvm::CmpInst>(Val)->setPredicate(P);
}

void CmpInst::swapOperands() {
if (ICmpInst *IC = dyn_cast<ICmpInst>(this))
IC->swapOperands();
else
cast<FCmpInst>(this)->swapOperands();
}

void ICmpInst::swapOperands() {
Ctx.getTracker().emplaceIfTracking<CmpSwapOperands>(this);
cast<llvm::ICmpInst>(Val)->swapOperands();
}

void FCmpInst::swapOperands() {
Ctx.getTracker().emplaceIfTracking<CmpSwapOperands>(this);
cast<llvm::FCmpInst>(Val)->swapOperands();
}

#ifndef NDEBUG
void CmpInst::dumpOS(raw_ostream &OS) const {
dumpCommonPrefix(OS);
dumpCommonSuffix(OS);
}

void CmpInst::dump() const {
dumpOS(dbgs());
dbgs() << "\n";
}
#endif // NDEBUG

static llvm::Instruction::CastOps getLLVMCastOp(Instruction::Opcode Opc) {
switch (Opc) {
case Instruction::Opcode::ZExt:
Expand Down
6 changes: 3 additions & 3 deletions llvm/unittests/SandboxIR/SandboxIRTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5843,7 +5843,7 @@ define void @foo(i32 %i0, i32 %i1) {
}
auto *NewCmp =
sandboxir::CmpInst::create(llvm::CmpInst::ICMP_ULE, F.getArg(0),
F.getArg(1), &*BB->begin(), Ctx, "NewCmp");
F.getArg(1), BB->begin(), Ctx, "NewCmp");
EXPECT_EQ(NewCmp, &*BB->begin());
EXPECT_EQ(NewCmp->getPredicate(), llvm::CmpInst::ICMP_ULE);
EXPECT_EQ(NewCmp->getOperand(0), F.getArg(0));
Expand Down Expand Up @@ -5907,7 +5907,7 @@ define void @foo(float %f0, float %f1) {

// create with default flags
auto *NewFCmp = sandboxir::CmpInst::create(
llvm::CmpInst::FCMP_ONE, F.getArg(0), F.getArg(1), &*It1, Ctx, "NewFCmp");
llvm::CmpInst::FCMP_ONE, F.getArg(0), F.getArg(1), It1, Ctx, "NewFCmp");
EXPECT_EQ(NewFCmp->getPredicate(), llvm::CmpInst::FCMP_ONE);
EXPECT_EQ(NewFCmp->getOperand(0), F.getArg(0));
EXPECT_EQ(NewFCmp->getOperand(1), F.getArg(1));
Expand All @@ -5918,7 +5918,7 @@ define void @foo(float %f0, float %f1) {
EXPECT_TRUE(CopyFrom->getFastMathFlags() != DefaultFMF);
// create with copied flags
auto *NewFCmpFlags = sandboxir::CmpInst::createWithCopiedFlags(
llvm::CmpInst::FCMP_ONE, F.getArg(0), F.getArg(1), CopyFrom, &*It1, Ctx,
llvm::CmpInst::FCMP_ONE, F.getArg(0), F.getArg(1), CopyFrom, It1, Ctx,
"NewFCmpFlags");
EXPECT_FALSE(NewFCmpFlags->getFastMathFlags() !=
CopyFrom->getFastMathFlags());
Expand Down
Loading