perf: improve deterministic chunk ids (#11575)

* perf: improve deterministic chunk ids

* perf: improve deterministic chunk ids

Author: LingyuCoder

crates/rspack_core/src/chunk_graph/chunk_graph_chunk.rs

@@ -412,6 +412,27 @@ impl ChunkGraph {
     modules
   }
 
+  pub fn get_ordered_chunk_normal_modules_identifier(
+    &self,
+    chunk: &ChunkUkey,
+  ) -> Vec<ModuleIdentifier> {
+    let chunk_graph_chunk = self.expect_chunk_graph_chunk(chunk);
+    let runtime_modules = chunk_graph_chunk
+      .runtime_modules
+      .iter()
+      .copied()
+      .collect::<IdentifierSet>();
+    let mut modules: Vec<ModuleIdentifier> = chunk_graph_chunk
+      .modules
+      .iter()
+      .filter(|m| !runtime_modules.contains(m))
+      .copied()
+      .collect();
+    // SAFETY: module identifier is unique
+    modules.sort_unstable_by_key(|m| m.as_str());
+    modules
+  }
+
   pub fn get_ordered_chunk_modules<'module>(
     &self,
     chunk: &ChunkUkey,
@@ -664,6 +685,7 @@ impl ChunkGraph {
     let cgc = self.expect_chunk_graph_chunk(chunk);
     let mut input = cgc.modules.iter().copied().collect::<Vec<_>>();
     input.sort_unstable();
+
     let mut modules = find_graph_roots(input, |module| {
       let mut set: IdentifierSet = Default::default();
       fn add_dependencies(

crates/rspack_ids/src/deterministic_chunk_ids_plugin.rs

@@ -87,7 +87,6 @@ async fn chunk_ids(&self, compilation: &mut rspack_core::Compilation) -> rspack_
     |a, b| {
       compare_chunks_natural(
         chunk_graph,
-        &module_graph,
         &compilation.chunk_group_by_ukey,
         &compilation.module_ids_artifact,
         a,

crates/rspack_ids/src/id_helpers.rs

@@ -360,7 +360,6 @@ pub fn assign_ascending_chunk_ids(chunks: &[ChunkUkey], compilation: &mut Compil
 
 fn compare_chunks_by_modules<'a>(
   chunk_graph: &ChunkGraph,
-  module_graph: &ModuleGraph,
   module_ids: &'a ModuleIdsArtifact,
   a: &Chunk,
   b: &Chunk,
@@ -372,19 +371,19 @@ fn compare_chunks_by_modules<'a>(
     .entry(a_ukey)
     .or_insert_with(|| {
       chunk_graph
-        .get_ordered_chunk_modules(&a_ukey, module_graph)
+        .get_ordered_chunk_normal_modules_identifier(&a_ukey)
         .into_iter()
-        .map(|m| ChunkGraph::get_module_id(module_ids, m.identifier()).map(|s| s.as_str()))
+        .map(|m| ChunkGraph::get_module_id(module_ids, m).map(|s| s.as_str()))
         .collect_vec()
     })
     .clone();
   let b_modules = ordered_chunk_modules_cache
     .entry(b_ukey)
     .or_insert_with(|| {
       chunk_graph
-        .get_ordered_chunk_modules(&b_ukey, module_graph)
+        .get_ordered_chunk_normal_modules_identifier(&b_ukey)
         .into_iter()
-        .map(|m| ChunkGraph::get_module_id(module_ids, m.identifier()).map(|s| s.as_str()))
+        .map(|m| ChunkGraph::get_module_id(module_ids, m).map(|s| s.as_str()))
         .collect_vec()
     })
     .clone();
@@ -427,7 +426,6 @@ fn compare_chunks_by_groups(
 
 pub fn compare_chunks_natural<'a>(
   chunk_graph: &ChunkGraph,
-  module_graph: &ModuleGraph,
   chunk_group_by_ukey: &ChunkGroupByUkey,
   module_ids: &'a ModuleIdsArtifact,
   a: &Chunk,
@@ -444,14 +442,8 @@ pub fn compare_chunks_natural<'a>(
     return runtime_ordering;
   }
 
-  let modules_ordering = compare_chunks_by_modules(
-    chunk_graph,
-    module_graph,
-    module_ids,
-    a,
-    b,
-    ordered_chunk_modules_cache,
-  );
+  let modules_ordering =
+    compare_chunks_by_modules(chunk_graph, module_ids, a, b, ordered_chunk_modules_cache);
   if modules_ordering != Ordering::Equal {
     return modules_ordering;
   }

crates/rspack_ids/src/named_chunk_ids_plugin.rs

@@ -119,7 +119,6 @@ fn assign_named_chunk_ids(
         let b = compilation.chunk_by_ukey.expect_get(b);
         compare_chunks_natural(
           chunk_graph,
-          &module_graph,
           &compilation.chunk_group_by_ukey,
           &compilation.module_ids_artifact,
           a,
@@ -154,7 +153,6 @@ fn assign_named_chunk_ids(
     let b = compilation.chunk_by_ukey.expect_get(b);
     compare_chunks_natural(
       chunk_graph,
-      &module_graph,
       &compilation.chunk_group_by_ukey,
       &compilation.module_ids_artifact,
       a,

crates/rspack_ids/src/natural_chunk_ids_plugin.rs

@@ -24,7 +24,6 @@ async fn chunk_ids(&self, compilation: &mut rspack_core::Compilation) -> rspack_
 
   let module_ids = &compilation.module_ids_artifact;
   let chunk_graph = &compilation.chunk_graph;
-  let module_graph = &compilation.get_module_graph();
   let mut ordered_chunk_modules_cache = Default::default();
 
   let chunks = compilation
@@ -34,7 +33,6 @@ async fn chunk_ids(&self, compilation: &mut rspack_core::Compilation) -> rspack_
     .sorted_unstable_by(|a, b| {
       compare_chunks_natural(
         chunk_graph,
-        module_graph,
         &compilation.chunk_group_by_ukey,
         module_ids,
         a,

crates/rspack_ids/src/occurrence_chunk_ids_plugin.rs

@@ -39,7 +39,6 @@ async fn chunk_ids(&self, compilation: &mut rspack_core::Compilation) -> Result<
   }
 
   let chunk_graph = &compilation.chunk_graph;
-  let module_graph = &compilation.get_module_graph();
   let chunk_group_by_ukey = &compilation.chunk_group_by_ukey;
   let mut occurs_in_initial_chunks_map = HashMap::new();
 
@@ -81,7 +80,6 @@ async fn chunk_ids(&self, compilation: &mut rspack_core::Compilation) -> Result<
 
       compare_chunks_natural(
         chunk_graph,
-        module_graph,
         &compilation.chunk_group_by_ukey,
         &compilation.module_ids_artifact,
         a,