From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx.kolabnow.com (mx.kolabnow.com [212.103.80.155]) by sourceware.org (Postfix) with ESMTPS id AC70A386C599 for ; Tue, 25 Jun 2024 08:04:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AC70A386C599 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=lambda.is Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=lambda.is ARC-Filter: OpenARC Filter v1.0.0 sourceware.org AC70A386C599 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=212.103.80.155 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1719302662; cv=none; b=Hv5jsLJBF6tbjLgcpJuZgL3GcwxXzcqxMtwq2o5J6sWEbiZMT0B75lcIBnx1iPdgZFerEqnPGmqvJWcuhX5Ycwe6epOs71gd3CEhlCJ84lzxwzTFnNuXpwfVzmuoLCHZ2Tvg7A5Pu+VJEN/ubru6E0l7ElwkyLm65umNkJePYTc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1719302662; c=relaxed/simple; bh=I/0LECDxRzwrWrftoT1WqYFV9iMfJ6Kk3TMnlqQcp6k=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=s9NhEOP+3J9PcaxlZw+EQUTlHJQ1Yg9/afP+fRH4jOWqUVyafPyoQPCco8xwEKJPkDNRzEPi9WU8AKbprVM/YP/mw+qLnCjR6VSqRZtqLM+wjhpWw4ahAD/BdITxxLBzRBqFjdDBY/Zo+SSMbtsPQCTxuAzg8tRAt4Ojw7c8fP4= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from localhost (unknown [127.0.0.1]) by mx.kolabnow.com (Postfix) with ESMTP id DA79520D136E; Tue, 25 Jun 2024 10:04:17 +0200 (CEST) Authentication-Results: ext-mx-out011.mykolab.com (amavis); dkim=pass (2048-bit key) reason="pass (just generated, assumed good)" header.d=kolabnow.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-transfer-encoding:mime-version:message-id:date:date :subject:subject:from:from:received:received:received; s= dkim20240523; t=1719302655; x=1721117056; bh=a60jSe1GM95Z05ma3hw 3wX7fE2MvCR+XcSRulf+iieU=; b=M8mxVwPhvMDELULGKsqzXvAKOODY520M5AN z9Yzt+659xbScSb9XMUpvZ3Z/PKKTfS/QXZTwZ1RlUtl1j3J47rvhhvF45k+3Z4U v3FG4G8sTZcrobwmUzlF+j+Bi4VMAoppiP/LfV2RbE7O/PWTC7A0twciM9wDhp2S 06w8A1wk6w9YWvH4Yq2ebM6DD4NKt+KANZz7IZeAPxPq3aYt52oOUR9b4tGyEJLn SWzd+8tuNAFjndlAC9C/y9UDpF9n2oMtWJVVJADhYydf/GzBhhBxPWWzjD2vAjUV RS3cDJLIZZMxfrOAaqdZt7L0FRdNwEK8E4R8ORYobhr0RXzZRFQ== X-Virus-Scanned: amavis at mykolab.com X-Spam-Score: -0.999 X-Spam-Level: X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,GIT_PATCH_0,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out011.mykolab.com [127.0.0.1]) (amavis, port 10024) with ESMTP id WQ4K--gyENsq; Tue, 25 Jun 2024 10:04:15 +0200 (CEST) Received: from int-mx009.mykolab.com (unknown [10.9.13.9]) by mx.kolabnow.com (Postfix) with ESMTPS id 1165620D1348; Tue, 25 Jun 2024 10:04:14 +0200 (CEST) Received: from ext-subm010.mykolab.com (unknown [10.9.6.10]) by int-mx009.mykolab.com (Postfix) with ESMTPS id D25C221F0909; Tue, 25 Jun 2024 10:04:14 +0200 (CEST) From: =?UTF-8?q?J=C3=B8rgen=20Kvalsvik?= To: gcc-patches@gcc.gnu.org Cc: hubicka@ucw.cz, =?UTF-8?q?J=C3=B8rgen=20Kvalsvik?= Subject: [PATCH 1/2] Record edge true/false value for gcov Date: Tue, 25 Jun 2024 10:04:07 +0200 Message-Id: <20240625080408.1517769-1-j@lambda.is> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Make gcov aware which edges are the true/false to more accurately reconstruct the CFG. There are plenty of bits left in arc_info and it opens up for richer reporting. gcc/ChangeLog: * gcov-io.h (GCOV_ARC_TRUE): New. (GCOV_ARC_FALSE): New. * gcov.cc (struct arc_info): Add true_value, false_value. (read_graph_file): Read true_value, false_value. * profile.cc (branch_prob): Write GCOV_ARC_TRUE, GCOV_ARC_FALSE. --- gcc/gcov-io.h | 2 ++ gcc/gcov.cc | 8 ++++++++ gcc/profile.cc | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/gcc/gcov-io.h b/gcc/gcov-io.h index 20f805598f0..5dc467c92b1 100644 --- a/gcc/gcov-io.h +++ b/gcc/gcov-io.h @@ -337,6 +337,8 @@ GCOV_COUNTERS #define GCOV_ARC_ON_TREE (1 << 0) #define GCOV_ARC_FAKE (1 << 1) #define GCOV_ARC_FALLTHROUGH (1 << 2) +#define GCOV_ARC_TRUE (1 << 3) +#define GCOV_ARC_FALSE (1 << 4) /* Object & program summary record. */ diff --git a/gcc/gcov.cc b/gcc/gcov.cc index 1e2e193d79d..b9e41fd5172 100644 --- a/gcc/gcov.cc +++ b/gcc/gcov.cc @@ -117,6 +117,12 @@ struct arc_info /* Loop making arc. */ unsigned int cycle : 1; + /* Is a true arc. */ + unsigned int true_value : 1; + + /* Is a false arc. */ + unsigned int false_value : 1; + /* Links to next arc on src and dst lists. */ struct arc_info *succ_next; struct arc_info *pred_next; @@ -2095,6 +2101,8 @@ read_graph_file (void) arc->on_tree = !!(flags & GCOV_ARC_ON_TREE); arc->fake = !!(flags & GCOV_ARC_FAKE); arc->fall_through = !!(flags & GCOV_ARC_FALLTHROUGH); + arc->true_value = !!(flags & GCOV_ARC_TRUE); + arc->false_value = !!(flags & GCOV_ARC_FALSE); arc->succ_next = src_blk->succ; src_blk->succ = arc; diff --git a/gcc/profile.cc b/gcc/profile.cc index 2b90e6cc510..25d4f4a4b86 100644 --- a/gcc/profile.cc +++ b/gcc/profile.cc @@ -1456,6 +1456,10 @@ branch_prob (bool thunk) flag_bits |= GCOV_ARC_FAKE; if (e->flags & EDGE_FALLTHRU) flag_bits |= GCOV_ARC_FALLTHROUGH; + if (e->flags & EDGE_TRUE_VALUE) + flag_bits |= GCOV_ARC_TRUE; + if (e->flags & EDGE_FALSE_VALUE) + flag_bits |= GCOV_ARC_FALSE; /* On trees we don't have fallthru flags, but we can recompute them from CFG shape. */ if (e->flags & (EDGE_TRUE_VALUE | EDGE_FALSE_VALUE) -- 2.39.2