tests: don't pass any -C target-feature=... for tests by default.

eddyb · eddyb · commit a1082774a7fc · 2025-07-12T14:40:40.000Z
diff --git a/crates/spirv-std/src/arch/primitive.rs b/crates/spirv-std/src/arch/primitive.rs
@@ -47,6 +47,7 @@ pub unsafe fn end_primitive() {
 #[spirv_std_macros::gpu_only]
 #[doc(alias = "OpEmitStreamVertex")]
 #[inline]
+// FIXME(eddyb) why does this require `i64` instead of `i32`?
 pub unsafe fn emit_stream_vertex<const STREAM: i64>() {
     unsafe {
         asm! {
@@ -69,6 +70,7 @@ pub unsafe fn emit_stream_vertex<const STREAM: i64>() {
 #[spirv_std_macros::gpu_only]
 #[doc(alias = "OpEndStreamPrimitive")]
 #[inline]
+// FIXME(eddyb) why does this require `i64` instead of `i32`?
 pub unsafe fn end_stream_primitive<const STREAM: i64>() {
     unsafe {
         asm! {
diff --git a/tests/compiletests/src/main.rs b/tests/compiletests/src/main.rs
@@ -355,8 +355,6 @@ struct TestDeps {
 /// The RUSTFLAGS passed to all SPIR-V builds.
 // FIXME(eddyb) expose most of these from `spirv-builder`.
 fn rust_flags(codegen_backend_path: &Path) -> String {
-    let target_features = ["Int8", "Int16", "Int64", "Float64"];
-
     [
         &*format!("-Zcodegen-backend={}", codegen_backend_path.display()),
         // Ensure the codegen backend is emitted in `.d` files to force Cargo
@@ -388,7 +386,6 @@ fn rust_flags(codegen_backend_path: &Path) -> String {
         // NOTE(eddyb) flags copied from `spirv-builder` are all above this line.
         "-Cdebuginfo=2",
         "-Cembed-bitcode=no",
-        &format!("-Ctarget-feature=+{}", target_features.join(",+")),
     ]
     .join(" ")
 }
diff --git a/tests/compiletests/ui/arch/convert_u_to_acceleration_structure_khr.rs b/tests/compiletests/ui/arch/convert_u_to_acceleration_structure_khr.rs
@@ -1,5 +1,5 @@
 // build-pass
-// compile-flags: -Ctarget-feature=+RayTracingKHR,+ext:SPV_KHR_ray_tracing
+// compile-flags: -Ctarget-feature=+Int64,+RayTracingKHR,+ext:SPV_KHR_ray_tracing
 
 use spirv_std::spirv;
 
diff --git a/tests/compiletests/ui/arch/emit_stream_vertex.rs b/tests/compiletests/ui/arch/emit_stream_vertex.rs
@@ -1,5 +1,5 @@
 // build-pass
-// compile-flags: -C target-feature=+GeometryStreams
+// compile-flags: -C target-feature=+Int64,+GeometryStreams
 
 use spirv_std::spirv;
 
diff --git a/tests/compiletests/ui/arch/end_stream_primitive.rs b/tests/compiletests/ui/arch/end_stream_primitive.rs
@@ -1,5 +1,5 @@
 // build-pass
-// compile-flags: -C target-feature=+GeometryStreams
+// compile-flags: -C target-feature=+Int64,+GeometryStreams
 
 use spirv_std::spirv;
 
diff --git a/tests/compiletests/ui/arch/integer_min_and_max.rs b/tests/compiletests/ui/arch/integer_min_and_max.rs
@@ -1,4 +1,5 @@
 // build-pass
+// compile-flags: -C target-feature=+Int8,+Int16,+Int64
 
 use spirv_std::arch::{signed_max, signed_min, unsigned_max, unsigned_min};
 use spirv_std::spirv;
diff --git a/tests/compiletests/ui/dis/const-float-cast-optimized.rs b/tests/compiletests/ui/dis/const-float-cast-optimized.rs
@@ -2,7 +2,7 @@
 // the smaller float type when not needed elsewhere.
 
 // build-pass
-// compile-flags: -C llvm-args=--disassemble-globals
+// compile-flags: -C target-feature=+Float64 -C llvm-args=--disassemble-globals
 // normalize-stderr-test "OpCapability VulkanMemoryModel\n" -> ""
 // normalize-stderr-test "OpSource .*\n" -> ""
 // normalize-stderr-test "OpExtension .SPV_KHR_vulkan_memory_model.\n" -> ""
diff --git a/tests/compiletests/ui/dis/const-float-cast.rs b/tests/compiletests/ui/dis/const-float-cast.rs
@@ -1,7 +1,7 @@
 // Test whether float constant casts need optimization
 
 // build-pass
-// compile-flags: -C llvm-args=--disassemble-globals
+// compile-flags: -C target-feature=+Float64 -C llvm-args=--disassemble-globals
 // normalize-stderr-test "OpCapability VulkanMemoryModel\n" -> ""
 // normalize-stderr-test "OpSource .*\n" -> ""
 // normalize-stderr-test "OpExtension .SPV_KHR_vulkan_memory_model.\n" -> ""
diff --git a/tests/compiletests/ui/dis/const-narrowing-cast.rs b/tests/compiletests/ui/dis/const-narrowing-cast.rs
@@ -2,7 +2,7 @@
 // and produce the expected truncation behavior.
 
 // build-pass
-// compile-flags: -C llvm-args=--disassemble-globals
+// compile-flags: -C target-feature=+Int8 -C llvm-args=--disassemble-globals
 // normalize-stderr-test "OpCapability VulkanMemoryModel\n" -> ""
 // normalize-stderr-test "OpSource .*\n" -> ""
 // normalize-stderr-test "OpExtension .SPV_KHR_vulkan_memory_model.\n" -> ""
diff --git a/tests/compiletests/ui/dis/pass-mode-cast-struct.rs b/tests/compiletests/ui/dis/pass-mode-cast-struct.rs
@@ -5,7 +5,7 @@
 // the default Rust ABI adjustments, that we now override through query hooks)
 
 // build-pass
-// compile-flags: -C llvm-args=--disassemble-entry=main
+// compile-flags: -C target-feature=+Int8,+Int64 -C llvm-args=--disassemble-entry=main
 
 use spirv_std::spirv;
 
diff --git a/tests/compiletests/ui/image/image_with.rs b/tests/compiletests/ui/image/image_with.rs
@@ -11,8 +11,17 @@ pub fn main(
     output: &mut glam::Vec4,
 ) {
     let t1 = image1.fetch_with(glam::IVec2::new(0, 0), sample_with::sample_index(1));
-    let t2 = image2.sample_with(*sampler, glam::Vec2::new(0.5, 0.5), sample_with::bias(1.0));
-    let t3 = image2.sample_with(*sampler, glam::Vec2::new(0.5, 0.5), sample_with::lod(2.0));
+    // FIXME(eddyb) get `f32` to be automatically inferred instead of the `f64` default.
+    let t2 = image2.sample_with(
+        *sampler,
+        glam::Vec2::new(0.5, 0.5),
+        sample_with::bias(1.0f32),
+    );
+    let t3 = image2.sample_with(
+        *sampler,
+        glam::Vec2::new(0.5, 0.5),
+        sample_with::lod(2.0f32),
+    );
     let t4 = image2.sample_with(
         *sampler,
         glam::Vec2::new(0.5, 0.5),
diff --git a/tests/compiletests/ui/lang/control_flow/issue_764.rs b/tests/compiletests/ui/lang/control_flow/issue_764.rs
@@ -5,7 +5,7 @@ use spirv_std::glam;
 use spirv_std::glam::{Mat3, Vec3, Vec4};
 use spirv_std::spirv;
 
-fn index_to_transform(index: usize, raw_data: &[u8]) -> Transform2D {
+fn index_to_transform(index: usize, raw_data: &[u32]) -> Transform2D {
     Transform2D {
         own_transform: Mat3::IDENTITY,
         parent_offset: 0,
@@ -21,11 +21,11 @@ struct Transform2D {
 }
 
 trait GivesFinalTransform {
-    fn get_final_transform(&self, raw_data: &[u8]) -> Mat3;
+    fn get_final_transform(&self, raw_data: &[u32]) -> Mat3;
 }
 
 impl GivesFinalTransform for (i32, Transform2D) {
-    fn get_final_transform(&self, raw_data: &[u8]) -> Mat3 {
+    fn get_final_transform(&self, raw_data: &[u32]) -> Mat3 {
         if self.1.parent_offset == 0 {
             self.1.own_transform
         } else {
@@ -44,7 +44,7 @@ impl GivesFinalTransform for (i32, Transform2D) {
 #[spirv(compute(threads(64)))]
 pub fn main_cs(
     #[spirv(global_invocation_id)] id: UVec3,
-    #[spirv(storage_buffer, descriptor_set = 0, binding = 0)] raw_data: &mut [u8],
+    #[spirv(storage_buffer, descriptor_set = 0, binding = 0)] raw_data: &mut [u32],
     #[spirv(position)] output_position: &mut Vec4,
 ) {
     let index = id.x as usize;
diff --git a/tests/compiletests/ui/lang/core/array/init_array_i16.rs b/tests/compiletests/ui/lang/core/array/init_array_i16.rs
@@ -1,5 +1,6 @@
 // Test creating an array.
 // build-pass
+// compile-flags: -C target-feature=+Int16
 
 use spirv_std::macros::spirv;
 
diff --git a/tests/compiletests/ui/lang/core/array/init_array_i64.rs b/tests/compiletests/ui/lang/core/array/init_array_i64.rs
@@ -1,5 +1,6 @@
 // Test creating an array.
 // build-pass
+// compile-flags: -C target-feature=+Int64
 
 use spirv_std::macros::spirv;
 
diff --git a/tests/compiletests/ui/lang/core/array/init_array_i8.rs b/tests/compiletests/ui/lang/core/array/init_array_i8.rs
@@ -1,5 +1,6 @@
 // Test creating an array.
 // build-pass
+// compile-flags: -C target-feature=+Int8
 
 use spirv_std::macros::spirv;
 
diff --git a/tests/compiletests/ui/lang/core/intrinsics/bswap.rs b/tests/compiletests/ui/lang/core/intrinsics/bswap.rs
@@ -1,5 +1,6 @@
 // Test bswap intrinsic
 // build-pass
+// compile-flags: -C target-feature=+Int8,+Int16,+Int64
 
 #![allow(internal_features)]
 #![feature(core_intrinsics)]
diff --git a/tests/compiletests/ui/lang/core/intrinsics/leading_zeros.rs b/tests/compiletests/ui/lang/core/intrinsics/leading_zeros.rs
@@ -1,4 +1,5 @@
 // build-pass
+// compile-flags: -C target-feature=+Int8,+Int16,+Int64
 
 use spirv_std::spirv;
 
diff --git a/tests/compiletests/ui/lang/core/intrinsics/trailing_zeros.rs b/tests/compiletests/ui/lang/core/intrinsics/trailing_zeros.rs
@@ -1,4 +1,5 @@
 // build-pass
+// compile-flags: -C target-feature=+Int8,+Int16,+Int64
 
 use spirv_std::spirv;
 
diff --git a/tests/compiletests/ui/lang/core/ptr/allocate_const_scalar.rs b/tests/compiletests/ui/lang/core/ptr/allocate_const_scalar.rs
@@ -9,9 +9,9 @@ use spirv_std::spirv;
 
 use core::ptr::Unique;
 
-const POINTER: Unique<[u8; 4]> = Unique::<[u8; 4]>::dangling();
+const POINTER: Unique<()> = Unique::<()>::dangling();
 
 #[spirv(fragment)]
-pub fn main(output: &mut Unique<[u8; 4]>) {
+pub fn main(output: &mut Unique<()>) {
     *output = POINTER;
 }
diff --git a/tests/compiletests/ui/lang/core/ptr/allocate_const_scalar.stderr b/tests/compiletests/ui/lang/core/ptr/allocate_const_scalar.stderr
@@ -17,7 +17,7 @@ note: used from within `allocate_const_scalar::main`
 note: called by `main`
   --> $DIR/allocate_const_scalar.rs:15:8
    |
-15 | pub fn main(output: &mut Unique<[u8; 4]>) {
+15 | pub fn main(output: &mut Unique<()>) {
    |        ^^^^
 
 error: aborting due to 1 previous error; 1 warning emitted
diff --git a/tests/compiletests/ui/lang/u32/bit_reverse.rs b/tests/compiletests/ui/lang/u32/bit_reverse.rs
@@ -1,6 +1,7 @@
 // Test all trailing and leading zeros. No need to test ones, they just call the zero variant with !value
 
 // build-pass
+// compile-flags: -C target-feature=+Int8,+Int16,+Int64
 
 use spirv_std::spirv;
 
diff --git a/tests/compiletests/ui/lang/u32/count_ones.rs b/tests/compiletests/ui/lang/u32/count_ones.rs
@@ -1,6 +1,7 @@
 // Test all trailing and leading zeros. No need to test ones, they just call the zero variant with !value
 
 // build-pass
+// compile-flags: -C target-feature=+Int8,+Int16,+Int64
 
 use spirv_std::spirv;
 

Original file line number	Diff line number	Diff line change
`@@ -355,8 +355,6 @@ struct TestDeps {`
`355`	`355`	`/// The RUSTFLAGS passed to all SPIR-V builds.`
`356`	`356`	// FIXME(eddyb) expose most of these from `spirv-builder`.
`357`	`357`	`fn rust_flags(codegen_backend_path: &Path) -> String {`
`358`		`- let target_features = ["Int8", "Int16", "Int64", "Float64"];`
`359`		`-`
`360`	`358`	`[`
`361`	`359`	`&*format!("-Zcodegen-backend={}", codegen_backend_path.display()),`
`362`	`360`	// Ensure the codegen backend is emitted in `.d` files to force Cargo
`@@ -388,7 +386,6 @@ fn rust_flags(codegen_backend_path: &Path) -> String {`
`388`	`386`	// NOTE(eddyb) flags copied from `spirv-builder` are all above this line.
`389`	`387`	`"-Cdebuginfo=2",`
`390`	`388`	`"-Cembed-bitcode=no",`
`391`		`- &format!("-Ctarget-feature=+{}", target_features.join(",+")),`
`392`	`389`	`]`
`393`	`390`	`.join(" ")`
`394`	`391`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`// build-pass`
	`2`	`+// compile-flags: -C target-feature=+Int8,+Int16,+Int64`
`2`	`3`
`3`	`4`	`use spirv_std::arch::{signed_max, signed_min, unsigned_max, unsigned_min};`
`4`	`5`	`use spirv_std::spirv;`