Skip to content

[PIX] Fix mesh shader instrumentation #8855

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

Open
Damyan Pepper (damyanp) wants to merge 1 commit into from
Open

[PIX] Fix mesh shader instrumentation #8855

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
24 changes: 23 additions & 1 deletion lib/DxilPIXPasses/DxilPIXAddTidToAmplificationShaderPayload.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include "dxc/DXIL/DxilOperations.h"
#include "dxc/DXIL/DxilUtil.h"

#include "dxc/DXIL/DxilConstants.h"
#include "dxc/DXIL/DxilInstructions.h"
#include "dxc/DXIL/DxilModule.h"
#include "dxc/DxilPIXPasses/DxilPIXPasses.h"
Expand Down Expand Up @@ -98,13 +99,32 @@ bool DxilPIXAddTidToAmplificationShaderPayload::runOnModule(Module &M) {
OriginalPayloadStructPointerType->getPointerElementType();
ExpandedStruct expanded =
ExpandStructType(Ctx, OriginalPayloadStructType);
unsigned expandedPayloadSizeInBytes =
(unsigned)M.getDataLayout().getTypeAllocSize(
expanded.ExpandedPayloadStructType);
if (expandedPayloadSizeInBytes > DXIL::kMaxMSASPayloadBytes) {
return false;
}

if (OSOverride != nullptr) {
auto const *expandedLayout = M.getDataLayout().getStructLayout(
cast<StructType>(expanded.ExpandedPayloadStructType));
unsigned appendedFieldsOffsetInBytes =
(unsigned)expandedLayout->getElementOffset(
expanded.ExpandedPayloadStructType->getStructNumElements() - 3);
*OSOverride << "ExpandedPayloadSize:"
<< std::to_string(expandedPayloadSizeInBytes) << "\n";
*OSOverride << "ExpandedPayloadAppendedFieldsOffset:"
<< std::to_string(appendedFieldsOffsetInBytes) << "\n";
}

llvm::IRBuilder<> B(&*I);

auto *NewStructAlloca =
B.CreateAlloca(expanded.ExpandedPayloadStructType,
HlslOP->GetU32Const(1), "NewPayload");
NewStructAlloca->setAlignment(4);
NewStructAlloca->setAlignment(M.getDataLayout().getABITypeAlignment(
expanded.ExpandedPayloadStructType));
auto PayloadType =
llvm::dyn_cast<PointerType>(DispatchMesh.get_payload()->getType());
SmallVector<Value *, 16> GEPIndices;
Expand Down Expand Up @@ -188,6 +208,8 @@ bool DxilPIXAddTidToAmplificationShaderPayload::runOnModule(Module &M) {
I->removeFromParent();
delete &*I;
PIXPassHelpers::EraseIfUnused(DM, OriginalDispatchMeshFn);
DM.GetDxilFunctionProps(entryFunction).ShaderProps.AS.payloadSizeInBytes =
expandedPayloadSizeInBytes;
// Validation requires exactly one DispatchMesh in an AS, so we can exit
// after the first one:
DM.ReEmitDxilResources();
Expand Down
Loading
Loading