spirv-val: Make Constant evaluation consistent #5587
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
spencer-lunarg
commented
Feb 16, 2024
| if (!_.IsUnsignedIntScalarType(cluster_size_type)) { | ||
| return _.diag(SPV_ERROR_INVALID_DATA, inst) | ||
| << "ClusterSize must be a scalar of integer type, whose " | ||
| "Signedness operand is 0."; | ||
| } | ||
|
|
||
| uint64_t cluster_size; | ||
| if (!_.GetConstantValUint64(cluster_size_op_id, &cluster_size)) { | ||
| if (!spvOpcodeIsConstant(cluster_size_inst->opcode())) { |
There was a problem hiding this comment.
here is an example were we using what I thought was a "get the constant value" but really here we want to check if it is any Op*Constant and not the value itself
alan-baker
approved these changes
Feb 21, 2024
alan-baker
reviewed
Feb 21, 2024
| @@ -1374,22 +1374,18 @@ spv_result_t ValidateAccessChain(ValidationState_t& _, | |||
| case spv::Op::OpTypeStruct: { | |||
| // In case of structures, there is an additional constraint on the | |||
| // index: the index must be an OpConstant. | |||
| if (spv::Op::OpConstant != cur_word_instr->opcode()) { | |||
| int64_t cur_index; | |||
There was a problem hiding this comment.
This is causing a build failure for android due to shortening later on.
spencer-lunarg
force-pushed
the
spencer-lunarg-eval-constant
branch
from
c57100c
to
5ba07d2
Compare
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.
prequel for #5577
We currently have multiple ways to get the constant values, and one to create a single system. This also keeps things consistent to not grab the constant value from a
OpSpecConstant*should not be used