The attached patch makes the htm tests on s390 less sensitive to spurious abort. Please check the commit comment for details. The modified tests have been run once on a zEC12.
Ciao Dominik ^_^ ^_^ -- Dominik Vogt IBM Germany
gcc/testsuite/ChangeLog * gcc.target/s390/htm-builtins-1.c (DEFAULT_MAX_REPETITIONS) (DEFAULT_REQUIRED_QUORUM, NUM_WARMUP_RUNS): Lower requirements for successful test. * gcc.target/s390/htm-builtins-2.c (DEFAULT_MAX_REPETITIONS) (DEFAULT_REQUIRED_QUORUM): Likewise.
>From cd354b024c5e129575465b9088b0e0d03340c8f0 Mon Sep 17 00:00:00 2001 From: Dominik Vogt <v...@linux.vnet.ibm.com> Date: Fri, 18 Nov 2016 14:06:28 +0100 Subject: [PATCH] S390: Lower requirements for successful htm tests. Due to spurious aborts, requiring four successful tests out of five fails too often; accept four out of seven instead. Reduce number of warmup passes. --- gcc/testsuite/gcc.target/s390/htm-builtins-1.c | 6 +++--- gcc/testsuite/gcc.target/s390/htm-builtins-2.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gcc/testsuite/gcc.target/s390/htm-builtins-1.c b/gcc/testsuite/gcc.target/s390/htm-builtins-1.c index c90490f..ff43be9 100644 --- a/gcc/testsuite/gcc.target/s390/htm-builtins-1.c +++ b/gcc/testsuite/gcc.target/s390/htm-builtins-1.c @@ -13,9 +13,9 @@ /* ---------------------------- local definitions -------------------------- */ -#define DEFAULT_MAX_REPETITIONS 5 -#define DEFAULT_REQUIRED_QUORUM ((DEFAULT_MAX_REPETITIONS) - 1) -#define NUM_WARMUP_RUNS 10 +#define DEFAULT_MAX_REPETITIONS 7 +#define DEFAULT_REQUIRED_QUORUM 4 +#define NUM_WARMUP_RUNS 2 /* ---------------------------- local macros ------------------------------- */ diff --git a/gcc/testsuite/gcc.target/s390/htm-builtins-2.c b/gcc/testsuite/gcc.target/s390/htm-builtins-2.c index 15b0d12..bb9d346 100644 --- a/gcc/testsuite/gcc.target/s390/htm-builtins-2.c +++ b/gcc/testsuite/gcc.target/s390/htm-builtins-2.c @@ -13,8 +13,8 @@ /* ---------------------------- local definitions -------------------------- */ -#define DEFAULT_MAX_REPETITIONS 5 -#define DEFAULT_REQUIRED_QUORUM ((DEFAULT_MAX_REPETITIONS) - 1) +#define DEFAULT_MAX_REPETITIONS 7 +#define DEFAULT_REQUIRED_QUORUM 4 #define DEFAULT_ABORT_ADDRESS (0x12345678u) /* ---------------------------- local macros ------------------------------- */ -- 2.3.0