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