-
Notifications
You must be signed in to change notification settings - Fork 14.7k
[DXIL] Add support for root signature flag element in DXContainer #123147
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.
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
Changes from 69 commits
8adb678
ba78f21
0a54559
557075f
e0d3dcd
80587dd
be3764d
7582ca6
6aaa0a5
916b2f1
d9bce0a
e7676ed
a0cee57
1e7a1fe
0ed658a
932062e
628937c
1378c9f
e3206c9
f93d42d
25e3f37
751cbdc
44532d6
ca21878
987901c
0fbe900
b771aea
aabdfe7
4f6f941
a7f7784
bf3b2e0
16b4d03
e043370
57bf935
1f8c0a5
0905b83
77e8544
1351fb0
09e645a
5a44b62
d1a79b3
9f8e512
5c7ed7e
93f7c4c
5aac761
47b01f7
486ab88
852ac25
74f7226
7a82fa9
c67d039
e80ef33
ef1ce8a
b7f2716
83b0979
b175b65
01b49a7
7bba9d3
2809c2f
023dcb8
aedb446
39e60c0
3b135c6
ae3d03f
3d19f8b
5a3be7c
f64c608
a5a2093
5b3fedc
605f225
e4bca2b
825673f
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,6 +10,7 @@ | |
// | ||
//===----------------------------------------------------------------------===// | ||
|
||
#include "DXILRootSignature.h" | ||
#include "DXILShaderFlags.h" | ||
#include "DirectX.h" | ||
#include "llvm/ADT/SmallVector.h" | ||
|
@@ -23,8 +24,10 @@ | |
#include "llvm/IR/Module.h" | ||
#include "llvm/InitializePasses.h" | ||
#include "llvm/MC/DXContainerPSVInfo.h" | ||
#include "llvm/MC/DXContainerRootSignature.h" | ||
#include "llvm/Pass.h" | ||
#include "llvm/Support/MD5.h" | ||
#include "llvm/TargetParser/Triple.h" | ||
#include "llvm/Transforms/Utils/ModuleUtils.h" | ||
|
||
using namespace llvm; | ||
|
@@ -41,6 +44,7 @@ class DXContainerGlobals : public llvm::ModulePass { | |
GlobalVariable *buildSignature(Module &M, Signature &Sig, StringRef Name, | ||
StringRef SectionName); | ||
void addSignature(Module &M, SmallVector<GlobalValue *> &Globals); | ||
void addRootSignature(Module &M, SmallVector<GlobalValue *> &Globals); | ||
void addResourcesForPSV(Module &M, PSVRuntimeInfo &PSV); | ||
void addPipelineStateValidationInfo(Module &M, | ||
SmallVector<GlobalValue *> &Globals); | ||
|
@@ -60,6 +64,7 @@ class DXContainerGlobals : public llvm::ModulePass { | |
void getAnalysisUsage(AnalysisUsage &AU) const override { | ||
AU.setPreservesAll(); | ||
AU.addRequired<ShaderFlagsAnalysisWrapper>(); | ||
AU.addRequired<RootSignatureAnalysisWrapper>(); | ||
AU.addRequired<DXILMetadataAnalysisWrapperPass>(); | ||
AU.addRequired<DXILResourceTypeWrapperPass>(); | ||
AU.addRequired<DXILResourceBindingWrapperPass>(); | ||
|
@@ -73,6 +78,7 @@ bool DXContainerGlobals::runOnModule(Module &M) { | |
Globals.push_back(getFeatureFlags(M)); | ||
Globals.push_back(computeShaderHash(M)); | ||
addSignature(M, Globals); | ||
addRootSignature(M, Globals); | ||
addPipelineStateValidationInfo(M, Globals); | ||
appendToCompilerUsed(M, Globals); | ||
return true; | ||
|
@@ -144,6 +150,39 @@ void DXContainerGlobals::addSignature(Module &M, | |
Globals.emplace_back(buildSignature(M, OutputSig, "dx.osg1", "OSG1")); | ||
} | ||
|
||
void DXContainerGlobals::addRootSignature(Module &M, | ||
SmallVector<GlobalValue *> &Globals) { | ||
|
||
dxil::ModuleMetadataInfo &MMI = | ||
getAnalysis<DXILMetadataAnalysisWrapperPass>().getModuleMetadata(); | ||
Comment on lines
+156
to
+157
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Not something that needs to be changed for this PR, but accessing analysis results here shows that it's a bit concerning how DXContainer is designed - we'll need to do a lot of work to port it to the new pass manager. |
||
|
||
// Root Signature in Library shaders are different, | ||
// since they don't use DXContainer to share it. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This comment is confusing. Can you reword it a bit please? It should say why we don't need to handle library shaders here, not simpy point out that they're "different" |
||
if (MMI.ShaderProfile == llvm::Triple::Library) | ||
return; | ||
|
||
assert(MMI.EntryPropertyVec.size() == 1); | ||
|
||
auto &RSA = getAnalysis<RootSignatureAnalysisWrapper>(); | ||
const Function *&EntryFunction = MMI.EntryPropertyVec[0].Entry; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. A const ref to a pointer is pretty strange. Is this what we really want here? I suspect just copying the pointer is fine. |
||
|
||
if (!RSA.hasForFunction(EntryFunction)) | ||
return; | ||
|
||
const ModuleRootSignature &MRS = RSA.getForFunction(EntryFunction); | ||
SmallString<256> Data; | ||
raw_svector_ostream OS(Data); | ||
|
||
RootSignatureHeader RSH; | ||
RSH.Flags = MRS.Flags; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why do we have an auxilliary structure that we simply copy through here? Could RootSignatureAnalysis just provide us with a aside: Both |
||
|
||
RSH.write(OS); | ||
|
||
Constant *Constant = | ||
ConstantDataArray::getString(M.getContext(), Data, /*AddNull*/ false); | ||
Globals.emplace_back(buildContainerGlobal(M, Constant, "dx.rts0", "RTS0")); | ||
} | ||
|
||
void DXContainerGlobals::addResourcesForPSV(Module &M, PSVRuntimeInfo &PSV) { | ||
const DXILBindingMap &DBM = | ||
getAnalysis<DXILResourceBindingWrapperPass>().getBindingMap(); | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,224 @@ | ||
//===- DXILRootSignature.cpp - DXIL Root Signature helper objects -------===// | ||
// | ||
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. | ||
// See https://llvm.org/LICENSE.txt for license information. | ||
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception | ||
// | ||
//===----------------------------------------------------------------------===// | ||
/// | ||
/// \file This file contains helper objects and APIs for working with DXIL | ||
/// Root Signatures. | ||
/// | ||
//===----------------------------------------------------------------------===// | ||
#include "DXILRootSignature.h" | ||
#include "DirectX.h" | ||
#include "llvm/ADT/StringSwitch.h" | ||
#include "llvm/ADT/Twine.h" | ||
#include "llvm/Analysis/DXILMetadataAnalysis.h" | ||
#include "llvm/BinaryFormat/DXContainer.h" | ||
#include "llvm/IR/Constants.h" | ||
#include "llvm/IR/DiagnosticInfo.h" | ||
#include "llvm/IR/Function.h" | ||
#include "llvm/IR/LLVMContext.h" | ||
#include "llvm/IR/Metadata.h" | ||
#include "llvm/IR/Module.h" | ||
#include "llvm/InitializePasses.h" | ||
#include "llvm/Pass.h" | ||
#include "llvm/Support/Error.h" | ||
#include "llvm/Support/ErrorHandling.h" | ||
#include <cstdint> | ||
#include <optional> | ||
#include <utility> | ||
|
||
using namespace llvm; | ||
using namespace llvm::dxil; | ||
|
||
static bool reportError(LLVMContext *Ctx, Twine Message, | ||
DiagnosticSeverity Severity = DS_Error) { | ||
Ctx->diagnose(DiagnosticInfoGeneric(Message, Severity)); | ||
return true; | ||
} | ||
|
||
static bool parseRootFlags(LLVMContext *Ctx, ModuleRootSignature &MRS, | ||
MDNode *RootFlagNode) { | ||
|
||
if (RootFlagNode->getNumOperands() != 2) | ||
return reportError(Ctx, "Invalid format for RootFlag Element"); | ||
|
||
auto *Flag = mdconst::extract<ConstantInt>(RootFlagNode->getOperand(1)); | ||
MRS.Flags = Flag->getZExtValue(); | ||
|
||
return false; | ||
} | ||
|
||
static bool parseRootSignatureElement(LLVMContext *Ctx, | ||
ModuleRootSignature &MRS, | ||
MDNode *Element) { | ||
MDString *ElementText = cast<MDString>(Element->getOperand(0)); | ||
if (ElementText == nullptr) | ||
return reportError(Ctx, "Invalid format for Root Element"); | ||
|
||
RootSignatureElementKind ElementKind = | ||
StringSwitch<RootSignatureElementKind>(ElementText->getString()) | ||
.Case("RootFlags", RootSignatureElementKind::RootFlags) | ||
.Default(RootSignatureElementKind::None); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should |
||
|
||
switch (ElementKind) { | ||
|
||
case RootSignatureElementKind::RootFlags: | ||
return parseRootFlags(Ctx, MRS, Element); | ||
case RootSignatureElementKind::None: | ||
return reportError(Ctx, "Invalid Root Signature Element: " + | ||
ElementText->getString()); | ||
} | ||
|
||
llvm_unreachable("Root signature element kind not expected."); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Wording nit: This isn't "unexpected" - it should be impossible if folks are reading compiler warnings. I might say "Unhandled RootSignatureElementKind enum" here. |
||
} | ||
|
||
static bool parse(LLVMContext *Ctx, ModuleRootSignature &MRS, MDNode *Node) { | ||
bool HasError = false; | ||
|
||
// Loop through the Root Elements of the root signature. | ||
for (const auto &Operand : Node->operands()) { | ||
MDNode *Element = dyn_cast<MDNode>(Operand); | ||
if (Element == nullptr) | ||
return reportError(Ctx, "Missing Root Element Metadata Node."); | ||
|
||
HasError = HasError || parseRootSignatureElement(Ctx, MRS, Element); | ||
} | ||
|
||
return HasError; | ||
} | ||
|
||
static bool validate(LLVMContext *Ctx, const ModuleRootSignature &MRS) { | ||
if (!dxbc::RootSignatureValidations::isValidRootFlag(MRS.Flags)) { | ||
return reportError(Ctx, "Invalid Root Signature flag value"); | ||
} | ||
return false; | ||
} | ||
|
||
static SmallDenseMap<const Function *, ModuleRootSignature> | ||
analyzeModule(Module &M) { | ||
|
||
/** Root Signature are specified as following in the metadata: | ||
|
||
!dx.rootsignatures = !{!2} ; list of function/root signature pairs | ||
!2 = !{ ptr @main, !3 } ; function, root signature | ||
!3 = !{ !4, !5, !6, !7 } ; list of root signature elements | ||
|
||
So for each MDNode inside dx.rootsignatures NamedMDNode | ||
(the Root parameter of this function), the parsing process needs | ||
to loop through each of its operands and process the function, | ||
signature pair. | ||
*/ | ||
|
||
LLVMContext *Ctx = &M.getContext(); | ||
|
||
SmallDenseMap<const Function *, ModuleRootSignature> MRSMap; | ||
|
||
NamedMDNode *RootSignatureNode = M.getNamedMetadata("dx.rootsignatures"); | ||
if (RootSignatureNode == nullptr) | ||
return MRSMap; | ||
|
||
for (const auto &RSDefNode : RootSignatureNode->operands()) { | ||
if (RSDefNode->getNumOperands() != 2) { | ||
reportError(Ctx, "Invalid format for Root Signature Definition. Pairs " | ||
"of function, root signature expected."); | ||
continue; | ||
} | ||
|
||
// Function was pruned during compilation. | ||
const MDOperand &FunctionPointerMdNode = RSDefNode->getOperand(0); | ||
if (FunctionPointerMdNode == nullptr) { | ||
continue; | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This should probably be a (there's an argument that some of these could be asserts, depending on whether we consider invalid IR to be user input or a frontend bug, but for consistency with the other cases here reportError seems the most appropriate) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is it possible that a function might be removed, but the root signature metadata associated with it is not? For example, if the user change the Entry function using the CLI flag? If that is possible, we might need to update There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I can't think of any way that we could get here from HLSL, no. As far as I can tell the only way we can get to this situation is if we have invalid LLVM IR in the first place. |
||
|
||
ValueAsMetadata *VAM = | ||
llvm::dyn_cast<ValueAsMetadata>(FunctionPointerMdNode.get()); | ||
if (VAM == nullptr) { | ||
reportError(Ctx, "First element of root signature is not a Value"); | ||
continue; | ||
} | ||
|
||
Function *F = dyn_cast<Function>(VAM->getValue()); | ||
if (F == nullptr) { | ||
reportError(Ctx, "First element of root signature is not a Function"); | ||
continue; | ||
} | ||
|
||
MDNode *RootElementListNode = | ||
dyn_cast<MDNode>(RSDefNode->getOperand(1).get()); | ||
|
||
if (RootElementListNode == nullptr) { | ||
reportError(Ctx, "Missing Root Element List Metadata node."); | ||
} | ||
Comment on lines
+156
to
+158
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should there be a |
||
|
||
ModuleRootSignature MRS; | ||
|
||
if (parse(Ctx, MRS, RootElementListNode) || validate(Ctx, MRS)) { | ||
return MRSMap; | ||
} | ||
|
||
MRSMap.insert(std::make_pair(F, MRS)); | ||
} | ||
|
||
return MRSMap; | ||
} | ||
|
||
AnalysisKey RootSignatureAnalysis::Key; | ||
|
||
SmallDenseMap<const Function *, ModuleRootSignature> | ||
RootSignatureAnalysis::run(Module &M, ModuleAnalysisManager &AM) { | ||
return analyzeModule(M); | ||
} | ||
|
||
//===----------------------------------------------------------------------===// | ||
|
||
static void printSpaces(raw_ostream &Stream, unsigned int Count) { | ||
for (unsigned int I = 0; I < Count; ++I) { | ||
Stream << ' '; | ||
} | ||
} | ||
|
||
PreservedAnalyses RootSignatureAnalysisPrinter::run(Module &M, | ||
ModuleAnalysisManager &AM) { | ||
|
||
SmallDenseMap<const Function *, ModuleRootSignature> &MRSMap = | ||
AM.getResult<RootSignatureAnalysis>(M); | ||
OS << "Root Signature Definitions" | ||
<< "\n"; | ||
uint8_t Space = 0; | ||
for (const auto &P : MRSMap) { | ||
const auto &[Function, MRS] = P; | ||
OS << "Definition for '" << Function->getName() << "':\n"; | ||
|
||
// start root signature header | ||
Space++; | ||
printSpaces(OS, Space); | ||
OS << "Flags: " << format_hex(MRS.Flags, 8) << ":\n"; | ||
Space--; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think you can use |
||
// end root signature header | ||
} | ||
|
||
return PreservedAnalyses::all(); | ||
} | ||
|
||
//===----------------------------------------------------------------------===// | ||
bool RootSignatureAnalysisWrapper::runOnModule(Module &M) { | ||
MRS = analyzeModule(M); | ||
return false; | ||
} | ||
|
||
void RootSignatureAnalysisWrapper::getAnalysisUsage(AnalysisUsage &AU) const { | ||
AU.setPreservesAll(); | ||
AU.addRequired<DXILMetadataAnalysisWrapperPass>(); | ||
} | ||
|
||
char RootSignatureAnalysisWrapper::ID = 0; | ||
damyanp marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
INITIALIZE_PASS_BEGIN(RootSignatureAnalysisWrapper, | ||
"dxil-root-signature-analysis", | ||
"DXIL Root Signature Analysis", true, true) | ||
INITIALIZE_PASS_END(RootSignatureAnalysisWrapper, | ||
"dxil-root-signature-analysis", | ||
"DXIL Root Signature Analysis", true, true) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please keep the blank line between the sources and the LINK_COMPONENTS line - it makes this easier to read.