-
-
Notifications
You must be signed in to change notification settings - Fork 757
perf: try fix mf performance regression #12958
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.
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -114,18 +114,57 @@ impl<'a> FlagDependencyUsagePluginProxy<'a> { | |
|
|
||
| // collect referenced exports from modules by calling `dependency.get_referenced_exports` | ||
| // and also added referenced modules to queue for further processing | ||
| let mut batch_res = vec![]; | ||
| for (block_id, runtime, force_side_effects) in batch { | ||
| let (referenced_exports, module_tasks) = self | ||
| .process_module(block_id, runtime.as_ref(), force_side_effects, self.global) | ||
| .await; | ||
| batch_res.push(( | ||
| runtime, | ||
| force_side_effects, | ||
| referenced_exports, | ||
| module_tasks, | ||
| )); | ||
| } | ||
| let batch_res = { | ||
| let compilation = self.compilation; | ||
| let module_graph = self.build_module_graph_artifact.get_module_graph(); | ||
| let global = self.global; | ||
|
|
||
| rspack_futures::scope::<_, _>(|token| { | ||
| for (block_id, runtime, force_side_effects) in batch { | ||
| // SAFETY: await immediately and trust caller to poll future entirely | ||
| let s = unsafe { | ||
| token.used(( | ||
| compilation, | ||
| module_graph, | ||
| block_id, | ||
| runtime, | ||
| force_side_effects, | ||
| global, | ||
| )) | ||
| }; | ||
| s.spawn( | ||
| |( | ||
| compilation, | ||
| module_graph, | ||
| block_id, | ||
| runtime, | ||
| force_side_effects, | ||
| global, | ||
| )| async move { | ||
| let (referenced_exports, module_tasks) = Self::process_module( | ||
| compilation, | ||
| module_graph, | ||
| block_id, | ||
| runtime.as_ref(), | ||
| force_side_effects, | ||
| global, | ||
| ) | ||
| .await; | ||
| ( | ||
| runtime, | ||
| force_side_effects, | ||
| referenced_exports, | ||
| module_tasks, | ||
| ) | ||
| }, | ||
| ); | ||
| } | ||
| }) | ||
| .await | ||
| .into_iter() | ||
| .map(|res| res.expect("flag dependency usage task failed")) | ||
| .collect::<Vec<_>>() | ||
| }; | ||
|
|
||
| let mut nested_tasks = vec![]; | ||
| let mut non_nested_tasks: IdentifierMap<Vec<NonNestedTask>> = IdentifierMap::default(); | ||
|
|
@@ -252,7 +291,8 @@ impl<'a> FlagDependencyUsagePluginProxy<'a> { | |
| } | ||
|
|
||
| async fn process_module( | ||
| &self, | ||
| compilation: &Compilation, | ||
| module_graph: &ModuleGraph, | ||
| block_id: ModuleOrAsyncDependenciesBlock, | ||
| runtime: Option<&RuntimeSpec>, | ||
| force_side_effects: bool, | ||
|
|
@@ -267,8 +307,8 @@ impl<'a> FlagDependencyUsagePluginProxy<'a> { | |
| let (dependencies, async_blocks) = collect_active_dependencies( | ||
| block_id, | ||
| runtime, | ||
| self.build_module_graph_artifact.get_module_graph(), | ||
| &self.compilation.module_graph_cache_artifact, | ||
| module_graph, | ||
| &compilation.module_graph_cache_artifact, | ||
| global, | ||
| ); | ||
| q.extend(async_blocks); | ||
|
|
@@ -278,22 +318,21 @@ impl<'a> FlagDependencyUsagePluginProxy<'a> { | |
|
|
||
| let referenced_exports_result = get_dependency_referenced_exports( | ||
| dep_id, | ||
| self.build_module_graph_artifact.get_module_graph(), | ||
| &self.compilation.module_graph_cache_artifact, | ||
| module_graph, | ||
| &compilation.module_graph_cache_artifact, | ||
| runtime, | ||
| ); | ||
|
|
||
| self | ||
| .compilation | ||
| compilation | ||
| .plugin_driver | ||
| .compilation_hooks | ||
| .dependency_referenced_exports | ||
| .call( | ||
| self.compilation, | ||
| compilation, | ||
| &dep_id, | ||
| &referenced_exports_result, | ||
| runtime, | ||
| Some(self.build_module_graph_artifact.get_module_graph()), | ||
| Some(module_graph), | ||
| ) | ||
| .await; | ||
|
Comment on lines
+326
to
337
|
||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Using
.expect()will cause a panic if any task fails, which will crash the entire compilation process. Consider handling errors more gracefully, such as collecting errors and reporting them as diagnostics instead of panicking. This would provide better error messages and allow the compilation to continue or fail more gracefully.