[Draft][DO NOT MERGE] SM 6.9 cap: fix PSV/DebugBreak unit tests (validate #8618)#8623
Closed
alsepkow wants to merge 4 commits into
Closed
[Draft][DO NOT MERGE] SM 6.9 cap: fix PSV/DebugBreak unit tests (validate #8618)#8623alsepkow wants to merge 4 commits into
alsepkow wants to merge 4 commits into
Conversation
Lower the highest recognized shader model from 6.10 to 6.9 so this release branch only produces up to Shader Model 6.9. Sets highest_minor = 9 in hctdb_instrhelp.py and regenerates the dependent sources (DxilConstants.h, DxilShaderModel.h/.cpp, HLSLOptions.td), dropping all 6.10 target profiles, the SM 6.10 table entries, and IsSM610Plus. kDxilMinor and the validator version follow at 1.9. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: f3140c6f-a4ea-4f73-aac8-df248801fd8f
Capping the highest recognized shader model to 6.9 (PR microsoft#8618) removes the dxil-1-10 lit feature, so tests that target SM 6.10 or require validator version 1.10 now fail. Add REQUIRES: dxil-1-10 guards so they skip cleanly on the capped release, following the pattern from PR microsoft#8069. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 086148ba-a82b-41c4-8fa0-5eb63e5797e2
Capping the highest shader model to 6.9 (PR microsoft#8618) lowers the validator version to 1.9, so the compiler emits PSVRuntimeInfo3 (52 bytes) instead of PSVRuntimeInfo4 (56 bytes) and rejects cs_6_10, which broke 14 unit tests. - PixTest DebugBreakInstrumentation_{Basic,Multiple}: skip when Dxil/ Validator < 1.10 (DebugBreak is an experimental SM 6.10 feature). - ValidationTest PSV tests: derive the expected PSVRuntimeInfo size from the validator version (v4 only for >= 1.10, else v3) instead of hard-coding sizeof(PSVRuntimeInfo4), and format the expected size into the WrongPSVVersion mismatch messages. Validated locally against a capped x64 build: the 14 tests pass, and the full ValidationTest + PixTest suites (302) and clang FileCheck lit suite show no failures. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 086148ba-a82b-41c4-8fa0-5eb63e5797e2
Contributor
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 942a5e5f-0252-472b-9529-7218fdab7664
alsepkow
changed the title
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
1 participant
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.
Draft for CI validation only, not for merge.
Purpose: prove the PSV/DebugBreak unit-test fixes work under the SM 6.9 cap. Exercising them requires capping the recognized validator to 1.9, which only makes sense on
release-1.9.2607, so this draft stacks everything on that branch to get one clean CI run before the pieces land separately.Composition:
REQUIRES: dxil-1-10lit guards (from Cap highest shader model at 6.9 for the 1.9.2607 release #8618).mainvia Make PSV/DebugBreak unit tests robust to validator version #8625; the release branch picks them up by cherry-picking Make PSV/DebugBreak unit tests robust to validator version #8625).Not merged directly: #8618 carries the cap + guards into the release branch, and the unit-test fixes arrive there via the #8625 cherry-pick.