From 35bbafb5263d3fa5f688d7dcf28ba8ef0f869efb Mon Sep 17 00:00:00 2001 From: Alexey Bader Date: Fri, 19 Apr 2019 12:37:15 +0300 Subject: [PATCH] Revert "[SYCL] Enable swizzle_op and kernel_functor tests on non host devices." This reverts commit 828075679d7ed70ac27326011ea897c71f6e71ec. Signed-off-by: Alexey Bader --- sycl/test/basic_tests/swizzle_op.cpp | 8 ++++---- sycl/test/functor/kernel_functor.cpp | 24 +++++++++++++++--------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/sycl/test/basic_tests/swizzle_op.cpp b/sycl/test/basic_tests/swizzle_op.cpp index c133c29c9aa8f..1e92462272208 100644 --- a/sycl/test/basic_tests/swizzle_op.cpp +++ b/sycl/test/basic_tests/swizzle_op.cpp @@ -1,8 +1,8 @@ -// RUN: %clang -std=c++11 -fsycl %s -o %t.out -lstdc++ -lOpenCL +// RUN: %clang -std=c++11 -fsycl %s -o %t.out -lstdc++ -lOpenCL -lsycl // RUN: env SYCL_DEVICE_TYPE=HOST %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// RUN: %ACC_RUN_PLACEHOLDER %t.out +// RUNx: %CPU_RUN_PLACEHOLDER %t.out +// RUNx: %GPU_RUN_PLACEHOLDER %t.out +// RUNx: %ACC_RUN_PLACEHOLDER %t.out //==------------ swizzle_op.cpp - SYCL SwizzleOp basic test ----------------==// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/sycl/test/functor/kernel_functor.cpp b/sycl/test/functor/kernel_functor.cpp index 44d66b0baa418..13680964326b9 100644 --- a/sycl/test/functor/kernel_functor.cpp +++ b/sycl/test/functor/kernel_functor.cpp @@ -1,8 +1,9 @@ -// RUN: %clang -fsycl -o %t.out %s -lstdc++ -lOpenCL +// RUN: %clang -fsycl -o %t.out %s -lstdc++ -lOpenCL -lsycl // RUN: cd %T -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: env SYCL_DEVICE_TYPE=HOST %t.out | FileCheck %s +// RUNx: %CPU_RUN_PLACEHOLDER %t.out +// RUNx: %GPU_RUN_PLACEHOLDER %t.out +// CHECK:Passed. //==--- kernel_functor.cpp - Functors as SYCL kernel test ------------------==// // @@ -13,8 +14,7 @@ //===----------------------------------------------------------------------===// #include - -#include +#include constexpr auto sycl_read_write = cl::sycl::access::mode::read_write; constexpr auto sycl_global_buffer = cl::sycl::access::target::global_buffer; @@ -172,8 +172,14 @@ int main() { const int Gold1 = 40; const int Gold2 = 80; - assert(Res1 == Gold1); - assert(Res2 == Gold2); - + if (Res1 != Gold1) { + std::cout << "FAILED. " << Res1 << "!=" << Gold1 << "\n"; + return 1; + } + if (Res2 != Gold2) { + std::cout << "FAILED. " << Res2 << "!=" << Gold2 << "\n"; + return 1; + } + std::cout << "Passed.\n"; return 0; }