Skip to content

perf: reduce module concatenation hot-path overhead #14834

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LingyuCoder wants to merge 1 commit into from
+8 −11
Open

perf: reduce module concatenation hot-path overhead #14834

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions crates/rspack_plugin_javascript/src/plugin/module_concatenation_plugin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ enum ConcatenationProblem {
},
UnsupportedSyntax {
module: ModuleIdentifier,
modules: Vec<(ModuleIdentifier, Vec<String>)>,
modules: Arc<[(ModuleIdentifier, Vec<String>)]>,
},
}

Expand Down Expand Up @@ -858,7 +858,7 @@ impl ModuleConcatenationPlugin {

Warning::Problem(ConcatenationProblem::UnsupportedSyntax {
module: *module_id,
modules,
modules: modules.into(),
})
};
state.statistics.incorrect_module_dependency += 1;
Expand Down Expand Up @@ -1094,11 +1094,7 @@ impl ModuleConcatenationPlugin {
));

let start = logger.time("sort relevant modules");
relevant_modules.sort_by(|a, b| {
let ad = module_graph.get_depth(a);
let bd = module_graph.get_depth(b);
ad.cmp(&bd)
});
relevant_modules.sort_by_cached_key(|module| module_graph.get_depth(module));

logger.time_end(start);
let mut statistics = Statistics::default();
Expand Down Expand Up @@ -1914,6 +1910,7 @@ fn add_concatenated_module(
// integrate

let module_graph = compilation.get_module_graph_mut();
let root_chunks = chunk_graph.get_module_chunks(root_module_id).clone();

for m in modules_set.iter() {
if *m == root_module_id {
Expand All @@ -1923,18 +1920,18 @@ fn add_concatenated_module(
.module_by_identifier(m)
.expect("should exist module");
// TODO: optimize asset module https://github.com/webpack/webpack/pull/15515/files
for chunk_ukey in chunk_graph.get_module_chunks(root_module_id).clone() {
for chunk_ukey in &root_chunks {
let source_types =
chunk_graph.get_chunk_module_source_types(&chunk_ukey, module, module_graph);
chunk_graph.get_chunk_module_source_types(chunk_ukey, module, module_graph);

if source_types.len() == 1 && source_types.contains(&SourceType::JavaScript) {
chunk_graph.disconnect_chunk_and_module(&chunk_ukey, *m);
chunk_graph.disconnect_chunk_and_module(chunk_ukey, *m);
} else {
let new_source_types = source_types
.into_iter()
.filter(|source_type| !matches!(source_type, SourceType::JavaScript))
.collect();
chunk_graph.set_chunk_modules_source_types(&chunk_ukey, *m, new_source_types)
chunk_graph.set_chunk_modules_source_types(chunk_ukey, *m, new_source_types)
}
}
}
Expand Down
Loading