Merge remote-tracking branch 'origin/no-wasm-opt' into moc-inline-wit…

…h-new-meter

Makefile

@@ -2,4 +2,3 @@ APPS = dapps collections crypto pub-sub heartbeat motoko
 
 all:
 	$(foreach test_dir,$(APPS),make -C $(test_dir) &&) true
-

collections/Makefile

@@ -1,32 +1,15 @@
-APP = collections
+include ../*.mk
 
 .PHONY: all motoko rust build perf
 all: build perf
 
 motoko:
-	set -e; \
-	cd motoko; \
-	envsubst < mops.template.toml > mops.toml; \
-	mops install; \
-	dfx canister create --all; \
-	dfx ledger fabricate-cycles --t 100 --canister $$(dfx identity get-wallet); \
-	dfx build; \
-	rm mops.toml; \
-	cd ..
+	$(call build_with_mops,motoko)
 
 rust:
-	set -e; \
-	cd rust; \
-	dfx canister create --all; \
-	dfx ledger fabricate-cycles --t 100 --canister $$(dfx identity get-wallet); \
-	dfx build; \
-	cd ..
+	$(call build,rust)
 
 build: motoko rust
 
 perf:
-	set -e; \
-	mkdir -p ../_out/$(APP); \
-	cp README.md ../_out/$(APP); \
-	cd ../_out/$(APP); \
-	ic-repl ../../$(APP)/perf.sh
+	$(call perf,collections,perf.sh)

crypto/Makefile

@@ -1,30 +1,15 @@
-APP = crypto
+include ../*.mk
 
 .PHONY: all motoko rust build perf
 all: build perf
 
 motoko:
-	set -e; \
-	cd motoko; \
-	envsubst < mops.template.toml > mops.toml; \
-	mops install; \
-	dfx canister create --all; \
-	dfx build; \
-	rm mops.toml; \
-	cd ..
+	$(call build_with_mops,motoko)
 
 rust:
-	set -e; \
-	cd rust; \
-	dfx canister create --all; \
-	dfx build; \
-	cd ..
+	$(call build,rust)
 
 build: motoko rust
 
 perf:
-	set -e; \
-	mkdir -p ../_out/$(APP); \
-	cp README.md ../_out/$(APP); \
-	cd ../_out/$(APP); \
-	ic-repl ../../$(APP)/perf.sh
+	$(call perf,crypto,perf.sh)

dapps/Makefile

@@ -1,26 +1,15 @@
-APP = dapps
+include ../*.mk
 
 .PHONY: all motoko rust build perf
 all: build perf
 
 motoko:
-	cd motoko; \
-	dfx canister create --all; \
-	dfx build; \
-	cd ..
+	$(call build,motoko)
 
 rust:
-	cd rust; \
-	dfx canister create --all; \
-	dfx build; \
-	cd ..
+	$(call build,rust)
 
 build: motoko rust
 
 perf:
-	set -e; \
-	mkdir -p ../_out/$(APP); \
-	cp README.md ../_out/$(APP); \
-	cd ../_out/$(APP); \
-	ic-repl ../../$(APP)/basic_dao.sh; \
-	ic-repl ../../$(APP)/nft.sh
+	$(call perf_two,dapps,basic_dao.sh,nft.sh)

heartbeat/Makefile

@@ -1,28 +1,15 @@
-APP = heartbeat
+include ../*.mk
 
 .PHONY: all motoko rust build perf
 all: build perf
 
 motoko:
-	cd motoko; \
-	envsubst < mops.template.toml > mops.toml; \
-	mops install; \
-	dfx canister create --all; \
-	dfx build; \
-	rm mops.toml; \
-	cd ..
+	$(call build_with_mops,motoko)
 
 rust:
-	cd rust; \
-	dfx canister create --all; \
-	dfx build; \
-	cd ..
+	$(call build,rust)
 
 build: motoko rust
 
 perf:
-	set -e; \
-	mkdir -p ../_out/$(APP); \
-	cp README.md ../_out/$(APP); \
-	cd ../_out/$(APP); \
-	ic-repl ../../$(APP)/perf.sh
+	$(call perf,heartbeat,perf.sh)

motoko/Makefile

@@ -1,23 +1,10 @@
-APP = motoko
+include ../*.mk
 
 .PHONY: all build perf
 all: build perf
 
 build:
-	envsubst < mops.template.toml > mops.toml; \
-	mops install; \
-	dfx canister create --all; \
-	dfx build; \
-	rm mops.toml; \
-	cd ..
+	$(call build_with_mops,motoko)
 
 perf:
-	set -e; \
-	mkdir -p ../_out/$(APP); \
-	cp README.md ../_out/$(APP); \
-	cd ../_out/$(APP); \
-	ic-repl ../../$(APP)/gc.sh; \
-	ic-repl ../../$(APP)/classes.sh
-
-clean:
-	rm *.wasm && rm mops.toml
+	$(call perf_two,motoko,gc.sh,classes.sh)

motoko/classes.sh

@@ -1,7 +1,7 @@
 #!ic-repl
 load "../prelude.sh";
 
-let class = wasm_profiling(".dfx/local/canisters/classes/classes.wasm");
+let class = wasm_profiling("motoko/.dfx/local/canisters/classes/classes.wasm");
 let map = install(class, encode (), null);
 
 let file = "README.md";

motoko/gc.sh

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

motoko/motoko/dfx.json

@@ -0,0 +1,54 @@
+{
+  "canisters": {
+    "classes": {
+      "type": "motoko",
+      "main": "src/Map.mo"
+    },
+    "default": {
+      "type": "custom",
+      "candid": "../../collections/rust/collection.did",
+      "wasm": "default.wasm",
+      "build": [
+        "sh -c '$(dfx cache show)/moc ../../collections/motoko/src/triemap.mo -o default.wasm --public-metadata candid:service $(mops sources)'"
+      ]
+    },
+    "copying": {
+      "type": "custom",
+      "candid": "../../collections/rust/collection.did",
+      "wasm": "copying.wasm",
+      "build": [
+        "sh -c '$(dfx cache show)/moc ../../collections/motoko/src/triemap.mo -o copying.wasm --public-metadata candid:service $(mops sources) --force-gc --copying-gc'"
+      ]
+    },
+    "compacting": {
+      "type": "custom",
+      "candid": "../../collections/rust/collection.did",
+      "wasm": "compacting.wasm",
+      "build": [
+        "sh -c '$(dfx cache show)/moc ../../collections/motoko/src/triemap.mo -o compacting.wasm --public-metadata candid:service $(mops sources) --force-gc --compacting-gc'"
+      ]
+    },
+    "generational": {
+      "type": "custom",
+      "candid": "../../collections/rust/collection.did",
+      "wasm": "generational.wasm",
+      "build": [
+        "sh -c '$(dfx cache show)/moc ../../collections/motoko/src/triemap.mo -o generational.wasm --public-metadata candid:service $(mops sources) --force-gc --generational-gc'"
+      ]
+    },
+    "incremental": {
+      "type": "custom",
+      "candid": "../../collections/rust/collection.did",
+      "wasm": "incremental.wasm",
+      "build": [
+        "sh -c '$(dfx cache show)/moc ../../collections/motoko/src/triemap.mo -o incremental.wasm --public-metadata candid:service $(mops sources) --force-gc --incremental-gc'"
+      ]
+    }
+  },
+  "defaults": {
+    "build": {
+      "packtool": "mops sources",
+      "args": ""
+    }
+  }
+}

pub-sub/Makefile

@@ -1,26 +1,15 @@
-APP = pub-sub
+include ../*.mk
 
 .PHONY: all motoko rust build perf
 all: build perf
 
 motoko:
-	cd motoko; \
-	dfx canister create --all; \
-	dfx build; \
-	cd ..
+	$(call build,motoko)
 
 rust:
-	cd rust; \
-	dfx canister create --all; \
-	dfx build; \
-	cd ..
+	$(call build,rust)
 
 build: motoko rust
 
 perf:
-	set -e; \
-	mkdir -p ../_out/$(APP); \
-	cp README.md ../_out/$(APP); \
-	cd ../_out/$(APP); \
-	ic-repl ../../$(APP)/motoko/perf.sh; \
-	ic-repl ../../$(APP)/rust/perf.sh
+	$(call perf_two,pub-sub,motoko/perf.sh,rust/perf.sh)

utils.mk

@@ -0,0 +1,45 @@
+define ic-wasm
+	echo "No Optimize!"
+endef
+
+define build_with_mops
+	set -e; \
+	cd $(1); \
+	envsubst < mops.template.toml > mops.toml; \
+	mops install; \
+	dfx canister create --all; \
+	dfx ledger fabricate-cycles --t 100 --canister $$(dfx identity get-wallet); \
+	dfx build; \
+	rm mops.toml; \
+	$(call ic-wasm,.dfx/local/canisters/); \
+	cd ..
+endef
+
+define build
+	set -e; \
+	cd $(1); \
+	dfx canister create --all; \
+	dfx ledger fabricate-cycles --t 100 --canister $$(dfx identity get-wallet); \
+	dfx build; \
+	$(call ic-wasm,.dfx/local/canisters/); \
+	cd ..
+endef
+
+define prepare_perf
+	mkdir -p ../_out/$(1); \
+	cp README.md ../_out/$(1); \
+	cd ../_out/$(1)
+endef
+
+define perf
+	set -e; \
+	$(call prepare_perf,$(1)); \
+	ic-repl ../../$(1)/$(2)
+endef
+
+define perf_two
+	set -e; \
+	$(call prepare_perf,$(1)); \
+	ic-repl ../../$(1)/$(2); \
+	ic-repl ../../$(1)/$(3)
+endef