From c51cc3b96f0b562deaffcfbcc51043aed216801a Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Fri, 7 May 2021 10:57:36 +0200 Subject: [PATCH] Fix up 'c-c++-common/goacc/firstprivate-mappings-1.c' for C, non-LP64 Follow-up to recent og10 commit a70b5b1aa8b3d32f6728dbfcfc00b0cff8c5219d "OpenMP 5.0: Implement relaxation of implicit map vs. existing device mappings". gcc/testsuite/ * c-c++-common/goacc/firstprivate-mappings-1.c: Fix up for C, non-LP64. --- gcc/testsuite/ChangeLog.omp | 5 +++++ gcc/testsuite/c-c++-common/goacc/firstprivate-mappings-1.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp index 45277a37fd2a..b18615a1603b 100644 --- a/gcc/testsuite/ChangeLog.omp +++ b/gcc/testsuite/ChangeLog.omp @@ -1,3 +1,8 @@ +2021-05-07 Thomas Schwinge + + * c-c++-common/goacc/firstprivate-mappings-1.c: Fix up for C, + non-LP64. + 2021-04-11 Hafiz Abid Qadeer Backport from mainline diff --git a/gcc/testsuite/c-c++-common/goacc/firstprivate-mappings-1.c b/gcc/testsuite/c-c++-common/goacc/firstprivate-mappings-1.c index f43e4b46cb69..ab09dee3d377 100644 --- a/gcc/testsuite/c-c++-common/goacc/firstprivate-mappings-1.c +++ b/gcc/testsuite/c-c++-common/goacc/firstprivate-mappings-1.c @@ -419,8 +419,8 @@ vla (int array_li) copyout (array_so) /* The gimplifier has created an implicit 'firstprivate' clause for the array length. - { dg-final { scan-tree-dump {(?n)#pragma omp target oacc_parallel firstprivate\(array_li.[0-9]+\) map\(from:array_so \[len: 4\]\)} omplower { target { ! c++ } } } } - { dg-final { scan-tree-dump {(?n)#pragma omp target oacc_parallel firstprivate\([^)]+\) map\(from:array_so \[len: 4\]\)} omplower { target { c++ } } } } + { dg-final { scan-tree-dump {(?n)#pragma omp target oacc_parallel firstprivate\(array_li.[0-9]+\) map\(from:array_so \[len: 4\]\) \[} omplower { target { c && lp64 } } } } + { dg-final { scan-tree-dump {(?n)#pragma omp target oacc_parallel firstprivate\(D\.[0-9]+\) map\(from:array_so \[len: 4\]\) \[} omplower { target { c++ } } } } (C++ computes an intermediate value, so can't scan for 'firstprivate(array_li)'.) */ /* For C, non-LP64, the gimplifier has also created a mapping for the array itself; PR90859. -- 2.47.2