From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7824) id 5CE5B3858D20; Thu, 25 Apr 2024 18:57:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5CE5B3858D20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1714071468; bh=ggDXyNjECjKctq3HX2NUdfEpsMmd4ObgcVGiPkJ8J44=; h=From:To:Subject:Date:From; b=GDAsUv4cgD0T2YSB9jWj6eMRh8S4TuTl50ucVms2PHWRvJJU/Go3AGOCI5PNgAD9t /x67Jw836M8Uby89PTnZgd38DyZYKU/Ee+MXhg1ITvalh+3LpuhIUo58x48KruIXV1 937Bk1i0Qk2ZrYyvFYC2ro1dt9w2alNXJ5X9/DbY= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: David Faust To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-10135] bpf: set PREFERRED_DEBUGGING_TYPE to BTF_DEBUG X-Act-Checkin: gcc X-Git-Author: David Faust X-Git-Refname: refs/heads/master X-Git-Oldrev: f541757ba4632e204169dd08a5f10c782199af42 X-Git-Newrev: 1604f7cebc49220e47d584615bcd91b1fdc1267f Message-Id: <20240425185748.5CE5B3858D20@sourceware.org> Date: Thu, 25 Apr 2024 18:57:48 +0000 (GMT) List-Id: https://gcc.gnu.org/g:1604f7cebc49220e47d584615bcd91b1fdc1267f commit r14-10135-g1604f7cebc49220e47d584615bcd91b1fdc1267f Author: David Faust Date: Wed Apr 24 15:01:02 2024 -0700 bpf: set PREFERRED_DEBUGGING_TYPE to BTF_DEBUG BTF is the standard debug info used with BPF programs, so it makes sense to default to BTF rather than DWARF. gcc/ * config/bpf/bpf.h (PREFERRED_DEBUGGING_TYPE): Set to BTF_DEBUG. gcc/testsuite/ * gcc.target/bpf/bpf-debug-options-1.c: New test. * gcc.target/bpf/bpf-debug-options-2.c: Likewise. * gcc.target/bpf/bpf-debug-options-3.c: Likewise. * gcc.target/bpf/core-options-4.c: Likewise. Diff: --- gcc/config/bpf/bpf.h | 5 +++++ gcc/testsuite/gcc.target/bpf/bpf-debug-options-1.c | 17 +++++++++++++++++ gcc/testsuite/gcc.target/bpf/bpf-debug-options-2.c | 18 ++++++++++++++++++ gcc/testsuite/gcc.target/bpf/bpf-debug-options-3.c | 14 ++++++++++++++ gcc/testsuite/gcc.target/bpf/core-options-4.c | 4 ++++ 5 files changed, 58 insertions(+) diff --git a/gcc/config/bpf/bpf.h b/gcc/config/bpf/bpf.h index c67e17526bf..e163fbf688d 100644 --- a/gcc/config/bpf/bpf.h +++ b/gcc/config/bpf/bpf.h @@ -245,6 +245,11 @@ enum reg_class /**** Debugging Info ****/ +/* Use BTF debug info by default. */ + +#undef PREFERRED_DEBUGGING_TYPE +#define PREFERRED_DEBUGGING_TYPE BTF_DEBUG + /* In eBPF it is not possible to unwind frames. Disable CFA. */ #define DWARF2_FRAME_INFO 0 diff --git a/gcc/testsuite/gcc.target/bpf/bpf-debug-options-1.c b/gcc/testsuite/gcc.target/bpf/bpf-debug-options-1.c new file mode 100644 index 00000000000..409466c4ead --- /dev/null +++ b/gcc/testsuite/gcc.target/bpf/bpf-debug-options-1.c @@ -0,0 +1,17 @@ +/* Default to BTF debug info. */ +/* { dg-do compile } */ +/* { dg-options "-g -dA" }*/ + +struct A { + int x; + int y; +}; + +int +foo (struct A *a) +{ + return a->x; +} + +/* { dg-final { scan-assembler-not "DWARF version" } } */ +/* { dg-final { scan-assembler "btf_version" } } */ diff --git a/gcc/testsuite/gcc.target/bpf/bpf-debug-options-2.c b/gcc/testsuite/gcc.target/bpf/bpf-debug-options-2.c new file mode 100644 index 00000000000..03bde12315b --- /dev/null +++ b/gcc/testsuite/gcc.target/bpf/bpf-debug-options-2.c @@ -0,0 +1,18 @@ +/* -g defaults to BTF, which in turn implies -mco-re. */ +/* { dg-do compile } */ +/* { dg-options "-g -dA" }*/ + +struct A { + int x; + int y; +}; + +int +foo (struct A *a) +{ + return __builtin_preserve_access_index (a->x); +} + +/* { dg-final { scan-assembler-not "DWARF version" } } */ +/* { dg-final { scan-assembler "btf_version" } } */ +/* { dg-final { scan-assembler "btfext_version" } } */ diff --git a/gcc/testsuite/gcc.target/bpf/bpf-debug-options-3.c b/gcc/testsuite/gcc.target/bpf/bpf-debug-options-3.c new file mode 100644 index 00000000000..d41790e0928 --- /dev/null +++ b/gcc/testsuite/gcc.target/bpf/bpf-debug-options-3.c @@ -0,0 +1,14 @@ +/* Using -g does not incorrectly force CO-RE enabled. */ +/* { dg-do compile } */ +/* { dg-options "-g -dA -mno-co-re" }*/ + +struct A { + int x; + int y; +}; + +int +foo (struct A *a) +{ + return __builtin_preserve_access_index (a->x); /* { dg-error "BPF CO-RE is required" } */ +} diff --git a/gcc/testsuite/gcc.target/bpf/core-options-4.c b/gcc/testsuite/gcc.target/bpf/core-options-4.c new file mode 100644 index 00000000000..fde4195da42 --- /dev/null +++ b/gcc/testsuite/gcc.target/bpf/core-options-4.c @@ -0,0 +1,4 @@ +/* -g implies BTF, -gtoggle turns it off. CO-RE should not work. */ +/* { dg-do compile } */ +/* { dg-options "-g -mco-re -gtoggle" } */ +/* { dg-excess-errors "BPF CO-RE requires BTF debugging information" } */