* Refactor where results of compilation are stored This commit refactors the internals of compilation in Wasmtime to change where results of individual function compilation are stored. Previously compilation resulted in many maps being returned, and compilation results generally held all these maps together. This commit instead switches this to have all metadata stored in a `CompiledFunction` instead of having a separate map for each item that can be stored. The motivation for this is primarily to help out with future module-linking-related PRs. What exactly "module level" is depends on how we interpret modules and how many modules are in play, so it's a bit easier for operations in wasmtime to work at the function level where possible. This means that we don't have to pass around multiple different maps and a function index, but instead just one map or just one entry representing a compiled function. Additionally this change updates where the parallelism of compilation happens, pushing it into `wasmtime-jit` instead of `wasmtime-environ`. This is another goal where `wasmtime-jit` will have more knowledge about module-level pieces with module linking in play. User-facing-wise this should be the same in terms of parallel compilation, though. The ultimate goal of this refactoring is to make it easier for the results of compilation to actually be a set of wasm modules. This means we won't be able to have a map-per-metadata where the primary key is the function index, because there will be many modules within one "object file". * Don't clear out fields, just don't store them Persist a smaller set of fields in `CompilationArtifacts` instead of trying to clear fields out and dynamically not accessing them.
426 lines
10 KiB
Rust
426 lines
10 KiB
Rust
//! Densely numbered entity references as mapping keys.
|
|
use crate::boxed_slice::BoxedSlice;
|
|
use crate::iter::{IntoIter, Iter, IterMut};
|
|
use crate::keys::Keys;
|
|
use crate::EntityRef;
|
|
use alloc::boxed::Box;
|
|
use alloc::vec::Vec;
|
|
use core::iter::FromIterator;
|
|
use core::marker::PhantomData;
|
|
use core::ops::{Index, IndexMut};
|
|
use core::slice;
|
|
#[cfg(feature = "enable-serde")]
|
|
use serde::{Deserialize, Serialize};
|
|
|
|
/// A primary mapping `K -> V` allocating dense entity references.
|
|
///
|
|
/// The `PrimaryMap` data structure uses the dense index space to implement a map with a vector.
|
|
///
|
|
/// A primary map contains the main definition of an entity, and it can be used to allocate new
|
|
/// entity references with the `push` method.
|
|
///
|
|
/// There should only be a single `PrimaryMap` instance for a given `EntityRef` type, otherwise
|
|
/// conflicting references will be created. Using unknown keys for indexing will cause a panic.
|
|
///
|
|
/// Note that `PrimaryMap` doesn't implement `Deref` or `DerefMut`, which would allow
|
|
/// `&PrimaryMap<K, V>` to convert to `&[V]`. One of the main advantages of `PrimaryMap` is
|
|
/// that it only allows indexing with the distinct `EntityRef` key type, so converting to a
|
|
/// plain slice would make it easier to use incorrectly. To make a slice of a `PrimaryMap`, use
|
|
/// `into_boxed_slice`.
|
|
#[derive(Debug, Clone, Hash, PartialEq, Eq)]
|
|
#[cfg_attr(feature = "enable-serde", derive(Serialize, Deserialize))]
|
|
pub struct PrimaryMap<K, V>
|
|
where
|
|
K: EntityRef,
|
|
{
|
|
elems: Vec<V>,
|
|
unused: PhantomData<K>,
|
|
}
|
|
|
|
impl<K, V> PrimaryMap<K, V>
|
|
where
|
|
K: EntityRef,
|
|
{
|
|
/// Create a new empty map.
|
|
pub fn new() -> Self {
|
|
Self {
|
|
elems: Vec::new(),
|
|
unused: PhantomData,
|
|
}
|
|
}
|
|
|
|
/// Create a new empty map with the given capacity.
|
|
pub fn with_capacity(capacity: usize) -> Self {
|
|
Self {
|
|
elems: Vec::with_capacity(capacity),
|
|
unused: PhantomData,
|
|
}
|
|
}
|
|
|
|
/// Check if `k` is a valid key in the map.
|
|
pub fn is_valid(&self, k: K) -> bool {
|
|
k.index() < self.elems.len()
|
|
}
|
|
|
|
/// Get the element at `k` if it exists.
|
|
pub fn get(&self, k: K) -> Option<&V> {
|
|
self.elems.get(k.index())
|
|
}
|
|
|
|
/// Get the element at `k` if it exists, mutable version.
|
|
pub fn get_mut(&mut self, k: K) -> Option<&mut V> {
|
|
self.elems.get_mut(k.index())
|
|
}
|
|
|
|
/// Is this map completely empty?
|
|
pub fn is_empty(&self) -> bool {
|
|
self.elems.is_empty()
|
|
}
|
|
|
|
/// Get the total number of entity references created.
|
|
pub fn len(&self) -> usize {
|
|
self.elems.len()
|
|
}
|
|
|
|
/// Iterate over all the keys in this map.
|
|
pub fn keys(&self) -> Keys<K> {
|
|
Keys::with_len(self.elems.len())
|
|
}
|
|
|
|
/// Iterate over all the values in this map.
|
|
pub fn values(&self) -> slice::Iter<V> {
|
|
self.elems.iter()
|
|
}
|
|
|
|
/// Iterate over all the values in this map, mutable edition.
|
|
pub fn values_mut(&mut self) -> slice::IterMut<V> {
|
|
self.elems.iter_mut()
|
|
}
|
|
|
|
/// Iterate over all the keys and values in this map.
|
|
pub fn iter(&self) -> Iter<K, V> {
|
|
Iter::new(self.elems.iter())
|
|
}
|
|
|
|
/// Iterate over all the keys and values in this map, mutable edition.
|
|
pub fn iter_mut(&mut self) -> IterMut<K, V> {
|
|
IterMut::new(self.elems.iter_mut())
|
|
}
|
|
|
|
/// Remove all entries from this map.
|
|
pub fn clear(&mut self) {
|
|
self.elems.clear()
|
|
}
|
|
|
|
/// Get the key that will be assigned to the next pushed value.
|
|
pub fn next_key(&self) -> K {
|
|
K::new(self.elems.len())
|
|
}
|
|
|
|
/// Append `v` to the mapping, assigning a new key which is returned.
|
|
pub fn push(&mut self, v: V) -> K {
|
|
let k = self.next_key();
|
|
self.elems.push(v);
|
|
k
|
|
}
|
|
|
|
/// Returns the last element that was inserted in the map.
|
|
pub fn last(&self) -> Option<&V> {
|
|
self.elems.last()
|
|
}
|
|
|
|
/// Reserves capacity for at least `additional` more elements to be inserted.
|
|
pub fn reserve(&mut self, additional: usize) {
|
|
self.elems.reserve(additional)
|
|
}
|
|
|
|
/// Reserves the minimum capacity for exactly `additional` more elements to be inserted.
|
|
pub fn reserve_exact(&mut self, additional: usize) {
|
|
self.elems.reserve_exact(additional)
|
|
}
|
|
|
|
/// Shrinks the capacity of the `PrimaryMap` as much as possible.
|
|
pub fn shrink_to_fit(&mut self) {
|
|
self.elems.shrink_to_fit()
|
|
}
|
|
|
|
/// Consumes this `PrimaryMap` and produces a `BoxedSlice`.
|
|
pub fn into_boxed_slice(self) -> BoxedSlice<K, V> {
|
|
unsafe { BoxedSlice::<K, V>::from_raw(Box::<[V]>::into_raw(self.elems.into_boxed_slice())) }
|
|
}
|
|
}
|
|
|
|
impl<K, V> Default for PrimaryMap<K, V>
|
|
where
|
|
K: EntityRef,
|
|
{
|
|
fn default() -> PrimaryMap<K, V> {
|
|
PrimaryMap::new()
|
|
}
|
|
}
|
|
|
|
/// Immutable indexing into an `PrimaryMap`.
|
|
/// The indexed value must be in the map.
|
|
impl<K, V> Index<K> for PrimaryMap<K, V>
|
|
where
|
|
K: EntityRef,
|
|
{
|
|
type Output = V;
|
|
|
|
fn index(&self, k: K) -> &V {
|
|
&self.elems[k.index()]
|
|
}
|
|
}
|
|
|
|
/// Mutable indexing into an `PrimaryMap`.
|
|
impl<K, V> IndexMut<K> for PrimaryMap<K, V>
|
|
where
|
|
K: EntityRef,
|
|
{
|
|
fn index_mut(&mut self, k: K) -> &mut V {
|
|
&mut self.elems[k.index()]
|
|
}
|
|
}
|
|
|
|
impl<K, V> IntoIterator for PrimaryMap<K, V>
|
|
where
|
|
K: EntityRef,
|
|
{
|
|
type Item = (K, V);
|
|
type IntoIter = IntoIter<K, V>;
|
|
|
|
fn into_iter(self) -> Self::IntoIter {
|
|
IntoIter::new(self.elems.into_iter())
|
|
}
|
|
}
|
|
|
|
impl<'a, K, V> IntoIterator for &'a PrimaryMap<K, V>
|
|
where
|
|
K: EntityRef,
|
|
{
|
|
type Item = (K, &'a V);
|
|
type IntoIter = Iter<'a, K, V>;
|
|
|
|
fn into_iter(self) -> Self::IntoIter {
|
|
Iter::new(self.elems.iter())
|
|
}
|
|
}
|
|
|
|
impl<'a, K, V> IntoIterator for &'a mut PrimaryMap<K, V>
|
|
where
|
|
K: EntityRef,
|
|
{
|
|
type Item = (K, &'a mut V);
|
|
type IntoIter = IterMut<'a, K, V>;
|
|
|
|
fn into_iter(self) -> Self::IntoIter {
|
|
IterMut::new(self.elems.iter_mut())
|
|
}
|
|
}
|
|
|
|
impl<K, V> FromIterator<V> for PrimaryMap<K, V>
|
|
where
|
|
K: EntityRef,
|
|
{
|
|
fn from_iter<T>(iter: T) -> Self
|
|
where
|
|
T: IntoIterator<Item = V>,
|
|
{
|
|
Self {
|
|
elems: Vec::from_iter(iter),
|
|
unused: PhantomData,
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
// `EntityRef` impl for testing.
|
|
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
|
struct E(u32);
|
|
|
|
impl EntityRef for E {
|
|
fn new(i: usize) -> Self {
|
|
E(i as u32)
|
|
}
|
|
fn index(self) -> usize {
|
|
self.0 as usize
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn basic() {
|
|
let r0 = E(0);
|
|
let r1 = E(1);
|
|
let m = PrimaryMap::<E, isize>::new();
|
|
|
|
let v: Vec<E> = m.keys().collect();
|
|
assert_eq!(v, []);
|
|
|
|
assert!(!m.is_valid(r0));
|
|
assert!(!m.is_valid(r1));
|
|
}
|
|
|
|
#[test]
|
|
fn push() {
|
|
let mut m = PrimaryMap::new();
|
|
let k0: E = m.push(12);
|
|
let k1 = m.push(33);
|
|
|
|
assert_eq!(m[k0], 12);
|
|
assert_eq!(m[k1], 33);
|
|
|
|
let v: Vec<E> = m.keys().collect();
|
|
assert_eq!(v, [k0, k1]);
|
|
}
|
|
|
|
#[test]
|
|
fn iter() {
|
|
let mut m: PrimaryMap<E, usize> = PrimaryMap::new();
|
|
m.push(12);
|
|
m.push(33);
|
|
|
|
let mut i = 0;
|
|
for (key, value) in &m {
|
|
assert_eq!(key.index(), i);
|
|
match i {
|
|
0 => assert_eq!(*value, 12),
|
|
1 => assert_eq!(*value, 33),
|
|
_ => panic!(),
|
|
}
|
|
i += 1;
|
|
}
|
|
i = 0;
|
|
for (key_mut, value_mut) in m.iter_mut() {
|
|
assert_eq!(key_mut.index(), i);
|
|
match i {
|
|
0 => assert_eq!(*value_mut, 12),
|
|
1 => assert_eq!(*value_mut, 33),
|
|
_ => panic!(),
|
|
}
|
|
i += 1;
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn iter_rev() {
|
|
let mut m: PrimaryMap<E, usize> = PrimaryMap::new();
|
|
m.push(12);
|
|
m.push(33);
|
|
|
|
let mut i = 2;
|
|
for (key, value) in m.iter().rev() {
|
|
i -= 1;
|
|
assert_eq!(key.index(), i);
|
|
match i {
|
|
0 => assert_eq!(*value, 12),
|
|
1 => assert_eq!(*value, 33),
|
|
_ => panic!(),
|
|
}
|
|
}
|
|
|
|
i = 2;
|
|
for (key, value) in m.iter_mut().rev() {
|
|
i -= 1;
|
|
assert_eq!(key.index(), i);
|
|
match i {
|
|
0 => assert_eq!(*value, 12),
|
|
1 => assert_eq!(*value, 33),
|
|
_ => panic!(),
|
|
}
|
|
}
|
|
}
|
|
#[test]
|
|
fn keys() {
|
|
let mut m: PrimaryMap<E, usize> = PrimaryMap::new();
|
|
m.push(12);
|
|
m.push(33);
|
|
|
|
let mut i = 0;
|
|
for key in m.keys() {
|
|
assert_eq!(key.index(), i);
|
|
i += 1;
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn keys_rev() {
|
|
let mut m: PrimaryMap<E, usize> = PrimaryMap::new();
|
|
m.push(12);
|
|
m.push(33);
|
|
|
|
let mut i = 2;
|
|
for key in m.keys().rev() {
|
|
i -= 1;
|
|
assert_eq!(key.index(), i);
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn values() {
|
|
let mut m: PrimaryMap<E, usize> = PrimaryMap::new();
|
|
m.push(12);
|
|
m.push(33);
|
|
|
|
let mut i = 0;
|
|
for value in m.values() {
|
|
match i {
|
|
0 => assert_eq!(*value, 12),
|
|
1 => assert_eq!(*value, 33),
|
|
_ => panic!(),
|
|
}
|
|
i += 1;
|
|
}
|
|
i = 0;
|
|
for value_mut in m.values_mut() {
|
|
match i {
|
|
0 => assert_eq!(*value_mut, 12),
|
|
1 => assert_eq!(*value_mut, 33),
|
|
_ => panic!(),
|
|
}
|
|
i += 1;
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn values_rev() {
|
|
let mut m: PrimaryMap<E, usize> = PrimaryMap::new();
|
|
m.push(12);
|
|
m.push(33);
|
|
|
|
let mut i = 2;
|
|
for value in m.values().rev() {
|
|
i -= 1;
|
|
match i {
|
|
0 => assert_eq!(*value, 12),
|
|
1 => assert_eq!(*value, 33),
|
|
_ => panic!(),
|
|
}
|
|
}
|
|
i = 2;
|
|
for value_mut in m.values_mut().rev() {
|
|
i -= 1;
|
|
match i {
|
|
0 => assert_eq!(*value_mut, 12),
|
|
1 => assert_eq!(*value_mut, 33),
|
|
_ => panic!(),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn from_iter() {
|
|
let mut m: PrimaryMap<E, usize> = PrimaryMap::new();
|
|
m.push(12);
|
|
m.push(33);
|
|
|
|
let n = m.values().collect::<PrimaryMap<E, _>>();
|
|
assert!(m.len() == n.len());
|
|
for (me, ne) in m.values().zip(n.values()) {
|
|
assert!(*me == **ne);
|
|
}
|
|
}
|
|
}
|