diff --git a/llvm/lib/CodeGen/GlobalISel/Legalizer.cpp b/llvm/lib/CodeGen/GlobalISel/Legalizer.cpp --- a/llvm/lib/CodeGen/GlobalISel/Legalizer.cpp +++ b/llvm/lib/CodeGen/GlobalISel/Legalizer.cpp @@ -181,6 +181,26 @@ createdOrChangedInstr(MI); } }; + +bool shouldSkipDbgValueFor(MachineInstr &MI) { + switch (MI.getOpcode()) { + case TargetOpcode::G_UNMERGE_VALUES: + case TargetOpcode::G_MERGE_VALUES: + case TargetOpcode::G_CONCAT_VECTORS: + case TargetOpcode::G_BUILD_VECTOR: + case TargetOpcode::G_EXTRACT: + case TargetOpcode::G_INSERT: + return true; + } + return false; +} + +void eraseInstr(MachineInstr &MI) { + if (shouldSkipDbgValueFor(MI)) + MI.eraseFromParent(); + else + MI.eraseFromParentAndMarkDBGValuesForRemoval(); +} } // namespace Legalizer::MFResult @@ -243,7 +263,7 @@ "Expecting generic opcode"); if (isTriviallyDead(MI, MRI)) { LLVM_DEBUG(dbgs() << MI << "Is dead; erasing.\n"); - MI.eraseFromParentAndMarkDBGValuesForRemoval(); + eraseInstr(MI); LocObserver.checkpoint(false); continue; } @@ -293,7 +313,7 @@ if (isTriviallyDead(MI, MRI)) { LLVM_DEBUG(dbgs() << MI << "Is dead\n"); RemoveDeadInstFromLists(&MI); - MI.eraseFromParentAndMarkDBGValuesForRemoval(); + eraseInstr(MI); LocObserver.checkpoint(false); continue; } @@ -305,7 +325,7 @@ for (auto *DeadMI : DeadInstructions) { LLVM_DEBUG(dbgs() << "Is dead: " << *DeadMI); RemoveDeadInstFromLists(DeadMI); - DeadMI->eraseFromParentAndMarkDBGValuesForRemoval(); + eraseInstr(*DeadMI); } LocObserver.checkpoint( VerifyDebugLocs == diff --git a/llvm/test/CodeGen/AMDGPU/GlobalISel/bug-legalization-artifact-combiner-dead-def.mir b/llvm/test/CodeGen/AMDGPU/GlobalISel/bug-legalization-artifact-combiner-dead-def.mir --- a/llvm/test/CodeGen/AMDGPU/GlobalISel/bug-legalization-artifact-combiner-dead-def.mir +++ b/llvm/test/CodeGen/AMDGPU/GlobalISel/bug-legalization-artifact-combiner-dead-def.mir @@ -88,41 +88,3 @@ G_STORE %11(s32), %13(p5) :: (store (s32) into unknown-address + 4, addrspace 5) ... - ---- -name: value_finder_bug_before_artifact_combine_dbg_use -body: | - bb.0: - liveins: $vgpr0, $vgpr1, $vgpr2 - - ; GFX10-LABEL: name: value_finder_bug_before_artifact_combine_dbg_use - ; GFX10: [[COPY:%[0-9]+]]:_(p5) = COPY $vgpr0 - ; GFX10: [[COPY1:%[0-9]+]]:_(s32) = COPY $vgpr1 - ; GFX10: [[COPY2:%[0-9]+]]:_(s32) = COPY $vgpr2 - ; GFX10: [[MV:%[0-9]+]]:_(p4) = G_MERGE_VALUES [[COPY1]](s32), [[COPY2]](s32) - ; GFX10: [[LOAD:%[0-9]+]]:_(<4 x s32>) = G_LOAD [[MV]](p4) :: (load (<4 x s32>), align 4, addrspace 4) - ; GFX10: [[EXTRACT:%[0-9]+]]:_(s32) = G_EXTRACT [[LOAD]](<4 x s32>), 96 - ; GFX10: [[EXTRACT1:%[0-9]+]]:_(s32) = G_EXTRACT [[LOAD]](<4 x s32>), 64 - ; GFX10: [[DEF:%[0-9]+]]:_(s32) = G_IMPLICIT_DEF - ; GFX10: DBG_VALUE $noreg, $noreg, {{.*}}, !DIExpression(), debug-location !DILocation(line: 1, column: 1 - ; GFX10: G_STORE [[EXTRACT1]](s32), [[COPY]](p5) :: (store (s32), align 8, addrspace 5) - ; GFX10: [[C:%[0-9]+]]:_(s32) = G_CONSTANT i32 4 - ; GFX10: [[PTR_ADD:%[0-9]+]]:_(p5) = G_PTR_ADD [[COPY]], [[C]](s32) - ; GFX10: G_STORE [[EXTRACT]](s32), [[PTR_ADD]](p5) :: (store (s32) into unknown-address + 4, addrspace 5) - %0:_(p5) = COPY $vgpr0 - %1:_(s32) = COPY $vgpr1 - %2:_(s32) = COPY $vgpr2 - %3:_(p4) = G_MERGE_VALUES %1(s32), %2(s32) - %4:_(<4 x s32>) = G_LOAD %3(p4) :: (load (<4 x s32>), align 4, addrspace 4) - %5:_(s32) = G_EXTRACT %4(<4 x s32>), 96 - %6:_(s32) = G_EXTRACT %4(<4 x s32>), 64 - %7:_(s32) = G_IMPLICIT_DEF - %8:_(<2 x s32>) = G_BUILD_VECTOR %6(s32), %7(s32) - %9:_(<2 x s32>) = G_INSERT %8, %5(s32), 32 - %dbg_use:_(s32), %11:_(s32) = G_UNMERGE_VALUES %9(<2 x s32>) - DBG_VALUE %dbg_use(s32), $noreg, !7, !DIExpression(), debug-location !9 - G_STORE %6(s32), %0(p5) :: (store (s32), align 8, addrspace 5) - %12:_(s32) = G_CONSTANT i32 4 - %13:_(p5) = G_PTR_ADD %0, %12(s32) - G_STORE %11(s32), %13(p5) :: (store (s32) into unknown-address + 4, addrspace 5) -...