Merge branch 'master' into jack/crp-1559

Author: randombit

.github/workflows/schedule-rust-bench.yml

@@ -60,8 +60,11 @@ jobs:
           run: |
             echo -e "\e[34mRunning rust benchmarks on dedicated machine fr1-spm15!\e[0m"
 
+            CRITERION_HOME=$(mktemp -d)
+            trap "rm -rf $CRITERION_HOME" INT TERM EXIT
+
             while IFS= read -r tgt; do
-                bazel run "$tgt"
+                bazel run "$tgt" -- --criterion-home "$CRITERION_HOME"
             done < <(bazel query "attr(tags, 'rust_bench', ${{ matrix.target }})")
 
             while IFS= read -r bench_dir; do
@@ -82,6 +85,6 @@ jobs:
                     >report.json
                 curl --fail --retry 2 -sS -o /dev/null -X POST -H 'Content-Type: application/json' --data @report.json \
                     "https://elasticsearch.testnet.dfinity.network/ci-performance-test/_doc"
-            done < <(find -L ./bazel-out -type d -path '*/new')
+            done < <(find -L "$CRITERION_HOME" -type d -path '*/new')
 
             echo -e "\e[34mRust benchmarks on dedicated machine fr1-spm15 finished.\e[0m"

Cargo.lock

@@ -683,14 +683,12 @@ ic-cdk-timers = "1.0.0"
 ic-certificate-verification = "3"
 ic-certification = "3"
 ic-doge-interface = { git = "https://github.com/dfinity/dogecoin-canister", rev = "74e6dc9a10ba64d2dbad013282c26d74cd49863f" }
-ic-ed25519 = "0.4.0"
 ic-gateway = { git = "https://github.com/dfinity/ic-gateway", rev = "92ee522a4514584ccf6de487ba40d92063effd9a", default-features = false }
 ic-http-certification = "3.0.3"
 ic-http-gateway = { git = "https://github.com/dfinity/http-gateway", rev = "c17ad1b378df3a85441ce2c6853ec61b6f83f730" }
 ic-identity-hsm = "0.40.1"
 ic-management-canister-types = "0.5.0"
 ic-response-verification = "3"
-ic-secp256k1 = "0.3.0"
 ic-sha3 = "1.0.0"
 ic-stable-structures = "0.6.8"
 ic-transport-types = { version = "0.40.1" }

Cargo.toml

@@ -2,6 +2,30 @@
 
 set -euo pipefail
 
+# criterion supports specifying a "home" where it places its benchmark result tree.
+# at the time of writing, our bazel version (.bazelversion) is outdated and sh_binary
+# does not support `env_inherit` so add (or rather intercept) a new CLI argument
+# `--criterion-home` which we convert into `CRITERION_HOME`, which is read by
+# criterion.rs.
+#
+# https://github.com/criterion-rs/criterion.rs/blob/950c3b727a09d10067ea686e2ac6f1f23569168f/src/lib.rs#L142-L142
+
+# store passthru args
+args=()
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        --criterion-home)
+            shift
+            export CRITERION_HOME="$1"
+            ;;
+        *)
+            # passthru
+            args+=("$1")
+            shift
+            ;;
+    esac
+done
+
 # When Cargo runs benchmarks, it passes the --bench or --test command-line arguments to
 # the benchmark executables. Criterion.rs looks for these arguments and tries to either
 # run benchmarks or run in test mode. In particular, when you run cargo test --benches
@@ -11,7 +35,7 @@ set -euo pipefail
 # present, or when --bench and --test are both present.
 #
 # https://bheisler.github.io/criterion.rs/book/faq.html#when-i-run-benchmark-executables-directly-without-using-cargo-they-just-print-success-why
-CMD="${BAZEL_DEFS_BENCH_PREFIX}${BAZEL_DEFS_BENCH_BIN} --bench $@"
+CMD="${BAZEL_DEFS_BENCH_PREFIX}${BAZEL_DEFS_BENCH_BIN} --bench ${args[@]}"
 
 echo "running ${CMD}"
 ${CMD}

bazel/generic_rust_bench.sh

@@ -84,12 +84,12 @@
     "sha256": "bce508df3db43b47b158c0aab9a7c9a3709a78e055a7ced76d5ff89832f9e778"
   },
   "governance": {
-    "rev": "724ae4101bfdd8d4443126a6a8b1ec5ca9b68a12",
-    "sha256": "f00255c9e776ee375c2846e310031219f154b75bc6bd6e1b1e3bb62e59a50b97"
+    "rev": "c9ab58bfd048522d56401b879ddb890626e111e5",
+    "sha256": "ba8493ec7bc2be6360e62c5e9297d7f4c548992d944185cf4e3508fb7b23da4d"
   },
   "governance-canister_test": {
-    "rev": "724ae4101bfdd8d4443126a6a8b1ec5ca9b68a12",
-    "sha256": "6069543d0fdcb35f1a757542844b811b1a5cffc1fe12d03986e49fc1adde12a1"
+    "rev": "c9ab58bfd048522d56401b879ddb890626e111e5",
+    "sha256": "94d064aaae624d159ece411533965a12794582bb78e089e221597337c1269cf3"
   },
   "index": {
     "rev": "3ae3649a2366aaca83404b692fc58e4c6e604a25",
@@ -112,16 +112,16 @@
     "sha256": "2bcf1c2c8adba6f7bff5e7abda164f22e0a8f6a07120fbe3596c94234727d04c"
   },
   "nns_dapp_test": {
-    "sha256": "ab640ac8df064da1c4b9feb3b9938b3cc0a8f578b702a34e99ca9a0e36da7b85",
-    "tag": "proposal-139482"
+    "sha256": "37935da32289fb7f42d5b166b1e858322a7144422eccd9b03c6081da51b878f3",
+    "tag": "proposal-139676"
   },
   "node-rewards": {
-    "rev": "a23bb5a4a5b8824bddf103c5fdcadbbae8d6ae05",
-    "sha256": "eefe64585ebba5283f6ad03eadff6600fdfd577e3c1f0854756b4bef1c6764aa"
+    "rev": "d2a13f0ecb29c96818d24076925d5da19ae61e93",
+    "sha256": "53cc70006aa957e655c28d30198ba945dffda4d71515954c4c7e596c0caede59"
   },
   "registry": {
-    "rev": "724ae4101bfdd8d4443126a6a8b1ec5ca9b68a12",
-    "sha256": "4842f2cb8fbe9b57d08edf5c66608be7a56eec27bced313c3ed194da263d36c0"
+    "rev": "c9ab58bfd048522d56401b879ddb890626e111e5",
+    "sha256": "c5ceecda0dbc8bc50d246ef0fa6aa93fb02138e09192533bb9ca150fd9e348ee"
   },
   "root": {
     "rev": "c558689f2aed7dbd745474a3cbda84ba0825b4a8",