From d38d0cc23481b726ef425ccb0637fe2f7c8cf264 Mon Sep 17 00:00:00 2001 From: Mateusz Chudyk Date: Wed, 16 Oct 2024 10:52:47 +0000 Subject: [PATCH] Add missing requirements spirv-val to tests There is a feature that checks if spirv-val exists, but no test that uses spirv-val requires that it exists. --- test/CXX/global-ctor.cl | 1 + test/ComparePointers.cl | 1 + test/FPFastMathModeNotNaNFast.spvasm | 2 +- test/GEPOperator.spvasm | 2 +- test/GroupAndSubgroupInstructions.spvasm | 2 +- test/OpConstantNull.spvasm | 2 +- test/OpConvertPtrToU_narrowing.spvasm | 2 +- test/OpConvertPtrToU_widening.spvasm | 2 +- test/OpConvertUToPtr_narrowing.spvasm | 2 +- test/OpConvertUToPtr_widening.spvasm | 2 +- test/OpCopyLogical.spvasm | 2 +- test/OpDecorateString_UserSemantic.spvasm | 2 +- test/OpDecorateString_UserSemantic_Builtin.spvasm | 2 +- test/OpFMod_f32.spvasm | 2 +- test/OpFMod_v2f16.spvasm | 2 +- test/OpGroupIAdd.spt | 1 + test/OpIAdd.spvasm | 2 +- test/OpIMul.spvasm | 2 +- test/OpISub.spvasm | 2 +- test/OpLogicalAnd.spvasm | 2 +- test/OpLogicalEqual.spvasm | 2 +- test/OpLogicalNot.spvasm | 2 +- test/OpLogicalNotEqual.spvasm | 2 +- test/OpLogicalOr.spvasm | 2 +- test/OpLoopMergeNone.spt | 1 + test/OpMemberDecorateString_UserSemantic.spvasm | 2 +- test/OpNoLine.spvasm | 2 +- test/OpNop.spvasm | 2 +- test/OpNot.spvasm | 2 +- test/OpSMod_i32.spvasm | 2 +- test/OpSMod_v2i16.spvasm | 2 +- test/OpSNegate.spvasm | 2 +- test/OpShiftLeftLogical.spvasm | 2 +- test/OpVectorShuffle.spvasm | 2 +- test/OpenCL.std/acos.spvasm | 2 +- test/OpenCL.std/printf.spvasm | 2 +- test/OpenCL.std/upsample.spvasm | 2 +- test/OpenCL.std/vload_half.spvasm | 2 +- test/OpenCL.std/vload_halfn.spvasm | 2 +- test/OpenCL.std/vloada_halfn.spvasm | 2 +- test/OpenCL.std/vloadn.spvasm | 2 +- test/OpenCL.std/vstore_half.spvasm | 2 +- test/OpenCL.std/vstore_halfn.spvasm | 2 +- test/OpenCL.std/vstorea_halfn.spvasm | 2 +- test/OpenCL.std/vstoren.spvasm | 2 +- test/SpecConstants/OpSpecConstantComposite.spvasm | 2 +- test/SpecConstants/specconstantop-arraylength.spvasm | 2 +- test/SpecConstants/specconstantop-copymemsized.spvasm | 2 +- test/SpecConstants/specconstantop-init.spvasm | 2 +- test/atomic_explicit_arguments.spt | 1 + test/barrier_explicit_arguments.spt | 1 + test/builtin_returns_struct.spvasm | 2 +- test/composite_construct_array_non_constant.spvasm | 2 +- test/composite_construct_struct.spt | 1 + test/composite_construct_struct_non_constant.spt | 1 + test/composite_construct_vector.spt | 1 + test/composite_construct_vector_non_constant.spvasm | 2 +- test/copy_object.spt | 1 + test/event_no_group_cap.cl | 1 + test/extensions/EXT/SPV_EXT_image_raw10_raw12/reader.spvasm | 2 +- .../INTEL/SPV_INTEL_media_block_io/SPV_INTEL_media_block_io.cl | 1 + test/extensions/KHR/SPV_KHR_cooperative_matrix/length.spvasm | 2 +- test/extensions/KHR/SPV_KHR_shader_clock/shader_clock.cl | 2 +- test/extensions/KHR/SPV_KHR_untyped_pointers/untyped_var.spvasm | 2 +- test/float_atomic_spv_to_ocl12.spt | 1 + test/ignore-builtin-linkage-name.spt | 1 + test/image-unoptimized.cl | 1 + test/image_without_access_qualifier.spt | 1 + test/linkage-name.spt | 1 + test/matrix_times_matrix.spt | 1 + test/matrix_times_scalar.spt | 1 + test/matrix_times_vector.spt | 1 + test/matrix_transpose.spt | 1 + test/mem_fence_explicit_arguments.spt | 1 + test/negative/InvalidAtomicBuiltins.cl | 1 + test/opundef.spt | 1 + test/phi-multiple-predecessors.spvasm | 2 +- test/read_image.cl | 1 + test/redundant_word.spt | 2 +- test/right_shift.spt | 1 + test/sampler-variable.spt | 1 + test/selection_merge.spt | 1 + test/spirv-extensions-control.spt | 1 + test/spirv-ocl-builtins-version.spt | 1 + test/spirv-version-controls.spt | 1 + test/transcoding/AtomicCompareExchangeExplicit_cl20.cl | 1 + test/transcoding/BuiltinPrintf.cl | 1 + test/transcoding/ConvertPtr.cl | 1 + test/transcoding/DivRem.cl | 1 + test/transcoding/GenericCastToPtr.cl | 1 + test/transcoding/OpImageSampleExplicitLod_arg.cl | 1 + test/transcoding/OpenCL/atomic_cmpxchg.cl | 1 + test/transcoding/OpenCL/atomic_legacy.cl | 1 + test/transcoding/OpenCL/atomic_work_item_fence.cl | 1 + test/transcoding/OpenCL/barrier.cl | 1 + test/transcoding/OpenCL/mem_fence.cl | 1 + test/transcoding/OpenCL/sub_group_barrier.cl | 1 + test/transcoding/OpenCL/sub_group_mask.cl | 1 + test/transcoding/OpenCL/work_group_barrier.cl | 1 + test/transcoding/Printf.cl | 1 + test/transcoding/RelationalOperators.cl | 1 + test/transcoding/SampledImage.cl | 1 + test/transcoding/TransFNeg.cl | 1 + test/transcoding/atomic_flag.cl | 1 + test/transcoding/atomics.spt | 2 +- test/transcoding/atomics_int64.spt | 1 + test/transcoding/bit_ops.cl | 1 + test/transcoding/block_w_struct_return.cl | 1 + test/transcoding/clk_event_t.cl | 1 + test/transcoding/enqueue_kernel.cl | 1 + test/transcoding/enqueue_marker.cl | 1 + test/transcoding/explicit-conversions.cl | 1 + test/transcoding/global_block.cl | 1 + test/transcoding/group_ops.cl | 1 + test/transcoding/ldexp.cl | 1 + test/transcoding/pipe_builtins.cl | 1 + test/transcoding/subgroup_spirv_1_5.cl | 1 + test/transcoding/vec_type_hint.cl | 1 + test/vector_times_matrix.spt | 1 + test/vector_times_scalar.spt | 1 + 120 files changed, 120 insertions(+), 55 deletions(-) diff --git a/test/CXX/global-ctor.cl b/test/CXX/global-ctor.cl index 7beffe65e5..df7ec5121c 100644 --- a/test/CXX/global-ctor.cl +++ b/test/CXX/global-ctor.cl @@ -1,3 +1,4 @@ +// REQUIRES: spirv-val // RUN: %clang_cc1 -cl-std=clc++ -emit-llvm-bc -triple spir -O0 %s -o %t.bc // RUN: llvm-spirv %t.bc -o %t.spv // RUN: spirv-val %t.spv diff --git a/test/ComparePointers.cl b/test/ComparePointers.cl index 85856e73de..cc07cb4f11 100644 --- a/test/ComparePointers.cl +++ b/test/ComparePointers.cl @@ -8,6 +8,7 @@ kernel void test(int global *in, int global *in2) { if (in < in2) return; } +// REQUIRES: spirv-val // RUN: %clang_cc1 -triple spir64 -x cl -cl-std=CL2.0 -O0 -emit-llvm-bc %s -o %t.bc // RUN: llvm-spirv %t.bc --spirv-max-version=1.3 -o %t.spv // RUN: spirv-val %t.spv diff --git a/test/FPFastMathModeNotNaNFast.spvasm b/test/FPFastMathModeNotNaNFast.spvasm index b0fe0267ab..60d8df4120 100644 --- a/test/FPFastMathModeNotNaNFast.spvasm +++ b/test/FPFastMathModeNotNaNFast.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r -o - %t.spv | llvm-dis | FileCheck %s diff --git a/test/GEPOperator.spvasm b/test/GEPOperator.spvasm index d537c46a1a..efb1e63242 100644 --- a/test/GEPOperator.spvasm +++ b/test/GEPOperator.spvasm @@ -1,7 +1,7 @@ ; It's possible that access to builtin variable is represented by ; GetElementPtrConstantExpr rather than GetElementPtrInst. This ; test case presents a pattern that results into a ConstantExpr. -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r -o - %t.spv | llvm-dis | FileCheck %s diff --git a/test/GroupAndSubgroupInstructions.spvasm b/test/GroupAndSubgroupInstructions.spvasm index 2ff5609a80..1dd790c2ec 100644 --- a/test/GroupAndSubgroupInstructions.spvasm +++ b/test/GroupAndSubgroupInstructions.spvasm @@ -61,7 +61,7 @@ ; llvm-spirv tmp.bc --spirv-ext=+all,-SPV_KHR_untyped_pointers -o tmp.spv ; spirv-dis tmp.spv -o llvm-spirv/test/GroupAndSubgroupInstructions.spvasm -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as %s --target-env spv1.3 -o %t.spv ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r %t.spv --spirv-target-env=CL1.2 -o %t.bc diff --git a/test/OpConstantNull.spvasm b/test/OpConstantNull.spvasm index 64e8a3b521..c814f1697b 100644 --- a/test/OpConstantNull.spvasm +++ b/test/OpConstantNull.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r -o - %t.spv | llvm-dis | FileCheck %s diff --git a/test/OpConvertPtrToU_narrowing.spvasm b/test/OpConvertPtrToU_narrowing.spvasm index 2a8839e94f..9eef928d35 100644 --- a/test/OpConvertPtrToU_narrowing.spvasm +++ b/test/OpConvertPtrToU_narrowing.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r -o - %t.spv | llvm-dis | FileCheck %s diff --git a/test/OpConvertPtrToU_widening.spvasm b/test/OpConvertPtrToU_widening.spvasm index 1a5c324082..33aae6ff39 100644 --- a/test/OpConvertPtrToU_widening.spvasm +++ b/test/OpConvertPtrToU_widening.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r -o - %t.spv | llvm-dis | FileCheck %s diff --git a/test/OpConvertUToPtr_narrowing.spvasm b/test/OpConvertUToPtr_narrowing.spvasm index 4f71fd2b9f..40a825fcdd 100644 --- a/test/OpConvertUToPtr_narrowing.spvasm +++ b/test/OpConvertUToPtr_narrowing.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r -o - %t.spv | llvm-dis | FileCheck %s diff --git a/test/OpConvertUToPtr_widening.spvasm b/test/OpConvertUToPtr_widening.spvasm index 4f6ff3bedc..40da7df4bd 100644 --- a/test/OpConvertUToPtr_widening.spvasm +++ b/test/OpConvertUToPtr_widening.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r -o - %t.spv | llvm-dis | FileCheck %s diff --git a/test/OpCopyLogical.spvasm b/test/OpCopyLogical.spvasm index a8874c5961..5025629b96 100644 --- a/test/OpCopyLogical.spvasm +++ b/test/OpCopyLogical.spvasm @@ -1,6 +1,6 @@ ; Check support of OpCopyLogical instruction that was added in SPIR-V 1.4 -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.4 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r %t.spv -o %t.rev.bc diff --git a/test/OpDecorateString_UserSemantic.spvasm b/test/OpDecorateString_UserSemantic.spvasm index 98b5edba76..2cfce4f38d 100644 --- a/test/OpDecorateString_UserSemantic.spvasm +++ b/test/OpDecorateString_UserSemantic.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.4 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r -o - %t.spv | llvm-dis | FileCheck %s diff --git a/test/OpDecorateString_UserSemantic_Builtin.spvasm b/test/OpDecorateString_UserSemantic_Builtin.spvasm index ac8dfdbf01..7711adea53 100644 --- a/test/OpDecorateString_UserSemantic_Builtin.spvasm +++ b/test/OpDecorateString_UserSemantic_Builtin.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.4 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r --spirv-target-env=CL2.0 %t.spv -o - | llvm-dis | FileCheck --check-prefix=CHECK-OCL %s diff --git a/test/OpFMod_f32.spvasm b/test/OpFMod_f32.spvasm index 2dd4409ef4..1ef2317fda 100644 --- a/test/OpFMod_f32.spvasm +++ b/test/OpFMod_f32.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r -o - %t.spv | llvm-dis | FileCheck %s diff --git a/test/OpFMod_v2f16.spvasm b/test/OpFMod_v2f16.spvasm index ce8de0a2c9..5adaa44e6b 100644 --- a/test/OpFMod_v2f16.spvasm +++ b/test/OpFMod_v2f16.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r -o - %t.spv | llvm-dis | FileCheck %s diff --git a/test/OpGroupIAdd.spt b/test/OpGroupIAdd.spt index cb1deb1260..b854c2c49d 100644 --- a/test/OpGroupIAdd.spt +++ b/test/OpGroupIAdd.spt @@ -30,6 +30,7 @@ ; to _Z21work_group_reduce_addj, instead. Remove this test and update ; test/transcoding/group_ops.cl when fixing this. ; XFAIL: * +; REQUIRES: spirv-val ; RUN: llvm-spirv %s -to-binary -o %t.spv ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r %t.spv -o %t.bc diff --git a/test/OpIAdd.spvasm b/test/OpIAdd.spvasm index f70ee50872..10d172707b 100644 --- a/test/OpIAdd.spvasm +++ b/test/OpIAdd.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r -o - %t.spv | llvm-dis | FileCheck %s diff --git a/test/OpIMul.spvasm b/test/OpIMul.spvasm index 80bac40af5..0603969480 100644 --- a/test/OpIMul.spvasm +++ b/test/OpIMul.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r -o - %t.spv | llvm-dis | FileCheck %s diff --git a/test/OpISub.spvasm b/test/OpISub.spvasm index f139bf0b70..625dc19130 100644 --- a/test/OpISub.spvasm +++ b/test/OpISub.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r -o - %t.spv | llvm-dis | FileCheck %s diff --git a/test/OpLogicalAnd.spvasm b/test/OpLogicalAnd.spvasm index 6fcb616387..6450597e85 100644 --- a/test/OpLogicalAnd.spvasm +++ b/test/OpLogicalAnd.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r -o - %t.spv | llvm-dis | FileCheck %s diff --git a/test/OpLogicalEqual.spvasm b/test/OpLogicalEqual.spvasm index 67d13493bc..fedd8379c5 100644 --- a/test/OpLogicalEqual.spvasm +++ b/test/OpLogicalEqual.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r -o - %t.spv | llvm-dis | FileCheck %s diff --git a/test/OpLogicalNot.spvasm b/test/OpLogicalNot.spvasm index a9f94d8a2b..8ac4cf5f52 100644 --- a/test/OpLogicalNot.spvasm +++ b/test/OpLogicalNot.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r -o - %t.spv | llvm-dis | FileCheck %s diff --git a/test/OpLogicalNotEqual.spvasm b/test/OpLogicalNotEqual.spvasm index 7c80cb9e43..9ac5019870 100644 --- a/test/OpLogicalNotEqual.spvasm +++ b/test/OpLogicalNotEqual.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r -o - %t.spv | llvm-dis | FileCheck %s diff --git a/test/OpLogicalOr.spvasm b/test/OpLogicalOr.spvasm index 6a5c737932..03d129bede 100644 --- a/test/OpLogicalOr.spvasm +++ b/test/OpLogicalOr.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r -o - %t.spv | llvm-dis | FileCheck %s diff --git a/test/OpLoopMergeNone.spt b/test/OpLoopMergeNone.spt index 734143f1ab..1d2d5d1ad6 100644 --- a/test/OpLoopMergeNone.spt +++ b/test/OpLoopMergeNone.spt @@ -79,6 +79,7 @@ 1 FunctionEnd +; REQUIRES: spirv-val ; RUN: llvm-spirv %s -to-binary -o %t.spv ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r %t.spv -o %t.bc diff --git a/test/OpMemberDecorateString_UserSemantic.spvasm b/test/OpMemberDecorateString_UserSemantic.spvasm index 5753f030ec..f2c2b2193a 100644 --- a/test/OpMemberDecorateString_UserSemantic.spvasm +++ b/test/OpMemberDecorateString_UserSemantic.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.4 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r -o - %t.spv | llvm-dis | FileCheck %s diff --git a/test/OpNoLine.spvasm b/test/OpNoLine.spvasm index f5aac0c802..c6a02d8db8 100644 --- a/test/OpNoLine.spvasm +++ b/test/OpNoLine.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r -o - %t.spv | llvm-dis | FileCheck %s diff --git a/test/OpNop.spvasm b/test/OpNop.spvasm index 6bd06d300c..d024cf52f6 100644 --- a/test/OpNop.spvasm +++ b/test/OpNop.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r -o - %t.spv | llvm-dis | FileCheck %s diff --git a/test/OpNot.spvasm b/test/OpNot.spvasm index 212534a7a7..46f65edcb0 100644 --- a/test/OpNot.spvasm +++ b/test/OpNot.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r -o - %t.spv | llvm-dis | FileCheck %s diff --git a/test/OpSMod_i32.spvasm b/test/OpSMod_i32.spvasm index d074147b1c..f8b915bbde 100644 --- a/test/OpSMod_i32.spvasm +++ b/test/OpSMod_i32.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r -o - %t.spv | llvm-dis | FileCheck %s diff --git a/test/OpSMod_v2i16.spvasm b/test/OpSMod_v2i16.spvasm index 93b67b6432..73ba36b90c 100644 --- a/test/OpSMod_v2i16.spvasm +++ b/test/OpSMod_v2i16.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r -o - %t.spv | llvm-dis | FileCheck %s diff --git a/test/OpSNegate.spvasm b/test/OpSNegate.spvasm index 8882fb132d..bb943a6947 100644 --- a/test/OpSNegate.spvasm +++ b/test/OpSNegate.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r -o - %t.spv | llvm-dis | FileCheck %s diff --git a/test/OpShiftLeftLogical.spvasm b/test/OpShiftLeftLogical.spvasm index 5804ee2916..80e19719c2 100644 --- a/test/OpShiftLeftLogical.spvasm +++ b/test/OpShiftLeftLogical.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r -o - %t.spv | llvm-dis | FileCheck %s diff --git a/test/OpVectorShuffle.spvasm b/test/OpVectorShuffle.spvasm index b648595396..7f3f70789a 100644 --- a/test/OpVectorShuffle.spvasm +++ b/test/OpVectorShuffle.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r -o - %t.spv | llvm-dis | FileCheck %s diff --git a/test/OpenCL.std/acos.spvasm b/test/OpenCL.std/acos.spvasm index d288a76662..c2629d64c1 100644 --- a/test/OpenCL.std/acos.spvasm +++ b/test/OpenCL.std/acos.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv %t.spv -r --spirv-target-env=SPV-IR -o - | llvm-dis | FileCheck %s --check-prefixes=CHECK,CHECK-SPV-IR diff --git a/test/OpenCL.std/printf.spvasm b/test/OpenCL.std/printf.spvasm index 3611a0f0cf..e501830202 100644 --- a/test/OpenCL.std/printf.spvasm +++ b/test/OpenCL.std/printf.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv %t.spv -r --spirv-target-env=SPV-IR -o %t.rev.bc diff --git a/test/OpenCL.std/upsample.spvasm b/test/OpenCL.std/upsample.spvasm index 702092c3da..e46b990f06 100644 --- a/test/OpenCL.std/upsample.spvasm +++ b/test/OpenCL.std/upsample.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv %t.spv -r --spirv-target-env=SPV-IR -o - | llvm-dis | FileCheck %s --check-prefixes=CHECK,CHECK-SPV-IR diff --git a/test/OpenCL.std/vload_half.spvasm b/test/OpenCL.std/vload_half.spvasm index 677a8db1ec..6f8dc3a966 100644 --- a/test/OpenCL.std/vload_half.spvasm +++ b/test/OpenCL.std/vload_half.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv %t.spv -r --spirv-target-env=SPV-IR -o - | llvm-dis | FileCheck %s --check-prefixes=CHECK,CHECK-SPV-IR diff --git a/test/OpenCL.std/vload_halfn.spvasm b/test/OpenCL.std/vload_halfn.spvasm index 90bf3f568f..38eb1dccd3 100644 --- a/test/OpenCL.std/vload_halfn.spvasm +++ b/test/OpenCL.std/vload_halfn.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv %t.spv -r --spirv-target-env=SPV-IR -o - | llvm-dis | FileCheck %s --check-prefixes=CHECK,CHECK-SPV-IR diff --git a/test/OpenCL.std/vloada_halfn.spvasm b/test/OpenCL.std/vloada_halfn.spvasm index 3eeb845689..541c3e13ab 100644 --- a/test/OpenCL.std/vloada_halfn.spvasm +++ b/test/OpenCL.std/vloada_halfn.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv %t.spv -r --spirv-target-env=SPV-IR -o - | llvm-dis | FileCheck %s --check-prefixes=CHECK,CHECK-SPV-IR diff --git a/test/OpenCL.std/vloadn.spvasm b/test/OpenCL.std/vloadn.spvasm index 6668198941..b01ae37765 100644 --- a/test/OpenCL.std/vloadn.spvasm +++ b/test/OpenCL.std/vloadn.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv %t.spv -r --spirv-target-env=SPV-IR -o - | llvm-dis | FileCheck %s --check-prefixes=CHECK,CHECK-SPV-IR diff --git a/test/OpenCL.std/vstore_half.spvasm b/test/OpenCL.std/vstore_half.spvasm index a20a06b11c..1a4a435af8 100644 --- a/test/OpenCL.std/vstore_half.spvasm +++ b/test/OpenCL.std/vstore_half.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv %t.spv -r --spirv-target-env=SPV-IR -o %t.rev.bc diff --git a/test/OpenCL.std/vstore_halfn.spvasm b/test/OpenCL.std/vstore_halfn.spvasm index f08779ee21..bac8ab3699 100644 --- a/test/OpenCL.std/vstore_halfn.spvasm +++ b/test/OpenCL.std/vstore_halfn.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv %t.spv -r --spirv-target-env=SPV-IR -o %t.rev.bc diff --git a/test/OpenCL.std/vstorea_halfn.spvasm b/test/OpenCL.std/vstorea_halfn.spvasm index 602c425386..1ddae93784 100644 --- a/test/OpenCL.std/vstorea_halfn.spvasm +++ b/test/OpenCL.std/vstorea_halfn.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv %t.spv -r --spirv-target-env=SPV-IR -o %t.rev.bc diff --git a/test/OpenCL.std/vstoren.spvasm b/test/OpenCL.std/vstoren.spvasm index d715a2b2d0..5e0f6bab70 100644 --- a/test/OpenCL.std/vstoren.spvasm +++ b/test/OpenCL.std/vstoren.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv %t.spv -r --spirv-target-env=SPV-IR -o %t.rev.bc diff --git a/test/SpecConstants/OpSpecConstantComposite.spvasm b/test/SpecConstants/OpSpecConstantComposite.spvasm index 56e388dc1e..868bef7cc9 100644 --- a/test/SpecConstants/OpSpecConstantComposite.spvasm +++ b/test/SpecConstants/OpSpecConstantComposite.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv diff --git a/test/SpecConstants/specconstantop-arraylength.spvasm b/test/SpecConstants/specconstantop-arraylength.spvasm index 7c44493abf..3fc96865ce 100644 --- a/test/SpecConstants/specconstantop-arraylength.spvasm +++ b/test/SpecConstants/specconstantop-arraylength.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv diff --git a/test/SpecConstants/specconstantop-copymemsized.spvasm b/test/SpecConstants/specconstantop-copymemsized.spvasm index f40012d583..40c5d943dd 100644 --- a/test/SpecConstants/specconstantop-copymemsized.spvasm +++ b/test/SpecConstants/specconstantop-copymemsized.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv diff --git a/test/SpecConstants/specconstantop-init.spvasm b/test/SpecConstants/specconstantop-init.spvasm index 8d6e5b19a4..cd340508fa 100644 --- a/test/SpecConstants/specconstantop-init.spvasm +++ b/test/SpecConstants/specconstantop-init.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv diff --git a/test/atomic_explicit_arguments.spt b/test/atomic_explicit_arguments.spt index cd35268884..f00c27c9a0 100644 --- a/test/atomic_explicit_arguments.spt +++ b/test/atomic_explicit_arguments.spt @@ -29,6 +29,7 @@ 1 FunctionEnd +; REQUIRES: spirv-val ; RUN: llvm-spirv %s -to-binary -o %t.spv ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r --spirv-target-env=CL2.0 %t.spv -o %t.bc diff --git a/test/barrier_explicit_arguments.spt b/test/barrier_explicit_arguments.spt index 36737c289d..434b9146a6 100644 --- a/test/barrier_explicit_arguments.spt +++ b/test/barrier_explicit_arguments.spt @@ -24,6 +24,7 @@ 1 FunctionEnd +; REQUIRES: spirv-val ; RUN: llvm-spirv %s -to-binary -o %t.spv ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r --spirv-target-env=CL2.0 %t.spv -o %t.bc diff --git a/test/builtin_returns_struct.spvasm b/test/builtin_returns_struct.spvasm index 48e4973b73..1c02a8e7c5 100644 --- a/test/builtin_returns_struct.spvasm +++ b/test/builtin_returns_struct.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r -o - %t.spv | llvm-dis | FileCheck %s diff --git a/test/composite_construct_array_non_constant.spvasm b/test/composite_construct_array_non_constant.spvasm index 50b0009537..98a6f0dba7 100644 --- a/test/composite_construct_array_non_constant.spvasm +++ b/test/composite_construct_array_non_constant.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r %t.spv -o %t.rev.bc diff --git a/test/composite_construct_struct.spt b/test/composite_construct_struct.spt index 6a4433058a..103d4b69a0 100644 --- a/test/composite_construct_struct.spt +++ b/test/composite_construct_struct.spt @@ -47,6 +47,7 @@ 1 FunctionEnd +; REQUIRES: spirv-val ; RUN: llvm-spirv %s -to-binary -o %t.spv ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r %t.spv -o %t.bc diff --git a/test/composite_construct_struct_non_constant.spt b/test/composite_construct_struct_non_constant.spt index eb727f625c..2df0f45e55 100644 --- a/test/composite_construct_struct_non_constant.spt +++ b/test/composite_construct_struct_non_constant.spt @@ -1,3 +1,4 @@ +; REQUIRES: spirv-val ; RUN: llvm-spirv %s -to-binary -o %t.spv ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r %t.spv -o %t.rev.bc diff --git a/test/composite_construct_vector.spt b/test/composite_construct_vector.spt index 8e19152ed9..e52a99f7ed 100644 --- a/test/composite_construct_vector.spt +++ b/test/composite_construct_vector.spt @@ -41,6 +41,7 @@ 1 FunctionEnd +; REQUIRES: spirv-val ; RUN: llvm-spirv %s -to-binary -o %t.spv ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r %t.spv -o %t.bc diff --git a/test/composite_construct_vector_non_constant.spvasm b/test/composite_construct_vector_non_constant.spvasm index b76b4d9702..99d586ae89 100644 --- a/test/composite_construct_vector_non_constant.spvasm +++ b/test/composite_construct_vector_non_constant.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r %t.spv -o %t.rev.bc diff --git a/test/copy_object.spt b/test/copy_object.spt index 7527b860d5..4308de3fa0 100644 --- a/test/copy_object.spt +++ b/test/copy_object.spt @@ -38,6 +38,7 @@ 1 FunctionEnd +; REQUIRES: spirv-val ; RUN: llvm-spirv %s -to-binary -o %t.spv ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r %t.spv -o %t.bc diff --git a/test/event_no_group_cap.cl b/test/event_no_group_cap.cl index 563d40e2ea..4edacf796e 100644 --- a/test/event_no_group_cap.cl +++ b/test/event_no_group_cap.cl @@ -2,6 +2,7 @@ __kernel void test_fn( const __global char *src) { wait_group_events(0, NULL); } +// REQUIRES: spirv-val // RUN: %clang_cc1 -triple spir64 -x cl -cl-std=CL2.0 -fdeclare-opencl-builtins -finclude-default-header -O0 -emit-llvm-bc %s -o %t.bc // RUN: llvm-spirv %t.bc -spirv-text -o %t.spt // RUN: FileCheck < %t.spt %s diff --git a/test/extensions/EXT/SPV_EXT_image_raw10_raw12/reader.spvasm b/test/extensions/EXT/SPV_EXT_image_raw10_raw12/reader.spvasm index 8f3d576991..7f3aab081f 100644 --- a/test/extensions/EXT/SPV_EXT_image_raw10_raw12/reader.spvasm +++ b/test/extensions/EXT/SPV_EXT_image_raw10_raw12/reader.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r -o - %t.spv | llvm-dis | FileCheck %s diff --git a/test/extensions/INTEL/SPV_INTEL_media_block_io/SPV_INTEL_media_block_io.cl b/test/extensions/INTEL/SPV_INTEL_media_block_io/SPV_INTEL_media_block_io.cl index c54ccd6ece..2f4696764c 100644 --- a/test/extensions/INTEL/SPV_INTEL_media_block_io/SPV_INTEL_media_block_io.cl +++ b/test/extensions/INTEL/SPV_INTEL_media_block_io/SPV_INTEL_media_block_io.cl @@ -1,3 +1,4 @@ +// REQUIRES: spirv-val // 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 // RUN: llvm-spirv --spirv-ext=+SPV_INTEL_media_block_io %t.bc -o %t.spv // RUN: llvm-spirv %t.spv -to-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV diff --git a/test/extensions/KHR/SPV_KHR_cooperative_matrix/length.spvasm b/test/extensions/KHR/SPV_KHR_cooperative_matrix/length.spvasm index aa3992195e..577126f4c2 100644 --- a/test/extensions/KHR/SPV_KHR_cooperative_matrix/length.spvasm +++ b/test/extensions/KHR/SPV_KHR_cooperative_matrix/length.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r -o - %t.spv | llvm-dis | FileCheck %s diff --git a/test/extensions/KHR/SPV_KHR_shader_clock/shader_clock.cl b/test/extensions/KHR/SPV_KHR_shader_clock/shader_clock.cl index bcb2268fc3..f4c405b22e 100644 --- a/test/extensions/KHR/SPV_KHR_shader_clock/shader_clock.cl +++ b/test/extensions/KHR/SPV_KHR_shader_clock/shader_clock.cl @@ -1,4 +1,4 @@ -// REQUIRES: spirv-dis +// REQUIRES: spirv-dis, spirv-val // 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 // RUN: llvm-spirv %t.bc --spirv-ext=+SPV_KHR_shader_clock -o %t.spv // RUN: spirv-dis %t.spv -o - | FileCheck %s --check-prefix=CHECK-SPIRV diff --git a/test/extensions/KHR/SPV_KHR_untyped_pointers/untyped_var.spvasm b/test/extensions/KHR/SPV_KHR_untyped_pointers/untyped_var.spvasm index 604842312f..4feca35aa5 100644 --- a/test/extensions/KHR/SPV_KHR_untyped_pointers/untyped_var.spvasm +++ b/test/extensions/KHR/SPV_KHR_untyped_pointers/untyped_var.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.6 -o %t.spv %s ; RUN: spirv-val %t.spv diff --git a/test/float_atomic_spv_to_ocl12.spt b/test/float_atomic_spv_to_ocl12.spt index 29b9563753..ff278fb78b 100644 --- a/test/float_atomic_spv_to_ocl12.spt +++ b/test/float_atomic_spv_to_ocl12.spt @@ -72,6 +72,7 @@ 1 FunctionEnd +; REQUIRES: spirv-val ; RUN: llvm-spirv %s -to-binary -o %t.spv ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r %t.spv -o %t.bc --spirv-target-env="CL1.2" diff --git a/test/ignore-builtin-linkage-name.spt b/test/ignore-builtin-linkage-name.spt index 1e038baedc..176b5828d7 100644 --- a/test/ignore-builtin-linkage-name.spt +++ b/test/ignore-builtin-linkage-name.spt @@ -47,6 +47,7 @@ 1 FunctionEnd +; REQUIRES: spirv-val ; RUN: llvm-spirv %s -to-binary -o %t.spv ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r %t.spv -spirv-target-env=SPV-IR -o - | llvm-dis | FileCheck %s -check-prefix=CHECK-LLVM diff --git a/test/image-unoptimized.cl b/test/image-unoptimized.cl index ad7bcb0fe5..04a5e640a9 100644 --- a/test/image-unoptimized.cl +++ b/test/image-unoptimized.cl @@ -1,3 +1,4 @@ +// REQUIRES: spirv-val // RUN: %clang_cc1 %s -triple spir -O0 -emit-llvm-bc -o %t.bc // RUN: llvm-spirv %t.bc -o %t.spv // RUN: llvm-spirv %t.spv -to-text -o - | FileCheck %s diff --git a/test/image_without_access_qualifier.spt b/test/image_without_access_qualifier.spt index 0c6ebe9354..7873d460b5 100644 --- a/test/image_without_access_qualifier.spt +++ b/test/image_without_access_qualifier.spt @@ -64,6 +64,7 @@ 1 FunctionEnd +; REQUIRES: spirv-val ; RUN: llvm-spirv %s -to-binary -o %t.spv ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r %t.spv -o %t.bc diff --git a/test/linkage-name.spt b/test/linkage-name.spt index 241c600b54..3b2bfd2b4a 100644 --- a/test/linkage-name.spt +++ b/test/linkage-name.spt @@ -23,6 +23,7 @@ 1 FunctionEnd +; REQUIRES: spirv-val ; RUN: llvm-spirv %s -to-binary -o %t.spv ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r %t.spv -o %t.bc diff --git a/test/matrix_times_matrix.spt b/test/matrix_times_matrix.spt index f004339b84..4bef5b4748 100644 --- a/test/matrix_times_matrix.spt +++ b/test/matrix_times_matrix.spt @@ -1,3 +1,4 @@ +; REQUIRES: spirv-val ; RUN: llvm-spirv %s -to-binary -o %t.spv ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r %t.spv -o %t.bc diff --git a/test/matrix_times_scalar.spt b/test/matrix_times_scalar.spt index df944bb7ad..9ae63f529d 100644 --- a/test/matrix_times_scalar.spt +++ b/test/matrix_times_scalar.spt @@ -1,3 +1,4 @@ +; REQUIRES: spirv-val ; RUN: llvm-spirv %s -to-binary -o %t.spv ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r %t.spv -o %t.bc diff --git a/test/matrix_times_vector.spt b/test/matrix_times_vector.spt index 2be3d99e91..8307bc2467 100644 --- a/test/matrix_times_vector.spt +++ b/test/matrix_times_vector.spt @@ -33,6 +33,7 @@ 1 FunctionEnd +; REQUIRES: spirv-val ; RUN: llvm-spirv %s -to-binary -o %t.spv ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r %t.spv -o %t.bc diff --git a/test/matrix_transpose.spt b/test/matrix_transpose.spt index aea51daf98..3fe103255d 100644 --- a/test/matrix_transpose.spt +++ b/test/matrix_transpose.spt @@ -1,3 +1,4 @@ +; REQUIRES: spirv-val ; RUN: llvm-spirv %s -to-binary -o %t.spv ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r %t.spv -o %t.bc diff --git a/test/mem_fence_explicit_arguments.spt b/test/mem_fence_explicit_arguments.spt index afddb736e6..29c8e6c00c 100644 --- a/test/mem_fence_explicit_arguments.spt +++ b/test/mem_fence_explicit_arguments.spt @@ -26,6 +26,7 @@ 1 FunctionEnd +; REQUIRES: spirv-val ; RUN: llvm-spirv %s -to-binary -o %t.spv ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r %t.spv -o %t.bc diff --git a/test/negative/InvalidAtomicBuiltins.cl b/test/negative/InvalidAtomicBuiltins.cl index f8d159fe50..b4c67c595e 100644 --- a/test/negative/InvalidAtomicBuiltins.cl +++ b/test/negative/InvalidAtomicBuiltins.cl @@ -1,6 +1,7 @@ // Check that translator doesn't generate atomic instructions for atomic builtins // which are not defined in the spec. +// REQUIRES: spirv-val // RUN: %clang_cc1 -triple spir -O1 -cl-std=cl2.0 -fdeclare-opencl-builtins -finclude-default-header %s -emit-llvm-bc -o %t.bc // RUN: llvm-spirv %t.bc -spirv-text -o - | FileCheck %s // RUN: llvm-spirv %t.bc -o %t.spv diff --git a/test/opundef.spt b/test/opundef.spt index 7a27d9f028..f1c9317989 100644 --- a/test/opundef.spt +++ b/test/opundef.spt @@ -38,6 +38,7 @@ 1 FunctionEnd +; REQUIRES: spirv-val ; RUN: llvm-spirv %s -to-binary -o %t.spv ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r %t.spv -o %t.bc diff --git a/test/phi-multiple-predecessors.spvasm b/test/phi-multiple-predecessors.spvasm index 458625c404..60347a9b06 100644 --- a/test/phi-multiple-predecessors.spvasm +++ b/test/phi-multiple-predecessors.spvasm @@ -1,4 +1,4 @@ -; REQUIRES: spirv-as +; REQUIRES: spirv-as, spirv-val ; RUN: spirv-as --target-env spv1.0 -o %t.spv %s ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r -o - %t.spv | llvm-dis | FileCheck %s diff --git a/test/read_image.cl b/test/read_image.cl index 98eb4c1759..12a57dd182 100644 --- a/test/read_image.cl +++ b/test/read_image.cl @@ -1,3 +1,4 @@ +// REQUIRES: spirv-val // RUN: %clang_cc1 -triple spir64 -fdeclare-opencl-builtins -finclude-default-header -O0 -cl-std=CL2.0 -emit-llvm-bc %s -o %t.bc // RUN: llvm-spirv --spirv-max-version=1.3 %t.bc -o %t.spv // RUN: spirv-val %t.spv diff --git a/test/redundant_word.spt b/test/redundant_word.spt index e851292f02..35140f4080 100644 --- a/test/redundant_word.spt +++ b/test/redundant_word.spt @@ -27,7 +27,7 @@ 1 FunctionEnd - +; REQUIRES: spirv-val ; RUN: llvm-spirv %s -to-binary -o %t.spv ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r %t.spv -o %t.bc diff --git a/test/right_shift.spt b/test/right_shift.spt index a0bac4b69b..e227f95884 100644 --- a/test/right_shift.spt +++ b/test/right_shift.spt @@ -42,6 +42,7 @@ 1 FunctionEnd +; REQUIRES: spirv-val ; RUN: llvm-spirv %s -to-binary -o %t.spv ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r %t.spv -o %t.bc diff --git a/test/sampler-variable.spt b/test/sampler-variable.spt index 3910a794c1..4353f2f283 100644 --- a/test/sampler-variable.spt +++ b/test/sampler-variable.spt @@ -21,6 +21,7 @@ 1 FunctionEnd +; REQUIRES: spirv-val ; RUN: llvm-spirv %s -to-binary -o %t.spv ; RUN: spirv-val %t.spv ; Reverse translation shouldn't crash: diff --git a/test/selection_merge.spt b/test/selection_merge.spt index 636b813d3c..4ba093ce3b 100644 --- a/test/selection_merge.spt +++ b/test/selection_merge.spt @@ -65,6 +65,7 @@ 1 Return 1 FunctionEnd +; REQUIRES: spirv-val ; RUN: llvm-spirv %s -to-binary -o %t.spv ; RUN: spirv-val %t.spv ; RUN: llvm-spirv %t.spv -to-text -o %t.spt diff --git a/test/spirv-extensions-control.spt b/test/spirv-extensions-control.spt index caee5106d1..90af186ba4 100644 --- a/test/spirv-extensions-control.spt +++ b/test/spirv-extensions-control.spt @@ -39,6 +39,7 @@ 1 FunctionEnd +; REQUIRES: spirv-val ; RUN: llvm-spirv %s -to-binary -o %t.spv ; RUN: spirv-val %t.spv ; The purpose of this test is to check that SPIR-V file that uses extensions is diff --git a/test/spirv-ocl-builtins-version.spt b/test/spirv-ocl-builtins-version.spt index 40373dbe77..23f2ac9893 100644 --- a/test/spirv-ocl-builtins-version.spt +++ b/test/spirv-ocl-builtins-version.spt @@ -30,6 +30,7 @@ 1 FunctionEnd +; REQUIRES: spirv-val ; RUN: llvm-spirv %s -to-binary -o %t.spv ; RUN: spirv-val %t.spv diff --git a/test/spirv-version-controls.spt b/test/spirv-version-controls.spt index 7bfcefea1b..cfbfa7a97c 100644 --- a/test/spirv-version-controls.spt +++ b/test/spirv-version-controls.spt @@ -27,6 +27,7 @@ 1 FunctionEnd +; REQUIRES: spirv-val ; RUN: llvm-spirv %s -to-binary -o %t.spv ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r %t.spv --spirv-max-version=1.1 -o %t diff --git a/test/transcoding/AtomicCompareExchangeExplicit_cl20.cl b/test/transcoding/AtomicCompareExchangeExplicit_cl20.cl index 7eefe0dafd..a61f42a7fb 100644 --- a/test/transcoding/AtomicCompareExchangeExplicit_cl20.cl +++ b/test/transcoding/AtomicCompareExchangeExplicit_cl20.cl @@ -1,3 +1,4 @@ +// REQUIRES: spirv-val // 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 // RUN: llvm-spirv %t.bc -spirv-text -o %t.txt // RUN: FileCheck < %t.txt %s --check-prefix=CHECK-SPIRV diff --git a/test/transcoding/BuiltinPrintf.cl b/test/transcoding/BuiltinPrintf.cl index e5605b2ac9..1cd57c2fa2 100644 --- a/test/transcoding/BuiltinPrintf.cl +++ b/test/transcoding/BuiltinPrintf.cl @@ -1,5 +1,6 @@ // Ensure __builtin_printf is translated to a SPIRV printf instruction +// REQUIRES: spirv-val // RUN: %clang_cc1 -triple spir-unknown-unknown -emit-llvm-bc %s -o %t.bc // RUN: llvm-spirv %t.bc -spirv-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV // RUN: llvm-spirv %t.bc -o %t.spv diff --git a/test/transcoding/ConvertPtr.cl b/test/transcoding/ConvertPtr.cl index 7faaaa35a8..d3f5b1fb5f 100644 --- a/test/transcoding/ConvertPtr.cl +++ b/test/transcoding/ConvertPtr.cl @@ -1,3 +1,4 @@ +// REQUIRES: spirv-val // RUN: %clang_cc1 -triple spir-unknown-unknown -O1 -cl-std=CL2.0 -emit-llvm-bc %s -o %t.bc // RUN: llvm-spirv %t.bc -spirv-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV // RUN: llvm-spirv %t.bc -o %t.spv diff --git a/test/transcoding/DivRem.cl b/test/transcoding/DivRem.cl index e6eb97b06d..7adbddc4b5 100644 --- a/test/transcoding/DivRem.cl +++ b/test/transcoding/DivRem.cl @@ -1,3 +1,4 @@ +// REQUIRES: spirv-val // 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 // RUN: llvm-spirv %t.bc -spirv-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV // RUN: llvm-spirv %t.bc -o %t.spv diff --git a/test/transcoding/GenericCastToPtr.cl b/test/transcoding/GenericCastToPtr.cl index abbfdbcb16..299922e54d 100644 --- a/test/transcoding/GenericCastToPtr.cl +++ b/test/transcoding/GenericCastToPtr.cl @@ -1,3 +1,4 @@ +// REQUIRES: spirv-val // RUN: %clang_cc1 -triple spir-unknown-unknown -O1 -cl-std=CL2.0 -emit-llvm-bc -fdeclare-opencl-builtins -finclude-default-header %s -o %t.bc // RUN: llvm-spirv %t.bc -spirv-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV // RUN: llvm-spirv %t.bc -o %t.spv diff --git a/test/transcoding/OpImageSampleExplicitLod_arg.cl b/test/transcoding/OpImageSampleExplicitLod_arg.cl index 0acb2d4af0..b8d865b47e 100644 --- a/test/transcoding/OpImageSampleExplicitLod_arg.cl +++ b/test/transcoding/OpImageSampleExplicitLod_arg.cl @@ -1,3 +1,4 @@ +// REQUIRES: spirv-val // RUN: %clang_cc1 -O1 -triple spir-unknown-unknown -cl-std=CL2.0 %s -finclude-default-header -emit-llvm-bc -o %t.bc // RUN: llvm-spirv %t.bc -spirv-text -o %t.txt // RUN: FileCheck < %t.txt %s --check-prefix=CHECK-SPIRV diff --git a/test/transcoding/OpenCL/atomic_cmpxchg.cl b/test/transcoding/OpenCL/atomic_cmpxchg.cl index a683365c12..3519abdf5b 100644 --- a/test/transcoding/OpenCL/atomic_cmpxchg.cl +++ b/test/transcoding/OpenCL/atomic_cmpxchg.cl @@ -1,3 +1,4 @@ +// REQUIRES: spirv-val // RUN: %clang_cc1 %s -triple spir -cl-std=CL1.2 -emit-llvm-bc -fdeclare-opencl-builtins -o %t.bc // RUN: llvm-spirv %t.bc -o %t.spv // RUN: spirv-val %t.spv diff --git a/test/transcoding/OpenCL/atomic_legacy.cl b/test/transcoding/OpenCL/atomic_legacy.cl index a7a5464794..aec8d435b4 100644 --- a/test/transcoding/OpenCL/atomic_legacy.cl +++ b/test/transcoding/OpenCL/atomic_legacy.cl @@ -1,3 +1,4 @@ +// REQUIRES: spirv-val // RUN: %clang_cc1 %s -triple spir -cl-std=CL1.2 -emit-llvm-bc -fdeclare-opencl-builtins -o %t.bc // RUN: llvm-spirv %t.bc -o %t.spv // RUN: spirv-val %t.spv diff --git a/test/transcoding/OpenCL/atomic_work_item_fence.cl b/test/transcoding/OpenCL/atomic_work_item_fence.cl index 6cc9c14339..484ff7363a 100644 --- a/test/transcoding/OpenCL/atomic_work_item_fence.cl +++ b/test/transcoding/OpenCL/atomic_work_item_fence.cl @@ -1,5 +1,6 @@ // RUN: %clang_cc1 %s -triple spir -cl-std=CL2.0 -fdeclare-opencl-builtins -finclude-default-header -emit-llvm-bc -o %t.bc // +// REQUIRES: spirv-val // RUN: llvm-spirv %t.bc -o %t.spv // RUN: spirv-val %t.spv // RUN: llvm-spirv %t.spv -to-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV diff --git a/test/transcoding/OpenCL/barrier.cl b/test/transcoding/OpenCL/barrier.cl index c2ee95340c..a1ccf0574a 100644 --- a/test/transcoding/OpenCL/barrier.cl +++ b/test/transcoding/OpenCL/barrier.cl @@ -1,3 +1,4 @@ +// REQUIRES: spirv-val // RUN: %clang_cc1 %s -triple spir -cl-std=CL1.2 -fdeclare-opencl-builtins -finclude-default-header -emit-llvm-bc -o %t.bc // RUN: llvm-spirv %t.bc -o %t.spv // RUN: spirv-val %t.spv diff --git a/test/transcoding/OpenCL/mem_fence.cl b/test/transcoding/OpenCL/mem_fence.cl index 4c12695904..6d8a78c634 100644 --- a/test/transcoding/OpenCL/mem_fence.cl +++ b/test/transcoding/OpenCL/mem_fence.cl @@ -1,3 +1,4 @@ +// REQUIRES: spirv-val // RUN: %clang_cc1 %s -triple spir -cl-std=CL1.2 -fdeclare-opencl-builtins -finclude-default-header -emit-llvm-bc -o %t.bc // RUN: llvm-spirv %t.bc -o %t.spv // RUN: spirv-val %t.spv diff --git a/test/transcoding/OpenCL/sub_group_barrier.cl b/test/transcoding/OpenCL/sub_group_barrier.cl index 173991abd8..2637cbf5bb 100644 --- a/test/transcoding/OpenCL/sub_group_barrier.cl +++ b/test/transcoding/OpenCL/sub_group_barrier.cl @@ -1,5 +1,6 @@ // RUN: %clang_cc1 %s -triple spir -cl-std=CL2.0 -fdeclare-opencl-builtins -finclude-default-header -emit-llvm-bc -o %t.bc // +// REQUIRES: spirv-val // RUN: llvm-spirv %t.bc -o %t.spv // RUN: spirv-val %t.spv // RUN: llvm-spirv %t.spv -to-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV diff --git a/test/transcoding/OpenCL/sub_group_mask.cl b/test/transcoding/OpenCL/sub_group_mask.cl index b618e0d1be..1fa8d3445c 100644 --- a/test/transcoding/OpenCL/sub_group_mask.cl +++ b/test/transcoding/OpenCL/sub_group_mask.cl @@ -1,5 +1,6 @@ // RUN: %clang_cc1 %s -triple spir -cl-std=CL2.0 -fdeclare-opencl-builtins -finclude-default-header -emit-llvm-bc -o %t.bc +// REQUIRES: spirv-val // RUN: llvm-spirv %t.bc -o %t.spv // RUN: spirv-val %t.spv // RUN: llvm-spirv %t.spv -to-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV diff --git a/test/transcoding/OpenCL/work_group_barrier.cl b/test/transcoding/OpenCL/work_group_barrier.cl index ec6c087f03..0f571ddf95 100644 --- a/test/transcoding/OpenCL/work_group_barrier.cl +++ b/test/transcoding/OpenCL/work_group_barrier.cl @@ -1,3 +1,4 @@ +// REQUIRES: spirv-val // RUN: %clang_cc1 %s -triple spir -cl-std=CL2.0 -fdeclare-opencl-builtins -finclude-default-header -emit-llvm-bc -o %t.bc // RUN: llvm-spirv %t.bc -o %t.spv // RUN: spirv-val %t.spv diff --git a/test/transcoding/Printf.cl b/test/transcoding/Printf.cl index 72e8721bd3..d24b543b52 100644 --- a/test/transcoding/Printf.cl +++ b/test/transcoding/Printf.cl @@ -1,5 +1,6 @@ // Ensure printf is translated to a SPIRV printf instruction +// REQUIRES: spirv-val // RUN: %clang_cc1 -triple spir-unknown-unknown -emit-llvm-bc %s -o %t.bc -finclude-default-header // RUN: llvm-spirv %t.bc -spirv-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV // RUN: llvm-spirv %t.bc -o %t.spv diff --git a/test/transcoding/RelationalOperators.cl b/test/transcoding/RelationalOperators.cl index 72bd1c652e..a55028af11 100644 --- a/test/transcoding/RelationalOperators.cl +++ b/test/transcoding/RelationalOperators.cl @@ -1,3 +1,4 @@ +// REQUIRES: spirv-val // 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 // RUN: llvm-spirv %t.bc -spirv-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV // RUN: llvm-spirv %t.bc -o %t.spv diff --git a/test/transcoding/SampledImage.cl b/test/transcoding/SampledImage.cl index c37de46333..03cdf67829 100644 --- a/test/transcoding/SampledImage.cl +++ b/test/transcoding/SampledImage.cl @@ -1,3 +1,4 @@ +// REQUIRES: spirv-val // RUN: %clang_cc1 -triple spir -cl-std=CL2.0 %s -fdeclare-opencl-builtins -finclude-default-header -emit-llvm-bc -o %t.bc // RUN: llvm-spirv %t.bc -spirv-text -o %t.txt // RUN: FileCheck < %t.txt %s --check-prefix=CHECK-SPIRV diff --git a/test/transcoding/TransFNeg.cl b/test/transcoding/TransFNeg.cl index c05dd3c872..65bb40c5b4 100644 --- a/test/transcoding/TransFNeg.cl +++ b/test/transcoding/TransFNeg.cl @@ -1,3 +1,4 @@ +// REQUIRES: spirv-val // RUN: %clang_cc1 -triple spir-unknown-unknown -O0 -cl-std=CL2.0 -fdeclare-opencl-builtins -finclude-default-header -emit-llvm-bc %s -o %t.bc // RUN: llvm-spirv %t.bc -spirv-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV // RUN: llvm-spirv %t.bc -o %t.spv diff --git a/test/transcoding/atomic_flag.cl b/test/transcoding/atomic_flag.cl index dd21af731d..a269046385 100644 --- a/test/transcoding/atomic_flag.cl +++ b/test/transcoding/atomic_flag.cl @@ -1,3 +1,4 @@ +// REQUIRES: spirv-val // 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 // RUN: llvm-spirv %t.bc -spirv-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV // RUN: llvm-spirv %t.bc -o %t.spv diff --git a/test/transcoding/atomics.spt b/test/transcoding/atomics.spt index cc8add1fc6..fa5309d710 100644 --- a/test/transcoding/atomics.spt +++ b/test/transcoding/atomics.spt @@ -50,7 +50,7 @@ 1 FunctionEnd - +; REQUIRES: spirv-val ; RUN: llvm-spirv %s -to-binary -o %t1.spv ; RUN: spirv-val %t1.spv ; RUN: llvm-spirv -r %t1.spv -o %t1.bc --spirv-target-env="CL1.2" diff --git a/test/transcoding/atomics_int64.spt b/test/transcoding/atomics_int64.spt index b6e57bd415..9fd89f341e 100644 --- a/test/transcoding/atomics_int64.spt +++ b/test/transcoding/atomics_int64.spt @@ -50,6 +50,7 @@ 1 FunctionEnd +; REQUIRES: spirv-val ; RUN: llvm-spirv --to-binary %s -o %t.spv ; RUN: spirv-val %t.spv ; RUN: llvm-spirv --spirv-target-env=CL1.2 -r %t.spv -o - | llvm-dis -o %t.ll diff --git a/test/transcoding/bit_ops.cl b/test/transcoding/bit_ops.cl index 713b8d4753..3c78d3c0d9 100644 --- a/test/transcoding/bit_ops.cl +++ b/test/transcoding/bit_ops.cl @@ -1,3 +1,4 @@ +// REQUIRES: spirv-val // 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 // RUN: llvm-spirv %t.bc -spirv-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV // RUN: llvm-spirv %t.bc -o %t.spv diff --git a/test/transcoding/block_w_struct_return.cl b/test/transcoding/block_w_struct_return.cl index ce85a04136..76d0fec1fd 100644 --- a/test/transcoding/block_w_struct_return.cl +++ b/test/transcoding/block_w_struct_return.cl @@ -1,5 +1,6 @@ // RUN: %clang_cc1 -triple spir -cl-std=cl2.0 -disable-llvm-passes -fdeclare-opencl-builtins -finclude-default-header %s -emit-llvm-bc -o %t.bc +// REQUIRES: spirv-val // RUN: llvm-spirv --spirv-max-version=1.1 %t.bc -spirv-text -o - | FileCheck %s --check-prefixes=CHECK-SPIRV1_1,CHECK-SPIRV // RUN: llvm-spirv --spirv-max-version=1.1 %t.bc -o %t.spirv1.1.spv // RUN: spirv-val --target-env spv1.1 %t.spirv1.1.spv diff --git a/test/transcoding/clk_event_t.cl b/test/transcoding/clk_event_t.cl index 953b3a2e30..234f44a105 100644 --- a/test/transcoding/clk_event_t.cl +++ b/test/transcoding/clk_event_t.cl @@ -1,3 +1,4 @@ +// REQUIRES: spirv-val // 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 // RUN: llvm-spirv %t.bc -spirv-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV // RUN: llvm-spirv %t.bc -o %t.spv diff --git a/test/transcoding/enqueue_kernel.cl b/test/transcoding/enqueue_kernel.cl index a83211b955..ae1be06ed9 100644 --- a/test/transcoding/enqueue_kernel.cl +++ b/test/transcoding/enqueue_kernel.cl @@ -1,3 +1,4 @@ +// REQUIRES: spirv-val // RUN: %clang_cc1 -triple spir-unknown-unknown -O0 -cl-std=CL2.0 -emit-llvm-bc %s -o %t.bc // RUN: llvm-spirv %t.bc -spirv-text -o %t.spv.txt // RUN: FileCheck < %t.spv.txt %s --check-prefix=CHECK-SPIRV diff --git a/test/transcoding/enqueue_marker.cl b/test/transcoding/enqueue_marker.cl index 0c05205e9f..ccd975781e 100644 --- a/test/transcoding/enqueue_marker.cl +++ b/test/transcoding/enqueue_marker.cl @@ -1,3 +1,4 @@ +// REQUIRES: spirv-val // RUN: %clang_cc1 -triple spir-unknown-unknown -fdeclare-opencl-builtins -finclude-default-header -O0 -cl-std=CL2.0 -emit-llvm-bc %s -o %t.bc // RUN: llvm-spirv %t.bc -spirv-text -o %t.spv.txt // RUN: FileCheck < %t.spv.txt %s --check-prefix=CHECK-SPIRV diff --git a/test/transcoding/explicit-conversions.cl b/test/transcoding/explicit-conversions.cl index 7fbfa2a2ea..e04ffe724a 100644 --- a/test/transcoding/explicit-conversions.cl +++ b/test/transcoding/explicit-conversions.cl @@ -1,3 +1,4 @@ +// REQUIRES: spirv-val // 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 // RUN: llvm-spirv %t.bc -spirv-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV // RUN: llvm-spirv %t.bc -o %t.spv diff --git a/test/transcoding/global_block.cl b/test/transcoding/global_block.cl index 16944a7275..055ecf134a 100644 --- a/test/transcoding/global_block.cl +++ b/test/transcoding/global_block.cl @@ -5,6 +5,7 @@ // RUN: %clang_cc1 -O0 -triple spir-unknown-unknown -cl-std=CL2.0 -x cl %s -emit-llvm-bc -o %t.bc +// REQUIRES: spirv-val // RUN: llvm-spirv --spirv-max-version=1.1 %t.bc -spirv-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV // RUN: llvm-spirv --spirv-max-version=1.1 %t.bc -o %t.spirv1.1.spv // RUN: spirv-val --target-env spv1.1 %t.spirv1.1.spv diff --git a/test/transcoding/group_ops.cl b/test/transcoding/group_ops.cl index 0849640b9a..4d51ee76f8 100644 --- a/test/transcoding/group_ops.cl +++ b/test/transcoding/group_ops.cl @@ -1,3 +1,4 @@ +// REQUIRES: spirv-val // 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 // RUN: llvm-spirv %t.bc -spirv-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV // RUN: llvm-spirv %t.bc -o %t.spv diff --git a/test/transcoding/ldexp.cl b/test/transcoding/ldexp.cl index a95668465b..e9be8691ac 100644 --- a/test/transcoding/ldexp.cl +++ b/test/transcoding/ldexp.cl @@ -1,4 +1,5 @@ // Check that translator converts scalar arg to vector for ldexp math instructions +// REQUIRES: spirv-val // 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 // RUN: llvm-spirv %t.bc -o %t.spv // RUN: spirv-val %t.spv diff --git a/test/transcoding/pipe_builtins.cl b/test/transcoding/pipe_builtins.cl index cc7c76e158..3fa7926759 100644 --- a/test/transcoding/pipe_builtins.cl +++ b/test/transcoding/pipe_builtins.cl @@ -1,5 +1,6 @@ // Pipe built-ins are mangled accordingly to SPIR2.0/C++ ABI. +// REQUIRES: spirv-val // RUN: %clang_cc1 -x cl -cl-std=CL2.0 -triple spir64-unknown-unknown -emit-llvm-bc -fdeclare-opencl-builtins -finclude-default-header -Dcl_khr_subgroups %s -o %t.bc // RUN: llvm-spirv %t.bc -spirv-text -o %t.spt // RUN: FileCheck < %t.spt %s --check-prefix=CHECK-SPIRV diff --git a/test/transcoding/subgroup_spirv_1_5.cl b/test/transcoding/subgroup_spirv_1_5.cl index be7dbf59a4..a60daa3256 100644 --- a/test/transcoding/subgroup_spirv_1_5.cl +++ b/test/transcoding/subgroup_spirv_1_5.cl @@ -1,3 +1,4 @@ +// REQUIRES: spirv-val // 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 // RUN: not llvm-spirv --spirv-max-version=1.4 %t.bc 2>&1 | FileCheck --check-prefix=CHECK-ERROR %s // RUN: llvm-spirv %t.bc -o %t.spv diff --git a/test/transcoding/vec_type_hint.cl b/test/transcoding/vec_type_hint.cl index faf17ab786..c0ef38b9b2 100644 --- a/test/transcoding/vec_type_hint.cl +++ b/test/transcoding/vec_type_hint.cl @@ -1,3 +1,4 @@ +// REQUIRES: spirv-val // RUN: %clang_cc1 -triple spir64-unknown-unknown -x cl -cl-std=CL2.0 -O0 -fdeclare-opencl-builtins -finclude-default-header -emit-llvm-bc %s -o %t.bc // RUN: llvm-spirv %t.bc -spirv-text -o %t.spt // RUN: FileCheck < %t.spt %s --check-prefix=CHECK-SPIRV diff --git a/test/vector_times_matrix.spt b/test/vector_times_matrix.spt index ca7d2e3bf3..37d30d7e20 100644 --- a/test/vector_times_matrix.spt +++ b/test/vector_times_matrix.spt @@ -33,6 +33,7 @@ 1 FunctionEnd +; REQUIRES: spirv-val ; RUN: llvm-spirv %s -to-binary -o %t.spv ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r %t.spv -o %t.bc diff --git a/test/vector_times_scalar.spt b/test/vector_times_scalar.spt index 7b4d89e191..bb2079c1f1 100644 --- a/test/vector_times_scalar.spt +++ b/test/vector_times_scalar.spt @@ -49,6 +49,7 @@ 1 FunctionEnd +; REQUIRES: spirv-val ; RUN: llvm-spirv %s -to-binary -o %t.spv ; RUN: spirv-val %t.spv ; RUN: llvm-spirv -r %t.spv -o %t.bc