Skip to content

Turbopack: reduce the amount of task modifications caused by recomputation #78728

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

Merged
merged 2 commits into from
May 5, 2025
Merged

Turbopack: reduce the amount of task modifications caused by recomputation #78728

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3bb5d5
reduce the amount of task modifications caused by recomputation
sokra Apr 30, 2025
9bddc22
fixup! reduce the amount of task modifications caused by recomputation
sokra Apr 30, 2025
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
101 changes: 54 additions & 47 deletions turbopack/crates/turbo-tasks-backend/src/backend/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,8 @@ use crate::{
backing_storage::BackingStorage,
data::{
ActivenessState, AggregationNumber, CachedDataItem, CachedDataItemKey, CachedDataItemType,
CachedDataItemValue, CachedDataItemValueRef, CellRef, CollectibleRef, CollectiblesRef,
DirtyState, InProgressCellState, InProgressState, InProgressStateInner, OutputValue,
RootType,
CachedDataItemValueRef, CellRef, CollectibleRef, CollectiblesRef, DirtyState,
InProgressCellState, InProgressState, InProgressStateInner, OutputValue, RootType,
},
utils::{
bi_map::BiMap, chunked_vec::ChunkedVec, ptr_eq_arc::PtrEqArc, sharded::Sharded, swap_retain,
Expand Down Expand Up @@ -422,7 +421,7 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> {
}

let mut ctx = self.execute_context(turbo_tasks);
let mut task = ctx.task(task_id, TaskDataCategory::All);
let mut task = ctx.task(task_id, TaskDataCategory::Meta);

fn listen_to_done_event<B: BackingStorage>(
this: &TurboTasksBackendInner<B>,
Expand Down Expand Up @@ -493,7 +492,7 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> {
&mut ctx,
);
}
task = ctx.task(task_id, TaskDataCategory::All);
task = ctx.task(task_id, TaskDataCategory::Meta);
}

let is_dirty =
Expand Down Expand Up @@ -1552,10 +1551,16 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> {

// Remove no longer existing cells and
// find all outdated data items (removed cells, outdated edges)
removed_data.extend(task.extract_if(CachedDataItemType::CellData, |key, _| {
matches!(key, CachedDataItemKey::CellData { cell } if cell_counters
.get(&cell.type_id).is_none_or(|start_index| cell.index >= *start_index))
}));
// Note: For persistent tasks we only want to call extract_if when there are actual cells to
// remove to avoid tracking that as modification.
if task_id.is_transient() || iter_many!(task, CellData { cell }
if cell_counters.get(&cell.type_id).is_none_or(|start_index| cell.index >= *start_index) => cell
).count() > 0 {
removed_data.extend(task.extract_if(CachedDataItemType::CellData, |key, _| {
matches!(key, CachedDataItemKey::CellData { cell } if cell_counters
.get(&cell.type_id).is_none_or(|start_index| cell.index >= *start_index))
}));
}
if self.should_track_children() {
old_edges.extend(
task.iter(CachedDataItemType::OutdatedCollectible)
Expand Down Expand Up @@ -1708,6 +1713,8 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> {
));

// Update the dirty state
let old_dirty_state = get!(task, Dirty).copied();

let new_dirty_state = if session_dependent {
Some(DirtyState {
clean_in_session: Some(self.session_id),
Expand All @@ -1716,48 +1723,48 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> {
None
};

let old_dirty = if let Some(new_dirty_state) = new_dirty_state {
task.insert(CachedDataItem::Dirty {
value: new_dirty_state,
})
} else {
task.remove(&CachedDataItemKey::Dirty {})
};

let old_dirty_state = old_dirty.map(|old_dirty| match old_dirty {
CachedDataItemValue::Dirty { value } => value,
_ => unreachable!(),
});

let data_update = if self.should_track_children()
&& (old_dirty_state.is_some() || new_dirty_state.is_some())
{
let mut dirty_containers = get!(task, AggregatedDirtyContainerCount)
.cloned()
.unwrap_or_default();
if let Some(old_dirty_state) = old_dirty_state {
dirty_containers.update_with_dirty_state(&old_dirty_state);
let data_update = if old_dirty_state != new_dirty_state {
if let Some(new_dirty_state) = new_dirty_state {
task.insert(CachedDataItem::Dirty {
value: new_dirty_state,
});
} else {
task.remove(&CachedDataItemKey::Dirty {});
}
let aggregated_update = match (old_dirty_state, new_dirty_state) {
(None, None) => unreachable!(),
(Some(old), None) => dirty_containers.undo_update_with_dirty_state(&old),
(None, Some(new)) => dirty_containers.update_with_dirty_state(&new),
(Some(old), Some(new)) => dirty_containers.replace_dirty_state(&old, &new),
};
if !aggregated_update.is_zero() {
if aggregated_update.get(self.session_id) < 0 {
if let Some(root_state) = get_mut!(task, Activeness) {
root_state.all_clean_event.notify(usize::MAX);
root_state.unset_active_until_clean();
if root_state.is_empty() {
task.remove(&CachedDataItemKey::Activeness {});

if self.should_track_children()
&& (old_dirty_state.is_some() || new_dirty_state.is_some())
{
let mut dirty_containers = get!(task, AggregatedDirtyContainerCount)
.cloned()
.unwrap_or_default();
if let Some(old_dirty_state) = old_dirty_state {
dirty_containers.update_with_dirty_state(&old_dirty_state);
}
let aggregated_update = match (old_dirty_state, new_dirty_state) {
(None, None) => unreachable!(),
(Some(old), None) => dirty_containers.undo_update_with_dirty_state(&old),
(None, Some(new)) => dirty_containers.update_with_dirty_state(&new),
(Some(old), Some(new)) => dirty_containers.replace_dirty_state(&old, &new),
};
if !aggregated_update.is_zero() {
if aggregated_update.get(self.session_id) < 0 {
if let Some(root_state) = get_mut!(task, Activeness) {
root_state.all_clean_event.notify(usize::MAX);
root_state.unset_active_until_clean();
if root_state.is_empty() {
task.remove(&CachedDataItemKey::Activeness {});
}
}
}
AggregationUpdateJob::data_update(
&mut task,
AggregatedDataUpdate::new()
.dirty_container_update(task_id, aggregated_update),
)
} else {
None
}
AggregationUpdateJob::data_update(
&mut task,
AggregatedDataUpdate::new().dirty_container_update(task_id, aggregated_update),
)
} else {
None
}
Expand Down
Loading