From 6af483547e27b0df4df3271c4ecdefa62e875d8f Mon Sep 17 00:00:00 2001 From: Robin Malfait Date: Mon, 2 Dec 2024 20:03:10 +0100 Subject: [PATCH] Improve performance of scanning source files (#15270) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR improves scanning files by scanning chunks of the files in parallel. Each chunk is separated by new lines since we can't use whitespace in classes anyway. This also means that we can use the power of your CPU to scan files faster. The extractor itself also has less state to worry about on these smaller chunks. On a dedicated benchmark machine: Mac Mini, M1, 16 GB RAM ```shellsession ❯ hyperfine --warmup 15 --runs 50 \ -n NEW 'bun --bun /Users/ben/github.com/tailwindlabs/tailwindcss/packages/@tailwindcss-cli/src/index.ts -i ./tailwind.css -o out.css' \ -n CURRENT 'bun --bun /Users/ben/github.com/tailwindlabs/tailwindcss--next/packages/@tailwindcss-cli/src/index.ts -i ./tailwind.css -o out.css' Benchmark 1: NEW Time (mean ± σ): 337.2 ms ± 2.9 ms [User: 1376.6 ms, System: 80.9 ms] Range (min … max): 331.0 ms … 345.3 ms 50 runs Benchmark 2: CURRENT Time (mean ± σ): 730.3 ms ± 3.8 ms [User: 978.9 ms, System: 78.7 ms] Range (min … max): 722.0 ms … 741.8 ms 50 runs Summary NEW ran 2.17 ± 0.02 times faster than CURRENT ``` On a more powerful machine, MacBook Pro M1 Max, 64 GB RAM, the results look even more promising: ```shellsession ❯ hyperfine --warmup 15 --runs 50 \ -n NEW 'bun --bun /Users/robin/github.com/tailwindlabs/tailwindcss/packages/@tailwindcss-cli/src/index.ts -i ./tailwind.css -o out.css' \ -n CURRENT 'bun --bun /Users/robin/github.com/tailwindlabs/tailwindcss--next/packages/@tailwindcss-cli/src/index.ts -i ./tailwind.css -o out.css' Benchmark 1: NEW Time (mean ± σ): 307.8 ms ± 24.5 ms [User: 1124.8 ms, System: 187.9 ms] Range (min … max): 291.7 ms … 397.9 ms 50 runs Benchmark 2: CURRENT Time (mean ± σ): 754.7 ms ± 27.2 ms [User: 934.9 ms, System: 217.6 ms] Range (min … max): 735.5 ms … 845.6 ms 50 runs Warning: Statistical outliers were detected. Consider re-running this benchmark on a quiet system without any interferences from other programs. It might help to use the '--warmup' or '--prepare' options. Summary NEW ran 2.45 ± 0.21 times faster than CURRENT ``` > Note: This last benchmark is running on my main machine which is more "busy" compared to my benchmark machine. Because of this I had to increase the `--runs` to get statistically better results. There is still a warning present, but the overall numbers are still very promising. --- These benchmarks are running on our Tailwind UI project where we have >1000 files, and >750 000 lines of code in those files. | Before | After | | --- | --- | | image | image | --- I am sure there is more we can do here, because reading all of these 1000 files only takes ~10ms, whereas parsing all these files takes ~180ms. But I'm still happy with these results as an incremental improvement. For good measure, I also wanted to make sure that we didn't regress on smaller projects. Running this on Catalyst, we only have to deal with ~100 files and ~18 000 lines of code. In this case reading all the files takes ~890µs and parsing takes about ~4ms. | Before | After | | --- | --- | | image | image | Not a huge difference, still better and definitely no regressions which sounds like a win to me. --- **Edit:** after talking to @thecrypticace, instead of splitting on any whitespace we just split on newlines. This makes the chunks a bit larger, but it reduces the overhead of the extractor itself. This now results in a 2.45x speedup in Tailwind UI compared to 1.94x speedup. --------- Co-authored-by: Jordan Pittman Co-authored-by: Adam Wathan --- CHANGELOG.md | 4 +++- crates/oxide/src/lib.rs | 24 +++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14cc77dbf..7be15ceb6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -- Nothing yet! +### Added + +- Parallelize parsing of individual source files ([#15270](https://github.com/tailwindlabs/tailwindcss/pull/15270)) ## [4.0.0-beta.4] - 2024-11-29 diff --git a/crates/oxide/src/lib.rs b/crates/oxide/src/lib.rs index a9567c5c4..4c7621e7a 100644 --- a/crates/oxide/src/lib.rs +++ b/crates/oxide/src/lib.rs @@ -102,13 +102,11 @@ impl Scanner { pub fn scan(&mut self) -> Vec { init_tracing(); self.prepare(); - self.check_for_new_files(); self.compute_candidates(); - let mut candidates: Vec = self.candidates.clone().into_iter().collect(); - - candidates.sort(); + let mut candidates: Vec = self.candidates.clone().into_par_iter().collect(); + candidates.par_sort(); candidates } @@ -140,7 +138,7 @@ impl Scanner { let extractor = Extractor::with_positions(&content[..], Default::default()); let candidates: Vec<(String, usize)> = extractor - .into_iter() + .into_par_iter() .map(|(s, i)| { // SAFETY: When we parsed the candidates, we already guaranteed that the byte slices // are valid, therefore we don't have to re-check here when we want to convert it back @@ -156,7 +154,7 @@ impl Scanner { self.prepare(); self.files - .iter() + .par_iter() .filter_map(|x| Path::from(x.clone()).canonicalize().ok()) .map(|x| x.to_string()) .collect() @@ -201,7 +199,7 @@ impl Scanner { if !changed_content.is_empty() { let candidates = parse_all_blobs(read_all_files(changed_content)); - self.candidates.extend(candidates); + self.candidates.par_extend(candidates); } } @@ -209,6 +207,7 @@ impl Scanner { // content for candidates. fn prepare(&mut self) { if self.ready { + self.check_for_new_files(); return; } @@ -455,12 +454,10 @@ fn read_all_files(changed_content: Vec) -> Vec> { #[tracing::instrument(skip_all)] fn parse_all_blobs(blobs: Vec>) -> Vec { - let input: Vec<_> = blobs.iter().map(|blob| &blob[..]).collect(); - let input = &input[..]; - - let mut result: Vec = input + let mut result: Vec<_> = blobs .par_iter() - .map(|input| Extractor::unique(input, Default::default())) + .flat_map(|blob| blob.par_split(|x| matches!(x, b'\n'))) + .map(|blob| Extractor::unique(blob, Default::default())) .reduce(Default::default, |mut a, b| { a.extend(b); a @@ -473,6 +470,7 @@ fn parse_all_blobs(blobs: Vec>) -> Vec { unsafe { String::from_utf8_unchecked(s.to_vec()) } }) .collect(); - result.sort(); + + result.par_sort(); result }