From 802b86f4aad54ba4abfa0c0390c2fe4519789130 Mon Sep 17 00:00:00 2001 From: natgavrilenko Date: Mon, 7 Oct 2024 09:41:19 +0200 Subject: [PATCH] Updated model in spirv tests (#749) --- .../dat3m/dartagnan/configuration/Arch.java | 6 +- .../visitors/spirv/VisitorOpsMemory.java | 28 ------- .../visitors/spirv/VisitorOpsSetting.java | 17 ++++ .../spirv/builders/ProgramBuilder.java | 9 ++ .../processing/compilation/Compilation.java | 1 + .../compilation/VisitorSpirvVulkan.java | 25 ------ .../processing/compilation/VisitorVulkan.java | 24 ++---- .../visitors/spirv/VisitorOpsMemoryTest.java | 10 +-- .../compilation/VisitorSpirvVulkanTest.java | 36 ++++---- .../spirv/benchmarks/SpirvAssertionsTest.java | 9 +- .../spirv/benchmarks/SpirvChecksTest.java | 9 +- .../spirv/benchmarks/SpirvRacesTest.java | 14 ++-- .../spirv/gpuverify/SpirvChecksTest.java | 12 ++- .../spirv/gpuverify/SpirvRacesTest.java | 12 ++- .../dartagnan/spirv/header/AbstractTest.java | 3 +- .../program/spirv/valid/fibonacci.spv.dis | 3 +- .../spirv/basic/array-of-vector.spv.dis | 3 +- .../spirv/basic/array-of-vector1.spv.dis | 3 +- .../test/resources/spirv/basic/array.spv.dis | 3 +- .../spirv/basic/branch-cond-bf.spv.dis | 3 +- .../spirv/basic/branch-cond-fb.spv.dis | 3 +- .../basic/branch-cond-ff-inverted.spv.dis | 3 +- .../spirv/basic/branch-cond-ff.spv.dis | 3 +- .../branch-cond-struct-read-write.spv.dis | 3 +- .../spirv/basic/branch-cond-struct.spv.dis | 3 +- .../resources/spirv/basic/branch-loop.spv.dis | 3 +- .../resources/spirv/basic/branch-race.spv.dis | 3 +- .../spirv/basic/builtin-all-123.spv.dis | 3 +- .../spirv/basic/builtin-all-321.spv.dis | 3 +- .../spirv/basic/builtin-constant.spv.dis | 3 +- .../basic/builtin-default-config.spv.dis | 3 +- .../spirv/basic/builtin-variable.spv.dis | 3 +- .../spirv/basic/cmpxchg-const-const.spv.dis | 3 +- .../spirv/basic/cmpxchg-const-reg.spv.dis | 3 +- .../spirv/basic/cmpxchg-reg-const.spv.dis | 3 +- .../spirv/basic/cmpxchg-reg-reg.spv.dis | 3 +- .../spirv/basic/empty-exists-false.spv.dis | 3 +- .../spirv/basic/empty-exists-true.spv.dis | 3 +- .../spirv/basic/empty-forall-false.spv.dis | 3 +- .../spirv/basic/empty-forall-true.spv.dis | 3 +- .../basic/empty-not-exists-false.spv.dis | 3 +- .../spirv/basic/empty-not-exists-true.spv.dis | 3 +- .../test/resources/spirv/basic/ids.spv.dis | 3 +- .../basic/init-forall-not-exists-fail.spv.dis | 3 +- .../basic/init-forall-not-exists.spv.dis | 3 +- .../spirv/basic/init-forall-split.spv.dis | 3 +- .../resources/spirv/basic/init-forall.spv.dis | 3 +- .../basic/loop-struct-cond-nested.spv.dis | 3 +- .../basic/loop-struct-cond-sequence.spv.dis | 3 +- .../basic/loop-struct-cond-suffix.spv.dis | 3 +- .../spirv/basic/loop-struct-cond.spv.dis | 3 +- .../spirv/basic/memory-scopes.spv.dis | 3 +- .../resources/spirv/basic/mixed-size.spv.dis | 3 +- .../spirv/basic/phi-unstruct-false.spv.dis | 3 +- .../spirv/basic/phi-unstruct-true.spv.dis | 3 +- .../test/resources/spirv/basic/phi.spv.dis | 3 +- .../spirv/basic/push-constant-mixed.spv.dis | 3 +- .../spirv/basic/push-constants-pod.spv.dis | 3 +- .../spirv/basic/push-constants.spv.dis | 3 +- .../resources/spirv/basic/read-write.spv.dis | 3 +- .../spirv/basic/rmw-extremum-false.spv.dis | 3 +- .../spirv/basic/rmw-extremum-true.spv.dis | 3 +- .../spirv/basic/uninitialized-exists.spv.dis | 3 +- .../spirv/basic/uninitialized-forall.spv.dis | 3 +- .../uninitialized-private-exists.spv.dis | 3 +- .../uninitialized-private-forall.spv.dis | 3 +- .../resources/spirv/basic/vector-init.spv.dis | 3 +- .../spirv/basic/vector-read-write.spv.dis | 3 +- .../test/resources/spirv/basic/vector.spv.dis | 3 +- .../resources/spirv/benchmarks/CORR.spv.dis | 16 ++-- .../resources/spirv/benchmarks/IRIW.spv.dis | 3 +- .../spirv/benchmarks/MP-acq2rx.spv.dis | 10 +-- .../spirv/benchmarks/MP-rel2rx.spv.dis | 10 +-- .../resources/spirv/benchmarks/MP.spv.dis | 7 +- .../resources/spirv/benchmarks/SB.spv.dis | 3 +- .../spirv/benchmarks/caslock-1.1.2.spv.dis | 7 +- .../spirv/benchmarks/caslock-2.1.1.spv.dis | 7 +- .../spirv/benchmarks/caslock-acq2rx.spv.dis | 10 +-- .../benchmarks/caslock-dv2wg-1.1.2.spv.dis | 7 +- .../benchmarks/caslock-dv2wg-2.1.1.spv.dis | 7 +- .../benchmarks/caslock-dv2wg-2.2.1.spv.dis | 7 +- .../benchmarks/caslock-dv2wg-2.2.2.spv.dis | 7 +- .../spirv/benchmarks/caslock-rel2rx.spv.dis | 10 +-- .../spirv/benchmarks/ticketlock-1.1.2.spv.dis | 12 +-- .../spirv/benchmarks/ticketlock-2.1.1.spv.dis | 12 +-- .../benchmarks/ticketlock-acq2rx.spv.dis | 14 ++-- .../benchmarks/ticketlock-dv2wg-1.1.2.spv.dis | 12 +-- .../benchmarks/ticketlock-dv2wg-2.1.1.spv.dis | 12 +-- .../benchmarks/ticketlock-dv2wg-2.2.1.spv.dis | 12 +-- .../benchmarks/ticketlock-dv2wg-2.2.2.spv.dis | 12 +-- .../benchmarks/ticketlock-rel2rx.spv.dis | 14 ++-- .../spirv/benchmarks/ttaslock-1.1.2.spv.dis | 10 +-- .../spirv/benchmarks/ttaslock-2.1.1.spv.dis | 10 +-- .../spirv/benchmarks/ttaslock-acq2rx.spv.dis | 12 +-- .../benchmarks/ttaslock-dv2wg-1.1.2.spv.dis | 10 +-- .../benchmarks/ttaslock-dv2wg-2.1.1.spv.dis | 10 +-- .../benchmarks/ttaslock-dv2wg-2.2.1.spv.dis | 10 +-- .../benchmarks/ttaslock-dv2wg-2.2.2.spv.dis | 10 +-- .../spirv/benchmarks/ttaslock-rel2rx.spv.dis | 12 +-- .../spirv/benchmarks/xf-barrier-1.1.2.spv.dis | 7 +- .../spirv/benchmarks/xf-barrier-2.1.1.spv.dis | 7 +- .../spirv/benchmarks/xf-barrier-2.1.2.spv.dis | 7 +- .../spirv/benchmarks/xf-barrier-3.1.3.spv.dis | 7 +- .../spirv/benchmarks/xf-barrier-fail1.spv.dis | 10 +-- .../spirv/benchmarks/xf-barrier-fail2.spv.dis | 10 +-- .../spirv/benchmarks/xf-barrier-fail3.spv.dis | 10 +-- .../spirv/benchmarks/xf-barrier-fail4.spv.dis | 10 +-- .../benchmarks/xf-barrier-local-1.1.2.spv.dis | 7 +- .../benchmarks/xf-barrier-local-2.1.1.spv.dis | 7 +- .../benchmarks/xf-barrier-local-2.1.2.spv.dis | 7 +- .../benchmarks/xf-barrier-local-3.1.3.spv.dis | 7 +- .../benchmarks/xf-barrier-local-fail1.spv.dis | 10 +-- .../benchmarks/xf-barrier-local-fail2.spv.dis | 10 +-- .../benchmarks/xf-barrier-local-fail3.spv.dis | 10 +-- .../benchmarks/xf-barrier-local-fail4.spv.dis | 10 +-- .../xf-barrier-local-weakest.spv.dis | 16 ++-- .../benchmarks/xf-barrier-weakest.spv.dis | 16 ++-- .../benchmarks/xf-barrier-zero-1.1.2.spv.dis | 7 +- .../benchmarks/xf-barrier-zero-2.1.1.spv.dis | 7 +- .../benchmarks/xf-barrier-zero-2.1.2.spv.dis | 7 +- .../benchmarks/xf-barrier-zero-3.1.3.spv.dis | 7 +- .../benchmarks/xf-barrier-zero-fail1.spv.dis | 10 +-- .../benchmarks/xf-barrier-zero-fail2.spv.dis | 10 +-- .../benchmarks/xf-barrier-zero-fail3.spv.dis | 10 +-- .../benchmarks/xf-barrier-zero-fail4.spv.dis | 10 +-- .../xf-barrier-zero-weakest.spv.dis | 16 ++-- .../spirv/gpuverify/addressofinit.spv.dis | 3 +- .../gpuverify/alignment/int3int4.spv.dis | 3 +- .../gpuverify/alignment/race_location.spv.dis | 3 +- .../annotation_tests/test_axiom.spv.dis | 3 +- .../array_bounds_tests/array_in_array.spv.dis | 3 +- .../array_in_array_2.spv.dis | 3 +- .../array_in_array_param.spv.dis | 3 +- .../multi_dim_array.spv.dis | 3 +- .../multi_dim_array_fail_upper.spv.dis | 3 +- .../negative_index_multi_dim.spv.dis | 3 +- .../negative_index_multi_dim_fail.spv.dis | 3 +- .../array_bounds_tests/private_array.spv.dis | 3 +- .../array_bounds_tests/realign_simple.spv.dis | 3 +- .../realign_simple_fail.spv.dis | 3 +- .../array_bounds_tests/simple_array.spv.dis | 3 +- .../simple_array_fail_lower.spv.dis | 3 +- .../simple_array_fail_upper.spv.dis | 3 +- .../simple_array_fail_var.spv.dis | 3 +- .../async_work_group_copy/fail/test1.spv.dis | 3 +- .../async_work_group_copy/fail/test10.spv.dis | 3 +- .../async_work_group_copy/fail/test13.spv.dis | 3 +- .../async_work_group_copy/fail/test14.spv.dis | 3 +- .../async_work_group_copy/fail/test15.spv.dis | 3 +- .../async_work_group_copy/fail/test16.spv.dis | 3 +- .../async_work_group_copy/fail/test17.spv.dis | 3 +- .../async_work_group_copy/fail/test18.spv.dis | 3 +- .../async_work_group_copy/fail/test2.spv.dis | 3 +- .../async_work_group_copy/fail/test4.spv.dis | 3 +- .../async_work_group_copy/fail/test5.spv.dis | 3 +- .../async_work_group_copy/fail/test7.spv.dis | 3 +- .../async_work_group_copy/fail/test8.spv.dis | 3 +- .../async_work_group_copy/fail/test9.spv.dis | 3 +- .../async_work_group_copy/pass/test1.spv.dis | 3 +- .../async_work_group_copy/pass/test2.spv.dis | 3 +- .../async_work_group_copy/pass/test3.spv.dis | 3 +- .../async_work_group_copy/pass/test4.spv.dis | 3 +- .../async_work_group_copy/pass/test5.spv.dis | 3 +- .../async_work_group_copy/pass/test6.spv.dis | 3 +- .../async_work_group_copy/pass/test7.spv.dis | 3 +- .../async_work_group_copy/pass/test8.spv.dis | 3 +- .../async_work_group_copy/pass/test9.spv.dis | 3 +- .../atomics/atomic_read_race.spv.dis | 3 +- .../spirv/gpuverify/atomics/counter.spv.dis | 3 +- .../atomics/definitions_atom_int.spv.dis | 3 +- .../atomics/definitions_float.spv.dis | 3 +- .../gpuverify/atomics/definitions_int.spv.dis | 3 +- .../atomics/definitions_long.spv.dis | 3 +- .../spirv/gpuverify/atomics/displaced.spv.dis | 3 +- .../gpuverify/atomics/equality_fail.spv.dis | 3 +- .../spirv/gpuverify/atomics/forloop.spv.dis | 3 +- .../spirv/gpuverify/atomics/histo.spv.dis | 3 +- .../int_add_with_float.spv.dis | 3 +- .../int_add_with_long.spv.dis | 3 +- .../int_add_with_short.spv.dis | 3 +- .../spirv/gpuverify/atomics/pointers.spv.dis | 3 +- .../bad_local_counters.spv.dis | 3 +- .../intra_local_counters.spv.dis | 3 +- .../many_accesses.spv.dis | 3 +- .../one_access.spv.dis | 3 +- .../predication.spv.dis | 3 +- .../gpuverify/barrier_intervals/test1.spv.dis | 3 +- .../gpuverify/barrier_intervals/test2.spv.dis | 3 +- .../gpuverify/barrier_intervals/test3.spv.dis | 3 +- .../gpuverify/barrier_intervals/test4.spv.dis | 3 +- .../barrierconditionalkernelparam.spv.dis | 3 +- .../resources/spirv/gpuverify/basic1.spv.dis | 3 +- .../spirv/gpuverify/basicbarrier.spv.dis | 3 +- .../spirv/gpuverify/basicglobalarray.spv.dis | 3 +- .../fail/writeafterread_addition.spv.dis | 3 +- .../fail/writeafterread_otherval.spv.dis | 3 +- .../fail/writetiddiv64_offbyone.spv.dis | 3 +- .../fail/writewritearray_adversarial.spv.dis | 3 +- .../fail/writezero_nobenign.spv.dis | 3 +- .../pass/writeafterread.spv.dis | 3 +- .../pass/writeinloop.spv.dis | 3 +- .../benign_race_tests/pass/writezero.spv.dis | 3 +- .../resources/spirv/gpuverify/bitand.spv.dis | 3 +- .../resources/spirv/gpuverify/bitnot.spv.dis | 3 +- .../resources/spirv/gpuverify/bitor.spv.dis | 3 +- .../resources/spirv/gpuverify/bitxor.spv.dis | 3 +- .../spirv/gpuverify/bool_bv_test.spv.dis | 3 +- .../spirv/gpuverify/casttofloat.spv.dis | 3 +- .../resources/spirv/gpuverify/ceil.spv.dis | 3 +- .../fail/arraydoesnotexist1.spv.dis | 3 +- .../fail/arraydoesnotexist2.spv.dis | 3 +- .../checkarrays/pass/specifyall.spv.dis | 3 +- .../gpuverify/conditional_int_test.spv.dis | 3 +- .../spirv/gpuverify/constantnotparam.spv.dis | 3 +- ...rived_from_uniformity_analysis_bug.spv.dis | 3 +- .../derivedfrombinomialoptions.spv.dis | 3 +- .../derivedfrombinomialoptions2.spv.dis | 3 +- .../divergence/race_and_divergence.spv.dis | 3 +- .../divergence/race_no_divergence.spv.dis | 3 +- .../fail_equality_and_adversarial.spv.dis | 3 +- .../gpuverify/float_constant_test2.spv.dis | 3 +- .../spirv/gpuverify/floatcastrequired.spv.dis | 3 +- .../spirv/gpuverify/floatrelationalop.spv.dis | 3 +- .../spirv/gpuverify/get_global_id.spv.dis | 3 +- ...local_size_fail_divide_global_size.spv.dis | 3 +- .../global_size/mismatch_dims.spv.dis | 3 +- .../num_groups_and_global_size.spv.dis | 3 +- .../spirv/gpuverify/globalarray/fail.spv.dis | 3 +- .../spirv/gpuverify/globalarray/pass.spv.dis | 3 +- .../imagetests/fail2dimagecopy.spv.dis | 3 +- .../imagetests/test2dimagecopy.spv.dis | 3 +- .../gpuverify/imagetests/testsampler.spv.dis | 3 +- .../gpuverify/imagetests/testsampler2.spv.dis | 3 +- .../gpuverify/induction_variable.spv.dis | 3 +- .../fail/bad_read_then_write.spv.dis | 3 +- .../fail/bad_write_then_read.spv.dis | 3 +- .../fail/local_id.spv.dis | 3 +- .../fail/missing_global_barrier_flag.spv.dis | 3 +- .../fail/missing_local_barrier_flag.spv.dis | 3 +- .../fail/missing_local_barrier_flag_2.spv.dis | 83 ++++++++++++++++++ .../fail/missing_local_barrier_flag_3.spv.dis | 83 ++++++++++++++++++ .../fail/no_barrier_flags.spv.dis | 3 +- .../fail/sync.spv.dis | 3 +- .../fail/sync_within_group_wrong_flag.spv.dis | 3 +- .../pass/global_barrier.spv.dis | 3 +- .../pass/local_barrier_flag.spv.dis | 3 +- .../pass/local_barrier_flag_2.spv.dis | 83 ++++++++++++++++++ .../pass/local_barrier_flag_3.spv.dis | 84 +++++++++++++++++++ .../pass/local_id_benign_write_write.spv.dis | 3 +- .../pass/pass_due_to_intra_group_flag.spv.dis | 3 +- .../pass/read_then_write.spv.dis | 3 +- .../pass/sync_within_group.spv.dis | 3 +- .../pass/write_then_read.spv.dis | 3 +- .../k-induction/amazingreduction.spv.dis | 3 +- .../spirv/gpuverify/leftshiftequals.spv.dis | 3 +- .../spirv/gpuverify/localarrayaccess.spv.dis | 3 +- .../gpuverify/localmultidimarraydecl.spv.dis | 3 +- .../spirv/gpuverify/mem_fence.spv.dis | 3 +- .../gpuverify/misc/fail/2d_array_race.spv.dis | 3 +- .../fail/4d_array_of_structs_race.spv.dis | 3 +- .../fail/4d_array_of_vectors_race.spv.dis | 3 +- .../gpuverify/misc/fail/4d_array_race.spv.dis | 3 +- .../misc/fail/4d_array_with_casting.spv.dis | 3 +- .../gpuverify/misc/fail/miscfail1.spv.dis | 3 +- .../gpuverify/misc/fail/miscfail10.spv.dis | 3 +- .../gpuverify/misc/fail/miscfail3.spv.dis | 3 +- .../gpuverify/misc/fail/miscfail8.spv.dis | 3 +- .../gpuverify/misc/fail/miscfail9.spv.dis | 3 +- .../misc/fail/struct_member_race.spv.dis | 3 +- .../misc/fail/vector_element_race.spv.dis | 3 +- .../spirv/gpuverify/misc/pass/misc12.spv.dis | 3 +- .../spirv/gpuverify/misc/pass/misc13.spv.dis | 3 +- .../spirv/gpuverify/misc/pass/misc15.spv.dis | 3 +- .../spirv/gpuverify/misc/pass/misc16.spv.dis | 3 +- .../spirv/gpuverify/misc/pass/misc2.spv.dis | 3 +- .../spirv/gpuverify/misc/pass/misc3.spv.dis | 3 +- .../spirv/gpuverify/misc/pass/misc4.spv.dis | 3 +- .../spirv/gpuverify/misc/pass/misc7.spv.dis | 3 +- .../spirv/gpuverify/misc/pass/misc8.spv.dis | 3 +- .../spirv/gpuverify/modifyparam.spv.dis | 3 +- .../gpuverify/multidimarrays/test1.spv.dis | 3 +- .../gpuverify/multidimarrays/test2.spv.dis | 3 +- .../gpuverify/multidimarrays/test3.spv.dis | 3 +- .../gpuverify/multidimarrays/test4.spv.dis | 3 +- .../gpuverify/multidimarrays/test5.spv.dis | 3 +- .../spirv/gpuverify/multiplelocals.spv.dis | 3 +- .../spirv/gpuverify/multiplelocals2.spv.dis | 3 +- .../spirv/gpuverify/no_log/pass.spv.dis | 3 +- .../spirv/gpuverify/noraceduetoreturn.spv.dis | 3 +- .../spirv/gpuverify/notunaryoptest.spv.dis | 3 +- .../null_pointers/atomic_null.spv.dis | 3 +- .../null_pointers/load_from_null.spv.dis | 3 +- .../null_pointer_assignment_equal.spv.dis | 3 +- .../null_pointer_assignment_unequal.spv.dis | 3 +- .../null_pointer_greater.spv.dis | 3 +- .../store_to_null_and_non_null.spv.dis | 3 +- .../spirv/gpuverify/null_statement.spv.dis | 3 +- .../manyprocedures.spv.dis | 3 +- .../manyproceduresinlined.spv.dis | 3 +- .../testbasicaliasing.spv.dis | 3 +- .../testbasicaliasing2.spv.dis | 3 +- .../testbasicpointerarithmetic.spv.dis | 3 +- .../testbasicpointerarithmetic2.spv.dis | 3 +- .../testinterprocedural.spv.dis | 3 +- .../pointertests/param_addressof.spv.dis | 3 +- .../pointertests/pointerarith.spv.dis | 3 +- .../test_copy_between_memory_spaces.spv.dis | 3 +- .../test_copy_between_memory_spaces2.spv.dis | 3 +- .../test_derived_from_binomial_opts.spv.dis | 3 +- .../test_opencl_local_array.spv.dis | 3 +- .../test_opencl_local_param.spv.dis | 3 +- .../test_pass_value_from_array.spv.dis | 3 +- .../pointertests/test_return_pointer.spv.dis | 3 +- .../gpuverify/pow2/64bit_loopcounter.spv.dis | 3 +- .../gpuverify/pow2/64bit_relational.spv.dis | 3 +- .../spirv/gpuverify/predicated_undef.spv.dis | 3 +- .../reducedstrength_generalised.spv.dis | 3 +- .../reducedstrengthnonloopbug.spv.dis | 3 +- .../gpuverify/report_global_id/test1.spv.dis | 3 +- .../gpuverify/report_global_id/test2.spv.dis | 3 +- .../return_tests/id_dependent_return.spv.dis | 3 +- .../return_tests/multiloop_return.spv.dis | 3 +- .../multiloop_return_simplified.spv.dis | 3 +- .../return_tests/simple_return.spv.dis | 3 +- .../spirv/gpuverify/rightshiftequals.spv.dis | 3 +- .../spirv/gpuverify/saturate/sadd.spv.dis | 3 +- .../spirv/gpuverify/saturate/ssub.spv.dis | 3 +- .../spirv/gpuverify/saturate/uadd.spv.dis | 3 +- .../spirv/gpuverify/saturate/usub.spv.dis | 3 +- .../spirv/gpuverify/shared_int.spv.dis | 3 +- .../spirv/gpuverify/shuffle/shuffle.spv.dis | 3 +- .../gpuverify/simplebinomialoptions.spv.dis | 3 +- .../gpuverify/simpleparampassing.spv.dis | 3 +- .../gpuverify/simpleprocedurecall.spv.dis | 3 +- .../spirv/gpuverify/simplereturn.spv.dis | 3 +- .../gpuverify/skeletonbinomialoptions.spv.dis | 3 +- .../barrier_divergence/fail.spv.dis | 3 +- .../barrier_divergence/pass.spv.dis | 3 +- .../needs_source_location_ensures.spv.dis | 3 +- .../needs_source_location_requires.spv.dis | 3 +- .../race_from_call.spv.dis | 3 +- .../race_from_call_in_loop.spv.dis | 3 +- .../race_with_loop.spv.dis | 3 +- .../races/fail/read_write.spv.dis | 3 +- .../races/fail/write_read.spv.dis | 3 +- .../fail/write_write/elem_width_16.spv.dis | 3 +- .../races/fail/write_write/loop.spv.dis | 3 +- .../races/fail/write_write/normal.spv.dis | 3 +- .../races/pass/no_race.spv.dis | 3 +- .../races/pass/read_read.spv.dis | 3 +- .../races_from_indirect_calls.spv.dis | 3 +- .../spirv/gpuverify/ternarytest.spv.dis | 3 +- .../spirv/gpuverify/ternarytest2.spv.dis | 3 +- .../test_2d_global_index_inference.spv.dis | 3 +- .../test_2d_local_index_inference.spv.dis | 3 +- .../test_2d_local_index_inference_2.spv.dis | 3 +- .../gpuverify/test_address_of_bug.spv.dis | 3 +- .../spirv/gpuverify/test_float_neq.spv.dis | 3 +- .../test_for_benign_read_write_bug.spv.dis | 3 +- .../gpuverify/test_for_get_group_id.spv.dis | 3 +- .../spirv/gpuverify/test_for_ssa_bug.spv.dis | 3 +- .../test_global_id_inference.spv.dis | 3 +- .../test_line_number_problem.spv.dis | 3 +- .../gpuverify/test_local_id_inference.spv.dis | 3 +- .../global_reduce_strength.spv.dis | 3 +- .../test_mod_invariants/local_direct.spv.dis | 3 +- .../local_reduce_strength.spv.dis | 3 +- .../store_int_and_short.spv.dis | 3 +- .../test_structs/store_array_element.spv.dis | 3 +- .../test_structs/store_element.spv.dis | 3 +- .../test_structs/store_struct_element.spv.dis | 3 +- .../test_structs/use_array_element.spv.dis | 3 +- .../test_structs/use_element.spv.dis | 3 +- .../test_structs/use_struct_element.spv.dis | 3 +- .../transitiveclosuresimplified.spv.dis | 3 +- .../spirv/gpuverify/unusedreturn.spv.dis | 3 +- .../vectortests/addressofvector.spv.dis | 3 +- .../vectortests/double2simpleaccess.spv.dis | 3 +- .../vectortests/double4simpleaccess.spv.dis | 3 +- .../vectortests/float2simpleaccess.spv.dis | 3 +- .../vectortests/float4arrayaccess.spv.dis | 3 +- .../vectortests/float4simpleaccess.spv.dis | 3 +- .../vectortests/int3arrayaccess.spv.dis | 3 +- .../gpuverify/vectortests/test_paren.spv.dis | 3 +- .../gpuverify/vectortests/vectorsplat.spv.dis | 3 +- .../vectortests/vectorswizzle.spv.dis | 3 +- .../spirv/gpuverify/warpsync/2d.spv.dis | 3 +- .../gpuverify/warpsync/broken_shuffle.spv.dis | 3 +- .../warpsync/intragroup_scan.spv.dis | 3 +- .../gpuverify/warpsync/scan_warp.spv.dis | 3 +- .../spirv/gpuverify/warpsync/shuffle.spv.dis | 3 +- .../VULKAN/Manual/ticketlock-rel2rlx.litmus | 2 +- 392 files changed, 1340 insertions(+), 702 deletions(-) create mode 100644 dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/missing_local_barrier_flag_2.spv.dis create mode 100644 dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/missing_local_barrier_flag_3.spv.dis create mode 100644 dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/pass/local_barrier_flag_2.spv.dis create mode 100644 dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/pass/local_barrier_flag_3.spv.dis diff --git a/dartagnan/src/main/java/com/dat3m/dartagnan/configuration/Arch.java b/dartagnan/src/main/java/com/dat3m/dartagnan/configuration/Arch.java index d62603b1a1..164b9f88e1 100644 --- a/dartagnan/src/main/java/com/dat3m/dartagnan/configuration/Arch.java +++ b/dartagnan/src/main/java/com/dat3m/dartagnan/configuration/Arch.java @@ -3,7 +3,7 @@ import java.util.Arrays; public enum Arch implements OptionInterface { - C11, ARM8, POWER, PTX, TSO, IMM, LKMM, RISCV, VULKAN; + C11, ARM8, POWER, PTX, TSO, IMM, LKMM, RISCV, VULKAN, OPENCL; // Used to display in UI @Override @@ -27,6 +27,8 @@ public String toString() { return "RISCV"; case VULKAN: return "VULKAN"; + case OPENCL: + return "OpenCL"; } throw new UnsupportedOperationException("Unrecognized architecture " + this); } @@ -37,7 +39,7 @@ public static Arch getDefault() { // Used to decide the order shown by the selector in the UI public static Arch[] orderedValues() { - Arch[] order = { C11, ARM8, IMM, LKMM, POWER, PTX, RISCV, TSO, VULKAN }; + Arch[] order = { C11, ARM8, IMM, LKMM, OPENCL, POWER, PTX, RISCV, TSO, VULKAN }; // Be sure no element is missing assert(Arrays.asList(order).containsAll(Arrays.asList(values()))); return order; diff --git a/dartagnan/src/main/java/com/dat3m/dartagnan/parsers/program/visitors/spirv/VisitorOpsMemory.java b/dartagnan/src/main/java/com/dat3m/dartagnan/parsers/program/visitors/spirv/VisitorOpsMemory.java index bbf32ac25e..b28831a610 100644 --- a/dartagnan/src/main/java/com/dat3m/dartagnan/parsers/program/visitors/spirv/VisitorOpsMemory.java +++ b/dartagnan/src/main/java/com/dat3m/dartagnan/parsers/program/visitors/spirv/VisitorOpsMemory.java @@ -49,13 +49,8 @@ public Event visitOpStore(SpirvParser.OpStoreContext ctx) { Set tags = parseMemoryAccessTags(ctx.memoryAccess()); if (!tags.contains(Tag.Spirv.MEM_VISIBLE)) { String storageClass = builder.getPointerStorageClass(ctx.pointer().getText()); - String scope = getScope(storageClass); event.addTags(tags); event.addTags(storageClass); - if (scope != null) { - event.addTags(Tag.Spirv.MEM_NON_PRIVATE); - event.addTags(scope); - } return builder.addEvent(event); } throw new ParsingException("OpStore cannot contain tag '%s'", Tag.Spirv.MEM_VISIBLE); @@ -69,13 +64,8 @@ public Event visitOpLoad(SpirvParser.OpLoadContext ctx) { Set tags = parseMemoryAccessTags(ctx.memoryAccess()); if (!tags.contains(Tag.Spirv.MEM_AVAILABLE)) { String storageClass = builder.getPointerStorageClass(ctx.pointer().getText()); - String scope = getScope(storageClass); event.addTags(tags); event.addTags(storageClass); - if (scope != null) { - event.addTags(Tag.Spirv.MEM_NON_PRIVATE); - event.addTags(scope); - } return builder.addEvent(event); } throw new ParsingException("OpLoad cannot contain tag '%s'", Tag.Spirv.MEM_AVAILABLE); @@ -196,24 +186,6 @@ private Set parseMemoryAccessTags(SpirvParser.MemoryAccessContext ctx) { return Set.of(); } - private String getScope(String storageClass) { - return switch (storageClass) { - case Tag.Spirv.SC_UNIFORM_CONSTANT, - Tag.Spirv.SC_UNIFORM, - Tag.Spirv.SC_OUTPUT, - Tag.Spirv.SC_PUSH_CONSTANT, - Tag.Spirv.SC_STORAGE_BUFFER, - Tag.Spirv.SC_PHYS_STORAGE_BUFFER -> Tag.Spirv.DEVICE; - case Tag.Spirv.SC_PRIVATE, - Tag.Spirv.SC_FUNCTION, - Tag.Spirv.SC_INPUT -> null; - case Tag.Spirv.SC_WORKGROUP -> Tag.Spirv.WORKGROUP; - case Tag.Spirv.SC_CROSS_WORKGROUP -> Tag.Spirv.QUEUE_FAMILY; - default -> throw new UnsupportedOperationException( - "Unsupported storage class " + storageClass); - }; - } - public Set getSupportedOps() { return Set.of( "OpVariable", diff --git a/dartagnan/src/main/java/com/dat3m/dartagnan/parsers/program/visitors/spirv/VisitorOpsSetting.java b/dartagnan/src/main/java/com/dat3m/dartagnan/parsers/program/visitors/spirv/VisitorOpsSetting.java index 847e9a69b9..dd164e4bb6 100644 --- a/dartagnan/src/main/java/com/dat3m/dartagnan/parsers/program/visitors/spirv/VisitorOpsSetting.java +++ b/dartagnan/src/main/java/com/dat3m/dartagnan/parsers/program/visitors/spirv/VisitorOpsSetting.java @@ -1,5 +1,7 @@ package com.dat3m.dartagnan.parsers.program.visitors.spirv; +import com.dat3m.dartagnan.configuration.Arch; +import com.dat3m.dartagnan.exception.ParsingException; import com.dat3m.dartagnan.parsers.SpirvBaseVisitor; import com.dat3m.dartagnan.parsers.SpirvParser; import com.dat3m.dartagnan.parsers.program.visitors.spirv.builders.ProgramBuilder; @@ -14,12 +16,27 @@ public VisitorOpsSetting(ProgramBuilder builder) { this.builder = builder; } + @Override + public Void visitOpMemoryModel(SpirvParser.OpMemoryModelContext ctx) { + builder.setArch(parseArch(ctx.memoryModel().getText())); + return null; + } + @Override public Void visitOpEntryPoint(SpirvParser.OpEntryPointContext ctx) { builder.setEntryPointId(ctx.entryPoint().getText()); return null; } + private Arch parseArch(String memoryModel) { + return switch (memoryModel) { + case "Vulkan", "VulkanKHR" -> Arch.VULKAN; + case "OpenCL" -> Arch.OPENCL; + case "GLSL450", "Simple" -> throw new ParsingException("Unsupported memory model '%s'", memoryModel); + default -> throw new ParsingException("Illegal memory model '%s'", memoryModel); + }; + } + public Set getSupportedOps() { return Set.of( "OpCapability", diff --git a/dartagnan/src/main/java/com/dat3m/dartagnan/parsers/program/visitors/spirv/builders/ProgramBuilder.java b/dartagnan/src/main/java/com/dat3m/dartagnan/parsers/program/visitors/spirv/builders/ProgramBuilder.java index fd5c37e0c6..e66c32f454 100644 --- a/dartagnan/src/main/java/com/dat3m/dartagnan/parsers/program/visitors/spirv/builders/ProgramBuilder.java +++ b/dartagnan/src/main/java/com/dat3m/dartagnan/parsers/program/visitors/spirv/builders/ProgramBuilder.java @@ -1,5 +1,6 @@ package com.dat3m.dartagnan.parsers.program.visitors.spirv.builders; +import com.dat3m.dartagnan.configuration.Arch; import com.dat3m.dartagnan.exception.ParsingException; import com.dat3m.dartagnan.expression.Expression; import com.dat3m.dartagnan.expression.Type; @@ -33,6 +34,7 @@ public class ProgramBuilder { protected DecorationsBuilder decorationsBuilder; protected Function currentFunction; protected String entryPointId; + protected Arch arch; protected Set nextOps; public ProgramBuilder(ThreadGrid grid) { @@ -84,6 +86,13 @@ public void setEntryPointId(String id) { entryPointId = id; } + public void setArch(Arch arch) { + if (this.arch != null) { + throw new ParsingException("Illegal attempt to override memory model"); + } + this.arch = arch; + } + public void setSpecification(Program.SpecificationType type, Expression condition) { if (program.getSpecification() != null) { throw new ParsingException("Attempt to override program specification"); diff --git a/dartagnan/src/main/java/com/dat3m/dartagnan/program/processing/compilation/Compilation.java b/dartagnan/src/main/java/com/dat3m/dartagnan/program/processing/compilation/Compilation.java index 4892f50c49..7d6c2cff0d 100644 --- a/dartagnan/src/main/java/com/dat3m/dartagnan/program/processing/compilation/Compilation.java +++ b/dartagnan/src/main/java/com/dat3m/dartagnan/program/processing/compilation/Compilation.java @@ -130,6 +130,7 @@ private VisitorBase getCompiler() { case RISCV -> new VisitorRISCV(useRC11Scheme); case PTX -> new VisitorPTX(); case VULKAN -> new VisitorVulkan(); + case OPENCL -> throw new UnsupportedOperationException(); }; } diff --git a/dartagnan/src/main/java/com/dat3m/dartagnan/program/processing/compilation/VisitorSpirvVulkan.java b/dartagnan/src/main/java/com/dat3m/dartagnan/program/processing/compilation/VisitorSpirvVulkan.java index 80c84f028e..62b4010b85 100644 --- a/dartagnan/src/main/java/com/dat3m/dartagnan/program/processing/compilation/VisitorSpirvVulkan.java +++ b/dartagnan/src/main/java/com/dat3m/dartagnan/program/processing/compilation/VisitorSpirvVulkan.java @@ -151,31 +151,6 @@ private Set toVulkanTags(Set tags) { vTags.add(tag); } }); - return adjustVulkanTags(tags, vTags); - } - - private Set adjustVulkanTags(Set tags, Set vTags) { - if (tags.contains(Tag.MEMORY) && toVulkanTag(Tag.Spirv.getStorageClassTag(tags)) != null) { - vTags.add(Tag.Vulkan.NON_PRIVATE); - if (vTags.contains(Tag.READ)) { - vTags.add(Tag.Vulkan.VISIBLE); - } - if (vTags.contains(Tag.WRITE)) { - vTags.add(Tag.Vulkan.AVAILABLE); - } - } - if (tags.contains(Tag.Spirv.MEM_AVAILABLE) && tags.contains(Tag.Spirv.DEVICE)) { - vTags.add(Tag.Vulkan.AVDEVICE); - } - if (tags.contains(Tag.Spirv.MEM_VISIBLE) && tags.contains(Tag.Spirv.DEVICE)) { - vTags.add(Tag.Vulkan.VISDEVICE); - } - if (tags.contains(Tag.Spirv.RELAXED)) { - vTags.remove(Tag.Vulkan.SEMSC0); - vTags.remove(Tag.Vulkan.SEMSC1); - vTags.remove(Tag.Vulkan.SEM_VISIBLE); - vTags.remove(Tag.Vulkan.SEM_AVAILABLE); - } return vTags; } diff --git a/dartagnan/src/main/java/com/dat3m/dartagnan/program/processing/compilation/VisitorVulkan.java b/dartagnan/src/main/java/com/dat3m/dartagnan/program/processing/compilation/VisitorVulkan.java index 1ee857bbb8..50cc44479a 100644 --- a/dartagnan/src/main/java/com/dat3m/dartagnan/program/processing/compilation/VisitorVulkan.java +++ b/dartagnan/src/main/java/com/dat3m/dartagnan/program/processing/compilation/VisitorVulkan.java @@ -109,14 +109,10 @@ private void propagateTags(Event source, Event target) { if (source.hasTag(Tag.Vulkan.SEM_VISIBLE)) { target.addTags(Tag.Vulkan.SEM_VISIBLE); } - // If a RMW is a release, we do not propagate semscX to the read - if (!(source.hasTag(Tag.Vulkan.ACQUIRE) || source.hasTag(Tag.Vulkan.ACQ_REL))) { - if (target.hasTag(Tag.Vulkan.SEMSC0)) { - target.removeTags(Tag.Vulkan.SEMSC0); - } - if (target.hasTag(Tag.Vulkan.SEMSC1)) { - target.removeTags(Tag.Vulkan.SEMSC1); - } + // Remove tag if it refers to the release write + if (!source.hasTag(Tag.Vulkan.ACQUIRE) && source.hasTag(Tag.Vulkan.RELEASE)) { + target.removeTags(Tag.Vulkan.SEMSC0); + target.removeTags(Tag.Vulkan.SEMSC1); } if (source.hasTag(Tag.Vulkan.VISDEVICE)) { target.addTags(Tag.Vulkan.VISDEVICE); @@ -129,14 +125,10 @@ private void propagateTags(Event source, Event target) { if (source.hasTag(Tag.Vulkan.SEM_AVAILABLE)) { target.addTags(Tag.Vulkan.SEM_AVAILABLE); } - // If a RMW is an acquire, we do not propagate semscX to the write - if (!(source.hasTag(Tag.Vulkan.RELEASE) || source.hasTag(Tag.Vulkan.ACQ_REL))) { - if (target.hasTag(Tag.Vulkan.SEMSC0)) { - target.removeTags(Tag.Vulkan.SEMSC0); - } - if (target.hasTag(Tag.Vulkan.SEMSC1)) { - target.removeTags(Tag.Vulkan.SEMSC1); - } + // Remove tag if it refers to the acquire read + if (!source.hasTag(Tag.Vulkan.RELEASE) && source.hasTag(Tag.Vulkan.ACQUIRE)) { + target.removeTags(Tag.Vulkan.SEMSC0); + target.removeTags(Tag.Vulkan.SEMSC1); } if (source.hasTag(Tag.Vulkan.AVDEVICE)) { target.addTags(Tag.Vulkan.AVDEVICE); diff --git a/dartagnan/src/test/java/com/dat3m/dartagnan/parsers/program/visitors/spirv/VisitorOpsMemoryTest.java b/dartagnan/src/test/java/com/dat3m/dartagnan/parsers/program/visitors/spirv/VisitorOpsMemoryTest.java index 9bcb83e5c4..e66d054595 100644 --- a/dartagnan/src/test/java/com/dat3m/dartagnan/parsers/program/visitors/spirv/VisitorOpsMemoryTest.java +++ b/dartagnan/src/test/java/com/dat3m/dartagnan/parsers/program/visitors/spirv/VisitorOpsMemoryTest.java @@ -49,8 +49,7 @@ public void testLoad() { assertNotNull(load); assertEquals(pointer, load.getAddress()); assertEquals(iType, load.getAccessType()); - assertEquals(Set.of(Tag.VISIBLE, Tag.MEMORY, Tag.READ, Tag.Spirv.SC_UNIFORM, - Tag.Spirv.MEM_NON_PRIVATE, Tag.Spirv.DEVICE), load.getTags()); + assertEquals(Set.of(Tag.VISIBLE, Tag.MEMORY, Tag.READ, Tag.Spirv.SC_UNIFORM), load.getTags()); Register register = load.getResultRegister(); assertEquals("%result", register.getName()); @@ -60,7 +59,7 @@ public void testLoad() { @Test public void testLoadWithTags() { // given - String input = "%result = OpLoad %int %ptr MakePointerVisible %scope"; + String input = "%result = OpLoad %int %ptr MakePointerVisible|NonPrivatePointer %scope"; IntegerType iType = builder.mockIntType("%int", 32); builder.mockPtrType("%int_ptr", "%int", "Workgroup"); ScopedPointerVariable pointer = builder.mockVariable("%ptr", "%int_ptr"); @@ -121,14 +120,13 @@ public void testStore() { assertEquals(pointer, store.getAddress()); assertEquals(iType, store.getAccessType()); assertEquals(value, store.getMemValue()); - assertEquals(Set.of(Tag.VISIBLE, Tag.MEMORY, Tag.WRITE, Tag.Spirv.SC_UNIFORM, - Tag.Spirv.MEM_NON_PRIVATE, Tag.Spirv.DEVICE), store.getTags()); + assertEquals(Set.of(Tag.VISIBLE, Tag.MEMORY, Tag.WRITE, Tag.Spirv.SC_UNIFORM), store.getTags()); } @Test public void testStoreWithTags() { // given - String input = "OpStore %ptr %value MakePointerAvailable %scope"; + String input = "OpStore %ptr %value MakePointerAvailable|NonPrivatePointer %scope"; IntegerType iType = builder.mockIntType("%int", 32); builder.mockPtrType("%int_ptr", "%int", "Workgroup"); ScopedPointerVariable pointer = builder.mockVariable("%ptr", "%int_ptr"); diff --git a/dartagnan/src/test/java/com/dat3m/dartagnan/program/processing/compilation/VisitorSpirvVulkanTest.java b/dartagnan/src/test/java/com/dat3m/dartagnan/program/processing/compilation/VisitorSpirvVulkanTest.java index 20461a6ad8..c40d6bbefc 100644 --- a/dartagnan/src/test/java/com/dat3m/dartagnan/program/processing/compilation/VisitorSpirvVulkanTest.java +++ b/dartagnan/src/test/java/com/dat3m/dartagnan/program/processing/compilation/VisitorSpirvVulkanTest.java @@ -40,15 +40,15 @@ public void testLoad() { ); doTestLoad( Set.of(Tag.Spirv.SC_WORKGROUP), - Set.of(Tag.Vulkan.SC1, Tag.Vulkan.NON_PRIVATE, Tag.Vulkan.VISIBLE) + Set.of(Tag.Vulkan.SC1) ); doTestLoad( - Set.of(Tag.Spirv.MEM_VISIBLE, Tag.Spirv.SC_UNIFORM), - Set.of(Tag.Vulkan.VISIBLE, Tag.Vulkan.SC0, Tag.Vulkan.NON_PRIVATE) + Set.of(Tag.Spirv.MEM_VISIBLE, Tag.Spirv.DEVICE, Tag.Spirv.SC_UNIFORM), + Set.of(Tag.Vulkan.VISIBLE, Tag.Vulkan.DEVICE, Tag.Vulkan.SC0) ); doTestLoad( - Set.of(Tag.Spirv.MEM_VISIBLE, Tag.Spirv.DEVICE, Tag.Spirv.SC_UNIFORM), - Set.of(Tag.Vulkan.VISIBLE, Tag.Vulkan.DEVICE, Tag.Vulkan.VISDEVICE, Tag.Vulkan.SC0, Tag.Vulkan.NON_PRIVATE) + Set.of(Tag.Spirv.MEM_NON_PRIVATE, Tag.Spirv.MEM_VISIBLE, Tag.Spirv.DEVICE, Tag.Spirv.SC_UNIFORM), + Set.of(Tag.Vulkan.NON_PRIVATE, Tag.Vulkan.VISIBLE, Tag.Vulkan.DEVICE, Tag.Vulkan.SC0) ); } @@ -77,15 +77,15 @@ public void testStore() { ); doTestStore( Set.of(Tag.Spirv.SC_WORKGROUP), - Set.of(Tag.Vulkan.SC1, Tag.Vulkan.NON_PRIVATE, Tag.Vulkan.AVAILABLE) + Set.of(Tag.Vulkan.SC1) ); doTestStore( - Set.of(Tag.Spirv.MEM_AVAILABLE, Tag.Spirv.SC_UNIFORM), - Set.of(Tag.Vulkan.AVAILABLE, Tag.Vulkan.SC0, Tag.Vulkan.NON_PRIVATE) + Set.of(Tag.Spirv.MEM_AVAILABLE, Tag.Spirv.DEVICE, Tag.Spirv.SC_UNIFORM), + Set.of(Tag.Vulkan.AVAILABLE, Tag.Vulkan.DEVICE, Tag.Vulkan.SC0) ); doTestStore( - Set.of(Tag.Spirv.MEM_AVAILABLE, Tag.Spirv.DEVICE, Tag.Spirv.SC_UNIFORM), - Set.of(Tag.Vulkan.AVAILABLE, Tag.Vulkan.DEVICE, Tag.Vulkan.AVDEVICE, Tag.Vulkan.SC0, Tag.Vulkan.NON_PRIVATE) + Set.of(Tag.Spirv.MEM_NON_PRIVATE, Tag.Spirv.MEM_AVAILABLE, Tag.Spirv.DEVICE, Tag.Spirv.SC_UNIFORM), + Set.of(Tag.Vulkan.NON_PRIVATE, Tag.Vulkan.AVAILABLE, Tag.Vulkan.DEVICE, Tag.Vulkan.SC0) ); } @@ -126,7 +126,7 @@ public void testSpirvLoad() { ); doTestSpirvLoad( Set.of(Tag.Spirv.RELAXED, Tag.Spirv.DEVICE, Tag.Spirv.SC_UNIFORM), - Set.of(Tag.Vulkan.DEVICE, Tag.Vulkan.VISDEVICE, Tag.Vulkan.SC0, Tag.Vulkan.NON_PRIVATE) + Set.of(Tag.Vulkan.DEVICE, Tag.Vulkan.SC0, Tag.Vulkan.NON_PRIVATE) ); } @@ -169,7 +169,7 @@ public void testSpirvStore() { ); doTestSpirvStore( Set.of(Tag.Spirv.RELAXED, Tag.Spirv.DEVICE, Tag.Spirv.SC_UNIFORM), - Set.of(Tag.Vulkan.DEVICE, Tag.Vulkan.AVDEVICE, Tag.Vulkan.SC0, Tag.Vulkan.NON_PRIVATE) + Set.of(Tag.Vulkan.DEVICE, Tag.Vulkan.SC0, Tag.Vulkan.NON_PRIVATE) ); } @@ -221,8 +221,8 @@ public void testSpirvXchg() { ); doTestSpirvXchg( Set.of(Tag.Spirv.RELAXED, Tag.Spirv.DEVICE, Tag.Spirv.SC_WORKGROUP), - Set.of(Tag.Vulkan.DEVICE, Tag.Vulkan.VISDEVICE, Tag.Vulkan.SC1, Tag.Vulkan.NON_PRIVATE), - Set.of(Tag.Vulkan.DEVICE, Tag.Vulkan.AVDEVICE, Tag.Vulkan.SC1, Tag.Vulkan.NON_PRIVATE) + Set.of(Tag.Vulkan.DEVICE, Tag.Vulkan.SC1, Tag.Vulkan.NON_PRIVATE), + Set.of(Tag.Vulkan.DEVICE, Tag.Vulkan.SC1, Tag.Vulkan.NON_PRIVATE) ); } @@ -282,8 +282,8 @@ public void testSpirvRmw() { ); doTestSpirvRmw( Set.of(Tag.Spirv.RELAXED, Tag.Spirv.DEVICE, Tag.Spirv.SC_WORKGROUP), - Set.of(Tag.Vulkan.DEVICE, Tag.Vulkan.VISDEVICE, Tag.Vulkan.SC1, Tag.Vulkan.NON_PRIVATE), - Set.of(Tag.Vulkan.DEVICE, Tag.Vulkan.AVDEVICE, Tag.Vulkan.SC1, Tag.Vulkan.NON_PRIVATE) + Set.of(Tag.Vulkan.DEVICE, Tag.Vulkan.SC1, Tag.Vulkan.NON_PRIVATE), + Set.of(Tag.Vulkan.DEVICE, Tag.Vulkan.SC1, Tag.Vulkan.NON_PRIVATE) ); } @@ -350,8 +350,8 @@ public void testSpirvCmpXchg() { Tag.Spirv.DEVICE, Set.of(Tag.Spirv.RELAXED, Tag.Spirv.SC_WORKGROUP), Set.of(Tag.Spirv.RELAXED, Tag.Spirv.SC_WORKGROUP), - Set.of(Tag.Vulkan.DEVICE, Tag.Vulkan.VISDEVICE, Tag.Vulkan.SC1, Tag.Vulkan.NON_PRIVATE), - Set.of(Tag.Vulkan.DEVICE, Tag.Vulkan.AVDEVICE, Tag.Vulkan.SC1, Tag.Vulkan.NON_PRIVATE)); + Set.of(Tag.Vulkan.DEVICE, Tag.Vulkan.SC1, Tag.Vulkan.NON_PRIVATE), + Set.of(Tag.Vulkan.DEVICE, Tag.Vulkan.SC1, Tag.Vulkan.NON_PRIVATE)); } private void doTestSpirvCmpXchg(String scope, Set eqTags, Set neqTags, Set loadTags, Set storeTags) { diff --git a/dartagnan/src/test/java/com/dat3m/dartagnan/spirv/benchmarks/SpirvAssertionsTest.java b/dartagnan/src/test/java/com/dat3m/dartagnan/spirv/benchmarks/SpirvAssertionsTest.java index 6625246101..f9bb418ac7 100644 --- a/dartagnan/src/test/java/com/dat3m/dartagnan/spirv/benchmarks/SpirvAssertionsTest.java +++ b/dartagnan/src/test/java/com/dat3m/dartagnan/spirv/benchmarks/SpirvAssertionsTest.java @@ -75,8 +75,7 @@ public static Iterable data() throws IOException { {"ttaslock-dv2wg-1.1.2.spv.dis", 1, FAIL}, {"xf-barrier-2.1.2.spv.dis", 4, PASS}, - // Slow test - // {"xf-barrier-3.1.3.spv.dis", 9, PASS}, + {"xf-barrier-3.1.3.spv.dis", 9, PASS}, // TODO: IMO should pass (spinloop handling?) // {"xf-barrier-1.1.2.spv.dis", 2, PASS}, {"xf-barrier-2.1.1.spv.dis", 2, PASS}, @@ -87,8 +86,7 @@ public static Iterable data() throws IOException { {"xf-barrier-weakest.spv.dis", 4, FAIL}, {"xf-barrier-local-2.1.2.spv.dis", 4, FAIL}, - // Slow test - // {"xf-barrier-local-3.1.3.spv.dis", 9, FAIL}, + {"xf-barrier-local-3.1.3.spv.dis", 9, FAIL}, // TODO: ?? // {"xf-barrier-local-1.1.2.spv.dis", 2, FAIL}, {"xf-barrier-local-2.1.1.spv.dis", 2, FAIL}, @@ -99,8 +97,7 @@ public static Iterable data() throws IOException { {"xf-barrier-local-weakest.spv.dis", 4, FAIL}, {"xf-barrier-zero-2.1.2.spv.dis", 4, FAIL}, - // Slow test - // {"xf-barrier-zero-3.1.3.spv.dis", 9, FAIL}, + {"xf-barrier-zero-3.1.3.spv.dis", 9, FAIL}, // TODO: ?? // {"xf-barrier-zero-1.1.2.spv.dis", 2, FAIL}, {"xf-barrier-zero-2.1.1.spv.dis", 2, FAIL}, diff --git a/dartagnan/src/test/java/com/dat3m/dartagnan/spirv/benchmarks/SpirvChecksTest.java b/dartagnan/src/test/java/com/dat3m/dartagnan/spirv/benchmarks/SpirvChecksTest.java index 0efe8060ed..4b6b052568 100644 --- a/dartagnan/src/test/java/com/dat3m/dartagnan/spirv/benchmarks/SpirvChecksTest.java +++ b/dartagnan/src/test/java/com/dat3m/dartagnan/spirv/benchmarks/SpirvChecksTest.java @@ -82,8 +82,7 @@ public static Iterable data() throws IOException { {"ttaslock-dv2wg-2.2.2.spv.dis", 2, UNKNOWN}, {"xf-barrier-2.1.2.spv.dis", 4, PASS}, - // Slow test - // {"xf-barrier-3.1.3.spv.dis", 9, PASS}, + {"xf-barrier-3.1.3.spv.dis", 9, PASS}, {"xf-barrier-2.1.1.spv.dis", 2, PASS}, {"xf-barrier-1.1.2.spv.dis", 2, PASS}, {"xf-barrier-fail1.spv.dis", 4, PASS}, @@ -93,8 +92,7 @@ public static Iterable data() throws IOException { {"xf-barrier-weakest.spv.dis", 4, PASS}, {"xf-barrier-local-2.1.2.spv.dis", 4, PASS}, - // Slow test - // {"xf-barrier-local-3.1.3.spv.dis", 9, PASS}, + {"xf-barrier-local-3.1.3.spv.dis", 9, PASS}, {"xf-barrier-local-2.1.1.spv.dis", 2, PASS}, {"xf-barrier-local-1.1.2.spv.dis", 2, PASS}, {"xf-barrier-local-fail1.spv.dis", 4, PASS}, @@ -118,9 +116,10 @@ public static Iterable data() throws IOException { @Test public void testAllSolvers() throws Exception { + /* TODO: Very slow, enable when Vulkan memory model is more efficient in CAAT try (SolverContext ctx = mkCtx(); ProverWithTracker prover = mkProver(ctx)) { assertEquals(expected, RefinementSolver.run(ctx, prover, mkTask()).getResult()); - } + }*/ try (SolverContext ctx = mkCtx(); ProverWithTracker prover = mkProver(ctx)) { assertEquals(expected, AssumeSolver.run(ctx, prover, mkTask()).getResult()); } diff --git a/dartagnan/src/test/java/com/dat3m/dartagnan/spirv/benchmarks/SpirvRacesTest.java b/dartagnan/src/test/java/com/dat3m/dartagnan/spirv/benchmarks/SpirvRacesTest.java index b6ee1d618c..f74cc504d7 100644 --- a/dartagnan/src/test/java/com/dat3m/dartagnan/spirv/benchmarks/SpirvRacesTest.java +++ b/dartagnan/src/test/java/com/dat3m/dartagnan/spirv/benchmarks/SpirvRacesTest.java @@ -81,8 +81,7 @@ public static Iterable data() throws IOException { {"ttaslock-dv2wg-2.2.2.spv.dis", 1, FAIL}, {"xf-barrier-2.1.2.spv.dis", 4, PASS}, - // Slow test - // {"xf-barrier-3.1.3.spv.dis", 9, PASS}, + {"xf-barrier-3.1.3.spv.dis", 9, PASS}, {"xf-barrier-2.1.1.spv.dis", 2, PASS}, {"xf-barrier-1.1.2.spv.dis", 2, PASS}, {"xf-barrier-fail1.spv.dis", 4, FAIL}, @@ -92,10 +91,8 @@ public static Iterable data() throws IOException { {"xf-barrier-weakest.spv.dis", 4, FAIL}, {"xf-barrier-local-2.1.2.spv.dis", 4, FAIL}, - // Slow test - // {"xf-barrier-local-3.1.3.spv.dis", 9, FAIL}, + {"xf-barrier-local-3.1.3.spv.dis", 9, FAIL}, {"xf-barrier-local-2.1.1.spv.dis", 2, FAIL}, - // one thread in workgroup, barrier semantics doesn't matter {"xf-barrier-local-1.1.2.spv.dis", 2, PASS}, {"xf-barrier-local-fail1.spv.dis", 4, FAIL}, {"xf-barrier-local-fail2.spv.dis", 4, FAIL}, @@ -104,10 +101,8 @@ public static Iterable data() throws IOException { {"xf-barrier-local-weakest.spv.dis", 4, FAIL}, {"xf-barrier-zero-2.1.2.spv.dis", 4, FAIL}, - // Slow test - // {"xf-barrier-zero-3.1.3.spv.dis", 9, FAIL}, + {"xf-barrier-zero-3.1.3.spv.dis", 9, FAIL}, {"xf-barrier-zero-2.1.1.spv.dis", 2, FAIL}, - // one thread in workgroup, barrier semantics doesn't matter {"xf-barrier-zero-1.1.2.spv.dis", 2, PASS}, {"xf-barrier-zero-fail1.spv.dis", 4, FAIL}, {"xf-barrier-zero-fail2.spv.dis", 4, FAIL}, @@ -119,9 +114,10 @@ public static Iterable data() throws IOException { @Test public void testAllSolvers() throws Exception { + /* TODO: Very slow, enable when Vulkan memory model is more efficient in CAAT try (SolverContext ctx = mkCtx(); ProverWithTracker prover = mkProver(ctx)) { assertEquals(expected, RefinementSolver.run(ctx, prover, mkTask()).getResult()); - } + }*/ try (SolverContext ctx = mkCtx(); ProverWithTracker prover = mkProver(ctx)) { assertEquals(expected, AssumeSolver.run(ctx, prover, mkTask()).getResult()); } diff --git a/dartagnan/src/test/java/com/dat3m/dartagnan/spirv/gpuverify/SpirvChecksTest.java b/dartagnan/src/test/java/com/dat3m/dartagnan/spirv/gpuverify/SpirvChecksTest.java index 0cbb610e7d..7a3742f03b 100644 --- a/dartagnan/src/test/java/com/dat3m/dartagnan/spirv/gpuverify/SpirvChecksTest.java +++ b/dartagnan/src/test/java/com/dat3m/dartagnan/spirv/gpuverify/SpirvChecksTest.java @@ -28,8 +28,7 @@ import static com.dat3m.dartagnan.configuration.Property.CAT_SPEC; import static com.dat3m.dartagnan.utils.ResourceHelper.getRootPath; import static com.dat3m.dartagnan.utils.ResourceHelper.getTestResourcePath; -import static com.dat3m.dartagnan.utils.Result.PASS; -import static com.dat3m.dartagnan.utils.Result.UNKNOWN; +import static com.dat3m.dartagnan.utils.Result.*; import static org.junit.Assert.assertEquals; @RunWith(Parameterized.class) @@ -64,13 +63,11 @@ public static Iterable data() throws IOException { {"divergence/race_and_divergence.spv.dis", 1, PASS}, {"divergence/race_no_divergence.spv.dis", 1, PASS}, {"inter_group_and_barrier_flag_tests/fail/local_id.spv.dis", 1, PASS}, - {"inter_group_and_barrier_flag_tests/fail/missing_local_barrier_flag.spv.dis", 1, PASS}, // Fails check checkRelIsSem for a barrier with semantics 0x8 (rel_acq, no storage class semantics) // {"inter_group_and_barrier_flag_tests/fail/no_barrier_flags.spv.dis", 1, PASS}, {"inter_group_and_barrier_flag_tests/fail/sync.spv.dis", 1, PASS}, - {"inter_group_and_barrier_flag_tests/pass/local_barrier_flag.spv.dis", 1, PASS}, {"inter_group_and_barrier_flag_tests/pass/local_id_benign_write_write.spv.dis", 1, PASS}, {"inter_group_and_barrier_flag_tests/pass/pass_due_to_intra_group_flag.spv.dis", 1, PASS}, {"localarrayaccess.spv.dis", 1, PASS}, @@ -127,6 +124,13 @@ public static Iterable data() throws IOException { {"global_size/mismatch_dims.spv.dis", 1, PASS}, {"global_size/num_groups_and_global_size.spv.dis", 1, PASS}, + {"inter_group_and_barrier_flag_tests/fail/missing_local_barrier_flag.spv.dis", 1, PASS}, + {"inter_group_and_barrier_flag_tests/fail/missing_local_barrier_flag_2.spv.dis", 1, PASS}, + {"inter_group_and_barrier_flag_tests/fail/missing_local_barrier_flag_3.spv.dis", 1, PASS}, + {"inter_group_and_barrier_flag_tests/pass/local_barrier_flag.spv.dis", 1, PASS}, + {"inter_group_and_barrier_flag_tests/pass/local_barrier_flag_2.spv.dis", 1, PASS}, + {"inter_group_and_barrier_flag_tests/pass/local_barrier_flag_3.spv.dis", 1, PASS}, + // Unsupported large array (4K elements) leading to OOM // {"misc/fail/2d_array_race.spv.dis", 1, PASS}, diff --git a/dartagnan/src/test/java/com/dat3m/dartagnan/spirv/gpuverify/SpirvRacesTest.java b/dartagnan/src/test/java/com/dat3m/dartagnan/spirv/gpuverify/SpirvRacesTest.java index 2493d31e92..78623ff8ac 100644 --- a/dartagnan/src/test/java/com/dat3m/dartagnan/spirv/gpuverify/SpirvRacesTest.java +++ b/dartagnan/src/test/java/com/dat3m/dartagnan/spirv/gpuverify/SpirvRacesTest.java @@ -64,10 +64,8 @@ public static Iterable data() throws IOException { {"divergence/race_and_divergence.spv.dis", 1, FAIL}, {"divergence/race_no_divergence.spv.dis", 1, FAIL}, {"inter_group_and_barrier_flag_tests/fail/local_id.spv.dis", 1, FAIL}, - {"inter_group_and_barrier_flag_tests/fail/missing_local_barrier_flag.spv.dis", 1, FAIL}, {"inter_group_and_barrier_flag_tests/fail/no_barrier_flags.spv.dis", 1, FAIL}, {"inter_group_and_barrier_flag_tests/fail/sync.spv.dis", 1, FAIL}, - {"inter_group_and_barrier_flag_tests/pass/local_barrier_flag.spv.dis", 1, PASS}, {"inter_group_and_barrier_flag_tests/pass/local_id_benign_write_write.spv.dis", 1, FAIL}, {"inter_group_and_barrier_flag_tests/pass/pass_due_to_intra_group_flag.spv.dis", 1, FAIL}, {"localarrayaccess.spv.dis", 1, PASS}, @@ -126,6 +124,14 @@ public static Iterable data() throws IOException { {"global_size/mismatch_dims.spv.dis", 1, PASS}, {"global_size/num_groups_and_global_size.spv.dis", 1, PASS}, + // barrier avvis variations + {"inter_group_and_barrier_flag_tests/fail/missing_local_barrier_flag.spv.dis", 1, FAIL}, + {"inter_group_and_barrier_flag_tests/fail/missing_local_barrier_flag_2.spv.dis", 1, FAIL}, + {"inter_group_and_barrier_flag_tests/fail/missing_local_barrier_flag_3.spv.dis", 1, FAIL}, + {"inter_group_and_barrier_flag_tests/pass/local_barrier_flag.spv.dis", 1, FAIL}, + {"inter_group_and_barrier_flag_tests/pass/local_barrier_flag_2.spv.dis", 1, PASS}, + {"inter_group_and_barrier_flag_tests/pass/local_barrier_flag_3.spv.dis", 1, PASS}, + // Unsupported large array (4K elements) leading to OOM // {"misc/fail/2d_array_race.spv.dis", 1, FAIL}, @@ -357,7 +363,7 @@ public void testAllSolvers() throws Exception { private SolverContext mkCtx() throws InvalidConfigurationException { Configuration cfg = Configuration.builder().build(); return SolverContextFactory.createSolverContext( - Configuration.builder().build(), + cfg, BasicLogManager.create(cfg), ShutdownManager.create().getNotifier(), SolverContextFactory.Solvers.Z3); diff --git a/dartagnan/src/test/java/com/dat3m/dartagnan/spirv/header/AbstractTest.java b/dartagnan/src/test/java/com/dat3m/dartagnan/spirv/header/AbstractTest.java index 1b7ba45689..26e73ea7ea 100644 --- a/dartagnan/src/test/java/com/dat3m/dartagnan/spirv/header/AbstractTest.java +++ b/dartagnan/src/test/java/com/dat3m/dartagnan/spirv/header/AbstractTest.java @@ -9,7 +9,8 @@ public abstract class AbstractTest { protected static final String BODY = """ OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" OpSource GLSL 450 %void = OpTypeVoid diff --git a/dartagnan/src/test/resources/parsers/program/spirv/valid/fibonacci.spv.dis b/dartagnan/src/test/resources/parsers/program/spirv/valid/fibonacci.spv.dis index 2e50cb6e7f..faa2ac468d 100644 --- a/dartagnan/src/test/resources/parsers/program/spirv/valid/fibonacci.spv.dis +++ b/dartagnan/src/test/resources/parsers/program/spirv/valid/fibonacci.spv.dis @@ -6,7 +6,8 @@ ; Bound: 72 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" %gl_GlobalInvocationID OpExecutionMode %main LocalSize 1 1 1 OpSource GLSL 450 diff --git a/dartagnan/src/test/resources/spirv/basic/array-of-vector.spv.dis b/dartagnan/src/test/resources/spirv/basic/array-of-vector.spv.dis index f32d02edf1..5ca24dda20 100644 --- a/dartagnan/src/test/resources/spirv/basic/array-of-vector.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/array-of-vector.spv.dis @@ -4,7 +4,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" OpSource GLSL 450 %void = OpTypeVoid diff --git a/dartagnan/src/test/resources/spirv/basic/array-of-vector1.spv.dis b/dartagnan/src/test/resources/spirv/basic/array-of-vector1.spv.dis index 4e868d6b22..703a730b8c 100644 --- a/dartagnan/src/test/resources/spirv/basic/array-of-vector1.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/array-of-vector1.spv.dis @@ -4,7 +4,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" OpSource GLSL 450 %void = OpTypeVoid diff --git a/dartagnan/src/test/resources/spirv/basic/array.spv.dis b/dartagnan/src/test/resources/spirv/basic/array.spv.dis index 1b940fe995..6fcdad2d1f 100644 --- a/dartagnan/src/test/resources/spirv/basic/array.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/array.spv.dis @@ -4,7 +4,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" OpSource GLSL 450 %void = OpTypeVoid diff --git a/dartagnan/src/test/resources/spirv/basic/branch-cond-bf.spv.dis b/dartagnan/src/test/resources/spirv/basic/branch-cond-bf.spv.dis index 49a4cfd06d..88ab44bd00 100644 --- a/dartagnan/src/test/resources/spirv/basic/branch-cond-bf.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/branch-cond-bf.spv.dis @@ -5,7 +5,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" %ids OpSource GLSL 450 OpDecorate %ids BuiltIn GlobalInvocationId diff --git a/dartagnan/src/test/resources/spirv/basic/branch-cond-fb.spv.dis b/dartagnan/src/test/resources/spirv/basic/branch-cond-fb.spv.dis index 73e3a83121..129a678828 100644 --- a/dartagnan/src/test/resources/spirv/basic/branch-cond-fb.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/branch-cond-fb.spv.dis @@ -5,7 +5,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" %ids OpSource GLSL 450 OpDecorate %ids BuiltIn GlobalInvocationId diff --git a/dartagnan/src/test/resources/spirv/basic/branch-cond-ff-inverted.spv.dis b/dartagnan/src/test/resources/spirv/basic/branch-cond-ff-inverted.spv.dis index 9aa15df295..99184e47e1 100644 --- a/dartagnan/src/test/resources/spirv/basic/branch-cond-ff-inverted.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/branch-cond-ff-inverted.spv.dis @@ -5,7 +5,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" %ids OpSource GLSL 450 OpDecorate %ids BuiltIn GlobalInvocationId diff --git a/dartagnan/src/test/resources/spirv/basic/branch-cond-ff.spv.dis b/dartagnan/src/test/resources/spirv/basic/branch-cond-ff.spv.dis index 2662f7d997..d4e6f05a4e 100644 --- a/dartagnan/src/test/resources/spirv/basic/branch-cond-ff.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/branch-cond-ff.spv.dis @@ -5,7 +5,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" %ids OpSource GLSL 450 OpDecorate %ids BuiltIn GlobalInvocationId diff --git a/dartagnan/src/test/resources/spirv/basic/branch-cond-struct-read-write.spv.dis b/dartagnan/src/test/resources/spirv/basic/branch-cond-struct-read-write.spv.dis index 99ee9e0489..4d1a3ac892 100644 --- a/dartagnan/src/test/resources/spirv/basic/branch-cond-struct-read-write.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/branch-cond-struct-read-write.spv.dis @@ -5,7 +5,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" %ids OpSource GLSL 450 OpDecorate %ids BuiltIn GlobalInvocationId diff --git a/dartagnan/src/test/resources/spirv/basic/branch-cond-struct.spv.dis b/dartagnan/src/test/resources/spirv/basic/branch-cond-struct.spv.dis index 76c5f34f9e..2b9f7cc11e 100644 --- a/dartagnan/src/test/resources/spirv/basic/branch-cond-struct.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/branch-cond-struct.spv.dis @@ -5,7 +5,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" %ids OpSource GLSL 450 OpDecorate %ids BuiltIn GlobalInvocationId diff --git a/dartagnan/src/test/resources/spirv/basic/branch-loop.spv.dis b/dartagnan/src/test/resources/spirv/basic/branch-loop.spv.dis index 5b799532e2..d0bc0c9a33 100644 --- a/dartagnan/src/test/resources/spirv/basic/branch-loop.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/branch-loop.spv.dis @@ -5,7 +5,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" %ids OpSource GLSL 450 OpDecorate %ids BuiltIn GlobalInvocationId diff --git a/dartagnan/src/test/resources/spirv/basic/branch-race.spv.dis b/dartagnan/src/test/resources/spirv/basic/branch-race.spv.dis index 52b1b40be9..95e141fc39 100644 --- a/dartagnan/src/test/resources/spirv/basic/branch-race.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/branch-race.spv.dis @@ -5,7 +5,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" %ids OpSource GLSL 450 OpDecorate %ids BuiltIn GlobalInvocationId diff --git a/dartagnan/src/test/resources/spirv/basic/builtin-all-123.spv.dis b/dartagnan/src/test/resources/spirv/basic/builtin-all-123.spv.dis index 1f4759b2be..fc3e0a6504 100644 --- a/dartagnan/src/test/resources/spirv/basic/builtin-all-123.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/builtin-all-123.spv.dis @@ -29,7 +29,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" OpSource GLSL 450 OpDecorate %gl_SubgroupLocalInvocationId BuiltIn SubgroupLocalInvocationId diff --git a/dartagnan/src/test/resources/spirv/basic/builtin-all-321.spv.dis b/dartagnan/src/test/resources/spirv/basic/builtin-all-321.spv.dis index f114f44024..d8c037e0dd 100644 --- a/dartagnan/src/test/resources/spirv/basic/builtin-all-321.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/builtin-all-321.spv.dis @@ -29,7 +29,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" OpSource GLSL 450 OpDecorate %gl_SubgroupLocalInvocationId BuiltIn SubgroupLocalInvocationId diff --git a/dartagnan/src/test/resources/spirv/basic/builtin-constant.spv.dis b/dartagnan/src/test/resources/spirv/basic/builtin-constant.spv.dis index f10ac6ea61..d11c108918 100644 --- a/dartagnan/src/test/resources/spirv/basic/builtin-constant.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/builtin-constant.spv.dis @@ -5,7 +5,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" OpSource GLSL 450 OpDecorate %gl_WorkGroupSize BuiltIn WorkgroupSize diff --git a/dartagnan/src/test/resources/spirv/basic/builtin-default-config.spv.dis b/dartagnan/src/test/resources/spirv/basic/builtin-default-config.spv.dis index d3d5c069cd..fbfb100f8d 100644 --- a/dartagnan/src/test/resources/spirv/basic/builtin-default-config.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/builtin-default-config.spv.dis @@ -4,7 +4,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" OpSource GLSL 450 OpDecorate %gl_WorkGroupSize BuiltIn WorkgroupSize diff --git a/dartagnan/src/test/resources/spirv/basic/builtin-variable.spv.dis b/dartagnan/src/test/resources/spirv/basic/builtin-variable.spv.dis index 3d41f341bd..6eb9124731 100644 --- a/dartagnan/src/test/resources/spirv/basic/builtin-variable.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/builtin-variable.spv.dis @@ -5,7 +5,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" OpSource GLSL 450 OpDecorate %gl_WorkGroupSize BuiltIn WorkgroupSize diff --git a/dartagnan/src/test/resources/spirv/basic/cmpxchg-const-const.spv.dis b/dartagnan/src/test/resources/spirv/basic/cmpxchg-const-const.spv.dis index dfc5ba84a5..4a70865b5d 100644 --- a/dartagnan/src/test/resources/spirv/basic/cmpxchg-const-const.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/cmpxchg-const-const.spv.dis @@ -7,7 +7,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" OpSource GLSL 450 %void = OpTypeVoid diff --git a/dartagnan/src/test/resources/spirv/basic/cmpxchg-const-reg.spv.dis b/dartagnan/src/test/resources/spirv/basic/cmpxchg-const-reg.spv.dis index 1a71c3221c..c8af1b1d3a 100644 --- a/dartagnan/src/test/resources/spirv/basic/cmpxchg-const-reg.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/cmpxchg-const-reg.spv.dis @@ -7,7 +7,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" OpSource GLSL 450 %void = OpTypeVoid diff --git a/dartagnan/src/test/resources/spirv/basic/cmpxchg-reg-const.spv.dis b/dartagnan/src/test/resources/spirv/basic/cmpxchg-reg-const.spv.dis index 6fe0a7adc2..51e9b38a2a 100644 --- a/dartagnan/src/test/resources/spirv/basic/cmpxchg-reg-const.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/cmpxchg-reg-const.spv.dis @@ -7,7 +7,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" OpSource GLSL 450 %void = OpTypeVoid diff --git a/dartagnan/src/test/resources/spirv/basic/cmpxchg-reg-reg.spv.dis b/dartagnan/src/test/resources/spirv/basic/cmpxchg-reg-reg.spv.dis index 8c41d220a9..54b02cc8a8 100644 --- a/dartagnan/src/test/resources/spirv/basic/cmpxchg-reg-reg.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/cmpxchg-reg-reg.spv.dis @@ -7,7 +7,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" OpSource GLSL 450 %void = OpTypeVoid diff --git a/dartagnan/src/test/resources/spirv/basic/empty-exists-false.spv.dis b/dartagnan/src/test/resources/spirv/basic/empty-exists-false.spv.dis index 23b3ba66af..157037c062 100644 --- a/dartagnan/src/test/resources/spirv/basic/empty-exists-false.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/empty-exists-false.spv.dis @@ -4,7 +4,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" OpSource GLSL 450 %void = OpTypeVoid diff --git a/dartagnan/src/test/resources/spirv/basic/empty-exists-true.spv.dis b/dartagnan/src/test/resources/spirv/basic/empty-exists-true.spv.dis index 8c6d406555..74551c3f03 100644 --- a/dartagnan/src/test/resources/spirv/basic/empty-exists-true.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/empty-exists-true.spv.dis @@ -4,7 +4,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" OpSource GLSL 450 %void = OpTypeVoid diff --git a/dartagnan/src/test/resources/spirv/basic/empty-forall-false.spv.dis b/dartagnan/src/test/resources/spirv/basic/empty-forall-false.spv.dis index 41fedcfe2c..36711923ed 100644 --- a/dartagnan/src/test/resources/spirv/basic/empty-forall-false.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/empty-forall-false.spv.dis @@ -4,7 +4,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" OpSource GLSL 450 %void = OpTypeVoid diff --git a/dartagnan/src/test/resources/spirv/basic/empty-forall-true.spv.dis b/dartagnan/src/test/resources/spirv/basic/empty-forall-true.spv.dis index 2471793eb7..be6e0f1850 100644 --- a/dartagnan/src/test/resources/spirv/basic/empty-forall-true.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/empty-forall-true.spv.dis @@ -4,7 +4,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" OpSource GLSL 450 %void = OpTypeVoid diff --git a/dartagnan/src/test/resources/spirv/basic/empty-not-exists-false.spv.dis b/dartagnan/src/test/resources/spirv/basic/empty-not-exists-false.spv.dis index de03e04581..1bdc9e6813 100644 --- a/dartagnan/src/test/resources/spirv/basic/empty-not-exists-false.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/empty-not-exists-false.spv.dis @@ -4,7 +4,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" OpSource GLSL 450 %void = OpTypeVoid diff --git a/dartagnan/src/test/resources/spirv/basic/empty-not-exists-true.spv.dis b/dartagnan/src/test/resources/spirv/basic/empty-not-exists-true.spv.dis index 4c8ed11545..aea4acac4b 100644 --- a/dartagnan/src/test/resources/spirv/basic/empty-not-exists-true.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/empty-not-exists-true.spv.dis @@ -4,7 +4,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" OpSource GLSL 450 %void = OpTypeVoid diff --git a/dartagnan/src/test/resources/spirv/basic/ids.spv.dis b/dartagnan/src/test/resources/spirv/basic/ids.spv.dis index 470adf2186..bac7cf9127 100644 --- a/dartagnan/src/test/resources/spirv/basic/ids.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/ids.spv.dis @@ -11,7 +11,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" OpSource GLSL 450 OpDecorate %x_scalar BuiltIn SubgroupLocalInvocationId diff --git a/dartagnan/src/test/resources/spirv/basic/init-forall-not-exists-fail.spv.dis b/dartagnan/src/test/resources/spirv/basic/init-forall-not-exists-fail.spv.dis index 00da8c3946..ce9dea8fa9 100644 --- a/dartagnan/src/test/resources/spirv/basic/init-forall-not-exists-fail.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/init-forall-not-exists-fail.spv.dis @@ -5,7 +5,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" OpSource GLSL 450 %void = OpTypeVoid diff --git a/dartagnan/src/test/resources/spirv/basic/init-forall-not-exists.spv.dis b/dartagnan/src/test/resources/spirv/basic/init-forall-not-exists.spv.dis index 407a46ddab..ae8a4b7401 100644 --- a/dartagnan/src/test/resources/spirv/basic/init-forall-not-exists.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/init-forall-not-exists.spv.dis @@ -5,7 +5,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" OpSource GLSL 450 %void = OpTypeVoid diff --git a/dartagnan/src/test/resources/spirv/basic/init-forall-split.spv.dis b/dartagnan/src/test/resources/spirv/basic/init-forall-split.spv.dis index 8da20dfd4f..2c56dc07db 100644 --- a/dartagnan/src/test/resources/spirv/basic/init-forall-split.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/init-forall-split.spv.dis @@ -6,7 +6,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" OpSource GLSL 450 %void = OpTypeVoid diff --git a/dartagnan/src/test/resources/spirv/basic/init-forall.spv.dis b/dartagnan/src/test/resources/spirv/basic/init-forall.spv.dis index e39569864f..b6b9e2d2dc 100644 --- a/dartagnan/src/test/resources/spirv/basic/init-forall.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/init-forall.spv.dis @@ -5,7 +5,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" OpSource GLSL 450 %void = OpTypeVoid diff --git a/dartagnan/src/test/resources/spirv/basic/loop-struct-cond-nested.spv.dis b/dartagnan/src/test/resources/spirv/basic/loop-struct-cond-nested.spv.dis index b93f230bf9..28d05afbf9 100644 --- a/dartagnan/src/test/resources/spirv/basic/loop-struct-cond-nested.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/loop-struct-cond-nested.spv.dis @@ -5,7 +5,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" %ids OpSource GLSL 450 OpDecorate %ids BuiltIn GlobalInvocationId diff --git a/dartagnan/src/test/resources/spirv/basic/loop-struct-cond-sequence.spv.dis b/dartagnan/src/test/resources/spirv/basic/loop-struct-cond-sequence.spv.dis index e7d5865466..5f1bd22421 100644 --- a/dartagnan/src/test/resources/spirv/basic/loop-struct-cond-sequence.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/loop-struct-cond-sequence.spv.dis @@ -5,7 +5,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" %ids OpSource GLSL 450 OpDecorate %ids BuiltIn GlobalInvocationId diff --git a/dartagnan/src/test/resources/spirv/basic/loop-struct-cond-suffix.spv.dis b/dartagnan/src/test/resources/spirv/basic/loop-struct-cond-suffix.spv.dis index 1d50ad7d83..9e0c3af5f9 100644 --- a/dartagnan/src/test/resources/spirv/basic/loop-struct-cond-suffix.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/loop-struct-cond-suffix.spv.dis @@ -5,7 +5,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" %ids OpSource GLSL 450 OpDecorate %ids BuiltIn GlobalInvocationId diff --git a/dartagnan/src/test/resources/spirv/basic/loop-struct-cond.spv.dis b/dartagnan/src/test/resources/spirv/basic/loop-struct-cond.spv.dis index 84a0b3cf3e..53432c1f9f 100644 --- a/dartagnan/src/test/resources/spirv/basic/loop-struct-cond.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/loop-struct-cond.spv.dis @@ -5,7 +5,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" %ids OpSource GLSL 450 OpDecorate %ids BuiltIn GlobalInvocationId diff --git a/dartagnan/src/test/resources/spirv/basic/memory-scopes.spv.dis b/dartagnan/src/test/resources/spirv/basic/memory-scopes.spv.dis index 2896039c04..f1e1d63fc0 100644 --- a/dartagnan/src/test/resources/spirv/basic/memory-scopes.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/memory-scopes.spv.dis @@ -6,7 +6,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" %ids OpSource GLSL 450 OpDecorate %ids BuiltIn GlobalInvocationId diff --git a/dartagnan/src/test/resources/spirv/basic/mixed-size.spv.dis b/dartagnan/src/test/resources/spirv/basic/mixed-size.spv.dis index 78efe25c52..0fa6b56f68 100644 --- a/dartagnan/src/test/resources/spirv/basic/mixed-size.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/mixed-size.spv.dis @@ -8,7 +8,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" OpSource GLSL 450 %void = OpTypeVoid diff --git a/dartagnan/src/test/resources/spirv/basic/phi-unstruct-false.spv.dis b/dartagnan/src/test/resources/spirv/basic/phi-unstruct-false.spv.dis index 772c41741d..3c924f4608 100644 --- a/dartagnan/src/test/resources/spirv/basic/phi-unstruct-false.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/phi-unstruct-false.spv.dis @@ -5,7 +5,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" %ids OpSource GLSL 450 OpDecorate %ids BuiltIn GlobalInvocationId diff --git a/dartagnan/src/test/resources/spirv/basic/phi-unstruct-true.spv.dis b/dartagnan/src/test/resources/spirv/basic/phi-unstruct-true.spv.dis index 4c1ab4eb1f..bb74df1a62 100644 --- a/dartagnan/src/test/resources/spirv/basic/phi-unstruct-true.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/phi-unstruct-true.spv.dis @@ -5,7 +5,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" %ids OpSource GLSL 450 OpDecorate %ids BuiltIn GlobalInvocationId diff --git a/dartagnan/src/test/resources/spirv/basic/phi.spv.dis b/dartagnan/src/test/resources/spirv/basic/phi.spv.dis index 65243dd999..59679b8523 100644 --- a/dartagnan/src/test/resources/spirv/basic/phi.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/phi.spv.dis @@ -5,7 +5,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" %ids OpSource GLSL 450 OpDecorate %ids BuiltIn GlobalInvocationId diff --git a/dartagnan/src/test/resources/spirv/basic/push-constant-mixed.spv.dis b/dartagnan/src/test/resources/spirv/basic/push-constant-mixed.spv.dis index 8ddd7c15f3..54f9ba961f 100644 --- a/dartagnan/src/test/resources/spirv/basic/push-constant-mixed.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/push-constant-mixed.spv.dis @@ -10,7 +10,8 @@ ; Schema: 0 OpCapability Shader %54 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %func "test" %out %push OpSource OpenCL_C 200 OpMemberDecorate %_struct_11 0 Offset 0 diff --git a/dartagnan/src/test/resources/spirv/basic/push-constants-pod.spv.dis b/dartagnan/src/test/resources/spirv/basic/push-constants-pod.spv.dis index d972c636ca..cf6c75135e 100644 --- a/dartagnan/src/test/resources/spirv/basic/push-constants-pod.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/push-constants-pod.spv.dis @@ -12,7 +12,8 @@ ; Schema: 0 OpCapability Shader %ext = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %func "test" %out %push OpSource OpenCL_C 200 OpMemberDecorate %_struct_3 0 Offset 0 diff --git a/dartagnan/src/test/resources/spirv/basic/push-constants.spv.dis b/dartagnan/src/test/resources/spirv/basic/push-constants.spv.dis index 7305c954dd..292e74c2d5 100644 --- a/dartagnan/src/test/resources/spirv/basic/push-constants.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/push-constants.spv.dis @@ -8,7 +8,8 @@ ; Schema: 0 OpCapability Shader %ext = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %func "test" %out %push OpSource OpenCL_C 200 OpMemberDecorate %_struct_3 0 Offset 0 diff --git a/dartagnan/src/test/resources/spirv/basic/read-write.spv.dis b/dartagnan/src/test/resources/spirv/basic/read-write.spv.dis index c9ef064417..198afdaf55 100644 --- a/dartagnan/src/test/resources/spirv/basic/read-write.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/read-write.spv.dis @@ -5,7 +5,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" OpSource GLSL 450 %void = OpTypeVoid diff --git a/dartagnan/src/test/resources/spirv/basic/rmw-extremum-false.spv.dis b/dartagnan/src/test/resources/spirv/basic/rmw-extremum-false.spv.dis index 327849b21d..29e6bf0e4e 100644 --- a/dartagnan/src/test/resources/spirv/basic/rmw-extremum-false.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/rmw-extremum-false.spv.dis @@ -6,7 +6,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" OpSource GLSL 450 %void = OpTypeVoid diff --git a/dartagnan/src/test/resources/spirv/basic/rmw-extremum-true.spv.dis b/dartagnan/src/test/resources/spirv/basic/rmw-extremum-true.spv.dis index 6a7e86dd82..69492c108e 100644 --- a/dartagnan/src/test/resources/spirv/basic/rmw-extremum-true.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/rmw-extremum-true.spv.dis @@ -6,7 +6,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" OpSource GLSL 450 %void = OpTypeVoid diff --git a/dartagnan/src/test/resources/spirv/basic/uninitialized-exists.spv.dis b/dartagnan/src/test/resources/spirv/basic/uninitialized-exists.spv.dis index 4a98a2a267..0292e2ef5b 100644 --- a/dartagnan/src/test/resources/spirv/basic/uninitialized-exists.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/uninitialized-exists.spv.dis @@ -4,7 +4,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" OpSource GLSL 450 %void = OpTypeVoid diff --git a/dartagnan/src/test/resources/spirv/basic/uninitialized-forall.spv.dis b/dartagnan/src/test/resources/spirv/basic/uninitialized-forall.spv.dis index ba9261363a..ffb0ef4ba7 100644 --- a/dartagnan/src/test/resources/spirv/basic/uninitialized-forall.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/uninitialized-forall.spv.dis @@ -4,7 +4,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" OpSource GLSL 450 %void = OpTypeVoid diff --git a/dartagnan/src/test/resources/spirv/basic/uninitialized-private-exists.spv.dis b/dartagnan/src/test/resources/spirv/basic/uninitialized-private-exists.spv.dis index d7ccd76748..a1bc7599b6 100644 --- a/dartagnan/src/test/resources/spirv/basic/uninitialized-private-exists.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/uninitialized-private-exists.spv.dis @@ -5,7 +5,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" %ids OpSource GLSL 450 OpDecorate %ids BuiltIn GlobalInvocationId diff --git a/dartagnan/src/test/resources/spirv/basic/uninitialized-private-forall.spv.dis b/dartagnan/src/test/resources/spirv/basic/uninitialized-private-forall.spv.dis index 08ae1cea40..c5022fd859 100644 --- a/dartagnan/src/test/resources/spirv/basic/uninitialized-private-forall.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/uninitialized-private-forall.spv.dis @@ -5,7 +5,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" %ids OpSource GLSL 450 OpDecorate %ids BuiltIn GlobalInvocationId diff --git a/dartagnan/src/test/resources/spirv/basic/vector-init.spv.dis b/dartagnan/src/test/resources/spirv/basic/vector-init.spv.dis index 7506f29efc..e35ad06ff2 100644 --- a/dartagnan/src/test/resources/spirv/basic/vector-init.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/vector-init.spv.dis @@ -5,7 +5,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" OpSource GLSL 450 %void = OpTypeVoid diff --git a/dartagnan/src/test/resources/spirv/basic/vector-read-write.spv.dis b/dartagnan/src/test/resources/spirv/basic/vector-read-write.spv.dis index 284f1d64a1..06f0868836 100644 --- a/dartagnan/src/test/resources/spirv/basic/vector-read-write.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/vector-read-write.spv.dis @@ -4,7 +4,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" OpSource GLSL 450 %void = OpTypeVoid diff --git a/dartagnan/src/test/resources/spirv/basic/vector.spv.dis b/dartagnan/src/test/resources/spirv/basic/vector.spv.dis index bbc8078c5f..e519f5677d 100644 --- a/dartagnan/src/test/resources/spirv/basic/vector.spv.dis +++ b/dartagnan/src/test/resources/spirv/basic/vector.spv.dis @@ -4,7 +4,8 @@ ; Version: 1.0 ; Schema: 0 OpCapability Shader - OpMemoryModel Logical GLSL450 + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpEntryPoint GLCompute %main "main" OpSource GLSL 450 %void = OpTypeVoid diff --git a/dartagnan/src/test/resources/spirv/benchmarks/CORR.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/CORR.spv.dis index 78c0288a1f..204119bbf4 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/CORR.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/CORR.spv.dis @@ -11,8 +11,9 @@ ; Bound: 112 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %88 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %24 "test" %gl_WorkGroupID %13 %17 %18 %19 %20 %21 %5 OpSource OpenCL_C 200 %89 = OpString "test" @@ -63,7 +64,6 @@ %_ptr_PushConstant_uint = OpTypePointer PushConstant %uint %bool = OpTypeBool %uint_1 = OpConstant %uint 1 - %uint_64 = OpConstant %uint 64 %uint_2 = OpConstant %uint 2 %uint_3 = OpConstant %uint 3 %uint_5 = OpConstant %uint 5 @@ -93,9 +93,9 @@ OpSelectionMerge %50 None OpBranchConditional %41 %44 %50 %44 = OpLabel - %47 = OpAtomicLoad %uint %28 %uint_1 %uint_64 + %47 = OpAtomicLoad %uint %28 %uint_1 %uint_0 OpStore %29 %47 - %48 = OpAtomicLoad %uint %28 %uint_1 %uint_64 + %48 = OpAtomicLoad %uint %28 %uint_1 %uint_0 OpStore %30 %48 OpBranch %50 %50 = OpLabel @@ -108,9 +108,9 @@ OpSelectionMerge %63 None OpBranchConditional %56 %59 %63 %59 = OpLabel - %60 = OpAtomicLoad %uint %28 %uint_1 %uint_64 + %60 = OpAtomicLoad %uint %28 %uint_1 %uint_0 OpStore %31 %60 - %61 = OpAtomicLoad %uint %28 %uint_1 %uint_64 + %61 = OpAtomicLoad %uint %28 %uint_1 %uint_0 OpStore %32 %61 OpBranch %63 %63 = OpLabel @@ -123,7 +123,7 @@ OpSelectionMerge %75 None OpBranchConditional %70 %73 %75 %73 = OpLabel - OpAtomicStore %28 %uint_1 %uint_64 %uint_2 + OpAtomicStore %28 %uint_1 %uint_0 %uint_2 OpBranch %75 %75 = OpLabel %76 = OpAccessChain %_ptr_Input_uint %gl_WorkGroupID %uint_0 @@ -135,7 +135,7 @@ OpSelectionMerge %87 None OpBranchConditional %82 %85 %87 %85 = OpLabel - OpAtomicStore %28 %uint_1 %uint_64 %uint_1 + OpAtomicStore %28 %uint_1 %uint_0 %uint_1 OpBranch %87 %87 = OpLabel OpReturn diff --git a/dartagnan/src/test/resources/spirv/benchmarks/IRIW.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/IRIW.spv.dis index fd1c7d1179..0a46e211ad 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/IRIW.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/IRIW.spv.dis @@ -12,8 +12,9 @@ ; Bound: 103 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %77 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %22 "test" %gl_LocalInvocationID %10 %14 %15 %16 %17 %18 %19 OpSource OpenCL_C 200 %78 = OpString "test" diff --git a/dartagnan/src/test/resources/spirv/benchmarks/MP-acq2rx.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/MP-acq2rx.spv.dis index 6a9d2bb60f..7e703d390d 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/MP-acq2rx.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/MP-acq2rx.spv.dis @@ -10,8 +10,9 @@ ; Bound: 80 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %58 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %23 "test" %gl_GlobalInvocationID %13 %17 %18 %19 %20 %5 OpSource OpenCL_C 200 %59 = OpString "test" @@ -59,7 +60,6 @@ %_ptr_PushConstant_uint = OpTypePointer PushConstant %uint %bool = OpTypeBool %uint_1 = OpConstant %uint 1 - %uint_64 = OpConstant %uint 64 %uint_68 = OpConstant %uint 68 %false = OpConstantFalse %bool %true = OpConstantTrue %bool @@ -89,9 +89,9 @@ OpSelectionMerge %48 None OpBranchConditional %39 %42 %48 %42 = OpLabel - %45 = OpAtomicLoad %uint %27 %uint_1 %uint_64 + %45 = OpAtomicLoad %uint %27 %uint_1 %uint_0 OpStore %29 %45 - %46 = OpLoad %uint %28 + %46 = OpLoad %uint %28 MakePointerVisible|NonPrivatePointer %uint_1 OpStore %30 %46 OpBranch %48 %48 = OpLabel @@ -99,7 +99,7 @@ OpSelectionMerge %55 None OpBranchConditional %49 %52 %55 %52 = OpLabel - OpStore %28 %uint_1 + OpStore %28 %uint_1 MakePointerAvailable|NonPrivatePointer %uint_1 OpAtomicStore %27 %uint_1 %uint_68 %uint_1 OpBranch %55 %55 = OpLabel diff --git a/dartagnan/src/test/resources/spirv/benchmarks/MP-rel2rx.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/MP-rel2rx.spv.dis index 27c43873e4..09d997d3d3 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/MP-rel2rx.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/MP-rel2rx.spv.dis @@ -10,8 +10,9 @@ ; Bound: 80 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %58 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %23 "test" %gl_GlobalInvocationID %13 %17 %18 %19 %20 %5 OpSource OpenCL_C 200 %59 = OpString "test" @@ -60,7 +61,6 @@ %bool = OpTypeBool %uint_1 = OpConstant %uint 1 %uint_66 = OpConstant %uint 66 - %uint_64 = OpConstant %uint 64 %false = OpConstantFalse %bool %true = OpConstantTrue %bool %uint_4 = OpConstant %uint 4 @@ -91,7 +91,7 @@ %42 = OpLabel %45 = OpAtomicLoad %uint %27 %uint_1 %uint_66 OpStore %29 %45 - %46 = OpLoad %uint %28 + %46 = OpLoad %uint %28 MakePointerVisible|NonPrivatePointer %uint_1 OpStore %30 %46 OpBranch %48 %48 = OpLabel @@ -99,8 +99,8 @@ OpSelectionMerge %55 None OpBranchConditional %49 %52 %55 %52 = OpLabel - OpStore %28 %uint_1 - OpAtomicStore %27 %uint_1 %uint_64 %uint_1 + OpStore %28 %uint_1 MakePointerAvailable|NonPrivatePointer %uint_1 + OpAtomicStore %27 %uint_1 %uint_0 %uint_1 OpBranch %55 %55 = OpLabel OpReturn diff --git a/dartagnan/src/test/resources/spirv/benchmarks/MP.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/MP.spv.dis index 5f4f64c44c..11f6853f55 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/MP.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/MP.spv.dis @@ -10,8 +10,9 @@ ; Bound: 80 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %58 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %23 "test" %gl_GlobalInvocationID %13 %17 %18 %19 %20 %5 OpSource OpenCL_C 200 %59 = OpString "test" @@ -91,7 +92,7 @@ %42 = OpLabel %45 = OpAtomicLoad %uint %27 %uint_1 %uint_66 OpStore %29 %45 - %46 = OpLoad %uint %28 + %46 = OpLoad %uint %28 MakePointerVisible|NonPrivatePointer %uint_1 OpStore %30 %46 OpBranch %48 %48 = OpLabel @@ -99,7 +100,7 @@ OpSelectionMerge %55 None OpBranchConditional %49 %52 %55 %52 = OpLabel - OpStore %28 %uint_1 + OpStore %28 %uint_1 MakePointerAvailable|NonPrivatePointer %uint_1 OpAtomicStore %27 %uint_1 %uint_68 %uint_1 OpBranch %55 %55 = OpLabel diff --git a/dartagnan/src/test/resources/spirv/benchmarks/SB.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/SB.spv.dis index 4954ef8a1e..12a42da2ec 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/SB.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/SB.spv.dis @@ -10,8 +10,9 @@ ; Bound: 71 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %51 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %20 "test" %gl_LocalInvocationID %10 %14 %15 %16 %17 OpSource OpenCL_C 200 %52 = OpString "test" diff --git a/dartagnan/src/test/resources/spirv/benchmarks/caslock-1.1.2.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/caslock-1.1.2.spv.dis index f8c57d51b2..df22fe5c51 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/caslock-1.1.2.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/caslock-1.1.2.spv.dis @@ -9,8 +9,9 @@ ; Bound: 67 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %49 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %22 "mutex_test" %gl_GlobalInvocationID %13 %17 %18 %19 %5 OpSource OpenCL_C 200 %50 = OpString "mutex_test" @@ -77,9 +78,9 @@ OpLoopMerge %37 %29 None OpBranchConditional %34 %37 %29 %37 = OpLabel - %38 = OpLoad %uint %27 + %38 = OpLoad %uint %27 MakePointerVisible|NonPrivatePointer %uint_1 %39 = OpIAdd %uint %38 %uint_1 - OpStore %27 %39 + OpStore %27 %39 MakePointerAvailable|NonPrivatePointer %uint_1 OpAtomicStore %26 %uint_1 %uint_68 %uint_0 %42 = OpAccessChain %_ptr_Input_uint %gl_GlobalInvocationID %uint_0 %43 = OpLoad %uint %42 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/caslock-2.1.1.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/caslock-2.1.1.spv.dis index 88895b1212..81dd783384 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/caslock-2.1.1.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/caslock-2.1.1.spv.dis @@ -9,8 +9,9 @@ ; Bound: 67 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %49 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %22 "mutex_test" %gl_GlobalInvocationID %13 %17 %18 %19 %5 OpSource OpenCL_C 200 %50 = OpString "mutex_test" @@ -77,9 +78,9 @@ OpLoopMerge %37 %29 None OpBranchConditional %34 %37 %29 %37 = OpLabel - %38 = OpLoad %uint %27 + %38 = OpLoad %uint %27 MakePointerVisible|NonPrivatePointer %uint_1 %39 = OpIAdd %uint %38 %uint_1 - OpStore %27 %39 + OpStore %27 %39 MakePointerAvailable|NonPrivatePointer %uint_1 OpAtomicStore %26 %uint_1 %uint_68 %uint_0 %42 = OpAccessChain %_ptr_Input_uint %gl_GlobalInvocationID %uint_0 %43 = OpLoad %uint %42 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/caslock-acq2rx.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/caslock-acq2rx.spv.dis index 7e0bedc896..8c6fb8c888 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/caslock-acq2rx.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/caslock-acq2rx.spv.dis @@ -9,8 +9,9 @@ ; Bound: 58 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %42 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %19 "mutex_test" %gl_LocalInvocationID %10 %14 %15 %16 OpSource OpenCL_C 200 %43 = OpString "mutex_test" @@ -48,7 +49,6 @@ %_ptr_StorageBuffer_uint = OpTypePointer StorageBuffer %uint %uint_0 = OpConstant %uint 0 %uint_1 = OpConstant %uint 1 - %uint_64 = OpConstant %uint 64 %bool = OpTypeBool %uint_68 = OpConstant %uint 68 %_ptr_Input_uint = OpTypePointer Input %uint @@ -65,14 +65,14 @@ %24 = OpAccessChain %_ptr_StorageBuffer_uint %15 %uint_0 %uint_0 OpBranch %26 %26 = OpLabel - %29 = OpAtomicCompareExchange %uint %23 %uint_1 %uint_64 %uint_64 %uint_1 %uint_0 + %29 = OpAtomicCompareExchange %uint %23 %uint_1 %uint_0 %uint_0 %uint_1 %uint_0 %31 = OpIEqual %bool %29 %uint_0 OpLoopMerge %34 %26 None OpBranchConditional %31 %34 %26 %34 = OpLabel - %35 = OpLoad %uint %24 + %35 = OpLoad %uint %24 MakePointerVisible|NonPrivatePointer %uint_1 %36 = OpIAdd %uint %35 %uint_1 - OpStore %24 %36 + OpStore %24 %36 MakePointerAvailable|NonPrivatePointer %uint_1 OpAtomicStore %23 %uint_1 %uint_68 %uint_0 %39 = OpAccessChain %_ptr_Input_uint %gl_LocalInvocationID %uint_0 %40 = OpLoad %uint %39 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/caslock-dv2wg-1.1.2.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/caslock-dv2wg-1.1.2.spv.dis index fe6a66a564..bf807bb3ae 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/caslock-dv2wg-1.1.2.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/caslock-dv2wg-1.1.2.spv.dis @@ -9,8 +9,9 @@ ; Bound: 67 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %50 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %22 "mutex_test" %gl_GlobalInvocationID %13 %17 %18 %19 %5 OpSource OpenCL_C 200 %51 = OpString "mutex_test" @@ -77,9 +78,9 @@ OpLoopMerge %38 %29 None OpBranchConditional %35 %38 %29 %38 = OpLabel - %39 = OpLoad %uint %27 + %39 = OpLoad %uint %27 MakePointerVisible|NonPrivatePointer %uint_1 %40 = OpIAdd %uint %39 %uint_1 - OpStore %27 %40 + OpStore %27 %40 MakePointerAvailable|NonPrivatePointer %uint_1 OpAtomicStore %26 %uint_2 %uint_68 %uint_0 %43 = OpAccessChain %_ptr_Input_uint %gl_GlobalInvocationID %uint_0 %44 = OpLoad %uint %43 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/caslock-dv2wg-2.1.1.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/caslock-dv2wg-2.1.1.spv.dis index 995b5489f3..e0113213c9 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/caslock-dv2wg-2.1.1.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/caslock-dv2wg-2.1.1.spv.dis @@ -9,8 +9,9 @@ ; Bound: 67 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %50 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %22 "mutex_test" %gl_GlobalInvocationID %13 %17 %18 %19 %5 OpSource OpenCL_C 200 %51 = OpString "mutex_test" @@ -77,9 +78,9 @@ OpLoopMerge %38 %29 None OpBranchConditional %35 %38 %29 %38 = OpLabel - %39 = OpLoad %uint %27 + %39 = OpLoad %uint %27 MakePointerVisible|NonPrivatePointer %uint_1 %40 = OpIAdd %uint %39 %uint_1 - OpStore %27 %40 + OpStore %27 %40 MakePointerAvailable|NonPrivatePointer %uint_1 OpAtomicStore %26 %uint_2 %uint_68 %uint_0 %43 = OpAccessChain %_ptr_Input_uint %gl_GlobalInvocationID %uint_0 %44 = OpLoad %uint %43 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/caslock-dv2wg-2.2.1.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/caslock-dv2wg-2.2.1.spv.dis index 5e94fce420..511698898c 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/caslock-dv2wg-2.2.1.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/caslock-dv2wg-2.2.1.spv.dis @@ -8,8 +8,9 @@ ; Bound: 67 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %50 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %22 "mutex_test" %gl_GlobalInvocationID %13 %17 %18 %19 %5 OpSource OpenCL_C 200 %51 = OpString "mutex_test" @@ -76,9 +77,9 @@ OpLoopMerge %38 %29 None OpBranchConditional %35 %38 %29 %38 = OpLabel - %39 = OpLoad %uint %27 + %39 = OpLoad %uint %27 MakePointerVisible|NonPrivatePointer %uint_1 %40 = OpIAdd %uint %39 %uint_1 - OpStore %27 %40 + OpStore %27 %40 MakePointerAvailable|NonPrivatePointer %uint_1 OpAtomicStore %26 %uint_2 %uint_68 %uint_0 %43 = OpAccessChain %_ptr_Input_uint %gl_GlobalInvocationID %uint_0 %44 = OpLoad %uint %43 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/caslock-dv2wg-2.2.2.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/caslock-dv2wg-2.2.2.spv.dis index 2370207795..429528c62d 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/caslock-dv2wg-2.2.2.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/caslock-dv2wg-2.2.2.spv.dis @@ -8,8 +8,9 @@ ; Bound: 67 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %50 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %22 "mutex_test" %gl_GlobalInvocationID %13 %17 %18 %19 %5 OpSource OpenCL_C 200 %51 = OpString "mutex_test" @@ -76,9 +77,9 @@ OpLoopMerge %38 %29 None OpBranchConditional %35 %38 %29 %38 = OpLabel - %39 = OpLoad %uint %27 + %39 = OpLoad %uint %27 MakePointerVisible|NonPrivatePointer %uint_1 %40 = OpIAdd %uint %39 %uint_1 - OpStore %27 %40 + OpStore %27 %40 MakePointerAvailable|NonPrivatePointer %uint_1 OpAtomicStore %26 %uint_2 %uint_68 %uint_0 %43 = OpAccessChain %_ptr_Input_uint %gl_GlobalInvocationID %uint_0 %44 = OpLoad %uint %43 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/caslock-rel2rx.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/caslock-rel2rx.spv.dis index 6c18c46040..b439c52062 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/caslock-rel2rx.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/caslock-rel2rx.spv.dis @@ -9,8 +9,9 @@ ; Bound: 58 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %42 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %19 "mutex_test" %gl_LocalInvocationID %10 %14 %15 %16 OpSource OpenCL_C 200 %43 = OpString "mutex_test" @@ -50,7 +51,6 @@ %uint_1 = OpConstant %uint 1 %uint_66 = OpConstant %uint 66 %bool = OpTypeBool - %uint_64 = OpConstant %uint 64 %_ptr_Input_uint = OpTypePointer Input %uint %uint_3 = OpConstant %uint 3 %uint_2 = OpConstant %uint 2 @@ -70,10 +70,10 @@ OpLoopMerge %34 %26 None OpBranchConditional %31 %34 %26 %34 = OpLabel - %35 = OpLoad %uint %24 + %35 = OpLoad %uint %24 MakePointerVisible|NonPrivatePointer %uint_1 %36 = OpIAdd %uint %35 %uint_1 - OpStore %24 %36 - OpAtomicStore %23 %uint_1 %uint_64 %uint_0 + OpStore %24 %36 MakePointerAvailable|NonPrivatePointer %uint_1 + OpAtomicStore %23 %uint_1 %uint_0 %uint_0 %39 = OpAccessChain %_ptr_Input_uint %gl_LocalInvocationID %uint_0 %40 = OpLoad %uint %39 %41 = OpAccessChain %_ptr_StorageBuffer_uint %16 %uint_0 %40 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/ticketlock-1.1.2.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/ticketlock-1.1.2.spv.dis index 21b61b7f6e..6e2b4a3ec0 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/ticketlock-1.1.2.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/ticketlock-1.1.2.spv.dis @@ -10,8 +10,9 @@ ; Bound: 77 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %55 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %23 "mutex_test" %gl_GlobalInvocationID %13 %17 %18 %19 %20 %5 OpSource OpenCL_C 200 %56 = OpString "mutex_test" @@ -56,7 +57,6 @@ %_ptr_StorageBuffer_uint = OpTypePointer StorageBuffer %uint %uint_0 = OpConstant %uint 0 %uint_1 = OpConstant %uint 1 - %uint_64 = OpConstant %uint 64 %uint_66 = OpConstant %uint 66 %bool = OpTypeBool %uint_68 = OpConstant %uint 68 @@ -78,7 +78,7 @@ %27 = OpAccessChain %_ptr_StorageBuffer_uint %17 %uint_0 %uint_0 %28 = OpAccessChain %_ptr_StorageBuffer_uint %18 %uint_0 %uint_0 %29 = OpAccessChain %_ptr_StorageBuffer_uint %19 %uint_0 %uint_0 - %32 = OpAtomicIAdd %uint %28 %uint_1 %uint_64 %uint_1 + %32 = OpAtomicIAdd %uint %28 %uint_1 %uint_0 %uint_1 OpBranch %34 %34 = OpLabel %36 = OpAtomicLoad %uint %27 %uint_1 %uint_66 @@ -86,10 +86,10 @@ OpLoopMerge %41 %34 None OpBranchConditional %38 %41 %34 %41 = OpLabel - %42 = OpLoad %uint %29 + %42 = OpLoad %uint %29 MakePointerVisible|NonPrivatePointer %uint_1 %43 = OpIAdd %uint %42 %uint_1 - OpStore %29 %43 - %44 = OpAtomicLoad %uint %27 %uint_1 %uint_64 + OpStore %29 %43 MakePointerAvailable|NonPrivatePointer %uint_1 + %44 = OpAtomicLoad %uint %27 %uint_1 %uint_0 %45 = OpIAdd %uint %44 %uint_1 OpAtomicStore %27 %uint_1 %uint_68 %45 %48 = OpAccessChain %_ptr_Input_uint %gl_GlobalInvocationID %uint_0 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/ticketlock-2.1.1.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/ticketlock-2.1.1.spv.dis index ab4222b4aa..bf1cb73370 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/ticketlock-2.1.1.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/ticketlock-2.1.1.spv.dis @@ -10,8 +10,9 @@ ; Bound: 77 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %55 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %23 "mutex_test" %gl_GlobalInvocationID %13 %17 %18 %19 %20 %5 OpSource OpenCL_C 200 %56 = OpString "mutex_test" @@ -56,7 +57,6 @@ %_ptr_StorageBuffer_uint = OpTypePointer StorageBuffer %uint %uint_0 = OpConstant %uint 0 %uint_1 = OpConstant %uint 1 - %uint_64 = OpConstant %uint 64 %uint_66 = OpConstant %uint 66 %bool = OpTypeBool %uint_68 = OpConstant %uint 68 @@ -78,7 +78,7 @@ %27 = OpAccessChain %_ptr_StorageBuffer_uint %17 %uint_0 %uint_0 %28 = OpAccessChain %_ptr_StorageBuffer_uint %18 %uint_0 %uint_0 %29 = OpAccessChain %_ptr_StorageBuffer_uint %19 %uint_0 %uint_0 - %32 = OpAtomicIAdd %uint %28 %uint_1 %uint_64 %uint_1 + %32 = OpAtomicIAdd %uint %28 %uint_1 %uint_0 %uint_1 OpBranch %34 %34 = OpLabel %36 = OpAtomicLoad %uint %27 %uint_1 %uint_66 @@ -86,10 +86,10 @@ OpLoopMerge %41 %34 None OpBranchConditional %38 %41 %34 %41 = OpLabel - %42 = OpLoad %uint %29 + %42 = OpLoad %uint %29 MakePointerVisible|NonPrivatePointer %uint_1 %43 = OpIAdd %uint %42 %uint_1 - OpStore %29 %43 - %44 = OpAtomicLoad %uint %27 %uint_1 %uint_64 + OpStore %29 %43 MakePointerAvailable|NonPrivatePointer %uint_1 + %44 = OpAtomicLoad %uint %27 %uint_1 %uint_0 %45 = OpIAdd %uint %44 %uint_1 OpAtomicStore %27 %uint_1 %uint_68 %45 %48 = OpAccessChain %_ptr_Input_uint %gl_GlobalInvocationID %uint_0 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/ticketlock-acq2rx.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/ticketlock-acq2rx.spv.dis index 20b7f1bd25..b079b9f627 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/ticketlock-acq2rx.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/ticketlock-acq2rx.spv.dis @@ -10,8 +10,9 @@ ; Bound: 67 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %47 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %20 "mutex_test" %gl_LocalInvocationID %10 %14 %15 %16 %17 OpSource OpenCL_C 200 %48 = OpString "mutex_test" @@ -52,7 +53,6 @@ %_ptr_StorageBuffer_uint = OpTypePointer StorageBuffer %uint %uint_0 = OpConstant %uint 0 %uint_1 = OpConstant %uint 1 - %uint_64 = OpConstant %uint 64 %bool = OpTypeBool %uint_68 = OpConstant %uint 68 %_ptr_Input_uint = OpTypePointer Input %uint @@ -70,18 +70,18 @@ %24 = OpAccessChain %_ptr_StorageBuffer_uint %14 %uint_0 %uint_0 %25 = OpAccessChain %_ptr_StorageBuffer_uint %15 %uint_0 %uint_0 %26 = OpAccessChain %_ptr_StorageBuffer_uint %16 %uint_0 %uint_0 - %29 = OpAtomicIAdd %uint %25 %uint_1 %uint_64 %uint_1 + %29 = OpAtomicIAdd %uint %25 %uint_1 %uint_0 %uint_1 OpBranch %31 %31 = OpLabel - %32 = OpAtomicLoad %uint %24 %uint_1 %uint_64 + %32 = OpAtomicLoad %uint %24 %uint_1 %uint_0 %34 = OpIEqual %bool %32 %29 OpLoopMerge %37 %31 None OpBranchConditional %34 %37 %31 %37 = OpLabel - %38 = OpLoad %uint %26 + %38 = OpLoad %uint %26 MakePointerVisible|NonPrivatePointer %uint_1 %39 = OpIAdd %uint %38 %uint_1 - OpStore %26 %39 - %40 = OpAtomicLoad %uint %24 %uint_1 %uint_64 + OpStore %26 %39 MakePointerAvailable|NonPrivatePointer %uint_1 + %40 = OpAtomicLoad %uint %24 %uint_1 %uint_0 %41 = OpIAdd %uint %40 %uint_1 OpAtomicStore %24 %uint_1 %uint_68 %41 %44 = OpAccessChain %_ptr_Input_uint %gl_LocalInvocationID %uint_0 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/ticketlock-dv2wg-1.1.2.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/ticketlock-dv2wg-1.1.2.spv.dis index 0b139d43b6..cdcb45f6e0 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/ticketlock-dv2wg-1.1.2.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/ticketlock-dv2wg-1.1.2.spv.dis @@ -10,8 +10,9 @@ ; Bound: 77 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %56 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %23 "mutex_test" %gl_GlobalInvocationID %13 %17 %18 %19 %20 %5 OpSource OpenCL_C 200 %57 = OpString "mutex_test" @@ -56,7 +57,6 @@ %_ptr_StorageBuffer_uint = OpTypePointer StorageBuffer %uint %uint_0 = OpConstant %uint 0 %uint_2 = OpConstant %uint 2 - %uint_64 = OpConstant %uint 64 %uint_1 = OpConstant %uint 1 %uint_66 = OpConstant %uint 66 %bool = OpTypeBool @@ -78,7 +78,7 @@ %27 = OpAccessChain %_ptr_StorageBuffer_uint %17 %uint_0 %uint_0 %28 = OpAccessChain %_ptr_StorageBuffer_uint %18 %uint_0 %uint_0 %29 = OpAccessChain %_ptr_StorageBuffer_uint %19 %uint_0 %uint_0 - %33 = OpAtomicIAdd %uint %28 %uint_2 %uint_64 %uint_1 + %33 = OpAtomicIAdd %uint %28 %uint_2 %uint_0 %uint_1 OpBranch %35 %35 = OpLabel %37 = OpAtomicLoad %uint %27 %uint_2 %uint_66 @@ -86,10 +86,10 @@ OpLoopMerge %42 %35 None OpBranchConditional %39 %42 %35 %42 = OpLabel - %43 = OpLoad %uint %29 + %43 = OpLoad %uint %29 MakePointerVisible|NonPrivatePointer %uint_1 %44 = OpIAdd %uint %43 %uint_1 - OpStore %29 %44 - %45 = OpAtomicLoad %uint %27 %uint_2 %uint_64 + OpStore %29 %44 MakePointerAvailable|NonPrivatePointer %uint_1 + %45 = OpAtomicLoad %uint %27 %uint_2 %uint_0 %46 = OpIAdd %uint %45 %uint_1 OpAtomicStore %27 %uint_2 %uint_68 %46 %49 = OpAccessChain %_ptr_Input_uint %gl_GlobalInvocationID %uint_0 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/ticketlock-dv2wg-2.1.1.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/ticketlock-dv2wg-2.1.1.spv.dis index 5ab51f12ca..a8222e90b5 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/ticketlock-dv2wg-2.1.1.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/ticketlock-dv2wg-2.1.1.spv.dis @@ -10,8 +10,9 @@ ; Bound: 77 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %56 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %23 "mutex_test" %gl_GlobalInvocationID %13 %17 %18 %19 %20 %5 OpSource OpenCL_C 200 %57 = OpString "mutex_test" @@ -56,7 +57,6 @@ %_ptr_StorageBuffer_uint = OpTypePointer StorageBuffer %uint %uint_0 = OpConstant %uint 0 %uint_2 = OpConstant %uint 2 - %uint_64 = OpConstant %uint 64 %uint_1 = OpConstant %uint 1 %uint_66 = OpConstant %uint 66 %bool = OpTypeBool @@ -78,7 +78,7 @@ %27 = OpAccessChain %_ptr_StorageBuffer_uint %17 %uint_0 %uint_0 %28 = OpAccessChain %_ptr_StorageBuffer_uint %18 %uint_0 %uint_0 %29 = OpAccessChain %_ptr_StorageBuffer_uint %19 %uint_0 %uint_0 - %33 = OpAtomicIAdd %uint %28 %uint_2 %uint_64 %uint_1 + %33 = OpAtomicIAdd %uint %28 %uint_2 %uint_0 %uint_1 OpBranch %35 %35 = OpLabel %37 = OpAtomicLoad %uint %27 %uint_2 %uint_66 @@ -86,10 +86,10 @@ OpLoopMerge %42 %35 None OpBranchConditional %39 %42 %35 %42 = OpLabel - %43 = OpLoad %uint %29 + %43 = OpLoad %uint %29 MakePointerVisible|NonPrivatePointer %uint_1 %44 = OpIAdd %uint %43 %uint_1 - OpStore %29 %44 - %45 = OpAtomicLoad %uint %27 %uint_2 %uint_64 + OpStore %29 %44 MakePointerAvailable|NonPrivatePointer %uint_1 + %45 = OpAtomicLoad %uint %27 %uint_2 %uint_0 %46 = OpIAdd %uint %45 %uint_1 OpAtomicStore %27 %uint_2 %uint_68 %46 %49 = OpAccessChain %_ptr_Input_uint %gl_GlobalInvocationID %uint_0 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/ticketlock-dv2wg-2.2.1.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/ticketlock-dv2wg-2.2.1.spv.dis index eefbd6145b..b4bd4d0717 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/ticketlock-dv2wg-2.2.1.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/ticketlock-dv2wg-2.2.1.spv.dis @@ -9,8 +9,9 @@ ; Bound: 77 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %56 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %23 "mutex_test" %gl_GlobalInvocationID %13 %17 %18 %19 %20 %5 OpSource OpenCL_C 200 %57 = OpString "mutex_test" @@ -55,7 +56,6 @@ %_ptr_StorageBuffer_uint = OpTypePointer StorageBuffer %uint %uint_0 = OpConstant %uint 0 %uint_2 = OpConstant %uint 2 - %uint_64 = OpConstant %uint 64 %uint_1 = OpConstant %uint 1 %uint_66 = OpConstant %uint 66 %bool = OpTypeBool @@ -77,7 +77,7 @@ %27 = OpAccessChain %_ptr_StorageBuffer_uint %17 %uint_0 %uint_0 %28 = OpAccessChain %_ptr_StorageBuffer_uint %18 %uint_0 %uint_0 %29 = OpAccessChain %_ptr_StorageBuffer_uint %19 %uint_0 %uint_0 - %33 = OpAtomicIAdd %uint %28 %uint_2 %uint_64 %uint_1 + %33 = OpAtomicIAdd %uint %28 %uint_2 %uint_0 %uint_1 OpBranch %35 %35 = OpLabel %37 = OpAtomicLoad %uint %27 %uint_2 %uint_66 @@ -85,10 +85,10 @@ OpLoopMerge %42 %35 None OpBranchConditional %39 %42 %35 %42 = OpLabel - %43 = OpLoad %uint %29 + %43 = OpLoad %uint %29 MakePointerVisible|NonPrivatePointer %uint_1 %44 = OpIAdd %uint %43 %uint_1 - OpStore %29 %44 - %45 = OpAtomicLoad %uint %27 %uint_2 %uint_64 + OpStore %29 %44 MakePointerAvailable|NonPrivatePointer %uint_1 + %45 = OpAtomicLoad %uint %27 %uint_2 %uint_0 %46 = OpIAdd %uint %45 %uint_1 OpAtomicStore %27 %uint_2 %uint_68 %46 %49 = OpAccessChain %_ptr_Input_uint %gl_GlobalInvocationID %uint_0 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/ticketlock-dv2wg-2.2.2.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/ticketlock-dv2wg-2.2.2.spv.dis index 96860dd07e..50a304d95e 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/ticketlock-dv2wg-2.2.2.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/ticketlock-dv2wg-2.2.2.spv.dis @@ -9,8 +9,9 @@ ; Bound: 77 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %56 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %23 "mutex_test" %gl_GlobalInvocationID %13 %17 %18 %19 %20 %5 OpSource OpenCL_C 200 %57 = OpString "mutex_test" @@ -55,7 +56,6 @@ %_ptr_StorageBuffer_uint = OpTypePointer StorageBuffer %uint %uint_0 = OpConstant %uint 0 %uint_2 = OpConstant %uint 2 - %uint_64 = OpConstant %uint 64 %uint_1 = OpConstant %uint 1 %uint_66 = OpConstant %uint 66 %bool = OpTypeBool @@ -77,7 +77,7 @@ %27 = OpAccessChain %_ptr_StorageBuffer_uint %17 %uint_0 %uint_0 %28 = OpAccessChain %_ptr_StorageBuffer_uint %18 %uint_0 %uint_0 %29 = OpAccessChain %_ptr_StorageBuffer_uint %19 %uint_0 %uint_0 - %33 = OpAtomicIAdd %uint %28 %uint_2 %uint_64 %uint_1 + %33 = OpAtomicIAdd %uint %28 %uint_2 %uint_0 %uint_1 OpBranch %35 %35 = OpLabel %37 = OpAtomicLoad %uint %27 %uint_2 %uint_66 @@ -85,10 +85,10 @@ OpLoopMerge %42 %35 None OpBranchConditional %39 %42 %35 %42 = OpLabel - %43 = OpLoad %uint %29 + %43 = OpLoad %uint %29 MakePointerVisible|NonPrivatePointer %uint_1 %44 = OpIAdd %uint %43 %uint_1 - OpStore %29 %44 - %45 = OpAtomicLoad %uint %27 %uint_2 %uint_64 + OpStore %29 %44 MakePointerAvailable|NonPrivatePointer %uint_1 + %45 = OpAtomicLoad %uint %27 %uint_2 %uint_0 %46 = OpIAdd %uint %45 %uint_1 OpAtomicStore %27 %uint_2 %uint_68 %46 %49 = OpAccessChain %_ptr_Input_uint %gl_GlobalInvocationID %uint_0 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/ticketlock-rel2rx.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/ticketlock-rel2rx.spv.dis index 3878314c9f..ab5d4d8d32 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/ticketlock-rel2rx.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/ticketlock-rel2rx.spv.dis @@ -10,8 +10,9 @@ ; Bound: 67 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %47 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %20 "mutex_test" %gl_LocalInvocationID %10 %14 %15 %16 %17 OpSource OpenCL_C 200 %48 = OpString "mutex_test" @@ -52,7 +53,6 @@ %_ptr_StorageBuffer_uint = OpTypePointer StorageBuffer %uint %uint_0 = OpConstant %uint 0 %uint_1 = OpConstant %uint 1 - %uint_64 = OpConstant %uint 64 %uint_66 = OpConstant %uint 66 %bool = OpTypeBool %_ptr_Input_uint = OpTypePointer Input %uint @@ -70,7 +70,7 @@ %24 = OpAccessChain %_ptr_StorageBuffer_uint %14 %uint_0 %uint_0 %25 = OpAccessChain %_ptr_StorageBuffer_uint %15 %uint_0 %uint_0 %26 = OpAccessChain %_ptr_StorageBuffer_uint %16 %uint_0 %uint_0 - %29 = OpAtomicIAdd %uint %25 %uint_1 %uint_64 %uint_1 + %29 = OpAtomicIAdd %uint %25 %uint_1 %uint_0 %uint_1 OpBranch %31 %31 = OpLabel %33 = OpAtomicLoad %uint %24 %uint_1 %uint_66 @@ -78,12 +78,12 @@ OpLoopMerge %38 %31 None OpBranchConditional %35 %38 %31 %38 = OpLabel - %39 = OpLoad %uint %26 + %39 = OpLoad %uint %26 MakePointerVisible|NonPrivatePointer %uint_1 %40 = OpIAdd %uint %39 %uint_1 - OpStore %26 %40 - %41 = OpAtomicLoad %uint %24 %uint_1 %uint_64 + OpStore %26 %40 MakePointerAvailable|NonPrivatePointer %uint_1 + %41 = OpAtomicLoad %uint %24 %uint_1 %uint_0 %42 = OpIAdd %uint %41 %uint_1 - OpAtomicStore %24 %uint_1 %uint_64 %42 + OpAtomicStore %24 %uint_1 %uint_0 %42 %44 = OpAccessChain %_ptr_Input_uint %gl_LocalInvocationID %uint_0 %45 = OpLoad %uint %44 %46 = OpAccessChain %_ptr_StorageBuffer_uint %17 %uint_0 %45 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/ttaslock-1.1.2.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/ttaslock-1.1.2.spv.dis index 0976b01146..22f52f4324 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/ttaslock-1.1.2.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/ttaslock-1.1.2.spv.dis @@ -9,8 +9,9 @@ ; Bound: 85 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %67 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %22 "mutex_test" %gl_GlobalInvocationID %13 %17 %18 %19 %5 OpSource OpenCL_C 200 %68 = OpString "mutex_test" @@ -52,7 +53,6 @@ %_ptr_StorageBuffer_uint = OpTypePointer StorageBuffer %uint %uint_0 = OpConstant %uint 0 %uint_1 = OpConstant %uint 1 - %uint_64 = OpConstant %uint 64 %bool = OpTypeBool %uint_66 = OpConstant %uint 66 %uint_68 = OpConstant %uint 68 @@ -75,7 +75,7 @@ %27 = OpAccessChain %_ptr_StorageBuffer_uint %18 %uint_0 %uint_0 OpBranch %29 %29 = OpLabel - %32 = OpAtomicLoad %uint %26 %uint_1 %uint_64 + %32 = OpAtomicLoad %uint %26 %uint_1 %uint_0 %34 = OpIEqual %bool %32 %uint_0 OpLoopMerge %53 %50 None OpBranch %37 @@ -95,9 +95,9 @@ %51 = OpPhi %bool %false %48 %true %45 OpBranchConditional %51 %53 %29 %53 = OpLabel - %54 = OpLoad %uint %27 + %54 = OpLoad %uint %27 MakePointerVisible|NonPrivatePointer %uint_1 %55 = OpIAdd %uint %54 %uint_1 - OpStore %27 %55 + OpStore %27 %55 MakePointerAvailable|NonPrivatePointer %uint_1 OpAtomicStore %26 %uint_1 %uint_68 %uint_0 %58 = OpAccessChain %_ptr_Input_uint %gl_GlobalInvocationID %uint_0 %59 = OpLoad %uint %58 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/ttaslock-2.1.1.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/ttaslock-2.1.1.spv.dis index dc93a6416b..552694a69c 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/ttaslock-2.1.1.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/ttaslock-2.1.1.spv.dis @@ -9,8 +9,9 @@ ; Bound: 85 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %67 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %22 "mutex_test" %gl_GlobalInvocationID %13 %17 %18 %19 %5 OpSource OpenCL_C 200 %68 = OpString "mutex_test" @@ -52,7 +53,6 @@ %_ptr_StorageBuffer_uint = OpTypePointer StorageBuffer %uint %uint_0 = OpConstant %uint 0 %uint_1 = OpConstant %uint 1 - %uint_64 = OpConstant %uint 64 %bool = OpTypeBool %uint_66 = OpConstant %uint 66 %uint_68 = OpConstant %uint 68 @@ -75,7 +75,7 @@ %27 = OpAccessChain %_ptr_StorageBuffer_uint %18 %uint_0 %uint_0 OpBranch %29 %29 = OpLabel - %32 = OpAtomicLoad %uint %26 %uint_1 %uint_64 + %32 = OpAtomicLoad %uint %26 %uint_1 %uint_0 %34 = OpIEqual %bool %32 %uint_0 OpLoopMerge %53 %50 None OpBranch %37 @@ -95,9 +95,9 @@ %51 = OpPhi %bool %false %48 %true %45 OpBranchConditional %51 %53 %29 %53 = OpLabel - %54 = OpLoad %uint %27 + %54 = OpLoad %uint %27 MakePointerVisible|NonPrivatePointer %uint_1 %55 = OpIAdd %uint %54 %uint_1 - OpStore %27 %55 + OpStore %27 %55 MakePointerAvailable|NonPrivatePointer %uint_1 OpAtomicStore %26 %uint_1 %uint_68 %uint_0 %58 = OpAccessChain %_ptr_Input_uint %gl_GlobalInvocationID %uint_0 %59 = OpLoad %uint %58 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/ttaslock-acq2rx.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/ttaslock-acq2rx.spv.dis index 5b69439b50..b19a0ed7a7 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/ttaslock-acq2rx.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/ttaslock-acq2rx.spv.dis @@ -9,8 +9,9 @@ ; Bound: 75 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %59 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %19 "mutex_test" %gl_LocalInvocationID %10 %14 %15 %16 OpSource OpenCL_C 200 %60 = OpString "mutex_test" @@ -48,7 +49,6 @@ %_ptr_StorageBuffer_uint = OpTypePointer StorageBuffer %uint %uint_0 = OpConstant %uint 0 %uint_1 = OpConstant %uint 1 - %uint_64 = OpConstant %uint 64 %bool = OpTypeBool %uint_68 = OpConstant %uint 68 %_ptr_Input_uint = OpTypePointer Input %uint @@ -67,7 +67,7 @@ %24 = OpAccessChain %_ptr_StorageBuffer_uint %15 %uint_0 %uint_0 OpBranch %26 %26 = OpLabel - %29 = OpAtomicLoad %uint %23 %uint_1 %uint_64 + %29 = OpAtomicLoad %uint %23 %uint_1 %uint_0 %31 = OpIEqual %bool %29 %uint_0 OpLoopMerge %49 %46 None OpBranch %34 @@ -75,7 +75,7 @@ OpSelectionMerge %41 None OpBranchConditional %31 %37 %41 %37 = OpLabel - %38 = OpAtomicExchange %uint %23 %uint_1 %uint_64 %uint_1 + %38 = OpAtomicExchange %uint %23 %uint_1 %uint_0 %uint_1 %39 = OpINotEqual %bool %38 %uint_0 OpBranch %41 %41 = OpLabel @@ -87,9 +87,9 @@ %47 = OpPhi %bool %false %44 %true %41 OpBranchConditional %47 %49 %26 %49 = OpLabel - %50 = OpLoad %uint %24 + %50 = OpLoad %uint %24 MakePointerVisible|NonPrivatePointer %uint_1 %51 = OpIAdd %uint %50 %uint_1 - OpStore %24 %51 + OpStore %24 %51 MakePointerAvailable|NonPrivatePointer %uint_1 OpAtomicStore %23 %uint_1 %uint_68 %uint_0 %54 = OpAccessChain %_ptr_Input_uint %gl_LocalInvocationID %uint_0 %55 = OpLoad %uint %54 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/ttaslock-dv2wg-1.1.2.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/ttaslock-dv2wg-1.1.2.spv.dis index 0c4efe90df..9763d39fdf 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/ttaslock-dv2wg-1.1.2.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/ttaslock-dv2wg-1.1.2.spv.dis @@ -9,8 +9,9 @@ ; Bound: 85 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %68 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %22 "mutex_test" %gl_GlobalInvocationID %13 %17 %18 %19 %5 OpSource OpenCL_C 200 %69 = OpString "mutex_test" @@ -52,7 +53,6 @@ %_ptr_StorageBuffer_uint = OpTypePointer StorageBuffer %uint %uint_0 = OpConstant %uint 0 %uint_2 = OpConstant %uint 2 - %uint_64 = OpConstant %uint 64 %bool = OpTypeBool %uint_66 = OpConstant %uint 66 %uint_1 = OpConstant %uint 1 @@ -75,7 +75,7 @@ %27 = OpAccessChain %_ptr_StorageBuffer_uint %18 %uint_0 %uint_0 OpBranch %29 %29 = OpLabel - %32 = OpAtomicLoad %uint %26 %uint_2 %uint_64 + %32 = OpAtomicLoad %uint %26 %uint_2 %uint_0 %34 = OpIEqual %bool %32 %uint_0 OpLoopMerge %54 %51 None OpBranch %37 @@ -95,9 +95,9 @@ %52 = OpPhi %bool %false %49 %true %46 OpBranchConditional %52 %54 %29 %54 = OpLabel - %55 = OpLoad %uint %27 + %55 = OpLoad %uint %27 MakePointerVisible|NonPrivatePointer %uint_1 %56 = OpIAdd %uint %55 %uint_1 - OpStore %27 %56 + OpStore %27 %56 MakePointerAvailable|NonPrivatePointer %uint_1 OpAtomicStore %26 %uint_2 %uint_68 %uint_0 %59 = OpAccessChain %_ptr_Input_uint %gl_GlobalInvocationID %uint_0 %60 = OpLoad %uint %59 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/ttaslock-dv2wg-2.1.1.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/ttaslock-dv2wg-2.1.1.spv.dis index b2fa3118ed..6abe2c14b3 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/ttaslock-dv2wg-2.1.1.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/ttaslock-dv2wg-2.1.1.spv.dis @@ -9,8 +9,9 @@ ; Bound: 85 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %68 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %22 "mutex_test" %gl_GlobalInvocationID %13 %17 %18 %19 %5 OpSource OpenCL_C 200 %69 = OpString "mutex_test" @@ -52,7 +53,6 @@ %_ptr_StorageBuffer_uint = OpTypePointer StorageBuffer %uint %uint_0 = OpConstant %uint 0 %uint_2 = OpConstant %uint 2 - %uint_64 = OpConstant %uint 64 %bool = OpTypeBool %uint_66 = OpConstant %uint 66 %uint_1 = OpConstant %uint 1 @@ -75,7 +75,7 @@ %27 = OpAccessChain %_ptr_StorageBuffer_uint %18 %uint_0 %uint_0 OpBranch %29 %29 = OpLabel - %32 = OpAtomicLoad %uint %26 %uint_2 %uint_64 + %32 = OpAtomicLoad %uint %26 %uint_2 %uint_0 %34 = OpIEqual %bool %32 %uint_0 OpLoopMerge %54 %51 None OpBranch %37 @@ -95,9 +95,9 @@ %52 = OpPhi %bool %false %49 %true %46 OpBranchConditional %52 %54 %29 %54 = OpLabel - %55 = OpLoad %uint %27 + %55 = OpLoad %uint %27 MakePointerVisible|NonPrivatePointer %uint_1 %56 = OpIAdd %uint %55 %uint_1 - OpStore %27 %56 + OpStore %27 %56 MakePointerAvailable|NonPrivatePointer %uint_1 OpAtomicStore %26 %uint_2 %uint_68 %uint_0 %59 = OpAccessChain %_ptr_Input_uint %gl_GlobalInvocationID %uint_0 %60 = OpLoad %uint %59 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/ttaslock-dv2wg-2.2.1.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/ttaslock-dv2wg-2.2.1.spv.dis index d89a502907..fb3dea9744 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/ttaslock-dv2wg-2.2.1.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/ttaslock-dv2wg-2.2.1.spv.dis @@ -8,8 +8,9 @@ ; Bound: 85 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %68 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %22 "mutex_test" %gl_GlobalInvocationID %13 %17 %18 %19 %5 OpSource OpenCL_C 200 %69 = OpString "mutex_test" @@ -51,7 +52,6 @@ %_ptr_StorageBuffer_uint = OpTypePointer StorageBuffer %uint %uint_0 = OpConstant %uint 0 %uint_2 = OpConstant %uint 2 - %uint_64 = OpConstant %uint 64 %bool = OpTypeBool %uint_66 = OpConstant %uint 66 %uint_1 = OpConstant %uint 1 @@ -74,7 +74,7 @@ %27 = OpAccessChain %_ptr_StorageBuffer_uint %18 %uint_0 %uint_0 OpBranch %29 %29 = OpLabel - %32 = OpAtomicLoad %uint %26 %uint_2 %uint_64 + %32 = OpAtomicLoad %uint %26 %uint_2 %uint_0 %34 = OpIEqual %bool %32 %uint_0 OpLoopMerge %54 %51 None OpBranch %37 @@ -94,9 +94,9 @@ %52 = OpPhi %bool %false %49 %true %46 OpBranchConditional %52 %54 %29 %54 = OpLabel - %55 = OpLoad %uint %27 + %55 = OpLoad %uint %27 MakePointerVisible|NonPrivatePointer %uint_1 %56 = OpIAdd %uint %55 %uint_1 - OpStore %27 %56 + OpStore %27 %56 MakePointerAvailable|NonPrivatePointer %uint_1 OpAtomicStore %26 %uint_2 %uint_68 %uint_0 %59 = OpAccessChain %_ptr_Input_uint %gl_GlobalInvocationID %uint_0 %60 = OpLoad %uint %59 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/ttaslock-dv2wg-2.2.2.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/ttaslock-dv2wg-2.2.2.spv.dis index 009caae32c..37c9ccdb3e 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/ttaslock-dv2wg-2.2.2.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/ttaslock-dv2wg-2.2.2.spv.dis @@ -8,8 +8,9 @@ ; Bound: 85 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %68 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %22 "mutex_test" %gl_GlobalInvocationID %13 %17 %18 %19 %5 OpSource OpenCL_C 200 %69 = OpString "mutex_test" @@ -51,7 +52,6 @@ %_ptr_StorageBuffer_uint = OpTypePointer StorageBuffer %uint %uint_0 = OpConstant %uint 0 %uint_2 = OpConstant %uint 2 - %uint_64 = OpConstant %uint 64 %bool = OpTypeBool %uint_66 = OpConstant %uint 66 %uint_1 = OpConstant %uint 1 @@ -74,7 +74,7 @@ %27 = OpAccessChain %_ptr_StorageBuffer_uint %18 %uint_0 %uint_0 OpBranch %29 %29 = OpLabel - %32 = OpAtomicLoad %uint %26 %uint_2 %uint_64 + %32 = OpAtomicLoad %uint %26 %uint_2 %uint_0 %34 = OpIEqual %bool %32 %uint_0 OpLoopMerge %54 %51 None OpBranch %37 @@ -94,9 +94,9 @@ %52 = OpPhi %bool %false %49 %true %46 OpBranchConditional %52 %54 %29 %54 = OpLabel - %55 = OpLoad %uint %27 + %55 = OpLoad %uint %27 MakePointerVisible|NonPrivatePointer %uint_1 %56 = OpIAdd %uint %55 %uint_1 - OpStore %27 %56 + OpStore %27 %56 MakePointerAvailable|NonPrivatePointer %uint_1 OpAtomicStore %26 %uint_2 %uint_68 %uint_0 %59 = OpAccessChain %_ptr_Input_uint %gl_GlobalInvocationID %uint_0 %60 = OpLoad %uint %59 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/ttaslock-rel2rx.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/ttaslock-rel2rx.spv.dis index 4bf494e61a..56e2b9a5a6 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/ttaslock-rel2rx.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/ttaslock-rel2rx.spv.dis @@ -9,8 +9,9 @@ ; Bound: 75 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %59 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %19 "mutex_test" %gl_LocalInvocationID %10 %14 %15 %16 OpSource OpenCL_C 200 %60 = OpString "mutex_test" @@ -48,7 +49,6 @@ %_ptr_StorageBuffer_uint = OpTypePointer StorageBuffer %uint %uint_0 = OpConstant %uint 0 %uint_1 = OpConstant %uint 1 - %uint_64 = OpConstant %uint 64 %bool = OpTypeBool %uint_66 = OpConstant %uint 66 %_ptr_Input_uint = OpTypePointer Input %uint @@ -67,7 +67,7 @@ %24 = OpAccessChain %_ptr_StorageBuffer_uint %15 %uint_0 %uint_0 OpBranch %26 %26 = OpLabel - %29 = OpAtomicLoad %uint %23 %uint_1 %uint_64 + %29 = OpAtomicLoad %uint %23 %uint_1 %uint_0 %31 = OpIEqual %bool %29 %uint_0 OpLoopMerge %50 %47 None OpBranch %34 @@ -87,10 +87,10 @@ %48 = OpPhi %bool %false %45 %true %42 OpBranchConditional %48 %50 %26 %50 = OpLabel - %51 = OpLoad %uint %24 + %51 = OpLoad %uint %24 MakePointerVisible|NonPrivatePointer %uint_1 %52 = OpIAdd %uint %51 %uint_1 - OpStore %24 %52 - OpAtomicStore %23 %uint_1 %uint_64 %uint_0 + OpStore %24 %52 MakePointerAvailable|NonPrivatePointer %uint_1 + OpAtomicStore %23 %uint_1 %uint_0 %uint_0 %54 = OpAccessChain %_ptr_Input_uint %gl_LocalInvocationID %uint_0 %55 = OpLoad %uint %54 %56 = OpAccessChain %_ptr_StorageBuffer_uint %16 %uint_0 %55 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-1.1.2.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-1.1.2.spv.dis index f461f92413..8a58d30fa1 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-1.1.2.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-1.1.2.spv.dis @@ -11,8 +11,9 @@ ; Bound: 155 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %133 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %24 "xf_barrier" %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %15 %19 %20 %21 %5 OpSource OpenCL_C 200 %134 = OpString "xf_barrier" @@ -103,7 +104,7 @@ %46 = OpAccessChain %_ptr_PushConstant_uint %5 %uint_0 %uint_0 %47 = OpLoad %uint %46 %49 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %45 - OpStore %49 %uint_1 + OpStore %49 %uint_1 MakePointerAvailable|NonPrivatePointer %uint_1 %51 = OpINotEqual %bool %34 %uint_0 OpSelectionMerge %75 None OpBranchConditional %51 %54 %75 @@ -175,7 +176,7 @@ %117 = OpPhi %uint %121 %116 %114 %112 %118 = OpPhi %uint %122 %116 %uint_0 %112 %119 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %118 - %120 = OpLoad %uint %119 + %120 = OpLoad %uint %119 MakePointerVisible|NonPrivatePointer %uint_1 %121 = OpIAdd %uint %117 %120 OpStore %113 %121 %122 = OpIAdd %uint %118 %uint_1 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-2.1.1.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-2.1.1.spv.dis index 88615fd5a8..e5e3bf3c74 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-2.1.1.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-2.1.1.spv.dis @@ -11,8 +11,9 @@ ; Bound: 155 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %133 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %24 "xf_barrier" %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %15 %19 %20 %21 %5 OpSource OpenCL_C 200 %134 = OpString "xf_barrier" @@ -103,7 +104,7 @@ %46 = OpAccessChain %_ptr_PushConstant_uint %5 %uint_0 %uint_0 %47 = OpLoad %uint %46 %49 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %45 - OpStore %49 %uint_1 + OpStore %49 %uint_1 MakePointerAvailable|NonPrivatePointer %uint_1 %51 = OpINotEqual %bool %34 %uint_0 OpSelectionMerge %75 None OpBranchConditional %51 %54 %75 @@ -175,7 +176,7 @@ %117 = OpPhi %uint %121 %116 %114 %112 %118 = OpPhi %uint %122 %116 %uint_0 %112 %119 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %118 - %120 = OpLoad %uint %119 + %120 = OpLoad %uint %119 MakePointerVisible|NonPrivatePointer %uint_1 %121 = OpIAdd %uint %117 %120 OpStore %113 %121 %122 = OpIAdd %uint %118 %uint_1 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-2.1.2.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-2.1.2.spv.dis index e14e48bfcc..12a3013510 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-2.1.2.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-2.1.2.spv.dis @@ -11,8 +11,9 @@ ; Bound: 155 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %133 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %24 "xf_barrier" %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %15 %19 %20 %21 %5 OpSource OpenCL_C 200 %134 = OpString "xf_barrier" @@ -103,7 +104,7 @@ %46 = OpAccessChain %_ptr_PushConstant_uint %5 %uint_0 %uint_0 %47 = OpLoad %uint %46 %49 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %45 - OpStore %49 %uint_1 + OpStore %49 %uint_1 MakePointerAvailable|NonPrivatePointer %uint_1 %51 = OpINotEqual %bool %34 %uint_0 OpSelectionMerge %75 None OpBranchConditional %51 %54 %75 @@ -175,7 +176,7 @@ %117 = OpPhi %uint %121 %116 %114 %112 %118 = OpPhi %uint %122 %116 %uint_0 %112 %119 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %118 - %120 = OpLoad %uint %119 + %120 = OpLoad %uint %119 MakePointerVisible|NonPrivatePointer %uint_1 %121 = OpIAdd %uint %117 %120 OpStore %113 %121 %122 = OpIAdd %uint %118 %uint_1 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-3.1.3.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-3.1.3.spv.dis index 63642dde10..e853978e9a 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-3.1.3.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-3.1.3.spv.dis @@ -13,8 +13,9 @@ ; Bound: 155 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %133 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %24 "xf_barrier" %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %15 %19 %20 %21 %5 OpSource OpenCL_C 200 %134 = OpString "xf_barrier" @@ -105,7 +106,7 @@ %46 = OpAccessChain %_ptr_PushConstant_uint %5 %uint_0 %uint_0 %47 = OpLoad %uint %46 %49 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %45 - OpStore %49 %uint_1 + OpStore %49 %uint_1 MakePointerAvailable|NonPrivatePointer %uint_1 %51 = OpINotEqual %bool %34 %uint_0 OpSelectionMerge %75 None OpBranchConditional %51 %54 %75 @@ -177,7 +178,7 @@ %117 = OpPhi %uint %121 %116 %114 %112 %118 = OpPhi %uint %122 %116 %uint_0 %112 %119 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %118 - %120 = OpLoad %uint %119 + %120 = OpLoad %uint %119 MakePointerVisible|NonPrivatePointer %uint_1 %121 = OpIAdd %uint %117 %120 OpStore %113 %121 %122 = OpIAdd %uint %118 %uint_1 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-fail1.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-fail1.spv.dis index fecaba0fc7..15cb4c99d7 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-fail1.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-fail1.spv.dis @@ -11,8 +11,9 @@ ; Bound: 156 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %134 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %24 "xf_barrier" %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %15 %19 %20 %21 %5 OpSource OpenCL_C 200 %135 = OpString "xf_barrier" @@ -70,7 +71,6 @@ %uint_72 = OpConstant %uint 72 %uint_68 = OpConstant %uint 68 %uint_66 = OpConstant %uint 66 - %uint_64 = OpConstant %uint 64 %false = OpConstantFalse %bool %true = OpConstantTrue %bool %uint_12 = OpConstant %uint 12 @@ -104,7 +104,7 @@ %46 = OpAccessChain %_ptr_PushConstant_uint %5 %uint_0 %uint_0 %47 = OpLoad %uint %46 %49 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %45 - OpStore %49 %uint_1 + OpStore %49 %uint_1 MakePointerAvailable|NonPrivatePointer %uint_1 %51 = OpINotEqual %bool %34 %uint_0 OpSelectionMerge %75 None OpBranchConditional %51 %54 %75 @@ -143,7 +143,7 @@ %86 = OpAccessChain %_ptr_StorageBuffer_uint %19 %uint_0 %85 OpBranch %88 %88 = OpLabel - %90 = OpAtomicLoad %uint %86 %uint_1 %uint_64 + %90 = OpAtomicLoad %uint %86 %uint_1 %uint_0 %91 = OpINotEqual %bool %90 %uint_0 OpLoopMerge %94 %88 None OpBranchConditional %91 %94 %88 @@ -176,7 +176,7 @@ %118 = OpPhi %uint %122 %117 %115 %113 %119 = OpPhi %uint %123 %117 %uint_0 %113 %120 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %119 - %121 = OpLoad %uint %120 + %121 = OpLoad %uint %120 MakePointerVisible|NonPrivatePointer %uint_1 %122 = OpIAdd %uint %118 %121 OpStore %114 %122 %123 = OpIAdd %uint %119 %uint_1 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-fail2.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-fail2.spv.dis index fd323ea311..4033eb9e62 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-fail2.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-fail2.spv.dis @@ -11,8 +11,9 @@ ; Bound: 156 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %134 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %24 "xf_barrier" %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %15 %19 %20 %21 %5 OpSource OpenCL_C 200 %135 = OpString "xf_barrier" @@ -70,7 +71,6 @@ %uint_72 = OpConstant %uint 72 %uint_68 = OpConstant %uint 68 %uint_66 = OpConstant %uint 66 - %uint_64 = OpConstant %uint 64 %false = OpConstantFalse %bool %true = OpConstantTrue %bool %uint_12 = OpConstant %uint 12 @@ -104,7 +104,7 @@ %46 = OpAccessChain %_ptr_PushConstant_uint %5 %uint_0 %uint_0 %47 = OpLoad %uint %46 %49 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %45 - OpStore %49 %uint_1 + OpStore %49 %uint_1 MakePointerAvailable|NonPrivatePointer %uint_1 %51 = OpINotEqual %bool %34 %uint_0 OpSelectionMerge %75 None OpBranchConditional %51 %54 %75 @@ -158,7 +158,7 @@ %100 = OpLabel %101 = OpIAdd %uint %36 %uint_1 %102 = OpAccessChain %_ptr_StorageBuffer_uint %19 %uint_0 %101 - OpAtomicStore %102 %uint_1 %uint_64 %uint_0 + OpAtomicStore %102 %uint_1 %uint_0 %uint_0 OpBranch %105 %105 = OpLabel OpBranch %107 @@ -176,7 +176,7 @@ %118 = OpPhi %uint %122 %117 %115 %113 %119 = OpPhi %uint %123 %117 %uint_0 %113 %120 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %119 - %121 = OpLoad %uint %120 + %121 = OpLoad %uint %120 MakePointerVisible|NonPrivatePointer %uint_1 %122 = OpIAdd %uint %118 %121 OpStore %114 %122 %123 = OpIAdd %uint %119 %uint_1 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-fail3.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-fail3.spv.dis index 96f851fe65..9d8d6f78e6 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-fail3.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-fail3.spv.dis @@ -11,8 +11,9 @@ ; Bound: 156 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %134 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %24 "xf_barrier" %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %15 %19 %20 %21 %5 OpSource OpenCL_C 200 %135 = OpString "xf_barrier" @@ -68,7 +69,6 @@ %_ptr_StorageBuffer_uint = OpTypePointer StorageBuffer %uint %bool = OpTypeBool %uint_72 = OpConstant %uint 72 - %uint_64 = OpConstant %uint 64 %uint_66 = OpConstant %uint 66 %uint_68 = OpConstant %uint 68 %false = OpConstantFalse %bool @@ -104,7 +104,7 @@ %46 = OpAccessChain %_ptr_PushConstant_uint %5 %uint_0 %uint_0 %47 = OpLoad %uint %46 %49 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %45 - OpStore %49 %uint_1 + OpStore %49 %uint_1 MakePointerAvailable|NonPrivatePointer %uint_1 %51 = OpINotEqual %bool %34 %uint_0 OpSelectionMerge %75 None OpBranchConditional %51 %54 %75 @@ -115,7 +115,7 @@ OpBranchConditional %56 %59 %71 %59 = OpLabel %60 = OpAccessChain %_ptr_StorageBuffer_uint %19 %uint_0 %34 - OpAtomicStore %60 %uint_1 %uint_64 %uint_1 + OpAtomicStore %60 %uint_1 %uint_0 %uint_1 OpBranch %63 %63 = OpLabel %65 = OpAtomicLoad %uint %60 %uint_1 %uint_66 @@ -176,7 +176,7 @@ %118 = OpPhi %uint %122 %117 %115 %113 %119 = OpPhi %uint %123 %117 %uint_0 %113 %120 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %119 - %121 = OpLoad %uint %120 + %121 = OpLoad %uint %120 MakePointerVisible|NonPrivatePointer %uint_1 %122 = OpIAdd %uint %118 %121 OpStore %114 %122 %123 = OpIAdd %uint %119 %uint_1 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-fail4.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-fail4.spv.dis index 52ba1e94e1..598b969488 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-fail4.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-fail4.spv.dis @@ -11,8 +11,9 @@ ; Bound: 156 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %134 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %24 "xf_barrier" %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %15 %19 %20 %21 %5 OpSource OpenCL_C 200 %135 = OpString "xf_barrier" @@ -69,7 +70,6 @@ %bool = OpTypeBool %uint_72 = OpConstant %uint 72 %uint_68 = OpConstant %uint 68 - %uint_64 = OpConstant %uint 64 %uint_66 = OpConstant %uint 66 %false = OpConstantFalse %bool %true = OpConstantTrue %bool @@ -104,7 +104,7 @@ %46 = OpAccessChain %_ptr_PushConstant_uint %5 %uint_0 %uint_0 %47 = OpLoad %uint %46 %49 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %45 - OpStore %49 %uint_1 + OpStore %49 %uint_1 MakePointerAvailable|NonPrivatePointer %uint_1 %51 = OpINotEqual %bool %34 %uint_0 OpSelectionMerge %75 None OpBranchConditional %51 %54 %75 @@ -118,7 +118,7 @@ OpAtomicStore %60 %uint_1 %uint_68 %uint_1 OpBranch %63 %63 = OpLabel - %65 = OpAtomicLoad %uint %60 %uint_1 %uint_64 + %65 = OpAtomicLoad %uint %60 %uint_1 %uint_0 %66 = OpINotEqual %bool %65 %uint_1 OpLoopMerge %69 %63 None OpBranchConditional %66 %69 %63 @@ -176,7 +176,7 @@ %118 = OpPhi %uint %122 %117 %115 %113 %119 = OpPhi %uint %123 %117 %uint_0 %113 %120 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %119 - %121 = OpLoad %uint %120 + %121 = OpLoad %uint %120 MakePointerVisible|NonPrivatePointer %uint_1 %122 = OpIAdd %uint %118 %121 OpStore %114 %122 %123 = OpIAdd %uint %119 %uint_1 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-local-1.1.2.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-local-1.1.2.spv.dis index 6893f61e39..dc68aa4f83 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-local-1.1.2.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-local-1.1.2.spv.dis @@ -11,8 +11,9 @@ ; Bound: 155 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %133 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %24 "xf_barrier" %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %15 %19 %20 %21 %5 OpSource OpenCL_C 200 %134 = OpString "xf_barrier" @@ -100,7 +101,7 @@ %46 = OpAccessChain %_ptr_PushConstant_uint %5 %uint_0 %uint_0 %47 = OpLoad %uint %46 %49 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %45 - OpStore %49 %uint_1 + OpStore %49 %uint_1 MakePointerAvailable|NonPrivatePointer %uint_1 %51 = OpINotEqual %bool %34 %uint_0 OpSelectionMerge %75 None OpBranchConditional %51 %54 %75 @@ -172,7 +173,7 @@ %117 = OpPhi %uint %121 %116 %114 %112 %118 = OpPhi %uint %122 %116 %uint_0 %112 %119 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %118 - %120 = OpLoad %uint %119 + %120 = OpLoad %uint %119 MakePointerVisible|NonPrivatePointer %uint_1 %121 = OpIAdd %uint %117 %120 OpStore %113 %121 %122 = OpIAdd %uint %118 %uint_1 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-local-2.1.1.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-local-2.1.1.spv.dis index 0b3f6da23d..b1306b14e8 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-local-2.1.1.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-local-2.1.1.spv.dis @@ -11,8 +11,9 @@ ; Bound: 155 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %133 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %24 "xf_barrier" %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %15 %19 %20 %21 %5 OpSource OpenCL_C 200 %134 = OpString "xf_barrier" @@ -100,7 +101,7 @@ %46 = OpAccessChain %_ptr_PushConstant_uint %5 %uint_0 %uint_0 %47 = OpLoad %uint %46 %49 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %45 - OpStore %49 %uint_1 + OpStore %49 %uint_1 MakePointerAvailable|NonPrivatePointer %uint_1 %51 = OpINotEqual %bool %34 %uint_0 OpSelectionMerge %75 None OpBranchConditional %51 %54 %75 @@ -172,7 +173,7 @@ %117 = OpPhi %uint %121 %116 %114 %112 %118 = OpPhi %uint %122 %116 %uint_0 %112 %119 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %118 - %120 = OpLoad %uint %119 + %120 = OpLoad %uint %119 MakePointerVisible|NonPrivatePointer %uint_1 %121 = OpIAdd %uint %117 %120 OpStore %113 %121 %122 = OpIAdd %uint %118 %uint_1 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-local-2.1.2.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-local-2.1.2.spv.dis index ff564af293..86f148fdd6 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-local-2.1.2.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-local-2.1.2.spv.dis @@ -11,8 +11,9 @@ ; Bound: 155 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %133 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %24 "xf_barrier" %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %15 %19 %20 %21 %5 OpSource OpenCL_C 200 %134 = OpString "xf_barrier" @@ -100,7 +101,7 @@ %46 = OpAccessChain %_ptr_PushConstant_uint %5 %uint_0 %uint_0 %47 = OpLoad %uint %46 %49 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %45 - OpStore %49 %uint_1 + OpStore %49 %uint_1 MakePointerAvailable|NonPrivatePointer %uint_1 %51 = OpINotEqual %bool %34 %uint_0 OpSelectionMerge %75 None OpBranchConditional %51 %54 %75 @@ -172,7 +173,7 @@ %117 = OpPhi %uint %121 %116 %114 %112 %118 = OpPhi %uint %122 %116 %uint_0 %112 %119 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %118 - %120 = OpLoad %uint %119 + %120 = OpLoad %uint %119 MakePointerVisible|NonPrivatePointer %uint_1 %121 = OpIAdd %uint %117 %120 OpStore %113 %121 %122 = OpIAdd %uint %118 %uint_1 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-local-3.1.3.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-local-3.1.3.spv.dis index 8c0756b644..5c8ca410bf 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-local-3.1.3.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-local-3.1.3.spv.dis @@ -13,8 +13,9 @@ ; Bound: 155 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %133 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %24 "xf_barrier" %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %15 %19 %20 %21 %5 OpSource OpenCL_C 200 %134 = OpString "xf_barrier" @@ -102,7 +103,7 @@ %46 = OpAccessChain %_ptr_PushConstant_uint %5 %uint_0 %uint_0 %47 = OpLoad %uint %46 %49 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %45 - OpStore %49 %uint_1 + OpStore %49 %uint_1 MakePointerAvailable|NonPrivatePointer %uint_1 %51 = OpINotEqual %bool %34 %uint_0 OpSelectionMerge %75 None OpBranchConditional %51 %54 %75 @@ -174,7 +175,7 @@ %117 = OpPhi %uint %121 %116 %114 %112 %118 = OpPhi %uint %122 %116 %uint_0 %112 %119 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %118 - %120 = OpLoad %uint %119 + %120 = OpLoad %uint %119 MakePointerVisible|NonPrivatePointer %uint_1 %121 = OpIAdd %uint %117 %120 OpStore %113 %121 %122 = OpIAdd %uint %118 %uint_1 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-local-fail1.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-local-fail1.spv.dis index 3965304f30..2218913538 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-local-fail1.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-local-fail1.spv.dis @@ -11,8 +11,9 @@ ; Bound: 156 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %134 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %24 "xf_barrier" %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %15 %19 %20 %21 %5 OpSource OpenCL_C 200 %135 = OpString "xf_barrier" @@ -67,7 +68,6 @@ %uint_264 = OpConstant %uint 264 %uint_68 = OpConstant %uint 68 %uint_66 = OpConstant %uint 66 - %uint_64 = OpConstant %uint 64 %false = OpConstantFalse %bool %true = OpConstantTrue %bool %uint_12 = OpConstant %uint 12 @@ -101,7 +101,7 @@ %46 = OpAccessChain %_ptr_PushConstant_uint %5 %uint_0 %uint_0 %47 = OpLoad %uint %46 %49 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %45 - OpStore %49 %uint_1 + OpStore %49 %uint_1 MakePointerAvailable|NonPrivatePointer %uint_1 %51 = OpINotEqual %bool %34 %uint_0 OpSelectionMerge %75 None OpBranchConditional %51 %54 %75 @@ -140,7 +140,7 @@ %86 = OpAccessChain %_ptr_StorageBuffer_uint %19 %uint_0 %85 OpBranch %88 %88 = OpLabel - %90 = OpAtomicLoad %uint %86 %uint_1 %uint_64 + %90 = OpAtomicLoad %uint %86 %uint_1 %uint_0 %91 = OpINotEqual %bool %90 %uint_0 OpLoopMerge %94 %88 None OpBranchConditional %91 %94 %88 @@ -173,7 +173,7 @@ %118 = OpPhi %uint %122 %117 %115 %113 %119 = OpPhi %uint %123 %117 %uint_0 %113 %120 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %119 - %121 = OpLoad %uint %120 + %121 = OpLoad %uint %120 MakePointerVisible|NonPrivatePointer %uint_1 %122 = OpIAdd %uint %118 %121 OpStore %114 %122 %123 = OpIAdd %uint %119 %uint_1 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-local-fail2.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-local-fail2.spv.dis index 240d5754a8..039471c239 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-local-fail2.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-local-fail2.spv.dis @@ -11,8 +11,9 @@ ; Bound: 156 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %134 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %24 "xf_barrier" %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %15 %19 %20 %21 %5 OpSource OpenCL_C 200 %135 = OpString "xf_barrier" @@ -67,7 +68,6 @@ %uint_264 = OpConstant %uint 264 %uint_68 = OpConstant %uint 68 %uint_66 = OpConstant %uint 66 - %uint_64 = OpConstant %uint 64 %false = OpConstantFalse %bool %true = OpConstantTrue %bool %uint_12 = OpConstant %uint 12 @@ -101,7 +101,7 @@ %46 = OpAccessChain %_ptr_PushConstant_uint %5 %uint_0 %uint_0 %47 = OpLoad %uint %46 %49 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %45 - OpStore %49 %uint_1 + OpStore %49 %uint_1 MakePointerAvailable|NonPrivatePointer %uint_1 %51 = OpINotEqual %bool %34 %uint_0 OpSelectionMerge %75 None OpBranchConditional %51 %54 %75 @@ -155,7 +155,7 @@ %100 = OpLabel %101 = OpIAdd %uint %36 %uint_1 %102 = OpAccessChain %_ptr_StorageBuffer_uint %19 %uint_0 %101 - OpAtomicStore %102 %uint_1 %uint_64 %uint_0 + OpAtomicStore %102 %uint_1 %uint_0 %uint_0 OpBranch %105 %105 = OpLabel OpBranch %107 @@ -173,7 +173,7 @@ %118 = OpPhi %uint %122 %117 %115 %113 %119 = OpPhi %uint %123 %117 %uint_0 %113 %120 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %119 - %121 = OpLoad %uint %120 + %121 = OpLoad %uint %120 MakePointerVisible|NonPrivatePointer %uint_1 %122 = OpIAdd %uint %118 %121 OpStore %114 %122 %123 = OpIAdd %uint %119 %uint_1 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-local-fail3.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-local-fail3.spv.dis index 7fec5d95f8..e625602d49 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-local-fail3.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-local-fail3.spv.dis @@ -11,8 +11,9 @@ ; Bound: 156 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %134 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %24 "xf_barrier" %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %15 %19 %20 %21 %5 OpSource OpenCL_C 200 %135 = OpString "xf_barrier" @@ -65,7 +66,6 @@ %_ptr_StorageBuffer_uint = OpTypePointer StorageBuffer %uint %bool = OpTypeBool %uint_264 = OpConstant %uint 264 - %uint_64 = OpConstant %uint 64 %uint_66 = OpConstant %uint 66 %uint_68 = OpConstant %uint 68 %false = OpConstantFalse %bool @@ -101,7 +101,7 @@ %46 = OpAccessChain %_ptr_PushConstant_uint %5 %uint_0 %uint_0 %47 = OpLoad %uint %46 %49 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %45 - OpStore %49 %uint_1 + OpStore %49 %uint_1 MakePointerAvailable|NonPrivatePointer %uint_1 %51 = OpINotEqual %bool %34 %uint_0 OpSelectionMerge %75 None OpBranchConditional %51 %54 %75 @@ -112,7 +112,7 @@ OpBranchConditional %56 %59 %71 %59 = OpLabel %60 = OpAccessChain %_ptr_StorageBuffer_uint %19 %uint_0 %34 - OpAtomicStore %60 %uint_1 %uint_64 %uint_1 + OpAtomicStore %60 %uint_1 %uint_0 %uint_1 OpBranch %63 %63 = OpLabel %65 = OpAtomicLoad %uint %60 %uint_1 %uint_66 @@ -173,7 +173,7 @@ %118 = OpPhi %uint %122 %117 %115 %113 %119 = OpPhi %uint %123 %117 %uint_0 %113 %120 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %119 - %121 = OpLoad %uint %120 + %121 = OpLoad %uint %120 MakePointerVisible|NonPrivatePointer %uint_1 %122 = OpIAdd %uint %118 %121 OpStore %114 %122 %123 = OpIAdd %uint %119 %uint_1 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-local-fail4.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-local-fail4.spv.dis index c5c4b8c599..72dbabebc1 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-local-fail4.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-local-fail4.spv.dis @@ -11,8 +11,9 @@ ; Bound: 156 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %134 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %24 "xf_barrier" %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %15 %19 %20 %21 %5 OpSource OpenCL_C 200 %135 = OpString "xf_barrier" @@ -66,7 +67,6 @@ %bool = OpTypeBool %uint_264 = OpConstant %uint 264 %uint_68 = OpConstant %uint 68 - %uint_64 = OpConstant %uint 64 %uint_66 = OpConstant %uint 66 %false = OpConstantFalse %bool %true = OpConstantTrue %bool @@ -101,7 +101,7 @@ %46 = OpAccessChain %_ptr_PushConstant_uint %5 %uint_0 %uint_0 %47 = OpLoad %uint %46 %49 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %45 - OpStore %49 %uint_1 + OpStore %49 %uint_1 MakePointerAvailable|NonPrivatePointer %uint_1 %51 = OpINotEqual %bool %34 %uint_0 OpSelectionMerge %75 None OpBranchConditional %51 %54 %75 @@ -115,7 +115,7 @@ OpAtomicStore %60 %uint_1 %uint_68 %uint_1 OpBranch %63 %63 = OpLabel - %65 = OpAtomicLoad %uint %60 %uint_1 %uint_64 + %65 = OpAtomicLoad %uint %60 %uint_1 %uint_0 %66 = OpINotEqual %bool %65 %uint_1 OpLoopMerge %69 %63 None OpBranchConditional %66 %69 %63 @@ -173,7 +173,7 @@ %118 = OpPhi %uint %122 %117 %115 %113 %119 = OpPhi %uint %123 %117 %uint_0 %113 %120 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %119 - %121 = OpLoad %uint %120 + %121 = OpLoad %uint %120 MakePointerVisible|NonPrivatePointer %uint_1 %122 = OpIAdd %uint %118 %121 OpStore %114 %122 %123 = OpIAdd %uint %119 %uint_1 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-local-weakest.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-local-weakest.spv.dis index 309c081b39..142e207bb2 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-local-weakest.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-local-weakest.spv.dis @@ -11,8 +11,9 @@ ; Bound: 154 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %132 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %24 "xf_barrier" %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %15 %19 %20 %21 %5 OpSource OpenCL_C 200 %133 = OpString "xf_barrier" @@ -65,7 +66,6 @@ %_ptr_StorageBuffer_uint = OpTypePointer StorageBuffer %uint %bool = OpTypeBool %uint_264 = OpConstant %uint 264 - %uint_64 = OpConstant %uint 64 %false = OpConstantFalse %bool %true = OpConstantTrue %bool %uint_12 = OpConstant %uint 12 @@ -99,7 +99,7 @@ %46 = OpAccessChain %_ptr_PushConstant_uint %5 %uint_0 %uint_0 %47 = OpLoad %uint %46 %49 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %45 - OpStore %49 %uint_1 + OpStore %49 %uint_1 MakePointerAvailable|NonPrivatePointer %uint_1 %51 = OpINotEqual %bool %34 %uint_0 OpSelectionMerge %74 None OpBranchConditional %51 %54 %74 @@ -110,10 +110,10 @@ OpBranchConditional %56 %59 %70 %59 = OpLabel %60 = OpAccessChain %_ptr_StorageBuffer_uint %19 %uint_0 %34 - OpAtomicStore %60 %uint_1 %uint_64 %uint_1 + OpAtomicStore %60 %uint_1 %uint_0 %uint_1 OpBranch %63 %63 = OpLabel - %64 = OpAtomicLoad %uint %60 %uint_1 %uint_64 + %64 = OpAtomicLoad %uint %60 %uint_1 %uint_0 %65 = OpINotEqual %bool %64 %uint_1 OpLoopMerge %68 %63 None OpBranchConditional %65 %68 %63 @@ -138,7 +138,7 @@ %85 = OpAccessChain %_ptr_StorageBuffer_uint %19 %uint_0 %84 OpBranch %87 %87 = OpLabel - %88 = OpAtomicLoad %uint %85 %uint_1 %uint_64 + %88 = OpAtomicLoad %uint %85 %uint_1 %uint_0 %89 = OpINotEqual %bool %88 %uint_0 OpLoopMerge %92 %87 None OpBranchConditional %89 %92 %87 @@ -153,7 +153,7 @@ %99 = OpLabel %100 = OpIAdd %uint %36 %uint_1 %101 = OpAccessChain %_ptr_StorageBuffer_uint %19 %uint_0 %100 - OpAtomicStore %101 %uint_1 %uint_64 %uint_0 + OpAtomicStore %101 %uint_1 %uint_0 %uint_0 OpBranch %103 %103 = OpLabel OpBranch %105 @@ -171,7 +171,7 @@ %116 = OpPhi %uint %120 %115 %113 %111 %117 = OpPhi %uint %121 %115 %uint_0 %111 %118 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %117 - %119 = OpLoad %uint %118 + %119 = OpLoad %uint %118 MakePointerVisible|NonPrivatePointer %uint_1 %120 = OpIAdd %uint %116 %119 OpStore %112 %120 %121 = OpIAdd %uint %117 %uint_1 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-weakest.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-weakest.spv.dis index 3259e7e80d..56b44bfb4b 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-weakest.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-weakest.spv.dis @@ -11,8 +11,9 @@ ; Bound: 154 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %132 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %24 "xf_barrier" %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %15 %19 %20 %21 %5 OpSource OpenCL_C 200 %133 = OpString "xf_barrier" @@ -68,7 +69,6 @@ %_ptr_StorageBuffer_uint = OpTypePointer StorageBuffer %uint %bool = OpTypeBool %uint_72 = OpConstant %uint 72 - %uint_64 = OpConstant %uint 64 %false = OpConstantFalse %bool %true = OpConstantTrue %bool %uint_12 = OpConstant %uint 12 @@ -102,7 +102,7 @@ %46 = OpAccessChain %_ptr_PushConstant_uint %5 %uint_0 %uint_0 %47 = OpLoad %uint %46 %49 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %45 - OpStore %49 %uint_1 + OpStore %49 %uint_1 MakePointerAvailable|NonPrivatePointer %uint_1 %51 = OpINotEqual %bool %34 %uint_0 OpSelectionMerge %74 None OpBranchConditional %51 %54 %74 @@ -113,10 +113,10 @@ OpBranchConditional %56 %59 %70 %59 = OpLabel %60 = OpAccessChain %_ptr_StorageBuffer_uint %19 %uint_0 %34 - OpAtomicStore %60 %uint_1 %uint_64 %uint_1 + OpAtomicStore %60 %uint_1 %uint_0 %uint_1 OpBranch %63 %63 = OpLabel - %64 = OpAtomicLoad %uint %60 %uint_1 %uint_64 + %64 = OpAtomicLoad %uint %60 %uint_1 %uint_0 %65 = OpINotEqual %bool %64 %uint_1 OpLoopMerge %68 %63 None OpBranchConditional %65 %68 %63 @@ -141,7 +141,7 @@ %85 = OpAccessChain %_ptr_StorageBuffer_uint %19 %uint_0 %84 OpBranch %87 %87 = OpLabel - %88 = OpAtomicLoad %uint %85 %uint_1 %uint_64 + %88 = OpAtomicLoad %uint %85 %uint_1 %uint_0 %89 = OpINotEqual %bool %88 %uint_0 OpLoopMerge %92 %87 None OpBranchConditional %89 %92 %87 @@ -156,7 +156,7 @@ %99 = OpLabel %100 = OpIAdd %uint %36 %uint_1 %101 = OpAccessChain %_ptr_StorageBuffer_uint %19 %uint_0 %100 - OpAtomicStore %101 %uint_1 %uint_64 %uint_0 + OpAtomicStore %101 %uint_1 %uint_0 %uint_0 OpBranch %103 %103 = OpLabel OpBranch %105 @@ -174,7 +174,7 @@ %116 = OpPhi %uint %120 %115 %113 %111 %117 = OpPhi %uint %121 %115 %uint_0 %111 %118 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %117 - %119 = OpLoad %uint %118 + %119 = OpLoad %uint %118 MakePointerVisible|NonPrivatePointer %uint_1 %120 = OpIAdd %uint %116 %119 OpStore %112 %120 %121 = OpIAdd %uint %117 %uint_1 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-zero-1.1.2.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-zero-1.1.2.spv.dis index 8f901f1d55..b2ae1d76d0 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-zero-1.1.2.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-zero-1.1.2.spv.dis @@ -11,8 +11,9 @@ ; Bound: 155 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %133 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %24 "xf_barrier" %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %15 %19 %20 %21 %5 OpSource OpenCL_C 200 %134 = OpString "xf_barrier" @@ -100,7 +101,7 @@ %46 = OpAccessChain %_ptr_PushConstant_uint %5 %uint_0 %uint_0 %47 = OpLoad %uint %46 %49 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %45 - OpStore %49 %uint_1 + OpStore %49 %uint_1 MakePointerAvailable|NonPrivatePointer %uint_1 %51 = OpINotEqual %bool %34 %uint_0 OpSelectionMerge %75 None OpBranchConditional %51 %54 %75 @@ -172,7 +173,7 @@ %117 = OpPhi %uint %121 %116 %114 %112 %118 = OpPhi %uint %122 %116 %uint_0 %112 %119 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %118 - %120 = OpLoad %uint %119 + %120 = OpLoad %uint %119 MakePointerVisible|NonPrivatePointer %uint_1 %121 = OpIAdd %uint %117 %120 OpStore %113 %121 %122 = OpIAdd %uint %118 %uint_1 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-zero-2.1.1.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-zero-2.1.1.spv.dis index f7c911d76b..e83390b1dc 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-zero-2.1.1.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-zero-2.1.1.spv.dis @@ -11,8 +11,9 @@ ; Bound: 155 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %133 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %24 "xf_barrier" %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %15 %19 %20 %21 %5 OpSource OpenCL_C 200 %134 = OpString "xf_barrier" @@ -100,7 +101,7 @@ %46 = OpAccessChain %_ptr_PushConstant_uint %5 %uint_0 %uint_0 %47 = OpLoad %uint %46 %49 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %45 - OpStore %49 %uint_1 + OpStore %49 %uint_1 MakePointerAvailable|NonPrivatePointer %uint_1 %51 = OpINotEqual %bool %34 %uint_0 OpSelectionMerge %75 None OpBranchConditional %51 %54 %75 @@ -172,7 +173,7 @@ %117 = OpPhi %uint %121 %116 %114 %112 %118 = OpPhi %uint %122 %116 %uint_0 %112 %119 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %118 - %120 = OpLoad %uint %119 + %120 = OpLoad %uint %119 MakePointerVisible|NonPrivatePointer %uint_1 %121 = OpIAdd %uint %117 %120 OpStore %113 %121 %122 = OpIAdd %uint %118 %uint_1 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-zero-2.1.2.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-zero-2.1.2.spv.dis index fe9dcd8d91..3bf12ac7e8 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-zero-2.1.2.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-zero-2.1.2.spv.dis @@ -11,8 +11,9 @@ ; Bound: 155 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %133 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %24 "xf_barrier" %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %15 %19 %20 %21 %5 OpSource OpenCL_C 200 %134 = OpString "xf_barrier" @@ -100,7 +101,7 @@ %46 = OpAccessChain %_ptr_PushConstant_uint %5 %uint_0 %uint_0 %47 = OpLoad %uint %46 %49 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %45 - OpStore %49 %uint_1 + OpStore %49 %uint_1 MakePointerAvailable|NonPrivatePointer %uint_1 %51 = OpINotEqual %bool %34 %uint_0 OpSelectionMerge %75 None OpBranchConditional %51 %54 %75 @@ -172,7 +173,7 @@ %117 = OpPhi %uint %121 %116 %114 %112 %118 = OpPhi %uint %122 %116 %uint_0 %112 %119 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %118 - %120 = OpLoad %uint %119 + %120 = OpLoad %uint %119 MakePointerVisible|NonPrivatePointer %uint_1 %121 = OpIAdd %uint %117 %120 OpStore %113 %121 %122 = OpIAdd %uint %118 %uint_1 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-zero-3.1.3.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-zero-3.1.3.spv.dis index 78f37eda4d..a608862e5e 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-zero-3.1.3.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-zero-3.1.3.spv.dis @@ -13,8 +13,9 @@ ; Bound: 155 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %133 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %24 "xf_barrier" %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %15 %19 %20 %21 %5 OpSource OpenCL_C 200 %134 = OpString "xf_barrier" @@ -102,7 +103,7 @@ %46 = OpAccessChain %_ptr_PushConstant_uint %5 %uint_0 %uint_0 %47 = OpLoad %uint %46 %49 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %45 - OpStore %49 %uint_1 + OpStore %49 %uint_1 MakePointerAvailable|NonPrivatePointer %uint_1 %51 = OpINotEqual %bool %34 %uint_0 OpSelectionMerge %75 None OpBranchConditional %51 %54 %75 @@ -174,7 +175,7 @@ %117 = OpPhi %uint %121 %116 %114 %112 %118 = OpPhi %uint %122 %116 %uint_0 %112 %119 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %118 - %120 = OpLoad %uint %119 + %120 = OpLoad %uint %119 MakePointerVisible|NonPrivatePointer %uint_1 %121 = OpIAdd %uint %117 %120 OpStore %113 %121 %122 = OpIAdd %uint %118 %uint_1 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-zero-fail1.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-zero-fail1.spv.dis index 5de96580c9..5a7c831159 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-zero-fail1.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-zero-fail1.spv.dis @@ -11,8 +11,9 @@ ; Bound: 156 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %134 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %24 "xf_barrier" %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %15 %19 %20 %21 %5 OpSource OpenCL_C 200 %135 = OpString "xf_barrier" @@ -67,7 +68,6 @@ %uint_8 = OpConstant %uint 8 %uint_68 = OpConstant %uint 68 %uint_66 = OpConstant %uint 66 - %uint_64 = OpConstant %uint 64 %false = OpConstantFalse %bool %true = OpConstantTrue %bool %uint_12 = OpConstant %uint 12 @@ -101,7 +101,7 @@ %46 = OpAccessChain %_ptr_PushConstant_uint %5 %uint_0 %uint_0 %47 = OpLoad %uint %46 %49 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %45 - OpStore %49 %uint_1 + OpStore %49 %uint_1 MakePointerAvailable|NonPrivatePointer %uint_1 %51 = OpINotEqual %bool %34 %uint_0 OpSelectionMerge %75 None OpBranchConditional %51 %54 %75 @@ -140,7 +140,7 @@ %86 = OpAccessChain %_ptr_StorageBuffer_uint %19 %uint_0 %85 OpBranch %88 %88 = OpLabel - %90 = OpAtomicLoad %uint %86 %uint_1 %uint_64 + %90 = OpAtomicLoad %uint %86 %uint_1 %uint_0 %91 = OpINotEqual %bool %90 %uint_0 OpLoopMerge %94 %88 None OpBranchConditional %91 %94 %88 @@ -173,7 +173,7 @@ %118 = OpPhi %uint %122 %117 %115 %113 %119 = OpPhi %uint %123 %117 %uint_0 %113 %120 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %119 - %121 = OpLoad %uint %120 + %121 = OpLoad %uint %120 MakePointerVisible|NonPrivatePointer %uint_1 %122 = OpIAdd %uint %118 %121 OpStore %114 %122 %123 = OpIAdd %uint %119 %uint_1 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-zero-fail2.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-zero-fail2.spv.dis index 63f14ccf0e..7c6a7ad8f1 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-zero-fail2.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-zero-fail2.spv.dis @@ -11,8 +11,9 @@ ; Bound: 156 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %134 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %24 "xf_barrier" %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %15 %19 %20 %21 %5 OpSource OpenCL_C 200 %135 = OpString "xf_barrier" @@ -67,7 +68,6 @@ %uint_8 = OpConstant %uint 8 %uint_68 = OpConstant %uint 68 %uint_66 = OpConstant %uint 66 - %uint_64 = OpConstant %uint 64 %false = OpConstantFalse %bool %true = OpConstantTrue %bool %uint_12 = OpConstant %uint 12 @@ -101,7 +101,7 @@ %46 = OpAccessChain %_ptr_PushConstant_uint %5 %uint_0 %uint_0 %47 = OpLoad %uint %46 %49 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %45 - OpStore %49 %uint_1 + OpStore %49 %uint_1 MakePointerAvailable|NonPrivatePointer %uint_1 %51 = OpINotEqual %bool %34 %uint_0 OpSelectionMerge %75 None OpBranchConditional %51 %54 %75 @@ -155,7 +155,7 @@ %100 = OpLabel %101 = OpIAdd %uint %36 %uint_1 %102 = OpAccessChain %_ptr_StorageBuffer_uint %19 %uint_0 %101 - OpAtomicStore %102 %uint_1 %uint_64 %uint_0 + OpAtomicStore %102 %uint_1 %uint_0 %uint_0 OpBranch %105 %105 = OpLabel OpBranch %107 @@ -173,7 +173,7 @@ %118 = OpPhi %uint %122 %117 %115 %113 %119 = OpPhi %uint %123 %117 %uint_0 %113 %120 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %119 - %121 = OpLoad %uint %120 + %121 = OpLoad %uint %120 MakePointerVisible|NonPrivatePointer %uint_1 %122 = OpIAdd %uint %118 %121 OpStore %114 %122 %123 = OpIAdd %uint %119 %uint_1 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-zero-fail3.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-zero-fail3.spv.dis index 2dd66a6823..a6e755e317 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-zero-fail3.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-zero-fail3.spv.dis @@ -11,8 +11,9 @@ ; Bound: 156 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %134 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %24 "xf_barrier" %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %15 %19 %20 %21 %5 OpSource OpenCL_C 200 %135 = OpString "xf_barrier" @@ -65,7 +66,6 @@ %_ptr_StorageBuffer_uint = OpTypePointer StorageBuffer %uint %bool = OpTypeBool %uint_8 = OpConstant %uint 8 - %uint_64 = OpConstant %uint 64 %uint_66 = OpConstant %uint 66 %uint_68 = OpConstant %uint 68 %false = OpConstantFalse %bool @@ -101,7 +101,7 @@ %46 = OpAccessChain %_ptr_PushConstant_uint %5 %uint_0 %uint_0 %47 = OpLoad %uint %46 %49 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %45 - OpStore %49 %uint_1 + OpStore %49 %uint_1 MakePointerAvailable|NonPrivatePointer %uint_1 %51 = OpINotEqual %bool %34 %uint_0 OpSelectionMerge %75 None OpBranchConditional %51 %54 %75 @@ -112,7 +112,7 @@ OpBranchConditional %56 %59 %71 %59 = OpLabel %60 = OpAccessChain %_ptr_StorageBuffer_uint %19 %uint_0 %34 - OpAtomicStore %60 %uint_1 %uint_64 %uint_1 + OpAtomicStore %60 %uint_1 %uint_0 %uint_1 OpBranch %63 %63 = OpLabel %65 = OpAtomicLoad %uint %60 %uint_1 %uint_66 @@ -173,7 +173,7 @@ %118 = OpPhi %uint %122 %117 %115 %113 %119 = OpPhi %uint %123 %117 %uint_0 %113 %120 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %119 - %121 = OpLoad %uint %120 + %121 = OpLoad %uint %120 MakePointerVisible|NonPrivatePointer %uint_1 %122 = OpIAdd %uint %118 %121 OpStore %114 %122 %123 = OpIAdd %uint %119 %uint_1 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-zero-fail4.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-zero-fail4.spv.dis index 49711aa2e8..0a9744602d 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-zero-fail4.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-zero-fail4.spv.dis @@ -11,8 +11,9 @@ ; Bound: 156 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %134 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %24 "xf_barrier" %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %15 %19 %20 %21 %5 OpSource OpenCL_C 200 %135 = OpString "xf_barrier" @@ -66,7 +67,6 @@ %bool = OpTypeBool %uint_8 = OpConstant %uint 8 %uint_68 = OpConstant %uint 68 - %uint_64 = OpConstant %uint 64 %uint_66 = OpConstant %uint 66 %false = OpConstantFalse %bool %true = OpConstantTrue %bool @@ -101,7 +101,7 @@ %46 = OpAccessChain %_ptr_PushConstant_uint %5 %uint_0 %uint_0 %47 = OpLoad %uint %46 %49 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %45 - OpStore %49 %uint_1 + OpStore %49 %uint_1 MakePointerAvailable|NonPrivatePointer %uint_1 %51 = OpINotEqual %bool %34 %uint_0 OpSelectionMerge %75 None OpBranchConditional %51 %54 %75 @@ -115,7 +115,7 @@ OpAtomicStore %60 %uint_1 %uint_68 %uint_1 OpBranch %63 %63 = OpLabel - %65 = OpAtomicLoad %uint %60 %uint_1 %uint_64 + %65 = OpAtomicLoad %uint %60 %uint_1 %uint_0 %66 = OpINotEqual %bool %65 %uint_1 OpLoopMerge %69 %63 None OpBranchConditional %66 %69 %63 @@ -173,7 +173,7 @@ %118 = OpPhi %uint %122 %117 %115 %113 %119 = OpPhi %uint %123 %117 %uint_0 %113 %120 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %119 - %121 = OpLoad %uint %120 + %121 = OpLoad %uint %120 MakePointerVisible|NonPrivatePointer %uint_1 %122 = OpIAdd %uint %118 %121 OpStore %114 %122 %123 = OpIAdd %uint %119 %uint_1 diff --git a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-zero-weakest.spv.dis b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-zero-weakest.spv.dis index 3bbbaa9dea..63ec714560 100644 --- a/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-zero-weakest.spv.dis +++ b/dartagnan/src/test/resources/spirv/benchmarks/xf-barrier-zero-weakest.spv.dis @@ -11,8 +11,9 @@ ; Bound: 154 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %132 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %24 "xf_barrier" %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %15 %19 %20 %21 %5 OpSource OpenCL_C 200 %133 = OpString "xf_barrier" @@ -65,7 +66,6 @@ %_ptr_StorageBuffer_uint = OpTypePointer StorageBuffer %uint %bool = OpTypeBool %uint_8 = OpConstant %uint 8 - %uint_64 = OpConstant %uint 64 %false = OpConstantFalse %bool %true = OpConstantTrue %bool %uint_12 = OpConstant %uint 12 @@ -99,7 +99,7 @@ %46 = OpAccessChain %_ptr_PushConstant_uint %5 %uint_0 %uint_0 %47 = OpLoad %uint %46 %49 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %45 - OpStore %49 %uint_1 + OpStore %49 %uint_1 MakePointerAvailable|NonPrivatePointer %uint_1 %51 = OpINotEqual %bool %34 %uint_0 OpSelectionMerge %74 None OpBranchConditional %51 %54 %74 @@ -110,10 +110,10 @@ OpBranchConditional %56 %59 %70 %59 = OpLabel %60 = OpAccessChain %_ptr_StorageBuffer_uint %19 %uint_0 %34 - OpAtomicStore %60 %uint_1 %uint_64 %uint_1 + OpAtomicStore %60 %uint_1 %uint_0 %uint_1 OpBranch %63 %63 = OpLabel - %64 = OpAtomicLoad %uint %60 %uint_1 %uint_64 + %64 = OpAtomicLoad %uint %60 %uint_1 %uint_0 %65 = OpINotEqual %bool %64 %uint_1 OpLoopMerge %68 %63 None OpBranchConditional %65 %68 %63 @@ -138,7 +138,7 @@ %85 = OpAccessChain %_ptr_StorageBuffer_uint %19 %uint_0 %84 OpBranch %87 %87 = OpLabel - %88 = OpAtomicLoad %uint %85 %uint_1 %uint_64 + %88 = OpAtomicLoad %uint %85 %uint_1 %uint_0 %89 = OpINotEqual %bool %88 %uint_0 OpLoopMerge %92 %87 None OpBranchConditional %89 %92 %87 @@ -153,7 +153,7 @@ %99 = OpLabel %100 = OpIAdd %uint %36 %uint_1 %101 = OpAccessChain %_ptr_StorageBuffer_uint %19 %uint_0 %100 - OpAtomicStore %101 %uint_1 %uint_64 %uint_0 + OpAtomicStore %101 %uint_1 %uint_0 %uint_0 OpBranch %103 %103 = OpLabel OpBranch %105 @@ -171,7 +171,7 @@ %116 = OpPhi %uint %120 %115 %113 %111 %117 = OpPhi %uint %121 %115 %uint_0 %111 %118 = OpAccessChain %_ptr_StorageBuffer_uint %20 %uint_0 %117 - %119 = OpLoad %uint %118 + %119 = OpLoad %uint %118 MakePointerVisible|NonPrivatePointer %uint_1 %120 = OpIAdd %uint %116 %119 OpStore %112 %120 %121 = OpIAdd %uint %117 %uint_1 diff --git a/dartagnan/src/test/resources/spirv/gpuverify/addressofinit.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/addressofinit.spv.dis index 4d83e11cb6..8eda228dd3 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/addressofinit.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/addressofinit.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/alignment/int3int4.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/alignment/int3int4.spv.dis index e9f715dde3..0553ab50b9 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/alignment/int3int4.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/alignment/int3int4.spv.dis @@ -6,8 +6,9 @@ ; Bound: 49 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %37 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "foo" %gl_GlobalInvocationID %13 %18 %5 OpSource OpenCL_C 200 %38 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/alignment/race_location.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/alignment/race_location.spv.dis index 7768bb0eaa..ffd0242440 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/alignment/race_location.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/alignment/race_location.spv.dis @@ -6,8 +6,9 @@ ; Bound: 49 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %37 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "foo" %gl_GlobalInvocationID %13 %18 %5 OpSource OpenCL_C 200 %38 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/annotation_tests/test_axiom.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/annotation_tests/test_axiom.spv.dis index da9175440e..1142a6256f 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/annotation_tests/test_axiom.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/annotation_tests/test_axiom.spv.dis @@ -6,8 +6,9 @@ ; Bound: 50 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %40 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "foo" %8 %gl_LocalInvocationID %14 OpSource OpenCL_C 200 %41 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/array_in_array.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/array_in_array.spv.dis index 7ca31451ac..7af6756ec2 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/array_in_array.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/array_in_array.spv.dis @@ -5,8 +5,9 @@ ; Bound: 30 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %18 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %16 "foo" %gl_GlobalInvocationID %13 %5 OpSource OpenCL_C 200 %19 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/array_in_array_2.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/array_in_array_2.spv.dis index 6d5d0d0689..72ef3a6eaf 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/array_in_array_2.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/array_in_array_2.spv.dis @@ -5,8 +5,9 @@ ; Bound: 28 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %18 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %16 "foo" %gl_GlobalInvocationID %13 %5 OpSource OpenCL_C 200 %19 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/array_in_array_param.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/array_in_array_param.spv.dis index 9da9de1805..23529f77b8 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/array_in_array_param.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/array_in_array_param.spv.dis @@ -5,8 +5,9 @@ ; Bound: 30 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %18 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %16 "foo" %gl_GlobalInvocationID %13 %5 OpSource OpenCL_C 200 %19 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/multi_dim_array.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/multi_dim_array.spv.dis index b96c292109..37934d2f75 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/multi_dim_array.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/multi_dim_array.spv.dis @@ -5,8 +5,9 @@ ; Bound: 29 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %19 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "foo" %gl_LocalInvocationID %gl_WorkGroupID %14 %5 OpSource OpenCL_C 200 %20 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/multi_dim_array_fail_upper.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/multi_dim_array_fail_upper.spv.dis index 0429a61277..c8c5a11c78 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/multi_dim_array_fail_upper.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/multi_dim_array_fail_upper.spv.dis @@ -5,8 +5,9 @@ ; Bound: 32 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %20 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %18 "foo" %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %15 %5 OpSource OpenCL_C 200 %21 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/negative_index_multi_dim.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/negative_index_multi_dim.spv.dis index b2b2106a0c..611ae53578 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/negative_index_multi_dim.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/negative_index_multi_dim.spv.dis @@ -5,8 +5,9 @@ ; Bound: 31 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %19 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "foo" %gl_GlobalInvocationID %gl_LocalInvocationID %14 %5 OpSource OpenCL_C 200 %20 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/negative_index_multi_dim_fail.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/negative_index_multi_dim_fail.spv.dis index 1471eec23d..64c9043eb8 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/negative_index_multi_dim_fail.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/negative_index_multi_dim_fail.spv.dis @@ -5,8 +5,9 @@ ; Bound: 30 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %18 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %16 "foo" %gl_GlobalInvocationID %13 %5 OpSource OpenCL_C 200 %19 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/private_array.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/private_array.spv.dis index 293beb9482..0938db2aee 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/private_array.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/private_array.spv.dis @@ -5,8 +5,9 @@ ; Bound: 28 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %18 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %16 "foo" %gl_GlobalInvocationID %13 %5 OpSource OpenCL_C 200 %19 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/realign_simple.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/realign_simple.spv.dis index 1471eec23d..64c9043eb8 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/realign_simple.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/realign_simple.spv.dis @@ -5,8 +5,9 @@ ; Bound: 30 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %18 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %16 "foo" %gl_GlobalInvocationID %13 %5 OpSource OpenCL_C 200 %19 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/realign_simple_fail.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/realign_simple_fail.spv.dis index 1471eec23d..64c9043eb8 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/realign_simple_fail.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/realign_simple_fail.spv.dis @@ -5,8 +5,9 @@ ; Bound: 30 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %18 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %16 "foo" %gl_GlobalInvocationID %13 %5 OpSource OpenCL_C 200 %19 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/simple_array.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/simple_array.spv.dis index 1471eec23d..64c9043eb8 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/simple_array.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/simple_array.spv.dis @@ -5,8 +5,9 @@ ; Bound: 30 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %18 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %16 "foo" %gl_GlobalInvocationID %13 %5 OpSource OpenCL_C 200 %19 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/simple_array_fail_lower.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/simple_array_fail_lower.spv.dis index 1471eec23d..64c9043eb8 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/simple_array_fail_lower.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/simple_array_fail_lower.spv.dis @@ -5,8 +5,9 @@ ; Bound: 30 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %18 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %16 "foo" %gl_GlobalInvocationID %13 %5 OpSource OpenCL_C 200 %19 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/simple_array_fail_upper.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/simple_array_fail_upper.spv.dis index 1471eec23d..64c9043eb8 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/simple_array_fail_upper.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/simple_array_fail_upper.spv.dis @@ -5,8 +5,9 @@ ; Bound: 30 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %18 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %16 "foo" %gl_GlobalInvocationID %13 %5 OpSource OpenCL_C 200 %19 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/simple_array_fail_var.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/simple_array_fail_var.spv.dis index 293beb9482..0938db2aee 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/simple_array_fail_var.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/array_bounds_tests/simple_array_fail_var.spv.dis @@ -5,8 +5,9 @@ ; Bound: 28 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %18 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %16 "foo" %gl_GlobalInvocationID %13 %5 OpSource OpenCL_C 200 %19 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test1.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test1.spv.dis index c3fba1f6ab..0444811012 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test1.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test1.spv.dis @@ -6,8 +6,9 @@ ; Bound: 102 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %90 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %27 "foo" %6 %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %20 %24 %10 OpSource OpenCL_C 200 %91 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test10.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test10.spv.dis index 12dd92c273..2c1644868f 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test10.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test10.spv.dis @@ -6,8 +6,9 @@ ; Bound: 87 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %77 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %26 "foo" %6 %gl_GlobalInvocationID %gl_LocalInvocationID %19 %23 %10 OpSource OpenCL_C 200 %78 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test13.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test13.spv.dis index 0fa5927f08..ff9e0d3f02 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test13.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test13.spv.dis @@ -7,8 +7,9 @@ ; Bound: 91 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %78 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %26 "foo" %5 %gl_GlobalInvocationID %17 %gl_LocalInvocationID %22 %23 %9 OpSource OpenCL_C 200 %79 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test14.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test14.spv.dis index fc0f77bfcc..ab6672919f 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test14.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test14.spv.dis @@ -7,8 +7,9 @@ ; Bound: 143 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %128 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %29 "foo" %6 %7 %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %21 %25 %26 %11 OpSource OpenCL_C 200 %129 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test15.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test15.spv.dis index 706bcff8d8..1ea6b3a007 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test15.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test15.spv.dis @@ -6,9 +6,10 @@ ; Bound: 112 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpCapability VariablePointersStorageBuffer %100 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %28 "foo" %7 %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %21 %25 %11 OpSource OpenCL_C 200 %101 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test16.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test16.spv.dis index cf59c89c88..44bd0d8895 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test16.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test16.spv.dis @@ -5,9 +5,10 @@ ; Bound: 102 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpCapability VariablePointersStorageBuffer %93 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %24 "foo" %7 %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %21 %11 OpSource OpenCL_C 200 %94 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test17.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test17.spv.dis index ac749f344b..7f6b89a7f3 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test17.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test17.spv.dis @@ -7,10 +7,11 @@ ; Bound: 121 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpCapability VariablePointersStorageBuffer OpCapability VariablePointers %106 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %29 "foo" %7 %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %21 %25 %26 %11 OpSource OpenCL_C 200 %107 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test18.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test18.spv.dis index e7a46b7d8c..dffe4c58f6 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test18.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test18.spv.dis @@ -7,10 +7,11 @@ ; Bound: 114 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpCapability VariablePointersStorageBuffer OpCapability VariablePointers %99 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %25 "foo" %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %15 %21 %22 %5 OpSource OpenCL_C 200 %100 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test2.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test2.spv.dis index fc0f77bfcc..ab6672919f 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test2.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test2.spv.dis @@ -7,8 +7,9 @@ ; Bound: 143 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %128 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %29 "foo" %6 %7 %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %21 %25 %26 %11 OpSource OpenCL_C 200 %129 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test4.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test4.spv.dis index 72c05691c8..6e2ce94f9c 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test4.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test4.spv.dis @@ -7,8 +7,9 @@ ; Bound: 185 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %172 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %28 "foo" %6 %7 %gl_LocalInvocationID %gl_WorkGroupID %20 %24 %25 %11 OpSource OpenCL_C 200 %173 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test5.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test5.spv.dis index f243a5fa20..2d1d421135 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test5.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test5.spv.dis @@ -7,8 +7,9 @@ ; Bound: 187 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %174 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %28 "foo" %6 %7 %gl_LocalInvocationID %gl_WorkGroupID %20 %24 %25 %11 OpSource OpenCL_C 200 %175 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test7.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test7.spv.dis index fc510f3bfb..d7557969f9 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test7.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test7.spv.dis @@ -5,8 +5,9 @@ ; Bound: 71 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %64 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "foo" %gl_GlobalInvocationID %13 %gl_LocalInvocationID %5 OpSource OpenCL_C 200 %65 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test8.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test8.spv.dis index fd9c8e40bf..2d8c0c754c 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test8.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test8.spv.dis @@ -5,8 +5,9 @@ ; Bound: 63 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %56 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "foo" %gl_LocalInvocationID %gl_WorkGroupID %14 %5 OpSource OpenCL_C 200 %57 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test9.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test9.spv.dis index 63228a12c9..51859b7803 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test9.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/fail/test9.spv.dis @@ -5,8 +5,9 @@ ; Bound: 70 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %63 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "foo" %gl_LocalInvocationID %gl_WorkGroupID %14 %5 OpSource OpenCL_C 200 %64 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/pass/test1.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/pass/test1.spv.dis index 293a6e95ab..2fd29ec5e6 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/pass/test1.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/pass/test1.spv.dis @@ -6,8 +6,9 @@ ; Bound: 106 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %94 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %27 "foo" %6 %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %20 %24 %10 OpSource OpenCL_C 200 %95 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/pass/test2.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/pass/test2.spv.dis index a3412a0197..57085d00ff 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/pass/test2.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/pass/test2.spv.dis @@ -7,8 +7,9 @@ ; Bound: 144 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %129 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %29 "foo" %6 %7 %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %21 %25 %26 %11 OpSource OpenCL_C 200 %130 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/pass/test3.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/pass/test3.spv.dis index a3412a0197..57085d00ff 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/pass/test3.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/pass/test3.spv.dis @@ -7,8 +7,9 @@ ; Bound: 144 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %129 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %29 "foo" %6 %7 %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %21 %25 %26 %11 OpSource OpenCL_C 200 %130 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/pass/test4.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/pass/test4.spv.dis index cc7aa6f0b1..ffe309ee35 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/pass/test4.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/pass/test4.spv.dis @@ -6,9 +6,10 @@ ; Bound: 155 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpCapability Int8 %143 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %28 "foo" %6 %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %20 %25 %10 OpSource OpenCL_C 200 %144 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/pass/test5.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/pass/test5.spv.dis index 0fea6ed869..1abef0557c 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/pass/test5.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/pass/test5.spv.dis @@ -6,8 +6,9 @@ ; Bound: 132 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %122 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %26 "foo" %6 %16 %gl_WorkGroupID %gl_LocalInvocationID %23 %10 OpSource OpenCL_C 200 %123 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/pass/test6.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/pass/test6.spv.dis index 328932af95..5e5f7bb7bf 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/pass/test6.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/pass/test6.spv.dis @@ -7,10 +7,11 @@ ; Bound: 116 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpCapability VariablePointersStorageBuffer OpCapability VariablePointers %101 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %29 "foo" %7 %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %21 %25 %26 %11 OpSource OpenCL_C 200 %102 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/pass/test7.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/pass/test7.spv.dis index 47f9ecf726..a5cb508560 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/pass/test7.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/pass/test7.spv.dis @@ -6,9 +6,10 @@ ; Bound: 113 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpCapability VariablePointersStorageBuffer %101 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %28 "foo" %7 %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %21 %25 %11 OpSource OpenCL_C 200 %102 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/pass/test8.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/pass/test8.spv.dis index 810435d8d1..cbec46d70a 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/pass/test8.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/pass/test8.spv.dis @@ -7,10 +7,11 @@ ; Bound: 121 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpCapability VariablePointersStorageBuffer OpCapability VariablePointers %106 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %30 "foo" %7 %8 %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %22 %26 %27 %12 OpSource OpenCL_C 200 %107 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/pass/test9.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/pass/test9.spv.dis index 1d92750efd..0b7ceb6383 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/pass/test9.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/async_work_group_copy/pass/test9.spv.dis @@ -6,9 +6,10 @@ ; Bound: 114 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpCapability VariablePointers %102 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %29 "foo" %7 %8 %gl_GlobalInvocationID %gl_LocalInvocationID %gl_WorkGroupID %22 %26 %12 OpSource OpenCL_C 200 %103 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/atomics/atomic_read_race.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/atomics/atomic_read_race.spv.dis index 0d0c8ff496..8938cc1f33 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/atomics/atomic_read_race.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/atomics/atomic_read_race.spv.dis @@ -5,8 +5,9 @@ ; Bound: 43 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %32 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "atomic" %gl_LocalInvocationID %10 %14 OpSource OpenCL_C 200 %33 = OpString "atomic" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/atomics/counter.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/atomics/counter.spv.dis index c25d4c4df9..104c0fc326 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/atomics/counter.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/atomics/counter.spv.dis @@ -5,8 +5,9 @@ ; Bound: 50 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %40 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %19 "counter" %3 %gl_LocalInvocationID %12 %16 OpSource OpenCL_C 200 %41 = OpString "counter" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/atomics/definitions_atom_int.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/atomics/definitions_atom_int.spv.dis index 245900a659..87e39cd71e 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/atomics/definitions_atom_int.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/atomics/definitions_atom_int.spv.dis @@ -7,8 +7,9 @@ ; Bound: 100 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %80 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %24 "definitions" %8 %12 %13 %17 %21 OpSource OpenCL_C 200 %81 = OpString "definitions" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/atomics/definitions_float.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/atomics/definitions_float.spv.dis index f6cde7ea9a..a9b259ebe3 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/atomics/definitions_float.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/atomics/definitions_float.spv.dis @@ -6,8 +6,9 @@ ; Bound: 46 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %32 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %20 "definitions" %8 %13 %17 OpSource OpenCL_C 200 %33 = OpString "definitions" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/atomics/definitions_int.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/atomics/definitions_int.spv.dis index 245900a659..87e39cd71e 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/atomics/definitions_int.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/atomics/definitions_int.spv.dis @@ -7,8 +7,9 @@ ; Bound: 100 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %80 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %24 "definitions" %8 %12 %13 %17 %21 OpSource OpenCL_C 200 %81 = OpString "definitions" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/atomics/definitions_long.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/atomics/definitions_long.spv.dis index 76672efd1e..ee8b5936d4 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/atomics/definitions_long.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/atomics/definitions_long.spv.dis @@ -7,9 +7,10 @@ ; Bound: 102 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpCapability Int64 %81 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %25 "definitions" %8 %13 %14 %18 %22 OpSource OpenCL_C 200 %82 = OpString "definitions" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/atomics/displaced.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/atomics/displaced.spv.dis index 20b7ee9eda..0a171833a6 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/atomics/displaced.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/atomics/displaced.spv.dis @@ -5,9 +5,10 @@ ; Bound: 67 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpCapability Int8 %55 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %22 "atomicTest" %gl_LocalInvocationID %10 %14 %19 OpSource OpenCL_C 200 %56 = OpString "atomicTest" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/atomics/equality_fail.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/atomics/equality_fail.spv.dis index 6eb6cbd581..2484f1e099 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/atomics/equality_fail.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/atomics/equality_fail.spv.dis @@ -5,8 +5,9 @@ ; Bound: 34 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %23 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %15 "simple" %8 %12 OpSource OpenCL_C 200 %24 = OpString "simple" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/atomics/forloop.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/atomics/forloop.spv.dis index e51de29be6..0e88f926ae 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/atomics/forloop.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/atomics/forloop.spv.dis @@ -6,8 +6,9 @@ ; Bound: 71 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %54 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "blarp" %gl_GlobalInvocationID %10 %18 %14 OpSource OpenCL_C 200 %55 = OpString "blarp" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/atomics/histo.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/atomics/histo.spv.dis index 7941656cc2..9b77650385 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/atomics/histo.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/atomics/histo.spv.dis @@ -5,8 +5,9 @@ ; Bound: 48 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %34 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "atomic" %gl_LocalInvocationID %10 %14 %18 OpSource OpenCL_C 200 %35 = OpString "atomic" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/atomics/mismatched_types/int_add_with_float.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/atomics/mismatched_types/int_add_with_float.spv.dis index 9ec825f040..dd1d4a9cc1 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/atomics/mismatched_types/int_add_with_float.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/atomics/mismatched_types/int_add_with_float.spv.dis @@ -5,8 +5,9 @@ ; Bound: 55 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %41 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "atomicTest" %gl_LocalInvocationID %10 %14 %18 OpSource OpenCL_C 200 %42 = OpString "atomicTest" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/atomics/mismatched_types/int_add_with_long.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/atomics/mismatched_types/int_add_with_long.spv.dis index 3f6bdd4e81..4c5bed7a81 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/atomics/mismatched_types/int_add_with_long.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/atomics/mismatched_types/int_add_with_long.spv.dis @@ -5,8 +5,9 @@ ; Bound: 58 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %46 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "atomicTest" %gl_LocalInvocationID %10 %14 %18 OpSource OpenCL_C 200 %47 = OpString "atomicTest" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/atomics/mismatched_types/int_add_with_short.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/atomics/mismatched_types/int_add_with_short.spv.dis index 24a5e0fb7a..8da6267944 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/atomics/mismatched_types/int_add_with_short.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/atomics/mismatched_types/int_add_with_short.spv.dis @@ -6,9 +6,10 @@ ; Bound: 58 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpCapability Int16 %45 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %22 "atomicTest" %gl_LocalInvocationID %10 %14 %19 OpSource OpenCL_C 200 %46 = OpString "atomicTest" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/atomics/pointers.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/atomics/pointers.spv.dis index 5d37ee75af..78c36d5b26 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/atomics/pointers.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/atomics/pointers.spv.dis @@ -5,9 +5,10 @@ ; Bound: 65 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpCapability VariablePointers %49 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %25 "pointers" %gl_LocalInvocationID %10 %14 %18 %22 OpSource OpenCL_C 200 %50 = OpString "pointers" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/atomics/refined_atomic_abstraction/bad_local_counters.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/atomics/refined_atomic_abstraction/bad_local_counters.spv.dis index b634d9c8ab..653b8e63bc 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/atomics/refined_atomic_abstraction/bad_local_counters.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/atomics/refined_atomic_abstraction/bad_local_counters.spv.dis @@ -6,8 +6,9 @@ ; Bound: 57 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %41 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %24 "foo" %gl_GlobalInvocationID %13 %17 %21 %5 OpSource OpenCL_C 200 %42 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/atomics/refined_atomic_abstraction/intra_local_counters.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/atomics/refined_atomic_abstraction/intra_local_counters.spv.dis index b634d9c8ab..653b8e63bc 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/atomics/refined_atomic_abstraction/intra_local_counters.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/atomics/refined_atomic_abstraction/intra_local_counters.spv.dis @@ -6,8 +6,9 @@ ; Bound: 57 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %41 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %24 "foo" %gl_GlobalInvocationID %13 %17 %21 %5 OpSource OpenCL_C 200 %42 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/atomics/refined_atomic_abstraction/many_accesses.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/atomics/refined_atomic_abstraction/many_accesses.spv.dis index 43ec01d5c8..debd92af8c 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/atomics/refined_atomic_abstraction/many_accesses.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/atomics/refined_atomic_abstraction/many_accesses.spv.dis @@ -6,8 +6,9 @@ ; Bound: 134 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %112 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %34 "foo" %gl_GlobalInvocationID %gl_LocalInvocationID %14 %18 %23 %27 %31 %5 OpSource OpenCL_C 200 %113 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/atomics/refined_atomic_abstraction/one_access.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/atomics/refined_atomic_abstraction/one_access.spv.dis index 9b2eb14918..68904456bf 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/atomics/refined_atomic_abstraction/one_access.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/atomics/refined_atomic_abstraction/one_access.spv.dis @@ -6,8 +6,9 @@ ; Bound: 82 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %60 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %34 "foo" %gl_GlobalInvocationID %gl_LocalInvocationID %14 %18 %23 %27 %31 %5 OpSource OpenCL_C 200 %61 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/atomics/refined_atomic_abstraction/predication.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/atomics/refined_atomic_abstraction/predication.spv.dis index 480caf2765..e4a610f60f 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/atomics/refined_atomic_abstraction/predication.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/atomics/refined_atomic_abstraction/predication.spv.dis @@ -6,8 +6,9 @@ ; Bound: 71 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %58 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %25 "foo" %gl_GlobalInvocationID %13 %17 %22 %5 OpSource OpenCL_C 200 %59 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/barrier_intervals/test1.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/barrier_intervals/test1.spv.dis index 02f2218e11..e04e3b7ab2 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/barrier_intervals/test1.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/barrier_intervals/test1.spv.dis @@ -5,8 +5,9 @@ ; Bound: 44 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %33 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "simple_kernel" %gl_LocalInvocationID %10 %14 OpSource OpenCL_C 200 %34 = OpString "simple_kernel" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/barrier_intervals/test2.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/barrier_intervals/test2.spv.dis index 263b66ca90..a3699a55af 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/barrier_intervals/test2.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/barrier_intervals/test2.spv.dis @@ -5,8 +5,9 @@ ; Bound: 51 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %40 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "simple_kernel" %gl_LocalInvocationID %10 %14 OpSource OpenCL_C 200 %41 = OpString "simple_kernel" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/barrier_intervals/test3.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/barrier_intervals/test3.spv.dis index dee2bcecaf..1004f526ef 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/barrier_intervals/test3.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/barrier_intervals/test3.spv.dis @@ -5,8 +5,9 @@ ; Bound: 66 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %56 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "simple_kernel" %gl_LocalInvocationID %10 %14 OpSource OpenCL_C 200 %57 = OpString "simple_kernel" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/barrier_intervals/test4.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/barrier_intervals/test4.spv.dis index 721fac4a92..11bffc7803 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/barrier_intervals/test4.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/barrier_intervals/test4.spv.dis @@ -5,8 +5,9 @@ ; Bound: 88 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %78 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "simple_kernel" %gl_LocalInvocationID %10 %14 OpSource OpenCL_C 200 %79 = OpString "simple_kernel" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/barrierconditionalkernelparam.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/barrierconditionalkernelparam.spv.dis index 523dc96bf1..b34ebd4c79 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/barrierconditionalkernelparam.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/barrierconditionalkernelparam.spv.dis @@ -5,8 +5,9 @@ ; Bound: 44 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %34 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %15 "foo" %8 %12 OpSource OpenCL_C 200 %35 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/basic1.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/basic1.spv.dis index 4d83e11cb6..8eda228dd3 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/basic1.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/basic1.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/basicbarrier.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/basicbarrier.spv.dis index 648eda0289..d14242e7d2 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/basicbarrier.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/basicbarrier.spv.dis @@ -5,8 +5,9 @@ ; Bound: 22 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %15 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %16 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/basicglobalarray.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/basicglobalarray.spv.dis index fa2cacd239..f9d6b9b763 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/basicglobalarray.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/basicglobalarray.spv.dis @@ -6,8 +6,9 @@ ; Bound: 47 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %35 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "foo" %gl_GlobalInvocationID %gl_LocalInvocationID %14 %18 %5 OpSource OpenCL_C 200 %36 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/benign_race_tests/fail/writeafterread_addition.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/benign_race_tests/fail/writeafterread_addition.spv.dis index 89e47d828f..5793f3005f 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/benign_race_tests/fail/writeafterread_addition.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/benign_race_tests/fail/writeafterread_addition.spv.dis @@ -5,8 +5,9 @@ ; Bound: 34 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %23 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %15 "foo" %8 %12 OpSource OpenCL_C 200 %24 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/benign_race_tests/fail/writeafterread_otherval.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/benign_race_tests/fail/writeafterread_otherval.spv.dis index 389314def6..a0943b242c 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/benign_race_tests/fail/writeafterread_otherval.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/benign_race_tests/fail/writeafterread_otherval.spv.dis @@ -5,8 +5,9 @@ ; Bound: 47 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %32 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "foo" %gl_LocalInvocationID %10 %14 %18 OpSource OpenCL_C 200 %33 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/benign_race_tests/fail/writetiddiv64_offbyone.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/benign_race_tests/fail/writetiddiv64_offbyone.spv.dis index 8c94c4cac1..f414286fb5 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/benign_race_tests/fail/writetiddiv64_offbyone.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/benign_race_tests/fail/writetiddiv64_offbyone.spv.dis @@ -5,8 +5,9 @@ ; Bound: 52 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %37 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "foo" %gl_LocalInvocationID %10 %14 %18 OpSource OpenCL_C 200 %38 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/benign_race_tests/fail/writewritearray_adversarial.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/benign_race_tests/fail/writewritearray_adversarial.spv.dis index adc42bfcf3..0eac3b5804 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/benign_race_tests/fail/writewritearray_adversarial.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/benign_race_tests/fail/writewritearray_adversarial.spv.dis @@ -5,8 +5,9 @@ ; Bound: 58 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %37 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %23 "foo" %8 %12 %16 %20 OpSource OpenCL_C 200 %38 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/benign_race_tests/fail/writezero_nobenign.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/benign_race_tests/fail/writezero_nobenign.spv.dis index d7aa67d2ac..57247288dd 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/benign_race_tests/fail/writezero_nobenign.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/benign_race_tests/fail/writezero_nobenign.spv.dis @@ -5,8 +5,9 @@ ; Bound: 32 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %20 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %15 "foo" %8 %12 OpSource OpenCL_C 200 %21 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/benign_race_tests/pass/writeafterread.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/benign_race_tests/pass/writeafterread.spv.dis index 5d349c8d5b..cbe281dc1a 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/benign_race_tests/pass/writeafterread.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/benign_race_tests/pass/writeafterread.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/benign_race_tests/pass/writeinloop.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/benign_race_tests/pass/writeinloop.spv.dis index e9e06b1758..1065265282 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/benign_race_tests/pass/writeinloop.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/benign_race_tests/pass/writeinloop.spv.dis @@ -5,8 +5,9 @@ ; Bound: 57 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %39 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %19 "foo" %8 %12 %16 OpSource OpenCL_C 200 %40 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/benign_race_tests/pass/writezero.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/benign_race_tests/pass/writezero.spv.dis index 5597fa1a94..cd6f12e2eb 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/benign_race_tests/pass/writezero.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/benign_race_tests/pass/writezero.spv.dis @@ -5,8 +5,9 @@ ; Bound: 32 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %20 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %15 "foo" %8 %12 OpSource OpenCL_C 200 %21 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/bitand.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/bitand.spv.dis index 4d83e11cb6..8eda228dd3 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/bitand.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/bitand.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/bitnot.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/bitnot.spv.dis index 4d83e11cb6..8eda228dd3 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/bitnot.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/bitnot.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/bitor.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/bitor.spv.dis index 4d83e11cb6..8eda228dd3 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/bitor.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/bitor.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/bitxor.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/bitxor.spv.dis index 4d83e11cb6..8eda228dd3 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/bitxor.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/bitxor.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/bool_bv_test.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/bool_bv_test.spv.dis index 31e32b91a4..26d3a88f69 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/bool_bv_test.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/bool_bv_test.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/casttofloat.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/casttofloat.spv.dis index 4d83e11cb6..8eda228dd3 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/casttofloat.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/casttofloat.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/ceil.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/ceil.spv.dis index d2262d8974..680adfc4dd 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/ceil.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/ceil.spv.dis @@ -6,9 +6,10 @@ ; Bound: 40 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %28 = OpExtInstImport "GLSL.std.450" %30 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %19 "test" %gl_LocalInvocationID %10 %16 OpSource OpenCL_C 200 %31 = OpString "test" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/checkarrays/fail/arraydoesnotexist1.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/checkarrays/fail/arraydoesnotexist1.spv.dis index d2349d29f4..0d4103496a 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/checkarrays/fail/arraydoesnotexist1.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/checkarrays/fail/arraydoesnotexist1.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/checkarrays/fail/arraydoesnotexist2.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/checkarrays/fail/arraydoesnotexist2.spv.dis index 7df43d526d..6c6a241e17 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/checkarrays/fail/arraydoesnotexist2.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/checkarrays/fail/arraydoesnotexist2.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/checkarrays/pass/specifyall.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/checkarrays/pass/specifyall.spv.dis index b8513645d4..1a569cf74c 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/checkarrays/pass/specifyall.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/checkarrays/pass/specifyall.spv.dis @@ -7,8 +7,9 @@ ; Bound: 63 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %48 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %22 "foo" %gl_GlobalInvocationID %gl_LocalInvocationID %14 %18 %19 %5 OpSource OpenCL_C 200 %49 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/conditional_int_test.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/conditional_int_test.spv.dis index 76fefda694..c978e87227 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/conditional_int_test.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/conditional_int_test.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/constantnotparam.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/constantnotparam.spv.dis index 170897f5db..c73a94ab7a 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/constantnotparam.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/constantnotparam.spv.dis @@ -5,8 +5,9 @@ ; Bound: 43 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %4 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %23 "foo" %3 %16 %21 OpSource OpenCL_C 200 %34 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/derived_from_uniformity_analysis_bug.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/derived_from_uniformity_analysis_bug.spv.dis index 894e0e2bf1..5674f2fd7b 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/derived_from_uniformity_analysis_bug.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/derived_from_uniformity_analysis_bug.spv.dis @@ -5,8 +5,9 @@ ; Bound: 23 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %15 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %13 "foo" %gl_LocalInvocationID %10 OpSource OpenCL_C 200 %16 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/derivedfrombinomialoptions.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/derivedfrombinomialoptions.spv.dis index 19f971d505..b9a49e9aa5 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/derivedfrombinomialoptions.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/derivedfrombinomialoptions.spv.dis @@ -9,8 +9,9 @@ ; Bound: 76 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %51 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %25 "binomial_options_kernel" %gl_GlobalInvocationID %gl_LocalInvocationID %14 %19 %20 %21 %22 %5 OpSource OpenCL_C 200 %52 = OpString "binomial_options_kernel" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/derivedfrombinomialoptions2.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/derivedfrombinomialoptions2.spv.dis index 95812a733f..22a663d870 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/derivedfrombinomialoptions2.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/derivedfrombinomialoptions2.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "binomial_options_kernel" %8 OpSource OpenCL_C 200 %14 = OpString "binomial_options_kernel" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/divergence/race_and_divergence.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/divergence/race_and_divergence.spv.dis index 43c05bda14..996486e756 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/divergence/race_and_divergence.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/divergence/race_and_divergence.spv.dis @@ -7,8 +7,9 @@ ; Bound: 58 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %44 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "foo" %gl_GlobalInvocationID %13 %17 %18 %5 OpSource OpenCL_C 200 %45 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/divergence/race_no_divergence.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/divergence/race_no_divergence.spv.dis index 1c973404e9..704b345acb 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/divergence/race_no_divergence.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/divergence/race_no_divergence.spv.dis @@ -7,8 +7,9 @@ ; Bound: 51 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %37 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "foo" %gl_GlobalInvocationID %13 %17 %18 %5 OpSource OpenCL_C 200 %38 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/fail_equality_and_adversarial.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/fail_equality_and_adversarial.spv.dis index 4d83e11cb6..8eda228dd3 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/fail_equality_and_adversarial.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/fail_equality_and_adversarial.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/float_constant_test2.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/float_constant_test2.spv.dis index 4d83e11cb6..8eda228dd3 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/float_constant_test2.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/float_constant_test2.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/floatcastrequired.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/floatcastrequired.spv.dis index 17e6954ee5..96d84b1cea 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/floatcastrequired.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/floatcastrequired.spv.dis @@ -5,8 +5,9 @@ ; Bound: 25 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %17 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %18 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/floatrelationalop.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/floatrelationalop.spv.dis index 4d83e11cb6..8eda228dd3 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/floatrelationalop.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/floatrelationalop.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/get_global_id.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/get_global_id.spv.dis index a6d209f747..461f58a436 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/get_global_id.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/get_global_id.spv.dis @@ -6,8 +6,9 @@ ; Bound: 48 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %36 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "foo" %gl_GlobalInvocationID %13 %18 %5 OpSource OpenCL_C 200 %37 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/global_size/local_size_fail_divide_global_size.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/global_size/local_size_fail_divide_global_size.spv.dis index 4ae4bd5f0c..392d19a976 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/global_size/local_size_fail_divide_global_size.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/global_size/local_size_fail_divide_global_size.spv.dis @@ -6,8 +6,9 @@ ; Bound: 47 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %35 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %20 "a" %gl_GlobalInvocationID %13 %17 %5 OpSource OpenCL_C 200 %36 = OpString "a" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/global_size/mismatch_dims.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/global_size/mismatch_dims.spv.dis index 4ae4bd5f0c..392d19a976 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/global_size/mismatch_dims.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/global_size/mismatch_dims.spv.dis @@ -6,8 +6,9 @@ ; Bound: 47 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %35 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %20 "a" %gl_GlobalInvocationID %13 %17 %5 OpSource OpenCL_C 200 %36 = OpString "a" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/global_size/num_groups_and_global_size.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/global_size/num_groups_and_global_size.spv.dis index 4ae4bd5f0c..392d19a976 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/global_size/num_groups_and_global_size.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/global_size/num_groups_and_global_size.spv.dis @@ -6,8 +6,9 @@ ; Bound: 47 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %35 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %20 "a" %gl_GlobalInvocationID %13 %17 %5 OpSource OpenCL_C 200 %36 = OpString "a" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/globalarray/fail.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/globalarray/fail.spv.dis index 2fbdbffe62..df97a4f1df 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/globalarray/fail.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/globalarray/fail.spv.dis @@ -6,8 +6,9 @@ ; Bound: 53 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %41 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "globalarray" %gl_GlobalInvocationID %13 %18 %5 OpSource OpenCL_C 200 %42 = OpString "globalarray" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/globalarray/pass.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/globalarray/pass.spv.dis index a21eb97581..fe9b5b570f 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/globalarray/pass.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/globalarray/pass.spv.dis @@ -6,8 +6,9 @@ ; Bound: 53 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %41 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "globalarray" %gl_GlobalInvocationID %13 %18 %5 OpSource OpenCL_C 200 %42 = OpString "globalarray" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/imagetests/fail2dimagecopy.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/imagetests/fail2dimagecopy.spv.dis index 03d2160f9d..89aa3b4e91 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/imagetests/fail2dimagecopy.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/imagetests/fail2dimagecopy.spv.dis @@ -5,9 +5,10 @@ ; Bound: 73 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpCapability StorageImageWriteWithoutFormat %4 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %31 "k" %3 %gl_GlobalInvocationID %21 %25 %29 %13 OpSource OpenCL_C 200 %60 = OpString "k" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/imagetests/test2dimagecopy.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/imagetests/test2dimagecopy.spv.dis index 80d29bca59..69bfbd88d2 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/imagetests/test2dimagecopy.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/imagetests/test2dimagecopy.spv.dis @@ -5,9 +5,10 @@ ; Bound: 70 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpCapability StorageImageWriteWithoutFormat %4 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %31 "k" %3 %gl_GlobalInvocationID %21 %25 %29 %13 OpSource OpenCL_C 200 %57 = OpString "k" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/imagetests/testsampler.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/imagetests/testsampler.spv.dis index 926675a377..3fa8a11b57 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/imagetests/testsampler.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/imagetests/testsampler.spv.dis @@ -5,8 +5,9 @@ ; Bound: 64 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %50 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %24 "foo" %gl_GlobalInvocationID %13 %18 %21 %5 OpSource OpenCL_C 200 %51 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/imagetests/testsampler2.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/imagetests/testsampler2.spv.dis index 207824b428..2a43765d15 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/imagetests/testsampler2.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/imagetests/testsampler2.spv.dis @@ -5,8 +5,9 @@ ; Bound: 63 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %4 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %28 "foo" %3 %gl_GlobalInvocationID %21 %26 %13 OpSource OpenCL_C 200 %53 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/induction_variable.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/induction_variable.spv.dis index ac11046675..318579183d 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/induction_variable.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/induction_variable.spv.dis @@ -5,8 +5,9 @@ ; Bound: 89 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %77 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "foo" %8 %gl_LocalInvocationID %14 OpSource OpenCL_C 200 %78 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/bad_read_then_write.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/bad_read_then_write.spv.dis index 4857d7e22d..7979e114af 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/bad_read_then_write.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/bad_read_then_write.spv.dis @@ -5,8 +5,9 @@ ; Bound: 68 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %58 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "foo" %gl_LocalInvocationID %10 %14 OpSource OpenCL_C 200 %59 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/bad_write_then_read.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/bad_write_then_read.spv.dis index 68d70331a3..e6bd64aa5c 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/bad_write_then_read.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/bad_write_then_read.spv.dis @@ -5,8 +5,9 @@ ; Bound: 74 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %64 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "foo" %gl_LocalInvocationID %10 %14 OpSource OpenCL_C 200 %65 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/local_id.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/local_id.spv.dis index dd4f93db6e..8f942ec2f0 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/local_id.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/local_id.spv.dis @@ -6,8 +6,9 @@ ; Bound: 47 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %35 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "foo" %gl_LocalInvocationID %gl_WorkGroupID %14 %18 %5 OpSource OpenCL_C 200 %36 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/missing_global_barrier_flag.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/missing_global_barrier_flag.spv.dis index d86b94cc70..beba5741c7 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/missing_global_barrier_flag.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/missing_global_barrier_flag.spv.dis @@ -6,8 +6,9 @@ ; Bound: 68 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %58 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "foo" %gl_GlobalInvocationID %13 %gl_LocalInvocationID %18 %5 OpSource OpenCL_C 200 %59 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/missing_local_barrier_flag.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/missing_local_barrier_flag.spv.dis index 0c7ed7cd51..7650ea8a9f 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/missing_local_barrier_flag.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/missing_local_barrier_flag.spv.dis @@ -5,8 +5,9 @@ ; Bound: 59 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %47 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "foo" %gl_GlobalInvocationID %gl_LocalInvocationID %14 %18 %5 OpSource OpenCL_C 200 %48 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/missing_local_barrier_flag_2.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/missing_local_barrier_flag_2.spv.dis new file mode 100644 index 0000000000..4927124763 --- /dev/null +++ b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/missing_local_barrier_flag_2.spv.dis @@ -0,0 +1,83 @@ +; @Config: 3, 1, 3 +; SPIR-V +; Version: 1.6 +; Generator: Google Clspv; 0 +; Bound: 59 +; Schema: 0 + OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan + %47 = OpExtInstImport "NonSemantic.ClspvReflection.5" + OpEntryPoint GLCompute %21 "foo" %gl_GlobalInvocationID %gl_LocalInvocationID %14 %18 %5 + OpSource OpenCL_C 200 + %48 = OpString "foo" + %49 = OpString " __kernel" + %51 = OpString "p" + OpMemberDecorate %_struct_3 0 Offset 0 + OpDecorate %_struct_3 Block + OpDecorate %gl_GlobalInvocationID BuiltIn GlobalInvocationId + OpDecorate %gl_LocalInvocationID BuiltIn LocalInvocationId + OpDecorate %gl_WorkGroupSize BuiltIn WorkgroupSize + OpDecorate %15 SpecId 3 + OpDecorate %9 SpecId 0 + OpDecorate %10 SpecId 1 + OpDecorate %11 SpecId 2 + %uint = OpTypeInt 32 0 + %v3uint = OpTypeVector %uint 3 + %_struct_3 = OpTypeStruct %v3uint +%_ptr_PushConstant__struct_3 = OpTypePointer PushConstant %_struct_3 +%_ptr_Input_v3uint = OpTypePointer Input %v3uint + %9 = OpSpecConstant %uint 1 + %10 = OpSpecConstant %uint 1 + %11 = OpSpecConstant %uint 1 +%gl_WorkGroupSize = OpSpecConstantComposite %v3uint %9 %10 %11 +%_ptr_Private_v3uint = OpTypePointer Private %v3uint + %15 = OpSpecConstant %uint 1 +%_arr_uint_15 = OpTypeArray %uint %15 +%_ptr_Workgroup__arr_uint_15 = OpTypePointer Workgroup %_arr_uint_15 + %void = OpTypeVoid + %20 = OpTypeFunction %void +%_ptr_Input_uint = OpTypePointer Input %uint + %uint_0 = OpConstant %uint 0 +%_ptr_PushConstant_uint = OpTypePointer PushConstant %uint +%_ptr_Workgroup_uint = OpTypePointer Workgroup %uint + %uint_2 = OpConstant %uint 2 + %uint_72 = OpConstant %uint 72 + %uint_1 = OpConstant %uint 1 + %uint_3 = OpConstant %uint 3 + %uint_4 = OpConstant %uint 4 + %uint_12 = OpConstant %uint 12 + %5 = OpVariable %_ptr_PushConstant__struct_3 PushConstant +%gl_GlobalInvocationID = OpVariable %_ptr_Input_v3uint Input +%gl_LocalInvocationID = OpVariable %_ptr_Input_v3uint Input + %14 = OpVariable %_ptr_Private_v3uint Private %gl_WorkGroupSize + %18 = OpVariable %_ptr_Workgroup__arr_uint_15 Workgroup + %21 = OpFunction %void None %20 + %22 = OpLabel + %25 = OpAccessChain %_ptr_Input_uint %gl_GlobalInvocationID %uint_0 + %26 = OpLoad %uint %25 + %28 = OpAccessChain %_ptr_PushConstant_uint %5 %uint_0 %uint_0 + %29 = OpLoad %uint %28 + %30 = OpIAdd %uint %29 %26 + %31 = OpAccessChain %_ptr_Input_uint %gl_LocalInvocationID %uint_0 + %32 = OpLoad %uint %31 + %34 = OpAccessChain %_ptr_Workgroup_uint %18 %32 + OpStore %34 %30 NonPrivatePointer|MakePointerAvailable %uint_2 + OpControlBarrier %uint_2 %uint_2 %uint_72 + %37 = OpAccessChain %_ptr_Input_uint %gl_GlobalInvocationID %uint_0 + %38 = OpLoad %uint %37 + %39 = OpAccessChain %_ptr_PushConstant_uint %5 %uint_0 %uint_0 + %40 = OpLoad %uint %39 + %41 = OpIAdd %uint %40 %38 + %42 = OpAccessChain %_ptr_Input_uint %gl_LocalInvocationID %uint_0 + %43 = OpLoad %uint %42 + %45 = OpIAdd %uint %43 %uint_1 + %46 = OpAccessChain %_ptr_Workgroup_uint %18 %45 + OpStore %46 %41 NonPrivatePointer|MakePointerAvailable %uint_2 + OpReturn + OpFunctionEnd + %57 = OpExtInst %void %47 PushConstantRegionOffset %uint_0 %uint_12 + %50 = OpExtInst %void %47 Kernel %21 %48 %uint_1 %uint_0 %49 + %52 = OpExtInst %void %47 ArgumentInfo %51 + %55 = OpExtInst %void %47 ArgumentWorkgroup %50 %uint_0 %uint_3 %uint_4 %52 + %58 = OpExtInst %void %47 SpecConstantWorkgroupSize %uint_0 %uint_1 %uint_2 diff --git a/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/missing_local_barrier_flag_3.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/missing_local_barrier_flag_3.spv.dis new file mode 100644 index 0000000000..7a6b86bc52 --- /dev/null +++ b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/missing_local_barrier_flag_3.spv.dis @@ -0,0 +1,83 @@ +; @Config: 3, 1, 3 +; SPIR-V +; Version: 1.6 +; Generator: Google Clspv; 0 +; Bound: 59 +; Schema: 0 + OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan + %47 = OpExtInstImport "NonSemantic.ClspvReflection.5" + OpEntryPoint GLCompute %21 "foo" %gl_GlobalInvocationID %gl_LocalInvocationID %14 %18 %5 + OpSource OpenCL_C 200 + %48 = OpString "foo" + %49 = OpString " __kernel" + %51 = OpString "p" + OpMemberDecorate %_struct_3 0 Offset 0 + OpDecorate %_struct_3 Block + OpDecorate %gl_GlobalInvocationID BuiltIn GlobalInvocationId + OpDecorate %gl_LocalInvocationID BuiltIn LocalInvocationId + OpDecorate %gl_WorkGroupSize BuiltIn WorkgroupSize + OpDecorate %15 SpecId 3 + OpDecorate %9 SpecId 0 + OpDecorate %10 SpecId 1 + OpDecorate %11 SpecId 2 + %uint = OpTypeInt 32 0 + %v3uint = OpTypeVector %uint 3 + %_struct_3 = OpTypeStruct %v3uint +%_ptr_PushConstant__struct_3 = OpTypePointer PushConstant %_struct_3 +%_ptr_Input_v3uint = OpTypePointer Input %v3uint + %9 = OpSpecConstant %uint 1 + %10 = OpSpecConstant %uint 1 + %11 = OpSpecConstant %uint 1 +%gl_WorkGroupSize = OpSpecConstantComposite %v3uint %9 %10 %11 +%_ptr_Private_v3uint = OpTypePointer Private %v3uint + %15 = OpSpecConstant %uint 1 +%_arr_uint_15 = OpTypeArray %uint %15 +%_ptr_Workgroup__arr_uint_15 = OpTypePointer Workgroup %_arr_uint_15 + %void = OpTypeVoid + %20 = OpTypeFunction %void +%_ptr_Input_uint = OpTypePointer Input %uint + %uint_0 = OpConstant %uint 0 +%_ptr_PushConstant_uint = OpTypePointer PushConstant %uint +%_ptr_Workgroup_uint = OpTypePointer Workgroup %uint + %uint_2 = OpConstant %uint 2 + %uint_8264 = OpConstant %uint 8264 + %uint_1 = OpConstant %uint 1 + %uint_3 = OpConstant %uint 3 + %uint_4 = OpConstant %uint 4 + %uint_12 = OpConstant %uint 12 + %5 = OpVariable %_ptr_PushConstant__struct_3 PushConstant +%gl_GlobalInvocationID = OpVariable %_ptr_Input_v3uint Input +%gl_LocalInvocationID = OpVariable %_ptr_Input_v3uint Input + %14 = OpVariable %_ptr_Private_v3uint Private %gl_WorkGroupSize + %18 = OpVariable %_ptr_Workgroup__arr_uint_15 Workgroup + %21 = OpFunction %void None %20 + %22 = OpLabel + %25 = OpAccessChain %_ptr_Input_uint %gl_GlobalInvocationID %uint_0 + %26 = OpLoad %uint %25 + %28 = OpAccessChain %_ptr_PushConstant_uint %5 %uint_0 %uint_0 + %29 = OpLoad %uint %28 + %30 = OpIAdd %uint %29 %26 + %31 = OpAccessChain %_ptr_Input_uint %gl_LocalInvocationID %uint_0 + %32 = OpLoad %uint %31 + %34 = OpAccessChain %_ptr_Workgroup_uint %18 %32 + OpStore %34 %30 NonPrivatePointer + OpControlBarrier %uint_2 %uint_2 %uint_8264 + %37 = OpAccessChain %_ptr_Input_uint %gl_GlobalInvocationID %uint_0 + %38 = OpLoad %uint %37 + %39 = OpAccessChain %_ptr_PushConstant_uint %5 %uint_0 %uint_0 + %40 = OpLoad %uint %39 + %41 = OpIAdd %uint %40 %38 + %42 = OpAccessChain %_ptr_Input_uint %gl_LocalInvocationID %uint_0 + %43 = OpLoad %uint %42 + %45 = OpIAdd %uint %43 %uint_1 + %46 = OpAccessChain %_ptr_Workgroup_uint %18 %45 + OpStore %46 %41 NonPrivatePointer + OpReturn + OpFunctionEnd + %57 = OpExtInst %void %47 PushConstantRegionOffset %uint_0 %uint_12 + %50 = OpExtInst %void %47 Kernel %21 %48 %uint_1 %uint_0 %49 + %52 = OpExtInst %void %47 ArgumentInfo %51 + %55 = OpExtInst %void %47 ArgumentWorkgroup %50 %uint_0 %uint_3 %uint_4 %52 + %58 = OpExtInst %void %47 SpecConstantWorkgroupSize %uint_0 %uint_1 %uint_2 diff --git a/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/no_barrier_flags.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/no_barrier_flags.spv.dis index cacadc19f0..820394c5d8 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/no_barrier_flags.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/no_barrier_flags.spv.dis @@ -5,8 +5,9 @@ ; Bound: 59 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %47 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "foo" %gl_GlobalInvocationID %gl_LocalInvocationID %14 %18 %5 OpSource OpenCL_C 200 %48 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/sync.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/sync.spv.dis index e922f851ce..f05ea490f9 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/sync.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/sync.spv.dis @@ -6,8 +6,9 @@ ; Bound: 54 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %44 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %20 "foo" %gl_GlobalInvocationID %13 %17 %5 OpSource OpenCL_C 200 %45 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/sync_within_group_wrong_flag.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/sync_within_group_wrong_flag.spv.dis index d86b94cc70..beba5741c7 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/sync_within_group_wrong_flag.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/fail/sync_within_group_wrong_flag.spv.dis @@ -6,8 +6,9 @@ ; Bound: 68 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %58 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "foo" %gl_GlobalInvocationID %13 %gl_LocalInvocationID %18 %5 OpSource OpenCL_C 200 %59 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/pass/global_barrier.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/pass/global_barrier.spv.dis index eadd7d0a4c..888ce69dd6 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/pass/global_barrier.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/pass/global_barrier.spv.dis @@ -6,8 +6,9 @@ ; Bound: 68 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %58 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "foo" %gl_GlobalInvocationID %13 %gl_LocalInvocationID %18 %5 OpSource OpenCL_C 200 %59 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/pass/local_barrier_flag.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/pass/local_barrier_flag.spv.dis index e4bd89d90e..b479dbc6a1 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/pass/local_barrier_flag.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/pass/local_barrier_flag.spv.dis @@ -5,8 +5,9 @@ ; Bound: 59 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %47 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "foo" %gl_GlobalInvocationID %gl_LocalInvocationID %14 %18 %5 OpSource OpenCL_C 200 %48 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/pass/local_barrier_flag_2.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/pass/local_barrier_flag_2.spv.dis new file mode 100644 index 0000000000..d245e39873 --- /dev/null +++ b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/pass/local_barrier_flag_2.spv.dis @@ -0,0 +1,83 @@ +; @Config: 3, 1, 3 +; SPIR-V +; Version: 1.6 +; Generator: Google Clspv; 0 +; Bound: 59 +; Schema: 0 + OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan + %47 = OpExtInstImport "NonSemantic.ClspvReflection.5" + OpEntryPoint GLCompute %21 "foo" %gl_GlobalInvocationID %gl_LocalInvocationID %14 %18 %5 + OpSource OpenCL_C 200 + %48 = OpString "foo" + %49 = OpString " __kernel" + %51 = OpString "p" + OpMemberDecorate %_struct_3 0 Offset 0 + OpDecorate %_struct_3 Block + OpDecorate %gl_GlobalInvocationID BuiltIn GlobalInvocationId + OpDecorate %gl_LocalInvocationID BuiltIn LocalInvocationId + OpDecorate %gl_WorkGroupSize BuiltIn WorkgroupSize + OpDecorate %15 SpecId 3 + OpDecorate %9 SpecId 0 + OpDecorate %10 SpecId 1 + OpDecorate %11 SpecId 2 + %uint = OpTypeInt 32 0 + %v3uint = OpTypeVector %uint 3 + %_struct_3 = OpTypeStruct %v3uint +%_ptr_PushConstant__struct_3 = OpTypePointer PushConstant %_struct_3 +%_ptr_Input_v3uint = OpTypePointer Input %v3uint + %9 = OpSpecConstant %uint 1 + %10 = OpSpecConstant %uint 1 + %11 = OpSpecConstant %uint 1 +%gl_WorkGroupSize = OpSpecConstantComposite %v3uint %9 %10 %11 +%_ptr_Private_v3uint = OpTypePointer Private %v3uint + %15 = OpSpecConstant %uint 1 +%_arr_uint_15 = OpTypeArray %uint %15 +%_ptr_Workgroup__arr_uint_15 = OpTypePointer Workgroup %_arr_uint_15 + %void = OpTypeVoid + %20 = OpTypeFunction %void +%_ptr_Input_uint = OpTypePointer Input %uint + %uint_0 = OpConstant %uint 0 +%_ptr_PushConstant_uint = OpTypePointer PushConstant %uint +%_ptr_Workgroup_uint = OpTypePointer Workgroup %uint + %uint_2 = OpConstant %uint 2 + %uint_264 = OpConstant %uint 264 + %uint_1 = OpConstant %uint 1 + %uint_3 = OpConstant %uint 3 + %uint_4 = OpConstant %uint 4 + %uint_12 = OpConstant %uint 12 + %5 = OpVariable %_ptr_PushConstant__struct_3 PushConstant +%gl_GlobalInvocationID = OpVariable %_ptr_Input_v3uint Input +%gl_LocalInvocationID = OpVariable %_ptr_Input_v3uint Input + %14 = OpVariable %_ptr_Private_v3uint Private %gl_WorkGroupSize + %18 = OpVariable %_ptr_Workgroup__arr_uint_15 Workgroup + %21 = OpFunction %void None %20 + %22 = OpLabel + %25 = OpAccessChain %_ptr_Input_uint %gl_GlobalInvocationID %uint_0 + %26 = OpLoad %uint %25 + %28 = OpAccessChain %_ptr_PushConstant_uint %5 %uint_0 %uint_0 + %29 = OpLoad %uint %28 + %30 = OpIAdd %uint %29 %26 + %31 = OpAccessChain %_ptr_Input_uint %gl_LocalInvocationID %uint_0 + %32 = OpLoad %uint %31 + %34 = OpAccessChain %_ptr_Workgroup_uint %18 %32 + OpStore %34 %30 NonPrivatePointer|MakePointerAvailable %uint_2 + OpControlBarrier %uint_2 %uint_2 %uint_264 + %37 = OpAccessChain %_ptr_Input_uint %gl_GlobalInvocationID %uint_0 + %38 = OpLoad %uint %37 + %39 = OpAccessChain %_ptr_PushConstant_uint %5 %uint_0 %uint_0 + %40 = OpLoad %uint %39 + %41 = OpIAdd %uint %40 %38 + %42 = OpAccessChain %_ptr_Input_uint %gl_LocalInvocationID %uint_0 + %43 = OpLoad %uint %42 + %45 = OpIAdd %uint %43 %uint_1 + %46 = OpAccessChain %_ptr_Workgroup_uint %18 %45 + OpStore %46 %41 NonPrivatePointer|MakePointerAvailable %uint_2 + OpReturn + OpFunctionEnd + %57 = OpExtInst %void %47 PushConstantRegionOffset %uint_0 %uint_12 + %50 = OpExtInst %void %47 Kernel %21 %48 %uint_1 %uint_0 %49 + %52 = OpExtInst %void %47 ArgumentInfo %51 + %55 = OpExtInst %void %47 ArgumentWorkgroup %50 %uint_0 %uint_3 %uint_4 %52 + %58 = OpExtInst %void %47 SpecConstantWorkgroupSize %uint_0 %uint_1 %uint_2 diff --git a/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/pass/local_barrier_flag_3.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/pass/local_barrier_flag_3.spv.dis new file mode 100644 index 0000000000..6832387db7 --- /dev/null +++ b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/pass/local_barrier_flag_3.spv.dis @@ -0,0 +1,84 @@ +; @Config: 3, 1, 3 +; SPIR-V +; Version: 1.6 +; Generator: Google Clspv; 0 +; Bound: 59 +; Schema: 0 + OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan + %47 = OpExtInstImport "NonSemantic.ClspvReflection.5" + OpEntryPoint GLCompute %21 "foo" %gl_GlobalInvocationID %gl_LocalInvocationID %14 %18 %5 + OpSource OpenCL_C 200 + %48 = OpString "foo" + %49 = OpString " __kernel" + %51 = OpString "p" + OpMemberDecorate %_struct_3 0 Offset 0 + OpDecorate %_struct_3 Block + OpDecorate %gl_GlobalInvocationID BuiltIn GlobalInvocationId + OpDecorate %gl_LocalInvocationID BuiltIn LocalInvocationId + OpDecorate %gl_WorkGroupSize BuiltIn WorkgroupSize + OpDecorate %15 SpecId 3 + OpDecorate %9 SpecId 0 + OpDecorate %10 SpecId 1 + OpDecorate %11 SpecId 2 + %uint = OpTypeInt 32 0 + %v3uint = OpTypeVector %uint 3 + %_struct_3 = OpTypeStruct %v3uint +%_ptr_PushConstant__struct_3 = OpTypePointer PushConstant %_struct_3 +%_ptr_Input_v3uint = OpTypePointer Input %v3uint + %9 = OpSpecConstant %uint 1 + %10 = OpSpecConstant %uint 1 + %11 = OpSpecConstant %uint 1 +%gl_WorkGroupSize = OpSpecConstantComposite %v3uint %9 %10 %11 +%_ptr_Private_v3uint = OpTypePointer Private %v3uint + %15 = OpSpecConstant %uint 1 +%_arr_uint_15 = OpTypeArray %uint %15 +%_ptr_Workgroup__arr_uint_15 = OpTypePointer Workgroup %_arr_uint_15 + %void = OpTypeVoid + %20 = OpTypeFunction %void +%_ptr_Input_uint = OpTypePointer Input %uint + %uint_0 = OpConstant %uint 0 +%_ptr_PushConstant_uint = OpTypePointer PushConstant %uint +%_ptr_Workgroup_uint = OpTypePointer Workgroup %uint + %uint_2 = OpConstant %uint 2 + %uint_264 = OpConstant %uint 264 + %uint_8456 = OpConstant %uint 8456 + %uint_1 = OpConstant %uint 1 + %uint_3 = OpConstant %uint 3 + %uint_4 = OpConstant %uint 4 + %uint_12 = OpConstant %uint 12 + %5 = OpVariable %_ptr_PushConstant__struct_3 PushConstant +%gl_GlobalInvocationID = OpVariable %_ptr_Input_v3uint Input +%gl_LocalInvocationID = OpVariable %_ptr_Input_v3uint Input + %14 = OpVariable %_ptr_Private_v3uint Private %gl_WorkGroupSize + %18 = OpVariable %_ptr_Workgroup__arr_uint_15 Workgroup + %21 = OpFunction %void None %20 + %22 = OpLabel + %25 = OpAccessChain %_ptr_Input_uint %gl_GlobalInvocationID %uint_0 + %26 = OpLoad %uint %25 + %28 = OpAccessChain %_ptr_PushConstant_uint %5 %uint_0 %uint_0 + %29 = OpLoad %uint %28 + %30 = OpIAdd %uint %29 %26 + %31 = OpAccessChain %_ptr_Input_uint %gl_LocalInvocationID %uint_0 + %32 = OpLoad %uint %31 + %34 = OpAccessChain %_ptr_Workgroup_uint %18 %32 + OpStore %34 %30 NonPrivatePointer + OpControlBarrier %uint_2 %uint_2 %uint_8456 + %37 = OpAccessChain %_ptr_Input_uint %gl_GlobalInvocationID %uint_0 + %38 = OpLoad %uint %37 + %39 = OpAccessChain %_ptr_PushConstant_uint %5 %uint_0 %uint_0 + %40 = OpLoad %uint %39 + %41 = OpIAdd %uint %40 %38 + %42 = OpAccessChain %_ptr_Input_uint %gl_LocalInvocationID %uint_0 + %43 = OpLoad %uint %42 + %45 = OpIAdd %uint %43 %uint_1 + %46 = OpAccessChain %_ptr_Workgroup_uint %18 %45 + OpStore %46 %41 NonPrivatePointer + OpReturn + OpFunctionEnd + %57 = OpExtInst %void %47 PushConstantRegionOffset %uint_0 %uint_12 + %50 = OpExtInst %void %47 Kernel %21 %48 %uint_1 %uint_0 %49 + %52 = OpExtInst %void %47 ArgumentInfo %51 + %55 = OpExtInst %void %47 ArgumentWorkgroup %50 %uint_0 %uint_3 %uint_4 %52 + %58 = OpExtInst %void %47 SpecConstantWorkgroupSize %uint_0 %uint_1 %uint_2 diff --git a/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/pass/local_id_benign_write_write.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/pass/local_id_benign_write_write.spv.dis index 55f01e7f24..780880bd61 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/pass/local_id_benign_write_write.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/pass/local_id_benign_write_write.spv.dis @@ -6,8 +6,9 @@ ; Bound: 35 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %25 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "foo" %gl_LocalInvocationID %10 %14 OpSource OpenCL_C 200 %26 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/pass/pass_due_to_intra_group_flag.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/pass/pass_due_to_intra_group_flag.spv.dis index ab0ae83eb9..001a9ba2b8 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/pass/pass_due_to_intra_group_flag.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/pass/pass_due_to_intra_group_flag.spv.dis @@ -6,8 +6,9 @@ ; Bound: 47 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %35 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "foo" %gl_GlobalInvocationID %gl_LocalInvocationID %14 %18 %5 OpSource OpenCL_C 200 %36 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/pass/read_then_write.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/pass/read_then_write.spv.dis index df403ac10e..89d9b81d7d 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/pass/read_then_write.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/pass/read_then_write.spv.dis @@ -5,8 +5,9 @@ ; Bound: 73 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %63 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "foo" %gl_LocalInvocationID %10 %14 OpSource OpenCL_C 200 %64 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/pass/sync_within_group.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/pass/sync_within_group.spv.dis index eadd7d0a4c..888ce69dd6 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/pass/sync_within_group.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/pass/sync_within_group.spv.dis @@ -6,8 +6,9 @@ ; Bound: 68 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %58 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "foo" %gl_GlobalInvocationID %13 %gl_LocalInvocationID %18 %5 OpSource OpenCL_C 200 %59 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/pass/write_then_read.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/pass/write_then_read.spv.dis index d88bf51992..fafbbd4305 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/pass/write_then_read.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/inter_group_and_barrier_flag_tests/pass/write_then_read.spv.dis @@ -5,8 +5,9 @@ ; Bound: 73 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %63 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "foo" %gl_LocalInvocationID %10 %14 OpSource OpenCL_C 200 %64 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/k-induction/amazingreduction.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/k-induction/amazingreduction.spv.dis index bb95f050ca..e9bfdfe70a 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/k-induction/amazingreduction.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/k-induction/amazingreduction.spv.dis @@ -5,8 +5,9 @@ ; Bound: 72 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %63 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "foo" %8 %gl_LocalInvocationID %14 OpSource OpenCL_C 200 %64 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/leftshiftequals.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/leftshiftequals.spv.dis index 4d83e11cb6..8eda228dd3 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/leftshiftequals.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/leftshiftequals.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/localarrayaccess.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/localarrayaccess.spv.dis index 88feba962e..6b02c87bb8 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/localarrayaccess.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/localarrayaccess.spv.dis @@ -5,8 +5,9 @@ ; Bound: 24 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %17 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %13 "foo" %gl_LocalInvocationID %10 OpSource OpenCL_C 200 %18 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/localmultidimarraydecl.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/localmultidimarraydecl.spv.dis index 4d83e11cb6..8eda228dd3 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/localmultidimarraydecl.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/localmultidimarraydecl.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/mem_fence.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/mem_fence.spv.dis index 256c118aa2..45ab5c04c2 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/mem_fence.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/mem_fence.spv.dis @@ -5,8 +5,9 @@ ; Bound: 23 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %16 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %17 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/2d_array_race.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/2d_array_race.spv.dis index 182fb0bc7e..ac1775c502 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/2d_array_race.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/2d_array_race.spv.dis @@ -6,8 +6,9 @@ ; Bound: 77 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %64 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %26 "example" %6 %gl_GlobalInvocationID %gl_LocalInvocationID %19 %23 %10 OpSource OpenCL_C 200 %65 = OpString "example" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/4d_array_of_structs_race.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/4d_array_of_structs_race.spv.dis index f8dcdc64a3..e5479eaba2 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/4d_array_of_structs_race.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/4d_array_of_structs_race.spv.dis @@ -5,8 +5,9 @@ ; Bound: 28 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %18 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %16 "example" %gl_GlobalInvocationID %13 %5 OpSource OpenCL_C 200 %19 = OpString "example" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/4d_array_of_vectors_race.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/4d_array_of_vectors_race.spv.dis index f8cdbfc116..f75d2551d2 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/4d_array_of_vectors_race.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/4d_array_of_vectors_race.spv.dis @@ -6,8 +6,9 @@ ; Bound: 51 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %39 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %24 "example" %4 %gl_GlobalInvocationID %17 %21 %9 OpSource OpenCL_C 200 %40 = OpString "example" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/4d_array_race.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/4d_array_race.spv.dis index f8dcdc64a3..e5479eaba2 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/4d_array_race.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/4d_array_race.spv.dis @@ -5,8 +5,9 @@ ; Bound: 28 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %18 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %16 "example" %gl_GlobalInvocationID %13 %5 OpSource OpenCL_C 200 %19 = OpString "example" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/4d_array_with_casting.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/4d_array_with_casting.spv.dis index f8dcdc64a3..e5479eaba2 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/4d_array_with_casting.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/4d_array_with_casting.spv.dis @@ -5,8 +5,9 @@ ; Bound: 28 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %18 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %16 "example" %gl_GlobalInvocationID %13 %5 OpSource OpenCL_C 200 %19 = OpString "example" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/miscfail1.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/miscfail1.spv.dis index 37a84f697b..4597b28a0d 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/miscfail1.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/miscfail1.spv.dis @@ -5,8 +5,9 @@ ; Bound: 63 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %46 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %25 "foo" %gl_LocalInvocationID %10 %14 %18 %22 OpSource OpenCL_C 200 %47 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/miscfail10.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/miscfail10.spv.dis index ef1d416579..1baa91c2bd 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/miscfail10.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/miscfail10.spv.dis @@ -5,8 +5,9 @@ ; Bound: 22 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/miscfail3.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/miscfail3.spv.dis index 7121fcdebf..1e613d4ff0 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/miscfail3.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/miscfail3.spv.dis @@ -5,8 +5,9 @@ ; Bound: 47 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %35 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "foo" %gl_LocalInvocationID %10 %14 OpSource OpenCL_C 200 %36 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/miscfail8.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/miscfail8.spv.dis index 74faa361c3..f43f75416c 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/miscfail8.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/miscfail8.spv.dis @@ -5,8 +5,9 @@ ; Bound: 38 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %27 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "baz" %gl_LocalInvocationID %10 %14 OpSource OpenCL_C 200 %28 = OpString "baz" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/miscfail9.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/miscfail9.spv.dis index 862d7faeb4..c5407ad1e4 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/miscfail9.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/miscfail9.spv.dis @@ -6,9 +6,10 @@ ; Bound: 7117 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %184 = OpExtInstImport "GLSL.std.450" %7107 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "test" %gl_GlobalInvocationID %13 %18 %5 OpSource OpenCL_C 200 %7108 = OpString "test" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/struct_member_race.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/struct_member_race.spv.dis index f9240e0829..c3f75c4ca6 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/struct_member_race.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/struct_member_race.spv.dis @@ -6,8 +6,9 @@ ; Bound: 46 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %35 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "example" %gl_GlobalInvocationID %13 %18 %5 OpSource OpenCL_C 200 %36 = OpString "example" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/vector_element_race.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/vector_element_race.spv.dis index 40e2776785..ea8aed3bf2 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/vector_element_race.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/misc/fail/vector_element_race.spv.dis @@ -6,8 +6,9 @@ ; Bound: 50 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %38 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %22 "example" %gl_GlobalInvocationID %13 %19 %5 OpSource OpenCL_C 200 %39 = OpString "example" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/misc/pass/misc12.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/misc/pass/misc12.spv.dis index b794ebb6c3..a23f706c20 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/misc/pass/misc12.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/misc/pass/misc12.spv.dis @@ -5,8 +5,9 @@ ; Bound: 54 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %47 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %16 "foo" %gl_WorkGroupID %13 %5 OpSource OpenCL_C 200 %48 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/misc/pass/misc13.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/misc/pass/misc13.spv.dis index 46cfa81a68..4579a4d52b 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/misc/pass/misc13.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/misc/pass/misc13.spv.dis @@ -6,8 +6,9 @@ ; Bound: 44 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %33 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %20 "foo" %gl_GlobalInvocationID %13 %17 %5 OpSource OpenCL_C 200 %34 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/misc/pass/misc15.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/misc/pass/misc15.spv.dis index 9f2dc81678..67dbdc8a3e 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/misc/pass/misc15.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/misc/pass/misc15.spv.dis @@ -5,8 +5,9 @@ ; Bound: 66 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %52 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "foo" %gl_LocalInvocationID %10 %14 %18 OpSource OpenCL_C 200 %53 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/misc/pass/misc16.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/misc/pass/misc16.spv.dis index 83eec15674..dccb49fedf 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/misc/pass/misc16.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/misc/pass/misc16.spv.dis @@ -6,8 +6,9 @@ ; Bound: 1916 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %1902 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %971 "foo" %gl_GlobalInvocationID %13 %405 %771 %958 %963 %968 %5 OpSource OpenCL_C 200 %1903 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/misc/pass/misc2.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/misc/pass/misc2.spv.dis index a1b263296d..b0f61e2f68 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/misc/pass/misc2.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/misc/pass/misc2.spv.dis @@ -5,8 +5,9 @@ ; Bound: 51 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %41 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "foo" %gl_LocalInvocationID %10 %14 OpSource OpenCL_C 200 %42 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/misc/pass/misc3.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/misc/pass/misc3.spv.dis index 5a9fa3e081..8a7dd30972 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/misc/pass/misc3.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/misc/pass/misc3.spv.dis @@ -5,8 +5,9 @@ ; Bound: 23 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %15 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %13 "k" %gl_LocalInvocationID %10 OpSource OpenCL_C 200 %16 = OpString "k" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/misc/pass/misc4.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/misc/pass/misc4.spv.dis index 76fefda694..c978e87227 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/misc/pass/misc4.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/misc/pass/misc4.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/misc/pass/misc7.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/misc/pass/misc7.spv.dis index 91573a6515..b516516e32 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/misc/pass/misc7.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/misc/pass/misc7.spv.dis @@ -6,9 +6,10 @@ ; Bound: 87 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpCapability Float64 %65 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %31 "float_const" %gl_GlobalInvocationID %13 %18 %22 %27 %28 %5 OpSource OpenCL_C 200 %66 = OpString "float_const" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/misc/pass/misc8.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/misc/pass/misc8.spv.dis index ab502fbbaa..f8f7643b6b 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/misc/pass/misc8.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/misc/pass/misc8.spv.dis @@ -6,8 +6,9 @@ ; Bound: 59 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %47 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "foo" %gl_GlobalInvocationID %13 %18 %5 OpSource OpenCL_C 200 %48 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/modifyparam.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/modifyparam.spv.dis index 31e32b91a4..26d3a88f69 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/modifyparam.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/modifyparam.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/multidimarrays/test1.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/multidimarrays/test1.spv.dis index 4d83e11cb6..8eda228dd3 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/multidimarrays/test1.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/multidimarrays/test1.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/multidimarrays/test2.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/multidimarrays/test2.spv.dis index 8357c18766..189f30276b 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/multidimarrays/test2.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/multidimarrays/test2.spv.dis @@ -5,8 +5,9 @@ ; Bound: 23 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %15 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %13 "foo" %gl_LocalInvocationID %10 OpSource OpenCL_C 200 %16 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/multidimarrays/test3.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/multidimarrays/test3.spv.dis index 4d83e11cb6..8eda228dd3 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/multidimarrays/test3.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/multidimarrays/test3.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/multidimarrays/test4.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/multidimarrays/test4.spv.dis index 8357c18766..189f30276b 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/multidimarrays/test4.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/multidimarrays/test4.spv.dis @@ -5,8 +5,9 @@ ; Bound: 23 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %15 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %13 "foo" %gl_LocalInvocationID %10 OpSource OpenCL_C 200 %16 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/multidimarrays/test5.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/multidimarrays/test5.spv.dis index 99c1260c96..3beb619edd 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/multidimarrays/test5.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/multidimarrays/test5.spv.dis @@ -6,8 +6,9 @@ ; Bound: 30 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %20 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %15 "foo" %8 %12 OpSource OpenCL_C 200 %21 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/multiplelocals.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/multiplelocals.spv.dis index 31e32b91a4..26d3a88f69 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/multiplelocals.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/multiplelocals.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/multiplelocals2.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/multiplelocals2.spv.dis index 4d83e11cb6..8eda228dd3 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/multiplelocals2.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/multiplelocals2.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/no_log/pass.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/no_log/pass.spv.dis index 23758790e6..dc01812f18 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/no_log/pass.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/no_log/pass.spv.dis @@ -5,8 +5,9 @@ ; Bound: 37 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %25 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "foo" %gl_LocalInvocationID %10 %14 OpSource OpenCL_C 200 %26 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/noraceduetoreturn.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/noraceduetoreturn.spv.dis index 355fecbb81..bb4d300e39 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/noraceduetoreturn.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/noraceduetoreturn.spv.dis @@ -5,8 +5,9 @@ ; Bound: 46 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %35 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %18 "foo" %gl_LocalInvocationID %10 %15 OpSource OpenCL_C 200 %36 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/notunaryoptest.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/notunaryoptest.spv.dis index 4d83e11cb6..8eda228dd3 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/notunaryoptest.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/notunaryoptest.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/null_pointers/atomic_null.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/null_pointers/atomic_null.spv.dis index 793cf7d620..0402edd2a1 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/null_pointers/atomic_null.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/null_pointers/atomic_null.spv.dis @@ -5,9 +5,10 @@ ; Bound: 25 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpCapability VariablePointersStorageBuffer %18 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %19 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/null_pointers/load_from_null.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/null_pointers/load_from_null.spv.dis index 6510f35994..ffcf76db41 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/null_pointers/load_from_null.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/null_pointers/load_from_null.spv.dis @@ -5,8 +5,9 @@ ; Bound: 28 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %18 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %16 "foo" %gl_GlobalInvocationID %13 %5 OpSource OpenCL_C 200 %19 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/null_pointers/null_pointer_assignment_equal.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/null_pointers/null_pointer_assignment_equal.spv.dis index 77108c2ce2..d27c840670 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/null_pointers/null_pointer_assignment_equal.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/null_pointers/null_pointer_assignment_equal.spv.dis @@ -6,8 +6,9 @@ ; Bound: 69 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %53 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "foo" %gl_GlobalInvocationID %10 %18 %14 OpSource OpenCL_C 200 %54 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/null_pointers/null_pointer_assignment_unequal.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/null_pointers/null_pointer_assignment_unequal.spv.dis index a93584cc3c..30b6923a90 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/null_pointers/null_pointer_assignment_unequal.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/null_pointers/null_pointer_assignment_unequal.spv.dis @@ -6,8 +6,9 @@ ; Bound: 69 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %53 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "foo" %gl_GlobalInvocationID %10 %18 %14 OpSource OpenCL_C 200 %54 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/null_pointers/null_pointer_greater.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/null_pointers/null_pointer_greater.spv.dis index 1bdd989cae..2c9a52cdb9 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/null_pointers/null_pointer_greater.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/null_pointers/null_pointer_greater.spv.dis @@ -6,8 +6,9 @@ ; Bound: 70 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %53 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "foo" %gl_GlobalInvocationID %10 %18 %14 OpSource OpenCL_C 200 %54 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/null_pointers/store_to_null_and_non_null.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/null_pointers/store_to_null_and_non_null.spv.dis index d8711b9140..c85189e187 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/null_pointers/store_to_null_and_non_null.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/null_pointers/store_to_null_and_non_null.spv.dis @@ -6,9 +6,10 @@ ; Bound: 53 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpCapability VariablePointersStorageBuffer %41 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %20 "foo" %gl_GlobalInvocationID %13 %17 %5 OpSource OpenCL_C 200 %42 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/null_statement.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/null_statement.spv.dis index 4d83e11cb6..8eda228dd3 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/null_statement.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/null_statement.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/pointeranalysistests/manyprocedures.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/pointeranalysistests/manyprocedures.spv.dis index 689e475482..89f254981f 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/pointeranalysistests/manyprocedures.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/pointeranalysistests/manyprocedures.spv.dis @@ -11,10 +11,11 @@ ; Bound: 191 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpCapability VariablePointersStorageBuffer OpCapability VariablePointers %157 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %27 "foo" %gl_GlobalInvocationID %10 %19 %20 %21 %22 %23 %24 %14 OpSource OpenCL_C 200 %158 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/pointeranalysistests/manyproceduresinlined.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/pointeranalysistests/manyproceduresinlined.spv.dis index 689e475482..89f254981f 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/pointeranalysistests/manyproceduresinlined.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/pointeranalysistests/manyproceduresinlined.spv.dis @@ -11,10 +11,11 @@ ; Bound: 191 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpCapability VariablePointersStorageBuffer OpCapability VariablePointers %157 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %27 "foo" %gl_GlobalInvocationID %10 %19 %20 %21 %22 %23 %24 %14 OpSource OpenCL_C 200 %158 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/pointeranalysistests/testbasicaliasing.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/pointeranalysistests/testbasicaliasing.spv.dis index b4de5704e6..9c11b83425 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/pointeranalysistests/testbasicaliasing.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/pointeranalysistests/testbasicaliasing.spv.dis @@ -7,8 +7,9 @@ ; Bound: 79 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %66 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %22 "foo" %gl_GlobalInvocationID %13 %18 %19 %5 OpSource OpenCL_C 200 %67 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/pointeranalysistests/testbasicaliasing2.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/pointeranalysistests/testbasicaliasing2.spv.dis index abb904323e..0717a4770e 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/pointeranalysistests/testbasicaliasing2.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/pointeranalysistests/testbasicaliasing2.spv.dis @@ -5,8 +5,9 @@ ; Bound: 72 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %59 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %22 "foo" %gl_LocalInvocationID %10 %15 %19 OpSource OpenCL_C 200 %60 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/pointeranalysistests/testbasicpointerarithmetic.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/pointeranalysistests/testbasicpointerarithmetic.spv.dis index 108f06aefb..98db56a4b8 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/pointeranalysistests/testbasicpointerarithmetic.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/pointeranalysistests/testbasicpointerarithmetic.spv.dis @@ -6,8 +6,9 @@ ; Bound: 60 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %49 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "foo" %gl_GlobalInvocationID %13 %18 %5 OpSource OpenCL_C 200 %50 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/pointeranalysistests/testbasicpointerarithmetic2.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/pointeranalysistests/testbasicpointerarithmetic2.spv.dis index 9950ffb17a..d08e86e5dc 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/pointeranalysistests/testbasicpointerarithmetic2.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/pointeranalysistests/testbasicpointerarithmetic2.spv.dis @@ -5,8 +5,9 @@ ; Bound: 53 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %42 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %18 "foo" %gl_LocalInvocationID %10 %15 OpSource OpenCL_C 200 %43 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/pointeranalysistests/testinterprocedural.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/pointeranalysistests/testinterprocedural.spv.dis index 3697631dfc..c7c2148a2b 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/pointeranalysistests/testinterprocedural.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/pointeranalysistests/testinterprocedural.spv.dis @@ -7,8 +7,9 @@ ; Bound: 76 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %62 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %22 "foo" %gl_GlobalInvocationID %13 %18 %19 %5 OpSource OpenCL_C 200 %63 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/pointertests/param_addressof.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/pointertests/param_addressof.spv.dis index 76fefda694..c978e87227 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/pointertests/param_addressof.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/pointertests/param_addressof.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/pointertests/pointerarith.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/pointertests/pointerarith.spv.dis index 76fefda694..c978e87227 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/pointertests/pointerarith.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/pointertests/pointerarith.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/pointertests/test_copy_between_memory_spaces.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/pointertests/test_copy_between_memory_spaces.spv.dis index 49f6051cac..2458afc9ce 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/pointertests/test_copy_between_memory_spaces.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/pointertests/test_copy_between_memory_spaces.spv.dis @@ -5,8 +5,9 @@ ; Bound: 22 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %15 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %16 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/pointertests/test_copy_between_memory_spaces2.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/pointertests/test_copy_between_memory_spaces2.spv.dis index a29a9dad4b..50336d9755 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/pointertests/test_copy_between_memory_spaces2.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/pointertests/test_copy_between_memory_spaces2.spv.dis @@ -6,8 +6,9 @@ ; Bound: 52 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %38 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %20 "foo" %8 %13 %17 OpSource OpenCL_C 200 %39 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/pointertests/test_derived_from_binomial_opts.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/pointertests/test_derived_from_binomial_opts.spv.dis index 157d026fe4..08fa2175a4 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/pointertests/test_derived_from_binomial_opts.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/pointertests/test_derived_from_binomial_opts.spv.dis @@ -5,8 +5,9 @@ ; Bound: 30 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %19 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "binomial_options_kernel" %gl_LocalInvocationID %gl_WorkGroupID %14 %5 OpSource OpenCL_C 200 %20 = OpString "binomial_options_kernel" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/pointertests/test_opencl_local_array.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/pointertests/test_opencl_local_array.spv.dis index 4d83e11cb6..8eda228dd3 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/pointertests/test_opencl_local_array.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/pointertests/test_opencl_local_array.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/pointertests/test_opencl_local_param.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/pointertests/test_opencl_local_param.spv.dis index 76fefda694..c978e87227 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/pointertests/test_opencl_local_param.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/pointertests/test_opencl_local_param.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/pointertests/test_pass_value_from_array.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/pointertests/test_pass_value_from_array.spv.dis index 31e32b91a4..26d3a88f69 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/pointertests/test_pass_value_from_array.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/pointertests/test_pass_value_from_array.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/pointertests/test_return_pointer.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/pointertests/test_return_pointer.spv.dis index 9b890b5074..f18ce0600f 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/pointertests/test_return_pointer.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/pointertests/test_return_pointer.spv.dis @@ -5,8 +5,9 @@ ; Bound: 37 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %25 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "foo" %gl_LocalInvocationID %10 %14 OpSource OpenCL_C 200 %26 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/pow2/64bit_loopcounter.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/pow2/64bit_loopcounter.spv.dis index e380cf0051..a6066f771d 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/pow2/64bit_loopcounter.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/pow2/64bit_loopcounter.spv.dis @@ -6,10 +6,11 @@ ; Bound: 75 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpCapability Float64 OpCapability Int64 %59 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %22 "foo" %gl_GlobalInvocationID %10 %19 %14 OpSource OpenCL_C 200 %60 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/pow2/64bit_relational.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/pow2/64bit_relational.spv.dis index e380cf0051..a6066f771d 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/pow2/64bit_relational.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/pow2/64bit_relational.spv.dis @@ -6,10 +6,11 @@ ; Bound: 75 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpCapability Float64 OpCapability Int64 %59 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %22 "foo" %gl_GlobalInvocationID %10 %19 %14 OpSource OpenCL_C 200 %60 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/predicated_undef.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/predicated_undef.spv.dis index fb765d65c4..09b3d1e005 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/predicated_undef.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/predicated_undef.spv.dis @@ -5,8 +5,9 @@ ; Bound: 23 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %15 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %13 "k" %gl_LocalInvocationID %10 OpSource OpenCL_C 200 %16 = OpString "k" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/reducedstrength_generalised.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/reducedstrength_generalised.spv.dis index 41736e2855..c3137d0977 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/reducedstrength_generalised.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/reducedstrength_generalised.spv.dis @@ -5,8 +5,9 @@ ; Bound: 76 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %64 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "foo" %8 %gl_LocalInvocationID %14 OpSource OpenCL_C 200 %65 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/reducedstrengthnonloopbug.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/reducedstrengthnonloopbug.spv.dis index 5c19f88591..4244b51b96 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/reducedstrengthnonloopbug.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/reducedstrengthnonloopbug.spv.dis @@ -5,8 +5,9 @@ ; Bound: 23 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %15 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %13 "foo" %8 %gl_LocalInvocationID OpSource OpenCL_C 200 %16 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/report_global_id/test1.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/report_global_id/test1.spv.dis index 38ab266396..1bfb15606f 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/report_global_id/test1.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/report_global_id/test1.spv.dis @@ -6,8 +6,9 @@ ; Bound: 119 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %104 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "foo" %gl_GlobalInvocationID %10 %18 %14 OpSource OpenCL_C 200 %105 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/report_global_id/test2.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/report_global_id/test2.spv.dis index 069b9d91c7..935cbbffca 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/report_global_id/test2.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/report_global_id/test2.spv.dis @@ -6,8 +6,9 @@ ; Bound: 79 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %63 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "foo" %gl_GlobalInvocationID %10 %18 %14 OpSource OpenCL_C 200 %64 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/return_tests/id_dependent_return.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/return_tests/id_dependent_return.spv.dis index 894e0e2bf1..5674f2fd7b 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/return_tests/id_dependent_return.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/return_tests/id_dependent_return.spv.dis @@ -5,8 +5,9 @@ ; Bound: 23 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %15 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %13 "foo" %gl_LocalInvocationID %10 OpSource OpenCL_C 200 %16 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/return_tests/multiloop_return.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/return_tests/multiloop_return.spv.dis index 8357c18766..189f30276b 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/return_tests/multiloop_return.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/return_tests/multiloop_return.spv.dis @@ -5,8 +5,9 @@ ; Bound: 23 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %15 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %13 "foo" %gl_LocalInvocationID %10 OpSource OpenCL_C 200 %16 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/return_tests/multiloop_return_simplified.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/return_tests/multiloop_return_simplified.spv.dis index 411b6e8e57..05e7856ce0 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/return_tests/multiloop_return_simplified.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/return_tests/multiloop_return_simplified.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "bar" %8 OpSource OpenCL_C 200 %14 = OpString "bar" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/return_tests/simple_return.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/return_tests/simple_return.spv.dis index 894e0e2bf1..5674f2fd7b 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/return_tests/simple_return.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/return_tests/simple_return.spv.dis @@ -5,8 +5,9 @@ ; Bound: 23 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %15 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %13 "foo" %gl_LocalInvocationID %10 OpSource OpenCL_C 200 %16 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/rightshiftequals.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/rightshiftequals.spv.dis index 4d83e11cb6..8eda228dd3 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/rightshiftequals.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/rightshiftequals.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/saturate/sadd.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/saturate/sadd.spv.dis index 703ce55b4f..83921b68f0 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/saturate/sadd.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/saturate/sadd.spv.dis @@ -7,8 +7,9 @@ ; Bound: 62 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %47 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "test" %gl_GlobalInvocationID %13 %17 %18 %5 OpSource OpenCL_C 200 %48 = OpString "test" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/saturate/ssub.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/saturate/ssub.spv.dis index c7b255df1f..316296fdeb 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/saturate/ssub.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/saturate/ssub.spv.dis @@ -7,8 +7,9 @@ ; Bound: 62 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %47 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "test" %gl_GlobalInvocationID %13 %17 %18 %5 OpSource OpenCL_C 200 %48 = OpString "test" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/saturate/uadd.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/saturate/uadd.spv.dis index 0da179c8a0..f046e1d09d 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/saturate/uadd.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/saturate/uadd.spv.dis @@ -7,8 +7,9 @@ ; Bound: 60 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %45 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "test" %gl_GlobalInvocationID %13 %17 %18 %5 OpSource OpenCL_C 200 %46 = OpString "test" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/saturate/usub.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/saturate/usub.spv.dis index 237860087f..4c35ddab24 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/saturate/usub.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/saturate/usub.spv.dis @@ -7,8 +7,9 @@ ; Bound: 59 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %44 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "test" %gl_GlobalInvocationID %13 %17 %18 %5 OpSource OpenCL_C 200 %45 = OpString "test" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/shared_int.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/shared_int.spv.dis index 8357c18766..189f30276b 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/shared_int.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/shared_int.spv.dis @@ -5,8 +5,9 @@ ; Bound: 23 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %15 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %13 "foo" %gl_LocalInvocationID %10 OpSource OpenCL_C 200 %16 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/shuffle/shuffle.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/shuffle/shuffle.spv.dis index e45a5ed68e..4530847cb1 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/shuffle/shuffle.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/shuffle/shuffle.spv.dis @@ -6,8 +6,9 @@ ; Bound: 79 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %65 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %22 "test" %gl_GlobalInvocationID %10 %19 %14 OpSource OpenCL_C 200 %66 = OpString "test" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/simplebinomialoptions.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/simplebinomialoptions.spv.dis index 312f3c735a..5bf70e5b28 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/simplebinomialoptions.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/simplebinomialoptions.spv.dis @@ -8,9 +8,10 @@ ; Bound: 170 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %85 = OpExtInstImport "GLSL.std.450" %153 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %29 "binomial_options_kernel" %6 %7 %gl_LocalInvocationID %gl_WorkGroupID %20 %24 %25 %26 %11 OpSource OpenCL_C 200 %154 = OpString "binomial_options_kernel" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/simpleparampassing.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/simpleparampassing.spv.dis index 4d83e11cb6..8eda228dd3 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/simpleparampassing.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/simpleparampassing.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/simpleprocedurecall.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/simpleprocedurecall.spv.dis index 4d83e11cb6..8eda228dd3 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/simpleprocedurecall.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/simpleprocedurecall.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/simplereturn.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/simplereturn.spv.dis index 4d83e11cb6..8eda228dd3 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/simplereturn.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/simplereturn.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/skeletonbinomialoptions.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/skeletonbinomialoptions.spv.dis index 4bbccaa4b8..4850b990e5 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/skeletonbinomialoptions.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/skeletonbinomialoptions.spv.dis @@ -5,8 +5,9 @@ ; Bound: 58 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %52 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "binomial_options_kernel" %8 OpSource OpenCL_C 200 %53 = OpString "binomial_options_kernel" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/barrier_divergence/fail.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/barrier_divergence/fail.spv.dis index adc6a9c531..6439dffd2a 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/barrier_divergence/fail.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/barrier_divergence/fail.spv.dis @@ -5,8 +5,9 @@ ; Bound: 47 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %37 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "foo" %gl_LocalInvocationID %10 %14 OpSource OpenCL_C 200 %38 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/barrier_divergence/pass.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/barrier_divergence/pass.spv.dis index c3db1ad1d9..198a8571b3 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/barrier_divergence/pass.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/barrier_divergence/pass.spv.dis @@ -5,8 +5,9 @@ ; Bound: 48 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %34 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "foo" %gl_LocalInvocationID %10 %14 %18 OpSource OpenCL_C 200 %35 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/needs_source_location_ensures.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/needs_source_location_ensures.spv.dis index 13ed74dfa1..e54b0c9eb7 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/needs_source_location_ensures.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/needs_source_location_ensures.spv.dis @@ -6,8 +6,9 @@ ; Bound: 52 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %40 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %20 "foo" %gl_GlobalInvocationID %13 %17 %5 OpSource OpenCL_C 200 %41 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/needs_source_location_requires.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/needs_source_location_requires.spv.dis index 3ef2d61b30..2d0b38e851 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/needs_source_location_requires.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/needs_source_location_requires.spv.dis @@ -6,8 +6,9 @@ ; Bound: 52 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %40 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %20 "foo" %gl_GlobalInvocationID %13 %17 %5 OpSource OpenCL_C 200 %41 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/race_from_call.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/race_from_call.spv.dis index 74faa361c3..f43f75416c 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/race_from_call.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/race_from_call.spv.dis @@ -5,8 +5,9 @@ ; Bound: 38 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %27 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "baz" %gl_LocalInvocationID %10 %14 OpSource OpenCL_C 200 %28 = OpString "baz" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/race_from_call_in_loop.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/race_from_call_in_loop.spv.dis index 4f9a9a9c50..e41926db71 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/race_from_call_in_loop.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/race_from_call_in_loop.spv.dis @@ -5,8 +5,9 @@ ; Bound: 38 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %27 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "bar" %gl_LocalInvocationID %10 %14 OpSource OpenCL_C 200 %28 = OpString "bar" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/race_with_loop.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/race_with_loop.spv.dis index 51933401d2..5cb5cbdb78 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/race_with_loop.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/race_with_loop.spv.dis @@ -5,8 +5,9 @@ ; Bound: 55 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %44 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "foo" %gl_LocalInvocationID %10 %14 OpSource OpenCL_C 200 %45 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/races/fail/read_write.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/races/fail/read_write.spv.dis index e3b5fbe370..c05b4fa894 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/races/fail/read_write.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/races/fail/read_write.spv.dis @@ -7,8 +7,9 @@ ; Bound: 50 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %35 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "foo" %gl_LocalInvocationID %10 %14 %18 OpSource OpenCL_C 200 %36 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/races/fail/write_read.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/races/fail/write_read.spv.dis index dcd292d71e..680c0d8851 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/races/fail/write_read.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/races/fail/write_read.spv.dis @@ -6,8 +6,9 @@ ; Bound: 47 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %33 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "foo" %gl_LocalInvocationID %10 %14 %18 OpSource OpenCL_C 200 %34 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/races/fail/write_write/elem_width_16.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/races/fail/write_write/elem_width_16.spv.dis index 99d39f8556..b7cb0bf0a9 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/races/fail/write_write/elem_width_16.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/races/fail/write_write/elem_width_16.spv.dis @@ -6,9 +6,10 @@ ; Bound: 38 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpCapability Int16 %28 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %18 "foo" %gl_LocalInvocationID %10 %15 OpSource OpenCL_C 200 %29 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/races/fail/write_write/loop.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/races/fail/write_write/loop.spv.dis index 1b34fdf3b7..54e65e489c 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/races/fail/write_write/loop.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/races/fail/write_write/loop.spv.dis @@ -6,8 +6,9 @@ ; Bound: 75 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %65 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "foo" %gl_LocalInvocationID %10 %14 OpSource OpenCL_C 200 %66 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/races/fail/write_write/normal.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/races/fail/write_write/normal.spv.dis index 180347cfda..96675abd9b 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/races/fail/write_write/normal.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/races/fail/write_write/normal.spv.dis @@ -7,8 +7,9 @@ ; Bound: 46 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %34 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "foo" %gl_LocalInvocationID %10 %14 OpSource OpenCL_C 200 %35 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/races/pass/no_race.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/races/pass/no_race.spv.dis index fcefc98b74..28c1027086 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/races/pass/no_race.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/races/pass/no_race.spv.dis @@ -5,8 +5,9 @@ ; Bound: 77 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %58 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %25 "foo" %gl_LocalInvocationID %10 %14 %18 %22 OpSource OpenCL_C 200 %59 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/races/pass/read_read.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/races/pass/read_read.spv.dis index 018913df6e..1f1953441b 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/races/pass/read_read.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/races/pass/read_read.spv.dis @@ -5,8 +5,9 @@ ; Bound: 59 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %40 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %25 "foo" %gl_LocalInvocationID %10 %14 %18 %22 OpSource OpenCL_C 200 %41 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/races_from_indirect_calls.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/races_from_indirect_calls.spv.dis index 74faa361c3..f43f75416c 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/races_from_indirect_calls.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/sourcelocation_tests/races_from_indirect_calls.spv.dis @@ -5,8 +5,9 @@ ; Bound: 38 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %27 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "baz" %gl_LocalInvocationID %10 %14 OpSource OpenCL_C 200 %28 = OpString "baz" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/ternarytest.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/ternarytest.spv.dis index 0e51e99625..b98b487dbc 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/ternarytest.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/ternarytest.spv.dis @@ -5,8 +5,9 @@ ; Bound: 43 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %32 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %18 "foo" %gl_LocalInvocationID %10 %15 OpSource OpenCL_C 200 %33 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/ternarytest2.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/ternarytest2.spv.dis index 0e51e99625..b98b487dbc 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/ternarytest2.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/ternarytest2.spv.dis @@ -5,8 +5,9 @@ ; Bound: 43 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %32 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %18 "foo" %gl_LocalInvocationID %10 %15 OpSource OpenCL_C 200 %33 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/test_2d_global_index_inference.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/test_2d_global_index_inference.spv.dis index 4222b1cccf..c9eb9ec339 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/test_2d_global_index_inference.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/test_2d_global_index_inference.spv.dis @@ -8,8 +8,9 @@ ; Bound: 86 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %71 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "foo" %gl_GlobalInvocationID %13 %17 %18 %5 OpSource OpenCL_C 200 %72 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/test_2d_local_index_inference.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/test_2d_local_index_inference.spv.dis index ae18f8000f..e604269e56 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/test_2d_local_index_inference.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/test_2d_local_index_inference.spv.dis @@ -5,8 +5,9 @@ ; Bound: 41 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %35 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "foo" %5 %12 %gl_LocalInvocationID OpSource OpenCL_C 200 %36 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/test_2d_local_index_inference_2.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/test_2d_local_index_inference_2.spv.dis index c59ca24eef..5fa4a23f39 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/test_2d_local_index_inference_2.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/test_2d_local_index_inference_2.spv.dis @@ -5,8 +5,9 @@ ; Bound: 38 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %32 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %18 "foo" %6 %gl_LocalInvocationID %15 OpSource OpenCL_C 200 %33 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/test_address_of_bug.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/test_address_of_bug.spv.dis index 4d83e11cb6..8eda228dd3 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/test_address_of_bug.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/test_address_of_bug.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/test_float_neq.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/test_float_neq.spv.dis index 76fefda694..c978e87227 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/test_float_neq.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/test_float_neq.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/test_for_benign_read_write_bug.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/test_for_benign_read_write_bug.spv.dis index 3219791a56..a255ae59ed 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/test_for_benign_read_write_bug.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/test_for_benign_read_write_bug.spv.dis @@ -5,9 +5,10 @@ ; Bound: 35 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpCapability Int16 %24 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %16 "foo" %8 %13 OpSource OpenCL_C 200 %25 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/test_for_get_group_id.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/test_for_get_group_id.spv.dis index 3bdb1ce7cb..a7e6cf059d 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/test_for_get_group_id.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/test_for_get_group_id.spv.dis @@ -6,8 +6,9 @@ ; Bound: 56 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %44 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %22 "foo" %gl_LocalInvocationID %gl_WorkGroupID %14 %19 %5 OpSource OpenCL_C 200 %45 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/test_for_ssa_bug.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/test_for_ssa_bug.spv.dis index 1c926ced24..0614550984 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/test_for_ssa_bug.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/test_for_ssa_bug.spv.dis @@ -5,8 +5,9 @@ ; Bound: 53 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %43 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "foo" %gl_LocalInvocationID %10 %14 OpSource OpenCL_C 200 %44 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/test_global_id_inference.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/test_global_id_inference.spv.dis index 4cdcdcf910..506c46a01d 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/test_global_id_inference.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/test_global_id_inference.spv.dis @@ -7,8 +7,9 @@ ; Bound: 70 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %57 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %22 "foo" %11 %gl_LocalInvocationID %gl_WorkGroupID %18 %19 %5 OpSource OpenCL_C 200 %58 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/test_line_number_problem.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/test_line_number_problem.spv.dis index fa4015e2ec..8ebfb9f463 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/test_line_number_problem.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/test_line_number_problem.spv.dis @@ -5,8 +5,9 @@ ; Bound: 77 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %67 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "foo" %8 %gl_LocalInvocationID %14 OpSource OpenCL_C 200 %68 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/test_local_id_inference.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/test_local_id_inference.spv.dis index 35a5af43a4..cd4d1870ea 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/test_local_id_inference.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/test_local_id_inference.spv.dis @@ -5,8 +5,9 @@ ; Bound: 38 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %26 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "foo" %gl_LocalInvocationID %10 %14 OpSource OpenCL_C 200 %27 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/test_mod_invariants/global_reduce_strength.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/test_mod_invariants/global_reduce_strength.spv.dis index 0b1f50b75a..f6b6b69563 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/test_mod_invariants/global_reduce_strength.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/test_mod_invariants/global_reduce_strength.spv.dis @@ -8,8 +8,9 @@ ; Bound: 80 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %61 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %23 "foo" %gl_GlobalInvocationID %gl_LocalInvocationID %14 %18 %19 %20 %5 OpSource OpenCL_C 200 %62 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/test_mod_invariants/local_direct.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/test_mod_invariants/local_direct.spv.dis index 8beeec2907..c27b6ef78c 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/test_mod_invariants/local_direct.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/test_mod_invariants/local_direct.spv.dis @@ -5,8 +5,9 @@ ; Bound: 64 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %50 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "foo" %gl_LocalInvocationID %10 %14 %18 OpSource OpenCL_C 200 %51 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/test_mod_invariants/local_reduce_strength.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/test_mod_invariants/local_reduce_strength.spv.dis index b11896503a..6a5fffd12a 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/test_mod_invariants/local_reduce_strength.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/test_mod_invariants/local_reduce_strength.spv.dis @@ -5,8 +5,9 @@ ; Bound: 77 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %58 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %25 "foo" %8 %gl_LocalInvocationID %14 %18 %22 OpSource OpenCL_C 200 %59 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/test_part_load_store/store_int_and_short.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/test_part_load_store/store_int_and_short.spv.dis index d06e6ce7ad..3e04447b95 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/test_part_load_store/store_int_and_short.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/test_part_load_store/store_int_and_short.spv.dis @@ -6,9 +6,10 @@ ; Bound: 55 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan OpCapability Int16 %44 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %22 "foo" %gl_GlobalInvocationID %13 %19 %5 OpSource OpenCL_C 200 %45 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/test_structs/store_array_element.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/test_structs/store_array_element.spv.dis index 3424fce807..362c8d9216 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/test_structs/store_array_element.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/test_structs/store_array_element.spv.dis @@ -5,8 +5,9 @@ ; Bound: 34 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %19 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "foo" %gl_GlobalInvocationID %10 %14 OpSource OpenCL_C 200 %20 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/test_structs/store_element.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/test_structs/store_element.spv.dis index e265cadd9a..76408aa6d8 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/test_structs/store_element.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/test_structs/store_element.spv.dis @@ -5,8 +5,9 @@ ; Bound: 34 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %19 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "foo" %gl_GlobalInvocationID %10 %14 OpSource OpenCL_C 200 %20 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/test_structs/store_struct_element.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/test_structs/store_struct_element.spv.dis index 246300bbf1..50417eaefd 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/test_structs/store_struct_element.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/test_structs/store_struct_element.spv.dis @@ -5,8 +5,9 @@ ; Bound: 34 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %19 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "foo" %gl_GlobalInvocationID %10 %14 OpSource OpenCL_C 200 %20 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/test_structs/use_array_element.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/test_structs/use_array_element.spv.dis index ef0d59e022..8f4d543ff7 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/test_structs/use_array_element.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/test_structs/use_array_element.spv.dis @@ -6,8 +6,9 @@ ; Bound: 53 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %37 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "foo" %gl_GlobalInvocationID %10 %18 %14 OpSource OpenCL_C 200 %38 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/test_structs/use_element.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/test_structs/use_element.spv.dis index db7f3d68a8..521f0ae36a 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/test_structs/use_element.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/test_structs/use_element.spv.dis @@ -6,8 +6,9 @@ ; Bound: 52 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %36 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "foo" %gl_GlobalInvocationID %10 %18 %14 OpSource OpenCL_C 200 %37 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/test_structs/use_struct_element.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/test_structs/use_struct_element.spv.dis index db7f3d68a8..521f0ae36a 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/test_structs/use_struct_element.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/test_structs/use_struct_element.spv.dis @@ -6,8 +6,9 @@ ; Bound: 52 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %36 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "foo" %gl_GlobalInvocationID %10 %18 %14 OpSource OpenCL_C 200 %37 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/transitiveclosuresimplified.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/transitiveclosuresimplified.spv.dis index cd3fddfaba..f9c60fbe9b 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/transitiveclosuresimplified.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/transitiveclosuresimplified.spv.dis @@ -6,8 +6,9 @@ ; Bound: 111 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %99 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "transitive_closure_stage1_kernel" %gl_LocalInvocationID %10 %14 %18 OpSource OpenCL_C 200 %100 = OpString "transitive_closure_stage1_kernel" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/unusedreturn.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/unusedreturn.spv.dis index 4d83e11cb6..8eda228dd3 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/unusedreturn.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/unusedreturn.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/vectortests/addressofvector.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/vectortests/addressofvector.spv.dis index 4d83e11cb6..8eda228dd3 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/vectortests/addressofvector.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/vectortests/addressofvector.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/vectortests/double2simpleaccess.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/vectortests/double2simpleaccess.spv.dis index db3e4fa339..0da21c56d7 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/vectortests/double2simpleaccess.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/vectortests/double2simpleaccess.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "k" %8 OpSource OpenCL_C 200 %14 = OpString "k" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/vectortests/double4simpleaccess.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/vectortests/double4simpleaccess.spv.dis index db3e4fa339..0da21c56d7 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/vectortests/double4simpleaccess.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/vectortests/double4simpleaccess.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "k" %8 OpSource OpenCL_C 200 %14 = OpString "k" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/vectortests/float2simpleaccess.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/vectortests/float2simpleaccess.spv.dis index db3e4fa339..0da21c56d7 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/vectortests/float2simpleaccess.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/vectortests/float2simpleaccess.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "k" %8 OpSource OpenCL_C 200 %14 = OpString "k" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/vectortests/float4arrayaccess.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/vectortests/float4arrayaccess.spv.dis index 4deb5acdec..1a65a514f3 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/vectortests/float4arrayaccess.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/vectortests/float4arrayaccess.spv.dis @@ -6,8 +6,9 @@ ; Bound: 60 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %48 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %27 "foo" %7 %gl_GlobalInvocationID %gl_LocalInvocationID %20 %24 %11 OpSource OpenCL_C 200 %49 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/vectortests/float4simpleaccess.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/vectortests/float4simpleaccess.spv.dis index 4d83e11cb6..8eda228dd3 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/vectortests/float4simpleaccess.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/vectortests/float4simpleaccess.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/vectortests/int3arrayaccess.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/vectortests/int3arrayaccess.spv.dis index 4d48c7e5c9..a617267593 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/vectortests/int3arrayaccess.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/vectortests/int3arrayaccess.spv.dis @@ -6,8 +6,9 @@ ; Bound: 59 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %47 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %26 "foo" %6 %gl_GlobalInvocationID %gl_LocalInvocationID %19 %23 %10 OpSource OpenCL_C 200 %48 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/vectortests/test_paren.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/vectortests/test_paren.spv.dis index 755927cd92..9778714058 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/vectortests/test_paren.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/vectortests/test_paren.spv.dis @@ -6,8 +6,9 @@ ; Bound: 42 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %32 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %19 "foo" %gl_LocalInvocationID %10 %16 OpSource OpenCL_C 200 %33 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/vectortests/vectorsplat.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/vectortests/vectorsplat.spv.dis index 4d83e11cb6..8eda228dd3 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/vectortests/vectorsplat.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/vectortests/vectorsplat.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/vectortests/vectorswizzle.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/vectortests/vectorswizzle.spv.dis index 4d83e11cb6..8eda228dd3 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/vectortests/vectorswizzle.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/vectortests/vectorswizzle.spv.dis @@ -5,8 +5,9 @@ ; Bound: 21 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %13 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %11 "foo" %8 OpSource OpenCL_C 200 %14 = OpString "foo" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/warpsync/2d.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/warpsync/2d.spv.dis index a07970ce07..ba4dc1a33f 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/warpsync/2d.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/warpsync/2d.spv.dis @@ -6,8 +6,9 @@ ; Bound: 73 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %63 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %27 "matrix_transpose" %7 %gl_LocalInvocationID %gl_WorkGroupID %20 %24 %11 OpSource OpenCL_C 200 %64 = OpString "matrix_transpose" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/warpsync/broken_shuffle.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/warpsync/broken_shuffle.spv.dis index b3392f0804..dc9d25d2f7 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/warpsync/broken_shuffle.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/warpsync/broken_shuffle.spv.dis @@ -5,9 +5,10 @@ ; Bound: 55 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %29 = OpExtInstImport "GLSL.std.450" %44 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "shuffle" %gl_LocalInvocationID %10 %14 OpSource OpenCL_C 200 %45 = OpString "shuffle" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/warpsync/intragroup_scan.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/warpsync/intragroup_scan.spv.dis index d072dbc964..0db89b074c 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/warpsync/intragroup_scan.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/warpsync/intragroup_scan.spv.dis @@ -5,8 +5,9 @@ ; Bound: 181 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %172 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %21 "scan" %5 %gl_LocalInvocationID %14 %18 OpSource OpenCL_C 200 %173 = OpString "scan" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/warpsync/scan_warp.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/warpsync/scan_warp.spv.dis index f9f0d05d26..9cd803463e 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/warpsync/scan_warp.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/warpsync/scan_warp.spv.dis @@ -5,8 +5,9 @@ ; Bound: 98 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %88 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "scan" %gl_LocalInvocationID %10 %14 OpSource OpenCL_C 200 %89 = OpString "scan" diff --git a/dartagnan/src/test/resources/spirv/gpuverify/warpsync/shuffle.spv.dis b/dartagnan/src/test/resources/spirv/gpuverify/warpsync/shuffle.spv.dis index b3392f0804..dc9d25d2f7 100644 --- a/dartagnan/src/test/resources/spirv/gpuverify/warpsync/shuffle.spv.dis +++ b/dartagnan/src/test/resources/spirv/gpuverify/warpsync/shuffle.spv.dis @@ -5,9 +5,10 @@ ; Bound: 55 ; Schema: 0 OpCapability Shader + OpCapability VulkanMemoryModel + OpMemoryModel Logical Vulkan %29 = OpExtInstImport "GLSL.std.450" %44 = OpExtInstImport "NonSemantic.ClspvReflection.5" - OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %17 "shuffle" %gl_LocalInvocationID %10 %14 OpSource OpenCL_C 200 %45 = OpString "shuffle" diff --git a/litmus/VULKAN/Manual/ticketlock-rel2rlx.litmus b/litmus/VULKAN/Manual/ticketlock-rel2rlx.litmus index 076680f354..9bbf71c6a9 100644 --- a/litmus/VULKAN/Manual/ticketlock-rel2rlx.litmus +++ b/litmus/VULKAN/Manual/ticketlock-rel2rlx.litmus @@ -13,6 +13,6 @@ x=0; LC01: | LC01: ; ld.nonpriv.sc0 r3, x | ld.nonpriv.sc0 r3, x ; st.nonpriv.sc0 x, 1 | st.nonpriv.sc0 x, 1 ; - rmw.atom.wg.sc0.semsc0.add r4, out, 1 | rmw.atom.rel.wg.sc0.semsc0.semav.add r4, out, 1 ; + rmw.atom.wg.sc0.add r4, out, 1 | rmw.atom.rel.wg.sc0.semsc0.semav.add r4, out, 1 ; exists (P0:r1 == P0:r2 /\ P1:r1 == P1:r2 /\ P0:r3 == 0 /\ P1:r3 == 0) \ No newline at end of file