aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-08-03 21:07:07 +0100
committerbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-08-03 21:07:07 +0100
commit0e94d07b9c6f75657ab07dbf4a42a6d2c08a139a (patch)
tree4eb35b21ec2411778eb675e88c8bbd7900c65b47
parentc5bdd02503b782eb8406cfdb2692ef51c05d5f48 (diff)
parentf52437371f9e82cc0ceb6c2f5e48e23d405faf5e (diff)
Merge #1638
1638: Avoid cloning a TtToken in SubtreeTokenSource::mk_token r=matklad a=lnicola According to `perf record`, this function is the hottest one while running `ra_cli analysis-stats`: Before: ``` 6.05% ra_cli ra_cli <ra_mbe::subtree_source::SubtreeTokenSource as ra_parser::TokenSource>::lookahead_nth 5.56% ra_cli ra_cli <rowan::green::GreenNode as core::hash::Hash>::hash 4.16% ra_cli libc-2.29.so _int_malloc 3.93% ra_cli ra_cli ra_mbe::subtree_source::SubtreeTokenSource::get Database loaded, 255 roots, 231.676882ms Crates in this dir: 27 Total modules found: 282 Total declarations: 9642 Total functions: 3287 Total expressions: 64616 Expressions of unknown type: 9111 (14%) Expressions of partially unknown type: 3417 (5%) Analysis: 24.012797561s, 0b allocated 0b resident target/release/ra_cli analysis-stats 24.60s user 0.56s system 100% cpu 25.125 total ``` After: ``` 5.85% ra_cli ra_cli <rowan::green::GreenNode as core::hash::Hash>::hash 4.55% ra_cli libc-2.29.so _int_malloc 4.31% ra_cli ra_cli ra_parser::parser::Parser::nth 3.61% ra_cli ra_cli <ra_syntax::parsing::text_token_source::TextTokenSource as ra_parser::TokenSource>::lookahead_nth 3.54% ra_cli ra_cli ra_syntax::syntax_node::SyntaxTreeBuilder::finish_node 3.46% ra_cli libc-2.29.so _int_free 3.12% ra_cli libc-2.29.so malloc 2.76% ra_cli ra_cli ra_parser::event::process 2.68% ra_cli ra_cli alloc::sync::Arc<T>::drop_slow 2.50% ra_cli ra_cli ra_mbe::subtree_source::SubtreeTokenSource::get 2.31% ra_cli ra_cli <smol_str::SmolStr as core::hash::Hash>::hash 2.04% ra_cli libc-2.29.so __memmove_avx_unaligned_erms 1.92% ra_cli ra_cli <ra_mbe::subtree_source::SubtreeTokenSource as ra_parser::TokenSource>::lookahead_nth Database loaded, 255 roots, 236.176803ms Crates in this dir: 27 Total modules found: 282 Total declarations: 9642 Total functions: 3287 Total expressions: 64620 Expressions of unknown type: 9107 (14%) Expressions of partially unknown type: 3425 (5%) Analysis: 22.562328486s, 0b allocated 0b resident target/release/ra_cli analysis-stats 23.12s user 0.57s system 100% cpu 23.659 total ``` r? @edwin0cheng, @matklad Co-authored-by: LaurenČ›iu Nicola <[email protected]>
-rw-r--r--crates/ra_mbe/src/subtree_source.rs62
1 files changed, 32 insertions, 30 deletions
diff --git a/crates/ra_mbe/src/subtree_source.rs b/crates/ra_mbe/src/subtree_source.rs
index 6603ff34d..9d6d0133f 100644
--- a/crates/ra_mbe/src/subtree_source.rs
+++ b/crates/ra_mbe/src/subtree_source.rs
@@ -1,6 +1,6 @@
1use ra_parser::{Token, TokenSource}; 1use ra_parser::{Token, TokenSource};
2use ra_syntax::{classify_literal, SmolStr, SyntaxKind, SyntaxKind::*, T}; 2use ra_syntax::{classify_literal, SmolStr, SyntaxKind, SyntaxKind::*, T};
3use std::cell::{Cell, RefCell}; 3use std::cell::{Cell, Ref, RefCell};
4use tt::buffer::{Cursor, TokenBuffer}; 4use tt::buffer::{Cursor, TokenBuffer};
5 5
6#[derive(Debug, Clone, Eq, PartialEq)] 6#[derive(Debug, Clone, Eq, PartialEq)]
@@ -20,8 +20,8 @@ impl<'a> SubtreeTokenSource<'a> {
20 // Helper function used in test 20 // Helper function used in test
21 #[cfg(test)] 21 #[cfg(test)]
22 pub fn text(&self) -> SmolStr { 22 pub fn text(&self) -> SmolStr {
23 match self.get(self.curr.1) { 23 match *self.get(self.curr.1) {
24 Some(tt) => tt.text, 24 Some(ref tt) => tt.text.clone(),
25 _ => SmolStr::new(""), 25 _ => SmolStr::new(""),
26 } 26 }
27 } 27 }
@@ -41,44 +41,46 @@ impl<'a> SubtreeTokenSource<'a> {
41 } 41 }
42 42
43 fn mk_token(&self, pos: usize) -> Token { 43 fn mk_token(&self, pos: usize) -> Token {
44 match self.get(pos) { 44 match *self.get(pos) {
45 Some(tt) => Token { kind: tt.kind, is_jointed_to_next: tt.is_joint_to_next }, 45 Some(ref tt) => Token { kind: tt.kind, is_jointed_to_next: tt.is_joint_to_next },
46 None => Token { kind: EOF, is_jointed_to_next: false }, 46 None => Token { kind: EOF, is_jointed_to_next: false },
47 } 47 }
48 } 48 }
49 49
50 fn get(&self, pos: usize) -> Option<TtToken> { 50 fn get(&self, pos: usize) -> Ref<Option<TtToken>> {
51 let mut cached = self.cached.borrow_mut(); 51 if pos < self.cached.borrow().len() {
52 if pos < cached.len() { 52 return Ref::map(self.cached.borrow(), |c| &c[pos]);
53 return cached[pos].clone();
54 } 53 }
55 54
56 while pos >= cached.len() { 55 {
57 let cursor = self.cached_cursor.get(); 56 let mut cached = self.cached.borrow_mut();
58 if cursor.eof() { 57 while pos >= cached.len() {
59 cached.push(None); 58 let cursor = self.cached_cursor.get();
60 continue; 59 if cursor.eof() {
61 } 60 cached.push(None);
62 61 continue;
63 match cursor.token_tree() {
64 Some(tt::TokenTree::Leaf(leaf)) => {
65 cached.push(Some(convert_leaf(&leaf)));
66 self.cached_cursor.set(cursor.bump());
67 }
68 Some(tt::TokenTree::Subtree(subtree)) => {
69 self.cached_cursor.set(cursor.subtree().unwrap());
70 cached.push(Some(convert_delim(subtree.delimiter, false)));
71 } 62 }
72 None => { 63
73 if let Some(subtree) = cursor.end() { 64 match cursor.token_tree() {
74 cached.push(Some(convert_delim(subtree.delimiter, true))); 65 Some(tt::TokenTree::Leaf(leaf)) => {
66 cached.push(Some(convert_leaf(&leaf)));
75 self.cached_cursor.set(cursor.bump()); 67 self.cached_cursor.set(cursor.bump());
76 } 68 }
69 Some(tt::TokenTree::Subtree(subtree)) => {
70 self.cached_cursor.set(cursor.subtree().unwrap());
71 cached.push(Some(convert_delim(subtree.delimiter, false)));
72 }
73 None => {
74 if let Some(subtree) = cursor.end() {
75 cached.push(Some(convert_delim(subtree.delimiter, true)));
76 self.cached_cursor.set(cursor.bump());
77 }
78 }
77 } 79 }
78 } 80 }
79 } 81 }
80 82
81 cached[pos].clone() 83 Ref::map(self.cached.borrow(), |c| &c[pos])
82 } 84 }
83} 85}
84 86
@@ -103,8 +105,8 @@ impl<'a> TokenSource for SubtreeTokenSource<'a> {
103 105
104 /// Is the current token a specified keyword? 106 /// Is the current token a specified keyword?
105 fn is_keyword(&self, kw: &str) -> bool { 107 fn is_keyword(&self, kw: &str) -> bool {
106 match self.get(self.curr.1) { 108 match *self.get(self.curr.1) {
107 Some(t) => t.text == *kw, 109 Some(ref t) => t.text == *kw,
108 _ => false, 110 _ => false,
109 } 111 }
110 } 112 }