Skip to content

Delete unused memo and preparation carriers (native-memory-inert-carriers) #13615

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

Closed
briansrls wants to merge 1 commit into from
Closed

Delete unused memo and preparation carriers (native-memory-inert-carriers) #13615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 1 addition & 5 deletions dag/extdeps/cache.dag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import extdeps.cache.types {
CatalogOpaqueStringKey,
CatalogCasContentDigest,
}
import extdeps.realization.compile_stage_memo { compile_stage_memo_facts, compile_stage_memo_id }
import extdeps.realization.reconcile_in_process {
parse_cache_facts,
typed_module_cache_facts,
Expand Down Expand Up @@ -127,7 +126,6 @@ data sccache_local: CacheInterfaceCatalogFacts = sccache_local_facts
data buildbuddy_cas: CacheInterfaceCatalogFacts = buildbuddy_cas_facts
data cargo_target_dir: CacheInterfaceCatalogFacts = cargo_target_dir_facts
data rustup_toolchain_store: CacheInterfaceCatalogFacts = rustup_toolchain_store_facts
data compile_stage_memo: CacheInterfaceCatalogFacts = compile_stage_memo_facts

data cache_catalog: List<CacheInterfaceCatalogFacts> = [
gha_actions_cache,
Expand All @@ -137,19 +135,17 @@ data cache_catalog: List<CacheInterfaceCatalogFacts> = [
rustup_toolchain_store,
parse_cache_facts,
typed_module_cache_facts,
compile_stage_memo_facts,
materialization_store_local_facts,
]

data cache_catalog_rows: List<CacheInterfaceFacts> = cache_catalog
|> map(row => cache_interface_facts_from_catalog(row: row))

data sccache_local_projected: CacheInterfaceFacts = cache_interface_facts_from_catalog(sccache_local)
data compile_stage_memo_projected: CacheInterfaceFacts = cache_interface_facts_from_catalog(compile_stage_memo)
data parse_cache_projected: CacheInterfaceFacts = cache_interface_facts_from_catalog(parse_cache_facts)
data cargo_target_dir_projected: CacheInterfaceFacts = cache_interface_facts_from_catalog(cargo_target_dir)

data cache_layer_default_order: List<CacheInterfaceId> = [
compile_stage_memo_id,
parse_cache_id,
typed_module_cache_id,
cargo_target_dir_id,
Expand Down
78 changes: 0 additions & 78 deletions dag/extdeps/realization/compile_stage_memo.dag
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions dag/gunbc/commit_workflow.dag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1450,21 +1450,6 @@ data commit_gate_roster: List<CommitCheckEnrollment> = [
},
surfaces: [GithubActionsCiJob]
},
CommitCheckEnrollment {
check: CommitWitnessClaim {
entry: "src/v2/test/claim/compiler_materialization_witness_test.dag",
check_fns: [
"compiler_materialization_ladder_holds",
"compile_stage_memo_provider_preserves_catalog_retention",
"compile_stage_carrier_inhabits_realization",
"single_site_demands_are_accepted_single_recompute",
"compile_stage_memo_plural_reds_without_provider"
],
kind: CorpusWitnessKind,
span: SpanUndeclared
},
surfaces: [GithubActionsCiJob]
},
CommitCheckEnrollment {
check: CommitWitnessClaim {
entry: "dag/test/claim/ci_materialization_witness_test.dag",
Expand Down
1 change: 0 additions & 1 deletion dag/gunbc/doc_graph_roots.dag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,6 @@ data hand_authored_doc_bind_incomings: List<HandAuthoredDocBind> = [
primary_work: DeclarationRef { module_path: "v2.std.materialize", decl_name: "materialize", field: WholeDeclaration },
additional_works: [
DeclarationRef { module_path: "std.realization", decl_name: "Materialization", field: WholeDeclaration },
DeclarationRef { module_path: "v2.std.staging", decl_name: "cached_stage", field: WholeDeclaration },
],
dissolution: PlanRetiresWhen { condition: unbound_dissolution(description: "the work this document plans lands and its subject materialize describes shipped behavior rather than a planned change; the row deletes with the document. Registered at subject grain: the systems bound here are the ones whose movement would make this document's purpose false, not every system its prose mentions.") },
},
Expand Down
1 change: 0 additions & 1 deletion dag/gunbc/legacy_extdeps_scope_frontier.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,6 @@ dag/extdeps/provisioning/ubuntu_seeded_install_media_toolchain.dag
dag/extdeps/python/python.dag
dag/extdeps/realization/artifact_store_fs.dag
dag/extdeps/realization/cache_purity.dag
dag/extdeps/realization/compile_stage_memo.dag
dag/extdeps/realization/emit_on_demand_host.dag
dag/extdeps/realization/eval_memo.dag
dag/extdeps/realization/frame_boundary_simulated.dag
Expand Down
8 changes: 0 additions & 8 deletions dag/gunbc/materialization_provider_targets.dag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import std.types { Bool, Int, List, String }
import std.cache_identity { CacheInterfaceId }
import std.decl_ref { DeclarationRef, WholeDeclaration, declaration_ref_eq }
import extdeps.realization.reconcile_in_process { parse_cache_id, typed_module_cache_id }
import extdeps.realization.compile_stage_memo { compile_stage_memo_id }
import extdeps.realization.eval_memo { eval_memo_id }
import extdeps.realization.native_artifact_cache { native_artifact_cache_id }
import std.dissolution { DissolutionCondition, unbound_dissolution }
Expand Down Expand Up @@ -66,13 +65,6 @@ data materialization_provider_targets: List<ProviderContractTarget> = [
reason: "cli_run typed-module memo already keys on the typed_module_key facts this contract's TypecheckModuleRequest derives; the carrier is still an exposed in-process map (hollowing-plan area 2.6)",
dissolution: unbound_dissolution(description: "typecheck lookups route through provider_serve with TypecheckModuleRequest and the map carrier retires")
},
ProviderContractTarget {
cache: compile_stage_memo_id,
cache_row: target_decl(module_path: "extdeps.realization.compile_stage_memo", decl_name: "compile_stage_memo_facts"),
consumer_seam: target_decl(module_path: "v2.std.staging", decl_name: "cached_stage"),
reason: "v2 compile_ingest_staging cached_stage is content-addressed done right but answers through its own lookup shape rather than the contract's typed outcomes",
dissolution: unbound_dissolution(description: "cached_stage lookups project through provider_serve outcomes (the DESIGN section 2 ParseTable/cached_stage grounding lane)")
},
ProviderContractTarget {
cache: eval_memo_id,
cache_row: target_decl(module_path: "extdeps.realization.eval_memo", decl_name: "eval_memo_facts"),
Expand Down
1 change: 0 additions & 1 deletion dag/gunbc/witness/witness_row_cost_basis.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,6 @@ src/v2/test/claim/compilation_unit_witness_test.dag witness_fold_deps_match_boun
src/v2/test/claim/compilation_unit_witness_test.dag witness_fold_deps_match_boundary_edges_two_unit 4 30550328673 srv_fleet_arm64 wall
src/v2/test/claim/compiler/compile_eval_thesis_proof_test.dag compile_eval_bool_reaches_node_value_holds 2 30550328673 srv_fleet_arm64 wall
src/v2/test/claim/compiler/compile_eval_thesis_proof_test.dag compile_eval_bool_via_compile_entry_holds 1 30550328673 srv_fleet_arm64 wall
src/v2/test/claim/compiler_materialization_witness_test.dag compile_stage_memo_plural_reds_without_provider 1 30550328673 srv_fleet_arm64 wall
src/v2/test/claim/complexity_gate/budget_roster_completeness_test.dag complexity_budget_roster_family_gate_holds 5 30550328673 srv_fleet_arm64 wall
src/v2/test/claim/complexity_gate/source_bridged_add_budget_test.dag table_fixture_add_budget_claim_holds 1 30550328673 srv_fleet_arm64 wall
src/v2/test/claim/complexity_gate/source_bridged_bind_budget_test.dag table_fixture_bind_budget_claim_holds 1 30550328673 srv_fleet_arm64 wall
Expand Down
6 changes: 2 additions & 4 deletions dag/std/materialization_provider.dag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1256,17 +1256,15 @@ data resolved_graph_disk_format_unqualified_frontier: DissolutionCondition = unb
)

data in_process_fnv_producer_observation_frontier: DissolutionCondition = unbound_dissolution(
description: "A production producer must mint InProcessMaterialization at the seam that holds both the executed ArtifactRequest and the constructed artifact. Until that seam exists, in-process FNV sharing is not an admitted production route: only inhabitance claims and floor-preparation witnesses may call in_process_materialization, and a consumer must not derive the observed identity from the lookup request."
description: "A production producer must mint InProcessMaterialization at the seam that holds both the executed ArtifactRequest and the constructed artifact. Until that seam exists, in-process FNV sharing is not an admitted production route: only inhabitance claims may call in_process_materialization, and a consumer must not derive the observed identity from the lookup request."
)

fn in_process_materialization(
req: ArtifactRequest,
artifact: MaterializedArtifact,
observed_digest: ContentHash
) -> ProviderProbe admit_callers: [
decl_ref(module_path: "test.claim.materialization_provider_witness", decl_name: "minted_in_process"),
decl_ref(module_path: "test.claim.floor_preparation_witness", decl_name: "probe_for"),
decl_ref(module_path: "test.claim.floor_preparation_witness", decl_name: "wrong_artifact_key_refuses")
decl_ref(module_path: "test.claim.materialization_provider_witness", decl_name: "minted_in_process")
] {
InProcessProbe {
observation: InProcessMaterialization {
Expand Down
8 changes: 4 additions & 4 deletions dag/test/claim/cache_layer_planner_test.dag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ data expensive_recompute: CostAccount = cost_account_measured(

data wan_deployment: CacheDeploymentBackends = CacheDeploymentBackends {
available: [
compile_stage_memo_id,
parse_cache_id,
sccache_local_id,
buildbuddy_cas_id,
gha_actions_cache_id,
Expand All @@ -30,7 +30,7 @@ test fn witness_cheap_recompute_skips_wan_layers() -> Bool {
catalog: cache_catalog_rows,
default_order: cache_layer_default_order,
)
cache_layer_plan_contains_id(plan: plan, id: compile_stage_memo_id)
cache_layer_plan_contains_id(plan: plan, id: parse_cache_id)
&& cache_layer_plan_contains_id(plan: plan, id: sccache_local_id)
&& !cache_layer_plan_contains_id(plan: plan, id: buildbuddy_cas_id)
&& !cache_layer_plan_contains_id(plan: plan, id: gha_actions_cache_id)
Expand Down Expand Up @@ -69,7 +69,7 @@ test fn witness_plan_primary_and_fallback_projections() -> Bool {
Present { value: primary } =>
match cache_layer_plan_fallback(plan: plan) {
Absent => false
Present { value: fallback } => primary == compile_stage_memo_id && fallback == sccache_local_id
Present { value: fallback } => primary == parse_cache_id && fallback == sccache_local_id
}
}
}
Expand Down Expand Up @@ -98,7 +98,7 @@ test fn witness_empty_plan_means_recompute_only() -> Bool {

test fn witness_vendor_only_key_inputs_omission_is_explicit() -> Bool {
sccache_local_projected.key_derivation.vendor_only_key_inputs_omitted
&& !compile_stage_memo_projected.key_derivation.vendor_only_key_inputs_omitted
&& !parse_cache_projected.key_derivation.vendor_only_key_inputs_omitted
}

test fn witness_vendor_transport_encoding_projection_is_honest() -> Bool {
Expand Down
Loading