Fix compilation for targets that don't have AtomicU64. (#7118)

Co-authored-by: Connor Fitzgerald <[email protected]>

Author: flaviojs

.github/workflows/ci.yml

@@ -181,6 +181,14 @@ jobs:
             tier: 2
             kind: no_std
 
+          # 32-bit PowerPC Linux
+          # Included to test support for `portable-atomic`
+          - name: Linux ppc32
+            os: ubuntu-22.04
+            target: powerpc-unknown-linux-gnu
+            tier: 2
+            kind: wgpu-only
+
     name: Clippy ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
 

Cargo.lock

@@ -135,6 +135,7 @@ pico-args = { version = "0.5.0", features = [
 ] }
 png = "0.17.16"
 pollster = "0.4"
+portable-atomic = "1"
 profiling = { version = "1", default-features = false }
 raw-window-handle = { version = "0.6", default-features = false }
 rayon = "1"

Cargo.toml

@@ -114,6 +114,9 @@ fragile-send-sync-non-atomic-wasm = [
 ## Enable using the `mach-dxcompiler-rs` crate to compile DX12 shaders.
 static-dxc = ["wgpu-hal/static-dxc"]
 
+## Enable portable atomics on platforms that do not support 64bit atomics.
+portable-atomic = ["dep:portable-atomic", "wgpu-hal/portable-atomic"]
+
 #! ### Target Conditional Features
 # --------------------------------------------------------------------
 # Look to wgpu-hal's Cargo.toml for explaination how these features and the wgpu-core
@@ -179,5 +182,8 @@ serde = { workspace = true, features = ["default", "derive"], optional = true }
 smallvec.workspace = true
 thiserror.workspace = true
 
+[target.'cfg(not(target_has_atomic = "64"))'.dependencies]
+portable-atomic = { workspace = true, optional = true }
+
 [build-dependencies]
 cfg_aliases.workspace = true

wgpu-core/Cargo.toml

@@ -18,5 +18,7 @@ fn main() {
             all(target_vendor = "apple", feature = "vulkan-portability") // Vulkan Portability on Apple
         ) },
         metal: { all(target_vendor = "apple", feature = "metal") },
+
+        supports_64bit_atomics: { target_has_atomic = "64" }
     }
 }

wgpu-core/build.rs

@@ -9,7 +9,7 @@ use core::{
     fmt,
     mem::{self, ManuallyDrop},
     num::NonZeroU32,
-    sync::atomic::{AtomicBool, AtomicU64, Ordering},
+    sync::atomic::{AtomicBool, Ordering},
 };
 use std::sync::OnceLock;
 
@@ -57,6 +57,11 @@ use super::{
     ENTRYPOINT_FAILURE_ERROR, ZERO_BUFFER_SIZE,
 };
 
+#[cfg(supports_64bit_atomics)]
+use core::sync::atomic::AtomicU64;
+#[cfg(not(supports_64bit_atomics))]
+use portable_atomic::AtomicU64;
+
 /// Structure describing a logical device. Some members are internally mutable,
 /// stored behind mutexes.
 pub struct Device {

wgpu-core/src/device/resource.rs

@@ -155,6 +155,7 @@ renderdoc = ["dep:libloading", "dep:renderdoc-sys", "dep:log"]
 fragile-send-sync-non-atomic-wasm = [
     "wgpu-types/fragile-send-sync-non-atomic-wasm",
 ]
+portable-atomic = ["dep:portable-atomic"]
 
 ###################################
 ### Internal Debugging Features ###
@@ -300,6 +301,9 @@ khronos-egl = { workspace = true, optional = true, features = [
 # Note: it's unused by emscripten, but we keep it to have single code base in egl.rs
 libloading = { workspace = true, optional = true }
 
+[target.'cfg(not(target_has_atomic = "64"))'.dependencies]
+portable-atomic = { workspace = true, optional = true }
+
 [build-dependencies]
 cfg_aliases.workspace = true
 

wgpu-hal/Cargo.toml

@@ -12,6 +12,7 @@ fn main() {
         metal: { all(target_vendor = "apple", feature = "metal") },
         vulkan: { all(not(target_arch = "wasm32"), feature = "vulkan") },
         // ⚠️ Keep in sync with target.cfg() definition in Cargo.toml and cfg_alias in `wgpu` crate ⚠️
-        static_dxc: { all(target_os = "windows", feature = "static-dxc", not(target_arch = "aarch64")) }
+        static_dxc: { all(target_os = "windows", feature = "static-dxc", not(target_arch = "aarch64")) },
+        supports_64bit_atomics: { target_has_atomic = "64" }
     }
 }

wgpu-hal/build.rs

@@ -317,7 +317,10 @@ pub const QUERY_SIZE: wgt::BufferAddress = 8;
 pub type Label<'a> = Option<&'a str>;
 pub type MemoryRange = Range<wgt::BufferAddress>;
 pub type FenceValue = u64;
+#[cfg(supports_64bit_atomics)]
 pub type AtomicFenceValue = core::sync::atomic::AtomicU64;
+#[cfg(not(supports_64bit_atomics))]
+pub type AtomicFenceValue = portable_atomic::AtomicU64;
 
 /// A callback to signal that wgpu is no longer using a resource.
 #[cfg(any(gles, vulkan))]

wgpu-hal/src/lib.rs

@@ -1,11 +1,12 @@
 #![allow(unused_variables)]
 
 use alloc::{string::String, vec, vec::Vec};
-use core::{
-    ptr,
-    sync::atomic::{AtomicU64, Ordering},
-    time::Duration,
-};
+use core::{ptr, sync::atomic::Ordering, time::Duration};
+
+#[cfg(supports_64bit_atomics)]
+use core::sync::atomic::AtomicU64;
+#[cfg(not(supports_64bit_atomics))]
+use portable_atomic::AtomicU64;
 
 use crate::TlasInstance;