Skip to content

Commit 219729b

Browse files
jmmartinezjsji
authored andcommitted
Follow-up: Use IRParser instead of BitcodeReader (#3405)
This is a follow-up of KhronosGroup/SPIRV-LLVM-Translator#3399 . After KhronosGroup/SPIRV-LLVM-Translator#3399, we do not need to run `llvm-as`, we can directly consume the textual llvm-ir representation. This patch profits from this to clean this pattern in the test: ```bash RUN: llvm-as %s -o %t.bc RUN: llvm-spirv %t.bc ... ``` And replaces it by ```bash RUN: llvm-spirv %s ... ``` Original commit: KhronosGroup/SPIRV-LLVM-Translator@57c254d32ea287a
1 parent bfb2ca6 commit 219729b

File tree

99 files changed

+100
-198
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+100
-198
lines changed

llvm-spirv/test/DebugInfo/DebugInfoLexicalBlockDependency.ll

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
; - The parent scope of the local variable VAL is the lexical block LB
44
; - The parent scope of the lexical block LB is the subprogram.
55

6-
; RUN: llvm-as %s -o %t.bc
7-
; RUN: llvm-spirv %t.bc -o %t.spv
6+
; RUN: llvm-spirv %s -o %t.spv
87
; RUN: llvm-spirv -r %t.spv -o %t.rev.bc
98
; RUN: llvm-dis %t.rev.bc -o %t.rev.ll
109
; RUN: FileCheck %s --input-file %t.rev.ll

llvm-spirv/test/DebugInfo/NonSemantic/Shader200/DebugInfoStringType.ll

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
; RUN: llvm-as %s -o %t.bc
2-
; RUN: llvm-spirv -spirv-text %t.bc -o %t.spt --spirv-debug-info-version=nonsemantic-shader-200
1+
; RUN: llvm-spirv -spirv-text %s -o %t.spt --spirv-debug-info-version=nonsemantic-shader-200
32
; RUN: FileCheck < %t.spt %s -check-prefix=CHECK-SPIRV
43
; RUN: llvm-spirv -to-binary %t.spt -o %t.spv
54

llvm-spirv/test/DebugInfo/NonSemantic/Shader200/DebugInfoSubrange.ll

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
; RUN: llvm-as %s -o %t.bc
2-
; RUN: llvm-spirv -spirv-text %t.bc -o %t.spt --spirv-debug-info-version=nonsemantic-shader-200
1+
; RUN: llvm-spirv -spirv-text %s -o %t.spt --spirv-debug-info-version=nonsemantic-shader-200
32
; RUN: FileCheck < %t.spt %s -check-prefix=CHECK-SPIRV
43
; RUN: llvm-spirv -to-binary %t.spt -o %t.spv
54

llvm-spirv/test/DebugInfo/NonSemantic/Shader200/DebugInfoTargetFunction.ll

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
; RUN: llvm-as %s -o %t.bc
2-
; RUN: llvm-spirv -spirv-text %t.bc -o %t.spt --spirv-debug-info-version=nonsemantic-shader-200
1+
; RUN: llvm-spirv -spirv-text %s -o %t.spt --spirv-debug-info-version=nonsemantic-shader-200
32
; RUN: FileCheck < %t.spt %s -check-prefix=CHECK-SPIRV
43
; RUN: llvm-spirv -to-binary %t.spt -o %t.spv
54

llvm-spirv/test/DebugInfo/NonSemantic/Shader200/InlineNamespace.ll

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
; RUN: llvm-as %s -o %t.bc
2-
; RUN: llvm-spirv -spirv-text %t.bc -o %t.spt --spirv-debug-info-version=nonsemantic-shader-200
1+
; RUN: llvm-spirv -spirv-text %s -o %t.spt --spirv-debug-info-version=nonsemantic-shader-200
32
; RUN: FileCheck < %t.spt %s -check-prefix=CHECK-SPIRV
43
; RUN: llvm-spirv -to-binary %t.spt -o %t.spv
54

llvm-spirv/test/DebugInfo/OpenCL100/DebugInfoSubrange.ll

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
; RUN: llvm-as %s -o %t.bc
2-
; RUN: llvm-spirv -spirv-text %t.bc -o %t.spt
1+
; RUN: llvm-spirv -spirv-text %s -o %t.spt
32
; RUN: FileCheck < %t.spt %s -check-prefix=CHECK-SPIRV
43

54
; RUN: llvm-spirv -to-binary %t.spt -o %t.spv

llvm-spirv/test/DebugInfo/RecursiveDebugInfo.ll

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636
; return 0;
3737
; }
3838

39-
; RUN: llvm-as %s -o %t.bc
40-
; RUN: llvm-spirv %t.bc -o %t.spv
39+
; RUN: llvm-spirv %s -o %t.spv
4140
; RUN: llvm-spirv -r %t.spv -o %t.rev.bc
4241
; RUN: llvm-dis < %t.rev.bc | FileCheck %s
4342

llvm-spirv/test/complex-constexpr-vector.ll

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
; RUN: llvm-as %s -o %t.bc
2-
; RUN: llvm-spirv %t.bc -o %t.spv
1+
; RUN: llvm-spirv %s -o %t.spv
32
; RUN: llvm-spirv %t.spv -to-text -o %t.spt
43
; RUN: FileCheck < %t.spt %s --check-prefix=CHECK-SPIRV
54
; RUN: llvm-spirv -r %t.spv -o %t.rev.bc

llvm-spirv/test/complex-constexpr.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
; RUN: llvm-as %s -o %t.bc
2-
; RUN: llvm-spirv %t.bc -o %t.spv
1+
; RUN: llvm-spirv %s -o %t.spv
2+
; RUN: spirv-val %t.spv
33
; RUN: llvm-spirv %t.spv -o %t.spt --to-text
44
; RUN: llvm-spirv -r %t.spv -o %t.rev.bc
55
; RUN: llvm-dis %t.rev.bc

llvm-spirv/test/constexpr_phi.ll

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
; RUN: llvm-as %s -o %t.bc
2-
; RUN: llvm-spirv %t.bc --spirv-ext=+SPV_INTEL_function_pointers -o %t.spv
1+
; RUN: llvm-spirv %s --spirv-ext=+SPV_INTEL_function_pointers -o %t.spv
32
; RUN: llvm-spirv %t.spv -to-text -o %t.spt
43
; RUN: FileCheck < %t.spt %s --check-prefix=CHECK-SPIRV
54
; RUN: llvm-spirv -r %t.spv -o %t.r.bc

0 commit comments

Comments
 (0)