diff mbox

[ARM] Fix failing poly64 tests on ARM

Message ID CAKdteOYeppUbMSuwzGqxp+usyDnOC7DRP_Mk=9wbo7ut9SgXDg@mail.gmail.com
State Superseded
Headers show

Commit Message

Christophe Lyon Dec. 5, 2016, 6:33 p.m. UTC 
Hi Tamar,


On 5 December 2016 at 16:32, Kyrill Tkachov <kyrylo.tkachov@foss.arm.com> wrote:
>

> On 05/12/16 10:39, Tamar Christina wrote:

>>

>> Hi All,

>>

>> This patch fixes test failures on arm-none-eabi.

>> Poly64 was being used by files that were not supposed

>> to be testing poly64 types.

>>

>> I have added a new MACRO that must be defined in addition

>> to having CRYPTO available before use of Poly64 types are

>> allowed in the header arm-neon-ref.h.

>>

>> Ok for trunk?

>>

>> gcc/testsuite/

>> 2016-12-01  Tamar Christina  <tamar.christina@arm.com>

>>

>>         * gcc.target/aarch64/advsimd-intrinsics/arm-neon-ref.h: Gate use

>> of Poly64 on USE_CRYPTO_TYPES.

>>         * gcc.target/aarch64/advsimd-intrinsics/p64_p128.c: Define

>> USE_CRYPTO_TYPES.

>>         * gcc.target/aarch64/advsimd-intrinsics/vreinterpret_p128.c:

>> Likewise.

>>         * gcc.target/aarch64/advsimd-intrinsics/vreinterpret_p64.c:

>> Likewise.

>

>

> Ok, but please make sure the line length in the ChangeLog doesn't go over 80

> characters.

> Kyrill


Since 'expected_poly64x[12]' isn't used, there is no need to declare it,
and the attached patch seems to work (tested only on arm-none-linux-gnueabihf
--target-board=-mthumb/-march=armv8-a/-mfpu=crypto-neon-fp-armv8/-mfloat-abi=hard

All the tests for poly64 use dedicated output buffers, at least for the moment.

Does my patch break aarch64?

Christophe
diff mbox

Patch

diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/arm-neon-ref.h b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/arm-neon-ref.h
index beaf6ac..4728639 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/arm-neon-ref.h
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/arm-neon-ref.h
@@ -99,13 +99,6 @@  extern size_t strlen(const char *);
     fprintf(stderr, "CHECKED %s %s\n", STR(VECT_TYPE(T, W, N)), MSG);	\
   }
 
-#if defined (__ARM_FEATURE_CRYPTO)
-#define CHECK_CRYPTO(MSG,T,W,N,FMT,EXPECTED,COMMENT) \
-	       CHECK(MSG,T,W,N,FMT,EXPECTED,COMMENT)
-#else
-#define CHECK_CRYPTO(MSG,T,W,N,FMT,EXPECTED,COMMENT)
-#endif
-
 /* Floating-point variant.  */
 #define CHECK_FP(MSG,T,W,N,FMT,EXPECTED,COMMENT)			\
   {									\
@@ -198,9 +191,6 @@  extern ARRAY(expected, uint, 32, 2);
 extern ARRAY(expected, uint, 64, 1);
 extern ARRAY(expected, poly, 8, 8);
 extern ARRAY(expected, poly, 16, 4);
-#if defined (__ARM_FEATURE_CRYPTO)
-extern ARRAY(expected, poly, 64, 1);
-#endif
 extern ARRAY(expected, hfloat, 16, 4);
 extern ARRAY(expected, hfloat, 32, 2);
 extern ARRAY(expected, hfloat, 64, 1);
@@ -214,9 +204,6 @@  extern ARRAY(expected, uint, 32, 4);
 extern ARRAY(expected, uint, 64, 2);
 extern ARRAY(expected, poly, 8, 16);
 extern ARRAY(expected, poly, 16, 8);
-#if defined (__ARM_FEATURE_CRYPTO)
-extern ARRAY(expected, poly, 64, 2);
-#endif
 extern ARRAY(expected, hfloat, 16, 8);
 extern ARRAY(expected, hfloat, 32, 4);
 extern ARRAY(expected, hfloat, 64, 2);
@@ -233,7 +220,6 @@  extern ARRAY(expected, hfloat, 64, 2);
     CHECK(test_name, uint, 64, 1, PRIx64, EXPECTED, comment);		\
     CHECK(test_name, poly, 8, 8, PRIx8, EXPECTED, comment);		\
     CHECK(test_name, poly, 16, 4, PRIx16, EXPECTED, comment);		\
-    CHECK_CRYPTO(test_name, poly, 64, 1, PRIx64, EXPECTED, comment);	\
     CHECK_FP(test_name, float, 32, 2, PRIx32, EXPECTED, comment);	\
 									\
     CHECK(test_name, int, 8, 16, PRIx8, EXPECTED, comment);		\
@@ -246,7 +232,6 @@  extern ARRAY(expected, hfloat, 64, 2);
     CHECK(test_name, uint, 64, 2, PRIx64, EXPECTED, comment);		\
     CHECK(test_name, poly, 8, 16, PRIx8, EXPECTED, comment);		\
     CHECK(test_name, poly, 16, 8, PRIx16, EXPECTED, comment);		\
-    CHECK_CRYPTO(test_name, poly, 64, 2, PRIx64, EXPECTED, comment);	\
     CHECK_FP(test_name, float, 32, 4, PRIx32, EXPECTED, comment);	\
   }									\