Improve compilation time by disabling inlining instead of enabling outlining. Generate a non-asmjs version with even shorter loading times.

lovasoa · lovasoa · commit 8d5f15a3a499 · 2014-05-05T02:36:02.000+02:00
Performance is now very good in both Firefox and Chrome with the asm.js version.
With the non-asm version, firefox can take a few hundred ms to execute complex queries
diff --git a/GUI/gui.js b/GUI/gui.js
@@ -66,7 +66,7 @@ execBtn.addEventListener("click", execEditorContents, true);
 
 // Performance measurement functions
 var tictime;
-if (!performance) {performance = {now:Date.now}}
+if (!window.performance || !performance.now) {window.performance = {now:Date.now}}
 function tic () {tictime = performance.now()}
 function toc(msg) {
 	var dt = performance.now()-tictime;
diff --git a/GUI/index.html b/GUI/index.html
@@ -5,7 +5,6 @@
   <title>
     sql.js
   </title>
-  <script src="../js/sql.js"></script>
   <style>
 .CodeMirror {
   border: 1px solid #eee;
@@ -40,7 +39,11 @@
 <body>
 	<h1>Online SQL interpreter</h1>
 
-<br>
+<div id="loading">Loading sql.js...</div>
+<script src="../js/sql.js"></script>
+<script>document.getElementById('loading').style.display='none';</script>
+
+<main>
     <label for='commands'>Enter some SQL</label>
     <br>
 
@@ -75,6 +78,7 @@ <h1>Online SQL interpreter</h1>
 	<div id="error" class="error"></div>
 Result:
   <pre id="output"></pre>
+</main>
 
 <script src="codemirror/mode/sql/sql.js"></script>
 <script type="text/javascript" src="gui.js"></script>
diff --git a/Makefile b/Makefile
@@ -1,8 +1,7 @@
 # Need $(EMSCRIPTEN), for example run with        emmake make
 
 EMSCRIPTEN?=/usr/bin
-EMCC=$(EMSCRIPTEN)/emcc -s RESERVED_FUNCTION_POINTERS=2 -s OUTLINING_LIMIT=5500 --closure 1 -O3
-# -s INLINING_LIMIT=0
+EMCC=$(EMSCRIPTEN)/emcc -s RESERVED_FUNCTION_POINTERS=2  --closure 1 -O3 -s INLINING_LIMIT=10
 CC=clang -O2
 CFLAGS=-DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_DISABLE_LFS -DLONGDOUBLE_TYPE=double -DSQLITE_INT64_TYPE="long long int" -DSQLITE_THREADSAFE=0
 EXPORTED_FUNCTIONS="['_sqlite3_open', '_sqlite3_close', '_sqlite3_exec', '_sqlite3_free', '_sqlite3_column_count', ' _sqlite3_column_type', '_sqlite3_column_text', '_sqlite3_column_double', '_sqlite3_prepare_v2', '_sqlite3_step']"
@@ -11,7 +10,10 @@ EXPORTED_FUNCTIONS="['_sqlite3_open', '_sqlite3_close', '_sqlite3_exec', '_sqlit
 all: js/sql.js test/benchmark.js test/benchmark
 
 js/sql.js: c/sqlite3.bc js/pre.js js/post.js
-	$(EMCC) $(CFLAGS) c/sqlite3.c --pre-js js/pre.js --post-js js/post.js -o js/sql.js -s EXPORTED_FUNCTIONS=$(EXPORTED_FUNCTIONS)
+	$(EMCC) -s ASM_JS=1 $(CFLAGS) c/sqlite3.c --pre-js js/pre.js --post-js js/post.js -o js/sql.js -s EXPORTED_FUNCTIONS=$(EXPORTED_FUNCTIONS)
+
+js/sql-faststart.js: c/sqlite3.bc js/pre.js js/post.js
+	$(EMCC) -s ASM_JS=2 $(CFLAGS) c/sqlite3.c --pre-js js/pre.js --post-js js/post.js -o js/sql-faststart.js -s EXPORTED_FUNCTIONS=$(EXPORTED_FUNCTIONS)
 
 c/sqlite3.bc: c/sqlite3.c
 	# Generate llvm bitcode
diff --git a/js/sql.js b/js/sql.js
