ic-mops 2.2.0 → 2.2.1

package/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Next
 
+## 2.2.1
+- Fix `mops toolchain` when toolchain version is a local file path with subdirectories.
+
 ## 2.2.0
 - Add `[moc]` config section for global `moc` compiler flags (applied to `check`, `build`, `test`, `bench`, `watch`)
 - Add `mops moc-args` command to print global `moc` flags from `[moc]` config section

package/bundle/bench/bench-canister.mo

@@ -0,0 +1,130 @@
+import Nat64 "mo:core/Nat64";
+import Nat "mo:core/Nat";
+import Runtime "mo:core/Runtime";
+import InternetComputer "mo:core/InternetComputer";
+import Region "mo:core/Region";
+import Prim "mo:prim";
+
+import UserBench "./user-bench"; // file path will be replaced with the *.bench.mo file path
+
+persistent actor class () {
+  type BenchSchema = {
+    name : Text;
+    description : Text;
+    rows : [Text];
+    cols : [Text];
+  };
+
+  type Bench = {
+    getVersion : () -> Nat;
+    getSchema : () -> BenchSchema;
+    runCell : (Nat, Nat) -> ();
+  };
+
+  type BenchResult = {
+    instructions : Int;
+    rts_mutator_instructions : Int;
+    stable_memory_size : Int;
+    rts_stable_memory_size : Int;
+    rts_logical_stable_memory_size : Int;
+    rts_collector_instructions : Int;
+    rts_heap_size : Int;
+    rts_memory_size : Int;
+    rts_total_allocation : Int;
+    rts_reclaimed : Int;
+  };
+
+  transient var benchOpt : ?Bench = null;
+
+  public func init() : async BenchSchema {
+    let bench = UserBench.init();
+    benchOpt := ?bench;
+    ignore Region.grow(Region.new(), 1);
+    bench.getSchema();
+  };
+
+  public query func getSchema() : async BenchSchema {
+    let ?bench = benchOpt else Runtime.trap("bench not initialized");
+    bench.getSchema();
+  };
+
+  func _getStats() : BenchResult {
+    {
+      instructions = 0;
+      rts_heap_size = Prim.rts_heap_size();
+      stable_memory_size = Prim.rts_stable_memory_size() * 65536;
+      rts_stable_memory_size = Prim.rts_stable_memory_size();
+      rts_logical_stable_memory_size = Prim.rts_logical_stable_memory_size();
+      rts_memory_size = Prim.rts_memory_size();
+      rts_total_allocation = Prim.rts_total_allocation();
+      rts_reclaimed = Prim.rts_reclaimed();
+      rts_mutator_instructions = Prim.rts_mutator_instructions();
+      rts_collector_instructions = Prim.rts_collector_instructions();
+    };
+  };
+
+  func _diffStats(before : BenchResult, after : BenchResult) : BenchResult {
+    {
+      instructions = after.instructions - before.instructions;
+      rts_heap_size = after.rts_heap_size - before.rts_heap_size;
+      stable_memory_size = after.stable_memory_size - before.stable_memory_size;
+      rts_stable_memory_size = after.rts_stable_memory_size - before.rts_stable_memory_size;
+      rts_logical_stable_memory_size = after.rts_logical_stable_memory_size - before.rts_logical_stable_memory_size;
+      rts_memory_size = after.rts_memory_size - before.rts_memory_size;
+      rts_total_allocation = after.rts_total_allocation - before.rts_total_allocation;
+      rts_reclaimed = after.rts_reclaimed - before.rts_reclaimed;
+      rts_mutator_instructions = after.rts_mutator_instructions - before.rts_mutator_instructions;
+      rts_collector_instructions = after.rts_collector_instructions - before.rts_collector_instructions;
+    };
+  };
+
+  func _runCell(rowIndex : Nat, colIndex : Nat) : BenchResult {
+    let ?bench = benchOpt else Runtime.trap("bench not initialized");
+    let statsBefore = _getStats();
+
+    let instructions = Nat64.toNat(
+      InternetComputer.countInstructions(
+        func() {
+          bench.runCell(rowIndex, colIndex);
+        }
+      )
+    );
+
+    let statsAfter = _getStats();
+    _diffStats(statsBefore, { statsAfter with instructions });
+  };
+
+  func _runCellAwait(rowIndex : Nat, colIndex : Nat) : async BenchResult {
+    let ?bench = benchOpt else Runtime.trap("bench not initialized");
+    let statsBefore = _getStats();
+
+    let instructions = Nat64.toNat(
+      InternetComputer.countInstructions(
+        func() {
+          bench.runCell(rowIndex, colIndex);
+        }
+      )
+    );
+
+    await (func() : async () {})();
+
+    let statsAfter = _getStats();
+    _diffStats(statsBefore, { statsAfter with instructions });
+  };
+
+  public query func getStats() : async BenchResult {
+    _getStats();
+  };
+
+  public query func runCellQuery(rowIndex : Nat, colIndex : Nat) : async BenchResult {
+    _runCell(rowIndex, colIndex);
+  };
+
+  public func runCellUpdate(rowIndex : Nat, colIndex : Nat) : async BenchResult {
+    _runCell(rowIndex, colIndex);
+  };
+
+  public func runCellUpdateAwait(rowIndex : Nat, colIndex : Nat) : async BenchResult {
+    await _runCellAwait(rowIndex, colIndex);
+  };
+};

package/bundle/bench/user-bench.mo

@@ -0,0 +1,10 @@
+import Bench "mo:bench";
+
+// placeholder file that will be replaced with the *.bench.mo file
+module {
+  public func init() : Bench.Bench {
+    let bench = Bench.Bench();
+    // benchmark code goes here...
+    bench;
+  };
+};

package/bundle/bin/moc-wrapper.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# set -e
+
+findRootDir() {
+  dir="$(pwd)"
+  while [[ "$dir" != "" && ! -e "$dir/mops.toml" ]]; do
+    dir=${dir%/*}
+  done
+  echo "$dir"
+}
+
+rootDir=$(findRootDir)
+mopsToml="$rootDir/mops.toml"
+
+if [[ $rootDir == "" ]] || [[ ! -f $mopsToml ]]; then
+  mocPath="$(mops toolchain bin moc --fallback)"
+else
+  if command -v openssl >/dev/null 2>&1; then
+    mopsTomlHash=$(openssl sha256 $mopsToml | awk -F'= ' '{print $2}')
+  else
+    mopsTomlHash=$(shasum $mopsToml -a 256 | awk -F' ' '{print $1}')
+  fi;
+
+  cached="$rootDir/.mops/moc-$(uname -n)-$mopsTomlHash"
+
+  if [ -f $cached ]; then
+    mocPath=$(cat $cached)
+    if [[ "$mocPath" != *"/moc" ]] ; then
+      mocPath="$(mops toolchain bin moc --fallback)"
+      echo -n $mocPath > "$cached"
+    fi;
+  else
+    mkdir -p "$(dirname $cached)"
+    mocPath="$(mops toolchain bin moc --fallback)"
+    echo -n $mocPath > "$cached"
+  fi;
+fi;
+
+$mocPath "$@"

package/bundle/bin/mops.js

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+import "../cli.js";