[llvm] f404047 - [DirectX][OpLowering] Simplify named struct handling (#128247)
via llvm-commits
llvm-commits at lists.llvm.org
Sat Feb 22 12:33:12 PST 2025
Author: Justin Bogner
Date: 2025-02-22T12:33:09-08:00
New Revision: f404047ab2ab7fc4755374692bb1159827e887f2
URL: https://github.com/llvm/llvm-project/commit/f404047ab2ab7fc4755374692bb1159827e887f2
DIFF: https://github.com/llvm/llvm-project/commit/f404047ab2ab7fc4755374692bb1159827e887f2.diff
LOG: [DirectX][OpLowering] Simplify named struct handling (#128247)
This removes "replaceFunctionWithNamedStructOp" and folds its
functionality into "replaceFunctionWithOp". It turns out we were
overcomplicating things and this is trivial to handle generically.
Fixes #113192
Added:
Modified:
llvm/lib/Target/DirectX/DXIL.td
llvm/lib/Target/DirectX/DXILOpBuilder.cpp
llvm/lib/Target/DirectX/DXILOpBuilder.h
llvm/lib/Target/DirectX/DXILOpLowering.cpp
Removed:
################################################################################
diff --git a/llvm/lib/Target/DirectX/DXIL.td b/llvm/lib/Target/DirectX/DXIL.td
index 7cb841d9bd5b5..d59e28c37b91d 100644
--- a/llvm/lib/Target/DirectX/DXIL.td
+++ b/llvm/lib/Target/DirectX/DXIL.td
@@ -930,6 +930,7 @@ def MakeDouble : DXILOp<101, makeDouble> {
def SplitDouble : DXILOp<102, splitDouble> {
let Doc = "Splits a double into 2 uints";
+ let intrinsics = [IntrinSelect<int_dx_splitdouble>];
let arguments = [OverloadTy];
let result = SplitDoubleTy;
let overloads = [Overloads<DXIL1_0, [DoubleTy]>];
diff --git a/llvm/lib/Target/DirectX/DXILOpBuilder.cpp b/llvm/lib/Target/DirectX/DXILOpBuilder.cpp
index badd5aabd6432..6bbe8d5d12280 100644
--- a/llvm/lib/Target/DirectX/DXILOpBuilder.cpp
+++ b/llvm/lib/Target/DirectX/DXILOpBuilder.cpp
@@ -535,10 +535,6 @@ StructType *DXILOpBuilder::getResRetType(Type *ElementTy) {
return ::getResRetType(ElementTy);
}
-StructType *DXILOpBuilder::getSplitDoubleType(LLVMContext &Context) {
- return ::getSplitDoubleType(Context);
-}
-
StructType *DXILOpBuilder::getHandleType() {
return ::getHandleType(IRB.getContext());
}
diff --git a/llvm/lib/Target/DirectX/DXILOpBuilder.h b/llvm/lib/Target/DirectX/DXILOpBuilder.h
index df5a0240870f4..5fe9f4429a494 100644
--- a/llvm/lib/Target/DirectX/DXILOpBuilder.h
+++ b/llvm/lib/Target/DirectX/DXILOpBuilder.h
@@ -50,9 +50,6 @@ class DXILOpBuilder {
/// Get a `%dx.types.ResRet` type with the given element type.
StructType *getResRetType(Type *ElementTy);
- /// Get the `%dx.types.splitdouble` type.
- StructType *getSplitDoubleType(LLVMContext &Context);
-
/// Get the `%dx.types.Handle` type.
StructType *getHandleType();
diff --git a/llvm/lib/Target/DirectX/DXILOpLowering.cpp b/llvm/lib/Target/DirectX/DXILOpLowering.cpp
index 0c245c1a43d31..83cc4b18824c7 100644
--- a/llvm/lib/Target/DirectX/DXILOpLowering.cpp
+++ b/llvm/lib/Target/DirectX/DXILOpLowering.cpp
@@ -120,6 +120,30 @@ class OpLowerer {
int Value;
};
+ /// Replaces uses of a struct with uses of an equivalent named struct.
+ ///
+ /// DXIL operations that return structs give them well known names, so we need
+ /// to update uses when we switch from an LLVM intrinsic to an op.
+ Error replaceNamedStructUses(CallInst *Intrin, CallInst *DXILOp) {
+ auto *IntrinTy = cast<StructType>(Intrin->getType());
+ auto *DXILOpTy = cast<StructType>(DXILOp->getType());
+ if (!IntrinTy->isLayoutIdentical(DXILOpTy))
+ return make_error<StringError>(
+ "Type mismatch between intrinsic and DXIL op",
+ inconvertibleErrorCode());
+
+ for (Use &U : make_early_inc_range(Intrin->uses()))
+ if (auto *EVI = dyn_cast<ExtractValueInst>(U.getUser()))
+ EVI->setOperand(0, DXILOp);
+ else if (auto *IVI = dyn_cast<InsertValueInst>(U.getUser()))
+ IVI->setOperand(0, DXILOp);
+ else
+ return make_error<StringError>("DXIL ops that return structs may only "
+ "be used by insert- and extractvalue",
+ inconvertibleErrorCode());
+ return Error::success();
+ }
+
[[nodiscard]] bool
replaceFunctionWithOp(Function &F, dxil::OpCode DXILOp,
ArrayRef<IntrinArgSelect> ArgSelects) {
@@ -154,32 +178,13 @@ class OpLowerer {
if (Error E = OpCall.takeError())
return E;
- CI->replaceAllUsesWith(*OpCall);
- CI->eraseFromParent();
- return Error::success();
- });
- }
-
- [[nodiscard]] bool replaceFunctionWithNamedStructOp(
- Function &F, dxil::OpCode DXILOp, Type *NewRetTy,
- llvm::function_ref<Error(CallInst *CI, CallInst *Op)> ReplaceUses) {
- bool IsVectorArgExpansion = isVectorArgExpansion(F);
- return replaceFunction(F, [&](CallInst *CI) -> Error {
- SmallVector<Value *> Args;
- OpBuilder.getIRB().SetInsertPoint(CI);
- if (IsVectorArgExpansion) {
- SmallVector<Value *> NewArgs = argVectorFlatten(CI, OpBuilder.getIRB());
- Args.append(NewArgs.begin(), NewArgs.end());
+ if (isa<StructType>(CI->getType())) {
+ if (Error E = replaceNamedStructUses(CI, *OpCall))
+ return E;
} else
- Args.append(CI->arg_begin(), CI->arg_end());
-
- Expected<CallInst *> OpCall =
- OpBuilder.tryCreateOp(DXILOp, Args, CI->getName(), NewRetTy);
- if (Error E = OpCall.takeError())
- return E;
- if (Error E = ReplaceUses(CI, *OpCall))
- return E;
+ CI->replaceAllUsesWith(*OpCall);
+ CI->eraseFromParent();
return Error::success();
});
}
@@ -359,26 +364,6 @@ class OpLowerer {
return lowerToBindAndAnnotateHandle(F);
}
- Error replaceSplitDoubleCallUsages(CallInst *Intrin, CallInst *Op) {
- for (Use &U : make_early_inc_range(Intrin->uses())) {
- if (auto *EVI = dyn_cast<ExtractValueInst>(U.getUser())) {
-
- if (EVI->getNumIndices() != 1)
- return createStringError(std::errc::invalid_argument,
- "Splitdouble has only 2 elements");
- EVI->setOperand(0, Op);
- } else {
- return make_error<StringError>(
- "Splitdouble use is not ExtractValueInst",
- inconvertibleErrorCode());
- }
- }
-
- Intrin->eraseFromParent();
-
- return Error::success();
- }
-
/// Replace uses of \c Intrin with the values in the `dx.ResRet` of \c Op.
/// Since we expect to be post-scalarization, make an effort to avoid vectors.
Error replaceResRetUses(CallInst *Intrin, CallInst *Op, bool HasCheckBit) {
@@ -814,16 +799,6 @@ class OpLowerer {
case Intrinsic::dx_resource_updatecounter:
HasErrors |= lowerUpdateCounter(F);
break;
- // TODO: this can be removed when
- // https://github.com/llvm/llvm-project/issues/113192 is fixed
- case Intrinsic::dx_splitdouble:
- HasErrors |= replaceFunctionWithNamedStructOp(
- F, OpCode::SplitDouble,
- OpBuilder.getSplitDoubleType(M.getContext()),
- [&](CallInst *CI, CallInst *Op) {
- return replaceSplitDoubleCallUsages(CI, Op);
- });
- break;
case Intrinsic::ctpop:
HasErrors |= lowerCtpopToCountBits(F);
break;
More information about the llvm-commits
mailing list