feat(compiler)!: Enable tail calls by default (#1589)

* feat: Make Tail Calls Default * fix: Disable Tail Calls In Near SmokeTest * Update size of smallest grain program --------- Co-authored-by: Oscar Spencer <oscar@grain-lang.org>
grain-lang · Mar 11, 2023 · f6e5b00 · f6e5b00
1 parent cbd46ee
commit f6e5b00
Show file tree

Hide file tree

Showing 147 changed files with 1,034 additions and 1,403 deletions.
diff --git a/cli/__test__/index.gr b/cli/__test__/index.gr
@@ -1,4 +1,4 @@
-/* grainc-flags --no-gc --no-bulk-memory */
+/* grainc-flags --no-gc --no-bulk-memory --no-wasm-tail-call */
 module NearTest
 
 include "runtime/unsafe/wasmi32"

diff --git a/cli/__test__/nearEnv.gr b/cli/__test__/nearEnv.gr
@@ -1,4 +1,4 @@
-/* grainc-flags --no-gc --no-bulk-memory */
+/* grainc-flags --no-gc --no-bulk-memory --no-wasm-tail-call */
 module NearEnv
 
 provide foreign wasm storage_read: (

diff --git a/compiler/src/codegen/compcore.re b/compiler/src/codegen/compcore.re
@@ -1391,16 +1391,16 @@ let call_lambda =
  | Some(name) =>
  let instr =
  if (tail) {
- if (Config.experimental_tail_call^) {
- Expression.Call.make_return;
- } else {
+ if (Config.no_tail_call^) {
  (
  (wasm_mod, name, args, retty) =>
  Expression.Return.make(
  wasm_mod,
  Expression.Call.make(wasm_mod, name, args, retty),
  )
  );
+ } else {
+ Expression.Call.make_return;
  };
  } else {
  Expression.Call.make;
@@ -1410,9 +1410,7 @@ let call_lambda =
  | None =>
  let instr =
  if (tail) {
- if (Config.experimental_tail_call^) {
- Expression.Call_indirect.make_return;
- } else {
+ if (Config.no_tail_call^) {
  (
  (wasm_mod, table, ptr, args, argty, retty) =>
  Expression.Return.make(
@@ -1427,6 +1425,8 @@ let call_lambda =
  ),
  )
  );
+ } else {
+ Expression.Call_indirect.make_return;
  };
  } else {
  Expression.Call_indirect.make;

diff --git a/compiler/src/utils/config.re b/compiler/src/utils/config.re
@@ -466,10 +466,10 @@ let compilation_mode =
 let statically_link =
  toggle_flag(~names=["no-link"], ~doc="Disable static linking", true);
 
-let experimental_tail_call =
+let no_tail_call =
  toggle_flag(
- ~names=["experimental-wasm-tail-call"],
- ~doc="Enables tail-call optimization",
+ ~names=["no-wasm-tail-call"],
+ ~doc="Disables tail-call optimization",
  false,
  );
 

diff --git a/compiler/src/utils/config.rei b/compiler/src/utils/config.rei
@@ -90,9 +90,9 @@ let compilation_mode: ref(option(string));
 
 let statically_link: ref(bool);
 
-/** Enable tail-call optimizations */
+/** Disables tail-call optimizations */
 
-let experimental_tail_call: ref(bool);
+let no_tail_call: ref(bool);
 
 /** Whether to allow cyclic types. */
 

diff --git a/compiler/test/__snapshots__/basic_functionality.0996c5f7.0.snapshot b/compiler/test/__snapshots__/basic_functionality.0996c5f7.0.snapshot
@@ -36,15 +36,13 @@ basic functionality › modulo4
  (local $4 f32)
  (local $5 f64)
  (block $compile_block.1
- (return
- (call $%_1113
- (call $incRef_0
- (global.get $GRAIN$EXPORT$incRef_0)
- (global.get $%_1113)
- )
- (i32.const -33)
- (i32.const 35)
+ (return_call $%_1113
+ (call $incRef_0
+ (global.get $GRAIN$EXPORT$incRef_0)
+ (global.get $%_1113)
  )
+ (i32.const -33)
+ (i32.const 35)
  )
  )
  )

diff --git a/compiler/test/__snapshots__/basic_functionality.0a230f18.0.snapshot b/compiler/test/__snapshots__/basic_functionality.0a230f18.0.snapshot
@@ -36,15 +36,13 @@ basic functionality › land4
  (local $4 f32)
  (local $5 f64)
  (block $compile_block.1
- (return
- (call $&_1113
- (call $incRef_0
- (global.get $GRAIN$EXPORT$incRef_0)
- (global.get $&_1113)
- )
- (i32.const 1)
- (i32.const 1)
+ (return_call $&_1113
+ (call $incRef_0
+ (global.get $GRAIN$EXPORT$incRef_0)
+ (global.get $&_1113)
  )
+ (i32.const 1)
+ (i32.const 1)
  )
  )
  )

diff --git a/compiler/test/__snapshots__/basic_functionality.0a2e4afa.0.snapshot b/compiler/test/__snapshots__/basic_functionality.0a2e4afa.0.snapshot
@@ -36,15 +36,13 @@ basic functionality › lxor1
  (local $4 f32)
  (local $5 f64)
  (block $compile_block.1
- (return
- (call $^_1113
- (call $incRef_0
- (global.get $GRAIN$EXPORT$incRef_0)
- (global.get $^_1113)
- )
- (i32.const 3)
- (i32.const 3)
+ (return_call $^_1113
+ (call $incRef_0
+ (global.get $GRAIN$EXPORT$incRef_0)
+ (global.get $^_1113)
  )
+ (i32.const 3)
+ (i32.const 3)
  )
  )
  )

diff --git a/compiler/test/__snapshots__/basic_functionality.0c0b170b.0.snapshot b/compiler/test/__snapshots__/basic_functionality.0c0b170b.0.snapshot
@@ -36,15 +36,13 @@ basic functionality › lor1
  (local $4 f32)
  (local $5 f64)
  (block $compile_block.1
- (return
- (call $|_1113
- (call $incRef_0
- (global.get $GRAIN$EXPORT$incRef_0)
- (global.get $|_1113)
- )
- (i32.const 3)
- (i32.const 3)
+ (return_call $|_1113
+ (call $incRef_0
+ (global.get $GRAIN$EXPORT$incRef_0)
+ (global.get $|_1113)
  )
+ (i32.const 3)
+ (i32.const 3)
  )
  )
  )

diff --git a/compiler/test/__snapshots__/basic_functionality.0c400bde.0.snapshot b/compiler/test/__snapshots__/basic_functionality.0c400bde.0.snapshot
@@ -36,15 +36,13 @@ basic functionality › modulo6
  (local $4 f32)
  (local $5 f64)
  (block $compile_block.1
- (return
- (call $%_1113
- (call $incRef_0
- (global.get $GRAIN$EXPORT$incRef_0)
- (global.get $%_1113)
- )
- (i32.const 35)
- (i32.const 35)
+ (return_call $%_1113
+ (call $incRef_0
+ (global.get $GRAIN$EXPORT$incRef_0)
+ (global.get $%_1113)
  )
+ (i32.const 35)
+ (i32.const 35)
  )
  )
  )

diff --git a/compiler/test/__snapshots__/basic_functionality.0e812a39.0.snapshot b/compiler/test/__snapshots__/basic_functionality.0e812a39.0.snapshot
@@ -53,15 +53,13 @@ basic functionality › precedence1
  (block $do_backpatches.1
  )
  )
- (return
- (call $+_1113
- (call $incRef_0
- (global.get $GRAIN$EXPORT$incRef_0)
- (global.get $+_1113)
- )
- (i32.const 7)
- (local.get $6)
+ (return_call $+_1113
+ (call $incRef_0
+ (global.get $GRAIN$EXPORT$incRef_0)
+ (global.get $+_1113)
  )
+ (i32.const 7)
+ (local.get $6)
  )
  )
  )

diff --git a/compiler/test/__snapshots__/basic_functionality.0f79ce35.0.snapshot b/compiler/test/__snapshots__/basic_functionality.0f79ce35.0.snapshot
@@ -36,15 +36,13 @@ basic functionality › comp16
  (local $4 f32)
  (local $5 f64)
  (block $compile_block.1
- (return
- (call $==_1113
- (call $incRef_0
- (global.get $GRAIN$EXPORT$incRef_0)
- (global.get $==_1113)
- )
- (i32.const 2147483646)
- (i32.const 2147483646)
+ (return_call $==_1113
+ (call $incRef_0
+ (global.get $GRAIN$EXPORT$incRef_0)
+ (global.get $==_1113)
  )
+ (i32.const 2147483646)
+ (i32.const 2147483646)
  )
  )
  )

diff --git a/compiler/test/__snapshots__/basic_functionality.125626a9.0.snapshot b/compiler/test/__snapshots__/basic_functionality.125626a9.0.snapshot
@@ -36,15 +36,13 @@ basic functionality › orshadow
  (local $4 f32)
  (local $5 f64)
  (block $compile_block.1
- (return
- (call $+_1114
- (call $incRef_0
- (global.get $GRAIN$EXPORT$incRef_0)
- (global.get $+_1114)
- )
- (i32.const 3)
- (i32.const 5)
+ (return_call $+_1114
+ (call $incRef_0
+ (global.get $GRAIN$EXPORT$incRef_0)
+ (global.get $+_1114)
  )
+ (i32.const 3)
+ (i32.const 5)
  )
  )
  )

diff --git a/compiler/test/__snapshots__/basic_functionality.13335202.0.snapshot b/compiler/test/__snapshots__/basic_functionality.13335202.0.snapshot
@@ -53,15 +53,13 @@ basic functionality › precedence2
  (block $do_backpatches.1
  )
  )
- (return
- (call $+_1113
- (call $incRef_0
- (global.get $GRAIN$EXPORT$incRef_0)
- (global.get $+_1113)
- )
- (local.get $6)
- (i32.const 7)
+ (return_call $+_1113
+ (call $incRef_0
+ (global.get $GRAIN$EXPORT$incRef_0)
+ (global.get $+_1113)
  )
+ (local.get $6)
+ (i32.const 7)
  )
  )
  )

diff --git a/compiler/test/__snapshots__/basic_functionality.1ad0f349.0.snapshot b/compiler/test/__snapshots__/basic_functionality.1ad0f349.0.snapshot
@@ -53,15 +53,13 @@ basic functionality › precedence3
  (block $do_backpatches.1
  )
  )
- (return
- (call $+_1113
- (call $incRef_0
- (global.get $GRAIN$EXPORT$incRef_0)
- (global.get $+_1113)
- )
- (i32.const 7)
- (local.get $6)
+ (return_call $+_1113
+ (call $incRef_0
+ (global.get $GRAIN$EXPORT$incRef_0)
+ (global.get $+_1113)
  )
+ (i32.const 7)
+ (local.get $6)
  )
  )
  )

diff --git a/compiler/test/__snapshots__/basic_functionality.1ae16d82.0.snapshot b/compiler/test/__snapshots__/basic_functionality.1ae16d82.0.snapshot
@@ -36,15 +36,13 @@ basic functionality › binop4
  (local $4 f32)
  (local $5 f64)
  (block $compile_block.1
- (return
- (call $*_1113
- (call $incRef_0
- (global.get $GRAIN$EXPORT$incRef_0)
- (global.get $*_1113)
- )
- (i32.const 5)
- (i32.const 7)
+ (return_call $*_1113
+ (call $incRef_0
+ (global.get $GRAIN$EXPORT$incRef_0)
+ (global.get $*_1113)
  )
+ (i32.const 5)
+ (i32.const 7)
  )
  )
  )

diff --git a/compiler/test/__snapshots__/basic_functionality.1b68c8db.0.snapshot b/compiler/test/__snapshots__/basic_functionality.1b68c8db.0.snapshot
@@ -36,15 +36,13 @@ basic functionality › lsl1
  (local $4 f32)
  (local $5 f64)
  (block $compile_block.1
- (return
- (call $<<_1113
- (call $incRef_0
- (global.get $GRAIN$EXPORT$incRef_0)
- (global.get $<<_1113)
- )
- (i32.const 15)
- (i32.const 3)
+ (return_call $<<_1113
+ (call $incRef_0
+ (global.get $GRAIN$EXPORT$incRef_0)
+ (global.get $<<_1113)
  )
+ (i32.const 15)
+ (i32.const 3)
  )
  )
  )

diff --git a/compiler/test/__snapshots__/basic_functionality.1bf5759c.0.snapshot b/compiler/test/__snapshots__/basic_functionality.1bf5759c.0.snapshot
@@ -64,11 +64,9 @@ basic functionality › unsafe_wasm_globals
  (global.get $_F32_VAL_1145)
  )
  )
- (return
- (call $printF64_1146
- (global.get $printF64_1146)
- (global.get $_F64_VAL_1147)
- )
+ (return_call $printF64_1146
+ (global.get $printF64_1146)
+ (global.get $_F64_VAL_1147)
  )
  )
  )

diff --git a/compiler/test/__snapshots__/basic_functionality.1d2ec323.0.snapshot b/compiler/test/__snapshots__/basic_functionality.1d2ec323.0.snapshot
@@ -260,15 +260,13 @@ basic functionality › comp22
  (block $do_backpatches.17
  )
  )
- (return
- (call $isnt_1113
- (call $incRef_0
- (global.get $GRAIN$EXPORT$incRef_0)
- (global.get $isnt_1113)
- )
- (local.get $8)
- (local.get $11)
+ (return_call $isnt_1113
+ (call $incRef_0
+ (global.get $GRAIN$EXPORT$incRef_0)
+ (global.get $isnt_1113)
  )
+ (local.get $8)
+ (local.get $11)
  )
  )
  )