From patchwork Mon Dec 5 10:39:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tamar Christina X-Patchwork-Id: 86543 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp1410132qgi; Mon, 5 Dec 2016 02:54:23 -0800 (PST) X-Received: by 10.98.103.84 with SMTP id b81mr56465588pfc.6.1480935263306; Mon, 05 Dec 2016 02:54:23 -0800 (PST) Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id t78si14196682pfj.273.2016.12.05.02.54.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Dec 2016 02:54:23 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-return-443454-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org; spf=pass (google.com: domain of gcc-patches-return-443454-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=gcc-patches-return-443454-patch=linaro.org@gcc.gnu.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:content-type:mime-version; q=dns; s=default; b=pah253bWH3Exiptrr8uQYi842z7kof+ljpvXdCNRrM3j+Otd5V +LHvGKBRQKPDuY7CE7cJ20UgDVSa3VEghOEMlEo+ritsh+yDmN6IIZQBR0JuDVo8 MIbBqbD14MbyVctIqQMtI/b3gDvkSXslj67EKDF8YjWuJn89wkhqxzG0U= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:content-type:mime-version; s= default; bh=UNIb5AChWA72p3Z3OOlfumQ0TSE=; b=t+pmb1/uC+8IhrlxDRtE gkCB8paP3/OqjJOc9n0FqRQW5nvFfaTpRr9vidhvfMT9OfqxoZhOsxDgZGFSh/k4 fox6h1skyh6LZjgIbDy1hHvTVD6oU04UkxfGlR3NvyciLobjtUQ2wfxWo6e6PuoH ysM7QMQ1x0RB2l1RtGzMQAc= Received: (qmail 41532 invoked by alias); 5 Dec 2016 10:54:09 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 41515 invoked by uid 89); 5 Dec 2016 10:54:08 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.6 required=5.0 tests=AWL, BAYES_00, KAM_LOTSOFHASH, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS autolearn=no version=3.3.2 spammy=Gate, HX-MS-Has-Attach:yes, H*c:HHH X-HELO: EUR01-VE1-obe.outbound.protection.outlook.com Received: from mail-ve1eur01on0061.outbound.protection.outlook.com (HELO EUR01-VE1-obe.outbound.protection.outlook.com) (104.47.1.61) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 05 Dec 2016 10:53:58 +0000 Received: from VI1PR0801MB2031.eurprd08.prod.outlook.com (10.173.74.140) by HE1PR0802MB2394.eurprd08.prod.outlook.com (10.175.33.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.761.9; Mon, 5 Dec 2016 10:39:26 +0000 Received: from VI1PR0801MB2031.eurprd08.prod.outlook.com ([10.173.74.140]) by VI1PR0801MB2031.eurprd08.prod.outlook.com ([10.173.74.140]) with mapi id 15.01.0761.016; Mon, 5 Dec 2016 10:39:25 +0000 From: Tamar Christina To: GCC Patches , Christophe Lyon , Kyrylo Tkachov , "nickc@redhat.com" , Richard Earnshaw CC: nd Subject: [ARM][PATCH] Fix failing poly64 tests on ARM Date: Mon, 5 Dec 2016 10:39:25 +0000 Message-ID: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Tamar.Christina@arm.com; x-ms-exchange-messagesentrepresentingtype: 1 x-ld-processed: f34e5979-57d9-4aaa-ad4d-b122a662184d,ExtAddr x-ms-office365-filtering-correlation-id: bee3205f-b407-4300-0dab-08d41cfafb82 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:HE1PR0802MB2394; x-microsoft-exchange-diagnostics: 1; HE1PR0802MB2394; 7:8B2HXPXb2S4RZ5EwLbpgoTlaTKeC6Taplbz5SXux4uO6BJ/RcpoSch3jKSaczDkYop2Dzy8Emy7IPaQZnhJHVcFmSGeDRcaLEz9BmNrNAN+onAa02zUwVRVX9TUMuKElAQOeNXsdYQnJOcVTxC3+q6Izhorgo2uOfbXfg8TCgjr4rlBcKu5PwkFGv8PPTeGeKGTUJspWreQfi0mShQ/cblHPSll1Bd40Yze6BEJjsJXbUfUTRm97RtYzVpwEvCvoBR2vJr5zSCktHAI62LfGOR0ucrgxXgmUC6xr4FF/r5Iebs/SnGjYxdHSmEPZ+uKQNSI3UqqSM3beF9nFhBg03vl2T1tsB669QSqtJyO4L1eW0q0212vkVwGq+Wx5RL2toSbvLSfCKYzfRy8IWvUz4g60LRjpY1mEQpGpbe+8i9EnqysOLew6BPaZBs0/EP/Xac8mL5OeAseYkPySprspfA== nodisclaimer: True x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(180628864354917); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(102415395)(6040375)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6055026)(6041248)(20161123560025)(20161123562025)(20161123564025)(20161123555025)(6072148); SRVR:HE1PR0802MB2394; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0802MB2394; x-forefront-prvs: 0147E151B5 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(6009001)(7916002)(377424004)(53754006)(189002)(199003)(68736007)(74316002)(2900100001)(54356999)(99936001)(105586002)(9686002)(50986999)(81166006)(106356001)(8936002)(106116001)(81156014)(101416001)(77096006)(39840400001)(39860400001)(39410400001)(97736004)(8676002)(39450400002)(5001770100001)(38730400001)(6506006)(189998001)(7696004)(92566002)(5660300001)(33656002)(6636002)(102836003)(6116002)(4326007)(76576001)(3846002)(7846002)(39850400001)(3660700001)(3280700002)(2501003)(7736002)(66066001)(305945005)(2906002)(122556002)(86362001); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR0802MB2394; H:VI1PR0801MB2031.eurprd08.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; received-spf: None (protection.outlook.com: arm.com does not designate permitted sender hosts) spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Dec 2016 10:39:25.0396 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0802MB2394 X-IsSubscribed: yes 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 * 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. 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 beaf6ac31d5c5affe3702a505ad0df8679229e32..8ed76c5c6f0adef4f5c123add1043eed1122ce84 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 @@ -40,6 +40,10 @@ extern size_t strlen(const char *); #define AARCH64_ONLY(X) #endif +#if defined (USE_POLY_TYPES) && defined (__ARM_FEATURE_CRYPTO) +#define USE_CRYPTO_TYPES 1 +#endif + #define xSTR(X) #X #define STR(X) xSTR(X) @@ -99,7 +103,7 @@ extern size_t strlen(const char *); fprintf(stderr, "CHECKED %s %s\n", STR(VECT_TYPE(T, W, N)), MSG); \ } -#if defined (__ARM_FEATURE_CRYPTO) +#if defined (USE_CRYPTO_TYPES) #define CHECK_CRYPTO(MSG,T,W,N,FMT,EXPECTED,COMMENT) \ CHECK(MSG,T,W,N,FMT,EXPECTED,COMMENT) #else @@ -155,7 +159,7 @@ static ARRAY(result, uint, 32, 2); static ARRAY(result, uint, 64, 1); static ARRAY(result, poly, 8, 8); static ARRAY(result, poly, 16, 4); -#if defined (__ARM_FEATURE_CRYPTO) +#if defined (USE_CRYPTO_TYPES) static ARRAY(result, poly, 64, 1); #endif #if defined (__ARM_FP16_FORMAT_IEEE) || defined (__ARM_FP16_FORMAT_ALTERNATIVE) @@ -175,7 +179,7 @@ static ARRAY(result, uint, 32, 4); static ARRAY(result, uint, 64, 2); static ARRAY(result, poly, 8, 16); static ARRAY(result, poly, 16, 8); -#if defined (__ARM_FEATURE_CRYPTO) +#if defined (USE_CRYPTO_TYPES) static ARRAY(result, poly, 64, 2); #endif #if defined (__ARM_FP16_FORMAT_IEEE) || defined (__ARM_FP16_FORMAT_ALTERNATIVE) @@ -198,7 +202,7 @@ 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) +#if defined (USE_CRYPTO_TYPES) extern ARRAY(expected, poly, 64, 1); #endif extern ARRAY(expected, hfloat, 16, 4); @@ -214,7 +218,7 @@ 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) +#if defined (USE_CRYPTO_TYPES) extern ARRAY(expected, poly, 64, 2); #endif extern ARRAY(expected, hfloat, 16, 8); @@ -420,7 +424,7 @@ static void clean_results (void) CLEAN(result, uint, 64, 1); CLEAN(result, poly, 8, 8); CLEAN(result, poly, 16, 4); -#if defined (__ARM_FEATURE_CRYPTO) +#if defined (USE_CRYPTO_TYPES) CLEAN(result, poly, 64, 1); #endif #if defined (__ARM_FP16_FORMAT_IEEE) || defined (__ARM_FP16_FORMAT_ALTERNATIVE) @@ -438,7 +442,7 @@ static void clean_results (void) CLEAN(result, uint, 64, 2); CLEAN(result, poly, 8, 16); CLEAN(result, poly, 16, 8); -#if defined (__ARM_FEATURE_CRYPTO) +#if defined (USE_CRYPTO_TYPES) CLEAN(result, poly, 64, 2); #endif #if defined (__ARM_FP16_FORMAT_IEEE) || defined (__ARM_FP16_FORMAT_ALTERNATIVE) @@ -466,7 +470,7 @@ static void clean_results (void) #define DECL_VARIABLE(VAR, T1, W, N) \ VECT_TYPE(T1, W, N) VECT_VAR(VAR, T1, W, N) -#if defined (__ARM_FEATURE_CRYPTO) +#if defined (USE_CRYPTO_TYPES) #define DECL_VARIABLE_CRYPTO(VAR, T1, W, N) \ DECL_VARIABLE(VAR, T1, W, N) #else @@ -570,7 +574,7 @@ static void clean_results (void) /* Helpers to call macros with 1 constant and 5 variable arguments. */ -#if defined (__ARM_FEATURE_CRYPTO) +#if defined (USE_CRYPTO_TYPES) #define MACRO_CRYPTO(MACRO, VAR1, VAR2, T1, T2, T3, W, N) \ MACRO(VAR1, VAR2, T1, T2, T3, W, N) #else diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/p64_p128.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/p64_p128.c index 8907b38cde90b44a8f1501f72b2c4e812cba5707..1b66a6a243ac5ea16cf1d05cb4f2853a5ed23e7d 100644 --- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/p64_p128.c +++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/p64_p128.c @@ -4,7 +4,7 @@ /* { dg-require-effective-target arm_crypto_ok { target { arm*-*-* } } } */ /* { dg-add-options arm_crypto } */ /* { dg-additional-options "-march=armv8-a+crypto" { target { aarch64*-*-* } } }*/ - +#define USE_POLY_TYPES 1 #include #include "arm-neon-ref.h" #include "compute-ref-data.h" diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vreinterpret_p128.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vreinterpret_p128.c index f192d4dda514287c8417e7fc922bc580b209b163..5529f03140e8411a73d4c837608db5ba25a39bcd 100644 --- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vreinterpret_p128.c +++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vreinterpret_p128.c @@ -3,7 +3,7 @@ /* { dg-require-effective-target arm_crypto_ok { target { arm*-*-* } } } */ /* { dg-add-options arm_crypto } */ /* { dg-additional-options "-march=armv8-a+crypto" { target { aarch64*-*-* } } }*/ - +#define USE_POLY_TYPES 1 #include #include "arm-neon-ref.h" #include "compute-ref-data.h" diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vreinterpret_p64.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vreinterpret_p64.c index c915fd2fea6b4d8770c9a4aab88caad391105d89..23db9988396f971175dd339fb4b20beed7d353f8 100644 --- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vreinterpret_p64.c +++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vreinterpret_p64.c @@ -3,7 +3,7 @@ /* { dg-require-effective-target arm_crypto_ok { target { arm*-*-* } } } */ /* { dg-add-options arm_crypto } */ /* { dg-additional-options "-march=armv8-a+crypto" { target { aarch64*-*-* } } }*/ - +#define USE_POLY_TYPES 1 #include #include "arm-neon-ref.h" #include "compute-ref-data.h"