-
Notifications
You must be signed in to change notification settings - Fork 567
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
spirv-val: Add initial SPV_EXT_mesh_shader validation (#4924)
* Move TaskEXT check to OpEmitMeshTasksEXT * Add MeshNV for Execution Model alias
- Loading branch information
Showing
14 changed files
with
788 additions
and
11 deletions.
There are no files selected for viewing
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| // Copyright (c) 2022 The Khronos Group Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| // Validates ray query instructions from SPV_KHR_ray_query | ||
|
|
||
| #include "source/opcode.h" | ||
| #include "source/val/instruction.h" | ||
| #include "source/val/validate.h" | ||
| #include "source/val/validation_state.h" | ||
|
|
||
| namespace spvtools { | ||
| namespace val { | ||
|
|
||
| spv_result_t MeshShadingPass(ValidationState_t& _, const Instruction* inst) { | ||
| const SpvOp opcode = inst->opcode(); | ||
| switch (opcode) { | ||
| case SpvOpEmitMeshTasksEXT: { | ||
| _.function(inst->function()->id()) | ||
| ->RegisterExecutionModelLimitation( | ||
| [](SpvExecutionModel model, std::string* message) { | ||
| if (model != SpvExecutionModelTaskEXT) { | ||
| if (message) { | ||
| *message = | ||
| "OpEmitMeshTasksEXT requires TaskEXT execution model"; | ||
| } | ||
| return false; | ||
| } | ||
| return true; | ||
| }); | ||
|
|
||
| const uint32_t group_count_x = _.GetOperandTypeId(inst, 0); | ||
| if (!_.IsUnsignedIntScalarType(group_count_x) || | ||
| _.GetBitWidth(group_count_x) != 32) { | ||
| return _.diag(SPV_ERROR_INVALID_DATA, inst) | ||
| << "Group Count X must be a 32-bit unsigned int scalar"; | ||
| } | ||
|
|
||
| const uint32_t group_count_y = _.GetOperandTypeId(inst, 1); | ||
| if (!_.IsUnsignedIntScalarType(group_count_y) || | ||
| _.GetBitWidth(group_count_y) != 32) { | ||
| return _.diag(SPV_ERROR_INVALID_DATA, inst) | ||
| << "Group Count Y must be a 32-bit unsigned int scalar"; | ||
| } | ||
|
|
||
| const uint32_t group_count_z = _.GetOperandTypeId(inst, 2); | ||
| if (!_.IsUnsignedIntScalarType(group_count_z) || | ||
| _.GetBitWidth(group_count_z) != 32) { | ||
| return _.diag(SPV_ERROR_INVALID_DATA, inst) | ||
| << "Group Count Z must be a 32-bit unsigned int scalar"; | ||
| } | ||
|
|
||
| if (inst->operands().size() == 4) { | ||
| const auto payload = _.FindDef(inst->GetOperandAs<uint32_t>(3)); | ||
| if (payload->opcode() != SpvOpVariable) { | ||
| return _.diag(SPV_ERROR_INVALID_DATA, inst) | ||
| << "Payload must be the result of a OpVariable"; | ||
| } | ||
| if (SpvStorageClass(payload->GetOperandAs<uint32_t>(2)) != | ||
| SpvStorageClassTaskPayloadWorkgroupEXT) { | ||
| return _.diag(SPV_ERROR_INVALID_DATA, inst) | ||
| << "Payload OpVariable must have a storage class of " | ||
| "TaskPayloadWorkgroupEXT"; | ||
| } | ||
| } | ||
| break; | ||
| } | ||
|
|
||
| case SpvOpSetMeshOutputsEXT: { | ||
| _.function(inst->function()->id()) | ||
| ->RegisterExecutionModelLimitation( | ||
| [](SpvExecutionModel model, std::string* message) { | ||
| if (model != SpvExecutionModelMeshEXT) { | ||
| if (message) { | ||
| *message = | ||
| "OpSetMeshOutputsEXT requires MeshEXT execution model"; | ||
| } | ||
| return false; | ||
| } | ||
| return true; | ||
| }); | ||
|
|
||
| const uint32_t vertex_count = _.GetOperandTypeId(inst, 0); | ||
| if (!_.IsUnsignedIntScalarType(vertex_count) || | ||
| _.GetBitWidth(vertex_count) != 32) { | ||
| return _.diag(SPV_ERROR_INVALID_DATA, inst) | ||
| << "Vertex Count must be a 32-bit unsigned int scalar"; | ||
| } | ||
|
|
||
| const uint32_t primitive_count = _.GetOperandTypeId(inst, 1); | ||
| if (!_.IsUnsignedIntScalarType(primitive_count) || | ||
| _.GetBitWidth(primitive_count) != 32) { | ||
| return _.diag(SPV_ERROR_INVALID_DATA, inst) | ||
| << "Primitive Count must be a 32-bit unsigned int scalar"; | ||
| } | ||
|
|
||
| break; | ||
| } | ||
|
|
||
| case SpvOpWritePackedPrimitiveIndices4x8NV: { | ||
| // No validation rules (for the moment). | ||
| break; | ||
| } | ||
|
|
||
| default: | ||
| break; | ||
| } | ||
|
|
||
| return SPV_SUCCESS; | ||
| } | ||
|
|
||
| } // namespace val | ||
| } // namespace spvtools |
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
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
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
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
Oops, something went wrong.