From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2140) id ED9373858296; Fri, 23 Jun 2023 20:13:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org ED9373858296 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1687551186; bh=wFV+xfEs3JW2x0htnhOV0w5sBdjHsOp/DPDmDfLa1cc=; h=From:To:Subject:Date:From; b=MsHBbvADGRIQdR/Si3x3Nj3liwwl4b+z/MV74IvfWLnWfcjNImf1NX73EQH8G62Qo DaNkdmCHjEOPN1x8sm5ynn9S3EBWhLMruj8Wn2TgMoxv9HVRonhVXynlpSe/t4r+iX t1VS224KmpUFV5LLKwx1KuF02xuncEDtIOpEJS00= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Alexandre Oliva To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/aoliva/heads/testme)] hardcfr: optionally disable in leaf functions X-Act-Checkin: gcc X-Git-Author: Alexandre Oliva X-Git-Refname: refs/users/aoliva/heads/testme X-Git-Oldrev: 8071e29f38ec5c1c61ab35330719a47c9c25997f X-Git-Newrev: df9c89700f234305be581cc6613c95c442f4547a Message-Id: <20230623201306.ED9373858296@sourceware.org> Date: Fri, 23 Jun 2023 20:13:06 +0000 (GMT) List-Id: https://gcc.gnu.org/g:df9c89700f234305be581cc6613c95c442f4547a commit df9c89700f234305be581cc6613c95c442f4547a Author: Alexandre Oliva Date: Fri Jun 23 17:10:11 2023 -0300 hardcfr: optionally disable in leaf functions Introduce -fhardcfr-skip-leaf to avoid control flow redundancy instrumentation of leaf functions, where the benefit is far more limited. for gcc/ChangeLog * common.opt (fhardcfr-skip-leaf): New. * doc/invoke.texi: Document it. * gimple-harden-control-flow.cc (pass_harden_control_flow_redundancy::execute): Honor it. for gcc/testsuite/ChangeLog * c-c++-common/torture/harden-cfr-skip-leaf.c: New. Diff: --- gcc/common.opt | 4 ++++ gcc/doc/invoke.texi | 8 +++++-- gcc/gimple-harden-control-flow.cc | 27 ++++++++++++++++++++++ .../c-c++-common/torture/harden-cfr-skip-leaf.c | 10 ++++++++ 4 files changed, 47 insertions(+), 2 deletions(-) diff --git a/gcc/common.opt b/gcc/common.opt index 0170aafa597..fe40fcd504b 100644 --- a/gcc/common.opt +++ b/gcc/common.opt @@ -1827,6 +1827,10 @@ fharden-control-flow-redundancy Common Var(flag_harden_control_flow_redundancy) Optimization Harden control flow by recording and checking execution paths. +fhardcfr-skip-leaf +Common Var(flag_harden_control_flow_redundancy_skip_leaf) Optimization +Disable CFR in leaf functions. + fhardcfr-check-returning-calls Common Var(flag_harden_control_flow_redundancy_check_returning_calls) Init(-1) Optimization Check CFR execution paths also before calls followed by returns of their results. diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi index 17030ca2b8f..23528b4cfaa 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi @@ -637,8 +637,8 @@ Objective-C and Objective-C++ Dialects}. -fsanitize-undefined-trap-on-error -fbounds-check -fcf-protection=@r{[}full@r{|}branch@r{|}return@r{|}none@r{|}check@r{]} -fharden-compares -fharden-conditional-branches --fharden-control-flow-redundancy -fhardcfr-check-exceptions --fhardcfr-check-returning-calls +-fharden-control-flow-redundancy -fhardcfr-skip-leaf +-fhardcfr-check-exceptions -fhardcfr-check-returning-calls -fhardcfr-check-noreturn-calls=@r{[}always@r{|}no-xthrow@r{|}nothrow@r{|}never@r{]} -fstack-protector -fstack-protector-all -fstack-protector-strong -fstack-protector-explicit -fstack-check @@ -17312,6 +17312,10 @@ would also have verification issued before the call, but these possibilities are merely theoretical, as these conditions can only be met when using custom compiler plugins. +@opindex fhardcfr-skip-leaf +@item -fhardcfr-skip-leaf +Disable @option{-fharden-control-flow-redundancy} in leaf functions. + @opindex fhardcfr-check-exceptions @opindex fno-hardcfr-check-exceptions @item -fhardcfr-check-exceptions diff --git a/gcc/gimple-harden-control-flow.cc b/gcc/gimple-harden-control-flow.cc index 38b991879e7..ac4a329ebad 100644 --- a/gcc/gimple-harden-control-flow.cc +++ b/gcc/gimple-harden-control-flow.cc @@ -1120,6 +1120,33 @@ pass_harden_control_flow_redundancy::execute (function *fun) basic_block bb; basic_block bb_eh_cleanup = NULL; + if (flag_harden_control_flow_redundancy_skip_leaf) + { + bool found_calls_p = false; + + FOR_EACH_BB_FN (bb, fun) + { + for (gimple_stmt_iterator gsi = gsi_last_bb (bb); + !gsi_end_p (gsi); gsi_prev (&gsi)) + if (is_a (gsi_stmt (gsi))) + { + found_calls_p = true; + break; + } + if (found_calls_p) + break; + } + + if (!found_calls_p) + { + if (dump_file) + fprintf (dump_file, + "Disabling CFR for leaf function, as requested\n"); + + return 0; + } + } + if (check_at_escaping_exceptions) { int lp_eh_cleanup = -1; diff --git a/gcc/testsuite/c-c++-common/torture/harden-cfr-skip-leaf.c b/gcc/testsuite/c-c++-common/torture/harden-cfr-skip-leaf.c new file mode 100644 index 00000000000..85ecaa04d04 --- /dev/null +++ b/gcc/testsuite/c-c++-common/torture/harden-cfr-skip-leaf.c @@ -0,0 +1,10 @@ +/* { dg-do run } */ +/* { dg-options "-fharden-control-flow-redundancy -fhardcfr-skip-leaf -fdump-tree-hardcfr -ffat-lto-objects" } */ + +/* Test skipping instrumentation of leaf functions. */ + +#include "harden-cfr.c" + +/* { dg-final { scan-tree-dump-times "__builtin_trap" 0 "hardcfr" } } */ +/* Only main isn't leaf. */ +/* { dg-final { scan-tree-dump-times "__hardcfr_check" 2 "hardcfr" } } */