Remove datalayout and target triple from test cases related to LiveDebugValues pass.

[tvvikram]

Summary

Buildbots failed with architectures other than x86 for a new test case added in commit rL255759.
The test case contained x86 specific target triple - 'x86_64-unknown-linux-gnu' as seen from http://lab.llvm.org:8011/builders/clang-cmake-armv7-a15/builds/8377/steps/ninja%20check%201/logs/FAIL%3A%20LLVM%3A%3Alive-debug-values.ll.

I have removed the datalayout and target triple lines from the test case (including related test cases). This made the test cases "generic" i.e. moved the test cases into "Generic" folder.

[kparzysz]

The testcase is still x86-specific, since it checks for x86 register names. The Hexagon build bot only builds the Hexagon target.

[tobiasvk]

I just did

$ bin/llc -march=hexagon -filetype=asm ../llvm/test/DebugInfo/live-debug-values.ll -o - | bin/FileCheck ../llvm/test/DebugInfo/live-debug-values.ll
../llvm/test/DebugInfo/live-debug-values.ll:32:10: error: expected string not found in input
; CHECK: .LBB0_5:
         ^
<stdin>:1:2: note: scanning from here
 .text
 ^
<stdin>:70:1: note: possible intended match here
.LBB0_2: // %if.else.5
^

so it seems your test case is still to x86-specific.

[tvvikram]

Retained the test cases in X86 folder as they are not generic.

[tobiasvk]

LGTM conceptually. The patch doesn't apply to the current repo though (I guess it's a diff against what you had locally).

[aprantl]

The right fix for this is to move the test to an X86 subdirectory and add a lit.local.cfg file like the one in test/DebugInfo/X86/.

MIR/X86/live-debug-values-3preds.mir

36

Since you are actually checking for x86 register names I don't see the point in removing the target triple from the test. I would just leave it in.

[tvvikram]

MIR/X86/live-debug-values-3preds.mir

36

I checked a few existing test cases in DebugInfo/X86 and they didn't contain the triple. So I had removed it.

[tvvikram]

Fixed by chapuni in rL255834. Will abandon this patch.

MIR/X86/live-debug-values-3preds.mir

 # predecessors BB#0, BB#2 and BB#8.
 # CHECK:      bb.9.for.end:
 # CHECK:      DBG_VALUE debug-use %edx, debug-use _, !11, !17, debug-location !21
 # CHECK-NEXT: DBG_VALUE debug-use %esi, debug-use _, !10, !17, debug-location !19
 # CHECK-NEXT: DBG_VALUE debug-use %edi, debug-use _, !9, !17, debug-location !18
 
 
 --- |
   ; ModuleID = 'live-debug-values-3preds.ll'
-  target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
-  target triple = "x86_64-unknown-linux-gnu"
   
   ; Function Attrs: norecurse nounwind readnone uwtable
   define i32 @add(i32 %x, i32 %y, i32 %z, i32 %a) #0 !dbg !4 {
   entry:
     tail call void @llvm.dbg.value(metadata i32 %x, i64 0, metadata !9, metadata !17), !dbg !18
     tail call void @llvm.dbg.value(metadata i32 %y, i64 0, metadata !10, metadata !17), !dbg !19
     tail call void @llvm.dbg.value(metadata i32 %z, i64 0, metadata !11, metadata !17), !dbg !21
     tail call void @llvm.dbg.value(metadata i32 %a, i64 0, metadata !12, metadata !17), !dbg !23

MIR/X86/live-debug-values.mir

 # and BB#4.
 # CHECK:      bb.5.if.end.7:
 # CHECK:      DBG_VALUE debug-use %rsi, debug-use _, !13, !20, debug-location !22
 # CHECK-NEXT: DBG_VALUE debug-use %ebx, debug-use _, !14, !20, debug-location !33
 
 
 --- |
   ; ModuleID = 'live-debug-values.ll'
-  target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
-  target triple = "x86_64-unknown-linux-gnu"
   
   @m = common global i32 0, align 4
   @.str = private unnamed_addr constant [13 x i8] c"m(main): %d\0A\00", align 1
   
   ; Function Attrs: nounwind uwtable
   define i32 @main(i32 %argc, i8** nocapture readonly %argv) #0 !dbg !4 {
   entry:
     tail call void @llvm.dbg.value(metadata i32 %argc, i64 0, metadata !12, metadata !20), !dbg !21

X86/live-debug-values.ll

 ; DBG_VALUE for variable "n" is extended into BB#5 from its predecessors BB#3
 ; and BB#4.
 ; CHECK:       .LBB0_5:
 ; CHECK-NEXT:  #DEBUG_VALUE: main:argv <- %RSI
 ; CHECK-NEXT:  #DEBUG_VALUE: main:n <- %EBX
 
 
 ; ModuleID = 'LiveDebugValues.c'
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
-target triple = "x86_64-unknown-linux-gnu"
 
 @m = common global i32 0, align 4
 @.str = private unnamed_addr constant [13 x i8] c"m(main): %d\0A\00", align 1
 
 ; Function Attrs: nounwind uwtable
 define i32 @main(i32 %argc, i8** nocapture readonly %argv) #0 !dbg !4 {
 entry:
   tail call void @llvm.dbg.value(metadata i32 %argc, i64 0, metadata !12, metadata !20), !dbg !21

live-debug-values.ll

-; RUN: llc -filetype=asm %s -o - | FileCheck %s
-
-; Test the extension of debug ranges from predecessors.
-; Generated from the source file LiveDebugValues.c:
-; #include <stdio.h>
-; int m;
-; extern int inc(int n); 
-; extern int change(int n); 
-; extern int modify(int n); 
-; int main(int argc, char **argv) {
-;   int n;
-;   if (argc != 2)
-;     n = 2;
-;   else
-;     n = atoi(argv[1]);
-;   n = change(n);
-;   if (n > 10) {
-;     m = modify(n);
-;     m = m + n;  // var `m' doesn't has a dbg.value
-;   }
-;   else
-;     m = inc(n); // var `m' doesn't has a dbg.value
-;   printf("m(main): %d\n", m); 
-;   return 0;
-; }
-; with clang -g -O3 -emit-llvm -c LiveDebugValues.c -S -o live-debug-values.ll
-; This case will also produce multiple locations but only the debug range
-; extension is tested here.
-
-; DBG_VALUE for variable "n" is extended into BB#5 from its predecessors BB#3
-; and BB#4.
-; CHECK:       .LBB0_5:
-; CHECK-NEXT:  #DEBUG_VALUE: main:argv <- %RSI
-; CHECK-NEXT:  #DEBUG_VALUE: main:n <- %EBX
-
-
-; ModuleID = 'LiveDebugValues.c'
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
-target triple = "x86_64-unknown-linux-gnu"
-
-@m = common global i32 0, align 4
-@.str = private unnamed_addr constant [13 x i8] c"m(main): %d\0A\00", align 1
-
-; Function Attrs: nounwind uwtable
-define i32 @main(i32 %argc, i8** nocapture readonly %argv) #0 !dbg !4 {
-entry:
-  tail call void @llvm.dbg.value(metadata i32 %argc, i64 0, metadata !12, metadata !20), !dbg !21
-  tail call void @llvm.dbg.value(metadata i8** %argv, i64 0, metadata !13, metadata !20), !dbg !22
-  %cmp = icmp eq i32 %argc, 2, !dbg !24
-  br i1 %cmp, label %if.else, label %if.end, !dbg !26
-
-if.else:                                          ; preds = %entry
-  %arrayidx = getelementptr inbounds i8*, i8** %argv, i64 1, !dbg !27
-  %0 = load i8*, i8** %arrayidx, align 8, !dbg !27, !tbaa !28
-  %call = tail call i32 (i8*, ...) bitcast (i32 (...)* @atoi to i32 (i8*, ...)*)(i8* %0) #4, !dbg !32
-  tail call void @llvm.dbg.value(metadata i32 %call, i64 0, metadata !14, metadata !20), !dbg !33
-  br label %if.end
-
-if.end:                                           ; preds = %entry, %if.else
-  %n.0 = phi i32 [ %call, %if.else ], [ 2, %entry ]
-  %call1 = tail call i32 @change(i32 %n.0) #4, !dbg !34
-  tail call void @llvm.dbg.value(metadata i32 %call1, i64 0, metadata !14, metadata !20), !dbg !33
-  %cmp2 = icmp sgt i32 %call1, 10, !dbg !35
-  br i1 %cmp2, label %if.then.3, label %if.else.5, !dbg !37
-
-if.then.3:                                        ; preds = %if.end
-  %call4 = tail call i32 @modify(i32 %call1) #4, !dbg !38
-  %add = add nsw i32 %call4, %call1, !dbg !40
-  br label %if.end.7, !dbg !41
-
-if.else.5:                                        ; preds = %if.end
-  %call6 = tail call i32 @inc(i32 %call1) #4, !dbg !42
-  br label %if.end.7
-
-if.end.7:                                         ; preds = %if.else.5, %if.then.3
-  %storemerge = phi i32 [ %call6, %if.else.5 ], [ %add, %if.then.3 ]
-  store i32 %storemerge, i32* @m, align 4, !dbg !43, !tbaa !44
-  %call8 = tail call i32 (i8*, ...) @printf(i8* nonnull getelementptr inbounds ([13 x i8], [13 x i8]* @.str, i64 0, i64 0), i32 %storemerge) #4, !dbg !46
-  ret i32 0, !dbg !47
-}
-
-declare i32 @atoi(...) #1
-
-declare i32 @change(i32) #1
-
-declare i32 @modify(i32) #1
-
-declare i32 @inc(i32) #1
-
-; Function Attrs: nounwind
-declare i32 @printf(i8* nocapture readonly, ...) #2
-
-; Function Attrs: nounwind readnone
-declare void @llvm.dbg.value(metadata, i64, metadata, metadata) #3
-
-attributes #0 = { nounwind uwtable }
-attributes #1 = { nounwind }
-attributes #2 = { nounwind }
-attributes #3 = { nounwind readnone }
-attributes #4 = { nounwind }
-
-!llvm.dbg.cu = !{!0}
-!llvm.module.flags = !{!17, !18}
-!llvm.ident = !{!19}
-
-!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 3.8.0 (trunk 253049) ", isOptimized: true, runtimeVersion: 0, emissionKind: 1, enums: !2, subprograms: !3, globals: !15)
-!1 = !DIFile(filename: "LiveDebugValues.c", directory: "/home/vt/julia/test/tvvikram")
-!2 = !{}
-!3 = !{!4}
-!4 = distinct !DISubprogram(name: "main", scope: !1, file: !1, line: 6, type: !5, isLocal: false, isDefinition: true, scopeLine: 6, flags: DIFlagPrototyped, isOptimized: true, variables: !11)
-!5 = !DISubroutineType(types: !6)
-!6 = !{!7, !7, !8}
-!7 = !DIBasicType(name: "int", size: 32, align: 32, encoding: DW_ATE_signed)
-!8 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !9, size: 64, align: 64)
-!9 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !10, size: 64, align: 64)
-!10 = !DIBasicType(name: "char", size: 8, align: 8, encoding: DW_ATE_signed_char)
-!11 = !{!12, !13, !14}
-!12 = !DILocalVariable(name: "argc", arg: 1, scope: !4, file: !1, line: 6, type: !7)
-!13 = !DILocalVariable(name: "argv", arg: 2, scope: !4, file: !1, line: 6, type: !8)
-!14 = !DILocalVariable(name: "n", scope: !4, file: !1, line: 7, type: !7)
-!15 = !{!16}
-!16 = !DIGlobalVariable(name: "m", scope: !0, file: !1, line: 2, type: !7, isLocal: false, isDefinition: true, variable: i32* @m)
-!17 = !{i32 2, !"Dwarf Version", i32 4}
-!18 = !{i32 2, !"Debug Info Version", i32 3}
-!19 = !{!"clang version 3.8.0 (trunk 253049) "}
-!20 = !DIExpression()
-!21 = !DILocation(line: 6, column: 14, scope: !4)
-!22 = !DILocation(line: 6, column: 27, scope: !23)
-!23 = !DILexicalBlockFile(scope: !4, file: !1, discriminator: 1)
-!24 = !DILocation(line: 8, column: 12, scope: !25)
-!25 = distinct !DILexicalBlock(scope: !4, file: !1, line: 8, column: 7)
-!26 = !DILocation(line: 8, column: 7, scope: !4)
-!27 = !DILocation(line: 11, column: 14, scope: !25)
-!28 = !{!29, !29, i64 0}
-!29 = !{!"any pointer", !30, i64 0}
-!30 = !{!"omnipotent char", !31, i64 0}
-!31 = !{!"Simple C/C++ TBAA"}
-!32 = !DILocation(line: 11, column: 9, scope: !25)
-!33 = !DILocation(line: 7, column: 7, scope: !23)
-!34 = !DILocation(line: 12, column: 7, scope: !4)
-!35 = !DILocation(line: 13, column: 9, scope: !36)
-!36 = distinct !DILexicalBlock(scope: !4, file: !1, line: 13, column: 7)
-!37 = !DILocation(line: 13, column: 7, scope: !4)
-!38 = !DILocation(line: 14, column: 9, scope: !39)
-!39 = distinct !DILexicalBlock(scope: !36, file: !1, line: 13, column: 15)
-!40 = !DILocation(line: 15, column: 11, scope: !39)
-!41 = !DILocation(line: 16, column: 3, scope: !39)
-!42 = !DILocation(line: 18, column: 9, scope: !36)
-!43 = !DILocation(line: 15, column: 7, scope: !39)
-!44 = !{!45, !45, i64 0}
-!45 = !{!"int", !30, i64 0}
-!46 = !DILocation(line: 19, column: 3, scope: !4)
-!47 = !DILocation(line: 20, column: 3, scope: !4)