Skip to content

Commit fc9bcc5

Browse files
baderromanovvlad
authored andcommitted
Revert "[SYCL] Enable swizzle_op and kernel_functor tests on non host devices."
This reverts commit 8280756. Signed-off-by: Alexey Bader <[email protected]>
1 parent f207062 commit fc9bcc5

File tree

2 files changed

+19
-13
lines changed

2 files changed

+19
-13
lines changed

sycl/test/basic_tests/swizzle_op.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
// RUN: %clang -std=c++11 -fsycl %s -o %t.out -lstdc++ -lOpenCL
1+
// RUN: %clang -std=c++11 -fsycl %s -o %t.out -lstdc++ -lOpenCL -lsycl
22
// RUN: env SYCL_DEVICE_TYPE=HOST %t.out
3-
// RUN: %CPU_RUN_PLACEHOLDER %t.out
4-
// RUN: %GPU_RUN_PLACEHOLDER %t.out
5-
// RUN: %ACC_RUN_PLACEHOLDER %t.out
3+
// RUNx: %CPU_RUN_PLACEHOLDER %t.out
4+
// RUNx: %GPU_RUN_PLACEHOLDER %t.out
5+
// RUNx: %ACC_RUN_PLACEHOLDER %t.out
66
//==------------ swizzle_op.cpp - SYCL SwizzleOp basic test ----------------==//
77
//
88
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

sycl/test/functor/kernel_functor.cpp

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
// RUN: %clang -fsycl -o %t.out %s -lstdc++ -lOpenCL
1+
// RUN: %clang -fsycl -o %t.out %s -lstdc++ -lOpenCL -lsycl
22
// RUN: cd %T
3-
// RUN: env SYCL_DEVICE_TYPE=HOST %t.out
4-
// RUN: %CPU_RUN_PLACEHOLDER %t.out
5-
// RUN: %GPU_RUN_PLACEHOLDER %t.out
3+
// RUN: env SYCL_DEVICE_TYPE=HOST %t.out | FileCheck %s
4+
// RUNx: %CPU_RUN_PLACEHOLDER %t.out
5+
// RUNx: %GPU_RUN_PLACEHOLDER %t.out
6+
// CHECK:Passed.
67

78
//==--- kernel_functor.cpp - Functors as SYCL kernel test ------------------==//
89
//
@@ -13,8 +14,7 @@
1314
//===----------------------------------------------------------------------===//
1415

1516
#include <CL/sycl.hpp>
16-
17-
#include <cassert>
17+
#include <iostream>
1818

1919
constexpr auto sycl_read_write = cl::sycl::access::mode::read_write;
2020
constexpr auto sycl_global_buffer = cl::sycl::access::target::global_buffer;
@@ -172,8 +172,14 @@ int main() {
172172
const int Gold1 = 40;
173173
const int Gold2 = 80;
174174

175-
assert(Res1 == Gold1);
176-
assert(Res2 == Gold2);
177-
175+
if (Res1 != Gold1) {
176+
std::cout << "FAILED. " << Res1 << "!=" << Gold1 << "\n";
177+
return 1;
178+
}
179+
if (Res2 != Gold2) {
180+
std::cout << "FAILED. " << Res2 << "!=" << Gold2 << "\n";
181+
return 1;
182+
}
183+
std::cout << "Passed.\n";
178184
return 0;
179185
}

0 commit comments

Comments
 (0)