Skip to content

[SYCL][NFC] Remove __SYCL_INLINE_VER_NAMESPACE macro #10510

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 21, 2023
Merged

[SYCL][NFC] Remove __SYCL_INLINE_VER_NAMESPACE macro #10510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
80b1775
[SYCL][NFC] Remove __SYCL_INLINE_VER_NAMESPACE macro
bader Jul 21, 2023
486b180
Fix formatting.
bader Jul 21, 2023
3ded6b3
Apply formatting changes to clang project.
bader Jul 21, 2023
269b6f2
Merge remote-tracking branch 'intel/sycl' into remove-include
bader Jul 21, 2023
1e53b00
Remove new instances of the macro.
bader Jul 21, 2023
7537010
Merge branch 'sycl' into remove-include
bader Jul 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 4 additions & 4 deletions clang/lib/Sema/SemaSYCL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5184,7 +5184,7 @@ void SYCLIntegrationHeader::emit(raw_ostream &O) {
O << "\n";

O << "namespace sycl {\n";
O << "__SYCL_INLINE_VER_NAMESPACE(_V1) {\n";
O << "inline namespace _V1 {\n";
O << "namespace detail {\n";

// Generate declaration of variable of type __sycl_device_global_registration
Expand Down Expand Up @@ -5347,7 +5347,7 @@ void SYCLIntegrationHeader::emit(raw_ostream &O) {
}
O << "\n";
O << "} // namespace detail\n";
O << "} // __SYCL_INLINE_VER_NAMESPACE(_V1)\n";
O << "} // namespace _V1\n";
O << "} // namespace sycl\n";
O << "\n";
}
Expand Down Expand Up @@ -5659,7 +5659,7 @@ bool SYCLIntegrationFooter::emit(raw_ostream &OS) {
} else {
EmittedFirstSpecConstant = true;
OS << "namespace sycl {\n";
OS << "__SYCL_INLINE_VER_NAMESPACE(_V1) {\n";
OS << "inline namespace _V1 {\n";
OS << "namespace detail {\n";
OS << "template<>\n";
OS << "inline const char *get_spec_constant_symbolic_ID_impl<";
Expand All @@ -5677,7 +5677,7 @@ bool SYCLIntegrationFooter::emit(raw_ostream &OS) {
OS << "\";\n";
OS << "}\n";
OS << "} // namespace detail\n";
OS << "} // __SYCL_INLINE_VER_NAMESPACE(_V1)\n";
OS << "} // namespace _V1\n";
OS << "} // namespace sycl\n";
}
}
Expand Down
2 changes: 1 addition & 1 deletion clang/test/CodeGenSYCL/Inputs/sycl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,5 +670,5 @@ class image {
}
};

} // inline namespace _V1
} // namespace _V1
} // namespace sycl
2 changes: 1 addition & 1 deletion clang/test/CodeGenSYCL/accessor-readonly-invalid-lib.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class __attribute__((sycl_special_class)) [[__sycl_detail__::sycl_type(accessor)
range<dimensions> MemRange, id<dimensions> Offset) {}
};

} // inline namespace _V1
} // namespace _V1
} // namespace sycl

template <typename name, typename Func>
Expand Down
Loading