From 3f3a6bf184975b2f39ba4aacd537c353711644f2 Mon Sep 17 00:00:00 2001 From: Dmitry Bocharnikov Date: Tue, 1 Oct 2013 12:21:06 +0000 Subject: 01-10-2013 Dmitry Bocharnikov Fix several ICEs * gcc/gimple.def: Change position of GIMPLE_ACC_KERNELS * gcc/passes.def: Change position of pass_expand_oacc git-svn-id: https://gcc.gnu.org/svn/gcc/branches/openacc-1_0-branch@203058 138bc75d-0d04-0410-961f-82ee72b054a4 --- ChangeLog.ACC | 6 ++++++ gcc/gimple.def | 3 ++- gcc/passes.def | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog.ACC b/ChangeLog.ACC index 6e019c77b8a..8f21ae920c5 100644 --- a/ChangeLog.ACC +++ b/ChangeLog.ACC @@ -1,3 +1,9 @@ +01-10-2013 Dmitry Bocharnikov + Fix several ICEs + + * gcc/gimple.def: Change position of GIMPLE_ACC_KERNELS + * gcc/passes.def: Change position of pass_expand_oacc + 26-09-2013 Evgeny Gavrin Initial source drop for OpenACC implementation diff --git a/gcc/gimple.def b/gcc/gimple.def index cbe1dc0d34c..e2b80a59024 100644 --- a/gcc/gimple.def +++ b/gcc/gimple.def @@ -132,6 +132,8 @@ DEFGSCODE(GIMPLE_CALL, "gimple_call", GSS_CALL) so that it can clobber global memory. */ DEFGSCODE(GIMPLE_TRANSACTION, "gimple_transaction", GSS_TRANSACTION) +DEFGSCODE(GIMPLE_ACC_KERNELS, "gimple_acc_kernels", GSS_ACC_KERNELS) + /* GIMPLE_RETURN represents return statements. RETVAL is the value to return or NULL. If a value is returned it @@ -352,7 +354,6 @@ DEFGSCODE(GIMPLE_OMP_SINGLE, "gimple_omp_single", GSS_OMP_SINGLE) /* OpenACC DEFGSCODEs */ DEFGSCODE(GIMPLE_ACC, "gimple_acc", GSS_ACC) DEFGSCODE(GIMPLE_ACC_PARALLEL, "gimple_acc_parallel", GSS_ACC_PARALLEL) -DEFGSCODE(GIMPLE_ACC_KERNELS, "gimple_acc_kernels", GSS_ACC_KERNELS) DEFGSCODE(GIMPLE_ACC_DATA, "gimple_acc_data", GSS_ACC_DATA) DEFGSCODE(GIMPLE_ACC_CACHE, "gimple_acc_cache", GSS_ACC_CACHE) DEFGSCODE(GIMPLE_ACC_WAIT, "gimple_acc_wait", GSS_ACC_WAIT) diff --git a/gcc/passes.def b/gcc/passes.def index ab0075616a7..50f5c2ac624 100644 --- a/gcc/passes.def +++ b/gcc/passes.def @@ -54,7 +54,6 @@ along with GCC; see the file COPYING3. If not see NEXT_PASS (pass_ipa_function_and_variable_visibility); NEXT_PASS (pass_early_local_passes); PUSH_INSERT_PASSES_WITHIN (pass_early_local_passes) - NEXT_PASS (pass_expand_oacc); NEXT_PASS (pass_fixup_cfg); NEXT_PASS (pass_init_datastructures); @@ -130,6 +129,7 @@ along with GCC; see the file COPYING3. If not see /* These passes are run after IPA passes on every function that is being output to the assembler file. */ INSERT_PASSES_AFTER (all_passes) + NEXT_PASS (pass_expand_oacc); NEXT_PASS (pass_lower_eh_dispatch); NEXT_PASS (pass_all_optimizations); PUSH_INSERT_PASSES_WITHIN (pass_all_optimizations) -- cgit v1.2.3