[SYCL] More changes to silence -Wctad-maybe-unsupported

Mutex changes could be reverted if/when this change lands:
https://reviews.llvm.org/D133425

Author: Pavel V Chupin

sycl/plugins/level_zero/pi_level_zero.cpp

@@ -72,13 +72,13 @@ void event_impl::waitInternal() {
   if (MState == HES_Complete)
     return;
 
-  std::unique_lock lock(MMutex);
+  std::unique_lock<std::mutex> lock(MMutex);
   cv.wait(lock, [this] { return MState == HES_Complete; });
 }
 
 void event_impl::setComplete() {
   if (MHostEvent || !MEvent) {
-    std::unique_lock lock(MMutex);
+    std::unique_lock<std::mutex> lock(MMutex);
 #ifndef NDEBUG
     int Expected = HES_NotComplete;
     int Desired = HES_Complete;

sycl/source/detail/event_impl.cpp

@@ -79,8 +79,9 @@ context platform::ext_oneapi_get_default_context() const {
       &PlatformToDefaultContextCache =
           detail::GlobalHandler::instance().getPlatformToDefaultContextCache();
 
-  std::lock_guard Lock{detail::GlobalHandler::instance()
-                           .getPlatformToDefaultContextCacheMutex()};
+  std::lock_guard<std::mutex> Lock{
+      detail::GlobalHandler::instance()
+          .getPlatformToDefaultContextCacheMutex()};
 
   auto It = PlatformToDefaultContextCache.find(impl);
   if (PlatformToDefaultContextCache.end() == It)

sycl/source/platform.cpp

@@ -28,15 +28,15 @@ class JSONWriter : public Writer {
   explicit JSONWriter(const std::string &OutPath) : MOutFile(OutPath) {}
 
   void init() final {
-    std::lock_guard _{MWriteMutex};
+    std::lock_guard<std::mutex> _{MWriteMutex};
 
     MOutFile << "{\n";
     MOutFile << "  \"traceEvents\": [\n";
   }
 
   void writeBegin(std::string_view Name, std::string_view Category, size_t PID,
                   size_t TID, size_t TimeStamp) override {
-    std::lock_guard _{MWriteMutex};
+    std::lock_guard<std::mutex> _{MWriteMutex};
 
     if (!MOutFile.is_open())
       return;
@@ -52,7 +52,7 @@ class JSONWriter : public Writer {
 
   void writeEnd(std::string_view Name, std::string_view Category, size_t PID,
                 size_t TID, size_t TimeStamp) override {
-    std::lock_guard _{MWriteMutex};
+    std::lock_guard<std::mutex> _{MWriteMutex};
 
     if (!MOutFile.is_open())
       return;
@@ -67,7 +67,7 @@ class JSONWriter : public Writer {
   }
 
   void finalize() final {
-    std::lock_guard _{MWriteMutex};
+    std::lock_guard<std::mutex> _{MWriteMutex};
 
     if (!MOutFile.is_open())
       return;

sycl/tools/sycl-prof/writer.hpp

@@ -138,7 +138,7 @@ XPTI_CALLBACK_API void piCallback(uint16_t TraceType,
     return;
 
   // Lock while we print information
-  std::lock_guard _{GlobalLock};
+  std::lock_guard<sycl::detail::SpinLock> _{GlobalLock};
   const auto *Data = static_cast<const xpti::function_with_args_t *>(UserData);
   if (TraceType == xpti::trace_function_with_args_begin) {
     const auto *Plugin = static_cast<pi_plugin *>(Data->user_data);

sycl/tools/sycl-trace/pi_trace_collector.cpp

@@ -250,7 +250,7 @@ XPTI_CALLBACK_API void zeCallback(uint16_t TraceType,
                                   xpti::trace_event_data_t * /*Parent*/,
                                   xpti::trace_event_data_t * /*Event*/,
                                   uint64_t /*Instance*/, const void *UserData) {
-  std::lock_guard _{GlobalLock};
+  std::lock_guard<sycl::detail::SpinLock> _{GlobalLock};
   const auto *Data = static_cast<const xpti::function_with_args_t *>(UserData);
   const auto PrintPrefix = [] {
     if (HasPIPrinter)

sycl/tools/sycl-trace/ze_trace_collector.cpp

@@ -83,6 +83,7 @@ template <typename Mutex> class SharedLock {
   Mutex *MMutex;
   bool MIsWriter = false;
 };
+template <typename Mutex> SharedLock(Mutex &) -> SharedLock<Mutex>;
 
 /// SpinLock is a synchronization primitive, that uses atomic variable and
 /// causes thread trying acquire lock wait in loop while repeatedly check if