From bfa7594241bb1e946a562855af2633986ddeb7a4 Mon Sep 17 00:00:00 2001 From: Vedant Kumar Date: Sat, 15 Sep 2018 04:08:52 +0000 Subject: [PATCH] [CodeGenPrepare] Preserve debug locs in OptimizeExtractBits CodeGenPrepare has a transform that sinks {lshr, trunc} pairs to make it easier for the backend to emit fancy extract-bits instructions (e.g UBFX). Teach it to preserve debug locations and salvage debug values. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@342319 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CodeGenPrepare.cpp | 7 +- .../CodeGenPrepare/sink-shift-and-trunc.ll | 110 +++++++++++++++++++++ 2 files changed, 116 insertions(+), 1 deletion(-) create mode 100644 test/Transforms/CodeGenPrepare/sink-shift-and-trunc.ll diff --git a/lib/CodeGen/CodeGenPrepare.cpp b/lib/CodeGen/CodeGenPrepare.cpp index cf1966f4677..ec4451ffa75 100644 --- a/lib/CodeGen/CodeGenPrepare.cpp +++ b/lib/CodeGen/CodeGenPrepare.cpp @@ -1405,6 +1405,7 @@ SinkShiftAndTruncate(BinaryOperator *ShiftI, Instruction *User, ConstantInt *CI, else InsertedShift = BinaryOperator::CreateLShr(ShiftI->getOperand(0), CI, "", &*InsertPt); + InsertedShift->setDebugLoc(ShiftI->getDebugLoc()); // Sink the trunc BasicBlock::iterator TruncInsertPt = TruncUserBB->getFirstInsertionPt(); @@ -1413,6 +1414,7 @@ SinkShiftAndTruncate(BinaryOperator *ShiftI, Instruction *User, ConstantInt *CI, InsertedTrunc = CastInst::Create(TruncI->getOpcode(), InsertedShift, TruncI->getType(), "", &*TruncInsertPt); + InsertedTrunc->setDebugLoc(TruncI->getDebugLoc()); MadeChange = true; @@ -1504,6 +1506,7 @@ static bool OptimizeExtractBits(BinaryOperator *ShiftI, ConstantInt *CI, else InsertedShift = BinaryOperator::CreateLShr(ShiftI->getOperand(0), CI, "", &*InsertPt); + InsertedShift->setDebugLoc(ShiftI->getDebugLoc()); MadeChange = true; } @@ -1513,8 +1516,10 @@ static bool OptimizeExtractBits(BinaryOperator *ShiftI, ConstantInt *CI, } // If we removed all uses, nuke the shift. - if (ShiftI->use_empty()) + if (ShiftI->use_empty()) { + salvageDebugInfo(*ShiftI); ShiftI->eraseFromParent(); + } return MadeChange; } diff --git a/test/Transforms/CodeGenPrepare/sink-shift-and-trunc.ll b/test/Transforms/CodeGenPrepare/sink-shift-and-trunc.ll new file mode 100644 index 00000000000..20a436edd10 --- /dev/null +++ b/test/Transforms/CodeGenPrepare/sink-shift-and-trunc.ll @@ -0,0 +1,110 @@ +; REQUIRES: aarch64-registered-target +; RUN: opt -codegenprepare -mtriple=arm64-apple=ios -S -o - %s | FileCheck %s + +@first_ones = external global [65536 x i8] + +define i32 @fct19(i64 %arg1) #0 !dbg !6 { +; CHECK-LABEL: @fct19 +entry: + %x.sroa.1.0.extract.shift = lshr i64 %arg1, 16, !dbg !35 + %x.sroa.1.0.extract.trunc = trunc i64 %x.sroa.1.0.extract.shift to i16, !dbg !36 + + %x.sroa.3.0.extract.shift = lshr i64 %arg1, 32, !dbg !37 + call void @llvm.dbg.value(metadata i64 %x.sroa.3.0.extract.shift, metadata !13, metadata !DIExpression()), !dbg !37 +; CHECK: call void @llvm.dbg.value(metadata i64 %arg1, metadata {{.*}}, metadata !DIExpression(DW_OP_constu, 32, DW_OP_shr, DW_OP_stack_value)), !dbg [[shift2_loc:![0-9]+]] + + %x.sroa.5.0.extract.shift = lshr i64 %arg1, 48, !dbg !38 + %tobool = icmp eq i64 %x.sroa.5.0.extract.shift, 0, !dbg !39 + br i1 %tobool, label %if.end, label %if.then, !dbg !40 + +if.then: ; preds = %entry + %arrayidx3 = getelementptr inbounds [65536 x i8], [65536 x i8]* @first_ones, i64 0, i64 %x.sroa.5.0.extract.shift, !dbg !41 + %0 = load i8, i8* %arrayidx3, align 1, !dbg !42 + %conv = zext i8 %0 to i32, !dbg !43 + br label %return, !dbg !44 + +if.end: ; preds = %entry +; CHECK-LABEL: if.end: +; CHECK-NEXT: lshr i64 %arg1, 32, !dbg [[shift2_loc]] + %x.sroa.3.0.extract.trunc = trunc i64 %x.sroa.3.0.extract.shift to i16, !dbg !45 + %tobool6 = icmp eq i16 %x.sroa.3.0.extract.trunc, 0, !dbg !46 + br i1 %tobool6, label %if.end13, label %if.then7, !dbg !47 + +if.then7: ; preds = %if.end + %idxprom10 = and i64 %x.sroa.3.0.extract.shift, 65535, !dbg !48 + %arrayidx11 = getelementptr inbounds [65536 x i8], [65536 x i8]* @first_ones, i64 0, i64 %idxprom10, !dbg !49 + %1 = load i8, i8* %arrayidx11, align 1, !dbg !50 + %conv12 = zext i8 %1 to i32, !dbg !51 + %add = add nsw i32 %conv12, 16, !dbg !52 + br label %return, !dbg !53 + +if.end13: ; preds = %if.end +; CHECK-LABEL: if.end13: +; CHECK-NEXT: [[shift1:%.*]] = lshr i64 %arg1, 16, !dbg [[shift1_loc:![0-9]+]] +; CHECK-NEXT: trunc i64 [[shift1]] to i16, !dbg [[trunc1_loc:![0-9]+]] + %tobool16 = icmp eq i16 %x.sroa.1.0.extract.trunc, 0, !dbg !54 + br i1 %tobool16, label %return, label %if.then17, !dbg !55 + +if.then17: ; preds = %if.end13 + %idxprom20 = and i64 %x.sroa.1.0.extract.shift, 65535, !dbg !56 + %arrayidx21 = getelementptr inbounds [65536 x i8], [65536 x i8]* @first_ones, i64 0, i64 %idxprom20, !dbg !57 + %2 = load i8, i8* %arrayidx21, align 1, !dbg !58 + %conv22 = zext i8 %2 to i32, !dbg !59 + %add23 = add nsw i32 %conv22, 32, !dbg !60 + br label %return, !dbg !61 + +return: ; preds = %if.then17, %if.end13, %if.then7, %if.then + %retval.0 = phi i32 [ %conv, %if.then ], [ %add, %if.then7 ], [ %add23, %if.then17 ], [ 64, %if.end13 ], !dbg !62 + ret i32 %retval.0, !dbg !63 +} + +; CHECK: [[shift1_loc]] = !DILocation(line: 1 +; CHECK: [[trunc1_loc]] = !DILocation(line: 2 +; CHECK: [[shift2_loc]] = !DILocation(line: 3 + +declare void @llvm.dbg.value(metadata, metadata, metadata) #1 + +attributes #0 = { nounwind readonly ssp } +attributes #1 = { nounwind readnone speculatable } + +!llvm.dbg.cu = !{!0} +!llvm.module.flags = !{!5} + +!0 = distinct !DICompileUnit(language: DW_LANG_C, file: !1, producer: "debugify", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2) +!1 = !DIFile(filename: "sink-shift-and-trunc.ll", directory: "/") +!2 = !{} +!5 = !{i32 2, !"Debug Info Version", i32 3} +!6 = distinct !DISubprogram(name: "fct19", linkageName: "fct19", scope: null, file: !1, line: 1, type: !7, isLocal: false, isDefinition: true, scopeLine: 1, isOptimized: true, unit: !0, retainedNodes: !8) +!7 = !DISubroutineType(types: !2) +!8 = !{!13} +!10 = !DIBasicType(name: "ty64", size: 64, encoding: DW_ATE_unsigned) +!13 = !DILocalVariable(name: "3", scope: !6, file: !1, line: 3, type: !10) +!35 = !DILocation(line: 1, column: 1, scope: !6) +!36 = !DILocation(line: 2, column: 1, scope: !6) +!37 = !DILocation(line: 3, column: 1, scope: !6) +!38 = !DILocation(line: 4, column: 1, scope: !6) +!39 = !DILocation(line: 5, column: 1, scope: !6) +!40 = !DILocation(line: 6, column: 1, scope: !6) +!41 = !DILocation(line: 7, column: 1, scope: !6) +!42 = !DILocation(line: 8, column: 1, scope: !6) +!43 = !DILocation(line: 9, column: 1, scope: !6) +!44 = !DILocation(line: 10, column: 1, scope: !6) +!45 = !DILocation(line: 11, column: 1, scope: !6) +!46 = !DILocation(line: 12, column: 1, scope: !6) +!47 = !DILocation(line: 13, column: 1, scope: !6) +!48 = !DILocation(line: 14, column: 1, scope: !6) +!49 = !DILocation(line: 15, column: 1, scope: !6) +!50 = !DILocation(line: 16, column: 1, scope: !6) +!51 = !DILocation(line: 17, column: 1, scope: !6) +!52 = !DILocation(line: 18, column: 1, scope: !6) +!53 = !DILocation(line: 19, column: 1, scope: !6) +!54 = !DILocation(line: 20, column: 1, scope: !6) +!55 = !DILocation(line: 21, column: 1, scope: !6) +!56 = !DILocation(line: 22, column: 1, scope: !6) +!57 = !DILocation(line: 23, column: 1, scope: !6) +!58 = !DILocation(line: 24, column: 1, scope: !6) +!59 = !DILocation(line: 25, column: 1, scope: !6) +!60 = !DILocation(line: 26, column: 1, scope: !6) +!61 = !DILocation(line: 27, column: 1, scope: !6) +!62 = !DILocation(line: 28, column: 1, scope: !6) +!63 = !DILocation(line: 29, column: 1, scope: !6) -- 2.11.0