Skip to content

Commit f9fc34b

Browse files
committed
docs: distinguish measured stack from subsequent upstream changes
1 parent 73eef09 commit f9fc34b

2 files changed

Lines changed: 11 additions & 1 deletion

File tree

‎test/FastExpressionCompiler.Performance/Measurements/Rebase-20261024/README.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Exact revisions and retained scope
44

5-
- Before #558: current upstream master without #558, `233ed5adaa9d9ceea67d71e153d0d2457f2cce00`. This includes merged #557/#562 and upstream SmallMap/conversion-helper repairs. It is not the historical original parent of #558; choosing this matched base isolates the current PR's incremental cost.
5+
- Before #558: upstream master snapshot at measurement start, without #558, `233ed5adaa9d9ceea67d71e153d0d2457f2cce00`. This includes merged #557/#562 and upstream SmallMap/conversion-helper repairs. It is not the historical original parent of #558; choosing this matched base isolates the current PR's incremental cost.
66
- After #558: `aaa79fe73f0978e9be8150116d4175f04cb5c971`.
77
- After #559: rebased production/test source `e300f4e2`.
88

@@ -76,3 +76,7 @@ Validated source `e300f4e2`: all production targets build; full .NET 10/.NET 8 A
7676
- `source-manifest.json`, `binary-manifest.json`, `system-reference-manifest.json`: immutable snapshot identities.
7777
- `range-diff.txt`: old/rebased performance-layer mapping.
7878
- `evidence.zip` and `evidence-manifest.json`: complete sources, harnesses/scripts, project files, native/imported validation logs, raw measurements, confirmation data and manifests. Binaries are hashed and retained locally, not committed. Runners refuse to mix existing output with a new run; preserve/relocate archived output before replaying in a fresh directory. The initial System-reference build error is retained; the corrected reference project was then built and measured successfully.
79+
80+
## Upstream advanced after measurement
81+
82+
After the measurement snapshots were frozen, dadhi/master advanced to `f49acef0` through `c89a3b2c` (nullable truth operators, Quote, and literal-lambda invocation changes). The requested parent #558 remains at `aaa79fe7`; this performance layer remains rebased onto exactly that head. The new master creates conflicts in the parent compatibility changes, so GitHub currently reports #559 as conflicting against its nominal master base. `git merge-tree` confirms conflicts in both compiler source files. No working-tree merge was started, and #558 was not changed. Integrating the new upstream semantics belongs in the parent layer first; the pinned measurements here do not claim to include that subsequent upstream work.

‎test/FastExpressionCompiler.Performance/Measurements/Rebase-20261024/validation.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,11 @@
6262
"commit": "e300f4e2b258c12975022fe7799acd88872cc06c",
6363
"compilerSha256": "97cfdeec42624a04d06062892d38801ff08ed4a5cbe0e99019d8d2d1ee254ff2",
6464
"assemblySha256": "773ff009d45d033efff2413575635cecc7883f0f918b1bb8ab614571508cf765"
65+
},
66+
"upstreamAdvancedAfterMeasurement": {
67+
"master": "f49acef0d83db3dd2b1059d7fda1a5107ee4eb3a",
68+
"parent558Unchanged": "aaa79fe73f0978e9be8150116d4175f04cb5c971",
69+
"githubMergeableAgainstNewMaster": false,
70+
"workingTreeMergeStarted": false
6571
}
6672
}

0 commit comments

Comments
 (0)