improve performance, update benchmarks

mbasso · May 22, 2018 · 7d87523 · 7d87523
1 parent 0191265
commit 7d87523
Show file tree

Hide file tree

Showing 20 changed files with 50 additions and 42 deletions.
diff --git a/benchmarks/README.md b/benchmarks/README.md
@@ -22,6 +22,18 @@ There are 4 tests at the moment:
 
 - `add/remove nodes`: this test runs the `patch` function 100 times with 2 nodes, one with 100 children and one without children.
 
-Here you can find screenshots of the tests (lower is better) runned on a MacBook Pro (Retina, 13-inch, Late 2013), Processor 2,4 GHz Intel Core i5, Memory 8 GB 1600 MHz DDR3:
+Here you can find the tests (lower is better) runned on a MacBook Pro (Retina, 13-inch, Late 2013), Processor 2,4 GHz Intel Core i5, Memory 8 GB 1600 MHz DDR3:
 
-![Benchmarks](benchmarks.jpg)
+### Firefox 59.0.2 (64 bit)
+
+| library | create nodes | diff equal nodes | diff different nodes | add/remove nodes |
+| --- | --- | --- | --- | --- |
+| asm-dom | 0.0000 | 2.0000 | 34.0000 | 32.0000 |
+| snabbbom | 0.0000 | 12.0000 | 42.0000 | 44.0000 |
+
+### Chrome 66.0.3359.181 (64-bit)
+
+| library | create nodes | diff equal nodes | diff different nodes | add/remove nodes |
+| --- | --- | --- | --- | --- |
+| asm-dom | 0.9000 | 3.2000 | 16.4000 | 15.1000 |
+| snabbbom | 0.5000 | 4.6000 | 8.7000 | 13.3000 |
diff --git a/benchmarks/benchmarks.jpg b/benchmarks/benchmarks.jpg
diff --git a/benchmarks/compiled/app.bc b/benchmarks/compiled/app.bc
diff --git a/benchmarks/compiled/asmjs/app.asm.js b/benchmarks/compiled/asmjs/app.asm.js
diff --git a/benchmarks/compiled/wasm/app.js b/benchmarks/compiled/wasm/app.js
diff --git a/benchmarks/compiled/wasm/app.wasm b/benchmarks/compiled/wasm/app.wasm
diff --git a/compiled/asm-dom.a b/compiled/asm-dom.a
diff --git a/compiled/asm-dom.bc b/compiled/asm-dom.bc
diff --git a/compiled/asm-dom.o b/compiled/asm-dom.o
diff --git a/compiled/asmjs/asm-dom.asm.js b/compiled/asmjs/asm-dom.asm.js
diff --git a/compiled/wasm/asm-dom.js b/compiled/wasm/asm-dom.js
diff --git a/compiled/wasm/asm-dom.wasm b/compiled/wasm/asm-dom.wasm
diff --git a/cpp/Patch/patch.cpp b/cpp/Patch/patch.cpp
@@ -32,7 +32,7 @@ namespace asmdom {
 	bool sameVNode(const VNode* __restrict__ const vnode1, const VNode* __restrict__ const vnode2) {
 		return
 			// compare selector, nodeType and key existance
-			(vnode1->hash & id) == (vnode2->hash & id) &&
+			((vnode1->hash & id) == (vnode2->hash & id)) &
 			// compare keys
 			(!(vnode1->hash & hasKey) || vnode1->key == vnode2->key);
 	};
@@ -86,12 +86,9 @@ namespace asmdom {
 		const std::vector<VNode*>::size_type endIdx
 	) {
 		while (startIdx <= endIdx) {
-			VNode* const vnode = vnodes[startIdx++];
-			if (vnode) {
-				EM_ASM_({
-					Module.insertBefore($0, $1, $2)
-				}, parentElm, createElm(vnode), before);
-			}
+			EM_ASM_({
+				Module.insertBefore($0, $1, $2)
+			}, parentElm, createElm(vnodes[startIdx++]), before);
 		}
 	};
 
@@ -104,18 +101,19 @@ namespace asmdom {
 			VNode* const vnode = vnodes[startIdx++];
 
 			if (vnode) {
-				EM_ASM_({
-					Module.removeChild($0);
-				}, vnode->elm);
-
 				#ifdef ASMDOM_JS_SIDE
 					EM_ASM_({
-						var data = window['asmDomHelpers']['vnodesData'][$0];
+						Module.removeChild($0);
+						var data = window['asmDomHelpers']['vnodesData'][$1];
 						if (data !== undefined && data['ref'] !== undefined) {
 							data['ref'](null);
 						}
-					}, reinterpret_cast<std::uintptr_t>(vnode));
+					}, vnode->elm, reinterpret_cast<std::uintptr_t>(vnode));
 				#else
+					EM_ASM_({
+						Module.removeChild($0);
+					}, vnode->elm);
+
 					if (vnode->hash & hasRef) {
 						vnode->data.callbacks["ref"](
 							emscripten::val::null()

diff --git a/dist/js/0.asm-dom.js b/dist/js/0.asm-dom.js
diff --git a/dist/js/0.asm-dom.js.br b/dist/js/0.asm-dom.js.br
diff --git a/dist/js/0.asm-dom.js.gz b/dist/js/0.asm-dom.js.gz
diff --git a/dist/js/1.asm-dom.js b/dist/js/1.asm-dom.js
diff --git a/dist/js/1.asm-dom.js.br b/dist/js/1.asm-dom.js.br
diff --git a/dist/js/1.asm-dom.js.gz b/dist/js/1.asm-dom.js.gz
diff --git a/src/cpp/Patch/patch.cpp b/src/cpp/Patch/patch.cpp
@@ -32,7 +32,7 @@ namespace asmdom {
 	bool sameVNode(const VNode* __restrict__ const vnode1, const VNode* __restrict__ const vnode2) {
 		return
 			// compare selector, nodeType and key existance
-			(vnode1->hash & id) == (vnode2->hash & id) &&
+			((vnode1->hash & id) == (vnode2->hash & id)) &
 			// compare keys
 			(!(vnode1->hash & hasKey) || vnode1->key == vnode2->key);
 	};
@@ -86,12 +86,9 @@ namespace asmdom {
 		const std::vector<VNode*>::size_type endIdx
 	) {
 		while (startIdx <= endIdx) {
-			VNode* const vnode = vnodes[startIdx++];
-			if (vnode) {
-				EM_ASM_({
-					Module.insertBefore($0, $1, $2)
-				}, parentElm, createElm(vnode), before);
-			}
+			EM_ASM_({
+				Module.insertBefore($0, $1, $2)
+			}, parentElm, createElm(vnodes[startIdx++]), before);
 		}
 	};
 
@@ -104,18 +101,19 @@ namespace asmdom {
 			VNode* const vnode = vnodes[startIdx++];
 
 			if (vnode) {
-				EM_ASM_({
-					Module.removeChild($0);
-				}, vnode->elm);
-
 				#ifdef ASMDOM_JS_SIDE
 					EM_ASM_({
-						var data = window['asmDomHelpers']['vnodesData'][$0];
+						Module.removeChild($0);
+						var data = window['asmDomHelpers']['vnodesData'][$1];
 						if (data !== undefined && data['ref'] !== undefined) {
 							data['ref'](null);
 						}
-					}, reinterpret_cast<std::uintptr_t>(vnode));
+					}, vnode->elm, reinterpret_cast<std::uintptr_t>(vnode));
 				#else
+					EM_ASM_({
+						Module.removeChild($0);
+					}, vnode->elm);
+
 					if (vnode->hash & hasRef) {
 						vnode->data.callbacks["ref"](
 							emscripten::val::null()