From ddec001e9f39390340986e5a7786e6add641afcb Mon Sep 17 00:00:00 2001 From: Corey Richardson Date: Mon, 24 Feb 2014 12:43:48 -0500 Subject: [PATCH 1/2] Move simd out of unstable It's still marked experimental. Also add documentation. --- src/libstd/lib.rs | 2 + src/libstd/{unstable => }/simd.rs | 60 +++++++++++++++++----- src/libstd/unstable/mod.rs | 2 +- src/test/compile-fail/simd-experimental.rs | 2 +- src/test/run-pass/simd-binop.rs | 2 +- src/test/run-pass/simd-issue-10604.rs | 2 +- 6 files changed, 53 insertions(+), 17 deletions(-) rename src/libstd/{unstable => }/simd.rs (58%) diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 119cd9aa2ca88..2e5593f7b4b90 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -238,6 +238,8 @@ pub mod io; pub mod path; pub mod fmt; pub mod cleanup; +#[experimental] +pub mod simd; /* Unsupported interfaces */ diff --git a/src/libstd/unstable/simd.rs b/src/libstd/simd.rs similarity index 58% rename from src/libstd/unstable/simd.rs rename to src/libstd/simd.rs index a7a314d35e736..aae00eea25842 100644 --- a/src/libstd/unstable/simd.rs +++ b/src/libstd/simd.rs @@ -1,4 +1,4 @@ -// Copyright 2013 The Rust Project Developers. See the COPYRIGHT +// Copyright 2014 The Rust Project Developers. See the COPYRIGHT // file at the top-level directory of this distribution and at // http://rust-lang.org/COPYRIGHT. // @@ -8,54 +8,88 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -//! SIMD vectors +//! SIMD vectors. +//! +//! These types can be used for accessing basic SIMD operations. Each of them +//! implements the standard arithmetic operator traits (Add, Sub, Mul, Div, +//! Rem, Shl, Shr) through compiler magic, rather than explicitly. Currently +//! comparison operators are not implemented. To use SSE3+, you must enable +//! the features, like `-C target-feature=sse3,sse4.1,sse4.2`, or a more +//! specific `target-cpu`. No other SIMD intrinsics or high-level wrappers are +//! provided beyond this module. +//! +//! ```rust +//! #[allow(experimental)]; +//! +//! fn main() { +//! use std::simd::f32x4; +//! let a = f32x4(40.0, 41.0, 42.0, 43.0); +//! let b = f32x4(1.0, 1.1, 3.4, 9.8); +//! println!("{}", a + b); +//! } +//! ``` +//! +//! ## Stability Note +//! +//! These are all experimental. The inferface may change entirely, without +//! warning. #![allow(non_camel_case_types)] +#![allow(missing_doc)] -#[experimental] #[simd] +#[experimental] +#[deriving(Show)] pub struct i8x16(pub i8, pub i8, pub i8, pub i8, pub i8, pub i8, pub i8, pub i8, pub i8, pub i8, pub i8, pub i8, pub i8, pub i8, pub i8, pub i8); -#[experimental] #[simd] +#[experimental] +#[deriving(Show)] pub struct i16x8(pub i16, pub i16, pub i16, pub i16, pub i16, pub i16, pub i16, pub i16); - -#[experimental] #[simd] +#[experimental] +#[deriving(Show)] pub struct i32x4(pub i32, pub i32, pub i32, pub i32); -#[experimental] #[simd] +#[experimental] +#[deriving(Show)] pub struct i64x2(pub i64, pub i64); -#[experimental] #[simd] +#[experimental] +#[deriving(Show)] pub struct u8x16(pub u8, pub u8, pub u8, pub u8, pub u8, pub u8, pub u8, pub u8, pub u8, pub u8, pub u8, pub u8, pub u8, pub u8, pub u8, pub u8); -#[experimental] #[simd] +#[experimental] +#[deriving(Show)] pub struct u16x8(pub u16, pub u16, pub u16, pub u16, pub u16, pub u16, pub u16, pub u16); -#[experimental] #[simd] +#[experimental] +#[deriving(Show)] pub struct u32x4(pub u32, pub u32, pub u32, pub u32); -#[experimental] #[simd] +#[experimental] +#[deriving(Show)] pub struct u64x2(pub u64, pub u64); -#[experimental] #[simd] +#[experimental] +#[deriving(Show)] pub struct f32x4(pub f32, pub f32, pub f32, pub f32); -#[experimental] #[simd] +#[experimental] +#[deriving(Show)] pub struct f64x2(pub f64, pub f64); diff --git a/src/libstd/unstable/mod.rs b/src/libstd/unstable/mod.rs index f464f70772d94..6569b4a81c766 100644 --- a/src/libstd/unstable/mod.rs +++ b/src/libstd/unstable/mod.rs @@ -16,7 +16,7 @@ pub use core::finally; pub mod dynamic_lib; -pub mod simd; +pub mod finally; pub mod sync; pub mod mutex; diff --git a/src/test/compile-fail/simd-experimental.rs b/src/test/compile-fail/simd-experimental.rs index f9cc4d0d8c372..5f9f56bf3c0f4 100644 --- a/src/test/compile-fail/simd-experimental.rs +++ b/src/test/compile-fail/simd-experimental.rs @@ -10,7 +10,7 @@ #![deny(experimental)] -use std::unstable::simd; +use std::simd; fn main() { let _ = simd::i64x2(0, 0); //~ ERROR: experimental diff --git a/src/test/run-pass/simd-binop.rs b/src/test/run-pass/simd-binop.rs index efcd99a04cedd..7f9be78d5832d 100644 --- a/src/test/run-pass/simd-binop.rs +++ b/src/test/run-pass/simd-binop.rs @@ -10,7 +10,7 @@ #![allow(experimental)] -use std::unstable::simd::{i32x4, f32x4, u32x4}; +use std::simd::{i32x4, f32x4, u32x4}; fn eq_u32x4(u32x4(x0, x1, x2, x3): u32x4, u32x4(y0, y1, y2, y3): u32x4) -> bool { (x0 == y0) && (x1 == y1) && (x2 == y2) && (x3 == y3) diff --git a/src/test/run-pass/simd-issue-10604.rs b/src/test/run-pass/simd-issue-10604.rs index 2e533e3b263a0..966db25a128a7 100644 --- a/src/test/run-pass/simd-issue-10604.rs +++ b/src/test/run-pass/simd-issue-10604.rs @@ -13,5 +13,5 @@ #![feature(simd)] pub fn main() { - let _o = None::; + let _o = None::; } From 4b364302ed94d5b48fe537a7d93f7c57ff990522 Mon Sep 17 00:00:00 2001 From: Corey Richardson Date: Wed, 14 May 2014 14:47:50 -0700 Subject: [PATCH 2/2] Move simd to core --- src/libcore/lib.rs | 7 ++++++- src/{libstd => libcore}/simd.rs | 0 src/libstd/lib.rs | 5 ++--- src/libstd/unstable/mod.rs | 1 - 4 files changed, 8 insertions(+), 5 deletions(-) rename src/{libstd => libcore}/simd.rs (100%) diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs index 05b314b699847..e9819afb48337 100644 --- a/src/libcore/lib.rs +++ b/src/libcore/lib.rs @@ -42,7 +42,7 @@ html_root_url = "http://static.rust-lang.org/doc/master")] #![no_std] -#![feature(globs, macro_rules, managed_boxes, phase)] +#![feature(globs, macro_rules, managed_boxes, phase, simd)] #![deny(missing_doc)] #[cfg(test)] extern crate realcore = "core"; @@ -117,6 +117,11 @@ pub mod slice; pub mod str; pub mod tuple; pub mod fmt; +#[experimental] +pub mod simd; + +#[cfg(stage0, not(test))] +pub mod owned; // FIXME: this module should not exist. Once owned allocations are no longer a // language type, this module can move outside to the owned allocation diff --git a/src/libstd/simd.rs b/src/libcore/simd.rs similarity index 100% rename from src/libstd/simd.rs rename to src/libcore/simd.rs diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 2e5593f7b4b90..af7c641830f7f 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -105,7 +105,7 @@ html_favicon_url = "http://www.rust-lang.org/favicon.ico", html_root_url = "http://static.rust-lang.org/doc/master")] #![feature(macro_rules, globs, asm, managed_boxes, thread_local, link_args, - simd, linkage, default_type_params, phase, concat_idents, quad_precision_float)] + linkage, default_type_params, phase, concat_idents, quad_precision_float)] // Don't link to std. We are std. #![no_std] @@ -154,6 +154,7 @@ pub use core::ptr; pub use core::raw; pub use core::tuple; pub use core::result; +pub use core::simd; // Run tests with libgreen instead of libnative. // @@ -238,8 +239,6 @@ pub mod io; pub mod path; pub mod fmt; pub mod cleanup; -#[experimental] -pub mod simd; /* Unsupported interfaces */ diff --git a/src/libstd/unstable/mod.rs b/src/libstd/unstable/mod.rs index 6569b4a81c766..147609d12e329 100644 --- a/src/libstd/unstable/mod.rs +++ b/src/libstd/unstable/mod.rs @@ -16,7 +16,6 @@ pub use core::finally; pub mod dynamic_lib; -pub mod finally; pub mod sync; pub mod mutex;