|
From: <sv...@va...> - 2011-09-11 14:43:49
|
Author: florian
Date: 2011-09-11 15:39:02 +0100 (Sun, 11 Sep 2011)
New Revision: 12031
Log:
This testcase is sensitive to some sleep period. On slower
machines we need to sleep longer. See bugzilla #268623 comment #2.
So let's sleep 500ms instead of 100ms, get rid of the load
barrier and enable the testcase for s390x again.
Modified:
trunk/helgrind/tests/annotate_hbefore.c
trunk/helgrind/tests/annotate_hbefore.vgtest
Modified: trunk/helgrind/tests/annotate_hbefore.c
===================================================================
--- trunk/helgrind/tests/annotate_hbefore.c 2011-09-10 21:46:08 UTC (rev 12030)
+++ trunk/helgrind/tests/annotate_hbefore.c 2011-09-11 14:39:02 UTC (rev 12031)
@@ -235,9 +235,9 @@
int shared_var = 0; // is not raced upon
-void delay100ms ( void )
+void delay500ms ( void )
{
- struct timespec ts = { 0, 100 * 1000 * 1000 };
+ struct timespec ts = { 0, 500 * 1000 * 1000 };
nanosleep(&ts, NULL);
}
@@ -245,13 +245,8 @@
{
UWord w0 = *w;
UWord volatile * wV = w;
- while (*wV == w0) {
-#ifdef VGA_s390x
- asm volatile ("bcr 15,0\n\t"); /* load barrier */
-#else
+ while (*wV == w0)
;
-#endif
- }
ANNOTATE_HAPPENS_AFTER(w);
}
@@ -266,11 +261,11 @@
void* thread_fn1 ( void* arg )
{
UWord* w = (UWord*)arg;
- delay100ms(); // ensure t2 gets to its wait first
+ delay500ms(); // ensure t2 gets to its wait first
shared_var = 1; // first access
do_signal(w); // cause h-b edge to second thread
- delay100ms();
+ delay500ms();
return NULL;
}
@@ -280,7 +275,7 @@
do_wait(w); // wait for h-b edge from first thread
shared_var = 2; // second access
- delay100ms();
+ delay500ms();
return NULL;
}
Modified: trunk/helgrind/tests/annotate_hbefore.vgtest
===================================================================
--- trunk/helgrind/tests/annotate_hbefore.vgtest 2011-09-10 21:46:08 UTC (rev 12030)
+++ trunk/helgrind/tests/annotate_hbefore.vgtest 2011-09-11 14:39:02 UTC (rev 12031)
@@ -1,3 +1,2 @@
-prereq: (../../tests/arch_test s390x; if [ $? = 0 ]; then false; else true; fi)
vgopts: -q
prog: annotate_hbefore
|