octave-nkf: libinterp/corefcn/pt-jit.cc annotate

annotate libinterp/corefcn/pt-jit.cc @ 18601:fa53284d4511 draft lyh

Fix warnings

author	LYH <lyh.kernel@gmail.com>
date	Fri, 21 Mar 2014 14:59:39 -0400
parents	67445219aee2
children

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

Mercurial > octave-nkf

annotate libinterp/corefcn/pt-jit.cc @ 18601:fa53284d4511 draft lyh