From patchwork Wed Jul 6 15:12:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wilco Dijkstra X-Patchwork-Id: 1653024 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=vmOf+xkU; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LdNMl1YPwz9ryY for ; Thu, 7 Jul 2022 01:13:07 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 101823858C39 for ; Wed, 6 Jul 2022 15:13:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 101823858C39 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1657120385; bh=Uj0c/LGA87wMGZ35qEdh/g9e+wbAFQS2xiS+QetuKrM=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=vmOf+xkUHGK8Wp5uEVzdhvI4sNtCah52+S8HfERIE1M+rXFlSYeBLCyZ3DaqTKMNu TKPHrmL0cYlQPez3Caa1KGQ29fzJhvNuQ5HSI+XuVA+OL2HSFfhI7rU9N5JgH/MPDj Q+0LglcWlGfm+H6M7sju8jMmQR47xvxgQIS9IXX0= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50060.outbound.protection.outlook.com [40.107.5.60]) by sourceware.org (Postfix) with ESMTPS id 99ED53858C20 for ; Wed, 6 Jul 2022 15:12:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 99ED53858C20 ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=nS2oqNZX+dGOf36OyxZqbzhLJ7+Xr+7jSDhV0NRmoveWkFqLAR9J5UW3W6daMEQOuVmhTDF9J8k9T5WFY1KzsO2uvlww14uJoOfX+K+JMF8hpHnNn2tQOG6hgmVMEgatmrm+M4on/VQ84AV5N5ga6WH9DgDyhGbT1gh98ripp+HKhrDCPOQmCHQhN+/P1vd+18DjlmQmp8RP8rkJNZcCCmwuh5piKpmn+12qBqI+OuHfQPoCy2lE50s6r8KWRZCmCYQug38+Hwu9YnCeIALODdjVPV0Ucn/8XwtaWbrlovdD1I+xgT0GUvNjPy9onrzKn3yVmp+IgYzxtK3f/kLohA== 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=Uj0c/LGA87wMGZ35qEdh/g9e+wbAFQS2xiS+QetuKrM=; b=BOgbpVWjb6i+fQOVGRbyq0NiKetPuWSKBFRnnIVnP5iHRb7PDysIsBkhRmnfoygyrmdx7cPqCN4hZSxTiIObT4yMOW6JDpPUXU2wPem8CqYjRHurC/1RSzYFM5UEt4FW3alA3UmZ6KW430lFHUz3j5c+SoBB1lTnJfsV5l4T2Tb+DG2Oum2wE7vXruXqFFY70z+zW5VUu0jenNDnVkqUJUtIRAL8Zts8EQuAH7l/d8N/2y7bIlnvp3kAyOnd1tLc9YvtwkWCn4r5a0RS7prOdPjGWqAK2XM99EXWSYpbmFlBbUFwKUPk5/Gyt+9sYPoDiy2/1wlbe4Qr+tjCbSPXOw== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 63.35.35.123) smtp.rcpttodomain=sourceware.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 DB6PR07CA0103.eurprd07.prod.outlook.com (2603:10a6:6:2c::17) by DB9PR08MB6811.eurprd08.prod.outlook.com (2603:10a6:10:2a7::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.15; Wed, 6 Jul 2022 15:12:45 +0000 Received: from DBAEUR03FT026.eop-EUR03.prod.protection.outlook.com (2603:10a6:6:2c:cafe::fc) by DB6PR07CA0103.outlook.office365.com (2603:10a6:6:2c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.6 via Frontend Transport; Wed, 6 Jul 2022 15:12:45 +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 DBAEUR03FT026.mail.protection.outlook.com (100.127.142.242) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.15 via Frontend Transport; Wed, 6 Jul 2022 15:12:44 +0000 Received: ("Tessian outbound 190453a6d737:v122"); Wed, 06 Jul 2022 15:12:44 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: dd1c9470880934c4 X-CR-MTA-TID: 64aa7808 Received: from ac253347ce27.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 86917B28-BAC2-4429-9E95-6B5377861D5B.1; Wed, 06 Jul 2022 15:12:37 +0000 Received: from EUR04-DB3-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id ac253347ce27.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 06 Jul 2022 15:12:37 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PAEtLN7SOy/8FHDN7JnjhTDjYFev4uiztbRm/z1BFOSCvLOTClUDvohhfrzhRIvTc2WyCdXtp97dYlItsQPwWlDGgXSuQE2wLyOPIMW7i4YjL6QJbe+ezYAR5MQ9Klh1DeTgskVlGxKQc3DLsYSm9GVQwM+1QVGnZpXhyClROG5OJEG9mRtI9AQy8x1zOo6ZnNciqkMtrR0Mq+41QCp/to89tKhQo0BbQBLAiTFgH9tRgl3+pp+FLFT0pIh3ECYLJ1e+31ckMIV4Bns6JsTf1dYzwjNuyGJT44mlfvmiKuIHDzFzM2SQVN0zfIwV2jfspnJVJLD09EBNAXkpfhjxxQ== 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=Uj0c/LGA87wMGZ35qEdh/g9e+wbAFQS2xiS+QetuKrM=; b=Df/iKDdkKqm3qRgsYlSWZbzW3DpRU4RZhgcelxDb41kWfNYbnAz2OLSE9jDHFP59xda+wdu8uJxGg+XyvXPSWKFIeBKtZwvhxKPQv0WVXLnMTGh9aTsTPc+zWHaVEjdcQHJFPvZvfR5nCBF4FgisaB+pH1bYaU1sBT0uDwRkOleBF3XtvTX0L2UucHdoS4sutaIsIbRYs+aLV3cdXecRDQtUyIeVpWwoaoMf8hnjzlrD/bGv2MTEwiXv5qzrI3pvAvLhwpp7qsFEclJJKaIwk1fBqqcLjLVdfPOCidDuuo0xNg7P15RoCSZPt0jp7WGXVbnqEklYrziPdXKmrvSj1Q== 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 Received: from AM5PR0801MB1668.eurprd08.prod.outlook.com (2603:10a6:203:3c::14) by AM4PR0802MB2178.eurprd08.prod.outlook.com (2603:10a6:200:5a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.15; Wed, 6 Jul 2022 15:12:35 +0000 Received: from AM5PR0801MB1668.eurprd08.prod.outlook.com ([fe80::845f:5b9c:410a:f581]) by AM5PR0801MB1668.eurprd08.prod.outlook.com ([fe80::845f:5b9c:410a:f581%5]) with mapi id 15.20.5417.015; Wed, 6 Jul 2022 15:12:35 +0000 To: 'GNU C Library' Subject: [PATCH 2/7] Use atomic_max_relaxed Thread-Topic: [PATCH 2/7] Use atomic_max_relaxed Thread-Index: AQHYkUqtlJgSkjccBUC5Yv+bdre4LA== Date: Wed, 6 Jul 2022 15:12:35 +0000 Message-ID: Accept-Language: en-GB, en-US Content-Language: en-GB X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; X-MS-Office365-Filtering-Correlation-Id: c49273fe-80b2-4dae-ee7e-08da5f61fac4 x-ms-traffictypediagnostic: AM4PR0802MB2178:EE_|DBAEUR03FT026:EE_|DB9PR08MB6811:EE_ 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: ZfucYfvxPeKHsqGF0866mHYOqOGwOCLt6JVNuJl04F+AJntTZFwfEEsF4g/l0jhZAN2nTGnxrvExuVcJ+TNpEeYibHYTnsNhi4SwOkRWAb71qU0nJo3KEd3HH4aY3eaXUC++jtGAdWoXxHQvi0xH5CWlnqerIvPKuYdNdqXucvkxNSvCJ6i1QaYoF4VpUjgUdBbXNngfl+8Gm82s6HZvGLArA2gFq/kxreMIXPiUG4POJYe1bwfDOlC5N6wwsqx/HzoBSHeTWR8RNyf/ZK9j4vP+rZuhX2gl6hPhBLdZsz+7AZVzoEsDT8s08O+3/RjKU8nKmgU+gW35kd76KMXQRJJwR6/dtlRb1hRYaev13W5UK+t04ThFxdunE8VltAu68uMJpQIt5ULT8rT5MjWY8dFM9wloVJc74mr0uqRdMrjtx2bUPAi/NGdaxAztesWkK/OLzhpiD6LraT8omCjs6UA8qonJd4uOngz/pjSSCOxJzTPU+h9neTSYl2E5k2pIoVHSoqwVLPiLglbxdLXG9pWSl00s0memo+Mi4cBaM9ubOGceUf2SWpk3189JDuK57wDrOAmHnlKKZruXFi4tjomZ+/JzzSPwobLEmN6pxo9k2NIkR7vzRpWiyRTRw/2OKxOmQUneljXDBYmNymqrcq+KaQRHvjpa26c62QVvSEz4hkhD8WXMs7TWJRV8fYIhq8X9JblapUHGO3ghS0xGu0QHTJSdUpuuykqz943FBiVev8VR7sV76no+OFxf0Q6bV8qcRaTBB5B7b6Od6a5XY2lv2PgkpCoxJl1W/IaagbWqvMlV8aAxZT+2NaM1nXf7 X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM5PR0801MB1668.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(4636009)(376002)(136003)(346002)(396003)(366004)(39860400002)(83380400001)(38070700005)(52536014)(9686003)(122000001)(186003)(6916009)(316002)(8936002)(5660300002)(2906002)(26005)(33656002)(41300700001)(478600001)(91956017)(66946007)(66556008)(55016003)(76116006)(8676002)(6506007)(86362001)(7696005)(38100700002)(66476007)(71200400001)(64756008)(66446008); DIR:OUT; SFP:1101; MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR0802MB2178 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: DBAEUR03FT026.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 6d61d629-fb93-4f46-7ad1-08da5f61f4e9 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0HSAre1lBOLLNSrbigJJ+2xV6tpxg5mj/ymlnx2iaQC1RjCzY8hPbP4wZwehH1R7aeOBw+Yd+eZjvJwJc6tolqsAJNenQKsonCXW6XFnzUCJNmOLSKA98jpSV6YC6GUVIq2hwpQVPOEn6AeWRp90UeiVB8mspdnTd8iHZAQydICIkXcBTCxFYZ214SouC2E2hvV5jo8wFuoZX1yuOMuFDWYk/kac4gs90XjPkht6/IxPBcN3U8d2v9sepKhIQ64n9mGY72CZoQcvFeurPhGF2/mzp262tMnDQb+v0YYikL4CF3zIvH+TVcI+0jbfO0FxEJROJt3dSGkxB1Mxn37CCpNKNynRPYfpezLsPeejqumYoHsLJAiT1J80Jp2EM3IczYRfgrTKUGYxlntaUv5UldsMRZj9piKNYSzznfdCgO5vwnUQtWQIA0P4KrydhufilXt7/AX4bDwEbDFYxYfHfeFq2GhdXYvxrOJQdvIqOuj0OE4oz+evtjcQBBPovyQhYFCjiIis64WtwVtdI6OoRTQaDrRZqS/jzWxQPUbXesaEbgutA6fRjVpPrRmaVybFxLy7LCSqAEnPW6nY3rT7sFWX3asmox4Kw/BCtIM54TWDsVlwzZ8PYB7TFJQBw/kQVeg8EnL80FqTeYlj/skcXIV2FiRNn7CPzu1mf2SuoiYM7M0pnn20I9W+osY/JLgqN8nbXPMCmMNPF6Gc1aFUD04orpXb3lCb78ewrtaiqF3buThFbvpUJyhL4GY7jsp+qtOxyrgv0m6UOw78Emc8btLKykZej23d/+6TsVKZRM8o0dLW2qZ8w42+AcEXAg8t 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:(13230016)(4636009)(346002)(136003)(376002)(39860400002)(396003)(46966006)(40470700004)(36840700001)(7696005)(26005)(6506007)(40460700003)(9686003)(47076005)(186003)(82740400003)(83380400001)(336012)(478600001)(40480700001)(2906002)(33656002)(55016003)(8676002)(70206006)(70586007)(41300700001)(86362001)(82310400005)(8936002)(81166007)(52536014)(5660300002)(36860700001)(6916009)(316002)(356005); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jul 2022 15:12:44.9866 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c49273fe-80b2-4dae-ee7e-08da5f61fac4 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: DBAEUR03FT026.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB6811 X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FORGED_SPF_HELO, GIT_PATCH_0, KAM_DMARC_NONE, KAM_LOTSOFHASH, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE, 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: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Wilco Dijkstra via Libc-alpha From: Wilco Dijkstra Reply-To: Wilco Dijkstra Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" Rename atomic_max to atomic_max_relaxed since it cannot guarantee a stricter memory ordering. diff --git a/include/atomic.h b/include/atomic.h index 264db9a0b7619ff6520f84a19c53c1eb9a3b42a3..73cc772f0149f94fa0c3e14fa858fa89fee6985f 100644 --- a/include/atomic.h +++ b/include/atomic.h @@ -165,14 +165,15 @@ atomic_exchange_and_add_acq(mem, value) #endif -#ifndef atomic_max -# define atomic_max(mem, value) \ +#ifndef atomic_max_relaxed +# define atomic_max_relaxed(mem, value) \ do { \ __typeof (*(mem)) __atg8_oldval; \ __typeof (mem) __atg8_memp = (mem); \ __typeof (*(mem)) __atg8_value = (value); \ do { \ __atg8_oldval = *__atg8_memp; \ + /* This early-exit means the atomic has relaxed memory ordering. */ \ if (__atg8_oldval >= __atg8_value) \ break; \ } while (__builtin_expect \ @@ -181,24 +182,6 @@ } while (0) #endif -#ifndef atomic_min -# define atomic_min(mem, value) \ - do { \ - __typeof (*(mem)) __atg10_oldval; \ - __typeof (mem) __atg10_memp = (mem); \ - __typeof (*(mem)) __atg10_value = (value); \ - do { \ - __atg10_oldval = *__atg10_memp; \ - if (__atg10_oldval <= __atg10_value) \ - break; \ - } while (__builtin_expect \ - (atomic_compare_and_exchange_bool_acq (__atg10_memp, \ - __atg10_value, \ - __atg10_oldval), 0)); \ - } while (0) -#endif - - #ifndef atomic_add # define atomic_add(mem, value) (void) atomic_exchange_and_add ((mem), (value)) #endif diff --git a/malloc/malloc.c b/malloc/malloc.c index 1b2a19c38ac4fd0af0c0b4a953ac6580101916ca..a5e68a34059b18e67899aeb616976682382976ba 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -2486,11 +2486,11 @@ sysmalloc_mmap (INTERNAL_SIZE_T nb, size_t pagesize, int extra_flags, mstate av) /* update statistics */ int new = atomic_fetch_add_relaxed (&mp_.n_mmaps, 1) + 1; - atomic_max (&mp_.max_n_mmaps, new); + atomic_max_relaxed (&mp_.max_n_mmaps, new); unsigned long sum; sum = atomic_fetch_add_relaxed (&mp_.mmapped_mem, size) + size; - atomic_max (&mp_.max_mmapped_mem, sum); + atomic_max_relaxed (&mp_.max_mmapped_mem, sum); check_chunk (av, p); @@ -3111,7 +3111,7 @@ mremap_chunk (mchunkptr p, size_t new_size) INTERNAL_SIZE_T new; new = atomic_fetch_add_relaxed (&mp_.mmapped_mem, new_size - size - offset) + new_size - size - offset; - atomic_max (&mp_.max_mmapped_mem, new); + atomic_max_relaxed (&mp_.max_mmapped_mem, new); return p; } #endif /* HAVE_MREMAP */ diff --git a/malloc/memusage.c b/malloc/memusage.c index 74712834fa8b96fb2d9589d34b34ab07d05a84ca..d2f768b97df4e383a41b0eeaf0c37433ce890757 100644 --- a/malloc/memusage.c +++ b/malloc/memusage.c @@ -149,7 +149,7 @@ update_data (struct header *result, size_t len, size_t old_len) /* Compute current heap usage and compare it with the maximum value. */ size_t heap = atomic_fetch_add_relaxed (¤t_heap, len - old_len) + len - old_len; - atomic_max (&peak_heap, heap); + atomic_max_relaxed (&peak_heap, heap); /* Compute current stack usage and compare it with the maximum value. The base stack pointer might not be set if this is not @@ -172,10 +172,10 @@ update_data (struct header *result, size_t len, size_t old_len) start_sp = sp; size_t current_stack = start_sp - sp; #endif - atomic_max (&peak_stack, current_stack); + atomic_max_relaxed (&peak_stack, current_stack); /* Add up heap and stack usage and compare it with the maximum value. */ - atomic_max (&peak_total, heap + current_stack); + atomic_max_relaxed (&peak_total, heap + current_stack); /* Store the value only if we are writing to a file. */ if (fd != -1) diff --git a/sysdeps/unix/sysv/linux/riscv/atomic-machine.h b/sysdeps/unix/sysv/linux/riscv/atomic-machine.h index a3eff1134ac2bed7e1e14de961cf77b8b1a33ce5..deb6cadaa35e841e23cee55d169a20538bdb1f8d 100644 --- a/sysdeps/unix/sysv/linux/riscv/atomic-machine.h +++ b/sysdeps/unix/sysv/linux/riscv/atomic-machine.h @@ -157,8 +157,7 @@ abort (); \ __tmp; }) -# define atomic_max(mem, value) asm_amo ("amomaxu", ".aq", mem, value) -# define atomic_min(mem, value) asm_amo ("amominu", ".aq", mem, value) +# define atomic_max_relaxed(mem, value) asm_amo ("amomaxu", "", mem, value) # define atomic_bit_test_set(mem, bit) \ ({ typeof (*mem) __mask = (typeof (*mem))1 << (bit); \