From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1130) id 460803857C42; Thu, 3 Feb 2022 10:44:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 460803857C42 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Richard Sandiford To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-7019] aarch64: Adjust tests after fix for PR102659 X-Act-Checkin: gcc X-Git-Author: Richard Sandiford X-Git-Refname: refs/heads/trunk X-Git-Oldrev: 7e4f89a23e32604f71f8f6756c8856bf07bf7ac2 X-Git-Newrev: 2b4044d8c271d22407d6d34caf625380daaa14b4 Message-Id: <20220203104443.460803857C42@sourceware.org> Date: Thu, 3 Feb 2022 10:44:43 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Feb 2022 10:44:43 -0000 https://gcc.gnu.org/g:2b4044d8c271d22407d6d34caf625380daaa14b4 commit r12-7019-g2b4044d8c271d22407d6d34caf625380daaa14b4 Author: Richard Sandiford Date: Thu Feb 3 10:44:01 2022 +0000 aarch64: Adjust tests after fix for PR102659 After the fix for PR102659, the vectoriser can no longer group conditional accesses of the form: for (int i = 0; i < n; ++i) if (...) ...a[i * 2] + a[i * 2 + 1]...; on LP64 targets. It has to treat them as two independent gathers instead. This was causing failures in the sve mask_struct*.c tests. The tests weren't really testing that int iterators could be used, so this patch switches to pointer-sized iterators instead. gcc/testsuite/ * gcc.target/aarch64/sve/mask_struct_load_1.c: Use intptr_t iterators instead of int iterators. * gcc.target/aarch64/sve/mask_struct_load_2.c: Likewise. * gcc.target/aarch64/sve/mask_struct_load_3.c: Likewise. * gcc.target/aarch64/sve/mask_struct_load_4.c: Likewise. * gcc.target/aarch64/sve/mask_struct_load_5.c: Likewise. * gcc.target/aarch64/sve/mask_struct_load_6.c: Likewise. * gcc.target/aarch64/sve/mask_struct_load_7.c: Likewise. * gcc.target/aarch64/sve/mask_struct_load_8.c: Likewise. * gcc.target/aarch64/sve/mask_struct_store_1.c: Likewise. * gcc.target/aarch64/sve/mask_struct_store_2.c: Likewise. * gcc.target/aarch64/sve/mask_struct_store_3.c: Likewise. * gcc.target/aarch64/sve/mask_struct_store_4.c: Likewise. Diff: --- gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_1.c | 4 ++-- gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_2.c | 4 ++-- gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_3.c | 4 ++-- gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_4.c | 4 ++-- gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_5.c | 4 ++-- gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_6.c | 4 ++-- gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_7.c | 4 ++-- gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_8.c | 4 ++-- gcc/testsuite/gcc.target/aarch64/sve/mask_struct_store_1.c | 4 ++-- gcc/testsuite/gcc.target/aarch64/sve/mask_struct_store_2.c | 4 ++-- gcc/testsuite/gcc.target/aarch64/sve/mask_struct_store_3.c | 4 ++-- gcc/testsuite/gcc.target/aarch64/sve/mask_struct_store_4.c | 6 +++--- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_1.c b/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_1.c index 03b2b93df07..450fbb887e3 100644 --- a/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_1.c +++ b/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_1.c @@ -6,9 +6,9 @@ #define TEST_LOOP(NAME, OUTTYPE, INTYPE, MASKTYPE) \ void __attribute__ ((noinline, noclone)) \ NAME##_2 (OUTTYPE *__restrict dest, INTYPE *__restrict src, \ - MASKTYPE *__restrict cond, int n) \ + MASKTYPE *__restrict cond, intptr_t n) \ { \ - for (int i = 0; i < n; ++i) \ + for (intptr_t i = 0; i < n; ++i) \ if (cond[i]) \ dest[i] = src[i * 2] + src[i * 2 + 1]; \ } diff --git a/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_2.c b/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_2.c index 87ac3178be0..499abd7c99a 100644 --- a/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_2.c +++ b/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_2.c @@ -6,9 +6,9 @@ #define TEST_LOOP(NAME, OUTTYPE, INTYPE, MASKTYPE) \ void __attribute__ ((noinline, noclone)) \ NAME##_3 (OUTTYPE *__restrict dest, INTYPE *__restrict src, \ - MASKTYPE *__restrict cond, int n) \ + MASKTYPE *__restrict cond, intptr_t n) \ { \ - for (int i = 0; i < n; ++i) \ + for (intptr_t i = 0; i < n; ++i) \ if (cond[i]) \ dest[i] = (src[i * 3] \ + src[i * 3 + 1] \ diff --git a/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_3.c b/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_3.c index 54806f93ad9..a5ce0716322 100644 --- a/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_3.c +++ b/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_3.c @@ -6,9 +6,9 @@ #define TEST_LOOP(NAME, OUTTYPE, INTYPE, MASKTYPE) \ void __attribute__ ((noinline, noclone)) \ NAME##_4 (OUTTYPE *__restrict dest, INTYPE *__restrict src, \ - MASKTYPE *__restrict cond, int n) \ + MASKTYPE *__restrict cond, intptr_t n) \ { \ - for (int i = 0; i < n; ++i) \ + for (intptr_t i = 0; i < n; ++i) \ if (cond[i]) \ dest[i] = (src[i * 4] \ + src[i * 4 + 1] \ diff --git a/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_4.c b/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_4.c index 4c73004f68d..bdfea964f88 100644 --- a/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_4.c +++ b/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_4.c @@ -6,9 +6,9 @@ #define TEST_LOOP(NAME, OUTTYPE, INTYPE, MASKTYPE) \ void __attribute__ ((noinline, noclone)) \ NAME##_3 (OUTTYPE *__restrict dest, INTYPE *__restrict src, \ - MASKTYPE *__restrict cond, int n) \ + MASKTYPE *__restrict cond, intptr_t n) \ { \ - for (int i = 0; i < n; ++i) \ + for (intptr_t i = 0; i < n; ++i) \ if (cond[i]) \ dest[i] = src[i * 3] + src[i * 3 + 2]; \ } diff --git a/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_5.c b/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_5.c index 2a33ee81d1a..299955a8a93 100644 --- a/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_5.c +++ b/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_5.c @@ -6,9 +6,9 @@ #define TEST_LOOP(NAME, OUTTYPE, INTYPE, MASKTYPE) \ void __attribute__ ((noinline, noclone)) \ NAME##_4 (OUTTYPE *__restrict dest, INTYPE *__restrict src, \ - MASKTYPE *__restrict cond, int n) \ + MASKTYPE *__restrict cond, intptr_t n) \ { \ - for (int i = 0; i < n; ++i) \ + for (intptr_t i = 0; i < n; ++i) \ if (cond[i]) \ dest[i] = src[i * 4] + src[i * 4 + 3]; \ } diff --git a/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_6.c b/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_6.c index d4542eca0f7..999c7b52422 100644 --- a/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_6.c +++ b/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_6.c @@ -6,9 +6,9 @@ #define TEST_LOOP(NAME, OUTTYPE, INTYPE, MASKTYPE) \ void __attribute__ ((noinline, noclone)) \ NAME##_2 (OUTTYPE *__restrict dest, INTYPE *__restrict src, \ - MASKTYPE *__restrict cond, int n) \ + MASKTYPE *__restrict cond, intptr_t n) \ { \ - for (int i = 0; i < n; ++i) \ + for (intptr_t i = 0; i < n; ++i) \ if (cond[i]) \ dest[i] = src[i * 2]; \ } diff --git a/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_7.c b/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_7.c index 9d26e15c0d9..57d71ed460a 100644 --- a/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_7.c +++ b/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_7.c @@ -6,9 +6,9 @@ #define TEST_LOOP(NAME, OUTTYPE, INTYPE, MASKTYPE) \ void __attribute__ ((noinline, noclone)) \ NAME##_3 (OUTTYPE *__restrict dest, INTYPE *__restrict src, \ - MASKTYPE *__restrict cond, int n) \ + MASKTYPE *__restrict cond, intptr_t n) \ { \ - for (int i = 0; i < n; ++i) \ + for (intptr_t i = 0; i < n; ++i) \ if (cond[i]) \ dest[i] = src[i * 3] + src[i * 3 + 1]; \ } diff --git a/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_8.c b/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_8.c index 17fd4c0a079..1ead3ba695e 100644 --- a/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_8.c +++ b/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_load_8.c @@ -6,9 +6,9 @@ #define TEST_LOOP(NAME, OUTTYPE, INTYPE, MASKTYPE) \ void __attribute__ ((noinline, noclone)) \ NAME##_4 (OUTTYPE *__restrict dest, INTYPE *__restrict src, \ - MASKTYPE *__restrict cond, int n) \ + MASKTYPE *__restrict cond, intptr_t n) \ { \ - for (int i = 0; i < n; ++i) \ + for (intptr_t i = 0; i < n; ++i) \ if (cond[i]) \ dest[i] = src[i * 4] + src[i * 4 + 2]; \ } diff --git a/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_store_1.c b/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_store_1.c index a75a694f9c3..39fae68a5d0 100644 --- a/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_store_1.c +++ b/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_store_1.c @@ -6,9 +6,9 @@ #define TEST_LOOP(NAME, OUTTYPE, INTYPE, MASKTYPE) \ void __attribute__ ((noinline, noclone)) \ NAME##_2 (OUTTYPE *__restrict dest, INTYPE *__restrict src, \ - MASKTYPE *__restrict cond, INTYPE bias, int n) \ + MASKTYPE *__restrict cond, INTYPE bias, intptr_t n) \ { \ - for (int i = 0; i < n; ++i) \ + for (intptr_t i = 0; i < n; ++i) \ { \ INTYPE value = src[i] + bias; \ if (cond[i]) \ diff --git a/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_store_2.c b/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_store_2.c index 0fd35f2ff52..0fe9b993402 100644 --- a/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_store_2.c +++ b/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_store_2.c @@ -6,9 +6,9 @@ #define TEST_LOOP(NAME, OUTTYPE, INTYPE, MASKTYPE) \ void __attribute__ ((noinline, noclone)) \ NAME##_3 (OUTTYPE *__restrict dest, INTYPE *__restrict src, \ - MASKTYPE *__restrict cond, INTYPE bias, int n) \ + MASKTYPE *__restrict cond, INTYPE bias, intptr_t n) \ { \ - for (int i = 0; i < n; ++i) \ + for (intptr_t i = 0; i < n; ++i) \ { \ INTYPE value = src[i] + bias; \ if (cond[i]) \ diff --git a/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_store_3.c b/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_store_3.c index 1765d54a483..a9430870eee 100644 --- a/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_store_3.c +++ b/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_store_3.c @@ -6,9 +6,9 @@ #define TEST_LOOP(NAME, OUTTYPE, INTYPE, MASKTYPE) \ void __attribute__ ((noinline, noclone)) \ NAME##_4 (OUTTYPE *__restrict dest, INTYPE *__restrict src, \ - MASKTYPE *__restrict cond, INTYPE bias, int n) \ + MASKTYPE *__restrict cond, INTYPE bias, intptr_t n) \ { \ - for (int i = 0; i < n; ++i) \ + for (intptr_t i = 0; i < n; ++i) \ { \ INTYPE value = src[i] + bias; \ if (cond[i]) \ diff --git a/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_store_4.c b/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_store_4.c index 59e9ee49c4a..d3f0216406d 100644 --- a/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_store_4.c +++ b/gcc/testsuite/gcc.target/aarch64/sve/mask_struct_store_4.c @@ -6,15 +6,15 @@ #define TEST_LOOP(NAME, OUTTYPE, INTYPE, MASKTYPE) \ void __attribute__ ((noinline, noclone)) \ NAME##_2 (OUTTYPE *__restrict dest, INTYPE *__restrict src, \ - MASKTYPE *__restrict cond, int n) \ + MASKTYPE *__restrict cond, intptr_t n) \ { \ - for (int i = 0; i < n; ++i) \ + for (intptr_t i = 0; i < n; ++i) \ { \ if (cond[i] < 8) \ dest[i * 2] = src[i]; \ if (cond[i] > 2) \ dest[i * 2 + 1] = src[i]; \ - } \ + } \ } #define TEST2(NAME, OUTTYPE, INTYPE) \