Skip to content

Commit 472d425

Browse files
vmaksimojsji
authored andcommitted
Enable spirv-val in tests after SPIRV-Tools were updated in CI (#2749)
Original commit: KhronosGroup/SPIRV-LLVM-Translator@d3e72db7e0d74f4
1 parent d93b877 commit 472d425

File tree

11 files changed

+11
-20
lines changed

11 files changed

+11
-20
lines changed

llvm-spirv/test/extensions/EXT/SPV_EXT_relaxed_printf_string_address_space/builtin_printf.ll

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
; RUN: llvm-spirv -spirv-text %t.bc -o %t.spt --spirv-ext=+SPV_EXT_relaxed_printf_string_address_space
1919
; RUN: FileCheck < %t.spt %s --check-prefix=CHECK-SPIRV
2020
; RUN: llvm-spirv %t.bc -o %t.spv --spirv-ext=+SPV_EXT_relaxed_printf_string_address_space
21-
; Change TODO to RUN when spirv-val allows non-constant printf formats
22-
; TODO: spirv-val %t.spv
21+
; RUN: spirv-val %t.spv
2322

2423

2524
; CHECK-WO-EXT: RequiresExtension: Feature requires the following SPIR-V extension:

llvm-spirv/test/extensions/INTEL/SPV_INTEL_fpga_cluster_attributes/function_attributes.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
; RUN: llvm-as %s -o %t.bc
22
; RUN: llvm-spirv --spirv-ext=+SPV_INTEL_fpga_cluster_attributes -spirv-text -o - %t.bc | FileCheck --check-prefix CHECK-SPIRV %s
33
; RUN: llvm-spirv --spirv-ext=+SPV_INTEL_fpga_cluster_attributes %t.bc -o %t.spv
4-
; spirv-val %t.spv
4+
; RUN: spirv-val %t.spv
55
; RUN: llvm-spirv -r --spirv-ext=+SPV_INTEL_fpga_cluster_attributes %t.spv -o %t.rev.bc
66
; RUN: llvm-dis %t.rev.bc -o - | FileCheck --check-prefix CHECK-LLVM %s
77

llvm-spirv/test/extensions/KHR/SPV_KHR_shader_clock/shader_clock.cl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// RUN: %clang_cc1 -triple spir-unknown-unknown -O1 -cl-std=CL2.0 -fdeclare-opencl-builtins -finclude-default-header -emit-llvm-bc %s -o %t.bc
33
// RUN: llvm-spirv %t.bc --spirv-ext=+SPV_KHR_shader_clock -o %t.spv
44
// RUN: spirv-dis %t.spv -o - | FileCheck %s --check-prefix=CHECK-SPIRV
5-
// TODO: spirv-val %t.spv
5+
// RUN: spirv-val %t.spv
66
// RUN: llvm-spirv -r %t.spv -o %t.rev.bc
77
// RUN: llvm-dis < %t.rev.bc | FileCheck %s --check-prefix=CHECK-LLVM
88
// RUN: llvm-spirv -r --spirv-target-env=SPV-IR %t.spv -o %t.rev.bc

llvm-spirv/test/extensions/KHR/SPV_KHR_untyped_pointers/infinite-phi.ll

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
; RUN: llvm-as %s -o %t.bc
22
; RUN: llvm-spirv %t.bc --spirv-ext=+SPV_KHR_untyped_pointers -o %t.spv
3-
; TODO: enable back once spirv-tools are updated.
4-
; R/UN: spirv-val %t.spv
3+
; RUN: spirv-val %t.spv
54
; RUN: llvm-spirv %t.bc --spirv-ext=+SPV_KHR_untyped_pointers -spirv-text -o %t.spt
65
; RUN: FileCheck < %t.spt %s --check-prefix=CHECK-SPIRV
76

llvm-spirv/test/extensions/KHR/SPV_KHR_untyped_pointers/store.ll

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44

55
; RUN: llvm-as %s -o %t.bc
66
; RUN: llvm-spirv %t.bc --spirv-ext=+SPV_KHR_untyped_pointers -o %t.spv
7-
; TODO: enable back once spirv-tools are updated.
8-
; R/UN: spirv-val %t.spv
7+
; RUN: spirv-val %t.spv
98

109
; RUN: llvm-spirv %t.bc --spirv-ext=+SPV_KHR_untyped_pointers -spirv-text -o %t.spt
1110
; RUN: FileCheck < %t.spt %s --check-prefix=CHECK-SPIRV

llvm-spirv/test/extensions/KHR/SPV_KHR_untyped_pointers/untyped_ptr_access_chain.ll

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77

88
; RUN: llvm-as %s -o %t.bc
99
; RUN: llvm-spirv %t.bc --spirv-ext=+SPV_KHR_untyped_pointers -o %t.spv
10-
; TODO: enable back once spirv-tools are updated.
11-
; R/UN: spirv-val %t.spv
10+
; RUN: spirv-val %t.spv
1211

1312
; RUN: llvm-spirv %t.bc --spirv-ext=+SPV_KHR_untyped_pointers -spirv-text -o %t.spt
1413
; RUN: FileCheck < %t.spt %s --check-prefix=CHECK-SPIRV

llvm-spirv/test/extensions/KHR/SPV_KHR_untyped_pointers/untyped_ptr_type.ll

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
; RUN: llvm-as %s -o %t.bc
22
; RUN: llvm-spirv %t.bc -o %t.spv --spirv-ext=+SPV_KHR_untyped_pointers
33

4-
; TODO: enable back once spirv-tools are updated
5-
; R/UN: spirv-val %t.spv
4+
; RUN: spirv-val %t.spv
65

76
; RUN: llvm-spirv %t.spv -o %t.spt --to-text
87
; RUN: FileCheck < %t.spt %s --check-prefix=CHECK-SPIRV

llvm-spirv/test/llvm-intrinsics/lifetime.ll

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88

99
; Verify that we have valid SPV and the same output LLVM IR when using untyped pointers.
1010
; RUN: llvm-spirv %t.bc --spirv-ext=+SPV_KHR_untyped_pointers -o %t.spv
11-
; TODO: enable back once spirv-tools are updated.
12-
; R/UN: spirv-val %t.spv
11+
; RUN: spirv-val %t.spv
1312
; RUN: llvm-spirv -r %t.spv -o %t.spv.bc
1413
; RUN: llvm-dis < %t.spv.bc | FileCheck %s --check-prefix=CHECK-LLVM
1514

llvm-spirv/test/transcoding/BuiltinPrintf.cl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
// RUN: %clang_cc1 -triple spir-unknown-unknown -emit-llvm-bc %s -o %t.bc
44
// RUN: llvm-spirv %t.bc -spirv-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV
55
// RUN: llvm-spirv %t.bc -o %t.spv
6-
// Change TODO to RUN when spirv-val allows array of 8-bit ints for format
7-
// TODO: spirv-val %t.spv
6+
// RUN: spirv-val %t.spv
87
// RUN: llvm-spirv -r %t.spv -o %t.rev.bc
98
// RUN: llvm-dis < %t.rev.bc | FileCheck %s --check-prefix=CHECK-LLVM
109

llvm-spirv/test/transcoding/Printf.cl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
// RUN: %clang_cc1 -triple spir-unknown-unknown -emit-llvm-bc %s -o %t.bc -finclude-default-header
44
// RUN: llvm-spirv %t.bc -spirv-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV
55
// RUN: llvm-spirv %t.bc -o %t.spv
6-
// Change TODO to RUN when spirv-val allows array of 8-bit ints for format
7-
// TODO: spirv-val %t.spv
6+
// RUN: spirv-val %t.spv
87
// RUN: llvm-spirv -r %t.spv -o %t.rev.bc
98
// RUN: llvm-dis < %t.rev.bc | FileCheck %s --check-prefix=CHECK-LLVM
109

llvm-spirv/test/transcoding/multiple_user_semantic.ll

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
; RUN: llvm-dis < %t.rev.bc | FileCheck %s --check-prefix=CHECK-LLVM
1010

1111
; RUN: llvm-spirv %t.bc --spirv-ext=+SPV_KHR_untyped_pointers -o %t.spv
12-
; TODO: enable back once spirv-tools are updated.
13-
; R/UN: spirv-val %t.spv
12+
; RUN: spirv-val %t.spv
1413
; RUN: llvm-spirv -r %t.spv -o %t.rev.bc
1514
; RUN: llvm-dis < %t.rev.bc | FileCheck %s --check-prefix=CHECK-LLVM
1615

0 commit comments

Comments
 (0)