comparison liboctave/array/Array.h @ 29949:f254c302bb9c

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 3e5e88d9c85f
children 4c88a452519c
comparison
equal deleted inserted replaced
29948:c92a4ebaa777 29949:f254c302bb9c
240 240
241 private: 241 private:
242 242
243 static OCTARRAY_API typename Array<T>::ArrayRep *nil_rep (void); 243 static OCTARRAY_API typename Array<T>::ArrayRep *nil_rep (void);
244 244
245 protected:
246
247 //! For jit support
248 Array (T *sdata, octave_idx_type slen, octave_idx_type *adims, void *arep)
249 : m_dimensions (adims),
250 m_rep (reinterpret_cast<typename Array<T>::ArrayRep *> (arep)),
251 m_slice_data (sdata), m_slice_len (slen) { }
252
253 public: 245 public:
254 246
255 //! Empty ctor (0 by 0). 247 //! Empty ctor (0 by 0).
256 Array (void) 248 Array (void)
257 : m_dimensions (), m_rep (nil_rep ()), m_slice_data (m_rep->m_data), 249 : m_dimensions (), m_rep (nil_rep ()), m_slice_data (m_rep->m_data),
836 828
837 //! Returns true if this->dims () == dv, and if so, replaces this->m_dimensions 829 //! Returns true if this->dims () == dv, and if so, replaces this->m_dimensions
838 //! by a shallow copy of dv. This is useful for maintaining several arrays 830 //! by a shallow copy of dv. This is useful for maintaining several arrays
839 //! with supposedly equal dimensions (e.g. structs in the interpreter). 831 //! with supposedly equal dimensions (e.g. structs in the interpreter).
840 OCTARRAY_API bool optimize_dimensions (const dim_vector& dv); 832 OCTARRAY_API bool optimize_dimensions (const dim_vector& dv);
841
842 //@{
843 //! WARNING: Only call these functions from jit
844
845 int jit_ref_count (void) { return m_rep->m_count.value (); }
846
847 T * jit_slice_data (void) const { return m_slice_data; }
848
849 octave_idx_type * jit_dimensions (void) const { return m_dimensions.to_jit (); }
850
851 void * jit_array_rep (void) const { return m_rep; }
852 //@}
853 833
854 private: 834 private:
855 OCTARRAY_API static void instantiation_guard (); 835 OCTARRAY_API static void instantiation_guard ();
856 }; 836 };
857 837