local_size_*_id and SPIR-V 1.2

[pobrn]

The first commit adds a diagnostic when local_size_*_id is used when targeting < SPIR-V 1.2. I think it would be nice to get a diagnostic if the qualifier will be ignored in the end; I was surprised by this behaviour.

The second commit essentially applies #3351 to mesh and task shaders (#3739).

The third commit, I'm not entirely sure about, but according to https://registry.khronos.org/SPIR-V/specs/unified1/SPIRV.html#OpExecutionModeId local_size_*_id should be available when targeting at least SPIR-V 1.2, so that commit lowers the required versions.

The fourth is a trivial cleanup.

Related:

• spirv: only set LocalSizeId mode when necessary #3351
• OpExecutionModeId not used unless targeting SPIRV-1.6 #3510
• Targeting spv1.6 with MeshShader generates LocalSizeId instead of LocalSize #3739

[CLAassistant]

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

[dnovillo]

Could you please add a test for this? The one in #3510 seems fine. Also, please split it into its own PR for clarity.

[pobrn]

I suppose I should add it to Spv.FromFile.cpp? And I imagine I can just add two new test suites CompileToSpirv11Test and CompileToSpirv12Test, and then use the same input file for both?

[pobrn]

I have somehow missed the test suite, sorry. These changes generate 11 failures:

[----------] Global test environment tear-down
[==========] 1782 tests from 71 test suites ran. (61587 ms total)
[  PASSED  ] 1771 tests.
[  FAILED  ] 11 tests, listed below:
[  FAILED  ] Glsl/LinkTestVulkan.FromFile/9, where GetParam() = { "link.vk.multiUnitLayout.0.comp", "link.vk.multiUnitLayout.1.comp" }
[  FAILED  ] Glsl/LinkTestVulkan.FromFile/10, where GetParam() = { "link.vk.multiUnitLayout.2.comp", "link.vk.multiUnitLayout.0.comp" }
[  FAILED  ] Glsl/CompileVulkanToSpirvTest.FromFile/spv_noWorkgroup_comp, where GetParam() = "spv.noWorkgroup.comp"
[  FAILED  ] Glsl/CompileVulkanToSpirvTest.FromFile/spv_specConstant_comp, where GetParam() = "spv.specConstant.comp"
[  FAILED  ] Glsl/CompileVulkanToSpirvTest.FromFile/spv_tensorARM_params_comp, where GetParam() = "spv.tensorARM.params.comp"
[  FAILED  ] Glsl/CompileVulkan1_1ToSpirvTest.FromFile/spv_atomicAdd_bufferReference_comp, where GetParam() = "spv.atomicAdd.bufferReference.comp"
[  FAILED  ] Glsl/VulkanSemantics.FromFile/vulkan_comp, where GetParam() = "vulkan.comp"
[  FAILED  ] Glsl/CompileVulkanToSpirv13TestQCOM.FromFile/spv_qcom_coopmatConversion_1_comp, where GetParam() = "spv.qcom.coopmatConversion.1.comp"
[  FAILED  ] Glsl/CompileVulkanToSpirv13TestQCOM.FromFile/spv_qcom_coopmatConversion_2_comp, where GetParam() = "spv.qcom.coopmatConversion.2.comp"
[  FAILED  ] Glsl/CompileVulkanToSpirvTestNV.FromFile/spv_computeShaderDerivativesSpec_comp, where GetParam() = "spv.computeShaderDerivativesSpec.comp"
[  FAILED  ] Glsl/CompileVulkanToSpirvTestNV.FromFile/spv_computeShaderDerivativesSpec2_comp, where GetParam() = "spv.computeShaderDerivativesSpec2.comp"

11 FAILED TESTS

Mostly due to to new "requires SPIR-V 1.2" error message.