From f69b8a4ce9c6efafc07ed0bbf1bc18837a753130 Mon Sep 17 00:00:00 2001 From: nathan Date: Mon, 9 Nov 2015 21:56:42 +0000 Subject: [PATCH] * omp-low.c: Fix some OpenACC comment typos. (lower_reduction_clauses): Remove BUILT_IN_GOACC_GET_THREAD_NUM call. * omp-builtins.def (BUILT_IN_GOACC_GET_THREAD_NUM, BUILT_IN_GOACC_GET_NUM_THREADS): Delete. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@230054 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 7 +++++++ gcc/omp-builtins.def | 4 ---- gcc/omp-low.c | 21 +++++---------------- 3 files changed, 12 insertions(+), 20 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 00fd752..1f513ec 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2015-11-09 Nathan Sidwell + + * omp-low.c: Fix some OpenACC comment typos. + (lower_reduction_clauses): Remove BUILT_IN_GOACC_GET_THREAD_NUM call. + * omp-builtins.def (BUILT_IN_GOACC_GET_THREAD_NUM, + BUILT_IN_GOACC_GET_NUM_THREADS): Delete. + 2015-11-09 Uros Bizjak * config/i386/i386.md (*strmovqi_1): Fix insn enable condition. diff --git a/gcc/omp-builtins.def b/gcc/omp-builtins.def index fc87a3f..0b6bd58 100644 --- a/gcc/omp-builtins.def +++ b/gcc/omp-builtins.def @@ -47,10 +47,6 @@ DEF_GOACC_BUILTIN (BUILT_IN_GOACC_UPDATE, "GOACC_update", DEF_GOACC_BUILTIN (BUILT_IN_GOACC_WAIT, "GOACC_wait", BT_FN_VOID_INT_INT_VAR, ATTR_NOTHROW_LIST) -DEF_GOACC_BUILTIN (BUILT_IN_GOACC_GET_THREAD_NUM, "GOACC_get_thread_num", - BT_FN_INT, ATTR_CONST_NOTHROW_LEAF_LIST) -DEF_GOACC_BUILTIN (BUILT_IN_GOACC_GET_NUM_THREADS, "GOACC_get_num_threads", - BT_FN_INT, ATTR_CONST_NOTHROW_LEAF_LIST) DEF_GOACC_BUILTIN_COMPILER (BUILT_IN_ACC_ON_DEVICE, "acc_on_device", BT_FN_INT_INT, ATTR_CONST_NOTHROW_LEAF_LIST) diff --git a/gcc/omp-low.c b/gcc/omp-low.c index 45d1927..159f784 100644 --- a/gcc/omp-low.c +++ b/gcc/omp-low.c @@ -5559,7 +5559,7 @@ lower_reduction_clauses (tree clauses, gimple_seq *stmt_seqp, omp_context *ctx) { gimple_seq sub_seq = NULL; gimple *stmt; - tree x, c, tid = NULL_TREE; + tree x, c; int count = 0; /* OpenACC loop reductions are handled elsewhere. */ @@ -5589,17 +5589,6 @@ lower_reduction_clauses (tree clauses, gimple_seq *stmt_seqp, omp_context *ctx) if (count == 0) return; - /* Initialize thread info for OpenACC. */ - if (is_gimple_omp_oacc (ctx->stmt)) - { - /* Get the current thread id. */ - tree call = builtin_decl_explicit (BUILT_IN_GOACC_GET_THREAD_NUM); - tid = create_tmp_var (TREE_TYPE (TREE_TYPE (call))); - gimple *stmt = gimple_build_call (call, 0); - gimple_call_set_lhs (stmt, tid); - gimple_seq_add_stmt (stmt_seqp, stmt); - } - for (c = clauses; c ; c = OMP_CLAUSE_CHAIN (c)) { tree var, ref, new_var, orig_var; @@ -12266,7 +12255,7 @@ expand_omp_atomic (struct omp_region *region) } -/* Encode an oacc launc argument. This matches the GOMP_LAUNCH_PACK +/* Encode an oacc launch argument. This matches the GOMP_LAUNCH_PACK macro on gomp-constants.h. We do not check for overflow. */ static tree @@ -12292,7 +12281,7 @@ oacc_launch_pack (unsigned code, tree device, unsigned op) The attribute value is a TREE_LIST. A set of dimensions is represented as a list of INTEGER_CST. Those that are runtime - expres are represented as an INTEGER_CST of zero. + exprs are represented as an INTEGER_CST of zero. TOOO. Normally the attribute will just contain a single such list. If however it contains a list of lists, this will represent the use of @@ -14311,7 +14300,7 @@ lower_omp_for (gimple_stmt_iterator *gsi_p, omp_context *ctx) gimple_omp_for_clauses (stmt), &oacc_head, &oacc_tail, ctx); - /* Add OpenACC partitioning markers just before the loop */ + /* Add OpenACC partitioning and reduction markers just before the loop */ if (oacc_head) gimple_seq_add_seq (&body, oacc_head); @@ -19524,7 +19513,7 @@ public: return execute_oacc_device_lower (); } -}; // class pass_oacc_transform +}; // class pass_oacc_device_lower } // anon namespace -- 2.7.4