move mod: move arch::barrier to barrier

crates/spirv-std/src/arch.rs

@@ -9,10 +9,6 @@ use crate::{Scalar, SignedInteger, UnsignedInteger, Vector};
 #[cfg(target_arch = "spirv")]
 use core::arch::asm;
 
-mod barrier;
-
-pub use barrier::*;
-
 /// Result is true if any component of `vector` is true, otherwise result is
 /// false.
 #[spirv_std_macros::gpu_only]

crates/spirv-std/src/arch/barrier.rs → crates/spirv-std/src/barrier.rs

@@ -1,3 +1,5 @@
+//! Intrinsics for barrier operations
+
 #[cfg(target_arch = "spirv")]
 use core::arch::asm;
 

crates/spirv-std/src/lib.rs

@@ -92,6 +92,7 @@ pub use macros::{debug_printf, debug_printfln};
 
 pub mod arch;
 pub mod atomic;
+pub mod barrier;
 pub mod byte_addressable_buffer;
 pub mod debug_printf;
 pub mod float;

crates/spirv-std/src/subgroup.rs

@@ -15,7 +15,7 @@
 #[cfg(target_arch = "spirv")]
 use crate::ScalarOrVectorTransform;
 #[cfg(target_arch = "spirv")]
-use crate::arch::{control_barrier, memory_barrier};
+use crate::barrier::{control_barrier, memory_barrier};
 #[cfg(target_arch = "spirv")]
 use crate::memory::{Scope, Semantics};
 use crate::{Float, Integer, ScalarComposite, ScalarOrVector, SignedInteger, UnsignedInteger};

examples/shaders/reduce/src/lib.rs

@@ -54,7 +54,7 @@ pub fn main(
     if subgroup_local_invocation_id == 0 {
         shared[subgroup_id as usize] = sum;
     }
-    spirv_std::arch::workgroup_memory_barrier_with_group_sync();
+    spirv_std::barrier::workgroup_memory_barrier_with_group_sync();
     let mut sum = 0;
     if subgroup_id == 0 {
         if subgroup_local_invocation_id < num_subgroups {

tests/compiletests/ui/arch/all_memory_barrier.rs

@@ -1,11 +1,12 @@
 // build-pass
 // compile-flags: -C target-feature=+VulkanMemoryModelDeviceScopeKHR,+ext:SPV_KHR_vulkan_memory_model
 // compile-flags: -C llvm-args=--disassemble-fn=all_memory_barrier::all_memory_barrier
+// normalize-stderr-test "OpLine .*\n" -> ""
 
 use spirv_std::spirv;
 
 unsafe fn all_memory_barrier() {
-    spirv_std::arch::all_memory_barrier();
+    spirv_std::barrier::all_memory_barrier();
 }
 
 #[spirv(compute(threads(1, 1, 1)))]

tests/compiletests/ui/arch/all_memory_barrier.stderr

@@ -1,6 +1,5 @@
 %1 = OpFunction  %2  None %3
 %4 = OpLabel
-OpLine %5 82 13
 OpMemoryBarrier %6 %7
 OpNoLine
 OpReturn

tests/compiletests/ui/arch/all_memory_barrier_with_group_sync.rs

@@ -1,11 +1,12 @@
 // build-pass
 // compile-flags: -C target-feature=+VulkanMemoryModelDeviceScopeKHR,+ext:SPV_KHR_vulkan_memory_model
 // compile-flags: -C llvm-args=--disassemble-fn=all_memory_barrier_with_group_sync::all_memory_barrier_with_group_sync
+// normalize-stderr-test "OpLine .*\n" -> ""
 
 use spirv_std::spirv;
 
 unsafe fn all_memory_barrier_with_group_sync() {
-    spirv_std::arch::all_memory_barrier_with_group_sync();
+    spirv_std::barrier::all_memory_barrier_with_group_sync();
 }
 
 #[spirv(compute(threads(1, 1, 1)))]

tests/compiletests/ui/arch/all_memory_barrier_with_group_sync.stderr

@@ -1,6 +1,5 @@
 %1 = OpFunction  %2  None %3
 %4 = OpLabel
-OpLine %5 47 13
 OpControlBarrier %6 %7 %8
 OpNoLine
 OpReturn

tests/compiletests/ui/arch/control_barrier.rs

@@ -9,7 +9,7 @@ use spirv_std::spirv;
 #[spirv(fragment)]
 pub fn main() {
     unsafe {
-        spirv_std::arch::control_barrier::<
+        spirv_std::barrier::control_barrier::<
             { Scope::Subgroup as u32 },
             { Scope::Subgroup as u32 },
             { Semantics::NONE.bits() },

tests/compiletests/ui/arch/device_memory_barrier.rs

@@ -1,11 +1,12 @@
 // build-pass
 // compile-flags: -C target-feature=+VulkanMemoryModelDeviceScopeKHR,+ext:SPV_KHR_vulkan_memory_model
 // compile-flags: -C llvm-args=--disassemble-fn=device_memory_barrier::device_memory_barrier
+// normalize-stderr-test "OpLine .*\n" -> ""
 
 use spirv_std::spirv;
 
 unsafe fn device_memory_barrier() {
-    spirv_std::arch::device_memory_barrier();
+    spirv_std::barrier::device_memory_barrier();
 }
 
 #[spirv(compute(threads(1, 1, 1)))]

tests/compiletests/ui/arch/device_memory_barrier.stderr

@@ -1,6 +1,5 @@
 %1 = OpFunction  %2  None %3
 %4 = OpLabel
-OpLine %5 82 13
 OpMemoryBarrier %6 %7
 OpNoLine
 OpReturn

tests/compiletests/ui/arch/device_memory_barrier_with_group_sync.rs

@@ -1,11 +1,12 @@
 // build-pass
 // compile-flags: -C target-feature=+VulkanMemoryModelDeviceScopeKHR,+ext:SPV_KHR_vulkan_memory_model
 // compile-flags: -C llvm-args=--disassemble-fn=device_memory_barrier_with_group_sync::device_memory_barrier_with_group_sync
+// normalize-stderr-test "OpLine .*\n" -> ""
 
 use spirv_std::spirv;
 
 unsafe fn device_memory_barrier_with_group_sync() {
-    spirv_std::arch::device_memory_barrier_with_group_sync();
+    spirv_std::barrier::device_memory_barrier_with_group_sync();
 }
 
 #[spirv(compute(threads(1, 1, 1)))]

tests/compiletests/ui/arch/device_memory_barrier_with_group_sync.stderr

@@ -1,6 +1,5 @@
 %1 = OpFunction  %2  None %3
 %4 = OpLabel
-OpLine %5 47 13
 OpControlBarrier %6 %7 %8
 OpNoLine
 OpReturn

tests/compiletests/ui/arch/memory_barrier.rs

@@ -9,7 +9,7 @@ use spirv_std::spirv;
 #[spirv(fragment)]
 pub fn main() {
     unsafe {
-        spirv_std::arch::memory_barrier::<
+        spirv_std::barrier::memory_barrier::<
             { Scope::Subgroup as u32 },
             { Semantics::ACQUIRE_RELEASE.bits() | Semantics::UNIFORM_MEMORY.bits() },
         >();

tests/compiletests/ui/arch/shared/dce_shared.rs

@@ -11,7 +11,7 @@
 // ignore-vulkan1.0
 // ignore-vulkan1.1
 
-use spirv_std::arch::workgroup_memory_barrier_with_group_sync;
+use spirv_std::barrier::workgroup_memory_barrier_with_group_sync;
 use spirv_std::glam::*;
 use spirv_std::spirv;
 

tests/compiletests/ui/arch/shared/reduction_array.rs

@@ -5,7 +5,7 @@
 // ignore-vulkan1.0
 
 use core::ops::{Add, AddAssign, Deref, DerefMut};
-use spirv_std::arch::workgroup_memory_barrier_with_group_sync;
+use spirv_std::barrier::workgroup_memory_barrier_with_group_sync;
 use spirv_std::glam::*;
 use spirv_std::spirv;
 

tests/compiletests/ui/arch/shared/reduction_big_struct.rs

@@ -5,7 +5,7 @@
 // ignore-vulkan1.0
 
 use core::ops::{Add, AddAssign};
-use spirv_std::arch::workgroup_memory_barrier_with_group_sync;
+use spirv_std::barrier::workgroup_memory_barrier_with_group_sync;
 use spirv_std::glam::*;
 use spirv_std::spirv;
 

tests/compiletests/ui/arch/shared/reduction_u32.rs

@@ -4,7 +4,7 @@
 // ignore-spv1.2
 // ignore-vulkan1.0
 
-use spirv_std::arch::workgroup_memory_barrier_with_group_sync;
+use spirv_std::barrier::workgroup_memory_barrier_with_group_sync;
 use spirv_std::glam::*;
 use spirv_std::spirv;
 

tests/compiletests/ui/arch/shared/reduction_vec.rs

@@ -4,7 +4,7 @@
 // ignore-spv1.2
 // ignore-vulkan1.0
 
-use spirv_std::arch::workgroup_memory_barrier_with_group_sync;
+use spirv_std::barrier::workgroup_memory_barrier_with_group_sync;
 use spirv_std::glam::*;
 use spirv_std::spirv;
 

tests/compiletests/ui/arch/workgroup_memory_barrier.rs

@@ -1,10 +1,11 @@
 // build-pass
 // compile-flags: -C llvm-args=--disassemble-fn=workgroup_memory_barrier::workgroup_memory_barrier
+// normalize-stderr-test "OpLine .*\n" -> ""
 
 use spirv_std::spirv;
 
 unsafe fn workgroup_memory_barrier() {
-    spirv_std::arch::workgroup_memory_barrier();
+    spirv_std::barrier::workgroup_memory_barrier();
 }
 
 #[spirv(compute(threads(1, 1, 1)))]

tests/compiletests/ui/arch/workgroup_memory_barrier.stderr

@@ -1,6 +1,5 @@
 %1 = OpFunction  %2  None %3
 %4 = OpLabel
-OpLine %5 82 13
 OpMemoryBarrier %6 %7
 OpNoLine
 OpReturn

tests/compiletests/ui/arch/workgroup_memory_barrier_with_group_sync.rs

@@ -1,10 +1,11 @@
 // build-pass
 // compile-flags: -C llvm-args=--disassemble-fn=workgroup_memory_barrier_with_group_sync::workgroup_memory_barrier_with_group_sync
+// normalize-stderr-test "OpLine .*\n" -> ""
 
 use spirv_std::spirv;
 
 unsafe fn workgroup_memory_barrier_with_group_sync() {
-    spirv_std::arch::workgroup_memory_barrier_with_group_sync();
+    spirv_std::barrier::workgroup_memory_barrier_with_group_sync();
 }
 
 #[spirv(compute(threads(1, 1, 1)))]

tests/compiletests/ui/arch/workgroup_memory_barrier_with_group_sync.stderr

@@ -1,6 +1,5 @@
 %1 = OpFunction  %2  None %3
 %4 = OpLabel
-OpLine %5 47 13
 OpControlBarrier %6 %6 %7
 OpNoLine
 OpReturn

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

@@ -31,7 +31,7 @@ pub fn main_cs(
     // Thread 0 stores the final values after all operations complete
     if tid == 0 {
         // Use atomic loads to ensure we read the final values
-        spirv_std::arch::workgroup_memory_barrier_with_group_sync();
+        spirv_std::barrier::workgroup_memory_barrier_with_group_sync();
         output[0] = counters[0]; // Should be initial + 32
         output[1] = counters[1]; // Should be initial - 32
         output[2] = counters[2]; // Should be min(initial, 0)

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

@@ -1,6 +1,6 @@
 #![no_std]
 
-use spirv_std::arch::workgroup_memory_barrier_with_group_sync;
+use spirv_std::barrier::workgroup_memory_barrier_with_group_sync;
 use spirv_std::spirv;
 
 #[spirv(compute(threads(64)))]

tests/difftests/tests/arch/workgroup_memory/workgroup_memory-rust/src/shader.rs

@@ -1,4 +1,4 @@
-use spirv_std::arch::workgroup_memory_barrier_with_group_sync;
+use spirv_std::barrier::workgroup_memory_barrier_with_group_sync;
 use spirv_std::spirv;
 
 #[spirv(compute(threads(64)))]