Skip to content

Update the stdsimd submodule #56926

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.

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

Merged
merged 1 commit into from
Dec 25, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/libcore/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@
#![feature(mips_target_feature)]
#![feature(aarch64_target_feature)]
#![feature(wasm_target_feature)]
#![feature(avx512_target_feature)]
#![feature(const_slice_len)]
#![feature(const_str_as_bytes)]
#![feature(const_str_len)]
Expand Down
4 changes: 2 additions & 2 deletions src/libstd/sys/wasm/alloc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ mod lock {
return DropLock
}
unsafe {
let r = wasm32::atomic::wait_i32(
let r = wasm32::i32_atomic_wait(
&LOCKED as *const AtomicI32 as *mut i32,
1, // expected value
-1, // timeout
Expand All @@ -89,7 +89,7 @@ mod lock {
let r = LOCKED.swap(0, SeqCst);
debug_assert_eq!(r, 1);
unsafe {
wasm32::atomic::wake(
wasm32::atomic_notify(
&LOCKED as *const AtomicI32 as *mut i32,
1, // only one thread
);
Expand Down
10 changes: 5 additions & 5 deletions src/libstd/sys/wasm/condvar_atomics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

use arch::wasm32::atomic;
use arch::wasm32;
use cmp;
use mem;
use sync::atomic::{AtomicUsize, Ordering::SeqCst};
Expand Down Expand Up @@ -52,13 +52,13 @@ impl Condvar {

pub unsafe fn notify_one(&self) {
self.cnt.fetch_add(1, SeqCst);
atomic::wake(self.ptr(), 1);
wasm32::atomic_notify(self.ptr(), 1);
}

#[inline]
pub unsafe fn notify_all(&self) {
self.cnt.fetch_add(1, SeqCst);
atomic::wake(self.ptr(), -1); // -1 == "wake everyone"
wasm32::atomic_notify(self.ptr(), u32::max_value()); // -1 == "wake everyone"
}

pub unsafe fn wait(&self, mutex: &Mutex) {
Expand All @@ -72,7 +72,7 @@ impl Condvar {
// wake us up once we're asleep.
let ticket = self.cnt.load(SeqCst) as i32;
mutex.unlock();
let val = atomic::wait_i32(self.ptr(), ticket, -1);
let val = wasm32::i32_atomic_wait(self.ptr(), ticket, -1);
// 0 == woken, 1 == not equal to `ticket`, 2 == timeout (shouldn't happen)
debug_assert!(val == 0 || val == 1);
mutex.lock();
Expand All @@ -86,7 +86,7 @@ impl Condvar {

// If the return value is 2 then a timeout happened, so we return
// `false` as we weren't actually notified.
let ret = atomic::wait_i32(self.ptr(), ticket, nanos as i64) != 2;
let ret = wasm32::i32_atomic_wait(self.ptr(), ticket, nanos as i64) != 2;
mutex.lock();
return ret
}
Expand Down
10 changes: 5 additions & 5 deletions src/libstd/sys/wasm/mutex_atomics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

use arch::wasm32::atomic;
use arch::wasm32;
use cell::UnsafeCell;
use mem;
use sync::atomic::{AtomicUsize, AtomicU32, Ordering::SeqCst};
Expand Down Expand Up @@ -36,7 +36,7 @@ impl Mutex {

pub unsafe fn lock(&self) {
while !self.try_lock() {
let val = atomic::wait_i32(
let val = wasm32::i32_atomic_wait(
self.ptr(),
1, // we expect our mutex is locked
-1, // wait infinitely
Expand All @@ -50,7 +50,7 @@ impl Mutex {
pub unsafe fn unlock(&self) {
let prev = self.locked.swap(0, SeqCst);
debug_assert_eq!(prev, 1);
atomic::wake(self.ptr(), 1); // wake up one waiter, if any
wasm32::atomic_notify(self.ptr(), 1); // wake up one waiter, if any
}

#[inline]
Expand Down Expand Up @@ -104,7 +104,7 @@ impl ReentrantMutex {
pub unsafe fn lock(&self) {
let me = thread::my_id();
while let Err(owner) = self._try_lock(me) {
let val = atomic::wait_i32(self.ptr(), owner as i32, -1);
let val = wasm32::i32_atomic_wait(self.ptr(), owner as i32, -1);
debug_assert!(val == 0 || val == 1);
}
}
Expand Down Expand Up @@ -143,7 +143,7 @@ impl ReentrantMutex {
match *self.recursions.get() {
0 => {
self.owner.swap(0, SeqCst);
atomic::wake(self.ptr() as *mut i32, 1); // wake up one waiter, if any
wasm32::atomic_notify(self.ptr() as *mut i32, 1); // wake up one waiter, if any
}
ref mut n => *n -= 1,
}
Expand Down
6 changes: 3 additions & 3 deletions src/libstd/sys/wasm/thread.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ impl Thread {

#[cfg(target_feature = "atomics")]
pub fn sleep(dur: Duration) {
use arch::wasm32::atomic;
use arch::wasm32;
use cmp;

// Use an atomic wait to block the current thread artificially with a
Expand All @@ -53,7 +53,7 @@ impl Thread {
while nanos > 0 {
let amt = cmp::min(i64::max_value() as u128, nanos);
let mut x = 0;
let val = unsafe { atomic::wait_i32(&mut x, 0, amt as i64) };
let val = unsafe { wasm32::i32_atomic_wait(&mut x, 0, amt as i64) };
debug_assert_eq!(val, 2);
nanos -= amt;
}
Expand Down Expand Up @@ -108,7 +108,7 @@ cfg_if! {
panic!("thread local data not implemented on wasm with atomics yet")
}

pub fn tcb_set(ptr: *mut u8) {
pub fn tcb_set(_ptr: *mut u8) {
panic!("thread local data not implemented on wasm with atomics yet")
}
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/stdsimd