Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 16:55:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1562185: Reorganize Cranelift target ISA configuration; r=lth

Browse Source 
- rename the cpu.rs file to isa.rs;
- create a new function for platform-specific flags, and move x86 flags in
  there;

Differential Revision: https://phabricator.services.mozilla.com/D36321

--HG--
rename : js/src/wasm/cranelift/src/cpu.rs => js/src/wasm/cranelift/src/isa.rs
extra : rebase_source : 2611faa2084f82667e73cc264c10ba6f7c97c407
extra : histedit_source : f1db60e45ea7a3178c19153912d2c659c10f7f71
This commit is contained in:
Benjamin Bouvier 2019-06-27 19:31:32 +02:00
parent 79af6afde4
commit 120aeef9e4
3 changed files with 57 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/wasm/cranelift/src/compile.rs
View File

@ -31,7 +31,7 @@ use cranelift_codegen::Context;
use cranelift_wasm::{FuncIndex, FuncTranslator, WasmResult};
use crate::bindings;
use crate::cpu::make_isa;
use crate::isa::make_isa;
use crate::utils::DashResult;
use crate::wasm2clif::{init_sig, native_pointer_size, TransEnv};

101
js/src/wasm/cranelift/src/cpu.rs → js/src/wasm/cranelift/src/isa.rs
View File

@ -21,8 +21,6 @@
//! The main entry point is the `make_isa()` function which allocates a configured `TargetISA`
//! object.
use std::str::FromStr;
use cranelift_codegen::isa;
use cranelift_codegen::settings::{self, Configurable};
@ -41,51 +39,6 @@ impl From<settings::SetError> for BasicError {
}
}
/// Allocate a `TargetISA` object that can be used to generate code for the CPU we're running on.
///
/// TODO: SM runs on more than x86 chips. Support them.
///
/// # Errors
///
/// This function fails if Cranelift has not been compiled with support for the current CPU.
pub fn make_isa(env: &StaticEnvironment) -> DashResult<Box<dyn isa::TargetIsa>> {
// Start with the ISA-independent settings.
let shared_flags = make_shared_flags().expect("Cranelift configuration error");
// We can use `#[cfg(target_arch = "...")]` to conditionally compile code per ISA.
let mut ib = isa::lookup(triple!("x86_64-unknown-unknown")).map_err(BasicError::from)?;
if !env.hasSse2 {
return Err("SSE2 is mandatory for Baldrdash!".into());
}
if env.hasSse3 {
ib.enable("has_sse3").map_err(BasicError::from)?;
}
if env.hasSse41 {
ib.enable("has_sse41").map_err(BasicError::from)?;
}
if env.hasSse42 {
ib.enable("has_sse42").map_err(BasicError::from)?;
}
if env.hasPopcnt {
ib.enable("has_popcnt").map_err(BasicError::from)?;
}
if env.hasAvx {
ib.enable("has_avx").map_err(BasicError::from)?;
}
if env.hasBmi1 {
ib.enable("has_bmi1").map_err(BasicError::from)?;
}
if env.hasBmi2 {
ib.enable("has_bmi2").map_err(BasicError::from)?;
}
if env.hasLzcnt {
ib.enable("has_lzcnt").map_err(BasicError::from)?;
}
Ok(ib.finish(shared_flags))
}
/// Create a `Flags` object for the shared settings.
///
/// This only fails if one of Cranelift's settings has been removed or renamed.
@ -120,8 +73,60 @@ fn make_shared_flags() -> settings::SetResult<settings::Flags> {
// Let's optimize for speed.
sb.set("opt_level", "best")?;
// TODO: Enable jump tables (requires emitting readonly data separately from text).
// Enable jump tables.
sb.set("jump_tables_enabled", "true")?;
Ok(settings::Flags::new(sb))
}
#[cfg(feature = "cranelift_x86")]
fn make_isa_specific(env: &StaticEnvironment) -> DashResult<isa::Builder> {
use std::str::FromStr; // for the triple! macro below.
let mut ib = isa::lookup(triple!("x86_64-unknown-unknown")).map_err(BasicError::from)?;
if !env.hasSse2 {
return Err("SSE2 is mandatory for Baldrdash!".into());
}
if env.hasSse3 {
ib.enable("has_sse3").map_err(BasicError::from)?;
}
if env.hasSse41 {
ib.enable("has_sse41").map_err(BasicError::from)?;
}
if env.hasSse42 {
ib.enable("has_sse42").map_err(BasicError::from)?;
}
if env.hasPopcnt {
ib.enable("has_popcnt").map_err(BasicError::from)?;
}
if env.hasAvx {
ib.enable("has_avx").map_err(BasicError::from)?;
}
if env.hasBmi1 {
ib.enable("has_bmi1").map_err(BasicError::from)?;
}
if env.hasBmi2 {
ib.enable("has_bmi2").map_err(BasicError::from)?;
}
if env.hasLzcnt {
ib.enable("has_lzcnt").map_err(BasicError::from)?;
}
Ok(ib)
}
/// TODO: SM runs on more than x86 chips. Support them.
#[cfg(not(feature = "cranelift_x86"))]
fn make_isa_specific(_env: &StaticEnvironment) -> DashResult<isa::Builder> {
Err("Platform not supported yet!".into())
}
/// Allocate a `TargetISA` object that can be used to generate code for the CPU we're running on.
pub fn make_isa(env: &StaticEnvironment) -> DashResult<Box<dyn isa::TargetIsa>> {
// Start with the ISA-independent settings.
let shared_flags = make_shared_flags().map_err(BasicError::from)?;
let ib = make_isa_specific(env)?;
Ok(ib.finish(shared_flags))
}

4
js/src/wasm/cranelift/src/lib.rs
View File

@ -13,14 +13,16 @@
* limitations under the License.
*/
#[cfg(feature = "cranelift_x86")]
#[macro_use]
extern crate target_lexicon;
#[macro_use]
extern crate log;
mod bindings; // High-level bindings for C++ data structures.
mod compile; // Cranelift function compiler.
mod cpu; // CPU detection and `TargetISA` configuration.
mod isa; // `TargetISA` configuration.
mod utils; // Helpers for other source files.
mod wasm2clif; // WebAssembly to Cranelift translation callbacks.