[PIX] Fix shared instrumentation resource handling - #8842
Open
Damyan Pepper (damyanp) wants to merge 4 commits into
Open
[PIX] Fix shared instrumentation resource handling#8842Damyan Pepper (damyanp) wants to merge 4 commits into
Damyan Pepper (damyanp) wants to merge 4 commits into
Conversation
More than one PIX pass can run on the same module. Each pass adds its own tools UAV, so a pipeline with two passes makes two resources at the same register and space. The code that adds this UAV to a root signature has three unsafe paths. Root signature serialization can fail and give a null blob, which the code then reads. An empty result can replace a correct root signature. Only the first global root-signature subobject gets the new parameter, so a state object that declares more than one is left in a mixed state. The tools UAV is a raw buffer, so it changes the shader flags of the module. The code does not compute the flags again. Some passes make a dx.op overload declaration and then find no callers for it. They leave the declaration in the module, and the validator refuses a module that has an unused declaration. When serialization fails, the helpers keep the original root signature. A valid signature is better than an empty one. Assisted-by: Copilot Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 40dc9de3-617e-4caf-ab0d-fba0a033ed93
Damyan Pepper (damyanp)
requested a review
from Austin Kinross (austinkinross)
August 27, 2026 22:45
Austin Kinross (austinkinross)
approved these changes
Aug 27, 2026
Member
Author
|
/azp run |
|
Azure Pipelines: 1 pipeline(s) were filtered out due to trigger conditions. |
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes PIX instrumentation resource reuse, root-signature handling, shader flags, and unused DXIL operation declarations.
Changes:
- Reuses tools UAVs and safely updates all global root signatures.
- Recomputes shader flags and centralizes unused declaration cleanup.
- Adds regression and validation coverage for affected PIX passes.
Reviewed changes
Copilot reviewed 11 out of 11 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
tools/clang/unittests/HLSL/PixTest.cpp |
Adds PIX resource, root-signature, flags, cleanup, and validation tests. |
tools/clang/test/HLSLFileCheck/pix/pixelCounterEarlyZ.hlsl |
Updates expected raw-buffer shader flags. |
lib/DxilPIXPasses/PixPassHelpers.h |
Exposes the operation cleanup helper. |
lib/DxilPIXPasses/PixPassHelpers.cpp |
Implements UAV reuse, root-signature updates, flags, and cleanup. |
lib/DxilPIXPasses/DxilRemoveDiscards.cpp |
Removes unused discard declarations. |
lib/DxilPIXPasses/DxilPIXMeshShaderOutputInstrumentation.cpp |
Cleans obsolete mesh operation overloads. |
lib/DxilPIXPasses/DxilPIXAddTidToAmplificationShaderPayload.cpp |
Cleans the replaced dispatch declaration. |
lib/DxilPIXPasses/DxilOutputColorBecomesConstant.cpp |
Cleans unused output overloads. |
lib/DxilPIXPasses/DxilNonUniformResourceIndexInstrumentation.cpp |
Cleans unused instrumentation operations. |
lib/DxilPIXPasses/DxilDebugInstrumentation.cpp |
Removes obsolete UAV-selection logic. |
lib/DxilPIXPasses/DxilDebugBreakInstrumentation.cpp |
Uses centralized operation cleanup. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Comment on lines
246
to
249
| ExtendRootSig<DxilRootSignatureDesc1, DxilRootParameter1>(rs->Desc_1_1, | ||
| toolsUAVRegister); | ||
| rs->Desc_1_1.pParameters[rs->Desc_1_1.NumParameters - 1].Descriptor.Flags = | ||
| hlsl::DxilRootDescriptorFlags::None; |
Bring the final approved L1 tip, including its formatting follow-up, into this layer while preserving the original L2 commit as the first parent. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
ExtendRootSig returns early, without appending a parameter, when a version 1.1 root signature already holds the requested tools UAV. The caller still unconditionally cleared Descriptor.Flags on the last parameter in that case, which may be an unrelated, pre-existing parameter whose flags the caller must not disturb. Have ExtendRootSig report whether it actually appended a parameter, and only clear flags on that path. Add a regression test: a v1.1 root signature with the tools UAV already present as parameter 0 and an unrelated root descriptor as parameter 1 with DataVolatile flags. Re-requesting the same register leaves parameter 1's flags untouched; appending a genuinely new register still leaves parameter 1 untouched and gives the new parameter None flags. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Replace the stable, nameable auto-deduced types introduced by L2. Retain only the two DxilSubobjects MapVector ranges whose underlying pair type is implementation-dependent and obscures the loop. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Contributor
There was a problem hiding this comment.
🟡 Changes recommended
Declaration cleanup mutations must be reflected in pass modification results.
Once you've addressed the issues Copilot identified, you can request another Copilot review.
Review details
Suppressed comments (1)
tools/clang/unittests/HLSL/PixTest.cpp:4243
- Use the explicit
CComPtr<IDxcBlob>type here.Compileresults use that type throughout these new tests (for example, line 4224 immediately above), matching the repository's almost-never-autoconvention.
auto compiled = Compile(m_dllSupport, source, L"cs_6_10", {});
- Files reviewed: 11/11 changed files
- Comments generated: 1
- Review effort level: Balanced
Comment on lines
+389
to
+393
| void EraseIfUnused(hlsl::DxilModule &DM, llvm::Function *OpFunction) { | ||
| if (OpFunction != nullptr && OpFunction->user_empty()) { | ||
| DM.GetOP()->RemoveFunction(OpFunction); | ||
| OpFunction->eraseFromParent(); | ||
| } |
This file contains hidden or 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
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.
More than one PIX pass can run on the same module. Each pass adds its own tools UAV, so a pipeline with two passes makes two resources at the same register and space.
The code that adds this UAV to a root signature has three unsafe paths. Root signature serialization can fail and give a null blob, which the code then reads. An empty result can replace a correct root signature. Only the first global root-signature subobject gets the new parameter, so a state object that declares more than one is left in a mixed state.
The tools UAV is a raw buffer, so it changes the shader flags of the module. The code does not compute the flags again. Some passes make a dx.op overload declaration and then find no callers for it. They leave the declaration in the module, and the validator refuses a module that has an unused declaration.
When serialization fails, the helpers keep the original root signature. A valid signature is better than an empty one.
Assisted-by: Copilot
Stack created with GitHub Stacks CLI • Give Feedback 💬