Merge from gomp-3_1-branch branch: 2011-08-02 Jakub Jelinek <jakub@redhat.com> gcc/ * c-parser.c (enum c_parser_prec): New enum, moved from within c_parser_binary_expression. (c_parser_binary_expression): Add PREC argument. Stop parsing if operator has lower or equal precedence than PREC. (c_parser_conditional_expression, c_parser_omp_for_loop): Adjust callers. (c_parser_omp_atomic): Handle parsing OpenMP 3.1 atomics. Adjust c_finish_omp_atomic caller. (c_parser_omp_taskyield): New function. (c_parser_pragma): Handle PRAGMA_OMP_TASKYIELD. (c_parser_omp_clause_name): Handle final and mergeable clauses. (c_parser_omp_clause_final, c_parser_omp_clause_mergeable): New functions. (c_parser_omp_all_clauses): Handle PRAGMA_OMP_CLAUSE_FINAL and PRAGMA_OMP_CLAUSE_MERGEABLE. (OMP_TASK_CLAUSE_MASK): Allow final and mergeable clauses. (c_parser_omp_clause_reduction): Handle min and max. * c-typeck.c (c_finish_omp_clauses): Don't complain about const qualified predetermined vars in firstprivate clause. andle OMP_CLAUSE_FINAL and OMP_CLAUSE_MERGEABLE. Handle MIN_EXPR and MAX_EXPR. * tree-pretty-print.c (dump_omp_clause): Handle OMP_CLAUSE_FINAL and OMP_CLAUSE_MERGEABLE. (dump_generic_node): Handle OMP_ATOMIC_READ, OMP_ATOMIC_CAPTURE_OLD and OMP_ATOMIC_CAPTURE_NEW. * tree.c (omp_clause_num_ops): Add OMP_CLAUSE_FINAL and OMP_CLAUSE_MERGEABLE. (omp_clause_code_name): Likewise. (walk_tree_1): Handle OMP_CLAUSE_FINAL and OMP_CLAUSE_MERGEABLE. * tree.h (enum omp_clause_code): Add OMP_CLAUSE_FINAL and OMP_CLAUSE_MERGEABLE. (OMP_CLAUSE_FINAL_EXPR): Define. * omp-low.c (scan_sharing_clauses): Handle OMP_CLAUSE_FINAL and OMP_CLAUSE_MERGEABLE. (expand_task_call): Likewise. (expand_omp_atomic_load, expand_omp_atomic_store): New functions. (expand_omp_atomic_fetch_op): Handle cases where old or new value is needed afterwards. (expand_omp_atomic): Call expand_omp_atomic_load resp. expand_omp_atomic_store. * gimplify.c (gimplify_omp_atomic, gimplify_expr): Handle OMP_ATOMIC_READ, OMP_ATOMIC_CAPTURE_OLD and OMP_ATOMIC_CAPTURE_NEW. (gimplify_scan_omp_clauses, gimplify_adjust_omp_clauses): Handle OMP_CLAUSE_FINAL and OMP_CLAUSE_MERGEABLE. * tree-nested.c (convert_nonlocal_omp_clauses, convert_local_omp_clauses): Likewise. * tree.def (OMP_ATOMIC_READ, OMP_ATOMIC_CAPTURE_OLD, OMP_ATOMIC_CAPTURE_NEW): New. * gimple.h (GF_OMP_ATOMIC_NEED_VALUE): New. (gimple_omp_atomic_need_value_p, gimple_omp_atomic_set_need_value): New inlines. * omp-builtins.def (BUILT_IN_GOMP_TASKYIELD): New builtin. * doc/generic.texi: Mention OMP_CLAUSE_COLLAPSE, OMP_CLAUSE_UNTIED, OMP_CLAUSE_FINAL and OMP_CLAUSE_MERGEABLE. gcc/c-family/ * c-common.h (c_finish_omp_atomic): Adjust prototype. (c_finish_omp_taskyield): New prototype. * c-omp.c (c_finish_omp_atomic): Add OPCODE, V, LHS1 and RHS1 arguments. Handle OMP_ATOMIC_READ, OMP_ATOMIC_CAPTURE_OLD and OMP_ATOMIC_CAPTURE_NEW in addition to OMP_ATOMIC. If LHS1 or RHS1 have side-effects, evaluate those too in the right spot, if it is a decl and LHS is also a decl, error out if they aren't the same. (c_finish_omp_taskyield): New function. * c-cppbuiltin.c (c_cpp_builtins): Change _OPENMP to 201107. * c-pragma.c (omp_pragmas): Add taskyield. * c-pragma.h (enum pragma_kind): Add PRAGMA_OMP_TASKYIELD. (enum pragma_omp_clause): Add PRAGMA_OMP_CLAUSE_FINAL and PRAGMA_OMP_CLAUSE_MERGEABLE. gcc/cp/ * cp-tree.h (finish_omp_atomic): Adjust prototype. (cxx_omp_const_qual_no_mutable): New prototype. (finish_omp_taskyield): New prototype. * parser.c (cp_parser_omp_atomic): (cp_parser_omp_atomic): Handle parsing OpenMP 3.1 atomics. Adjust finish_omp_atomic caller. (cp_parser_omp_clause_name): Handle final and mergeable clauses. (cp_parser_omp_clause_final, cp_parser_omp_clause_mergeable): New functions. (cp_parser_omp_all_clauses): Handle PRAGMA_OMP_CLAUSE_FINAL and PRAGMA_OMP_CLAUSE_MERGEABLE. (OMP_TASK_CLAUSE_MASK): Allow final and mergeable clauses. (cp_parser_omp_taskyield): New function. (cp_parser_pragma): Handle PRAGMA_OMP_TASKYIELD. (cp_parser_omp_clause_reduction): Handle min and max. * pt.c (tsubst_expr) <case OMP_ATOMIC>: Handle OpenMP 3.1 atomics. (tsubst_omp_clauses): Handle OMP_CLAUSE_FINAL and OMP_CLAUSE_MERGEABLE. * semantics.c (finish_omp_atomic): Add OPCODE, V, LHS1 and RHS1 arguments. Handle OpenMP 3.1 atomics. Adjust c_finish_omp_atomic caller. (finish_omp_clauses): Don't complain about const qualified predetermined vars and static data members in firstprivate clause. Handle OMP_CLAUSE_FINAL and OMP_CLAUSE_MERGEABLE. Handle MIN_EXPR and MAX_EXPR. (finish_omp_taskyield): New function. * cp-gimplify.c (cxx_omp_const_qual_no_mutable): New function. (cxx_omp_predetermined_sharing): Use it. gcc/fortran/ PR fortran/46752 * cpp.c (cpp_define_builtins): Change _OPENMP to 201107. * openmp.c (gfc_free_omp_clauses): Free also final_expr. (OMP_CLAUSE_FINAL, OMP_CLAUSE_MERGEABLE): Define. (gfc_match_omp_clauses): Handle parsing final and mergeable clauses. (OMP_TASK_CLAUSES): Allow final and mergeable clauses. (gfc_match_omp_taskyield): New function. (resolve_omp_clauses): Resolve final clause. Allow POINTERs and Cray pointers in clauses other than REDUCTION. (gfc_match_omp_atomic): Match optional read/write/update/capture keywords after !$omp atomic. (resolve_omp_atomic): Handle all OpenMP 3.1 atomic forms. * dump-parse-tree.c (show_omp_node): Handle EXEC_OMP_TASKYIELD, print final and mergeable clauses. (show_code_node): Handle EXEC_OMP_TASKYIELD. * trans-openmp.c (gfc_trans_omp_clauses): Handle final and mergeable clauses. (gfc_trans_omp_taskyield): New function. (gfc_trans_omp_directive): Handle EXEC_OMP_TASKYIELD. (gfc_trans_omp_atomic): Handle all OpenMP 3.1 atomic forms. (gfc_omp_clause_copy_ctor): Handle non-allocated allocatable. (gfc_omp_predetermined_sharing): Adjust comment. * gfortran.h (gfc_statement): Add ST_OMP_TASKYIELD and ST_OMP_END_ATOMIC. (gfc_omp_clauses): Add final_expr and mergeable fields. (gfc_exec_op): Add EXEC_OMP_TASKYIELD. (gfc_omp_atomic_op): New enum typedef. (struct gfc_code): Add ext.omp_atomic. * trans.c (trans_code): Handle EXEC_OMP_TASKYIELD. * frontend-passes.c (gfc_code_walker): Also walk final_expr. * resolve.c (gfc_resolve_blocks, resolve_code): Handle EXEC_OMP_TASKYIELD. * st.c (gfc_free_statement): Likewise. * match.h (gfc_match_omp_taskyield): New prototype. * parse.c (decode_omp_directive): Handle taskyield directive. Handle !$omp end atomic. (case_executable): Add ST_OMP_TASKYIELD case. (gfc_ascii_statement): Handle ST_OMP_TASKYIELD. (parse_omp_atomic): Return gfc_statement instead of void. For !$omp atomic capture parse two assignments instead of just one and require !$omp end atomic afterwards, for other !$omp atomic forms just allow !$omp end atomic at the end. (parse_omp_structured_block, parse_executable): Adjust parse_omp_atomic callers. 2011-08-02 Tobias Burnus <burnus@net-b.de> * intrinsic.c (OMP_LIB): Updated openmp_version's value to 201107. * gfortran.texi (OpenMP): Update ref to OpenMP 3.1. * intrinsic.texi (OpenMP Modules): Update ref to OpenMP 3.1; remove deleted omp_integer_kind and omp_logical_kind constants. gcc/testsuite/ PR fortran/46752 * gcc.dg/gomp/atomic-5.c: Adjust expected diagnostics. * gcc.dg/gomp/atomic-15.c: New test. * g++.dg/gomp/atomic-5.C: Adjust expected diagnostics. * g++.dg/gomp/atomic-15.C: New test. * g++.dg/gomp/private-1.C: New test. * g++.dg/gomp/sharing-2.C: New test. * gfortran.dg/gomp/crayptr1.f90: Don't expect error about Cray pointer in FIRSTPRIVATE/LASTPRIVATE. * gfortran.dg/gomp/omp_atomic2.f90: New test. libgomp/ PR fortran/42041 PR fortran/46752 * omp.h.in (omp_in_final): New prototype. * omp_lib.f90.in (omp_in_final): New interface. (omp_integer_kind, omp_logical_kind): Remove and replace all its uses in the module with 4. (openmp_version): Change to 201107. * omp_lib.h.in (omp_sched_static, omp_sched_dynamic, omp_sched_guided, omp_sched_auto): Use omp_sched_kind kind for the parameters. (omp_in_final): New external. (openmp_version): Change to 201107. * task.c (omp_in_final): New function. (gomp_init_task): Initialize final_task. (GOMP_task): Remove unused attribute from flags. Handle final tasks. (GOMP_taskyield): New function. (omp_in_final): Return true if if (false) or final (true) task or descendant of final (true). * fortran.c (omp_in_final_): New function. * libgomp.map (OMP_3.1): Export omp_in_final and omp_in_final_. (GOMP_3.0): Export GOMP_taskyield. * env.c (gomp_nthreads_var_list, gomp_nthreads_var_list_len): New variables. (parse_unsigned_long_list): New function. (initialize_env): Use it for OMP_NUM_THREADS. Call parse_boolean with "OMP_PROC_BIND". If OMP_PROC_BIND=true, call gomp_init_affinity even if parse_affinity returned false. * config/linux/affinity.c (gomp_init_affinity): Handle gomp_cpu_affinity_len == 0. * libgomp_g.h (GOMP_taskyield): New prototype. * libgomp.h (struct gomp_task): Add final_task field. (gomp_nthreads_var_list, gomp_nthreads_var_list_len): New externs. * team.c (gomp_team_start): Override new task's nthreads_var icv if list form OMP_NUM_THREADS has been used and it has value for the new nesting level. * testsuite/libgomp.c/atomic-11.c: New test. * testsuite/libgomp.c/atomic-12.c: New test. * testsuite/libgomp.c/atomic-13.c: New test. * testsuite/libgomp.c/atomic-14.c: New test. * testsuite/libgomp.c/reduction-6.c: New test. * testsuite/libgomp.c/task-5.c: New test. * testsuite/libgomp.c++/atomic-2.C: New test. * testsuite/libgomp.c++/atomic-3.C: New test. * testsuite/libgomp.c++/atomic-4.C: New test. * testsuite/libgomp.c++/atomic-5.C: New test. * testsuite/libgomp.c++/atomic-6.C: New test. * testsuite/libgomp.c++/atomic-7.C: New test. * testsuite/libgomp.c++/atomic-8.C: New test. * testsuite/libgomp.c++/atomic-9.C: New test. * testsuite/libgomp.c++/task-8.C: New test. * testsuite/libgomp.c++/reduction-4.C: New test. * testsuite/libgomp.fortran/allocatable7.f90: New test. * testsuite/libgomp.fortran/allocatable8.f90: New test. * testsuite/libgomp.fortran/crayptr3.f90: New test. * testsuite/libgomp.fortran/omp_atomic3.f90: New test. * testsuite/libgomp.fortran/omp_atomic4.f90: New test. * testsuite/libgomp.fortran/pointer1.f90: New test. * testsuite/libgomp.fortran/pointer2.f90: New test. * testsuite/libgomp.fortran/task4.f90: New test. 2011-08-02 Tobias Burnus <burnus@net-b.de> * libgomp.texi: Update OpenMP spec references to 3.1. (omp_in_final,OMP_PROC_BIND): New sections. (OMP_NUM_THREADS): Document that the value can be now a list. (GOMP_STACKSIZE,GOMP_CPU_AFFINITY): Update @ref. From-SVN: r177194
256 lines
8.2 KiB
C
256 lines
8.2 KiB
C
/* All matcher functions.
|
|
Copyright (C) 2003, 2005, 2007, 2008, 2010
|
|
Free Software Foundation, Inc.
|
|
Contributed by Steven Bosscher
|
|
|
|
This file is part of GCC.
|
|
|
|
GCC is free software; you can redistribute it and/or modify it under
|
|
the terms of the GNU General Public License as published by the Free
|
|
Software Foundation; either version 3, or (at your option) any later
|
|
version.
|
|
|
|
GCC is distributed in the hope that it will be useful, but WITHOUT ANY
|
|
WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GCC; see the file COPYING3. If not see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
|
|
#ifndef GFC_MATCH_H
|
|
#define GFC_MATCH_H
|
|
|
|
/* gfc_new_block points to the symbol of a newly matched block. */
|
|
extern gfc_symbol *gfc_new_block;
|
|
|
|
/* Current statement label. Zero means no statement label. Because
|
|
new_st can get wiped during statement matching, we have to keep it
|
|
separate. */
|
|
extern gfc_st_label *gfc_statement_label;
|
|
|
|
extern int gfc_matching_ptr_assignment;
|
|
extern int gfc_matching_procptr_assignment;
|
|
extern bool gfc_matching_prefix;
|
|
|
|
/* Default access specifier while matching procedure bindings. */
|
|
extern gfc_access gfc_typebound_default_access;
|
|
|
|
/****************** All gfc_match* routines *****************/
|
|
|
|
/* match.c. */
|
|
|
|
/* Generic match subroutines. */
|
|
match gfc_match_special_char (gfc_char_t *);
|
|
match gfc_match_space (void);
|
|
match gfc_match_eos (void);
|
|
match gfc_match_small_literal_int (int *, int *);
|
|
match gfc_match_st_label (gfc_st_label **);
|
|
match gfc_match_label (void);
|
|
match gfc_match_small_int (int *);
|
|
match gfc_match_small_int_expr (int *, gfc_expr **);
|
|
match gfc_match_name (char *);
|
|
match gfc_match_name_C (char *buffer);
|
|
match gfc_match_symbol (gfc_symbol **, int);
|
|
match gfc_match_sym_tree (gfc_symtree **, int);
|
|
match gfc_match_intrinsic_op (gfc_intrinsic_op *);
|
|
match gfc_match_char (char);
|
|
match gfc_match (const char *, ...);
|
|
match gfc_match_iterator (gfc_iterator *, int);
|
|
match gfc_match_parens (void);
|
|
|
|
/* Statement matchers. */
|
|
match gfc_match_program (void);
|
|
match gfc_match_pointer_assignment (void);
|
|
match gfc_match_assignment (void);
|
|
match gfc_match_if (gfc_statement *);
|
|
match gfc_match_else (void);
|
|
match gfc_match_elseif (void);
|
|
match gfc_match_critical (void);
|
|
match gfc_match_block (void);
|
|
match gfc_match_associate (void);
|
|
match gfc_match_do (void);
|
|
match gfc_match_cycle (void);
|
|
match gfc_match_exit (void);
|
|
match gfc_match_lock (void);
|
|
match gfc_match_pause (void);
|
|
match gfc_match_stop (void);
|
|
match gfc_match_error_stop (void);
|
|
match gfc_match_continue (void);
|
|
match gfc_match_assign (void);
|
|
match gfc_match_goto (void);
|
|
match gfc_match_sync_all (void);
|
|
match gfc_match_sync_images (void);
|
|
match gfc_match_sync_memory (void);
|
|
match gfc_match_unlock (void);
|
|
|
|
match gfc_match_allocate (void);
|
|
match gfc_match_nullify (void);
|
|
match gfc_match_deallocate (void);
|
|
match gfc_match_return (void);
|
|
match gfc_match_call (void);
|
|
|
|
/* We want to use this function to check for a common-block-name
|
|
that can exist in a bind statement, so removed the "static"
|
|
declaration of the function in match.c.
|
|
|
|
TODO: should probably rename this now that it'll be globally seen to
|
|
gfc_match_common_name. */
|
|
match match_common_name (char *name);
|
|
|
|
match gfc_match_common (void);
|
|
match gfc_match_block_data (void);
|
|
match gfc_match_namelist (void);
|
|
match gfc_match_module (void);
|
|
match gfc_match_equivalence (void);
|
|
match gfc_match_st_function (void);
|
|
match gfc_match_case (void);
|
|
match gfc_match_select (void);
|
|
match gfc_match_select_type (void);
|
|
match gfc_match_type_is (void);
|
|
match gfc_match_class_is (void);
|
|
match gfc_match_where (gfc_statement *);
|
|
match gfc_match_elsewhere (void);
|
|
match gfc_match_forall (gfc_statement *);
|
|
|
|
/* Other functions. */
|
|
|
|
gfc_common_head *gfc_get_common (const char *, int);
|
|
|
|
/* openmp.c. */
|
|
|
|
/* OpenMP directive matchers. */
|
|
match gfc_match_omp_eos (void);
|
|
match gfc_match_omp_atomic (void);
|
|
match gfc_match_omp_barrier (void);
|
|
match gfc_match_omp_critical (void);
|
|
match gfc_match_omp_do (void);
|
|
match gfc_match_omp_flush (void);
|
|
match gfc_match_omp_master (void);
|
|
match gfc_match_omp_ordered (void);
|
|
match gfc_match_omp_parallel (void);
|
|
match gfc_match_omp_parallel_do (void);
|
|
match gfc_match_omp_parallel_sections (void);
|
|
match gfc_match_omp_parallel_workshare (void);
|
|
match gfc_match_omp_sections (void);
|
|
match gfc_match_omp_single (void);
|
|
match gfc_match_omp_task (void);
|
|
match gfc_match_omp_taskwait (void);
|
|
match gfc_match_omp_taskyield (void);
|
|
match gfc_match_omp_threadprivate (void);
|
|
match gfc_match_omp_workshare (void);
|
|
match gfc_match_omp_end_nowait (void);
|
|
match gfc_match_omp_end_single (void);
|
|
|
|
/* decl.c. */
|
|
|
|
match gfc_match_data (void);
|
|
match gfc_match_null (gfc_expr **);
|
|
match gfc_match_kind_spec (gfc_typespec *, bool);
|
|
match gfc_match_old_kind_spec (gfc_typespec *);
|
|
match gfc_match_decl_type_spec (gfc_typespec *, int);
|
|
|
|
match gfc_match_end (gfc_statement *);
|
|
match gfc_match_data_decl (void);
|
|
match gfc_match_formal_arglist (gfc_symbol *, int, int);
|
|
match gfc_match_procedure (void);
|
|
match gfc_match_generic (void);
|
|
match gfc_match_function_decl (void);
|
|
match gfc_match_entry (void);
|
|
match gfc_match_subroutine (void);
|
|
match gfc_match_derived_decl (void);
|
|
match gfc_match_final_decl (void);
|
|
|
|
match gfc_match_implicit_none (void);
|
|
match gfc_match_implicit (void);
|
|
|
|
void gfc_set_constant_character_len (int, gfc_expr *, int);
|
|
|
|
/* Matchers for attribute declarations. */
|
|
match gfc_match_allocatable (void);
|
|
match gfc_match_asynchronous (void);
|
|
match gfc_match_codimension (void);
|
|
match gfc_match_contiguous (void);
|
|
match gfc_match_dimension (void);
|
|
match gfc_match_external (void);
|
|
match gfc_match_gcc_attributes (void);
|
|
match gfc_match_import (void);
|
|
match gfc_match_intent (void);
|
|
match gfc_match_intrinsic (void);
|
|
match gfc_match_optional (void);
|
|
match gfc_match_parameter (void);
|
|
match gfc_match_pointer (void);
|
|
match gfc_match_protected (void);
|
|
match gfc_match_private (gfc_statement *);
|
|
match gfc_match_public (gfc_statement *);
|
|
match gfc_match_save (void);
|
|
match gfc_match_modproc (void);
|
|
match gfc_match_target (void);
|
|
match gfc_match_value (void);
|
|
match gfc_match_volatile (void);
|
|
|
|
/* decl.c. */
|
|
|
|
/* Fortran 2003 c interop.
|
|
TODO: some of these should be moved to another file rather than decl.c */
|
|
void set_com_block_bind_c (gfc_common_head *, int);
|
|
gfc_try set_binding_label (char *, const char *, int);
|
|
gfc_try set_verify_bind_c_sym (gfc_symbol *, int);
|
|
gfc_try set_verify_bind_c_com_block (gfc_common_head *, int);
|
|
gfc_try get_bind_c_idents (void);
|
|
match gfc_match_bind_c_stmt (void);
|
|
match gfc_match_suffix (gfc_symbol *, gfc_symbol **);
|
|
match gfc_match_bind_c (gfc_symbol *, bool);
|
|
match gfc_get_type_attr_spec (symbol_attribute *, char*);
|
|
|
|
/* primary.c. */
|
|
match gfc_match_structure_constructor (gfc_symbol *, gfc_expr **, bool);
|
|
match gfc_match_variable (gfc_expr **, int);
|
|
match gfc_match_equiv_variable (gfc_expr **);
|
|
match gfc_match_actual_arglist (int, gfc_actual_arglist **);
|
|
match gfc_match_literal_constant (gfc_expr **, int);
|
|
|
|
/* expr.c -- FIXME: this one should be eliminated by moving the
|
|
matcher to matchexp.c and a call to a new function in expr.c that
|
|
only makes sure the init expr. is valid. */
|
|
gfc_try gfc_reduce_init_expr (gfc_expr *expr);
|
|
match gfc_match_init_expr (gfc_expr **);
|
|
|
|
/* array.c. */
|
|
match gfc_match_array_spec (gfc_array_spec **, bool, bool);
|
|
match gfc_match_array_ref (gfc_array_ref *, gfc_array_spec *, int, int);
|
|
match gfc_match_array_constructor (gfc_expr **);
|
|
|
|
/* interface.c. */
|
|
match gfc_match_abstract_interface (void);
|
|
match gfc_match_generic_spec (interface_type *, char *, gfc_intrinsic_op *);
|
|
match gfc_match_interface (void);
|
|
match gfc_match_end_interface (void);
|
|
|
|
/* io.c. */
|
|
match gfc_match_format (void);
|
|
match gfc_match_open (void);
|
|
match gfc_match_close (void);
|
|
match gfc_match_endfile (void);
|
|
match gfc_match_backspace (void);
|
|
match gfc_match_rewind (void);
|
|
match gfc_match_flush (void);
|
|
match gfc_match_inquire (void);
|
|
match gfc_match_read (void);
|
|
match gfc_match_wait (void);
|
|
match gfc_match_write (void);
|
|
match gfc_match_print (void);
|
|
|
|
/* matchexp.c. */
|
|
match gfc_match_defined_op_name (char *, int);
|
|
match gfc_match_expr (gfc_expr **);
|
|
|
|
/* module.c. */
|
|
match gfc_match_use (void);
|
|
void gfc_use_module (void);
|
|
|
|
#endif /* GFC_MATCH_H */
|
|
|