From patchwork Fri Sep 23 18:53:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugene Rozenfeld X-Patchwork-Id: 1681634 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=rCAJ/GKV; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MZ1Wq5dNZz1yqV for ; Sat, 24 Sep 2022 04:53:42 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 21EF9385803D for ; Fri, 23 Sep 2022 18:53:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 21EF9385803D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1663959219; bh=4c/bttomPyZDBP65gCDvUaFpqLPaIkbcCTALqW/x3o0=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=rCAJ/GKVHWMMYmQN6Uv+Y/DS3l+tgMd+bGKybLEDt8nexMMBSoa461H3WbHAVYVCK 4fMeeHV3SROyo1CBonDi+mNrNxiusXe2MaX6LkWFilPjuxTkkGw5Omeal93JcAs1iR Orpfb1LeZNcvF97BvdsRjVqFD0UjIVni17CoxdZg= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from na01-obe.outbound.protection.outlook.com (mail-eastus2azon11021021.outbound.protection.outlook.com [52.101.57.21]) by sourceware.org (Postfix) with ESMTPS id 8FDEF3858C52 for ; Fri, 23 Sep 2022 18:53:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8FDEF3858C52 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SBKdFsin2CyjJj0tF8PEVPxZ+s/+NradGW8a5xIUB4Z7soeO159rm39eRNiHsMtDgWK8JaYewdD47C7Nws8AWB7fMkKiranyiFchTmwcU8TGJcGI+Le4ZvR7yZ11ob8OTHtAu9k2xoxVrX14mwOnfk4OcX93siR6L4zV7vVvQsvBuMd8rQaDtrX+pZ3gu1h4vtTk/rpd1QM/Ek/mzkt+gdaz3nvMDh+ZBeeh31KRlj5HfD4wcgdA+BOUagckNEvlF/De074zHwFe7YnjUvhrP7/yX1n5HE7cs34p6szfZ4PNqRS+UFZTx1mdpzNpryEAyk/EDbLtoCmXeLaym6YM7Q== 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=4c/bttomPyZDBP65gCDvUaFpqLPaIkbcCTALqW/x3o0=; b=RW8Q7EHQxjd7R8hBNylkqUNQF9QBymQSLP0NILHuGyj3K9StOgrXsFa4kNezDUtT7k70RYIn8cNK18YfY21POLWu0wZK4haI6AzoBWn4YLhSAxW+2rnA6PfFTzRaxgXq5Gntglu1S3oBR45J2Coinvtc5JAP/NWC/Gz3DHqIOHhiYSFJcMz6dOVtm+5moi12T98qv4QXkGRfLmlFRAEPDa8ePTwTpANBYqwgyXC0qyVFNOrWhI+fpzN+raKsSLKrBwAqDoPXkS4lB9uFcoWSYkwokAau6WxXkdwoPP/8/MzD2pIBPbQgKhhSs5nQCiGclHwicEbT3/5wseB2AwWL6g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microsoft.com; dmarc=pass action=none header.from=microsoft.com; dkim=pass header.d=microsoft.com; arc=none Received: from CY5PR21MB3542.namprd21.prod.outlook.com (2603:10b6:930:d::7) by SA0PR21MB1882.namprd21.prod.outlook.com (2603:10b6:806:d8::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.9; Fri, 23 Sep 2022 18:53:16 +0000 Received: from CY5PR21MB3542.namprd21.prod.outlook.com ([fe80::9654:314:4725:db6d]) by CY5PR21MB3542.namprd21.prod.outlook.com ([fe80::9654:314:4725:db6d%4]) with mapi id 15.20.5676.011; Fri, 23 Sep 2022 18:53:16 +0000 To: "gcc-patches@gcc.gnu.org" , Jan Hubicka Subject: [PATCH] Fix profile count comparison. Thread-Topic: [PATCH] Fix profile count comparison. Thread-Index: AdjPfaKPkk9srY+5Se2BufYvGgFcTw== Date: Fri, 23 Sep 2022 18:53:16 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_ActionId=14d81881-193a-4db7-9ab2-4f4e951a2ff4; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_ContentBits=0; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Enabled=true; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Method=Standard; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Name=Internal; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SetDate=2022-09-23T18:51:43Z; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SiteId=72f988bf-86f1-41af-91ab-2d7cd011db47; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: CY5PR21MB3542:EE_|SA0PR21MB1882:EE_ x-ms-office365-filtering-correlation-id: 53598399-8c4c-47ce-492e-08da9d94dfd4 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: siVwkizI6vrHZr4unJpUL0wO9hmlTtDSoURlZ2RaQYndzMBrQJRMWWJs7lJPyq01n06tu8SzuZR/lNFFRXpdQmT3IoGF+6s270vrLr7ZVIRT8LjFuj6ySaNA/0DUuYEMiS6Adscxc7qqmYIfyDJr+Wb/JsNiVuDbWOwWG1gnfrz/6NykGPLmqhmE2iPUS1gCAbPNptPGiDwFp9jkQruzt/tcxSr+SUZOyRZlKPgwiIzpuXQHm0x6xWvStiC1//TT5Vayi8ycHFIf7Zk6MsJDruzIJdrPdG2GaVGM2uytGxPuVzfcb9s9AQTbwlUgOZCC5rztMrcjUIRbIoCDHkCCp8g5Rtb7r6BOTz3ZAWOmTWgTIoTeKILD5D8C9p3WFida9g2Bk4Mpq3KxwM40IBLco9U3Uwx7kR+iVQXOcOT0lXOllBxq+9nKtSJqC2c2TPkkIGNKzAzVeOuY0I3qtvFUXGjryrdRij3ZMphlTw+g/BGX6KA+XNk8Vi+oY4KE3r6m3y93sceFPhev5tfIjWymZfnPLzkwFdBGhJ8I20Ku6qD+Z8N+q89+kvaanBOxMZh3hE1ifkVgngb2ylHRatPuBawz49SaXzuzbrA6SltY+tqL3e5UBSIsJ8++ztVC0E3++c2JxSzmjswsiTUpsIJlzV384+9g1k5cpnEVeqEPFdT6jzsIcaVIHtiVtsTKk0hEGfjVoPINGc33/vatbPEX97F/mrA0jiVMIjLGLUrXuDmlqkU7ycKCxvvcsRicQJxHstp0z58AIN04+GO4xGlz1FxN8VgIHzxMePKrjWF7kaJwD3ByDrk09NTxm7PKuNX7 x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CY5PR21MB3542.namprd21.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(396003)(366004)(376002)(39860400002)(136003)(346002)(451199015)(2906002)(186003)(5660300002)(82950400001)(82960400001)(38070700005)(83380400001)(8990500004)(38100700002)(122000001)(55016003)(316002)(110136005)(86362001)(33656002)(71200400001)(10290500003)(478600001)(76116006)(41300700001)(9686003)(66446008)(64756008)(8676002)(66946007)(8936002)(66556008)(52536014)(66476007)(7696005)(6506007); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: hYANB9r7adMeY5H9c+6fJOjmTB1ACB3GP3TaUM/Kw4qVJ1HXb0crCCLBXwuflj96k9Dc2ojbaNkjDyu8vG6Cj8CRbZ9pFC7ICdz3wMOFJ3eL5AqnuFiRDzjs/96vGNKxH9Zq9HqJbMs9iKl5shQlzRFf96u8ZScSTk3MZfZRUtsAg2cbP8ZdIKpyv4kQY+7CvUUk5HtMEzBJpS7l1g6KRDA0OmBe466NYpLom/Y5BclvSDnqLRg7bHPvEc5sKH8YFgdnau26BP8VelQFJ1z9i8i+pwGaIPLs4qVQAB86zQxpZ+MbS/oVJSuWkM7pWyqmXD2n0PEhsy5raitkSGaMIzagawKh+eSxRzwxcf3asSSd2zdukJTh1z1F/3fKnOq79MAwn48h+IlzKlMDAEsL6S93XyOV3VClBxEuTbYms782dY4OCI6WsUt2KLStcfZ7BMrSHOZdSObnPAIQyVKwYhvblprnEHvj0R6ghXuP55W616fmOeGBRPSMfrHakQa4rU+1VZDJ35JiTQY8k/JzFmKnmhnvWtyLOHUBUkwMAXBO16Ry8J2URzF8G1BoQBoWUZvp/4ehTBGceXYPMzB6NXzB3z6P5RykllUZ6ZdLIBKA6pM2vzC7Au7nl0FbGRNwNhj1v9FlsQ6c0xjDyOwzar4lCK/QpFvUROs2CO9SKWPRlaYtiiDm38C3U1hxsFhzTTkjStA5HyX24zohr1pDacfN0gAcCUXUfQDARh/S7B2wUzRCmJ6uxN7xVQFKMbd9OXXW7GQNPXoS6lxriyDFCjvHGK1KhGkBqgEnIo6dpnwRPaefH0YPegO5CBzuHfiUkuf8iclt3fGz9TIodVcHSg6YRLVqlaH6fSa1SgrxXqvwWP6Mj7uR/8IqiVVQsc8sZ4fSt8Db19B9YtdkcFDhaQ/Y7kGd4z80OeTbK2IcDvj5kiI2lVC3yBR5BxrYOXd1KYezprJLXbtQT8wrHzn6Tg6dHETmn9H0MPd+3mKBZP0QiutZO738C+ijPGgg6P8g4uanTgYpcbeGkkc9WzxGcOdZoZ4RyNN5/yIF5XY9VMjFgVddq5mqn+RSIz6VtUoLtt9BrwImCLrexZWu2P79nJq+t8QW+KpK6a/j+qUJQCFY+uNG2elb1o8MbcV1MeFVLl97ERXCyiExQiANp/i7hxm/+4q1PtrCfVpOhvT3j4+nrV9h6MVgUskhWgb6Z7+23FVAmYXxa/RnlfopfjbvXEkLdJauOnREGQsO5n9AIKcqYGgPlrvrYH9kHwl4MuFE+PT1Twxw1DdCEhc6QgbvCojCyXqwdXSZTaNOryAIz9krqd82j5B9G3Fwq6HNUd08Qs5QZ2DtbEmXjq5rbPmJ0Gk4NDjPaAwZxMlEeppVdQMkhHpZlY0Iaimk9tW35fdoRSFzSYwo1Lu8VQVWZygpYWjFxA6nkHjwbkgFh9pysaxwybga9W561aEzOdjTsfaTC+7trPpM/S/qYJwzsfoC/U7DHuuTVCBZU50oNEasw24tmvTqLaS+uLCaKG0x5xZZ7UZIGgJN8X0rO8Lc4OUpTRdhyKwRmREkVTRcORaqlZktxktelpM5iujD/OFtDYXrCEZFvRd/ZMjSl36pW2HBgkl8HuUZccO9WYeysNl1SEdk7qq6j1bY2BzcD3FfSZxp MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CY5PR21MB3542.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 53598399-8c4c-47ce-492e-08da9d94dfd4 X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Sep 2022 18:53:16.1830 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 9u5dLMZ/5bagZpvu4FIAit5GMaIDFiBxnfFWRiXYm0y0YrRCJrPMeqg1GQtHGqM9+523bwRD+sZ7xe42+hutXQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR21MB1882 X-Spam-Status: No, score=-9.3 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FORGED_SPF_HELO, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_NONE, TXREP 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: Eugene Rozenfeld via Gcc-patches From: Eugene Rozenfeld Reply-To: Eugene Rozenfeld Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" The comparison was incorrect when the counts weren't PRECISE. For example, crossmodule-indir-call-topn-1.c was failing with AutoFDO: when count_sum is 0 with quality AFDO, count_sum > profile_count::zero() evaluates to true. Taking that branch then leads to an assert in the call to to_sreal(). Tested on x86_64-pc-linux-gnu. gcc/ChangeLog: * ipa-cp.cc (good_cloning_opportunity_p): Fix profile count comparison. --- gcc/ipa-cp.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.25.1 diff --git a/gcc/ipa-cp.cc b/gcc/ipa-cp.cc index 543a9334e2c..66bba71c068 100644 --- a/gcc/ipa-cp.cc +++ b/gcc/ipa-cp.cc @@ -3338,9 +3338,9 @@ good_cloning_opportunity_p (struct cgraph_node *node, sreal time_benefit, ipa_node_params *info = ipa_node_params_sum->get (node); int eval_threshold = opt_for_fn (node->decl, param_ipa_cp_eval_threshold); - if (count_sum > profile_count::zero ()) + if (count_sum.nonzero_p ()) { - gcc_assert (base_count > profile_count::zero ()); + gcc_assert (base_count.nonzero_p ()); sreal factor = count_sum.probability_in (base_count).to_sreal (); sreal evaluation = (time_benefit * factor) / size_cost; evaluation = incorporate_penalties (node, info, evaluation);