Skip to content

Commit 71e6ea4

Browse files
committed
wgsl: ignore wgsl in compile tests with unsupported extensions or instructions
1 parent a5e4aaf commit 71e6ea4

File tree

60 files changed

+108
-50
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+108
-50
lines changed

tests/compiletests/ui/arch/all_memory_barrier.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// build-pass
22
// compile-flags: -C target-feature=+VulkanMemoryModelDeviceScopeKHR,+ext:SPV_KHR_vulkan_memory_model
33
// compile-flags: -C llvm-args=--disassemble-fn=all_memory_barrier::all_memory_barrier
4+
// ignore-wgsl
45

56
use spirv_std::spirv;
67

tests/compiletests/ui/arch/convert_u_to_acceleration_structure_khr.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// build-pass
22
// compile-flags: -Ctarget-feature=+RayTracingKHR,+ext:SPV_KHR_ray_tracing
3+
// ignore-wgsl
34

45
use spirv_std::spirv;
56

tests/compiletests/ui/arch/debug_printf.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// build-pass
22
// compile-flags: -Ctarget-feature=+ext:SPV_KHR_non_semantic_info
3+
// ignore-wgsl
34

45
use spirv_std::spirv;
56
use spirv_std::{

tests/compiletests/ui/arch/demote_to_helper_invocation.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// build-pass
22
//
33
// compile-flags: -C target-feature=+DemoteToHelperInvocationEXT,+ext:SPV_EXT_demote_to_helper_invocation
4+
// ignore-wgsl
45

56
use spirv_std::spirv;
67

tests/compiletests/ui/arch/emit_stream_vertex.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// build-pass
22
// compile-flags: -C target-feature=+GeometryStreams
3+
// ignore-wgsl
34

45
use spirv_std::spirv;
56

tests/compiletests/ui/arch/emit_vertex.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// build-pass
22
// compile-flags: -Ctarget-feature=+Geometry
3+
// ignore-wgsl
34

45
use spirv_std::spirv;
56

tests/compiletests/ui/arch/end_primitive.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// build-pass
22
// compile-flags: -Ctarget-feature=+Geometry
3+
// ignore-wgsl
34

45
use spirv_std::spirv;
56

tests/compiletests/ui/arch/end_stream_primitive.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// build-pass
22
// compile-flags: -C target-feature=+GeometryStreams
3+
// ignore-wgsl
34

45
use spirv_std::spirv;
56

tests/compiletests/ui/arch/execute_callable.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// build-pass
22
// compile-flags: -Ctarget-feature=+RayTracingKHR,+ext:SPV_KHR_ray_tracing
3+
// ignore-wgsl
34

45
use spirv_std::spirv;
56

tests/compiletests/ui/arch/ignore_intersection_khr.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// build-pass
22
// compile-flags: -Ctarget-feature=+RayTracingKHR,+ext:SPV_KHR_ray_tracing
3+
// ignore-wgsl
34

45
use spirv_std::spirv;
56

tests/compiletests/ui/arch/memory_barrier.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// build-pass
2+
// ignore-wgsl
23

34
#![feature(adt_const_params)]
45
#![allow(incomplete_features)]

tests/compiletests/ui/arch/ray_query_confirm_intersection_khr.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// build-pass
22
// compile-flags: -Ctarget-feature=+RayQueryKHR,+ext:SPV_KHR_ray_query
3+
// ignore-wgsl
34

45
use glam::Vec3;
56
use spirv_std::ray_tracing::{AccelerationStructure, RayFlags, RayQuery};

tests/compiletests/ui/arch/ray_query_get_intersection_barycentrics_khr.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// build-pass
22
// compile-flags: -Ctarget-feature=+RayQueryKHR,+ext:SPV_KHR_ray_query
3+
// ignore-wgsl
34

45
use glam::Vec3;
56
use spirv_std::ray_tracing::{AccelerationStructure, RayFlags, RayQuery};

tests/compiletests/ui/arch/ray_query_get_intersection_candidate_aabb_opaque_khr.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// build-pass
22
// compile-flags: -Ctarget-feature=+RayQueryKHR,+ext:SPV_KHR_ray_query
3+
// ignore-wgsl
34

45
use glam::Vec3;
56
use spirv_std::ray_tracing::{AccelerationStructure, RayFlags, RayQuery};

tests/compiletests/ui/arch/ray_query_get_intersection_front_face_khr.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// build-pass
22
// compile-flags: -Ctarget-feature=+RayQueryKHR,+ext:SPV_KHR_ray_query
3+
// ignore-wgsl
34

45
use glam::Vec3;
56
use spirv_std::ray_tracing::{AccelerationStructure, RayFlags, RayQuery};

tests/compiletests/ui/arch/ray_query_get_intersection_geometry_index_khr.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// build-pass
22
// compile-flags: -Ctarget-feature=+RayQueryKHR,+ext:SPV_KHR_ray_query
3+
// ignore-wgsl
34

45
use glam::Vec3;
56
use spirv_std::ray_tracing::{AccelerationStructure, RayFlags, RayQuery};

tests/compiletests/ui/arch/ray_query_get_intersection_instance_custom_index_khr.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// build-pass
22
// compile-flags: -Ctarget-feature=+RayQueryKHR,+ext:SPV_KHR_ray_query
3+
// ignore-wgsl
34

45
use glam::Vec3;
56
use spirv_std::ray_tracing::{AccelerationStructure, RayFlags, RayQuery};

tests/compiletests/ui/arch/ray_query_get_intersection_instance_id_khr.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// build-pass
22
// compile-flags: -Ctarget-feature=+RayQueryKHR,+ext:SPV_KHR_ray_query
3+
// ignore-wgsl
34

45
use glam::Vec3;
56
use spirv_std::ray_tracing::{AccelerationStructure, RayFlags, RayQuery};

tests/compiletests/ui/arch/ray_query_get_intersection_object_ray_direction_khr.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// build-pass
22
// compile-flags: -Ctarget-feature=+RayQueryKHR,+ext:SPV_KHR_ray_query
3+
// ignore-wgsl
34

45
use glam::Vec3;
56
use spirv_std::ray_tracing::{AccelerationStructure, RayFlags, RayQuery};

tests/compiletests/ui/arch/ray_query_get_intersection_object_ray_origin_khr.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// build-pass
22
// compile-flags: -Ctarget-feature=+RayQueryKHR,+ext:SPV_KHR_ray_query
3+
// ignore-wgsl
34

45
use glam::Vec3;
56
use spirv_std::ray_tracing::{AccelerationStructure, RayFlags, RayQuery};

tests/compiletests/ui/arch/ray_query_get_intersection_object_to_world_khr.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// build-pass
22
// compile-flags: -Ctarget-feature=+RayQueryKHR,+ext:SPV_KHR_ray_query
3+
// ignore-wgsl
34

45
use glam::Vec3;
56
use spirv_std::ray_tracing::{AccelerationStructure, RayFlags, RayQuery};

tests/compiletests/ui/arch/ray_query_get_intersection_primitive_index_khr.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// build-pass
22
// compile-flags: -Ctarget-feature=+RayQueryKHR,+ext:SPV_KHR_ray_query
3+
// ignore-wgsl
34

45
use glam::Vec3;
56
use spirv_std::ray_tracing::{AccelerationStructure, RayFlags, RayQuery};

tests/compiletests/ui/arch/ray_query_get_intersection_shader_binding_table_record_offset_khr.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// build-pass
22
// compile-flags: -Ctarget-feature=+RayQueryKHR,+ext:SPV_KHR_ray_query
3+
// ignore-wgsl
34

45
use glam::Vec3;
56
use spirv_std::ray_tracing::{AccelerationStructure, RayFlags, RayQuery};

tests/compiletests/ui/arch/ray_query_get_intersection_t_khr.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// build-pass
22
// compile-flags: -Ctarget-feature=+RayQueryKHR,+ext:SPV_KHR_ray_query
3+
// ignore-wgsl
34

45
use glam::Vec3;
56
use spirv_std::ray_tracing::{AccelerationStructure, RayFlags, RayQuery};

tests/compiletests/ui/arch/ray_query_get_intersection_type_khr.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// build-pass
22
// compile-flags: -Ctarget-feature=+RayQueryKHR,+ext:SPV_KHR_ray_query
3+
// ignore-wgsl
34

45
use glam::Vec3;
56
use spirv_std::ray_tracing::{AccelerationStructure, RayFlags, RayQuery};

tests/compiletests/ui/arch/ray_query_get_ray_flags_khr.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// build-pass
22
// compile-flags: -Ctarget-feature=+RayQueryKHR,+ext:SPV_KHR_ray_query
3+
// ignore-wgsl
34

45
use glam::Vec3;
56
use spirv_std::ray_tracing::{AccelerationStructure, RayFlags, RayQuery};

tests/compiletests/ui/arch/ray_query_get_ray_t_min_khr.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// build-pass
22
// compile-flags: -Ctarget-feature=+RayQueryKHR,+ext:SPV_KHR_ray_query
3+
// ignore-wgsl
34

45
use glam::Vec3;
56
use spirv_std::ray_tracing::{AccelerationStructure, RayFlags, RayQuery};

tests/compiletests/ui/arch/ray_query_get_world_ray_direction_khr.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// build-pass
22
// compile-flags: -Ctarget-feature=+RayQueryKHR,+ext:SPV_KHR_ray_query
3+
// ignore-wgsl
34

45
use glam::Vec3;
56
use spirv_std::ray_tracing::{AccelerationStructure, RayFlags, RayQuery};

tests/compiletests/ui/arch/ray_query_get_world_ray_origin_khr.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// build-pass
22
// compile-flags: -Ctarget-feature=+RayQueryKHR,+ext:SPV_KHR_ray_query
3+
// ignore-wgsl
34

45
use glam::Vec3;
56
use spirv_std::ray_tracing::{AccelerationStructure, RayFlags, RayQuery};

tests/compiletests/ui/arch/ray_query_initialize_khr.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// build-pass
22
// compile-flags: -Ctarget-feature=+RayTracingKHR,+RayQueryKHR,+ext:SPV_KHR_ray_tracing,+ext:SPV_KHR_ray_query
3+
// ignore-wgsl
34

45
use glam::Vec3;
56
use spirv_std::ray_tracing::{AccelerationStructure, RayFlags, RayQuery};

tests/compiletests/ui/arch/ray_query_terminate_khr.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// build-pass
22
// compile-flags: -Ctarget-feature=+RayQueryKHR,+ext:SPV_KHR_ray_query
3+
// ignore-wgsl
34

45
use glam::Vec3;
56
use spirv_std::ray_tracing::{AccelerationStructure, RayFlags, RayQuery};

tests/compiletests/ui/arch/read_clock_khr.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// build-pass
22
// compile-flags: -Ctarget-feature=+Int64,+ShaderClockKHR,+ext:SPV_KHR_shader_clock
3+
// ignore-wgsl
34

45
use glam::UVec2;
56
use spirv_std::spirv;

tests/compiletests/ui/arch/report_intersection_khr.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// build-pass
22
// compile-flags: -Ctarget-feature=+RayTracingKHR,+ext:SPV_KHR_ray_tracing
3+
// ignore-wgsl
34

45
use spirv_std::spirv;
56

tests/compiletests/ui/arch/terminate_ray_khr.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// build-pass
22
// compile-flags: -Ctarget-feature=+RayTracingKHR,+ext:SPV_KHR_ray_tracing
3+
// ignore-wgsl
34

45
use spirv_std::spirv;
56

tests/compiletests/ui/arch/trace_ray_khr.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// build-pass
22
// compile-flags: -Ctarget-feature=+RayTracingKHR,+ext:SPV_KHR_ray_tracing
3+
// ignore-wgsl
34

45
use spirv_std::spirv;
56

tests/compiletests/ui/arch/workgroup_memory_barrier.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// build-pass
22
// compile-flags: -C llvm-args=--disassemble-fn=workgroup_memory_barrier::workgroup_memory_barrier
3+
// ignore-wgsl
34

45
use spirv_std::spirv;
56

tests/compiletests/ui/dis/asm.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// build-pass
22
// compile-flags: -C llvm-args=--disassemble-fn=asm::asm
3+
// ignore-wgsl
34

45
use core::arch::asm;
56
use spirv_std::spirv;

tests/compiletests/ui/dis/asm.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
%1 = OpFunction %2 None %3
22
%4 = OpLabel
3-
OpLine %5 9 8
3+
OpLine %5 10 8
44
OpMemoryBarrier %6 %7
55
OpNoLine
66
OpReturn

tests/compiletests/ui/dis/asm_op_decorate.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
// ignore-vulkan1.2
1515
// ignore-vulkan1.3
1616
// ignore-vulkan1.4
17+
// ignore-wgsl
1718

1819
use core::arch::asm;
1920
use spirv_std::spirv;

tests/compiletests/ui/dis/complex_image_sample_inst.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// build-pass
22
// compile-flags: -Ctarget-feature=+RuntimeDescriptorArray,+ext:SPV_EXT_descriptor_indexing
33
// compile-flags: -C llvm-args=--disassemble-fn=complex_image_sample_inst::sample_proj_lod
4+
// ignore-wgsl
45

56
use core::arch::asm;
67
use spirv_std::spirv;

tests/compiletests/ui/dis/complex_image_sample_inst.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
%8 = OpFunctionParameter %9
66
%10 = OpFunctionParameter %9
77
%11 = OpLabel
8-
OpLine %12 18 8
8+
OpLine %12 19 8
99
%13 = OpAccessChain %14 %15 %16
1010
%17 = OpLoad %18 %13
1111
%19 = OpImageSampleProjExplicitLod %2 %17 %4 Grad|ConstOffset %5 %7 %20

tests/compiletests/ui/dis/non-writable-storage_buffer.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
// ignore-vulkan1.2
1616
// ignore-vulkan1.3
1717
// ignore-vulkan1.4
18+
// ignore-wgsl
1819

1920
use spirv_std::spirv;
2021

tests/compiletests/ui/dis/panic_builtin_bounds_check.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
// normalize-stderr-test "\S:\S*/panic_builtin_bounds_check.rs" -> "$$DIR/panic_builtin_bounds_check.rs"
1919
// FIXME(eddyb) handle this one in the test runner.
2020
// normalize-stderr-test "\S*/lib/rustlib/" -> "$$SYSROOT/lib/rustlib/"
21+
//
22+
// ignore-wgsl
2123

2224
use spirv_std::spirv;
2325

tests/compiletests/ui/dis/panic_builtin_bounds_check.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ OpExtension "SPV_KHR_non_semantic_info"
88
OpMemoryModel Logical Simple
99
OpEntryPoint Fragment %2 "main"
1010
OpExecutionMode %2 OriginUpperLeft
11-
%3 = OpString "/n[Rust panicked at $DIR/panic_builtin_bounds_check.rs:25:5]/n index out of bounds: the len is %u but the index is %u/n in main()/n"
11+
%3 = OpString "/n[Rust panicked at $DIR/panic_builtin_bounds_check.rs:27:5]/n index out of bounds: the len is %u but the index is %u/n in main()/n"
1212
%4 = OpString "$DIR/panic_builtin_bounds_check.rs"
1313
%5 = OpTypeVoid
1414
%6 = OpTypeFunction %5
@@ -19,15 +19,15 @@ OpExecutionMode %2 OriginUpperLeft
1919
%11 = OpUndef %8
2020
%2 = OpFunction %5 None %6
2121
%12 = OpLabel
22-
OpLine %4 25 4
22+
OpLine %4 27 4
2323
%13 = OpULessThan %7 %9 %10
2424
OpNoLine
2525
OpSelectionMerge %14 None
2626
OpBranchConditional %13 %15 %16
2727
%15 = OpLabel
2828
OpBranch %14
2929
%16 = OpLabel
30-
OpLine %4 25 4
30+
OpLine %4 27 4
3131
%17 = OpExtInst %5 %1 1 %3 %11 %9
3232
OpNoLine
3333
OpReturn

tests/compiletests/ui/dis/panic_sequential_many.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
// normalize-stderr-test "\S:\S*/panic_sequential_many.rs" -> "$$DIR/panic_sequential_many.rs"
2020
// FIXME(eddyb) handle this one in the test runner.
2121
// normalize-stderr-test "\S*/lib/rustlib/" -> "$$SYSROOT/lib/rustlib/"
22+
//
23+
// ignore-wgsl
2224

2325
use spirv_std::spirv;
2426

0 commit comments

Comments
 (0)