mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove MatcherPos::stack.

Browse source 
`parse_tt` needs a way to get from within submatchers make to the
enclosing submatchers. Currently it has two distinct mechanisms for
this:
- `Delimited` submatchers use `MatcherPos::stack` to record stuff about
  the parent (and further back ancestors).
- `Sequence` submatchers use `MatcherPosSequence::parent` to point to
  the parent matcher position.

Having two mechanisms is really confusing, and it took me a long time to
understand all this.

This commit eliminates `MatcherPos::stack`, and changes `Delimited`
submatchers to use the same mechanism as sequence submatchers. That
mechanism is also changed a bit: instead of storing the entire parent
`MatcherPos`, we now only store the necessary parts from the parent
`MatcherPos`.

Overall this is a small performance win, with the positives outweighing
the negatives, but it's mostly for clarity.
This commit is contained in:
Nicholas Nethercote 2022-03-31 08:21:36 +11:00
parent 048bd67d51
commit f68a0449ed
2 changed files with 74 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
compiler/rustc_expand/src/lib.rs
View file

@ -1,5 +1,6 @@
#![feature(associated_type_bounds)] #![feature(associated_type_bounds)]
#![feature(associated_type_defaults)] #![feature(associated_type_defaults)]
#![feature(box_patterns)]
#![feature(box_syntax)] #![feature(box_syntax)]
#![feature(crate_visibility_modifier)] #![feature(crate_visibility_modifier)]
#![feature(decl_macro)] #![feature(decl_macro)]

135
compiler/rustc_expand/src/mbe/macro_parser.rs
View file

@ -87,17 +87,6 @@ use rustc_data_structures::sync::Lrc;
use rustc_span::symbol::Ident; use rustc_span::symbol::Ident;
use std::borrow::Cow; use std::borrow::Cow;
use std::collections::hash_map::Entry::{Occupied, Vacant}; use std::collections::hash_map::Entry::{Occupied, Vacant};
use std::mem;
/// This is used by `parse_tt_inner` to keep track of delimited submatchers that we have
/// descended into.
#[derive(Clone)]
struct MatcherPosFrame<'tt> {
/// The "parent" matcher that we have descended from.
tts: &'tt [TokenTree],
/// The position of the "dot" in `tt` at the time we descended.
idx: usize,
}
// One element is enough to cover 95-99% of vectors for most benchmarks. Also, // One element is enough to cover 95-99% of vectors for most benchmarks. Also,
// vectors longer than one frequently have many elements, not just two or // vectors longer than one frequently have many elements, not just two or
@ -108,6 +97,33 @@ type NamedMatchVec = SmallVec<[NamedMatch; 1]>;
#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))] #[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
rustc_data_structures::static_assert_size!(NamedMatchVec, 48); rustc_data_structures::static_assert_size!(NamedMatchVec, 48);
#[derive(Clone)]
enum MatcherKind<'tt> {
TopLevel,
Delimited(Box<DelimitedSubmatcher<'tt>>),
Sequence(Box<SequenceSubmatcher<'tt>>),
}
#[derive(Clone)]
struct DelimitedSubmatcher<'tt> {
parent: Parent<'tt>,
}
#[derive(Clone)]
struct SequenceSubmatcher<'tt> {
parent: Parent<'tt>,
seq: &'tt SequenceRepetition,
}
/// Data used to ascend from a submatcher back to its parent matcher. A subset of the fields from
/// `MathcherPos`.
#[derive(Clone)]
struct Parent<'tt> {
tts: &'tt [TokenTree],
idx: usize,
kind: MatcherKind<'tt>,
}
/// A single matcher position, which could be within the top-level matcher, a submatcher, a /// A single matcher position, which could be within the top-level matcher, a submatcher, a
/// subsubmatcher, etc. For example: /// subsubmatcher, etc. For example:
/// ```text /// ```text
@ -140,17 +156,14 @@ struct MatcherPos<'tt> {
/// stream. Should not be used if there are no metavars. /// stream. Should not be used if there are no metavars.
match_cur: usize, match_cur: usize,
/// This field is only used if we are matching a sequence. /// What kind of matcher we are in. For submatchers, this contains enough information to
sequence: Option<MatcherPosSequence<'tt>>, /// reconstitute a `MatcherPos` within the parent once we ascend out of the submatcher.
kind: MatcherKind<'tt>,
/// When we are within a `Delimited` submatcher (or subsubmatcher), this tracks the parent
/// matcher(s). The bottom of the stack is the top-level matcher.
stack: SmallVec<[MatcherPosFrame<'tt>; 1]>,
} }
// This type is used a lot. Make sure it doesn't unintentionally get bigger. // This type is used a lot. Make sure it doesn't unintentionally get bigger.
#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))] #[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
rustc_data_structures::static_assert_size!(MatcherPos<'_>, 96); rustc_data_structures::static_assert_size!(MatcherPos<'_>, 64);
impl<'tt> MatcherPos<'tt> { impl<'tt> MatcherPos<'tt> {
fn top_level(matcher: &'tt [TokenTree], empty_matches: Lrc<NamedMatchVec>) -> Self { fn top_level(matcher: &'tt [TokenTree], empty_matches: Lrc<NamedMatchVec>) -> Self {
@ -160,24 +173,26 @@ impl<'tt> MatcherPos<'tt> {
matches: empty_matches, matches: empty_matches,
seq_depth: 0, seq_depth: 0,
match_cur: 0, match_cur: 0,
stack: smallvec![], kind: MatcherKind::TopLevel,
sequence: None,
} }
} }
fn sequence( fn sequence(
parent: Box<MatcherPos<'tt>>, parent_mp: Box<MatcherPos<'tt>>,
seq: &'tt SequenceRepetition, seq: &'tt SequenceRepetition,
empty_matches: Lrc<NamedMatchVec>, empty_matches: Lrc<NamedMatchVec>,
) -> Self { ) -> Self {
let seq_kind = box SequenceSubmatcher {
parent: Parent { tts: parent_mp.tts, idx: parent_mp.idx, kind: parent_mp.kind },
seq,
};
let mut mp = MatcherPos { let mut mp = MatcherPos {
tts: &seq.tts, tts: &seq.tts,
idx: 0, idx: 0,
matches: parent.matches.clone(), matches: parent_mp.matches,
seq_depth: parent.seq_depth, seq_depth: parent_mp.seq_depth,
match_cur: parent.match_cur, match_cur: parent_mp.match_cur,
sequence: Some(MatcherPosSequence { parent, seq }), kind: MatcherKind::Sequence(seq_kind),
stack: smallvec![],
}; };
// Start with an empty vec for each metavar within the sequence. Note that `mp.seq_depth` // Start with an empty vec for each metavar within the sequence. Note that `mp.seq_depth`
// must have the parent's depth at this point for these `push_match` calls to work. // must have the parent's depth at this point for these `push_match` calls to work.
@ -222,16 +237,6 @@ impl<'tt> MatcherPos<'tt> {
} }
} }
#[derive(Clone)]
struct MatcherPosSequence<'tt> {
/// The parent matcher position. Effectively gives a linked list of matches all the way to the
/// top-level matcher.
parent: Box<MatcherPos<'tt>>,
/// The sequence itself.
seq: &'tt SequenceRepetition,
}
enum EofMatcherPositions<'tt> { enum EofMatcherPositions<'tt> {
None, None,
One(Box<MatcherPos<'tt>>), One(Box<MatcherPos<'tt>>),
@ -499,15 +504,17 @@ impl<'tt> TtParser<'tt> {
} }
TokenTree::Delimited(_, delimited) => { TokenTree::Delimited(_, delimited) => {
// To descend into a delimited submatcher, we push the current matcher onto // To descend into a delimited submatcher, we update `mp` appropriately,
// a stack and push a new mp containing the submatcher onto `cur_mps`. When // including enough information to re-ascend afterwards, and push it onto
// we reach the closing delimiter, we will pop the stack to backtrack out // `cur_mps`. Later, when we reach the closing delimiter, we will recover
// of the descent. Note that we use `all_tts` to include the open and close // the parent matcher position to ascend. Note that we use `all_tts` to
// delimiter tokens. // include the open and close delimiter tokens.
let tts = mem::replace(&mut mp.tts, &delimited.all_tts); let kind = MatcherKind::Delimited(box DelimitedSubmatcher {
let idx = mp.idx; parent: Parent { tts: mp.tts, idx: mp.idx, kind: mp.kind },
mp.stack.push(MatcherPosFrame { tts, idx }); });
mp.tts = &delimited.all_tts;
mp.idx = 0; mp.idx = 0;
mp.kind = kind;
self.cur_mps.push(mp); self.cur_mps.push(mp);
} }
@ -528,9 +535,14 @@ impl<'tt> TtParser<'tt> {
if let TokenKind::CloseDelim(_) = token.kind { if let TokenKind::CloseDelim(_) = token.kind {
// Ascend out of the delimited submatcher. // Ascend out of the delimited submatcher.
debug_assert_eq!(idx, len - 1); debug_assert_eq!(idx, len - 1);
let frame = mp.stack.pop().unwrap(); match mp.kind {
mp.tts = frame.tts; MatcherKind::Delimited(submatcher) => {
mp.idx = frame.idx; mp.tts = submatcher.parent.tts;
mp.idx = submatcher.parent.idx;
mp.kind = submatcher.parent.kind;
}
_ => unreachable!(),
}
} }
mp.idx += 1; mp.idx += 1;
self.next_mps.push(mp); self.next_mps.push(mp);
@ -540,45 +552,44 @@ impl<'tt> TtParser<'tt> {
// These cannot appear in a matcher. // These cannot appear in a matcher.
TokenTree::MetaVar(..) | TokenTree::MetaVarExpr(..) => unreachable!(), TokenTree::MetaVar(..) | TokenTree::MetaVarExpr(..) => unreachable!(),
} }
} else if let Some(sequence) = &mp.sequence { } else if let MatcherKind::Sequence(box SequenceSubmatcher { parent, seq }) = &mp.kind {
// We are past the end of a sequence. // We are past the end of a sequence.
// - If it has no separator, we must be only one past the end. // - If it has no separator, we must be only one past the end.
// - If it has a separator, we may be one past the end, in which case we must // - If it has a separator, we may be one past the end, in which case we must
// look for a separator. Or we may be two past the end, in which case we have // look for a separator. Or we may be two past the end, in which case we have
// already dealt with the separator. // already dealt with the separator.
debug_assert!(idx == len || idx == len + 1 && sequence.seq.separator.is_some()); debug_assert!(idx == len || idx == len + 1 && seq.separator.is_some());
if idx == len { if idx == len {
// Sequence matching may have finished: move the "dot" past the sequence in // Sequence matching may have finished: move the "dot" past the sequence in
// `parent`. This applies whether a separator is used or not. If sequence // `parent`. This applies whether a separator is used or not. If sequence
// matching hasn't finished, this `new_mp` will fail quietly when it is // matching hasn't finished, this `new_mp` will fail quietly when it is
// processed next time around the loop. // processed next time around the loop.
let mut new_mp = sequence.parent.clone(); let new_mp = box MatcherPos {
new_mp.matches = mp.matches.clone(); tts: parent.tts,
new_mp.match_cur = mp.match_cur; idx: parent.idx + 1,
new_mp.idx += 1; matches: mp.matches.clone(), // a cheap clone
seq_depth: mp.seq_depth - 1,
match_cur: mp.match_cur,
kind: parent.kind.clone(), // an expensive clone
};
self.cur_mps.push(new_mp); self.cur_mps.push(new_mp);
} }
if sequence.seq.separator.is_some() && idx == len { if seq.separator.is_some() && idx == len {
// Look for the separator. // Look for the separator.
if sequence if seq.separator.as_ref().map_or(false, |sep| token_name_eq(token, sep)) {
.seq
.separator
.as_ref()
.map_or(false, |sep| token_name_eq(token, sep))
{
// The matcher has a separator, and it matches the current token. We can // The matcher has a separator, and it matches the current token. We can
// advance past the separator token. // advance past the separator token.
mp.idx += 1; mp.idx += 1;
self.next_mps.push(mp); self.next_mps.push(mp);
} }
} else if sequence.seq.kleene.op != mbe::KleeneOp::ZeroOrOne { } else if seq.kleene.op != mbe::KleeneOp::ZeroOrOne {
// We don't need to look for a separator: either this sequence doesn't have // We don't need to look for a separator: either this sequence doesn't have
// one, or it does and we've already handled it. Also, we are allowed to have // one, or it does and we've already handled it. Also, we are allowed to have
// more than one repetition. Move the "dot" back to the beginning of the // more than one repetition. Move the "dot" back to the beginning of the
// matcher and try to match again. // matcher and try to match again.
mp.match_cur -= sequence.seq.num_captures; mp.match_cur -= seq.num_captures;
mp.idx = 0; mp.idx = 0;
self.cur_mps.push(mp); self.cur_mps.push(mp);
} }