annotate libinterp/corefcn/pt-jit.cc @ 17468:dbfc7f98de02

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