bump ic-repl

.github/workflows/perf.yml

@@ -11,10 +11,11 @@ jobs:
     strategy:
       fail-fast: false
     env:
-      DFX_VERSION: 0.15.0
+      DFX_VERSION: 0.15.1
       IC_REPL_VERSION: 0.5.0
       MOC_VERSION: 0.10.0
       IC_WASM_VERSION: 0.5.1
+      RUSTC_VERSION: 1.72.1
     steps:
       - uses: actions/checkout@v3
       - name: Checkout out gh-pages report
@@ -32,7 +33,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: stable
+          toolchain: ${{ env.RUSTC_VERSION }}
           override: true
           target: wasm32-unknown-unknown
       - name: Cache cargo build
@@ -58,9 +59,7 @@ jobs:
       - name: Install ic-repl, mops, dfx, and moc
         run: |
           echo y | DFX_VERSION=$DFX_VERSION bash -ci "$(curl -fsSL https://smartcontracts.org/install.sh)"
-          wget https://github.com/chenyan2002/ic-repl/releases/download/$IC_REPL_VERSION/ic-repl-linux64
-          cp ./ic-repl-linux64 /usr/local/bin/ic-repl
-          chmod a+x /usr/local/bin/ic-repl
+          cargo install --git https://github.com/dfinity/ic-repl.git --branch new-meter
           npm i -g ic-mops
           dfx cache install
           cd $(dfx cache show)
@@ -82,7 +81,9 @@ jobs:
           dfx stop
           dfx start --clean --background
       - name: Run perf
-        run: make
+        run: |
+          make
+          make emit_version
       - name: Generate table
         if: github.event_name == 'pull_request'
         env:

Makefile

@@ -2,3 +2,13 @@ APPS = dapps collections crypto pub-sub heartbeat motoko
 
 all:
 	$(foreach test_dir,$(APPS),make -C $(test_dir) &&) true
+
+emit_version:
+	for f in _out/*/README.md; do \
+	  echo "\n> ## Environment" >> $$f; \
+	  (printf "> * "; dfx --version) >> $$f; \
+	  (printf "> * "; $$(dfx cache show)/moc --version) >> $$f; \
+	  (printf "> * "; rustc --version) >> $$f; \
+	  (printf "> * "; ic-repl --version) >> $$f; \
+	  (printf "> * "; ic-wasm --version) >> $$f; \
+	done

collections/perf.sh

@@ -1,24 +1,26 @@
 #!ic-repl
 load "../prelude.sh";
 
-let hashmap = wasm_profiling("motoko/.dfx/local/canisters/hashmap/hashmap.wasm", record { start_page = 16 });
-let triemap = wasm_profiling("motoko/.dfx/local/canisters/triemap/triemap.wasm", record { start_page = 16 });
-let rbtree = wasm_profiling("motoko/.dfx/local/canisters/rbtree/rbtree.wasm", record { start_page = 16 });
-let splay = wasm_profiling("motoko/.dfx/local/canisters/splay/splay.wasm", record { start_page = 16 });
-let btree = wasm_profiling("motoko/.dfx/local/canisters/btreemap/btreemap.wasm", record { start_page = 16 });
-let zhenya = wasm_profiling("motoko/.dfx/local/canisters/zhenya_hashmap/zhenya_hashmap.wasm", record { start_page = 16 });
-let heap = wasm_profiling("motoko/.dfx/local/canisters/heap/heap.wasm", record { start_page = 16 });
-let buffer = wasm_profiling("motoko/.dfx/local/canisters/buffer/buffer.wasm", record { start_page = 16 });
-let vector = wasm_profiling("motoko/.dfx/local/canisters/vector/vector.wasm", record { start_page = 16 });
-
-let hashmap_rs = wasm_profiling("rust/.dfx/local/canisters/hashmap/hashmap.wasm", record { start_page = 1 });
-let btreemap_rs = wasm_profiling("rust/.dfx/local/canisters/btreemap/btreemap.wasm", record { start_page = 1 });
-let btreemap_stable_rs = wasm_profiling("rust/.dfx/local/canisters/btreemap_stable/btreemap_stable.wasm", record { start_page = 1 });
-let heap_rs = wasm_profiling("rust/.dfx/local/canisters/heap/heap.wasm", record { start_page = 1 });
-let heap_stable_rs = wasm_profiling("rust/.dfx/local/canisters/heap_stable/heap_stable.wasm", record { start_page = 1 });
-let imrc_hashmap_rs = wasm_profiling("rust/.dfx/local/canisters/imrc_hashmap/imrc_hashmap.wasm", record { start_page = 1 });
-let vector_rs = wasm_profiling("rust/.dfx/local/canisters/vector/vector.wasm", record { start_page = 1 });
-let vector_stable_rs = wasm_profiling("rust/.dfx/local/canisters/vector_stable/vector_stable.wasm", record { start_page = 1 });
+let mo_config = record { start_page = 16; page_limit = 1024 };
+let hashmap = wasm_profiling("motoko/.dfx/local/canisters/hashmap/hashmap.wasm", mo_config);
+let triemap = wasm_profiling("motoko/.dfx/local/canisters/triemap/triemap.wasm", mo_config);
+let rbtree = wasm_profiling("motoko/.dfx/local/canisters/rbtree/rbtree.wasm", mo_config);
+let splay = wasm_profiling("motoko/.dfx/local/canisters/splay/splay.wasm", mo_config);
+let btree = wasm_profiling("motoko/.dfx/local/canisters/btreemap/btreemap.wasm", mo_config);
+let zhenya = wasm_profiling("motoko/.dfx/local/canisters/zhenya_hashmap/zhenya_hashmap.wasm", mo_config);
+let heap = wasm_profiling("motoko/.dfx/local/canisters/heap/heap.wasm", mo_config);
+let buffer = wasm_profiling("motoko/.dfx/local/canisters/buffer/buffer.wasm", mo_config);
+let vector = wasm_profiling("motoko/.dfx/local/canisters/vector/vector.wasm", mo_config);
+
+let rs_config = record { start_page = 1; page_limit = 1024 };
+let hashmap_rs = wasm_profiling("rust/.dfx/local/canisters/hashmap/hashmap.wasm", rs_config);
+let btreemap_rs = wasm_profiling("rust/.dfx/local/canisters/btreemap/btreemap.wasm", rs_config);
+let btreemap_stable_rs = wasm_profiling("rust/.dfx/local/canisters/btreemap_stable/btreemap_stable.wasm", rs_config);
+let heap_rs = wasm_profiling("rust/.dfx/local/canisters/heap/heap.wasm", rs_config);
+let heap_stable_rs = wasm_profiling("rust/.dfx/local/canisters/heap_stable/heap_stable.wasm", rs_config);
+let imrc_hashmap_rs = wasm_profiling("rust/.dfx/local/canisters/imrc_hashmap/imrc_hashmap.wasm", rs_config);
+let vector_rs = wasm_profiling("rust/.dfx/local/canisters/vector/vector.wasm", rs_config);
+let vector_stable_rs = wasm_profiling("rust/.dfx/local/canisters/vector_stable/vector_stable.wasm", rs_config);
 
 //let movm_rs = wasm_profiling("rust/.dfx/local/canisters/movm/movm.wasm");
 //let movm_dynamic_rs = wasm_profiling("rust/.dfx/local/canisters/movm_dynamic/movm_dynamic.wasm");
@@ -60,9 +62,9 @@ function perf(wasm, title, init, batch) {
   uninstall(cid);
 };
 
-let init_size = 1_000_000;
+let init_size = 500_000;
 let batch_size = 50;
-output(file, "\n## Map\n\n| |binary_size|generate 1m|max mem|batch_get 50|batch_put 50|batch_remove 50|upgrade|\n|--:|--:|--:|--:|--:|--:|--:|--:|\n");
+output(file, "\n## Map\n\n| |binary_size|generate 500k|max mem|batch_get 50|batch_put 50|batch_remove 50|upgrade|\n|--:|--:|--:|--:|--:|--:|--:|--:|\n");
 perf(hashmap, "hashmap", init_size, batch_size);
 perf(triemap, "triemap", init_size, batch_size);
 perf(rbtree, "rbtree", init_size, batch_size);
@@ -73,7 +75,7 @@ perf(btreemap_rs, "btreemap_rs", init_size, batch_size);
 perf(imrc_hashmap_rs, "imrc_hashmap_rs", init_size, batch_size);
 perf(hashmap_rs, "hashmap_rs", init_size, batch_size);
 
-output(file, "\n## Priority queue\n\n| |binary_size|heapify 1m|max mem|pop_min 50|put 50|pop_min 50|upgrade|\n|--:|--:|--:|--:|--:|--:|--:|--:|\n");
+output(file, "\n## Priority queue\n\n| |binary_size|heapify 500k|max mem|pop_min 50|put 50|pop_min 50|upgrade|\n|--:|--:|--:|--:|--:|--:|--:|--:|\n");
 perf(heap, "heap", init_size, batch_size);
 perf(heap_rs, "heap_rs", init_size, batch_size);
 

motoko/gc.sh

@@ -1,11 +1,11 @@
 #!ic-repl
 load "../prelude.sh";
 
-let default = wasm_profiling("motoko/default.wasm", record { trace_only_funcs = vec{"schedule_copying_gc"} });
-let copying = wasm_profiling("motoko/copying.wasm", record { trace_only_funcs = vec {"copying_gc"} });
-let compacting = wasm_profiling("motoko/compacting.wasm", record { trace_only_funcs = vec{"compacting_gc"} });
-let generational = wasm_profiling("motoko/generational.wasm", record { trace_only_funcs = vec{"generational_gc"} });
-let incremental = wasm_profiling("motoko/incremental.wasm", record { trace_only_funcs = vec{"incremental_gc"} });
+let default = wasm_profiling("motoko/default.wasm", record { trace_only_funcs = vec{"schedule_copying_gc"}; start_page = 16; page_limit = 1024 });
+let copying = wasm_profiling("motoko/copying.wasm", record { trace_only_funcs = vec {"copying_gc"}; start_page = 16; page_limit = 1024 });
+let compacting = wasm_profiling("motoko/compacting.wasm", record { trace_only_funcs = vec{"compacting_gc"}; start_page = 16; page_limit = 1024 });
+let generational = wasm_profiling("motoko/generational.wasm", record { trace_only_funcs = vec{"generational_gc"}; start_page = 16; page_limit = 1024 });
+let incremental = wasm_profiling("motoko/incremental.wasm", record { trace_only_funcs = vec{"incremental_gc"}; start_page = 16; page_limit = 1024 });
 
 let file = "README.md";
 output(file, "\n\n## Garbage Collection\n\n| |generate 700k|max mem|batch_get 50|batch_put 50|batch_remove 50|\n|--:|--:|--:|--:|--:|--:|\n");

utils/motoko/Profiling.mo

@@ -3,7 +3,7 @@ import Region "mo:base/Region";
 module {
     public func init() : Region.Region {
         let profiling = Region.new();
-        ignore Region.grow(profiling, 32);
+        ignore Region.grow(profiling, 1024);
         profiling;
     };
 }

utils/rust/src/lib.rs

@@ -64,7 +64,7 @@ pub fn get_upgrade_memory() -> Memory {
 
 pub fn profiling_init() {
     let memory = MEMORY_MANAGER.with(|m| m.borrow().get(PROFILING));
-    memory.grow(32);
+    memory.grow(1024);
 }
 
 pub fn save_stable<T: CandidType>(val: &T) {