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.

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

Module ID global optimization #8913

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions crates/turbopack-browser/src/chunking_context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -514,4 +514,9 @@ impl ChunkingContext for BrowserChunkingContext {
self.chunk_item_id_from_ident(AsyncLoaderModule::asset_ident_for(module))
})
}

#[turbo_tasks::function]
async fn global_information(self: Vc<Self>) -> Result<Vc<OptionGlobalInformation>> {
Ok(self.await?.global_information)
}
}
2 changes: 1 addition & 1 deletion crates/turbopack-core/src/changed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ async fn get_referenced_output_assets(
Ok(parent.references().await?.clone_value().into_iter())
}

async fn get_referenced_modules(
pub async fn get_referenced_modules(
parent: Vc<Box<dyn Module>>,
) -> Result<impl Iterator<Item = Vc<Box<dyn Module>>> + Send> {
Ok(primary_referenced_modules(parent)
Expand Down
10 changes: 9 additions & 1 deletion crates/turbopack-core/src/chunk/chunking_context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
use turbo_tasks_fs::FileSystemPath;
use turbo_tasks_hash::DeterministicHash;

use super::{availability_info::AvailabilityInfo, ChunkableModule, EvaluatableAssets};
use super::{
availability_info::AvailabilityInfo, global_information::OptionGlobalInformation,
ChunkableModule, EvaluatableAssets,
};
use crate::{
chunk::{ChunkItem, ModuleId},
environment::Environment,
Expand Down Expand Up @@ -114,10 +117,15 @@
availability_info: Value<AvailabilityInfo>,
) -> Result<Vc<EntryChunkGroupResult>>;

fn global_information(self: Vc<Self>) -> Vc<OptionGlobalInformation>;

async fn chunk_item_id_from_ident(
self: Vc<Self>,
ident: Vc<AssetIdent>,
) -> Result<Vc<ModuleId>> {
if let Some(global_information) = &*self.global_information().await? {
return Ok(global_information.get_module_id(ident).await?);

Check failure on line 127 in crates/turbopack-core/src/chunk/chunking_context.rs

View workflow job for this annotation

GitHub Actions / Turbopack rust clippy

question mark operator is useless here
}
Ok(ModuleId::String(ident.to_string().await?.clone_value()).cell())
}

Expand Down
63 changes: 62 additions & 1 deletion crates/turbopack-core/src/chunk/global_information.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,67 @@
use std::collections::{HashMap, HashSet};

use anyhow::Result;
use turbo_tasks::{ValueToString, Vc};
use turbo_tasks_hash::hash_xxh3_hash64;

use super::ModuleId;
use crate::{ident::AssetIdent, module::Module};

#[turbo_tasks::value]
#[derive(Clone, Debug)]
pub struct GlobalInformation {}
pub struct GlobalInformation {
pub module_id_map: HashMap<AssetIdent, ModuleId>,
}

impl GlobalInformation {
pub async fn get_module_id(&self, asset_ident: Vc<AssetIdent>) -> Result<Vc<ModuleId>> {
let ident_str = asset_ident.to_string().await?;
let ident = asset_ident.await?;
let hashed_module_id = self.module_id_map.get(&ident);
if let Some(hashed_module_id) = hashed_module_id {
dbg!("Hashed module ID found", &ident_str, hashed_module_id);
return Ok(hashed_module_id.clone().cell());
}
dbg!("Hashed module ID not found", &ident_str);
return Ok(ModuleId::String(ident_str.clone_value()).cell());

Check failure on line 26 in crates/turbopack-core/src/chunk/global_information.rs

View workflow job for this annotation

GitHub Actions / Turbopack rust clippy

unneeded `return` statement
}
}

#[turbo_tasks::value(transparent)]
pub struct OptionGlobalInformation(Option<GlobalInformation>);

// NOTE(LichuAcu): This is a temporary location for this function,
// it could later be moved to a `module_id_optimization.rs` file with
// other module ID optimization logic.
pub async fn process_module(
module: Vc<Box<dyn Module>>,
id_map: &mut HashMap<AssetIdent, ModuleId>,
used_ids: &mut HashSet<u64>,
) -> Result<()> {
let ident = module.ident();

let hash = hash_xxh3_hash64(ident.to_string().await?);
let mut masked_hash = hash & 0xF;
let mut mask = 0xF;
while used_ids.contains(&masked_hash) {
if mask == 0xFFFFFFFFFFFFFFFF {
return Err(anyhow::anyhow!("This is a... 64-bit hash collision?"));
}
mask = (mask << 4) | 0xF;
masked_hash = hash & mask;
}

let hashed_module_id = ModuleId::String(masked_hash.to_string().into());

dbg!(
"process_module",
ident.await?.clone_value(),
&hashed_module_id,
mask
);

id_map.insert(ident.await?.clone_value(), hashed_module_id);
used_ids.insert(masked_hash);

Ok(())
}
13 changes: 5 additions & 8 deletions crates/turbopack-nodejs/src/chunking_context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -136,14 +136,6 @@ impl NodeJsChunkingContext {

#[turbo_tasks::value_impl]
impl NodeJsChunkingContext {
#[turbo_tasks::function]
async fn chunk_item_id_from_ident(
self: Vc<Self>,
ident: Vc<AssetIdent>,
) -> Result<Vc<ModuleId>> {
Ok(ModuleId::String(ident.to_string().await?.clone_value()).cell())
}

#[turbo_tasks::function]
fn new(this: Value<NodeJsChunkingContext>) -> Vc<Self> {
this.into_value().cell()
Expand Down Expand Up @@ -393,4 +385,9 @@ impl ChunkingContext for NodeJsChunkingContext {
self.chunk_item_id_from_ident(AsyncLoaderModule::asset_ident_for(module))
})
}

#[turbo_tasks::function]
async fn global_information(self: Vc<Self>) -> Result<Vc<OptionGlobalInformation>> {
Ok(self.await?.global_information)
}
}
Loading