[DirectX backend] generate ISG1, OSG1 part for compute shader #90508
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty ISG1 and OSG1 parts are generated for compute shader since there's no signature for compute shader. Fixes llvm#88778
|
@llvm/pr-subscribers-backend-directx Author: Xiang Li (python3kgae) ChangesEmpty ISG1 and OSG1 parts are generated for compute shader since there's no signature for compute shader. Fixes #88778 Full diff: https://github.com/llvm/llvm-project/pull/90508.diff 2 Files Affected:
diff --git a/llvm/lib/Target/DirectX/DXContainerGlobals.cpp b/llvm/lib/Target/DirectX/DXContainerGlobals.cpp
index 65cf1dfdb4031b..4af4c506b630f4 100644
--- a/llvm/lib/Target/DirectX/DXContainerGlobals.cpp
+++ b/llvm/lib/Target/DirectX/DXContainerGlobals.cpp
@@ -28,8 +28,13 @@ using namespace llvm::dxil;
namespace {
class DXContainerGlobals : public llvm::ModulePass {
+ GlobalVariable *buildContainerGlobal(Module &M, Constant *Content,
+ StringRef Name, StringRef SectionName);
GlobalVariable *getFeatureFlags(Module &M);
GlobalVariable *computeShaderHash(Module &M);
+ GlobalVariable *buildInputSingature(Module &M, Constant *Content);
+ GlobalVariable *buildOutputSingature(Module &M, Constant *Content);
+ void addSingature(Module &M, SmallVector<GlobalValue *> &Globals, Triple &TT);
public:
static char ID; // Pass identification, replacement for typeid
@@ -55,7 +60,8 @@ bool DXContainerGlobals::runOnModule(Module &M) {
llvm::SmallVector<GlobalValue *> Globals;
Globals.push_back(getFeatureFlags(M));
Globals.push_back(computeShaderHash(M));
-
+ Triple TT(M.getTargetTriple());
+ addSingature(M, Globals, TT);
appendToCompilerUsed(M, Globals);
return true;
}
@@ -104,6 +110,50 @@ GlobalVariable *DXContainerGlobals::computeShaderHash(Module &M) {
return GV;
}
+GlobalVariable *DXContainerGlobals::buildContainerGlobal(
+ Module &M, Constant *Content, StringRef Name, StringRef SectionName) {
+ auto *GV = new llvm::GlobalVariable(
+ M, Content->getType(), true, GlobalValue::PrivateLinkage, Content, Name);
+ GV->setSection(SectionName);
+ GV->setAlignment(Align(4));
+ return GV;
+}
+
+GlobalVariable *DXContainerGlobals::buildInputSingature(Module &M,
+ Constant *Content) {
+ return buildContainerGlobal(M, Content, "dx.isg1", "ISG1");
+}
+GlobalVariable *DXContainerGlobals::buildOutputSingature(Module &M,
+ Constant *Content) {
+ return buildContainerGlobal(M, Content, "dx.osg1", "OSG1");
+}
+
+void DXContainerGlobals::addSingature(Module &M,
+ SmallVector<GlobalValue *> &Globals,
+ Triple &TT) {
+ dxbc::ProgramSignatureHeader Sig;
+ Sig.ParamCount = 0;
+ Sig.FirstParamOffset = sizeof(dxbc::ProgramSignatureHeader);
+ Type *Int32Ty = Type::getInt32Ty(M.getContext());
+ Constant *InputSig = nullptr;
+ Constant *OutputSig = nullptr;
+ switch (TT.getEnvironment()) {
+ case Triple::EnvironmentType::Compute:
+ InputSig = ConstantStruct::get(
+ StructType::get(Int32Ty, Int32Ty),
+ {ConstantInt::get(M.getContext(), APInt(32, Sig.ParamCount)),
+ ConstantInt::get(M.getContext(), APInt(32, Sig.FirstParamOffset))});
+ OutputSig = InputSig;
+ break;
+ // FIXME: support graphics shader.
+ // see issue https://github.com/llvm/llvm-project/issues/90504.
+ default:
+ return;
+ }
+ Globals.emplace_back(buildInputSingature(M, InputSig));
+ Globals.emplace_back(buildOutputSingature(M, OutputSig));
+}
+
char DXContainerGlobals::ID = 0;
INITIALIZE_PASS_BEGIN(DXContainerGlobals, "dxil-globals",
"DXContainer Global Emitter", false, true)
diff --git a/llvm/test/CodeGen/DirectX/ContainerData/EmptySignature.ll b/llvm/test/CodeGen/DirectX/ContainerData/EmptySignature.ll
new file mode 100644
index 00000000000000..bae50606a6b2ac
--- /dev/null
+++ b/llvm/test/CodeGen/DirectX/ContainerData/EmptySignature.ll
@@ -0,0 +1,25 @@
+; RUN: opt %s -dxil-embed -dxil-globals -S -o - | FileCheck %s
+; RUN: llc %s --filetype=obj -o - | obj2yaml | FileCheck %s --check-prefix=DXC
+target triple = "dxil-unknown-shadermodel6.0-compute"
+
+; CHECK: @dx.isg1 = private constant { i32, i32 } { i32 0, i32 8 }, section "ISG1", align 4
+; CHECK: @dx.osg1 = private constant { i32, i32 } { i32 0, i32 8 }, section "OSG1", align 4
+define void @main() #0 {
+entry:
+ ret void
+}
+
+attributes #0 = { "hlsl.numthreads"="1,1,1" "hlsl.shader"="compute" }
+
+!dx.valver = !{!0}
+
+!0 = !{i32 1, i32 7}
+
+; DXC: - Name: ISG1
+; DXC-NEXT: Size: 8
+; DXC-NEXT: Signature:
+; DXC-NEXT: Parameters: []
+; DXC: - Name: OSG1
+; DXC-NEXT: Size: 8
+; DXC-NEXT: Signature:
+; DXC-NEXT: Parameters: []
|
llvm-beanz
reviewed
Apr 29, 2024
llvm-beanz
reviewed
Apr 29, 2024
llvm-beanz
reviewed
Apr 29, 2024
|
|
||
| void DXContainerGlobals::addSingature(Module &M, | ||
| SmallVector<GlobalValue *> &Globals, | ||
| Triple &TT) { |
There was a problem hiding this comment.
TT is unused (and also reachable from the module)
Comment on lines
138
to
144
| Signature InputSig; | ||
| Signature OutputSig; | ||
| // FIXME: support graphics shader. | ||
| // see issue https://github.com/llvm/llvm-project/issues/90504. | ||
|
|
||
| Globals.emplace_back(buildSingature(M, InputSig, "dx.isg1", "ISG1")); | ||
| Globals.emplace_back(buildSingature(M, OutputSig, "dx.osg1", "OSG1")); |
There was a problem hiding this comment.
nit: It's clearer to read what is going on here if we group creating the signature with emitting it.
Suggested change
| Signature InputSig; | |
| Signature OutputSig; | |
| // FIXME: support graphics shader. | |
| // see issue https://github.com/llvm/llvm-project/issues/90504. | |
| Globals.emplace_back(buildSingature(M, InputSig, "dx.isg1", "ISG1")); | |
| Globals.emplace_back(buildSingature(M, OutputSig, "dx.osg1", "OSG1")); | |
| // FIXME: support graphics shader. | |
| // see issue https://github.com/llvm/llvm-project/issues/90504. | |
| Signature InputSig; | |
| Globals.emplace_back(buildSingature(M, InputSig, "dx.isg1", "ISG1")); | |
| Signature OutputSig; | |
| Globals.emplace_back(buildSingature(M, OutputSig, "dx.osg1", "OSG1")); |
llvm-beanz
approved these changes
Apr 30, 2024
damyanp
reviewed
Apr 30, 2024
Comment on lines
37
to
39
| GlobalVariable *buildSingature(Module &M, Signature &Sig, StringRef Name, | ||
| StringRef SectionName); | ||
| void addSingature(Module &M, SmallVector<GlobalValue *> &Globals); |
There was a problem hiding this comment.
Suggested change
| GlobalVariable *buildSingature(Module &M, Signature &Sig, StringRef Name, | |
| StringRef SectionName); | |
| void addSingature(Module &M, SmallVector<GlobalValue *> &Globals); | |
| GlobalVariable *buildSignature(Module &M, Signature &Sig, StringRef Name, | |
| StringRef SectionName); | |
| void addSignature(Module &M, SmallVector<GlobalValue *> &Globals); |
damyanp
requested changes
Apr 30, 2024
damyanp
approved these changes
Apr 30, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Empty ISG1 and OSG1 parts are generated for compute shader since there's no signature for compute shader.
Fixes #88778