mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2025-03-03 18:09:29 +00:00
BypassSlowDivision: Fix dropping debug info
I don't know anything about debug info, but this seems like more work should be necessary. This constructs a new IRBuilder and reconstructs the original divides rather than moving the original. One problem this has is if a div/rem pair are handled, both end up with the same debugloc. I'm not sure how to fix this, since this uses a cache when it sees the same input operands again, which will have the first instance's location attached.
This commit is contained in:
Matt Arsenault
parent
31eedc0f69
commit
1789f18d3a
@ -263,6 +263,7 @@ QuotRemWithBB FastDivInsertionTask::createSlowBB(BasicBlock *SuccessorBB) {
|
||||
DivRemPair.BB = BasicBlock::Create(MainBB->getParent()->getContext(), "",
|
||||
MainBB->getParent(), SuccessorBB);
|
||||
IRBuilder<> Builder(DivRemPair.BB, DivRemPair.BB->begin());
|
||||
Builder.SetCurrentDebugLocation(SlowDivOrRem->getDebugLoc());
|
||||
|
||||
Value *Dividend = SlowDivOrRem->getOperand(0);
|
||||
Value *Divisor = SlowDivOrRem->getOperand(1);
|
||||
@ -286,6 +287,7 @@ QuotRemWithBB FastDivInsertionTask::createFastBB(BasicBlock *SuccessorBB) {
|
||||
DivRemPair.BB = BasicBlock::Create(MainBB->getParent()->getContext(), "",
|
||||
MainBB->getParent(), SuccessorBB);
|
||||
IRBuilder<> Builder(DivRemPair.BB, DivRemPair.BB->begin());
|
||||
Builder.SetCurrentDebugLocation(SlowDivOrRem->getDebugLoc());
|
||||
|
||||
Value *Dividend = SlowDivOrRem->getOperand(0);
|
||||
Value *Divisor = SlowDivOrRem->getOperand(1);
|
||||
@ -311,6 +313,7 @@ QuotRemPair FastDivInsertionTask::createDivRemPhiNodes(QuotRemWithBB &LHS,
|
||||
QuotRemWithBB &RHS,
|
||||
BasicBlock *PhiBB) {
|
||||
IRBuilder<> Builder(PhiBB, PhiBB->begin());
|
||||
Builder.SetCurrentDebugLocation(SlowDivOrRem->getDebugLoc());
|
||||
PHINode *QuoPhi = Builder.CreatePHI(getSlowType(), 2);
|
||||
QuoPhi->addIncoming(LHS.Quotient, LHS.BB);
|
||||
QuoPhi->addIncoming(RHS.Quotient, RHS.BB);
|
||||
@ -327,6 +330,7 @@ QuotRemPair FastDivInsertionTask::createDivRemPhiNodes(QuotRemWithBB &LHS,
|
||||
Value *FastDivInsertionTask::insertOperandRuntimeCheck(Value *Op1, Value *Op2) {
|
||||
assert((Op1 || Op2) && "Nothing to check");
|
||||
IRBuilder<> Builder(MainBB, MainBB->end());
|
||||
Builder.SetCurrentDebugLocation(SlowDivOrRem->getDebugLoc());
|
||||
|
||||
Value *OrV;
|
||||
if (Op1 && Op2)
|
||||
@ -395,6 +399,9 @@ Optional<QuotRemPair> FastDivInsertionTask::insertFastDivAndRem() {
|
||||
isa<ConstantInt>(BCI->getOperand(0)))
|
||||
return None;
|
||||
|
||||
IRBuilder<> Builder(MainBB, MainBB->end());
|
||||
Builder.SetCurrentDebugLocation(SlowDivOrRem->getDebugLoc());
|
||||
|
||||
if (DividendShort && !isSignedOp()) {
|
||||
// If the division is unsigned and Dividend is known to be short, then
|
||||
// either
|
||||
@ -417,7 +424,6 @@ Optional<QuotRemPair> FastDivInsertionTask::insertFastDivAndRem() {
|
||||
Long.Remainder = Dividend;
|
||||
QuotRemWithBB Fast = createFastBB(SuccessorBB);
|
||||
QuotRemPair Result = createDivRemPhiNodes(Fast, Long, SuccessorBB);
|
||||
IRBuilder<> Builder(MainBB, MainBB->end());
|
||||
Value *CmpV = Builder.CreateICmpUGE(Dividend, Divisor);
|
||||
Builder.CreateCondBr(CmpV, Fast.BB, SuccessorBB);
|
||||
return Result;
|
||||
@ -434,7 +440,6 @@ Optional<QuotRemPair> FastDivInsertionTask::insertFastDivAndRem() {
|
||||
QuotRemPair Result = createDivRemPhiNodes(Fast, Slow, SuccessorBB);
|
||||
Value *CmpV = insertOperandRuntimeCheck(DividendShort ? nullptr : Dividend,
|
||||
DivisorShort ? nullptr : Divisor);
|
||||
IRBuilder<> Builder(MainBB, MainBB->end());
|
||||
Builder.CreateCondBr(CmpV, Fast.BB, Slow.BB);
|
||||
return Result;
|
||||
}
|
||||
|
||||
@ -0,0 +1,76 @@
|
||||
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
|
||||
; RUN: opt -S -mtriple=amdgcn-amd-amdhsa -codegenprepare %s | FileCheck %s
|
||||
; Make sure BypassSlowDivision doesn't drop debug info
|
||||
|
||||
define i64 @sdiv64(i64 %a, i64 %b) {
|
||||
; CHECK-LABEL: @sdiv64(
|
||||
; CHECK-NEXT: [[TMP1:%.*]] = or i64 [[A:%.*]], [[B:%.*]], !dbg !6
|
||||
; CHECK-NEXT: [[TMP2:%.*]] = and i64 [[TMP1]], -4294967296, !dbg !6
|
||||
; CHECK-NEXT: [[TMP3:%.*]] = icmp eq i64 [[TMP2]], 0, !dbg !6
|
||||
; CHECK-NEXT: br i1 [[TMP3]], label [[TMP4:%.*]], label [[TMP9:%.*]], !dbg !6
|
||||
; CHECK: 4:
|
||||
; CHECK-NEXT: [[TMP5:%.*]] = trunc i64 [[B]] to i32, !dbg !6
|
||||
; CHECK-NEXT: [[TMP6:%.*]] = trunc i64 [[A]] to i32, !dbg !6
|
||||
; CHECK-NEXT: [[TMP7:%.*]] = udiv i32 [[TMP6]], [[TMP5]], !dbg !6
|
||||
; CHECK-NEXT: [[TMP8:%.*]] = zext i32 [[TMP7]] to i64, !dbg !6
|
||||
; CHECK-NEXT: br label [[TMP11:%.*]], !dbg !6
|
||||
; CHECK: 9:
|
||||
; CHECK-NEXT: [[TMP10:%.*]] = sdiv i64 [[A]], [[B]], !dbg !6
|
||||
; CHECK-NEXT: br label [[TMP11]], !dbg !6
|
||||
; CHECK: 11:
|
||||
; CHECK-NEXT: [[TMP12:%.*]] = phi i64 [ [[TMP8]], [[TMP4]] ], [ [[TMP10]], [[TMP9]] ], !dbg !6
|
||||
; CHECK-NEXT: ret i64 [[TMP12]]
|
||||
;
|
||||
%d = sdiv i64 %a, %b, !dbg !6
|
||||
ret i64 %d
|
||||
}
|
||||
|
||||
; FIXME: The debugloc for the rem parts end up with the dbg of the
|
||||
; division.
|
||||
define <2 x i64> @sdivrem64(i64 %a, i64 %b) {
|
||||
; CHECK-LABEL: @sdivrem64(
|
||||
; CHECK-NEXT: [[TMP1:%.*]] = or i64 [[A:%.*]], [[B:%.*]], !dbg !6
|
||||
; CHECK-NEXT: [[TMP2:%.*]] = and i64 [[TMP1]], -4294967296, !dbg !6
|
||||
; CHECK-NEXT: [[TMP3:%.*]] = icmp eq i64 [[TMP2]], 0, !dbg !6
|
||||
; CHECK-NEXT: br i1 [[TMP3]], label [[TMP4:%.*]], label [[TMP11:%.*]], !dbg !6
|
||||
; CHECK: 4:
|
||||
; CHECK-NEXT: [[TMP5:%.*]] = trunc i64 [[B]] to i32, !dbg !6
|
||||
; CHECK-NEXT: [[TMP6:%.*]] = trunc i64 [[A]] to i32, !dbg !6
|
||||
; CHECK-NEXT: [[TMP7:%.*]] = udiv i32 [[TMP6]], [[TMP5]], !dbg !6
|
||||
; CHECK-NEXT: [[TMP8:%.*]] = urem i32 [[TMP6]], [[TMP5]], !dbg !6
|
||||
; CHECK-NEXT: [[TMP9:%.*]] = zext i32 [[TMP7]] to i64, !dbg !6
|
||||
; CHECK-NEXT: [[TMP10:%.*]] = zext i32 [[TMP8]] to i64, !dbg !6
|
||||
; CHECK-NEXT: br label [[TMP14:%.*]], !dbg !6
|
||||
; CHECK: 11:
|
||||
; CHECK-NEXT: [[TMP12:%.*]] = sdiv i64 [[A]], [[B]], !dbg !6
|
||||
; CHECK-NEXT: [[TMP13:%.*]] = srem i64 [[A]], [[B]], !dbg !6
|
||||
; CHECK-NEXT: br label [[TMP14]], !dbg !6
|
||||
; CHECK: 14:
|
||||
; CHECK-NEXT: [[TMP15:%.*]] = phi i64 [ [[TMP9]], [[TMP4]] ], [ [[TMP12]], [[TMP11]] ], !dbg !6
|
||||
; CHECK-NEXT: [[TMP16:%.*]] = phi i64 [ [[TMP10]], [[TMP4]] ], [ [[TMP13]], [[TMP11]] ], !dbg !6
|
||||
; CHECK-NEXT: [[INS0:%.*]] = insertelement <2 x i64> undef, i64 [[TMP15]], i32 0
|
||||
; CHECK-NEXT: [[INS1:%.*]] = insertelement <2 x i64> [[INS0]], i64 [[TMP16]], i32 1
|
||||
; CHECK-NEXT: ret <2 x i64> [[INS1]]
|
||||
;
|
||||
%d = sdiv i64 %a, %b, !dbg !6
|
||||
%r = srem i64 %a, %b, !dbg !10
|
||||
%ins0 = insertelement <2 x i64> undef, i64 %d, i32 0
|
||||
%ins1 = insertelement <2 x i64> %ins0, i64 %r, i32 1
|
||||
ret <2 x i64> %ins1
|
||||
}
|
||||
|
||||
!llvm.dbg.cu = !{!0}
|
||||
!llvm.module.flags = !{!3, !4}
|
||||
!llvm.ident = !{!5}
|
||||
|
||||
!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 3.5 ", isOptimized: false, runtimeVersion: 0, emissionKind: NoDebug, enums: !2, retainedTypes: !2, globals: !2, imports: !2)
|
||||
!1 = !DIFile(filename: "basic.c", directory: ".")
|
||||
!2 = !{}
|
||||
!3 = !{i32 2, !"Dwarf Version", i32 4}
|
||||
!4 = !{i32 1, !"Debug Info Version", i32 3}
|
||||
!5 = !{!"clang version 3.5 "}
|
||||
!6 = !DILocation(line: 3, scope: !7)
|
||||
!7 = distinct !DILexicalBlock(scope: !8, file: !1, line: 3)
|
||||
!8 = distinct !DISubprogram(name: "foo", scope: !1, file: !1, line: 1, type: !9, scopeLine: 1, virtualIndex: 6, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !2)
|
||||
!9 = !DISubroutineType(types: !2)
|
||||
!10 = !DILocation(line: 4, scope: !7)
|
||||
Loading…
x
Reference in New Issue
Block a user