[llvm] [DirectX][OpLowering] Simplify named struct handling (PR #128247)
Justin Bogner via llvm-commits
llvm-commits at lists.llvm.org
Fri Feb 21 15:40:23 PST 2025
https://github.com/bogner updated https://github.com/llvm/llvm-project/pull/128247
>From 7cdea51a398a07c7c4463a67968870bee78cca0a Mon Sep 17 00:00:00 2001
From: Justin Bogner <mail at justinbogner.com>
Date: Fri, 21 Feb 2025 12:58:55 -0800
Subject: [PATCH 1/3] [DirectX][OpLowering] Simplify named struct handling
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
---
llvm/lib/Target/DirectX/DXIL.td | 1 +
llvm/lib/Target/DirectX/DXILOpLowering.cpp | 61 ++++++++++------------
2 files changed, 28 insertions(+), 34 deletions(-)
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/DXILOpLowering.cpp b/llvm/lib/Target/DirectX/DXILOpLowering.cpp
index 0c245c1a43d31..5459695f96863 100644
--- a/llvm/lib/Target/DirectX/DXILOpLowering.cpp
+++ b/llvm/lib/Target/DirectX/DXILOpLowering.cpp
@@ -120,6 +120,28 @@ 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
+ return make_error<StringError>(
+ "DXIL ops that return structs may only be used by extractvalue",
+ inconvertibleErrorCode());
+ return Error::success();
+ }
+
[[nodiscard]] bool
replaceFunctionWithOp(Function &F, dxil::OpCode DXILOp,
ArrayRef<IntrinArgSelect> ArgSelects) {
@@ -154,32 +176,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();
});
}
@@ -814,16 +817,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;
>From 6a7460cffc3505cd176e983f17099f49dc100d36 Mon Sep 17 00:00:00 2001
From: Justin Bogner <mail at justinbogner.com>
Date: Fri, 21 Feb 2025 15:36:26 -0800
Subject: [PATCH 2/3] Handle insertvalue
---
llvm/lib/Target/DirectX/DXILOpLowering.cpp | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/llvm/lib/Target/DirectX/DXILOpLowering.cpp b/llvm/lib/Target/DirectX/DXILOpLowering.cpp
index 5459695f96863..d50e2c938edeb 100644
--- a/llvm/lib/Target/DirectX/DXILOpLowering.cpp
+++ b/llvm/lib/Target/DirectX/DXILOpLowering.cpp
@@ -135,10 +135,12 @@ class OpLowerer {
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 extractvalue",
- inconvertibleErrorCode());
+ return make_error<StringError>("DXIL ops that return structs may only "
+ "be used by insert- and extractvalue",
+ inconvertibleErrorCode());
return Error::success();
}
>From c3544452d42715a36503449a57f4700efd2fb6a8 Mon Sep 17 00:00:00 2001
From: Justin Bogner <mail at justinbogner.com>
Date: Fri, 21 Feb 2025 15:40:11 -0800
Subject: [PATCH 3/3] remove unused function
---
llvm/lib/Target/DirectX/DXILOpBuilder.cpp | 3 ---
llvm/lib/Target/DirectX/DXILOpBuilder.h | 3 ---
2 files changed, 6 deletions(-)
diff --git a/llvm/lib/Target/DirectX/DXILOpBuilder.cpp b/llvm/lib/Target/DirectX/DXILOpBuilder.cpp
index badd5aabd6432..4c2479bc08b1f 100644
--- a/llvm/lib/Target/DirectX/DXILOpBuilder.cpp
+++ b/llvm/lib/Target/DirectX/DXILOpBuilder.cpp
@@ -535,9 +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();
More information about the llvm-commits
mailing list