Skip to content
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

Error on diff blob versions part 1 #5378

Merged
merged 6 commits into from
Jul 10, 2023

Conversation

bob80905
Copy link
Collaborator

@bob80905 bob80905 commented Jun 29, 2023

This PR is the first of 2 PRs to prevent libraries of different compiler versions from linking together. This first PR implements adding the compiler version information into the Dxil Container itself, to allow for comparison later. It also adds some basic validation to the new part in the Dxil Container.

@AppVeyorBot
Copy link

@bob80905 bob80905 force-pushed the error_on_diff_blob_versions_part1 branch 2 times, most recently from d2e0f83 to 8d72f47 Compare June 30, 2023 21:11
@bob80905 bob80905 force-pushed the error_on_diff_blob_versions_part1 branch from 80ef3fb to ccc9d46 Compare June 30, 2023 21:23
@AppVeyorBot
Copy link

lib/HLSL/DxilValidation.cpp Show resolved Hide resolved
lib/DxilContainer/DxilContainerAssembler.cpp Outdated Show resolved Hide resolved
tools/clang/unittests/HLSL/DxilContainerTest.cpp Outdated Show resolved Hide resolved
tools/clang/unittests/HLSL/DxilContainerTest.cpp Outdated Show resolved Hide resolved
@AppVeyorBot
Copy link

@AppVeyorBot
Copy link

@AppVeyorBot
Copy link

@AppVeyorBot
Copy link

@AppVeyorBot
Copy link

Copy link
Contributor

@tex3d tex3d left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@tex3d tex3d self-requested a review July 6, 2023 22:32
Copy link
Contributor

@tex3d tex3d left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@AppVeyorBot
Copy link

@AppVeyorBot
Copy link

@bob80905 bob80905 merged commit 6287d51 into microsoft:main Jul 10, 2023
pow2clk added a commit to pow2clk/DirectXShaderCompiler that referenced this pull request Aug 31, 2023
The container builder determines whether to include the version in the
compiled shader library depending on the validator version. If the
version is below 1.8, it won't include it and any linking is allowed. If
it is 1.8 or above, the version will prevent linking with a
non-versioned compile.

RunLinkWithTempReg assembled one library shader and compiled another. As
such, one had a version and the other didn't. By forcing the link to use
an earlier validator version, the link is again allowed

Followup to microsoft#5378
pow2clk added a commit to pow2clk/DirectXShaderCompiler that referenced this pull request Aug 31, 2023
The container builder determines whether to include the version in the
compiled shader library depending on the validator version. If the
version is below 1.8, it won't include it and any linking is allowed. If
it is 1.8 or above, the version will prevent linking with a
non-versioned compile.

RunLinkWithTempReg assembled one library shader and compiled another. As
such, one had a version and the other didn't. By forcing the link to use
an earlier validator version, the link is again allowed

Followup to microsoft#5378
pow2clk added a commit that referenced this pull request Aug 31, 2023
The container builder determines whether to include the version in the
compiled shader library depending on the validator version. If the
version is below 1.8, it won't include it and any linking is allowed. If
it is 1.8 or above, the version will prevent linking with a
non-versioned compile.

RunLinkWithTempReg assembled one library shader and compiled another. As
such, one had a version and the other didn't. By forcing the compile to
use an earlier validator version, the link is again allowed

Followup to #5378
pow2clk added a commit to pow2clk/DirectXShaderCompiler that referenced this pull request Sep 14, 2023
Require a lesser validator version for linking without version for
RunLinkWithTempReg test in order to allow the test to run on older
validators. 1.3 is the lowest version that supports libraries

Another follow up to microsoft#5378
pow2clk added a commit to pow2clk/DirectXShaderCompiler that referenced this pull request Sep 14, 2023
Require a lesser validator version for linking without version for
RunLinkWithTempReg test in order to allow the test to run on older
validators. 1.3 is the lowest version that supports libraries

Another follow up to microsoft#5378
pow2clk added a commit that referenced this pull request Sep 14, 2023
Require a lesser validator version for linking without version for
RunLinkWithTempReg test in order to allow the test to run on older
validators. 1.3 is the lowest version that supports libraries

Another follow up to #5378
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants