From patchwork Tue Jun 27 14:49:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wilco Dijkstra X-Patchwork-Id: 781259 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wxpjt4C7rz9s0Z for ; Wed, 28 Jun 2017 00:49:53 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="LDqyLOaz"; dkim-atps=neutral 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 :content-transfer-encoding:mime-version; q=dns; s=default; b=C0/ Y6v/D0AWV+UdsTNojIiczpyK4MlszSY5+pbn7QzV6kbPwnFG+Pue02pzzLn17wF4 tZ3Tnp3ZJC/ftyhpLi7+wSQuWxaEribuw1o/fnkbZNxtwzj39WnPpod/qkg61AyI mbRppb2FoSLko8/0Gj+P97QGt49lq3mZ12Bcav+Y= 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 :content-transfer-encoding:mime-version; s=default; bh=VQR51zCCh twnVnmrs1XDoIcijmY=; b=LDqyLOazp+piqZa97qPto48GkoL5a/3pRLetgSyBQ fmKrXnCAQAq6BNLfPaSQq83q3A5GzFoHuk+peMHQWJSDHuBc0TMKXPIIDyeGBVaf E1vXRfHWIKTvrj+EKOWXdtjGX1w1F8q54RUpW7z5/2WF2gPuC5JJnulviVemkf4g Ws= Received: (qmail 75175 invoked by alias); 27 Jun 2017 14:49:44 -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 75156 invoked by uid 89); 27 Jun 2017 14:49:43 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_STOCKGEN, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: EUR01-DB5-obe.outbound.protection.outlook.com Received: from mail-db5eur01on0074.outbound.protection.outlook.com (HELO EUR01-DB5-obe.outbound.protection.outlook.com) (104.47.2.74) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 27 Jun 2017 14:49:42 +0000 Received: from AM5PR0802MB2610.eurprd08.prod.outlook.com (10.175.46.18) by AM4PR08MB2660.eurprd08.prod.outlook.com (10.171.190.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1199.15; Tue, 27 Jun 2017 14:49:39 +0000 Received: from AM5PR0802MB2610.eurprd08.prod.outlook.com ([fe80::a81e:e7d3:8fc6:7bb5]) by AM5PR0802MB2610.eurprd08.prod.outlook.com ([fe80::a81e:e7d3:8fc6:7bb5%18]) with mapi id 15.01.1220.011; Tue, 27 Jun 2017 14:49:38 +0000 From: Wilco Dijkstra To: GCC Patches , James Greenhalgh CC: nd , Yvan Roux Subject: [PATCH][AArch64] Fix PR79041 Date: Tue, 27 Jun 2017 14:49:38 +0000 Message-ID: authentication-results: arm.com; dkim=none (message not signed) header.d=none; arm.com; dmarc=none action=none header.from=arm.com; x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM4PR08MB2660; 7:BRbQaQ3hmD6xFNbJQf4Fh4a4fcaBzxVGkRzkBFLv33OanKN+VlRCM+aG3JEGO4kC3xcDHIecuCyRAbDq3YfzffMssmaeqhVO4OTZXjooqzEJF/JHzsunCAJ24aHUdLrhvBUanfYyWuVSSrzHu+cbdGg/rqpTwjYNih7M9mOusOSwbrGSt79D/qsvw8Py7s2tCf5bzyRVvXcuiwP//BWK98JCPwFwl3v2lMWmbyuO6pQVrajFifleg1MdKyJlI/ZokAaCwsnAk1quJbQiodpxWswNTIRP1LEbg3LJ3wYkSPTMUyIV5WGsvXOsw5j7eks+xmIVLJYVsc+DqmTEVH+UOO6F0bTC9muDse1gHEmNRftqFST2ewlz2tMJOsKhkBAjMZ5VSxV51q+Upvd56BKlodQdFwYpWL099X9M8EuiFoRWMegfPhRaa6r3xGy3Wc9rRbecSIBZ9HwAGcJiE0Pm/5pki7kl0GuO/x1ZT62O4SJk46Dhipxlt4/IISvAlMkdsokKdlNK5X1NnC4GaTDtBh3V9mcvWjXjr/xBp/5bsss86bQdBR5XwzZ0eBd+mZDExh0u4TEOhy6IBYU58cf1VRJLz104gJyuUnB2xoiqw/Kln8XVixilrEshmB19VXukcH3PNVo4jZw/IGOelcChtb+f8R4H4CV7nLy48Pf0gne7uL0nmzeMSOdHUQxJyJCr/UPuaLaGcvbzpFMO/+2T/qRMCYWTdHg7aZL8DKUA2NgbzLGeoI8uMXl6iggv/eu3w/lLNbDlo6ySuqe4FJG+UF63BF1VKBCqziks4ZMVZWg= x-ms-office365-filtering-correlation-id: 4f5a9f8a-9a6c-469c-4643-08d4bd6bbc88 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254075)(48565401081)(300000503095)(300135400095)(201703131423075)(201703031133081)(300000504095)(300135200095)(300000505095)(300135600095); SRVR:AM4PR08MB2660; x-ms-traffictypediagnostic: AM4PR08MB2660: nodisclaimer: True x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(180628864354917)(236129657087228)(148574349560750); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(5005006)(8121501046)(100000703101)(100105400095)(3002001)(93006095)(93001095)(10201501046)(6055026)(6041248)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123562025)(20161123558100)(20161123555025)(6072148)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:AM4PR08MB2660; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:AM4PR08MB2660; x-forefront-prvs: 0351D213B3 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(6009001)(39410400002)(39400400002)(39850400002)(39860400002)(39450400003)(39840400002)(377424004)(54534003)(33656002)(54906002)(6506006)(99286003)(50986999)(54356999)(55016002)(72206003)(5250100002)(4326008)(3280700002)(3660700001)(38730400002)(6636002)(25786009)(86362001)(9686003)(575784001)(8676002)(102836003)(6116002)(8936002)(74316002)(81166006)(189998001)(305945005)(5660300001)(2906002)(14454004)(478600001)(7736002)(53936002)(2900100001)(6436002)(7696004); DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR08MB2660; H:AM5PR0802MB2610.eurprd08.prod.outlook.com; FPR:; SPF:None; MLV:sfv; LANG:en; spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Jun 2017 14:49:38.5628 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR08MB2660 As described in PR79041, -mcmodel=large -mpc-relative-literal-loads may be used to avoid generating ADRP/ADD or ADRP/LDR. However both trunk and GCC7 may still emit ADRP for some constant pool literals. Fix this by adding a aarch64_pcrelative_literal_loads check. OK for trunk/GCC7 backport? ChangeLog: 2017-06-27 Wilco Dijkstra PR target/79041 * config/aarch64/aarch64.c (aarch64_classify_symbol): Avoid SYMBOL_SMALL_ABSOLUTE . * testsuite/gcc.target/aarch64/pr79041-2.c: New test. diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c index 060cd8476d2954119daac495ecb059c9be73edbe..329d244e9cf16dbdf849e5dd02b3999caf0cd5a7 100644 --- a/gcc/config/aarch64/aarch64.c +++ b/gcc/config/aarch64/aarch64.c @@ -10042,7 +10042,7 @@ aarch64_classify_symbol (rtx x, rtx offset) /* This is alright even in PIC code as the constant pool reference is always PC relative and within the same translation unit. */ - if (CONSTANT_POOL_ADDRESS_P (x)) + if (CONSTANT_POOL_ADDRESS_P (x) && !aarch64_pcrelative_literal_loads) return SYMBOL_SMALL_ABSOLUTE; else return SYMBOL_FORCE_TO_MEM; diff --git a/gcc/testsuite/gcc.target/aarch64/pr79041-2.c b/gcc/testsuite/gcc.target/aarch64/pr79041-2.c new file mode 100644 index 0000000000000000000000000000000000000000..e7899725bad2b770f8488a07f99792113275bdf2 --- /dev/null +++ b/gcc/testsuite/gcc.target/aarch64/pr79041-2.c @@ -0,0 +1,10 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -mcmodel=large -mpc-relative-literal-loads" } */ + +__int128 +t (void) +{ + return (__int128)1 << 80; +} + +/* { dg-final { scan-assembler "adr" } } */