Mercurial > octave-nkf
diff libinterp/octave-value/ov-usr-fcn.h @ 15337:3f43e9d6d86e
JIT compile anonymous functions
* jit-ir.h (jit_block::front, jit_block::back): New function.
(jit_call::jit_call): New overloads.
(jit_return): New class.
* jit-typeinfo.cc (octave_jit_create_undef): New function.
(jit_operation::to_idx): Correctly handle empty type vector.
(jit_typeinfo::jit_typeinfo): Add destroy_fn and initialize create_undef.
* jit-typeinfo.h (jit_typeinfo::get_any_ptr, jit_typeinfo::destroy,
jit_typeinfo::create_undef): New function.
* pt-jit.cc (jit_convert::jit_convert): Add overload and refactor.
(jit_convert::initialize, jit_convert_llvm::convert_loop,
jit_convert_llvm::convert_function, tree_jit::do_execute,
jit_function_info::jit_function_info, jit_function_info::execute,
jit_function_info::match): New function.
(jit_convert::get_variable): Support function variable lookup.
(jit_convert_llvm::convert): Handle loop/function agnostic stuff.
(jit_convert_llvm::visit): Handle function creation as well.
(tree_jit::execute): Move implementation to tree_jit::do_execute.
(jit_info::compile): Call convert_loop instead of convert.
* pt-jit.h (jit_convert::jit_convert): New overload.
(jit_convert::initialize, jit_convert_llvm::convert_loop,
jit_convert_llvm::convert_function, tree_jit::do_execute): New function.
(jit_convert::create_variable, jit_convert_llvm::initialize): Update signature.
(tree_jit::execute): Made static.
(tree_jit::tree_jit): Made private.
(jit_function_info): New class.
* ov-usr-fcn.cc (octave_user_function::~octave_user_function): Delete jit_info.
(octave_user_function::octave_user_function): Maybe JIT and use is_special_expr
and special_expr.
(octave_user_function::special_expr): New function.
* ov-usr-fcn.h (octave_user_function::is_special_expr,
octave_user_function::special_expr, octave_user_function::get_info,
octave_user_function::stash_info): New function.
* pt-decl.h (tree_decl_elt::name): New function.
* pt-eval.cc (tree_evaluator::visit_simple_for_command,
tree_evaluator::visit_while_command): Use static tree_jit methods.
author | Max Brister <max@2bass.com> |
---|---|
date | Sun, 09 Sep 2012 00:29:00 -0600 |
parents | 2fc554ffbc28 |
children | 6823ad7a25b1 |
line wrap: on
line diff
--- a/libinterp/octave-value/ov-usr-fcn.h Sat Sep 08 18:47:29 2012 -0700 +++ b/libinterp/octave-value/ov-usr-fcn.h Sun Sep 09 00:29:00 2012 -0600 @@ -41,8 +41,13 @@ class tree_parameter_list; class tree_statement_list; class tree_va_return_list; +class tree_expression; class tree_walker; +#ifdef HAVE_LLVM +class jit_function_info; +#endif + class octave_user_code : public octave_function { @@ -283,6 +288,14 @@ : false; } + // If we are a special expression, then the function body consists of exactly + // one expression. The expression's result is the return value of the + // function. + bool is_special_expr (void) const + { + return is_inline_function () || is_anonymous_function (); + } + bool is_nested_function (void) const { return nested_function; } void mark_as_nested_function (void) { nested_function = true; } @@ -335,6 +348,10 @@ octave_comment_list *trailing_comment (void) { return trail_comm; } + // If is_special_expr is true, retrieve the sigular expression that forms the + // body. May be null (even if is_special_expr is true). + tree_expression *special_expr (void); + bool subsasgn_optimization_ok (void); void accept (tree_walker& tw); @@ -351,6 +368,12 @@ return false; } +#ifdef HAVE_LLVM + jit_function_info *get_info (void) { return jit_info; } + + void stash_info (jit_function_info *info) { jit_info = info; } +#endif + #if 0 void print_symtab_info (std::ostream& os) const; #endif @@ -427,6 +450,10 @@ // pointer to the current unwind_protect frame of this function. unwind_protect *curr_unwind_protect_frame; +#ifdef HAVE_LLVM + jit_function_info *jit_info; +#endif + #if 0 // The symbol record for argn in the local symbol table. octave_value& argn_varref;