chore: prepare for a rust-nightly upgrade
#5080
Open
Conversation
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
ggreif
changed the title
rust-nightly upgrade
ggreif
force-pushed
the
rust-nightly-upgrade-preparation
branch
4 times, most recently
from
c3e42b2 to
c801962
Compare
|
@basvandijk in EDIT:
but: using |
ggreif
force-pushed
the
rust-nightly-upgrade-preparation
branch
2 times, most recently
from
4d7f415 to
ecc7414
Compare
ggreif
force-pushed
the
rust-nightly-upgrade-preparation
branch
2 times, most recently
from
bc52c19 to
4980586
Compare
ggreif
reviewed
May 25, 2025
| @@ -27,7 +27,7 @@ runs: | |||
| - name: Discover `test/bench` changes | |||
| if: ${{ inputs.is_fork == 'false' }} | |||
| run: | | |||
| git diff --no-index $(nix build --print-out-paths .#tests.bench)/share test/bench/ok | patch -p1 -R | |||
| git diff --no-index $(nix build --print-out-paths .#tests.bench)/share test/bench/ok | patch -f -u -p1 -R | |||
There was a problem hiding this comment.
This is because sometimes we got an exit code 1 that messed up the pipeline. -f fixes that for good.
There was a problem hiding this comment.
Only it doesn't. It is super strange.
There was a problem hiding this comment.
Applied a band-aid until I understand this: 587d130.
|
Strange. When I execute the command locally bas@devenv-bas:~/d/motoko/motoko$ git diff --no-index $(nix build --print-out-paths .#tests.bench)/share test/bench/ok | patch -f -u -p1 -R
patching file test/bench/ok/candid-subtype-cost.drun-run.ok
patching file test/bench/ok/heap-32.drun-run.ok
patching file test/bench/ok/heap-64.drun-run.ok
patching file test/bench/ok/palindrome.drun-run.ok
bas@devenv-bas:~/d/motoko/motoko$ echo $?
0
bas@devenv-bas:~/d/motoko/motoko$ git diff
diff --git a/test/bench/ok/candid-subtype-cost.drun-run.ok b/test/bench/ok/candid-subtype-cost.drun-run.ok
index fa8d5cdbd..4eedb5c3c 100644
--- a/test/bench/ok/candid-subtype-cost.drun-run.ok
+++ b/test/bench/ok/candid-subtype-cost.drun-run.ok
@@ -1,4 +1,4 @@
ingress Completed: Reply: 0x4449444c016c01b3c4b1f204680100010a00000000000000000101
ingress Completed: Reply: 0x4449444c0000
-debug.print: {cycles = 911_177; heap_bytes = +12_568}
+debug.print: {cycles = 910_817; heap_bytes = +12_568}
ingress Completed: Reply: 0x4449444c0000
diff --git a/test/bench/ok/heap-32.drun-run.ok b/test/bench/ok/heap-32.drun-run.ok
index 5d175041d..20762a59b 100644
--- a/test/bench/ok/heap-32.drun-run.ok
+++ b/test/bench/ok/heap-32.drun-run.ok
@@ -1,5 +1,5 @@
ingress Completed: Reply: 0x4449444c016c01b3c4b1f204680100010a00000000000000000101
ingress Completed: Reply: 0x4449444c0000
-debug.print: (50_227, +29_863_068, 723_584_959)
-debug.print: (50_070, +32_992_212, 785_200_311)
+debug.print: (50_227, +29_863_068, 723_584_599)
+debug.print: (50_070, +32_992_212, 785_200_671)
ingress Completed: Reply: 0x4449444c0000
diff --git a/test/bench/ok/heap-64.drun-run.ok b/test/bench/ok/heap-64.drun-run.ok
index d28df15ef..815a4da64 100644
--- a/test/bench/ok/heap-64.drun-run.ok
+++ b/test/bench/ok/heap-64.drun-run.ok
@@ -1,5 +1,5 @@
ingress Completed: Reply: 0x4449444c016c01b3c4b1f204680100010a00000000000000000101
ingress Completed: Reply: 0x4449444c0000
-debug.print: (49_965, +47_942_744, 987_908_675)
-debug.print: (49_806, +47_960_000, 996_956_504)
+debug.print: (49_965, +47_942_744, 987_907_181)
+debug.print: (49_806, +47_960_000, 996_956_864)
ingress Completed: Reply: 0x4449444c0000
diff --git a/test/bench/ok/palindrome.drun-run.ok b/test/bench/ok/palindrome.drun-run.ok
index e82e65287..1ee8e5701 100644
--- a/test/bench/ok/palindrome.drun-run.ok
+++ b/test/bench/ok/palindrome.drun-run.ok
@@ -1,7 +1,7 @@
ingress Completed: Reply: 0x4449444c016c01b3c4b1f204680100010a00000000000000000101
ingress Completed: Reply: 0x4449444c0000
debug.print: (true, +1_188, 12_573)
-debug.print: (false, +1_188, 11_622)
+debug.print: (false, +1_188, 12_045)
debug.print: (false, +1_188, 12_552)
debug.print: (true, +868, 12_713)
debug.print: (false, +868, 11_176) |
RIght. Same for me (had to change to |
ggreif
reviewed
May 27, 2025
| @@ -38,3 +38,48 @@ fn written_length(buffer: &[u8]) -> usize { | |||
| } | |||
| buffer.len() | |||
| } | |||
|
|
|||
| #[no_mangle] | |||
| pub fn pow(a: f64, b: f64) -> f64 { | |||
There was a problem hiding this comment.
maybe later we can short-circuit these to avoid the indirection
| @@ -145,7 +145,6 @@ impl Stream { | |||
| } | |||
|
|
|||
| /// Ingest a single byte into the stream. | |||
| #[inline] | |||
There was a problem hiding this comment.
Is this change intentional? Seems unrelated to the rest of the changes.
There was a problem hiding this comment.
IIRC a newer rustc complained that it's not possible to inline exported functions.
| @@ -1,4 +1,4 @@ | |||
| ingress Completed: Reply: 0x4449444c016c01b3c4b1f204680100010a00000000000000000101 | |||
| ingress Completed: Reply: 0x4449444c0000 | |||
| debug.print: {cycles = 911_177; heap_bytes = +12_568} | |||
| debug.print: {cycles = 910_817; heap_bytes = +12_568} | |||
There was a problem hiding this comment.
hmm, why does this change cycles? also below.
There was a problem hiding this comment.
Possibly libm has an optimisation?
... and to shut up about minor tossups
see comments
ggreif
force-pushed
the
rust-nightly-upgrade-preparation
branch
from
4644e46 to
f27f356
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This makes the necessary changes to upgrade
rust-nightlyexcept actually bumpingrust-nightly. This makes it easier to do the eventual upgrade later on, and simplifies the debugging as is done in: #5074.