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

YJIT: Speed up block_assumptions_free (#11556)

Browse Source
This commit is contained in:
Takashi Kokubun 2024-09-05 12:39:57 -07:00 committed by GitHub
parent cf3b62b545
commit f250296efa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
Notes: git 2024-09-05 19:40:17 +00:00 
Merged-By: k0kubun <takashikkbn@gmail.com>
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
yjit/src/invariants.rs
View File

@ -30,7 +30,6 @@ pub struct Invariants {
/// quick access to all of the blocks that are making this assumption when /// quick access to all of the blocks that are making this assumption when
/// the operator is redefined. /// the operator is redefined.
basic_operator_blocks: HashMap<(RedefinitionFlag, ruby_basic_operators), HashSet<BlockRef>>, basic_operator_blocks: HashMap<(RedefinitionFlag, ruby_basic_operators), HashSet<BlockRef>>,
/// A map from a block to a set of classes and their associated basic /// A map from a block to a set of classes and their associated basic
/// operators that the block is assuming are not redefined. This is used for /// operators that the block is assuming are not redefined. This is used for
/// quick access to all of the assumptions that a block is making when it /// quick access to all of the assumptions that a block is making when it
@ -48,7 +47,6 @@ pub struct Invariants {
/// a constant `A::B` is redefined, then all blocks that are assuming that /// a constant `A::B` is redefined, then all blocks that are assuming that
/// `A` and `B` have not be redefined must be invalidated. /// `A` and `B` have not be redefined must be invalidated.
constant_state_blocks: HashMap<ID, HashSet<BlockRef>>, constant_state_blocks: HashMap<ID, HashSet<BlockRef>>,
/// A map from a block to a set of IDs that it is assuming have not been /// A map from a block to a set of IDs that it is assuming have not been
/// redefined. /// redefined.
block_constant_states: HashMap<BlockRef, HashSet<ID>>, block_constant_states: HashMap<BlockRef, HashSet<ID>>,
@ -57,6 +55,9 @@ pub struct Invariants {
/// will have no singleton class. When the set is empty, it means that /// will have no singleton class. When the set is empty, it means that
/// there has been a singleton class for the class after boot, so you cannot /// there has been a singleton class for the class after boot, so you cannot
/// assume no singleton class going forward. /// assume no singleton class going forward.
/// For now, the key can be only Array, Hash, or String. Consider making
/// an inverted HashMap if we start using this for user-defined classes
/// to maintain the performance of block_assumptions_free().
no_singleton_classes: HashMap<VALUE, HashSet<BlockRef>>, no_singleton_classes: HashMap<VALUE, HashSet<BlockRef>>,
/// A map from an ISEQ to a set of blocks that assume base pointer is equal /// A map from an ISEQ to a set of blocks that assume base pointer is equal
@ -462,11 +463,15 @@ pub fn block_assumptions_free(blockref: BlockRef) {
} }
// Remove tracking for blocks assuming no singleton class // Remove tracking for blocks assuming no singleton class
// NOTE: no_singleton_class has up to 3 keys (Array, Hash, or String) for now.
// This is effectively an O(1) access unless we start using it for more classes.
for (_, blocks) in invariants.no_singleton_classes.iter_mut() { for (_, blocks) in invariants.no_singleton_classes.iter_mut() {
blocks.remove(&blockref); blocks.remove(&blockref);
} }
// Remove tracking for blocks assuming EP doesn't escape // Remove tracking for blocks assuming EP doesn't escape
for (_, blocks) in invariants.no_ep_escape_iseqs.iter_mut() { let iseq = unsafe { blockref.as_ref() }.get_blockid().iseq;
if let Some(blocks) = invariants.no_ep_escape_iseqs.get_mut(&iseq) {
blocks.remove(&blockref); blocks.remove(&blockref);
} }
} }