T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make settings::Flags::new consume the Builder.

Browse Source 
This makes it more clear what the relationship is between the Builder
and the resulting Flags.
This commit is contained in:
Dan Gohman
2018-04-27 21:01:35 -07:00
parent b7f38ac8bc
commit 94a883abae
21 changed files with 63 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/codegen/meta/gen_settings.py
View File

@@ -262,7 +262,7 @@ def gen_constructor(sgrp, parent, fmt):
"""
with fmt.indented('impl Flags {', '}'):
args = 'builder: &Builder'
args = 'builder: Builder'
if sgrp.parent:
p = sgrp.parent
args = '{}: &{}::Flags, {}'.format(p.name, p.qual_mod, args)

2
lib/codegen/src/dominator_tree.rs
View File

@@ -929,7 +929,7 @@ mod test {
cfg.compute(cur.func);
let flags = settings::Flags::new(&settings::builder());
let flags = settings::Flags::new(settings::builder());
verify_context(cur.func, &cfg, &dt, &flags).unwrap();
}
}

2
lib/codegen/src/isa/arm32/mod.rs
View File

@@ -33,7 +33,7 @@ pub fn isa_builder() -> IsaBuilder {
fn isa_constructor(
shared_flags: shared_settings::Flags,
builder: &shared_settings::Builder,
builder: shared_settings::Builder,
) -> Box<TargetIsa> {
let level1 = if shared_flags.is_compressed() {
&enc_tables::LEVEL1_T32[..]

2
lib/codegen/src/isa/arm64/mod.rs
View File

@@ -32,7 +32,7 @@ pub fn isa_builder() -> IsaBuilder {
fn isa_constructor(
shared_flags: shared_settings::Flags,
builder: &shared_settings::Builder,
builder: shared_settings::Builder,
) -> Box<TargetIsa> {
Box::new(Isa {
isa_flags: settings::Flags::new(&shared_flags, builder),

6
lib/codegen/src/isa/mod.rs
View File

@@ -24,7 +24,7 @@
//! use cretonne_codegen::isa;
//!
//! let shared_builder = settings::builder();
//! let shared_flags = settings::Flags::new(&shared_builder);
//! let shared_flags = settings::Flags::new(shared_builder);
//!
//! match isa::lookup("riscv") {
//! Err(_) => {
@@ -117,14 +117,14 @@ pub enum LookupError {
/// Modify the ISA-specific settings before creating the `TargetIsa` trait object with `finish`.
pub struct Builder {
setup: settings::Builder,
constructor: fn(settings::Flags, &settings::Builder) -> Box<TargetIsa>,
constructor: fn(settings::Flags, settings::Builder) -> Box<TargetIsa>,
}
impl Builder {
/// Combine the ISA-specific settings with the provided ISA-independent settings and allocate a
/// fully configured `TargetIsa` trait object.
pub fn finish(self, shared_flags: settings::Flags) -> Box<TargetIsa> {
(self.constructor)(shared_flags, &self.setup)
(self.constructor)(shared_flags, self.setup)
}
}

8
lib/codegen/src/isa/riscv/mod.rs
View File

@@ -33,7 +33,7 @@ pub fn isa_builder() -> IsaBuilder {
fn isa_constructor(
shared_flags: shared_settings::Flags,
builder: &shared_settings::Builder,
builder: shared_settings::Builder,
) -> Box<TargetIsa> {
let level1 = if shared_flags.is_64bit() {
&enc_tables::LEVEL1_RV64[..]
@@ -130,7 +130,7 @@ mod tests {
fn test_64bitenc() {
let mut shared_builder = settings::builder();
shared_builder.enable("is_64bit").unwrap();
let shared_flags = settings::Flags::new(&shared_builder);
let shared_flags = settings::Flags::new(shared_builder);
let isa = isa::lookup("riscv").unwrap().finish(shared_flags);
let mut func = Function::new();
@@ -180,7 +180,7 @@ mod tests {
fn test_32bitenc() {
let mut shared_builder = settings::builder();
shared_builder.set("is_64bit", "false").unwrap();
let shared_flags = settings::Flags::new(&shared_builder);
let shared_flags = settings::Flags::new(shared_builder);
let isa = isa::lookup("riscv").unwrap().finish(shared_flags);
let mut func = Function::new();
@@ -234,7 +234,7 @@ mod tests {
fn test_rv32m() {
let mut shared_builder = settings::builder();
shared_builder.set("is_64bit", "false").unwrap();
let shared_flags = settings::Flags::new(&shared_builder);
let shared_flags = settings::Flags::new(shared_builder);
// Set the supports_m stting which in turn enables the use_m predicate that unlocks
// encodings for imul.

12
lib/codegen/src/isa/riscv/settings.rs
View File

@@ -16,9 +16,9 @@ mod tests {
#[test]
fn display_default() {
let shared = settings::Flags::new(&settings::builder());
let shared = settings::Flags::new(settings::builder());
let b = builder();
let f = Flags::new(&shared, &b);
let f = Flags::new(&shared, b);
assert_eq!(
f.to_string(),
"[riscv]\n\
@@ -35,20 +35,20 @@ mod tests {
#[test]
fn predicates() {
let shared = settings::Flags::new(&settings::builder());
let shared = settings::Flags::new(settings::builder());
let mut b = builder();
b.enable("supports_f").unwrap();
b.enable("supports_d").unwrap();
let f = Flags::new(&shared, &b);
let f = Flags::new(&shared, b);
assert_eq!(f.full_float(), true);
let mut sb = settings::builder();
sb.set("enable_simd", "false").unwrap();
let shared = settings::Flags::new(&sb);
let shared = settings::Flags::new(sb);
let mut b = builder();
b.enable("supports_f").unwrap();
b.enable("supports_d").unwrap();
let f = Flags::new(&shared, &b);
let f = Flags::new(&shared, b);
assert_eq!(f.full_float(), false);
}
}

2
lib/codegen/src/isa/x86/mod.rs
View File

@@ -35,7 +35,7 @@ pub fn isa_builder() -> IsaBuilder {
fn isa_constructor(
shared_flags: shared_settings::Flags,
builder: &shared_settings::Builder,
builder: shared_settings::Builder,
) -> Box<TargetIsa> {
let level1 = if shared_flags.is_64bit() {
&enc_tables::LEVEL1_I64[..]

42
lib/codegen/src/isa/x86/settings.rs
View File

@@ -15,38 +15,38 @@ mod tests {
#[test]
fn presets() {
let shared = settings::Flags::new(&settings::builder());
let shared = settings::Flags::new(settings::builder());
// Nehalem has SSE4.1 but not BMI1.
let mut b1 = builder();
b1.enable("nehalem").unwrap();
let f1 = Flags::new(&shared, &b1);
assert_eq!(f1.has_sse41(), true);
assert_eq!(f1.has_bmi1(), false);
let mut b0 = builder();
b0.enable("nehalem").unwrap();
let f0 = Flags::new(&shared, b0);
assert_eq!(f0.has_sse41(), true);
assert_eq!(f0.has_bmi1(), false);
let mut b2 = builder();
b2.enable("haswell").unwrap();
let f2 = Flags::new(&shared, &b2);
assert_eq!(f2.has_sse41(), true);
assert_eq!(f2.has_bmi1(), true);
let mut b1 = builder();
b1.enable("haswell").unwrap();
let f1 = Flags::new(&shared, b1);
assert_eq!(f1.has_sse41(), true);
assert_eq!(f1.has_bmi1(), true);
}
#[test]
fn display_presets() {
// Spot check that the flags Display impl does not cause a panic
let shared = settings::Flags::new(&settings::builder());
let shared = settings::Flags::new(settings::builder());
let b1 = builder();
let f1 = Flags::new(&shared, &b1);
let b0 = builder();
let f0 = Flags::new(&shared, b0);
let _ = format!("{}", f0);
let mut b1 = builder();
b1.enable("nehalem").unwrap();
let f1 = Flags::new(&shared, b1);
let _ = format!("{}", f1);
let mut b2 = builder();
b2.enable("nehalem").unwrap();
let f2 = Flags::new(&shared, &b1);
b2.enable("haswell").unwrap();
let f2 = Flags::new(&shared, b2);
let _ = format!("{}", f2);
let mut b3 = builder();
b3.enable("haswell").unwrap();
let f3 = Flags::new(&shared, &b1);
let _ = format!("{}", f3);
}
}

2
lib/codegen/src/regalloc/pressure.rs
View File

@@ -281,7 +281,7 @@ mod tests {
use settings;
let shared_builder = settings::builder();
let shared_flags = settings::Flags::new(&shared_builder);
let shared_flags = settings::Flags::new(shared_builder);
isa::lookup("arm32").ok().map(|b| b.finish(shared_flags))
}

2
lib/codegen/src/regalloc/solver.rs
View File

@@ -1157,7 +1157,7 @@ mod tests {
use settings;
let shared_builder = settings::builder();
let shared_flags = settings::Flags::new(&shared_builder);
let shared_flags = settings::Flags::new(shared_builder);
isa::lookup("arm32").ok().map(|b| b.finish(shared_flags))
}

9
lib/codegen/src/settings.rs
View File

@@ -16,7 +16,7 @@
//! let mut b = settings::builder();
//! b.set("opt_level", "fastest");
//!
//! let f = settings::Flags::new(&b);
//! let f = settings::Flags::new(b);
//! assert_eq!(f.opt_level(), settings::OptLevel::Fastest);
//! ```
@@ -44,6 +44,7 @@ pub trait Configurable {
}
/// Collect settings values based on a template.
#[derive(Clone)]
pub struct Builder {
template: &'static detail::Template,
bytes: Box<[u8]>,
@@ -354,7 +355,7 @@ mod tests {
#[test]
fn display_default() {
let b = builder();
let f = Flags::new(&b);
let f = Flags::new(b);
assert_eq!(
f.to_string(),
"[shared]\n\
@@ -388,7 +389,7 @@ mod tests {
assert_eq!(b.enable("enable_simd"), Ok(()));
assert_eq!(b.set("enable_simd", "false"), Ok(()));
let f = Flags::new(&b);
let f = Flags::new(b);
assert_eq!(f.enable_simd(), false);
}
@@ -402,7 +403,7 @@ mod tests {
assert_eq!(b.set("opt_level", "best"), Ok(()));
assert_eq!(b.set("enable_simd", "0"), Ok(()));
let f = Flags::new(&b);
let f = Flags::new(b);
assert_eq!(f.enable_simd(), false);
assert_eq!(f.opt_level(), super::OptLevel::Best);
}

4
lib/codegen/src/verifier/mod.rs
View File

@@ -1175,7 +1175,7 @@ mod tests {
#[test]
fn empty() {
let func = Function::new();
let flags = &settings::Flags::new(&settings::builder());
let flags = &settings::Flags::new(settings::builder());
let verifier = Verifier::new(&func, flags.into());
assert_eq!(verifier.run(), Ok(()));
}
@@ -1198,7 +1198,7 @@ mod tests {
}),
ebb0,
);
let flags = &settings::Flags::new(&settings::builder());
let flags = &settings::Flags::new(settings::builder());
let verifier = Verifier::new(&func, flags.into());
assert_err_with_msg!(verifier.run(), "instruction format");
}