Merge pull request GaijinEntertainment#2095 from aleksisch/feature/standalone-executable

Feature/standalone executable

Author: borisbat

doc/reflections/das2rst.das

@@ -259,7 +259,6 @@ def document_module_ast(root : string) {
         group_by_regex("Evaluations", mod, %regex~(eval_single_expression)%%),
         group_by_regex("Error reporting", mod, %regex~(macro_error)%%),
         group_by_regex("Location and context", mod, %regex~(force_at|collect_dependencies|get_ast_context)%%),
-        // hide_group(group_by_regex("Jit support",mod,%regex~(make_interop_node|get_builtin_function_address)%%));
         group_by_regex("Use queries", mod, %regex~(get_use_global_variables|get_use_functions)%%),
         group_by_regex("Log", mod, %regex~(to_compilation_log)%%),
         group_by_regex("Removal", mod, %regex~(remove.*)%%),

include/daScript/ast/ast.h

@@ -1577,9 +1577,10 @@ namespace das
         // todo: add this params to serialization?
         bool jit_jit_all_functions = true;       // JIT all functions by default
         bool jit_debug_info = false;             // Add debug info to generate binary code
-        bool jit_use_dll_mode = true;            // Create if missing and reuse DLL or JIT compile
-        bool jit_emit_prologue = false;           // Emit prologue for all functions and blocks
-        string jit_output_folder;                // Folder to store compiled dll's. By default it'll be _das_root_/jitted_scripts
+        bool jit_dll_mode = true;                // Create if missing and reuse DLL or JIT compile
+        bool jit_exe_mode = false;                // Create executable
+        bool jit_emit_prologue = false;          // Emit prologue for all functions and blocks
+        string jit_output_path;                  // Folder to store compiled dll's. By default it'll be _das_root_/jitted_scripts
         int32_t jit_opt_level = 3u;              // Opt level for LLVM to codegen and IR optimizations
         int32_t jit_size_level = 3u;             // Opt level for LLVM for binary size
         string jit_path_to_shared_lib;           // Path to libDaScript. Optional, we'll try to find it in _das_root_/lib/ if not provided.

include/daScript/simulate/aot_builtin_jit.h

@@ -1,10 +1,21 @@
 #pragma once
 
-#include "daScript/ast/ast.h"
-#include "daScript/ast/ast_expressions.h"
-#include "daScript/ast/ast_visitor.h"
+#include "daScript/misc/vectypes.h"
+#include "daScript/misc/arraytype.h"
+#include "daScript/misc/smart_ptr.h"
 
 namespace das {
+
+    class Context;
+    class LineInfo;
+    class LineInfoArg;
+    class Function;
+    class ExprCallFunc;
+    class ExprStringBuilder;
+
+    struct TypeDecl;
+    typedef smart_ptr<TypeDecl> TypeDeclPtr;
+
     float4 das_invoke_code ( void * pfun, vec4f anything, void * cmres, Context * context );
     bool das_is_jit_function ( const Func func );
     bool das_remove_jit ( const Func func );
@@ -40,8 +51,6 @@ namespace das {
     void * das_get_jit_iterator_first();
     void * das_get_jit_iterator_next();
     void * das_get_builtin_function_address ( Function * fn, Context * context, LineInfoArg * at );
-    void * das_make_interop_node ( Context & ctx, ExprCallFunc * call, Context * context, LineInfoArg * at );
-    void * das_sb_make_interop_node ( Context & ctx, ExprStringBuilder * call, Context * context, LineInfoArg * at );
     void * das_get_jit_new ( TypeDeclPtr htype, Context * context, LineInfoArg * at );
     void * das_get_jit_delete ( TypeDeclPtr htype, Context * context, LineInfoArg * at );
     void * das_get_jit_debug_enter ();

include/daScript/simulate/simulate.h

@@ -436,6 +436,10 @@ namespace das
             return (uint32_t(index)<uint32_t(totalVariables)) ? globalVariables[index].debugInfo  : nullptr;;
         }
 
+        __forceinline const GlobalVariable getGlobalVariable( int index ) const {
+            return globalVariables[index];
+        }
+
         __forceinline void simEnd() {
             thisHelper = nullptr;
         }

include/daScript/simulate/simulate_nodes.h

@@ -482,37 +482,6 @@ namespace das {
     };
 
 
-    typedef vec4f ( * JitFunction ) ( Context * , vec4f *, void * );
-
-    struct SimNode_Jit : SimNode {
-        SimNode_Jit ( const LineInfo & at, JitFunction eval )
-            : SimNode(at), func(eval) {}
-        virtual SimNode * visit ( SimVisitor & vis ) override;
-        DAS_EVAL_ABI virtual vec4f eval ( Context & context ) override;
-        virtual bool rtti_node_isJit() const override { return true; }
-        JitFunction func = nullptr;
-        // saved original node
-        SimNode * saved_code = nullptr;
-        bool saved_aot = false;
-        void * saved_aot_function = nullptr;
-    };
-
-    struct SimNode_JitBlock;
-
-    struct JitBlock : Block {
-        vec4f   node[10];
-    };
-
-    struct SimNode_JitBlock : SimNode_ClosureBlock {
-        SimNode_JitBlock ( const LineInfo & at, JitBlockFunction eval, Block * bptr, uint64_t ad )
-            : SimNode_ClosureBlock(at,false,false,ad), func(eval), blockPtr(bptr) {}
-        virtual SimNode * visit ( SimVisitor & vis ) override;
-        DAS_EVAL_ABI virtual vec4f eval ( Context & context ) override;
-        JitBlockFunction func = nullptr;
-        Block * blockPtr = nullptr;
-    };
-    static_assert(sizeof(SimNode_JitBlock)<=sizeof(JitBlock().node),"jit block node must fit under node size");
-
     struct SimNode_SourceBase : SimNode {
         SimNode_SourceBase ( const LineInfo & at ) : SimNode(at) {}
         virtual bool rtti_node_isSourceBase() const override { return true;  }

modules/dasLLVM/.das_module

@@ -6,7 +6,8 @@ require fio
 def initialize(project_path : string) {
     let daslib_paths = [
         "llvm_boost", "llvm_debug", "llvm_jit", "llvm_targets",
-        "llvm_jit_intrin", "llvm_jit_common", "llvm_dll_utils"
+        "llvm_jit_intrin", "llvm_jit_common", "llvm_dll_utils",
+        "llvm_exe"
     ]
     let bindings_paths = [
         "llvm_const", "llvm_enum", "llvm_func", "llvm_struct",

modules/dasLLVM/README.md

@@ -62,5 +62,5 @@ code, and saves it as a dynamic (shared) library.
 - **Subsequent Runs:** Checks if the source code has changed. If unchanged, loads the
 cached DLL for instant execution.
 ### DLL location
-- By default, the `dll` is stored in `get_das_root()/jitted_scripts`.
-- This can be changed using `jit_output_folder` (not exposed to `CLI` yet).
+- By default, the `dll` is stored in `jitted_scripts/`.
+- This can be changed using `jit_output_path`.

modules/dasLLVM/daslib/llvm_boost.das

@@ -92,6 +92,10 @@ class PrimitiveTypes {
         return LLVMPointerType(t_int8, 0u)
     }
 
+    def ConstI1(val : bool) {
+        return LLVMConstInt(t_int1, uint64(val ? 1 : 0), 0);
+    }
+
     def ConstI8(val : int8) {
         return LLVMConstInt(t_int8, val |> uint64(), 0);
     }
@@ -437,6 +441,26 @@ def describe(blk : LLVMOpaqueBasicBlock?) {
     return st
 }
 
+def isExprOp2_Func(expr : smart_ptr<ExprOp2>) {
+    if (!expr.func.flags.builtIn) {
+        return true
+    }
+    if (expr.left._type.isHandle || expr.right._type.isHandle) {
+        return true
+    }
+    return false
+}
+
+def isExprOp1_Func(expr : smart_ptr<ExprOp1>) {
+    if (!expr.func.flags.builtIn) {
+        return true
+    }
+    if (expr.subexpr._type.isHandle) {
+        return true
+    }
+    return false
+}
+
 def LLVMSetFunctionCallConv(ofunc : LLVMOpaqueValue?; conv : LLVMCallConv) {
     LLVMSetFunctionCallConv(ofunc, uint(conv))
 }

modules/dasLLVM/daslib/llvm_dll_utils.das

@@ -145,11 +145,6 @@ class public UidNodes {
         return get_base(get_ptr(expr), "tinfo_{expr.typeexpr.get_mnh}")
     }
 
-    def get_ascend_tinfo(expr : smart_ptr<ExprAscend>) {
-        assert(expr.ascendFlags.needTypeInfo)
-        return get_base(get_ptr(expr), "tinfo_{expr.subexpr._type.get_mnh}")
-    }
-
     def get_ctor(expr : smart_ptr<ExprMakeStruct>) {
         return get_base(get_ptr(expr), "ctor_{expr.constructor}")
     }
@@ -158,10 +153,6 @@ class public UidNodes {
         return get_base(get_ptr(expr), "call_{get_mangled_name(expr.func)}")
     }
 
-    def get_string_builder(expr : smart_ptr<ExprStringBuilder>) {
-        return get_base(get_ptr(expr), "string_builder")
-    }
-
     def public get_block_name_ptr(blk : ExprBlock?) : DllName {
         return get_base(blk, "block_{get_mangled_name(blk)}")
     }
@@ -269,6 +260,10 @@ def public add_dll_extension(path : string) {
     return "{path}.dll"
 }
 
+def public add_exe_extension(path : string) {
+    return "{path}.exe"
+}
+
 def public get_dll_by_path(path : string) : DLLHandle? {
     return new DLLHandle(handle = load_dynamic_library(add_dll_extension(path)))
 }