mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rustc_codegen_ssa: cleanup AtomicOrdering

Browse Source 
* Remove unused `NotAtomic` ordering.
* Rename `Monotonic` to `Relaxed` - a Rust specific name.
This commit is contained in:
Tomasz Miąsko 2022-05-24 00:00:00 +00:00
parent fa70b89d19
commit f4c92cc4d1
4 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/rustc_codegen_gcc/src/builder.rs
View File

@ -68,9 +68,8 @@ trait EnumClone {
impl EnumClone for AtomicOrdering { impl EnumClone for AtomicOrdering {
fn clone(&self) -> Self { fn clone(&self) -> Self {
match *self { match *self {
AtomicOrdering::NotAtomic => AtomicOrdering::NotAtomic,
AtomicOrdering::Unordered => AtomicOrdering::Unordered, AtomicOrdering::Unordered => AtomicOrdering::Unordered,
AtomicOrdering::Monotonic => AtomicOrdering::Monotonic, AtomicOrdering::Relaxed => AtomicOrdering::Relaxed,
AtomicOrdering::Acquire => AtomicOrdering::Acquire, AtomicOrdering::Acquire => AtomicOrdering::Acquire,
AtomicOrdering::Release => AtomicOrdering::Release, AtomicOrdering::Release => AtomicOrdering::Release,
AtomicOrdering::AcquireRelease => AtomicOrdering::AcquireRelease, AtomicOrdering::AcquireRelease => AtomicOrdering::AcquireRelease,
@ -1384,9 +1383,8 @@ impl ToGccOrdering for AtomicOrdering {
let ordering = let ordering =
match self { match self {
AtomicOrdering::NotAtomic => __ATOMIC_RELAXED, // TODO(antoyo): check if that's the same.
AtomicOrdering::Unordered => __ATOMIC_RELAXED, AtomicOrdering::Unordered => __ATOMIC_RELAXED,
AtomicOrdering::Monotonic => __ATOMIC_RELAXED, // TODO(antoyo): check if that's the same. AtomicOrdering::Relaxed => __ATOMIC_RELAXED, // TODO(antoyo): check if that's the same.
AtomicOrdering::Acquire => __ATOMIC_ACQUIRE, AtomicOrdering::Acquire => __ATOMIC_ACQUIRE,
AtomicOrdering::Release => __ATOMIC_RELEASE, AtomicOrdering::Release => __ATOMIC_RELEASE,
AtomicOrdering::AcquireRelease => __ATOMIC_ACQ_REL, AtomicOrdering::AcquireRelease => __ATOMIC_ACQ_REL,

3
compiler/rustc_codegen_llvm/src/llvm/ffi.rs
View File

@ -381,9 +381,8 @@ pub enum AtomicOrdering {
impl AtomicOrdering { impl AtomicOrdering {
pub fn from_generic(ao: rustc_codegen_ssa::common::AtomicOrdering) -> Self { pub fn from_generic(ao: rustc_codegen_ssa::common::AtomicOrdering) -> Self {
match ao { match ao {
rustc_codegen_ssa::common::AtomicOrdering::NotAtomic => AtomicOrdering::NotAtomic,
rustc_codegen_ssa::common::AtomicOrdering::Unordered => AtomicOrdering::Unordered, rustc_codegen_ssa::common::AtomicOrdering::Unordered => AtomicOrdering::Unordered,
rustc_codegen_ssa::common::AtomicOrdering::Monotonic => AtomicOrdering::Monotonic, rustc_codegen_ssa::common::AtomicOrdering::Relaxed => AtomicOrdering::Monotonic,
rustc_codegen_ssa::common::AtomicOrdering::Acquire => AtomicOrdering::Acquire, rustc_codegen_ssa::common::AtomicOrdering::Acquire => AtomicOrdering::Acquire,
rustc_codegen_ssa::common::AtomicOrdering::Release => AtomicOrdering::Release, rustc_codegen_ssa::common::AtomicOrdering::Release => AtomicOrdering::Release,
rustc_codegen_ssa::common::AtomicOrdering::AcquireRelease => { rustc_codegen_ssa::common::AtomicOrdering::AcquireRelease => {

4
compiler/rustc_codegen_ssa/src/common.rs
View File

@ -58,10 +58,8 @@ pub enum AtomicRmwBinOp {
} }
pub enum AtomicOrdering { pub enum AtomicOrdering {
NotAtomic,
Unordered, Unordered,
Monotonic, Relaxed,
// Consume, // Not specified yet.
Acquire, Acquire,
Release, Release,
AcquireRelease, AcquireRelease,

10
compiler/rustc_codegen_ssa/src/mir/intrinsic.rs
View File

@ -388,17 +388,17 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
2 => (SequentiallyConsistent, SequentiallyConsistent), 2 => (SequentiallyConsistent, SequentiallyConsistent),
3 => match split[2] { 3 => match split[2] {
"unordered" => (Unordered, Unordered), "unordered" => (Unordered, Unordered),
"relaxed" => (Monotonic, Monotonic), "relaxed" => (Relaxed, Relaxed),
"acq" => (Acquire, Acquire), "acq" => (Acquire, Acquire),
"rel" => (Release, Monotonic), "rel" => (Release, Relaxed),
"acqrel" => (AcquireRelease, Acquire), "acqrel" => (AcquireRelease, Acquire),
"failrelaxed" if is_cxchg => (SequentiallyConsistent, Monotonic), "failrelaxed" if is_cxchg => (SequentiallyConsistent, Relaxed),
"failacq" if is_cxchg => (SequentiallyConsistent, Acquire), "failacq" if is_cxchg => (SequentiallyConsistent, Acquire),
_ => bx.sess().fatal("unknown ordering in atomic intrinsic"), _ => bx.sess().fatal("unknown ordering in atomic intrinsic"),
}, },
4 => match (split[2], split[3]) { 4 => match (split[2], split[3]) {
("acq", "failrelaxed") if is_cxchg => (Acquire, Monotonic), ("acq", "failrelaxed") if is_cxchg => (Acquire, Relaxed),
("acqrel", "failrelaxed") if is_cxchg => (AcquireRelease, Monotonic), ("acqrel", "failrelaxed") if is_cxchg => (AcquireRelease, Relaxed),
_ => bx.sess().fatal("unknown ordering in atomic intrinsic"), _ => bx.sess().fatal("unknown ordering in atomic intrinsic"),
}, },
_ => bx.sess().fatal("Atomic intrinsic not in correct format"), _ => bx.sess().fatal("Atomic intrinsic not in correct format"),