Merge from 'sycl' to 'sycl-web'

Author: iclsrc

CONTRIBUTING.md

@@ -77,12 +77,23 @@ for more information.
 - Create a personal fork of the project on GitHub
   - For the DPC++ Compiler project, use **sycl** branch as baseline for your
     changes. See [Get Started Guide](sycl/doc/GetStartedGuide.md).
-- Prepare your patch (follow
-  [LLVM coding standards](https://llvm.org/docs/CodingStandards.html)).
-  [clang-format](https://clang.llvm.org/docs/ClangFormat.html) and [clang-tidy](
-  https://clang.llvm.org/extra/clang-tidy/) tools can be integrated into your
-  workflow to ensure formatting and stylistic compliance of your changes.
+- Prepare your patch
+    - follow [LLVM coding standards](https://llvm.org/docs/CodingStandards.html)
+    - [clang-format](https://clang.llvm.org/docs/ClangFormat.html) and 
+      [clang-tidy](https://clang.llvm.org/extra/clang-tidy/) tools can be integrated into your
+      workflow to ensure formatting and stylistic compliance of your changes.
+    - use
+      ```
+      ./clang/tools/clang-format/git-clang-format `git merge-base origin/sycl HEAD`
+      ```
+      to check the format of your current changes against the `origin/sycl` branch.
+        - `-f` to also correct unstaged changes
+        - `--diff` to only print the diff without applying
 - Build the project and run all tests.
+    - complete test suite: `python buildbot/check.py`
+    - sycl test suite `python buildbot/check.py -t test-sycl`
+    - run only "mytest" test `python buildbot/check.py -t test-sycl-mytest`
+    - if necessary, use `-o $LLVM_BUILD_DIR` to specify the llvm build directory
 
 ### Commit message
 

sycl/include/CL/sycl/builtins.hpp

@@ -24,11 +24,7 @@ namespace sycl {
 #else
 namespace __sycl_std = __host_std;
 #endif
-} // namespace sycl
-} // __SYCL_INLINE_NAMESPACE(cl)
 
-__SYCL_INLINE_NAMESPACE(cl) {
-namespace sycl {
 /* ----------------- 4.13.3 Math functions. ---------------------------------*/
 // genfloat acos (genfloat x)
 template <typename T>
@@ -731,7 +727,8 @@ detail::enable_if_t<detail::is_geninteger<T>::value, T> clz(T x) __NOEXC {
 namespace intel {
 // geninteger ctz (geninteger x)
 template <typename T>
-detail::enable_if_t<detail::is_geninteger<T>::value, T> ctz(T x) __NOEXC {
+sycl::detail::enable_if_t<sycl::detail::is_geninteger<T>::value, T>
+ctz(T x) __NOEXC {
   return __sycl_std::__invoke_ctz<T>(x);
 }
 } // namespace intel

sycl/include/CL/sycl/detail/cg.hpp

@@ -46,7 +46,7 @@ class interop_handler {
 
 public:
   using QueueImplPtr = std::shared_ptr<detail::queue_impl>;
-  using ReqToMem = std::pair<detail::Requirement*, pi_mem>;
+  using ReqToMem = std::pair<detail::Requirement *, pi_mem>;
 
   interop_handler(std::vector<ReqToMem> MemObjs, QueueImplPtr Queue)
       : MQueue(std::move(Queue)), MMemObjs(std::move(MemObjs)) {}

sycl/include/CL/sycl/detail/pi.hpp

@@ -142,8 +142,9 @@ template <PiApiKind PiApiOffset> struct PiFuncInfo {};
 
 #define _PI_API(api)                                                           \
   template <> struct PiFuncInfo<PiApiKind::api> {                              \
+    using FuncPtrT = decltype(&::api);                                         \
     inline std::string getFuncName() { return #api; }                          \
-    inline decltype(&::api) getFuncPtr(PiPlugin MPlugin) {                     \
+    inline FuncPtrT getFuncPtr(PiPlugin MPlugin) {                             \
       return MPlugin.PiFunctionTable.api;                                      \
     }                                                                          \
   };