* [patch] remove cilk-plus
@ 2017-11-16 15:48 Koval, Julia
2017-11-16 15:49 ` Marek Polacek
` (4 more replies)
0 siblings, 5 replies; 26+ messages in thread
From: Koval, Julia @ 2017-11-16 15:48 UTC (permalink / raw)
To: GCC Patches; +Cc: law
// I failed to send patch itself, it is too big even in gzipped form. What is the right way to send such big patches?
Hi, this patch removes cilkplus. Ok for trunk?
2017-11-16 Julia Koval <julia.koval@intel.com>
Sebastian Peryt <sebastian.peryt@intel.com>
gcc/
* Makefile.def (target_modules): Remove libcilkrts.
* Makefile.in: Ditto.
* configure: Ditto.
* configure.ac: Ditto.
* contrib/gcc_update: Ditto.
* 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.
* builtins.c (is_builtin_name): Remove cilkplus condition.
(BUILT_IN_CILK_DETACH, BUILT_IN_CILK_POP_FRAME): Remove.
* builtins.def (DEF_CILK_BUILTIN_STUB, DEF_CILKPLUS_BUILTIN,
cilk-builtins.def, cilkplus.def): 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/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.
(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.
* c/c-typeck.c (build_array_ref, build_function_call_vec, convert_arguments,
lvalue_p, build_compound_expr, c_finish_return, c_finish_if_stmt,
c_finish_loop, build_binary_op): Remove cilkplus condition.
* cif-code.def (CILK_SPAWN): Remove.
* cilk-builtins.def: Delete.
* cilk-common.c: Ditto.
* cilk.h: Ditto.
* cilkplus.def: Ditto.
* config/darwin.h (fcilkplus): Delete.
* cp/Make-lang.in (cp/cp-array-notation.o, cp/cp-cilkplus.o): Delete.
* cp/call.c (convert_for_arg_passing, build_cxx_call): Remove cilkplus.
* cp/constexpr.c (potential_constant_expression_1): Ditto.
* cp/cp-array-notation.c: Delete.
* cp/cp-cilkplus.c: Ditto.
* cp/cp-cilkplus.h: Ditto.
* cp/cp-gimplify.c (cp_gimplify_expr, cp_fold_r, cp_genericize): Remove
cilkplus condition.
* cp/cp-objcp-common.c (ARRAY_NOTATION_REF): Delete.
* cp/cp-tree.h (cilkplus_an_triplet_types_ok_p): Delete.
* cp/decl.c (grokfndecl, finish_function): Remove cilkplus condition.
* cp/error.c (dump_decl, dump_expr): Remove ARRAY_NOTATION_REF condition.
* cp/lambda.c (cp-cilkplus.h): Remove.
* cp/parser.c (cp_parser_cilk_simd, cp_parser_cilk_for,
cp_parser_cilk_simd_vectorlength): Delete.
(cp_debug_parser, cp_parser_ctor_initializer_opt_and_function_body,
cp_parser_postfix_expression, cp_parser_postfix_open_square_expression,
cp_parser_statement, cp_parser_jump_statement, cp_parser_direct_declarator,
cp_parser_late_return_type_opt, cp_parser_gnu_attribute_list,
cp_parser_omp_clause_name, cp_parser_omp_clause_aligned,
cp_parser_omp_clause_linear, cp_parser_omp_all_clauses, cp_parser_omp_flush,
cp_parser_omp_for_cond, cp_parser_omp_for_incr, cp_parser_omp_for_loop_init,
cp_parser_omp_for_loop, cp_parser_omp_declare_simd): Remove cilkplus condtions.
(CILK_SIMD_FN_CLAUSE_MASK, cp_parser_late_parsing_cilk_simd_fn_info,
cp_parser_cilk_grainsize): Remove.
(cp_parser_pragma, c_parse_file): Remove cilkplus condition.
(cp_parser_cilk_simd_vectorlength, cp_parser_cilk_simd_linear,
cp_parser_cilk_simd_clause_name, cp_parser_cilk_simd_all_clauses,
cp_parser_cilk_simd, cp_parser_cilk_for): Remove.
* cp/parser.h (IN_CILK_SIMD_FOR, IN_CILK_SPAWN): Remove.
* cp/pt.c (tsubst_attribute, tsubst_expr, tsubst_copy_and_build): Remove
cilkplus condition.
* cp/semantics.c (finish_goto_stmt, begin_while_stmt, finish_do_body,
finish_init_stmt, finish_switch_cond, simplify_aggr_init_expr,
finish_omp_clauses, finish_omp_clauses, finish_omp_for): Remove cilkplus
condition.
* cp/tree.c (lvalue_kind): Remove ARRAY_NOTATION_REF conditon.
* cp/typeck.c (cp_build_array_ref, cp_build_compound_expr,
check_return_expr): Remove cilkplus conditions.
* cppbuiltin.c: Ditto.
* doc/extend.texi: Remove cilkplus doc.
* doc/generic.texi: Ditto.
* doc/invoke.texi: Ditto.
* doc/passes.texi: Ditto.
* gcc.c (fcilkplus): Remove.
* gengtype.c (cilk.h): Remove.
* gimple-pretty-print.c (dump_gimple_omp_for): Remove cilkplus conditions.
* gimple.h (GF_OMP_FOR_KIND_CILKFOR, GF_OMP_FOR_KIND_CILKSIMD): Remove.
* gimplify.c (gimplify_return_expr, maybe_fold_stmt, gimplify_call_expr,
is_gimple_stmt, gimplify_modify_expr, gimplify_scan_omp_clauses,
gimplify_adjust_omp_clauses, gimplify_omp_for, gimplify_expr): Remove
cilkplus conditions.
* ipa-fnsummary.c (ipa_dump_fn_summary, compute_fn_summary,
inline_read_section): Ditto.
* ipa-inline-analysis.c (cilk.h): Remove.
* ira.c (ira_setup_eliminable_regset): Remove cilkplus condition.
* lto-wrapper.c (merge_and_complain, append_compiler_options,
append_linker_options): Remove condition for fcilkplus.
* lto/lto-lang.c (cilk.h): Remove.
(lto_init): Remove condition for fcilkplus.
* omp-expand.c (expand_cilk_for_call): Delete.
(expand_omp_taskreg, expand_omp_for_static_chunk,
expand_omp_for): Remove cilkplus
conditions.
(expand_cilk_for): Delete.
* omp-general.c (omp_extract_for_data): Remove cilkplus condition.
* omp-low.c (scan_sharing_clauses, create_omp_child_function,
execute_lower_omp, diagnose_sb_0): Ditto.
* omp-simd-clone.c (simd_clone_clauses_extract): Ditto.
* tree-core.h
* tree-nested.c
* tree-pretty-print.c
* tree.c
* tree.def
* tree.h
gcc/testsuite/
* c-c++-common/attr-simd-3.c: Delete.
* c-c++-common/cilk-plus/AN/an-if.c: Delete.
* c-c++-common/cilk-plus/AN/array_test1.c: Delete.
* c-c++-common/cilk-plus/AN/array_test2.c: Delete.
* c-c++-common/cilk-plus/AN/array_test_ND.c: Delete.
* c-c++-common/cilk-plus/AN/builtin_fn_custom.c: Delete.
* c-c++-common/cilk-plus/AN/builtin_fn_mutating.c: Delete.
* c-c++-common/cilk-plus/AN/builtin_func_double.c: Delete.
* c-c++-common/cilk-plus/AN/builtin_func_double2.c: Delete.
* c-c++-common/cilk-plus/AN/comma_exp.c: Delete.
* c-c++-common/cilk-plus/AN/conditional.c: Delete.
* c-c++-common/cilk-plus/AN/decl-ptr-colon.c: Delete.
* c-c++-common/cilk-plus/AN/dimensionless-arrays.c: Delete.
* c-c++-common/cilk-plus/AN/exec-once.c: Delete.
* c-c++-common/cilk-plus/AN/exec-once2.c: Delete.
* c-c++-common/cilk-plus/AN/fn_ptr-2.c: Delete.
* c-c++-common/cilk-plus/AN/fn_ptr.c: Delete.
* c-c++-common/cilk-plus/AN/fp_triplet_values.c: Delete.
* c-c++-common/cilk-plus/AN/gather-scatter-errors.c: Delete.
* c-c++-common/cilk-plus/AN/gather_scatter.c: Delete.
* c-c++-common/cilk-plus/AN/if_test.c: Delete.
* c-c++-common/cilk-plus/AN/if_test_errors.c: Delete.
* c-c++-common/cilk-plus/AN/misc.c: Delete.
* c-c++-common/cilk-plus/AN/n-ptr-test.c: Delete.
* c-c++-common/cilk-plus/AN/parser_errors.c: Delete.
* c-c++-common/cilk-plus/AN/parser_errors2.c: Delete.
* c-c++-common/cilk-plus/AN/parser_errors3.c: Delete.
* c-c++-common/cilk-plus/AN/parser_errors4.c: Delete.
* c-c++-common/cilk-plus/AN/pr57457-2.c: Delete.
* c-c++-common/cilk-plus/AN/pr57457.c: Delete.
* c-c++-common/cilk-plus/AN/pr57490.c: Delete.
* c-c++-common/cilk-plus/AN/pr57541-2.c: Delete.
* c-c++-common/cilk-plus/AN/pr57541.c: Delete.
* c-c++-common/cilk-plus/AN/pr57577.c: Delete.
* c-c++-common/cilk-plus/AN/pr58942.c: Delete.
* c-c++-common/cilk-plus/AN/pr61191.c: Delete.
* c-c++-common/cilk-plus/AN/pr61455-2.c: Delete.
* c-c++-common/cilk-plus/AN/pr61455.c: Delete.
* c-c++-common/cilk-plus/AN/pr61962.c: Delete.
* c-c++-common/cilk-plus/AN/pr61963.c: Delete.
* c-c++-common/cilk-plus/AN/pr62008.c: Delete.
* c-c++-common/cilk-plus/AN/pr63884.c: Delete.
* c-c++-common/cilk-plus/AN/rank_mismatch.c: Delete.
* c-c++-common/cilk-plus/AN/rank_mismatch2.c: Delete.
* c-c++-common/cilk-plus/AN/rank_mismatch3.c: Delete.
* c-c++-common/cilk-plus/AN/sec_implicit.c: Delete.
* c-c++-common/cilk-plus/AN/sec_implicit2.c: Delete.
* c-c++-common/cilk-plus/AN/sec_implicit_ex.c: Delete.
* c-c++-common/cilk-plus/AN/sec_reduce_ind_same_value.c: Delete.
* c-c++-common/cilk-plus/AN/sec_reduce_max_min_ind.c: Delete.
* c-c++-common/cilk-plus/AN/sec_reduce_return.c: Delete.
* c-c++-common/cilk-plus/AN/side-effects-1.c: Delete.
* c-c++-common/cilk-plus/AN/test_builtin_return.c: Delete.
* c-c++-common/cilk-plus/AN/test_sec_limits.c: Delete.
* c-c++-common/cilk-plus/AN/tst_lngth.c: Delete.
* c-c++-common/cilk-plus/AN/vla.c: Delete.
* c-c++-common/cilk-plus/CK/Wparentheses-1.c: Delete.
* c-c++-common/cilk-plus/CK/cilk-for-2.c: Delete.
* c-c++-common/cilk-plus/CK/cilk-for-3.c: Delete.
* c-c++-common/cilk-plus/CK/cilk-fors.c: Delete.
* c-c++-common/cilk-plus/CK/cilk_for_errors.c: Delete.
* c-c++-common/cilk-plus/CK/cilk_for_grain.c: Delete.
* c-c++-common/cilk-plus/CK/cilk_for_grain_errors.c: Delete.
* c-c++-common/cilk-plus/CK/cilk_for_ptr_iter.c: Delete.
* c-c++-common/cilk-plus/CK/compound_cilk_spawn.c: Delete.
* c-c++-common/cilk-plus/CK/concec_cilk_spawn.c: Delete.
* c-c++-common/cilk-plus/CK/errors.c: Delete.
* c-c++-common/cilk-plus/CK/fib.c: Delete.
* c-c++-common/cilk-plus/CK/fib_init_expr_xy.c: Delete.
* c-c++-common/cilk-plus/CK/fib_no_return.c: Delete.
* c-c++-common/cilk-plus/CK/fib_no_sync.c: Delete.
* c-c++-common/cilk-plus/CK/invalid_spawns.c: Delete.
* c-c++-common/cilk-plus/CK/invalid_sync.c: Delete.c
* c-c++-common/cilk-plus/CK/nested_cilk_for.c: Delete.
* c-c++-common/cilk-plus/CK/no_args_error.c: Delete.
* c-c++-common/cilk-plus/CK/pr59631.c: Delete.
* c-c++-common/cilk-plus/CK/pr60197-2.c: Delete.
* c-c++-common/cilk-plus/CK/pr60197.c: Delete.
* c-c++-common/cilk-plus/CK/pr60469.c: Delete.
* c-c++-common/cilk-plus/CK/pr60586.c: Delete.
* c-c++-common/cilk-plus/CK/pr63307.c: Delete.
* c-c++-common/cilk-plus/CK/pr69826-1.c: Delete.
* c-c++-common/cilk-plus/CK/pr69826-2.c: Delete.
* c-c++-common/cilk-plus/CK/pr79428-4.c: Delete.
* c-c++-common/cilk-plus/CK/pr79428-7.c: Delete.
* c-c++-common/cilk-plus/CK/spawn_in_return.c: Delete.
* c-c++-common/cilk-plus/CK/spawnee_inline.c: Delete.
* c-c++-common/cilk-plus/CK/spawner_inline.c: Delete.
* c-c++-common/cilk-plus/CK/spawning_arg.c: Delete.
* c-c++-common/cilk-plus/CK/steal_check.c: Delete.
* c-c++-common/cilk-plus/CK/sync_wo_spawn.c: Delete.
* c-c++-common/cilk-plus/CK/test__cilk.c: Delete.
* c-c++-common/cilk-plus/CK/varargs_test.c: Delete.
* c-c++-common/cilk-plus/PS/Wparentheses-1.c: Delete.
* c-c++-common/cilk-plus/PS/body.c: Delete.
* c-c++-common/cilk-plus/PS/clauses1.c: Delete.
* c-c++-common/cilk-plus/PS/clauses2.c: Delete.
* c-c++-common/cilk-plus/PS/clauses3.c: Delete.
* c-c++-common/cilk-plus/PS/clauses4.c: Delete.
* c-c++-common/cilk-plus/PS/for1.c: Delete.
* c-c++-common/cilk-plus/PS/for2.c: Delete.
* c-c++-common/cilk-plus/PS/for3.c: Delete.
* c-c++-common/cilk-plus/PS/pr69363.c: Delete.
* c-c++-common/cilk-plus/PS/reduction-1.c: Delete.
* c-c++-common/cilk-plus/PS/reduction-2.c: Delete.
* c-c++-common/cilk-plus/PS/reduction-3.c: Delete.
* c-c++-common/cilk-plus/PS/run-1.c: Delete.
* c-c++-common/cilk-plus/PS/safelen.c: Delete.
* c-c++-common/cilk-plus/PS/vectorlength-2.c: Delete.
* c-c++-common/cilk-plus/PS/vectorlength-3.c: Delete.
* c-c++-common/cilk-plus/PS/vectorlength.c: Delete.
* c-c++-common/cilk-plus/SE/ef_error.c: Delete.
* c-c++-common/cilk-plus/SE/ef_error2.c: Delete.
* c-c++-common/cilk-plus/SE/ef_error3.c: Delete.
* c-c++-common/cilk-plus/SE/ef_test.c: Delete.
* c-c++-common/cilk-plus/SE/ef_test2.c: Delete.
* c-c++-common/cilk-plus/SE/vlength_errors.c: Delete.
* g++.dg/cilk-plus/AN/array_function.c: Delete.c
* g++.dg/cilk-plus/AN/array_test1_tplt.c: Delete.c
* g++.dg/cilk-plus/AN/array_test2_tplt.c: Delete.c
* g++.dg/cilk-plus/AN/array_test_ND_tplt.c: Delete.c
* g++.dg/cilk-plus/AN/braced_list.c: Delete.c
* g++.dg/cilk-plus/AN/builtin_fn_custom_tplt.c: Delete.c
* g++.dg/cilk-plus/AN/builtin_fn_mutating_tplt.c: Delete.c
* g++.dg/cilk-plus/AN/fp_triplet_values_tplt.c: Delete.
* g++.dg/cilk-plus/AN/postincr_test.c: Delete.c
* g++.dg/cilk-plus/AN/preincr_test.c: Delete.c
* g++.dg/cilk-plus/CK/catch_exc.c: Delete.c
* g++.dg/cilk-plus/CK/cf3.c: Delete.c
* g++.dg/cilk-plus/CK/cilk-for-tplt.c: Delete.c
* g++.dg/cilk-plus/CK/const_spawn.c: Delete.c
* g++.dg/cilk-plus/CK/fib-opr-overload.c: Delete.c
* g++.dg/cilk-plus/CK/fib-tplt.c: Delete.c
* g++.dg/cilk-plus/CK/for1.c: Delete.c
* g++.dg/cilk-plus/CK/lambda_spawns.c: Delete.c
* g++.dg/cilk-plus/CK/lambda_spawns_tplt.c: Delete.c
* g++.dg/cilk-plus/CK/pr60586.c: Delete.c
* g++.dg/cilk-plus/CK/pr66326.c: Delete.c
* g++.dg/cilk-plus/CK/pr68001.c: Delete.c
* g++.dg/cilk-plus/CK/pr68997.c: Delete.c
* g++.dg/cilk-plus/CK/pr69024.c: Delete.c
* g++.dg/cilk-plus/CK/pr69048.c: Delete.c
* g++.dg/cilk-plus/CK/pr69267.c: Delete.c
* g++.dg/cilk-plus/CK/pr80038.c: Delete.c
* g++.dg/cilk-plus/CK/stl_iter.c: Delete.c
* g++.dg/cilk-plus/CK/stl_rev_iter.c: Delete.c
* g++.dg/cilk-plus/CK/stl_test.c: Delete.c
* g++.dg/cilk-plus/cilk-plus.exp
* g++.dg/cilk-plus/ef_test.C: Delete.
* g++.dg/cilk-plus/for.C: Delete.
* g++.dg/cilk-plus/for2.C: Delete.
* g++.dg/cilk-plus/for3.C: Delete.
* g++.dg/cilk-plus/for4.C: Delete.
* g++.dg/cilk-plus/pr60967.C: Delete.
* g++.dg/cilk-plus/pr69028.C: Delete.
* g++.dg/cilk-plus/pr70565.C: Delete.
* g++.dg/pr57662.C: Delete.
* gcc.dg/cilk-plus/cilk-plus.exp
* gcc.dg/cilk-plus/for1.c: Delete.
* gcc.dg/cilk-plus/for2.c: Delete.
* gcc.dg/cilk-plus/jump-openmp.c: Delete.
* gcc.dg/cilk-plus/jump.c: Delete.
* gcc.dg/cilk-plus/pr69798-1.c: Delete.
* gcc.dg/cilk-plus/pr69798-2.c: Delete.
* gcc.dg/cilk-plus/pr78306.c: Delete.
* gcc.dg/cilk-plus/pr79116.c: Delete.
* gcc.dg/graphite/id-28.c: Delete.
* lib/cilk-plus-dg.exp: Delete.
* lib/target-supports.exp (cilkplus_runtime): Delete.
libcilkrts: Delete
Thanks,
Julia
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [patch] remove cilk-plus
2017-11-16 15:48 [patch] remove cilk-plus Koval, Julia
@ 2017-11-16 15:49 ` Marek Polacek
2017-11-16 16:21 ` Jakub Jelinek
` (3 subsequent siblings)
4 siblings, 0 replies; 26+ messages in thread
From: Marek Polacek @ 2017-11-16 15:49 UTC (permalink / raw)
To: Koval, Julia; +Cc: GCC Patches, law
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?
You can split the patch and then post each part in a separate e-mail.
Easier to review, too.
> Hi, this patch removes cilkplus. Ok for trunk?
Happy to see this, but the CL will have to be adjusted, e.g. no "c-family/"
prefix and similar.
Marek
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [patch] remove cilk-plus
2017-11-16 15:48 [patch] remove cilk-plus Koval, Julia
2017-11-16 15:49 ` Marek Polacek
@ 2017-11-16 16:21 ` Jakub Jelinek
2017-11-16 17:06 ` Koval, Julia
2017-11-16 16:34 ` Eric Gallager
` (2 subsequent siblings)
4 siblings, 1 reply; 26+ messages in thread
From: Jakub Jelinek @ 2017-11-16 16:21 UTC (permalink / raw)
To: Koval, Julia; +Cc: GCC Patches, law
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.koval@intel.com>
> Sebastian Peryt <sebastian.peryt@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
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [patch] remove cilk-plus
2017-11-16 15:48 [patch] remove cilk-plus Koval, Julia
2017-11-16 15:49 ` Marek Polacek
2017-11-16 16:21 ` Jakub Jelinek
@ 2017-11-16 16:34 ` Eric Gallager
2017-11-16 17:59 ` Jeff Law
2017-12-01 10:28 ` Paolo Carlini
2018-03-02 16:37 ` Thomas Schwinge
4 siblings, 1 reply; 26+ messages in thread
From: Eric Gallager @ 2017-11-16 16:34 UTC (permalink / raw)
To: Koval, Julia; +Cc: GCC Patches, law
On 11/16/17, Koval, Julia <julia.koval@intel.com> 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?
>
> Hi, this patch removes cilkplus. Ok for trunk?
I'm not a reviewer, but just as an onlooker, I'd want to see notes
about the removal in the caveats section of
https://gcc.gnu.org/gcc-8/changes.html
>
> 2017-11-16 Julia Koval <julia.koval@intel.com>
> Sebastian Peryt <sebastian.peryt@intel.com>
> gcc/
> * Makefile.def (target_modules): Remove libcilkrts.
> * Makefile.in: Ditto.
> * configure: Ditto.
> * configure.ac: Ditto.
> * contrib/gcc_update: Ditto.
> * 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.
> * builtins.c (is_builtin_name): Remove cilkplus condition.
> (BUILT_IN_CILK_DETACH, BUILT_IN_CILK_POP_FRAME): Remove.
> * builtins.def (DEF_CILK_BUILTIN_STUB, DEF_CILKPLUS_BUILTIN,
> cilk-builtins.def, cilkplus.def): 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/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.
> (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.
> * c/c-typeck.c (build_array_ref, build_function_call_vec,
> convert_arguments,
> lvalue_p, build_compound_expr, c_finish_return, c_finish_if_stmt,
> c_finish_loop, build_binary_op): Remove cilkplus condition.
> * cif-code.def (CILK_SPAWN): Remove.
> * cilk-builtins.def: Delete.
> * cilk-common.c: Ditto.
> * cilk.h: Ditto.
> * cilkplus.def: Ditto.
> * config/darwin.h (fcilkplus): Delete.
> * cp/Make-lang.in (cp/cp-array-notation.o, cp/cp-cilkplus.o): Delete.
> * cp/call.c (convert_for_arg_passing, build_cxx_call): Remove cilkplus.
> * cp/constexpr.c (potential_constant_expression_1): Ditto.
> * cp/cp-array-notation.c: Delete.
> * cp/cp-cilkplus.c: Ditto.
> * cp/cp-cilkplus.h: Ditto.
> * cp/cp-gimplify.c (cp_gimplify_expr, cp_fold_r, cp_genericize): Remove
> cilkplus condition.
> * cp/cp-objcp-common.c (ARRAY_NOTATION_REF): Delete.
> * cp/cp-tree.h (cilkplus_an_triplet_types_ok_p): Delete.
> * cp/decl.c (grokfndecl, finish_function): Remove cilkplus condition.
> * cp/error.c (dump_decl, dump_expr): Remove ARRAY_NOTATION_REF condition.
> * cp/lambda.c (cp-cilkplus.h): Remove.
> * cp/parser.c (cp_parser_cilk_simd, cp_parser_cilk_for,
> cp_parser_cilk_simd_vectorlength): Delete.
> (cp_debug_parser, cp_parser_ctor_initializer_opt_and_function_body,
> cp_parser_postfix_expression, cp_parser_postfix_open_square_expression,
> cp_parser_statement, cp_parser_jump_statement,
> cp_parser_direct_declarator,
> cp_parser_late_return_type_opt, cp_parser_gnu_attribute_list,
> cp_parser_omp_clause_name, cp_parser_omp_clause_aligned,
> cp_parser_omp_clause_linear, cp_parser_omp_all_clauses,
> cp_parser_omp_flush,
> cp_parser_omp_for_cond, cp_parser_omp_for_incr,
> cp_parser_omp_for_loop_init,
> cp_parser_omp_for_loop, cp_parser_omp_declare_simd): Remove cilkplus
> condtions.
> (CILK_SIMD_FN_CLAUSE_MASK, cp_parser_late_parsing_cilk_simd_fn_info,
> cp_parser_cilk_grainsize): Remove.
> (cp_parser_pragma, c_parse_file): Remove cilkplus condition.
> (cp_parser_cilk_simd_vectorlength, cp_parser_cilk_simd_linear,
> cp_parser_cilk_simd_clause_name, cp_parser_cilk_simd_all_clauses,
> cp_parser_cilk_simd, cp_parser_cilk_for): Remove.
> * cp/parser.h (IN_CILK_SIMD_FOR, IN_CILK_SPAWN): Remove.
> * cp/pt.c (tsubst_attribute, tsubst_expr, tsubst_copy_and_build): Remove
> cilkplus condition.
> * cp/semantics.c (finish_goto_stmt, begin_while_stmt, finish_do_body,
> finish_init_stmt, finish_switch_cond, simplify_aggr_init_expr,
> finish_omp_clauses, finish_omp_clauses, finish_omp_for): Remove cilkplus
> condition.
> * cp/tree.c (lvalue_kind): Remove ARRAY_NOTATION_REF conditon.
> * cp/typeck.c (cp_build_array_ref, cp_build_compound_expr,
> check_return_expr): Remove cilkplus conditions.
> * cppbuiltin.c: Ditto.
> * doc/extend.texi: Remove cilkplus doc.
> * doc/generic.texi: Ditto.
> * doc/invoke.texi: Ditto.
> * doc/passes.texi: Ditto.
> * gcc.c (fcilkplus): Remove.
> * gengtype.c (cilk.h): Remove.
> * gimple-pretty-print.c (dump_gimple_omp_for): Remove cilkplus conditions.
> * gimple.h (GF_OMP_FOR_KIND_CILKFOR, GF_OMP_FOR_KIND_CILKSIMD): Remove.
> * gimplify.c (gimplify_return_expr, maybe_fold_stmt, gimplify_call_expr,
> is_gimple_stmt, gimplify_modify_expr, gimplify_scan_omp_clauses,
> gimplify_adjust_omp_clauses, gimplify_omp_for, gimplify_expr): Remove
> cilkplus conditions.
> * ipa-fnsummary.c (ipa_dump_fn_summary, compute_fn_summary,
> inline_read_section): Ditto.
> * ipa-inline-analysis.c (cilk.h): Remove.
> * ira.c (ira_setup_eliminable_regset): Remove cilkplus condition.
> * lto-wrapper.c (merge_and_complain, append_compiler_options,
> append_linker_options): Remove condition for fcilkplus.
> * lto/lto-lang.c (cilk.h): Remove.
> (lto_init): Remove condition for fcilkplus.
> * omp-expand.c (expand_cilk_for_call): Delete.
> (expand_omp_taskreg, expand_omp_for_static_chunk,
> expand_omp_for): Remove cilkplus
> conditions.
> (expand_cilk_for): Delete.
> * omp-general.c (omp_extract_for_data): Remove cilkplus condition.
> * omp-low.c (scan_sharing_clauses, create_omp_child_function,
> execute_lower_omp, diagnose_sb_0): Ditto.
> * omp-simd-clone.c (simd_clone_clauses_extract): Ditto.
> * tree-core.h
> * tree-nested.c
> * tree-pretty-print.c
> * tree.c
> * tree.def
> * tree.h
>
> gcc/testsuite/
> * c-c++-common/attr-simd-3.c: Delete.
> * c-c++-common/cilk-plus/AN/an-if.c: Delete.
> * c-c++-common/cilk-plus/AN/array_test1.c: Delete.
> * c-c++-common/cilk-plus/AN/array_test2.c: Delete.
> * c-c++-common/cilk-plus/AN/array_test_ND.c: Delete.
> * c-c++-common/cilk-plus/AN/builtin_fn_custom.c: Delete.
> * c-c++-common/cilk-plus/AN/builtin_fn_mutating.c: Delete.
> * c-c++-common/cilk-plus/AN/builtin_func_double.c: Delete.
> * c-c++-common/cilk-plus/AN/builtin_func_double2.c: Delete.
> * c-c++-common/cilk-plus/AN/comma_exp.c: Delete.
> * c-c++-common/cilk-plus/AN/conditional.c: Delete.
> * c-c++-common/cilk-plus/AN/decl-ptr-colon.c: Delete.
> * c-c++-common/cilk-plus/AN/dimensionless-arrays.c: Delete.
> * c-c++-common/cilk-plus/AN/exec-once.c: Delete.
> * c-c++-common/cilk-plus/AN/exec-once2.c: Delete.
> * c-c++-common/cilk-plus/AN/fn_ptr-2.c: Delete.
> * c-c++-common/cilk-plus/AN/fn_ptr.c: Delete.
> * c-c++-common/cilk-plus/AN/fp_triplet_values.c: Delete.
> * c-c++-common/cilk-plus/AN/gather-scatter-errors.c: Delete.
> * c-c++-common/cilk-plus/AN/gather_scatter.c: Delete.
> * c-c++-common/cilk-plus/AN/if_test.c: Delete.
> * c-c++-common/cilk-plus/AN/if_test_errors.c: Delete.
> * c-c++-common/cilk-plus/AN/misc.c: Delete.
> * c-c++-common/cilk-plus/AN/n-ptr-test.c: Delete.
> * c-c++-common/cilk-plus/AN/parser_errors.c: Delete.
> * c-c++-common/cilk-plus/AN/parser_errors2.c: Delete.
> * c-c++-common/cilk-plus/AN/parser_errors3.c: Delete.
> * c-c++-common/cilk-plus/AN/parser_errors4.c: Delete.
> * c-c++-common/cilk-plus/AN/pr57457-2.c: Delete.
> * c-c++-common/cilk-plus/AN/pr57457.c: Delete.
> * c-c++-common/cilk-plus/AN/pr57490.c: Delete.
> * c-c++-common/cilk-plus/AN/pr57541-2.c: Delete.
> * c-c++-common/cilk-plus/AN/pr57541.c: Delete.
> * c-c++-common/cilk-plus/AN/pr57577.c: Delete.
> * c-c++-common/cilk-plus/AN/pr58942.c: Delete.
> * c-c++-common/cilk-plus/AN/pr61191.c: Delete.
> * c-c++-common/cilk-plus/AN/pr61455-2.c: Delete.
> * c-c++-common/cilk-plus/AN/pr61455.c: Delete.
> * c-c++-common/cilk-plus/AN/pr61962.c: Delete.
> * c-c++-common/cilk-plus/AN/pr61963.c: Delete.
> * c-c++-common/cilk-plus/AN/pr62008.c: Delete.
> * c-c++-common/cilk-plus/AN/pr63884.c: Delete.
> * c-c++-common/cilk-plus/AN/rank_mismatch.c: Delete.
> * c-c++-common/cilk-plus/AN/rank_mismatch2.c: Delete.
> * c-c++-common/cilk-plus/AN/rank_mismatch3.c: Delete.
> * c-c++-common/cilk-plus/AN/sec_implicit.c: Delete.
> * c-c++-common/cilk-plus/AN/sec_implicit2.c: Delete.
> * c-c++-common/cilk-plus/AN/sec_implicit_ex.c: Delete.
> * c-c++-common/cilk-plus/AN/sec_reduce_ind_same_value.c: Delete.
> * c-c++-common/cilk-plus/AN/sec_reduce_max_min_ind.c: Delete.
> * c-c++-common/cilk-plus/AN/sec_reduce_return.c: Delete.
> * c-c++-common/cilk-plus/AN/side-effects-1.c: Delete.
> * c-c++-common/cilk-plus/AN/test_builtin_return.c: Delete.
> * c-c++-common/cilk-plus/AN/test_sec_limits.c: Delete.
> * c-c++-common/cilk-plus/AN/tst_lngth.c: Delete.
> * c-c++-common/cilk-plus/AN/vla.c: Delete.
> * c-c++-common/cilk-plus/CK/Wparentheses-1.c: Delete.
> * c-c++-common/cilk-plus/CK/cilk-for-2.c: Delete.
> * c-c++-common/cilk-plus/CK/cilk-for-3.c: Delete.
> * c-c++-common/cilk-plus/CK/cilk-fors.c: Delete.
> * c-c++-common/cilk-plus/CK/cilk_for_errors.c: Delete.
> * c-c++-common/cilk-plus/CK/cilk_for_grain.c: Delete.
> * c-c++-common/cilk-plus/CK/cilk_for_grain_errors.c: Delete.
> * c-c++-common/cilk-plus/CK/cilk_for_ptr_iter.c: Delete.
> * c-c++-common/cilk-plus/CK/compound_cilk_spawn.c: Delete.
> * c-c++-common/cilk-plus/CK/concec_cilk_spawn.c: Delete.
> * c-c++-common/cilk-plus/CK/errors.c: Delete.
> * c-c++-common/cilk-plus/CK/fib.c: Delete.
> * c-c++-common/cilk-plus/CK/fib_init_expr_xy.c: Delete.
> * c-c++-common/cilk-plus/CK/fib_no_return.c: Delete.
> * c-c++-common/cilk-plus/CK/fib_no_sync.c: Delete.
> * c-c++-common/cilk-plus/CK/invalid_spawns.c: Delete.
> * c-c++-common/cilk-plus/CK/invalid_sync.c: Delete.c
> * c-c++-common/cilk-plus/CK/nested_cilk_for.c: Delete.
> * c-c++-common/cilk-plus/CK/no_args_error.c: Delete.
> * c-c++-common/cilk-plus/CK/pr59631.c: Delete.
> * c-c++-common/cilk-plus/CK/pr60197-2.c: Delete.
> * c-c++-common/cilk-plus/CK/pr60197.c: Delete.
> * c-c++-common/cilk-plus/CK/pr60469.c: Delete.
> * c-c++-common/cilk-plus/CK/pr60586.c: Delete.
> * c-c++-common/cilk-plus/CK/pr63307.c: Delete.
> * c-c++-common/cilk-plus/CK/pr69826-1.c: Delete.
> * c-c++-common/cilk-plus/CK/pr69826-2.c: Delete.
> * c-c++-common/cilk-plus/CK/pr79428-4.c: Delete.
> * c-c++-common/cilk-plus/CK/pr79428-7.c: Delete.
> * c-c++-common/cilk-plus/CK/spawn_in_return.c: Delete.
> * c-c++-common/cilk-plus/CK/spawnee_inline.c: Delete.
> * c-c++-common/cilk-plus/CK/spawner_inline.c: Delete.
> * c-c++-common/cilk-plus/CK/spawning_arg.c: Delete.
> * c-c++-common/cilk-plus/CK/steal_check.c: Delete.
> * c-c++-common/cilk-plus/CK/sync_wo_spawn.c: Delete.
> * c-c++-common/cilk-plus/CK/test__cilk.c: Delete.
> * c-c++-common/cilk-plus/CK/varargs_test.c: Delete.
> * c-c++-common/cilk-plus/PS/Wparentheses-1.c: Delete.
> * c-c++-common/cilk-plus/PS/body.c: Delete.
> * c-c++-common/cilk-plus/PS/clauses1.c: Delete.
> * c-c++-common/cilk-plus/PS/clauses2.c: Delete.
> * c-c++-common/cilk-plus/PS/clauses3.c: Delete.
> * c-c++-common/cilk-plus/PS/clauses4.c: Delete.
> * c-c++-common/cilk-plus/PS/for1.c: Delete.
> * c-c++-common/cilk-plus/PS/for2.c: Delete.
> * c-c++-common/cilk-plus/PS/for3.c: Delete.
> * c-c++-common/cilk-plus/PS/pr69363.c: Delete.
> * c-c++-common/cilk-plus/PS/reduction-1.c: Delete.
> * c-c++-common/cilk-plus/PS/reduction-2.c: Delete.
> * c-c++-common/cilk-plus/PS/reduction-3.c: Delete.
> * c-c++-common/cilk-plus/PS/run-1.c: Delete.
> * c-c++-common/cilk-plus/PS/safelen.c: Delete.
> * c-c++-common/cilk-plus/PS/vectorlength-2.c: Delete.
> * c-c++-common/cilk-plus/PS/vectorlength-3.c: Delete.
> * c-c++-common/cilk-plus/PS/vectorlength.c: Delete.
> * c-c++-common/cilk-plus/SE/ef_error.c: Delete.
> * c-c++-common/cilk-plus/SE/ef_error2.c: Delete.
> * c-c++-common/cilk-plus/SE/ef_error3.c: Delete.
> * c-c++-common/cilk-plus/SE/ef_test.c: Delete.
> * c-c++-common/cilk-plus/SE/ef_test2.c: Delete.
> * c-c++-common/cilk-plus/SE/vlength_errors.c: Delete.
> * g++.dg/cilk-plus/AN/array_function.c: Delete.c
> * g++.dg/cilk-plus/AN/array_test1_tplt.c: Delete.c
> * g++.dg/cilk-plus/AN/array_test2_tplt.c: Delete.c
> * g++.dg/cilk-plus/AN/array_test_ND_tplt.c: Delete.c
> * g++.dg/cilk-plus/AN/braced_list.c: Delete.c
> * g++.dg/cilk-plus/AN/builtin_fn_custom_tplt.c: Delete.c
> * g++.dg/cilk-plus/AN/builtin_fn_mutating_tplt.c: Delete.c
> * g++.dg/cilk-plus/AN/fp_triplet_values_tplt.c: Delete.
> * g++.dg/cilk-plus/AN/postincr_test.c: Delete.c
> * g++.dg/cilk-plus/AN/preincr_test.c: Delete.c
> * g++.dg/cilk-plus/CK/catch_exc.c: Delete.c
> * g++.dg/cilk-plus/CK/cf3.c: Delete.c
> * g++.dg/cilk-plus/CK/cilk-for-tplt.c: Delete.c
> * g++.dg/cilk-plus/CK/const_spawn.c: Delete.c
> * g++.dg/cilk-plus/CK/fib-opr-overload.c: Delete.c
> * g++.dg/cilk-plus/CK/fib-tplt.c: Delete.c
> * g++.dg/cilk-plus/CK/for1.c: Delete.c
> * g++.dg/cilk-plus/CK/lambda_spawns.c: Delete.c
> * g++.dg/cilk-plus/CK/lambda_spawns_tplt.c: Delete.c
> * g++.dg/cilk-plus/CK/pr60586.c: Delete.c
> * g++.dg/cilk-plus/CK/pr66326.c: Delete.c
> * g++.dg/cilk-plus/CK/pr68001.c: Delete.c
> * g++.dg/cilk-plus/CK/pr68997.c: Delete.c
> * g++.dg/cilk-plus/CK/pr69024.c: Delete.c
> * g++.dg/cilk-plus/CK/pr69048.c: Delete.c
> * g++.dg/cilk-plus/CK/pr69267.c: Delete.c
> * g++.dg/cilk-plus/CK/pr80038.c: Delete.c
> * g++.dg/cilk-plus/CK/stl_iter.c: Delete.c
> * g++.dg/cilk-plus/CK/stl_rev_iter.c: Delete.c
> * g++.dg/cilk-plus/CK/stl_test.c: Delete.c
> * g++.dg/cilk-plus/cilk-plus.exp
> * g++.dg/cilk-plus/ef_test.C: Delete.
> * g++.dg/cilk-plus/for.C: Delete.
> * g++.dg/cilk-plus/for2.C: Delete.
> * g++.dg/cilk-plus/for3.C: Delete.
> * g++.dg/cilk-plus/for4.C: Delete.
> * g++.dg/cilk-plus/pr60967.C: Delete.
> * g++.dg/cilk-plus/pr69028.C: Delete.
> * g++.dg/cilk-plus/pr70565.C: Delete.
> * g++.dg/pr57662.C: Delete.
> * gcc.dg/cilk-plus/cilk-plus.exp
> * gcc.dg/cilk-plus/for1.c: Delete.
> * gcc.dg/cilk-plus/for2.c: Delete.
> * gcc.dg/cilk-plus/jump-openmp.c: Delete.
> * gcc.dg/cilk-plus/jump.c: Delete.
> * gcc.dg/cilk-plus/pr69798-1.c: Delete.
> * gcc.dg/cilk-plus/pr69798-2.c: Delete.
> * gcc.dg/cilk-plus/pr78306.c: Delete.
> * gcc.dg/cilk-plus/pr79116.c: Delete.
> * gcc.dg/graphite/id-28.c: Delete.
> * lib/cilk-plus-dg.exp: Delete.
> * lib/target-supports.exp (cilkplus_runtime): Delete.
>
> libcilkrts: Delete
>
> Thanks,
> Julia
>
>
^ permalink raw reply [flat|nested] 26+ messages in thread
* RE: [patch] remove cilk-plus
2017-11-16 16:21 ` Jakub Jelinek
@ 2017-11-16 17:06 ` Koval, Julia
2017-11-16 23:51 ` Joseph Myers
2017-11-21 7:46 ` Jeff Law
0 siblings, 2 replies; 26+ messages in thread
From: Koval, Julia @ 2017-11-16 17:06 UTC (permalink / raw)
To: Jakub Jelinek; +Cc: GCC Patches, law
[-- Attachment #1: Type: text/plain, Size: 20397 bytes --]
Thanks for your comments, fixed it.
2017-11-16 Julia Koval <julia.koval@intel.com>
Sebastian Peryt <sebastian.peryt@intel.com>
* Makefile.def (target_modules): Remove libcilkrts.
* Makefile.in: Ditto.
* configure: Ditto.
* configure.ac: Ditto.
contrib/
* contrib/gcc_update: Ditto.
gcc/
* 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.
* builtins.c (is_builtin_name): Remove cilkplus condition.
(BUILT_IN_CILK_DETACH, BUILT_IN_CILK_POP_FRAME): Remove.
* builtins.def (DEF_CILK_BUILTIN_STUB, DEF_CILKPLUS_BUILTIN,
cilk-builtins.def, cilkplus.def): Remove.
* cif-code.def (CILK_SPAWN): Remove.
* cilk-builtins.def: Delete.
* cilk-common.c: Ditto.
* cilk.h: Ditto.
* cilkplus.def: Ditto.
* config/darwin.h (fcilkplus): Delete.
* cppbuiltin.c: Ditto.
* doc/extend.texi: Remove cilkplus doc.
* doc/generic.texi: Ditto.
* doc/invoke.texi: Ditto.
* doc/passes.texi: Ditto.
* gcc.c (fcilkplus): Remove.
* gengtype.c (cilk.h): Remove.
* gimple-pretty-print.c (dump_gimple_omp_for): Remove cilkplus support.
* gimple.h (GF_OMP_FOR_KIND_CILKFOR, GF_OMP_FOR_KIND_CILKSIMD): Remove.
* gimplify.c (gimplify_return_expr, maybe_fold_stmt, gimplify_call_expr,
is_gimple_stmt, gimplify_modify_expr, gimplify_scan_omp_clauses,
gimplify_adjust_omp_clauses, gimplify_omp_for, gimplify_expr): Remove
cilkplus conditions.
* ipa-fnsummary.c (ipa_dump_fn_summary, compute_fn_summary,
inline_read_section): Ditto.
* ipa-inline-analysis.c (cilk.h): Remove.
* ira.c (ira_setup_eliminable_regset): Remove cilkplus support.
* lto-wrapper.c (merge_and_complain, append_compiler_options,
append_linker_options): Remove condition for fcilkplus.
* lto/lto-lang.c (cilk.h): Remove.
(lto_init): Remove condition for fcilkplus.
* omp-expand.c (expand_cilk_for_call): Delete.
(expand_omp_taskreg, expand_omp_for_static_chunk,
expand_omp_for): Remove cilkplus
conditions.
(expand_cilk_for): Delete.
* omp-general.c (omp_extract_for_data): Remove cilkplus support.
* omp-low.c (scan_sharing_clauses, create_omp_child_function,
execute_lower_omp, diagnose_sb_0): Ditto.
* omp-simd-clone.c (simd_clone_clauses_extract): Ditto.
* tree-core.h (OMP_CLAUSE__CILK_FOR_COUNT_): Delete.
* tree-nested.c: Ditto.
* tree-pretty-print.c (dump_omp_clause): Remove cilkplus support.
(dump_generic_node): Ditto.
* tree.c (OMP_CLAUSE__CILK_FOR_COUNT_): Delete.
* tree.def (cilk_simd, cilk_for, cilk_spawn_stmt, cilk_sync_stmt): Delete.
* tree.h (CILK_SPAWN_FN, EXPR_CILK_SPAWN): Delete.
gcc/c-family/
* array-notation-common.c: Delete.
* c-cilkplus.c: Ditto.
* c-common.c (_Cilk_spawn, _Cilk_sync, _Cilk_for): Remove.
* c-common.def (ARRAY_NOTATION_REF): Remove.
* 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-gimplify.c (CILK_SPAWN_STMT): Remove.
* c-omp.c: Remove CILK_SIMD check.
* c-pragma.c: Ditto.
* c-pragma.h: Remove CILK related pragmas.
* c-pretty-print.c (c_pretty_printer::postfix_expression): Remove
ARRAY_NOTATION_REF condition.
(c_pretty_printer::expression): Ditto.
* c.opt (fcilkplus): Remove.
* cilk.c: Delete.
gcc/c/
* Make-lang.in (c/c-array-notation.o): Remove.
* c-array-notation.c: Delete.
* c-decl.c: Remove cilkplus condition.
* 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.
(c_parser_declaration_or_fndef): Remove cilkplus condition.
(c_parser_direct_declarator_inner): Ditto.
(CILK_SIMD_FN_CLAUSE_MASK): Delete.
(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.
* c-typeck.c (build_array_ref, build_function_call_vec, convert_arguments,
lvalue_p, build_compound_expr, c_finish_return, c_finish_if_stmt,
c_finish_loop, build_binary_op): Remove cilkplus support.
gcc/cp/
* Make-lang.in (cp/cp-array-notation.o, cp/cp-cilkplus.o): Delete.
* call.c (convert_for_arg_passing, build_cxx_call): Remove cilkplus.
* constexpr.c (potential_constant_expression_1): Ditto.
* cp-array-notation.c: Delete.
* cp-cilkplus.c: Ditto.
* cp-cilkplus.h: Ditto.
* cp-gimplify.c (cp_gimplify_expr, cp_fold_r, cp_genericize): Remove
cilkplus condition.
* cp-objcp-common.c (ARRAY_NOTATION_REF): Delete.
* cp-tree.h (cilkplus_an_triplet_types_ok_p): Delete.
* decl.c (grokfndecl, finish_function): Remove cilkplus condition.
* error.c (dump_decl, dump_expr): Remove ARRAY_NOTATION_REF condition.
* lambda.c (cp-cilkplus.h): Remove.
* parser.c (cp_parser_cilk_simd, cp_parser_cilk_for,
cp_parser_cilk_simd_vectorlength): Delete.
(cp_debug_parser, cp_parser_ctor_initializer_opt_and_function_body,
cp_parser_postfix_expression, cp_parser_postfix_open_square_expression,
cp_parser_statement, cp_parser_jump_statement, cp_parser_direct_declarator,
cp_parser_late_return_type_opt, cp_parser_gnu_attribute_list,
cp_parser_omp_clause_name, cp_parser_omp_clause_aligned,
cp_parser_omp_clause_linear, cp_parser_omp_all_clauses, cp_parser_omp_flush,
cp_parser_omp_for_cond, cp_parser_omp_for_incr, cp_parser_omp_for_loop_init,
cp_parser_omp_for_loop,
cp_parser_omp_declare_simd): Remove cilkplus support.
(CILK_SIMD_FN_CLAUSE_MASK, cp_parser_late_parsing_cilk_simd_fn_info,
cp_parser_cilk_grainsize): Remove.
(cp_parser_pragma, c_parse_file): Remove cilkplus support.
(cp_parser_cilk_simd_vectorlength, cp_parser_cilk_simd_linear,
cp_parser_cilk_simd_clause_name, cp_parser_cilk_simd_all_clauses,
cp_parser_cilk_simd, cp_parser_cilk_for): Remove.
* parser.h (IN_CILK_SIMD_FOR, IN_CILK_SPAWN): Remove.
* pt.c (tsubst_attribute, tsubst_expr, tsubst_copy_and_build): Remove
cilkplus support.
* semantics.c (finish_goto_stmt, begin_while_stmt, finish_do_body,
finish_init_stmt, finish_switch_cond, simplify_aggr_init_expr,
finish_omp_clauses, finish_omp_clauses, finish_omp_for): Remove cilkplus
support.
* tree.c (lvalue_kind): Remove ARRAY_NOTATION_REF conditon.
* typeck.c (cp_build_array_ref, cp_build_compound_expr,
check_return_expr): Remove cilkplus support.
gcc/testsuite/
* c-c++-common/attr-simd-3.c: Delete.
* c-c++-common/cilk-plus/AN/an-if.c: Delete.
* c-c++-common/cilk-plus/AN/array_test1.c: Delete.
* c-c++-common/cilk-plus/AN/array_test2.c: Delete.
* c-c++-common/cilk-plus/AN/array_test_ND.c: Delete.
* c-c++-common/cilk-plus/AN/builtin_fn_custom.c: Delete.
* c-c++-common/cilk-plus/AN/builtin_fn_mutating.c: Delete.
* c-c++-common/cilk-plus/AN/builtin_func_double.c: Delete.
* c-c++-common/cilk-plus/AN/builtin_func_double2.c: Delete.
* c-c++-common/cilk-plus/AN/comma_exp.c: Delete.
* c-c++-common/cilk-plus/AN/conditional.c: Delete.
* c-c++-common/cilk-plus/AN/decl-ptr-colon.c: Delete.
* c-c++-common/cilk-plus/AN/dimensionless-arrays.c: Delete.
* c-c++-common/cilk-plus/AN/exec-once.c: Delete.
* c-c++-common/cilk-plus/AN/exec-once2.c: Delete.
* c-c++-common/cilk-plus/AN/fn_ptr-2.c: Delete.
* c-c++-common/cilk-plus/AN/fn_ptr.c: Delete.
* c-c++-common/cilk-plus/AN/fp_triplet_values.c: Delete.
* c-c++-common/cilk-plus/AN/gather-scatter-errors.c: Delete.
* c-c++-common/cilk-plus/AN/gather_scatter.c: Delete.
* c-c++-common/cilk-plus/AN/if_test.c: Delete.
* c-c++-common/cilk-plus/AN/if_test_errors.c: Delete.
* c-c++-common/cilk-plus/AN/misc.c: Delete.
* c-c++-common/cilk-plus/AN/n-ptr-test.c: Delete.
* c-c++-common/cilk-plus/AN/parser_errors.c: Delete.
* c-c++-common/cilk-plus/AN/parser_errors2.c: Delete.
* c-c++-common/cilk-plus/AN/parser_errors3.c: Delete.
* c-c++-common/cilk-plus/AN/parser_errors4.c: Delete.
* c-c++-common/cilk-plus/AN/pr57457-2.c: Delete.
* c-c++-common/cilk-plus/AN/pr57457.c: Delete.
* c-c++-common/cilk-plus/AN/pr57490.c: Delete.
* c-c++-common/cilk-plus/AN/pr57541-2.c: Delete.
* c-c++-common/cilk-plus/AN/pr57541.c: Delete.
* c-c++-common/cilk-plus/AN/pr57577.c: Delete.
* c-c++-common/cilk-plus/AN/pr58942.c: Delete.
* c-c++-common/cilk-plus/AN/pr61191.c: Delete.
* c-c++-common/cilk-plus/AN/pr61455-2.c: Delete.
* c-c++-common/cilk-plus/AN/pr61455.c: Delete.
* c-c++-common/cilk-plus/AN/pr61962.c: Delete.
* c-c++-common/cilk-plus/AN/pr61963.c: Delete.
* c-c++-common/cilk-plus/AN/pr62008.c: Delete.
* c-c++-common/cilk-plus/AN/pr63884.c: Delete.
* c-c++-common/cilk-plus/AN/rank_mismatch.c: Delete.
* c-c++-common/cilk-plus/AN/rank_mismatch2.c: Delete.
* c-c++-common/cilk-plus/AN/rank_mismatch3.c: Delete.
* c-c++-common/cilk-plus/AN/sec_implicit.c: Delete.
* c-c++-common/cilk-plus/AN/sec_implicit2.c: Delete.
* c-c++-common/cilk-plus/AN/sec_implicit_ex.c: Delete.
* c-c++-common/cilk-plus/AN/sec_reduce_ind_same_value.c: Delete.
* c-c++-common/cilk-plus/AN/sec_reduce_max_min_ind.c: Delete.
* c-c++-common/cilk-plus/AN/sec_reduce_return.c: Delete.
* c-c++-common/cilk-plus/AN/side-effects-1.c: Delete.
* c-c++-common/cilk-plus/AN/test_builtin_return.c: Delete.
* c-c++-common/cilk-plus/AN/test_sec_limits.c: Delete.
* c-c++-common/cilk-plus/AN/tst_lngth.c: Delete.
* c-c++-common/cilk-plus/AN/vla.c: Delete.
* c-c++-common/cilk-plus/CK/Wparentheses-1.c: Delete.
* c-c++-common/cilk-plus/CK/cilk-for-2.c: Delete.
* c-c++-common/cilk-plus/CK/cilk-for-3.c: Delete.
* c-c++-common/cilk-plus/CK/cilk-fors.c: Delete.
* c-c++-common/cilk-plus/CK/cilk_for_errors.c: Delete.
* c-c++-common/cilk-plus/CK/cilk_for_grain.c: Delete.
* c-c++-common/cilk-plus/CK/cilk_for_grain_errors.c: Delete.
* c-c++-common/cilk-plus/CK/cilk_for_ptr_iter.c: Delete.
* c-c++-common/cilk-plus/CK/compound_cilk_spawn.c: Delete.
* c-c++-common/cilk-plus/CK/concec_cilk_spawn.c: Delete.
* c-c++-common/cilk-plus/CK/errors.c: Delete.
* c-c++-common/cilk-plus/CK/fib.c: Delete.
* c-c++-common/cilk-plus/CK/fib_init_expr_xy.c: Delete.
* c-c++-common/cilk-plus/CK/fib_no_return.c: Delete.
* c-c++-common/cilk-plus/CK/fib_no_sync.c: Delete.
* c-c++-common/cilk-plus/CK/invalid_spawns.c: Delete.
* c-c++-common/cilk-plus/CK/invalid_sync.c: Delete.c
* c-c++-common/cilk-plus/CK/nested_cilk_for.c: Delete.
* c-c++-common/cilk-plus/CK/no_args_error.c: Delete.
* c-c++-common/cilk-plus/CK/pr59631.c: Delete.
* c-c++-common/cilk-plus/CK/pr60197-2.c: Delete.
* c-c++-common/cilk-plus/CK/pr60197.c: Delete.
* c-c++-common/cilk-plus/CK/pr60469.c: Delete.
* c-c++-common/cilk-plus/CK/pr60586.c: Delete.
* c-c++-common/cilk-plus/CK/pr63307.c: Delete.
* c-c++-common/cilk-plus/CK/pr69826-1.c: Delete.
* c-c++-common/cilk-plus/CK/pr69826-2.c: Delete.
* c-c++-common/cilk-plus/CK/pr79428-4.c: Delete.
* c-c++-common/cilk-plus/CK/pr79428-7.c: Delete.
* c-c++-common/cilk-plus/CK/spawn_in_return.c: Delete.
* c-c++-common/cilk-plus/CK/spawnee_inline.c: Delete.
* c-c++-common/cilk-plus/CK/spawner_inline.c: Delete.
* c-c++-common/cilk-plus/CK/spawning_arg.c: Delete.
* c-c++-common/cilk-plus/CK/steal_check.c: Delete.
* c-c++-common/cilk-plus/CK/sync_wo_spawn.c: Delete.
* c-c++-common/cilk-plus/CK/test__cilk.c: Delete.
* c-c++-common/cilk-plus/CK/varargs_test.c: Delete.
* c-c++-common/cilk-plus/PS/Wparentheses-1.c: Delete.
* c-c++-common/cilk-plus/PS/body.c: Delete.
* c-c++-common/cilk-plus/PS/clauses1.c: Delete.
* c-c++-common/cilk-plus/PS/clauses2.c: Delete.
* c-c++-common/cilk-plus/PS/clauses3.c: Delete.
* c-c++-common/cilk-plus/PS/clauses4.c: Delete.
* c-c++-common/cilk-plus/PS/for1.c: Delete.
* c-c++-common/cilk-plus/PS/for2.c: Delete.
* c-c++-common/cilk-plus/PS/for3.c: Delete.
* c-c++-common/cilk-plus/PS/pr69363.c: Delete.
* c-c++-common/cilk-plus/PS/reduction-1.c: Delete.
* c-c++-common/cilk-plus/PS/reduction-2.c: Delete.
* c-c++-common/cilk-plus/PS/reduction-3.c: Delete.
* c-c++-common/cilk-plus/PS/run-1.c: Delete.
* c-c++-common/cilk-plus/PS/safelen.c: Delete.
* c-c++-common/cilk-plus/PS/vectorlength-2.c: Delete.
* c-c++-common/cilk-plus/PS/vectorlength-3.c: Delete.
* c-c++-common/cilk-plus/PS/vectorlength.c: Delete.
* c-c++-common/cilk-plus/SE/ef_error.c: Delete.
* c-c++-common/cilk-plus/SE/ef_error2.c: Delete.
* c-c++-common/cilk-plus/SE/ef_error3.c: Delete.
* c-c++-common/cilk-plus/SE/ef_test.c: Delete.
* c-c++-common/cilk-plus/SE/ef_test2.c: Delete.
* c-c++-common/cilk-plus/SE/vlength_errors.c: Delete.
* g++.dg/cilk-plus/AN/array_function.c: Delete.
* g++.dg/cilk-plus/AN/array_test1_tplt.c: Delete.
* g++.dg/cilk-plus/AN/array_test2_tplt.c: Delete.
* g++.dg/cilk-plus/AN/array_test_ND_tplt.c: Delete.
* g++.dg/cilk-plus/AN/braced_list.c: Delete.
* g++.dg/cilk-plus/AN/builtin_fn_custom_tplt.c: Delete.
* g++.dg/cilk-plus/AN/builtin_fn_mutating_tplt.c: Delete.
* g++.dg/cilk-plus/AN/fp_triplet_values_tplt.c: Delete.
* g++.dg/cilk-plus/AN/postincr_test.c: Delete.
* g++.dg/cilk-plus/AN/preincr_test.c: Delete.
* g++.dg/cilk-plus/CK/catch_exc.c: Delete.
* g++.dg/cilk-plus/CK/cf3.c: Delete.
* g++.dg/cilk-plus/CK/cilk-for-tplt.c: Delete.
* g++.dg/cilk-plus/CK/const_spawn.c: Delete.
* g++.dg/cilk-plus/CK/fib-opr-overload.c: Delete.
* g++.dg/cilk-plus/CK/fib-tplt.c: Delete.
* g++.dg/cilk-plus/CK/for1.c: Delete.
* g++.dg/cilk-plus/CK/lambda_spawns.c: Delete.
* g++.dg/cilk-plus/CK/lambda_spawns_tplt.c: Delete.
* g++.dg/cilk-plus/CK/pr60586.c: Delete.
* g++.dg/cilk-plus/CK/pr66326.c: Delete.
* g++.dg/cilk-plus/CK/pr68001.c: Delete.
* g++.dg/cilk-plus/CK/pr68997.c: Delete.
* g++.dg/cilk-plus/CK/pr69024.c: Delete.
* g++.dg/cilk-plus/CK/pr69048.c: Delete.
* g++.dg/cilk-plus/CK/pr69267.c: Delete.
* g++.dg/cilk-plus/CK/pr80038.c: Delete.
* g++.dg/cilk-plus/CK/stl_iter.c: Delete.
* g++.dg/cilk-plus/CK/stl_rev_iter.c: Delete.
* g++.dg/cilk-plus/CK/stl_test.c: Delete.
* g++.dg/cilk-plus/cilk-plus.exp
* g++.dg/cilk-plus/ef_test.C: Delete.
* g++.dg/cilk-plus/for.C: Delete.
* g++.dg/cilk-plus/for2.C: Delete.
* g++.dg/cilk-plus/for3.C: Delete.
* g++.dg/cilk-plus/for4.C: Delete.
* g++.dg/cilk-plus/pr60967.C: Delete.
* g++.dg/cilk-plus/pr69028.C: Delete.
* g++.dg/cilk-plus/pr70565.C: Delete.
* g++.dg/pr57662.C: Delete.
* gcc.dg/cilk-plus/cilk-plus.exp
* gcc.dg/cilk-plus/for1.c: Delete.
* gcc.dg/cilk-plus/for2.c: Delete.
* gcc.dg/cilk-plus/jump-openmp.c: Delete.
* gcc.dg/cilk-plus/jump.c: Delete.
* gcc.dg/cilk-plus/pr69798-1.c: Delete.
* gcc.dg/cilk-plus/pr69798-2.c: Delete.
* gcc.dg/cilk-plus/pr78306.c: Delete.
* gcc.dg/cilk-plus/pr79116.c: Delete.
* gcc.dg/graphite/id-28.c: Delete.
* lib/cilk-plus-dg.exp: Delete.
* lib/target-supports.exp (cilkplus_runtime): Delete.
libcilkrts: Delete
> -----Original Message-----
> From: Jakub Jelinek [mailto:jakub@redhat.com]
> Sent: Thursday, November 16, 2017 4:49 PM
> To: Koval, Julia <julia.koval@intel.com>
> Cc: GCC Patches <gcc-patches@gcc.gnu.org>; law@redhat.com
> Subject: Re: [patch] remove cilk-plus
>
> 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.koval@intel.com>
> > Sebastian Peryt <sebastian.peryt@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
[-- Attachment #2: cilk-plus.tar.xz --]
[-- Type: application/octet-stream, Size: 81084 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [patch] remove cilk-plus
2017-11-16 16:34 ` Eric Gallager
@ 2017-11-16 17:59 ` Jeff Law
0 siblings, 0 replies; 26+ messages in thread
From: Jeff Law @ 2017-11-16 17:59 UTC (permalink / raw)
To: Eric Gallager, Koval, Julia; +Cc: GCC Patches
On 11/16/2017 09:22 AM, Eric Gallager wrote:
> On 11/16/17, Koval, Julia <julia.koval@intel.com> 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?
>>
>> Hi, this patch removes cilkplus. Ok for trunk?
>
> I'm not a reviewer, but just as an onlooker, I'd want to see notes
> about the removal in the caveats section of
> https://gcc.gnu.org/gcc-8/changes.html
Cilk+ was deprecated in gcc-7 and announced as-such.
But I do think a one-liner to the gcc-8 page would be appropriate to
note its removal.
Jeff
^ permalink raw reply [flat|nested] 26+ messages in thread
* RE: [patch] remove cilk-plus
2017-11-16 17:06 ` Koval, Julia
@ 2017-11-16 23:51 ` Joseph Myers
2017-11-21 7:46 ` Jeff Law
1 sibling, 0 replies; 26+ messages in thread
From: Joseph Myers @ 2017-11-16 23:51 UTC (permalink / raw)
To: Koval, Julia; +Cc: Jakub Jelinek, GCC Patches, law
There are places in the c-parser.c changes where there is a comment
referring to array notation and you remove the subsequent Cilk-specific
code, but not the comment. In at least one such place, the contents of
the "else" block that's made unconditional also need to be reindented.
--
Joseph S. Myers
joseph@codesourcery.com
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [patch] remove cilk-plus
2017-11-16 17:06 ` Koval, Julia
2017-11-16 23:51 ` Joseph Myers
@ 2017-11-21 7:46 ` Jeff Law
2017-11-22 8:47 ` Koval, Julia
1 sibling, 1 reply; 26+ messages in thread
From: Jeff Law @ 2017-11-21 7:46 UTC (permalink / raw)
To: Koval, Julia, Jakub Jelinek; +Cc: GCC Patches
On 11/16/2017 10:02 AM, Koval, Julia wrote:
> Thanks for your comments, fixed it.
>
> 2017-11-16 Julia Koval <julia.koval@intel.com>
> Sebastian Peryt <sebastian.peryt@intel.com>
>
> * Makefile.def (target_modules): Remove libcilkrts.
> * Makefile.in: Ditto.
> * configure: Ditto.
> * configure.ac: Ditto.
>
> contrib/
> * contrib/gcc_update: Ditto.
>
> gcc/
> * 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.
> * builtins.c (is_builtin_name): Remove cilkplus condition.
> (BUILT_IN_CILK_DETACH, BUILT_IN_CILK_POP_FRAME): Remove.
> * builtins.def (DEF_CILK_BUILTIN_STUB, DEF_CILKPLUS_BUILTIN,
> cilk-builtins.def, cilkplus.def): Remove.
> * cif-code.def (CILK_SPAWN): Remove.
> * cilk-builtins.def: Delete.
> * cilk-common.c: Ditto.
> * cilk.h: Ditto.
> * cilkplus.def: Ditto.
> * config/darwin.h (fcilkplus): Delete.
> * cppbuiltin.c: Ditto.
> * doc/extend.texi: Remove cilkplus doc.
> * doc/generic.texi: Ditto.
> * doc/invoke.texi: Ditto.
> * doc/passes.texi: Ditto.
> * gcc.c (fcilkplus): Remove.
> * gengtype.c (cilk.h): Remove.
> * gimple-pretty-print.c (dump_gimple_omp_for): Remove cilkplus support.
> * gimple.h (GF_OMP_FOR_KIND_CILKFOR, GF_OMP_FOR_KIND_CILKSIMD): Remove.
> * gimplify.c (gimplify_return_expr, maybe_fold_stmt, gimplify_call_expr,
> is_gimple_stmt, gimplify_modify_expr, gimplify_scan_omp_clauses,
> gimplify_adjust_omp_clauses, gimplify_omp_for, gimplify_expr): Remove
> cilkplus conditions.
> * ipa-fnsummary.c (ipa_dump_fn_summary, compute_fn_summary,
> inline_read_section): Ditto.
> * ipa-inline-analysis.c (cilk.h): Remove.
> * ira.c (ira_setup_eliminable_regset): Remove cilkplus support.
> * lto-wrapper.c (merge_and_complain, append_compiler_options,
> append_linker_options): Remove condition for fcilkplus.
> * lto/lto-lang.c (cilk.h): Remove.
> (lto_init): Remove condition for fcilkplus.
> * omp-expand.c (expand_cilk_for_call): Delete.
> (expand_omp_taskreg, expand_omp_for_static_chunk,
> expand_omp_for): Remove cilkplus
> conditions.
> (expand_cilk_for): Delete.
> * omp-general.c (omp_extract_for_data): Remove cilkplus support.
> * omp-low.c (scan_sharing_clauses, create_omp_child_function,
> execute_lower_omp, diagnose_sb_0): Ditto.
> * omp-simd-clone.c (simd_clone_clauses_extract): Ditto.
> * tree-core.h (OMP_CLAUSE__CILK_FOR_COUNT_): Delete.
> * tree-nested.c: Ditto.
> * tree-pretty-print.c (dump_omp_clause): Remove cilkplus support.
> (dump_generic_node): Ditto.
> * tree.c (OMP_CLAUSE__CILK_FOR_COUNT_): Delete.
> * tree.def (cilk_simd, cilk_for, cilk_spawn_stmt, cilk_sync_stmt): Delete.
> * tree.h (CILK_SPAWN_FN, EXPR_CILK_SPAWN): Delete.
>
> gcc/c-family/
> * array-notation-common.c: Delete.
> * c-cilkplus.c: Ditto.
> * c-common.c (_Cilk_spawn, _Cilk_sync, _Cilk_for): Remove.
> * c-common.def (ARRAY_NOTATION_REF): Remove.
> * 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-gimplify.c (CILK_SPAWN_STMT): Remove.
> * c-omp.c: Remove CILK_SIMD check.
> * c-pragma.c: Ditto.
> * c-pragma.h: Remove CILK related pragmas.
> * c-pretty-print.c (c_pretty_printer::postfix_expression): Remove
> ARRAY_NOTATION_REF condition.
> (c_pretty_printer::expression): Ditto.
> * c.opt (fcilkplus): Remove.
> * cilk.c: Delete.
>
> gcc/c/
> * Make-lang.in (c/c-array-notation.o): Remove.
> * c-array-notation.c: Delete.
> * c-decl.c: Remove cilkplus condition.
> * 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.
> (c_parser_declaration_or_fndef): Remove cilkplus condition.
> (c_parser_direct_declarator_inner): Ditto.
> (CILK_SIMD_FN_CLAUSE_MASK): Delete.
> (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.
> * c-typeck.c (build_array_ref, build_function_call_vec, convert_arguments,
> lvalue_p, build_compound_expr, c_finish_return, c_finish_if_stmt,
> c_finish_loop, build_binary_op): Remove cilkplus support.
>
> gcc/cp/
> * Make-lang.in (cp/cp-array-notation.o, cp/cp-cilkplus.o): Delete.
> * call.c (convert_for_arg_passing, build_cxx_call): Remove cilkplus.
> * constexpr.c (potential_constant_expression_1): Ditto.
> * cp-array-notation.c: Delete.
> * cp-cilkplus.c: Ditto.
> * cp-cilkplus.h: Ditto.
> * cp-gimplify.c (cp_gimplify_expr, cp_fold_r, cp_genericize): Remove
> cilkplus condition.
> * cp-objcp-common.c (ARRAY_NOTATION_REF): Delete.
> * cp-tree.h (cilkplus_an_triplet_types_ok_p): Delete.
> * decl.c (grokfndecl, finish_function): Remove cilkplus condition.
> * error.c (dump_decl, dump_expr): Remove ARRAY_NOTATION_REF condition.
> * lambda.c (cp-cilkplus.h): Remove.
> * parser.c (cp_parser_cilk_simd, cp_parser_cilk_for,
> cp_parser_cilk_simd_vectorlength): Delete.
> (cp_debug_parser, cp_parser_ctor_initializer_opt_and_function_body,
> cp_parser_postfix_expression, cp_parser_postfix_open_square_expression,
> cp_parser_statement, cp_parser_jump_statement, cp_parser_direct_declarator,
> cp_parser_late_return_type_opt, cp_parser_gnu_attribute_list,
> cp_parser_omp_clause_name, cp_parser_omp_clause_aligned,
> cp_parser_omp_clause_linear, cp_parser_omp_all_clauses, cp_parser_omp_flush,
> cp_parser_omp_for_cond, cp_parser_omp_for_incr, cp_parser_omp_for_loop_init,
> cp_parser_omp_for_loop,
> cp_parser_omp_declare_simd): Remove cilkplus support.
> (CILK_SIMD_FN_CLAUSE_MASK, cp_parser_late_parsing_cilk_simd_fn_info,
> cp_parser_cilk_grainsize): Remove.
> (cp_parser_pragma, c_parse_file): Remove cilkplus support.
> (cp_parser_cilk_simd_vectorlength, cp_parser_cilk_simd_linear,
> cp_parser_cilk_simd_clause_name, cp_parser_cilk_simd_all_clauses,
> cp_parser_cilk_simd, cp_parser_cilk_for): Remove.
> * parser.h (IN_CILK_SIMD_FOR, IN_CILK_SPAWN): Remove.
> * pt.c (tsubst_attribute, tsubst_expr, tsubst_copy_and_build): Remove
> cilkplus support.
> * semantics.c (finish_goto_stmt, begin_while_stmt, finish_do_body,
> finish_init_stmt, finish_switch_cond, simplify_aggr_init_expr,
> finish_omp_clauses, finish_omp_clauses, finish_omp_for): Remove cilkplus
> support.
> * tree.c (lvalue_kind): Remove ARRAY_NOTATION_REF conditon.
> * typeck.c (cp_build_array_ref, cp_build_compound_expr,
> check_return_expr): Remove cilkplus support.
>
> gcc/testsuite/
> * c-c++-common/attr-simd-3.c: Delete.
> * c-c++-common/cilk-plus/AN/an-if.c: Delete.
> * c-c++-common/cilk-plus/AN/array_test1.c: Delete.
> * c-c++-common/cilk-plus/AN/array_test2.c: Delete.
> * c-c++-common/cilk-plus/AN/array_test_ND.c: Delete.
> * c-c++-common/cilk-plus/AN/builtin_fn_custom.c: Delete.
> * c-c++-common/cilk-plus/AN/builtin_fn_mutating.c: Delete.
> * c-c++-common/cilk-plus/AN/builtin_func_double.c: Delete.
> * c-c++-common/cilk-plus/AN/builtin_func_double2.c: Delete.
> * c-c++-common/cilk-plus/AN/comma_exp.c: Delete.
> * c-c++-common/cilk-plus/AN/conditional.c: Delete.
> * c-c++-common/cilk-plus/AN/decl-ptr-colon.c: Delete.
> * c-c++-common/cilk-plus/AN/dimensionless-arrays.c: Delete.
> * c-c++-common/cilk-plus/AN/exec-once.c: Delete.
> * c-c++-common/cilk-plus/AN/exec-once2.c: Delete.
> * c-c++-common/cilk-plus/AN/fn_ptr-2.c: Delete.
> * c-c++-common/cilk-plus/AN/fn_ptr.c: Delete.
> * c-c++-common/cilk-plus/AN/fp_triplet_values.c: Delete.
> * c-c++-common/cilk-plus/AN/gather-scatter-errors.c: Delete.
> * c-c++-common/cilk-plus/AN/gather_scatter.c: Delete.
> * c-c++-common/cilk-plus/AN/if_test.c: Delete.
> * c-c++-common/cilk-plus/AN/if_test_errors.c: Delete.
> * c-c++-common/cilk-plus/AN/misc.c: Delete.
> * c-c++-common/cilk-plus/AN/n-ptr-test.c: Delete.
> * c-c++-common/cilk-plus/AN/parser_errors.c: Delete.
> * c-c++-common/cilk-plus/AN/parser_errors2.c: Delete.
> * c-c++-common/cilk-plus/AN/parser_errors3.c: Delete.
> * c-c++-common/cilk-plus/AN/parser_errors4.c: Delete.
> * c-c++-common/cilk-plus/AN/pr57457-2.c: Delete.
> * c-c++-common/cilk-plus/AN/pr57457.c: Delete.
> * c-c++-common/cilk-plus/AN/pr57490.c: Delete.
> * c-c++-common/cilk-plus/AN/pr57541-2.c: Delete.
> * c-c++-common/cilk-plus/AN/pr57541.c: Delete.
> * c-c++-common/cilk-plus/AN/pr57577.c: Delete.
> * c-c++-common/cilk-plus/AN/pr58942.c: Delete.
> * c-c++-common/cilk-plus/AN/pr61191.c: Delete.
> * c-c++-common/cilk-plus/AN/pr61455-2.c: Delete.
> * c-c++-common/cilk-plus/AN/pr61455.c: Delete.
> * c-c++-common/cilk-plus/AN/pr61962.c: Delete.
> * c-c++-common/cilk-plus/AN/pr61963.c: Delete.
> * c-c++-common/cilk-plus/AN/pr62008.c: Delete.
> * c-c++-common/cilk-plus/AN/pr63884.c: Delete.
> * c-c++-common/cilk-plus/AN/rank_mismatch.c: Delete.
> * c-c++-common/cilk-plus/AN/rank_mismatch2.c: Delete.
> * c-c++-common/cilk-plus/AN/rank_mismatch3.c: Delete.
> * c-c++-common/cilk-plus/AN/sec_implicit.c: Delete.
> * c-c++-common/cilk-plus/AN/sec_implicit2.c: Delete.
> * c-c++-common/cilk-plus/AN/sec_implicit_ex.c: Delete.
> * c-c++-common/cilk-plus/AN/sec_reduce_ind_same_value.c: Delete.
> * c-c++-common/cilk-plus/AN/sec_reduce_max_min_ind.c: Delete.
> * c-c++-common/cilk-plus/AN/sec_reduce_return.c: Delete.
> * c-c++-common/cilk-plus/AN/side-effects-1.c: Delete.
> * c-c++-common/cilk-plus/AN/test_builtin_return.c: Delete.
> * c-c++-common/cilk-plus/AN/test_sec_limits.c: Delete.
> * c-c++-common/cilk-plus/AN/tst_lngth.c: Delete.
> * c-c++-common/cilk-plus/AN/vla.c: Delete.
> * c-c++-common/cilk-plus/CK/Wparentheses-1.c: Delete.
> * c-c++-common/cilk-plus/CK/cilk-for-2.c: Delete.
> * c-c++-common/cilk-plus/CK/cilk-for-3.c: Delete.
> * c-c++-common/cilk-plus/CK/cilk-fors.c: Delete.
> * c-c++-common/cilk-plus/CK/cilk_for_errors.c: Delete.
> * c-c++-common/cilk-plus/CK/cilk_for_grain.c: Delete.
> * c-c++-common/cilk-plus/CK/cilk_for_grain_errors.c: Delete.
> * c-c++-common/cilk-plus/CK/cilk_for_ptr_iter.c: Delete.
> * c-c++-common/cilk-plus/CK/compound_cilk_spawn.c: Delete.
> * c-c++-common/cilk-plus/CK/concec_cilk_spawn.c: Delete.
> * c-c++-common/cilk-plus/CK/errors.c: Delete.
> * c-c++-common/cilk-plus/CK/fib.c: Delete.
> * c-c++-common/cilk-plus/CK/fib_init_expr_xy.c: Delete.
> * c-c++-common/cilk-plus/CK/fib_no_return.c: Delete.
> * c-c++-common/cilk-plus/CK/fib_no_sync.c: Delete.
> * c-c++-common/cilk-plus/CK/invalid_spawns.c: Delete.
> * c-c++-common/cilk-plus/CK/invalid_sync.c: Delete.c
> * c-c++-common/cilk-plus/CK/nested_cilk_for.c: Delete.
> * c-c++-common/cilk-plus/CK/no_args_error.c: Delete.
> * c-c++-common/cilk-plus/CK/pr59631.c: Delete.
> * c-c++-common/cilk-plus/CK/pr60197-2.c: Delete.
> * c-c++-common/cilk-plus/CK/pr60197.c: Delete.
> * c-c++-common/cilk-plus/CK/pr60469.c: Delete.
> * c-c++-common/cilk-plus/CK/pr60586.c: Delete.
> * c-c++-common/cilk-plus/CK/pr63307.c: Delete.
> * c-c++-common/cilk-plus/CK/pr69826-1.c: Delete.
> * c-c++-common/cilk-plus/CK/pr69826-2.c: Delete.
> * c-c++-common/cilk-plus/CK/pr79428-4.c: Delete.
> * c-c++-common/cilk-plus/CK/pr79428-7.c: Delete.
> * c-c++-common/cilk-plus/CK/spawn_in_return.c: Delete.
> * c-c++-common/cilk-plus/CK/spawnee_inline.c: Delete.
> * c-c++-common/cilk-plus/CK/spawner_inline.c: Delete.
> * c-c++-common/cilk-plus/CK/spawning_arg.c: Delete.
> * c-c++-common/cilk-plus/CK/steal_check.c: Delete.
> * c-c++-common/cilk-plus/CK/sync_wo_spawn.c: Delete.
> * c-c++-common/cilk-plus/CK/test__cilk.c: Delete.
> * c-c++-common/cilk-plus/CK/varargs_test.c: Delete.
> * c-c++-common/cilk-plus/PS/Wparentheses-1.c: Delete.
> * c-c++-common/cilk-plus/PS/body.c: Delete.
> * c-c++-common/cilk-plus/PS/clauses1.c: Delete.
> * c-c++-common/cilk-plus/PS/clauses2.c: Delete.
> * c-c++-common/cilk-plus/PS/clauses3.c: Delete.
> * c-c++-common/cilk-plus/PS/clauses4.c: Delete.
> * c-c++-common/cilk-plus/PS/for1.c: Delete.
> * c-c++-common/cilk-plus/PS/for2.c: Delete.
> * c-c++-common/cilk-plus/PS/for3.c: Delete.
> * c-c++-common/cilk-plus/PS/pr69363.c: Delete.
> * c-c++-common/cilk-plus/PS/reduction-1.c: Delete.
> * c-c++-common/cilk-plus/PS/reduction-2.c: Delete.
> * c-c++-common/cilk-plus/PS/reduction-3.c: Delete.
> * c-c++-common/cilk-plus/PS/run-1.c: Delete.
> * c-c++-common/cilk-plus/PS/safelen.c: Delete.
> * c-c++-common/cilk-plus/PS/vectorlength-2.c: Delete.
> * c-c++-common/cilk-plus/PS/vectorlength-3.c: Delete.
> * c-c++-common/cilk-plus/PS/vectorlength.c: Delete.
> * c-c++-common/cilk-plus/SE/ef_error.c: Delete.
> * c-c++-common/cilk-plus/SE/ef_error2.c: Delete.
> * c-c++-common/cilk-plus/SE/ef_error3.c: Delete.
> * c-c++-common/cilk-plus/SE/ef_test.c: Delete.
> * c-c++-common/cilk-plus/SE/ef_test2.c: Delete.
> * c-c++-common/cilk-plus/SE/vlength_errors.c: Delete.
> * g++.dg/cilk-plus/AN/array_function.c: Delete.
> * g++.dg/cilk-plus/AN/array_test1_tplt.c: Delete.
> * g++.dg/cilk-plus/AN/array_test2_tplt.c: Delete.
> * g++.dg/cilk-plus/AN/array_test_ND_tplt.c: Delete.
> * g++.dg/cilk-plus/AN/braced_list.c: Delete.
> * g++.dg/cilk-plus/AN/builtin_fn_custom_tplt.c: Delete.
> * g++.dg/cilk-plus/AN/builtin_fn_mutating_tplt.c: Delete.
> * g++.dg/cilk-plus/AN/fp_triplet_values_tplt.c: Delete.
> * g++.dg/cilk-plus/AN/postincr_test.c: Delete.
> * g++.dg/cilk-plus/AN/preincr_test.c: Delete.
> * g++.dg/cilk-plus/CK/catch_exc.c: Delete.
> * g++.dg/cilk-plus/CK/cf3.c: Delete.
> * g++.dg/cilk-plus/CK/cilk-for-tplt.c: Delete.
> * g++.dg/cilk-plus/CK/const_spawn.c: Delete.
> * g++.dg/cilk-plus/CK/fib-opr-overload.c: Delete.
> * g++.dg/cilk-plus/CK/fib-tplt.c: Delete.
> * g++.dg/cilk-plus/CK/for1.c: Delete.
> * g++.dg/cilk-plus/CK/lambda_spawns.c: Delete.
> * g++.dg/cilk-plus/CK/lambda_spawns_tplt.c: Delete.
> * g++.dg/cilk-plus/CK/pr60586.c: Delete.
> * g++.dg/cilk-plus/CK/pr66326.c: Delete.
> * g++.dg/cilk-plus/CK/pr68001.c: Delete.
> * g++.dg/cilk-plus/CK/pr68997.c: Delete.
> * g++.dg/cilk-plus/CK/pr69024.c: Delete.
> * g++.dg/cilk-plus/CK/pr69048.c: Delete.
> * g++.dg/cilk-plus/CK/pr69267.c: Delete.
> * g++.dg/cilk-plus/CK/pr80038.c: Delete.
> * g++.dg/cilk-plus/CK/stl_iter.c: Delete.
> * g++.dg/cilk-plus/CK/stl_rev_iter.c: Delete.
> * g++.dg/cilk-plus/CK/stl_test.c: Delete.
> * g++.dg/cilk-plus/cilk-plus.exp
> * g++.dg/cilk-plus/ef_test.C: Delete.
> * g++.dg/cilk-plus/for.C: Delete.
> * g++.dg/cilk-plus/for2.C: Delete.
> * g++.dg/cilk-plus/for3.C: Delete.
> * g++.dg/cilk-plus/for4.C: Delete.
> * g++.dg/cilk-plus/pr60967.C: Delete.
> * g++.dg/cilk-plus/pr69028.C: Delete.
> * g++.dg/cilk-plus/pr70565.C: Delete.
> * g++.dg/pr57662.C: Delete.
> * gcc.dg/cilk-plus/cilk-plus.exp
> * gcc.dg/cilk-plus/for1.c: Delete.
> * gcc.dg/cilk-plus/for2.c: Delete.
> * gcc.dg/cilk-plus/jump-openmp.c: Delete.
> * gcc.dg/cilk-plus/jump.c: Delete.
> * gcc.dg/cilk-plus/pr69798-1.c: Delete.
> * gcc.dg/cilk-plus/pr69798-2.c: Delete.
> * gcc.dg/cilk-plus/pr78306.c: Delete.
> * gcc.dg/cilk-plus/pr79116.c: Delete.
> * gcc.dg/graphite/id-28.c: Delete.
> * lib/cilk-plus-dg.exp: Delete.
> * lib/target-supports.exp (cilkplus_runtime): Delete.
>
> libcilkrts: Delete
So it's not important, but the patch doesn't have the removal of the
cilk+ testsuite or runtime. BUt again, it's not a big deal, I can guess
what that part of the patch looks like.
It's not unusual to find lingering bits after the removal. So if after
the kit is ack'd & committed you find additional tidbits, don't hesitate
to let us know.
In c-family/c-gimplify.c:c_gimplify_expr you have this change:
case MODIFY_EXPR:
case INIT_EXPR:
case CALL_EXPR:
- if (fn_contains_cilk_spawn_p (cfun)
- && cilk_detect_spawn_and_unwrap (expr_p)
- /* If an error is found, the spawn wrapper is removed and the
- original expression (MODIFY/INIT/CALL_EXPR) is processes as
- it is supposed to be. */
- && !seen_error ())
- return (enum gimplify_status) gimplify_cilk_spawn (expr_p);
-
default:;
I wonder if we should just remove the case labels as well since they do
nothing after the cilk+ bits are removed.
In c-family/c.opt rather than deleting the flag entirely, standard
practice is leave the flag and issue a Deprecated error/warning. There
should be examples in c-family/c.opt.
In c/c-parser:
@@ -2338,8 +2330,6 @@ c_parser_declaration_or_fndef (c_parser *parser,
bool fndef_ok,
else
{
fnbody = c_parser_compound_statement (parser);
- if (flag_cilkplus && contains_array_notation_expr (fnbody))
- fnbody = expand_array_notation_exprs (fnbody);
}
tree fndecl = current_function_decl;
if (nested)
I think the curly-braces become redundant after your remove the cilk+
specific code.
Also in c/c-parser.c, this time in
c_parser_postfix_expression_after_primary. The assignment to idx before
this comment:
+ /* Here we have 3 options:
+ 1. Array [EXPR] -- Normal Array call.
+ 2. Array [EXPR : EXPR] -- Array notation without stride.
+ 3. Array [EXPR : EXPR : EXPR] -- Array notation with stride.
+
+ For 1, we just handle it just like a normal array expression.
+ For 2 and 3 we handle it like we handle array notations. The
+ idx value we have above becomes the initial/start index.
+ */
Appears to be indented too far. Also the close comment should be at the
end of the previous line.
In these two hunks, you need to reindent the "else" clause that has
become unconditional:
@@ -9416,15 +9195,9 @@ c_parser_postfix_expression_after_primary
(c_parser *parser,
finish = c_parser_peek_token (parser)->get_finish ();
c_parser_consume_token (parser);
/* If the expressions have array notations, we expand them. */
- if (flag_cilkplus
- && TREE_CODE (expr.value) == ARRAY_NOTATION_REF)
- expr = fix_array_notation_expr (expr_loc,
POSTINCREMENT_EXPR, expr);
- else
- {
expr = default_function_array_read_conversion (expr_loc,
expr);
expr.value = build_unary_op (op_loc, POSTINCREMENT_EXPR,
expr.value, false);
- }
set_c_expr_source_range (&expr, start, finish);
expr.original_code = ERROR_MARK;
expr.original_type = NULL;
@@ -9435,15 +9208,9 @@ c_parser_postfix_expression_after_primary
(c_parser *parser,
finish = c_parser_peek_token (parser)->get_finish ();
c_parser_consume_token (parser);
/* If the expressions have array notations, we expand them. */
- if (flag_cilkplus
- && TREE_CODE (expr.value) == ARRAY_NOTATION_REF)
- expr = fix_array_notation_expr (expr_loc,
POSTDECREMENT_EXPR, expr);
- else
- {
expr = default_function_array_read_conversion (expr_loc,
expr);
expr.value = build_unary_op (op_loc, POSTDECREMENT_EXPR,
expr.value, false);
- }
set_c_expr_source_range (&expr, start, finish);
expr.original_code = ERROR_MARK;
expr.original_type = NULL;
In c_parser_omp_for_loop:
@@ -15882,8 +15604,6 @@ c_parser_omp_for_loop (location_t loc, c_parser
*parser, enum tree_code code,
case LE_EXPR:
break;
case NE_EXPR:
- if (code == CILK_SIMD || code == CILK_FOR)
- break;
/* FALLTHRU. */
default:
/* Can't be cond = error_mark_node, because we want to
preserve
I think you can just delete the NE_EXPR case label and the associated
FALLTHRU comment.
The && part of this condition needs reindenting as a result of pulling
the code out of the conditional.
- if (!is_cilkplus_cilk_simd_fn)
- gcc_assert (token->type == CPP_NAME
+ gcc_assert (token->type == CPP_NAME
&& strcmp (IDENTIFIER_POINTER (token->value),
"simd") == 0);
In cp/parser.c:
@@ -25090,12 +24798,6 @@ cp_parser_gnu_attribute_list (cp_parser* parser)
vec<tree, va_gc> *vec;
int attr_flag = (attribute_takes_identifier_p (identifier)
? id_attr : normal_attr);
- if (is_cilkplus_vector_p (identifier))
- {
- cp_parser_cilk_simd_fn_vector_attrs (parser, id_token);
- continue;
- }
- else
vec = cp_parser_parenthesized_expression_list
(parser, attr_flag, /*cast_p=*/false,
/*allow_expansion_p=*/false,
You need to reindent the code from the else clause that you're keeping.
I think the outer curleys are redundant now:
@@ -34825,12 +34495,8 @@ cp_parser_omp_for_loop_init (cp_parser *parser,
if (cp_lexer_next_token_is (parser->lexer,
CPP_OPEN_PAREN))
{
- if (code != CILK_SIMD && code != CILK_FOR)
- error ("parenthesized initialization is not allowed in "
+ error ("parenthesized initialization is not allowed in "
"OpenMP %<for%> loop");
- else
- error ("parenthesized initialization is "
- "not allowed in for-loop");
}
else
/* Trigger an error. */
Indentation on the else clause here needs to be fixed:
@@ -35267,9 +34921,6 @@ cp_parser_omp_for_loop (cp_parser *parser, enum
tree_code code, tree clauses,
/* Note that we saved the original contents of this flag when we entered
the structured block, and so we don't need to re-save it here. */
- if (code == CILK_SIMD || code == CILK_FOR)
- parser->in_statement = IN_CILK_SIMD_FOR;
- else
parser->in_statement = IN_OMP_FOR;
/* Note that the grammar doesn't call for a structured block here,
I know it seems like a lot of issues, but I'm encouraged by the fact
that they're all just formatting things. The one or two correctness
fragments I was worried about turned out to be non-issues when I looked
at the larger context.
So if you could fix the things noted above and repost. I'm pretty sure
it'll be approved at that point.
jeff
^ permalink raw reply [flat|nested] 26+ messages in thread
* RE: [patch] remove cilk-plus
2017-11-21 7:46 ` Jeff Law
@ 2017-11-22 8:47 ` Koval, Julia
2017-11-22 9:15 ` Rainer Orth
` (2 more replies)
0 siblings, 3 replies; 26+ messages in thread
From: Koval, Julia @ 2017-11-22 8:47 UTC (permalink / raw)
To: Jeff Law, Jakub Jelinek; +Cc: GCC Patches
[-- Attachment #1: Type: text/plain, Size: 25747 bytes --]
Hi,
> So it's not important, but the patch doesn't have the removal of the
> cilk+ testsuite or runtime. BUt again, it's not a big deal, I can guess
> what that part of the patch looks like.
I used Jakub's suggestion in https://gcc.gnu.org/ml/gcc-patches/2017-11/msg01348.html and didn't add libcilkrts and cilk-plus directories to patch(without this patch doesn't fit in gcc-patches), only to change log. I will include them, when I'll commit the patch, but I guess there is nothing to review here:
rm -rf gcc/testsuite/c-c++-common/cilk-plus
rm -rf gcc/testsuite/g++.dg/cilk-plus
rm -rf gcc/testsuite/gcc.dg/cilk-plus
rm -rf libcilkrts
I can send it as an additional patch(or patches) if this is required.
Thanks for your comments, fixed them in attached patch.vm
> -----Original Message-----
> From: Jeff Law [mailto:law@redhat.com]
> Sent: Tuesday, November 21, 2017 8:41 AM
> To: Koval, Julia <julia.koval@intel.com>; Jakub Jelinek <jakub@redhat.com>
> Cc: GCC Patches <gcc-patches@gcc.gnu.org>
> Subject: Re: [patch] remove cilk-plus
>
> On 11/16/2017 10:02 AM, Koval, Julia wrote:
> > Thanks for your comments, fixed it.
> >
> > 2017-11-16 Julia Koval <julia.koval@intel.com>
> > Sebastian Peryt <sebastian.peryt@intel.com>
> >
> > * Makefile.def (target_modules): Remove libcilkrts.
> > * Makefile.in: Ditto.
> > * configure: Ditto.
> > * configure.ac: Ditto.
> >
> > contrib/
> > * contrib/gcc_update: Ditto.
> >
> > gcc/
> > * 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.
> > * builtins.c (is_builtin_name): Remove cilkplus condition.
> > (BUILT_IN_CILK_DETACH, BUILT_IN_CILK_POP_FRAME): Remove.
> > * builtins.def (DEF_CILK_BUILTIN_STUB, DEF_CILKPLUS_BUILTIN,
> > cilk-builtins.def, cilkplus.def): Remove.
> > * cif-code.def (CILK_SPAWN): Remove.
> > * cilk-builtins.def: Delete.
> > * cilk-common.c: Ditto.
> > * cilk.h: Ditto.
> > * cilkplus.def: Ditto.
> > * config/darwin.h (fcilkplus): Delete.
> > * cppbuiltin.c: Ditto.
> > * doc/extend.texi: Remove cilkplus doc.
> > * doc/generic.texi: Ditto.
> > * doc/invoke.texi: Ditto.
> > * doc/passes.texi: Ditto.
> > * gcc.c (fcilkplus): Remove.
> > * gengtype.c (cilk.h): Remove.
> > * gimple-pretty-print.c (dump_gimple_omp_for): Remove cilkplus
> support.
> > * gimple.h (GF_OMP_FOR_KIND_CILKFOR,
> GF_OMP_FOR_KIND_CILKSIMD): Remove.
> > * gimplify.c (gimplify_return_expr, maybe_fold_stmt,
> gimplify_call_expr,
> > is_gimple_stmt, gimplify_modify_expr, gimplify_scan_omp_clauses,
> > gimplify_adjust_omp_clauses, gimplify_omp_for, gimplify_expr):
> Remove
> > cilkplus conditions.
> > * ipa-fnsummary.c (ipa_dump_fn_summary, compute_fn_summary,
> > inline_read_section): Ditto.
> > * ipa-inline-analysis.c (cilk.h): Remove.
> > * ira.c (ira_setup_eliminable_regset): Remove cilkplus support.
> > * lto-wrapper.c (merge_and_complain, append_compiler_options,
> > append_linker_options): Remove condition for fcilkplus.
> > * lto/lto-lang.c (cilk.h): Remove.
> > (lto_init): Remove condition for fcilkplus.
> > * omp-expand.c (expand_cilk_for_call): Delete.
> > (expand_omp_taskreg, expand_omp_for_static_chunk,
> > expand_omp_for): Remove cilkplus
> > conditions.
> > (expand_cilk_for): Delete.
> > * omp-general.c (omp_extract_for_data): Remove cilkplus support.
> > * omp-low.c (scan_sharing_clauses, create_omp_child_function,
> > execute_lower_omp, diagnose_sb_0): Ditto.
> > * omp-simd-clone.c (simd_clone_clauses_extract): Ditto.
> > * tree-core.h (OMP_CLAUSE__CILK_FOR_COUNT_): Delete.
> > * tree-nested.c: Ditto.
> > * tree-pretty-print.c (dump_omp_clause): Remove cilkplus support.
> > (dump_generic_node): Ditto.
> > * tree.c (OMP_CLAUSE__CILK_FOR_COUNT_): Delete.
> > * tree.def (cilk_simd, cilk_for, cilk_spawn_stmt, cilk_sync_stmt): Delete.
> > * tree.h (CILK_SPAWN_FN, EXPR_CILK_SPAWN): Delete.
> >
> > gcc/c-family/
> > * array-notation-common.c: Delete.
> > * c-cilkplus.c: Ditto.
> > * c-common.c (_Cilk_spawn, _Cilk_sync, _Cilk_for): Remove.
> > * c-common.def (ARRAY_NOTATION_REF): Remove.
> > * 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-gimplify.c (CILK_SPAWN_STMT): Remove.
> > * c-omp.c: Remove CILK_SIMD check.
> > * c-pragma.c: Ditto.
> > * c-pragma.h: Remove CILK related pragmas.
> > * c-pretty-print.c (c_pretty_printer::postfix_expression): Remove
> > ARRAY_NOTATION_REF condition.
> > (c_pretty_printer::expression): Ditto.
> > * c.opt (fcilkplus): Remove.
> > * cilk.c: Delete.
> >
> > gcc/c/
> > * Make-lang.in (c/c-array-notation.o): Remove.
> > * c-array-notation.c: Delete.
> > * c-decl.c: Remove cilkplus condition.
> > * 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.
> > (c_parser_declaration_or_fndef): Remove cilkplus condition.
> > (c_parser_direct_declarator_inner): Ditto.
> > (CILK_SIMD_FN_CLAUSE_MASK): Delete.
> > (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.
> > * c-typeck.c (build_array_ref, build_function_call_vec,
> convert_arguments,
> > lvalue_p, build_compound_expr, c_finish_return, c_finish_if_stmt,
> > c_finish_loop, build_binary_op): Remove cilkplus support.
> >
> > gcc/cp/
> > * Make-lang.in (cp/cp-array-notation.o, cp/cp-cilkplus.o): Delete.
> > * call.c (convert_for_arg_passing, build_cxx_call): Remove cilkplus.
> > * constexpr.c (potential_constant_expression_1): Ditto.
> > * cp-array-notation.c: Delete.
> > * cp-cilkplus.c: Ditto.
> > * cp-cilkplus.h: Ditto.
> > * cp-gimplify.c (cp_gimplify_expr, cp_fold_r, cp_genericize): Remove
> > cilkplus condition.
> > * cp-objcp-common.c (ARRAY_NOTATION_REF): Delete.
> > * cp-tree.h (cilkplus_an_triplet_types_ok_p): Delete.
> > * decl.c (grokfndecl, finish_function): Remove cilkplus condition.
> > * error.c (dump_decl, dump_expr): Remove ARRAY_NOTATION_REF
> condition.
> > * lambda.c (cp-cilkplus.h): Remove.
> > * parser.c (cp_parser_cilk_simd, cp_parser_cilk_for,
> > cp_parser_cilk_simd_vectorlength): Delete.
> > (cp_debug_parser, cp_parser_ctor_initializer_opt_and_function_body,
> > cp_parser_postfix_expression,
> cp_parser_postfix_open_square_expression,
> > cp_parser_statement, cp_parser_jump_statement,
> cp_parser_direct_declarator,
> > cp_parser_late_return_type_opt, cp_parser_gnu_attribute_list,
> > cp_parser_omp_clause_name, cp_parser_omp_clause_aligned,
> > cp_parser_omp_clause_linear, cp_parser_omp_all_clauses,
> cp_parser_omp_flush,
> > cp_parser_omp_for_cond, cp_parser_omp_for_incr,
> cp_parser_omp_for_loop_init,
> > cp_parser_omp_for_loop,
> > cp_parser_omp_declare_simd): Remove cilkplus support.
> > (CILK_SIMD_FN_CLAUSE_MASK,
> cp_parser_late_parsing_cilk_simd_fn_info,
> > cp_parser_cilk_grainsize): Remove.
> > (cp_parser_pragma, c_parse_file): Remove cilkplus support.
> > (cp_parser_cilk_simd_vectorlength, cp_parser_cilk_simd_linear,
> > cp_parser_cilk_simd_clause_name, cp_parser_cilk_simd_all_clauses,
> > cp_parser_cilk_simd, cp_parser_cilk_for): Remove.
> > * parser.h (IN_CILK_SIMD_FOR, IN_CILK_SPAWN): Remove.
> > * pt.c (tsubst_attribute, tsubst_expr, tsubst_copy_and_build): Remove
> > cilkplus support.
> > * semantics.c (finish_goto_stmt, begin_while_stmt, finish_do_body,
> > finish_init_stmt, finish_switch_cond, simplify_aggr_init_expr,
> > finish_omp_clauses, finish_omp_clauses, finish_omp_for): Remove
> cilkplus
> > support.
> > * tree.c (lvalue_kind): Remove ARRAY_NOTATION_REF conditon.
> > * typeck.c (cp_build_array_ref, cp_build_compound_expr,
> > check_return_expr): Remove cilkplus support.
> >
> > gcc/testsuite/
> > * c-c++-common/attr-simd-3.c: Delete.
> > * c-c++-common/cilk-plus/AN/an-if.c: Delete.
> > * c-c++-common/cilk-plus/AN/array_test1.c: Delete.
> > * c-c++-common/cilk-plus/AN/array_test2.c: Delete.
> > * c-c++-common/cilk-plus/AN/array_test_ND.c: Delete.
> > * c-c++-common/cilk-plus/AN/builtin_fn_custom.c: Delete.
> > * c-c++-common/cilk-plus/AN/builtin_fn_mutating.c: Delete.
> > * c-c++-common/cilk-plus/AN/builtin_func_double.c: Delete.
> > * c-c++-common/cilk-plus/AN/builtin_func_double2.c: Delete.
> > * c-c++-common/cilk-plus/AN/comma_exp.c: Delete.
> > * c-c++-common/cilk-plus/AN/conditional.c: Delete.
> > * c-c++-common/cilk-plus/AN/decl-ptr-colon.c: Delete.
> > * c-c++-common/cilk-plus/AN/dimensionless-arrays.c: Delete.
> > * c-c++-common/cilk-plus/AN/exec-once.c: Delete.
> > * c-c++-common/cilk-plus/AN/exec-once2.c: Delete.
> > * c-c++-common/cilk-plus/AN/fn_ptr-2.c: Delete.
> > * c-c++-common/cilk-plus/AN/fn_ptr.c: Delete.
> > * c-c++-common/cilk-plus/AN/fp_triplet_values.c: Delete.
> > * c-c++-common/cilk-plus/AN/gather-scatter-errors.c: Delete.
> > * c-c++-common/cilk-plus/AN/gather_scatter.c: Delete.
> > * c-c++-common/cilk-plus/AN/if_test.c: Delete.
> > * c-c++-common/cilk-plus/AN/if_test_errors.c: Delete.
> > * c-c++-common/cilk-plus/AN/misc.c: Delete.
> > * c-c++-common/cilk-plus/AN/n-ptr-test.c: Delete.
> > * c-c++-common/cilk-plus/AN/parser_errors.c: Delete.
> > * c-c++-common/cilk-plus/AN/parser_errors2.c: Delete.
> > * c-c++-common/cilk-plus/AN/parser_errors3.c: Delete.
> > * c-c++-common/cilk-plus/AN/parser_errors4.c: Delete.
> > * c-c++-common/cilk-plus/AN/pr57457-2.c: Delete.
> > * c-c++-common/cilk-plus/AN/pr57457.c: Delete.
> > * c-c++-common/cilk-plus/AN/pr57490.c: Delete.
> > * c-c++-common/cilk-plus/AN/pr57541-2.c: Delete.
> > * c-c++-common/cilk-plus/AN/pr57541.c: Delete.
> > * c-c++-common/cilk-plus/AN/pr57577.c: Delete.
> > * c-c++-common/cilk-plus/AN/pr58942.c: Delete.
> > * c-c++-common/cilk-plus/AN/pr61191.c: Delete.
> > * c-c++-common/cilk-plus/AN/pr61455-2.c: Delete.
> > * c-c++-common/cilk-plus/AN/pr61455.c: Delete.
> > * c-c++-common/cilk-plus/AN/pr61962.c: Delete.
> > * c-c++-common/cilk-plus/AN/pr61963.c: Delete.
> > * c-c++-common/cilk-plus/AN/pr62008.c: Delete.
> > * c-c++-common/cilk-plus/AN/pr63884.c: Delete.
> > * c-c++-common/cilk-plus/AN/rank_mismatch.c: Delete.
> > * c-c++-common/cilk-plus/AN/rank_mismatch2.c: Delete.
> > * c-c++-common/cilk-plus/AN/rank_mismatch3.c: Delete.
> > * c-c++-common/cilk-plus/AN/sec_implicit.c: Delete.
> > * c-c++-common/cilk-plus/AN/sec_implicit2.c: Delete.
> > * c-c++-common/cilk-plus/AN/sec_implicit_ex.c: Delete.
> > * c-c++-common/cilk-plus/AN/sec_reduce_ind_same_value.c: Delete.
> > * c-c++-common/cilk-plus/AN/sec_reduce_max_min_ind.c: Delete.
> > * c-c++-common/cilk-plus/AN/sec_reduce_return.c: Delete.
> > * c-c++-common/cilk-plus/AN/side-effects-1.c: Delete.
> > * c-c++-common/cilk-plus/AN/test_builtin_return.c: Delete.
> > * c-c++-common/cilk-plus/AN/test_sec_limits.c: Delete.
> > * c-c++-common/cilk-plus/AN/tst_lngth.c: Delete.
> > * c-c++-common/cilk-plus/AN/vla.c: Delete.
> > * c-c++-common/cilk-plus/CK/Wparentheses-1.c: Delete.
> > * c-c++-common/cilk-plus/CK/cilk-for-2.c: Delete.
> > * c-c++-common/cilk-plus/CK/cilk-for-3.c: Delete.
> > * c-c++-common/cilk-plus/CK/cilk-fors.c: Delete.
> > * c-c++-common/cilk-plus/CK/cilk_for_errors.c: Delete.
> > * c-c++-common/cilk-plus/CK/cilk_for_grain.c: Delete.
> > * c-c++-common/cilk-plus/CK/cilk_for_grain_errors.c: Delete.
> > * c-c++-common/cilk-plus/CK/cilk_for_ptr_iter.c: Delete.
> > * c-c++-common/cilk-plus/CK/compound_cilk_spawn.c: Delete.
> > * c-c++-common/cilk-plus/CK/concec_cilk_spawn.c: Delete.
> > * c-c++-common/cilk-plus/CK/errors.c: Delete.
> > * c-c++-common/cilk-plus/CK/fib.c: Delete.
> > * c-c++-common/cilk-plus/CK/fib_init_expr_xy.c: Delete.
> > * c-c++-common/cilk-plus/CK/fib_no_return.c: Delete.
> > * c-c++-common/cilk-plus/CK/fib_no_sync.c: Delete.
> > * c-c++-common/cilk-plus/CK/invalid_spawns.c: Delete.
> > * c-c++-common/cilk-plus/CK/invalid_sync.c: Delete.c
> > * c-c++-common/cilk-plus/CK/nested_cilk_for.c: Delete.
> > * c-c++-common/cilk-plus/CK/no_args_error.c: Delete.
> > * c-c++-common/cilk-plus/CK/pr59631.c: Delete.
> > * c-c++-common/cilk-plus/CK/pr60197-2.c: Delete.
> > * c-c++-common/cilk-plus/CK/pr60197.c: Delete.
> > * c-c++-common/cilk-plus/CK/pr60469.c: Delete.
> > * c-c++-common/cilk-plus/CK/pr60586.c: Delete.
> > * c-c++-common/cilk-plus/CK/pr63307.c: Delete.
> > * c-c++-common/cilk-plus/CK/pr69826-1.c: Delete.
> > * c-c++-common/cilk-plus/CK/pr69826-2.c: Delete.
> > * c-c++-common/cilk-plus/CK/pr79428-4.c: Delete.
> > * c-c++-common/cilk-plus/CK/pr79428-7.c: Delete.
> > * c-c++-common/cilk-plus/CK/spawn_in_return.c: Delete.
> > * c-c++-common/cilk-plus/CK/spawnee_inline.c: Delete.
> > * c-c++-common/cilk-plus/CK/spawner_inline.c: Delete.
> > * c-c++-common/cilk-plus/CK/spawning_arg.c: Delete.
> > * c-c++-common/cilk-plus/CK/steal_check.c: Delete.
> > * c-c++-common/cilk-plus/CK/sync_wo_spawn.c: Delete.
> > * c-c++-common/cilk-plus/CK/test__cilk.c: Delete.
> > * c-c++-common/cilk-plus/CK/varargs_test.c: Delete.
> > * c-c++-common/cilk-plus/PS/Wparentheses-1.c: Delete.
> > * c-c++-common/cilk-plus/PS/body.c: Delete.
> > * c-c++-common/cilk-plus/PS/clauses1.c: Delete.
> > * c-c++-common/cilk-plus/PS/clauses2.c: Delete.
> > * c-c++-common/cilk-plus/PS/clauses3.c: Delete.
> > * c-c++-common/cilk-plus/PS/clauses4.c: Delete.
> > * c-c++-common/cilk-plus/PS/for1.c: Delete.
> > * c-c++-common/cilk-plus/PS/for2.c: Delete.
> > * c-c++-common/cilk-plus/PS/for3.c: Delete.
> > * c-c++-common/cilk-plus/PS/pr69363.c: Delete.
> > * c-c++-common/cilk-plus/PS/reduction-1.c: Delete.
> > * c-c++-common/cilk-plus/PS/reduction-2.c: Delete.
> > * c-c++-common/cilk-plus/PS/reduction-3.c: Delete.
> > * c-c++-common/cilk-plus/PS/run-1.c: Delete.
> > * c-c++-common/cilk-plus/PS/safelen.c: Delete.
> > * c-c++-common/cilk-plus/PS/vectorlength-2.c: Delete.
> > * c-c++-common/cilk-plus/PS/vectorlength-3.c: Delete.
> > * c-c++-common/cilk-plus/PS/vectorlength.c: Delete.
> > * c-c++-common/cilk-plus/SE/ef_error.c: Delete.
> > * c-c++-common/cilk-plus/SE/ef_error2.c: Delete.
> > * c-c++-common/cilk-plus/SE/ef_error3.c: Delete.
> > * c-c++-common/cilk-plus/SE/ef_test.c: Delete.
> > * c-c++-common/cilk-plus/SE/ef_test2.c: Delete.
> > * c-c++-common/cilk-plus/SE/vlength_errors.c: Delete.
> > * g++.dg/cilk-plus/AN/array_function.c: Delete.
> > * g++.dg/cilk-plus/AN/array_test1_tplt.c: Delete.
> > * g++.dg/cilk-plus/AN/array_test2_tplt.c: Delete.
> > * g++.dg/cilk-plus/AN/array_test_ND_tplt.c: Delete.
> > * g++.dg/cilk-plus/AN/braced_list.c: Delete.
> > * g++.dg/cilk-plus/AN/builtin_fn_custom_tplt.c: Delete.
> > * g++.dg/cilk-plus/AN/builtin_fn_mutating_tplt.c: Delete.
> > * g++.dg/cilk-plus/AN/fp_triplet_values_tplt.c: Delete.
> > * g++.dg/cilk-plus/AN/postincr_test.c: Delete.
> > * g++.dg/cilk-plus/AN/preincr_test.c: Delete.
> > * g++.dg/cilk-plus/CK/catch_exc.c: Delete.
> > * g++.dg/cilk-plus/CK/cf3.c: Delete.
> > * g++.dg/cilk-plus/CK/cilk-for-tplt.c: Delete.
> > * g++.dg/cilk-plus/CK/const_spawn.c: Delete.
> > * g++.dg/cilk-plus/CK/fib-opr-overload.c: Delete.
> > * g++.dg/cilk-plus/CK/fib-tplt.c: Delete.
> > * g++.dg/cilk-plus/CK/for1.c: Delete.
> > * g++.dg/cilk-plus/CK/lambda_spawns.c: Delete.
> > * g++.dg/cilk-plus/CK/lambda_spawns_tplt.c: Delete.
> > * g++.dg/cilk-plus/CK/pr60586.c: Delete.
> > * g++.dg/cilk-plus/CK/pr66326.c: Delete.
> > * g++.dg/cilk-plus/CK/pr68001.c: Delete.
> > * g++.dg/cilk-plus/CK/pr68997.c: Delete.
> > * g++.dg/cilk-plus/CK/pr69024.c: Delete.
> > * g++.dg/cilk-plus/CK/pr69048.c: Delete.
> > * g++.dg/cilk-plus/CK/pr69267.c: Delete.
> > * g++.dg/cilk-plus/CK/pr80038.c: Delete.
> > * g++.dg/cilk-plus/CK/stl_iter.c: Delete.
> > * g++.dg/cilk-plus/CK/stl_rev_iter.c: Delete.
> > * g++.dg/cilk-plus/CK/stl_test.c: Delete.
> > * g++.dg/cilk-plus/cilk-plus.exp
> > * g++.dg/cilk-plus/ef_test.C: Delete.
> > * g++.dg/cilk-plus/for.C: Delete.
> > * g++.dg/cilk-plus/for2.C: Delete.
> > * g++.dg/cilk-plus/for3.C: Delete.
> > * g++.dg/cilk-plus/for4.C: Delete.
> > * g++.dg/cilk-plus/pr60967.C: Delete.
> > * g++.dg/cilk-plus/pr69028.C: Delete.
> > * g++.dg/cilk-plus/pr70565.C: Delete.
> > * g++.dg/pr57662.C: Delete.
> > * gcc.dg/cilk-plus/cilk-plus.exp
> > * gcc.dg/cilk-plus/for1.c: Delete.
> > * gcc.dg/cilk-plus/for2.c: Delete.
> > * gcc.dg/cilk-plus/jump-openmp.c: Delete.
> > * gcc.dg/cilk-plus/jump.c: Delete.
> > * gcc.dg/cilk-plus/pr69798-1.c: Delete.
> > * gcc.dg/cilk-plus/pr69798-2.c: Delete.
> > * gcc.dg/cilk-plus/pr78306.c: Delete.
> > * gcc.dg/cilk-plus/pr79116.c: Delete.
> > * gcc.dg/graphite/id-28.c: Delete.
> > * lib/cilk-plus-dg.exp: Delete.
> > * lib/target-supports.exp (cilkplus_runtime): Delete.
> >
> > libcilkrts: Delete
> So it's not important, but the patch doesn't have the removal of the
> cilk+ testsuite or runtime. BUt again, it's not a big deal, I can guess
> what that part of the patch looks like.
>
> It's not unusual to find lingering bits after the removal. So if after
> the kit is ack'd & committed you find additional tidbits, don't hesitate
> to let us know.
>
>
> In c-family/c-gimplify.c:c_gimplify_expr you have this change:
>
> case MODIFY_EXPR:
> case INIT_EXPR:
> case CALL_EXPR:
> - if (fn_contains_cilk_spawn_p (cfun)
> - && cilk_detect_spawn_and_unwrap (expr_p)
> - /* If an error is found, the spawn wrapper is removed and the
> - original expression (MODIFY/INIT/CALL_EXPR) is processes as
> - it is supposed to be. */
> - && !seen_error ())
> - return (enum gimplify_status) gimplify_cilk_spawn (expr_p);
> -
> default:;
> I wonder if we should just remove the case labels as well since they do
> nothing after the cilk+ bits are removed.
>
> In c-family/c.opt rather than deleting the flag entirely, standard
> practice is leave the flag and issue a Deprecated error/warning. There
> should be examples in c-family/c.opt.
>
> In c/c-parser:
>
> @@ -2338,8 +2330,6 @@ c_parser_declaration_or_fndef (c_parser *parser,
> bool fndef_ok,
> else
> {
> fnbody = c_parser_compound_statement (parser);
> - if (flag_cilkplus && contains_array_notation_expr (fnbody))
> - fnbody = expand_array_notation_exprs (fnbody);
> }
> tree fndecl = current_function_decl;
> if (nested)
>
> I think the curly-braces become redundant after your remove the cilk+
> specific code.
>
> Also in c/c-parser.c, this time in
> c_parser_postfix_expression_after_primary. The assignment to idx before
> this comment:
>
> + /* Here we have 3 options:
> + 1. Array [EXPR] -- Normal Array call.
> + 2. Array [EXPR : EXPR] -- Array notation without stride.
> + 3. Array [EXPR : EXPR : EXPR] -- Array notation with stride.
> +
> + For 1, we just handle it just like a normal array expression.
> + For 2 and 3 we handle it like we handle array notations. The
> + idx value we have above becomes the initial/start index.
> + */
>
> Appears to be indented too far. Also the close comment should be at the
> end of the previous line.
>
>
> In these two hunks, you need to reindent the "else" clause that has
> become unconditional:
> @@ -9416,15 +9195,9 @@ c_parser_postfix_expression_after_primary
> (c_parser *parser,
> finish = c_parser_peek_token (parser)->get_finish ();
> c_parser_consume_token (parser);
> /* If the expressions have array notations, we expand them. */
> - if (flag_cilkplus
> - && TREE_CODE (expr.value) == ARRAY_NOTATION_REF)
> - expr = fix_array_notation_expr (expr_loc,
> POSTINCREMENT_EXPR, expr);
> - else
> - {
> expr = default_function_array_read_conversion (expr_loc,
> expr);
> expr.value = build_unary_op (op_loc, POSTINCREMENT_EXPR,
> expr.value, false);
> - }
> set_c_expr_source_range (&expr, start, finish);
> expr.original_code = ERROR_MARK;
> expr.original_type = NULL;
> @@ -9435,15 +9208,9 @@ c_parser_postfix_expression_after_primary
> (c_parser *parser,
> finish = c_parser_peek_token (parser)->get_finish ();
> c_parser_consume_token (parser);
> /* If the expressions have array notations, we expand them. */
> - if (flag_cilkplus
> - && TREE_CODE (expr.value) == ARRAY_NOTATION_REF)
> - expr = fix_array_notation_expr (expr_loc,
> POSTDECREMENT_EXPR, expr);
> - else
> - {
> expr = default_function_array_read_conversion (expr_loc,
> expr);
> expr.value = build_unary_op (op_loc, POSTDECREMENT_EXPR,
> expr.value, false);
> - }
> set_c_expr_source_range (&expr, start, finish);
> expr.original_code = ERROR_MARK;
> expr.original_type = NULL;
>
>
> In c_parser_omp_for_loop:
>
>
> @@ -15882,8 +15604,6 @@ c_parser_omp_for_loop (location_t loc, c_parser
> *parser, enum tree_code code,
> case LE_EXPR:
> break;
> case NE_EXPR:
> - if (code == CILK_SIMD || code == CILK_FOR)
> - break;
> /* FALLTHRU. */
> default:
> /* Can't be cond = error_mark_node, because we want to
> preserve
>
> I think you can just delete the NE_EXPR case label and the associated
> FALLTHRU comment.
>
>
> The && part of this condition needs reindenting as a result of pulling
> the code out of the conditional.
>
>
>
> - if (!is_cilkplus_cilk_simd_fn)
> - gcc_assert (token->type == CPP_NAME
> + gcc_assert (token->type == CPP_NAME
> && strcmp (IDENTIFIER_POINTER (token->value),
> "simd") == 0);
>
>
> In cp/parser.c:
>
> @@ -25090,12 +24798,6 @@ cp_parser_gnu_attribute_list (cp_parser* parser)
> vec<tree, va_gc> *vec;
> int attr_flag = (attribute_takes_identifier_p (identifier)
> ? id_attr : normal_attr);
> - if (is_cilkplus_vector_p (identifier))
> - {
> - cp_parser_cilk_simd_fn_vector_attrs (parser, id_token);
> - continue;
> - }
> - else
> vec = cp_parser_parenthesized_expression_list
> (parser, attr_flag, /*cast_p=*/false,
> /*allow_expansion_p=*/false,
> You need to reindent the code from the else clause that you're keeping.
>
>
> I think the outer curleys are redundant now:
>
>
> @@ -34825,12 +34495,8 @@ cp_parser_omp_for_loop_init (cp_parser *parser,
> if (cp_lexer_next_token_is (parser->lexer,
> CPP_OPEN_PAREN))
> {
> - if (code != CILK_SIMD && code != CILK_FOR)
> - error ("parenthesized initialization is not allowed in "
> + error ("parenthesized initialization is not allowed in "
> "OpenMP %<for%> loop");
> - else
> - error ("parenthesized initialization is "
> - "not allowed in for-loop");
> }
> else
> /* Trigger an error. */
>
>
>
> Indentation on the else clause here needs to be fixed:
>
> @@ -35267,9 +34921,6 @@ cp_parser_omp_for_loop (cp_parser *parser,
> enum
> tree_code code, tree clauses,
>
> /* Note that we saved the original contents of this flag when we entered
> the structured block, and so we don't need to re-save it here. */
> - if (code == CILK_SIMD || code == CILK_FOR)
> - parser->in_statement = IN_CILK_SIMD_FOR;
> - else
> parser->in_statement = IN_OMP_FOR;
>
> /* Note that the grammar doesn't call for a structured block here,
>
>
>
>
> I know it seems like a lot of issues, but I'm encouraged by the fact
> that they're all just formatting things. The one or two correctness
> fragments I was worried about turned out to be non-issues when I looked
> at the larger context.
>
> So if you could fix the things noted above and repost. I'm pretty sure
> it'll be approved at that point.
>
> jeff
[-- Attachment #2: cilk-plus.tar.xz --]
[-- Type: application/octet-stream, Size: 82028 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [patch] remove cilk-plus
2017-11-22 8:47 ` Koval, Julia
@ 2017-11-22 9:15 ` Rainer Orth
2017-11-22 9:22 ` Koval, Julia
2017-11-22 17:33 ` Joseph Myers
2017-11-23 17:58 ` Jeff Law
2 siblings, 1 reply; 26+ messages in thread
From: Rainer Orth @ 2017-11-22 9:15 UTC (permalink / raw)
To: Koval, Julia; +Cc: Jeff Law, Jakub Jelinek, GCC Patches
Hi Julia,
>> So it's not important, but the patch doesn't have the removal of the
>> cilk+ testsuite or runtime. BUt again, it's not a big deal, I can guess
>> what that part of the patch looks like.
>
> I used Jakub's suggestion in
> https://gcc.gnu.org/ml/gcc-patches/2017-11/msg01348.html and didn't add
> libcilkrts and cilk-plus directories to patch(without this patch doesn't
> fit in gcc-patches), only to change log. I will include them, when I'll
> commit the patch, but I guess there is nothing to review here:
> rm -rf gcc/testsuite/c-c++-common/cilk-plus
> rm -rf gcc/testsuite/g++.dg/cilk-plus
> rm -rf gcc/testsuite/gcc.dg/cilk-plus
> rm -rf libcilkrts
> I can send it as an additional patch(or patches) if this is required.
there's more in the testsuite:
gcc/testsuite/lib/cilk-plus-dg.exp
gcc/testsuite/lib/target-supports.exp (check_effective_target_cilkplus,
check_effective_target_cilkplus_runtime)
gcc/doc/sourcebuild.texi (cilkplus_runtime effective-target keyword)
Rainer
--
-----------------------------------------------------------------------------
Rainer Orth, Center for Biotechnology, Bielefeld University
^ permalink raw reply [flat|nested] 26+ messages in thread
* RE: [patch] remove cilk-plus
2017-11-22 9:15 ` Rainer Orth
@ 2017-11-22 9:22 ` Koval, Julia
2017-11-22 10:01 ` Koval, Julia
0 siblings, 1 reply; 26+ messages in thread
From: Koval, Julia @ 2017-11-22 9:22 UTC (permalink / raw)
To: Rainer Orth; +Cc: Jeff Law, Jakub Jelinek, GCC Patches
Changes for these files(except sourcebuild one, will fix that) are included in patch I sent. I only removed from the patch deletion of the folders I mentioned.
Julia
> -----Original Message-----
> From: Rainer Orth [mailto:ro@CeBiTec.Uni-Bielefeld.DE]
> Sent: Wednesday, November 22, 2017 10:11 AM
> To: Koval, Julia <julia.koval@intel.com>
> Cc: Jeff Law <law@redhat.com>; Jakub Jelinek <jakub@redhat.com>; GCC
> Patches <gcc-patches@gcc.gnu.org>
> Subject: Re: [patch] remove cilk-plus
>
> Hi Julia,
>
> >> So it's not important, but the patch doesn't have the removal of the
> >> cilk+ testsuite or runtime. BUt again, it's not a big deal, I can guess
> >> what that part of the patch looks like.
> >
> > I used Jakub's suggestion in
> > https://gcc.gnu.org/ml/gcc-patches/2017-11/msg01348.html and didn't add
> > libcilkrts and cilk-plus directories to patch(without this patch doesn't
> > fit in gcc-patches), only to change log. I will include them, when I'll
> > commit the patch, but I guess there is nothing to review here:
> > rm -rf gcc/testsuite/c-c++-common/cilk-plus
> > rm -rf gcc/testsuite/g++.dg/cilk-plus
> > rm -rf gcc/testsuite/gcc.dg/cilk-plus
> > rm -rf libcilkrts
> > I can send it as an additional patch(or patches) if this is required.
>
> there's more in the testsuite:
>
> gcc/testsuite/lib/cilk-plus-dg.exp
> gcc/testsuite/lib/target-supports.exp (check_effective_target_cilkplus,
> check_effective_target_cilkplus_runtime)
> gcc/doc/sourcebuild.texi (cilkplus_runtime effective-target keyword)
>
> Rainer
>
> --
> -----------------------------------------------------------------------------
> Rainer Orth, Center for Biotechnology, Bielefeld University
^ permalink raw reply [flat|nested] 26+ messages in thread
* RE: [patch] remove cilk-plus
2017-11-22 9:22 ` Koval, Julia
@ 2017-11-22 10:01 ` Koval, Julia
0 siblings, 0 replies; 26+ messages in thread
From: Koval, Julia @ 2017-11-22 10:01 UTC (permalink / raw)
To: 'Rainer Orth'
Cc: 'Jeff Law', 'Jakub Jelinek', 'GCC Patches'
[-- Attachment #1: Type: text/plain, Size: 2157 bytes --]
Added fix for gcc/doc/sourcebuild.texi
> -----Original Message-----
> From: Koval, Julia
> Sent: Wednesday, November 22, 2017 10:15 AM
> To: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
> Cc: Jeff Law <law@redhat.com>; Jakub Jelinek <jakub@redhat.com>; GCC
> Patches <gcc-patches@gcc.gnu.org>
> Subject: RE: [patch] remove cilk-plus
>
> Changes for these files(except sourcebuild one, will fix that) are included in
> patch I sent. I only removed from the patch deletion of the folders I mentioned.
>
> Julia
>
> > -----Original Message-----
> > From: Rainer Orth [mailto:ro@CeBiTec.Uni-Bielefeld.DE]
> > Sent: Wednesday, November 22, 2017 10:11 AM
> > To: Koval, Julia <julia.koval@intel.com>
> > Cc: Jeff Law <law@redhat.com>; Jakub Jelinek <jakub@redhat.com>; GCC
> > Patches <gcc-patches@gcc.gnu.org>
> > Subject: Re: [patch] remove cilk-plus
> >
> > Hi Julia,
> >
> > >> So it's not important, but the patch doesn't have the removal of the
> > >> cilk+ testsuite or runtime. BUt again, it's not a big deal, I can guess
> > >> what that part of the patch looks like.
> > >
> > > I used Jakub's suggestion in
> > > https://gcc.gnu.org/ml/gcc-patches/2017-11/msg01348.html and didn't add
> > > libcilkrts and cilk-plus directories to patch(without this patch doesn't
> > > fit in gcc-patches), only to change log. I will include them, when I'll
> > > commit the patch, but I guess there is nothing to review here:
> > > rm -rf gcc/testsuite/c-c++-common/cilk-plus
> > > rm -rf gcc/testsuite/g++.dg/cilk-plus
> > > rm -rf gcc/testsuite/gcc.dg/cilk-plus
> > > rm -rf libcilkrts
> > > I can send it as an additional patch(or patches) if this is required.
> >
> > there's more in the testsuite:
> >
> > gcc/testsuite/lib/cilk-plus-dg.exp
> > gcc/testsuite/lib/target-supports.exp (check_effective_target_cilkplus,
> > check_effective_target_cilkplus_runtime)
> > gcc/doc/sourcebuild.texi (cilkplus_runtime effective-target keyword)
> >
> > Rainer
> >
> > --
> > -----------------------------------------------------------------------------
> > Rainer Orth, Center for Biotechnology, Bielefeld University
[-- Attachment #2: cilk-plus.tar.xz --]
[-- Type: application/octet-stream, Size: 82124 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread
* RE: [patch] remove cilk-plus
2017-11-22 8:47 ` Koval, Julia
2017-11-22 9:15 ` Rainer Orth
@ 2017-11-22 17:33 ` Joseph Myers
2017-11-23 10:01 ` Koval, Julia
2017-11-23 17:58 ` Jeff Law
2 siblings, 1 reply; 26+ messages in thread
From: Joseph Myers @ 2017-11-22 17:33 UTC (permalink / raw)
To: Koval, Julia; +Cc: Jeff Law, Jakub Jelinek, GCC Patches
This patch version does not appear to address my comment that you're
leaving behind comments in c-parser.c relating to Cilk array notations
while removing the subsequent code. (Or in one case actually reindenting
the comment that is no longer relevant, rather than removing it.)
--
Joseph S. Myers
joseph@codesourcery.com
^ permalink raw reply [flat|nested] 26+ messages in thread
* RE: [patch] remove cilk-plus
2017-11-22 17:33 ` Joseph Myers
@ 2017-11-23 10:01 ` Koval, Julia
2017-11-27 18:06 ` Jeff Law
0 siblings, 1 reply; 26+ messages in thread
From: Koval, Julia @ 2017-11-23 10:01 UTC (permalink / raw)
To: Joseph Myers; +Cc: Jeff Law, Jakub Jelinek, GCC Patches
[-- Attachment #1: Type: text/plain, Size: 741 bytes --]
Sorry, I think in this version of this patch they are fixed.
> -----Original Message-----
> From: Joseph Myers [mailto:joseph@codesourcery.com]
> Sent: Wednesday, November 22, 2017 6:23 PM
> To: Koval, Julia <julia.koval@intel.com>
> Cc: Jeff Law <law@redhat.com>; Jakub Jelinek <jakub@redhat.com>; GCC
> Patches <gcc-patches@gcc.gnu.org>
> Subject: RE: [patch] remove cilk-plus
>
> This patch version does not appear to address my comment that you're
> leaving behind comments in c-parser.c relating to Cilk array notations
> while removing the subsequent code. (Or in one case actually reindenting
> the comment that is no longer relevant, rather than removing it.)
>
> --
> Joseph S. Myers
> joseph@codesourcery.com
[-- Attachment #2: cilk-plus.tar.xz --]
[-- Type: application/octet-stream, Size: 82132 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [patch] remove cilk-plus
2017-11-22 8:47 ` Koval, Julia
2017-11-22 9:15 ` Rainer Orth
2017-11-22 17:33 ` Joseph Myers
@ 2017-11-23 17:58 ` Jeff Law
2 siblings, 0 replies; 26+ messages in thread
From: Jeff Law @ 2017-11-23 17:58 UTC (permalink / raw)
To: Koval, Julia, Jakub Jelinek; +Cc: GCC Patches
On 11/22/2017 01:38 AM, Koval, Julia wrote:
> Hi,
>
>> So it's not important, but the patch doesn't have the removal of the
>> cilk+ testsuite or runtime. BUt again, it's not a big deal, I can guess
>> what that part of the patch looks like.
>
> I used Jakub's suggestion in https://gcc.gnu.org/ml/gcc-patches/2017-11/msg01348.html and didn't add libcilkrts and cilk-plus directories to patch(without this patch doesn't fit in gcc-patches), only to change log. I will include them, when I'll commit the patch, but I guess there is nothing to review here:
> rm -rf gcc/testsuite/c-c++-common/cilk-plus
> rm -rf gcc/testsuite/g++.dg/cilk-plus
> rm -rf gcc/testsuite/gcc.dg/cilk-plus
> rm -rf libcilkrts
> I can send it as an additional patch(or patches) if this is required.
No need. As I said, I can guess what those look like :-0
Jeff
>
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [patch] remove cilk-plus
2017-11-23 10:01 ` Koval, Julia
@ 2017-11-27 18:06 ` Jeff Law
2017-11-30 11:55 ` Koval, Julia
0 siblings, 1 reply; 26+ messages in thread
From: Jeff Law @ 2017-11-27 18:06 UTC (permalink / raw)
To: Koval, Julia, Joseph Myers; +Cc: Jakub Jelinek, GCC Patches
On 11/23/2017 02:45 AM, Koval, Julia wrote:
> Sorry, I think in this version of this patch they are fixed.
>
>> -----Original Message-----
>> From: Joseph Myers [mailto:joseph@codesourcery.com]
>> Sent: Wednesday, November 22, 2017 6:23 PM
>> To: Koval, Julia <julia.koval@intel.com>
>> Cc: Jeff Law <law@redhat.com>; Jakub Jelinek <jakub@redhat.com>; GCC
>> Patches <gcc-patches@gcc.gnu.org>
>> Subject: RE: [patch] remove cilk-plus
>>
>> This patch version does not appear to address my comment that you're
>> leaving behind comments in c-parser.c relating to Cilk array notations
>> while removing the subsequent code. (Or in one case actually reindenting
>> the comment that is no longer relevant, rather than removing it.)
>>
>> --
>> Joseph S. Myers
>> joseph@codesourcery.com
This version is fine to commit.
Can you also remove struct inv_list from c-family/c-common.h. It was
only used for array notation support. You can include that in your main
commit or as a separate follow-up.
We may well find other nits like inv_list. I'm comfortable addressing
those as we bump into them.
Thanks for taking care of this!
jeff
^ permalink raw reply [flat|nested] 26+ messages in thread
* RE: [patch] remove cilk-plus
2017-11-27 18:06 ` Jeff Law
@ 2017-11-30 11:55 ` Koval, Julia
2017-11-30 12:02 ` Jakub Jelinek
2017-11-30 16:40 ` Marek Polacek
0 siblings, 2 replies; 26+ messages in thread
From: Koval, Julia @ 2017-11-30 11:55 UTC (permalink / raw)
To: Jeff Law, Joseph Myers; +Cc: Jakub Jelinek, GCC Patches
[-- Attachment #1: Type: text/plain, Size: 1676 bytes --]
Hi, here is the followup patch. Ok for trunk?
gcc/c-family/
* c-common.h (inv_list): Remove.
Thanks,
Julia
> -----Original Message-----
> From: Jeff Law [mailto:law@redhat.com]
> Sent: Monday, November 27, 2017 6:50 PM
> To: Koval, Julia <julia.koval@intel.com>; Joseph Myers
> <joseph@codesourcery.com>
> Cc: Jakub Jelinek <jakub@redhat.com>; GCC Patches <gcc-
> patches@gcc.gnu.org>
> Subject: Re: [patch] remove cilk-plus
>
> On 11/23/2017 02:45 AM, Koval, Julia wrote:
> > Sorry, I think in this version of this patch they are fixed.
> >
> >> -----Original Message-----
> >> From: Joseph Myers [mailto:joseph@codesourcery.com]
> >> Sent: Wednesday, November 22, 2017 6:23 PM
> >> To: Koval, Julia <julia.koval@intel.com>
> >> Cc: Jeff Law <law@redhat.com>; Jakub Jelinek <jakub@redhat.com>; GCC
> >> Patches <gcc-patches@gcc.gnu.org>
> >> Subject: RE: [patch] remove cilk-plus
> >>
> >> This patch version does not appear to address my comment that you're
> >> leaving behind comments in c-parser.c relating to Cilk array notations
> >> while removing the subsequent code. (Or in one case actually reindenting
> >> the comment that is no longer relevant, rather than removing it.)
> >>
> >> --
> >> Joseph S. Myers
> >> joseph@codesourcery.com
> This version is fine to commit.
>
> Can you also remove struct inv_list from c-family/c-common.h. It was
> only used for array notation support. You can include that in your main
> commit or as a separate follow-up.
>
> We may well find other nits like inv_list. I'm comfortable addressing
> those as we bump into them.
>
> Thanks for taking care of this!
>
> jeff
[-- Attachment #2: 0001-cilk-followup.patch --]
[-- Type: application/octet-stream, Size: 1101 bytes --]
From 09ed2d6ceff7b1e51fa188057d311d1af4432308 Mon Sep 17 00:00:00 2001
From: julia <jkoval@gkticlel801.igk.intel.com>
Date: Thu, 30 Nov 2017 14:42:11 +0300
Subject: [PATCH] cilk followup
---
gcc/c-family/c-common.h | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/gcc/c-family/c-common.h b/gcc/c-family/c-common.h
index 7561531..27b1de9 100644
--- a/gcc/c-family/c-common.h
+++ b/gcc/c-family/c-common.h
@@ -1358,17 +1358,6 @@ enum stv_conv {
extern enum stv_conv scalar_to_vector (location_t loc, enum tree_code code,
tree op0, tree op1, bool);
-/* This structure holds all the scalar values and its appropriate variable
- replacment. It is mainly used by the function that pulls all the invariant
- parts that should be executed only once, which comes with array notation
- expressions. */
-struct inv_list
-{
- vec<tree, va_gc> *list_values;
- vec<tree, va_gc> *replacement;
- vec<enum tree_code, va_gc> *additional_tcodes;
-};
-
extern tree find_inv_trees (tree *, int *, void *);
extern tree replace_inv_trees (tree *, int *, void *);
--
2.5.5
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [patch] remove cilk-plus
2017-11-30 11:55 ` Koval, Julia
@ 2017-11-30 12:02 ` Jakub Jelinek
2017-11-30 16:40 ` Marek Polacek
1 sibling, 0 replies; 26+ messages in thread
From: Jakub Jelinek @ 2017-11-30 12:02 UTC (permalink / raw)
To: Koval, Julia; +Cc: Jeff Law, Joseph Myers, GCC Patches
On Thu, Nov 30, 2017 at 11:54:11AM +0000, Koval, Julia wrote:
> Hi, here is the followup patch. Ok for trunk?
>
> gcc/c-family/
> * c-common.h (inv_list): Remove.
Ok, thanks.
Jakub
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [patch] remove cilk-plus
2017-11-30 11:55 ` Koval, Julia
2017-11-30 12:02 ` Jakub Jelinek
@ 2017-11-30 16:40 ` Marek Polacek
2017-11-30 17:27 ` Jeff Law
1 sibling, 1 reply; 26+ messages in thread
From: Marek Polacek @ 2017-11-30 16:40 UTC (permalink / raw)
To: Koval, Julia; +Cc: Jeff Law, Joseph Myers, Jakub Jelinek, GCC Patches
On Thu, Nov 30, 2017 at 11:54:11AM +0000, Koval, Julia wrote:
> Hi, here is the followup patch. Ok for trunk?
>
> gcc/c-family/
> * c-common.h (inv_list): Remove.
In function.h I still see
/* In a Cilk function, the VAR_DECL for the frame descriptor. */
tree cilk_frame_decl;
isn't that redundant now, too?
Marek
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [patch] remove cilk-plus
2017-11-30 16:40 ` Marek Polacek
@ 2017-11-30 17:27 ` Jeff Law
2017-11-30 17:29 ` Jakub Jelinek
0 siblings, 1 reply; 26+ messages in thread
From: Jeff Law @ 2017-11-30 17:27 UTC (permalink / raw)
To: Marek Polacek, Koval, Julia; +Cc: Joseph Myers, Jakub Jelinek, GCC Patches
On 11/30/2017 09:32 AM, Marek Polacek wrote:
> On Thu, Nov 30, 2017 at 11:54:11AM +0000, Koval, Julia wrote:
>> Hi, here is the followup patch. Ok for trunk?
>>
>> gcc/c-family/
>> * c-common.h (inv_list): Remove.
>
> In function.h I still see
>
> /* In a Cilk function, the VAR_DECL for the frame descriptor. */
> tree cilk_frame_decl;
>
> isn't that redundant now, too?
Yes. I actually saw that today when looking at the issue Florian and
Carlos raised internally. :-)
Assuming a grep doesn't find any references, removal is pre-approved.
jeff
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [patch] remove cilk-plus
2017-11-30 17:27 ` Jeff Law
@ 2017-11-30 17:29 ` Jakub Jelinek
0 siblings, 0 replies; 26+ messages in thread
From: Jakub Jelinek @ 2017-11-30 17:29 UTC (permalink / raw)
To: Jeff Law; +Cc: Marek Polacek, Koval, Julia, Joseph Myers, GCC Patches
On Thu, Nov 30, 2017 at 10:15:20AM -0700, Jeff Law wrote:
> On 11/30/2017 09:32 AM, Marek Polacek wrote:
> > On Thu, Nov 30, 2017 at 11:54:11AM +0000, Koval, Julia wrote:
> >> Hi, here is the followup patch. Ok for trunk?
> >>
> >> gcc/c-family/
> >> * c-common.h (inv_list): Remove.
> >
> > In function.h I still see
> >
> > /* In a Cilk function, the VAR_DECL for the frame descriptor. */
> > tree cilk_frame_decl;
> >
> > isn't that redundant now, too?
> Yes. I actually saw that today when looking at the issue Florian and
> Carlos raised internally. :-)
>
> Assuming a grep doesn't find any references, removal is pre-approved.
grep finds actually tons of further stuff:
grep -i cilk * c*/* 2>/dev/null | grep -v ChangeLog
cgraph.h: /* True if this is a Cilk Plus variant. */
cgraph.h: unsigned int cilk_elemental : 1;
function.h: /* In a Cilk function, the VAR_DECL for the frame descriptor. */
function.h: tree cilk_frame_decl;
function.h: /* This will indicate whether a function is a cilk function */
function.h: unsigned int is_cilk_function : 1;
function.h: /* Nonzero if this is a Cilk function that spawns. */
function.h: unsigned int calls_cilk_spawn : 1;
omp-simd-clone.c: clone_info->cilk_elemental = false;
target.def:/* Functions relating to OpenMP and Cilk Plus SIMD clones. */
tree-inline.h: /* Cilk keywords currently need to replace some variables that
tree-inline.h: bool remap_var_for_cilk;
c-family/c-attribs.c: { "cilk simd function", 0, -1, true, false, false,
c-family/c-attribs.c: if (lookup_attribute ("cilk simd function",
c-family/c-attribs.c: "function marked as a Cilk Plus SIMD-enabled function");
c-family/c.opt:fcilkplus Undocumented
c-family/c.opt:C ObjC C++ ObjC++ LTO Report Var(flag_cilkplus) Init(0)
cp/cp-tree.h:/* In c-family/cilk.c */
cp/cp-tree.h:extern bool cilk_valid_spawn (tree);
cp/parser.c: parser->cilk_simd_fn_info = NULL;
cp/parser.c: clauses, Cilk Plus SIMD-enabled functions' vector attributes, and
cp/parser.c: a Cilk Plus for loop.
cp/parser.h:/* Helper data structure for parsing #pragma omp declare simd, and Cilk Plus
cp/parser.h: /* When parsing Cilk Plus SIMD-enabled functions' vector attributes,
cp/parser.h: cp_omp_declare_simd_data * GTY((skip)) cilk_simd_fn_info;
Of course, when it is Cilk+ + something else, it should be carefully adjusted.
Jakub
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [patch] remove cilk-plus
2017-11-16 15:48 [patch] remove cilk-plus Koval, Julia
` (2 preceding siblings ...)
2017-11-16 16:34 ` Eric Gallager
@ 2017-12-01 10:28 ` Paolo Carlini
2017-12-01 15:43 ` Jeff Law
2018-03-02 16:37 ` Thomas Schwinge
4 siblings, 1 reply; 26+ messages in thread
From: Paolo Carlini @ 2017-12-01 10:28 UTC (permalink / raw)
To: Koval, Julia, GCC Patches; +Cc: law
Hi,
On 16/11/2017 16:33, 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?
>
> Hi, this patch removes cilkplus. Ok for trunk?
Now that cilkplus is gone I suppose we should clean-up Bugzilla about
that. Shall I go ahead and essentially close all the bugs we got? As
WONTFIX or what else? Let's agree on something. In principle we could
keep the regressions for the sake of the existing release branches but I
think we got very, very, few of those and anyway I don't see who gonna
work on that...
Cheers,
Paolo.
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [patch] remove cilk-plus
2017-12-01 10:28 ` Paolo Carlini
@ 2017-12-01 15:43 ` Jeff Law
2017-12-01 16:19 ` Paolo Carlini
0 siblings, 1 reply; 26+ messages in thread
From: Jeff Law @ 2017-12-01 15:43 UTC (permalink / raw)
To: Paolo Carlini, Koval, Julia, GCC Patches
On 12/01/2017 03:28 AM, Paolo Carlini wrote:
> Hi,
>
> On 16/11/2017 16:33, 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?
>>
>> Hi, this patch removes cilkplus. Ok for trunk?
> Now that cilkplus is gone I suppose we should clean-up Bugzilla about
> that. Shall I go ahead and essentially close all the bugs we got? As
> WONTFIX or what else? Let's agree on something. In principle we could
> keep the regressions for the sake of the existing release branches but I
> think we got very, very, few of those and anyway I don't see who gonna
> work on that...
Not sure if we have a policy in this space or not.
If we don't then my vote would be for CLOSE/WONTFIX now. That seems to
most accurately reflect state -- we're not going to be fixing any Cilk+
stuff on the trunk or in the release branches.
jeff
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [patch] remove cilk-plus
2017-12-01 15:43 ` Jeff Law
@ 2017-12-01 16:19 ` Paolo Carlini
0 siblings, 0 replies; 26+ messages in thread
From: Paolo Carlini @ 2017-12-01 16:19 UTC (permalink / raw)
To: Jeff Law, Koval, Julia, GCC Patches
Hi,
On 01/12/2017 16:43, Jeff Law wrote:
> On 12/01/2017 03:28 AM, Paolo Carlini wrote:
>> Hi,
>>
>> On 16/11/2017 16:33, 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?
>>>
>>> Hi, this patch removes cilkplus. Ok for trunk?
>> Now that cilkplus is gone I suppose we should clean-up Bugzilla about
>> that. Shall I go ahead and essentially close all the bugs we got? As
>> WONTFIX or what else? Let's agree on something. In principle we could
>> keep the regressions for the sake of the existing release branches but I
>> think we got very, very, few of those and anyway I don't see who gonna
>> work on that...
> Not sure if we have a policy in this space or not.
>
> If we don't then my vote would be for CLOSE/WONTFIX now. That seems to
> most accurately reflect state -- we're not going to be fixing any Cilk+
> stuff on the trunk or in the release branches.
Excellent, thanks Jeff. Thus, barring strong contrary opinions, I'll
take care of that over the we.
Cheers,
Paolo.
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [patch] remove cilk-plus
2017-11-16 15:48 [patch] remove cilk-plus Koval, Julia
` (3 preceding siblings ...)
2017-12-01 10:28 ` Paolo Carlini
@ 2018-03-02 16:37 ` Thomas Schwinge
2018-03-02 16:43 ` Jeff Law
4 siblings, 1 reply; 26+ messages in thread
From: Thomas Schwinge @ 2018-03-02 16:37 UTC (permalink / raw)
To: GCC Patches; +Cc: Koval, Julia, law
Hi!
On Thu, 16 Nov 2017 15:33:40 +0000, "Koval, Julia" <julia.koval@intel.com> wrote:
> Hi, this patch removes cilkplus.
I noticed a few remaining bits, that I convinced myself are obvious
enough; committed to trunk in r258141:
commit bd571ec47012c4ee50ef028024276ab02f5c15ec
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri Mar 2 16:35:26 2018 +0000
More Cilk Plus removal
contrib/
* update-copyright.py: Remove "libcilkrts" reference.
gcc/c-family/
* c-attribs.c (c_common_attribute_table): Remove "cilk simd
function".
gcc/
* doc/invoke.texi: Remove "Cilk Plus" references.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@258141 138bc75d-0d04-0410-961f-82ee72b054a4
---
contrib/ChangeLog | 4 ++++
contrib/update-copyright.py | 3 +--
gcc/ChangeLog | 4 ++++
gcc/c-family/ChangeLog | 5 +++++
gcc/c-family/c-attribs.c | 2 --
gcc/doc/invoke.texi | 4 ++--
6 files changed, 16 insertions(+), 6 deletions(-)
diff --git contrib/ChangeLog contrib/ChangeLog
index 627cafd..6bb3b6f 100644
--- contrib/ChangeLog
+++ contrib/ChangeLog
@@ -1,3 +1,7 @@
+2018-03-02 Thomas Schwinge <thomas@codesourcery.com>
+
+ * update-copyright.py: Remove "libcilkrts" reference.
+
2018-02-19 Yury Gribov <tetra2005@gmail.com>
* compare_tests: Use TMPDIR when set.
diff --git contrib/update-copyright.py contrib/update-copyright.py
index 85be1e1..9295c6b 100755
--- contrib/update-copyright.py
+++ contrib/update-copyright.py
@@ -1,6 +1,6 @@
#!/usr/bin/python
#
-# Copyright (C) 2013-2017 Free Software Foundation, Inc.
+# Copyright (C) 2013-2018 Free Software Foundation, Inc.
#
# This script is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -708,7 +708,6 @@ class GCCCmdLine (CmdLine):
self.add_dir ('libatomic')
self.add_dir ('libbacktrace')
self.add_dir ('libcc1')
- # libcilkrts is imported from upstream.
self.add_dir ('libcpp', LibCppFilter())
self.add_dir ('libdecnumber')
# libffi is imported from upstream.
diff --git gcc/ChangeLog gcc/ChangeLog
index 447d563..662b72f 100644
--- gcc/ChangeLog
+++ gcc/ChangeLog
@@ -1,3 +1,7 @@
+2018-03-02 Thomas Schwinge <thomas@codesourcery.com>
+
+ * doc/invoke.texi: Remove "Cilk Plus" references.
+
2018-03-02 Jakub Jelinek <jakub@redhat.com>
Richard Biener <rguenther@suse.de>
diff --git gcc/c-family/ChangeLog gcc/c-family/ChangeLog
index c10b7bf..27cc43e 100644
--- gcc/c-family/ChangeLog
+++ gcc/c-family/ChangeLog
@@ -1,3 +1,8 @@
+2018-03-02 Thomas Schwinge <thomas@codesourcery.com>
+
+ * c-attribs.c (c_common_attribute_table): Remove "cilk simd
+ function".
+
2018-03-01 Marek Polacek <polacek@redhat.com>
PR c++/84639
diff --git gcc/c-family/c-attribs.c gcc/c-family/c-attribs.c
index 3ebb2d6..cebc0b2 100644
--- gcc/c-family/c-attribs.c
+++ gcc/c-family/c-attribs.c
@@ -439,8 +439,6 @@ const struct attribute_spec c_common_attribute_table[] =
handle_returns_nonnull_attribute, NULL },
{ "omp declare simd", 0, -1, true, false, false, false,
handle_omp_declare_simd_attribute, NULL },
- { "cilk simd function", 0, -1, true, false, false, false,
- handle_omp_declare_simd_attribute, NULL },
{ "simd", 0, 1, true, false, false, false,
handle_simd_attribute, NULL },
{ "omp declare target", 0, 0, true, false, false, false,
diff --git gcc/doc/invoke.texi gcc/doc/invoke.texi
index 8d366c6..ad0fec6 100644
--- gcc/doc/invoke.texi
+++ gcc/doc/invoke.texi
@@ -6710,7 +6710,7 @@ Requires @option{-flto-odr-type-merging} to be enabled. Enabled by default.
@item -Wopenmp-simd
@opindex Wopenm-simd
-Warn if the vectorizer cost model overrides the OpenMP or the Cilk Plus
+Warn if the vectorizer cost model overrides the OpenMP
simd directive set by user. The @option{-fsimd-cost-model=unlimited}
option can be used to relax the cost model.
@@ -8953,7 +8953,7 @@ either @samp{dynamic} or @samp{cheap}.
@item -fsimd-cost-model=@var{model}
@opindex fsimd-cost-model
Alter the cost model used for vectorization of loops marked with the OpenMP
-or Cilk Plus simd directive. The @var{model} argument should be one of
+simd directive. The @var{model} argument should be one of
@samp{unlimited}, @samp{dynamic}, @samp{cheap}. All values of @var{model}
have the same meaning as described in @option{-fvect-cost-model} and by
default a cost model defined with @option{-fvect-cost-model} is used.
Grüße
Thomas
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [patch] remove cilk-plus
2018-03-02 16:37 ` Thomas Schwinge
@ 2018-03-02 16:43 ` Jeff Law
0 siblings, 0 replies; 26+ messages in thread
From: Jeff Law @ 2018-03-02 16:43 UTC (permalink / raw)
To: Thomas Schwinge, GCC Patches; +Cc: Koval, Julia
On 03/02/2018 09:36 AM, Thomas Schwinge wrote:
> Hi!
>
> On Thu, 16 Nov 2017 15:33:40 +0000, "Koval, Julia" <julia.koval@intel.com> wrote:
>> Hi, this patch removes cilkplus.
>
> I noticed a few remaining bits, that I convinced myself are obvious
> enough; committed to trunk in r258141:
>
> commit bd571ec47012c4ee50ef028024276ab02f5c15ec
> Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
> Date: Fri Mar 2 16:35:26 2018 +0000
>
> More Cilk Plus removal
>
> contrib/
> * update-copyright.py: Remove "libcilkrts" reference.
> gcc/c-family/
> * c-attribs.c (c_common_attribute_table): Remove "cilk simd
> function".
> gcc/
> * doc/invoke.texi: Remove "Cilk Plus" references.
Thanks. Yea, this certainly qualifies as obvious :-)
jeff
^ permalink raw reply [flat|nested] 26+ messages in thread
end of thread, other threads:[~2018-03-02 16:43 UTC | newest]
Thread overview: 26+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-16 15:48 [patch] remove cilk-plus Koval, Julia
2017-11-16 15:49 ` Marek Polacek
2017-11-16 16:21 ` Jakub Jelinek
2017-11-16 17:06 ` Koval, Julia
2017-11-16 23:51 ` Joseph Myers
2017-11-21 7:46 ` Jeff Law
2017-11-22 8:47 ` Koval, Julia
2017-11-22 9:15 ` Rainer Orth
2017-11-22 9:22 ` Koval, Julia
2017-11-22 10:01 ` Koval, Julia
2017-11-22 17:33 ` Joseph Myers
2017-11-23 10:01 ` Koval, Julia
2017-11-27 18:06 ` Jeff Law
2017-11-30 11:55 ` Koval, Julia
2017-11-30 12:02 ` Jakub Jelinek
2017-11-30 16:40 ` Marek Polacek
2017-11-30 17:27 ` Jeff Law
2017-11-30 17:29 ` Jakub Jelinek
2017-11-23 17:58 ` Jeff Law
2017-11-16 16:34 ` Eric Gallager
2017-11-16 17:59 ` Jeff Law
2017-12-01 10:28 ` Paolo Carlini
2017-12-01 15:43 ` Jeff Law
2017-12-01 16:19 ` Paolo Carlini
2018-03-02 16:37 ` Thomas Schwinge
2018-03-02 16:43 ` Jeff Law
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).