octave-nkf: libinterp/interp-core/pt-jit.cc annotate

annotate libinterp/interp-core/pt-jit.cc @ 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	8125773322d4
children	b49d707fe9d7

rev	line source
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	1 /*
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	2
14901 516b4a15b775 doc: Copyright fix in pt-jit.h and pt-jit.cc Max Brister <max@2bass.com> parents: 14899 diff changeset	3 Copyright (C) 2012 Max Brister <max@2bass.com>
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	4
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	5 This file is part of Octave.
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	6
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	7 Octave is free software; you can redistribute it and/or modify it
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	8 under the terms of the GNU General Public License as published by the
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	9 Free Software Foundation; either version 3 of the License, or (at your
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	10 option) any later version.
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	11
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	12 Octave is distributed in the hope that it will be useful, but WITHOUT
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	15 for more details.
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	16
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	17 You should have received a copy of the GNU General Public License
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	18 along with Octave; see the file COPYING. If not, see
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	19 <http://www.gnu.org/licenses/>.
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	20
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	21 */
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	22
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	23 #define __STDC_LIMIT_MACROS
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	24 #define __STDC_CONSTANT_MACROS
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	25
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	26 #ifdef HAVE_CONFIG_H
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	27 #include <config.h>
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	28 #endif
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	29
15310 b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	30 #include "defun.h"
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	31 #include "ov.h"
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	32 #include "pt-all.h"
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	33 #include "pt-jit.h"
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	34 #include "symtab.h"
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	35 #include "variables.h"
14932 1f914446157d Locate and link with LLVM properly Max Brister <max@2bass.com> parents: 14928 diff changeset	36
15310 b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	37 bool Venable_jit_debug = false;
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	38
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	39 bool Venable_jit_compiler = true;
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	40
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	41 #ifdef HAVE_LLVM
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	42
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	43 #include <llvm/Analysis/CallGraph.h>
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	44 #include <llvm/Analysis/Passes.h>
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	45 #include <llvm/Analysis/Verifier.h>
15030 86a95d6ada0d src/pt-jit.cc: Fix JIT build with LLVM 3.0. Max Brister <max@2bass.com> parents: 15027 diff changeset	46 #include <llvm/LLVMContext.h>
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	47 #include <llvm/ExecutionEngine/ExecutionEngine.h>
005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	48 #include <llvm/ExecutionEngine/JIT.h>
005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	49 #include <llvm/Module.h>
005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	50 #include <llvm/PassManager.h>
005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	51 #include <llvm/Support/IRBuilder.h>
005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	52 #include <llvm/Support/raw_os_ostream.h>
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	53 #include <llvm/Support/TargetSelect.h>
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	54 #include <llvm/Target/TargetData.h>
005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	55 #include <llvm/Transforms/IPO.h>
005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	56 #include <llvm/Transforms/Scalar.h>
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	57
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	58 #ifdef OCTAVE_JIT_DEBUG
005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	59 #include <llvm/Bitcode/ReaderWriter.h>
005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	60 #endif
005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	61
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	62 static llvm::IRBuilder<> builder (llvm::getGlobalContext ());
54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	63
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	64 static llvm::LLVMContext& context = llvm::getGlobalContext ();
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	65
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	66 // -------------------- jit_convert --------------------
15191 ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	67 jit_convert::jit_convert (tree &tee, jit_type *for_bounds)
15337 3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	68 : converting_function (false)
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	69 {
15337 3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	70 initialize (symbol_table::current_scope ());
15027 741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	71
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	72 if (for_bounds)
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	73 create_variable (next_for_bounds (false), for_bounds);
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	74
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	75 visit (tee);
14920 51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	76
15337 3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	77 // breaks must have been handled by the top level loop
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	78 assert (! breaking);
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	79 assert (breaks.empty ());
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	80 assert (continues.empty ());
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	81
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	82 block->append (factory.create<jit_branch> (final_block));
a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	83 blocks.push_back (final_block);
14959 12fd4a62d633 Fix whitespace issues and update documentation Max Brister <max@2bass.com> parents: 14958 diff changeset	84
15191 ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	85 for (variable_map::iterator iter = vmap.begin (); iter != vmap.end (); ++iter)
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	86 {
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	87 jit_variable *var = iter->second;
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	88 const std::string& name = var->name ();
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	89 if (name.size () && name[0] != '#')
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	90 final_block->append (factory.create<jit_store_argument> (var));
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	91 }
15337 3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	92
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	93 final_block->append (factory.create<jit_return> ());
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	94 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	95
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	96 jit_convert::jit_convert (octave_user_function& fcn,
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	97 const std::vector<jit_type *>& args)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	98 : converting_function (true)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	99 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	100 initialize (fcn.scope ());
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	101
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	102 tree_parameter_list *plist = fcn.parameter_list ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	103 tree_parameter_list *rlist = fcn.return_list ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	104 if (plist && plist->takes_varargs ())
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	105 throw jit_fail_exception ("varags not supported");
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	106
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	107 if (rlist && (rlist->size () > 1 \|\| rlist->takes_varargs ()))
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	108 throw jit_fail_exception ("multiple returns not supported");
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	109
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	110 if (plist)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	111 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	112 tree_parameter_list::iterator piter = plist->begin ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	113 for (size_t i = 0; i < args.size (); ++i, ++piter)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	114 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	115 if (piter == plist->end ())
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	116 throw jit_fail_exception ("Too many parameter to function");
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	117
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	118 tree_decl_elt elt = piter;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	119 std::string name = elt->name ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	120 create_variable (name, args[i]);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	121 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	122 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	123
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	124 jit_value *return_value = 0;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	125 if (fcn.is_special_expr ())
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	126 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	127 tree_expression *expr = fcn.special_expr ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	128 if (expr)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	129 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	130 jit_variable *retvar = get_variable ("#return");
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	131 jit_value *retval = visit (expr);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	132 block->append (factory.create<jit_assign> (retvar, retval));
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	133 return_value = retvar;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	134 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	135 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	136 else
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	137 visit_statement_list (*fcn.body ());
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	138
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	139 // the user may use break or continue to exit the function. Because the
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	140 // function does not start as a loop, we can have one continue, one break, or
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	141 // a regular fallthrough to exit the function
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	142 if (continues.size ())
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	143 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	144 assert (! continues.size ());
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	145 finish_breaks (final_block, continues);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	146 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	147 else if (breaks.size ())
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	148 finish_breaks (final_block, breaks);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	149 else
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	150 block->append (factory.create<jit_branch> (final_block));
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	151 blocks.push_back (final_block);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	152 block = final_block;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	153
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	154 if (! return_value && rlist && rlist->size () == 1)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	155 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	156 tree_decl_elt *elt = rlist->front ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	157 return_value = get_variable (elt->name ());
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	158 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	159
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	160 // FIXME: We should use live range analysis to delete variables where needed.
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	161 // For now we just delete everything at the end of the function.
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	162 for (variable_map::iterator iter = vmap.begin (); iter != vmap.end (); ++iter)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	163 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	164 if (iter->second != return_value)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	165 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	166 jit_call *call;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	167 call = factory.create<jit_call> (&jit_typeinfo::destroy,
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	168 iter->second);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	169 final_block->append (call);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	170 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	171 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	172
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	173 if (return_value)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	174 final_block->append (factory.create<jit_return> (return_value));
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	175 else
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	176 final_block->append (factory.create<jit_return> ());
14906 3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	177 }
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	178
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	179 void
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	180 jit_convert::visit_anon_fcn_handle (tree_anon_fcn_handle&)
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	181 {
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	182 throw jit_fail_exception ();
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	183 }
54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	184
54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	185 void
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	186 jit_convert::visit_argument_list (tree_argument_list&)
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	187 {
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	188 throw jit_fail_exception ();
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	189 }
54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	190
54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	191 void
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	192 jit_convert::visit_binary_expression (tree_binary_expression& be)
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	193 {
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	194 if (be.op_type () >= octave_value::num_binary_ops)
14978 f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	195 {
f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	196 tree_boolean_expression *boole;
f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	197 boole = dynamic_cast<tree_boolean_expression *> (&be);
f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	198 assert (boole);
f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	199 bool is_and = boole->op_type () == tree_boolean_expression::bool_and;
f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	200
15027 741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	201 std::string short_name = next_shortcircut_result ();
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	202 jit_variable *short_result = factory.create<jit_variable> (short_name);
14978 f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	203 vmap[short_name] = short_result;
f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	204
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	205 jit_block *done = factory.create<jit_block> (block->name ());
14978 f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	206 tree_expression *lhs = be.lhs ();
f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	207 jit_value *lhsv = visit (lhs);
f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	208 lhsv = create_checked (&jit_typeinfo::logically_true, lhsv);
f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	209
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	210 jit_block *short_early = factory.create<jit_block> ("short_early");
a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	211 blocks.push_back (short_early);
14978 f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	212
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	213 jit_block *short_cont = factory.create<jit_block> ("short_cont");
14978 f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	214
f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	215 if (is_and)
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	216 block->append (factory.create<jit_cond_branch> (lhsv, short_cont, short_early));
14978 f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	217 else
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	218 block->append (factory.create<jit_cond_branch> (lhsv, short_early, short_cont));
14978 f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	219
f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	220 block = short_early;
f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	221
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	222 jit_value *early_result = factory.create<jit_const_bool> (! is_and);
a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	223 block->append (factory.create<jit_assign> (short_result, early_result));
a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	224 block->append (factory.create<jit_branch> (done));
14978 f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	225
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	226 blocks.push_back (short_cont);
14978 f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	227 block = short_cont;
f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	228
f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	229 tree_expression *rhs = be.rhs ();
f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	230 jit_value *rhsv = visit (rhs);
f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	231 rhsv = create_checked (&jit_typeinfo::logically_true, rhsv);
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	232 block->append (factory.create<jit_assign> (short_result, rhsv));
a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	233 block->append (factory.create<jit_branch> (done));
14978 f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	234
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	235 blocks.push_back (done);
14978 f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	236 block = done;
f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	237 result = short_result;
f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	238 }
f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	239 else
f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	240 {
f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	241 tree_expression *lhs = be.lhs ();
f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	242 jit_value *lhsv = visit (lhs);
f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	243
f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	244 tree_expression *rhs = be.rhs ();
f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	245 jit_value *rhsv = visit (rhs);
f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	246
14983 a5f75de0dab1 Rename jit_function to jit_operation Max Brister <max@2bass.com> parents: 14978 diff changeset	247 const jit_operation& fn = jit_typeinfo::binary_op (be.op_type ());
14978 f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	248 result = create_checked (fn, lhsv, rhsv);
f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	249 }
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	250 }
54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	251
54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	252 void
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	253 jit_convert::visit_break_command (tree_break_command&)
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	254 {
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	255 breaks.push_back (block);
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	256 breaking = true;
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	257 }
54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	258
54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	259 void
14936 32deb562ae77 Allow for construction of ranges during jit Max Brister <max@2bass.com> parents: 14935 diff changeset	260 jit_convert::visit_colon_expression (tree_colon_expression& expr)
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	261 {
14936 32deb562ae77 Allow for construction of ranges during jit Max Brister <max@2bass.com> parents: 14935 diff changeset	262 // in the futher we need to add support for classes and deal with rvalues
14944 c0a5ab3b9278 jit_const no longer inherits from jit_instruction Max Brister <max@2bass.com> parents: 14943 diff changeset	263 jit_value *base = visit (expr.base ());
c0a5ab3b9278 jit_const no longer inherits from jit_instruction Max Brister <max@2bass.com> parents: 14943 diff changeset	264 jit_value *limit = visit (expr.limit ());
c0a5ab3b9278 jit_const no longer inherits from jit_instruction Max Brister <max@2bass.com> parents: 14943 diff changeset	265 jit_value *increment;
14936 32deb562ae77 Allow for construction of ranges during jit Max Brister <max@2bass.com> parents: 14935 diff changeset	266 tree_expression *tinc = expr.increment ();
32deb562ae77 Allow for construction of ranges during jit Max Brister <max@2bass.com> parents: 14935 diff changeset	267
32deb562ae77 Allow for construction of ranges during jit Max Brister <max@2bass.com> parents: 14935 diff changeset	268 if (tinc)
32deb562ae77 Allow for construction of ranges during jit Max Brister <max@2bass.com> parents: 14935 diff changeset	269 increment = visit (tinc);
32deb562ae77 Allow for construction of ranges during jit Max Brister <max@2bass.com> parents: 14935 diff changeset	270 else
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	271 increment = factory.create<jit_const_scalar> (1);
14936 32deb562ae77 Allow for construction of ranges during jit Max Brister <max@2bass.com> parents: 14935 diff changeset	272
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	273 result = block->append (factory.create<jit_call> (jit_typeinfo::make_range, base,
14936 32deb562ae77 Allow for construction of ranges during jit Max Brister <max@2bass.com> parents: 14935 diff changeset	274 limit, increment));
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	275 }
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	276
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	277 void
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	278 jit_convert::visit_continue_command (tree_continue_command&)
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	279 {
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	280 continues.push_back (block);
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	281 breaking = true;
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	282 }
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	283
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	284 void
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	285 jit_convert::visit_global_command (tree_global_command&)
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	286 {
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	287 throw jit_fail_exception ();
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	288 }
54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	289
54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	290 void
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	291 jit_convert::visit_persistent_command (tree_persistent_command&)
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	292 {
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	293 throw jit_fail_exception ();
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	294 }
54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	295
54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	296 void
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	297 jit_convert::visit_decl_elt (tree_decl_elt&)
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	298 {
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	299 throw jit_fail_exception ();
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	300 }
54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	301
54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	302 void
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	303 jit_convert::visit_decl_init_list (tree_decl_init_list&)
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	304 {
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	305 throw jit_fail_exception ();
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	306 }
54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	307
54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	308 void
14920 51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	309 jit_convert::visit_simple_for_command (tree_simple_for_command& cmd)
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	310 {
14938 bab44e3ee291 Adding basic error support to JIT Max Brister <max@2bass.com> parents: 14937 diff changeset	311 // Note we do an initial check to see if the loop will run atleast once.
bab44e3ee291 Adding basic error support to JIT Max Brister <max@2bass.com> parents: 14937 diff changeset	312 // This allows us to get better type inference bounds on variables defined
bab44e3ee291 Adding basic error support to JIT Max Brister <max@2bass.com> parents: 14937 diff changeset	313 // and used only inside the for loop (e.g. the index variable)
14920 51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	314
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	315 // If we are a nested for loop we need to store the previous breaks
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	316 assert (! breaking);
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	317 unwind_protect prot;
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	318 prot.protect_var (breaks);
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	319 prot.protect_var (continues);
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	320 prot.protect_var (breaking);
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	321 breaks.clear ();
14989 dfaa8da46364 Support while loops in JIT Max Brister <max@2bass.com> parents: 14988 diff changeset	322 continues.clear ();
14920 51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	323
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	324 // we need a variable for our iterator, because it is used in multiple blocks
15027 741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	325 std::string iter_name = next_iterator ();
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	326 jit_variable *iterator = factory.create<jit_variable> (iter_name);
a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	327 factory.create<jit_variable> (iter_name);
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	328 vmap[iter_name] = iterator;
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	329
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	330 jit_block *body = factory.create<jit_block> ("for_body");
a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	331 jit_block *tail = factory.create<jit_block> ("for_tail");
14920 51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	332
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	333 // do control expression, iter init, and condition check in prev_block (block)
15027 741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	334 // if we are the top level for loop, the bounds is an input argument.
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	335 jit_value *control = find_variable (next_for_bounds ());
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	336 if (! control)
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	337 control = visit (cmd.control_expr ());
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	338 jit_call *init_iter = factory.create<jit_call> (jit_typeinfo::for_init,
a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	339 control);
14920 51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	340 block->append (init_iter);
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	341 block->append (factory.create<jit_assign> (iterator, init_iter));
14959 12fd4a62d633 Fix whitespace issues and update documentation Max Brister <max@2bass.com> parents: 14958 diff changeset	342
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	343 jit_call *check = factory.create<jit_call> (jit_typeinfo::for_check, control,
a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	344 iterator);
a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	345 block->append (check);
a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	346 block->append (factory.create<jit_cond_branch> (check, body, tail));
15233 c27a1e131b16 pt-jit.cc (jit_convert::visit_simple_for_command): Fix block order Max Brister <max@2bass.com> parents: 15230 diff changeset	347
c27a1e131b16 pt-jit.cc (jit_convert::visit_simple_for_command): Fix block order Max Brister <max@2bass.com> parents: 15230 diff changeset	348 blocks.push_back (body);
14920 51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	349 block = body;
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	350
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	351 // compute the syntactical iterator
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	352 jit_call *idx_rhs = factory.create<jit_call> (jit_typeinfo::for_index,
a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	353 control, iterator);
14920 51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	354 block->append (idx_rhs);
14969 bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	355 do_assign (cmd.left_hand_side (), idx_rhs);
14959 12fd4a62d633 Fix whitespace issues and update documentation Max Brister <max@2bass.com> parents: 14958 diff changeset	356
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	357 // do loop
14920 51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	358 tree_statement_list *pt_body = cmd.body ();
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	359 pt_body->accept (*this);
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	360
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	361 if (breaking && continues.empty ())
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	362 {
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	363 // WTF are you doing user? Every branch was a continue, why did you have
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	364 // a loop??? Users are silly people...
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	365 finish_breaks (tail, breaks);
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	366 blocks.push_back (tail);
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	367 block = tail;
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	368 return;
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	369 }
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	370
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	371 // check our condition, continues jump to this block
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	372 jit_block *check_block = factory.create<jit_block> ("for_check");
a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	373 blocks.push_back (check_block);
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	374
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	375 if (! breaking)
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	376 block->append (factory.create<jit_branch> (check_block));
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	377 finish_breaks (check_block, continues);
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	378
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	379 block = check_block;
14983 a5f75de0dab1 Rename jit_function to jit_operation Max Brister <max@2bass.com> parents: 14978 diff changeset	380 const jit_operation& add_fn = jit_typeinfo::binary_op (octave_value::op_add);
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	381 jit_value *one = factory.create<jit_const_index> (1);
a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	382 jit_call *iter_inc = factory.create<jit_call> (add_fn, iterator, one);
14920 51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	383 block->append (iter_inc);
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	384 block->append (factory.create<jit_assign> (iterator, iter_inc));
a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	385 check = block->append (factory.create<jit_call> (jit_typeinfo::for_check, control,
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	386 iterator));
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	387 block->append (factory.create<jit_cond_branch> (check, body, tail));
14920 51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	388
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	389 // breaks will go to our tail
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	390 blocks.push_back (tail);
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	391 finish_breaks (tail, breaks);
14920 51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	392 block = tail;
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	393 }
54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	394
54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	395 void
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	396 jit_convert::visit_complex_for_command (tree_complex_for_command&)
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	397 {
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	398 throw jit_fail_exception ();
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	399 }
54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	400
54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	401 void
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	402 jit_convert::visit_octave_user_script (octave_user_script&)
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	403 {
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	404 throw jit_fail_exception ();
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	405 }
54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	406
14915 cba58541954c Add if support and fix leak with any Max Brister <max@2bass.com> parents: 14913 diff changeset	407 void
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	408 jit_convert::visit_octave_user_function (octave_user_function&)
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	409 {
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	410 throw jit_fail_exception ();
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	411 }
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	412
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	413 void
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	414 jit_convert::visit_octave_user_function_header (octave_user_function&)
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	415 {
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	416 throw jit_fail_exception ();
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	417 }
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	418
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	419 void
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	420 jit_convert::visit_octave_user_function_trailer (octave_user_function&)
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	421 {
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	422 throw jit_fail_exception ();
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	423 }
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	424
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	425 void
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	426 jit_convert::visit_function_def (tree_function_def&)
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	427 {
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	428 throw jit_fail_exception ();
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	429 }
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	430
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	431 void
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	432 jit_convert::visit_identifier (tree_identifier& ti)
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	433 {
15056 bc32288f4a42 Support the end keyword for one dimentional indexing in JIT. Max Brister <max@2bass.com> parents: 15030 diff changeset	434 if (ti.has_magic_end ())
bc32288f4a42 Support the end keyword for one dimentional indexing in JIT. Max Brister <max@2bass.com> parents: 15030 diff changeset	435 {
bc32288f4a42 Support the end keyword for one dimentional indexing in JIT. Max Brister <max@2bass.com> parents: 15030 diff changeset	436 if (!end_context.size ())
bc32288f4a42 Support the end keyword for one dimentional indexing in JIT. Max Brister <max@2bass.com> parents: 15030 diff changeset	437 throw jit_fail_exception ("Illegal end");
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	438 result = block->append (factory.create<jit_magic_end> (end_context));
15056 bc32288f4a42 Support the end keyword for one dimentional indexing in JIT. Max Brister <max@2bass.com> parents: 15030 diff changeset	439 }
bc32288f4a42 Support the end keyword for one dimentional indexing in JIT. Max Brister <max@2bass.com> parents: 15030 diff changeset	440 else
15334 8125773322d4 Error on undefined an unused variables in JIT Max Brister <max@2bass.com> parents: 15311 diff changeset	441 {
8125773322d4 Error on undefined an unused variables in JIT Max Brister <max@2bass.com> parents: 15311 diff changeset	442 jit_variable *var = get_variable (ti.name ());
8125773322d4 Error on undefined an unused variables in JIT Max Brister <max@2bass.com> parents: 15311 diff changeset	443 jit_instruction *instr;
8125773322d4 Error on undefined an unused variables in JIT Max Brister <max@2bass.com> parents: 15311 diff changeset	444 instr = factory.create<jit_call> (&jit_typeinfo::grab, var);
8125773322d4 Error on undefined an unused variables in JIT Max Brister <max@2bass.com> parents: 15311 diff changeset	445 result = block->append (instr);
8125773322d4 Error on undefined an unused variables in JIT Max Brister <max@2bass.com> parents: 15311 diff changeset	446 }
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	447 }
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	448
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	449 void
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	450 jit_convert::visit_if_clause (tree_if_clause&)
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	451 {
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	452 throw jit_fail_exception ();
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	453 }
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	454
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	455 void
14923 168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	456 jit_convert::visit_if_command (tree_if_command& cmd)
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	457 {
14923 168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	458 tree_if_command_list *lst = cmd.cmd_list ();
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	459 assert (lst); // jwe: Can this be null?
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	460 lst->accept (*this);
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	461 }
54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	462
54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	463 void
14923 168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	464 jit_convert::visit_if_command_list (tree_if_command_list& lst)
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	465 {
14923 168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	466 tree_if_clause *last = lst.back ();
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	467 size_t last_else = static_cast<size_t> (last->is_else_clause ());
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	468
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	469 // entry_blocks represents the block you need to enter in order to execute
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	470 // the condition check for the ith clause. For the else, it is simple the
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	471 // else body. If there is no else body, then it is padded with the tail
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	472 std::vector<jit_block *> entry_blocks (lst.size () + 1 - last_else);
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	473 std::vector<jit_block *> branch_blocks (lst.size (), 0); // final blocks
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	474 entry_blocks[0] = block;
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	475
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	476 // we need to construct blocks first, because they have jumps to eachother
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	477 tree_if_command_list::iterator iter = lst.begin ();
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	478 ++iter;
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	479 for (size_t i = 1; iter != lst.end (); ++iter, ++i)
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	480 {
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	481 tree_if_clause tic = iter;
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	482 if (tic->is_else_clause ())
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	483 entry_blocks[i] = factory.create<jit_block> ("else");
14923 168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	484 else
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	485 entry_blocks[i] = factory.create<jit_block> ("ifelse_cond");
14923 168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	486 }
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	487
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	488 jit_block *tail = factory.create<jit_block> ("if_tail");
14923 168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	489 if (! last_else)
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	490 entry_blocks[entry_blocks.size () - 1] = tail;
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	491
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	492 size_t num_incomming = 0; // number of incomming blocks to our tail
14923 168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	493 iter = lst.begin ();
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	494 for (size_t i = 0; iter != lst.end (); ++iter, ++i)
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	495 {
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	496 tree_if_clause tic = iter;
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	497 block = entry_blocks[i];
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	498 assert (block);
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	499
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	500 if (i) // the first block is prev_block, so it has already been added
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	501 blocks.push_back (entry_blocks[i]);
14923 168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	502
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	503 if (! tic->is_else_clause ())
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	504 {
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	505 tree_expression *expr = tic->condition ();
14944 c0a5ab3b9278 jit_const no longer inherits from jit_instruction Max Brister <max@2bass.com> parents: 14943 diff changeset	506 jit_value *cond = visit (expr);
14961 903a5ee2cdde Simplify the creation of error checks in jit Max Brister <max@2bass.com> parents: 14960 diff changeset	507 jit_call *check = create_checked (&jit_typeinfo::logically_true,
903a5ee2cdde Simplify the creation of error checks in jit Max Brister <max@2bass.com> parents: 14960 diff changeset	508 cond);
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	509 jit_block *body = factory.create<jit_block> (i == 0 ? "if_body"
a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	510 : "ifelse_body");
a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	511 blocks.push_back (body);
14923 168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	512
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	513 jit_instruction *br = factory.create<jit_cond_branch> (check, body,
14925 8697e3e9d77a Properly cleanup the low level IR Max Brister <max@2bass.com> parents: 14924 diff changeset	514 entry_blocks[i + 1]);
14923 168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	515 block->append (br);
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	516 block = body;
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	517 }
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	518
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	519 tree_statement_list *stmt_lst = tic->commands ();
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	520 assert (stmt_lst); // jwe: Can this be null?
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	521 stmt_lst->accept (*this);
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	522
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	523 if (breaking)
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	524 breaking = false;
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	525 else
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	526 {
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	527 ++num_incomming;
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	528 block->append (factory.create<jit_branch> (tail));
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	529 }
14923 168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	530 }
168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	531
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	532 if (num_incomming \|\| ! last_else)
14923 168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	533 {
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	534 blocks.push_back (tail);
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	535 block = tail;
14923 168cb10bb9c5 If, ifelse, and else statements JIT compile now Max Brister <max@2bass.com> parents: 14922 diff changeset	536 }
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	537 else
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	538 // every branch broke, so we don't have a tail
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	539 breaking = true;
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	540 }
54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	541
54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	542 void
14951 4c9fd3e31436 Start of jit support for double matricies Max Brister <max@2bass.com> parents: 14949 diff changeset	543 jit_convert::visit_index_expression (tree_index_expression& exp)
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	544 {
15334 8125773322d4 Error on undefined an unused variables in JIT Max Brister <max@2bass.com> parents: 15311 diff changeset	545 result = resolve (exp);
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	546 }
54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	547
54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	548 void
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	549 jit_convert::visit_matrix (tree_matrix&)
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	550 {
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	551 throw jit_fail_exception ();
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	552 }
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	553
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	554 void
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	555 jit_convert::visit_cell (tree_cell&)
14906 3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	556 {
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	557 throw jit_fail_exception ();
14906 3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	558 }
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	559
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	560 void
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	561 jit_convert::visit_multi_assignment (tree_multi_assignment&)
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	562 {
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	563 throw jit_fail_exception ();
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	564 }
54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	565
54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	566 void
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	567 jit_convert::visit_no_op_command (tree_no_op_command&)
14906 3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	568 {
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	569 throw jit_fail_exception ();
14906 3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	570 }
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	571
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	572 void
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	573 jit_convert::visit_constant (tree_constant& tc)
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	574 {
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	575 octave_value v = tc.rvalue1 ();
15311 de9bfcf637df Fix error when compiling with complex matrix (bug #37247) Max Brister <max@2bass.com> parents: 15310 diff changeset	576 if (v.is_real_scalar () && v.is_double_type () && ! v.is_complex_type ())
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	577 {
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	578 double dv = v.double_value ();
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	579 result = factory.create<jit_const_scalar> (dv);
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	580 }
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	581 else if (v.is_range ())
14920 51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	582 {
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	583 Range rv = v.range_value ();
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	584 result = factory.create<jit_const_range> (rv);
14920 51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	585 }
14984 561aad6a9e4b Initial support for complex numbers in JIT Max Brister <max@2bass.com> parents: 14983 diff changeset	586 else if (v.is_complex_scalar ())
561aad6a9e4b Initial support for complex numbers in JIT Max Brister <max@2bass.com> parents: 14983 diff changeset	587 {
561aad6a9e4b Initial support for complex numbers in JIT Max Brister <max@2bass.com> parents: 14983 diff changeset	588 Complex cv = v.complex_value ();
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	589 result = factory.create<jit_const_complex> (cv);
14984 561aad6a9e4b Initial support for complex numbers in JIT Max Brister <max@2bass.com> parents: 14983 diff changeset	590 }
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	591 else
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	592 throw jit_fail_exception ("Unknown constant");
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	593 }
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	594
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	595 void
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	596 jit_convert::visit_fcn_handle (tree_fcn_handle&)
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	597 {
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	598 throw jit_fail_exception ();
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	599 }
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	600
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	601 void
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	602 jit_convert::visit_parameter_list (tree_parameter_list&)
14906 3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	603 {
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	604 throw jit_fail_exception ();
14906 3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	605 }
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	606
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	607 void
15146 709e8928e68c Scalar unary operation support in JIT Max Brister <max@2bass.com> parents: 15140 diff changeset	608 jit_convert::visit_postfix_expression (tree_postfix_expression& tpe)
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	609 {
15146 709e8928e68c Scalar unary operation support in JIT Max Brister <max@2bass.com> parents: 15140 diff changeset	610 octave_value::unary_op etype = tpe.op_type ();
709e8928e68c Scalar unary operation support in JIT Max Brister <max@2bass.com> parents: 15140 diff changeset	611 tree_expression *operand = tpe.operand ();
709e8928e68c Scalar unary operation support in JIT Max Brister <max@2bass.com> parents: 15140 diff changeset	612 jit_value *operandv = visit (operand);
709e8928e68c Scalar unary operation support in JIT Max Brister <max@2bass.com> parents: 15140 diff changeset	613
709e8928e68c Scalar unary operation support in JIT Max Brister <max@2bass.com> parents: 15140 diff changeset	614 const jit_operation& fn = jit_typeinfo::unary_op (etype);
709e8928e68c Scalar unary operation support in JIT Max Brister <max@2bass.com> parents: 15140 diff changeset	615 result = create_checked (fn, operandv);
709e8928e68c Scalar unary operation support in JIT Max Brister <max@2bass.com> parents: 15140 diff changeset	616
709e8928e68c Scalar unary operation support in JIT Max Brister <max@2bass.com> parents: 15140 diff changeset	617 if (etype == octave_value::op_incr \|\| etype == octave_value::op_decr)
709e8928e68c Scalar unary operation support in JIT Max Brister <max@2bass.com> parents: 15140 diff changeset	618 {
15334 8125773322d4 Error on undefined an unused variables in JIT Max Brister <max@2bass.com> parents: 15311 diff changeset	619 jit_value *ret = create_checked (&jit_typeinfo::grab, operandv);
15148 1b2fbc30e4e7 Postfix increment and decrement operations in JIT Max Brister <max@2bass.com> parents: 15147 diff changeset	620 do_assign (operand, result);
1b2fbc30e4e7 Postfix increment and decrement operations in JIT Max Brister <max@2bass.com> parents: 15147 diff changeset	621 result = ret;
15146 709e8928e68c Scalar unary operation support in JIT Max Brister <max@2bass.com> parents: 15140 diff changeset	622 }
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	623 }
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	624
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	625 void
15146 709e8928e68c Scalar unary operation support in JIT Max Brister <max@2bass.com> parents: 15140 diff changeset	626 jit_convert::visit_prefix_expression (tree_prefix_expression& tpe)
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	627 {
15146 709e8928e68c Scalar unary operation support in JIT Max Brister <max@2bass.com> parents: 15140 diff changeset	628 octave_value::unary_op etype = tpe.op_type ();
709e8928e68c Scalar unary operation support in JIT Max Brister <max@2bass.com> parents: 15140 diff changeset	629 tree_expression *operand = tpe.operand ();
709e8928e68c Scalar unary operation support in JIT Max Brister <max@2bass.com> parents: 15140 diff changeset	630 const jit_operation& fn = jit_typeinfo::unary_op (etype);
709e8928e68c Scalar unary operation support in JIT Max Brister <max@2bass.com> parents: 15140 diff changeset	631 result = create_checked (fn, visit (operand));
709e8928e68c Scalar unary operation support in JIT Max Brister <max@2bass.com> parents: 15140 diff changeset	632
709e8928e68c Scalar unary operation support in JIT Max Brister <max@2bass.com> parents: 15140 diff changeset	633 if (etype == octave_value::op_incr \|\| etype == octave_value::op_decr)
709e8928e68c Scalar unary operation support in JIT Max Brister <max@2bass.com> parents: 15140 diff changeset	634 do_assign (operand, result);
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	635 }
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	636
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	637 void
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	638 jit_convert::visit_return_command (tree_return_command&)
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	639 {
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	640 throw jit_fail_exception ();
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	641 }
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	642
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	643 void
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	644 jit_convert::visit_return_list (tree_return_list&)
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	645 {
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	646 throw jit_fail_exception ();
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	647 }
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	648
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	649 void
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	650 jit_convert::visit_simple_assignment (tree_simple_assignment& tsa)
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	651 {
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	652 tree_expression *rhs = tsa.right_hand_side ();
14944 c0a5ab3b9278 jit_const no longer inherits from jit_instruction Max Brister <max@2bass.com> parents: 14943 diff changeset	653 jit_value *rhsv = visit (rhs);
15140 6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15135 diff changeset	654 octave_value::assign_op op = tsa.op_type ();
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15135 diff changeset	655
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15135 diff changeset	656 if (op != octave_value::op_asn_eq)
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15135 diff changeset	657 {
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15135 diff changeset	658 // do the equivlent binary operation, then assign. This is always correct,
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15135 diff changeset	659 // but isn't always optimal.
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15135 diff changeset	660 tree_expression *lhs = tsa.left_hand_side ();
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15135 diff changeset	661 jit_value *lhsv = visit (lhs);
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15135 diff changeset	662 octave_value::binary_op bop = octave_value::assign_op_to_binary_op (op);
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15135 diff changeset	663 const jit_operation& fn = jit_typeinfo::binary_op (bop);
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15135 diff changeset	664 rhsv = create_checked (fn, lhsv, rhsv);
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15135 diff changeset	665 }
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	666
14978 f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	667 result = do_assign (tsa.left_hand_side (), rhsv);
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	668 }
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	669
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	670 void
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	671 jit_convert::visit_statement (tree_statement& stmt)
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	672 {
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	673 tree_command *cmd = stmt.command ();
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	674 tree_expression *expr = stmt.expression ();
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	675
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	676 if (cmd)
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	677 visit (cmd);
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	678 else
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	679 {
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	680 // stolen from tree_evaluator::visit_statement
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	681 bool do_bind_ans = false;
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	682
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	683 if (expr->is_identifier ())
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	684 {
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	685 tree_identifier id = dynamic_cast<tree_identifier > (expr);
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	686
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	687 do_bind_ans = (! id->is_variable ());
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	688 }
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	689 else
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	690 do_bind_ans = (! expr->is_assignment_expression ());
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	691
14944 c0a5ab3b9278 jit_const no longer inherits from jit_instruction Max Brister <max@2bass.com> parents: 14943 diff changeset	692 jit_value *expr_result = visit (expr);
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	693
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	694 if (do_bind_ans)
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	695 do_assign ("ans", expr_result, expr->print_result ());
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	696 else if (expr->is_identifier () && expr->print_result ())
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	697 {
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	698 // FIXME: ugly hack, we need to come up with a way to pass
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	699 // nargout to visit_identifier
14983 a5f75de0dab1 Rename jit_function to jit_operation Max Brister <max@2bass.com> parents: 14978 diff changeset	700 const jit_operation& fn = jit_typeinfo::print_value ();
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	701 jit_const_string *name = factory.create<jit_const_string> (expr->name ());
a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	702 block->append (factory.create<jit_call> (fn, name, expr_result));
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	703 }
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	704 }
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	705 }
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	706
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	707 void
14920 51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	708 jit_convert::visit_statement_list (tree_statement_list& lst)
14906 3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	709 {
14920 51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	710 for (tree_statement_list::iterator iter = lst.begin (); iter != lst.end();
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	711 ++iter)
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	712 {
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	713 tree_statement elt = iter;
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	714 // jwe: Can this ever be null?
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	715 assert (elt);
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	716 elt->accept (*this);
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	717
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	718 if (breaking)
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	719 break;
14920 51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	720 }
14906 3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	721 }
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	722
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	723 void
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	724 jit_convert::visit_switch_case (tree_switch_case&)
14906 3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	725 {
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	726 throw jit_fail_exception ();
14906 3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	727 }
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	728
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	729 void
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	730 jit_convert::visit_switch_case_list (tree_switch_case_list&)
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	731 {
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	732 throw jit_fail_exception ();
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	733 }
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	734
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	735 void
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	736 jit_convert::visit_switch_command (tree_switch_command&)
14906 3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	737 {
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	738 throw jit_fail_exception ();
14906 3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	739 }
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	740
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	741 void
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	742 jit_convert::visit_try_catch_command (tree_try_catch_command&)
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	743 {
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	744 throw jit_fail_exception ();
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	745 }
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	746
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	747 void
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	748 jit_convert::visit_unwind_protect_command (tree_unwind_protect_command&)
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	749 {
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	750 throw jit_fail_exception ();
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	751 }
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	752
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	753 void
14989 dfaa8da46364 Support while loops in JIT Max Brister <max@2bass.com> parents: 14988 diff changeset	754 jit_convert::visit_while_command (tree_while_command& wc)
14906 3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	755 {
14989 dfaa8da46364 Support while loops in JIT Max Brister <max@2bass.com> parents: 14988 diff changeset	756 assert (! breaking);
dfaa8da46364 Support while loops in JIT Max Brister <max@2bass.com> parents: 14988 diff changeset	757 unwind_protect prot;
dfaa8da46364 Support while loops in JIT Max Brister <max@2bass.com> parents: 14988 diff changeset	758 prot.protect_var (breaks);
dfaa8da46364 Support while loops in JIT Max Brister <max@2bass.com> parents: 14988 diff changeset	759 prot.protect_var (continues);
dfaa8da46364 Support while loops in JIT Max Brister <max@2bass.com> parents: 14988 diff changeset	760 prot.protect_var (breaking);
dfaa8da46364 Support while loops in JIT Max Brister <max@2bass.com> parents: 14988 diff changeset	761 breaks.clear ();
dfaa8da46364 Support while loops in JIT Max Brister <max@2bass.com> parents: 14988 diff changeset	762 continues.clear ();
dfaa8da46364 Support while loops in JIT Max Brister <max@2bass.com> parents: 14988 diff changeset	763
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	764 jit_block *cond_check = factory.create<jit_block> ("while_cond_check");
a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	765 block->append (factory.create<jit_branch> (cond_check));
a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	766 blocks.push_back (cond_check);
14989 dfaa8da46364 Support while loops in JIT Max Brister <max@2bass.com> parents: 14988 diff changeset	767 block = cond_check;
dfaa8da46364 Support while loops in JIT Max Brister <max@2bass.com> parents: 14988 diff changeset	768
dfaa8da46364 Support while loops in JIT Max Brister <max@2bass.com> parents: 14988 diff changeset	769 tree_expression *expr = wc.condition ();
dfaa8da46364 Support while loops in JIT Max Brister <max@2bass.com> parents: 14988 diff changeset	770 assert (expr && "While expression can not be null");
dfaa8da46364 Support while loops in JIT Max Brister <max@2bass.com> parents: 14988 diff changeset	771 jit_value *check = visit (expr);
dfaa8da46364 Support while loops in JIT Max Brister <max@2bass.com> parents: 14988 diff changeset	772 check = create_checked (&jit_typeinfo::logically_true, check);
dfaa8da46364 Support while loops in JIT Max Brister <max@2bass.com> parents: 14988 diff changeset	773
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	774 jit_block *body = factory.create<jit_block> ("while_body");
a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	775 blocks.push_back (body);
14989 dfaa8da46364 Support while loops in JIT Max Brister <max@2bass.com> parents: 14988 diff changeset	776
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	777 jit_block *tail = factory.create<jit_block> ("while_tail");
a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	778 block->append (factory.create<jit_cond_branch> (check, body, tail));
14989 dfaa8da46364 Support while loops in JIT Max Brister <max@2bass.com> parents: 14988 diff changeset	779 block = body;
dfaa8da46364 Support while loops in JIT Max Brister <max@2bass.com> parents: 14988 diff changeset	780
dfaa8da46364 Support while loops in JIT Max Brister <max@2bass.com> parents: 14988 diff changeset	781 tree_statement_list *loop_body = wc.body ();
dfaa8da46364 Support while loops in JIT Max Brister <max@2bass.com> parents: 14988 diff changeset	782 if (loop_body)
dfaa8da46364 Support while loops in JIT Max Brister <max@2bass.com> parents: 14988 diff changeset	783 loop_body->accept (*this);
dfaa8da46364 Support while loops in JIT Max Brister <max@2bass.com> parents: 14988 diff changeset	784
dfaa8da46364 Support while loops in JIT Max Brister <max@2bass.com> parents: 14988 diff changeset	785 finish_breaks (tail, breaks);
dfaa8da46364 Support while loops in JIT Max Brister <max@2bass.com> parents: 14988 diff changeset	786 finish_breaks (cond_check, continues);
dfaa8da46364 Support while loops in JIT Max Brister <max@2bass.com> parents: 14988 diff changeset	787
dfaa8da46364 Support while loops in JIT Max Brister <max@2bass.com> parents: 14988 diff changeset	788 if (! breaking)
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	789 block->append (factory.create<jit_branch> (cond_check));
14989 dfaa8da46364 Support while loops in JIT Max Brister <max@2bass.com> parents: 14988 diff changeset	790
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	791 blocks.push_back (tail);
14989 dfaa8da46364 Support while loops in JIT Max Brister <max@2bass.com> parents: 14988 diff changeset	792 block = tail;
14906 3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	793 }
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	794
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	795 void
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	796 jit_convert::visit_do_until_command (tree_do_until_command&)
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	797 {
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	798 throw jit_fail_exception ();
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	799 }
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	800
15337 3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	801 void
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	802 jit_convert::initialize (symbol_table::scope_id s)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	803 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	804 scope = s;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	805 iterator_count = 0;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	806 for_bounds_count = 0;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	807 short_count = 0;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	808 breaking = false;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	809 jit_instruction::reset_ids ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	810
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	811 entry_block = factory.create<jit_block> ("body");
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	812 final_block = factory.create<jit_block> ("final");
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	813 blocks.push_back (entry_block);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	814 entry_block->mark_alive ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	815 block = entry_block;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	816 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	817
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	818 jit_call *
a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	819 jit_convert::create_checked_impl (jit_call *ret)
14963 709f50069722 Change algorithm for placing releases and simplify PHIs in low level Octave IR Max Brister <max@2bass.com> parents: 14962 diff changeset	820 {
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	821 block->append (ret);
14963 709f50069722 Change algorithm for placing releases and simplify PHIs in low level Octave IR Max Brister <max@2bass.com> parents: 14962 diff changeset	822
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	823 jit_block *normal = factory.create<jit_block> (block->name ());
a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	824 jit_error_check *check = factory.create<jit_error_check> (ret, normal,
a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	825 final_block);
a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	826 block->append (check);
a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	827 blocks.push_back (normal);
a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	828 block = normal;
a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	829
a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	830 return ret;
14963 709f50069722 Change algorithm for placing releases and simplify PHIs in low level Octave IR Max Brister <max@2bass.com> parents: 14962 diff changeset	831 }
709f50069722 Change algorithm for placing releases and simplify PHIs in low level Octave IR Max Brister <max@2bass.com> parents: 14962 diff changeset	832
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	833 jit_variable *
15027 741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	834 jit_convert::find_variable (const std::string& vname) const
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	835 {
15191 ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	836 variable_map::const_iterator iter;
15027 741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	837 iter = vmap.find (vname);
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	838 return iter != vmap.end () ? iter->second : 0;
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	839 }
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	840
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	841 jit_variable *
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	842 jit_convert::get_variable (const std::string& vname)
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	843 {
15027 741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	844 jit_variable *ret = find_variable (vname);
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	845 if (ret)
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	846 return ret;
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	847
15337 3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	848 symbol_table::symbol_record record = symbol_table::find_symbol (vname, scope);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	849 if (record.is_persistent () \|\| record.is_global ())
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	850 throw jit_fail_exception ("Persistent and global not yet supported");
15230 b0c08e995950 pt-jit.cc (jit_convert::get_variable): Add type bound Max Brister <max@2bass.com> parents: 15195 diff changeset	851
15337 3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	852 if (converting_function)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	853 return create_variable (vname, jit_typeinfo::get_any (), false);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	854 else
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	855 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	856 octave_value val = record.varval ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	857 jit_type *type = jit_typeinfo::type_of (val);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	858 bounds.push_back (type_bound (type, vname));
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	859
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	860 return create_variable (vname, type);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	861 }
15027 741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	862 }
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	863
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	864 jit_variable *
15337 3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	865 jit_convert::create_variable (const std::string& vname, jit_type *type,
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	866 bool isarg)
15027 741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	867 {
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	868 jit_variable *var = factory.create<jit_variable> (vname);
15337 3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	869
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	870 if (isarg)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	871 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	872 jit_extract_argument *extract;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	873 extract = factory.create<jit_extract_argument> (type, var);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	874 entry_block->prepend (extract);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	875 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	876 else
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	877 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	878 jit_call *init = factory.create<jit_call> (&jit_typeinfo::create_undef);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	879 jit_assign *assign = factory.create<jit_assign> (var, init);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	880 entry_block->prepend (assign);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	881 entry_block->prepend (init);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	882 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	883
15027 741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	884 return vmap[vname] = var;
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	885 }
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	886
15027 741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	887 std::string
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	888 jit_convert::next_name (const char *prefix, size_t& count, bool inc)
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	889 {
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	890 std::stringstream ss;
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	891 ss << prefix << count;
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	892 if (inc)
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	893 ++count;
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	894 return ss.str ();
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	895 }
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	896
15067 df4538e3b50b ND scalar indexing in JIT. Max Brister <max@2bass.com> parents: 15056 diff changeset	897 jit_instruction *
15334 8125773322d4 Error on undefined an unused variables in JIT Max Brister <max@2bass.com> parents: 15311 diff changeset	898 jit_convert::resolve (tree_index_expression& exp, jit_value *extra_arg,
8125773322d4 Error on undefined an unused variables in JIT Max Brister <max@2bass.com> parents: 15311 diff changeset	899 bool lhs)
14969 bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	900 {
bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	901 std::string type = exp.type_tags ();
bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	902 if (! (type.size () == 1 && type[0] == '('))
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	903 throw jit_fail_exception ("Unsupported index operation");
14969 bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	904
bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	905 std::list<tree_argument_list *> args = exp.arg_lists ();
bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	906 if (args.size () != 1)
15334 8125773322d4 Error on undefined an unused variables in JIT Max Brister <max@2bass.com> parents: 15311 diff changeset	907 throw jit_fail_exception ("Bad number of arguments in "
8125773322d4 Error on undefined an unused variables in JIT Max Brister <max@2bass.com> parents: 15311 diff changeset	908 "tree_index_expression");
14969 bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	909
bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	910 tree_argument_list *arg_list = args.front ();
bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	911 if (! arg_list)
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	912 throw jit_fail_exception ("null argument list");
14969 bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	913
15067 df4538e3b50b ND scalar indexing in JIT. Max Brister <max@2bass.com> parents: 15056 diff changeset	914 if (arg_list->size () < 1)
df4538e3b50b ND scalar indexing in JIT. Max Brister <max@2bass.com> parents: 15056 diff changeset	915 throw jit_fail_exception ("Empty arg_list");
14969 bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	916
bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	917 tree_expression *tree_object = exp.expression ();
15334 8125773322d4 Error on undefined an unused variables in JIT Max Brister <max@2bass.com> parents: 15311 diff changeset	918 jit_value *object;
8125773322d4 Error on undefined an unused variables in JIT Max Brister <max@2bass.com> parents: 15311 diff changeset	919 if (lhs)
8125773322d4 Error on undefined an unused variables in JIT Max Brister <max@2bass.com> parents: 15311 diff changeset	920 {
8125773322d4 Error on undefined an unused variables in JIT Max Brister <max@2bass.com> parents: 15311 diff changeset	921 tree_identifier id = dynamic_cast<tree_identifier > (tree_object);
8125773322d4 Error on undefined an unused variables in JIT Max Brister <max@2bass.com> parents: 15311 diff changeset	922 if (! id)
8125773322d4 Error on undefined an unused variables in JIT Max Brister <max@2bass.com> parents: 15311 diff changeset	923 throw jit_fail_exception ("expected identifier");
8125773322d4 Error on undefined an unused variables in JIT Max Brister <max@2bass.com> parents: 15311 diff changeset	924 object = get_variable (id->name ());
8125773322d4 Error on undefined an unused variables in JIT Max Brister <max@2bass.com> parents: 15311 diff changeset	925 }
8125773322d4 Error on undefined an unused variables in JIT Max Brister <max@2bass.com> parents: 15311 diff changeset	926 else
8125773322d4 Error on undefined an unused variables in JIT Max Brister <max@2bass.com> parents: 15311 diff changeset	927 object = visit (tree_object);
15056 bc32288f4a42 Support the end keyword for one dimentional indexing in JIT. Max Brister <max@2bass.com> parents: 15030 diff changeset	928
15067 df4538e3b50b ND scalar indexing in JIT. Max Brister <max@2bass.com> parents: 15056 diff changeset	929 size_t narg = arg_list->size ();
df4538e3b50b ND scalar indexing in JIT. Max Brister <max@2bass.com> parents: 15056 diff changeset	930 tree_argument_list::iterator iter = arg_list->begin ();
15068 f57d7578c1a6 Support ND matrix indexing with scalar assignment in JIT. Max Brister <max@2bass.com> parents: 15067 diff changeset	931 bool have_extra = extra_arg;
f57d7578c1a6 Support ND matrix indexing with scalar assignment in JIT. Max Brister <max@2bass.com> parents: 15067 diff changeset	932 std::vector<jit_value *> call_args (narg + 1 + have_extra);
15067 df4538e3b50b ND scalar indexing in JIT. Max Brister <max@2bass.com> parents: 15056 diff changeset	933 call_args[0] = object;
15056 bc32288f4a42 Support the end keyword for one dimentional indexing in JIT. Max Brister <max@2bass.com> parents: 15030 diff changeset	934
15067 df4538e3b50b ND scalar indexing in JIT. Max Brister <max@2bass.com> parents: 15056 diff changeset	935 for (size_t idx = 0; iter != arg_list->end (); ++idx, ++iter)
df4538e3b50b ND scalar indexing in JIT. Max Brister <max@2bass.com> parents: 15056 diff changeset	936 {
df4538e3b50b ND scalar indexing in JIT. Max Brister <max@2bass.com> parents: 15056 diff changeset	937 unwind_protect prot;
df4538e3b50b ND scalar indexing in JIT. Max Brister <max@2bass.com> parents: 15056 diff changeset	938 prot.add_method (&end_context,
df4538e3b50b ND scalar indexing in JIT. Max Brister <max@2bass.com> parents: 15056 diff changeset	939 &std::vector<jit_magic_end::context>::pop_back);
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	940
a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	941 jit_magic_end::context ctx (factory, object, idx, narg);
a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	942 end_context.push_back (ctx);
15067 df4538e3b50b ND scalar indexing in JIT. Max Brister <max@2bass.com> parents: 15056 diff changeset	943 call_args[idx + 1] = visit (*iter);
df4538e3b50b ND scalar indexing in JIT. Max Brister <max@2bass.com> parents: 15056 diff changeset	944 }
14969 bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	945
15068 f57d7578c1a6 Support ND matrix indexing with scalar assignment in JIT. Max Brister <max@2bass.com> parents: 15067 diff changeset	946 if (extra_arg)
f57d7578c1a6 Support ND matrix indexing with scalar assignment in JIT. Max Brister <max@2bass.com> parents: 15067 diff changeset	947 call_args[call_args.size () - 1] = extra_arg;
f57d7578c1a6 Support ND matrix indexing with scalar assignment in JIT. Max Brister <max@2bass.com> parents: 15067 diff changeset	948
15334 8125773322d4 Error on undefined an unused variables in JIT Max Brister <max@2bass.com> parents: 15311 diff changeset	949 const jit_operation& fres = lhs ? jit_typeinfo::paren_subsasgn ()
8125773322d4 Error on undefined an unused variables in JIT Max Brister <max@2bass.com> parents: 15311 diff changeset	950 : jit_typeinfo::paren_subsref ();
8125773322d4 Error on undefined an unused variables in JIT Max Brister <max@2bass.com> parents: 15311 diff changeset	951
15067 df4538e3b50b ND scalar indexing in JIT. Max Brister <max@2bass.com> parents: 15056 diff changeset	952 return create_checked (fres, call_args);
14969 bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	953 }
bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	954
bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	955 jit_value *
bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	956 jit_convert::do_assign (tree_expression exp, jit_value rhs, bool artificial)
bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	957 {
bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	958 if (! exp)
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	959 throw jit_fail_exception ("NULL lhs in assign");
14969 bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	960
bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	961 if (isa<tree_identifier> (exp))
bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	962 return do_assign (exp->name (), rhs, exp->print_result (), artificial);
bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	963 else if (tree_index_expression *idx
bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	964 = dynamic_cast<tree_index_expression *> (exp))
bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	965 {
15334 8125773322d4 Error on undefined an unused variables in JIT Max Brister <max@2bass.com> parents: 15311 diff changeset	966 jit_value new_object = resolve (idx, rhs, true);
14969 bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	967 do_assign (idx->expression (), new_object, true);
bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	968
bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	969 // FIXME: Will not work for values that must be release/grabed
bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	970 return rhs;
bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	971 }
bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	972 else
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	973 throw jit_fail_exception ("Unsupported assignment");
14969 bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	974 }
bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	975
14944 c0a5ab3b9278 jit_const no longer inherits from jit_instruction Max Brister <max@2bass.com> parents: 14943 diff changeset	976 jit_value *
c0a5ab3b9278 jit_const no longer inherits from jit_instruction Max Brister <max@2bass.com> parents: 14943 diff changeset	977 jit_convert::do_assign (const std::string& lhs, jit_value *rhs,
14969 bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	978 bool print, bool artificial)
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	979 {
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	980 jit_variable *var = get_variable (lhs);
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	981 jit_assign *assign = block->append (factory.create<jit_assign> (var, rhs));
14969 bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	982
bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	983 if (artificial)
bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	984 assign->mark_artificial ();
14906 3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	985
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	986 if (print)
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	987 {
14983 a5f75de0dab1 Rename jit_function to jit_operation Max Brister <max@2bass.com> parents: 14978 diff changeset	988 const jit_operation& print_fn = jit_typeinfo::print_value ();
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	989 jit_const_string *name = factory.create<jit_const_string> (lhs);
a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	990 block->append (factory.create<jit_call> (print_fn, name, var));
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	991 }
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	992
14944 c0a5ab3b9278 jit_const no longer inherits from jit_instruction Max Brister <max@2bass.com> parents: 14943 diff changeset	993 return var;
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	994 }
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	995
14944 c0a5ab3b9278 jit_const no longer inherits from jit_instruction Max Brister <max@2bass.com> parents: 14943 diff changeset	996 jit_value *
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	997 jit_convert::visit (tree& tee)
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	998 {
15146 709e8928e68c Scalar unary operation support in JIT Max Brister <max@2bass.com> parents: 15140 diff changeset	999 unwind_protect prot;
709e8928e68c Scalar unary operation support in JIT Max Brister <max@2bass.com> parents: 15140 diff changeset	1000 prot.protect_var (result);
14906 3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1001
15146 709e8928e68c Scalar unary operation support in JIT Max Brister <max@2bass.com> parents: 15140 diff changeset	1002 tee.accept (*this);
709e8928e68c Scalar unary operation support in JIT Max Brister <max@2bass.com> parents: 15140 diff changeset	1003 return result;
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1004 }
14906 3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1005
14920 51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1006 void
14935 5801e031a3b5 Place releases after last use and generalize dom visiting Max Brister <max@2bass.com> parents: 14932 diff changeset	1007 jit_convert::finish_breaks (jit_block *dest, const block_list& lst)
5801e031a3b5 Place releases after last use and generalize dom visiting Max Brister <max@2bass.com> parents: 14932 diff changeset	1008 {
5801e031a3b5 Place releases after last use and generalize dom visiting Max Brister <max@2bass.com> parents: 14932 diff changeset	1009 for (block_list::const_iterator iter = lst.begin (); iter != lst.end ();
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	1010 ++iter)
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	1011 {
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	1012 jit_block b = iter;
15182 a7a56b436de2 Factor out jit_block_list and jit_factory from jit_convert Max Brister <max@2bass.com> parents: 15181 diff changeset	1013 b->append (factory.create<jit_branch> (dest));
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	1014 }
14920 51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1015 }
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1016
15191 ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1017 // -------------------- jit_convert_llvm --------------------
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1018 llvm::Function *
15337 3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1019 jit_convert_llvm::convert_loop (llvm::Module *module,
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1020 const jit_block_list& blocks,
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1021 const std::list<jit_value *>& constants)
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1022 {
15337 3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1023 converting_function = false;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1024
15191 ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1025 // for now just init arguments from entry, later we will have to do something
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1026 // more interesting
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1027 jit_block *entry_block = blocks.front ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1028 for (jit_block::iterator iter = entry_block->begin ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1029 iter != entry_block->end (); ++iter)
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1030 if (jit_extract_argument *extract
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1031 = dynamic_cast<jit_extract_argument > (iter))
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1032 argument_vec.push_back (std::make_pair (extract->name (), true));
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1033
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1034
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1035 jit_type *any = jit_typeinfo::get_any ();
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	1036
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1037 // argument is an array of octave_base_value, or octave_base_value*
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1038 llvm::Type arg_type = any->to_llvm (); // this is octave_base_value
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1039 arg_type = arg_type->getPointerTo ();
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1040 llvm::FunctionType *ft = llvm::FunctionType::get (llvm::Type::getVoidTy (context),
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1041 arg_type, false);
14920 51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1042 function = llvm::Function::Create (ft, llvm::Function::ExternalLinkage,
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1043 "foobar", module);
14906 3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1044
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1045 try
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1046 {
14968 7f60cdfcc0e5 Do not smash stack when passing structures in JIT Max Brister <max@2bass.com> parents: 14967 diff changeset	1047 prelude = llvm::BasicBlock::Create (context, "prelude", function);
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1048 builder.SetInsertPoint (prelude);
14906 3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1049
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1050 llvm::Value *arg = function->arg_begin ();
15191 ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1051 for (size_t i = 0; i < argument_vec.size (); ++i)
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1052 {
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1053 llvm::Value *loaded_arg = builder.CreateConstInBoundsGEP1_32 (arg, i);
15191 ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1054 arguments[argument_vec[i].first] = loaded_arg;
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1055 }
14906 3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1056
15337 3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1057 convert (blocks, constants);
14920 51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1058 } catch (const jit_fail_exception& e)
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1059 {
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1060 function->eraseFromParent ();
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1061 throw;
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1062 }
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1063
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1064 return function;
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	1065 }
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	1066
15337 3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1067
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1068 jit_function
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1069 jit_convert_llvm::convert_function (llvm::Module *module,
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1070 const jit_block_list& blocks,
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1071 const std::list<jit_value *>& constants,
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1072 octave_user_function& fcn,
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1073 const std::vector<jit_type *>& args)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1074 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1075 converting_function = true;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1076
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1077 jit_block *final_block = blocks.back ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1078 jit_return ret = dynamic_cast<jit_return > (final_block->back ());
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1079 assert (ret);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1080
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1081 jit_function creating = jit_function (module, jit_convention::internal,
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1082 "foobar", ret->result_type (), args);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1083 function = creating.to_llvm ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1084
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1085 try
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1086 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1087 prelude = creating.new_block ("prelude");
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1088 builder.SetInsertPoint (prelude);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1089
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1090 tree_parameter_list *plist = fcn.parameter_list ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1091 if (plist)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1092 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1093 tree_parameter_list::iterator piter = plist->begin ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1094 tree_parameter_list::iterator pend = plist->end ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1095 for (size_t i = 0; i < args.size () && piter != pend; ++i, ++piter)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1096 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1097 tree_decl_elt elt = piter;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1098 std::string arg_name = elt->name ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1099 arguments[arg_name] = creating.argument (builder, i);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1100 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1101 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1102
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1103 convert (blocks, constants);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1104 } catch (const jit_fail_exception& e)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1105 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1106 function->eraseFromParent ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1107 throw;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1108 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1109
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1110 return creating;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1111 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1112
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1113 void
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1114 jit_convert_llvm::convert (const jit_block_list& blocks,
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1115 const std::list<jit_value *>& constants)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1116 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1117 std::list<jit_block *>::const_iterator biter;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1118 for (biter = blocks.begin (); biter != blocks.end (); ++biter)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1119 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1120 jit_block jblock = biter;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1121 llvm::BasicBlock *block = llvm::BasicBlock::Create (context,
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1122 jblock->name (),
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1123 function);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1124 jblock->stash_llvm (block);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1125 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1126
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1127 jit_block first = blocks.begin ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1128 builder.CreateBr (first->to_llvm ());
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1129
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1130 // constants aren't in the IR, we visit those first
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1131 for (std::list<jit_value *>::const_iterator iter = constants.begin ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1132 iter != constants.end (); ++iter)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1133 if (! isa<jit_instruction> (*iter))
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1134 visit (*iter);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1135
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1136 // convert all instructions
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1137 for (biter = blocks.begin (); biter != blocks.end (); ++biter)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1138 visit (*biter);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1139
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1140 // now finish phi nodes
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1141 for (biter = blocks.begin (); biter != blocks.end (); ++biter)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1142 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1143 jit_block& block = **biter;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1144 for (jit_block::iterator piter = block.begin ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1145 piter != block.end () && isa<jit_phi> (*piter); ++piter)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1146 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1147 jit_instruction phi = piter;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1148 finish_phi (static_cast<jit_phi *> (phi));
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1149 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1150 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1151 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1152
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	1153 void
15181 ed2b911a2fb3 Rename jit_convert::convert_llvm to jit_convert_llvm Max Brister <max@2bass.com> parents: 15171 diff changeset	1154 jit_convert_llvm::finish_phi (jit_phi *phi)
14935 5801e031a3b5 Place releases after last use and generalize dom visiting Max Brister <max@2bass.com> parents: 14932 diff changeset	1155 {
14963 709f50069722 Change algorithm for placing releases and simplify PHIs in low level Octave IR Max Brister <max@2bass.com> parents: 14962 diff changeset	1156 llvm::PHINode *llvm_phi = phi->to_llvm ();
709f50069722 Change algorithm for placing releases and simplify PHIs in low level Octave IR Max Brister <max@2bass.com> parents: 14962 diff changeset	1157 for (size_t i = 0; i < phi->argument_count (); ++i)
14935 5801e031a3b5 Place releases after last use and generalize dom visiting Max Brister <max@2bass.com> parents: 14932 diff changeset	1158 {
14963 709f50069722 Change algorithm for placing releases and simplify PHIs in low level Octave IR Max Brister <max@2bass.com> parents: 14962 diff changeset	1159 llvm::BasicBlock *pred = phi->incomming_llvm (i);
709f50069722 Change algorithm for placing releases and simplify PHIs in low level Octave IR Max Brister <max@2bass.com> parents: 14962 diff changeset	1160 llvm_phi->addIncoming (phi->argument_llvm (i), pred);
14935 5801e031a3b5 Place releases after last use and generalize dom visiting Max Brister <max@2bass.com> parents: 14932 diff changeset	1161 }
5801e031a3b5 Place releases after last use and generalize dom visiting Max Brister <max@2bass.com> parents: 14932 diff changeset	1162 }
5801e031a3b5 Place releases after last use and generalize dom visiting Max Brister <max@2bass.com> parents: 14932 diff changeset	1163
5801e031a3b5 Place releases after last use and generalize dom visiting Max Brister <max@2bass.com> parents: 14932 diff changeset	1164 void
15181 ed2b911a2fb3 Rename jit_convert::convert_llvm to jit_convert_llvm Max Brister <max@2bass.com> parents: 15171 diff changeset	1165 jit_convert_llvm::visit (jit_const_string& cs)
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1166 {
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1167 cs.stash_llvm (builder.CreateGlobalStringPtr (cs.value ()));
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1168 }
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1169
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1170 void
15181 ed2b911a2fb3 Rename jit_convert::convert_llvm to jit_convert_llvm Max Brister <max@2bass.com> parents: 15171 diff changeset	1171 jit_convert_llvm::visit (jit_const_bool& cb)
14978 f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	1172 {
f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	1173 cb.stash_llvm (llvm::ConstantInt::get (cb.type_llvm (), cb.value ()));
f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	1174 }
f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	1175
f649b66ef1af Add short circult operators to JIT Max Brister <max@2bass.com> parents: 14977 diff changeset	1176 void
15181 ed2b911a2fb3 Rename jit_convert::convert_llvm to jit_convert_llvm Max Brister <max@2bass.com> parents: 15171 diff changeset	1177 jit_convert_llvm::visit (jit_const_scalar& cs)
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1178 {
14920 51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1179 cs.stash_llvm (llvm::ConstantFP::get (cs.type_llvm (), cs.value ()));
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1180 }
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1181
14984 561aad6a9e4b Initial support for complex numbers in JIT Max Brister <max@2bass.com> parents: 14983 diff changeset	1182 void
15181 ed2b911a2fb3 Rename jit_convert::convert_llvm to jit_convert_llvm Max Brister <max@2bass.com> parents: 15171 diff changeset	1183 jit_convert_llvm::visit (jit_const_complex& cc)
14984 561aad6a9e4b Initial support for complex numbers in JIT Max Brister <max@2bass.com> parents: 14983 diff changeset	1184 {
561aad6a9e4b Initial support for complex numbers in JIT Max Brister <max@2bass.com> parents: 14983 diff changeset	1185 llvm::Type *scalar_t = jit_typeinfo::get_scalar_llvm ();
561aad6a9e4b Initial support for complex numbers in JIT Max Brister <max@2bass.com> parents: 14983 diff changeset	1186 llvm::Constant *values[2];
561aad6a9e4b Initial support for complex numbers in JIT Max Brister <max@2bass.com> parents: 14983 diff changeset	1187 Complex value = cc.value ();
561aad6a9e4b Initial support for complex numbers in JIT Max Brister <max@2bass.com> parents: 14983 diff changeset	1188 values[0] = llvm::ConstantFP::get (scalar_t, value.real ());
561aad6a9e4b Initial support for complex numbers in JIT Max Brister <max@2bass.com> parents: 14983 diff changeset	1189 values[1] = llvm::ConstantFP::get (scalar_t, value.imag ());
561aad6a9e4b Initial support for complex numbers in JIT Max Brister <max@2bass.com> parents: 14983 diff changeset	1190 cc.stash_llvm (llvm::ConstantVector::get (values));
561aad6a9e4b Initial support for complex numbers in JIT Max Brister <max@2bass.com> parents: 14983 diff changeset	1191 }
561aad6a9e4b Initial support for complex numbers in JIT Max Brister <max@2bass.com> parents: 14983 diff changeset	1192
15181 ed2b911a2fb3 Rename jit_convert::convert_llvm to jit_convert_llvm Max Brister <max@2bass.com> parents: 15171 diff changeset	1193 void jit_convert_llvm::visit (jit_const_index& ci)
14920 51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1194 {
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1195 ci.stash_llvm (llvm::ConstantInt::get (ci.type_llvm (), ci.value ()));
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1196 }
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1197
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1198 void
15181 ed2b911a2fb3 Rename jit_convert::convert_llvm to jit_convert_llvm Max Brister <max@2bass.com> parents: 15171 diff changeset	1199 jit_convert_llvm::visit (jit_const_range& cr)
14920 51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1200 {
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1201 llvm::StructType *stype = llvm::cast<llvm::StructType>(cr.type_llvm ());
14951 4c9fd3e31436 Start of jit support for double matricies Max Brister <max@2bass.com> parents: 14949 diff changeset	1202 llvm::Type *scalar_t = jit_typeinfo::get_scalar_llvm ();
14920 51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1203 llvm::Type *idx = jit_typeinfo::get_index_llvm ();
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1204 const jit_range& rng = cr.value ();
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1205
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1206 llvm::Constant *constants[4];
14951 4c9fd3e31436 Start of jit support for double matricies Max Brister <max@2bass.com> parents: 14949 diff changeset	1207 constants[0] = llvm::ConstantFP::get (scalar_t, rng.base);
4c9fd3e31436 Start of jit support for double matricies Max Brister <max@2bass.com> parents: 14949 diff changeset	1208 constants[1] = llvm::ConstantFP::get (scalar_t, rng.limit);
4c9fd3e31436 Start of jit support for double matricies Max Brister <max@2bass.com> parents: 14949 diff changeset	1209 constants[2] = llvm::ConstantFP::get (scalar_t, rng.inc);
14920 51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1210 constants[3] = llvm::ConstantInt::get (idx, rng.nelem);
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1211
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1212 llvm::Value *as_llvm;
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1213 as_llvm = llvm::ConstantStruct::get (stype,
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1214 llvm::makeArrayRef (constants, 4));
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1215 cr.stash_llvm (as_llvm);
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1216 }
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1217
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1218 void
15181 ed2b911a2fb3 Rename jit_convert::convert_llvm to jit_convert_llvm Max Brister <max@2bass.com> parents: 15171 diff changeset	1219 jit_convert_llvm::visit (jit_block& b)
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	1220 {
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1221 llvm::BasicBlock *block = b.to_llvm ();
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1222 builder.SetInsertPoint (block);
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1223 for (jit_block::iterator iter = b.begin (); iter != b.end (); ++iter)
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1224 visit (*iter);
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1225 }
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	1226
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1227 void
15181 ed2b911a2fb3 Rename jit_convert::convert_llvm to jit_convert_llvm Max Brister <max@2bass.com> parents: 15171 diff changeset	1228 jit_convert_llvm::visit (jit_branch& b)
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1229 {
14948 006570a76b90 Cleanup and optimization of JIT Max Brister <max@2bass.com> parents: 14946 diff changeset	1230 b.stash_llvm (builder.CreateBr (b.successor_llvm ()));
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1231 }
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1232
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1233 void
15181 ed2b911a2fb3 Rename jit_convert::convert_llvm to jit_convert_llvm Max Brister <max@2bass.com> parents: 15171 diff changeset	1234 jit_convert_llvm::visit (jit_cond_branch& cb)
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1235 {
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1236 llvm::Value *cond = cb.cond_llvm ();
14920 51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1237 llvm::Value *br;
14959 12fd4a62d633 Fix whitespace issues and update documentation Max Brister <max@2bass.com> parents: 14958 diff changeset	1238 br = builder.CreateCondBr (cond, cb.successor_llvm (0),
12fd4a62d633 Fix whitespace issues and update documentation Max Brister <max@2bass.com> parents: 14958 diff changeset	1239 cb.successor_llvm (1));
14920 51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1240 cb.stash_llvm (br);
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	1241 }
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	1242
14913 c7071907a641 Use symbol_record_ref instead of names in JIT Max Brister <max@2bass.com> parents: 14911 diff changeset	1243 void
15181 ed2b911a2fb3 Rename jit_convert::convert_llvm to jit_convert_llvm Max Brister <max@2bass.com> parents: 15171 diff changeset	1244 jit_convert_llvm::visit (jit_call& call)
14913 c7071907a641 Use symbol_record_ref instead of names in JIT Max Brister <max@2bass.com> parents: 14911 diff changeset	1245 {
15014 094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	1246 const jit_function& ol = call.overload ();
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	1247
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	1248 std::vector<jit_value *> args (call.arguments ().size ());
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	1249 for (size_t i = 0; i < args.size (); ++i)
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	1250 args[i] = call.argument (i);
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	1251
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	1252 llvm::Value *ret = ol.call (builder, args);
14951 4c9fd3e31436 Start of jit support for double matricies Max Brister <max@2bass.com> parents: 14949 diff changeset	1253 call.stash_llvm (ret);
14913 c7071907a641 Use symbol_record_ref instead of names in JIT Max Brister <max@2bass.com> parents: 14911 diff changeset	1254 }
c7071907a641 Use symbol_record_ref instead of names in JIT Max Brister <max@2bass.com> parents: 14911 diff changeset	1255
c7071907a641 Use symbol_record_ref instead of names in JIT Max Brister <max@2bass.com> parents: 14911 diff changeset	1256 void
15181 ed2b911a2fb3 Rename jit_convert::convert_llvm to jit_convert_llvm Max Brister <max@2bass.com> parents: 15171 diff changeset	1257 jit_convert_llvm::visit (jit_extract_argument& extract)
14913 c7071907a641 Use symbol_record_ref instead of names in JIT Max Brister <max@2bass.com> parents: 14911 diff changeset	1258 {
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	1259 llvm::Value *arg = arguments[extract.name ()];
14920 51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1260 assert (arg);
14951 4c9fd3e31436 Start of jit support for double matricies Max Brister <max@2bass.com> parents: 14949 diff changeset	1261
15337 3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1262 if (converting_function)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1263 extract.stash_llvm (arg);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1264 else
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1265 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1266 arg = builder.CreateLoad (arg);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1267
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1268 const jit_function& ol = extract.overload ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1269 extract.stash_llvm (ol.call (builder, arg));
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1270 }
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1271 }
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1272
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1273 void
15181 ed2b911a2fb3 Rename jit_convert::convert_llvm to jit_convert_llvm Max Brister <max@2bass.com> parents: 15171 diff changeset	1274 jit_convert_llvm::visit (jit_store_argument& store)
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1275 {
15014 094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	1276 const jit_function& ol = store.overload ();
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	1277 llvm::Value *arg_value = ol.call (builder, store.result ());
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	1278 llvm::Value *arg = arguments[store.name ()];
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1279 store.stash_llvm (builder.CreateStore (arg_value, arg));
14913 c7071907a641 Use symbol_record_ref instead of names in JIT Max Brister <max@2bass.com> parents: 14911 diff changeset	1280 }
c7071907a641 Use symbol_record_ref instead of names in JIT Max Brister <max@2bass.com> parents: 14911 diff changeset	1281
14920 51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1282 void
15337 3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1283 jit_convert_llvm::visit (jit_return& ret)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1284 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1285 jit_value *res = ret.result ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1286 if (res)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1287 builder.CreateRet (res->to_llvm ());
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1288 else
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1289 builder.CreateRetVoid ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1290 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1291
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1292 void
15181 ed2b911a2fb3 Rename jit_convert::convert_llvm to jit_convert_llvm Max Brister <max@2bass.com> parents: 15171 diff changeset	1293 jit_convert_llvm::visit (jit_phi& phi)
14920 51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1294 {
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1295 // we might not have converted all incoming branches, so we don't
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1296 // set incomming branches now
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1297 llvm::PHINode *node = llvm::PHINode::Create (phi.type_llvm (),
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	1298 phi.argument_count ());
14920 51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1299 builder.Insert (node);
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1300 phi.stash_llvm (node);
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1301 }
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1302
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	1303 void
15181 ed2b911a2fb3 Rename jit_convert::convert_llvm to jit_convert_llvm Max Brister <max@2bass.com> parents: 15171 diff changeset	1304 jit_convert_llvm::visit (jit_variable&)
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	1305 {
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	1306 throw jit_fail_exception ("ERROR: SSA construction should remove all variables");
14928 39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	1307 }
39d52aa37a08 Use standard SSA construction algorithm, and support break/continue Max Brister <max@2bass.com> parents: 14925 diff changeset	1308
14938 bab44e3ee291 Adding basic error support to JIT Max Brister <max@2bass.com> parents: 14937 diff changeset	1309 void
15181 ed2b911a2fb3 Rename jit_convert::convert_llvm to jit_convert_llvm Max Brister <max@2bass.com> parents: 15171 diff changeset	1310 jit_convert_llvm::visit (jit_error_check& check)
14938 bab44e3ee291 Adding basic error support to JIT Max Brister <max@2bass.com> parents: 14937 diff changeset	1311 {
15016 005cb78e1dd1 Split pt-jit into multiple files. Max Brister <max@2bass.com> parents: 15014 diff changeset	1312 llvm::Value *cond = jit_typeinfo::insert_error_check (builder);
14948 006570a76b90 Cleanup and optimization of JIT Max Brister <max@2bass.com> parents: 14946 diff changeset	1313 llvm::Value *br = builder.CreateCondBr (cond, check.successor_llvm (0),
006570a76b90 Cleanup and optimization of JIT Max Brister <max@2bass.com> parents: 14946 diff changeset	1314 check.successor_llvm (1));
14938 bab44e3ee291 Adding basic error support to JIT Max Brister <max@2bass.com> parents: 14937 diff changeset	1315 check.stash_llvm (br);
bab44e3ee291 Adding basic error support to JIT Max Brister <max@2bass.com> parents: 14937 diff changeset	1316 }
bab44e3ee291 Adding basic error support to JIT Max Brister <max@2bass.com> parents: 14937 diff changeset	1317
bab44e3ee291 Adding basic error support to JIT Max Brister <max@2bass.com> parents: 14937 diff changeset	1318 void
15181 ed2b911a2fb3 Rename jit_convert::convert_llvm to jit_convert_llvm Max Brister <max@2bass.com> parents: 15171 diff changeset	1319 jit_convert_llvm::visit (jit_assign& assign)
14962 90a7a2af2cd5 Keep track of variables after SSA construction Max Brister <max@2bass.com> parents: 14961 diff changeset	1320 {
15014 094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	1321 jit_value *new_value = assign.src ();
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	1322 assign.stash_llvm (new_value->to_llvm ());
14965 f2117a963c54 Place grab/release for assignments Max Brister <max@2bass.com> parents: 14964 diff changeset	1323
14969 bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	1324 if (assign.artificial ())
bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	1325 return;
bbeef7b8ea2e Add support for matrix indexed assignment to JIT Max Brister <max@2bass.com> parents: 14968 diff changeset	1326
14965 f2117a963c54 Place grab/release for assignments Max Brister <max@2bass.com> parents: 14964 diff changeset	1327 jit_value *overwrite = assign.overwrite ();
f2117a963c54 Place grab/release for assignments Max Brister <max@2bass.com> parents: 14964 diff changeset	1328 if (isa<jit_assign_base> (overwrite))
f2117a963c54 Place grab/release for assignments Max Brister <max@2bass.com> parents: 14964 diff changeset	1329 {
15014 094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	1330 const jit_function& ol = jit_typeinfo::get_release (overwrite->type ());
15147 98a65d9e426f Remove uneeded release overloads Max Brister <max@2bass.com> parents: 15146 diff changeset	1331 if (ol.valid ())
98a65d9e426f Remove uneeded release overloads Max Brister <max@2bass.com> parents: 15146 diff changeset	1332 ol.call (builder, overwrite);
14965 f2117a963c54 Place grab/release for assignments Max Brister <max@2bass.com> parents: 14964 diff changeset	1333 }
14962 90a7a2af2cd5 Keep track of variables after SSA construction Max Brister <max@2bass.com> parents: 14961 diff changeset	1334 }
14938 bab44e3ee291 Adding basic error support to JIT Max Brister <max@2bass.com> parents: 14937 diff changeset	1335
14951 4c9fd3e31436 Start of jit support for double matricies Max Brister <max@2bass.com> parents: 14949 diff changeset	1336 void
15181 ed2b911a2fb3 Rename jit_convert::convert_llvm to jit_convert_llvm Max Brister <max@2bass.com> parents: 15171 diff changeset	1337 jit_convert_llvm::visit (jit_argument&)
14951 4c9fd3e31436 Start of jit support for double matricies Max Brister <max@2bass.com> parents: 14949 diff changeset	1338 {}
4c9fd3e31436 Start of jit support for double matricies Max Brister <max@2bass.com> parents: 14949 diff changeset	1339
15056 bc32288f4a42 Support the end keyword for one dimentional indexing in JIT. Max Brister <max@2bass.com> parents: 15030 diff changeset	1340 void
15181 ed2b911a2fb3 Rename jit_convert::convert_llvm to jit_convert_llvm Max Brister <max@2bass.com> parents: 15171 diff changeset	1341 jit_convert_llvm::visit (jit_magic_end& me)
15056 bc32288f4a42 Support the end keyword for one dimentional indexing in JIT. Max Brister <max@2bass.com> parents: 15030 diff changeset	1342 {
bc32288f4a42 Support the end keyword for one dimentional indexing in JIT. Max Brister <max@2bass.com> parents: 15030 diff changeset	1343 const jit_function& ol = me.overload ();
15102 d29f2583cf7b Support end in multi indexing in JIT Max Brister <max@2bass.com> parents: 15096 diff changeset	1344
d29f2583cf7b Support end in multi indexing in JIT Max Brister <max@2bass.com> parents: 15096 diff changeset	1345 jit_magic_end::context ctx = me.resolve_context ();
d29f2583cf7b Support end in multi indexing in JIT Max Brister <max@2bass.com> parents: 15096 diff changeset	1346 llvm::Value *ret = ol.call (builder, ctx.value, ctx.index, ctx.count);
15056 bc32288f4a42 Support the end keyword for one dimentional indexing in JIT. Max Brister <max@2bass.com> parents: 15030 diff changeset	1347 me.stash_llvm (ret);
bc32288f4a42 Support the end keyword for one dimentional indexing in JIT. Max Brister <max@2bass.com> parents: 15030 diff changeset	1348 }
bc32288f4a42 Support the end keyword for one dimentional indexing in JIT. Max Brister <max@2bass.com> parents: 15030 diff changeset	1349
15191 ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1350 // -------------------- jit_infer --------------------
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1351 jit_infer::jit_infer (jit_factory& afactory, jit_block_list& ablocks,
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1352 const variable_map& avmap)
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1353 : blocks (ablocks), factory (afactory), vmap (avmap) {}
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1354
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1355 void
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1356 jit_infer::infer (void)
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1357 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1358 construct_ssa ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1359
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1360 // initialize the worklist to instructions derived from constants
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1361 const std::list<jit_value *>& constants = factory.constants ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1362 for (std::list<jit_value *>::const_iterator iter = constants.begin ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1363 iter != constants.end (); ++iter)
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1364 append_users (*iter);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1365
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1366 // the entry block terminator may be a regular branch statement
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1367 if (entry_block ().terminator ())
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1368 push_worklist (entry_block ().terminator ());
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1369
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1370 // FIXME: Describe algorithm here
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1371 while (worklist.size ())
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1372 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1373 jit_instruction *next = worklist.front ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1374 worklist.pop_front ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1375 next->stash_in_worklist (false);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1376
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1377 if (next->infer ())
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1378 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1379 // terminators need to be handles specially
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1380 if (jit_terminator term = dynamic_cast<jit_terminator > (next))
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1381 append_users_term (term);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1382 else
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1383 append_users (next);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1384 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1385 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1386
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1387 remove_dead ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1388 final_block ().label ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1389 place_releases ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1390 simplify_phi ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1391 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1392
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1393 void
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1394 jit_infer::append_users (jit_value *v)
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1395 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1396 for (jit_use *use = v->first_use (); use; use = use->next ())
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1397 push_worklist (use->user ());
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1398 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1399
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1400 void
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1401 jit_infer::append_users_term (jit_terminator *term)
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1402 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1403 for (size_t i = 0; i < term->successor_count (); ++i)
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1404 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1405 if (term->alive (i))
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1406 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1407 jit_block *succ = term->successor (i);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1408 for (jit_block::iterator iter = succ->begin (); iter != succ->end ()
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1409 && isa<jit_phi> (*iter); ++iter)
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1410 push_worklist (*iter);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1411
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1412 jit_terminator *sterm = succ->terminator ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1413 if (sterm)
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1414 push_worklist (sterm);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1415 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1416 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1417 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1418
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1419 void
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1420 jit_infer::construct_ssa (void)
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1421 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1422 final_block ().label ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1423 final_block ().compute_idom (entry_block ());
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1424 entry_block ().compute_df ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1425 entry_block ().create_dom_tree ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1426
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1427 // insert phi nodes where needed, this is done on a per variable basis
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1428 for (variable_map::const_iterator iter = vmap.begin (); iter != vmap.end ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1429 ++iter)
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1430 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1431 jit_block::df_set visited, added_phi;
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1432 std::list<jit_block *> ssa_worklist;
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1433 iter->second->use_blocks (visited);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1434 ssa_worklist.insert (ssa_worklist.begin (), visited.begin (),
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1435 visited.end ());
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1436
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1437 while (ssa_worklist.size ())
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1438 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1439 jit_block *b = ssa_worklist.front ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1440 ssa_worklist.pop_front ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1441
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1442 for (jit_block::df_iterator diter = b->df_begin ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1443 diter != b->df_end (); ++diter)
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1444 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1445 jit_block dblock = diter;
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1446 if (! added_phi.count (dblock))
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1447 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1448 jit_phi *phi = factory.create<jit_phi> (iter->second,
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1449 dblock->use_count ());
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1450 dblock->prepend (phi);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1451 added_phi.insert (dblock);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1452 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1453
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1454 if (! visited.count (dblock))
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1455 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1456 ssa_worklist.push_back (dblock);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1457 visited.insert (dblock);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1458 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1459 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1460 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1461 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1462
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1463 do_construct_ssa (entry_block (), entry_block ().visit_count ());
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1464 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1465
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1466 void
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1467 jit_infer::do_construct_ssa (jit_block& ablock, size_t avisit_count)
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1468 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1469 if (ablock.visited (avisit_count))
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1470 return;
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1471
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1472 // replace variables with their current SSA value
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1473 for (jit_block::iterator iter = ablock.begin (); iter != ablock.end ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1474 ++iter)
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1475 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1476 jit_instruction instr = iter;
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1477 instr->construct_ssa ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1478 instr->push_variable ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1479 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1480
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1481 // finish phi nodes of successors
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1482 for (size_t i = 0; i < ablock.successor_count (); ++i)
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1483 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1484 jit_block *finish = ablock.successor (i);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1485
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1486 for (jit_block::iterator iter = finish->begin (); iter != finish->end ()
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1487 && isa<jit_phi> (*iter);)
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1488 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1489 jit_phi phi = static_cast<jit_phi > (*iter);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1490 jit_variable *var = phi->dest ();
15245 4c0cef65c55f pt-jit.cc (jit_infer::do_construct_ir): Correct extraious phi removal Max Brister <max@2bass.com> parents: 15234 diff changeset	1491 ++iter;
4c0cef65c55f pt-jit.cc (jit_infer::do_construct_ir): Correct extraious phi removal Max Brister <max@2bass.com> parents: 15234 diff changeset	1492
15191 ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1493 if (var->has_top ())
15245 4c0cef65c55f pt-jit.cc (jit_infer::do_construct_ir): Correct extraious phi removal Max Brister <max@2bass.com> parents: 15234 diff changeset	1494 phi->add_incomming (&ablock, var->top ());
15191 ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1495 else
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1496 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1497 // temporaries may have extranious phi nodes which can be removed
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1498 assert (! phi->use_count ());
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1499 assert (var->name ().size () && var->name ()[0] == '#');
15245 4c0cef65c55f pt-jit.cc (jit_infer::do_construct_ir): Correct extraious phi removal Max Brister <max@2bass.com> parents: 15234 diff changeset	1500 phi->remove ();
15191 ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1501 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1502 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1503 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1504
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1505 for (size_t i = 0; i < ablock.dom_successor_count (); ++i)
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1506 do_construct_ssa (*ablock.dom_successor (i), avisit_count);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1507
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1508 ablock.pop_all ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1509 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1510
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1511 void
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1512 jit_infer::place_releases (void)
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1513 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1514 std::set<jit_value *> temporaries;
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1515 for (jit_block_list::iterator iter = blocks.begin (); iter != blocks.end ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1516 ++iter)
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1517 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1518 jit_block& ablock = **iter;
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1519 if (ablock.id () != jit_block::NO_ID)
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1520 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1521 release_temp (ablock, temporaries);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1522 release_dead_phi (ablock);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1523 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1524 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1525 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1526
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1527 void
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1528 jit_infer::push_worklist (jit_instruction *instr)
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1529 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1530 if (! instr->in_worklist ())
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1531 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1532 instr->stash_in_worklist (true);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1533 worklist.push_back (instr);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1534 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1535 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1536
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1537 void
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1538 jit_infer::remove_dead ()
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1539 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1540 jit_block_list::iterator biter;
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1541 for (biter = blocks.begin (); biter != blocks.end (); ++biter)
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1542 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1543 jit_block b = biter;
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1544 if (b->alive ())
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1545 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1546 for (jit_block::iterator iter = b->begin (); iter != b->end ()
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1547 && isa<jit_phi> (*iter);)
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1548 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1549 jit_phi phi = static_cast<jit_phi > (*iter);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1550 if (phi->prune ())
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1551 iter = b->remove (iter);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1552 else
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1553 ++iter;
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1554 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1555 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1556 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1557
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1558 for (biter = blocks.begin (); biter != blocks.end ();)
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1559 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1560 jit_block b = biter;
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1561 if (b->alive ())
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1562 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1563 // FIXME: A special case for jit_error_check, if we generalize to
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1564 // we will need to change!
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1565 jit_terminator *term = b->terminator ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1566 if (term && term->successor_count () == 2 && ! term->alive (0))
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1567 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1568 jit_block *succ = term->successor (1);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1569 term->remove ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1570 jit_branch *abreak = factory.create<jit_branch> (succ);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1571 b->append (abreak);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1572 abreak->infer ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1573 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1574
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1575 ++biter;
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1576 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1577 else
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1578 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1579 jit_terminator *term = b->terminator ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1580 if (term)
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1581 term->remove ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1582 biter = blocks.erase (biter);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1583 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1584 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1585 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1586
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1587 void
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1588 jit_infer::release_dead_phi (jit_block& ablock)
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1589 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1590 jit_block::iterator iter = ablock.begin ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1591 while (iter != ablock.end () && isa<jit_phi> (*iter))
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1592 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1593 jit_phi phi = static_cast<jit_phi > (*iter);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1594 ++iter;
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1595
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1596 jit_use *use = phi->first_use ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1597 if (phi->use_count () == 1 && isa<jit_assign> (use->user ()))
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1598 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1599 // instead of releasing on assign, release on all incomming branches,
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1600 // this can get rid of casts inside loops
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1601 for (size_t i = 0; i < phi->argument_count (); ++i)
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1602 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1603 jit_value *arg = phi->argument (i);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1604 if (! arg->needs_release ())
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1605 continue;
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1606
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1607 jit_block *inc = phi->incomming (i);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1608 jit_block *split = inc->maybe_split (factory, blocks, ablock);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1609 jit_terminator *term = split->terminator ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1610 jit_call *release
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1611 = factory.create<jit_call> (jit_typeinfo::release, arg);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1612 release->infer ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1613 split->insert_before (term, release);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1614 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1615
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1616 phi->replace_with (0);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1617 phi->remove ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1618 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1619 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1620 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1621
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1622 void
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1623 jit_infer::release_temp (jit_block& ablock, std::set<jit_value *>& temp)
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1624 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1625 for (jit_block::iterator iter = ablock.begin (); iter != ablock.end ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1626 ++iter)
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1627 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1628 jit_instruction instr = iter;
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1629
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1630 // check for temporaries that require release and live across
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1631 // multiple blocks
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1632 if (instr->needs_release ())
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1633 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1634 jit_block *fu_block = instr->first_use_block ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1635 if (fu_block && fu_block != &ablock && instr->needs_release ())
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1636 temp.insert (instr);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1637 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1638
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1639 if (isa<jit_call> (instr))
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1640 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1641 // place releases for temporary arguments
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1642 for (size_t i = 0; i < instr->argument_count (); ++i)
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1643 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1644 jit_value *arg = instr->argument (i);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1645 if (! arg->needs_release ())
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1646 continue;
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1647
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1648 jit_call *release
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1649 = factory.create<jit_call> (&jit_typeinfo::release, arg);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1650 release->infer ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1651 ablock.insert_after (iter, release);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1652 ++iter;
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1653 temp.erase (arg);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1654 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1655 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1656 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1657
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1658 if (! temp.size () \|\| ! isa<jit_error_check> (ablock.terminator ()))
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1659 return;
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1660
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1661 // FIXME: If we support try/catch or unwind_protect final_block may not be the
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1662 // destination
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1663 jit_block *split = ablock.maybe_split (factory, blocks, final_block ());
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1664 jit_terminator *term = split->terminator ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1665 for (std::set<jit_value *>::const_iterator iter = temp.begin ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1666 iter != temp.end (); ++iter)
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1667 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1668 jit_value value = iter;
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1669 jit_call *release
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1670 = factory.create<jit_call> (&jit_typeinfo::release, value);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1671 split->insert_before (term, release);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1672 release->infer ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1673 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1674 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1675
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1676 void
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1677 jit_infer::simplify_phi (void)
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1678 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1679 for (jit_block_list::iterator biter = blocks.begin (); biter != blocks.end ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1680 ++biter)
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1681 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1682 jit_block &ablock = **biter;
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1683 for (jit_block::iterator iter = ablock.begin (); iter != ablock.end ()
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1684 && isa<jit_phi> (*iter); ++iter)
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1685 simplify_phi (static_cast<jit_phi > (*iter));
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1686 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1687 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1688
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1689 void
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1690 jit_infer::simplify_phi (jit_phi& phi)
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1691 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1692 jit_block& pblock = *phi.parent ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1693 const jit_operation& cast_fn = jit_typeinfo::cast (phi.type ());
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1694 jit_variable *dest = phi.dest ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1695 for (size_t i = 0; i < phi.argument_count (); ++i)
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1696 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1697 jit_value *arg = phi.argument (i);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1698 if (arg->type () != phi.type ())
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1699 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1700 jit_block *pred = phi.incomming (i);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1701 jit_block *split = pred->maybe_split (factory, blocks, pblock);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1702 jit_terminator *term = split->terminator ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1703 jit_instruction *cast = factory.create<jit_call> (cast_fn, arg);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1704 jit_assign *assign = factory.create<jit_assign> (dest, cast);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1705
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1706 split->insert_before (term, cast);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1707 split->insert_before (term, assign);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1708 cast->infer ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1709 assign->infer ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1710 phi.stash_argument (i, assign);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1711 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1712 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1713 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	1714
14906 3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1715 // -------------------- tree_jit --------------------
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1716
14920 51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1717 tree_jit::tree_jit (void) : module (0), engine (0)
14906 3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1718 {
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1719 }
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1720
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1721 tree_jit::~tree_jit (void)
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1722 {}
14906 3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1723
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1724 bool
15027 741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	1725 tree_jit::execute (tree_simple_for_command& cmd, const octave_value& bounds)
14906 3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1726 {
15337 3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1727 return instance ().do_execute (cmd, bounds);
14906 3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1728 }
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1729
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1730 bool
15023 75d1bc2fd6d2 Compile top level while loops in JIT. Max Brister <max@2bass.com> parents: 15016 diff changeset	1731 tree_jit::execute (tree_while_command& cmd)
75d1bc2fd6d2 Compile top level while loops in JIT. Max Brister <max@2bass.com> parents: 15016 diff changeset	1732 {
15337 3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1733 return instance ().do_execute (cmd);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1734 }
15023 75d1bc2fd6d2 Compile top level while loops in JIT. Max Brister <max@2bass.com> parents: 15016 diff changeset	1735
15337 3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1736 bool
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1737 tree_jit::execute (octave_user_function& fcn, const octave_value_list& args,
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1738 octave_value_list& retval)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1739 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1740 return instance ().do_execute (fcn, args, retval);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1741 }
15023 75d1bc2fd6d2 Compile top level while loops in JIT. Max Brister <max@2bass.com> parents: 15016 diff changeset	1742
15337 3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1743 tree_jit&
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1744 tree_jit::instance (void)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1745 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1746 static tree_jit ret;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1747 return ret;
15023 75d1bc2fd6d2 Compile top level while loops in JIT. Max Brister <max@2bass.com> parents: 15016 diff changeset	1748 }
75d1bc2fd6d2 Compile top level while loops in JIT. Max Brister <max@2bass.com> parents: 15016 diff changeset	1749
75d1bc2fd6d2 Compile top level while loops in JIT. Max Brister <max@2bass.com> parents: 15016 diff changeset	1750 bool
14906 3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1751 tree_jit::initialize (void)
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	1752 {
14906 3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1753 if (engine)
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1754 return true;
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1755
14920 51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1756 if (! module)
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1757 {
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1758 llvm::InitializeNativeTarget ();
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1759 module = new llvm::Module ("octave", context);
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1760 }
51d4b1018efb For loops compile with new IR Max Brister <max@2bass.com> parents: 14918 diff changeset	1761
14906 3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1762 // sometimes this fails pre main
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1763 engine = llvm::ExecutionEngine::createJIT (module);
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1764
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1765 if (! engine)
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1766 return false;
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1767
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1768 module_pass_manager = new llvm::PassManager ();
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1769 module_pass_manager->add (llvm::createAlwaysInlinerPass ());
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1770
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1771 pass_manager = new llvm::FunctionPassManager (module);
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1772 pass_manager->add (new llvm::TargetData(*engine->getTargetData ()));
15171 7a19e8275d41 Do not simplify the CFG during type inference Max Brister <max@2bass.com> parents: 15169 diff changeset	1773 pass_manager->add (llvm::createCFGSimplificationPass ());
14906 3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1774 pass_manager->add (llvm::createBasicAliasAnalysisPass ());
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1775 pass_manager->add (llvm::createPromoteMemoryToRegisterPass ());
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1776 pass_manager->add (llvm::createInstructionCombiningPass ());
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1777 pass_manager->add (llvm::createReassociatePass ());
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1778 pass_manager->add (llvm::createGVNPass ());
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1779 pass_manager->add (llvm::createCFGSimplificationPass ());
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1780 pass_manager->doInitialization ();
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1781
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	1782 jit_typeinfo::initialize (module, engine);
14906 3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1783
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1784 return true;
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1785 }
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1786
15337 3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1787 bool
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1788 tree_jit::do_execute (tree_simple_for_command& cmd, const octave_value& bounds)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1789 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1790 const size_t MIN_TRIP_COUNT = 1000;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1791
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1792 size_t tc = trip_count (bounds);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1793 if (! tc \|\| ! initialize ())
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1794 return false;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1795
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1796 jit_info::vmap extra_vars;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1797 extra_vars["#for_bounds0"] = &bounds;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1798
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1799 jit_info *info = cmd.get_info ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1800 if (! info \|\| ! info->match (extra_vars))
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1801 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1802 if (tc < MIN_TRIP_COUNT)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1803 return false;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1804
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1805 delete info;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1806 info = new jit_info (*this, cmd, bounds);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1807 cmd.stash_info (info);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1808 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1809
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1810 return info->execute (extra_vars);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1811 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1812
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1813 bool
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1814 tree_jit::do_execute (tree_while_command& cmd)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1815 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1816 if (! initialize ())
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1817 return false;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1818
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1819 jit_info *info = cmd.get_info ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1820 if (! info \|\| ! info->match ())
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1821 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1822 delete info;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1823 info = new jit_info (*this, cmd);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1824 cmd.stash_info (info);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1825 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1826
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1827 return info->execute ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1828 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1829
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1830 bool
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1831 tree_jit::do_execute (octave_user_function& fcn, const octave_value_list& args,
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1832 octave_value_list& retval)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1833 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1834 if (! initialize ())
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1835 return false;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1836
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1837 jit_function_info *info = fcn.get_info ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1838 if (! info \|\| ! info->match (args))
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1839 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1840 delete info;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1841 info = new jit_function_info (*this, fcn, args);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1842 fcn.stash_info (info);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1843 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1844
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1845 return info->execute (args, retval);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1846 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1847
15027 741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	1848 size_t
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	1849 tree_jit::trip_count (const octave_value& bounds) const
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	1850 {
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	1851 if (bounds.is_range ())
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	1852 {
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	1853 Range rng = bounds.range_value ();
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	1854 return rng.nelem ();
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	1855 }
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	1856
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	1857 // unsupported type
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	1858 return 0;
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	1859 }
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	1860
14906 3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1861
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1862 void
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1863 tree_jit::optimize (llvm::Function *fn)
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1864 {
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1865 module_pass_manager->run (*module);
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1866 pass_manager->run (*fn);
14985 f5925478bc15 More support for complex numbers in JIT Max Brister <max@2bass.com> parents: 14984 diff changeset	1867
f5925478bc15 More support for complex numbers in JIT Max Brister <max@2bass.com> parents: 14984 diff changeset	1868 #ifdef OCTAVE_JIT_DEBUG
f5925478bc15 More support for complex numbers in JIT Max Brister <max@2bass.com> parents: 14984 diff changeset	1869 std::string error;
f5925478bc15 More support for complex numbers in JIT Max Brister <max@2bass.com> parents: 14984 diff changeset	1870 llvm::raw_fd_ostream fout ("test.bc", error,
f5925478bc15 More support for complex numbers in JIT Max Brister <max@2bass.com> parents: 14984 diff changeset	1871 llvm::raw_fd_ostream::F_Binary);
f5925478bc15 More support for complex numbers in JIT Max Brister <max@2bass.com> parents: 14984 diff changeset	1872 llvm::WriteBitcodeToFile (module, fout);
f5925478bc15 More support for complex numbers in JIT Max Brister <max@2bass.com> parents: 14984 diff changeset	1873 #endif
14906 3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1874 }
3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	1875
15337 3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1876 // -------------------- jit_function_info --------------------
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1877 jit_function_info::jit_function_info (tree_jit& tjit,
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1878 octave_user_function& fcn,
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1879 const octave_value_list& ov_args)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1880 : argument_types (ov_args.length ()), function (0)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1881 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1882 size_t nargs = ov_args.length ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1883 for (size_t i = 0; i < nargs; ++i)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1884 argument_types[i] = jit_typeinfo::type_of (ov_args(i));
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1885
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1886 try
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1887 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1888 jit_convert conv (fcn, argument_types);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1889 jit_infer infer (conv.get_factory (), conv.get_blocks (),
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1890 conv.get_variable_map ());
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1891 infer.infer ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1892
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1893 #if OCTAVE_JIT_DEBUG
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1894 if (Venable_jit_debug)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1895 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1896 jit_block_list& blocks = infer.get_blocks ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1897 jit_block *entry_block = blocks.front ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1898 entry_block->label ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1899 std::cout << "-------------------- Compiling function ";
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1900 std::cout << "--------------------\n";
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1901
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1902 tree_print_code tpc (std::cout);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1903 tpc.visit_octave_user_function_header (fcn);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1904 tpc.visit_statement_list (*fcn.body ());
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1905 tpc.visit_octave_user_function_trailer (fcn);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1906 blocks.print (std::cout, "octave jit ir");
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1907 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1908 #endif
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1909
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1910 jit_factory& factory = conv.get_factory ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1911 llvm::Module *module = tjit.get_module ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1912 jit_convert_llvm to_llvm;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1913 jit_function raw_fn = to_llvm.convert_function (module,
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1914 infer.get_blocks (),
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1915 factory.constants (),
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1916 fcn, argument_types);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1917
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1918 #ifdef OCTAVE_JIT_DEBUG
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1919 if (Venable_jit_debug)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1920 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1921 std::cout << "-------------------- raw function ";
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1922 std::cout << "--------------------\n";
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1923 std::cout << *raw_fn.to_llvm () << std::endl;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1924 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1925 #endif
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1926
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1927 std::string wrapper_name = fcn.name () + "_wrapper";
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1928 jit_type *any_t = jit_typeinfo::get_any ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1929 std::vector<jit_type *> wrapper_args (1, jit_typeinfo::get_any_ptr ());
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1930 jit_function wrapper (module, jit_convention::internal, wrapper_name,
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1931 any_t, wrapper_args);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1932 llvm::BasicBlock *wrapper_body = wrapper.new_block ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1933 builder.SetInsertPoint (wrapper_body);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1934
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1935 llvm::Value *wrapper_arg = wrapper.argument (builder, 0);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1936 std::vector<llvm::Value *> raw_args (nargs);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1937 for (size_t i = 0; i < nargs; ++i)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1938 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1939 llvm::Value *arg;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1940 arg = builder.CreateConstInBoundsGEP1_32 (wrapper_arg, i);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1941 arg = builder.CreateLoad (arg);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1942
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1943 jit_type *arg_type = argument_types[i];
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1944 const jit_function& cast = jit_typeinfo::cast (arg_type, any_t);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1945 raw_args[i] = cast.call (builder, arg);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1946 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1947
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1948 llvm::Value *result = raw_fn.call (builder, raw_args);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1949 if (raw_fn.result ())
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1950 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1951 jit_type *raw_result_t = raw_fn.result ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1952 const jit_function& cast = jit_typeinfo::cast (any_t, raw_result_t);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1953 result = cast.call (builder, result);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1954 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1955 else
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1956 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1957 llvm::Value *zero = builder.getInt32 (0);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1958 result = builder.CreateBitCast (zero, any_t->to_llvm ());
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1959 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1960
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1961 wrapper.do_return (builder, result);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1962
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1963 llvm::Function *llvm_function = wrapper.to_llvm ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1964 tjit.optimize (llvm_function);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1965
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1966 #ifdef OCTAVE_JIT_DEBUG
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1967 if (Venable_jit_debug)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1968 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1969 std::cout << "-------------------- optimized and wrapped ";
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1970 std::cout << "--------------------\n";
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1971 std::cout << *llvm_function << std::endl;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1972 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1973 #endif
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1974
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1975 llvm::ExecutionEngine* engine = tjit.get_engine ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1976 void *void_fn = engine->getPointerToFunction (llvm_function);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1977 function = reinterpret_cast<jited_function> (void_fn);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1978 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1979 catch (const jit_fail_exception& e)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1980 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1981 argument_types.clear ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1982 #ifdef OCTAVE_JIT_DEBUG
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1983 if (Venable_jit_debug)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1984 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1985 if (e.known ())
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1986 std::cout << "jit fail: " << e.what () << std::endl;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1987 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1988 #endif
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1989 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1990 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1991
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1992 bool
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1993 jit_function_info::execute (const octave_value_list& ov_args,
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1994 octave_value_list& retval) const
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1995 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1996 if (! function)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1997 return false;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1998
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	1999 // TODO figure out a way to delete ov_args so we avoid duplicating refcount
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2000 size_t nargs = ov_args.length ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2001 std::vector<octave_base_value *> args (nargs);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2002 for (size_t i = 0; i < nargs; ++i)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2003 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2004 octave_base_value *obv = ov_args(i).internal_rep ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2005 obv->grab ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2006 args[i] = obv;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2007 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2008
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2009 octave_base_value *ret = function (&args[0]);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2010 if (ret)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2011 retval(0) = octave_value (ret);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2012
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2013 return true;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2014 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2015
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2016 bool
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2017 jit_function_info::match (const octave_value_list& ov_args) const
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2018 {
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2019 if (! function)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2020 return true;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2021
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2022 size_t nargs = ov_args.length ();
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2023 if (nargs != argument_types.size ())
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2024 return false;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2025
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2026 for (size_t i = 0; i < nargs; ++i)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2027 if (jit_typeinfo::type_of (ov_args(i)) != argument_types[i])
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2028 return false;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2029
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2030 return true;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2031 }
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2032
14906 3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	2033 // -------------------- jit_info --------------------
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	2034 jit_info::jit_info (tree_jit& tjit, tree& tee)
15027 741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2035 : engine (tjit.get_engine ()), function (0), llvm_function (0)
14906 3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	2036 {
15191 ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	2037 compile (tjit, tee);
15027 741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2038 }
14906 3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	2039
15027 741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2040 jit_info::jit_info (tree_jit& tjit, tree& tee, const octave_value& for_bounds)
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2041 : engine (tjit.get_engine ()), function (0), llvm_function (0)
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2042 {
15191 ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	2043 compile (tjit, tee, jit_typeinfo::type_of (for_bounds));
14955 609dcc297db5 src/pt-jit.cc (jit_info::~jit_info): New function Max Brister <max@2bass.com> parents: 14954 diff changeset	2044 }
609dcc297db5 src/pt-jit.cc (jit_info::~jit_info): New function Max Brister <max@2bass.com> parents: 14954 diff changeset	2045
609dcc297db5 src/pt-jit.cc (jit_info::~jit_info): New function Max Brister <max@2bass.com> parents: 14954 diff changeset	2046 jit_info::~jit_info (void)
609dcc297db5 src/pt-jit.cc (jit_info::~jit_info): New function Max Brister <max@2bass.com> parents: 14954 diff changeset	2047 {
609dcc297db5 src/pt-jit.cc (jit_info::~jit_info): New function Max Brister <max@2bass.com> parents: 14954 diff changeset	2048 if (llvm_function)
609dcc297db5 src/pt-jit.cc (jit_info::~jit_info): New function Max Brister <max@2bass.com> parents: 14954 diff changeset	2049 llvm_function->eraseFromParent ();
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	2050 }
54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	2051
54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	2052 bool
15027 741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2053 jit_info::execute (const vmap& extra_vars) const
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	2054 {
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	2055 if (! function)
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	2056 return false;
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	2057
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	2058 std::vector<octave_base_value *> real_arguments (arguments.size ());
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	2059 for (size_t i = 0; i < arguments.size (); ++i)
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	2060 {
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	2061 if (arguments[i].second)
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	2062 {
15027 741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2063 octave_value current = find (extra_vars, arguments[i].first);
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	2064 octave_base_value *obv = current.internal_rep ();
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	2065 obv->grab ();
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	2066 real_arguments[i] = obv;
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	2067 }
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	2068 }
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	2069
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	2070 function (&real_arguments[0]);
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	2071
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	2072 for (size_t i = 0; i < arguments.size (); ++i)
15027 741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2073 {
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2074 const std::string& name = arguments[i].first;
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2075
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2076 // do not store for loop bounds temporary
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2077 if (name.size () && name[0] != '#')
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2078 symbol_table::varref (arguments[i].first) = real_arguments[i];
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2079 }
14910 a8f1e08de8fc Simplified llvm::GenericValue creation Max Brister <max@2bass.com> parents: 14906 diff changeset	2080
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	2081 return true;
f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: diff changeset	2082 }
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	2083
54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	2084 bool
15027 741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2085 jit_info::match (const vmap& extra_vars) const
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	2086 {
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	2087 if (! function)
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	2088 return true;
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	2089
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	2090 for (size_t i = 0; i < bounds.size (); ++i)
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	2091 {
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	2092 const std::string& arg_name = bounds[i].second;
15027 741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2093 octave_value value = find (extra_vars, arg_name);
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	2094 jit_type *type = jit_typeinfo::type_of (value);
14906 3f81e8b42955 JIT for loops over ranges Max Brister <max@2bass.com> parents: 14903 diff changeset	2095
14917 232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	2096 // FIXME: Check for a parent relationship
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	2097 if (type != bounds[i].first)
232d8ab07932 Rewrite pt-jit.* adding new low level octave IR Max Brister <max@2bass.com> parents: 14915 diff changeset	2098 return false;
14903 54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	2099 }
54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	2100
54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	2101 return true;
54ea692b8ab5 Reworking JIT implementation Max Brister <max@2bass.com> parents: 14901 diff changeset	2102 }
15027 741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2103
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2104 void
15191 ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	2105 jit_info::compile (tree_jit& tjit, tree& tee, jit_type *for_bounds)
15027 741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2106 {
15191 ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	2107 try
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	2108 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	2109 jit_convert conv (tee, for_bounds);
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	2110 jit_infer infer (conv.get_factory (), conv.get_blocks (),
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	2111 conv.get_variable_map ());
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	2112
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	2113 infer.infer ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	2114 #ifdef OCTAVE_JIT_DEBUG
15310 b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2115 if (Venable_jit_debug)
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2116 {
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2117 jit_block_list& blocks = infer.get_blocks ();
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2118 jit_block *entry_block = blocks.front ();
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2119 entry_block->label ();
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2120 std::cout << "-------------------- Compiling tree --------------------\n";
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2121 std::cout << tee.str_print_code () << std::endl;
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2122 blocks.print (std::cout, "octave jit ir");
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2123 }
15191 ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	2124 #endif
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	2125
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	2126 jit_factory& factory = conv.get_factory ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	2127 jit_convert_llvm to_llvm;
15337 3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2128 llvm_function = to_llvm.convert_loop (tjit.get_module (),
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2129 infer.get_blocks (),
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2130 factory.constants ());
15191 ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	2131 arguments = to_llvm.get_arguments ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	2132 bounds = conv.get_bounds ();
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	2133 }
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	2134 catch (const jit_fail_exception& e)
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	2135 {
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	2136 #ifdef OCTAVE_JIT_DEBUG
15310 b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2137 if (Venable_jit_debug)
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2138 {
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2139 if (e.known ())
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2140 std::cout << "jit fail: " << e.what () << std::endl;
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2141 }
15191 ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	2142 #endif
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	2143 }
15027 741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2144
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2145 if (llvm_function)
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2146 {
15191 ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	2147 #ifdef OCTAVE_JIT_DEBUG
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	2148 llvm::raw_os_ostream llvm_cout (std::cout);
15310 b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2149
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2150 if (Venable_jit_debug)
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2151 {
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2152 std::cout << "-------------------- llvm ir --------------------";
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2153 llvm_function->print (llvm_cout);
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2154 std::cout << std::endl;
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2155 llvm::verifyFunction (*llvm_function);
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2156 }
15191 ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	2157 #endif
ed4f4fb78586 Move type inference from jit_convert to jit_infer Max Brister <max@2bass.com> parents: 15182 diff changeset	2158
15027 741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2159 tjit.optimize (llvm_function);
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2160
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2161 #ifdef OCTAVE_JIT_DEBUG
15310 b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2162 if (Venable_jit_debug)
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2163 {
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2164 std::cout << "-------------------- optimized llvm ir "
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2165 << "--------------------\n";
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2166 llvm_function->print (llvm_cout);
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2167 llvm_cout.flush ();
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2168 std::cout << std::endl;
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2169 }
15027 741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2170 #endif
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2171
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2172 void *void_fn = engine->getPointerToFunction (llvm_function);
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2173 function = reinterpret_cast<jited_function> (void_fn);
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2174 }
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2175 }
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2176
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2177 octave_value
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2178 jit_info::find (const vmap& extra_vars, const std::string& vname) const
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2179 {
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2180 vmap::const_iterator iter = extra_vars.find (vname);
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2181 return iter == extra_vars.end () ? symbol_table::varval (vname)
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2182 : *iter->second;
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2183 }
741d2dbcc117 Check trip count before compiling for loops. Max Brister <max@2bass.com> parents: 15023 diff changeset	2184
14932 1f914446157d Locate and link with LLVM properly Max Brister <max@2bass.com> parents: 14928 diff changeset	2185 #endif
15014 094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2186
15310 b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2187 DEFUN (enable_jit_debug, args, nargout,
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2188 "-- texinfo --\n\
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2189 @deftypefn {Built-in Function} {} enable_jit_debug ()\n\
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2190 Query or set the internal variable that determines whether\n\
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2191 debugging/tracing is enabled for Octave's JIT compiler.\n\
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2192 @end deftypefn")
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2193 {
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2194 #if defined (HAVE_LLVM) && defined (OCTAVE_JIT_DEBUG)
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2195 return SET_INTERNAL_VARIABLE (enable_jit_debug);
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2196 #else
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2197 warning ("enable_jit_debug: JIT compiling not available in this version of Octave");
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2198 return octave_value ();
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2199 #endif
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2200 }
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2201
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2202 DEFUN (enable_jit_compiler, args, nargout,
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2203 "-- texinfo --\n\
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2204 @deftypefn {Built-in Function} {} enable_jit_compiler ()\n\
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2205 Query or set the internal variable that enables Octave's JIT compiler.\n\
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2206 @end deftypefn")
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2207 {
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2208 #if defined (HAVE_LLVM)
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2209 return SET_INTERNAL_VARIABLE (enable_jit_compiler);
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2210 #else
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2211 warning ("enable_jit_compiler: JIT compiling not available in this version of Octave");
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2212 return octave_value ();
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2213 #endif
b055fc077224 allow jit compiler to be enabled at run-time John W. Eaton <jwe@octave.org> parents: 15245 diff changeset	2214 }
15014 094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2215
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2216 /*
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2217 Test some simple cases that compile.
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2218
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2219 %!test
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2220 %! inc = 1e-5;
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2221 %! result = 0;
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2222 %! for ii = 0:inc:1
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2223 %! result = result + inc * (1/3 * ii * ii);
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2224 %! endfor
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2225 %! assert (abs (result - 1/9) < 1e-5);
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2226
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2227 %!test
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2228 %! inc = 1e-5;
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2229 %! result = 0;
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2230 %! for ii = 0:inc:1
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2231 %! # the ^ operator's result is complex
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2232 %! result = result + inc * (1/3 * ii ^ 2);
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2233 %! endfor
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2234 %! assert (abs (result - 1/9) < 1e-5);
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2235
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2236 %!test
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2237 %! nr = 1001;
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2238 %! mat = zeros (1, nr);
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2239 %! for i = 1:nr
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2240 %! mat(i) = i;
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2241 %! endfor
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2242 %! assert (mat == 1:nr);
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2243
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2244 %!test
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2245 %! nr = 1001;
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2246 %! mat = 1:nr;
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2247 %! mat(end) = 0; # force mat to a matrix
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2248 %! total = 0;
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2249 %! for i = 1:nr
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2250 %! total = mat(i) + total;
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2251 %! endfor
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2252 %! assert (sum (mat) == total);
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2253
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2254 %!test
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2255 %! nr = 1001;
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2256 %! mat = [3 1 5];
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2257 %! try
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2258 %! for i = 1:nr
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2259 %! if i > 500
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2260 %! result = mat(100);
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2261 %! else
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2262 %! result = i;
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2263 %! endif
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2264 %! endfor
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2265 %! catch
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2266 %! end
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2267 %! assert (result == 500);
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2268
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2269 %!function result = gen_test (n)
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2270 %! result = double (rand (1, n) > .01);
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2271 %!endfunction
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2272
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2273 %!function z = vectorized (A, K)
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2274 %! temp = ones (1, K);
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2275 %! z = conv (A, temp);
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2276 %! z = z > K-1;
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2277 %! z = conv (z, temp);
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2278 %! z = z(K:end-K+1);
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2279 %! z = z >= 1;
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2280 %!endfunction
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2281
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2282 %!function z = loopy (A, K)
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2283 %! z = A;
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2284 %! n = numel (A);
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2285 %! counter = 0;
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2286 %! for ii=1:n
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2287 %! if z(ii)
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2288 %! counter = counter + 1;
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2289 %! else
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2290 %! if counter > 0 && counter < K
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2291 %! z(ii-counter:ii-1) = 0;
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2292 %! endif
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2293 %! counter = 0;
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2294 %! endif
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2295 %! endfor
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2296 %!
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2297 %! if counter > 0 && counter < K
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2298 %! z(end-counter+1:end) = 0;
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2299 %! endif
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2300 %!endfunction
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2301
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2302 %!test
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2303 %! test_set = gen_test (10000);
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2304 %! assert (all (vectorized (test_set, 3) == loopy (test_set, 3)));
094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2305
15023 75d1bc2fd6d2 Compile top level while loops in JIT. Max Brister <max@2bass.com> parents: 15016 diff changeset	2306 %!test
75d1bc2fd6d2 Compile top level while loops in JIT. Max Brister <max@2bass.com> parents: 15016 diff changeset	2307 %! niter = 1001;
75d1bc2fd6d2 Compile top level while loops in JIT. Max Brister <max@2bass.com> parents: 15016 diff changeset	2308 %! i = 0;
75d1bc2fd6d2 Compile top level while loops in JIT. Max Brister <max@2bass.com> parents: 15016 diff changeset	2309 %! while (i < niter)
75d1bc2fd6d2 Compile top level while loops in JIT. Max Brister <max@2bass.com> parents: 15016 diff changeset	2310 %! i = i + 1;
75d1bc2fd6d2 Compile top level while loops in JIT. Max Brister <max@2bass.com> parents: 15016 diff changeset	2311 %! endwhile
75d1bc2fd6d2 Compile top level while loops in JIT. Max Brister <max@2bass.com> parents: 15016 diff changeset	2312 %! assert (i == niter);
75d1bc2fd6d2 Compile top level while loops in JIT. Max Brister <max@2bass.com> parents: 15016 diff changeset	2313
15056 bc32288f4a42 Support the end keyword for one dimentional indexing in JIT. Max Brister <max@2bass.com> parents: 15030 diff changeset	2314 %!test
bc32288f4a42 Support the end keyword for one dimentional indexing in JIT. Max Brister <max@2bass.com> parents: 15030 diff changeset	2315 %! niter = 1001;
bc32288f4a42 Support the end keyword for one dimentional indexing in JIT. Max Brister <max@2bass.com> parents: 15030 diff changeset	2316 %! result = 0;
bc32288f4a42 Support the end keyword for one dimentional indexing in JIT. Max Brister <max@2bass.com> parents: 15030 diff changeset	2317 %! m = [5 10];
bc32288f4a42 Support the end keyword for one dimentional indexing in JIT. Max Brister <max@2bass.com> parents: 15030 diff changeset	2318 %! for i=1:niter
bc32288f4a42 Support the end keyword for one dimentional indexing in JIT. Max Brister <max@2bass.com> parents: 15030 diff changeset	2319 %! result = result + m(end);
bc32288f4a42 Support the end keyword for one dimentional indexing in JIT. Max Brister <max@2bass.com> parents: 15030 diff changeset	2320 %! endfor
bc32288f4a42 Support the end keyword for one dimentional indexing in JIT. Max Brister <max@2bass.com> parents: 15030 diff changeset	2321 %! assert (result == m(end) * niter);
bc32288f4a42 Support the end keyword for one dimentional indexing in JIT. Max Brister <max@2bass.com> parents: 15030 diff changeset	2322
15067 df4538e3b50b ND scalar indexing in JIT. Max Brister <max@2bass.com> parents: 15056 diff changeset	2323 %!test
df4538e3b50b ND scalar indexing in JIT. Max Brister <max@2bass.com> parents: 15056 diff changeset	2324 %! ndim = 100;
df4538e3b50b ND scalar indexing in JIT. Max Brister <max@2bass.com> parents: 15056 diff changeset	2325 %! result = 0;
df4538e3b50b ND scalar indexing in JIT. Max Brister <max@2bass.com> parents: 15056 diff changeset	2326 %! m = zeros (ndim);
df4538e3b50b ND scalar indexing in JIT. Max Brister <max@2bass.com> parents: 15056 diff changeset	2327 %! m(:) = 1:ndim^2;
df4538e3b50b ND scalar indexing in JIT. Max Brister <max@2bass.com> parents: 15056 diff changeset	2328 %! i = 1;
df4538e3b50b ND scalar indexing in JIT. Max Brister <max@2bass.com> parents: 15056 diff changeset	2329 %! while (i <= ndim)
df4538e3b50b ND scalar indexing in JIT. Max Brister <max@2bass.com> parents: 15056 diff changeset	2330 %! for j = 1:ndim
df4538e3b50b ND scalar indexing in JIT. Max Brister <max@2bass.com> parents: 15056 diff changeset	2331 %! result = result + m(i, j);
df4538e3b50b ND scalar indexing in JIT. Max Brister <max@2bass.com> parents: 15056 diff changeset	2332 %! endfor
df4538e3b50b ND scalar indexing in JIT. Max Brister <max@2bass.com> parents: 15056 diff changeset	2333 %! i = i + 1;
df4538e3b50b ND scalar indexing in JIT. Max Brister <max@2bass.com> parents: 15056 diff changeset	2334 %! endwhile
df4538e3b50b ND scalar indexing in JIT. Max Brister <max@2bass.com> parents: 15056 diff changeset	2335 %! assert (result == sum (sum (m)));
15068 f57d7578c1a6 Support ND matrix indexing with scalar assignment in JIT. Max Brister <max@2bass.com> parents: 15067 diff changeset	2336
f57d7578c1a6 Support ND matrix indexing with scalar assignment in JIT. Max Brister <max@2bass.com> parents: 15067 diff changeset	2337 %!test
f57d7578c1a6 Support ND matrix indexing with scalar assignment in JIT. Max Brister <max@2bass.com> parents: 15067 diff changeset	2338 %! ndim = 100;
f57d7578c1a6 Support ND matrix indexing with scalar assignment in JIT. Max Brister <max@2bass.com> parents: 15067 diff changeset	2339 %! m = zeros (ndim);
f57d7578c1a6 Support ND matrix indexing with scalar assignment in JIT. Max Brister <max@2bass.com> parents: 15067 diff changeset	2340 %! i = 1;
f57d7578c1a6 Support ND matrix indexing with scalar assignment in JIT. Max Brister <max@2bass.com> parents: 15067 diff changeset	2341 %! while (i <= ndim)
f57d7578c1a6 Support ND matrix indexing with scalar assignment in JIT. Max Brister <max@2bass.com> parents: 15067 diff changeset	2342 %! for j = 1:ndim
f57d7578c1a6 Support ND matrix indexing with scalar assignment in JIT. Max Brister <max@2bass.com> parents: 15067 diff changeset	2343 %! m(i, j) = (j - 1) * ndim + i;
f57d7578c1a6 Support ND matrix indexing with scalar assignment in JIT. Max Brister <max@2bass.com> parents: 15067 diff changeset	2344 %! endfor
f57d7578c1a6 Support ND matrix indexing with scalar assignment in JIT. Max Brister <max@2bass.com> parents: 15067 diff changeset	2345 %! i = i + 1;
f57d7578c1a6 Support ND matrix indexing with scalar assignment in JIT. Max Brister <max@2bass.com> parents: 15067 diff changeset	2346 %! endwhile
f57d7578c1a6 Support ND matrix indexing with scalar assignment in JIT. Max Brister <max@2bass.com> parents: 15067 diff changeset	2347 %! m2 = zeros (ndim);
f57d7578c1a6 Support ND matrix indexing with scalar assignment in JIT. Max Brister <max@2bass.com> parents: 15067 diff changeset	2348 %! m2(:) = 1:(ndim^2);
f57d7578c1a6 Support ND matrix indexing with scalar assignment in JIT. Max Brister <max@2bass.com> parents: 15067 diff changeset	2349 %! assert (all (m == m2));
f57d7578c1a6 Support ND matrix indexing with scalar assignment in JIT. Max Brister <max@2bass.com> parents: 15067 diff changeset	2350
15078 fe4752f772e2 Generate ND indexing functions on demand in JIT. Max Brister <max@2bass.com> parents: 15068 diff changeset	2351 %!test
fe4752f772e2 Generate ND indexing functions on demand in JIT. Max Brister <max@2bass.com> parents: 15068 diff changeset	2352 %! ndim = 2;
fe4752f772e2 Generate ND indexing functions on demand in JIT. Max Brister <max@2bass.com> parents: 15068 diff changeset	2353 %! m = zeros (ndim, ndim, ndim, ndim);
fe4752f772e2 Generate ND indexing functions on demand in JIT. Max Brister <max@2bass.com> parents: 15068 diff changeset	2354 %! result = 0;
fe4752f772e2 Generate ND indexing functions on demand in JIT. Max Brister <max@2bass.com> parents: 15068 diff changeset	2355 %! i0 = 1;
fe4752f772e2 Generate ND indexing functions on demand in JIT. Max Brister <max@2bass.com> parents: 15068 diff changeset	2356 %! while (i0 <= ndim)
fe4752f772e2 Generate ND indexing functions on demand in JIT. Max Brister <max@2bass.com> parents: 15068 diff changeset	2357 %! for i1 = 1:ndim
fe4752f772e2 Generate ND indexing functions on demand in JIT. Max Brister <max@2bass.com> parents: 15068 diff changeset	2358 %! for i2 = 1:ndim
fe4752f772e2 Generate ND indexing functions on demand in JIT. Max Brister <max@2bass.com> parents: 15068 diff changeset	2359 %! for i3 = 1:ndim
fe4752f772e2 Generate ND indexing functions on demand in JIT. Max Brister <max@2bass.com> parents: 15068 diff changeset	2360 %! m(i0, i1, i2, i3) = 1;
fe4752f772e2 Generate ND indexing functions on demand in JIT. Max Brister <max@2bass.com> parents: 15068 diff changeset	2361 %! m(i0, i1, i2, i3, 1, 1, 1, 1, 1, 1) = 1;
fe4752f772e2 Generate ND indexing functions on demand in JIT. Max Brister <max@2bass.com> parents: 15068 diff changeset	2362 %! result = result + m(i0, i1, i2, i3);
fe4752f772e2 Generate ND indexing functions on demand in JIT. Max Brister <max@2bass.com> parents: 15068 diff changeset	2363 %! endfor
fe4752f772e2 Generate ND indexing functions on demand in JIT. Max Brister <max@2bass.com> parents: 15068 diff changeset	2364 %! endfor
fe4752f772e2 Generate ND indexing functions on demand in JIT. Max Brister <max@2bass.com> parents: 15068 diff changeset	2365 %! endfor
fe4752f772e2 Generate ND indexing functions on demand in JIT. Max Brister <max@2bass.com> parents: 15068 diff changeset	2366 %! i0 = i0 + 1;
fe4752f772e2 Generate ND indexing functions on demand in JIT. Max Brister <max@2bass.com> parents: 15068 diff changeset	2367 %! endwhile
fe4752f772e2 Generate ND indexing functions on demand in JIT. Max Brister <max@2bass.com> parents: 15068 diff changeset	2368 %! expected = ones (ndim, ndim, ndim, ndim);
fe4752f772e2 Generate ND indexing functions on demand in JIT. Max Brister <max@2bass.com> parents: 15068 diff changeset	2369 %! assert (all (m == expected));
fe4752f772e2 Generate ND indexing functions on demand in JIT. Max Brister <max@2bass.com> parents: 15068 diff changeset	2370 %! assert (result == sum (expected (:)));
fe4752f772e2 Generate ND indexing functions on demand in JIT. Max Brister <max@2bass.com> parents: 15068 diff changeset	2371
15095 9df70a18aa27 Correct division by zero check in JIT Max Brister <max@2bass.com> parents: 15078 diff changeset	2372 %!function test_divide ()
9df70a18aa27 Correct division by zero check in JIT Max Brister <max@2bass.com> parents: 15078 diff changeset	2373 %! state = warning ("query", "Octave:divide-by-zero").state;
9df70a18aa27 Correct division by zero check in JIT Max Brister <max@2bass.com> parents: 15078 diff changeset	2374 %! unwind_protect
9df70a18aa27 Correct division by zero check in JIT Max Brister <max@2bass.com> parents: 15078 diff changeset	2375 %! warning ("error", "Octave:divide-by-zero");
9df70a18aa27 Correct division by zero check in JIT Max Brister <max@2bass.com> parents: 15078 diff changeset	2376 %! for i=1:1e5
9df70a18aa27 Correct division by zero check in JIT Max Brister <max@2bass.com> parents: 15078 diff changeset	2377 %! a = 1;
9df70a18aa27 Correct division by zero check in JIT Max Brister <max@2bass.com> parents: 15078 diff changeset	2378 %! a / 0;
9df70a18aa27 Correct division by zero check in JIT Max Brister <max@2bass.com> parents: 15078 diff changeset	2379 %! endfor
9df70a18aa27 Correct division by zero check in JIT Max Brister <max@2bass.com> parents: 15078 diff changeset	2380 %! unwind_protect_cleanup
9df70a18aa27 Correct division by zero check in JIT Max Brister <max@2bass.com> parents: 15078 diff changeset	2381 %! warning (state, "Octave:divide-by-zero");
9df70a18aa27 Correct division by zero check in JIT Max Brister <max@2bass.com> parents: 15078 diff changeset	2382 %! end_unwind_protect
9df70a18aa27 Correct division by zero check in JIT Max Brister <max@2bass.com> parents: 15078 diff changeset	2383 %!endfunction
9df70a18aa27 Correct division by zero check in JIT Max Brister <max@2bass.com> parents: 15078 diff changeset	2384
9df70a18aa27 Correct division by zero check in JIT Max Brister <max@2bass.com> parents: 15078 diff changeset	2385 %!error <division by zero> test_divide ()
9df70a18aa27 Correct division by zero check in JIT Max Brister <max@2bass.com> parents: 15078 diff changeset	2386
9df70a18aa27 Correct division by zero check in JIT Max Brister <max@2bass.com> parents: 15078 diff changeset	2387 %!test
9df70a18aa27 Correct division by zero check in JIT Max Brister <max@2bass.com> parents: 15078 diff changeset	2388 %! while 1
9df70a18aa27 Correct division by zero check in JIT Max Brister <max@2bass.com> parents: 15078 diff changeset	2389 %! a = 0;
9df70a18aa27 Correct division by zero check in JIT Max Brister <max@2bass.com> parents: 15078 diff changeset	2390 %! result = a / 1;
9df70a18aa27 Correct division by zero check in JIT Max Brister <max@2bass.com> parents: 15078 diff changeset	2391 %! break;
9df70a18aa27 Correct division by zero check in JIT Max Brister <max@2bass.com> parents: 15078 diff changeset	2392 %! endwhile
9df70a18aa27 Correct division by zero check in JIT Max Brister <max@2bass.com> parents: 15078 diff changeset	2393 %! assert (result, 0);
9df70a18aa27 Correct division by zero check in JIT Max Brister <max@2bass.com> parents: 15078 diff changeset	2394
15102 d29f2583cf7b Support end in multi indexing in JIT Max Brister <max@2bass.com> parents: 15096 diff changeset	2395 %!test
d29f2583cf7b Support end in multi indexing in JIT Max Brister <max@2bass.com> parents: 15096 diff changeset	2396 %! m = zeros (2, 1001);
d29f2583cf7b Support end in multi indexing in JIT Max Brister <max@2bass.com> parents: 15096 diff changeset	2397 %! for i=1:1001
d29f2583cf7b Support end in multi indexing in JIT Max Brister <max@2bass.com> parents: 15096 diff changeset	2398 %! m(end, i) = i;
d29f2583cf7b Support end in multi indexing in JIT Max Brister <max@2bass.com> parents: 15096 diff changeset	2399 %! m(end - 1, end - i + 1) = i;
d29f2583cf7b Support end in multi indexing in JIT Max Brister <max@2bass.com> parents: 15096 diff changeset	2400 %! endfor
d29f2583cf7b Support end in multi indexing in JIT Max Brister <max@2bass.com> parents: 15096 diff changeset	2401 %! m2 = zeros (2, 1001);
d29f2583cf7b Support end in multi indexing in JIT Max Brister <max@2bass.com> parents: 15096 diff changeset	2402 %! m2(1, :) = fliplr (1:1001);
d29f2583cf7b Support end in multi indexing in JIT Max Brister <max@2bass.com> parents: 15096 diff changeset	2403 %! m2(2, :) = 1:1001;
d29f2583cf7b Support end in multi indexing in JIT Max Brister <max@2bass.com> parents: 15096 diff changeset	2404 %! assert (m, m2);
d29f2583cf7b Support end in multi indexing in JIT Max Brister <max@2bass.com> parents: 15096 diff changeset	2405
15135 bd6bb87e2bea Support sin, cos, and exp with matrix arguments in JIT Max Brister <max@2bass.com> parents: 15102 diff changeset	2406 %!test
bd6bb87e2bea Support sin, cos, and exp with matrix arguments in JIT Max Brister <max@2bass.com> parents: 15102 diff changeset	2407 %! m = [1 2 3];
bd6bb87e2bea Support sin, cos, and exp with matrix arguments in JIT Max Brister <max@2bass.com> parents: 15102 diff changeset	2408 %! for i=1:1001
bd6bb87e2bea Support sin, cos, and exp with matrix arguments in JIT Max Brister <max@2bass.com> parents: 15102 diff changeset	2409 %! m = sin (m);
bd6bb87e2bea Support sin, cos, and exp with matrix arguments in JIT Max Brister <max@2bass.com> parents: 15102 diff changeset	2410 %! break;
bd6bb87e2bea Support sin, cos, and exp with matrix arguments in JIT Max Brister <max@2bass.com> parents: 15102 diff changeset	2411 %! endfor
bd6bb87e2bea Support sin, cos, and exp with matrix arguments in JIT Max Brister <max@2bass.com> parents: 15102 diff changeset	2412 %! assert (m == sin ([1 2 3]));
bd6bb87e2bea Support sin, cos, and exp with matrix arguments in JIT Max Brister <max@2bass.com> parents: 15102 diff changeset	2413
15140 6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15135 diff changeset	2414 %!test
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15135 diff changeset	2415 %! i = 0;
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15135 diff changeset	2416 %! while i < 10
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15135 diff changeset	2417 %! i += 1;
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15135 diff changeset	2418 %! endwhile
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15135 diff changeset	2419 %! assert (i == 10);
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15135 diff changeset	2420
15146 709e8928e68c Scalar unary operation support in JIT Max Brister <max@2bass.com> parents: 15140 diff changeset	2421 %!test
709e8928e68c Scalar unary operation support in JIT Max Brister <max@2bass.com> parents: 15140 diff changeset	2422 %! i = 0;
709e8928e68c Scalar unary operation support in JIT Max Brister <max@2bass.com> parents: 15140 diff changeset	2423 %! while i < 10
709e8928e68c Scalar unary operation support in JIT Max Brister <max@2bass.com> parents: 15140 diff changeset	2424 %! a = ++i;
709e8928e68c Scalar unary operation support in JIT Max Brister <max@2bass.com> parents: 15140 diff changeset	2425 %! endwhile
709e8928e68c Scalar unary operation support in JIT Max Brister <max@2bass.com> parents: 15140 diff changeset	2426 %! assert (i == 10);
709e8928e68c Scalar unary operation support in JIT Max Brister <max@2bass.com> parents: 15140 diff changeset	2427 %! assert (a == 10);
15148 1b2fbc30e4e7 Postfix increment and decrement operations in JIT Max Brister <max@2bass.com> parents: 15147 diff changeset	2428 %!test
1b2fbc30e4e7 Postfix increment and decrement operations in JIT Max Brister <max@2bass.com> parents: 15147 diff changeset	2429 %! i = 0;
1b2fbc30e4e7 Postfix increment and decrement operations in JIT Max Brister <max@2bass.com> parents: 15147 diff changeset	2430 %! while i < 10
1b2fbc30e4e7 Postfix increment and decrement operations in JIT Max Brister <max@2bass.com> parents: 15147 diff changeset	2431 %! a = i++;
1b2fbc30e4e7 Postfix increment and decrement operations in JIT Max Brister <max@2bass.com> parents: 15147 diff changeset	2432 %! endwhile
1b2fbc30e4e7 Postfix increment and decrement operations in JIT Max Brister <max@2bass.com> parents: 15147 diff changeset	2433 %! assert (i == 10);
1b2fbc30e4e7 Postfix increment and decrement operations in JIT Max Brister <max@2bass.com> parents: 15147 diff changeset	2434 %! assert (a == 9);
15146 709e8928e68c Scalar unary operation support in JIT Max Brister <max@2bass.com> parents: 15140 diff changeset	2435
15169 6242904370bd Support balance, cond, det, norm, rand, magic, eye, and mod in JIT Max Brister <max@2bass.com> parents: 15148 diff changeset	2436 %!test
6242904370bd Support balance, cond, det, norm, rand, magic, eye, and mod in JIT Max Brister <max@2bass.com> parents: 15148 diff changeset	2437 %! num = 2;
6242904370bd Support balance, cond, det, norm, rand, magic, eye, and mod in JIT Max Brister <max@2bass.com> parents: 15148 diff changeset	2438 %! a = zeros (1, num);
6242904370bd Support balance, cond, det, norm, rand, magic, eye, and mod in JIT Max Brister <max@2bass.com> parents: 15148 diff changeset	2439 %! i = 1;
6242904370bd Support balance, cond, det, norm, rand, magic, eye, and mod in JIT Max Brister <max@2bass.com> parents: 15148 diff changeset	2440 %! while i <= num
6242904370bd Support balance, cond, det, norm, rand, magic, eye, and mod in JIT Max Brister <max@2bass.com> parents: 15148 diff changeset	2441 %! a(i) = norm (eye (i));
6242904370bd Support balance, cond, det, norm, rand, magic, eye, and mod in JIT Max Brister <max@2bass.com> parents: 15148 diff changeset	2442 %! ++i;
6242904370bd Support balance, cond, det, norm, rand, magic, eye, and mod in JIT Max Brister <max@2bass.com> parents: 15148 diff changeset	2443 %! endwhile
6242904370bd Support balance, cond, det, norm, rand, magic, eye, and mod in JIT Max Brister <max@2bass.com> parents: 15148 diff changeset	2444 %! assert (a, ones (1, num));
6242904370bd Support balance, cond, det, norm, rand, magic, eye, and mod in JIT Max Brister <max@2bass.com> parents: 15148 diff changeset	2445
15171 7a19e8275d41 Do not simplify the CFG during type inference Max Brister <max@2bass.com> parents: 15169 diff changeset	2446 %!function test_compute_idom ()
7a19e8275d41 Do not simplify the CFG during type inference Max Brister <max@2bass.com> parents: 15169 diff changeset	2447 %! while (li <= length (l1) && si <= length (s1))
7a19e8275d41 Do not simplify the CFG during type inference Max Brister <max@2bass.com> parents: 15169 diff changeset	2448 %! if (l1 (li) < s1 (si))
7a19e8275d41 Do not simplify the CFG during type inference Max Brister <max@2bass.com> parents: 15169 diff changeset	2449 %! if (li == si)
7a19e8275d41 Do not simplify the CFG during type inference Max Brister <max@2bass.com> parents: 15169 diff changeset	2450 %! break;
7a19e8275d41 Do not simplify the CFG during type inference Max Brister <max@2bass.com> parents: 15169 diff changeset	2451 %! endif;
7a19e8275d41 Do not simplify the CFG during type inference Max Brister <max@2bass.com> parents: 15169 diff changeset	2452 %! li++;
7a19e8275d41 Do not simplify the CFG during type inference Max Brister <max@2bass.com> parents: 15169 diff changeset	2453 %! else
7a19e8275d41 Do not simplify the CFG during type inference Max Brister <max@2bass.com> parents: 15169 diff changeset	2454 %! si++;
7a19e8275d41 Do not simplify the CFG during type inference Max Brister <max@2bass.com> parents: 15169 diff changeset	2455 %! endif;
7a19e8275d41 Do not simplify the CFG during type inference Max Brister <max@2bass.com> parents: 15169 diff changeset	2456 %! endwhile
7a19e8275d41 Do not simplify the CFG during type inference Max Brister <max@2bass.com> parents: 15169 diff changeset	2457
7a19e8275d41 Do not simplify the CFG during type inference Max Brister <max@2bass.com> parents: 15169 diff changeset	2458 %!error test_compute_idom ()
7a19e8275d41 Do not simplify the CFG during type inference Max Brister <max@2bass.com> parents: 15169 diff changeset	2459
15230 b0c08e995950 pt-jit.cc (jit_convert::get_variable): Add type bound Max Brister <max@2bass.com> parents: 15195 diff changeset	2460 %!function x = test_overload (a)
b0c08e995950 pt-jit.cc (jit_convert::get_variable): Add type bound Max Brister <max@2bass.com> parents: 15195 diff changeset	2461 %! while 1
b0c08e995950 pt-jit.cc (jit_convert::get_variable): Add type bound Max Brister <max@2bass.com> parents: 15195 diff changeset	2462 %! x = a;
b0c08e995950 pt-jit.cc (jit_convert::get_variable): Add type bound Max Brister <max@2bass.com> parents: 15195 diff changeset	2463 %! break;
b0c08e995950 pt-jit.cc (jit_convert::get_variable): Add type bound Max Brister <max@2bass.com> parents: 15195 diff changeset	2464 %! endwhile
b0c08e995950 pt-jit.cc (jit_convert::get_variable): Add type bound Max Brister <max@2bass.com> parents: 15195 diff changeset	2465 %!endfunction
b0c08e995950 pt-jit.cc (jit_convert::get_variable): Add type bound Max Brister <max@2bass.com> parents: 15195 diff changeset	2466
b0c08e995950 pt-jit.cc (jit_convert::get_variable): Add type bound Max Brister <max@2bass.com> parents: 15195 diff changeset	2467 %!assert (test_overload (1), 1);
b0c08e995950 pt-jit.cc (jit_convert::get_variable): Add type bound Max Brister <max@2bass.com> parents: 15195 diff changeset	2468 %!assert (test_overload ([1 2]), [1 2]);
b0c08e995950 pt-jit.cc (jit_convert::get_variable): Add type bound Max Brister <max@2bass.com> parents: 15195 diff changeset	2469
15233 c27a1e131b16 pt-jit.cc (jit_convert::visit_simple_for_command): Fix block order Max Brister <max@2bass.com> parents: 15230 diff changeset	2470 %!function a = bubble (a = [3 2 1])
c27a1e131b16 pt-jit.cc (jit_convert::visit_simple_for_command): Fix block order Max Brister <max@2bass.com> parents: 15230 diff changeset	2471 %! swapped = 1;
c27a1e131b16 pt-jit.cc (jit_convert::visit_simple_for_command): Fix block order Max Brister <max@2bass.com> parents: 15230 diff changeset	2472 %! n = length (a);
c27a1e131b16 pt-jit.cc (jit_convert::visit_simple_for_command): Fix block order Max Brister <max@2bass.com> parents: 15230 diff changeset	2473 %! while (swapped)
c27a1e131b16 pt-jit.cc (jit_convert::visit_simple_for_command): Fix block order Max Brister <max@2bass.com> parents: 15230 diff changeset	2474 %! swapped = 0;
c27a1e131b16 pt-jit.cc (jit_convert::visit_simple_for_command): Fix block order Max Brister <max@2bass.com> parents: 15230 diff changeset	2475 %! for i = 1:n-1
c27a1e131b16 pt-jit.cc (jit_convert::visit_simple_for_command): Fix block order Max Brister <max@2bass.com> parents: 15230 diff changeset	2476 %! if a(i) > a(i + 1)
c27a1e131b16 pt-jit.cc (jit_convert::visit_simple_for_command): Fix block order Max Brister <max@2bass.com> parents: 15230 diff changeset	2477 %! swapped = 1;
c27a1e131b16 pt-jit.cc (jit_convert::visit_simple_for_command): Fix block order Max Brister <max@2bass.com> parents: 15230 diff changeset	2478 %! temp = a(i);
c27a1e131b16 pt-jit.cc (jit_convert::visit_simple_for_command): Fix block order Max Brister <max@2bass.com> parents: 15230 diff changeset	2479 %! a(i) = a(i + 1);
c27a1e131b16 pt-jit.cc (jit_convert::visit_simple_for_command): Fix block order Max Brister <max@2bass.com> parents: 15230 diff changeset	2480 %! a(i + 1) = temp;
c27a1e131b16 pt-jit.cc (jit_convert::visit_simple_for_command): Fix block order Max Brister <max@2bass.com> parents: 15230 diff changeset	2481 %! endif
c27a1e131b16 pt-jit.cc (jit_convert::visit_simple_for_command): Fix block order Max Brister <max@2bass.com> parents: 15230 diff changeset	2482 %! endfor
c27a1e131b16 pt-jit.cc (jit_convert::visit_simple_for_command): Fix block order Max Brister <max@2bass.com> parents: 15230 diff changeset	2483 %! endwhile
c27a1e131b16 pt-jit.cc (jit_convert::visit_simple_for_command): Fix block order Max Brister <max@2bass.com> parents: 15230 diff changeset	2484 %!endfunction
c27a1e131b16 pt-jit.cc (jit_convert::visit_simple_for_command): Fix block order Max Brister <max@2bass.com> parents: 15230 diff changeset	2485
c27a1e131b16 pt-jit.cc (jit_convert::visit_simple_for_command): Fix block order Max Brister <max@2bass.com> parents: 15230 diff changeset	2486 %!assert (bubble (), [1 2 3]);
c27a1e131b16 pt-jit.cc (jit_convert::visit_simple_for_command): Fix block order Max Brister <max@2bass.com> parents: 15230 diff changeset	2487
15245 4c0cef65c55f pt-jit.cc (jit_infer::do_construct_ir): Correct extraious phi removal Max Brister <max@2bass.com> parents: 15234 diff changeset	2488 %!test
4c0cef65c55f pt-jit.cc (jit_infer::do_construct_ir): Correct extraious phi removal Max Brister <max@2bass.com> parents: 15234 diff changeset	2489 %! a = 0;
4c0cef65c55f pt-jit.cc (jit_infer::do_construct_ir): Correct extraious phi removal Max Brister <max@2bass.com> parents: 15234 diff changeset	2490 %! b = 1;
4c0cef65c55f pt-jit.cc (jit_infer::do_construct_ir): Correct extraious phi removal Max Brister <max@2bass.com> parents: 15234 diff changeset	2491 %! for i=1:1e3
4c0cef65c55f pt-jit.cc (jit_infer::do_construct_ir): Correct extraious phi removal Max Brister <max@2bass.com> parents: 15234 diff changeset	2492 %! for j=1:2
4c0cef65c55f pt-jit.cc (jit_infer::do_construct_ir): Correct extraious phi removal Max Brister <max@2bass.com> parents: 15234 diff changeset	2493 %! a = a + b;
4c0cef65c55f pt-jit.cc (jit_infer::do_construct_ir): Correct extraious phi removal Max Brister <max@2bass.com> parents: 15234 diff changeset	2494 %! endfor
4c0cef65c55f pt-jit.cc (jit_infer::do_construct_ir): Correct extraious phi removal Max Brister <max@2bass.com> parents: 15234 diff changeset	2495 %! endfor
4c0cef65c55f pt-jit.cc (jit_infer::do_construct_ir): Correct extraious phi removal Max Brister <max@2bass.com> parents: 15234 diff changeset	2496 %! assert (a, 2000);
4c0cef65c55f pt-jit.cc (jit_infer::do_construct_ir): Correct extraious phi removal Max Brister <max@2bass.com> parents: 15234 diff changeset	2497 %! assert (b, 1);
4c0cef65c55f pt-jit.cc (jit_infer::do_construct_ir): Correct extraious phi removal Max Brister <max@2bass.com> parents: 15234 diff changeset	2498
15311 de9bfcf637df Fix error when compiling with complex matrix (bug #37247) Max Brister <max@2bass.com> parents: 15310 diff changeset	2499 %!test
de9bfcf637df Fix error when compiling with complex matrix (bug #37247) Max Brister <max@2bass.com> parents: 15310 diff changeset	2500 %! a = [1+1i 1+2i];
de9bfcf637df Fix error when compiling with complex matrix (bug #37247) Max Brister <max@2bass.com> parents: 15310 diff changeset	2501 %! b = 0;
de9bfcf637df Fix error when compiling with complex matrix (bug #37247) Max Brister <max@2bass.com> parents: 15310 diff changeset	2502 %! while 1
de9bfcf637df Fix error when compiling with complex matrix (bug #37247) Max Brister <max@2bass.com> parents: 15310 diff changeset	2503 %! b = a(1);
de9bfcf637df Fix error when compiling with complex matrix (bug #37247) Max Brister <max@2bass.com> parents: 15310 diff changeset	2504 %! break;
de9bfcf637df Fix error when compiling with complex matrix (bug #37247) Max Brister <max@2bass.com> parents: 15310 diff changeset	2505 %! endwhile
de9bfcf637df Fix error when compiling with complex matrix (bug #37247) Max Brister <max@2bass.com> parents: 15310 diff changeset	2506 %! assert (b, a(1));
de9bfcf637df Fix error when compiling with complex matrix (bug #37247) Max Brister <max@2bass.com> parents: 15310 diff changeset	2507
15334 8125773322d4 Error on undefined an unused variables in JIT Max Brister <max@2bass.com> parents: 15311 diff changeset	2508 %!function test_undef ()
8125773322d4 Error on undefined an unused variables in JIT Max Brister <max@2bass.com> parents: 15311 diff changeset	2509 %! for i=1:1e7
8125773322d4 Error on undefined an unused variables in JIT Max Brister <max@2bass.com> parents: 15311 diff changeset	2510 %! XXX;
8125773322d4 Error on undefined an unused variables in JIT Max Brister <max@2bass.com> parents: 15311 diff changeset	2511 %! endfor
8125773322d4 Error on undefined an unused variables in JIT Max Brister <max@2bass.com> parents: 15311 diff changeset	2512 %!endfunction
8125773322d4 Error on undefined an unused variables in JIT Max Brister <max@2bass.com> parents: 15311 diff changeset	2513
8125773322d4 Error on undefined an unused variables in JIT Max Brister <max@2bass.com> parents: 15311 diff changeset	2514 %!error <undefined near> (test_undef);
8125773322d4 Error on undefined an unused variables in JIT Max Brister <max@2bass.com> parents: 15311 diff changeset	2515
15337 3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2516 %!shared id
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2517 %! id = @(x) x;
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2518
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2519 %!assert (id (1), 1);
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2520 %!assert (id (1+1i), 1+1i)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2521 %!assert (id (1, 2), 1)
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2522 %!error <undefined> (id ())
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2523
3f43e9d6d86e JIT compile anonymous functions Max Brister <max@2bass.com> parents: 15334 diff changeset	2524
15014 094bc0a145a1 Take into account different calling conventions Max Brister <max@2bass.com> parents: 14992 diff changeset	2525 */

Mercurial > octave-nkf

annotate libinterp/interp-core/pt-jit.cc @ 15337:3f43e9d6d86e