Unverified Commit 5d1ecedf authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

Turbopack: fix graph chunk groups (#76383)

### What?

* Fix pages graph entrypoints
* Fix chunk_group_info computation for merged
* Fix client_shared_entries in graph
* chunk_group_info: continue walking across graphs
parent 0f47638f
...@@ -813,13 +813,14 @@ impl AppProject { ...@@ -813,13 +813,14 @@ impl AppProject {
&self, &self,
endpoint: Vc<AppEndpoint>, endpoint: Vc<AppEndpoint>,
rsc_entry: ResolvedVc<Box<dyn Module>>, rsc_entry: ResolvedVc<Box<dyn Module>>,
extra_entries: Vc<EvaluatableAssets>, client_shared_entries: Vc<EvaluatableAssets>,
has_layout_segments: bool, has_layout_segments: bool,
) -> Result<Vc<ModuleGraphs>> { ) -> Result<Vc<ModuleGraphs>> {
let extra_entries = extra_entries let client_shared_entries = client_shared_entries
.await? .await?
.into_iter() .into_iter()
.map(|m| ResolvedVc::upcast(*m)); .map(|m| ResolvedVc::upcast(*m))
.collect();
if *self.project.per_page_module_graph().await? { if *self.project.per_page_module_graph().await? {
// Implements layout segment optimization to compute a graph "chain" for each layout // Implements layout segment optimization to compute a graph "chain" for each layout
...@@ -833,14 +834,17 @@ impl AppProject { ...@@ -833,14 +834,17 @@ impl AppProject {
} = &*find_server_entries(*rsc_entry).await?; } = &*find_server_entries(*rsc_entry).await?;
let graph = SingleModuleGraph::new_with_entries_visited( let graph = SingleModuleGraph::new_with_entries_visited(
vec![( vec![
server_utils (
.iter() server_utils
.map(|m| ResolvedVc::upcast(*m)) .iter()
.chain(extra_entries) .map(async |m| Ok(ResolvedVc::upcast(m.await?.module)))
.collect(), .try_join()
ChunkGroupType::Entry, .await?,
)], ChunkGroupType::Entry,
),
(client_shared_entries, ChunkGroupType::Evaluated),
],
VisitedModules::empty(), VisitedModules::empty(),
); );
graphs.push(graph); graphs.push(graph);
...@@ -869,7 +873,7 @@ impl AppProject { ...@@ -869,7 +873,7 @@ impl AppProject {
visited_modules visited_modules
} else { } else {
let graph = SingleModuleGraph::new_with_entries_visited( let graph = SingleModuleGraph::new_with_entries_visited(
vec![(extra_entries.collect(), ChunkGroupType::Entry)], vec![(client_shared_entries, ChunkGroupType::Evaluated)],
VisitedModules::empty(), VisitedModules::empty(),
); );
graphs.push(graph); graphs.push(graph);
......
...@@ -1475,7 +1475,11 @@ impl Endpoint for PageEndpoint { ...@@ -1475,7 +1475,11 @@ impl Endpoint for PageEndpoint {
if let PageEndpointType::Html = this.ty { if let PageEndpointType::Html = this.ty {
modules.push(( modules.push((
vec![self.client_module().to_resolved().await?], self.client_evaluatable_assets()
.await?
.iter()
.map(|m| ResolvedVc::upcast(*m))
.collect(),
ChunkGroupType::Evaluated, ChunkGroupType::Evaluated,
)); ));
} }
......
...@@ -22,8 +22,8 @@ use crate::{ ...@@ -22,8 +22,8 @@ use crate::{
chunk::{ChunkGroupType, ChunkingType}, chunk::{ChunkGroupType, ChunkingType},
module::Module, module::Module,
module_graph::{ module_graph::{
get_node, GraphNodeIndex, GraphTraversalAction, ModuleGraph, SingleModuleGraphModuleNode, get_node, get_node_idx, GraphNodeIndex, GraphTraversalAction, ModuleGraph,
SingleModuleGraphNode, SingleModuleGraphModuleNode, SingleModuleGraphNode,
}, },
}; };
...@@ -152,14 +152,14 @@ enum ChunkGroupKey { ...@@ -152,14 +152,14 @@ enum ChunkGroupKey {
}, },
/// a module with an incoming async edge /// a module with an incoming async edge
Async(ResolvedVc<Box<dyn Module>>), Async(ResolvedVc<Box<dyn Module>>),
/// a module with an incoming non-merged isolated edge /// a module with an incoming non-merging isolated edge
Isolated(ResolvedVc<Box<dyn Module>>), Isolated(ResolvedVc<Box<dyn Module>>),
/// a module with an incoming merging isolated edge /// a module with an incoming merging isolated edge
IsolatedMerged { IsolatedMerged {
parent: ChunkGroupId, parent: ChunkGroupId,
merge_tag: RcStr, merge_tag: RcStr,
}, },
/// a module with an incoming merging shared edge /// a module with an incoming non-merging shared edge
Shared(ResolvedVc<Box<dyn Module>>), Shared(ResolvedVc<Box<dyn Module>>),
/// a module with an incoming merging shared edge /// a module with an incoming merging shared edge
SharedMerged { SharedMerged {
...@@ -353,20 +353,23 @@ pub async fn compute_chunk_group_info(graph: &ModuleGraph) -> Result<Vc<ChunkGro ...@@ -353,20 +353,23 @@ pub async fn compute_chunk_group_info(graph: &ModuleGraph) -> Result<Vc<ChunkGro
// Start of a new chunk group, don't inherit anything from parent // Start of a new chunk group, don't inherit anything from parent
let chunk_group_ids = chunk_groups.map(|chunk_group| { let chunk_group_ids = chunk_groups.map(|chunk_group| {
let len = chunk_groups_map.len(); let len = chunk_groups_map.len();
let is_isolated_merged = let is_merged = matches!(
matches!(chunk_group, ChunkGroupKey::IsolatedMerged { .. }); chunk_group,
ChunkGroupKey::IsolatedMerged { .. }
| ChunkGroupKey::SharedMerged { .. }
);
match chunk_groups_map.entry(chunk_group) { match chunk_groups_map.entry(chunk_group) {
Entry::Occupied(mut e) => { Entry::Occupied(mut e) => {
let (id, isolated_merged_entries) = e.get_mut(); let (id, merged_entries) = e.get_mut();
if is_isolated_merged { if is_merged {
isolated_merged_entries.insert(node.module); merged_entries.insert(node.module);
} }
**id **id
} }
Entry::Vacant(e) => { Entry::Vacant(e) => {
let chunk_group_id = len as u32; let chunk_group_id = len as u32;
let mut set = FxIndexSet::default(); let mut set = FxIndexSet::default();
if is_isolated_merged { if is_merged {
set.insert(node.module); set.insert(node.module);
} }
e.insert((ChunkGroupId(chunk_group_id), set)); e.insert((ChunkGroupId(chunk_group_id), set));
...@@ -443,8 +446,8 @@ pub async fn compute_chunk_group_info(graph: &ModuleGraph) -> Result<Vc<ChunkGro ...@@ -443,8 +446,8 @@ pub async fn compute_chunk_group_info(graph: &ModuleGraph) -> Result<Vc<ChunkGro
} }
while let Some(NodeWithPriority { node, .. }) = queue.pop() { while let Some(NodeWithPriority { node, .. }) = queue.pop() {
queue_set.remove(&node); queue_set.remove(&node);
let (node_weight, node) = get_node_idx!(graphs, node)?;
let graph = &graphs[node.graph_idx].graph; let graph = &graphs[node.graph_idx].graph;
let node_weight = get_node!(graphs, node)?;
let neighbors = iter_neighbors(graph, node.node_idx); let neighbors = iter_neighbors(graph, node.node_idx);
visit_count += 1; visit_count += 1;
...@@ -454,7 +457,7 @@ pub async fn compute_chunk_group_info(graph: &ModuleGraph) -> Result<Vc<ChunkGro ...@@ -454,7 +457,7 @@ pub async fn compute_chunk_group_info(graph: &ModuleGraph) -> Result<Vc<ChunkGro
graph_idx: node.graph_idx, graph_idx: node.graph_idx,
node_idx: succ, node_idx: succ,
}; };
let succ_weight = get_node!(graphs, succ)?; let (succ_weight, succ) = get_node_idx!(graphs, succ)?;
let edge_weight = graph.edge_weight(edge).unwrap(); let edge_weight = graph.edge_weight(edge).unwrap();
let action = visitor( let action = visitor(
Some((node_weight, edge_weight)), Some((node_weight, edge_weight)),
...@@ -483,7 +486,7 @@ pub async fn compute_chunk_group_info(graph: &ModuleGraph) -> Result<Vc<ChunkGro ...@@ -483,7 +486,7 @@ pub async fn compute_chunk_group_info(graph: &ModuleGraph) -> Result<Vc<ChunkGro
module_chunk_groups, module_chunk_groups,
chunk_groups: chunk_groups_map chunk_groups: chunk_groups_map
.into_iter() .into_iter()
.map(|(k, (_, isolated_merged_entries))| match k { .map(|(k, (_, merged_entries))| match k {
ChunkGroupKey::Entry { entries, ty } => ChunkGroup::Entry { entries, ty }, ChunkGroupKey::Entry { entries, ty } => ChunkGroup::Entry { entries, ty },
ChunkGroupKey::Async(module) => ChunkGroup::Async(module), ChunkGroupKey::Async(module) => ChunkGroup::Async(module),
ChunkGroupKey::Isolated(module) => ChunkGroup::Isolated(module), ChunkGroupKey::Isolated(module) => ChunkGroup::Isolated(module),
...@@ -491,14 +494,14 @@ pub async fn compute_chunk_group_info(graph: &ModuleGraph) -> Result<Vc<ChunkGro ...@@ -491,14 +494,14 @@ pub async fn compute_chunk_group_info(graph: &ModuleGraph) -> Result<Vc<ChunkGro
ChunkGroup::IsolatedMerged { ChunkGroup::IsolatedMerged {
parent: parent.0 as usize, parent: parent.0 as usize,
merge_tag, merge_tag,
entries: isolated_merged_entries.into_iter().collect(), entries: merged_entries.into_iter().collect(),
} }
} }
ChunkGroupKey::Shared(module) => ChunkGroup::Shared(module), ChunkGroupKey::Shared(module) => ChunkGroup::Shared(module),
ChunkGroupKey::SharedMerged { parent, merge_tag } => ChunkGroup::SharedMerged { ChunkGroupKey::SharedMerged { parent, merge_tag } => ChunkGroup::SharedMerged {
parent: parent.0 as usize, parent: parent.0 as usize,
merge_tag, merge_tag,
entries: isolated_merged_entries.into_iter().collect(), entries: merged_entries.into_iter().collect(),
}, },
}) })
.collect(), .collect(),
......
...@@ -692,7 +692,7 @@ macro_rules! get_node { ...@@ -692,7 +692,7 @@ macro_rules! get_node {
Some(SingleModuleGraphNode::Module(node)) => ::anyhow::Ok(node), Some(SingleModuleGraphNode::Module(node)) => ::anyhow::Ok(node),
Some(SingleModuleGraphNode::VisitedModule { idx, .. }) => { Some(SingleModuleGraphNode::VisitedModule { idx, .. }) => {
match $graphs[idx.graph_idx].graph.node_weight(idx.node_idx) { match $graphs[idx.graph_idx].graph.node_weight(idx.node_idx) {
Some(SingleModuleGraphNode::Module(node)) => anyhow::Ok(node), Some(SingleModuleGraphNode::Module(node)) => ::anyhow::Ok(node),
Some(SingleModuleGraphNode::VisitedModule { .. }) => Err(::anyhow::anyhow!( Some(SingleModuleGraphNode::VisitedModule { .. }) => Err(::anyhow::anyhow!(
"Expected visited target node to be module" "Expected visited target node to be module"
)), )),
...@@ -704,6 +704,28 @@ macro_rules! get_node { ...@@ -704,6 +704,28 @@ macro_rules! get_node {
}}; }};
} }
pub(crate) use get_node; pub(crate) use get_node;
macro_rules! get_node_idx {
($graphs:expr, $node:expr) => {{
let node_idx = $node;
match $graphs[node_idx.graph_idx]
.graph
.node_weight(node_idx.node_idx)
{
Some(SingleModuleGraphNode::Module(node)) => ::anyhow::Ok((node, node_idx)),
Some(SingleModuleGraphNode::VisitedModule { idx, .. }) => {
match $graphs[idx.graph_idx].graph.node_weight(idx.node_idx) {
Some(SingleModuleGraphNode::Module(node)) => ::anyhow::Ok((node, *idx)),
Some(SingleModuleGraphNode::VisitedModule { .. }) => Err(::anyhow::anyhow!(
"Expected visited target node to be module"
)),
None => Err(::anyhow::anyhow!("Expected visited target node")),
}
}
None => Err(::anyhow::anyhow!("Expected graph node")),
}
}};
}
pub(crate) use get_node_idx;
// pub struct AllNodesIterator { // pub struct AllNodesIterator {
// inner: Vec<ReadRef<SingleModuleGraph>>, // inner: Vec<ReadRef<SingleModuleGraph>>,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment