From 151c204ff8673a9c7efd2e6492b3765b60229f6d Mon Sep 17 00:00:00 2001 From: Dominik Vogt Date: Fri, 18 Nov 2016 14:50:27 +0000 Subject: [PATCH] S/390: Lower requirements for successful htm tests. 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. gcc/ChangeLog: 2016-11-18 Dominik Vogt * config/rs6000/rs6000.c (rs6000_stack_info): PR/77359: Properly align local variables in functions calling alloca. Also update the ASCII drawings * config/rs6000/rs6000.h (STARTING_FRAME_OFFSET, STACK_DYNAMIC_OFFSET): PR/77359: Likewise. * config/rs6000/aix.h (STARTING_FRAME_OFFSET, STACK_DYNAMIC_OFFSET): PR/77359: Copy AIX specific versions of the rs6000.h macros to aix.h. From-SVN: r242591 --- gcc/testsuite/ChangeLog | 8 ++++++++ gcc/testsuite/gcc.target/s390/htm-builtins-1.c | 6 +++--- gcc/testsuite/gcc.target/s390/htm-builtins-2.c | 4 ++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 58dba0ca4de..e13466b2779 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2016-11-18 Dominik Vogt + + * 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. + 2016-11-18 Andrew Bennett Toma Tabacu diff --git a/gcc/testsuite/gcc.target/s390/htm-builtins-1.c b/gcc/testsuite/gcc.target/s390/htm-builtins-1.c index c90490faa59..ff43be9fe73 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 15b0d12ae92..bb9d346ea56 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.30.2