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

Share constants between codegen and the meta crate;

Browse Source
This commit is contained in:
Benjamin Bouvier
2019-10-09 17:38:29 +02:00
parent 097fa0c7b1
commit f668869508
7 changed files with 79 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cranelift/codegen/src/ir/types.rs
View File

@@ -2,6 +2,7 @@
use core::default::Default;
use core::fmt::{self, Debug, Display, Formatter};
use cranelift_codegen_shared::constants;
use target_lexicon::{PointerWidth, Triple};
/// The type of an SSA value.
@@ -25,12 +26,6 @@ pub struct Type(u8);
/// Not a valid type. Can't be loaded or stored. Can't be part of a SIMD vector.
pub const INVALID: Type = Type(0);
/// Start of the lane types. See also `meta/src/cdsl/types.rs`.
const LANE_BASE: u8 = 0x70;
/// Start of the 2-lane vector types.
const VECTOR_BASE: u8 = LANE_BASE + 16;
// Include code generated by `cranelift-codegen/meta/gen_types.rs`. This file contains constant
// definitions for all the scalar types as well as common vector types for 64, 128, 256, and
// 512-bit SIMD vectors.
@@ -41,10 +36,10 @@ impl Type {
///
/// A lane type is the same as a SIMD vector type with one lane, so it returns itself.
pub fn lane_type(self) -> Self {
if self.0 < VECTOR_BASE {
if self.0 < constants::VECTOR_BASE {
self
} else {
Self(LANE_BASE | (self.0 & 0x0f))
Self(constants::LANE_BASE | (self.0 & 0x0f))
}
}
@@ -170,21 +165,21 @@ impl Type {
/// Is this a special type?
pub fn is_special(self) -> bool {
self.0 < LANE_BASE
self.0 < constants::LANE_BASE
}
/// Is this a lane type?
///
/// This is a scalar type that can also appear as the lane type of a SIMD vector.
pub fn is_lane(self) -> bool {
LANE_BASE <= self.0 && self.0 < VECTOR_BASE
constants::LANE_BASE <= self.0 && self.0 < constants::VECTOR_BASE
}
/// Is this a SIMD vector type?
///
/// A vector type has 2 or more lanes.
pub fn is_vector(self) -> bool {
self.0 >= VECTOR_BASE
self.0 >= constants::VECTOR_BASE
}
/// Is this a scalar boolean type?
@@ -234,7 +229,7 @@ impl Type {
///
/// A scalar type is the same as a SIMD vector type with one lane, so it returns 0.
pub fn log2_lane_count(self) -> u8 {
self.0.saturating_sub(LANE_BASE) >> 4
self.0.saturating_sub(constants::LANE_BASE) >> 4
}
/// Get the number of lanes in this SIMD vector type.