From 9771b26396c39dfaecd5a76dd359fb65d3be4cb6 Mon Sep 17 00:00:00 2001 From: Diego Novillo Date: Sat, 17 Nov 2012 21:54:30 -0500 Subject: This patch rewrites the old VEC macro-based interface into a new one based on the template class 'vec'. This patch rewrites the old VEC macro-based interface into a new one based on the template class 'vec'. The user-visible changes are described in http://gcc.gnu.org/wiki/cxx-conversion/cxx-vec. I have tested the patch pretty extensively: - Regular bootstraps on x86_64, ppc, ia64, sparc and hppa. - Bootstraps with --enable-checking=release - Bootstraps with --enable-checking=gc,gcac - Basic builds on all targets (using contrib/config-list.mk). We no longer access the vectors via VEC_* macros. The pattern is "VEC_operation (T, A, V, args)" becomes "V.operation (args)". The only thing I could not do is create proper ctors and dtors for the vec class. Since these vectors are stored in unions, we have to keep them as PODs (C++03 does not allow non-PODs in unions). This means that creation and destruction must be explicit. There is a new method vec::create() and another vec::destroy() to allocate the internal vector. For vectors that must be pointers, there is a family of free functions that implement the operations that need to tolerate NULL vectors. These functions all start with the prefix 'vec_safe_'. See the wiki page for details. The gengtype change removes the special handling for VEC() that used to exist in gengtype. Additionally, it allows gengtype to recognize templates of more than one argument and introduces the concept of an undefined type (useful for template arguments that may or may not be types). When a TYPE_UNDEFINED is reached, gengtype will ignore it if it happens inside a type marked with GTY((user)). Otherwise, it will emit an error. Finally, gengtype rejects root types marked GTY((user)) that are not first class pointers. 2012-11-16 Diego Novillo VEC API overhaul (http://gcc.gnu.org/wiki/cxx-conversion/cxx-vec) * vec.c (register_overhead): Convert it into member function of vec_prefix. (release_overhead): Likewise. (calculate_allocation): Likewise. (vec_heap_free): Remove. (vec_gc_o_reserve_1): Remove. (vec_heap_o_reserve_1): Remove. (vec_stack_o_reserve_1): Remove. (vec_stack_o_reserve_exact): Remove. (register_stack_vec): New. (stack_vec_register_index): New. (unregister_stack_vec): New. (vec_assert_fail): Remove. * vec.h: Conditionally include ggc.h. Document conditional hackery. Update top-level documentation. (ALONE_VEC_CHECK_INFO): Remove. (VEC_CHECK_INFO): Remove. (ALONE_VEC_CHECK_DECL): Remove. (VEC_CHECK_DECL): Remove. (ALONE_VEC_CHECK_PASS): Remove. (VEC_CHECK_PASS): Remove. (VEC_ASSERT): Remove. (vec_prefix): Add friends va_gc, va_gc_atomic, va_heap and va_stack. Mark fields alloc_ and num_ as protected. (struct vec_t): Remove. Remove all function members. (struct vl_embed): Declare. (struct vl_ptr): Declare. (free): Remove. (reserve_exact): Remove. (reserve): Remove. (safe_splice): Remove. (safe_push): Remove. (safe_grow): Remove. (safe_grow_cleared): Remove. (safe_insert): Remove. (DEF_VEC_I): Remove. (DEF_VEC_ALLOC_I): Remove. (DEF_VEC_P): Remove. (DEF_VEC_ALLOC_P): Remove. (DEF_VEC_O): Remove. (DEF_VEC_ALLOC_O): Remove. (DEF_VEC_ALLOC_P_STACK): Remove. (DEF_VEC_ALLOC_O_STACK): Remove. (DEF_VEC_ALLOC_I_STACK): Remove. (DEF_VEC_A): Remove. (DEF_VEC_ALLOC_A): Remove. (vec_stack_p_reserve_exact_1): Remove. (vec_stack_o_reserve): Remove. (vec_stack_o_reserve_exact): Remove. (VEC_length): Remove. (VEC_empty): Remove. (VEC_address): Remove. (vec_address): Remove. (VEC_last): Remove. (VEC_index): Remove. (VEC_iterate): Remove. (VEC_embedded_size): Remove. (VEC_embedded_init): Remove. (VEC_free): Remove. (VEC_copy): Remove. (VEC_space): Remove. (VEC_reserve): Remove. (VEC_reserve_exact): Remove. (VEC_splice): Remove. (VEC_safe_splice): Remove. (VEC_quick_push): Remove. (VEC_safe_push): Remove. (VEC_pop): Remove. (VEC_truncate): Remove. (VEC_safe_grow): Remove. (VEC_replace): Remove. (VEC_quick_insert): Remove. (VEC_safe_insert): Remove. (VEC_ordered_remove): Remove. (VEC_unordered_remove): Remove. (VEC_block_remove): Remove. (VEC_lower_bound): Remove. (VEC_alloc): Remove. (VEC_qsort): Remove. (va_heap): Declare. (va_heap::default_layout): New typedef to vl_ptr. (va_heap::reserve): New. (va_heap::release): New. (va_gc): Declare. (va_gc::default_layout): New typedef to vl_embed. (va_gc::reserve): New. (va_gc::release): New. (va_gc_atomic): Declare. Inherit from va_gc. (va_stack): Declare. (va_stack::default_layout): New typedef to vl_ptr. (va_stack::alloc): New. (va_stack::reserve): New. (va_stack::release): New. (register_stack_vec): Declare. (stack_vec_register_index): Declare. (unregister_stack_vec): Declare. (vec): Declare empty vec template. (vec): Partial specialization for embedded layout. (vec::allocated): New. (vec::length): New. (vec::is_empty): New. (vec::address): New. (vec::operator[]): New. (vec::last New. (vec::space): New. (vec::iterate): New. (vec::iterate): New. (vec::copy): New. (vec::splice): New. (vec::quick_push New. (vec::pop New. (vec::truncate): New. (vec::quick_insert): New. (vec::ordered_remove): New. (vec::unordered_remove): New. (vec::block_remove): New. (vec::qsort): New. (vec::lower_bound): New. (vec::embedded_size): New. (vec::embedded_init): New. (vec::quick_grow): New. (vec::quick_grow_cleared): New. (vec_safe_space): New. (vec_safe_length): New. (vec_safe_address): New. (vec_safe_is_empty): New. (vec_safe_reserve): New. (vec_safe_reserve_exact): New. (vec_alloc): New. (vec_free): New. (vec_safe_grow): New. (vec_safe_grow_cleared): New. (vec_safe_iterate): New. (vec_safe_push): New. (vec_safe_insert): New. (vec_safe_truncate): New. (vec_safe_copy): New. (vec_safe_splice): New. (vec): New partial specialization for the space efficient layout. (vec::exists): New. (vec::is_empty): New. (vec::length): New. (vec::address): New. (vec::operator[]): New. (vec::operator!=): New. (vec::operator==): New. (vec::last): New. (vec::space): New. (vec::iterate): New. (vec::copy): New. (vec::reserve): New. (vec::reserve_exact): New. (vec::splice): New. (vec::safe_splice): New. (vec::quick_push): New. (vec::safe_push): New. (vec::pop): New. (vec::truncate): New. (vec::safe_grow): New. (vec::safe_grow_cleared): New. (vec::quick_grow): New. (vec::quick_grow_cleared): New. (vec::quick_insert): New. (vec::safe_insert): New. (vec::ordered_remove): New. (vec::unordered_remove): New. (vec::block_remove): New. (vec::qsort): New. (vec::lower_bound): New. (vec_stack_alloc): Define. (FOR_EACH_VEC_SAFE_ELT): Define. * vecir.h: Remove. Update all users. * vecprim.h: Remove. Update all users. Move uchar to coretypes.h. * Makefile.in (VEC_H): Add $(GGC_H). Remove vecir.h and vecprim.h dependencies everywhere. 2012-11-16 Diego Novillo * gengtype-lex.l (VEC): Remove. Add characters in the set [\!\>\.-]. * gengtype-parse.c (token_names): Remove "VEC". (require_template_declaration): Remove handling of VEC_TOKEN. (type): Likewise. Call create_user_defined_type when parsing GTY((user)). * gengtype-state.c (type_lineloc): handle TYPE_UNDEFINED. (write_state_undefined_type): New. (write_state_type): Call write_state_undefined_type for TYPE_UNDEFINED. (read_state_type): Call read_state_undefined_type for TYPE_UNDEFINED. * gengtype.c (dbgprint_count_type_at): Handle TYPE_UNDEFINED. (create_user_defined_type): Make extern. (type_for_name): Factor out of resolve_typedef. (create_undefined_type): New (resolve_typedef): Call it when we cannot find a previous typedef and the type is not a template. (find_structure): Accept TYPE_UNDEFINED. (set_gc_used_type): Add argument ALLOWED_UNDEFINED_TYPES, default to false. Emit an error for TYPE_UNDEFINED unless LEVEL is GC_UNUSED or ALLOWED_UNDEFINED_TYPES is set. Set ALLOWED_UNDEFINED_TYPES to true for TYPE_USER_STRUCT. (filter_type_name): Accept templates with more than one argument. (output_mangled_typename): Handle TYPE_UNDEFINED (walk_type): Likewise. (write_types_process_field): Likewise. (write_func_for_structure): If CHAIN_NEXT is set, ORIG_S should not be a user-defined type. (write_types_local_user_process_field): Handle TYPE_ARRAY, TYPE_NONE and TYPE_UNDEFINED. (write_types_local_process_field): Likewise. (contains_scalar_p): Return 0 for TYPE_USER_STRUCT. (write_root): Reject user-defined types that are not pointers. Handle TYPE_NONE, TYPE_UNDEFINED, TYPE_UNION, TYPE_LANG_STRUCT and TYPE_PARAM_STRUCT. (output_typename): Handle TYPE_NONE, TYPE_UNDEFINED, and TYPE_ARRAY. (dump_typekind): Handle TYPE_UNDEFINED. * gengtype.h (enum typekind): Add TYPE_UNDEFINED. (create_user_defined_type): Declare. (enum gty_token): Remove VEC_TOKEN. 2012-11-16 Diego Novillo Adjust for new vec API (http://gcc.gnu.org/wiki/cxx-conversion/cxx-vec) * coretypes.h (uchar): Define. * alias.c: Use new vec API in vec.h. * asan.c: Likewise. * attribs.c: Likewise. * basic-block.h: Likewise. * bb-reorder.c: Likewise. * builtins.c: Likewise. * calls.c: Likewise. * cfg.c: Likewise. * cfganal.c: Likewise. * cfgcleanup.c: Likewise. * cfgexpand.c: Likewise. * cfghooks.c: Likewise. * cfghooks.h: Likewise. * cfgloop.c: Likewise. * cfgloop.h: Likewise. * cfgloopanal.c: Likewise. * cfgloopmanip.c: Likewise. * cfgrtl.c: Likewise. * cgraph.c: Likewise. * cgraph.h: Likewise. * cgraphclones.c: Likewise. * cgraphunit.c: Likewise. * combine.c: Likewise. * compare-elim.c: Likewise. * coverage.c: Likewise. * cprop.c: Likewise. * data-streamer.h: Likewise. * dbxout.c: Likewise. * dce.c: Likewise. * df-core.c: Likewise. * df-problems.c: Likewise. * df-scan.c: Likewise. * dominance.c: Likewise. * domwalk.c: Likewise. * domwalk.h: Likewise. * dse.c: Likewise. * dwarf2cfi.c: Likewise. * dwarf2out.c: Likewise. * dwarf2out.h: Likewise. * emit-rtl.c: Likewise. * except.c: Likewise. * except.h: Likewise. * expr.c: Likewise. * expr.h: Likewise. * final.c: Likewise. * fold-const.c: Likewise. * function.c: Likewise. * function.h: Likewise. * fwprop.c: Likewise. * gcc.c: Likewise. * gcse.c: Likewise. * genattr.c: Likewise. * genattrtab.c: Likewise. * genautomata.c: Likewise. * genextract.c: Likewise. * genopinit.c: Likewise * ggc-common.c: Likewise. * ggc.h: Likewise. * gimple-low.c: Likewise. * gimple-ssa-strength-reduction.c: Likewise. * gimple-streamer-in.c: Likewise. * gimple.c: Likewise. * gimple.h: Likewise. * gimplify.c: Likewise. * graph.c: Likewise. * graphds.c: Likewise. * graphds.h: Likewise. * graphite-blocking.c: Likewise. * graphite-clast-to-gimple.c: Likewise. * graphite-dependences.c: Likewise. * graphite-interchange.c: Likewise. * graphite-optimize-isl.c: Likewise. * graphite-poly.c: Likewise. * graphite-poly.h: Likewise. * graphite-scop-detection.c: Likewise. * graphite-scop-detection.h: Likewise. * graphite-sese-to-poly.c: Likewise. * graphite.c: Likewise. * godump.c: Likewise. * haifa-sched.c: Likewise. * hw-doloop.c: Likewise. * hw-doloop.h: Likewise. * ifcvt.c: Likewise. * insn-addr.h: Likewise. * ipa-cp.c: Likewise. * ipa-inline-analysis.c: Likewise. * ipa-inline-transform.c: Likewise. * ipa-inline.c: Likewise. * ipa-inline.h: Likewise. * ipa-prop.c: Likewise. * ipa-prop.h: Likewise. * ipa-pure-const.c: Likewise. * ipa-ref-inline.h: Likewise. * ipa-ref.c: Likewise. * ipa-ref.h: Likewise. * ipa-reference.c: Likewise. * ipa-split.c: Likewise. * ipa-utils.c: Likewise. * ipa-utils.h: Likewise. * ipa.c: Likewise. * ira-build.c: Likewise. * ira-color.c: Likewise. * ira-emit.c: Likewise. * ira-int.h: Likewise. * ira.c: Likewise. * loop-invariant.c: Likewise. * loop-unroll.c: Likewise. * lower-subreg.c: Likewise. * lra-lives.c: Likewise. * lra.c: Likewise. * lto-cgraph.c: Likewise. * lto-section-out.c: Likewise. * lto-streamer-in.c: Likewise. * lto-streamer-out.c: Likewise. * lto-streamer.h: Likewise. * lto-symtab.c: Likewise. * mcf.c: Likewise. * modulo-sched.c: Likewise. * omp-low.c: Likewise. * opts-common.c: Likewise. * opts-global.c: Likewise. * opts.c: Likewise. * opts.h: Likewise. * passes.c: Likewise. * predict.c: Likewise. * print-tree.c: Likewise. * profile.c: Likewise. * profile.h: Likewise. * read-rtl.c: Likewise. * ree.c: Likewise. * reg-stack.c: Likewise. * regrename.c: Likewise. * regrename.h: Likewise. * reload.c: Likewise. * reload.h: Likewise. * reload1.c: Likewise. * rtl.h: Likewise. * sched-deps.c: Likewise. * sched-int.h: Likewise. * sdbout.c: Likewise. * sel-sched-dump.c: Likewise. * sel-sched-ir.c: Likewise. * sel-sched-ir.h: Likewise. * sel-sched.c: Likewise. * sese.c: Likewise. * sese.h: Likewise. * statistics.h: Likewise. * stmt.c: Likewise. * stor-layout.c: Likewise. * store-motion.c: Likewise. * tlink.c: Likewise. * toplev.c: Likewise. * trans-mem.c: Likewise. * tree-browser.c: Likewise. * tree-call-cdce.c: Likewise. * tree-cfg.c: Likewise. * tree-cfgcleanup.c: Likewise. * tree-chrec.c: Likewise. * tree-chrec.h: Likewise. * tree-complex.c: Likewise. * tree-data-ref.c: Likewise. * tree-data-ref.h: Likewise. * tree-dfa.c: Likewise. * tree-diagnostic.c: Likewise. * tree-dump.c: Likewise. * tree-eh.c: Likewise. * tree-emutls.c: Likewise. * tree-flow.h: Likewise. * tree-if-conv.c: Likewise. * tree-inline.c: Likewise. * tree-inline.h: Likewise. * tree-into-ssa.c: Likewise. * tree-iterator.c: Likewise. * tree-loop-distribution.c: Likewise. * tree-mudflap.c: Likewise. * tree-optimize.c: Likewise. * tree-outof-ssa.c: Likewise. * tree-parloops.c: Likewise. * tree-phinodes.c: Likewise. * tree-predcom.c: Likewise. * tree-pretty-print.c: Likewise. * tree-scalar-evolution.c: Likewise. * tree-sra.c: Likewise. * tree-ssa-address.c: Likewise. * tree-ssa-alias.c: Likewise. * tree-ssa-ccp.c: Likewise. * tree-ssa-coalesce.c: Likewise. * tree-ssa-dce.c: Likewise. * tree-ssa-dom.c: Likewise. * tree-ssa-forwprop.c: Likewise. * tree-ssa-live.c: Likewise. * tree-ssa-live.h: Likewise. * tree-ssa-loop-im.c: Likewise. * tree-ssa-loop-ivcanon.c: Likewise. * tree-ssa-loop-ivopts.c: Likewise. * tree-ssa-loop-manip.c: Likewise. * tree-ssa-loop-niter.c: Likewise. * tree-ssa-loop-prefetch.c: Likewise. * tree-ssa-math-opts.c: Likewise. * tree-ssa-operands.c: Likewise. * tree-ssa-phiopt.c: Likewise. * tree-ssa-phiprop.c: Likewise. * tree-ssa-pre.c: Likewise. * tree-ssa-propagate.c: Likewise. * tree-ssa-reassoc.c: Likewise. * tree-ssa-sccvn.c: Likewise. * tree-ssa-sccvn.h: Likewise. * tree-ssa-strlen.c: Likewise. * tree-ssa-structalias.c: Likewise. * tree-ssa-tail-merge.c: Likewise. * tree-ssa-threadedge.c: Likewise. * tree-ssa-threadupdate.c: Likewise. * tree-ssa-uncprop.c: Likewise. * tree-ssa-uninit.c: Likewise. * tree-ssa.c: Likewise. * tree-ssanames.c: Likewise. * tree-stdarg.c: Likewise. * tree-streamer-in.c: Likewise. * tree-streamer-out.c: Likewise. * tree-streamer.c: Likewise. * tree-streamer.h: Likewise. * tree-switch-conversion.c: Likewise. * tree-vect-data-refs.c: Likewise. * tree-vect-generic.c: Likewise. * tree-vect-loop-manip.c: Likewise. * tree-vect-loop.c: Likewise. * tree-vect-patterns.c: Likewise. * tree-vect-slp.c: Likewise. * tree-vect-stmts.c: Likewise. * tree-vectorizer.c: Likewise. * tree-vectorizer.h: Likewise. * tree-vrp.c: Likewise. * tree.c: Likewise. * tree.h: Likewise. * value-prof.c: Likewise. * value-prof.h: Likewise. * var-tracking.c: Likewise. * varasm.c: Likewise. * varpool.c: Likewise. * vmsdbgout.c: Likewise. * config/bfin/bfin.c: Likewise. * config/c6x/c6x.c: Likewise. * config/darwin.c: Likewise. * config/i386/i386.c: Likewise. * config/ia64/ia64.c: Likewise. * config/mep/mep.c: Likewise. * config/mips/mips.c: Likewise. * config/pa/pa.c: Likewise. * config/rs6000/rs6000-c.c: Likewise. * config/rs6000/rs6000.c: Likewise. * config/rx/rx.c: Likewise. * config/spu/spu-c.c: Likewise. * config/vms/vms.c: Likewise. * config/vxworks.c: Likewise. * config/epiphany/resolve-sw-modes.c: Likewise. From-SVN: r193595 --- gcc/tree-vectorizer.h | 104 ++++++++++++++++++++++---------------------------- 1 file changed, 45 insertions(+), 59 deletions(-) (limited to 'gcc/tree-vectorizer.h') diff --git a/gcc/tree-vectorizer.h b/gcc/tree-vectorizer.h index 5762e00..e533d2c 100644 --- a/gcc/tree-vectorizer.h +++ b/gcc/tree-vectorizer.h @@ -80,10 +80,8 @@ typedef struct _stmt_info_for_cost { int misalign; } stmt_info_for_cost; -DEF_VEC_O (stmt_info_for_cost); -DEF_VEC_ALLOC_O (stmt_info_for_cost, heap); -typedef VEC(stmt_info_for_cost, heap) *stmt_vector_for_cost; +typedef vec stmt_vector_for_cost; static inline void add_stmt_info_to_vec (stmt_vector_for_cost *stmt_cost_vec, int count, @@ -94,25 +92,23 @@ add_stmt_info_to_vec (stmt_vector_for_cost *stmt_cost_vec, int count, si.kind = kind; si.stmt = stmt; si.misalign = misalign; - VEC_safe_push (stmt_info_for_cost, heap, *stmt_cost_vec, si); + stmt_cost_vec->safe_push (si); } /************************************************************************ SLP ************************************************************************/ typedef void *slp_void_p; -DEF_VEC_P (slp_void_p); -DEF_VEC_ALLOC_P (slp_void_p, heap); /* A computation tree of an SLP instance. Each node corresponds to a group of stmts to be packed in a SIMD stmt. */ typedef struct _slp_tree { /* Nodes that contain def-stmts of this node statements operands. */ - VEC (slp_void_p, heap) *children; + vec children; /* A group of scalar stmts to be vectorized together. */ - VEC (gimple, heap) *stmts; + vec stmts; /* Vectorized stmt/s. */ - VEC (gimple, heap) *vec_stmts; + vec vec_stmts; /* Number of vector stmts that are created to replace the group of scalar stmts. It is calculated during the transformation phase as the number of scalar elements in one scalar iteration (GROUP_SIZE) multiplied by VF @@ -120,8 +116,6 @@ typedef struct _slp_tree { unsigned int vec_stmts_size; } *slp_tree; -DEF_VEC_P(slp_tree); -DEF_VEC_ALLOC_P(slp_tree, heap); /* SLP instance is a sequence of stmts in a loop that can be packed into SIMD stmts. */ @@ -140,18 +134,16 @@ typedef struct _slp_instance { /* Loads permutation relatively to the stores, NULL if there is no permutation. */ - VEC (int, heap) *load_permutation; + vec load_permutation; /* The group of nodes that contain loads of this SLP instance. */ - VEC (slp_tree, heap) *loads; + vec loads; /* The first scalar load of the instance. The created vector loads will be inserted before this statement. */ gimple first_load; } *slp_instance; -DEF_VEC_P(slp_instance); -DEF_VEC_ALLOC_P(slp_instance, heap); /* Access Functions. */ #define SLP_INSTANCE_TREE(S) (S)->root @@ -173,7 +165,7 @@ DEF_VEC_ALLOC_P(slp_instance, heap); typedef struct _slp_oprnd_info { /* Def-stmts for the operands. */ - VEC (gimple, heap) *def_stmts; + vec def_stmts; /* Information about the first statement, its vector def-type, type, the operand itself in case it's constant, and an indication if it's a pattern stmt. */ @@ -183,8 +175,6 @@ typedef struct _slp_oprnd_info bool first_pattern; } *slp_oprnd_info; -DEF_VEC_P(slp_oprnd_info); -DEF_VEC_ALLOC_P(slp_oprnd_info, heap); typedef struct _vect_peel_info @@ -250,40 +240,40 @@ typedef struct _loop_vec_info { int ptr_mask; /* The loop nest in which the data dependences are computed. */ - VEC (loop_p, heap) *loop_nest; + vec loop_nest; /* All data references in the loop. */ - VEC (data_reference_p, heap) *datarefs; + vec datarefs; /* All data dependences in the loop. */ - VEC (ddr_p, heap) *ddrs; + vec ddrs; /* Data Dependence Relations defining address ranges that are candidates for a run-time aliasing check. */ - VEC (ddr_p, heap) *may_alias_ddrs; + vec may_alias_ddrs; /* Statements in the loop that have data references that are candidates for a runtime (loop versioning) misalignment check. */ - VEC(gimple,heap) *may_misalign_stmts; + vec may_misalign_stmts; /* All interleaving chains of stores in the loop, represented by the first stmt in the chain. */ - VEC(gimple, heap) *grouped_stores; + vec grouped_stores; /* All SLP instances in the loop. This is a subset of the set of GROUP_STORES of the loop. */ - VEC(slp_instance, heap) *slp_instances; + vec slp_instances; /* The unrolling factor needed to SLP the loop. In case of that pure SLP is applied to the loop, i.e., no unrolling is needed, this is 1. */ unsigned slp_unrolling_factor; /* Reduction cycles detected in the loop. Used in loop-aware SLP. */ - VEC (gimple, heap) *reductions; + vec reductions; /* All reduction chains in the loop, represented by the first stmt in the chain. */ - VEC (gimple, heap) *reduction_chains; + vec reduction_chains; /* Hash table used to choose the best peeling option. */ htab_t peeling_htab; @@ -335,9 +325,9 @@ typedef struct _loop_vec_info { #define LOOP_VINFO_OPERANDS_SWAPPED(L) (L)->operands_swapped #define LOOP_REQUIRES_VERSIONING_FOR_ALIGNMENT(L) \ -VEC_length (gimple, (L)->may_misalign_stmts) > 0 +(L)->may_misalign_stmts.length () > 0 #define LOOP_REQUIRES_VERSIONING_FOR_ALIAS(L) \ -VEC_length (ddr_p, (L)->may_alias_ddrs) > 0 +(L)->may_alias_ddrs.length () > 0 #define NITERS_KNOWN_P(n) \ (host_integerp ((n),0) \ @@ -364,17 +354,17 @@ typedef struct _bb_vec_info { basic_block bb; /* All interleaving chains of stores in the basic block, represented by the first stmt in the chain. */ - VEC(gimple, heap) *grouped_stores; + vec grouped_stores; /* All SLP instances in the basic block. This is a subset of the set of GROUP_STORES of the basic block. */ - VEC(slp_instance, heap) *slp_instances; + vec slp_instances; /* All data references in the basic block. */ - VEC (data_reference_p, heap) *datarefs; + vec datarefs; /* All data dependences in the basic block. */ - VEC (ddr_p, heap) *ddrs; + vec ddrs; /* Cost data used by the target cost model. */ void *target_cost_data; @@ -460,8 +450,6 @@ enum slp_vect_type { typedef struct data_reference *dr_p; -DEF_VEC_P(dr_p); -DEF_VEC_ALLOC_P(dr_p,heap); typedef struct _stmt_vec_info { @@ -530,7 +518,7 @@ typedef struct _stmt_vec_info { /* List of datarefs that are known to have the same alignment as the dataref of this stmt. */ - VEC(dr_p,heap) *same_align_refs; + vec same_align_refs; /* Classify the def of this stmt. */ enum vect_def_type def_type; @@ -632,10 +620,8 @@ typedef struct _stmt_vec_info { /* Avoid GTY(()) on stmt_vec_info. */ typedef void *vec_void_p; -DEF_VEC_P (vec_void_p); -DEF_VEC_ALLOC_P (vec_void_p, heap); -extern VEC(vec_void_p,heap) *stmt_vec_info_vec; +extern vec stmt_vec_info_vec; void init_stmt_vec_info_vec (void); void free_stmt_vec_info_vec (void); @@ -649,7 +635,7 @@ vinfo_for_stmt (gimple stmt) if (uid == 0) return NULL; - return (stmt_vec_info) VEC_index (vec_void_p, stmt_vec_info_vec, uid - 1); + return (stmt_vec_info) stmt_vec_info_vec[uid - 1]; } /* Set vectorizer information INFO for STMT. */ @@ -661,12 +647,12 @@ set_vinfo_for_stmt (gimple stmt, stmt_vec_info info) if (uid == 0) { gcc_checking_assert (info); - uid = VEC_length (vec_void_p, stmt_vec_info_vec) + 1; + uid = stmt_vec_info_vec.length () + 1; gimple_set_uid (stmt, uid); - VEC_safe_push (vec_void_p, heap, stmt_vec_info_vec, (vec_void_p) info); + stmt_vec_info_vec.safe_push ((vec_void_p) info); } else - VEC_replace (vec_void_p, stmt_vec_info_vec, uid - 1, (vec_void_p) info); + stmt_vec_info_vec[uid - 1] = (vec_void_p) info; } /* Return the earlier statement between STMT1 and STMT2. */ @@ -688,8 +674,8 @@ get_earlier_stmt (gimple stmt1, gimple stmt2) if (uid1 == 0 || uid2 == 0) return NULL; - gcc_checking_assert (uid1 <= VEC_length (vec_void_p, stmt_vec_info_vec) - && uid2 <= VEC_length (vec_void_p, stmt_vec_info_vec)); + gcc_checking_assert (uid1 <= stmt_vec_info_vec.length () + && uid2 <= stmt_vec_info_vec.length ()); if (uid1 < uid2) return stmt1; @@ -716,8 +702,8 @@ get_later_stmt (gimple stmt1, gimple stmt2) if (uid1 == 0 || uid2 == 0) return NULL; - gcc_assert (uid1 <= VEC_length (vec_void_p, stmt_vec_info_vec)); - gcc_assert (uid2 <= VEC_length (vec_void_p, stmt_vec_info_vec)); + gcc_assert (uid1 <= stmt_vec_info_vec.length ()); + gcc_assert (uid2 <= stmt_vec_info_vec.length ()); if (uid1 > uid2) return stmt1; @@ -878,10 +864,10 @@ extern bool vect_is_simple_use_1 (tree, gimple, loop_vec_info, tree *, enum vect_def_type *, tree *); extern bool supportable_widening_operation (enum tree_code, gimple, tree, tree, enum tree_code *, enum tree_code *, - int *, VEC (tree, heap) **); + int *, vec *); extern bool supportable_narrowing_operation (enum tree_code, tree, tree, enum tree_code *, - int *, VEC (tree, heap) **); + int *, vec *); extern stmt_vec_info new_stmt_vec_info (gimple stmt, loop_vec_info, bb_vec_info); extern void free_stmt_vec_info (gimple stmt); @@ -919,8 +905,8 @@ extern void vect_get_load_cost (struct data_reference *, int, bool, extern void vect_get_store_cost (struct data_reference *, int, unsigned int *, stmt_vector_for_cost *); extern bool vect_supportable_shift (enum tree_code, tree); -extern void vect_get_vec_defs (tree, tree, gimple, VEC (tree, heap) **, - VEC (tree, heap) **, slp_tree, int); +extern void vect_get_vec_defs (tree, tree, gimple, vec *, + vec *, slp_tree, int); extern tree vect_gen_perm_mask (tree, unsigned char *); /* In tree-vect-data-refs.c. */ @@ -949,14 +935,14 @@ extern bool vect_grouped_store_supported (tree, unsigned HOST_WIDE_INT); extern bool vect_store_lanes_supported (tree, unsigned HOST_WIDE_INT); extern bool vect_grouped_load_supported (tree, unsigned HOST_WIDE_INT); extern bool vect_load_lanes_supported (tree, unsigned HOST_WIDE_INT); -extern void vect_permute_store_chain (VEC(tree,heap) *,unsigned int, gimple, - gimple_stmt_iterator *, VEC(tree,heap) **); +extern void vect_permute_store_chain (vec ,unsigned int, gimple, + gimple_stmt_iterator *, vec *); extern tree vect_setup_realignment (gimple, gimple_stmt_iterator *, tree *, enum dr_alignment_support, tree, struct loop **); -extern void vect_transform_grouped_load (gimple, VEC(tree,heap) *, int, +extern void vect_transform_grouped_load (gimple, vec , int, gimple_stmt_iterator *); -extern void vect_record_grouped_load_vectors (gimple, VEC(tree,heap) *); +extern void vect_record_grouped_load_vectors (gimple, vec ); extern int vect_get_place_in_interleaving_chain (gimple, gimple); extern tree vect_get_new_vect_var (tree, enum vect_var_kind, const char *); extern tree vect_create_addr_base_for_vector_ref (gimple, gimple_seq *, @@ -985,7 +971,7 @@ extern int vect_get_single_scalar_iteration_cost (loop_vec_info); /* In tree-vect-slp.c. */ extern void vect_free_slp_instance (slp_instance); -extern bool vect_transform_slp_perm_load (gimple, VEC (tree, heap) *, +extern bool vect_transform_slp_perm_load (gimple, vec , gimple_stmt_iterator *, int, slp_instance, bool); extern bool vect_schedule_slp (loop_vec_info, bb_vec_info); @@ -993,8 +979,8 @@ extern void vect_update_slp_costs_according_to_vf (loop_vec_info); extern bool vect_analyze_slp (loop_vec_info, bb_vec_info); extern bool vect_make_slp_decision (loop_vec_info); extern void vect_detect_hybrid_slp (loop_vec_info); -extern void vect_get_slp_defs (VEC (tree, heap) *, slp_tree, - VEC (slp_void_p, heap) **, int); +extern void vect_get_slp_defs (vec , slp_tree, + vec *, int); extern LOC find_bb_location (basic_block); extern bb_vec_info vect_slp_analyze_bb (basic_block); @@ -1004,7 +990,7 @@ extern void vect_slp_transform_bb (basic_block); /* Pattern recognition functions. Additional pattern recognition functions can (and will) be added in the future. */ -typedef gimple (* vect_recog_func_ptr) (VEC (gimple, heap) **, tree *, tree *); +typedef gimple (* vect_recog_func_ptr) (vec *, tree *, tree *); #define NUM_PATTERNS 10 void vect_pattern_recog (loop_vec_info, bb_vec_info); -- cgit v1.1