Mercurial > octave

comparison libinterp/octave-value/ov-builtin.h @ 29949:f254c302bb9c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove JIT compiler from Octave sources As stated in the NEWS file entry added with this changeset, no one has ever seriously taken on further development of the JIT compiler in Octave since it was first added as part of a Google Summer of Code project in 2012 and it still does nothing significant. It is out of date with the default interpreter that walks the parse tree. Even though we have fixed the configure script to disable it by default, people still ask questions about how to build it, but it doesn’t seem that they are doing that to work on it but because they think it will make Octave code run faster (it never did, except for some extremely simple bits of code as examples for demonstration purposes only). * NEWS: Note change. * configure.ac, acinclude.m4: Eliminate checks and macros related to the JIT compiler and LLVM. * basics.txi, install.txi, octave.texi, vectorize.txi: Remove mention of JIT compiler and LLVM. * jit-ir.cc, jit-ir.h, jit-typeinfo.cc, jit-typeinfo.h, jit-util.cc, jit-util.h, pt-jit.cc, pt-jit.h: Delete. * libinterp/parse-tree/module.mk: Update. * Array-jit.cc: Delete. * libinterp/template-inst/module.mk: Update. * test/jit.tst: Delete. * test/module.mk: Update. * interpreter.cc (interpreter::interpreter): Don't check options for debug_jit or jit_compiler. * toplev.cc (F__octave_config_info__): Remove JIT compiler and LLVM info from struct. * ov-base.h (octave_base_value::grab, octave_base_value::release): Delete. * ov-builtin.h, ov-builtin.cc (octave_builtin::to_jit, octave_builtin::stash_jit): Delete. (octave_builtin::m_jtype): Delete data member and all uses. * ov-usr-fcn.h, ov-usr-fcn.cc (octave_user_function::m_jit_info): Delete data member and all uses. (octave_user_function::get_info, octave_user_function::stash_info): Delete. * options.h (DEBUG_JIT_OPTION, JIT_COMPILER_OPTION): Delete macro definitions and all uses. * octave.h, octave.cc (cmdline_options::cmdline_options): Don't handle DEBUG_JIT_OPTION, JIT_COMPILER_OPTION): Delete. (cmdline_options::debug_jit, cmdline_options::jit_compiler): Delete functions and all uses. (cmdline_options::m_debug_jit, cmdline_options::m_jit_compiler): Delete data members and all uses. (octave_getopt_options long_opts): Remove "debug-jit" and "jit-compiler" from the list. * pt-eval.cc (tree_evaluator::visit_simple_for_command, tree_evaluator::visit_complex_for_command, tree_evaluator::visit_while_command, tree_evaluator::execute_user_function): Eliminate JIT compiler code. * pt-loop.h, pt-loop.cc (tree_while_command::get_info, tree_while_command::stash_info, tree_simple_for_command::get_info, tree_simple_for_command::stash_info): Delete functions and all uses. (tree_while_command::m_compiled, tree_simple_for_command::m_compiled): Delete member variable and all uses. * usage.h (usage_string, octave_print_verbose_usage_and_exit): Remove [--debug-jit] and [--jit-compiler] from the message. * Array.h (Array<T>::Array): Remove constructor that was only intended to be used by the JIT compiler. (Array<T>::jit_ref_count, Array<T>::jit_slice_data, Array<T>::jit_dimensions, Array<T>::jit_array_rep): Delete. * Marray.h (MArray<T>::MArray): Remove constructor that was only intended to be used by the JIT compiler. * NDArray.h (NDArray::NDarray): Remove constructor that was only intended to be used by the JIT compiler. * dim-vector.h (dim_vector::to_jit): Delete. (dim_vector::dim_vector): Remove constructor that was only intended to be used by the JIT compiler. * codeql-analysis.yaml, make.yaml: Don't require llvm-dev. * subst-config-vals.in.sh, subst-cross-config-vals.in.sh: Don't substitute OCTAVE_CONF_LLVM_CPPFLAGS, OCTAVE_CONF_LLVM_LDFLAGS, or OCTAVE_CONF_LLVM_LIBS. * Doxyfile.in: Don't define HAVE_LLVM. * aspell-octave.en.pws: Eliminate jit, JIT, and LLVM from the list of spelling exceptions. * build-env.h, build-env.in.cc (LLVM_CPPFLAGS, LLVM_LDFLAGS, LLVM_LIBS): Delete variables and all uses. * libinterp/corefcn/module.mk (%canon_reldir%_libcorefcn_la_CPPFLAGS): Remove $(LLVM_CPPFLAGS) from the list. * libinterp/parse-tree/module.mk (%canon_reldir%_libparse_tree_la_CPPFLAGS): Remove $(LLVM_CPPFLAGS) from the list.
author John W. Eaton <jwe@octave.org>
date Tue, 10 Aug 2021 16:42:29 -0400
parents 7c8a70e4daad
children 796f54d4ddbf
comparison
equal deleted inserted replaced
29948:c92a4ebaa777 29949:f254c302bb9c
40 40
41 namespace octave 41 namespace octave
42 { 42 {
43 class tree_evaluator; 43 class tree_evaluator;
44 class interpreter; 44 class interpreter;
45 class jit_type;
46 } 45 }
47 46
48 // Builtin functions. 47 // Builtin functions.
49 48
50 class 49 class
52 octave_builtin : public octave_function 51 octave_builtin : public octave_function
53 { 52 {
54 public: 53 public:
55 54
56 octave_builtin (void) 55 octave_builtin (void)
57 : octave_function (), m_fcn (nullptr), m_meth (nullptr), m_file (), 56 : octave_function (), m_fcn (nullptr), m_meth (nullptr), m_file ()
58 m_jtype (nullptr)
59 { } 57 { }
60 58
61 typedef octave_value_list (*meth) (octave::interpreter&, 59 typedef octave_value_list (*meth) (octave::interpreter&,
62 const octave_value_list&, int); 60 const octave_value_list&, int);
63 61
64 typedef octave_value_list (*fcn) (const octave_value_list&, int); 62 typedef octave_value_list (*fcn) (const octave_value_list&, int);
65 63
66 octave_builtin (fcn ff, const std::string& nm = "", 64 octave_builtin (fcn ff, const std::string& nm = "",
67 const std::string& ds = "") 65 const std::string& ds = "")
68 : octave_function (nm, ds), m_fcn (ff), m_meth (nullptr), m_file (), 66 : octave_function (nm, ds), m_fcn (ff), m_meth (nullptr), m_file ()
69 m_jtype (nullptr)
70 { } 67 { }
71 68
72 octave_builtin (meth mm, const std::string& nm = "", 69 octave_builtin (meth mm, const std::string& nm = "",
73 const std::string& ds = "") 70 const std::string& ds = "")
74 : octave_function (nm, ds), m_fcn (nullptr), m_meth (mm), m_file (), 71 : octave_function (nm, ds), m_fcn (nullptr), m_meth (mm), m_file ()
75 m_jtype (nullptr)
76 { } 72 { }
77 73
78 octave_builtin (fcn ff, const std::string& nm, const std::string& fnm, 74 octave_builtin (fcn ff, const std::string& nm, const std::string& fnm,
79 const std::string& ds) 75 const std::string& ds)
80 : octave_function (nm, ds), m_fcn (ff), m_meth (nullptr), m_file (fnm), 76 : octave_function (nm, ds), m_fcn (ff), m_meth (nullptr), m_file (fnm)
81 m_jtype (nullptr)
82 { } 77 { }
83 78
84 octave_builtin (meth mm, const std::string& nm, const std::string& fnm, 79 octave_builtin (meth mm, const std::string& nm, const std::string& fnm,
85 const std::string& ds) 80 const std::string& ds)
86 : octave_function (nm, ds), m_fcn (nullptr), m_meth (mm), m_file (fnm), 81 : octave_function (nm, ds), m_fcn (nullptr), m_meth (mm), m_file (fnm)
87 m_jtype (nullptr)
88 { } 82 { }
89 83
90 // No copying! 84 // No copying!
91 85
92 octave_builtin (const octave_builtin& ob) = delete; 86 octave_builtin (const octave_builtin& ob) = delete;
102 bool is_builtin_function (void) const { return true; } 96 bool is_builtin_function (void) const { return true; }
103 97
104 octave_value_list 98 octave_value_list
105 execute (octave::tree_evaluator& tw, int nargout = 0, 99 execute (octave::tree_evaluator& tw, int nargout = 0,
106 const octave_value_list& args = octave_value_list ()); 100 const octave_value_list& args = octave_value_list ());
107
108 octave::jit_type * to_jit (void) const;
109
110 void stash_jit (octave::jit_type& type);
111 101
112 fcn function (void) const; 102 fcn function (void) const;
113 103
114 meth method (void) const; 104 meth method (void) const;
115 105
127 std::string m_file; 117 std::string m_file;
128 118
129 // The types this function has been declared to handle (if any). 119 // The types this function has been declared to handle (if any).
130 std::set<std::string> m_dispatch_classes; 120 std::set<std::string> m_dispatch_classes;
131 121
132 // A pointer to the jit type that represents the function.
133 octave::jit_type *m_jtype;
134
135 private: 122 private:
136 123
137 DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA 124 DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA
138 }; 125 };
139 126