From patchwork Wed Aug 7 11:50:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul-Antoine Arras X-Patchwork-Id: 1970001 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=wVZYE73q; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Wf7n66ZDgz1yfM for ; Wed, 7 Aug 2024 21:51:38 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 564F5385DDE3 for ; Wed, 7 Aug 2024 11:51:36 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by sourceware.org (Postfix) with ESMTPS id C2B3B3858C41 for ; Wed, 7 Aug 2024 11:50:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C2B3B3858C41 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=baylibre.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org C2B3B3858C41 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::336 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1723031465; cv=none; b=hzEBWjGz8G7SYXdQH1BGyiCJddMuP0K3ZBBtqyr8ypobcqbxYVlloz4k/XOfQM224fQxxww9EQwzGmoVaiqmTWAoaJFaQSkmRyN8BX5qtNkpqiPGw5btclX6l5JvYG17vP7oWbWHsvGJVbQ/GA2yyo/mb4JguibR7RxQwHpcoHY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1723031465; c=relaxed/simple; bh=X2cVMRzq4Sxa7zt42x7MvK8PlwP9rQ3l8rXYHcV+nR4=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=T25RWBQp1snuV2vtJ+myFAdV2khPAl6n0Z2NBIBRd7q1Qm/dOY7VyCQCCN8SoaddyKCxiM3xzGZmvdl7ALHDesFMn0QCwVTEuA3cSI5Lfs3lIMQy7Plh/tzq/BV5SvosoiL7ENNlxm/zxUfPwrngCC20yfP3IWZyj8l5wObxHuQ= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4281d812d3eso16132585e9.3 for ; Wed, 07 Aug 2024 04:50:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1723031458; x=1723636258; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=DLLjQ5k00jvAvcoLTb9wxvUClJu82RDJwHg/OVUu4JA=; b=wVZYE73qQYc1PgQhK5dZkNJBzJtGoJi82HOf4ddMGmdqGmcBUVB1oS0U+vk++O1kar 9j9oHnH6X2DovO/f4t2t2ma9LezN2zv2pRNu6n5vIafxXWJfH3exG7rV5GU5HkTZDkYe azJMIvTyJTywG1pTejI+Fy+isdS/zOSzwgItZ2UNTJrMhrgjK8F5H4YXKUcT2pzF0Z/9 y0oJW0l0LXXmBnRneZvlT+1Bhylc0zJ3oNjTQGZwZR/K9+KARrszaFnIsWs9GDQAabOS 8UdIFo5kgMUM9stS3WIAJRiww3ppIXf6FYJI8UYdl+z2bhL+rng0VW16mZKnjnugRrWU jvMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723031458; x=1723636258; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=DLLjQ5k00jvAvcoLTb9wxvUClJu82RDJwHg/OVUu4JA=; b=JL5zC4yBrqxAlLfdoq0FivIipg+ocf13O3v9I+59xBUumKUgSWmMP8mxGdi4LFD33o nKKVar8Y7/QLosF2xc2l8PMUTcTD9xLDszvMvxn75MbWlVE/F2fIgJGR6Jv8+i5Na7iP ytv/vbGw9tqtEtXiPDMY2RKn3VsBjPKlQgkRvui5jpwo6HkQm9dKsX+F08e2olP809EZ a15+i2kmmv2+7x97bnWtnBDkOX0Ebz5QS9hgJ9IdWDQPmnyJrEUW7HlQty5iyI4KMOPE GhdY7rNxhGoHAYmWTRlh7HytM9/JibBLfz4TlKCWhqPPgJTnU6RGRzL4GE0U7dPoQ27i REyA== X-Gm-Message-State: AOJu0Yy54TrNWVnPkqJyomGNVpcQhVoilRxggTRmmkY+zhs1cEV7AMgH Sh+da2LtsWj0jAz8qE9+sV3OniifGtHh0vM0isIt++xhcJbnpx7ZXvm8ybikx0vgtraeZG+U/Ta t8tI= X-Google-Smtp-Source: AGHT+IGPy8cHuVcUGWStrzgLx3Wg0yNasvr1SW9djo4binF0Fbbkfx/Zqnqplf7Xyf8XyMdHI8ZjFg== X-Received: by 2002:a05:600c:45d5:b0:424:aa35:9fb9 with SMTP id 5b1f17b1804b1-428e6af285cmr162507815e9.2.1723031457658; Wed, 07 Aug 2024 04:50:57 -0700 (PDT) Received: from localhost.localdomain (vlan-185-velingrad-59.comnet.bg. [84.54.185.59]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4290580c970sm25430125e9.46.2024.08.07.04.50.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Aug 2024 04:50:57 -0700 (PDT) From: Paul-Antoine Arras To: gcc-patches@gcc.gnu.org Cc: Paul-Antoine Arras Subject: [PATCH v3 0/7] OpenMP: dispatch + adjust_args support Date: Wed, 7 Aug 2024 14:50:05 +0300 Message-ID: <20240807115012.3632947-1-parras@baylibre.com> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-Spam-Status: No, score=-3.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, KAM_SHORT, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org This is a respin of my patchset implementing both the `dispatch` construct and the `adjust_args` clause to the `declare variant` directive. The previous submission can be found there: https://gcc.gnu.org/pipermail/gcc-patches/2024-July/657151.html. Beside being rebased, this new iteration has the following changes: * Remove `need_device_ptr` as pseudo-trait set selector and pass `adjust_args` list as attribute to the base function. This also ensures that the list will survive multiple declarations; * OpenMP 5.1 mandated that each dispatch construct should generate an explicit task. This requirement has been lifted in 5.2, so we removed it; * As a result, some clauses are now handled differently: nowait has no effect, depend is moved to a taskwait construct and the default-device ICV has to be restored at the end of the dispatch region; * Update test cases. Paul-Antoine Arras (7): OpenMP: dispatch + adjust_args tree data structures and front-end interfaces OpenMP: middle-end support for dispatch + adjust_args OpenMP: C front-end support for dispatch + adjust_args OpenMP: C++ front-end support for dispatch + adjust_args OpenMP: common C/C++ testcases for dispatch + adjust_args OpenMP: Fortran front-end support for dispatch + adjust_args OpenMP: update documentation for dispatch and adjust_args gcc/builtin-types.def | 1 + gcc/c-family/c-attribs.cc | 2 + gcc/c-family/c-omp.cc | 4 +- gcc/c-family/c-pragma.cc | 1 + gcc/c-family/c-pragma.h | 3 + gcc/c/c-parser.cc | 522 +++++++++++++-- gcc/c/c-typeck.cc | 2 + gcc/cp/decl.cc | 7 + gcc/cp/parser.cc | 631 ++++++++++++++++-- gcc/cp/semantics.cc | 20 + gcc/fortran/dump-parse-tree.cc | 17 + gcc/fortran/frontend-passes.cc | 2 + gcc/fortran/gfortran.h | 11 +- gcc/fortran/match.h | 1 + gcc/fortran/openmp.cc | 192 +++++- gcc/fortran/parse.cc | 39 +- gcc/fortran/resolve.cc | 2 + gcc/fortran/st.cc | 1 + gcc/fortran/trans-decl.cc | 9 +- gcc/fortran/trans-openmp.cc | 135 ++++ gcc/fortran/trans.cc | 1 + gcc/fortran/types.def | 1 + gcc/gimple-low.cc | 1 + gcc/gimple-pretty-print.cc | 33 + gcc/gimple-walk.cc | 1 + gcc/gimple.cc | 20 + gcc/gimple.def | 5 + gcc/gimple.h | 33 +- gcc/gimplify.cc | 421 +++++++++++- gcc/gimplify.h | 2 + gcc/omp-builtins.def | 6 + gcc/omp-expand.cc | 18 + gcc/omp-general.cc | 14 +- gcc/omp-low.cc | 35 + gcc/omp-selectors.h | 1 + .../c-c++-common/gomp/adjust-args-1.c | 30 + .../c-c++-common/gomp/adjust-args-2.c | 31 + .../c-c++-common/gomp/declare-variant-2.c | 4 +- gcc/testsuite/c-c++-common/gomp/dispatch-1.c | 65 ++ gcc/testsuite/c-c++-common/gomp/dispatch-2.c | 28 + gcc/testsuite/c-c++-common/gomp/dispatch-3.c | 12 + gcc/testsuite/c-c++-common/gomp/dispatch-4.c | 18 + gcc/testsuite/c-c++-common/gomp/dispatch-5.c | 27 + gcc/testsuite/c-c++-common/gomp/dispatch-6.c | 18 + gcc/testsuite/c-c++-common/gomp/dispatch-7.c | 21 + gcc/testsuite/g++.dg/gomp/adjust-args-1.C | 39 ++ gcc/testsuite/g++.dg/gomp/adjust-args-2.C | 51 ++ gcc/testsuite/g++.dg/gomp/dispatch-1.C | 53 ++ gcc/testsuite/g++.dg/gomp/dispatch-2.C | 62 ++ gcc/testsuite/gcc.dg/gomp/adjust-args-1.c | 32 + gcc/testsuite/gcc.dg/gomp/dispatch-1.c | 53 ++ .../gfortran.dg/gomp/adjust-args-1.f90 | 58 ++ .../gfortran.dg/gomp/adjust-args-2.f90 | 18 + .../gfortran.dg/gomp/adjust-args-3.f90 | 27 + .../gfortran.dg/gomp/adjust-args-4.f90 | 58 ++ .../gfortran.dg/gomp/adjust-args-5.f90 | 58 ++ .../gfortran.dg/gomp/declare-variant-2.f90 | 6 +- .../gomp/declare-variant-21-aux.f90 | 25 + .../gfortran.dg/gomp/declare-variant-21.f90 | 22 + gcc/testsuite/gfortran.dg/gomp/dispatch-1.f90 | 77 +++ gcc/testsuite/gfortran.dg/gomp/dispatch-2.f90 | 79 +++ gcc/testsuite/gfortran.dg/gomp/dispatch-3.f90 | 39 ++ gcc/testsuite/gfortran.dg/gomp/dispatch-4.f90 | 19 + gcc/testsuite/gfortran.dg/gomp/dispatch-5.f90 | 25 + gcc/testsuite/gfortran.dg/gomp/dispatch-6.f90 | 39 ++ gcc/testsuite/gfortran.dg/gomp/dispatch-7.f90 | 26 + gcc/testsuite/gfortran.dg/gomp/dispatch-8.f90 | 33 + gcc/tree-core.h | 7 + gcc/tree-inline.cc | 7 + gcc/tree-pretty-print.cc | 21 + gcc/tree.cc | 4 + gcc/tree.def | 5 + gcc/tree.h | 7 + libgomp/libgomp.texi | 4 +- .../libgomp.c-c++-common/dispatch-1.c | 76 +++ .../libgomp.c-c++-common/dispatch-2.c | 84 +++ 76 files changed, 3421 insertions(+), 141 deletions(-) create mode 100644 gcc/testsuite/c-c++-common/gomp/adjust-args-1.c create mode 100644 gcc/testsuite/c-c++-common/gomp/adjust-args-2.c create mode 100644 gcc/testsuite/c-c++-common/gomp/dispatch-1.c create mode 100644 gcc/testsuite/c-c++-common/gomp/dispatch-2.c create mode 100644 gcc/testsuite/c-c++-common/gomp/dispatch-3.c create mode 100644 gcc/testsuite/c-c++-common/gomp/dispatch-4.c create mode 100644 gcc/testsuite/c-c++-common/gomp/dispatch-5.c create mode 100644 gcc/testsuite/c-c++-common/gomp/dispatch-6.c create mode 100644 gcc/testsuite/c-c++-common/gomp/dispatch-7.c create mode 100644 gcc/testsuite/g++.dg/gomp/adjust-args-1.C create mode 100644 gcc/testsuite/g++.dg/gomp/adjust-args-2.C create mode 100644 gcc/testsuite/g++.dg/gomp/dispatch-1.C create mode 100644 gcc/testsuite/g++.dg/gomp/dispatch-2.C create mode 100644 gcc/testsuite/gcc.dg/gomp/adjust-args-1.c create mode 100644 gcc/testsuite/gcc.dg/gomp/dispatch-1.c create mode 100644 gcc/testsuite/gfortran.dg/gomp/adjust-args-1.f90 create mode 100644 gcc/testsuite/gfortran.dg/gomp/adjust-args-2.f90 create mode 100644 gcc/testsuite/gfortran.dg/gomp/adjust-args-3.f90 create mode 100644 gcc/testsuite/gfortran.dg/gomp/adjust-args-4.f90 create mode 100644 gcc/testsuite/gfortran.dg/gomp/adjust-args-5.f90 create mode 100644 gcc/testsuite/gfortran.dg/gomp/declare-variant-21-aux.f90 create mode 100644 gcc/testsuite/gfortran.dg/gomp/declare-variant-21.f90 create mode 100644 gcc/testsuite/gfortran.dg/gomp/dispatch-1.f90 create mode 100644 gcc/testsuite/gfortran.dg/gomp/dispatch-2.f90 create mode 100644 gcc/testsuite/gfortran.dg/gomp/dispatch-3.f90 create mode 100644 gcc/testsuite/gfortran.dg/gomp/dispatch-4.f90 create mode 100644 gcc/testsuite/gfortran.dg/gomp/dispatch-5.f90 create mode 100644 gcc/testsuite/gfortran.dg/gomp/dispatch-6.f90 create mode 100644 gcc/testsuite/gfortran.dg/gomp/dispatch-7.f90 create mode 100644 gcc/testsuite/gfortran.dg/gomp/dispatch-8.f90 create mode 100644 libgomp/testsuite/libgomp.c-c++-common/dispatch-1.c create mode 100644 libgomp/testsuite/libgomp.c-c++-common/dispatch-2.c