feat(native): land the reviewed M4 preview ports and speed fixes together

.github/workflows/verify.yml

@@ -96,7 +96,7 @@ jobs:
                 ;;
             esac
             case "${path}" in
-              scripts/compiler_differential/*|scripts/run_compiler_differential.py|tests/*/scripts/compiler_differential/*|.github/workflows/verify.yml|Makefile)
+              scripts/compiler_differential/*|scripts/run_compiler_differential.py|tests/*/scripts/compiler_differential/*|tests/goldens/*|tests/e2e/fixtures/*|website/examples/*|src/sqlbuild/cli/commands/_helpers/compile/*|.github/workflows/verify.yml|Makefile)
                 compiler_differential=true
                 ;;
             esac
@@ -318,7 +318,7 @@ jobs:
           path: ${{ runner.temp }}/compiler-differential-wheel-sites.json
           if-no-files-found: warn
           retention-days: 30
-      - name: Compare generated seeds and the failure corpus (python vs shipped native)
+      - name: Compare fixtures, examples, generated seeds and the failure corpus (python vs shipped native)
         run: >-
           make compiler-differential-shipped
           COMPILER_DIFFERENTIAL_ARGS="--stage-captures --require-discovery-coverage
@@ -595,7 +595,7 @@ jobs:
         run: make test-e2e-diagnostic-compile-performance
 
   compile_performance_ratio:
-    name: Same-runner compile ratio (${{ matrix.kind }} 3000 models)
+    name: Same-runner compile ratio (${{ matrix.label || matrix.kind }} 3000 models)
     needs: [changes, lockfile]
     if: needs.changes.outputs.performance == 'true'
     runs-on: ubuntu-24.04
@@ -608,6 +608,25 @@ jobs:
             max_ratio: "1.10"
           - kind: fresh
             max_ratio: "1.10"
+          - kind: dense
+            label: native-preview contracts vs python
+            base_engine: python
+            head_engine: native-preview
+            gate_phase: contracts_cpu_ms
+            max_ratio: "1.00"
+          - kind: dense
+            label: native-preview model analysis vs python
+            base_engine: python
+            head_engine: native-preview
+            gate_phase: model_analysis_cpu_ms
+            compile_args: --compile-arg=--select=*
+            max_ratio: "1.50"
+          - kind: dense
+            label: native-preview custom rules vs python
+            base_engine: python
+            head_engine: native-preview
+            gate_phase: custom_rules_cpu_ms
+            max_ratio: "1.25"
     steps:
       - uses: actions/checkout@v4
       - name: Check out the comparison base
@@ -634,7 +653,29 @@ jobs:
       - name: Install base dependencies
         working-directory: base
         run: uv sync --locked --all-groups --all-extras
+      - name: Compare python and native-preview phase CPU on head
+        if: matrix.gate_phase
+        env:
+          KIND: ${{ matrix.kind }}
+          MAX_RATIO: ${{ matrix.max_ratio }}
+          BASE_ENGINE: ${{ matrix.base_engine }}
+          HEAD_ENGINE: ${{ matrix.head_engine }}
+          GATE_PHASE: ${{ matrix.gate_phase }}
+          COMPILE_ARGS: ${{ matrix.compile_args }}
+        run: |
+          uv run python -m scripts.compare_compile_performance \
+            --kind "${KIND}" \
+            --modes cold \
+            --max-ratio "${MAX_RATIO}" \
+            --models 3000 \
+            --base-python .venv/bin/python \
+            --head-python .venv/bin/python \
+            --base-engine "${BASE_ENGINE}" \
+            --head-engine "${HEAD_ENGINE}" \
+            --gate-phase "${GATE_PHASE}" \
+            ${COMPILE_ARGS:+"${COMPILE_ARGS}"}
       - name: Compare base and head cold, warm and one-model edit compiles
+        if: ${{ !matrix.gate_phase }}
         env:
           KIND: ${{ matrix.kind }}
           MAX_RATIO: ${{ matrix.max_ratio }}

Makefile

@@ -7,7 +7,8 @@ SHELL := /bin/bash
 	test-e2e-duckdb-integrations test-e2e-performance \
 	test-e2e-cold-compile-performance test-e2e-cache-compile-performance \
 	test-e2e-dense-compile-performance test-e2e-varied-cache-performance \
-	compiler-differential compiler-differential-shipped compiler-differential-dense
+	compiler-differential compiler-differential-shipped compiler-differential-dense \
+	compiler-baselines
 
 format:
 	uv run ruff format .
@@ -293,19 +294,32 @@ COMPILER_DIFFERENTIAL_SEEDS ?= 12
 COMPILER_DIFFERENTIAL_SHIPPED_SEEDS ?= 12
 COMPILER_DIFFERENTIAL_DENSE_MODELS ?= 3000
 COMPILER_DIFFERENTIAL_ARGS ?=
+# Native-to-Python fallbacks and analysis deferrals must match the allow-list exactly, and every
+# output its golden. `make compiler-baselines` rewrites both (see scripts/compiler_differential/README.md).
+COMPILER_DIFFERENTIAL_GATES := --native-fallbacks check --goldens check
 
 compiler-differential:
 	env PYTHONUNBUFFERED=1 uv run python -m scripts.run_compiler_differential \
 		--jobs $(COMPILER_DIFFERENTIAL_JOBS) --seeds $(COMPILER_DIFFERENTIAL_SEEDS) \
-		$(COMPILER_DIFFERENTIAL_ARGS)
+		$(COMPILER_DIFFERENTIAL_GATES) $(COMPILER_DIFFERENTIAL_ARGS)
 
 # python vs native-preview above covers every native stage; this keeps the shipped `native` default
-# (native discovery and rendering) covered on a bounded corpus.
+# (native discovery and rendering) and its goldens covered on the same corpus.
 compiler-differential-shipped:
 	env PYTHONUNBUFFERED=1 uv run python -m scripts.run_compiler_differential \
-		--engines python native --corpus seeds failures \
+		--engines python native --corpus fixtures examples seeds failures \
 		--jobs $(COMPILER_DIFFERENTIAL_JOBS) --seeds $(COMPILER_DIFFERENTIAL_SHIPPED_SEEDS) \
-		$(COMPILER_DIFFERENTIAL_ARGS)
+		$(COMPILER_DIFFERENTIAL_GATES) $(COMPILER_DIFFERENTIAL_ARGS)
+
+# Rewrite the goldens (from the python oracle) and the fallback allow-list from both CI runs.
+# Review the diff like code; see scripts/compiler_differential/README.md.
+COMPILER_DIFFERENTIAL_CI_ARGS := --stage-captures --require-discovery-coverage --require-render-coverage
+compiler-baselines:
+	rm -rf tests/goldens/compiler
+	$(MAKE) compiler-differential COMPILER_DIFFERENTIAL_ARGS="$(COMPILER_DIFFERENTIAL_CI_ARGS) \
+		--require-analysis-coverage --native-fallbacks update --goldens update"
+	$(MAKE) compiler-differential-shipped COMPILER_DIFFERENTIAL_ARGS="$(COMPILER_DIFFERENTIAL_CI_ARGS) \
+		--native-fallbacks update --goldens update"
 
 compiler-differential-dense:
 	env PYTHONUNBUFFERED=1 uv run python -m scripts.run_compiler_differential \

crates/sqlbuild-analysis/src/assembly/analysis_session/_helpers/catalog_state.rs

@@ -17,6 +17,10 @@ pub(crate) struct SessionCatalog {
     additions: Shapes,
     analysis_names: Vec<String>,
     recorded_analysis: HashSet<String>,
+    /// The `(types, nullability)` this session gave each relation's analysis.
+    analysis_shapes: HashMap<String, (Pairs, Pairs)>,
+    pub(crate) shared_members: usize,
+    pub(crate) reanalysed_members: usize,
 }
 
 impl SessionCatalog {
@@ -28,6 +32,9 @@ impl SessionCatalog {
             additions: Vec::new(),
             analysis_names: Vec::new(),
             recorded_analysis: HashSet::new(),
+            analysis_shapes: HashMap::new(),
+            shared_members: 0,
+            reanalysed_members: 0,
         }
     }
 
@@ -86,6 +93,8 @@ impl SessionCatalog {
                 name.clone(),
                 (catalog_columns(&column_types), catalog_columns(columns)),
             );
+            self.analysis_shapes
+                .insert(name.clone(), (column_types, columns.clone()));
             if self.recorded_analysis.insert(name.clone()) {
                 self.analysis_names.push(name.clone());
             }
@@ -95,6 +104,27 @@ impl SessionCatalog {
         }
     }
 
+    /// `(shared members, shared members re-analysed alone)` so far.
+    pub(crate) fn sharing(&self) -> (usize, usize) {
+        (self.shared_members, self.reanalysed_members)
+    }
+
+    /// The analysis shape this session set for `name`; inherited shapes are not known here.
+    pub(crate) fn session_analysis_shape(&self, name: &str) -> Option<&(Pairs, Pairs)> {
+        self.analysis_shapes.get(name)
+    }
+
+    /// The shape a binding of `columns` for `name` resolves: Python's override or catalog entry.
+    pub(crate) fn effective_binding_shape(&self, name: &str, columns: &Pairs) -> Pairs {
+        if columns.is_empty() {
+            return Vec::new();
+        }
+        match self.schemas.get(name) {
+            Some(known) if same_mapping(known, columns) => known.clone(),
+            _ => columns.clone(),
+        }
+    }
+
     pub(crate) fn register_override(&mut self, overrides: Relations) -> usize {
         self.native.register_override(overrides)
     }