From patchwork Fri Jan 12 12:31:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Sandiford X-Patchwork-Id: 187720 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2614:b0:101:6a76:bbe3 with SMTP id mm20csp139468dyc; Fri, 12 Jan 2024 04:32:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IFpwBpJi3delH/aNDj+bpszCgHyO75pVygRsiarHACviXDa+axYVfZ2ehZViXqBRekbRG7D X-Received: by 2002:ac8:5a44:0:b0:429:b64f:3e1e with SMTP id o4-20020ac85a44000000b00429b64f3e1emr1189116qta.2.1705062761527; Fri, 12 Jan 2024 04:32:41 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705062761; cv=pass; d=google.com; s=arc-20160816; b=XXka9/e5XTaY8dSI3mr0fpsC9+exUIBvqKMxqwxMT8XPAlh/EBJmAfvHYfBaXif5Pb /eJxNRQBQ5tOFPz6gKMMajRgvdzvRSeA2rqE3sLukiWU+q52geK2TWZ0EPmmBfBCgAqF 3ce2oT18S4jmLRlxsenfT2aKKDegUG9EAD3//8SwUjJdIMTvmFTdwsbMpBIrUXiatMPP PCbRtF6umOcUFQTnzUXxp9NS18mD1ahwXaDyoJ7jt32kFiZ0mDNuQekqbaAydblPjMQH PJFJ6LSlEWyuymtzczdz3eG5JswF7MCdqQqS1f98+b/JOm/kK+Fif2MmjT3HawOzu+wW KN9w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:mime-version:user-agent :message-id:in-reply-to:date:references:subject:mail-followup-to:to :from:arc-filter:dmarc-filter:delivered-to; bh=7lMhmxeGuMou8GXa2J5GVYyLiPCoA6K/8EZGuMRkIbs=; fh=hPrbWPhweUx4V0GV9uXJqbyAzg2ABmTz7kczrAQqMmM=; b=RxmuLuWHAJ2/vi4k9TmA+xiOo19cjDi3rB/E7TN/Axp4yuEn5963kwlaYKCl4RsRwT iWtYvd3ay9U+DA5ElVtzYJDbKXrdT2l9cvDr7YV9fHYP90Bz6zmpqcOoUblUeB+OYOIm wrd6J9hlHGrgR8VIgZYlxvMTJGlVOtBz+0UJ0weNkmMVLKBf2rHm46NSFddNRJpR2tlJ K0gJI9pkbPy7t6+TvJ6bHg49QUIcfcVSxke+3nk4K+BRBVFTYoJavxiB2QmjdjaVEMvs woMqJ9mKal5+XF4hqr41k7mx6MBj8sc6cZo7mUC7M29Y3LG20gPxsqLbJbwZyxHx22aU 8R0g== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id t20-20020a05622a149400b00417b8ceb616si2821339qtx.403.2024.01.12.04.32.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jan 2024 04:32:41 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 41E3B3858D20 for ; Fri, 12 Jan 2024 12:32:41 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by sourceware.org (Postfix) with ESMTP id AE31C3858C36 for ; Fri, 12 Jan 2024 12:31:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AE31C3858C36 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=arm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org AE31C3858C36 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705062712; cv=none; b=xySrQ1qGJbPkBhkAALd6HqUYcJmWq3GvZ91rbpY1E+jyd3zFFkJhHBCiTvE86xn4TxfjpZ5uDPdFb9lytmVd2GduH2o3HARPbiz56Dhdq1Mdwj7UQUaQl5YjLA92Frfu7hu/DyBEUcdwRnBRWixrXTjNZTvUKYN2DvBKUd8BMxM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705062712; c=relaxed/simple; bh=sN04BGjluT4ZjAIgdwcQ4NSEy5rwAlDrOzdiAq5p/Cw=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=F1NXpvVrdjjOXx480DAP8gwdzU+F1w0AOWtIEwX9NF5QIStltkSbT01ajgfDurr2AJTvoXobrCj+lbJ+e9Ub4XtN9MHyY4apHR1uD2EsXyzrn0ZpeRi8kBL2/eZ5WnwwKaSDy+DRhHmUd1qCZPxK6J73buqw+OUGIPoFTBz8Sw0= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A4D971FB for ; Fri, 12 Jan 2024 04:32:36 -0800 (PST) Received: from localhost (e121540-lin.manchester.arm.com [10.32.110.72]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 0D7403F73F for ; Fri, 12 Jan 2024 04:31:49 -0800 (PST) From: Richard Sandiford To: gcc-patches@gcc.gnu.org Mail-Followup-To: gcc-patches@gcc.gnu.org, richard.sandiford@arm.com Subject: [PATCH 2/2] aarch64: Use a global map to detect duplicated overloads [PR112989] References: Date: Fri, 12 Jan 2024 12:31:48 +0000 In-Reply-To: (Richard Sandiford's message of "Fri, 12 Jan 2024 12:31:09 +0000") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Spam-Status: No, score=-21.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787887890562168827 X-GMAIL-MSGID: 1787887890562168827 As explained in the covering note to the previous patch, the fact that aarch64-sve-* is now used for multiple header files means that function_builder::add_overloaded_function now needs to use a global map to detect duplicated overload functions, instead of the member variable that it used previously. Tested on aarch64-linux-gnu & pushed. Richard gcc/ PR target/112989 * config/aarch64/aarch64-sve-builtins.h (function_builder::m_overload_names): Replace with... * config/aarch64/aarch64-sve-builtins.cc (overload_names): ...this new global. (add_overloaded_function): Update accordingly, using get_identifier to get a GGC-friendly record of the name. --- gcc/config/aarch64/aarch64-sve-builtins.cc | 22 ++++++++++++++-------- gcc/config/aarch64/aarch64-sve-builtins.h | 4 ---- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/gcc/config/aarch64/aarch64-sve-builtins.cc b/gcc/config/aarch64/aarch64-sve-builtins.cc index 3ad2271d51c..c2f1486315f 100644 --- a/gcc/config/aarch64/aarch64-sve-builtins.cc +++ b/gcc/config/aarch64/aarch64-sve-builtins.cc @@ -938,6 +938,10 @@ static GTY(()) vec *registered_functions; overloaded functions. */ static hash_table *function_table; +/* Maps all overloaded function names that we've registered so far to + their associated function_instances. The map keys are IDENTIFIER_NODEs. */ +static GTY(()) hash_map *overload_names; + /* True if we've already complained about attempts to use functions when the required extension is disabled. */ static bool reported_missing_extension_p; @@ -1585,21 +1589,23 @@ function_builder:: add_overloaded_function (const function_instance &instance, aarch64_feature_flags required_extensions) { + if (!overload_names) + overload_names = hash_map::create_ggc (); + char *name = get_name (instance, true); - if (registered_function **map_value = m_overload_names.get (name)) - { - gcc_assert ((*map_value)->instance == instance - && ((*map_value)->required_extensions - & ~required_extensions) == 0); - obstack_free (&m_string_obstack, name); - } + tree id = get_identifier (name); + if (registered_function **map_value = overload_names->get (id)) + gcc_assert ((*map_value)->instance == instance + && ((*map_value)->required_extensions + & ~required_extensions) == 0); else { registered_function &rfn = add_function (instance, name, m_overload_type, NULL_TREE, required_extensions, true, m_direct_overloads); - m_overload_names.put (name, &rfn); + overload_names->put (id, &rfn); } + obstack_free (&m_string_obstack, name); } /* If we are using manual overload resolution, add one function decl diff --git a/gcc/config/aarch64/aarch64-sve-builtins.h b/gcc/config/aarch64/aarch64-sve-builtins.h index 2bb893af7dd..e66729ed635 100644 --- a/gcc/config/aarch64/aarch64-sve-builtins.h +++ b/gcc/config/aarch64/aarch64-sve-builtins.h @@ -453,10 +453,6 @@ private: /* Used for building up function names. */ obstack m_string_obstack; - - /* Maps all overloaded function names that we've registered so far - to their associated function_instances. */ - hash_map m_overload_names; }; /* A base class for handling calls to built-in functions. */