feat: add rust benchmark case for code splitting (#9127)

JSerFeng · web-flow · commit cc5e3f6a4907 · 2025-01-27T15:36:36.000+08:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/rspack_core/src/build_chunk_graph/mod.rs b/crates/rspack_core/src/build_chunk_graph/mod.rs
@@ -10,7 +10,7 @@ pub(crate) mod incremental;
 pub(crate) mod new_code_splitter;
 
 #[instrument("Compilation:build_chunk_graph", skip_all)]
-pub(crate) fn build_chunk_graph(compilation: &mut Compilation) -> rspack_error::Result<()> {
+pub fn build_chunk_graph(compilation: &mut Compilation) -> rspack_error::Result<()> {
   let enable_incremental = compilation
     .incremental
     .can_read_mutations(IncrementalPasses::BUILD_CHUNK_GRAPH);
@@ -19,6 +19,7 @@ pub(crate) fn build_chunk_graph(compilation: &mut Compilation) -> rspack_error::
   } else {
     Default::default()
   };
+
   splitter.update_with_compilation(compilation)?;
 
   if !enable_incremental || splitter.chunk_group_infos.is_empty() {
@@ -49,7 +50,7 @@ pub(crate) fn build_chunk_graph(compilation: &mut Compilation) -> rspack_error::
 }
 
 #[instrument(skip_all)]
-pub(crate) fn build_chunk_graph_new(compilation: &mut Compilation) -> rspack_error::Result<()> {
+pub fn build_chunk_graph_new(compilation: &mut Compilation) -> rspack_error::Result<()> {
   new_code_splitter::code_split(compilation)?;
   Ok(())
 }
diff --git a/crates/rspack_core/src/build_chunk_graph/new_code_splitter.rs b/crates/rspack_core/src/build_chunk_graph/new_code_splitter.rs
@@ -828,127 +828,9 @@ impl CodeSplitter {
 
   fn create_chunks(&mut self, compilation: &mut Compilation) -> Result<()> {
     let mut errors = vec![];
-    // let mut roots: Vec<CreateChunkRoot> = vec![];
-    // for (idx, (name, data)) in entries.iter().enumerate() {
-    //   name_to_idx.insert(name, idx);
-    //   let runtime = if let Some(depend_on) = &data.options.depend_on {
-    //     deps.push((name, depend_on.clone()));
-    //     None
-    //   } else {
-    //     Some(RuntimeSpec::from_entry_options(&data.options).expect("should have runtime"))
-    //   };
-
-    //   // set runtime later
-    //   roots.push(CreateChunkRoot::Entry(name.clone(), data.clone(), runtime));
-    // }
-
-    // let mut entry_to_deps = HashMap::default();
-    // for (entry, deps) in deps {
-    //   entry_to_deps.insert(
-    //     entry.as_str(),
-    //     deps
-    //       .into_iter()
-    //       .map(|dep| *name_to_idx.get(&dep).expect("should have idx"))
-    //       .collect::<Vec<_>>(),
-    //   );
-    // }
-
-    // for (entry, _) in entries.iter() {
-    //   let curr = *name_to_idx.get(entry).expect("unreachable");
-    //   if roots[curr].get_runtime().is_some() {
-    //     // already set
-    //     continue;
-    //   }
-    //   let mut visited = Default::default();
-    //   if let Err(dep) =
-    //     set_entry_runtime_and_depend_on(curr, &mut roots, &entry_to_deps, &mut visited, &mut vec![])
-    //   {
-    //     let dep_name = roots[dep].entry_name();
-    //     let dep_rt = RuntimeSpec::from_entry(dep_name, None);
-    //     error_roots.push((curr, Diagnostic::from(error!("Entrypoints '{entry}' and '{dep_name}' use 'dependOn' to depend on each other in a circular way."))));
-    //     roots[dep].set_runtime(dep_rt);
-    //     roots[curr].set_runtime(RuntimeSpec::from_entry(entry, None));
-    //   }
-    // }
-
-    // let mut entry_module_runtime = IdentifierMap::<RuntimeSpec>::default();
-    // let module_graph: ModuleGraph = compilation.get_module_graph();
-    // for root in &roots {
-    //   if let CreateChunkRoot::Entry(_name, data, runtime) = root {
-    //     let runtime = runtime
-    //       .as_ref()
-    //       .expect("should have runtime after calculated depend on");
-    //     for dep_id in compilation
-    //       .global_entry
-    //       .all_dependencies()
-    //       .chain(data.all_dependencies())
-    //     {
-    //       let Some(module) = module_graph.module_identifier_by_dependency_id(dep_id) else {
-    //         continue;
-    //       };
-    //       match entry_module_runtime.entry(*module) {
-    //         std::collections::hash_map::Entry::Occupied(mut existing) => {
-    //           let new_runtime = merge_runtime(existing.get(), &runtime);
-    //           existing.insert(new_runtime);
-    //         }
-    //         std::collections::hash_map::Entry::Vacant(vacant) => {
-    //           vacant.insert(runtime.clone());
-    //         }
-    //       }
-    //     }
-    //   }
-    // }
-
-    // let module_graph = compilation.get_module_graph();
-    // let module_cache = DashMap::default();
-
-    // roots.extend(
-    //   self
-    //     .blocks
-    //     .par_iter()
-    //     .map(|(block_id, origin)| {
-    //       let visited = IdentifierDashSet::default();
-    //       let block = module_graph
-    //         .block_by_id(block_id)
-    //         .expect("should have block");
-    //       let runtime = if let Some(group_options) = block.get_group_options()
-    //         && let Some(entry_options) = group_options.entry_options()
-    //       {
-    //         RuntimeSpec::from_entry_options(entry_options).or_else(|| {
-    //           determine_runtime(
-    //             *origin,
-    //             &module_graph,
-    //             &entry_module_runtime,
-    //             &module_cache,
-    //             &visited,
-    //           )
-    //         })
-    //       } else {
-    //         determine_runtime(
-    //           *origin,
-    //           &module_graph,
-    //           &entry_module_runtime,
-    //           &module_cache,
-    //           &visited,
-    //         )
-    //       };
-
-    //       if runtime.is_none() {
-    //         dbg!(block.identifier());
-    //         panic!()
-    //       }
-    //       CreateChunkRoot::Block(*origin, *block_id, runtime)
-    //     })
-    //     .collect::<Vec<_>>(),
-    // );
-
-    // for root in &roots {
-    //   if let Some(runtime) = root.get_runtime() {
-    //     self.module_deps.insert(runtime.clone(), Default::default());
-    //   }
-    // }
 
     let roots = self.analyze_module_graph(compilation)?;
+
     // fill chunk with modules in parallel
     let chunks = roots
       .into_par_iter()
diff --git a/crates/rspack_core/src/compiler/mod.rs b/crates/rspack_core/src/compiler/mod.rs
@@ -484,7 +484,7 @@ impl Compiler {
     Ok(())
   }
 
-  fn new_compilation_params(&self) -> CompilationParams {
+  pub fn new_compilation_params(&self) -> CompilationParams {
     CompilationParams {
       normal_module_factory: Arc::new(NormalModuleFactory::new(
         self.options.clone(),
diff --git a/crates/rspack_core/src/lib.rs b/crates/rspack_core/src/lib.rs
@@ -75,7 +75,7 @@ use ustr::Ustr;
 pub use utils::*;
 mod chunk_graph;
 pub use chunk_graph::*;
-mod build_chunk_graph;
+pub mod build_chunk_graph;
 mod stats;
 pub use stats::*;
 mod runtime;
diff --git a/crates/rspack_plugin_split_chunks/src/plugin/mod.rs b/crates/rspack_plugin_split_chunks/src/plugin/mod.rs
@@ -49,7 +49,7 @@ impl SplitChunksPlugin {
     tracing::trace!("prepared module_group_map {:#?}", module_group_map);
     logger.time_end(start);
 
-    let start = logger.time("ensure min size fit");
+    let start: rspack_core::StartTime = logger.time("ensure min size fit");
     self.ensure_min_size_fit(compilation, &mut module_group_map);
     logger.time_end(start);
 
@@ -162,7 +162,7 @@ impl Debug for SplitChunksPlugin {
 }
 
 #[plugin_hook(CompilationOptimizeChunks for SplitChunksPlugin, stage = Compilation::OPTIMIZE_CHUNKS_STAGE_ADVANCED)]
-fn optimize_chunks(&self, compilation: &mut Compilation) -> Result<Option<bool>> {
+pub fn optimize_chunks(&self, compilation: &mut Compilation) -> Result<Option<bool>> {
   self.inner_impl(compilation)?;
   Ok(None)
 }
diff --git a/tasks/benchmark/Cargo.toml b/tasks/benchmark/Cargo.toml
@@ -17,7 +17,8 @@ rspack = { workspace = true }
 rspack_fs = { workspace = true }
 rspack_core = { workspace = true }
 tokio = { workspace = true }
+serde_json = { workspace = true }
 
 [[bench]]
-name    = "basic"
+name    = "benches"
 harness = false
diff --git a/tasks/benchmark/benches/basic.rs b/tasks/benchmark/benches/basic.rs
@@ -1,18 +1,20 @@
-#![allow(clippy::unwrap_used)]
 #![feature(trait_upcasting)]
+#![allow(unused_attributes)]
+#![allow(clippy::unwrap_used)]
 
 use std::sync::Arc;
 
+use criterion::criterion_group;
 use rspack::builder::{Builder as _, Devtool};
-use rspack_benchmark::{criterion_group, criterion_main, Criterion};
+use rspack_benchmark::Criterion;
 use rspack_core::Compiler;
 use rspack_fs::{MemoryFileSystem, ReadableFileSystem, WritableFileSystem};
 use tokio::runtime::Builder;
 
 trait FileSystem: ReadableFileSystem + WritableFileSystem + Send + Sync {}
 impl<T: ReadableFileSystem + WritableFileSystem + Send + Sync> FileSystem for T {}
 
-async fn basic(fs: Arc<dyn FileSystem>, sm: bool) {
+async fn basic_compile(fs: Arc<dyn FileSystem>, sm: bool) {
   let mut builder = Compiler::builder();
 
   builder
@@ -36,7 +38,7 @@ async fn basic(fs: Arc<dyn FileSystem>, sm: bool) {
     .is_empty());
 }
 
-pub fn criterion_benchmark(c: &mut Criterion) {
+pub fn basic_benchmark(c: &mut Criterion) {
   let rt = Builder::new_multi_thread().build().unwrap();
 
   let fs = MemoryFileSystem::default();
@@ -59,17 +61,16 @@ pub fn criterion_benchmark(c: &mut Criterion) {
   c.bench_function("basic", |b| {
     b.to_async(&rt).iter(|| {
       let fs = fs.clone();
-      basic(fs, false)
+      basic_compile(fs, false)
     });
   });
 
   c.bench_function("basic_sourcemap", |b| {
     b.to_async(&rt).iter(|| {
       let fs = fs.clone();
-      basic(fs, true)
+      basic_compile(fs, true)
     });
   });
 }
 
-criterion_group!(benches, criterion_benchmark);
-criterion_main!(benches);
+criterion_group!(basic, basic_benchmark);
diff --git a/tasks/benchmark/benches/benches.rs b/tasks/benchmark/benches/benches.rs
@@ -0,0 +1,11 @@
+#![feature(trait_upcasting)]
+#![allow(clippy::unwrap_used)]
+
+use basic::basic;
+use build_chunk_graph::chunk_graph;
+use criterion::criterion_main;
+
+mod basic;
+mod build_chunk_graph;
+
+criterion_main!(basic, chunk_graph);
diff --git a/tasks/benchmark/benches/build_chunk_graph.rs b/tasks/benchmark/benches/build_chunk_graph.rs
diff --git a/tasks/benchmark/benches/build_chunk_graph/random_table.json b/tasks/benchmark/benches/build_chunk_graph/random_table.json
diff --git a/tasks/benchmark/src/lib.rs b/tasks/benchmark/src/lib.rs

Original file line number	Diff line number	Diff line change
`@@ -484,7 +484,7 @@ impl Compiler {`
`484`	`484`	`Ok(())`
`485`	`485`	`}`
`486`	`486`
`487`		`- fn new_compilation_params(&self) -> CompilationParams {`
	`487`	`+ pub fn new_compilation_params(&self) -> CompilationParams {`
`488`	`488`	`CompilationParams {`
`489`	`489`	`normal_module_factory: Arc::new(NormalModuleFactory::new(`
`490`	`490`	`self.options.clone(),`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ impl SplitChunksPlugin {`
`49`	`49`	`tracing::trace!("prepared module_group_map {:#?}", module_group_map);`
`50`	`50`	`logger.time_end(start);`
`51`	`51`
`52`		`- let start = logger.time("ensure min size fit");`
	`52`	`+ let start: rspack_core::StartTime = logger.time("ensure min size fit");`
`53`	`53`	`self.ensure_min_size_fit(compilation, &mut module_group_map);`
`54`	`54`	`logger.time_end(start);`
`55`	`55`
`@@ -162,7 +162,7 @@ impl Debug for SplitChunksPlugin {`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`#[plugin_hook(CompilationOptimizeChunks for SplitChunksPlugin, stage = Compilation::OPTIMIZE_CHUNKS_STAGE_ADVANCED)]`
`165`		`-fn optimize_chunks(&self, compilation: &mut Compilation) -> Result<Option<bool>> {`
	`165`	`+pub fn optimize_chunks(&self, compilation: &mut Compilation) -> Result<Option<bool>> {`
`166`	`166`	`self.inner_impl(compilation)?;`
`167`	`167`	`Ok(None)`
`168`	`168`	`}`