From patchwork Mon Nov 9 21:58:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Sidwell X-Patchwork-Id: 542006 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id D4765140D97 for ; Tue, 10 Nov 2015 08:59:03 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=HRxel/uu; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to:cc :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=JB40psiplS0oEwToIj9mMYWLDEQd/Im9oxFC5IJ/O8RBfOe1ji U4APhp5slV7M28ZDjX+XXrBg3wFcWq7kcKKvv3SJV8D0PB+Brcm3KLoxNRbHI4rY Z2dg+qzUrk/SJ+OBd58kCpbew6l0rhLra1UbaFHGLZ4c2NnHa8dR9tv6E= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to:cc :from:subject:message-id:date:mime-version:content-type; s= default; bh=myvOx/XGeKsOdXSbiU5xqDMkDt0=; b=HRxel/uuLh4gMGhqxva3 BY2YBqLntHCM/XZhhoQUpLIci1R0POaTWaxyUgZTIKVBlGk6pcltCZzDjRCCYxBx cz9fBsKAAGMm5DPTdkARXFlHqpqe5ElfycsxIj55VfELn2GrErDv5APq7HcHp8sH j037GXa1klQvxhnDSYWkrDk= Received: (qmail 63893 invoked by alias); 9 Nov 2015 21:58:54 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 63876 invoked by uid 89); 9 Nov 2015 21:58:53 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=BAYES_00, FREEMAIL_FROM, KAM_ASCII_DIVIDERS, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=no version=3.3.2 X-HELO: mail-qg0-f48.google.com Received: from mail-qg0-f48.google.com (HELO mail-qg0-f48.google.com) (209.85.192.48) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Mon, 09 Nov 2015 21:58:51 +0000 Received: by qgad10 with SMTP id d10so156782571qga.3 for ; Mon, 09 Nov 2015 13:58:49 -0800 (PST) X-Received: by 10.140.96.230 with SMTP id k93mr167305qge.7.1447106329522; Mon, 09 Nov 2015 13:58:49 -0800 (PST) Received: from ?IPv6:2601:181:c000:c497:a2a8:cdff:fe3e:b48? ([2601:181:c000:c497:a2a8:cdff:fe3e:b48]) by smtp.googlemail.com with ESMTPSA id v105sm39758qgd.35.2015.11.09.13.58.48 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Nov 2015 13:58:48 -0800 (PST) To: GCC Patches Cc: Thomas Schwinge From: Nathan Sidwell Subject: Remove unused openacc call Message-ID: <56411718.6080503@acm.org> Date: Mon, 9 Nov 2015 16:58:48 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 I've committed this to trunk. It nuke the now unused GOACC_GET_NUM_THREADS and GOACC_GET_THREAD_NUM calls. Also fixed up some comment typos I noticed nathan 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. Index: omp-low.c =================================================================== --- omp-low.c (revision 230038) +++ omp-low.c (working copy) @@ -5559,7 +5559,7 @@ lower_reduction_clauses (tree clauses, g { 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, g 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 *re } -/* 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 de 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 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 Index: omp-builtins.def =================================================================== --- omp-builtins.def (revision 230038) +++ omp-builtins.def (working copy) @@ -47,10 +47,6 @@ DEF_GOACC_BUILTIN (BUILT_IN_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)