Cleanup / make more consistent

Author: LegNeato

tests/difftests/tests/arch/atomic_ops/atomic_ops-rust/src/main.rs

@@ -1,10 +1,9 @@
-#[cfg(not(target_arch = "spirv"))]
-fn main() {
-    use difftest::config::Config;
-    use difftest::scaffold::compute::{
-        BufferConfig, BufferUsage, RustComputeShader, WgpuComputeTestMultiBuffer,
-    };
+use difftest::config::Config;
+use difftest::scaffold::compute::{
+    BufferConfig, BufferUsage, RustComputeShader, WgpuComputeTestMultiBuffer,
+};
 
+fn main() {
     let config = Config::from_path(std::env::args().nth(1).unwrap()).unwrap();
 
     // Initialize counter buffer with test values
@@ -32,6 +31,3 @@ fn main() {
 
     test.run_test(&config).unwrap();
 }
-
-#[cfg(target_arch = "spirv")]
-fn main() {}

tests/difftests/tests/arch/memory_barriers/memory_barriers-rust/src/lib.rs

@@ -27,24 +27,29 @@ pub fn main_cs(
         let mut result = shared[lid];
 
         // Different threads perform different operations
-        if lid % 4 == 0 {
-            // Read from neighboring thread's data
-            if lid + 1 < 64 {
-                result += shared[lid + 1];
+        match lid % 4 {
+            0 => {
+                // Read from neighboring thread's data
+                if lid + 1 < 64 {
+                    result += shared[lid + 1];
+                }
             }
-        } else if lid % 4 == 1 {
-            // Read from previous thread's data
-            if lid > 0 {
-                result += shared[lid - 1];
+            1 => {
+                // Read from previous thread's data
+                if lid > 0 {
+                    result += shared[lid - 1];
+                }
             }
-        } else if lid % 4 == 2 {
-            // Sum reduction within groups of 4
-            if lid + 2 < 64 {
-                result = shared[lid] + shared[lid + 1] + shared[lid + 2];
+            2 => {
+                // Sum reduction within groups of 4
+                if lid + 2 < 64 {
+                    result = shared[lid] + shared[lid + 1] + shared[lid + 2];
+                }
+            }
+            _ => {
+                // XOR with wrapped neighbor
+                result ^= shared[(lid + 32) % 64];
             }
-        } else {
-            // XOR with wrapped neighbor
-            result ^= shared[(lid + 32) % 64];
         }
 
         // Another barrier before writing back

tests/difftests/tests/lang/core/ops/vector_swizzle/vector_swizzle-rust/src/lib.rs

@@ -1,5 +1,4 @@
 #![no_std]
-#![cfg_attr(target_arch = "spirv", feature(asm_experimental_arch))]
 
 use glam::{Vec3Swizzles, Vec4, Vec4Swizzles};
 use spirv_std::spirv;