Skip to content

Commit 47aeafa

Browse files
kbobrovskbobrovs
authored
[SYCL][ESIMD] Move headers to proper location. (#3720)
Header location must reflect the contained API's namespace. Not using CL as the top directory, as top-level cl namespace has been deprecated in SYCL2020, so top-level CL include directory will eventually be removed. Signed-off-by: kbobrovs <[email protected]>
1 parent 5612030 commit 47aeafa

37 files changed

+113
-74
lines changed

‎sycl/include/CL/sycl/INTEL/esimd.hpp

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,19 @@
1-
//==------------ esimd.hpp - DPC++ Explicit SIMD API -----------------------==//
1+
//==------------ esimd.hpp - DPC++ Explicit SIMD API redirection header ----==//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.
55
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
//
77
//===----------------------------------------------------------------------===//
8-
// The main header of the Explicit SIMD API.
8+
// This header is deprecated and should not be included by applications.
9+
// The header redirected to below should be used instead.
910
//===----------------------------------------------------------------------===//
1011

1112
#pragma once
1213

13-
#ifdef __SYCL_DEVICE_ONLY__
14-
#define SYCL_ESIMD_KERNEL __attribute__((sycl_explicit_simd))
15-
#define SYCL_ESIMD_FUNCTION __attribute__((sycl_explicit_simd))
16-
#else
17-
#define SYCL_ESIMD_KERNEL
18-
#define SYCL_ESIMD_FUNCTION
19-
#endif
14+
#include <CL/sycl/detail/defines_elementary.hpp>
2015

21-
/// \defgroup sycl_esimd DPC++ Explicit SIMD API
16+
__SYCL_WARNING("CL/sycl/INTEL/esimd.hpp usage is deprecated, include "
17+
"sycl/ext/intel/experimental/esimd.hpp instead")
2218

23-
#include <CL/sycl/INTEL/esimd/esimd.hpp>
24-
#include <CL/sycl/INTEL/esimd/esimd_math.hpp>
25-
#include <CL/sycl/INTEL/esimd/esimd_memory.hpp>
26-
#include <CL/sycl/INTEL/esimd/esimd_view.hpp>
19+
#include <sycl/ext/intel/experimental/esimd.hpp>

‎sycl/include/CL/sycl/detail/defines_elementary.hpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,3 +90,17 @@
9090
#define __SYCL_FALLTHROUGH
9191
#endif
9292
#endif // __SYCL_FALLTHROUGH
93+
94+
// define __SYCL_WARNING convenience macro to report compiler warnings
95+
#if defined(__GNUC__)
96+
#define __SYCL_GCC_PRAGMA(x) _Pragma(#x)
97+
#define __SYCL_WARNING(msg) __SYCL_GCC_PRAGMA(GCC warning msg)
98+
#elif defined(_MSC_VER) && !defined(__clang__)
99+
#define __SYCL_QUOTE1(x) #x
100+
#define __SYCL_QUOTE(x) __SYCL_QUOTE1(x)
101+
#define __SYCL_SRC_LOC __FILE__ ":" __SYCL_QUOTE(__LINE__)
102+
#define __SYCL_WARNING(msg) __pragma(message(__SYCL_SRC_LOC " warning: " msg))
103+
#else // clang et. al.
104+
// clang emits "warning:" in the message pragma output
105+
#define __SYCL_WARNING(msg) __pragma(message(msg))
106+
#endif // __GNUC__

‎sycl/include/sycl/ext/intel/experimental/esimd.hpp

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
//==------------ esimd.hpp - DPC++ Explicit SIMD API -----------------------==//
2+
//
3+
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
// The main header of the Explicit SIMD API.
9+
//===----------------------------------------------------------------------===//
10+
11+
#pragma once
12+
13+
#ifdef __SYCL_DEVICE_ONLY__
14+
#define SYCL_ESIMD_KERNEL __attribute__((sycl_explicit_simd))
15+
#define SYCL_ESIMD_FUNCTION __attribute__((sycl_explicit_simd))
16+
#else
17+
#define SYCL_ESIMD_KERNEL
18+
#define SYCL_ESIMD_FUNCTION
19+
#endif
20+
21+
/// \defgroup sycl_esimd DPC++ Explicit SIMD API
22+
23+
#include <sycl/ext/intel/experimental/esimd/esimd.hpp>
24+
#include <sycl/ext/intel/experimental/esimd/esimd_math.hpp>
25+
#include <sycl/ext/intel/experimental/esimd/esimd_memory.hpp>
26+
#include <sycl/ext/intel/experimental/esimd/esimd_view.hpp>

‎sycl/include/CL/sycl/INTEL/esimd/detail/esimd_host_util.hpp renamed to ‎sycl/include/sycl/ext/intel/experimental/esimd/detail/esimd_host_util.hpp

File renamed without changes.

‎sycl/include/CL/sycl/INTEL/esimd/detail/esimd_intrin.hpp renamed to ‎sycl/include/sycl/ext/intel/experimental/esimd/detail/esimd_intrin.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111

1212
#pragma once
1313

14-
#include <CL/sycl/INTEL/esimd/detail/esimd_types.hpp>
15-
#include <CL/sycl/INTEL/esimd/detail/esimd_util.hpp>
16-
#include <CL/sycl/INTEL/esimd/esimd_enum.hpp>
14+
#include <sycl/ext/intel/experimental/esimd/detail/esimd_types.hpp>
15+
#include <sycl/ext/intel/experimental/esimd/detail/esimd_util.hpp>
16+
#include <sycl/ext/intel/experimental/esimd/esimd_enum.hpp>
1717

1818
#include <assert.h>
1919
#include <cstdint>

‎sycl/include/CL/sycl/INTEL/esimd/detail/esimd_math_intrin.hpp renamed to ‎sycl/include/sycl/ext/intel/experimental/esimd/detail/esimd_math_intrin.hpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@
1111

1212
#pragma once
1313

14-
#include <CL/sycl/INTEL/esimd/detail/esimd_host_util.hpp>
15-
#include <CL/sycl/INTEL/esimd/detail/esimd_types.hpp>
16-
#include <CL/sycl/INTEL/esimd/esimd_enum.hpp>
14+
#include <sycl/ext/intel/experimental/esimd/detail/esimd_host_util.hpp>
15+
#include <sycl/ext/intel/experimental/esimd/detail/esimd_types.hpp>
16+
#include <sycl/ext/intel/experimental/esimd/esimd_enum.hpp>
17+
1718
#include <cstdint>
1819

1920
#define __SEIEED sycl::ext::intel::experimental::esimd::detail

‎sycl/include/CL/sycl/INTEL/esimd/detail/esimd_memory_intrin.hpp renamed to ‎sycl/include/sycl/ext/intel/experimental/esimd/detail/esimd_memory_intrin.hpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@
1111

1212
#pragma once
1313

14-
#include <CL/sycl/INTEL/esimd/detail/esimd_types.hpp>
15-
#include <CL/sycl/INTEL/esimd/detail/esimd_util.hpp>
16-
#include <CL/sycl/INTEL/esimd/esimd_enum.hpp>
1714
#include <CL/sycl/detail/accessor_impl.hpp>
1815
#include <CL/sycl/types.hpp>
16+
#include <sycl/ext/intel/experimental/esimd/detail/esimd_types.hpp>
17+
#include <sycl/ext/intel/experimental/esimd/detail/esimd_util.hpp>
18+
#include <sycl/ext/intel/experimental/esimd/esimd_enum.hpp>
19+
1920
#include <cstdint>
2021

2122
__SYCL_INLINE_NAMESPACE(cl) {

‎sycl/include/CL/sycl/INTEL/esimd/detail/esimd_region.hpp renamed to ‎sycl/include/sycl/ext/intel/experimental/esimd/detail/esimd_region.hpp

File renamed without changes.

‎sycl/include/CL/sycl/INTEL/esimd/detail/esimd_sycl_util.hpp renamed to ‎sycl/include/sycl/ext/intel/experimental/esimd/detail/esimd_sycl_util.hpp

File renamed without changes.

‎sycl/include/CL/sycl/INTEL/esimd/detail/esimd_types.hpp renamed to ‎sycl/include/sycl/ext/intel/experimental/esimd/detail/esimd_types.hpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@
1010

1111
#pragma once
1212

13-
#include <CL/sycl/INTEL/esimd/detail/esimd_region.hpp>
14-
#include <CL/sycl/INTEL/esimd/esimd_enum.hpp>
1513
#include <CL/sycl/detail/defines.hpp>
1614
#include <CL/sycl/detail/stl_type_traits.hpp> // to define C++14,17 extensions
1715
#include <CL/sycl/half_type.hpp>
16+
#include <sycl/ext/intel/experimental/esimd/detail/esimd_region.hpp>
17+
#include <sycl/ext/intel/experimental/esimd/esimd_enum.hpp>
18+
1819
#include <cstdint>
1920

2021
__SYCL_INLINE_NAMESPACE(cl) {

‎sycl/include/CL/sycl/INTEL/esimd/detail/esimd_util.hpp renamed to ‎sycl/include/sycl/ext/intel/experimental/esimd/detail/esimd_util.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
#pragma once
1212

13-
#include <CL/sycl/INTEL/esimd/detail/esimd_types.hpp>
1413
#include <CL/sycl/detail/type_traits.hpp>
14+
#include <sycl/ext/intel/experimental/esimd/detail/esimd_types.hpp>
1515

1616
__SYCL_INLINE_NAMESPACE(cl) {
1717
namespace sycl {

‎sycl/include/CL/sycl/INTEL/esimd/esimd.hpp renamed to ‎sycl/include/sycl/ext/intel/experimental/esimd/esimd.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010

1111
#pragma once
1212

13-
#include <CL/sycl/INTEL/esimd/detail/esimd_intrin.hpp>
14-
#include <CL/sycl/INTEL/esimd/detail/esimd_memory_intrin.hpp>
15-
#include <CL/sycl/INTEL/esimd/detail/esimd_sycl_util.hpp>
16-
#include <CL/sycl/INTEL/esimd/detail/esimd_types.hpp>
13+
#include <sycl/ext/intel/experimental/esimd/detail/esimd_intrin.hpp>
14+
#include <sycl/ext/intel/experimental/esimd/detail/esimd_memory_intrin.hpp>
15+
#include <sycl/ext/intel/experimental/esimd/detail/esimd_sycl_util.hpp>
16+
#include <sycl/ext/intel/experimental/esimd/detail/esimd_types.hpp>
1717

1818
__SYCL_INLINE_NAMESPACE(cl) {
1919
namespace sycl {

‎sycl/include/CL/sycl/INTEL/esimd/esimd_enum.hpp renamed to ‎sycl/include/sycl/ext/intel/experimental/esimd/esimd_enum.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#pragma once
1212

1313
#include <CL/sycl/detail/defines.hpp>
14+
1415
#include <cstdint> // for uint* types
1516

1617
__SYCL_INLINE_NAMESPACE(cl) {

‎sycl/include/CL/sycl/INTEL/esimd/esimd_math.hpp renamed to ‎sycl/include/sycl/ext/intel/experimental/esimd/esimd_math.hpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@
1010

1111
#pragma once
1212

13-
#include <CL/sycl/INTEL/esimd/detail/esimd_math_intrin.hpp>
14-
#include <CL/sycl/INTEL/esimd/detail/esimd_types.hpp>
15-
#include <CL/sycl/INTEL/esimd/detail/esimd_util.hpp>
16-
#include <CL/sycl/INTEL/esimd/esimd.hpp>
17-
#include <CL/sycl/INTEL/esimd/esimd_enum.hpp>
13+
#include <sycl/ext/intel/experimental/esimd/detail/esimd_math_intrin.hpp>
14+
#include <sycl/ext/intel/experimental/esimd/detail/esimd_types.hpp>
15+
#include <sycl/ext/intel/experimental/esimd/detail/esimd_util.hpp>
16+
#include <sycl/ext/intel/experimental/esimd/esimd.hpp>
17+
#include <sycl/ext/intel/experimental/esimd/esimd_enum.hpp>
18+
1819
#include <cstdint>
1920

2021
__SYCL_INLINE_NAMESPACE(cl) {

‎sycl/include/CL/sycl/INTEL/esimd/esimd_memory.hpp renamed to ‎sycl/include/sycl/ext/intel/experimental/esimd/esimd_memory.hpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@
1010

1111
#pragma once
1212

13-
#include <CL/sycl/INTEL/esimd/detail/esimd_memory_intrin.hpp>
14-
#include <CL/sycl/INTEL/esimd/detail/esimd_types.hpp>
15-
#include <CL/sycl/INTEL/esimd/detail/esimd_util.hpp>
16-
#include <CL/sycl/INTEL/esimd/esimd.hpp>
17-
#include <CL/sycl/INTEL/esimd/esimd_enum.hpp>
1813
#include <CL/sycl/half_type.hpp>
14+
#include <sycl/ext/intel/experimental/esimd/detail/esimd_memory_intrin.hpp>
15+
#include <sycl/ext/intel/experimental/esimd/detail/esimd_types.hpp>
16+
#include <sycl/ext/intel/experimental/esimd/detail/esimd_util.hpp>
17+
#include <sycl/ext/intel/experimental/esimd/esimd.hpp>
18+
#include <sycl/ext/intel/experimental/esimd/esimd_enum.hpp>
19+
1920
#include <cstdint>
2021

2122
__SYCL_INLINE_NAMESPACE(cl) {

‎sycl/include/CL/sycl/INTEL/esimd/esimd_view.hpp renamed to ‎sycl/include/sycl/ext/intel/experimental/esimd/esimd_view.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#pragma once
1212

13-
#include <CL/sycl/INTEL/esimd/detail/esimd_types.hpp>
13+
#include <sycl/ext/intel/experimental/esimd/detail/esimd_types.hpp>
1414

1515
__SYCL_INLINE_NAMESPACE(cl) {
1616
namespace sycl {

‎sycl/test/esimd/block_load_store.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %clangxx -fsycl -fsyntax-only -Xclang -verify %s
22

33
#include <CL/sycl.hpp>
4-
#include <CL/sycl/INTEL/esimd.hpp>
4+
#include <sycl/ext/intel/experimental/esimd.hpp>
55
#include <limits>
66
#include <utility>
77

@@ -13,21 +13,21 @@ SYCL_EXTERNAL void kernel1(
1313
&buf) SYCL_ESIMD_FUNCTION {
1414
simd<int, 32> v1(0, 1);
1515
// expected-warning@+2 {{deprecated}}
16-
// expected-note@CL/sycl/INTEL/esimd/esimd_memory.hpp:190 {{}}
16+
// expected-note@sycl/ext/intel/experimental/esimd/esimd_memory.hpp:191 {{}}
1717
auto v0 = block_load<int, 32>(buf, 0);
1818
v0 = v0 + v1;
1919
// expected-warning@+2 {{deprecated}}
20-
// expected-note@CL/sycl/INTEL/esimd/esimd_memory.hpp:222 {{}}
20+
// expected-note@sycl/ext/intel/experimental/esimd/esimd_memory.hpp:223 {{}}
2121
block_store<int, 32>(buf, 0, v0);
2222
}
2323

2424
SYCL_EXTERNAL void kernel2(int *ptr) SYCL_ESIMD_FUNCTION {
2525
simd<int, 32> v1(0, 1);
2626
// expected-warning@+2 {{deprecated}}
27-
// expected-note@CL/sycl/INTEL/esimd/esimd_memory.hpp:171 {{}}
27+
// expected-note@sycl/ext/intel/experimental/esimd/esimd_memory.hpp:172 {{}}
2828
auto v0 = block_load<int, 32>(ptr);
2929
v0 = v0 + v1;
3030
// expected-warning@+2 {{deprecated}}
31-
// expected-note@CL/sycl/INTEL/esimd/esimd_memory.hpp:203 {{}}
31+
// expected-note@sycl/ext/intel/experimental/esimd/esimd_memory.hpp:204 {{}}
3232
block_store<int, 32>(ptr, v0);
3333
}

‎sycl/test/esimd/esimd-util-compiler-eval.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// This test checks compile-time evaluation of functions from esimd_util.hpp
33

44
#include "CL/sycl.hpp"
5-
#include "CL/sycl/INTEL/esimd.hpp"
5+
#include "sycl/ext/intel/experimental/esimd.hpp"
66

77
using namespace sycl::ext::intel::experimental::esimd::detail;
88

‎sycl/test/esimd/esimd_math.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %clangxx -fsycl -fsycl-device-only -fsyntax-only -Xclang -verify %s
22
// expected-no-diagnostics
33

4-
#include <CL/sycl/INTEL/esimd.hpp>
4+
#include <sycl/ext/intel/experimental/esimd.hpp>
55
#include <limits>
66
#include <utility>
77

‎sycl/test/esimd/flat_atomic.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// expected-no-diagnostics
33

44
#include <CL/sycl.hpp>
5-
#include <CL/sycl/INTEL/esimd.hpp>
5+
#include <sycl/ext/intel/experimental/esimd.hpp>
66
#include <limits>
77
#include <utility>
88

‎sycl/test/esimd/gather4_scatter4.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// expected-no-diagnostics
33

44
#include <CL/sycl.hpp>
5-
#include <CL/sycl/INTEL/esimd.hpp>
5+
#include <sycl/ext/intel/experimental/esimd.hpp>
66
#include <limits>
77
#include <utility>
88

‎sycl/test/esimd/gather_scatter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// expected-no-diagnostics
33

44
#include <CL/sycl.hpp>
5-
#include <CL/sycl/INTEL/esimd.hpp>
5+
#include <sycl/ext/intel/experimental/esimd.hpp>
66
#include <limits>
77
#include <utility>
88

‎sycl/test/esimd/glob.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// (including translation of the register attribute)
88

99
#include <CL/sycl.hpp>
10-
#include <CL/sycl/INTEL/esimd.hpp>
10+
#include <sycl/ext/intel/experimental/esimd.hpp>
1111
#include <iostream>
1212

1313
using namespace sycl::ext::intel::experimental::esimd;

‎sycl/test/esimd/global_var.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %clangxx -fsycl -fsycl-device-only -fsyntax-only -Xclang -verify %s
22

33
#include <CL/sycl.hpp>
4-
#include <CL/sycl/INTEL/esimd.hpp>
4+
#include <sycl/ext/intel/experimental/esimd.hpp>
55

66
using namespace cl::sycl;
77

‎sycl/test/esimd/hw_compile.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// RUN: %clangxx -fsycl -fsycl-device-only -c %s -o %t.bc
33

44
#include <CL/sycl.hpp>
5-
#include <CL/sycl/INTEL/esimd.hpp>
5+
#include <sycl/ext/intel/experimental/esimd.hpp>
66
#include <iostream>
77

88
int main(void) {

‎sycl/test/esimd/intrins_trans.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// NOTE: must be run in -O0, as optimizer optimizes away some of the code
77

88
#include <CL/sycl.hpp>
9-
#include <CL/sycl/INTEL/esimd.hpp>
9+
#include <sycl/ext/intel/experimental/esimd.hpp>
1010
#include <CL/sycl/detail/image_ocl_types.hpp>
1111

1212
using namespace sycl::ext::intel::experimental::esimd;

‎sycl/test/esimd/odr.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// UNSUPPORTED: cuda
1313
//
1414
#include <CL/sycl.hpp>
15-
#include <CL/sycl/INTEL/esimd.hpp>
15+
#include <sycl/ext/intel/experimental/esimd.hpp>
1616
#include <iostream>
1717

1818
using namespace cl::sycl;

‎sycl/test/esimd/simd.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %clangxx -fsycl -fsycl-device-only -fsyntax-only -Xclang -verify %s
22
// expected-no-diagnostics
33

4-
#include <CL/sycl/INTEL/esimd.hpp>
4+
#include <sycl/ext/intel/experimental/esimd.hpp>
55
#include <limits>
66
#include <utility>
77

‎sycl/test/esimd/simd_copy_to_copy_from.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// in place of the accessor argument
77

88
#include <CL/sycl.hpp>
9-
#include <CL/sycl/INTEL/esimd.hpp>
9+
#include <sycl/ext/intel/experimental/esimd.hpp>
1010
#include <limits>
1111
#include <utility>
1212

@@ -42,13 +42,13 @@ kernel3(accessor<int, 1, access::mode::read_write, access::target::local> &buf)
4242
simd<int, 32> v1(0, 1);
4343
simd<int, 32> v0;
4444
// expected-error@+3 {{no matching member function for call to 'copy_from'}}
45-
// expected-note@CL/sycl/INTEL/esimd/esimd.hpp:499 {{}}
46-
// expected-note@CL/sycl/INTEL/esimd/esimd.hpp:511 {{}}
45+
// expected-note@sycl/ext/intel/experimental/esimd/esimd.hpp:499 {{}}
46+
// expected-note@sycl/ext/intel/experimental/esimd/esimd.hpp:511 {{}}
4747
v0.copy_from(buf, 0);
4848
v0 = v0 + v1;
4949
// expected-error@+3 {{no matching member function for call to 'copy_to'}}
50-
// expected-note@CL/sycl/INTEL/esimd/esimd.hpp:516 {{}}
51-
// expected-note@CL/sycl/INTEL/esimd/esimd.hpp:527 {{}}
50+
// expected-note@sycl/ext/intel/experimental/esimd/esimd.hpp:516 {{}}
51+
// expected-note@sycl/ext/intel/experimental/esimd/esimd.hpp:527 {{}}
5252
v0.copy_to(buf, 0);
5353
}
5454

@@ -58,8 +58,8 @@ SYCL_EXTERNAL void kernel4(
5858
SYCL_ESIMD_FUNCTION {
5959
simd<int, 32> v;
6060
// expected-error@+3 {{no matching member function for call to 'copy_from'}}
61-
// expected-note@CL/sycl/INTEL/esimd/esimd.hpp:499 {{}}
62-
// expected-note@CL/sycl/INTEL/esimd/esimd.hpp:511 {{}}
61+
// expected-note@sycl/ext/intel/experimental/esimd/esimd.hpp:499 {{}}
62+
// expected-note@sycl/ext/intel/experimental/esimd/esimd.hpp:511 {{}}
6363
v.copy_from(buf, 0);
6464
}
6565

@@ -69,7 +69,7 @@ SYCL_EXTERNAL void kernel5(
6969
SYCL_ESIMD_FUNCTION {
7070
simd<int, 32> v(0, 1);
7171
// expected-error@+3 {{no matching member function for call to 'copy_to'}}
72-
// expected-note@CL/sycl/INTEL/esimd/esimd.hpp:516 {{}}
73-
// expected-note@CL/sycl/INTEL/esimd/esimd.hpp:527 {{}}
72+
// expected-note@sycl/ext/intel/experimental/esimd/esimd.hpp:516 {{}}
73+
// expected-note@sycl/ext/intel/experimental/esimd/esimd.hpp:527 {{}}
7474
v.copy_to(buf, 0);
7575
}

0 commit comments

Comments
 (0)