|
From: <sv...@va...> - 2011-10-05 13:15:16
|
Author: bart
Date: 2011-10-05 14:10:30 +0100 (Wed, 05 Oct 2011)
New Revision: 12103
Log:
drd, s390: Make the annotate_ignore_* and the pth_barrier* tests produce
the same output on s390 as on other systems (not tested yet).
Removed:
trunk/drd/tests/annotate_ignore_rw2.stderr.exp-s390x-mvc
trunk/drd/tests/annotate_ignore_write.stderr.exp-s390x-mvc
trunk/drd/tests/annotate_ignore_write2.stderr.exp-s390x-mvc
trunk/drd/tests/pth_barrier.stderr.exp-s390x-mvc
trunk/drd/tests/pth_barrier2.stderr.exp-s390x-mvc
trunk/drd/tests/pth_barrier3.stderr.exp-s390x-mvc
Modified:
trunk/drd/tests/annotate_ignore_rw.c
trunk/drd/tests/annotate_ignore_rw.stderr.exp
trunk/drd/tests/annotate_ignore_rw2.stderr.exp
trunk/drd/tests/annotate_ignore_write.c
trunk/drd/tests/annotate_ignore_write.stderr.exp
trunk/drd/tests/annotate_ignore_write2.stderr.exp
trunk/drd/tests/pth_barrier.c
Modified: trunk/drd/tests/annotate_ignore_rw.c
===================================================================
--- trunk/drd/tests/annotate_ignore_rw.c 2011-10-05 08:48:07 UTC (rev 12102)
+++ trunk/drd/tests/annotate_ignore_rw.c 2011-10-05 13:10:30 UTC (rev 12103)
@@ -2,13 +2,14 @@
#include <assert.h> /* assert() */
#include <pthread.h>
+#include <stdint.h>
#include <stdio.h> /* EOF */
#include <unistd.h> /* getopt() */
#include "../../drd/drd.h"
-static int s_a;
-static int s_b;
-static int s_c;
+static int8_t s_a;
+static int8_t s_b;
+static int8_t s_c;
static void* thread_func(void* arg)
{
Modified: trunk/drd/tests/annotate_ignore_rw.stderr.exp
===================================================================
--- trunk/drd/tests/annotate_ignore_rw.stderr.exp 2011-10-05 08:48:07 UTC (rev 12102)
+++ trunk/drd/tests/annotate_ignore_rw.stderr.exp 2011-10-05 13:10:30 UTC (rev 12103)
@@ -1,8 +1,8 @@
-Conflicting load by thread 1 at 0x........ size 4
+Conflicting load by thread 1 at 0x........ size 1
at 0x........: main (annotate_ignore_rw.c:?)
Location 0x........ is 0 bytes inside local var "s_c"
-declared at annotate_ignore_rw.c:11, in frame #? of thread 1
+declared at annotate_ignore_rw.c:12, in frame #? of thread 1
Finished.
Modified: trunk/drd/tests/annotate_ignore_rw2.stderr.exp
===================================================================
--- trunk/drd/tests/annotate_ignore_rw2.stderr.exp 2011-10-05 08:48:07 UTC (rev 12102)
+++ trunk/drd/tests/annotate_ignore_rw2.stderr.exp 2011-10-05 13:10:30 UTC (rev 12103)
@@ -1,18 +1,18 @@
-Conflicting load by thread 1 at 0x........ size 4
+Conflicting load by thread 1 at 0x........ size 1
at 0x........: main (annotate_ignore_rw.c:?)
Location 0x........ is 0 bytes inside local var "s_b"
-declared at annotate_ignore_rw.c:10, in frame #? of thread 1
+declared at annotate_ignore_rw.c:11, in frame #? of thread 1
-Conflicting store by thread 1 at 0x........ size 4
+Conflicting store by thread 1 at 0x........ size 1
at 0x........: main (annotate_ignore_rw.c:?)
Location 0x........ is 0 bytes inside local var "s_a"
-declared at annotate_ignore_rw.c:9, in frame #? of thread 1
+declared at annotate_ignore_rw.c:10, in frame #? of thread 1
-Conflicting load by thread 1 at 0x........ size 4
+Conflicting load by thread 1 at 0x........ size 1
at 0x........: main (annotate_ignore_rw.c:?)
Location 0x........ is 0 bytes inside local var "s_c"
-declared at annotate_ignore_rw.c:11, in frame #? of thread 1
+declared at annotate_ignore_rw.c:12, in frame #? of thread 1
Finished.
Deleted: trunk/drd/tests/annotate_ignore_rw2.stderr.exp-s390x-mvc
===================================================================
--- trunk/drd/tests/annotate_ignore_rw2.stderr.exp-s390x-mvc 2011-10-05 08:48:07 UTC (rev 12102)
+++ trunk/drd/tests/annotate_ignore_rw2.stderr.exp-s390x-mvc 2011-10-05 13:10:30 UTC (rev 12103)
@@ -1,19 +0,0 @@
-
-Conflicting load by thread 1 at 0x........ size 1
- at 0x........: main (annotate_ignore_rw.c:?)
-Location 0x........ is 0 bytes inside local var "s_b"
-declared at annotate_ignore_rw.c:10, in frame #? of thread 1
-
-Conflicting store by thread 1 at 0x........ size 1
- at 0x........: main (annotate_ignore_rw.c:?)
-Location 0x........ is 0 bytes inside local var "s_a"
-declared at annotate_ignore_rw.c:9, in frame #? of thread 1
-
-Conflicting load by thread 1 at 0x........ size 4
- at 0x........: main (annotate_ignore_rw.c:?)
-Location 0x........ is 0 bytes inside local var "s_c"
-declared at annotate_ignore_rw.c:11, in frame #? of thread 1
-
-Finished.
-
-ERROR SUMMARY: 9 errors from 3 contexts (suppressed: 0 from 0)
Modified: trunk/drd/tests/annotate_ignore_write.c
===================================================================
--- trunk/drd/tests/annotate_ignore_write.c 2011-10-05 08:48:07 UTC (rev 12102)
+++ trunk/drd/tests/annotate_ignore_write.c 2011-10-05 13:10:30 UTC (rev 12103)
@@ -2,13 +2,14 @@
#include <assert.h> /* assert() */
#include <pthread.h>
+#include <stdint.h>
#include <stdio.h> /* EOF */
#include <unistd.h> /* getopt() */
#include "../../drd/drd.h"
-static int s_a;
-static int s_b;
-static int s_c;
+static int8_t s_a;
+static int8_t s_b;
+static int8_t s_c;
static void* thread_func(void* arg)
{
Modified: trunk/drd/tests/annotate_ignore_write.stderr.exp
===================================================================
--- trunk/drd/tests/annotate_ignore_write.stderr.exp 2011-10-05 08:48:07 UTC (rev 12102)
+++ trunk/drd/tests/annotate_ignore_write.stderr.exp 2011-10-05 13:10:30 UTC (rev 12103)
@@ -1,18 +1,18 @@
-Conflicting load by thread 1 at 0x........ size 4
+Conflicting load by thread 1 at 0x........ size 1
at 0x........: main (annotate_ignore_write.c:?)
Location 0x........ is 0 bytes inside local var "s_b"
-declared at annotate_ignore_write.c:10, in frame #? of thread 1
+declared at annotate_ignore_write.c:11, in frame #? of thread 1
-Conflicting load by thread 1 at 0x........ size 4
+Conflicting load by thread 1 at 0x........ size 1
at 0x........: main (annotate_ignore_write.c:?)
Location 0x........ is 0 bytes inside local var "s_c"
-declared at annotate_ignore_write.c:11, in frame #? of thread 1
+declared at annotate_ignore_write.c:12, in frame #? of thread 1
-Conflicting store by thread 1 at 0x........ size 4
+Conflicting store by thread 1 at 0x........ size 1
at 0x........: main (annotate_ignore_write.c:?)
Location 0x........ is 0 bytes inside local var "s_a"
-declared at annotate_ignore_write.c:9, in frame #? of thread 1
+declared at annotate_ignore_write.c:10, in frame #? of thread 1
Finished.
Deleted: trunk/drd/tests/annotate_ignore_write.stderr.exp-s390x-mvc
===================================================================
--- trunk/drd/tests/annotate_ignore_write.stderr.exp-s390x-mvc 2011-10-05 08:48:07 UTC (rev 12102)
+++ trunk/drd/tests/annotate_ignore_write.stderr.exp-s390x-mvc 2011-10-05 13:10:30 UTC (rev 12103)
@@ -1,19 +0,0 @@
-
-Conflicting load by thread 1 at 0x........ size 1
- at 0x........: main (annotate_ignore_write.c:?)
-Location 0x........ is 0 bytes inside local var "s_b"
-declared at annotate_ignore_write.c:10, in frame #? of thread 1
-
-Conflicting load by thread 1 at 0x........ size 1
- at 0x........: main (annotate_ignore_write.c:?)
-Location 0x........ is 0 bytes inside local var "s_c"
-declared at annotate_ignore_write.c:11, in frame #? of thread 1
-
-Conflicting store by thread 1 at 0x........ size 1
- at 0x........: main (annotate_ignore_write.c:?)
-Location 0x........ is 0 bytes inside local var "s_a"
-declared at annotate_ignore_write.c:9, in frame #? of thread 1
-
-Finished.
-
-ERROR SUMMARY: 12 errors from 3 contexts (suppressed: 0 from 0)
Modified: trunk/drd/tests/annotate_ignore_write2.stderr.exp
===================================================================
--- trunk/drd/tests/annotate_ignore_write2.stderr.exp 2011-10-05 08:48:07 UTC (rev 12102)
+++ trunk/drd/tests/annotate_ignore_write2.stderr.exp 2011-10-05 13:10:30 UTC (rev 12103)
@@ -1,23 +1,23 @@
-Conflicting load by thread 1 at 0x........ size 4
+Conflicting load by thread 1 at 0x........ size 1
at 0x........: main (annotate_ignore_write.c:?)
Location 0x........ is 0 bytes inside local var "s_b"
-declared at annotate_ignore_write.c:10, in frame #? of thread 1
+declared at annotate_ignore_write.c:11, in frame #? of thread 1
-Conflicting store by thread 1 at 0x........ size 4
+Conflicting store by thread 1 at 0x........ size 1
at 0x........: main (annotate_ignore_write.c:?)
Location 0x........ is 0 bytes inside local var "s_a"
-declared at annotate_ignore_write.c:9, in frame #? of thread 1
+declared at annotate_ignore_write.c:10, in frame #? of thread 1
-Conflicting load by thread 1 at 0x........ size 4
+Conflicting load by thread 1 at 0x........ size 1
at 0x........: main (annotate_ignore_write.c:?)
Location 0x........ is 0 bytes inside local var "s_c"
-declared at annotate_ignore_write.c:11, in frame #? of thread 1
+declared at annotate_ignore_write.c:12, in frame #? of thread 1
-Conflicting store by thread 1 at 0x........ size 4
+Conflicting store by thread 1 at 0x........ size 1
at 0x........: main (annotate_ignore_write.c:?)
Location 0x........ is 0 bytes inside local var "s_a"
-declared at annotate_ignore_write.c:9, in frame #? of thread 1
+declared at annotate_ignore_write.c:10, in frame #? of thread 1
Finished.
Deleted: trunk/drd/tests/annotate_ignore_write2.stderr.exp-s390x-mvc
===================================================================
--- trunk/drd/tests/annotate_ignore_write2.stderr.exp-s390x-mvc 2011-10-05 08:48:07 UTC (rev 12102)
+++ trunk/drd/tests/annotate_ignore_write2.stderr.exp-s390x-mvc 2011-10-05 13:10:30 UTC (rev 12103)
@@ -1,24 +0,0 @@
-
-Conflicting load by thread 1 at 0x........ size 1
- at 0x........: main (annotate_ignore_write.c:?)
-Location 0x........ is 0 bytes inside local var "s_b"
-declared at annotate_ignore_write.c:10, in frame #? of thread 1
-
-Conflicting store by thread 1 at 0x........ size 1
- at 0x........: main (annotate_ignore_write.c:?)
-Location 0x........ is 0 bytes inside local var "s_a"
-declared at annotate_ignore_write.c:9, in frame #? of thread 1
-
-Conflicting load by thread 1 at 0x........ size 1
- at 0x........: main (annotate_ignore_write.c:?)
-Location 0x........ is 0 bytes inside local var "s_c"
-declared at annotate_ignore_write.c:11, in frame #? of thread 1
-
-Conflicting store by thread 1 at 0x........ size 1
- at 0x........: main (annotate_ignore_write.c:?)
-Location 0x........ is 0 bytes inside local var "s_a"
-declared at annotate_ignore_write.c:9, in frame #? of thread 1
-
-Finished.
-
-ERROR SUMMARY: 16 errors from 4 contexts (suppressed: 0 from 0)
Modified: trunk/drd/tests/pth_barrier.c
===================================================================
--- trunk/drd/tests/pth_barrier.c 2011-10-05 08:48:07 UTC (rev 12102)
+++ trunk/drd/tests/pth_barrier.c 2011-10-05 13:10:30 UTC (rev 12103)
@@ -12,6 +12,7 @@
#include <assert.h>
#include <limits.h>
#include <pthread.h>
+#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -25,7 +26,7 @@
{
pthread_barrier_t* b;
pthread_t tid;
- int* array;
+ int8_t* array;
int iterations;
};
Deleted: trunk/drd/tests/pth_barrier.stderr.exp-s390x-mvc
===================================================================
--- trunk/drd/tests/pth_barrier.stderr.exp-s390x-mvc 2011-10-05 08:48:07 UTC (rev 12102)
+++ trunk/drd/tests/pth_barrier.stderr.exp-s390x-mvc 2011-10-05 13:10:30 UTC (rev 12103)
@@ -1 +0,0 @@
-ERROR SUMMARY: 4 errors from 1 contexts
Deleted: trunk/drd/tests/pth_barrier2.stderr.exp-s390x-mvc
===================================================================
--- trunk/drd/tests/pth_barrier2.stderr.exp-s390x-mvc 2011-10-05 08:48:07 UTC (rev 12102)
+++ trunk/drd/tests/pth_barrier2.stderr.exp-s390x-mvc 2011-10-05 13:10:30 UTC (rev 12103)
@@ -1 +0,0 @@
-ERROR SUMMARY: 128 errors
Deleted: trunk/drd/tests/pth_barrier3.stderr.exp-s390x-mvc
===================================================================
--- trunk/drd/tests/pth_barrier3.stderr.exp-s390x-mvc 2011-10-05 08:48:07 UTC (rev 12102)
+++ trunk/drd/tests/pth_barrier3.stderr.exp-s390x-mvc 2011-10-05 13:10:30 UTC (rev 12103)
@@ -1 +0,0 @@
-ERROR SUMMARY: 124 errors
|
|
From: Florian K. <br...@ac...> - 2011-10-05 14:52:51
|
On 10/05/2011 09:10 AM, sv...@va... wrote:
> Author: bart
> Date: 2011-10-05 14:10:30 +0100 (Wed, 05 Oct 2011)
> New Revision: 12103
>
> Log:
> drd, s390: Make the annotate_ignore_* and the pth_barrier* tests produce
> the same output on s390 as on other systems (not tested yet).
>
>
Thanks for the patch. There were some GCC warnings about incompatible
pointers which I fixed with the patch below. After applying it the
pth_barrier testcases compare (tested on x86 and s390x).
Florian
Index: drd/tests/pth_barrier.c
===================================================================
--- drd/tests/pth_barrier.c (revision 12103)
+++ drd/tests/pth_barrier.c (working copy)
@@ -47,7 +47,7 @@
static void* threadfunc(struct threadinfo* p)
{
int i;
- int* const array = p->array;
+ int8_t* const array = p->array;
pthread_barrier_t* const b = p->b;
if (! s_silent)
printf("thread %lx iteration 0\n", pthread_self());
@@ -70,7 +70,7 @@
pthread_attr_t attr;
struct threadinfo* t;
pthread_barrier_t b;
- int* array;
+ int8_t* array;
t = malloc(nthread * sizeof(struct threadinfo));
array = malloc(iterations * sizeof(array[0]));
|