Skip to content

Commit 5242c38

Browse files
authored
[NFC] Remove several TODOs from the tests (#2479)
* Run validation where it was intended * Do the expected source language check
1 parent a384e03 commit 5242c38

File tree

3 files changed

+5
-13
lines changed

3 files changed

+5
-13
lines changed

test/DebugInfo/SourceLanguageSPIRVToLLVM.spvasm

+3-8
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,13 @@
33
; - CPP_for_OpenCL is mapped to DW_LANG_C_plus_plus_17
44
; - OpenCL_C, GLSL, ESSL, HLSL, and Unknown are mapped to DW_LANG_OpenCL
55

6-
; LLVM does not yet define DW_LANG_C_plus_plus_17. When it is defined, the
7-
; test case for C++ for OpenCL should be updated to check that CPP_for_OpenCL
8-
; is mapped to DW_LANG_C_plus_plus_17, not DW_LANG_C_plus_plus_14.
9-
106
; REQUIRES: spirv-as
117

128
; RUN: sed -e 's/SOURCE_LANGUAGE/OpenCL_CPP/' %s | spirv-as --target-env spv1.3 - -o %t.spv
139
; RUN: llvm-spirv -r %t.spv -o - | llvm-dis | FileCheck %s --check-prefix=CHECK-CPP14
1410

15-
; COM: TODO: Enable this test when the version of SPIRV-Tools used by buildbot is updated to
16-
; COM: recognise CPP_for_OpenCL as a valid source language.
17-
; COM: sed -e 's/SOURCE_LANGUAGE/CPP_for_OpenCL/' %s | spirv-as --target-env spv1.3 - -o %t.spv
18-
; COM: llvm-spirv -r %t.spv -o - | llvm-dis | FileCheck %s --check-prefix=CHECK-CPP14
11+
; RUN: sed -e 's/SOURCE_LANGUAGE/CPP_for_OpenCL/' %s | spirv-as --target-env spv1.3 - -o %t.spv
12+
; RUN: llvm-spirv -r %t.spv -o - | llvm-dis | FileCheck %s --check-prefix=CHECK-CPP17
1913

2014
; RUN: sed -e 's/SOURCE_LANGUAGE/OpenCL_C/' %s | spirv-as --target-env spv1.3 - -o %t.spv
2115
; RUN: llvm-spirv -r %t.spv -o - | llvm-dis | FileCheck %s --check-prefix=CHECK-OPENCL
@@ -64,3 +58,4 @@
6458

6559
; CHECK-OPENCL: !DICompileUnit(language: DW_LANG_OpenCL,
6660
; CHECK-CPP14: !DICompileUnit(language: DW_LANG_C_plus_plus_14,
61+
; CHECK-CPP17: !DICompileUnit(language: DW_LANG_C_plus_plus_17,

test/extensions/KHR/SPV_KHR_cooperative_matrix/arithmetic_instructions.ll

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
; RUN: llvm-spirv %t.bc --spirv-ext=+SPV_KHR_cooperative_matrix -o %t.spv
33
; RUN: llvm-spirv %t.spv -to-text -o %t.spt
44
; RUN: FileCheck < %t.spt %s --check-prefix=CHECK-SPIRV
5-
6-
; TODO: Validation is disabled till the moment the tools in CI are updated (passes locally)
7-
; R/UN: spirv-val %t.spv
5+
; RUN: spirv-val %t.spv
86

97
; RUN: llvm-spirv -r --spirv-target-env=SPV-IR %t.spv -o %t.rev.bc
108
; RUN: llvm-dis %t.rev.bc

test/extensions/KHR/SPV_KHR_cooperative_matrix/conversion_instructions.ll

+1-2
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_cooperative_matrix -o %t.spv
3-
; TODO: Validation is disabled till the moment the tools in CI are updated (passes locally)
4-
; R/UN: spirv-val %t.spv
3+
; RUN: spirv-val %t.spv
54
; RUN: llvm-spirv %t.spv -to-text -o %t.spt
65
; RUN: FileCheck < %t.spt %s --check-prefix=CHECK-SPIRV
76

0 commit comments

Comments
 (0)