From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from esa4.mentor.iphmx.com (esa4.mentor.iphmx.com [68.232.137.252]) by sourceware.org (Postfix) with ESMTPS id 76B3E3840C0A for ; Mon, 22 Jun 2020 12:15:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 76B3E3840C0A Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=Julian_Brown@mentor.com IronPort-SDR: opIBKNAlncgWPrIv8O81MKTH5vMJfIJmcocsvGKy8abBjKPuZSYtRJB0IOPdi5oFJS9q1HwLx9 L8Z7xS6LYosI7BcfJc+TZfd3rMIZrvnI2aIkpdCVpoo4EAkBnv8cLsTSK9IVV34UOSBw314oWq oHGwxUsVQ2t0c1Ha4mDQm7GBMpun9S5EHwBY4tcNrYyGvY3cKPcKaLHBmLSWUlg8z+/xByQJDh hXQD2KAtlGdLAGBNuy4L+KZy40qsziQvuUDZeMedw/pCpfOzunUlVL/SXEZR9ITTC3Yg9dODMb hdw= X-IronPort-AV: E=Sophos;i="5.75,266,1589270400"; d="scan'208";a="50176515" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 22 Jun 2020 04:15:05 -0800 IronPort-SDR: SsUU0EGjoUBwEI5H/dv7spv8RI++K49pzkSiAKCG3FsNNLC67cHn251x4lcgPCIyY4qZ9C29+W IOudj5g1eWa/wGdSBFqk+juR03LgpZw8iL9O6Cof1ZKZR6Qfe6nGhJGnczK7O1jZhlclgt7v8i +kaKu1y3+yk+9+QDO88T96IYU+9PRALxoj9FmGOTouoejR0jhIY6wvqT7+5q1WzQSz7BrBZYh2 JQ1cjiP8GxOJPBBxI8ASUQCUpp4HV4QaTRc5TF0GWL43clr7vtmaaej7buHSdPyq9F0b/lwJRO J7s= From: Julian Brown To: CC: Thomas Schwinge , Jakub Jelinek , Catherine Moore Subject: [PATCH 1/2] [OpenACC] Refuse update/copyout for blocks with attached pointers Date: Mon, 22 Jun 2020 05:14:43 -0700 Message-ID: <067e77d09132cbd32cc3f32c5af525f8edc2f53a.1592826181.git.julian@codesourcery.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: SVR-IES-MBX-04.mgc.mentorg.com (139.181.222.4) To SVR-IES-MBX-03.mgc.mentorg.com (139.181.222.3) X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2020 12:15:07 -0000 As mentioned in the parent email, this patch adds diagnostics for probably-broken code that updates (host/device) or copies-out blocks that still have attached pointers. Several new tests have been added. OK? Julian ChangeLog libgomp/ * oacc-mem.c (update_dev_host): Raise error on update of block with attached pointers. (goacc_exit_data_internal): Raise error on copyout of block with attached pointers. * target.c (gomp_unmap_vars_internal): Likewise. * testsuite/libgomp.oacc-c-c++-common/copyback-attached-dynamic-1.c: New test. * testsuite/libgomp.oacc-c-c++-common/delete-attached-dynamic-1.c: New test. * testsuite/libgomp.oacc-c-c++-common/copyback-attached-structural-1.c: New test. * testsuite/libgomp.oacc-c-c++-common/copyback-attached-structural-2.c: New test. * testsuite/libgomp.oacc-c-c++-common/copyback-attached-structural-3.c: New test. * testsuite/libgomp.oacc-c-c++-common/delete-attached-structural-1.c: New test. * testsuite/libgomp.oacc-c-c++-common/update-attached.c: New test. * testsuite/libgomp.oacc-fortran/deep-copy-6-no_finalize.F90: Update for new diagnostic. --- libgomp/oacc-mem.c | 42 ++++++++++++++++--- libgomp/target.c | 27 +++++++++--- .../copyback-attached-dynamic-1.c | 31 ++++++++++++++ .../copyback-attached-structural-1.c | 30 +++++++++++++ .../copyback-attached-structural-2.c | 31 ++++++++++++++ .../copyback-attached-structural-3.c | 26 ++++++++++++ .../delete-attached-dynamic-1.c | 26 ++++++++++++ .../delete-attached-structural-1.c | 25 +++++++++++ .../delete-attached-structural-2.c | 26 ++++++++++++ .../update-attached-1.c | 33 +++++++++++++++ .../deep-copy-6-no_finalize.F90 | 6 +-- 11 files changed, 290 insertions(+), 13 deletions(-) create mode 100644 libgomp/testsuite/libgomp.oacc-c-c++-common/copyback-attached-dynamic-1.c create mode 100644 libgomp/testsuite/libgomp.oacc-c-c++-common/copyback-attached-structural-1.c create mode 100644 libgomp/testsuite/libgomp.oacc-c-c++-common/copyback-attached-structural-2.c create mode 100644 libgomp/testsuite/libgomp.oacc-c-c++-common/copyback-attached-structural-3.c create mode 100644 libgomp/testsuite/libgomp.oacc-c-c++-common/delete-attached-dynamic-1.c create mode 100644 libgomp/testsuite/libgomp.oacc-c-c++-common/delete-attached-structural-1.c create mode 100644 libgomp/testsuite/libgomp.oacc-c-c++-common/delete-attached-structural-2.c create mode 100644 libgomp/testsuite/libgomp.oacc-c-c++-common/update-attached-1.c diff --git a/libgomp/oacc-mem.c b/libgomp/oacc-mem.c index 1816b06bf2d..cf054f14b12 100644 --- a/libgomp/oacc-mem.c +++ b/libgomp/oacc-mem.c @@ -865,6 +865,23 @@ update_dev_host (int is_dev, void *h, size_t s, int async) gomp_fatal ("[%p,%d] is not mapped", h, (int)s); } + if (n->aux && n->aux->attach_count) + { + size_t nptrs = (n->host_end - n->host_start + sizeof (void *) - 1) + / sizeof (void *); + for (size_t i = 0; i < nptrs; i++) + if (n->aux->attach_count[i] > 0) + { + gomp_mutex_unlock (&acc_dev->lock); + if (is_dev) + gomp_fatal ("[%p,+%d] device update would overwrite attached " + "pointers", h, (int) s); + else + gomp_fatal ("host update from block [%p,+%d] with attached " + "pointers", h, (int) s); + } + } + d = (void *) (n->tgt->tgt_start + n->tgt_offset + (uintptr_t) h - n->host_start); @@ -1329,11 +1346,26 @@ goacc_exit_data_internal (struct gomp_device_descr *acc_dev, size_t mapnum, if (copyfrom && n->refcount != REFCOUNT_INFINITY && (kind != GOMP_MAP_FROM || n->refcount == 0)) - gomp_copy_dev2host (acc_dev, aq, (void *) cur_node.host_start, - (void *) (n->tgt->tgt_start + n->tgt_offset - + cur_node.host_start - - n->host_start), - cur_node.host_end - cur_node.host_start); + { + if (n->aux && n->aux->attach_count) + { + size_t nptrs = (n->host_end - n->host_start + + sizeof (void *) - 1) / sizeof (void *); + for (size_t j = 0; j < nptrs; j++) + if (n->aux->attach_count[j] > 0) + { + gomp_mutex_unlock (&acc_dev->lock); + gomp_fatal ("copyout of block [%p,+%d] with " + "attached pointers", hostaddrs[i], + (int) size); + } + } + gomp_copy_dev2host (acc_dev, aq, (void *) cur_node.host_start, + (void *) (n->tgt->tgt_start + n->tgt_offset + + cur_node.host_start + - n->host_start), + cur_node.host_end - cur_node.host_start); + } if (n->refcount == 0) { diff --git a/libgomp/target.c b/libgomp/target.c index badc254a777..db6f56a8ff8 100644 --- a/libgomp/target.c +++ b/libgomp/target.c @@ -1649,11 +1649,28 @@ gomp_unmap_vars_internal (struct target_mem_desc *tgt, bool do_copyfrom, if ((do_unmap && do_copyfrom && tgt->list[i].copy_from) || tgt->list[i].always_copy_from) - gomp_copy_dev2host (devicep, aq, - (void *) (k->host_start + tgt->list[i].offset), - (void *) (k->tgt->tgt_start + k->tgt_offset - + tgt->list[i].offset), - tgt->list[i].length); + { + if (k->aux && k->aux->attach_count) + { + size_t nptrs = (k->host_end - k->host_start + + sizeof (void *) - 1) / sizeof (void *); + for (size_t j = 0; j < nptrs; j++) + if (k->aux->attach_count[j] > 0) + { + gomp_mutex_unlock (&devicep->lock); + gomp_fatal ("copyout of block [%p,+%d] with " + "attached pointers", + (void *) (k->host_start + tgt->list[i].offset), + (int) (k->host_end - k->host_start)); + } + } + gomp_copy_dev2host (devicep, aq, + (void *) (k->host_start + tgt->list[i].offset), + (void *) (k->tgt->tgt_start + k->tgt_offset + + tgt->list[i].offset), + tgt->list[i].length); + } + if (do_unmap) { struct target_mem_desc *k_tgt = k->tgt; diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/copyback-attached-dynamic-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/copyback-attached-dynamic-1.c new file mode 100644 index 00000000000..bc4e297fa6f --- /dev/null +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/copyback-attached-dynamic-1.c @@ -0,0 +1,31 @@ +/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */ + +#include + +struct mystruct { + int *arr; +}; + +int +main (int argc, char *argv[]) +{ + int localarray[1024]; + struct mystruct s; + s.arr = localarray; + + #pragma acc enter data copyin(s) + + #pragma acc data copy(s.arr[0:1024]) + { + /* This directive does one too many attachments: it should fail when we try + to do the copyout below. */ + #pragma acc enter data attach(s.arr) + /* { dg-output "copyout of block \\\[0x\[0-9a-f\]+,\\+\[0-9\]+\\\] with attached pointers" } */ + } + + #pragma acc exit data copyout(s) + + return 0; +} + +/* { dg-shouldfail "" } */ diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/copyback-attached-structural-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/copyback-attached-structural-1.c new file mode 100644 index 00000000000..7846c8c717c --- /dev/null +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/copyback-attached-structural-1.c @@ -0,0 +1,30 @@ +/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */ + +#include + +struct mystruct { + int *arr; +}; + +int +main (int argc, char *argv[]) +{ + int localarray[1024]; + struct mystruct s; + s.arr = localarray; + + #pragma acc data copy(s) + { + #pragma acc data copy(s.arr[0:1024]) + { + /* This directive does one too many attachments: it should fail when we try + to do the copyout below. */ + #pragma acc enter data attach(s.arr) + /* { dg-output "copyout of block \\\[0x\[0-9a-f\]+,\\+\[0-9\]+\\\] with attached pointers" } */ + } + } + + return 0; +} + +/* { dg-shouldfail "" } */ diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/copyback-attached-structural-2.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/copyback-attached-structural-2.c new file mode 100644 index 00000000000..bffa06eb725 --- /dev/null +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/copyback-attached-structural-2.c @@ -0,0 +1,31 @@ +/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */ + +#include + +struct mystruct { + int *arr; +}; + +int +main (int argc, char *argv[]) +{ + int localarray[1024]; + struct mystruct s; + s.arr = localarray; + + #pragma acc enter data copyin(localarray[0:1024]) + + #pragma acc data copy(s) + { + /* This directive does one too many attachments: it should fail when we try + to do the copyout below. */ + #pragma acc enter data attach(s.arr) + /* { dg-output "copyout of block \\\[0x\[0-9a-f\]+,\\+\[0-9\]+\\\] with attached pointers" } */ + } + + #pragma acc exit data delete(localarray[0:1024]) + + return 0; +} + +/* { dg-shouldfail "" } */ diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/copyback-attached-structural-3.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/copyback-attached-structural-3.c new file mode 100644 index 00000000000..4b21677af09 --- /dev/null +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/copyback-attached-structural-3.c @@ -0,0 +1,26 @@ +#include + +struct mystruct { + int *arr; +}; + +int +main (int argc, char *argv[]) +{ + int localarray[1024]; + struct mystruct s; + s.arr = localarray; + + #pragma acc enter data copyin(localarray[0:1024]) + + #pragma acc data copy(s) + { + /* Here the attach and detach balance: this should work. */ + #pragma acc enter data attach(s.arr) + #pragma acc exit data detach(s.arr) + } + + #pragma acc exit data delete(localarray[0:1024]) + + return 0; +} diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/delete-attached-dynamic-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/delete-attached-dynamic-1.c new file mode 100644 index 00000000000..e074d507fb2 --- /dev/null +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/delete-attached-dynamic-1.c @@ -0,0 +1,26 @@ +#include + +struct mystruct { + int *arr; +}; + +int +main (int argc, char *argv[]) +{ + int localarray[1024]; + struct mystruct s; + s.arr = localarray; + + #pragma acc enter data copyin(s) + + #pragma acc data copy(s.arr[0:1024]) + { + /* We delete 's' from the target below: this extra attachment is not + dangerous and we do not raise an error. */ + #pragma acc enter data attach(s.arr) + } + + #pragma acc exit data delete(s) + + return 0; +} diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/delete-attached-structural-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/delete-attached-structural-1.c new file mode 100644 index 00000000000..e675762ecd8 --- /dev/null +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/delete-attached-structural-1.c @@ -0,0 +1,25 @@ +#include + +struct mystruct { + int *arr; +}; + +int +main (int argc, char *argv[]) +{ + int localarray[1024]; + struct mystruct s; + s.arr = localarray; + + #pragma acc data copyin(s) + { + #pragma acc data copy(s.arr[0:1024]) + { + /* This directive does one too many attachments: it should fail when we try + to do the copyout below. */ + #pragma acc enter data attach(s.arr) + } + } + + return 0; +} diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/delete-attached-structural-2.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/delete-attached-structural-2.c new file mode 100644 index 00000000000..d2095255ad3 --- /dev/null +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/delete-attached-structural-2.c @@ -0,0 +1,26 @@ +#include + +struct mystruct { + int *arr; +}; + +int +main (int argc, char *argv[]) +{ + int localarray[1024]; + struct mystruct s; + s.arr = localarray; + + #pragma acc enter data copyin(localarray[0:1024]) + + #pragma acc data copyin(s) + { + /* We only try to copy in: the extra attachment we're left over with is not + harmful and we don't raise an error. */ + #pragma acc enter data attach(s.arr) + } + + #pragma acc exit data delete(localarray[0:1024]) + + return 0; +} diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/update-attached-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/update-attached-1.c new file mode 100644 index 00000000000..9f60bfa56f4 --- /dev/null +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/update-attached-1.c @@ -0,0 +1,33 @@ +/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */ + +#include + +struct mystruct { + int *arr; +}; + +int +main (int argc, char *argv[]) +{ + int localarray[1024]; + int localarray2[1024]; + struct mystruct s; + s.arr = localarray; + + #pragma acc enter data copyin(s) + + #pragma acc data copy(s.arr[0:1024]) + { + s.arr = localarray2; + /* This update is dangerous because we have attached pointers: raise an + error. */ + #pragma acc update device(s) + /* { dg-output "\\\[0x\[0-9a-f\]+,\\+\[0-9\]+\\\] device update would overwrite attached pointers" } */ + } + + #pragma acc exit data delete(s) + + return 0; +} + +/* { dg-shouldfail "" } */ diff --git a/libgomp/testsuite/libgomp.oacc-fortran/deep-copy-6-no_finalize.F90 b/libgomp/testsuite/libgomp.oacc-fortran/deep-copy-6-no_finalize.F90 index ad8da71d7c9..355a381b625 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/deep-copy-6-no_finalize.F90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/deep-copy-6-no_finalize.F90 @@ -8,7 +8,7 @@ ! { dg-output ".*CheCKpOInT1(\n|\r\n|\r)" } ! { dg-output ".*CheCKpOInT2(\n|\r\n|\r)" } -! Without the finalize, we do not detach properly so the host sees a device -! pointer, and fails with this STOP code. -! { dg-output "STOP 7(\n|\r\n|\r)+" } +! Without the finalize, we do not detach properly and raise an error on attempting +! the copyout. +! { dg-output ".*copyout of block \\\[0x\[0-9a-f\]+,\\+\[0-9\]+\\\] with attached pointers(\n|\r\n|\r)+" } ! { dg-shouldfail "" } -- 2.23.0