From patchwork Tue Mar 5 21:45:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 1908469 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=Hh0CFy1r; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Tq8J836khz1yX3 for ; Wed, 6 Mar 2024 08:45:44 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5BF1B38582B0 for ; Tue, 5 Mar 2024 21:45:42 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) by sourceware.org (Postfix) with ESMTPS id 1B2DA385840F for ; Tue, 5 Mar 2024 21:45:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1B2DA385840F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1B2DA385840F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::633 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709675127; cv=none; b=Zas+ke1LrHQnZxpss/eeheXadz4Av+r8VooEvCdNqZAc5d+aLaHHBYoHcGTqmWGgBNClI3B0ispwWoTALNcDSl0IpS+SU9GeSpGuzEWKWTukGSjg9Naf5oBcO0BDmzNG3BL+LWmmZQkLveCE2Tz/0mmViwKJ1HQ8eqAeLwDNaDk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709675127; c=relaxed/simple; bh=SIRpc9QfFdDAc35pkSs3mGvtoedUjo71qcyEf2m/eok=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=TLyk2lviuezw2UEgEUiOR0vAcjec7RfnVurhE1RYXnVwt8/lPU1IJdes0iIVZ0MoEtO1dwmcj2W7rKB5UZrd++kr15Op4vdxqPfjGXUrS/t03hSdpO/U2R/oY6kLnpu+7k8SZTaz0HRsI8PTw48GYxtG1SGErxoJWJfUjdAhXIo= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-1dc3b4b9b62so1730755ad.1 for ; Tue, 05 Mar 2024 13:45:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709675123; x=1710279923; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=BP50fE/w7uBFauZAyYNgOPqhRKmMR5Nimx3NdP3hR3w=; b=Hh0CFy1rMFmNfJVpLY89nflx5JpvIEcRGf0QAN+LH7puL6fp6FL1WPQaTck3BShElY iYrWTbONlblS5Xve7s37v/I5DnhQiH2x6vaBtHW+PJZ/IyVE4PB3U6wpNDYMuK0w0hDl HLG/kHA8l/S4tzgllXqYxg/BwKyWF1l5Cmm7/piKbEBpXdOJS2Ml0AF6KCyEIbqailYE wh8n21EOt4IpeBI4sqSa7vIA+AvUhsq4ekAKTvhpsRkiVAvJXPiTeJMQO7XCkQGk+R6o 7zCdECaYvp3bSWf0Z4KnVIaAs9rndSSXe75I4DWrgYf2IQG1F4Wy3384uI6SGNGCgv9o uvdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709675123; x=1710279923; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=BP50fE/w7uBFauZAyYNgOPqhRKmMR5Nimx3NdP3hR3w=; b=uIog5CJpzI7KvV9DPU6kJ54hH1hp1N2dWnnEPtv3EprRJe5jvx4sAJFt2WcbKtScAt mnwtzpW5zjnw0Y0T5r0WqltQ8/X3BJfftJcjlH4k++Tcy5YnrvyN6EtSMTLx9oeM02I7 U/SkpIO07xPTxup1m8fpBdSjzRa8nnXSNZtdn+CjgzW+yWYnTnEaPHxGjc2jXf72CXKf 8WsAPvd2fTFjto7k5n5zeGJpvCemfNN+VxEUo4Psj51PxIUCQpk416LlHKC8+/cf2zVg GcHd/dOXQ0eC0bH8eRxS3Cdx6M09XzpOZ9Ndgl7YXRwHsRMtv0UNHhzGvyXtEIQtIN3o QHmw== X-Gm-Message-State: AOJu0Yzv7frQGnEImT5WtsecOV3Uvtjmmdy/Bqv9OU935dlPpieFcxl7 WwnZ9q33q4i1YUmKNJIr19O1z0A3n/vLT1EnlajxXnDmITTcK7dhJM1uTbwr X-Google-Smtp-Source: AGHT+IH4RBQUrjW2etUzU34SHuuOUAPE0rPr6mhZC+y82artbaCUDNOtdwymwZ4Zj3YyzMh/oMJUSA== X-Received: by 2002:a17:902:d2ce:b0:1dc:cae2:fcf5 with SMTP id n14-20020a170902d2ce00b001dccae2fcf5mr4911361plc.17.1709675123243; Tue, 05 Mar 2024 13:45:23 -0800 (PST) Received: from gnu-cfl-3.localdomain ([172.58.89.72]) by smtp.gmail.com with ESMTPSA id i37-20020a635865000000b005dc5289c4edsm9455643pgm.64.2024.03.05.13.45.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Mar 2024 13:45:22 -0800 (PST) Received: from gnu-cfl-3.. (localhost [IPv6:::1]) by gnu-cfl-3.localdomain (Postfix) with ESMTP id 8F4E9740122; Tue, 5 Mar 2024 13:45:21 -0800 (PST) From: "H.J. Lu" To: gcc-patches@gcc.gnu.org Cc: hubicka@ucw.cz Subject: [PATCH v2] tree-profile: Don't instrument an IFUNC resolver nor its callees Date: Tue, 5 Mar 2024 13:45:21 -0800 Message-ID: <20240305214521.326316-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 X-Spam-Status: No, score=-3019.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_ABUSEAT, RCVD_IN_DNSWL_NONE, RCVD_IN_SBL_CSS, SPF_HELO_NONE, SPF_PASS, 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+incoming=patchwork.ozlabs.org@gcc.gnu.org We can't instrument an IFUNC resolver nor its callees as it may require TLS which hasn't been set up yet when the dynamic linker is resolving IFUNC symbols. Add an IFUNC resolver caller marker to cgraph_node and set it if the function is called by an IFUNC resolver. Update tree_profiling to skip functions called by IFUNC resolver. Tested with profiledbootstrap on Fedora 39/x86-64. gcc/ChangeLog: PR tree-optimization/114115 * cgraph.h (symtab_node): Add check_ifunc_callee_symtab_nodes. (cgraph_node): Add called_by_ifunc_resolver. * cgraphunit.cc (symbol_table::compile): Call symtab_node::check_ifunc_callee_symtab_nodes. * symtab.cc (check_ifunc_resolver): New. (ifunc_ref_map): Likewise. (is_caller_ifunc_resolver): Likewise. (symtab_node::check_ifunc_callee_symtab_nodes): Likewise. * tree-profile.cc (tree_profiling): Do not instrument an IFUNC resolver nor its callees. gcc/testsuite/ChangeLog: PR tree-optimization/114115 * gcc.dg/pr114115.c: New test. --- gcc/cgraph.h | 6 +++ gcc/cgraphunit.cc | 2 + gcc/symtab.cc | 89 +++++++++++++++++++++++++++++++++ gcc/testsuite/gcc.dg/pr114115.c | 24 +++++++++ gcc/tree-profile.cc | 4 ++ 5 files changed, 125 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/pr114115.c diff --git a/gcc/cgraph.h b/gcc/cgraph.h index 47f35e8078d..a8c3224802c 100644 --- a/gcc/cgraph.h +++ b/gcc/cgraph.h @@ -479,6 +479,9 @@ public: Return NULL if there's no such node. */ static symtab_node *get_for_asmname (const_tree asmname); + /* Check symbol table for callees of IFUNC resolvers. */ + static void check_ifunc_callee_symtab_nodes (void); + /* Verify symbol table for internal consistency. */ static DEBUG_FUNCTION void verify_symtab_nodes (void); @@ -896,6 +899,7 @@ struct GTY((tag ("SYMTAB_FUNCTION"))) cgraph_node : public symtab_node redefined_extern_inline (false), tm_may_enter_irr (false), ipcp_clone (false), declare_variant_alt (false), calls_declare_variant_alt (false), gc_candidate (false), + called_by_ifunc_resolver (false), m_uid (uid), m_summary_id (-1) {} @@ -1495,6 +1499,8 @@ struct GTY((tag ("SYMTAB_FUNCTION"))) cgraph_node : public symtab_node is set for local SIMD clones when they are created and cleared if the vectorizer uses them. */ unsigned gc_candidate : 1; + /* Set if the function is called by an IFUNC resolver. */ + unsigned called_by_ifunc_resolver : 1; private: /* Unique id of the node. */ diff --git a/gcc/cgraphunit.cc b/gcc/cgraphunit.cc index d200166f7e9..2bd0289ffba 100644 --- a/gcc/cgraphunit.cc +++ b/gcc/cgraphunit.cc @@ -2317,6 +2317,8 @@ symbol_table::compile (void) symtab_node::checking_verify_symtab_nodes (); + symtab_node::check_ifunc_callee_symtab_nodes (); + timevar_push (TV_CGRAPHOPT); if (pre_ipa_mem_report) dump_memory_report ("Memory consumption before IPA"); diff --git a/gcc/symtab.cc b/gcc/symtab.cc index 4c7e3c135ca..3256133891d 100644 --- a/gcc/symtab.cc +++ b/gcc/symtab.cc @@ -1369,6 +1369,95 @@ symtab_node::verify (void) timevar_pop (TV_CGRAPH_VERIFY); } +/* Return true and set *DATA to true if NODE is an ifunc resolver. */ + +static bool +check_ifunc_resolver (cgraph_node *node, void *data) +{ + if (node->ifunc_resolver) + { + bool *is_ifunc_resolver = (bool *) data; + *is_ifunc_resolver = true; + return true; + } + return false; +} + +static auto_bitmap ifunc_ref_map; + +/* Return true if any caller of NODE is an ifunc resolver. */ + +static bool +is_caller_ifunc_resolver (cgraph_node *node) +{ + bool is_ifunc_resolver = false; + + for (cgraph_edge *e = node->callers; e; e = e->next_caller) + { + /* Return true if caller is known to be an IFUNC resolver. */ + if (e->caller->called_by_ifunc_resolver) + return true; + + /* Check for recursive call. */ + if (e->caller == node) + continue; + + /* Skip if it has been visited. */ + unsigned int uid = e->caller->get_uid (); + if (bitmap_bit_p (ifunc_ref_map, uid)) + continue; + bitmap_set_bit (ifunc_ref_map, uid); + + if (is_caller_ifunc_resolver (e->caller)) + { + /* Return true if caller is an IFUNC resolver. */ + e->caller->called_by_ifunc_resolver = true; + return true; + } + + /* Check if caller's alias is an IFUNC resolver. */ + e->caller->call_for_symbol_and_aliases (check_ifunc_resolver, + &is_ifunc_resolver, + true); + if (is_ifunc_resolver) + { + /* Return true if caller's alias is an IFUNC resolver. */ + e->caller->called_by_ifunc_resolver = true; + return true; + } + } + + return false; +} + +/* Check symbol table for callees of IFUNC resolvers. */ + +void +symtab_node::check_ifunc_callee_symtab_nodes (void) +{ + symtab_node *node; + + FOR_EACH_SYMBOL (node) + { + cgraph_node *cnode = dyn_cast (node); + if (!cnode) + continue; + + unsigned int uid = cnode->get_uid (); + if (bitmap_bit_p (ifunc_ref_map, uid)) + continue; + bitmap_set_bit (ifunc_ref_map, uid); + + bool is_ifunc_resolver = false; + cnode->call_for_symbol_and_aliases (check_ifunc_resolver, + &is_ifunc_resolver, true); + if (is_ifunc_resolver || is_caller_ifunc_resolver (cnode)) + cnode->called_by_ifunc_resolver = true; + } + + bitmap_clear (ifunc_ref_map); +} + /* Verify symbol table for internal consistency. */ DEBUG_FUNCTION void diff --git a/gcc/testsuite/gcc.dg/pr114115.c b/gcc/testsuite/gcc.dg/pr114115.c new file mode 100644 index 00000000000..2629f591877 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr114115.c @@ -0,0 +1,24 @@ +/* { dg-do compile } */ +/* { dg-options "-O0 -fprofile-generate -fdump-tree-optimized" } */ +/* { dg-require-profiling "-fprofile-generate" } */ +/* { dg-require-ifunc "" } */ + +void *foo_ifunc2() __attribute__((ifunc("foo_resolver"))); + +void bar(void) +{ +} + +static int f3() +{ + bar (); + return 5; +} + +void (*foo_resolver(void))(void) +{ + f3(); + return bar; +} + +/* { dg-final { scan-tree-dump-not "__gcov_indirect_call_profiler_v" "optimized" } } */ diff --git a/gcc/tree-profile.cc b/gcc/tree-profile.cc index aed13e2b1bc..2e55a5d8402 100644 --- a/gcc/tree-profile.cc +++ b/gcc/tree-profile.cc @@ -848,6 +848,10 @@ tree_profiling (void) } } + /* Do not instrument an IFUNC resolver nor its callees. */ + if (node->called_by_ifunc_resolver) + continue; + push_cfun (DECL_STRUCT_FUNCTION (node->decl)); if (dump_file)