Skip to content

Commit fd50369

Browse files
kbobrovskbobrovs
authored
[SYCL][ESIMD] Make source naming consistent. (#3830)
Signed-off-by: kbobrovs <[email protected]>
1 parent 29abcca commit fd50369

File tree

16 files changed

+56
-56
lines changed

16 files changed

+56
-56
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
/// \defgroup sycl_esimd DPC++ Explicit SIMD API
2222

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>
23+
#include <sycl/ext/intel/experimental/esimd/math.hpp>
24+
#include <sycl/ext/intel/experimental/esimd/memory.hpp>
25+
#include <sycl/ext/intel/experimental/esimd/simd.hpp>
26+
#include <sycl/ext/intel/experimental/esimd/simd_view.hpp>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//==---------------- esimd_enum.hpp - DPC++ Explicit SIMD API ------------==//
1+
//==---------------- common.hpp - DPC++ Explicit SIMD API ----------------==//
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.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//==-------------------------- esimd_host_util.hpp -------------------------==//
1+
//==-------------------------- host_util.hpp -------------------------------==//
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.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//==------------ esimd_intrin.hpp - DPC++ Explicit SIMD API --------------==//
1+
//==------------ intrin.hpp - DPC++ Explicit SIMD API --------------------==//
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.
@@ -11,9 +11,9 @@
1111

1212
#pragma once
1313

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>
14+
#include <sycl/ext/intel/experimental/esimd/common.hpp>
15+
#include <sycl/ext/intel/experimental/esimd/detail/types.hpp>
16+
#include <sycl/ext/intel/experimental/esimd/detail/util.hpp>
1717

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

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//==------------ esimd_math_intrin.hpp - DPC++ Explicit SIMD API -----------==//
1+
//==------------ math_intrin.hpp - DPC++ Explicit SIMD API -----------------==//
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.
@@ -11,9 +11,9 @@
1111

1212
#pragma once
1313

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>
14+
#include <sycl/ext/intel/experimental/esimd/common.hpp>
15+
#include <sycl/ext/intel/experimental/esimd/detail/host_util.hpp>
16+
#include <sycl/ext/intel/experimental/esimd/detail/types.hpp>
1717

1818
#include <cstdint>
1919

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//==------------ esimd_memory_intrin.hpp - DPC++ Explicit SIMD API ---------==//
1+
//==------------ memory_intrin.hpp - DPC++ Explicit SIMD API ---------------==//
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.
@@ -13,9 +13,9 @@
1313

1414
#include <CL/sycl/detail/accessor_impl.hpp>
1515
#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>
16+
#include <sycl/ext/intel/experimental/esimd/common.hpp>
17+
#include <sycl/ext/intel/experimental/esimd/detail/types.hpp>
18+
#include <sycl/ext/intel/experimental/esimd/detail/util.hpp>
1919

2020
#include <cstdint>
2121

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//==-------------- esimd_region.hpp - DPC++ Explicit SIMD API --------------==//
1+
//==-------------- region.hpp - DPC++ Explicit SIMD API --------------------==//
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.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//==------------- esimd_sycl_util.hpp - DPC++ Explicit SIMD API -----------==//
1+
//==------------- sycl_util.hpp - DPC++ Explicit SIMD API -----------------==//
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.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//==-------------- esimd_types.hpp - DPC++ Explicit SIMD API ---------------==//
1+
//==-------------- types.hpp - DPC++ Explicit SIMD API ---------------------==//
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.
@@ -13,8 +13,8 @@
1313
#include <CL/sycl/detail/defines.hpp>
1414
#include <CL/sycl/detail/stl_type_traits.hpp> // to define C++14,17 extensions
1515
#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>
16+
#include <sycl/ext/intel/experimental/esimd/common.hpp>
17+
#include <sycl/ext/intel/experimental/esimd/detail/region.hpp>
1818

1919
#include <cstdint>
2020

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//==----------------- esimd_util.hpp - DPC++ Explicit SIMD API ------------==//
1+
//==----------------- util.hpp - DPC++ Explicit SIMD API ------------------==//
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.
@@ -11,7 +11,7 @@
1111
#pragma once
1212

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

1616
#include <type_traits>
1717

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//==-------------- esimd_math.hpp - DPC++ Explicit SIMD API ------------==//
1+
//==-------------- math.hpp - DPC++ Explicit SIMD API --------------------==//
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.
@@ -10,11 +10,11 @@
1010

1111
#pragma once
1212

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>
13+
#include <sycl/ext/intel/experimental/esimd/common.hpp>
14+
#include <sycl/ext/intel/experimental/esimd/detail/math_intrin.hpp>
15+
#include <sycl/ext/intel/experimental/esimd/detail/types.hpp>
16+
#include <sycl/ext/intel/experimental/esimd/detail/util.hpp>
17+
#include <sycl/ext/intel/experimental/esimd/simd.hpp>
1818

1919
#include <cstdint>
2020

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//==-------------- esimd_memory.hpp - DPC++ Explicit SIMD API --------------==//
1+
//==-------------- memory.hpp - DPC++ Explicit SIMD API --------------------==//
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.
@@ -11,11 +11,11 @@
1111
#pragma once
1212

1313
#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>
14+
#include <sycl/ext/intel/experimental/esimd/common.hpp>
15+
#include <sycl/ext/intel/experimental/esimd/detail/memory_intrin.hpp>
16+
#include <sycl/ext/intel/experimental/esimd/detail/types.hpp>
17+
#include <sycl/ext/intel/experimental/esimd/detail/util.hpp>
18+
#include <sycl/ext/intel/experimental/esimd/simd.hpp>
1919

2020
#include <cstdint>
2121

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//==------------ - esimd.hpp - DPC++ Explicit SIMD API -------------------==//
1+
//==------------ - simd.hpp - DPC++ Explicit SIMD API --------------------==//
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.
@@ -10,10 +10,10 @@
1010

1111
#pragma once
1212

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>
13+
#include <sycl/ext/intel/experimental/esimd/detail/intrin.hpp>
14+
#include <sycl/ext/intel/experimental/esimd/detail/memory_intrin.hpp>
15+
#include <sycl/ext/intel/experimental/esimd/detail/sycl_util.hpp>
16+
#include <sycl/ext/intel/experimental/esimd/detail/types.hpp>
1717

1818
__SYCL_INLINE_NAMESPACE(cl) {
1919
namespace sycl {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//==------------ - esimd_view.hpp - DPC++ Explicit SIMD API --------------==//
1+
//==------------ - simd_view.hpp - DPC++ Explicit SIMD API ---------------==//
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.
@@ -10,7 +10,7 @@
1010

1111
#pragma once
1212

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

1515
__SYCL_INLINE_NAMESPACE(cl) {
1616
namespace sycl {

‎sycl/test/esimd/block_load_store.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -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@sycl/ext/intel/experimental/esimd/esimd_memory.hpp:191 {{}}
16+
// expected-note@sycl/ext/intel/experimental/esimd/memory.hpp:* {{}}
1717
auto v0 = block_load<int, 32>(buf, 0);
1818
v0 = v0 + v1;
1919
// expected-warning@+2 {{deprecated}}
20-
// expected-note@sycl/ext/intel/experimental/esimd/esimd_memory.hpp:223 {{}}
20+
// expected-note@sycl/ext/intel/experimental/esimd/memory.hpp:* {{}}
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@sycl/ext/intel/experimental/esimd/esimd_memory.hpp:172 {{}}
27+
// expected-note@sycl/ext/intel/experimental/esimd/memory.hpp:* {{}}
2828
auto v0 = block_load<int, 32>(ptr);
2929
v0 = v0 + v1;
3030
// expected-warning@+2 {{deprecated}}
31-
// expected-note@sycl/ext/intel/experimental/esimd/esimd_memory.hpp:204 {{}}
31+
// expected-note@sycl/ext/intel/experimental/esimd/memory.hpp:* {{}}
3232
block_store<int, 32>(ptr, v0);
3333
}

‎sycl/test/esimd/simd_copy_to_copy_from.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -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@sycl/ext/intel/experimental/esimd/esimd.hpp:499 {{}}
46-
// expected-note@sycl/ext/intel/experimental/esimd/esimd.hpp:511 {{}}
45+
// expected-note@sycl/ext/intel/experimental/esimd/simd.hpp:* {{}}
46+
// expected-note@sycl/ext/intel/experimental/esimd/simd.hpp:* {{}}
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@sycl/ext/intel/experimental/esimd/esimd.hpp:516 {{}}
51-
// expected-note@sycl/ext/intel/experimental/esimd/esimd.hpp:527 {{}}
50+
// expected-note@sycl/ext/intel/experimental/esimd/simd.hpp:* {{}}
51+
// expected-note@sycl/ext/intel/experimental/esimd/simd.hpp:* {{}}
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@sycl/ext/intel/experimental/esimd/esimd.hpp:499 {{}}
62-
// expected-note@sycl/ext/intel/experimental/esimd/esimd.hpp:511 {{}}
61+
// expected-note@sycl/ext/intel/experimental/esimd/simd.hpp:* {{}}
62+
// expected-note@sycl/ext/intel/experimental/esimd/simd.hpp:* {{}}
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@sycl/ext/intel/experimental/esimd/esimd.hpp:516 {{}}
73-
// expected-note@sycl/ext/intel/experimental/esimd/esimd.hpp:527 {{}}
72+
// expected-note@sycl/ext/intel/experimental/esimd/simd.hpp:* {{}}
73+
// expected-note@sycl/ext/intel/experimental/esimd/simd.hpp:* {{}}
7474
v.copy_to(buf, 0);
7575
}

0 commit comments

Comments
 (0)