From patchwork Wed Dec 12 08:25:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 1011672 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-492194-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="kyFWcZCT"; dkim-atps=neutral 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 43F8y52Xjfz9s8J for ; Wed, 12 Dec 2018 19:25:15 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :subject:to:references:from:message-id:date:mime-version :in-reply-to:content-type; q=dns; s=default; b=PQhJAKBuENo155tmA zf2ynZ9J2gIcbZsAv3CHfRuW5lFh3gvcx8WExnyepMD/MoMHm4YmCiQHqcN97wHw nW3cT43gy8aowAdH2EuvqehlIAi6cQJO/ZCqO3IhFwrosFGRCsP46NJD6QmHdSTX kZJ4QepZDWQ0KTnOluZE20tAWw= 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 :subject:to:references:from:message-id:date:mime-version :in-reply-to:content-type; s=default; bh=HK39Xv/cPay1ppmd0pRRoAN GE9U=; b=kyFWcZCT9dzTqsbVNDvwZM0/cvivYUwe9kzQSd71JxBfE9pd5H3tmcf HLDBZQw/OjRoPVaJw8KgthVua33ZZY7sxdUDUXAIt4SqpOAiUNht7Gu0TxQtvA5p MBY6/sZjJlxo8ybB3khYvzItQQc9MvaeELkv9YVb5n2cuFc1nalM= Received: (qmail 95887 invoked by alias); 12 Dec 2018 08:25:06 -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 89182 invoked by uid 89); 12 Dec 2018 08:24:55 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS, UPPERCASE_50_75 autolearn=ham version=3.3.2 spammy= X-HELO: mx1.suse.de Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 12 Dec 2018 08:24:52 +0000 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id B59D7AFBF; Wed, 12 Dec 2018 08:24:49 +0000 (UTC) Subject: [openmp] Fix openmp 5.0 builtin function types To: Jakub Jelinek , gcc-patches@gcc.gnu.org References: <20181108172450.GP11625@tucnak> From: Tom de Vries Message-ID: <7637b38b-4107-08f3-9037-9a34a92b8e69@suse.de> Date: Wed, 12 Dec 2018 09:25:06 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.3.0 MIME-Version: 1.0 In-Reply-To: <20181108172450.GP11625@tucnak> X-IsSubscribed: yes [ was: Re: [committed 1a/4] (Partial) OpenMP 5.0 support for GCC 9 (gcc middle-end) ] On 08-11-18 18:24, Jakub Jelinek wrote: > * omp-builtins.def (BUILT_IN_GOMP_TASKWAIT_DEPEND, > BUILT_IN_GOMP_LOOP_NONMONOTONIC_RUNTIME_START, > BUILT_IN_GOMP_LOOP_MAYBE_NONMONOTONIC_RUNTIME_START, > BUILT_IN_GOMP_LOOP_START, BUILT_IN_GOMP_LOOP_ORDERED_START, > BUILT_IN_GOMP_LOOP_DOACROSS_START, > BUILT_IN_GOMP_LOOP_NONMONOTONIC_RUNTIME_NEXT, > BUILT_IN_GOMP_LOOP_MAYBE_NONMONOTONIC_RUNTIME_NEXT, > BUILT_IN_GOMP_LOOP_ULL_NONMONOTONIC_RUNTIME_START, > BUILT_IN_GOMP_LOOP_ULL_MAYBE_NONMONOTONIC_RUNTIME_START, > BUILT_IN_GOMP_LOOP_ULL_START, BUILT_IN_GOMP_LOOP_ULL_ORDERED_START, > BUILT_IN_GOMP_LOOP_ULL_DOACROSS_START, > BUILT_IN_GOMP_LOOP_ULL_NONMONOTONIC_RUNTIME_NEXT, > BUILT_IN_GOMP_LOOP_ULL_MAYBE_NONMONOTONIC_RUNTIME_NEXT, > BUILT_IN_GOMP_PARALLEL_LOOP_NONMONOTONIC_RUNTIME, > BUILT_IN_GOMP_PARALLEL_LOOP_MAYBE_NONMONOTONIC_RUNTIME, > BUILT_IN_GOMP_PARALLEL_REDUCTIONS, BUILT_IN_GOMP_SECTIONS2_START, > BUILT_IN_GOMP_TEAMS_REG, BUILT_IN_GOMP_TASKGROUP_REDUCTION_REGISTER, > BUILT_IN_GOMP_TASKGROUP_REDUCTION_UNREGISTER, > BUILT_IN_GOMP_TASK_REDUCTION_REMAP, > BUILT_IN_GOMP_WORKSHARE_TASK_REDUCTION_UNREGISTER): New builtins. Hi, OK for trunk? Thanks, - Tom [openmp] Fix openmp 5.0 builtin function types Fix some openmp 5.0 builtin functions to match the type used in the implementation of those functions. This fixes some libgomp testsuite failures for x86_64 with nvptx accelerator. Build on x86_64 with nvptx accelerator, tested libgomp. 2018-12-12 Tom de Vries * omp-builtins.def (BUILT_IN_GOMP_LOOP_MAYBE_NONMONOTONIC_RUNTIME_START) (BUILT_IN_GOMP_LOOP_ULL_MAYBE_NONMONOTONIC_RUNTIME_START) (BUILT_IN_GOMP_PARALLEL_LOOP_MAYBE_NONMONOTONIC_RUNTIME): Fix function type. --- gcc/omp-builtins.def | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gcc/omp-builtins.def b/gcc/omp-builtins.def index 70051635fa0..6e22065461a 100644 --- a/gcc/omp-builtins.def +++ b/gcc/omp-builtins.def @@ -130,7 +130,7 @@ DEF_GOMP_BUILTIN (BUILT_IN_GOMP_LOOP_NONMONOTONIC_RUNTIME_START, ATTR_NOTHROW_LEAF_LIST) DEF_GOMP_BUILTIN (BUILT_IN_GOMP_LOOP_MAYBE_NONMONOTONIC_RUNTIME_START, "GOMP_loop_maybe_nonmonotonic_runtime_start", - BT_FN_BOOL_LONG_LONG_LONG_LONG_LONGPTR_LONGPTR, + BT_FN_BOOL_LONG_LONG_LONG_LONGPTR_LONGPTR, ATTR_NOTHROW_LEAF_LIST) DEF_GOMP_BUILTIN (BUILT_IN_GOMP_LOOP_ORDERED_STATIC_START, "GOMP_loop_ordered_static_start", @@ -238,7 +238,7 @@ DEF_GOMP_BUILTIN (BUILT_IN_GOMP_LOOP_ULL_NONMONOTONIC_RUNTIME_START, ATTR_NOTHROW_LEAF_LIST) DEF_GOMP_BUILTIN (BUILT_IN_GOMP_LOOP_ULL_MAYBE_NONMONOTONIC_RUNTIME_START, "GOMP_loop_ull_maybe_nonmonotonic_runtime_start", - BT_FN_BOOL_BOOL_ULL_ULL_ULL_ULL_ULLPTR_ULLPTR, + BT_FN_BOOL_BOOL_ULL_ULL_ULL_ULLPTR_ULLPTR, ATTR_NOTHROW_LEAF_LIST) DEF_GOMP_BUILTIN (BUILT_IN_GOMP_LOOP_ULL_ORDERED_STATIC_START, "GOMP_loop_ull_ordered_static_start", @@ -353,7 +353,7 @@ DEF_GOMP_BUILTIN (BUILT_IN_GOMP_PARALLEL_LOOP_NONMONOTONIC_RUNTIME, ATTR_NOTHROW_LIST) DEF_GOMP_BUILTIN (BUILT_IN_GOMP_PARALLEL_LOOP_MAYBE_NONMONOTONIC_RUNTIME, "GOMP_parallel_loop_maybe_nonmonotonic_runtime", - BT_FN_VOID_OMPFN_PTR_UINT_LONG_LONG_LONG_LONG_UINT, + BT_FN_VOID_OMPFN_PTR_UINT_LONG_LONG_LONG_UINT, ATTR_NOTHROW_LIST) DEF_GOMP_BUILTIN (BUILT_IN_GOMP_LOOP_END, "GOMP_loop_end", BT_FN_VOID, ATTR_NOTHROW_LEAF_LIST)