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

[meta] Make Builders build() instead of finish();

Browse Source
This commit is contained in:
Benjamin Bouvier
2019-05-28 15:01:14 +02:00
parent d9277f249b
commit 70f79d23bf
19 changed files with 156 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cranelift/codegen/meta/src/cdsl/formats.rs
View File

@@ -135,7 +135,7 @@ impl InstructionFormatBuilder {
self
}
pub fn finish(self) -> InstructionFormat {
pub fn build(self) -> InstructionFormat {
let typevar_operand = if self.typevar_operand.is_some() {
self.typevar_operand
} else if self.has_value_list || self.num_value_operands > 0 {
@@ -213,7 +213,7 @@ impl FormatRegistry {
);
}
let format = inst_format.finish();
let format = inst_format.build();
// Compute key.
let imm_keys = format

6
cranelift/codegen/meta/src/cdsl/instructions.rs
View File

@@ -34,10 +34,10 @@ impl<'format_reg> InstructionGroupBuilder<'format_reg> {
}
pub fn push(&mut self, builder: InstructionBuilder) {
self.instructions.push(builder.finish(self.format_registry));
self.instructions.push(builder.build(self.format_registry));
}
pub fn finish(self) -> InstructionGroup {
pub fn build(self) -> InstructionGroup {
InstructionGroup {
_name: self._name,
_doc: self._doc,
@@ -300,7 +300,7 @@ impl InstructionBuilder {
self
}
fn finish(self, format_registry: &FormatRegistry) -> Instruction {
fn build(self, format_registry: &FormatRegistry) -> Instruction {
let operands_in = self.operands_in.unwrap_or_else(Vec::new);
let operands_out = self.operands_out.unwrap_or_else(Vec::new);

10
cranelift/codegen/meta/src/cdsl/operands.rs
View File

@@ -95,7 +95,7 @@ impl OperandBuilder {
self.doc = Some(doc.into());
self
}
pub fn finish(self) -> Operand {
pub fn build(self) -> Operand {
let doc = match self.doc {
Some(doc) => Some(doc),
None => match &self.kind.fields {
@@ -215,7 +215,7 @@ impl OperandKindBuilder {
self
}
pub fn finish(self) -> OperandKind {
pub fn build(self) -> OperandKind {
let default_member = match self.default_member {
Some(default_member) => Some(default_member),
None => match &self.fields {
@@ -261,7 +261,7 @@ impl OperandKindBuilder {
impl Into<OperandKind> for &TypeVar {
fn into(self) -> OperandKind {
OperandKindBuilder::new("value", OperandKindFields::TypeVar(self.into())).finish()
OperandKindBuilder::new("value", OperandKindFields::TypeVar(self.into())).build()
}
}
impl Into<OperandKind> for &OperandKind {
@@ -272,7 +272,7 @@ impl Into<OperandKind> for &OperandKind {
/// Helper to create an operand in definitions files.
pub fn create_operand(name: &'static str, kind: impl Into<OperandKind>) -> Operand {
OperandBuilder::new(name, kind.into()).finish()
OperandBuilder::new(name, kind.into()).build()
}
/// Helper to create an operand with a documentation in definitions files.
@@ -281,5 +281,5 @@ pub fn create_operand_doc(
kind: impl Into<OperandKind>,
doc: &'static str,
) -> Operand {
OperandBuilder::new(name, kind.into()).doc(doc).finish()
OperandBuilder::new(name, kind.into()).doc(doc).build()
}

2
cranelift/codegen/meta/src/cdsl/regs.rs
View File

@@ -273,7 +273,7 @@ impl IsaRegsBuilder {
/// 2. There are no identical classes under different names.
/// 3. Classes are sorted topologically such that all subclasses have a
/// higher index that the superclass.
pub fn finish(self) -> IsaRegs {
pub fn build(self) -> IsaRegs {
for reg_bank in self.banks.values() {
for i1 in reg_bank.classes.iter() {
for i2 in reg_bank.classes.iter() {

2
cranelift/codegen/meta/src/cdsl/settings.rs
View File

@@ -315,7 +315,7 @@ impl SettingGroupBuilder {
/// 2. in the list above.
///
/// Assign `byte_offset` and `bit_offset` fields in all settings.
pub fn finish(self) -> SettingGroup {
pub fn build(self) -> SettingGroup {
let mut group = SettingGroup {
name: self.name,
settings: Vec::new(),

143
cranelift/codegen/meta/src/cdsl/typevar.rs
View File

@@ -59,10 +59,10 @@ impl TypeVar {
let (scalar_type, num_lanes) = match value_type {
ValueType::BV(bitvec_type) => {
let bits = bitvec_type.lane_bits() as RangeBound;
return TypeVar::new(name, doc, builder.bitvecs(bits..bits).finish());
return TypeVar::new(name, doc, builder.bitvecs(bits..bits).build());
}
ValueType::Special(special_type) => {
return TypeVar::new(name, doc, builder.specials(vec![special_type]).finish());
return TypeVar::new(name, doc, builder.specials(vec![special_type]).build());
}
ValueType::Lane(lane_type) => (lane_type, 1),
ValueType::Vector(vec_type) => {
@@ -86,7 +86,7 @@ impl TypeVar {
builder.bools(bits..bits)
}
};
TypeVar::new(name, doc, builder.finish())
TypeVar::new(name, doc, builder.build())
}
/// Get a fresh copy of self, named after `name`. Can only be called on non-derived typevars.
@@ -814,7 +814,7 @@ impl TypeSetBuilder {
self
}
pub fn finish(self) -> TypeSet {
pub fn build(self) -> TypeSet {
let min_lanes = if self.includes_scalars { 1 } else { 2 };
;
let bools = range_to_set(self.bools.to_range(1..MAX_BITS, None))
@@ -841,7 +841,7 @@ impl TypeSetBuilder {
.bitvecs(Interval::All)
.specials(ValueType::all_special_types().collect())
.includes_scalars(true)
.finish()
.build()
}
}
@@ -911,7 +911,7 @@ fn range_to_set(range: Option<Range>) -> NumSet {
#[test]
fn test_typevar_builder() {
let type_set = TypeSetBuilder::new().ints(Interval::All).finish();
let type_set = TypeSetBuilder::new().ints(Interval::All).build();
assert_eq!(type_set.lanes, num_set![1]);
assert!(type_set.floats.is_empty());
assert_eq!(type_set.ints, num_set![8, 16, 32, 64]);
@@ -919,7 +919,7 @@ fn test_typevar_builder() {
assert!(type_set.bitvecs.is_empty());
assert!(type_set.specials.is_empty());
let type_set = TypeSetBuilder::new().bools(Interval::All).finish();
let type_set = TypeSetBuilder::new().bools(Interval::All).build();
assert_eq!(type_set.lanes, num_set![1]);
assert!(type_set.floats.is_empty());
assert!(type_set.ints.is_empty());
@@ -927,7 +927,7 @@ fn test_typevar_builder() {
assert!(type_set.bitvecs.is_empty());
assert!(type_set.specials.is_empty());
let type_set = TypeSetBuilder::new().floats(Interval::All).finish();
let type_set = TypeSetBuilder::new().floats(Interval::All).build();
assert_eq!(type_set.lanes, num_set![1]);
assert_eq!(type_set.floats, num_set![32, 64]);
assert!(type_set.ints.is_empty());
@@ -939,7 +939,7 @@ fn test_typevar_builder() {
.floats(Interval::All)
.simd_lanes(Interval::All)
.includes_scalars(false)
.finish();
.build();
assert_eq!(type_set.lanes, num_set![2, 4, 8, 16, 32, 64, 128, 256]);
assert_eq!(type_set.floats, num_set![32, 64]);
assert!(type_set.ints.is_empty());
@@ -951,7 +951,7 @@ fn test_typevar_builder() {
.floats(Interval::All)
.simd_lanes(Interval::All)
.includes_scalars(true)
.finish();
.build();
assert_eq!(type_set.lanes, num_set![1, 2, 4, 8, 16, 32, 64, 128, 256]);
assert_eq!(type_set.floats, num_set![32, 64]);
assert!(type_set.ints.is_empty());
@@ -959,7 +959,7 @@ fn test_typevar_builder() {
assert!(type_set.bitvecs.is_empty());
assert!(type_set.specials.is_empty());
let type_set = TypeSetBuilder::new().ints(16..64).finish();
let type_set = TypeSetBuilder::new().ints(16..64).build();
assert_eq!(type_set.lanes, num_set![1]);
assert_eq!(type_set.ints, num_set![16, 32, 64]);
assert!(type_set.floats.is_empty());
@@ -971,13 +971,13 @@ fn test_typevar_builder() {
#[test]
#[should_panic]
fn test_typevar_builder_too_high_bound_panic() {
TypeSetBuilder::new().ints(16..2 * MAX_BITS).finish();
TypeSetBuilder::new().ints(16..2 * MAX_BITS).build();
}
#[test]
#[should_panic]
fn test_typevar_builder_inverted_bounds_panic() {
TypeSetBuilder::new().ints(32..16).finish();
TypeSetBuilder::new().ints(32..16).build();
}
#[test]
@@ -986,14 +986,14 @@ fn test_as_bool() {
.simd_lanes(2..8)
.ints(8..8)
.floats(32..32)
.finish();
.build();
assert_eq!(
a.lane_of(),
TypeSetBuilder::new().ints(8..8).floats(32..32).finish()
TypeSetBuilder::new().ints(8..8).floats(32..32).build()
);
// Test as_bool with disjoint intervals.
let mut a_as_bool = TypeSetBuilder::new().simd_lanes(2..8).finish();
let mut a_as_bool = TypeSetBuilder::new().simd_lanes(2..8).build();
a_as_bool.bools = num_set![8, 32];
assert_eq!(a.as_bool(), a_as_bool);
@@ -1001,93 +1001,93 @@ fn test_as_bool() {
.simd_lanes(1..8)
.ints(8..8)
.floats(32..32)
.finish();
let mut b_as_bool = TypeSetBuilder::new().simd_lanes(1..8).finish();
.build();
let mut b_as_bool = TypeSetBuilder::new().simd_lanes(1..8).build();
b_as_bool.bools = num_set![1, 8, 32];
assert_eq!(b.as_bool(), b_as_bool);
}
#[test]
fn test_forward_images() {
let empty_set = TypeSetBuilder::new().finish();
let empty_set = TypeSetBuilder::new().build();
// Half vector.
assert_eq!(
TypeSetBuilder::new()
.simd_lanes(1..32)
.finish()
.build()
.half_vector(),
TypeSetBuilder::new().simd_lanes(1..16).finish()
TypeSetBuilder::new().simd_lanes(1..16).build()
);
// Double vector.
assert_eq!(
TypeSetBuilder::new()
.simd_lanes(1..32)
.finish()
.build()
.double_vector(),
TypeSetBuilder::new().simd_lanes(2..64).finish()
TypeSetBuilder::new().simd_lanes(2..64).build()
);
assert_eq!(
TypeSetBuilder::new()
.simd_lanes(128..256)
.finish()
.build()
.double_vector(),
TypeSetBuilder::new().simd_lanes(256..256).finish()
TypeSetBuilder::new().simd_lanes(256..256).build()
);
// Half width.
assert_eq!(
TypeSetBuilder::new().ints(8..32).finish().half_width(),
TypeSetBuilder::new().ints(8..16).finish()
TypeSetBuilder::new().ints(8..32).build().half_width(),
TypeSetBuilder::new().ints(8..16).build()
);
assert_eq!(
TypeSetBuilder::new().floats(32..32).finish().half_width(),
TypeSetBuilder::new().floats(32..32).build().half_width(),
empty_set
);
assert_eq!(
TypeSetBuilder::new().floats(32..64).finish().half_width(),
TypeSetBuilder::new().floats(32..32).finish()
TypeSetBuilder::new().floats(32..64).build().half_width(),
TypeSetBuilder::new().floats(32..32).build()
);
assert_eq!(
TypeSetBuilder::new().bools(1..8).finish().half_width(),
TypeSetBuilder::new().bools(1..8).build().half_width(),
empty_set
);
assert_eq!(
TypeSetBuilder::new().bools(1..32).finish().half_width(),
TypeSetBuilder::new().bools(8..16).finish()
TypeSetBuilder::new().bools(1..32).build().half_width(),
TypeSetBuilder::new().bools(8..16).build()
);
// Double width.
assert_eq!(
TypeSetBuilder::new().ints(8..32).finish().double_width(),
TypeSetBuilder::new().ints(16..64).finish()
TypeSetBuilder::new().ints(8..32).build().double_width(),
TypeSetBuilder::new().ints(16..64).build()
);
assert_eq!(
TypeSetBuilder::new().ints(32..64).finish().double_width(),
TypeSetBuilder::new().ints(64..64).finish()
TypeSetBuilder::new().ints(32..64).build().double_width(),
TypeSetBuilder::new().ints(64..64).build()
);
assert_eq!(
TypeSetBuilder::new().floats(32..32).finish().double_width(),
TypeSetBuilder::new().floats(64..64).finish()
TypeSetBuilder::new().floats(32..32).build().double_width(),
TypeSetBuilder::new().floats(64..64).build()
);
assert_eq!(
TypeSetBuilder::new().floats(32..64).finish().double_width(),
TypeSetBuilder::new().floats(64..64).finish()
TypeSetBuilder::new().floats(32..64).build().double_width(),
TypeSetBuilder::new().floats(64..64).build()
);
assert_eq!(
TypeSetBuilder::new().bools(1..16).finish().double_width(),
TypeSetBuilder::new().bools(16..32).finish()
TypeSetBuilder::new().bools(1..16).build().double_width(),
TypeSetBuilder::new().bools(16..32).build()
);
assert_eq!(
TypeSetBuilder::new().bools(32..64).finish().double_width(),
TypeSetBuilder::new().bools(64..64).finish()
TypeSetBuilder::new().bools(32..64).build().double_width(),
TypeSetBuilder::new().bools(64..64).build()
);
}
#[test]
fn test_backward_images() {
let empty_set = TypeSetBuilder::new().finish();
let empty_set = TypeSetBuilder::new().build();
// LaneOf.
assert_eq!(
@@ -1095,13 +1095,13 @@ fn test_backward_images() {
.simd_lanes(1..1)
.ints(8..8)
.floats(32..32)
.finish()
.build()
.preimage(DerivedFunc::LaneOf),
TypeSetBuilder::new()
.simd_lanes(Interval::All)
.ints(8..8)
.floats(32..32)
.finish()
.build()
);
assert_eq!(empty_set.preimage(DerivedFunc::LaneOf), empty_set);
@@ -1110,14 +1110,14 @@ fn test_backward_images() {
TypeSetBuilder::new()
.simd_lanes(1..4)
.bools(1..64)
.finish()
.build()
.preimage(DerivedFunc::AsBool),
TypeSetBuilder::new()
.simd_lanes(1..4)
.ints(Interval::All)
.bools(Interval::All)
.floats(Interval::All)
.finish()
.build()
);
// Double vector.
@@ -1125,7 +1125,7 @@ fn test_backward_images() {
TypeSetBuilder::new()
.simd_lanes(1..1)
.ints(8..8)
.finish()
.build()
.preimage(DerivedFunc::DoubleVector)
.size(),
0
@@ -1135,13 +1135,13 @@ fn test_backward_images() {
.simd_lanes(1..16)
.ints(8..16)
.floats(32..32)
.finish()
.build()
.preimage(DerivedFunc::DoubleVector),
TypeSetBuilder::new()
.simd_lanes(1..8)
.ints(8..16)
.floats(32..32)
.finish(),
.build(),
);
// Half vector.
@@ -1149,7 +1149,7 @@ fn test_backward_images() {
TypeSetBuilder::new()
.simd_lanes(256..256)
.ints(8..8)
.finish()
.build()
.preimage(DerivedFunc::HalfVector)
.size(),
0
@@ -1158,12 +1158,12 @@ fn test_backward_images() {
TypeSetBuilder::new()
.simd_lanes(64..128)
.bools(1..32)
.finish()
.build()
.preimage(DerivedFunc::HalfVector),
TypeSetBuilder::new()
.simd_lanes(128..256)
.bools(1..32)
.finish(),
.build(),
);
// Half width.
@@ -1172,7 +1172,7 @@ fn test_backward_images() {
.ints(64..64)
.floats(64..64)
.bools(64..64)
.finish()
.build()
.preimage(DerivedFunc::HalfWidth)
.size(),
0
@@ -1181,12 +1181,12 @@ fn test_backward_images() {
TypeSetBuilder::new()
.simd_lanes(64..256)
.bools(1..64)
.finish()
.build()
.preimage(DerivedFunc::HalfWidth),
TypeSetBuilder::new()
.simd_lanes(64..256)
.bools(16..64)
.finish(),
.build(),
);
// Double width.
@@ -1195,7 +1195,7 @@ fn test_backward_images() {
.ints(8..8)
.floats(32..32)
.bools(1..8)
.finish()
.build()
.preimage(DerivedFunc::DoubleWidth)
.size(),
0
@@ -1205,13 +1205,13 @@ fn test_backward_images() {
.simd_lanes(1..16)
.ints(8..16)
.floats(32..64)
.finish()
.build()
.preimage(DerivedFunc::DoubleWidth),
TypeSetBuilder::new()
.simd_lanes(1..16)
.ints(8..8)
.floats(32..32)
.finish()
.build()
);
}
@@ -1221,7 +1221,7 @@ fn test_typeset_singleton_panic_nonsingleton_types() {
TypeSetBuilder::new()
.ints(8..8)
.floats(32..32)
.finish()
.build()
.get_singleton();
}
@@ -1231,7 +1231,7 @@ fn test_typeset_singleton_panic_nonsingleton_lanes() {
TypeSetBuilder::new()
.simd_lanes(1..2)
.floats(32..32)
.finish()
.build()
.get_singleton();
}
@@ -1239,25 +1239,22 @@ fn test_typeset_singleton_panic_nonsingleton_lanes() {
fn test_typeset_singleton() {
use crate::shared::types as shared_types;
assert_eq!(
TypeSetBuilder::new().ints(16..16).finish().get_singleton(),
TypeSetBuilder::new().ints(16..16).build().get_singleton(),
ValueType::Lane(shared_types::Int::I16.into())
);
assert_eq!(
TypeSetBuilder::new()
.floats(64..64)
.finish()
.get_singleton(),
TypeSetBuilder::new().floats(64..64).build().get_singleton(),
ValueType::Lane(shared_types::Float::F64.into())
);
assert_eq!(
TypeSetBuilder::new().bools(1..1).finish().get_singleton(),
TypeSetBuilder::new().bools(1..1).build().get_singleton(),
ValueType::Lane(shared_types::Bool::B1.into())
);
assert_eq!(
TypeSetBuilder::new()
.simd_lanes(4..4)
.ints(32..32)
.finish()
.build()
.get_singleton(),
LaneType::from(shared_types::Int::I32).by(4)
);
@@ -1268,7 +1265,7 @@ fn test_typevar_functions() {
let x = TypeVar::new(
"x",
"i16 and up",
TypeSetBuilder::new().ints(16..64).finish(),
TypeSetBuilder::new().ints(16..64).build(),
);
assert_eq!(x.half_width().name, "half_width(x)");
assert_eq!(
@@ -1276,7 +1273,7 @@ fn test_typevar_functions() {
"double_width(half_width(x))"
);
let x = TypeVar::new("x", "up to i32", TypeSetBuilder::new().ints(8..32).finish());
let x = TypeVar::new("x", "up to i32", TypeSetBuilder::new().ints(8..32).build());
assert_eq!(x.double_width().name, "double_width(x)");
}

4
cranelift/codegen/meta/src/cdsl/xform.rs
View File

@@ -348,7 +348,7 @@ impl TransformGroupBuilder {
self.transforms.push(transform);
}
pub fn finish_and_add_to(self, owner: &mut TransformGroups) -> TransformGroupIndex {
pub fn build_and_add_to(self, owner: &mut TransformGroups) -> TransformGroupIndex {
let next_id = owner.next_key();
owner.add(TransformGroup {
name: self.name,
@@ -410,7 +410,7 @@ fn test_double_custom_legalization() {
format.insert(InstructionFormatBuilder::new("nullary"));
let mut inst_group = InstructionGroupBuilder::new("test", "", &format);
inst_group.push(InstructionBuilder::new("dummy", "doc"));
let inst_group = inst_group.finish();
let inst_group = inst_group.build();
let dummy_inst = inst_group.by_name("dummy");
let mut transform_group = TransformGroupBuilder::new("test", "doc");