Merge #861

861: Reduce the function call overhead somewhat r=Marwes a=Marwes

Took care of some low hanging stuff and then decided to compare against https://github.com/khvzak/mlua . There may be some additional overhead compared to calling lua raw I guess, but we are still in the same ballpark so doing any improvements here seems fairly futile (general vm performance improvements like inlining still needs work though).

cc #858 cc @Anvoker

```
identity                time:   [186.46 ns 187.29 ns 188.17 ns]
                        change: [-3.3246% -2.5457% -1.7372%] (p = 0.00 < 0.05)
                        Performance has improved.
Found 2 outliers among 100 measurements (2.00%)
  1 (1.00%) high mild
  1 (1.00%) high severe

identity lua            time:   [179.16 ns 180.01 ns 180.88 ns]
Found 3 outliers among 100 measurements (3.00%)
  3 (3.00%) high mild
```

Co-authored-by: Markus Westerlind <[email protected]>

Author: bors[bot]

.travis.yml

@@ -18,7 +18,7 @@ branches:
 
 matrix:
   include:
-  - rust: nightly-2020-03-12
+  - rust: nightly-2020-07-26
     #  - rust: beta
   - rust: stable
     env: ARCH=i686

Cargo.lock

@@ -43,7 +43,7 @@ futures = { version = "0.3.1", default-features = false }
 codespan = "0.9"
 codespan-reporting = "0.9"
 pin-project-lite = { version = "0.1", optional = true }
-salsa = { version = "0.14.2", package = "gluon-salsa" }
+salsa = { version = "0.15.2", package = "gluon-salsa" }
 
 serde = { version = "1.0.0", optional = true }
 serde_state = { version = "0.4", optional = true }
@@ -145,8 +145,8 @@ path = "examples/lisp/main.rs"
 [package.metadata.docs.rs]
 features = ["docs_rs"]
 
-# [profile.bench]
-# debug = 2
-#
-# [profile.release]
-# debug = 2
+[profile.bench]
+debug = 2
+
+[profile.release]
+debug = 2

Cargo.toml

@@ -67,7 +67,7 @@ where
 {
     pub fn canonical_alias<'t, F>(
         &mut self,
-        env: &dyn TypeEnv<Type = T>,
+        env: &(dyn TypeEnv<Type = T> + '_),
         interner: &mut impl TypeContext<Symbol, T>,
         typ: &'t T,
         mut canonical: F,
@@ -105,7 +105,7 @@ where
 
     pub fn remove_aliases_to_concrete<'a>(
         &mut self,
-        env: &dyn TypeEnv<Type = T>,
+        env: &(dyn TypeEnv<Type = T> + '_),
         interner: &mut impl TypeContext<Symbol, T>,
         mut typ: T,
     ) -> Result<T, Error> {
@@ -139,7 +139,7 @@ where
 
     pub fn remove_aliases(
         &mut self,
-        env: &dyn TypeEnv<Type = T>,
+        env: &(dyn TypeEnv<Type = T> + '_),
         interner: &mut impl TypeContext<Symbol, T>,
         typ: T,
     ) -> Result<T, Error> {
@@ -148,7 +148,7 @@ where
 
     pub fn remove_aliases_predicate(
         &mut self,
-        env: &dyn TypeEnv<Type = T>,
+        env: &(dyn TypeEnv<Type = T> + '_),
         interner: &mut impl TypeContext<Symbol, T>,
         mut typ: T,
         mut predicate: impl FnMut(&AliasData<Symbol, T>) -> bool,
@@ -163,7 +163,7 @@ where
 
     pub fn remove_alias(
         &mut self,
-        env: &dyn TypeEnv<Type = T>,
+        env: &(dyn TypeEnv<Type = T> + '_),
         interner: &mut impl TypeContext<Symbol, T>,
         typ: &T,
         predicate: impl FnOnce(&AliasData<Symbol, T>) -> bool,
@@ -181,7 +181,7 @@ where
 
     pub fn remove_alias_to_concrete<'a>(
         &mut self,
-        env: &'a dyn TypeEnv<Type = T>,
+        env: &'a (dyn TypeEnv<Type = T> + '_),
         interner: &mut impl TypeContext<Symbol, T>,
         typ: &'a T,
         predicate: impl FnOnce(&AliasData<Symbol, T>) -> bool,
@@ -238,7 +238,7 @@ where
 
 /// Removes type aliases from `typ` until it is an actual type
 pub fn remove_aliases<T>(
-    env: &dyn TypeEnv<Type = T>,
+    env: &(dyn TypeEnv<Type = T> + '_),
     interner: &mut impl TypeContext<Symbol, T>,
     mut typ: T,
 ) -> T
@@ -255,8 +255,7 @@ where
 }
 
 pub fn remove_aliases_cow<'t, T>(
-    env: &dyn TypeEnv<Type = T>,
-
+    env: &(dyn TypeEnv<Type = T> + '_),
     interner: &mut impl TypeContext<Symbol, T>,
     typ: &'t T,
 ) -> Cow<'t, T>
@@ -275,7 +274,7 @@ where
 /// Resolves aliases until `canonical` returns `true` for an alias in which case it returns the
 /// type that directly contains that alias
 pub fn canonical_alias<'t, F, T>(
-    env: &dyn TypeEnv<Type = T>,
+    env: &(dyn TypeEnv<Type = T> + '_),
     interner: &mut impl TypeContext<Symbol, T>,
     typ: &'t T,
     mut canonical: F,
@@ -313,7 +312,7 @@ where
 /// Expand `typ` if it is an alias that can be expanded and return the expanded type.
 /// Returns `None` if the type is not an alias or the alias could not be expanded.
 pub fn remove_alias<T>(
-    env: &dyn TypeEnv<Type = T>,
+    env: &(dyn TypeEnv<Type = T> + '_),
     interner: &mut impl TypeContext<Symbol, T>,
     typ: &T,
 ) -> Result<Option<T>, Error>
@@ -338,7 +337,7 @@ where
 }
 
 pub fn peek_alias<'t, T>(
-    env: &'t dyn TypeEnv<Type = T>,
+    env: &(dyn TypeEnv<Type = T> + '_),
     typ: &'t T,
 ) -> Result<Option<AliasRef<Symbol, T>>, Error>
 where

base/src/resolve.rs

@@ -10,6 +10,21 @@ use gluon::{
 };
 
 // Benchmarks function calls
+
+fn identity(b: &mut Bencher) {
+    let vm = new_vm();
+    let text = r#"
+    let id x = x
+    id
+    "#;
+    vm.load_script("id", text).unwrap();
+    let mut id: FunctionRef<fn(i32) -> i32> = vm.get_global("id").unwrap();
+    b.iter(|| {
+        let result = id.call(20).unwrap();
+        black_box(result)
+    })
+}
+
 fn factorial(b: &mut Bencher) {
     let vm = new_vm();
     let text = r#"
@@ -81,6 +96,7 @@ fn gluon_rust_boundary_overhead(b: &mut Bencher) {
 }
 
 fn function_call_benchmark(c: &mut Criterion) {
+    c.bench_function("identity", identity);
     c.bench_function("factorial", factorial);
     c.bench_function("factorial tail call", factorial_tail_call);
     c.bench_function("gluon rust boundary overhead", gluon_rust_boundary_overhead);

benches/function_call.rs

@@ -155,7 +155,7 @@ pub unsafe extern "C" fn glu_push_string(vm: &Thread, s: &u8, len: usize) -> Err
         Ok(s) => s,
         Err(_) => return Error::Unknown,
     };
-    match s.push(&mut vm.current_context()) {
+    match s.vm_push(&mut vm.current_context()) {
         Ok(()) => Error::Ok,
         Err(_) => Error::Unknown,
     }
@@ -166,7 +166,7 @@ pub unsafe extern "C" fn glu_push_string(vm: &Thread, s: &u8, len: usize) -> Err
 #[no_mangle]
 pub unsafe extern "C" fn glu_push_string_unchecked(vm: &Thread, s: &u8, len: usize) -> Error {
     let s = str::from_utf8_unchecked(slice::from_raw_parts(s, len));
-    match s.push(&mut vm.current_context()) {
+    match s.vm_push(&mut vm.current_context()) {
         Ok(()) => Error::Ok,
         Err(_) => Error::Unknown,
     }

c-api/src/lib.rs

@@ -47,7 +47,7 @@ fn derive_struct(
         Fields::Unnamed(_) if field_idents.len() == 1 => {
             let ty = &field_types[0];
             let push_impl = quote! {
-                <#ty as _gluon_api::Pushable<'__vm>>::push(self.0, ctx)?;
+                <#ty as _gluon_api::Pushable<'__vm>>::vm_push(self.0, ctx)?;
             };
             return gen_impl(&container, &ident, generics, push_impl);
         }
@@ -163,7 +163,7 @@ fn gen_impl(
             impl #impl_generics _gluon_api::Pushable<'__vm> for #ident #ty_generics
             #where_clause #(#pushable_bounds),*
             {
-                fn push(self, ctx: &mut _gluon_thread::ActiveThread<'__vm>) -> _GluonResult<()> {
+                fn vm_push(self, ctx: &mut _gluon_thread::ActiveThread<'__vm>) -> _GluonResult<()> {
                     #push_impl
                     Ok(())
                 }
@@ -182,7 +182,7 @@ fn gen_push_impl(
     // push each field onto the stack
     let stack_pushes = field_idents.iter().zip(field_types).map(|(ident, ty)| {
         quote! {
-            <#ty as _gluon_api::Pushable<'__vm>>::push(#ident, ctx)?;
+            <#ty as _gluon_api::Pushable<'__vm>>::vm_push(#ident, ctx)?;
         }
     });
 

codegen/src/pushable.rs

@@ -32,7 +32,7 @@ serde = "1.0.0"
 serde_derive = "1.0.0"
 serde_json = "1.0.0"
 
-gluon = { version = "0.16.1", path = ".." } # GLUON
+gluon = { version = "0.16.1", default-features = false, path = ".." } # GLUON
 completion = { package = "gluon_completion", version = "0.16.1", path = "../completion" } # GLUON
 
 

doc/Cargo.toml

@@ -43,8 +43,8 @@ impl api::VmType for Enum {
 }
 
 impl<'vm, 'value> api::Pushable<'vm> for Enum {
-    fn push(self, context: &mut ActiveThread<'vm>) -> vm::Result<()> {
-        api::ser::Ser(self).push(context)
+    fn vm_push(self, context: &mut ActiveThread<'vm>) -> vm::Result<()> {
+        api::ser::Ser(self).vm_push(context)
     }
 }
 
@@ -240,7 +240,7 @@ where
 
         // apply all generic parameters to the type
         let mut vec = AppVec::new();
-        AppVec::push(&mut vec, T::make_type(thread));
+        vec.push(T::make_type(thread));
         Type::app(ty, vec)
     }
 }
@@ -249,13 +249,13 @@ impl<'vm, T> Pushable<'vm> for GluonUser<T>
 where
     T: Pushable<'vm>,
 {
-    fn push(self, ctx: &mut ActiveThread<'vm>) -> vm::Result<()> {
+    fn vm_push(self, ctx: &mut ActiveThread<'vm>) -> vm::Result<()> {
         (record! {
             name => self.inner.name,
             age => self.inner.age,
             data => self.inner.data,
         })
-        .push(ctx)
+        .vm_push(ctx)
     }
 }