Skip to content

Commit 2079eb2

Browse files
committed
Move GlobalMapUpdater into anynymous namespace
1 parent 7e043a9 commit 2079eb2

File tree

5 files changed

+10
-30
lines changed

5 files changed

+10
-30
lines changed

clang/lib/Sema/SemaSYCL.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7304,9 +7304,7 @@ void SYCLIntegrationHeader::emit(raw_ostream &O) {
73047304
if (FreeFunctionCount > 0) {
73057305
O << "\n#include <sycl/kernel_bundle.hpp>\n";
73067306
O << "#include <sycl/detail/kernel_global_info.hpp>\n";
7307-
O << "namespace sycl {\n";
7308-
O << "inline namespace _V1 {\n";
7309-
O << "namespace detail {\n";
7307+
O << "namespace {\n";
73107308
O << "struct GlobalMapUpdater {\n";
73117309
O << " GlobalMapUpdater() {\n";
73127310
O << " sycl::detail::free_function_info_map::add("
@@ -7320,9 +7318,7 @@ void SYCLIntegrationHeader::emit(raw_ostream &O) {
73207318
O << " }\n";
73217319
O << "};\n";
73227320
O << "static GlobalMapUpdater updater;\n";
7323-
O << "} // namespace detail\n";
7324-
O << "} // namespace _V1\n";
7325-
O << "} // namespace sycl\n";
7321+
O << "} //\n";
73267322
}
73277323
}
73287324

clang/test/CodeGenSYCL/free_function_default_template_arguments.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1087,9 +1087,7 @@ namespace Testing::Tests {
10871087

10881088
// CHECK: #include <sycl/kernel_bundle.hpp>
10891089
// CHECK-NEXT: #include <sycl/detail/kernel_global_info.hpp>
1090-
// CHECK-NEXT: namespace sycl {
1091-
// CHECK-NEXT: inline namespace _V1 {
1092-
// CHECK-NEXT: namespace detail {
1090+
// CHECK-NEXT: namespace {
10931091
// CHECK-NEXT: struct GlobalMapUpdater {
10941092
// CHECK-NEXT: GlobalMapUpdater() {
10951093
// CHECK-NEXT: sycl::detail::free_function_info_map::add(sycl::detail::kernel_names, sycl::detail::kernel_args_sizes, 28);
@@ -1099,6 +1097,4 @@ namespace Testing::Tests {
10991097
// CHECK-NEXT: }
11001098
// CHECK-NEXT: };
11011099
// CHECK-NEXT: static GlobalMapUpdater updater;
1102-
// CHECK-NEXT: } // namespace detail
1103-
// CHECK-NEXT: } // namespace _V1
1104-
// CHECK-NEXT: } // namespace sycl
1100+
// CHECK-NEXT: }

clang/test/CodeGenSYCL/free_function_int_header.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1567,9 +1567,7 @@ void ff_24(int arg) {
15671567

15681568
// CHECK: #include <sycl/kernel_bundle.hpp>
15691569
// CHECK-NEXT: #include <sycl/detail/kernel_global_info.hpp>
1570-
// CHECK-NEXT: namespace sycl {
1571-
// CHECK-NEXT: inline namespace _V1 {
1572-
// CHECK-NEXT: namespace detail {
1570+
// CHECK-NEXT: namespace {
15731571
// CHECK-NEXT: struct GlobalMapUpdater {
15741572
// CHECK-NEXT: GlobalMapUpdater() {
15751573
// CHECK-NEXT: sycl::detail::free_function_info_map::add(sycl::detail::kernel_names, sycl::detail::kernel_args_sizes, 33);
@@ -1579,6 +1577,4 @@ void ff_24(int arg) {
15791577
// CHECK-NEXT: }
15801578
// CHECK-NEXT: };
15811579
// CHECK-NEXT: static GlobalMapUpdater updater;
1582-
// CHECK-NEXT: } // namespace detail
1583-
// CHECK-NEXT: } // namespace _V1
1584-
// CHECK-NEXT: } // namespace sycl
1580+
// CHECK-NEXT: }

clang/test/CodeGenSYCL/free_function_int_header_rtc_mode.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,7 @@ int main(){
7575

7676
// CHECK-NORTC: #include <sycl/kernel_bundle.hpp>
7777
// CHECK-NORTC-NEXT: #include <sycl/detail/kernel_global_info.hpp>
78-
// CHECK-NORTC-NEXT: namespace sycl {
79-
// CHECK-NORTC-NEXT: inline namespace _V1 {
80-
// CHECK-NORTC-NEXT: namespace detail {
78+
// CHECK-NORTC-NEXT: namespace {
8179
// CHECK-NORTC-NEXT: struct GlobalMapUpdater {
8280
// CHECK-NORTC-NEXT: GlobalMapUpdater() {
8381
// CHECK-NORTC-NEXT: sycl::detail::free_function_info_map::add(sycl::detail::kernel_names, sycl::detail::kernel_args_sizes, 3);
@@ -87,6 +85,4 @@ int main(){
8785
// CHECK-NORTC-NEXT: }
8886
// CHECK-NORTC-NEXT: };
8987
// CHECK-NORTC-NEXT: static GlobalMapUpdater updater;
90-
// CHECK-NORTC-NEXT: } // namespace detail
91-
// CHECK-NORTC-NEXT: } // namespace _V1
92-
// CHECK-NORTC-NEXT: } // namespace sycl
88+
// CHECK-NORTC-NEXT: }

clang/test/SemaSYCL/Inputs/sycl/detail/kernel_global_info.hpp

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

1111
#include <sycl/detail/export.hpp>
1212

13-
namespace sycl {
14-
inline namespace _V1 {
15-
namespace detail {
13+
namespace {
1614
namespace free_function_info_map {
1715

1816
__SYCL_EXPORT void add(const void *DeviceGlobalPtr, const char *UniqueId);
1917
__SYCL_EXPORT void remove(const void *DeviceGlobalPtr, const char *UniqueId);
2018

2119
} // namespace free_function_info_map
22-
} // namespace detail
23-
} // namespace _V1
24-
} // namespace sycl
20+
}

0 commit comments

Comments
 (0)