Tested on x86_64-linux (m32/m64), x86_64, i686-darwin, pushed to trunk
thanks,
Iain
--- 8< ---
1. BSD-like platforms define MAP_ANON where the tests call for the
Linux MAP_ANONYMOUS; On later Darwin systems the SDKs contain an
alias - but on some versions we must apply it locally.
2. Two of the tests require a higher ISA rev than the vect_early_break
covers, add the extra.
3. For 32b Darwin, we pass the redic tests, so don't xfail them.
gcc/testsuite/ChangeLog:
* gcc.dg/vect/vect-early-break_109-pr113588.c: Define
MAP_ANONYMOUS to MAP_ANON on Darwin, where needed.
* gcc.dg/vect/vect-early-break_130.c: Likewise.
* gcc.dg/vect/vect-multi-peel-gaps.c:: Likewise.
* gcc.dg/vect/vect-pr124037.c:: Likewise.
* gcc.dg/vect/vect-early-break_137-pr121190.c: Define
MAP_ANONYMOUS to MAP_ANON on Darwin, where needed. Require
AVX2.
* gcc.dg/vect/vect-early-break_138-pr121020.c:: Likewise.
* gcc.dg/vect/vect-reduc-in-order-1.c: Do not XFAIL the
run on Darwin.
* gcc.dg/vect/vect-reduc-in-order-2.c: Likewise.
* gcc.dg/vect/vect-reduc-in-order-3.c: Likewise.
* gcc.dg/vect/vect-reduc-in-order-4.c: Likewise.
Signed-off-by: Iain Sandoe <[email protected]>
---
gcc/testsuite/gcc.dg/vect/vect-early-break_109-pr113588.c | 4 ++++
gcc/testsuite/gcc.dg/vect/vect-early-break_130.c | 4 ++++
gcc/testsuite/gcc.dg/vect/vect-early-break_137-pr121190.c | 5 +++++
gcc/testsuite/gcc.dg/vect/vect-early-break_138-pr121020.c | 5 +++++
gcc/testsuite/gcc.dg/vect/vect-multi-peel-gaps.c | 4 ++++
gcc/testsuite/gcc.dg/vect/vect-pr124037.c | 4 ++++
gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-1.c | 2 +-
gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-2.c | 2 +-
gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-3.c | 2 +-
gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-4.c | 2 +-
10 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/gcc/testsuite/gcc.dg/vect/vect-early-break_109-pr113588.c
b/gcc/testsuite/gcc.dg/vect/vect-early-break_109-pr113588.c
index 9c183139ac2..ed58c136c3d 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-early-break_109-pr113588.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-early-break_109-pr113588.c
@@ -7,6 +7,10 @@
/* { dg-final { scan-tree-dump "LOOP VECTORIZED" "vect" } } */
#include <sys/mman.h>
+
+#if defined(__APPLE__) && !defined(MAP_ANONYMOUS)
+#define MAP_ANONYMOUS MAP_ANON
+#endif
#include <unistd.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/vect-early-break_130.c
b/gcc/testsuite/gcc.dg/vect/vect-early-break_130.c
index f7cc67fc92c..b46e207c966 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-early-break_130.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-early-break_130.c
@@ -3,6 +3,10 @@
/* { dg-add-options vect_early_break } */
#include <sys/mman.h>
+
+#if defined(__APPLE__) && !defined(MAP_ANONYMOUS)
+#define MAP_ANONYMOUS MAP_ANON
+#endif
#include <unistd.h>
#include <stdio.h>
#include <stdint.h>
diff --git a/gcc/testsuite/gcc.dg/vect/vect-early-break_137-pr121190.c
b/gcc/testsuite/gcc.dg/vect/vect-early-break_137-pr121190.c
index d4c782549d9..5a3b17fa84c 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-early-break_137-pr121190.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-early-break_137-pr121190.c
@@ -4,11 +4,16 @@
/* { dg-require-effective-target mmap } */
/* { dg-require-effective-target sysconf } */
/* { dg-require-effective-target vect_early_break } */
+/* { dg-require-effective-target avx2 } */
#include <stdint.h>
#include <string.h>
#include <stdio.h>
#include <sys/mman.h>
+
+#if defined(__APPLE__) && !defined(MAP_ANONYMOUS)
+#define MAP_ANONYMOUS MAP_ANON
+#endif
#include <unistd.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/vect-early-break_138-pr121020.c
b/gcc/testsuite/gcc.dg/vect/vect-early-break_138-pr121020.c
index 8cb62bf5bc9..93de22448a1 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-early-break_138-pr121020.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-early-break_138-pr121020.c
@@ -3,10 +3,15 @@
/* { dg-additional-options "-march=znver2" { target x86_64-*-* i?86-*-* } } */
/* { dg-require-effective-target mmap } */
/* { dg-require-effective-target vect_early_break } */
+/* { dg-require-effective-target avx2 } */
#include <stdint.h>
#include <stdio.h>
#include <sys/mman.h>
+
+#if defined(__APPLE__) && !defined(MAP_ANONYMOUS)
+#define MAP_ANONYMOUS MAP_ANON
+#endif
#include <unistd.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/vect-multi-peel-gaps.c
b/gcc/testsuite/gcc.dg/vect/vect-multi-peel-gaps.c
index d914b88d731..a98d6b07fe8 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-multi-peel-gaps.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-multi-peel-gaps.c
@@ -12,6 +12,10 @@
#include <stdio.h>
#include "tree-vect.h"
+#if defined(__APPLE__) && !defined(MAP_ANONYMOUS)
+#define MAP_ANONYMOUS MAP_ANON
+#endif
+
#define MMAP_SIZE 0x20000
#define ADDRESS 0x1122000000
diff --git a/gcc/testsuite/gcc.dg/vect/vect-pr124037.c
b/gcc/testsuite/gcc.dg/vect/vect-pr124037.c
index f805d93ee89..34c558f260b 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-pr124037.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-pr124037.c
@@ -7,6 +7,10 @@
#include <sys/mman.h>
#include <unistd.h>
+#if defined(__APPLE__) && !defined(MAP_ANONYMOUS)
+#define MAP_ANONYMOUS MAP_ANON
+#endif
+
#define MAX 65536
typedef struct {
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-1.c
b/gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-1.c
index 4c17f2c1978..1507db0c6ba 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-1.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-1.c
@@ -1,4 +1,4 @@
-/* { dg-xfail-run-if "" { { i?86-*-* x86_64-*-* } && ia32 } } */
+/* { dg-xfail-run-if "" { { i?86-*-* x86_64-*-* } && { ia32 && { ! *-*-darwin*
} } } } */
/* { dg-require-effective-target vect_double } */
/* { dg-add-options ieee } */
/* { dg-additional-options "-fno-fast-math" } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-2.c
b/gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-2.c
index 3b4c68aa8d1..acc091a2421 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-2.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-2.c
@@ -1,4 +1,4 @@
-/* { dg-xfail-run-if "" { { i?86-*-* x86_64-*-* } && ia32 } } */
+/* { dg-xfail-run-if "" { { i?86-*-* x86_64-*-* } && { ia32 && { ! *-*-darwin*
} } } } */
/* { dg-require-effective-target vect_double } */
/* { dg-add-options ieee } */
/* { dg-additional-options "-fno-fast-math" } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-3.c
b/gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-3.c
index 3fd19f90d74..03b8faaf22c 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-3.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-3.c
@@ -1,4 +1,4 @@
-/* { dg-xfail-run-if "" { { i?86-*-* x86_64-*-* } && ia32 } } */
+/* { dg-xfail-run-if "" { { i?86-*-* x86_64-*-* } && { ia32 && { ! *-*-darwin*
} } } } */
/* { dg-require-effective-target vect_double } */
/* { dg-add-options ieee } */
/* { dg-additional-options "-fno-fast-math" } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-4.c
b/gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-4.c
index eff3994a335..d540cb3938e 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-4.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-in-order-4.c
@@ -1,4 +1,4 @@
-/* { dg-xfail-run-if "" { { i?86-*-* x86_64-*-* } && ia32 } } */
+/* { dg-xfail-run-if "" { { i?86-*-* x86_64-*-* } && { ia32 && { ! *-*-darwin*
} } } } */
/* { dg-require-effective-target vect_double } */
/* { dg-add-options ieee } */
/* { dg-additional-options "-fno-fast-math" } */
--
2.50.1 (Apple Git-155)
