perf(vm): Add function inlining

The main purpose of this is to avoid the overhead of the trivial operator functions `+, -, *` etc.
gluon-lang · Oct 1, 2019 · 5093137 · 5093137
1 parent 8f2e109
commit 5093137
Show file tree

Hide file tree

Showing 9 changed files with 457 additions and 49 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/compiler_pipeline.rs b/src/compiler_pipeline.rs
@@ -716,7 +716,7 @@ where
 
                 debug!("Translation returned: {}", expr);
 
-                core::optimize::optimize(&translator.allocator, expr)
+                core::optimize::optimize(&translator.allocator, &*env, expr)
             };
 
             let source = compiler

diff --git a/vm/Cargo.toml b/vm/Cargo.toml
@@ -49,6 +49,7 @@ gluon_codegen = { path = "../codegen", version = "0.12.0" } # GLUON
 lalrpop = { version = "0.17", optional = true }
 
 [dev-dependencies]
+difference = "2"
 env_logger = "0.6"
 pretty_assertions = "0.6"
 

diff --git a/vm/src/compiler.rs b/vm/src/compiler.rs
@@ -12,7 +12,7 @@ use crate::base::{
 };
 
 use crate::{
-    core::{self, CExpr, Expr, Literal, Pattern},
+    core::{self, is_primitive, CExpr, Expr, Literal, Pattern},
     interner::InternedStr,
     source_map::{LocalMap, SourceMap},
     types::*,
@@ -759,11 +759,7 @@ impl<'a> Compiler<'a> {
             }
             Expr::Call(func, args) => {
                 if let Expr::Ident(ref id, _) = *func {
-                    if id.name.as_ref() == "&&"
-                        || id.name.as_ref() == "||"
-                        || (id.name.as_ref().starts_with('#')
-                            && id.name.declared_name() != "#error")
-                    {
+                    if is_primitive(&id.name) && id.name.declared_name() != "#error" {
                         self.compile_primitive(&id.name, args, function, tail_position)?;
                         return Ok(None);
                     }

diff --git a/vm/src/core/grammar.lalrpop b/vm/src/core/grammar.lalrpop
@@ -2,7 +2,8 @@ use crate::base::{
     ast::{TypedIdent},
     pos::{BytePos, Span},
     symbol::{Symbol, Symbols},
-    types::{Field, Type}};
+    types::{Field, Type},
+};
 
 use crate::core::{Allocator, Alternative, Closure, Expr, LetBinding, Literal, Named, Pattern};