This is an archive of the discontinued LLVM Phabricator instance.

Differential D125366

[BOLT][TEST] Remove -gdwarf-4 override from %cflags
ClosedPublic

Authored by Amir on May 11 2022, 2:54 AM.

Details

Reviewers
ayermolo
rafauler
maksfb
Commits
rG4a58eb9e4e52: [BOLT][TEST] Remove -gdwarf-4 override from %cflags
Summary

As BOLT support for monolithic and split DWARF5 is added, remove DWARF version
override for BOLT tests.

Diff Detail

Event Timeline

Amir created this revision.May 11 2022, 2:54 AM
Herald added a reviewer: rafauler. · View Herald TranscriptMay 11 2022, 2:54 AM
Herald added a reviewer: maksfb. · View Herald Transcript
Herald added a project: Restricted Project. · View Herald Transcript
Amir requested review of this revision.May 11 2022, 2:54 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 11 2022, 2:54 AM
Herald added subscribers: llvm-commits, yota9. · View Herald Transcript
Harbormaster completed remote builds in B163864: Diff 428602.May 11 2022, 3:06 AM
Amir updated this revision to Diff 428606.May 11 2022, 3:14 AM

Keep override in {X86,AArch64}/asm-func-debug.test

Amir retitled this revision from [BOLT][TEST] Remove -gdwarf-4 override to [BOLT][TEST] Remove -gdwarf-4 override from %cflags.May 11 2022, 3:15 AM
Amir edited the summary of this revision. (Show Details)
Harbormaster completed remote builds in B163867: Diff 428606.May 11 2022, 3:19 AM
ayermolo accepted this revision.May 11 2022, 3:32 AM

LGTM

This revision is now accepted and ready to land.May 11 2022, 3:32 AM
Closed by commit rG4a58eb9e4e52: [BOLT][TEST] Remove -gdwarf-4 override from %cflags (authored by Amir). · Explain WhyMay 11 2022, 3:38 AM
This revision was automatically updated to reflect the committed changes.
Amir added a commit: rG4a58eb9e4e52: [BOLT][TEST] Remove -gdwarf-4 override from %cflags.
ayermolo mentioned this in D138338: [BOLT][DWARF] Re-enable DWARF5 for asm-func-debug tests.Nov 18 2022, 4:15 PM
ayermolo mentioned this in rG4ff1bc2f53a5: [BOLT][DWARF] Re-enable DWARF5 for asm-func-debug tests.Nov 22 2022, 4:30 PM

Revision Contents

PathSize
bolt/
test/
AArch64/
2 lines
X86/
2 lines
4 lines

Diff 428613

bolt/test/AArch64/asm-func-debug.test

# Verify that we update DW_TAG_compile_unit' ranges and .debug_aranges # Verify that we update DW_TAG_compile_unit' ranges and .debug_aranges
# for assembly function that doesn't have corresponding DIE. # for assembly function that doesn't have corresponding DIE.
# #
# The input test case foo() contains nops that we remove. # The input test case foo() contains nops that we remove.
RUN: %clang %cflags -no-pie -g %p/../Inputs/asm_foo.s %p/../Inputs/asm_main.c -o %t.exe RUN: %clang %cflags -no-pie -gdwarf-4 %p/../Inputs/asm_foo.s %p/../Inputs/asm_main.c -o %t.exe
RUN: llvm-bolt %t.exe -o %t -update-debug-sections RUN: llvm-bolt %t.exe -o %t -update-debug-sections
RUN: llvm-dwarfdump -all %t | FileCheck %s RUN: llvm-dwarfdump -all %t | FileCheck %s
# Check ranges were created/updated for asm compile unit # Check ranges were created/updated for asm compile unit
CHECK: 0x0000000b: DW_TAG_compile_unit CHECK: 0x0000000b: DW_TAG_compile_unit
CHECK-NEXT: DW_AT_stmt_list (0x00000000) CHECK-NEXT: DW_AT_stmt_list (0x00000000)
CHECK-NEXT: DW_AT_low_pc (0x0000000000000000) CHECK-NEXT: DW_AT_low_pc (0x0000000000000000)
CHECK-NEXT: DW_AT_ranges CHECK-NEXT: DW_AT_ranges
Show All 12 Lines

bolt/test/X86/asm-func-debug.test

# Verify that we update DW_TAG_compile_unit' ranges and .debug_aranges # Verify that we update DW_TAG_compile_unit' ranges and .debug_aranges
# for assembly function that doesn't have corresponding DIE. # for assembly function that doesn't have corresponding DIE.
# #
# The input test case foo() contains nops that we remove. # The input test case foo() contains nops that we remove.
RUN: %clang -g %cflags -no-pie %p/../Inputs/asm_foo.s %p/../Inputs/asm_main.c -o %t.exe RUN: %clang -gdwarf-4 %cflags -no-pie %p/../Inputs/asm_foo.s %p/../Inputs/asm_main.c -o %t.exe
RUN: llvm-bolt %t.exe -o %t -update-debug-sections RUN: llvm-bolt %t.exe -o %t -update-debug-sections
RUN: llvm-dwarfdump -all %t | FileCheck %s RUN: llvm-dwarfdump -all %t | FileCheck %s
# Check ranges were created/updated for asm compile unit # Check ranges were created/updated for asm compile unit
CHECK: 0x0000000b: DW_TAG_compile_unit CHECK: 0x0000000b: DW_TAG_compile_unit
CHECK-NEXT: DW_AT_stmt_list (0x00000000) CHECK-NEXT: DW_AT_stmt_list (0x00000000)
CHECK-NEXT: DW_AT_low_pc (0x0000000000000000) CHECK-NEXT: DW_AT_low_pc (0x0000000000000000)
CHECK-NEXT: DW_AT_ranges CHECK-NEXT: DW_AT_ranges
Show All 12 Lines

bolt/test/lit.cfg.py

Show First 20 Lines • Show All 60 Lines • ▼ Show 20 Lines
llvm_config.config.environment['CLANG'] = config.bolt_clang llvm_config.config.environment['CLANG'] = config.bolt_clang
llvm_config.use_clang() llvm_config.use_clang()
llvm_config.config.environment['LD_LLD'] = config.bolt_lld llvm_config.config.environment['LD_LLD'] = config.bolt_lld
ld_lld = llvm_config.use_llvm_tool('ld.lld', required=True, search_env='LD_LLD') ld_lld = llvm_config.use_llvm_tool('ld.lld', required=True, search_env='LD_LLD')
llvm_config.config.available_features.add('ld.lld') llvm_config.config.available_features.add('ld.lld')
llvm_config.add_tool_substitutions([ToolSubst(r'ld\.lld', command=ld_lld)]) llvm_config.add_tool_substitutions([ToolSubst(r'ld\.lld', command=ld_lld)])
config.substitutions.append(('%cflags', '-gdwarf-4')) config.substitutions.append(('%cflags', ''))
config.substitutions.append(('%cxxflags', '-gdwarf-4')) config.substitutions.append(('%cxxflags', ''))
link_fdata_cmd = os.path.join(config.test_source_root, 'link_fdata.py') link_fdata_cmd = os.path.join(config.test_source_root, 'link_fdata.py')
tool_dirs = [config.llvm_tools_dir, tool_dirs = [config.llvm_tools_dir,
config.test_source_root] config.test_source_root]
tools = [ tools = [
ToolSubst('llc', unresolved='fatal'), ToolSubst('llc', unresolved='fatal'),
Show All 32 Lines