Skip to content
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

perf: ⚡️ reduce alloc in ModuleGraphAccessor impl #6136

Merged
merged 2 commits into from
Apr 9, 2024
Merged

perf: ⚡️ reduce alloc in ModuleGraphAccessor impl #6136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
453fb6b
perf: ⚡️ reduce alloc
IWANABETHATGUY Apr 3, 2024
39b53e7
chore: 🤖 lint
IWANABETHATGUY Apr 8, 2024
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
123 changes: 79 additions & 44 deletions crates/rspack_core/src/exports_info.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -969,14 +969,41 @@ impl ExportInfoId {
}
already_visited.insert(*self);

let values = mga
.get_max_target(self)
.values()
.map(|item| UnResolvedExportInfoTarget {
connection: item.connection,
export: item.export.clone(),
})
.collect::<Vec<_>>();
let values = match mga.ty() {
ModuleGraphAccessorMutability::Mutable => mga
.get_max_target(self)
.values()
.map(|item| UnResolvedExportInfoTarget {
connection: item.connection,
export: item.export.clone(),
})
.collect::<Vec<_>>(),
ModuleGraphAccessorMutability::Immutable => {
let export_info = mga.inner().get_export_info_by_id(self);

let map = if export_info.max_target_is_set {
export_info
.get_max_target_readonly()
.values()
.map(|item| UnResolvedExportInfoTarget {
connection: item.connection,
export: item.export.clone(),
})
.collect::<Vec<_>>()
} else {
export_info
._get_max_target()
.values()
.map(|item| UnResolvedExportInfoTarget {
connection: item.connection,
export: item.export.clone(),
})
.collect::<Vec<_>>()
};
map
}
};

let target = ExportInfo::resolve_target(
values.first().cloned(),
already_visited,
Expand Down Expand Up @@ -1980,15 +2007,23 @@ macro_rules! debug_exports_info {
};
}

pub enum ModuleGraphAccessorMutability {
Mutable,
Immutable,
}

pub trait ModuleGraphAccessor<'a> {
fn ty(&self) -> ModuleGraphAccessorMutability;
fn inner(&self) -> &ModuleGraph;

fn connection_by_dependency(&self, dependency_id: DependencyId)
-> Option<&ModuleGraphConnection>;
fn run_resolve_filter(
&mut self,
target: &ResolvedExportInfoTarget,
resolve_filter: &ResolveFilterFnTy,
) -> bool;
fn get_export_info(&mut self, export_info_id: &ExportInfoId) -> Arc<ExportInfo>;
fn get_export_info(&mut self, export_info_id: &ExportInfoId) -> &ExportInfo;
fn get_export_info_id(
&mut self,
name: &Atom,
Expand All @@ -1997,7 +2032,7 @@ pub trait ModuleGraphAccessor<'a> {
fn get_max_target(
&mut self,
export_info_id: &ExportInfoId,
) -> Arc<HashMap<Option<DependencyId>, ExportInfoTargetValue>>;
) -> &HashMap<Option<DependencyId>, ExportInfoTargetValue>;
fn get_module_meta_exports_type(
&mut self,
module_identifier: &ModuleIdentifier,
Expand All @@ -2006,7 +2041,7 @@ pub trait ModuleGraphAccessor<'a> {
&mut self,
name: &Atom,
module_identifier: &ModuleIdentifier,
) -> Option<Arc<ExportInfo>>;
) -> Option<&ExportInfo>;
}

pub struct MutableModuleGraph<'a, 'b> {
Expand Down Expand Up @@ -2036,14 +2071,11 @@ impl<'a, 'b> ModuleGraphAccessor<'a> for MutableModuleGraph<'a, 'b> {
fn get_max_target(
&mut self,
export_info_id: &ExportInfoId,
) -> Arc<HashMap<Option<DependencyId>, ExportInfoTargetValue>> {
Arc::new(
self
.inner
.get_export_info_mut_by_id(export_info_id)
.get_max_target()
.to_owned(),
)
) -> &HashMap<Option<DependencyId>, ExportInfoTargetValue> {
self
.inner
.get_export_info_mut_by_id(export_info_id)
.get_max_target()
}

fn run_resolve_filter(
Expand All @@ -2054,19 +2086,18 @@ impl<'a, 'b> ModuleGraphAccessor<'a> for MutableModuleGraph<'a, 'b> {
resolve_filter(target, self.inner)
}

fn get_export_info(&mut self, export_info_id: &ExportInfoId) -> Arc<ExportInfo> {
Arc::new(self.inner.get_export_info_by_id(export_info_id).to_owned())
fn get_export_info(&mut self, export_info_id: &ExportInfoId) -> &ExportInfo {
self.inner.get_export_info_by_id(export_info_id)
}

fn get_read_only_export_info(
&mut self,
name: &Atom,
module_identifier: &ModuleIdentifier,
) -> Option<Arc<ExportInfo>> {
) -> Option<&ExportInfo> {
self
.inner
.get_read_only_export_info(module_identifier, name.to_owned())
.map(|i| Arc::new(i.to_owned()))
}

fn get_module_meta_exports_type(
Expand All @@ -2086,6 +2117,14 @@ impl<'a, 'b> ModuleGraphAccessor<'a> for MutableModuleGraph<'a, 'b> {
) -> Option<&ModuleGraphConnection> {
self.inner.connection_by_dependency(&dependency_id)
}

fn ty(&self) -> ModuleGraphAccessorMutability {
ModuleGraphAccessorMutability::Mutable
}

fn inner(&self) -> &ModuleGraph {
&*self.inner
}
}

pub struct ImmutableModuleGraph<'a> {
Expand Down Expand Up @@ -2113,25 +2152,14 @@ impl<'a> ModuleGraphAccessor<'a> for ImmutableModuleGraph<'a> {
.id
}

// Due rustc limitation, we can't reference a hashmap generate in function, the impl is just a
// dummy place holder, call site should determine the type of `ModuleGraphAccessor`, and inline
// the function in the call site
fn get_max_target(
&mut self,
export_info_id: &ExportInfoId,
) -> Arc<HashMap<Option<DependencyId>, ExportInfoTargetValue>> {
Arc::new({
let export_info_id = self.inner.get_export_info_by_id(export_info_id);

if export_info_id.max_target_is_set {
export_info_id.get_max_target_readonly().to_owned()
} else {
// FIXME:
// max target should be cached
// but when moduleGraph is immutable and no cached max target
// generate a new one, this should be removed
// when module graph in get_exports and get_referenced_exports
// is refactored to mutable
export_info_id._get_max_target().clone()
}
})
_export_info_id: &ExportInfoId,
) -> &HashMap<Option<DependencyId>, ExportInfoTargetValue> {
unreachable!()
}

fn run_resolve_filter(
Expand All @@ -2142,19 +2170,18 @@ impl<'a> ModuleGraphAccessor<'a> for ImmutableModuleGraph<'a> {
resolve_filter(target, self.inner)
}

fn get_export_info(&mut self, export_info_id: &ExportInfoId) -> Arc<ExportInfo> {
Arc::new(self.inner.get_export_info_by_id(export_info_id).to_owned())
fn get_export_info(&mut self, export_info_id: &ExportInfoId) -> &ExportInfo {
self.inner.get_export_info_by_id(export_info_id)
}

fn get_read_only_export_info(
&mut self,
name: &Atom,
module_identifier: &ModuleIdentifier,
) -> Option<Arc<ExportInfo>> {
) -> Option<&ExportInfo> {
self
.inner
.get_read_only_export_info(module_identifier, name.to_owned())
.map(|i| Arc::new(i.to_owned()))
}

fn get_module_meta_exports_type(
Expand All @@ -2174,6 +2201,14 @@ impl<'a> ModuleGraphAccessor<'a> for ImmutableModuleGraph<'a> {
) -> Option<&ModuleGraphConnection> {
self.inner.connection_by_dependency(&dependency_id)
}

fn ty(&self) -> ModuleGraphAccessorMutability {
ModuleGraphAccessorMutability::Immutable
}

fn inner(&self) -> &ModuleGraph {
self.inner
}
}

pub fn prepare_get_exports_type<'a>(mg: &'a mut ModuleGraph<'a>) {
Expand Down
3 changes: 2 additions & 1 deletion crates/rspack_core/src/module.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,10 +401,11 @@ fn get_exports_type_impl(
if let Some(export_info) =
mga.get_read_only_export_info(&Atom::from("__esModule"), &identifier)
{
let export_info_id = export_info.id;
if matches!(export_info.provided, Some(ExportInfoProvided::False)) {
handle_default(default_object)
} else {
let Some(target) = export_info.id.get_target(mga, None) else {
let Some(target) = export_info_id.get_target(mga, None) else {
return ExportsType::Dynamic;
};
if target
Expand Down
Loading