Two loop-perf folds, and the wasm value-numbering defect the second one exposed #1061
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -669,8 +669,10 @@ pub fn label_ref_capture_slots(inputargs: &[InputArg], ops: &[Op]) -> usize { | |
| LabelResumeData::collect(inputargs, ops).ref_slots | ||
| } | ||
|
|
||
| /// First free value position — one past the highest id any value reference in | ||
| /// the trace occupies (input args, op results, and every op argument, including | ||
| /// a folded value the constants pool alone binds). | ||
| /// `majit_gc::rewrite::remove_ref_constants` numbers the | ||
| /// `LoadFromGcTable` results it emits from here upward, so the operand | ||
| /// numbering the optimizer produced stays untouched. Same id set | ||
| /// `collect_guards_and_vars` sizes `num_vars` from, so the loads land inside | ||
|
|
@@ -1303,12 +1305,25 @@ fn collect_guards_and_vars(inputargs: &[InputArg], ops: &[Op]) -> (Vec<GuardExit | |
| { | ||
| max_var = op.pos.get().raw() + 1; | ||
| } | ||
| // Every value an op reads occupies a local, whether or not the trace | ||
| // also contains an op that produces it: constant folding and the short | ||
| // preamble leave a folded value bound only by the constants pool, and | ||
| // `unbound_pool_const_seeds` materializes it in the prologue. Counting | ||
| // only op results would under-size `num_vars` for such a value and, | ||
| // through `next_value_pos`, let `remove_ref_constants` reuse its id for | ||
| // a `LoadFromGcTable` — whose store then lands after the read, so the | ||
| // read returns the zero wasm initializes the local to. | ||
| let widen = |a: OpRef, max_var: &mut u32| { | ||
| if a != OpRef::NONE && !a.is_constant() && a.raw() + 1 > *max_var { | ||
| *max_var = a.raw() + 1; | ||
| } | ||
| }; | ||
| for a in op.getarglist().iter() { | ||
| widen(a.to_opref(), &mut max_var); | ||
| } | ||
|
Comment on lines
+1321
to
+1323
There was a problem hiding this comment.
When this loop now admits non-constant operand ids that have no producer, only AGENTS.md reference: AGENTS.md:L14-L20 Useful? React with 👍 / 👎. |
||
| if let Some(fa) = op.getfailargs() { | ||
| for a in fa.iter() { | ||
| widen(a.to_opref(), &mut max_var); | ||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| bridges_compiled=18 | ||
| descr_set_absent=0 | ||
| descr_set_ambiguous=0 | ||
| descr_set_stale_absent=0 | ||
| fbw_rolled_back_with_effects=0 | ||
| guard_failures=3610 | ||
| internal_compile_panics=0 | ||
| loops_aborted=0 | ||
| loops_compiled=6 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| bridges_compiled=18 | ||
| descr_set_absent=0 | ||
| descr_set_ambiguous=0 | ||
| descr_set_stale_absent=0 | ||
| fbw_rolled_back_with_effects=0 | ||
| guard_failures=3610 | ||
| internal_compile_panics=0 | ||
| loops_aborted=0 | ||
| loops_compiled=6 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| bridges_compiled=18 | ||
| descr_set_absent=0 | ||
| descr_set_ambiguous=0 | ||
| descr_set_stale_absent=0 | ||
| fbw_rolled_back_with_effects=0 | ||
| guard_failures=3610 | ||
| internal_compile_panics=0 | ||
| loops_aborted=0 | ||
| loops_compiled=6 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| bridges_compiled=9 | ||
| descr_set_absent=0 | ||
| descr_set_ambiguous=0 | ||
| descr_set_stale_absent=0 | ||
| fbw_rolled_back_with_effects=0 | ||
| guard_failures=1804 | ||
| internal_compile_panics=0 | ||
| loops_aborted=0 | ||
| loops_compiled=3 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| bridges_compiled=9 | ||
| descr_set_absent=0 | ||
| descr_set_ambiguous=0 | ||
| descr_set_stale_absent=0 | ||
| fbw_rolled_back_with_effects=0 | ||
| guard_failures=1804 | ||
| internal_compile_panics=0 | ||
| loops_aborted=0 | ||
| loops_compiled=3 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| bridges_compiled=9 | ||
| descr_set_absent=0 | ||
| descr_set_ambiguous=0 | ||
| descr_set_stale_absent=0 | ||
| fbw_rolled_back_with_effects=0 | ||
| guard_failures=1804 | ||
| internal_compile_panics=0 | ||
| loops_aborted=0 | ||
| loops_compiled=3 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| bridges_compiled=3 | ||
| descr_set_absent=0 | ||
| descr_set_ambiguous=0 | ||
| descr_set_stale_absent=0 | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| bridges_compiled=3 | ||
| descr_set_absent=0 | ||
| descr_set_ambiguous=0 | ||
| descr_set_stale_absent=0 | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| bridges_compiled=3 | ||
| descr_set_absent=0 | ||
| descr_set_ambiguous=0 | ||
| descr_set_stale_absent=0 | ||
| fbw_rolled_back_with_effects=0 | ||
| guard_failures=601 | ||
| internal_compile_panics=0 | ||
| loops_aborted=0 | ||
| loops_compiled=4 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| bridges_compiled=5 | ||
| descr_set_absent=0 | ||
| descr_set_ambiguous=0 | ||
| descr_set_stale_absent=0 | ||
| fbw_rolled_back_with_effects=0 | ||
| guard_failures=1016 | ||
| internal_compile_panics=0 | ||
| loops_aborted=0 | ||
| loops_compiled=15 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| bridges_compiled=4 | ||
| descr_set_absent=0 | ||
| descr_set_ambiguous=0 | ||
| descr_set_stale_absent=0 | ||
| fbw_rolled_back_with_effects=0 | ||
| guard_failures=606 | ||
| internal_compile_panics=0 | ||
| loops_aborted=0 | ||
| loops_compiled=6 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| bridges_compiled=4 | ||
| descr_set_absent=0 | ||
| descr_set_ambiguous=0 | ||
| descr_set_stale_absent=0 | ||
| fbw_rolled_back_with_effects=0 | ||
| guard_failures=606 | ||
| internal_compile_panics=0 | ||
| loops_aborted=0 | ||
| loops_compiled=6 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| bridges_compiled=5 | ||
| descr_set_absent=0 | ||
| descr_set_ambiguous=0 | ||
| descr_set_stale_absent=0 | ||
| fbw_rolled_back_with_effects=0 | ||
| guard_failures=1008 | ||
| internal_compile_panics=0 | ||
| loops_aborted=0 | ||
| loops_compiled=6 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| bridges_compiled=12 | ||
| descr_set_absent=0 | ||
| descr_set_ambiguous=0 | ||
| descr_set_stale_absent=0 | ||
| fbw_rolled_back_with_effects=0 | ||
| guard_failures=2461 | ||
| internal_compile_panics=0 | ||
| loops_aborted=0 | ||
| loops_compiled=3 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| bridges_compiled=12 | ||
| descr_set_absent=0 | ||
| descr_set_ambiguous=0 | ||
| descr_set_stale_absent=0 | ||
| fbw_rolled_back_with_effects=0 | ||
| guard_failures=2461 | ||
| internal_compile_panics=0 | ||
| loops_aborted=0 | ||
| loops_compiled=3 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| bridges_compiled=12 | ||
| descr_set_absent=0 | ||
| descr_set_ambiguous=0 | ||
| descr_set_stale_absent=0 | ||
| fbw_rolled_back_with_effects=0 | ||
| guard_failures=2461 | ||
| internal_compile_panics=0 | ||
| loops_aborted=0 | ||
| loops_compiled=3 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| bridges_compiled=4 | ||
| descr_set_absent=0 | ||
| descr_set_ambiguous=0 | ||
| descr_set_stale_absent=0 | ||
| fbw_rolled_back_with_effects=0 | ||
| guard_failures=607 | ||
| internal_compile_panics=0 | ||
| loops_aborted=0 | ||
| loops_compiled=5 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| bridges_compiled=4 | ||
| descr_set_absent=0 | ||
| descr_set_ambiguous=0 | ||
| descr_set_stale_absent=0 | ||
| fbw_rolled_back_with_effects=0 | ||
| guard_failures=607 | ||
| internal_compile_panics=0 | ||
| loops_aborted=0 | ||
| loops_compiled=5 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| bridges_compiled=4 | ||
| descr_set_absent=0 | ||
| descr_set_ambiguous=0 | ||
| descr_set_stale_absent=0 | ||
| fbw_rolled_back_with_effects=0 | ||
| guard_failures=804 | ||
| internal_compile_panics=0 | ||
| loops_aborted=0 | ||
| loops_compiled=5 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| bridges_compiled=8 | ||
| descr_set_absent=0 | ||
| descr_set_ambiguous=0 | ||
| descr_set_stale_absent=0 | ||
| fbw_rolled_back_with_effects=0 | ||
| guard_failures=1670 | ||
| internal_compile_panics=0 | ||
| loops_aborted=0 | ||
| loops_compiled=4 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| bridges_compiled=8 | ||
| descr_set_absent=0 | ||
| descr_set_ambiguous=0 | ||
| descr_set_stale_absent=0 | ||
| fbw_rolled_back_with_effects=0 | ||
| guard_failures=1670 | ||
| internal_compile_panics=0 | ||
| loops_aborted=0 | ||
| loops_compiled=4 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| bridges_compiled=9 | ||
| descr_set_absent=0 | ||
| descr_set_ambiguous=0 | ||
| descr_set_stale_absent=0 | ||
| fbw_rolled_back_with_effects=0 | ||
| guard_failures=2037 | ||
| internal_compile_panics=0 | ||
| loops_aborted=0 | ||
| loops_compiled=4 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| bridges_compiled=6 | ||
| descr_set_absent=0 | ||
| descr_set_ambiguous=0 | ||
| descr_set_stale_absent=0 | ||
| fbw_rolled_back_with_effects=0 | ||
| guard_failures=1202 | ||
| internal_compile_panics=0 | ||
| loops_aborted=0 | ||
| loops_compiled=2 |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When the folded value this loop now admits is a Float that survives only as an operand/constant-pool seed,
num_varsis widened for its raw id butcollect_value_typesstill marks only input args and op results asF64, leaving this new local asI64. A laterFloat*op resolves the same OpRef viaemit_resolve_f64and emitslocal.getof an i64 local where wasm expects f64, so folded-float short-preamble traces are rejected/invalid instead of compiling correctly; the operand census needs to propagate the value type (or decline) along with increasingnum_vars.Useful? React with 👍 / 👎.