Hi! On Thu, 30 Jul 2015 15:44:41 -0400, Nathan Sidwell <nat...@acm.org> wrote: > I've committed this to gomp4. It adds spinlock builtins [...]
These two test cases actually got committed to gomp-4_0-branch in the
later/unrelated r226508. In gomp-4_0-branch r227904, I now fixed these
as follows:
commit 5ab915af300d470df125fcf2445f56b601fbd80b
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri Sep 18 12:43:37 2015 +0000
Fix DejaGnu directives in nvptx spinlock tests
gcc/testsuite/
* gcc.target/nvptx/spinlock-1.c: Fix DejaGnu directives.
* gcc.target/nvptx/spinlock-2.c: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@227904
138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/testsuite/ChangeLog.gomp | 5 +++++
gcc/testsuite/gcc.target/nvptx/spinlock-1.c | 4 ++--
gcc/testsuite/gcc.target/nvptx/spinlock-2.c | 4 ++--
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git gcc/testsuite/ChangeLog.gomp gcc/testsuite/ChangeLog.gomp
index 1135e84..b14167e 100644
--- gcc/testsuite/ChangeLog.gomp
+++ gcc/testsuite/ChangeLog.gomp
@@ -1,3 +1,8 @@
+2015-09-18 Thomas Schwinge <tho...@codesourcery.com>
+
+ * gcc.target/nvptx/spinlock-1.c: Fix DejaGnu directives.
+ * gcc.target/nvptx/spinlock-2.c: Likewise.
+
2015-09-11 Cesar Philippidis <ce...@codesourcery.com>
* c-c++-common/goacc/parallel-reduction.c: Enclose the parallel
diff --git gcc/testsuite/gcc.target/nvptx/spinlock-1.c
gcc/testsuite/gcc.target/nvptx/spinlock-1.c
index 0b458c6..b464ad9 100644
--- gcc/testsuite/gcc.target/nvptx/spinlock-1.c
+++ gcc/testsuite/gcc.target/nvptx/spinlock-1.c
@@ -7,5 +7,5 @@ void Foo ()
/* { dg-final { scan-assembler-times ".atom.global.cas.b32" 2 } } */
-/* { dg-final { scan-assember ".global .u32 __global_lock;" } } */
-/* { dg-final { scan-assember-not ".shared .u32 __shared_lock;" } } */
+/* { dg-final { scan-assembler ".global .u32 __global_lock;" } } */
+/* { dg-final { scan-assembler-not ".shared .u32 __shared_lock;" } } */
diff --git gcc/testsuite/gcc.target/nvptx/spinlock-2.c
gcc/testsuite/gcc.target/nvptx/spinlock-2.c
index a327179..9a51d3f 100644
--- gcc/testsuite/gcc.target/nvptx/spinlock-2.c
+++ gcc/testsuite/gcc.target/nvptx/spinlock-2.c
@@ -6,5 +6,5 @@ void Foo ()
}
/* { dg-final { scan-assembler-times ".atom.shared.cas.b32" 2 } } */
-/* { dg-final { scan-assember ".shared .u32 __shared_lock;" } } */
-/* { dg-final { scan-assember-not ".shared .u32 __shared_lock;" } } */
+/* { dg-final { scan-assembler ".shared .u32 __shared_lock;" } } */
+/* { dg-final { scan-assembler-not ".global .u32 __global_lock;" } } */
Grüße,
Thomas
signature.asc
Description: PGP signature
