From 5a29b5f7db9cd2cc38bcc6be69c02671eb126eb7 Mon Sep 17 00:00:00 2001 From: Krasimir Georgiev Date: Wed, 18 Sep 2019 14:42:09 +0000 Subject: [PATCH] Revert "[AArch64][DebugInfo] Do not recompute CalleeSavedStackSize" Summary: This reverts commit r372204. This change causes build bot failures under msan: http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-fast/builds/35236/steps/check-llvm%20msan/logs/stdio: ``` FAIL: LLVM :: DebugInfo/AArch64/asan-stack-vars.mir (19531 of 33579) ******************** TEST 'LLVM :: DebugInfo/AArch64/asan-stack-vars.mir' FAILED ******************** Script: -- : 'RUN: at line 1'; /b/sanitizer-x86_64-linux-fast/build/llvm_build_msan/bin/llc -O0 -start-before=livedebugvalues -filetype=obj -o - /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/test/DebugInfo/AArch64/asan-stack-vars.mir | /b/sanitizer-x86_64-linux-fast/build/llvm_build_msan/bin/llvm-dwarfdump -v - | /b/sanitizer-x86_64-linux-fast/build/llvm_build_msan/bin/FileCheck /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/test/DebugInfo/AArch64/asan-stack-vars.mir -- Exit Code: 2 Command Output (stderr): -- ==62894==WARNING: MemorySanitizer: use-of-uninitialized-value #0 0xdfcafb in llvm::AArch64FrameLowering::resolveFrameOffsetReference(llvm::MachineFunction const&, int, bool, unsigned int&, bool, bool) const /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp:1658:3 #1 0xdfae8a in resolveFrameIndexReference /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp:1580:10 #2 0xdfae8a in llvm::AArch64FrameLowering::getFrameIndexReference(llvm::MachineFunction const&, int, unsigned int&) const /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp:1536 #3 0x46642c1 in (anonymous namespace)::LiveDebugValues::extractSpillBaseRegAndOffset(llvm::MachineInstr const&) /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/CodeGen/LiveDebugValues.cpp:582:21 #4 0x4647cb3 in transferSpillOrRestoreInst /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/CodeGen/LiveDebugValues.cpp:883:11 #5 0x4647cb3 in process /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/CodeGen/LiveDebugValues.cpp:1079 #6 0x4647cb3 in (anonymous namespace)::LiveDebugValues::ExtendRanges(llvm::MachineFunction&) /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/CodeGen/LiveDebugValues.cpp:1361 #7 0x463ac0e in (anonymous namespace)::LiveDebugValues::runOnMachineFunction(llvm::MachineFunction&) /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/CodeGen/LiveDebugValues.cpp:1415:18 #8 0x4854ef0 in llvm::MachineFunctionPass::runOnFunction(llvm::Function&) /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/CodeGen/MachineFunctionPass.cpp:73:13 #9 0x53b0b01 in llvm::FPPassManager::runOnFunction(llvm::Function&) /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/IR/LegacyPassManager.cpp:1648:27 #10 0x53b15f6 in llvm::FPPassManager::runOnModule(llvm::Module&) /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/IR/LegacyPassManager.cpp:1685:16 #11 0x53b298d in runOnModule /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/IR/LegacyPassManager.cpp:1750:27 #12 0x53b298d in llvm::legacy::PassManagerImpl::run(llvm::Module&) /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/IR/LegacyPassManager.cpp:1863 #13 0x905f21 in compileModule(char**, llvm::LLVMContext&) /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/tools/llc/llc.cpp:601:8 #14 0x8fdc4e in main /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/tools/llc/llc.cpp:355:22 #15 0x7f67673632e0 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x202e0) #16 0x882369 in _start (/b/sanitizer-x86_64-linux-fast/build/llvm_build_msan/bin/llc+0x882369) MemorySanitizer: use-of-uninitialized-value /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp:1658:3 in llvm::AArch64FrameLowering::resolveFrameOffsetReference(llvm::MachineFunction const&, int, bool, unsigned int&, bool, bool) const Exiting error: -: The file was not recognized as a valid object file FileCheck error: '-' is empty. FileCheck command line: /b/sanitizer-x86_64-linux-fast/build/llvm_build_msan/bin/FileCheck /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/test/DebugInfo/AArch64/asan-stack-vars.mir ``` Reviewers: bkramer Reviewed By: bkramer Subscribers: sdardis, aprantl, kristof.beyls, jrtc27, atanasyan, llvm-commits Tags: #llvm Differential Revision: https://reviews.llvm.org/D67710 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@372228 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/CodeGen/TargetFrameLowering.h | 8 -- lib/CodeGen/LiveDebugValues.cpp | 3 +- lib/CodeGen/RegUsageInfoCollector.cpp | 4 +- lib/CodeGen/TargetFrameLoweringImpl.cpp | 15 +-- lib/Target/AArch64/AArch64FrameLowering.cpp | 4 - lib/Target/ARM/ARMFrameLowering.cpp | 6 -- lib/Target/ARM/ARMFrameLowering.h | 2 - ...lee-save-size-after-livedebugvariables.mir | 92 ------------------- .../MIR/Mips/live-debug-values-reg-copy.mir | 2 +- .../MIR/X86/live-debug-values-reg-copy.mir | 2 +- 10 files changed, 7 insertions(+), 131 deletions(-) delete mode 100644 test/CodeGen/AArch64/wrong-callee-save-size-after-livedebugvariables.mir diff --git a/include/llvm/CodeGen/TargetFrameLowering.h b/include/llvm/CodeGen/TargetFrameLowering.h index acfc91bf7474..284f7ba64dba 100644 --- a/include/llvm/CodeGen/TargetFrameLowering.h +++ b/include/llvm/CodeGen/TargetFrameLowering.h @@ -281,11 +281,6 @@ class TargetFrameLowering { return getFrameIndexReference(MF, FI, FrameReg); } - /// Returns the callee-saved registers as computed by determineCalleeSaves - /// in the BitVector \p SavedRegs. - virtual void getCalleeSaves(const MachineFunction &MF, - BitVector &SavedRegs) const; - /// This method determines which of the registers reported by /// TargetRegisterInfo::getCalleeSavedRegs() should actually get saved. /// The default implementation checks populates the \p SavedRegs bitset with @@ -293,9 +288,6 @@ class TargetFrameLowering { /// this function to save additional registers. /// This method also sets up the register scavenger ensuring there is a free /// register or a frameindex available. - /// This method should not be called by any passes outside of PEI, because - /// it may change state passed in by \p MF and \p RS. The preferred - /// interface outside PEI is getCalleeSaves. virtual void determineCalleeSaves(MachineFunction &MF, BitVector &SavedRegs, RegScavenger *RS = nullptr) const; diff --git a/lib/CodeGen/LiveDebugValues.cpp b/lib/CodeGen/LiveDebugValues.cpp index 5e5c627caf12..0bdc62a345cb 100644 --- a/lib/CodeGen/LiveDebugValues.cpp +++ b/lib/CodeGen/LiveDebugValues.cpp @@ -1409,7 +1409,8 @@ bool LiveDebugValues::runOnMachineFunction(MachineFunction &MF) { TRI = MF.getSubtarget().getRegisterInfo(); TII = MF.getSubtarget().getInstrInfo(); TFI = MF.getSubtarget().getFrameLowering(); - TFI->getCalleeSaves(MF, CalleeSavedRegs); + TFI->determineCalleeSaves(MF, CalleeSavedRegs, + std::make_unique().get()); LS.initialize(MF); bool Changed = ExtendRanges(MF); diff --git a/lib/CodeGen/RegUsageInfoCollector.cpp b/lib/CodeGen/RegUsageInfoCollector.cpp index 5a79ac44dcf4..757ff0e44953 100644 --- a/lib/CodeGen/RegUsageInfoCollector.cpp +++ b/lib/CodeGen/RegUsageInfoCollector.cpp @@ -56,7 +56,7 @@ class RegUsageInfoCollector : public MachineFunctionPass { bool runOnMachineFunction(MachineFunction &MF) override; - // Call getCalleeSaves and then also set the bits for subregs and + // Call determineCalleeSaves and then also set the bits for subregs and // fully saved superregs. static void computeCalleeSavedRegs(BitVector &SavedRegs, MachineFunction &MF); @@ -199,7 +199,7 @@ computeCalleeSavedRegs(BitVector &SavedRegs, MachineFunction &MF) { // Target will return the set of registers that it saves/restores as needed. SavedRegs.clear(); - TFI.getCalleeSaves(MF, SavedRegs); + TFI.determineCalleeSaves(MF, SavedRegs); if (SavedRegs.none()) return; diff --git a/lib/CodeGen/TargetFrameLoweringImpl.cpp b/lib/CodeGen/TargetFrameLoweringImpl.cpp index 74c8fb9d029d..c5cd87b1481b 100644 --- a/lib/CodeGen/TargetFrameLoweringImpl.cpp +++ b/lib/CodeGen/TargetFrameLoweringImpl.cpp @@ -59,19 +59,6 @@ bool TargetFrameLowering::needsFrameIndexResolution( return MF.getFrameInfo().hasStackObjects(); } -void TargetFrameLowering::getCalleeSaves(const MachineFunction &MF, - BitVector &CalleeSaves) const { - const TargetRegisterInfo &TRI = *MF.getSubtarget().getRegisterInfo(); - CalleeSaves.resize(TRI.getNumRegs()); - - const MachineFrameInfo &MFI = MF.getFrameInfo(); - if (!MFI.isCalleeSavedInfoValid()) - return; - - for (const CalleeSavedInfo &Info : MFI.getCalleeSavedInfo()) - CalleeSaves.set(Info.getReg()); -} - void TargetFrameLowering::determineCalleeSaves(MachineFunction &MF, BitVector &SavedRegs, RegScavenger *RS) const { @@ -140,4 +127,4 @@ int TargetFrameLowering::getInitialCFAOffset(const MachineFunction &MF) const { unsigned TargetFrameLowering::getInitialCFARegister(const MachineFunction &MF) const { llvm_unreachable("getInitialCFARegister() not implemented!"); -} +} \ No newline at end of file diff --git a/lib/Target/AArch64/AArch64FrameLowering.cpp b/lib/Target/AArch64/AArch64FrameLowering.cpp index ab826a43543c..8357b763179d 100644 --- a/lib/Target/AArch64/AArch64FrameLowering.cpp +++ b/lib/Target/AArch64/AArch64FrameLowering.cpp @@ -2225,10 +2225,6 @@ void AArch64FrameLowering::determineCalleeSaves(MachineFunction &MF, << EstimatedStackSize + AlignedCSStackSize << " bytes.\n"); - assert((!MFI.isCalleeSavedInfoValid() || - AFI->getCalleeSavedStackSize() == AlignedCSStackSize) && - "Should not invalidate callee saved info"); - // Round up to register pair alignment to avoid additional SP adjustment // instructions. AFI->setCalleeSavedStackSize(AlignedCSStackSize); diff --git a/lib/Target/ARM/ARMFrameLowering.cpp b/lib/Target/ARM/ARMFrameLowering.cpp index 9f8b6cd2085d..03681d5634cc 100644 --- a/lib/Target/ARM/ARMFrameLowering.cpp +++ b/lib/Target/ARM/ARMFrameLowering.cpp @@ -2128,16 +2128,10 @@ void ARMFrameLowering::determineCalleeSaves(MachineFunction &MF, AFI->setLRIsSpilledForFarJump(true); } AFI->setLRIsSpilled(SavedRegs.test(ARM::LR)); -} - -void ARMFrameLowering::getCalleeSaves(const MachineFunction &MF, - BitVector &SavedRegs) const { - TargetFrameLowering::getCalleeSaves(MF, SavedRegs); // If we have the "returned" parameter attribute which guarantees that we // return the value which was passed in r0 unmodified (e.g. C++ 'structors), // record that fact for IPRA. - const ARMFunctionInfo *AFI = MF.getInfo(); if (AFI->getPreservesR0()) SavedRegs.set(ARM::R0); } diff --git a/lib/Target/ARM/ARMFrameLowering.h b/lib/Target/ARM/ARMFrameLowering.h index 0462b01af707..6d8aee597945 100644 --- a/lib/Target/ARM/ARMFrameLowering.h +++ b/lib/Target/ARM/ARMFrameLowering.h @@ -53,8 +53,6 @@ class ARMFrameLowering : public TargetFrameLowering { int ResolveFrameIndexReference(const MachineFunction &MF, int FI, unsigned &FrameReg, int SPAdj) const; - void getCalleeSaves(const MachineFunction &MF, - BitVector &SavedRegs) const override; void determineCalleeSaves(MachineFunction &MF, BitVector &SavedRegs, RegScavenger *RS) const override; diff --git a/test/CodeGen/AArch64/wrong-callee-save-size-after-livedebugvariables.mir b/test/CodeGen/AArch64/wrong-callee-save-size-after-livedebugvariables.mir deleted file mode 100644 index 231de4e18966..000000000000 --- a/test/CodeGen/AArch64/wrong-callee-save-size-after-livedebugvariables.mir +++ /dev/null @@ -1,92 +0,0 @@ -# RUN: llc -start-before=prologepilog -filetype=obj -o %t %s -# RUN: llvm-dwarfdump --name=obj1 %t | FileCheck %s --check-prefix=CHECKDWARF1 -# RUN: llvm-dwarfdump --name=obj2 %t | FileCheck %s --check-prefix=CHECKDWARF2 -# RUN: llvm-objdump --disassemble %t | FileCheck %s --check-prefix=CHECKASM -# -# Test that the location for obj1 and obj2 in the debug information is -# the same as the location used by load instructions. -# -# CHECKDWARF1: DW_AT_location (DW_OP_fbreg -1) -# CHECKDWARF2: DW_AT_location (DW_OP_fbreg -2) -# CHECKASM: ldurb w0, [x29, #-1] -# CHECKASM: ldurb w1, [x29, #-2] ---- | - ; ModuleID = 'wrong-callee-save-size-after-livedebugvariables.c' - source_filename = "wrong-callee-save-size-after-livedebugvariables.c" - target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128" - target triple = "aarch64-unknown-linux-gnu" - - ; Function Attrs: noinline nounwind optnone - define dso_local i8 @foo() #0 !dbg !7 { - entry: - %obj1 = alloca i8, align 1 - %obj2 = alloca i8, align 1 - %obj3 = alloca [238 x i8], align 1 - ret i8 undef, !dbg !24 - } - - declare dso_local i8 @bar(i8, i8, i8*) #0 - - attributes #0 = { noinline nounwind optnone "frame-pointer"="all" } - - !llvm.dbg.cu = !{!0} - !llvm.module.flags = !{!3, !4, !5} - !llvm.ident = !{!6} - - !0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None) - !1 = !DIFile(filename: "wrong-callee-save-size-after-livedebugvariables.c", directory: "") - !2 = !{} - !3 = !{i32 2, !"Dwarf Version", i32 4} - !4 = !{i32 2, !"Debug Info Version", i32 3} - !5 = !{i32 1, !"wchar_size", i32 4} - !6 = !{!"clang version 10.0.0"} - !7 = distinct !DISubprogram(name: "foo", scope: !1, file: !1, line: 3, type: !8, scopeLine: 3, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !2) - !8 = !DISubroutineType(types: !9) - !9 = !{!10} - !10 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_unsigned_char) - !11 = !DILocalVariable(name: "obj1", scope: !7, file: !1, line: 4, type: !10) - !12 = !DILocation(line: 4, column: 8, scope: !7) - !13 = !DILocalVariable(name: "obj2", scope: !7, file: !1, line: 5, type: !10) - !14 = !DILocation(line: 5, column: 8, scope: !7) - !15 = !DILocalVariable(name: "obj3", scope: !7, file: !1, line: 6, type: !16) - !16 = !DICompositeType(tag: DW_TAG_array_type, baseType: !10, size: 1904, elements: !17) - !17 = !{!18} - !18 = !DISubrange(count: 238) - !19 = !DILocation(line: 6, column: 8, scope: !7) - !20 = !DILocation(line: 7, column: 14, scope: !7) - !21 = !DILocation(line: 7, column: 20, scope: !7) - !22 = !DILocation(line: 7, column: 27, scope: !7) - !23 = !DILocation(line: 7, column: 10, scope: !7) - !24 = !DILocation(line: 7, column: 3, scope: !7) - -... ---- -name: foo -tracksRegLiveness: true -frameInfo: - hasCalls: true -fixedStack: [] -stack: - - { id: 0, name: obj1, type: default, offset: 0, size: 1, alignment: 1, - stack-id: default, callee-saved-register: '', callee-saved-restored: true, - local-offset: -1, debug-info-variable: '!11', debug-info-expression: '!DIExpression()', - debug-info-location: '!12' } - - { id: 1, name: obj2, type: default, offset: 0, size: 1, alignment: 1, - stack-id: default, callee-saved-register: '', callee-saved-restored: true, - local-offset: -2, debug-info-variable: '!13', debug-info-expression: '!DIExpression()', - debug-info-location: '!14' } - - { id: 2, name: obj3, type: default, offset: 0, size: 238, alignment: 1, - stack-id: default, callee-saved-register: '', callee-saved-restored: true, - local-offset: -240, debug-info-variable: '!15', debug-info-expression: '!DIExpression()', - debug-info-location: '!19' } -body: | - bb.1.entry: - renamable $x2 = ADDXri %stack.2.obj3, 0, 0 - renamable $w0 = LDRBBui %stack.0.obj1, 0, debug-location !20 :: (load 1 from %ir.obj1) - renamable $w1 = LDRBBui %stack.1.obj2, 0, debug-location !21 :: (load 1 from %ir.obj2) - ADJCALLSTACKDOWN 0, 0, implicit-def $sp, implicit $sp, debug-location !23 - BL @bar, csr_aarch64_aapcs, implicit-def $lr, implicit $sp, implicit killed $w0, implicit killed $w1, implicit killed $x2, implicit-def $w0, debug-location !23 - ADJCALLSTACKUP 0, 0, implicit-def $sp, implicit $sp, debug-location !23 - RET_ReallyLR implicit killed $w0, debug-location !24 - -... diff --git a/test/DebugInfo/MIR/Mips/live-debug-values-reg-copy.mir b/test/DebugInfo/MIR/Mips/live-debug-values-reg-copy.mir index bfc7c688ae81..52df7ae9751b 100644 --- a/test/DebugInfo/MIR/Mips/live-debug-values-reg-copy.mir +++ b/test/DebugInfo/MIR/Mips/live-debug-values-reg-copy.mir @@ -1,4 +1,4 @@ -# RUN: llc -start-before=prologepilog -stop-after=livedebugvalues %s -o - | FileCheck %s +# RUN: llc -run-pass=livedebugvalues %s -o - | FileCheck %s # # This test tests tracking variables value transferring from one register to another. # This example is altered additionally in order to test transferring from one float register diff --git a/test/DebugInfo/MIR/X86/live-debug-values-reg-copy.mir b/test/DebugInfo/MIR/X86/live-debug-values-reg-copy.mir index 3abde776904e..ba748b989c43 100644 --- a/test/DebugInfo/MIR/X86/live-debug-values-reg-copy.mir +++ b/test/DebugInfo/MIR/X86/live-debug-values-reg-copy.mir @@ -1,4 +1,4 @@ -# RUN: llc -start-before=prologepilog -stop-after=livedebugvalues %s -o - | FileCheck %s +# RUN: llc -run-pass=livedebugvalues %s -o - | FileCheck %s # # This test tests tracking variables value transferring from one register to another. # This example is altered additionally in order to test transferring from one float register