Skip to content

Commit 787f1e7

Browse files
aobolenskaobolensk
authored
Check for spirv-dis tool in DebugMacro tests (#3648)
1 parent 3ce38f4 commit 787f1e7

File tree

4 files changed

+13
-25
lines changed

4 files changed

+13
-25
lines changed

‎test/DebugInfo/DebugMacroDef.ll‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
; RUN: llvm-spirv --spirv-debug-info-version=ocl-100 %s -o %t.spv
77
; RUN: spirv-val %t.spv
88

9-
; RUN: spirv-dis %t.spv -o %t.spvasm
10-
; RUN: FileCheck %s --input-file %t.spvasm --check-prefix CHECK-SPIRV-OCL
9+
; RUN: %if spirv-dis %{ spirv-dis %t.spv -o - | FileCheck %s --check-prefix CHECK-SPIRV-OCL %}
1110

1211
; RUN: llvm-spirv -r %t.spv -o %t.rev.bc
1312
; RUN: llvm-dis %t.rev.bc -o %t.rev.ll
@@ -16,8 +15,7 @@
1615
; RUN: llvm-spirv --spirv-ext=+SPV_KHR_non_semantic_info --spirv-debug-info-version=nonsemantic-shader-100 %s -o %t.spv
1716
; RUN: spirv-val %t.spv
1817

19-
; RUN: spirv-dis %t.spv -o %t.spvasm
20-
; RUN: FileCheck %s --input-file %t.spvasm --check-prefix CHECK-SPIRV-NON-SEMANTIC-100
18+
; RUN: %if spirv-dis %{ spirv-dis %t.spv -o - | FileCheck %s --check-prefix CHECK-SPIRV-NON-SEMANTIC-100 %}
2119

2220
; RUN: llvm-spirv -r %t.spv -o %t.rev.bc
2321
; RUN: llvm-dis %t.rev.bc -o %t.rev.ll
@@ -26,10 +24,9 @@
2624
; RUN: llvm-spirv --spirv-ext=+SPV_KHR_non_semantic_info --spirv-debug-info-version=nonsemantic-shader-200 %s -o %t.spv
2725
; RUN: spirv-val %t.spv
2826

29-
; RUN: spirv-dis %t.spv -o %t.spvasm
30-
; RUN: FileCheck %s --input-file %t.spvasm --check-prefix CHECK-SPIRV-NON-SEMANTIC-200
27+
; RUN: %if spirv-dis %{ spirv-dis %t.spv -o - | FileCheck %s --check-prefix CHECK-SPIRV-NON-SEMANTIC-200 %}
3128

32-
; RUN: llvm-spirv -r %t.spv -o %t.rev.bc
29+
; RUN: llvm-spirv -r %t.spv -o %t.rev.bc
3330
; RUN: llvm-dis %t.rev.bc -o %t.rev.ll
3431
; RUN: FileCheck %s --input-file %t.rev.ll --check-prefix CHECK-LL
3532

‎test/DebugInfo/DebugMacroDefNoValue.ll‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
; RUN: llvm-spirv --spirv-debug-info-version=ocl-100 %s -o %t.spv
88
; RUN: spirv-val %t.spv
99

10-
; RUN: spirv-dis %t.spv -o %t.spvasm
11-
; RUN: FileCheck %s --input-file %t.spvasm --check-prefix CHECK-SPIRV-OCL
10+
; RUN: %if spirv-dis %{ spirv-dis %t.spv -o - | FileCheck %s --check-prefix CHECK-SPIRV-OCL %}
1211

1312
; RUN: llvm-spirv -r %t.spv -o %t.rev.bc
1413
; RUN: llvm-dis %t.rev.bc -o %t.rev.ll
@@ -17,8 +16,7 @@
1716
; RUN: llvm-spirv --spirv-ext=+SPV_KHR_non_semantic_info --spirv-debug-info-version=nonsemantic-shader-100 %s -o %t.spv
1817
; RUN: spirv-val %t.spv
1918

20-
; RUN: spirv-dis %t.spv -o %t.spvasm
21-
; RUN: FileCheck %s --input-file %t.spvasm --check-prefix CHECK-SPIRV-NON-SEMANTIC-100
19+
; RUN: %if spirv-dis %{ spirv-dis %t.spv -o - | FileCheck %s --check-prefix CHECK-SPIRV-NON-SEMANTIC-100 %}
2220

2321
; RUN: llvm-spirv -r %t.spv -o %t.rev.bc
2422
; RUN: llvm-dis %t.rev.bc -o %t.rev.ll
@@ -27,8 +25,7 @@
2725
; RUN: llvm-spirv --spirv-ext=+SPV_KHR_non_semantic_info --spirv-debug-info-version=nonsemantic-shader-200 %s -o %t.spv
2826
; RUN: spirv-val %t.spv
2927

30-
; RUN: spirv-dis %t.spv -o %t.spvasm
31-
; RUN: FileCheck %s --input-file %t.spvasm --check-prefix CHECK-SPIRV-NON-SEMANTIC-200
28+
; RUN: %if spirv-dis %{ spirv-dis %t.spv -o - | FileCheck %s --check-prefix CHECK-SPIRV-NON-SEMANTIC-200 %}
3229

3330
; RUN: llvm-spirv -r %t.spv -o %t.rev.bc
3431
; RUN: llvm-dis %t.rev.bc -o %t.rev.ll

‎test/DebugInfo/DebugMacroDefRoot.ll‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
; RUN: llvm-spirv --spirv-debug-info-version=ocl-100 %s -o %t.spv
77
; RUN: spirv-val %t.spv
88

9-
; RUN: spirv-dis %t.spv -o %t.spvasm
10-
; RUN: FileCheck %s --input-file %t.spvasm --check-prefix CHECK-SPIRV-OCL
9+
; RUN: %if spirv-dis %{ spirv-dis %t.spv -o - | FileCheck %s --check-prefix CHECK-SPIRV-OCL %}
1110

1211
; RUN: llvm-spirv -r %t.spv -o %t.rev.bc
1312
; RUN: llvm-dis %t.rev.bc -o %t.rev.ll
@@ -16,8 +15,7 @@
1615
; RUN: llvm-spirv --spirv-ext=+SPV_KHR_non_semantic_info --spirv-debug-info-version=nonsemantic-shader-100 %s -o %t.spv
1716
; RUN: spirv-val %t.spv
1817

19-
; RUN: spirv-dis %t.spv -o %t.spvasm
20-
; RUN: FileCheck %s --input-file %t.spvasm --check-prefix CHECK-SPIRV-NON-SEMANTIC-100
18+
; RUN: %if spirv-dis %{ spirv-dis %t.spv -o - | FileCheck %s --check-prefix CHECK-SPIRV-NON-SEMANTIC-100 %}
2119

2220
; RUN: llvm-spirv -r %t.spv -o %t.rev.bc
2321
; RUN: llvm-dis %t.rev.bc -o %t.rev.ll
@@ -26,8 +24,7 @@
2624
; RUN: llvm-spirv --spirv-ext=+SPV_KHR_non_semantic_info --spirv-debug-info-version=nonsemantic-shader-200 %s -o %t.spv
2725
; RUN: spirv-val %t.spv
2826

29-
; RUN: spirv-dis %t.spv -o %t.spvasm
30-
; RUN: FileCheck %s --input-file %t.spvasm --check-prefix CHECK-SPIRV-NON-SEMANTIC-200
27+
; RUN: %if spirv-dis %{ spirv-dis %t.spv -o - | FileCheck %s --check-prefix CHECK-SPIRV-NON-SEMANTIC-200 %}
3128

3229
; RUN: llvm-spirv -r %t.spv -o %t.rev.bc
3330
; RUN: llvm-dis %t.rev.bc -o %t.rev.ll

‎test/DebugInfo/DebugMacroUndefinedUndef.ll‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
; RUN: llvm-spirv --spirv-debug-info-version=ocl-100 %s -o %t.spv
77
; RUN: spirv-val %t.spv
88

9-
; RUN: spirv-dis %t.spv -o %t.spvasm
10-
; RUN: FileCheck %s --input-file %t.spvasm --check-prefix CHECK-SPIRV-OCL
9+
; RUN: %if spirv-dis %{ spirv-dis %t.spv -o - | FileCheck %s --check-prefix CHECK-SPIRV-OCL %}
1110

1211
; RUN: llvm-spirv -r %t.spv -o %t.rev.bc
1312
; RUN: llvm-dis %t.rev.bc -o %t.rev.ll
@@ -16,8 +15,7 @@
1615
; RUN: llvm-spirv --spirv-ext=+SPV_KHR_non_semantic_info --spirv-debug-info-version=nonsemantic-shader-100 %s -o %t.spv
1716
; RUN: spirv-val %t.spv
1817

19-
; RUN: spirv-dis %t.spv -o %t.spvasm
20-
; RUN: FileCheck %s --input-file %t.spvasm --check-prefix CHECK-SPIRV-NON-SEMANTIC-100
18+
; RUN: %if spirv-dis %{ spirv-dis %t.spv -o - | FileCheck %s --check-prefix CHECK-SPIRV-NON-SEMANTIC-100 %}
2119

2220
; RUN: llvm-spirv -r %t.spv -o %t.rev.bc
2321
; RUN: llvm-dis %t.rev.bc -o %t.rev.ll
@@ -26,8 +24,7 @@
2624
; RUN: llvm-spirv --spirv-ext=+SPV_KHR_non_semantic_info --spirv-debug-info-version=nonsemantic-shader-200 %s -o %t.spv
2725
; RUN: spirv-val %t.spv
2826

29-
; RUN: spirv-dis %t.spv -o %t.spvasm
30-
; RUN: FileCheck %s --input-file %t.spvasm --check-prefix CHECK-SPIRV-NON-SEMANTIC-200
27+
; RUN: %if spirv-dis %{ spirv-dis %t.spv -o - | FileCheck %s --check-prefix CHECK-SPIRV-NON-SEMANTIC-200 %}
3128

3229
; RUN: llvm-spirv -r %t.spv -o %t.rev.bc
3330
; RUN: llvm-dis %t.rev.bc -o %t.rev.ll

0 commit comments

Comments
 (0)