From patchwork Mon Oct 31 11:53:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tamar Christina X-Patchwork-Id: 59644 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0E7F0385DC3E for ; Mon, 31 Oct 2022 11:54:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0E7F0385DC3E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1667217284; bh=px7DWlP4lFxjsJUapUuDRaS/gqWnBj/e08G5I7+4+uA=; h=Date:To:Subject:In-Reply-To:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:From; b=EF60pkpVmk4tvudQm66IApQ6xmU9kJvSo2xcEMOLUD3scD8bGzMEGJE1BSfWC4mr6 1ojgGCGtriu/0CHN9eOuoEhjVC7FCaMA7UdBBlSUSvTAS5K84k0WRq0Cu1XD2GUuVF ZKwap9Hg0Lf96dQLIXNdAZKFGG7WLtO1FUEPkj3w= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2064.outbound.protection.outlook.com [40.107.20.64]) by sourceware.org (Postfix) with ESMTPS id D6906385416D for ; Mon, 31 Oct 2022 11:54:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D6906385416D ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=DbNTn0wbIryp95MPdiyViKgikK9Chtr9DtEq1wWi7GXt3z8e9MXWUNHxVoIILoEr202/Kaoh1U2+nxC2xyIBXKgPSOnG5KKoIFObMjWfNMBKSQcQ9LX0hIY6tp7a6+DeOJIyPKUOfpJX1D5V5/FIzgG2/goBLolmmzkn9tyIk583lG5BVG8jpRY+a0BzIXAKB5+u+2lklSX6jShubxOGJZGynuXO5EH39gAR9eWrqcePPFxooZZacDAnvhnywJ3IUK+OOdsMf+UzUY7iTE4zFjBVlojjkXJ+zYZVlMGv+zZKoegP0sHfx0rqhaYDKRM10VRnd7fJ4uE0cP6UoblcSA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=px7DWlP4lFxjsJUapUuDRaS/gqWnBj/e08G5I7+4+uA=; b=DAAqk+sOTDJyRzysHifkEgmA5DgBInhARC+IAic8U4vNPom9fXQ7cTwO5dCWVR9YLSxhtDAFWFynAUP7xsrt2fVer4mqu0tiuGvYczhBdCOMowZ83WcPs1JH27os1866k50gkg6bMa3FZMcUZYib3w9CGNm4OX6iP0LWVcN9RKLeKragptUVVZqE9mHm/z5FFsbAWTeImpfYpYXClYPH0/KV3ysifW9FliYTRyCXP0vCoJc3fcEKJcX53deG2leNguMVi30zgDfTdi1vphoekHYa/P6tqur1dYQDPjWe0jmw5/MBZMGZuNLG51IYARM/7wZ19l06P2ccWZzKNCLd1g== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 63.35.35.123) smtp.rcpttodomain=gcc.gnu.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com; arc=pass (0 oda=1 ltdi=1 spf=[1,1,smtp.mailfrom=arm.com] dkim=[1,1,header.d=arm.com] dmarc=[1,1,header.from=arm.com]) Received: from AM5PR0601CA0082.eurprd06.prod.outlook.com (2603:10a6:206::47) by GV2PR08MB7954.eurprd08.prod.outlook.com (2603:10a6:150:a8::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.28; Mon, 31 Oct 2022 11:54:07 +0000 Received: from AM7EUR03FT032.eop-EUR03.prod.protection.outlook.com (2603:10a6:206:0:cafe::1) by AM5PR0601CA0082.outlook.office365.com (2603:10a6:206::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15 via Frontend Transport; Mon, 31 Oct 2022 11:54:07 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; pr=C Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AM7EUR03FT032.mail.protection.outlook.com (100.127.140.65) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.14 via Frontend Transport; Mon, 31 Oct 2022 11:54:06 +0000 Received: ("Tessian outbound b4aebcc5bc64:v130"); Mon, 31 Oct 2022 11:54:06 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 9fb6ac0ad0eaddd8 X-CR-MTA-TID: 64aa7808 Received: from acf62bf6dec9.2 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 4F8AC3DB-83CE-4B44-9033-38735994AAF9.1; Mon, 31 Oct 2022 11:53:56 +0000 Received: from EUR04-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id acf62bf6dec9.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 31 Oct 2022 11:53:56 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M97ty4Jxh0eagAB6mtWkYXeIm57Gt1DSkBbTUPjwHDW/I1E7hF608Erh4ERP7LV2wopMuW14ocJrSNlHLrMjDhN+5Ns5azGCRhShG6BMkF8GIGcDHCltt7/m1w3nKEgncGO5K10xWEh6bV82WNe1ZZ7JuGB5BwnIyeg92wd4R6u4Dh6HJsQy5MIIZFaJ+hgLOvhASvDseW1chlGGVB+tsau0Hb34a/kfLfJyn7tqhtwlQ7DUT1uNPKNmpoz1O+UQXKMuYG2Jb0N/2QvMdPG1FHw0qDsmkRGbgDDF21F4W3AKDNJLX6vSlbYuADpKzMNJ8WW2slLrc7P0BcAdUDNLlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=px7DWlP4lFxjsJUapUuDRaS/gqWnBj/e08G5I7+4+uA=; b=CnHsHMrgt6Hc160mk8Jh2Qa/nx6lE2TWVEZUUXUz530M7wYQAJ1RxO87TnBsBCu5JKXpvPE87pODrefxnqpfFEElg+q0v4/oZtnl62I2IXajacSr7eHbSbcrJpyBDm1FDdsI4k7ECR5ykNcNAUZk0oh/aA0gTiU2dwr7Kq21bqG4g1t4LcTWpwI+McEZahJwo2mRe/Bk3eU4ionb//j4d8Tc2Npuatwmny/VZZs9wNwztj3ix9gfnsPNDmthTMqSFd04Bx5ChaYvZ0FDvdNcgwHoKRByPwRhFfkh/6xFhSAHf7NCUPxxNR9MfThP7BuZJRzRIwuT7/93G7JVdXF4fg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; Received: from VI1PR08MB5325.eurprd08.prod.outlook.com (2603:10a6:803:13e::17) by GV2PR08MB8319.eurprd08.prod.outlook.com (2603:10a6:150:b5::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.19; Mon, 31 Oct 2022 11:53:53 +0000 Received: from VI1PR08MB5325.eurprd08.prod.outlook.com ([fe80::c57d:50c2:3502:a52]) by VI1PR08MB5325.eurprd08.prod.outlook.com ([fe80::c57d:50c2:3502:a52%4]) with mapi id 15.20.5769.019; Mon, 31 Oct 2022 11:53:52 +0000 Date: Mon, 31 Oct 2022 11:53:50 +0000 To: gcc-patches@gcc.gnu.org Subject: [PATCH 2/2]AArch64 Support new tbranch optab. Message-ID: Content-Disposition: inline In-Reply-To: X-ClientProxiedBy: LO2P265CA0308.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a5::32) To VI1PR08MB5325.eurprd08.prod.outlook.com (2603:10a6:803:13e::17) MIME-Version: 1.0 X-MS-TrafficTypeDiagnostic: VI1PR08MB5325:EE_|GV2PR08MB8319:EE_|AM7EUR03FT032:EE_|GV2PR08MB7954:EE_ X-MS-Office365-Filtering-Correlation-Id: 497d76f4-466b-48c1-b2fd-08dabb369d78 x-checkrecipientrouted: true NoDisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: 8AKlRYlDoWsyZndR3iDh5BpcLCGkjkHabvfh0j/mSqyWweWnqwsWdsSxBY67eh9ycXmJnRBHaIIUBoJ+Y8Og9nx+ORa8ysYAzC4Ct6DQFJuMVmTPYIenR66WvilD/t2+uvenrtWYnC0jvhFGCLr6AjlWwKm8kkpaMrcPpCBu551lH3xX9n7cJOF7NtmjUoKE4WGcWu9lgX+3aUUxWsYLbeUlTZBegvLLAchr0IflfvseawvXcw1EwkUha5IV7QWVv9AE/PuKWAu9vswbITlIOD0k0SQr3R15juw1NBVO1t5DjTRD/TMog1MJEC1z/JZqNW8vg+oPJswQPF6ZLqPcN95e8ICuahvCH3GzPGzePTXku7lSDzeJSkUYimNEGyspks1bQD8vRP+6elqNGptQL24zXIdFSh04gqptzI19mnNBRVb+833EU3JJHgf9eqP558ITXwJDn8HZo2faoltZaAMlRYsm2PNyvxk/Wc+UjhhGh3jcsOJCK8iXoBVd/l8QG6Q+hAQA0HWCJKitr2Q7Hv5awpUkOUmSI+IyP5GCGB7nuZxj0MDt73vN7asuGGdXKG6zcC9oId4YS4ZB/YgWcUf59f2WEbyTFru/kcBWDC7DGUiSocYLyTddikV9nd5c8fTWwzCnF/Mjlvq1+QhINVX86Ck17mqda4aucdwSq0SnpT94pmdGCo1vU5NJIe7W9ybE/FVulhXt4GY/+6W64XZUlvfkFPRk4K7dPEvVqGYGrcNT3tJOJYuH0Jrt1Jerf3FTU4GHak5UXqb3M06V1AGBwCeQQk9aFXv1MmHMvXlZZjhaGOzCbxxcyu8IuKCC/fG0Mmw3Za/mKoT+svuY1Q== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR08MB5325.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(366004)(396003)(136003)(346002)(376002)(39860400002)(451199015)(6512007)(26005)(33964004)(6506007)(44144004)(6486002)(36756003)(478600001)(6916009)(316002)(38100700002)(86362001)(2616005)(186003)(83380400001)(4743002)(66556008)(66476007)(41300700001)(235185007)(8676002)(66946007)(2906002)(5660300002)(4326008)(8936002)(84970400001)(44832011)(2700100001)(67856001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR08MB8319 Original-Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM7EUR03FT032.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 6a2273f7-5820-4bcd-2393-08dabb3694da X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: h0/DYisR9JYMu23VAlKOEHQvglM7HusAOoQS7rtTJxN6InRQNYj+1MHGdyavjcbFgqRqjojYV1TOokHHsMbE6YP8rojgV68BEDlJqWxnenOiustkz3t1qwRaaU8WhFL3sgiA6kc+WRSNg4tZ/Vdr99vexWc93z4W89pPn0XtvVB6sO91iOJOrN6kvAfXNDSOKSBuidAYB2n+jQHERwZyajjAicMs6nnBrernkFgRZ199KPYW03+9Vnkpql3ZlqOWZxPg9NEVOBBN8pLMRYLfnODs3jbl8JZzh2lfzpZjsOOcMEiyGLHLwIOLKICiVyrNmh6qbkzcJmJ6RwKj2OTGSaPx4VsDzKkRFNmLi+hkbtKU5qLL2ma95iZjezJCR1726Mc5sjVFWyS7pa4KCLpJmZLZJOhB5atz6x5XscdidDRVOtnXktHAXrlPTDZ7i4Pa696c+a3APdmhIGx0VWfZvo3oKNO+v4FjbQB7NuTRFgPb4cxBeZzFdU1MIZoZI5SiYpLEHxT+c0pl74L2rty/bDrKPaJUVEw2UQWyNqjMDgQR9TpXIxm7ERqPjG3j4/g4Yfgwt5PIC5WoKUdG0tvi36/sunbFnnf+bbrrbFbGi+9r20UIQQlfL5qyIzseZ9ni2Vj9P+THm+JmpZt+ug86oxm0cLm2QA/O1c1Vz15wxzOvbx4009odxTsoX7B94z4/C+NrYA/zRDSbVvR6cNmK3o2BxorpZXOvsF29mvjJKystXoityMNGxOtHYwhVFVdeyhgJ8veXQdPLKharQ1BvFEftB0/ozO0LMIu+B8zC0EQKmxPJ1fK9fYzHG6Xux+ipqoUK2BbYYVtFTZP30G6QZlyp89yBbgq2ZEsdKQc5rMg= X-Forefront-Antispam-Report: CIP:63.35.35.123; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:64aa7808-outbound-1.mta.getcheckrecipient.com; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; CAT:NONE; SFS:(13230022)(4636009)(396003)(39860400002)(346002)(376002)(136003)(451199015)(36840700001)(40470700004)(46966006)(4326008)(8676002)(44832011)(2906002)(6916009)(82740400003)(2616005)(47076005)(70206006)(36756003)(70586007)(83380400001)(8936002)(5660300002)(235185007)(81166007)(316002)(336012)(36860700001)(40460700003)(186003)(41300700001)(356005)(26005)(4743002)(86362001)(478600001)(6506007)(6486002)(40480700001)(33964004)(44144004)(6512007)(82310400005)(84970400001)(2700100001)(67856001); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Oct 2022 11:54:06.9970 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 497d76f4-466b-48c1-b2fd-08dabb369d78 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: AM7EUR03FT032.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR08MB7954 X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FORGED_SPF_HELO, GIT_PATCH_0, KAM_DMARC_NONE, KAM_LOTSOFHASH, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_NONE, TXREP, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tamar Christina via Gcc-patches From: Tamar Christina Reply-To: Tamar Christina Cc: Richard.Earnshaw@arm.com, nd@arm.com, richard.sandiford@arm.com, Marcus.Shawcroft@arm.com Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Hi All, This implements the new tbranch optab for AArch64. Instead of emitting the instruction directly I've chosen to expand the pattern using a zero extract and generating the existing pattern for comparisons for two reasons: 1. Allows for CSE of the actual comparison. 2. It looks like the code in expand makes the label as unused and removed it if it doesn't see a separate reference to it. Because of this expansion though I disable the pattern at -O0 since we have no combine in that case so we'd end up with worse code. I did try emitting the pattern directly, but as mentioned in no#2 expand would then kill the label. While doing this I noticed that the version that checks the signbit doesn't work The reason for this looks like an incorrect pattern. The [us]fbx instructions are defined for index + size == regiter size. They architecturally alias to different instructions and binutils handles this correctly. In GCC however we tried to prematurely optimize this and added a separate split pattern. But this pattern is also missing alternatives only handling DImode. This just removes this and relaxes the constraints on the normal bfx pattern. Bootstrapped Regtested on aarch64-none-linux-gnu and no issues. Ok for master? Thanks, Tamar gcc/ChangeLog: * config/aarch64/aarch64.md (*tb1): Rename to... (*tb1): ... this. (tbranch4): New. (*): Rename to... (*): ... this. gcc/testsuite/ChangeLog: * gcc.target/aarch64/tbz_1.c: New test. --- inline copy of patch -- diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md index 2bc2684b82c35a44e0a2cea6e3aaf32d939f8cdf..6a4494a9a370139313cc8e57447717aafa14da2d 100644 --- diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md index 2bc2684b82c35a44e0a2cea6e3aaf32d939f8cdf..6a4494a9a370139313cc8e57447717aafa14da2d 100644 --- a/gcc/config/aarch64/aarch64.md +++ b/gcc/config/aarch64/aarch64.md @@ -943,12 +943,28 @@ (define_insn "*cb1" (const_int 1)))] ) -(define_insn "*tb1" +(define_expand "tbranch4" [(set (pc) (if_then_else - (EQL (zero_extract:DI (match_operand:GPI 0 "register_operand" "r") - (const_int 1) - (match_operand 1 - "aarch64_simd_shift_imm_" "n")) + (match_operator 0 "aarch64_comparison_operator" + [(match_operand:ALLI 1 "register_operand") + (match_operand:ALLI 2 "aarch64_simd_shift_imm_")]) + (label_ref (match_operand 3 "" "")) + (pc)))] + "optimize > 0" +{ + rtx bitvalue = gen_reg_rtx (DImode); + emit_insn (gen_extzv (bitvalue, operands[1], const1_rtx, operands[2])); + operands[2] = const0_rtx; + operands[1] = aarch64_gen_compare_reg (GET_CODE (operands[0]), bitvalue, + operands[2]); +}) + +(define_insn "*tb1" + [(set (pc) (if_then_else + (EQL (zero_extract:GPI (match_operand:ALLI 0 "register_operand" "r") + (const_int 1) + (match_operand 1 + "aarch64_simd_shift_imm_" "n")) (const_int 0)) (label_ref (match_operand 2 "" "")) (pc))) @@ -959,15 +975,15 @@ (define_insn "*tb1" { if (get_attr_far_branch (insn) == 1) return aarch64_gen_far_branch (operands, 2, "Ltb", - "\\t%0, %1, "); + "\\t%0, %1, "); else { operands[1] = GEN_INT (HOST_WIDE_INT_1U << UINTVAL (operands[1])); - return "tst\t%0, %1\;\t%l2"; + return "tst\t%0, %1\;\t%l2"; } } else - return "\t%0, %1, %l2"; + return "\t%0, %1, %l2"; } [(set_attr "type" "branch") (set (attr "length") @@ -5752,39 +5768,19 @@ (define_expand "" ) -(define_insn "*" +(define_insn "*" [(set (match_operand:GPI 0 "register_operand" "=r") - (ANY_EXTRACT:GPI (match_operand:GPI 1 "register_operand" "r") + (ANY_EXTRACT:GPI (match_operand:ALLI 1 "register_operand" "r") (match_operand 2 - "aarch64_simd_shift_imm_offset_" "n") + "aarch64_simd_shift_imm_offset_" "n") (match_operand 3 - "aarch64_simd_shift_imm_" "n")))] + "aarch64_simd_shift_imm_" "n")))] "IN_RANGE (INTVAL (operands[2]) + INTVAL (operands[3]), - 1, GET_MODE_BITSIZE (mode) - 1)" - "bfx\\t%0, %1, %3, %2" + 1, GET_MODE_BITSIZE (mode))" + "bfx\\t%0, %1, %3, %2" [(set_attr "type" "bfx")] ) -;; When the bit position and width add up to 32 we can use a W-reg LSR -;; instruction taking advantage of the implicit zero-extension of the X-reg. -(define_split - [(set (match_operand:DI 0 "register_operand") - (zero_extract:DI (match_operand:DI 1 "register_operand") - (match_operand 2 - "aarch64_simd_shift_imm_offset_di") - (match_operand 3 - "aarch64_simd_shift_imm_di")))] - "IN_RANGE (INTVAL (operands[2]) + INTVAL (operands[3]), 1, - GET_MODE_BITSIZE (DImode) - 1) - && (INTVAL (operands[2]) + INTVAL (operands[3])) - == GET_MODE_BITSIZE (SImode)" - [(set (match_dup 0) - (zero_extend:DI (lshiftrt:SI (match_dup 4) (match_dup 3))))] - { - operands[4] = gen_lowpart (SImode, operands[1]); - } -) - ;; Bitfield Insert (insv) (define_expand "insv" [(set (zero_extract:GPI (match_operand:GPI 0 "register_operand") diff --git a/gcc/testsuite/gcc.target/aarch64/tbz_1.c b/gcc/testsuite/gcc.target/aarch64/tbz_1.c new file mode 100644 index 0000000000000000000000000000000000000000..86f5d3e23cf7f1ea6f3596549ce1a0cff6774463 --- /dev/null +++ b/gcc/testsuite/gcc.target/aarch64/tbz_1.c @@ -0,0 +1,95 @@ +/* { dg-do compile } */ +/* { dg-additional-options "-O2 -std=c99 -fno-unwind-tables -fno-asynchronous-unwind-tables" } */ +/* { dg-final { check-function-bodies "**" "" "" { target { le } } } } */ + +#include + +void h(void); + +/* +** g1: +** tbnz x[0-9]+, #?0, .L([0-9]+) +** ret +** ... +*/ +void g1(bool x) +{ + if (__builtin_expect (x, 0)) + h (); +} + +/* +** g2: +** tbz x[0-9]+, #?0, .L([0-9]+) +** b h +** ... +*/ +void g2(bool x) +{ + if (__builtin_expect (x, 1)) + h (); +} + +/* +** g3_ge: +** tbnz w[0-9]+, #?31, .L[0-9]+ +** b h +** ... +*/ +void g3_ge(int x) +{ + if (__builtin_expect (x >= 0, 1)) + h (); +} + +/* +** g3_gt: +** cmp w[0-9]+, 0 +** ble .L[0-9]+ +** b h +** ... +*/ +void g3_gt(int x) +{ + if (__builtin_expect (x > 0, 1)) + h (); +} + +/* +** g3_lt: +** tbz w[0-9]+, #?31, .L[0-9]+ +** b h +** ... +*/ +void g3_lt(int x) +{ + if (__builtin_expect (x < 0, 1)) + h (); +} + +/* +** g3_le: +** cmp w[0-9]+, 0 +** bgt .L[0-9]+ +** b h +** ... +*/ +void g3_le(int x) +{ + if (__builtin_expect (x <= 0, 1)) + h (); +} + +/* +** g5: +** mov w[0-9]+, 65279 +** tst w[0-9]+, w[0-9]+ +** beq .L[0-9]+ +** b h +** ... +*/ +void g5(int x) +{ + if (__builtin_expect (x & 0xfeff, 1)) + h (); +} --- a/gcc/config/aarch64/aarch64.md +++ b/gcc/config/aarch64/aarch64.md @@ -943,12 +943,28 @@ (define_insn "*cb1" (const_int 1)))] ) -(define_insn "*tb1" +(define_expand "tbranch4" [(set (pc) (if_then_else - (EQL (zero_extract:DI (match_operand:GPI 0 "register_operand" "r") - (const_int 1) - (match_operand 1 - "aarch64_simd_shift_imm_" "n")) + (match_operator 0 "aarch64_comparison_operator" + [(match_operand:ALLI 1 "register_operand") + (match_operand:ALLI 2 "aarch64_simd_shift_imm_")]) + (label_ref (match_operand 3 "" "")) + (pc)))] + "optimize > 0" +{ + rtx bitvalue = gen_reg_rtx (DImode); + emit_insn (gen_extzv (bitvalue, operands[1], const1_rtx, operands[2])); + operands[2] = const0_rtx; + operands[1] = aarch64_gen_compare_reg (GET_CODE (operands[0]), bitvalue, + operands[2]); +}) + +(define_insn "*tb1" + [(set (pc) (if_then_else + (EQL (zero_extract:GPI (match_operand:ALLI 0 "register_operand" "r") + (const_int 1) + (match_operand 1 + "aarch64_simd_shift_imm_" "n")) (const_int 0)) (label_ref (match_operand 2 "" "")) (pc))) @@ -959,15 +975,15 @@ (define_insn "*tb1" { if (get_attr_far_branch (insn) == 1) return aarch64_gen_far_branch (operands, 2, "Ltb", - "\\t%0, %1, "); + "\\t%0, %1, "); else { operands[1] = GEN_INT (HOST_WIDE_INT_1U << UINTVAL (operands[1])); - return "tst\t%0, %1\;\t%l2"; + return "tst\t%0, %1\;\t%l2"; } } else - return "\t%0, %1, %l2"; + return "\t%0, %1, %l2"; } [(set_attr "type" "branch") (set (attr "length") @@ -5752,39 +5768,19 @@ (define_expand "" ) -(define_insn "*" +(define_insn "*" [(set (match_operand:GPI 0 "register_operand" "=r") - (ANY_EXTRACT:GPI (match_operand:GPI 1 "register_operand" "r") + (ANY_EXTRACT:GPI (match_operand:ALLI 1 "register_operand" "r") (match_operand 2 - "aarch64_simd_shift_imm_offset_" "n") + "aarch64_simd_shift_imm_offset_" "n") (match_operand 3 - "aarch64_simd_shift_imm_" "n")))] + "aarch64_simd_shift_imm_" "n")))] "IN_RANGE (INTVAL (operands[2]) + INTVAL (operands[3]), - 1, GET_MODE_BITSIZE (mode) - 1)" - "bfx\\t%0, %1, %3, %2" + 1, GET_MODE_BITSIZE (mode))" + "bfx\\t%0, %1, %3, %2" [(set_attr "type" "bfx")] ) -;; When the bit position and width add up to 32 we can use a W-reg LSR -;; instruction taking advantage of the implicit zero-extension of the X-reg. -(define_split - [(set (match_operand:DI 0 "register_operand") - (zero_extract:DI (match_operand:DI 1 "register_operand") - (match_operand 2 - "aarch64_simd_shift_imm_offset_di") - (match_operand 3 - "aarch64_simd_shift_imm_di")))] - "IN_RANGE (INTVAL (operands[2]) + INTVAL (operands[3]), 1, - GET_MODE_BITSIZE (DImode) - 1) - && (INTVAL (operands[2]) + INTVAL (operands[3])) - == GET_MODE_BITSIZE (SImode)" - [(set (match_dup 0) - (zero_extend:DI (lshiftrt:SI (match_dup 4) (match_dup 3))))] - { - operands[4] = gen_lowpart (SImode, operands[1]); - } -) - ;; Bitfield Insert (insv) (define_expand "insv" [(set (zero_extract:GPI (match_operand:GPI 0 "register_operand") diff --git a/gcc/testsuite/gcc.target/aarch64/tbz_1.c b/gcc/testsuite/gcc.target/aarch64/tbz_1.c new file mode 100644 index 0000000000000000000000000000000000000000..86f5d3e23cf7f1ea6f3596549ce1a0cff6774463 --- /dev/null +++ b/gcc/testsuite/gcc.target/aarch64/tbz_1.c @@ -0,0 +1,95 @@ +/* { dg-do compile } */ +/* { dg-additional-options "-O2 -std=c99 -fno-unwind-tables -fno-asynchronous-unwind-tables" } */ +/* { dg-final { check-function-bodies "**" "" "" { target { le } } } } */ + +#include + +void h(void); + +/* +** g1: +** tbnz x[0-9]+, #?0, .L([0-9]+) +** ret +** ... +*/ +void g1(bool x) +{ + if (__builtin_expect (x, 0)) + h (); +} + +/* +** g2: +** tbz x[0-9]+, #?0, .L([0-9]+) +** b h +** ... +*/ +void g2(bool x) +{ + if (__builtin_expect (x, 1)) + h (); +} + +/* +** g3_ge: +** tbnz w[0-9]+, #?31, .L[0-9]+ +** b h +** ... +*/ +void g3_ge(int x) +{ + if (__builtin_expect (x >= 0, 1)) + h (); +} + +/* +** g3_gt: +** cmp w[0-9]+, 0 +** ble .L[0-9]+ +** b h +** ... +*/ +void g3_gt(int x) +{ + if (__builtin_expect (x > 0, 1)) + h (); +} + +/* +** g3_lt: +** tbz w[0-9]+, #?31, .L[0-9]+ +** b h +** ... +*/ +void g3_lt(int x) +{ + if (__builtin_expect (x < 0, 1)) + h (); +} + +/* +** g3_le: +** cmp w[0-9]+, 0 +** bgt .L[0-9]+ +** b h +** ... +*/ +void g3_le(int x) +{ + if (__builtin_expect (x <= 0, 1)) + h (); +} + +/* +** g5: +** mov w[0-9]+, 65279 +** tst w[0-9]+, w[0-9]+ +** beq .L[0-9]+ +** b h +** ... +*/ +void g5(int x) +{ + if (__builtin_expect (x & 0xfeff, 1)) + h (); +}