Merge branch 'p-rcook-duplicate-function-elimination' of https://github.com/rcook/emscripten into incoming

Author: kripken

AUTHORS

@@ -232,4 +232,6 @@ a license to everyone to use it as detailed in LICENSE.)
 * Nick Shin <[email protected]>
 * Gregg Tavares <[email protected]>
 * Tanner Rogalsky <[email protected]>
-
+* Richard Cook <[email protected]> (copyright owned by Tableau Software, Inc.)
+* Arnab Choudhury <[email protected]> (copyright owned by Tableau Software, Inc.)
+* Charles Vaughn <[email protected]> (copyright owned by Tableau Software, Inc.)

emcc.py

@@ -1634,6 +1634,11 @@ def do_minify(): # minifies the code. this is also when we do certain optimizati
         else:
           JSOptimizer.queue += ['registerize']
 
+      # NOTE: Important that this comes after registerize/registerizeHarder
+      if shared.Settings.ELIMINATE_DUPLICATE_FUNCTIONS and opt_level >= 2:
+        JSOptimizer.flush()
+        shared.Building.eliminate_duplicate_funcs(final)
+
       if not shared.Settings.EMTERPRETIFY:
         do_minify()
 

src/settings.js

@@ -681,4 +681,9 @@ var PTHREADS_PROFILING = 0; // True when building with --threadprofiler
 
 var MAX_GLOBAL_ALIGN = -1; // received from the backend
 
+// Duplicate function elimination
+var ELIMINATE_DUPLICATE_FUNCTIONS = 0; // disabled by default
+var ELIMINATE_DUPLICATE_FUNCTIONS_PASSES = 5;
+var ELIMINATE_DUPLICATE_FUNCTIONS_DUMP_EQUIVALENT_FUNCTIONS = 0;
+
 // Reserved: variables containing POINTER_MASKING.

tests/optimizer/test-function-eliminator-double-parsed-correctly-output.js

@@ -0,0 +1,14 @@
+// EMSCRIPTEN_START_ASM
+var asm = (function(global, env, buffer) {
+ "use asm";
+ var e = 0;
+ 
+// EMSCRIPTEN_START_FUNCS
+function a() {
+ var c = 0.0;
+ return 0;
+}
+// EMSCRIPTEN_END_FUNCS
+ var f = 0;
+})(Module.asmGlobalArg, Module.asmLibraryArg, buffer);
+// EMSCRIPTEN_END_ASM

tests/optimizer/test-function-eliminator-double-parsed-correctly.js

@@ -0,0 +1,22 @@
+// EMSCRIPTEN_START_ASM
+var asm = (function(global, env, buffer) {
+ "use asm";
+ var e = 0;
+ 
+// EMSCRIPTEN_START_FUNCS
+ function a() {
+  var c = +0;
+  return 0;
+ }
+ function b() {
+  var c = +0;
+  return 0;
+ }
+// EMSCRIPTEN_END_FUNCS
+ var f = 0;
+})(Module.asmGlobalArg, Module.asmLibraryArg, buffer);
+// EMSCRIPTEN_END_ASM
+// EMSCRIPTEN_GENERATED_FUNCTIONS
+
+
+

tests/optimizer/test-function-eliminator-replace-array-value-output.js

@@ -0,0 +1,25 @@
+// EMSCRIPTEN_START_ASM
+var asm = (function(global, env, buffer) {
+ "use asm";
+ 
+// EMSCRIPTEN_START_FUNCS
+function d() {
+ a();
+ e();
+ return;
+}
+
+function c() {
+ a();
+ return;
+}
+
+function a() {
+ return 0;
+}
+
+// EMSCRIPTEN_END_FUNCS
+
+ var f = [ a ];
+})(Module.asmGlobalArg, Module.asmLibraryArg, buffer);
+// EMSCRIPTEN_END_ASM

tests/optimizer/test-function-eliminator-replace-array-value-with-hash-info.js

@@ -0,0 +1,32 @@
+var asm = (function(global, env, buffer) {
+"use asm";
+function a()
+{
+return 0;
+}
+
+function b()
+{
+return 0;
+}
+
+function c()
+{
+  a();
+  return;
+}
+
+function d()
+{
+  b();
+  
+  // We expect that b gets replaced by a below
+  var f = [b];
+  e();
+
+  return;
+}
+
+})(Module.asmGlobalArg, Module.asmLibraryArg, buffer);
+
+// {"b":"a"}

tests/optimizer/test-function-eliminator-replace-array-value.js

@@ -0,0 +1,23 @@
+// EMSCRIPTEN_START_ASM
+var asm = (function(global, env, buffer) {
+ "use asm";
+// EMSCRIPTEN_START_FUNCS
+ function a() {
+  return 0;
+ }
+ function b() {
+  return 0;
+ }
+ function c() {
+  a();
+  return;
+ }
+ function d() {
+  b();
+  e();
+  return;
+ }
+// EMSCRIPTEN_END_FUNCS
+  var f = [ b ];
+})(Module.asmGlobalArg, Module.asmLibraryArg, buffer);
+// EMSCRIPTEN_END_ASM

tests/optimizer/test-function-eliminator-replace-function-call-output-with-hash-info.js

@@ -0,0 +1,22 @@
+var asm = (function(global, env, buffer) {
+"use asm";
+function a()
+{
+return 0;
+}
+
+function c()
+{
+  a();
+  return;
+}
+
+function d()
+{
+  a();
+  return;
+}
+
+})(Module.asmGlobalArg, Module.asmLibraryArg, buffer);
+
+// {"d":"c"}

tests/optimizer/test-function-eliminator-replace-function-call-output.js

@@ -0,0 +1,14 @@
+var asm = (function(global, env, buffer) {
+ "use asm";
+ function a() {
+  return 0;
+ }
+ function c() {
+  a();
+  return;
+ }
+ function d() {
+  a();
+  return;
+ }
+})(Module.asmGlobalArg, Module.asmLibraryArg, buffer);

tests/optimizer/test-function-eliminator-replace-function-call-two-passes-output.js

@@ -0,0 +1,10 @@
+var asm = (function(global, env, buffer) {
+ "use asm";
+ function a() {
+  return 0;
+ }
+ function c() {
+  a();
+  return;
+ }
+})(Module.asmGlobalArg, Module.asmLibraryArg, buffer);

tests/optimizer/test-function-eliminator-replace-function-call-with-hash-info.js

@@ -0,0 +1,27 @@
+var asm = (function(global, env, buffer) {
+"use asm";
+function a()
+{
+return 0;
+}
+
+function b()
+{
+return 0;
+}
+
+function c()
+{
+  a();
+  return;
+}
+
+function d()
+{
+  b();
+  return;
+}
+
+})(Module.asmGlobalArg, Module.asmLibraryArg, buffer);
+
+// {"b":"a"}

tests/optimizer/test-function-eliminator-replace-function-call.js

@@ -0,0 +1,20 @@
+var asm = (function(global, env, buffer) {
+ "use asm";
+ function a() {
+  return 0;
+ }
+ function b() {
+  return 0;
+ }
+ function c() {
+  a();
+  return;
+ }
+ function d() {
+  b();
+  return;
+ }
+})(Module.asmGlobalArg, Module.asmLibraryArg, buffer);
+
+
+

tests/optimizer/test-function-eliminator-replace-object-value-assignment-output.js

@@ -0,0 +1,18 @@
+var asm = (function(global, env, buffer) {
+ "use asm";
+ function a() {
+  return 0;
+ }
+ function c() {
+  a();
+  return;
+ }
+ function d() {
+  a();
+  var f = {
+   g: a
+  };
+  e();
+  return;
+ }
+})(Module.asmGlobalArg, Module.asmLibraryArg, buffer);

tests/optimizer/test-function-eliminator-replace-object-value-assignment-with-hash-info.js

@@ -0,0 +1,34 @@
+var asm = (function(global, env, buffer) {
+"use asm";
+function a()
+{
+return 0;
+}
+
+function b()
+{
+return 0;
+}
+
+function c()
+{
+  a();
+  return;
+}
+
+function d()
+{
+  b();
+  
+  // We expect that b gets replaced by a below
+  var f = {
+    g: b
+  };
+  e();
+
+  return;
+}
+
+})(Module.asmGlobalArg, Module.asmLibraryArg, buffer);
+
+// {"b":"a"}

tests/optimizer/test-function-eliminator-replace-object-value-assignment.js

@@ -0,0 +1,24 @@
+var asm = (function(global, env, buffer) {
+ "use asm";
+ function a() {
+  return 0;
+ }
+ function b() {
+  return 0;
+ }
+ function c() {
+  a();
+  return;
+ }
+ function d() {
+  b();
+  var f = {
+   g: b
+  };
+  e();
+  return;
+ }
+})(Module.asmGlobalArg, Module.asmLibraryArg, buffer);
+
+
+

tests/optimizer/test-function-eliminator-replace-variable-value-output.js

@@ -0,0 +1,16 @@
+var asm = (function(global, env, buffer) {
+ "use asm";
+ function a() {
+  return 0;
+ }
+ function c() {
+  a();
+  return;
+ }
+ function d() {
+  a();
+  var e = a;
+  e();
+  return;
+ }
+})(Module.asmGlobalArg, Module.asmLibraryArg, buffer);

tests/optimizer/test-function-eliminator-replace-variable-value-with-hash-info.js

@@ -0,0 +1,32 @@
+var asm = (function(global, env, buffer) {
+"use asm";
+function a()
+{
+return 0;
+}
+
+function b()
+{
+return 0;
+}
+
+function c()
+{
+  a();
+  return;
+}
+
+function d()
+{
+  b();
+  
+  // We expect that b gets replaced by a below
+  var e = b;  
+  e();
+
+  return;
+}
+
+})(Module.asmGlobalArg, Module.asmLibraryArg, buffer);
+
+// {"b" : "a"}