mirror of
git://gcc.gnu.org/git/gcc.git
synced 2025-04-01 06:10:30 +08:00
9a771876d3
gcc/ * cilk-builtins.def (__cilkrts_cilk_for_32): New. (__cilkrts_cilk_for_64): Likewise. * cilk-common.c (declare_cilk_for_builtin): New function. (cilk_init_builtins): Declare __cilkrts_cilk_for_32 and __cilkrts_cilk_for_64 bultins. * cilk.h (enum cilk_tree_index): Added CILK_TI_F_LOOP_32 and CILK_TI_F_LOOP_64. (cilk_for_32_fndecl): New define. (cilk_for_64_fndecl): Likewise. * gimple-pretty-print.c (dump_gimple_omp_for): Correct hadling of GF_OMP_FOR_KIND_CILKFOR cases; Added NE_EXPR case. * gimple.h (enum gf_mask): Added GF_OMP_FOR_KIND_CILKFOR; adjusted GF_OMP_FOR_KIND_MASK, GF_OMP_FOR_SIMD, GF_OMP_FOR_COMBINED, GF_OMP_FOR_COMBINED_INTO. * gimplify.c (gimplify_scan_omp_clauses): Added OMP_CLAUSE__CILK_FOR_COUNT_ case. (gimplify_adjust_omp_clauses): Ditto. (gimplify_omp_for): Added CILK_FOR case. (gimplify_expr): Ditto. * omp-low.c: Include cilk.h. (extract_omp_for_data): Set appropriate kind for GF_OMP_FOR_KIND_CILKFOR; added check for GF_OMP_FOR_KIND_CILKFOR. (scan_sharing_clauses): Added OMP_CLAUSE__CILK_FOR_COUNT_ cases. (create_omp_child_function_name): Added second argument to handle cilk_for case. (cilk_for_check_loop_diff_type): New function. (expand_cilk_for_call): Likewise. (expand_cilk_for): Likewise. (create_omp_child_function): Set cilk_for_count; handle the cases when it is true; call create_omp_child_function_name with second argument. (expand_omp_taskreg): Set is_cilk_for and handle cases when it's true. (expand_omp_for): Handle case of GF_OMP_FOR_KIND_CILKFOR. * tree-core.h (omp_clause_code): Added OMP_CLAUSE__CILK_FOR_COUNT_. * tree-nested.c (convert_nonlocal_omp_clauses): Added OMP_CLAUSE__CILK_FOR_COUNT_ case. (convert_local_omp_clauses): Ditto. * tree-pretty-print.c (dump_omp_clause): Added OMP_CLAUSE__CILK_FOR_COUNT_ and OMP_CLAUSE_SCHEDULE_CILKFOR cases. (dump_generic_node): Added CILK_FOR case. * tree.c (omp_clause_num_ops): New element OMP_CLAUSE__CILK_FOR_COUNT_ (1). (omp_clause_code_name): New element _Cilk_for_count_. (walk_tree_1): Added OMP_CLAUSE__CILK_FOR_COUNT_ case. * tree.def: Add tree code for CILK_FOR. gcc/c/ * c-parser.c (c_parser_cilk_for): New function. (c_parser_cilk_grainsize): Likewise. (c_get_temp_regvar): Likewise. (c_parser_statement_after_labels): Added RID_CILK_FOR case. (c_parser_pragma): Added PRAGMA_CILK_GRAINSIZE case. (c_parser_omp_for_loop): Added CILK_FOR and CILK_SIMD checks. * c-typeck.c (c_finish_omp_clauses): Added OMP_CLAUSE__CILK_FOR_COUNT_ case. gcc/cp/ * cp-cilkplus.c (cpp_validate_cilk_plus_loop_aux): Loc definition simplified. * parser.c (cp_parser_cilk_for): New function. (cp_parser_cilk_grainsize): Likewise. (cp_parser_statement): Added RID_CILK_FOR case. (cp_parser_omp_for_cond): Added CILK_FOR check. (cp_parser_omp_for_loop_init): Change function argument to accept tree_code instead just a bool flag; change the check to use that tree_code; check for initialization declaration in case of Cilk_for. (cp_parser_omp_for_loop): Added checks for CILK_FOR and RID_CILK_FOR; changed call to cp_parser_omp_for_loop_init according new arguments' list. (cp_parser_pragma): Added PRAGMA_CILK_GRAINSIZE case. * pt.c (tsubst_expr): Added CILK_FOR case. * semantics.c: Include convert.h. (finish_omp_clauses): Properly handle OMP_CLAUSE_SCHEDULE_CILKFOR case; added OMP_CLAUSE__CILK_FOR_COUNT_. (handle_omp_for_class_iterator): New argument lastp and its usage; added NE_EXPR case. (finish_omp_for): Changed call to handle_omp_for_class_iterator according new arguments' list; in case of Cilk_for save very first decl and create empty stmt_list block; use block to build correct statement tree. gcc/c-family/ * c-cilkplus.c (cilk_for_number_of_iterations): New function. * c-common.c (c_common_reswords): Added _Cilk_for. * c-common.h (enum rid): Added RID_CILK_FOR. (cilk_for_number_of_iterations): Add declaration. * c-omp.c (c_finish_omp_for): Added checks for CILK_SIMD and CILK_FOR. * c-pragma.c (init_pragma): Register "grainsize" pragma. * c-pragma.h (enum pragma_kind): Add PRAGMA_CILK_GRAINSIZE. gcc/testsuite/ * c-c++-common/cilk-plus/CK/cilk-fors.c: New test. * c-c++-common/cilk-plus/CK/cilk-for-2.c: New test. * c-c++-common/cilk-plus/CK/cilk-for-3.c: New test. * c-c++-common/cilk-plus/CK/cilk_for_errors.c: New test. * c-c++-common/cilk-plus/CK/cilk_for_grain.c: New test. * c-c++-common/cilk-plus/CK/cilk_for_grain_errors.c: New test. * c-c++-common/cilk-plus/CK/cilk_for_ptr_iter.c: New test. * c-c++-common/cilk-plus/CK/nested_cilk_for.c: New test. * g++.dg/cilk-plus/CK/cf3.cc: New test. * g++.dg/cilk-plus/CK/cilk-for-tplt.cc: New test. * g++.dg/cilk-plus/CK/for1.cc: New test. * g++.dg/cilk-plus/CK/stl_iter.cc: New test. * g++.dg/cilk-plus/CK/stl_rev_iter.cc: New test. * g++.dg/cilk-plus/CK/stl_test.cc: New test. Co-Authored-By: Balaji V. Iyer <balaji.v.iyer@intel.com> Co-Authored-By: Igor Zamyatin <igor.zamyatin@intel.com> From-SVN: r214818
110 lines
4.8 KiB
C
110 lines
4.8 KiB
C
/* This file is part of the Intel(R) Cilk(TM) Plus support
|
|
This file contains Cilk Support files.
|
|
Copyright (C) 2013-2014 Free Software Foundation, Inc.
|
|
Contributed by Balaji V. Iyer <balaji.v.iyer@intel.com>,
|
|
Intel Corporation
|
|
|
|
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 GCC_CILK_H
|
|
#define GCC_CILK_H
|
|
|
|
/* Frame status bits known to compiler. */
|
|
#define CILK_FRAME_UNSYNCHED 0x02
|
|
#define CILK_FRAME_DETACHED 0x04
|
|
#define CILK_FRAME_EXCEPTING 0x10
|
|
#define CILK_FRAME_VERSION (1 << 24)
|
|
|
|
enum cilk_tree_index {
|
|
/* All the built-in functions for Cilk keywords. */
|
|
CILK_TI_F_WORKER = 0, /* __cilkrts_get_worker (). */
|
|
CILK_TI_F_SYNC, /* __cilkrts_sync (). */
|
|
CILK_TI_F_DETACH, /* __cilkrts_detach (...). */
|
|
CILK_TI_F_ENTER, /* __cilkrts_enter_frame (...). */
|
|
CILK_TI_F_ENTER_FAST, /* __cilkrts_enter_frame_fast (.). */
|
|
CILK_TI_F_LEAVE, /* __cilkrts_leave_frame (...). */
|
|
CILK_TI_F_POP, /* __cilkrts_pop_frame (...). */
|
|
CILK_TI_F_RETHROW, /* __cilkrts_rethrow (...). */
|
|
CILK_TI_F_SAVE_FP, /* __cilkrts_save_fp_ctrl_state (...). */
|
|
CILK_TI_F_LOOP_32, /* __cilkrts_cilk_for_32 (...). */
|
|
CILK_TI_F_LOOP_64, /* __cilkrts_cilk_for_64 (...). */
|
|
|
|
/* __cilkrts_stack_frame struct fields. */
|
|
CILK_TI_FRAME_FLAGS, /* stack_frame->flags. */
|
|
CILK_TI_FRAME_PARENT, /* stack_frame->parent. */
|
|
CILK_TI_FRAME_WORKER, /* stack_frame->worker. */
|
|
CILK_TI_FRAME_EXCEPTION, /* stack_frame->except_data. */
|
|
CILK_TI_FRAME_CONTEXT, /* stack_frame->context[4]. */
|
|
CILK_TI_FRAME_PEDIGREE, /* stack_frame->pedigree. */
|
|
|
|
/* __cilkrts_worker struct fields. */
|
|
CILK_TI_WORKER_CUR, /* worker->current_stack_frame. */
|
|
CILK_TI_WORKER_TAIL, /* worker->tail. */
|
|
CILK_TI_WORKER_PEDIGREE, /* worker->pedigree. */
|
|
|
|
/* __cilkrts_pedigree struct fields. */
|
|
CILK_TI_PEDIGREE_RANK, /* pedigree->rank. */
|
|
CILK_TI_PEDIGREE_PARENT, /* pedigree->parent. */
|
|
|
|
/* Types. */
|
|
CILK_TI_FRAME_TYPE, /* struct __cilkrts_stack_frame. */
|
|
CILK_TI_FRAME_PTR, /* __cilkrts_stack_frame *. */
|
|
CILK_TI_WORKER_TYPE, /* struct __cilkrts_worker. */
|
|
CILK_TI_PEDIGREE_TYPE, /* struct __cilkrts_pedigree. */
|
|
CILK_TI_MAX
|
|
};
|
|
|
|
extern GTY (()) tree cilk_trees[CILK_TI_MAX];
|
|
|
|
#define cilk_worker_fndecl cilk_trees[CILK_TI_F_WORKER]
|
|
#define cilk_sync_fndecl cilk_trees[CILK_TI_F_SYNC]
|
|
#define cilk_synched_fndecl cilk_trees[CILK_TI_F_SYNCED]
|
|
#define cilk_detach_fndecl cilk_trees[CILK_TI_F_DETACH]
|
|
#define cilk_enter_fndecl cilk_trees[CILK_TI_F_ENTER]
|
|
#define cilk_enter_fast_fndecl cilk_trees[CILK_TI_F_ENTER_FAST]
|
|
#define cilk_leave_fndecl cilk_trees[CILK_TI_F_LEAVE]
|
|
#define cilk_rethrow_fndecl cilk_trees[CILK_TI_F_RETHROW]
|
|
#define cilk_pop_fndecl cilk_trees[CILK_TI_F_POP]
|
|
#define cilk_save_fp_fndecl cilk_trees[CILK_TI_F_SAVE_FP]
|
|
#define cilk_for_32_fndecl cilk_trees[CILK_TI_F_LOOP_32]
|
|
#define cilk_for_64_fndecl cilk_trees[CILK_TI_F_LOOP_64]
|
|
|
|
#define cilk_worker_type_fndecl cilk_trees[CILK_TI_WORKER_TYPE]
|
|
#define cilk_frame_type_decl cilk_trees[CILK_TI_FRAME_TYPE]
|
|
#define cilk_frame_ptr_type_decl cilk_trees[CILK_TI_FRAME_PTR]
|
|
#define cilk_pedigree_type_decl cilk_trees[CILK_TI_PEDIGREE_TYPE]
|
|
|
|
extern void expand_builtin_cilk_detach (tree);
|
|
extern void expand_builtin_cilk_pop_frame (tree);
|
|
extern tree cilk_arrow (tree, int, bool);
|
|
extern tree cilk_dot (tree, int, bool);
|
|
extern void cilk_init_builtins (void);
|
|
extern void gimplify_cilk_sync (tree *, gimple_seq *);
|
|
extern tree cilk_call_setjmp (tree);
|
|
|
|
/* Returns true if Cilk Plus is enabled and if F->cilk_frame_decl is not
|
|
NULL_TREE. */
|
|
|
|
inline bool
|
|
fn_contains_cilk_spawn_p (function *f)
|
|
{
|
|
return (flag_cilkplus
|
|
&& (f->calls_cilk_spawn || f->cilk_frame_decl != NULL_TREE));
|
|
}
|
|
|
|
#endif
|