1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

YJIT: Pack BlockId and CodePtr (#6748)

Browse Source
This commit is contained in:
Takashi Kokubun 2022-11-16 15:48:46 -08:00 committed by GitHub
parent 1b8236acc2
commit 3259aceb35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
Notes: git 2022-11-16 23:49:11 +00:00 
Merged-By: k0kubun <takashikkbn@gmail.com>
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
yjit/src/codegen.rs
View File

@ -721,7 +721,8 @@ pub fn gen_single_block(
#[cfg(feature = "disasm")]
if get_option_ref!(dump_disasm).is_some() {
asm.comment(&format!("Block: {} (ISEQ offset: {})", iseq_get_location(blockid.iseq), blockid.idx));
let blockid_idx = blockid.idx;
asm.comment(&format!("Block: {} (ISEQ offset: {})", iseq_get_location(blockid.iseq), blockid_idx));
}
// For each instruction to compile

7
yjit/src/core.rs
View File

@ -304,6 +304,7 @@ pub struct Context {
/// Tuple of (iseq, idx) used to identify basic blocks
/// There are a lot of blockid objects so we try to keep the size small.
#[derive(Copy, Clone, PartialEq, Eq, Debug)]
#[repr(packed)]
pub struct BlockId {
/// Instruction sequence
pub iseq: IseqPtr,
@ -1526,7 +1527,8 @@ fn gen_block_series_body(
let iseq_location = iseq_get_location(blockid.iseq);
if iseq_location.contains(substr) {
let last_block = last_blockref.borrow();
println!("Compiling {} block(s) for {}, ISEQ offsets [{}, {})", batch.len(), iseq_location, blockid.idx, last_block.end_idx);
let blockid_idx = blockid.idx;
println!("Compiling {} block(s) for {}, ISEQ offsets [{}, {})", batch.len(), iseq_location, blockid_idx, last_block.end_idx);
print!("{}", disasm_iseq_insn_range(blockid.iseq, blockid.idx, last_block.end_idx));
}
}
@ -2148,7 +2150,8 @@ pub fn invalidate_block_version(blockref: &BlockRef) {
if let Some(substr) = get_option_ref!(dump_iseq_disasm).as_ref() {
let iseq_location = iseq_get_location(block.blockid.iseq);
if iseq_location.contains(substr) {
println!("Invalidating block from {}, ISEQ offsets [{}, {})", iseq_location, block.blockid.idx, block.end_idx);
let blockid_idx = block.blockid.idx;
println!("Invalidating block from {}, ISEQ offsets [{}, {})", iseq_location, blockid_idx, block.end_idx);
}
}
}

3
yjit/src/disasm.rs
View File

@ -90,11 +90,12 @@ pub fn disasm_iseq_insn_range(iseq: IseqPtr, start_idx: u32, end_idx: u32) -> St
let code_size = block.code_size();
// Write some info about the current block
let blockid_idx = blockid.idx;
let block_ident = format!(
"BLOCK {}/{}, ISEQ RANGE [{},{}), {} bytes ",
block_idx + 1,
block_list.len(),
blockid.idx,
blockid_idx,
end_idx,
code_size
);

2
yjit/src/virtualmem.rs
View File

@ -59,7 +59,7 @@ pub trait Allocator {
/// We may later change this to wrap an u32.
/// Note: there is no NULL constant for CodePtr. You should use Option<CodePtr> instead.
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
#[repr(C)]
#[repr(C, packed)]
pub struct CodePtr(*const u8);
/// Errors that can happen when writing to [VirtualMemory]