Skip to content

builder: implement pointer atomics (missing in SPIR-V) via integers. #559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
eddyb wants to merge 1 commit into
base: main
Choose a base branch
from
+25 −5
Draft

builder: implement pointer atomics (missing in SPIR-V) via integers. #559

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 25 additions & 5 deletions crates/rustc_codegen_spirv/src/builder/builder_methods.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1850,7 +1850,12 @@ impl<'a, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'tcx> {
order: AtomicOrdering,
_size: Size,
) -> Self::Value {
let (ptr, access_ty) = self.adjust_pointer_for_typed_access(ptr, ty);
// HACK(eddyb) SPIR-V lacks pointer atomics, have to use integers instead.
let atomic_ty = match self.lookup_type(ty) {
SpirvType::Pointer { .. } => self.type_usize(),
_ => ty,
};
let (ptr, access_ty) = self.adjust_pointer_for_typed_access(ptr, atomic_ty);

// TODO: Default to device scope
let memory = self.constant_u32(self.span(), Scope::Device as u32);
Expand Down Expand Up @@ -1988,7 +1993,12 @@ impl<'a, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'tcx> {
order: AtomicOrdering,
_size: Size,
) {
let (ptr, access_ty) = self.adjust_pointer_for_typed_access(ptr, val.ty);
// HACK(eddyb) SPIR-V lacks pointer atomics, have to use integers instead.
let atomic_ty = match self.lookup_type(val.ty) {
SpirvType::Pointer { .. } => self.type_usize(),
_ => val.ty,
};
let (ptr, access_ty) = self.adjust_pointer_for_typed_access(ptr, atomic_ty);
let val = self.bitcast(val, access_ty);

// TODO: Default to device scope
Expand Down Expand Up @@ -3089,7 +3099,12 @@ impl<'a, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'tcx> {
assert_ty_eq!(self, cmp.ty, src.ty);
let ty = src.ty;

let (dst, access_ty) = self.adjust_pointer_for_typed_access(dst, ty);
// HACK(eddyb) SPIR-V lacks pointer atomics, have to use integers instead.
let atomic_ty = match self.lookup_type(ty) {
SpirvType::Pointer { .. } => self.type_usize(),
_ => ty,
};
let (dst, access_ty) = self.adjust_pointer_for_typed_access(dst, atomic_ty);
let cmp = self.bitcast(cmp, access_ty);
let src = self.bitcast(src, access_ty);

Expand All @@ -3115,7 +3130,7 @@ impl<'a, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'tcx> {
.with_type(access_ty);

let val = self.bitcast(result, ty);
let success = self.icmp(IntPredicate::IntEQ, val, cmp);
let success = self.icmp(IntPredicate::IntEQ, result, cmp);

(val, success)
}
Expand All @@ -3130,7 +3145,12 @@ impl<'a, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'tcx> {
) -> Self::Value {
let ty = src.ty;

let (dst, access_ty) = self.adjust_pointer_for_typed_access(dst, ty);
// HACK(eddyb) SPIR-V lacks pointer atomics, have to use integers instead.
let atomic_ty = match self.lookup_type(ty) {
SpirvType::Pointer { .. } => self.type_usize(),
_ => ty,
};
let (dst, access_ty) = self.adjust_pointer_for_typed_access(dst, atomic_ty);
let src = self.bitcast(src, access_ty);

self.validate_atomic(access_ty, dst.def(self));
Expand Down
Loading