Skip to content

Tag VMContRef fields and continuation stack memory with alias regions #13742

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fitzgen wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Tag VMContRef fields and continuation stack memory with alias regions #13742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 64 additions & 16 deletions crates/cranelift/src/alias_region.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ enum VmType {
VMDrcHeapData,
VMCopyingHeapData,
VMNullHeapData,
VMContRef,
ContinuationStackMemory,
}

/// A key that uniquely identifies an alias region across an entire compilation.
Expand Down Expand Up @@ -85,7 +87,7 @@ enum AliasRegionKey {
}

impl AliasRegionKey {
const KIND_BITS: u32 = 4;
const KIND_BITS: u32 = 5;
const KIND_OFFSET: u32 = 32 - Self::KIND_BITS;
const KIND_MASK: u32 = ((1 << Self::KIND_BITS) - 1) << Self::KIND_OFFSET;

Expand All @@ -102,21 +104,23 @@ impl AliasRegionKey {
kind << Self::KIND_OFFSET
}

const VM_CONTEXT_KIND: u32 = Self::new_kind(0b0000);
const VM_STORE_CONTEXT_KIND: u32 = Self::new_kind(0b0001);
const IMPORTED_MEMORY_KIND: u32 = Self::new_kind(0b0010);
const DEFINED_MEMORY_KIND: u32 = Self::new_kind(0b0011);
const IMPORTED_TABLE_KIND: u32 = Self::new_kind(0b0100);
const DEFINED_TABLE_KIND: u32 = Self::new_kind(0b0101);
const IMPORTED_GLOBAL_KIND: u32 = Self::new_kind(0b0110);
const DEFINED_GLOBAL_KIND: u32 = Self::new_kind(0b0111);
const GC_HEAP_KIND: u32 = Self::new_kind(0b1000);
const VM_MEMORY_DEFINITION_KIND: u32 = Self::new_kind(0b1001);
const VM_TABLE_DEFINITION_KIND: u32 = Self::new_kind(0b1010);
const VM_COMPONENT_CONTEXT_KIND: u32 = Self::new_kind(0b1011);
const VM_DRC_HEAP_DATA_KIND: u32 = Self::new_kind(0b1100);
const VM_COPYING_HEAP_DATA_KIND: u32 = Self::new_kind(0b1101);
const VM_NULL_HEAP_DATA_KIND: u32 = Self::new_kind(0b1110);
const VM_CONTEXT_KIND: u32 = Self::new_kind(0b00000);
const VM_STORE_CONTEXT_KIND: u32 = Self::new_kind(0b00001);
const IMPORTED_MEMORY_KIND: u32 = Self::new_kind(0b00010);
const DEFINED_MEMORY_KIND: u32 = Self::new_kind(0b00011);
const IMPORTED_TABLE_KIND: u32 = Self::new_kind(0b00100);
const DEFINED_TABLE_KIND: u32 = Self::new_kind(0b00101);
const IMPORTED_GLOBAL_KIND: u32 = Self::new_kind(0b00110);
const DEFINED_GLOBAL_KIND: u32 = Self::new_kind(0b00111);
const GC_HEAP_KIND: u32 = Self::new_kind(0b01000);
const VM_MEMORY_DEFINITION_KIND: u32 = Self::new_kind(0b01001);
const VM_TABLE_DEFINITION_KIND: u32 = Self::new_kind(0b01010);
const VM_COMPONENT_CONTEXT_KIND: u32 = Self::new_kind(0b01011);
const VM_DRC_HEAP_DATA_KIND: u32 = Self::new_kind(0b01100);
const VM_COPYING_HEAP_DATA_KIND: u32 = Self::new_kind(0b01101);
const VM_NULL_HEAP_DATA_KIND: u32 = Self::new_kind(0b01110);
const VM_CONTREF_KIND: u32 = Self::new_kind(0b01111);
const CONTINUATION_STACK_MEMORY_KIND: u32 = Self::new_kind(0b10000);

/// Encode this key into a raw `u32` suitable for use as an
/// `AliasRegionData::user_id`.
Expand All @@ -133,6 +137,8 @@ impl AliasRegionKey {
VmType::VMDrcHeapData => Self::VM_DRC_HEAP_DATA_KIND,
VmType::VMCopyingHeapData => Self::VM_COPYING_HEAP_DATA_KIND,
VmType::VMNullHeapData => Self::VM_NULL_HEAP_DATA_KIND,
VmType::VMContRef => Self::VM_CONTREF_KIND,
VmType::ContinuationStackMemory => Self::CONTINUATION_STACK_MEMORY_KIND,
};
kind | (offset & Self::OFFSET_MASK)
}
Expand Down Expand Up @@ -1886,3 +1892,45 @@ where
);
}
}

/// Stack-switching and continuation-object methods.
impl<Offsets> AliasRegions<Offsets>
where
Offsets: GetPtrSize,
{
/// Region for a continuation-reference object and its inline
/// sub-structures.
///
/// A `VMContRef` (and its inline `VMCommonStackInformation` /
/// `VMStackLimits` / `VMHostArray` headers) is reached through a `*mut
/// VMContRef`.
///
/// A single region covers the whole object: this is coarse but sound, and
/// keeps every field of the object disjoint from linear memory, the vmctx,
/// the store context, etc...
pub fn vmcontref_region(&mut self, func: &mut ir::Function) -> ir::AliasRegion {
self.region(
func,
AliasRegionKey::Vm {
ty: VmType::VMContRef,
offset: 0,
},
)
}

/// Region for a continuation's stack memory: its payload/handler data
/// buffers and the control-context records stored on the continuation
/// stack.
///
/// These are distinct from the `VMContRef` object itself (which only holds
/// pointers to them).
pub fn continuation_stack_memory_region(&mut self, func: &mut ir::Function) -> ir::AliasRegion {
self.region(
func,
AliasRegionKey::Vm {
ty: VmType::ContinuationStackMemory,
offset: 0,
},
)
}
}
Loading