File tree Expand file tree Collapse file tree 1 file changed +10
-0
lines changed Expand file tree Collapse file tree 1 file changed +10
-0
lines changed Original file line number Diff line number Diff line change 7
7
// ===----------------------------------------------------------------------===//
8
8
// REQUIRES: gpu
9
9
// UNSUPPORTED: cuda || hip
10
+ <<<<<<< HEAD
10
11
// TODO: esimd_emulator fails due to unimplemented 'half' type
11
12
// XFAIL: esimd_emulator
13
+ =======
14
+ >>>>>>> 2206708db ([ESIMD] Add " smoke" test for esimd::saturate (#791 ))
12
15
// RUN: %clangxx -fsycl %s -o %t.out
13
16
// RUN: %GPU_RUN_PLACEHOLDER %t.out
14
17
//
18
21
19
22
#include < CL/sycl.hpp>
20
23
#include < iostream>
24
+ <<<<<<< HEAD
21
25
#include < sycl/ext/intel/esimd.hpp>
22
26
23
27
using namespace cl ::sycl;
24
28
using namespace sycl ::ext::intel::esimd;
29
+ =======
30
+ #include < sycl/ext/intel/experimental/esimd.hpp>
31
+
32
+ using namespace cl ::sycl;
33
+ using namespace sycl ::ext::intel::experimental::esimd;
34
+ >>>>>>> 2206708db ([ESIMD] Add " smoke" test for esimd::saturate (#791 ))
25
35
26
36
template <class T> struct char_to_int {
27
37
using type = typename std::conditional<
You can’t perform that action at this time.
0 commit comments