On Thu, Nov 16, 2017 at 03:33:40PM +0000, Koval, Julia wrote:
> // I failed to send patch itself, it is too big even in gzipped form. What
> is the right way to send such big patches?
Don't include the libcilkrts subtree in the patch nor /cilk-plus/
testcases that are going to be removed?
> Hi, this patch removes cilkplus. Ok for trunk?
>
> 2017-11-16 Julia Koval <julia.ko...@intel.com>
> Sebastian Peryt <sebastian.pe...@intel.com>
> gcc/
> * Makefile.def (target_modules): Remove libcilkrts.
> * Makefile.in: Ditto.
> * configure: Ditto.
> * configure.ac: Ditto.
The ChangeLog needs work, e.g. we have many different ChangeLog files and
changes should be relative to that. The above entries are for toplevel.
> * contrib/gcc_update: Ditto.
This one is for contrib/ChangeLog, so should be without contrib/
in the entry.
> * Makefile.in (cilkplus.def, cilk-builtins.def, c-family/cilk.o,
> c-family/c-cilkplus.o, c-family/array-notation-common.o,
> cilk-common.o, cilk.h, cilk-common.c): Remove.
> * builtin-types.def (BT_FN_INT_PTR_PTR_PTR_FTYPE_BT_INT_BT_PTR_BT_PTR
> _BT_PTR): Remove.
There should be no linebreaks within one identifier. So
* builtin-types.def
(BT_FN_INT_PTR_PTR_PTR_FTYPE_BT_INT_BT_PTR_BT_PTR_BT_PTR): Remove.
> * c-family/array-notation-common.c: Delete.
> * c-family/c-cilkplus.c: Ditto.
> * c-family/c-common.c (_Cilk_spawn, _Cilk_sync, _Cilk_for): Remove.
> * c-family/c-common.def (ARRAY_NOTATION_REF): Remove.
> * c-family/c-common.h (RID_CILK_SPAWN, build_array_notation_expr,
> build_array_notation_ref, C_ORT_CILK, c_check_cilk_loop,
> c_validate_cilk_plus_loop, cilkplus_an_parts,
> cilk_ignorable_spawn_rhs_op,
> cilk_recognize_spawn): Remove.
> * c-family/c-gimplify.c (CILK_SPAWN_STMT): Remove.
> * c-family/c-omp.c: Remove CILK_SIMD check.
> * c-family/c-pragma.c: Ditto.
> * c-family/c-pragma.h: Remove CILK related pragmas.
> * c-family/c-pretty-print.c (c_pretty_printer::postfix_expression):
> Remove
> ARRAY_NOTATION_REF condition.
> (c_pretty_printer::expression): Ditto.
> * c-family/c.opt (fcilkplus): Remove.
> * c-family/cilk.c: Delete.
c-family has its own ChangeLog, no c-family/ prefix (similarly for c/, cp/,
etc.).
> * c/Make-lang.in (c/c-array-notation.o): Remove.
> * c/c-array-notation.c: Delete.
> * c/c-decl.c: Remove cilkplus condition.
> * c/c-parser.c (c_parser_cilk_simd, c_parser_cilk_for,
> c_parser_cilk_verify_simd, c_parser_array_notation,
> c_parser_cilk_clause_vectorlength, c_parser_cilk_grainsize,
c_parser_cilk_simd_fn_vector_attrs, c_finish_cilk_simd_fn_tokens):
Delete.
Too long line.
> (c_parser_declaration_or_fndef): Remove cilkplus condition.
> (c_parser_direct_declarator_inner): Ditto.
> (CILK_SIMD_FN_CLAUSE_MASK): Delete.
> (c_parser_attributes): Remove cilk-plus condition.
> (c_parser_compound_statement): Ditto.
> (c_parser_statement_after_labels): Ditto.
> (c_parser_if_statement): Ditto.
> (c_parser_switch_statement): Ditto.
> (c_parser_while_statement): Ditto.
> (c_parser_do_statement): Ditto.
> (c_parser_for_statement): Ditto.
> (c_parser_unary_expression): Ditto.
> (c_parser_postfix_expression): Ditto.
> (c_parser_postfix_expression_after_primary): Ditto.
> (c_parser_pragma): Ditto.
> (c_parser_omp_clause_name): Ditto.
> (c_parser_omp_all_clauses): Ditto.
> (c_parser_omp_for_loop): Ditto.
> (c_finish_omp_declare_simd): Ditto.
Perhaps you could shorten by writing:
(c_parser_attributes, c_parser_compound_statement,
c_parser_statement_after_labels, c_parser_if_statement,
c_parser_switch_statement, c_parser_while_statement,
c_parser_do_statement, c_parser_for_statement,
c_parser_unary_expression, c_parser_postfix_expression,
c_parser_postfix_expression_after_primary, c_parser_pragma,
c_parser_omp_clause_name, c_parser_omp_all_clauses,
c_parser_omp_for_loop, c_finish_omp_declare_simd):
Remove cilkplus support.
etc.
* c/c-typeck.c (build_array_ref, build_function_call_vec,
convert_arguments,
Too long line (various others).
> * tree-core.h
> * tree-nested.c
> * tree-pretty-print.c
> * tree.c
> * tree.def
> * tree.h
Description on what changed is missing.
> * g++.dg/cilk-plus/AN/array_function.c: Delete.c
Delete.c ? Should be Delete.
Jakub
