Improve invalid shader handling #2880
Merged
Conversation
This file contains 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
5p4k
force-pushed
the
improve_invalid_shader_handling
branch
from
8ae925f to
c1021ac
Compare
nhaehnle
reviewed
Dec 12, 2023
llpc/util/llpcShaderModuleHelper.cpp
Outdated
| auto codeOrErr = getShaderCode(shaderInfo, codeBuffer); | ||
| if (Error err = codeOrErr.takeError()) { | ||
| return errorToResult(std::move(err)); | ||
| } |
| } | ||
| } else { | ||
| // Allocator is not specified | ||
| return Result::ErrorInvalidPointer; |
There was a problem hiding this comment.
This could also be turned into an early-out.
Test summary for commit c1021acCTS tests (Failed: 0/138443)
Ubuntu navi3x, SrdcvkUbuntu navi2x, Srdcvk |
Validation might fail e.g. because the shader entry point is missing. This change allows the error to bubble up through the call stack until vkCreateComputePipelines, instead of killing the app later on with exit code 1. BuildComputePipeline is converted to early-return style.
An invalid SPIR-V binary might contain data that does not match any opCode, and yields a wordCount of zero, triggering an infinite loop. trimSpirvDebugInfo now returns Expected<unsigned> and will give an error in such a situation. Caller functions getShaderCode and getCodeSize (as well as their callers BuildShaderModule and getModuleData) have been updated to handle the error.
5p4k
force-pushed
the
improve_invalid_shader_handling
branch
from
c1021ac to
c7656ef
Compare
Test summary for commit c7656efCTS tests (Failed: 0/138378)
Ubuntu navi3x, SrdcvkUbuntu navi2x, Srdcvk |
qiaojbao
pushed a commit
that referenced
this pull request
Jan 2, 2024
* Make BuildComputePipeline fail if the shader does not pass validation Validation might fail e.g. because the shader entry point is missing. This change allows the error to bubble up through the call stack until vkCreateComputePipelines, instead of killing the app later on with exit code 1. BuildComputePipeline is converted to early-return style. * Prevent trimSpirvDebugInfo from looping indefinitely on invalid input An invalid SPIR-V binary might contain data that does not match any opCode, and yields a wordCount of zero, triggering an infinite loop. trimSpirvDebugInfo now returns Expected<unsigned> and will give an error in such a situation. Caller functions getShaderCode and getCodeSize (as well as their callers BuildShaderModule and getModuleData) have been updated to handle the error.
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.
Prevent
trimSpirvDebugInfofrom looping indefinitely on invalid inputAn invalid SPIR-V binary might contain data that does not match any opCode, and yields a
wordCountof zero, triggering an infinite loop.trimSpirvDebugInfonow returnsExpected<unsigned>and will give an error in such a situation. Caller functionsgetShaderCodeandgetCodeSize(as well as their callersBuildShaderModuleandgetModuleData) have been updated to handle the error.Make
BuildComputePipelinefail if the shader does not pass validationValidation might fail e.g. because the shader entry point is missing. This change allows the error to bubble up through the call stack until
vkCreateComputePipelines, instead of killing the app later on with exit code 1.BuildComputePipelineis converted to early-return style.I did not add any test for these conditions, but I could do so if it's considered valuable.