From abff5e9411134caab9383109f85df6a943587f09 Mon Sep 17 00:00:00 2001 From: Romaric Jodin <89833130+rjodinchr@users.noreply.github.com> Date: Fri, 12 Jan 2024 19:17:56 +0100 Subject: [PATCH] update test expectation after update in spirv-tools passes (#8) --- tests/example-expectation.spvasm | 108 +++++++++++++++---------------- 1 file changed, 52 insertions(+), 56 deletions(-) diff --git a/tests/example-expectation.spvasm b/tests/example-expectation.spvasm index 2eda56a..1203011 100644 --- a/tests/example-expectation.spvasm +++ b/tests/example-expectation.spvasm @@ -1,7 +1,7 @@ ; SPIR-V ; Version: 1.6 ; Generator: Khronos SPIR-V Tools Assembler; 0 -; Bound: 70 +; Bound: 66 ; Schema: 0 OpCapability Shader OpCapability ShaderClockKHR @@ -9,53 +9,53 @@ OpCapability Int64Atomics OpExtension "SPV_KHR_shader_clock" OpExtension "SPV_KHR_storage_buffer_storage_class" - %62 = OpExtInstImport "NonSemantic.VkspReflection.1" + %58 = OpExtInstImport "NonSemantic.VkspReflection.1" OpMemoryModel Logical GLSL450 - OpEntryPoint GLCompute %1 "test_simple" %gl_GlobalInvocationID %3 %4 %5 %6 %7 + OpEntryPoint GLCompute %1 "test_simple" %gl_GlobalInvocationID %3 %4 %5 %6 ; Debug Information OpSource OpenCL_C 120 - %8 = OpString "test_simple" - %9 = OpString " kernel" - %10 = OpString "out" - %11 = OpString "uint*" + %7 = OpString "test_simple" + %8 = OpString " kernel" + %9 = OpString "out" + %10 = OpString "uint*" ; Annotations - OpMemberDecorate %_struct_12 0 Offset 0 - OpMemberDecorate %_struct_12 1 Offset 16 - OpDecorate %_struct_12 Block + OpMemberDecorate %_struct_11 0 Offset 0 + OpMemberDecorate %_struct_11 1 Offset 16 + OpDecorate %_struct_11 Block OpDecorate %gl_GlobalInvocationID BuiltIn GlobalInvocationId OpDecorate %gl_WorkGroupSize BuiltIn WorkgroupSize OpDecorate %_runtimearr_uint ArrayStride 4 - OpMemberDecorate %_struct_15 0 Offset 0 - OpDecorate %_struct_15 Block + OpMemberDecorate %_struct_14 0 Offset 0 + OpDecorate %_struct_14 Block OpDecorate %4 DescriptorSet 0 OpDecorate %4 Binding 0 - OpDecorate %16 SpecId 0 - OpDecorate %17 SpecId 1 - OpDecorate %18 SpecId 2 + OpDecorate %15 SpecId 0 + OpDecorate %16 SpecId 1 + OpDecorate %17 SpecId 2 OpDecorate %_runtimearr_ulong ArrayStride 8 - OpMemberDecorate %_struct_20 0 Offset 0 - OpDecorate %_struct_20 Block + OpMemberDecorate %_struct_19 0 Offset 0 + OpDecorate %_struct_19 Block OpDecorate %6 DescriptorSet 0 OpDecorate %6 Binding 1 ; Types, variables and constants %uint = OpTypeInt 32 0 %v3uint = OpTypeVector %uint 3 - %_struct_12 = OpTypeStruct %v3uint %v3uint -%_ptr_PushConstant__struct_12 = OpTypePointer PushConstant %_struct_12 + %_struct_11 = OpTypeStruct %v3uint %v3uint +%_ptr_PushConstant__struct_11 = OpTypePointer PushConstant %_struct_11 %_ptr_Input_v3uint = OpTypePointer Input %v3uint + %15 = OpSpecConstant %uint 1 %16 = OpSpecConstant %uint 1 %17 = OpSpecConstant %uint 1 - %18 = OpSpecConstant %uint 1 -%gl_WorkGroupSize = OpSpecConstantComposite %v3uint %16 %17 %18 +%gl_WorkGroupSize = OpSpecConstantComposite %v3uint %15 %16 %17 %_ptr_Private_v3uint = OpTypePointer Private %v3uint %_runtimearr_uint = OpTypeRuntimeArray %uint - %_struct_15 = OpTypeStruct %_runtimearr_uint -%_ptr_StorageBuffer__struct_15 = OpTypePointer StorageBuffer %_struct_15 + %_struct_14 = OpTypeStruct %_runtimearr_uint +%_ptr_StorageBuffer__struct_14 = OpTypePointer StorageBuffer %_struct_14 %void = OpTypeVoid - %28 = OpTypeFunction %void + %27 = OpTypeFunction %void %_ptr_Input_uint = OpTypePointer Input %uint %uint_0 = OpConstant %uint 0 %_ptr_PushConstant_uint = OpTypePointer PushConstant %uint @@ -66,47 +66,43 @@ %uint_12 = OpConstant %uint 12 %uint_16 = OpConstant %uint 16 %uint_2 = OpConstant %uint 2 - %5 = OpVariable %_ptr_PushConstant__struct_12 PushConstant + %5 = OpVariable %_ptr_PushConstant__struct_11 PushConstant %gl_GlobalInvocationID = OpVariable %_ptr_Input_v3uint Input %3 = OpVariable %_ptr_Private_v3uint Private %gl_WorkGroupSize - %4 = OpVariable %_ptr_StorageBuffer__struct_15 StorageBuffer + %4 = OpVariable %_ptr_StorageBuffer__struct_14 StorageBuffer %ulong = OpTypeInt 64 0 %_runtimearr_ulong = OpTypeRuntimeArray %ulong - %_struct_20 = OpTypeStruct %_runtimearr_ulong -%_ptr_StorageBuffer__struct_20 = OpTypePointer StorageBuffer %_struct_20 + %_struct_19 = OpTypeStruct %_runtimearr_ulong +%_ptr_StorageBuffer__struct_19 = OpTypePointer StorageBuffer %_struct_19 %_ptr_StorageBuffer_ulong = OpTypePointer StorageBuffer %ulong -%_arr_ulong_uint_0 = OpTypeArray %ulong %uint_0 -%_ptr_Private__arr_ulong_uint_0 = OpTypePointer Private %_arr_ulong_uint_0 -%_ptr_Private_ulong = OpTypePointer Private %ulong %uint_3 = OpConstant %uint 3 %uint_8 = OpConstant %uint 8 - %7 = OpVariable %_ptr_Private__arr_ulong_uint_0 Private - %6 = OpVariable %_ptr_StorageBuffer__struct_20 StorageBuffer + %6 = OpVariable %_ptr_StorageBuffer__struct_19 StorageBuffer %ulong_0 = OpConstant %ulong 0 - %63 = OpExtInst %void %62 Configuration ".VK_KHR_8bit_storage.VK_KHR_16bit_storage.VK_KHR_buffer_device_address.VK_KHR_driver_properties.VK_KHR_shader_float16_int8.VK_KHR_shader_float_controls.VK_KHR_shader_non_semantic_info.VK_KHR_storage_buffer_storage_class.VK_KHR_uniform_buffer_standard_layout.VK_KHR_variable_pointers.VK_KHR_vulkan_memory_model.VK_EXT_calibrated_timestamps.VK_KHR_shader_clock" 12 "020000000100000001000000" "vksp_s0" "test_simple" 128 1 1 - %64 = OpExtInst %void %62 PushConstants 0 28 "00000000000000000000000000000000000000000000000000000000" 32 - %65 = OpExtInst %void %62 DescriptorSetBuffer 0 0 7 0 0 0 1024 63 1024 0 1024 0 0 - %66 = OpExtInst %void %62 DescriptorSetBuffer 0 1 7 0 0 0 16 34 16 0 16 0 0 - %67 = OpExtInst %void %62 SpecializationMapEntry 0 0 4 - %68 = OpExtInst %void %62 SpecializationMapEntry 1 4 4 - %69 = OpExtInst %void %62 SpecializationMapEntry 2 8 4 + %59 = OpExtInst %void %58 Configuration ".VK_KHR_8bit_storage.VK_KHR_16bit_storage.VK_KHR_buffer_device_address.VK_KHR_driver_properties.VK_KHR_shader_float16_int8.VK_KHR_shader_float_controls.VK_KHR_shader_non_semantic_info.VK_KHR_storage_buffer_storage_class.VK_KHR_uniform_buffer_standard_layout.VK_KHR_variable_pointers.VK_KHR_vulkan_memory_model.VK_EXT_calibrated_timestamps.VK_KHR_shader_clock" 12 "020000000100000001000000" "vksp_s0" "test_simple" 128 1 1 + %60 = OpExtInst %void %58 PushConstants 0 28 "00000000000000000000000000000000000000000000000000000000" 32 + %61 = OpExtInst %void %58 DescriptorSetBuffer 0 0 7 0 0 0 1024 63 1024 0 1024 0 0 + %62 = OpExtInst %void %58 DescriptorSetBuffer 0 1 7 0 0 0 16 34 16 0 16 0 0 + %63 = OpExtInst %void %58 SpecializationMapEntry 0 0 4 + %64 = OpExtInst %void %58 SpecializationMapEntry 1 4 4 + %65 = OpExtInst %void %58 SpecializationMapEntry 2 8 4 ; Function 1 - %1 = OpFunction %void None %28 - %48 = OpLabel - %49 = OpReadClockKHR %ulong %uint_3 - %50 = OpAccessChain %_ptr_Input_uint %gl_GlobalInvocationID %uint_0 - %51 = OpLoad %uint %50 - %52 = OpAccessChain %_ptr_PushConstant_uint %5 %uint_1 %uint_0 - %53 = OpLoad %uint %52 - %54 = OpIAdd %uint %53 %51 - %55 = OpAccessChain %_ptr_StorageBuffer_uint %4 %uint_0 %54 - OpStore %55 %54 - %56 = OpReadClockKHR %ulong %uint_3 - %57 = OpISub %ulong %56 %49 - %58 = OpAccessChain %_ptr_StorageBuffer_ulong %6 %uint_0 %uint_0 - %59 = OpAtomicIIncrement %ulong %58 %uint_1 %uint_8 - %60 = OpAccessChain %_ptr_StorageBuffer_ulong %6 %uint_0 %uint_1 - %61 = OpAtomicIAdd %ulong %60 %uint_1 %uint_8 %57 + %1 = OpFunction %void None %27 + %44 = OpLabel + %45 = OpReadClockKHR %ulong %uint_3 + %46 = OpAccessChain %_ptr_Input_uint %gl_GlobalInvocationID %uint_0 + %47 = OpLoad %uint %46 + %48 = OpAccessChain %_ptr_PushConstant_uint %5 %uint_1 %uint_0 + %49 = OpLoad %uint %48 + %50 = OpIAdd %uint %49 %47 + %51 = OpAccessChain %_ptr_StorageBuffer_uint %4 %uint_0 %50 + OpStore %51 %50 + %52 = OpReadClockKHR %ulong %uint_3 + %53 = OpISub %ulong %52 %45 + %54 = OpAccessChain %_ptr_StorageBuffer_ulong %6 %uint_0 %uint_0 + %55 = OpAtomicIIncrement %ulong %54 %uint_1 %uint_8 + %56 = OpAccessChain %_ptr_StorageBuffer_ulong %6 %uint_0 %uint_1 + %57 = OpAtomicIAdd %ulong %56 %uint_1 %uint_8 %53 OpReturn OpFunctionEnd