miloignis/kraken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Swap ID to NonZeroI64 so Option<ID> is a single word and we can test for 0 in JIT for if we have an ID (for looking at ret_stack)

Browse Source
This commit is contained in:
Nathan Braswell
2024-02-05 01:34:53 -05:00
parent a4500fed36
commit fd843bc807
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
slj/src/lib.rs
View File

@@ -1,7 +1,6 @@
use std::collections::{BTreeSet,BTreeMap}; use std::collections::{BTreeSet,BTreeMap};
use std::fmt; use std::fmt;
use anyhow::{anyhow,bail,Result};
use std::sync::Mutex; use std::sync::Mutex;
use std::marker::PhantomData; use std::marker::PhantomData;
use std::ops::{Deref,DerefMut}; use std::ops::{Deref,DerefMut};
@@ -9,6 +8,7 @@ use std::ptr::{self, NonNull};
use std::mem::{self, ManuallyDrop}; use std::mem::{self, ManuallyDrop};
use std::alloc::{self, Layout}; use std::alloc::{self, Layout};
use std::cell::Cell; use std::cell::Cell;
use std::num::NonZeroI64;
use cranelift::codegen::ir::{UserFuncName,FuncRef}; use cranelift::codegen::ir::{UserFuncName,FuncRef};
use cranelift::prelude::*; use cranelift::prelude::*;
@@ -16,6 +16,7 @@ use cranelift_codegen::settings::{self, Configurable};
use cranelift_jit::{JITBuilder, JITModule}; use cranelift_jit::{JITBuilder, JITModule};
use cranelift_module::{default_libcall_names, Linkage, Module, FuncId}; use cranelift_module::{default_libcall_names, Linkage, Module, FuncId};
use anyhow::{anyhow,bail,Result};
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
const TRACE_LEVEL: i64 = 1; const TRACE_LEVEL: i64 = 1;
@@ -445,7 +446,7 @@ impl JIT {
// quit out of trace! // quit out of trace!
println!("compiling back to interp because we can't compile {op:?}"); println!("compiling back to interp because we can't compile {op:?}");
assert!(offset <= TRACE_OFFSET_MASK); assert!(offset <= TRACE_OFFSET_MASK);
let cst = bcx.ins().iconst(self.int, (id.id << TRACE_ID_OFFSET) | offset as i64); let cst = bcx.ins().iconst(self.int, (id.id.get() << TRACE_ID_OFFSET) | offset as i64);
bcx.ins().return_(&[cst]); bcx.ins().return_(&[cst]);
break; break;
} }
@@ -704,7 +705,7 @@ impl<T> Drop for Crc<T> {
#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Clone, Copy)] #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Clone, Copy)]
#[repr(transparent)] #[repr(transparent)]
pub struct ID { pub struct ID {
pub id: i64 pub id: NonZeroI64
} }
impl fmt::Display for ID { impl fmt::Display for ID {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
@@ -1243,7 +1244,7 @@ impl Ctx {
} }
fn alloc_id(&mut self) -> ID { fn alloc_id(&mut self) -> ID {
self.id_counter += 1; self.id_counter += 1;
ID { id: self.id_counter } ID { id: NonZeroI64::new(self.id_counter).unwrap() }
} }
fn trace_running(&self) -> bool { self.tracing.is_some() } fn trace_running(&self) -> bool { self.tracing.is_some() }
@@ -1325,7 +1326,7 @@ impl Ctx {
return None; return None;
} else { } else {
trace.tbk.stack_const.truncate(trace.tbk.stack_const.len()-call_len); trace.tbk.stack_const.truncate(trace.tbk.stack_const.len()-call_len);
self.id_counter += 1; let nc_id = ID { id: self.id_counter }; // HACK - I can't use the method cuz trace is borrowed self.id_counter += 1; let nc_id = ID { id: NonZeroI64::new(self.id_counter).unwrap() }; // HACK - I can't use the method cuz trace is borrowed
trace.ops.push(Op::Call { len: call_len, statik, nc: Crc::clone(nc), nc_id }); trace.ops.push(Op::Call { len: call_len, statik, nc: Crc::clone(nc), nc_id });
println!("Ending trace at call!"); println!("Ending trace at call!");
println!("\t{}", trace); println!("\t{}", trace);
@@ -1399,7 +1400,7 @@ impl Ctx {
println!("Tracing guard {value:?}"); println!("Tracing guard {value:?}");
if let Some(trace) = &mut self.tracing { if let Some(trace) = &mut self.tracing {
let (side_val, side_cont) = other(); let (side_val, side_cont) = other();
self.id_counter += 1; let side_id = ID { id: self.id_counter }; // HACK - I can't use the method cuz trace is borrowed self.id_counter += 1; let side_id = ID { id: NonZeroI64::new(self.id_counter).unwrap() }; // HACK - I can't use the method cuz trace is borrowed
trace.ops.push(Op::Guard { const_value: value.into(), side_val, side_cont, side_id, tbk: trace.tbk.clone() }); trace.ops.push(Op::Guard { const_value: value.into(), side_val, side_cont, side_id, tbk: trace.tbk.clone() });
} }
} }
@@ -1452,7 +1453,7 @@ impl Ctx {
if let Some(f) = self.compiled_traces.get(&id) { if let Some(f) = self.compiled_traces.get(&id) {
println!("Calling JIT function {id}, tmp_stack is {:?}!", tmp_stack); println!("Calling JIT function {id}, tmp_stack is {:?}!", tmp_stack);
let trace_ret = f(&mut e, tmp_stack, ret_stack); let trace_ret = f(&mut e, tmp_stack, ret_stack);
let new_id = ID { id: (trace_ret >> TRACE_ID_OFFSET) as i64 }; let new_id = ID { id: NonZeroI64::new((trace_ret >> TRACE_ID_OFFSET) as i64).unwrap() };
offset = trace_ret & TRACE_OFFSET_MASK; offset = trace_ret & TRACE_OFFSET_MASK;
println!("\tresult of call is new_id {new_id} and offset {offset}, tmp_stack is {:?}!", tmp_stack); println!("\tresult of call is new_id {new_id} and offset {offset}, tmp_stack is {:?}!", tmp_stack);
// if we've returned a new trace to start, do so, // if we've returned a new trace to start, do so,

2
slj/src/main.rs
View File

@@ -10,6 +10,8 @@ use sl::{eval,Form,Crc,Cvec,Prim,ID,JIT};
fn main() -> Result<()> { fn main() -> Result<()> {
// our Form shennigins will only work on 64 bit platforms // our Form shennigins will only work on 64 bit platforms
assert!(std::mem::size_of::<usize>() == 8); assert!(std::mem::size_of::<usize>() == 8);
assert!(std::mem::size_of::<ID>() == 8);
assert!(std::mem::size_of::<Option<ID>>() == 8);
//let res = ptr_b(); //let res = ptr_b();
//println!("sucessful run with result {res}"); //println!("sucessful run with result {res}");