perf: object pool (#192)

Author: SyMind

Cargo.lock

@@ -36,16 +36,15 @@ dyn-clone = "1.0.17"
 rustc-hash = "2.1.0"
 memchr = "2.7.4"
 
-
 codspeed-criterion-compat = { version = "2.7.2", default-features = false, optional = true }
 static_assertions = "1.1.0"
 simd-json = "0.14.3"
-self_cell = "1.2.1"
 
 [dev-dependencies]
 twox-hash = "2.1.0"
 regex = "1.11.1"
 criterion = { version = "0.5.1", default-features = false }
+rayon = "1.11.0"
 
 [features]
 codspeed = ["codspeed-criterion-compat"]

Cargo.toml

@@ -13,25 +13,23 @@ pub use criterion::*;
 pub use codspeed_criterion_compat::*;
 
 use rspack_sources::{
-  BoxSource, CachedSource, ConcatSource, MapOptions, Source, SourceExt,
-  SourceMap, SourceMapSource, SourceMapSourceOptions,
+  BoxSource, CachedSource, ConcatSource, MapOptions, ObjectPool, Source,
+  SourceExt, SourceMap, SourceMapSource, SourceMapSourceOptions,
 };
 
 use bench_complex_replace_source::{
-  benchmark_complex_replace_source_map, benchmark_complex_replace_source_source,
+  benchmark_complex_replace_source_map, benchmark_complex_replace_source_size,
+  benchmark_complex_replace_source_source,
 };
 use bench_source_map::{
   benchmark_parse_source_map_from_json, benchmark_source_map_clone,
-  benchmark_stringify_source_map_to_json,
 };
 
 use benchmark_repetitive_react_components::{
   benchmark_repetitive_react_components_map,
   benchmark_repetitive_react_components_source,
 };
 
-use crate::bench_complex_replace_source::benchmark_complex_replace_source_size;
-
 const HELLOWORLD_JS: &str = include_str!(concat!(
   env!("CARGO_MANIFEST_DIR"),
   "/benches/fixtures/transpile-minify/files/helloworld.js"
@@ -80,7 +78,7 @@ fn benchmark_concat_generate_string(b: &mut Bencher) {
 
   b.iter(|| {
     concat
-      .map(&MapOptions::default())
+      .map(&ObjectPool::default(), &MapOptions::default())
       .unwrap()
       .to_json()
       .unwrap();
@@ -109,7 +107,7 @@ fn benchmark_concat_generate_string_with_cache(b: &mut Bencher) {
 
   b.iter(|| {
     cached
-      .map(&MapOptions::default())
+      .map(&ObjectPool::default(), &MapOptions::default())
       .unwrap()
       .to_json()
       .unwrap();
@@ -178,11 +176,6 @@ fn bench_rspack_sources(criterion: &mut Criterion) {
 
   group.bench_function("source_map_clone", benchmark_source_map_clone);
 
-  group.bench_function(
-    "stringify_source_map_to_json",
-    benchmark_stringify_source_map_to_json,
-  );
-
   group.bench_function(
     "repetitive_react_components_map",
     benchmark_repetitive_react_components_map,

benches/bench.rs

@@ -9,7 +9,7 @@ pub use criterion::*;
 pub use codspeed_criterion_compat::*;
 
 use rspack_sources::{
-  BoxSource, MapOptions, OriginalSource, ReplaceSource, SourceExt,
+  BoxSource, MapOptions, ObjectPool, OriginalSource, ReplaceSource, SourceExt,
 };
 
 static LARGE_REPLACE_SOURCE: LazyLock<BoxSource> = LazyLock::new(|| {
@@ -36724,7 +36724,7 @@ pub fn benchmark_complex_replace_source_map(b: &mut Bencher) {
   let source = LARGE_REPLACE_SOURCE.clone();
 
   b.iter(|| {
-    black_box(source.map(&MapOptions::default()));
+    black_box(source.map(&ObjectPool::default(), &MapOptions::default()));
   });
 }
 

benches/bench_complex_replace_source.rs

@@ -25,10 +25,3 @@ pub fn benchmark_source_map_clone(b: &mut Bencher) {
     let _ = black_box(source.clone());
   })
 }
-
-pub fn benchmark_stringify_source_map_to_json(b: &mut Bencher) {
-  let source = SourceMap::from_json(ANTD_MIN_JS_MAP).unwrap();
-  b.iter(|| {
-    let _ = black_box(source.to_json().unwrap());
-  })
-}

benches/bench_source_map.rs

@@ -9,9 +9,9 @@ pub use criterion::*;
 pub use codspeed_criterion_compat::*;
 
 use rspack_sources::{
-  BoxSource, ConcatSource, MapOptions, OriginalSource, RawStringSource,
-  ReplaceSource, ReplacementEnforce, Source, SourceExt, SourceMap,
-  SourceMapSource, SourceMapSourceOptions,
+  BoxSource, ConcatSource, MapOptions, ObjectPool, OriginalSource,
+  RawStringSource, ReplaceSource, ReplacementEnforce, Source, SourceExt,
+  SourceMap, SourceMapSource, SourceMapSourceOptions,
 };
 
 static REPETITIVE_1K_REACT_COMPONENTS_SOURCE: LazyLock<BoxSource> =
@@ -3505,7 +3505,7 @@ pub fn benchmark_repetitive_react_components_map(b: &mut Bencher) {
   let source = REPETITIVE_1K_REACT_COMPONENTS_SOURCE.clone();
 
   b.iter(|| {
-    black_box(source.map(&MapOptions::default()));
+    black_box(source.map(&ObjectPool::default(), &MapOptions::default()));
   });
 }
 

benches/benchmark_repetitive_react_components.rs

@@ -11,6 +11,7 @@ use crate::{
     stream_and_get_source_and_map, stream_chunks_of_raw_source,
     stream_chunks_of_source_map, StreamChunks,
   },
+  object_pool::ObjectPool,
   rope::Rope,
   source::SourceValue,
   BoxSource, MapOptions, Source, SourceExt, SourceMap,
@@ -99,18 +100,22 @@ impl Source for CachedSource {
     *self.cache.size.get_or_init(|| self.inner.size())
   }
 
-  fn map(&self, options: &MapOptions) -> Option<SourceMap> {
+  fn map(
+    &self,
+    object_pool: &ObjectPool,
+    options: &MapOptions,
+  ) -> Option<SourceMap> {
     if options.columns {
       self
         .cache
         .columns_map
-        .get_or_init(|| self.inner.map(options))
+        .get_or_init(|| self.inner.map(object_pool, options))
         .clone()
     } else {
       self
         .cache
         .line_only_map
-        .get_or_init(|| self.inner.map(options))
+        .get_or_init(|| self.inner.map(object_pool, options))
         .clone()
     }
   }
@@ -123,6 +128,7 @@ impl Source for CachedSource {
 impl StreamChunks for CachedSource {
   fn stream_chunks<'a>(
     &'a self,
+    object_pool: &'a ObjectPool,
     options: &MapOptions,
     on_chunk: crate::helpers::OnChunk<'_, 'a>,
     on_source: crate::helpers::OnSource<'_, 'a>,
@@ -138,7 +144,13 @@ impl StreamChunks for CachedSource {
         let source = self.rope();
         if let Some(map) = map {
           stream_chunks_of_source_map(
-            source, map, on_chunk, on_source, on_name, options,
+            options,
+            object_pool,
+            source,
+            map,
+            on_chunk,
+            on_source,
+            on_name,
           )
         } else {
           stream_chunks_of_raw_source(
@@ -148,8 +160,9 @@ impl StreamChunks for CachedSource {
       }
       None => {
         let (generated_info, map) = stream_and_get_source_and_map(
-          &self.inner,
           options,
+          object_pool,
+          &self.inner,
           on_chunk,
           on_source,
           on_name,
@@ -233,7 +246,9 @@ mod tests {
       })
       .boxed(),
     ]);
-    let map = source.map(&Default::default()).unwrap();
+    let map = source
+      .map(&ObjectPool::default(), &Default::default())
+      .unwrap();
     assert_eq!(map.mappings(), ";;AACA");
   }
 
@@ -248,11 +263,11 @@ mod tests {
     source.source();
     source.buffer();
     source.size();
-    source.map(&map_options);
+    source.map(&ObjectPool::default(), &map_options);
 
     assert_eq!(
       *clone.cache.columns_map.get().unwrap(),
-      source.map(&map_options)
+      source.map(&ObjectPool::default(), &map_options)
     );
   }
 
@@ -302,16 +317,14 @@ mod tests {
 
   #[test]
   fn should_produce_correct_output_for_cached_raw_source() {
-    let map_options = MapOptions {
-      columns: true,
-      final_source: true,
-    };
+    let map_options = MapOptions::new(true);
 
     let source = RawStringSource::from("Test\nTest\nTest\n");
     let mut on_chunk_count = 0;
     let mut on_source_count = 0;
     let mut on_name_count = 0;
     let generated_info = source.stream_chunks(
+      &ObjectPool::default(),
       &map_options,
       &mut |_chunk, _mapping| {
         on_chunk_count += 1;
@@ -326,6 +339,7 @@ mod tests {
 
     let cached_source = CachedSource::new(source);
     cached_source.stream_chunks(
+      &ObjectPool::default(),
       &map_options,
       &mut |_chunk, _mapping| {},
       &mut |_source_index, _source, _source_content| {},
@@ -336,6 +350,7 @@ mod tests {
     let mut cached_on_source_count = 0;
     let mut cached_on_name_count = 0;
     let cached_generated_info = cached_source.stream_chunks(
+      &ObjectPool::default(),
       &map_options,
       &mut |_chunk, _mapping| {
         cached_on_chunk_count += 1;