Skip to content

Commit fad9949

Browse files
mattst88sys-ce-bb
mattst88
authored and
sys-ce-bb
committed
test: Fix x86 tests to use -mtriple=x86_64-unknown-linux-gnu (#2555)
... when test expects x86_64-specific results. Original commit: KhronosGroup/SPIRV-LLVM-Translator@681f027524840ff
1 parent f455245 commit fad9949

26 files changed

+99
-99
lines changed

‎llvm-spirv/test/DebugInfo/X86/abstract_origin.ll‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
; RUN: llvm-as < %s -o %t.bc
22
; RUN: llvm-spirv %t.bc -o %t.spv
33
; RUN: llvm-spirv -r %t.spv -o - | llvm-dis -o %t.ll
4-
; RUN: llc -mtriple=%triple -filetype=obj %t.ll -o - | llvm-dwarfdump -debug-info - | FileCheck %s
4+
; RUN: llc -mtriple=x86_64-unknown-linux-gnu -filetype=obj %t.ll -o - | llvm-dwarfdump -debug-info - | FileCheck %s
55

66
; RUN: llvm-spirv %t.bc -o %t.spv --spirv-debug-info-version=nonsemantic-shader-100
77
; RUN: llvm-spirv -r %t.spv -o - | llvm-dis -o %t.ll
8-
; RUN: llc -mtriple=%triple -filetype=obj %t.ll -o - | llvm-dwarfdump -debug-info - | FileCheck %s
8+
; RUN: llc -mtriple=x86_64-unknown-linux-gnu -filetype=obj %t.ll -o - | llvm-dwarfdump -debug-info - | FileCheck %s
99

1010
; RUN: llvm-spirv %t.bc -o %t.spv --spirv-debug-info-version=nonsemantic-shader-200
1111
; RUN: llvm-spirv -r %t.spv -o - | llvm-dis -o %t.ll
12-
; RUN: llc -mtriple=%triple -filetype=obj %t.ll -o - | llvm-dwarfdump -debug-info - | FileCheck %s
12+
; RUN: llc -mtriple=x86_64-unknown-linux-gnu -filetype=obj %t.ll -o - | llvm-dwarfdump -debug-info - | FileCheck %s
1313

1414
; Generated at -O2 from:
1515
; void f();

‎llvm-spirv/test/DebugInfo/X86/constant-aggregate.ll‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
; RUN: llvm-as < %s -o %t.bc
22
; RUN: llvm-spirv %t.bc -o %t.spv
33
; RUN: llvm-spirv -r %t.spv -o - | llvm-dis -o %t.ll
4-
; RUN: llc -mtriple=%triple %t.ll -filetype=obj -o %t.o
4+
; RUN: llc -mtriple=x86_64-unknown-linux-gnu %t.ll -filetype=obj -o %t.o
55
; RUN: llvm-dwarfdump -v -debug-info %t.o | FileCheck %s
66

77
; RUN: llvm-spirv %t.bc -o %t.spv --spirv-debug-info-version=nonsemantic-shader-100
88
; RUN: llvm-spirv -r %t.spv -o - | llvm-dis -o %t.ll
9-
; RUN: llc -mtriple=%triple %t.ll -filetype=obj -o %t.o
9+
; RUN: llc -mtriple=x86_64-unknown-linux-gnu %t.ll -filetype=obj -o %t.o
1010
; RUN: llvm-dwarfdump -v -debug-info %t.o | FileCheck %s
1111

1212
; RUN: llvm-spirv %t.bc -o %t.spv --spirv-debug-info-version=nonsemantic-shader-200
1313
; RUN: llvm-spirv -r %t.spv -o - | llvm-dis -o %t.ll
14-
; RUN: llc -mtriple=%triple %t.ll -filetype=obj -o %t.o
14+
; RUN: llc -mtriple=x86_64-unknown-linux-gnu %t.ll -filetype=obj -o %t.o
1515
; RUN: llvm-dwarfdump -v -debug-info %t.o | FileCheck %s
1616

1717
; Test emitting a constant for an aggregate type.

‎llvm-spirv/test/DebugInfo/X86/constant-loclist.ll‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
; RUN: llvm-as < %s -o %t.bc
22
; RUN: llvm-spirv %t.bc -o %t.spv
33
; RUN: llvm-spirv -r %t.spv -o - | llvm-dis -o %t.ll
4-
; RUN: llc -mtriple=%triple -filetype=obj %t.ll -o - -experimental-debug-variable-locations=false | llvm-dwarfdump -v -debug-info - | FileCheck %s
4+
; RUN: llc -mtriple=x86_64-unknown-linux-gnu -filetype=obj %t.ll -o - -experimental-debug-variable-locations=false | llvm-dwarfdump -v -debug-info - | FileCheck %s
55

66
; RUN: llvm-spirv %t.bc -o %t.spv --spirv-debug-info-version=nonsemantic-shader-100
77
; RUN: llvm-spirv -r %t.spv -o - | llvm-dis -o %t.ll
8-
; RUN: llc -mtriple=%triple -filetype=obj %t.ll -o - -experimental-debug-variable-locations=false | llvm-dwarfdump -v -debug-info - | FileCheck %s
8+
; RUN: llc -mtriple=x86_64-unknown-linux-gnu -filetype=obj %t.ll -o - -experimental-debug-variable-locations=false | llvm-dwarfdump -v -debug-info - | FileCheck %s
99

1010
; RUN: llvm-spirv %t.bc -o %t.spv --spirv-debug-info-version=nonsemantic-shader-200
1111
; RUN: llvm-spirv -r %t.spv -o - | llvm-dis -o %t.ll
12-
; RUN: llc -mtriple=%triple -filetype=obj %t.ll -o - -experimental-debug-variable-locations=false | llvm-dwarfdump -v -debug-info - | FileCheck %s
12+
; RUN: llc -mtriple=x86_64-unknown-linux-gnu -filetype=obj %t.ll -o - -experimental-debug-variable-locations=false | llvm-dwarfdump -v -debug-info - | FileCheck %s
1313

1414
; A hand-written testcase to check 64-bit constant handling in location lists.
1515

‎llvm-spirv/test/DebugInfo/X86/convert-debugloc.ll‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
; RUN: llvm-as < %s -o %t.bc
22
; RUN: llvm-spirv %t.bc -o %t.spv --spirv-allow-extra-diexpressions
33
; RUN: llvm-spirv -r %t.spv -o - | llvm-dis -o %t.ll
4-
; RUN: llc -mtriple=%triple -dwarf-version=5 -filetype=obj -O0 < %t.ll | llvm-dwarfdump - \
4+
; RUN: llc -mtriple=x86_64-unknown-linux-gnu -dwarf-version=5 -filetype=obj -O0 < %t.ll | llvm-dwarfdump - \
55
; RUN: | FileCheck %s --check-prefix=DW5 "--implicit-check-not={{DW_TAG|NULL}}"
6-
; RUN: llc -mtriple=%triple -dwarf-version=4 -filetype=obj -O0 < %t.ll | llvm-dwarfdump - \
6+
; RUN: llc -mtriple=x86_64-unknown-linux-gnu -dwarf-version=4 -filetype=obj -O0 < %t.ll | llvm-dwarfdump - \
77
; RUN: | FileCheck %s --check-prefix=DW4 "--implicit-check-not={{DW_TAG|NULL}}"
88

99
; RUN: llvm-spirv %t.bc -o %t.spv --spirv-allow-extra-diexpressions --spirv-debug-info-version=nonsemantic-shader-100
1010
; RUN: llvm-spirv -r %t.spv -o - | llvm-dis -o %t.ll
11-
; RUN: llc -mtriple=%triple -dwarf-version=5 -filetype=obj -O0 < %t.ll | llvm-dwarfdump - \
11+
; RUN: llc -mtriple=x86_64-unknown-linux-gnu -dwarf-version=5 -filetype=obj -O0 < %t.ll | llvm-dwarfdump - \
1212
; RUN: | FileCheck %s --check-prefix=DW5 "--implicit-check-not={{DW_TAG|NULL}}"
13-
; RUN: llc -mtriple=%triple -dwarf-version=4 -filetype=obj -O0 < %t.ll | llvm-dwarfdump - \
13+
; RUN: llc -mtriple=x86_64-unknown-linux-gnu -dwarf-version=4 -filetype=obj -O0 < %t.ll | llvm-dwarfdump - \
1414
; RUN: | FileCheck %s --check-prefix=DW4 "--implicit-check-not={{DW_TAG|NULL}}"
1515

1616
; RUN: llvm-spirv %t.bc -o %t.spv --spirv-debug-info-version=nonsemantic-shader-200
1717
; RUN: llvm-spirv -r %t.spv -o - | llvm-dis -o %t.ll
18-
; RUN: llc -mtriple=%triple -dwarf-version=5 -filetype=obj -O0 < %t.ll | llvm-dwarfdump - \
18+
; RUN: llc -mtriple=x86_64-unknown-linux-gnu -dwarf-version=5 -filetype=obj -O0 < %t.ll | llvm-dwarfdump - \
1919
; RUN: | FileCheck %s --check-prefix=DW5 "--implicit-check-not={{DW_TAG|NULL}}"
20-
; RUN: llc -mtriple=%triple -dwarf-version=4 -filetype=obj -O0 < %t.ll | llvm-dwarfdump - \
20+
; RUN: llc -mtriple=x86_64-unknown-linux-gnu -dwarf-version=4 -filetype=obj -O0 < %t.ll | llvm-dwarfdump - \
2121
; RUN: | FileCheck %s --check-prefix=DW4 "--implicit-check-not={{DW_TAG|NULL}}"
2222

2323
; DW5: .debug_info contents:

‎llvm-spirv/test/DebugInfo/X86/dbg-byval-parameter.ll‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
; RUN: llvm-as < %s -o %t.bc
22
; RUN: llvm-spirv %t.bc -o %t.spv
33
; RUN: llvm-spirv -r %t.spv -o - | llvm-dis -o %t.ll
4-
; RUN: llc -mtriple=%triple -march=x86 -asm-verbose < %t.ll | grep DW_TAG_formal_parameter
4+
; RUN: llc -mtriple=x86_64-unknown-linux-gnu -march=x86 -asm-verbose < %t.ll | grep DW_TAG_formal_parameter
55

66
; RUN: llvm-spirv %t.bc -o %t.spv --spirv-debug-info-version=nonsemantic-shader-100
77
; RUN: llvm-spirv -r %t.spv -o - | llvm-dis -o %t.ll
8-
; RUN: llc -mtriple=%triple -march=x86 -asm-verbose < %t.ll | grep DW_TAG_formal_parameter
8+
; RUN: llc -mtriple=x86_64-unknown-linux-gnu -march=x86 -asm-verbose < %t.ll | grep DW_TAG_formal_parameter
99

1010
; RUN: llvm-spirv %t.bc -o %t.spv --spirv-debug-info-version=nonsemantic-shader-200
1111
; RUN: llvm-spirv -r %t.spv -o - | llvm-dis -o %t.ll
12-
; RUN: llc -mtriple=%triple -march=x86 -asm-verbose < %t.ll | grep DW_TAG_formal_parameter
12+
; RUN: llc -mtriple=x86_64-unknown-linux-gnu -march=x86 -asm-verbose < %t.ll | grep DW_TAG_formal_parameter
1313

1414
target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-n8:16:32:64"
1515
target triple = "spir64-unknown-unknown"

‎llvm-spirv/test/DebugInfo/X86/dbg-declare-alloca.ll‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
; RUN: llvm-as < %s -o %t.bc
22
; RUN: llvm-spirv %t.bc -o %t.spv
33
; RUN: llvm-spirv -r %t.spv -o - | llvm-dis -o %t.ll
4-
; RUN: llc -mtriple=%triple < %t.ll | FileCheck %s
5-
; RUN: llc -mtriple=%triple < %t.ll -filetype=obj | llvm-dwarfdump -v - --debug-info | FileCheck %s --check-prefix=DWARF
4+
; RUN: llc -mtriple=x86_64-unknown-linux-gnu < %t.ll | FileCheck %s
5+
; RUN: llc -mtriple=x86_64-unknown-linux-gnu < %t.ll -filetype=obj | llvm-dwarfdump -v - --debug-info | FileCheck %s --check-prefix=DWARF
66

77
; RUN: llvm-spirv %t.bc -o %t.spv --spirv-debug-info-version=nonsemantic-shader-100
88
; RUN: llvm-spirv -r %t.spv -o - | llvm-dis -o %t.ll
9-
; RUN: llc -mtriple=%triple < %t.ll | FileCheck %s
10-
; RUN: llc -mtriple=%triple < %t.ll -filetype=obj | llvm-dwarfdump -v - --debug-info | FileCheck %s --check-prefix=DWARF
9+
; RUN: llc -mtriple=x86_64-unknown-linux-gnu < %t.ll | FileCheck %s
10+
; RUN: llc -mtriple=x86_64-unknown-linux-gnu < %t.ll -filetype=obj | llvm-dwarfdump -v - --debug-info | FileCheck %s --check-prefix=DWARF
1111

1212
; RUN: llvm-spirv %t.bc -o %t.spv --spirv-debug-info-version=nonsemantic-shader-200
1313
; RUN: llvm-spirv -r %t.spv -o - | llvm-dis -o %t.ll
14-
; RUN: llc -mtriple=%triple < %t.ll | FileCheck %s
15-
; RUN: llc -mtriple=%triple < %t.ll -filetype=obj | llvm-dwarfdump -v - --debug-info | FileCheck %s --check-prefix=DWARF
14+
; RUN: llc -mtriple=x86_64-unknown-linux-gnu < %t.ll | FileCheck %s
15+
; RUN: llc -mtriple=x86_64-unknown-linux-gnu < %t.ll -filetype=obj | llvm-dwarfdump -v - --debug-info | FileCheck %s --check-prefix=DWARF
1616

1717
; This should use the frame index side table for allocas, not DBG_VALUE
1818
; instructions. For SDAG ISel, this test would see an SDNode materializing the

‎llvm-spirv/test/DebugInfo/X86/dbg-declare-arg.ll‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
; RUN: llvm-as < %s -o %t.bc
22
; RUN: llvm-spirv %t.bc -o %t.spv
33
; RUN: llvm-spirv -r %t.spv -o - | llvm-dis -o %t.ll
4-
; RUN: llc -mtriple=%triple -O0 -fast-isel=true -filetype=obj -o - %t.ll | llvm-dwarfdump -v - | FileCheck %s
4+
; RUN: llc -mtriple=x86_64-unknown-linux-gnu -O0 -fast-isel=true -filetype=obj -o - %t.ll | llvm-dwarfdump -v - | FileCheck %s
55

66
; RUN: llvm-spirv %t.bc -o %t.spv --spirv-debug-info-version=nonsemantic-shader-100
77
; RUN: llvm-spirv -r %t.spv -o - | llvm-dis -o %t.ll
8-
; RUN: llc -mtriple=%triple -O0 -fast-isel=true -filetype=obj -o - %t.ll | llvm-dwarfdump -v - | FileCheck %s
8+
; RUN: llc -mtriple=x86_64-unknown-linux-gnu -O0 -fast-isel=true -filetype=obj -o - %t.ll | llvm-dwarfdump -v - | FileCheck %s
99

1010
; RUN: llvm-spirv %t.bc -o %t.spv --spirv-debug-info-version=nonsemantic-shader-200
1111
; RUN: llvm-spirv -r %t.spv -o - | llvm-dis -o %t.ll
12-
; RUN: llc -mtriple=%triple -O0 -fast-isel=true -filetype=obj -o - %t.ll | llvm-dwarfdump -v - | FileCheck %s
12+
; RUN: llc -mtriple=x86_64-unknown-linux-gnu -O0 -fast-isel=true -filetype=obj -o - %t.ll | llvm-dwarfdump -v - | FileCheck %s
1313

1414
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
1515
target triple = "spir64-unknown-unknown"

‎llvm-spirv/test/DebugInfo/X86/dbg-prolog-end.ll‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
; RUN: llvm-as < %s -o %t.bc
22
; RUN: llvm-spirv %t.bc -o %t.spv
33
; RUN: llvm-spirv -r %t.spv -o - | llvm-dis -o %t.ll
4-
; RUN: llc -mtriple=%triple -O0 < %t.ll | FileCheck %s
4+
; RUN: llc -mtriple=x86_64-unknown-linux-gnu -O0 < %t.ll | FileCheck %s
55

66
; RUN: llvm-spirv %t.bc -o %t.spv --spirv-debug-info-version=nonsemantic-shader-100
77
; RUN: llvm-spirv -r %t.spv -o - | llvm-dis -o %t.ll
8-
; RUN: llc -mtriple=%triple -O0 < %t.ll | FileCheck %s
8+
; RUN: llc -mtriple=x86_64-unknown-linux-gnu -O0 < %t.ll | FileCheck %s
99

1010
; RUN: llvm-spirv %t.bc -o %t.spv --spirv-debug-info-version=nonsemantic-shader-200
1111
; RUN: llvm-spirv -r %t.spv -o - | llvm-dis -o %t.ll
12-
; RUN: llc -mtriple=%triple -O0 < %t.ll | FileCheck %s
12+
; RUN: llc -mtriple=x86_64-unknown-linux-gnu -O0 < %t.ll | FileCheck %s
1313

1414
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
1515
target triple = "spir64-unknown-unknown"

‎llvm-spirv/test/DebugInfo/X86/dbg-value-const-byref.ll‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
; RUN: llvm-as < %s -o %t.bc
22
; RUN: llvm-spirv %t.bc -o %t.spv
33
; RUN: llvm-spirv -r %t.spv -o - | llvm-dis -o %t.ll
4-
; RUN: llc -mtriple=%triple -O1 -filetype=obj -o - %t.ll | llvm-dwarfdump -all - | FileCheck %s
4+
; RUN: llc -mtriple=x86_64-unknown-linux-gnu -O1 -filetype=obj -o - %t.ll | llvm-dwarfdump -all - | FileCheck %s
55

66
; RUN: llvm-spirv %t.bc -o %t.spv --spirv-debug-info-version=nonsemantic-shader-100
77
; RUN: llvm-spirv -r %t.spv -o - | llvm-dis -o %t.ll
8-
; RUN: llc -mtriple=%triple -O1 -filetype=obj -o - %t.ll | llvm-dwarfdump -all - | FileCheck %s
8+
; RUN: llc -mtriple=x86_64-unknown-linux-gnu -O1 -filetype=obj -o - %t.ll | llvm-dwarfdump -all - | FileCheck %s
99

1010
; RUN: llvm-spirv %t.bc -o %t.spv --spirv-debug-info-version=nonsemantic-shader-200
1111
; RUN: llvm-spirv -r %t.spv -o - | llvm-dis -o %t.ll
12-
; RUN: llc -mtriple=%triple -O1 -filetype=obj -o - %t.ll | llvm-dwarfdump -all - | FileCheck %s
12+
; RUN: llc -mtriple=x86_64-unknown-linux-gnu -O1 -filetype=obj -o - %t.ll | llvm-dwarfdump -all - | FileCheck %s
1313

1414
; Generated with -O1 from:
1515
; int f1();

‎llvm-spirv/test/DebugInfo/X86/dbg-value-isel.ll‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
; RUN: llvm-as < %s -o %t.bc
22
; RUN: llvm-spirv %t.bc -o %t.spv
33
; RUN: llvm-spirv -r %t.spv -o - | llvm-dis -o %t.ll
4-
; RUN: llc -mtriple=%triple < %t.ll | FileCheck %s
4+
; RUN: llc -mtriple=x86_64-unknown-linux-gnu < %t.ll | FileCheck %s
55

66
; RUN: llvm-spirv %t.bc -o %t.spv --spirv-debug-info-version=nonsemantic-shader-100
77
; RUN: llvm-spirv -r %t.spv -o - | llvm-dis -o %t.ll
8-
; RUN: llc -mtriple=%triple < %t.ll | FileCheck %s
8+
; RUN: llc -mtriple=x86_64-unknown-linux-gnu < %t.ll | FileCheck %s
99

1010
; RUN: llvm-spirv %t.bc -o %t.spv --spirv-debug-info-version=nonsemantic-shader-200
1111
; RUN: llvm-spirv -r %t.spv -o - | llvm-dis -o %t.ll
12-
; RUN: llc -mtriple=%triple < %t.ll | FileCheck %s
12+
; RUN: llc -mtriple=x86_64-unknown-linux-gnu < %t.ll | FileCheck %s
1313

1414
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
1515
target triple = "spir64-unknown-unknown"

0 commit comments

Comments
 (0)