From patchwork Mon Nov 20 14:33:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Huber X-Patchwork-Id: 1866031 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=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 4SYqkp3npYz1ySN for ; Tue, 21 Nov 2023 01:33:54 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CC535385F025 for ; Mon, 20 Nov 2023 14:33:48 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from dedi548.your-server.de (dedi548.your-server.de [85.10.215.148]) by sourceware.org (Postfix) with ESMTPS id F01083858C54 for ; Mon, 20 Nov 2023 14:33:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F01083858C54 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embedded-brains.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embedded-brains.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org F01083858C54 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=85.10.215.148 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700490818; cv=none; b=bbMugqwudz2Twz+XfFB7pvDk1yixS3SdYrvwRzMJtFAosVZALaeC6I32sDibilZpBUT4JxaLtt2BIm2gANMEieDGsw/E0ajHQPJHvQyNxiy8s1AsaCM4J0PvO0PgATY2GTEnvX3e7zGO0GIZ6/HyNdvnev7HoV1AhZbHhTJVoXk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700490818; c=relaxed/simple; bh=QQ4arbQCO9M7ddBVW8/wGLxlIExpkxbhkV4zcQMdSUs=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=krebQZ6mswQiMBrmyZRg/+MUoWomSwpPl9MtPIjarT1WHrUsPM9M+mk3W06TLqHnz+BDOtaeVz38D8P/a+fevO/gnhyXZoaP0S8sVPmWqxH2CjYsLbZ+2gUzcjscdlmHcC7fTdv1BkTYAivzjJ131WGmL3ntOdzmxNLEeSBQeH4= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from sslproxy05.your-server.de ([78.46.172.2]) by dedi548.your-server.de with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1r55LD-000AaR-A6; Mon, 20 Nov 2023 15:33:35 +0100 Received: from [82.100.198.138] (helo=mail.embedded-brains.de) by sslproxy05.your-server.de with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1r55LD-000KiL-6t; Mon, 20 Nov 2023 15:33:35 +0100 Received: from localhost (localhost [127.0.0.1]) by mail.embedded-brains.de (Postfix) with ESMTP id D33AD480194; Mon, 20 Nov 2023 15:33:34 +0100 (CET) Received: from mail.embedded-brains.de ([127.0.0.1]) by localhost (zimbra.eb.localhost [127.0.0.1]) (amavis, port 10032) with ESMTP id OaHh12b4y4W0; Mon, 20 Nov 2023 15:33:34 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail.embedded-brains.de (Postfix) with ESMTP id 772CC48019F; Mon, 20 Nov 2023 15:33:34 +0100 (CET) X-Virus-Scanned: amavis at zimbra.eb.localhost Received: from mail.embedded-brains.de ([127.0.0.1]) by localhost (zimbra.eb.localhost [127.0.0.1]) (amavis, port 10026) with ESMTP id XJdEJuOSE_X5; Mon, 20 Nov 2023 15:33:34 +0100 (CET) Received: from zimbra.eb.localhost (unknown [192.168.96.242]) by mail.embedded-brains.de (Postfix) with ESMTPSA id 5FB2B48001D; Mon, 20 Nov 2023 15:33:34 +0100 (CET) From: Sebastian Huber To: gcc-patches@gcc.gnu.org Cc: Dimitar Dimitrov , Tobias Burnus Subject: [PATCH 1/2] gcov: Use unshare_expr() in gen_counter_update() Date: Mon, 20 Nov 2023 15:33:30 +0100 Message-Id: <20231120143331.33102-1-sebastian.huber@embedded-brains.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-Authenticated-Sender: smtp-embedded@poldi-networks.de X-Virus-Scanned: Clear (ClamAV 0.103.10/27099/Mon Nov 20 09:39:02 2023) X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, 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 This fixes issues like this: gcc/testsuite/gcc.dg/no_profile_instrument_function-attr-1.c: In function 'main': gcc/testsuite/gcc.dg/no_profile_instrument_function-attr-1.c:19:1: error: incorrect sharing of tree nodes __gcov0.main[0] # .MEM_12 = VDEF <.MEM_9> __gcov0.main[0] = PROF_edge_counter_4; during IPA pass: profile gcc/testsuite/gcc.dg/no_profile_instrument_function-attr-1.c:19:1: internal compiler error: verify_gimple failed Unshare the counter expression in the second gimple_build_assign() in gen_counter_update(). This is similar to the original gimple_gen_edge_profiler() for "ref": void gimple_gen_edge_profiler (int edgeno, edge e) { tree one; one = build_int_cst (gcov_type_node, 1); if (flag_profile_update == PROFILE_UPDATE_ATOMIC) [...] else { tree ref = tree_coverage_counter_ref (GCOV_COUNTER_ARCS, edgeno); tree gcov_type_tmp_var = make_temp_ssa_name (gcov_type_node, NULL, "PROF_edge_counter"); gassign *stmt1 = gimple_build_assign (gcov_type_tmp_var, ref); gcov_type_tmp_var = make_temp_ssa_name (gcov_type_node, NULL, "PROF_edge_counter"); gassign *stmt2 = gimple_build_assign (gcov_type_tmp_var, PLUS_EXPR, gimple_assign_lhs (stmt1), one); gassign *stmt3 = gimple_build_assign (unshare_expr (ref), gimple_assign_lhs (stmt2)); gsi_insert_on_edge (e, stmt1); gsi_insert_on_edge (e, stmt2); gsi_insert_on_edge (e, stmt3); } } However, the orignal gimple_gen_time_profiler() did not use unshare_expr() for the counter expression (tree_time_profiler_counter): void gimple_gen_time_profiler (unsigned tag) { [...] /* Emit: counters[0] = ++__gcov_time_profiler_counter. */ if (flag_profile_update == PROFILE_UPDATE_ATOMIC) [...] else { tree tmp = make_temp_ssa_name (type, NULL, "PROF_time_profile"); gassign *assign = gimple_build_assign (tmp, tree_time_profiler_counter); gsi_insert_before (&gsi, assign, GSI_NEW_STMT); tmp = make_temp_ssa_name (type, NULL, "PROF_time_profile"); assign = gimple_build_assign (tmp, PLUS_EXPR, gimple_assign_lhs (assign), one); gsi_insert_after (&gsi, assign, GSI_NEW_STMT); assign = gimple_build_assign (original_ref, tmp); gsi_insert_after (&gsi, assign, GSI_NEW_STMT); assign = gimple_build_assign (tree_time_profiler_counter, tmp); gsi_insert_after (&gsi, assign, GSI_NEW_STMT); } } gcc/ChangeLog: * tree-profile.cc (gen_counter_update): Use unshare_expr() for the counter expression in the second gimple_build_assign(). --- gcc/tree-profile.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc/tree-profile.cc b/gcc/tree-profile.cc index 7d3cb1ef089..68db09f6189 100644 --- a/gcc/tree-profile.cc +++ b/gcc/tree-profile.cc @@ -354,7 +354,7 @@ gen_counter_update (gimple_stmt_iterator *gsi, tree counter, tree result, tree tmp2 = make_temp_ssa_name (type, NULL, name); gassign *assign2 = gimple_build_assign (tmp2, PLUS_EXPR, tmp1, one); gsi_insert_after (gsi, assign2, GSI_NEW_STMT); - gassign *assign3 = gimple_build_assign (counter, tmp2); + gassign *assign3 = gimple_build_assign (unshare_expr (counter), tmp2); gsi_insert_after (gsi, assign3, GSI_NEW_STMT); if (result) {