Merge branch 'sycl' into pietro/events_initial

Author: PietroGhg

clang/include/clang/Basic/SourceManager.h

@@ -906,6 +906,19 @@ class SourceManager : public RefCountedBase<SourceManager> {
   /// Get the file ID for the precompiled preamble if there is one.
   FileID getPreambleFileID() const { return PreambleFileID; }
 
+  ///  Get the file ID for the integration footer.
+  FileID ComputeValidFooterFileID(StringRef Footer) {
+    FileID FooterFileID;
+    llvm::Expected<FileEntryRef> ExpectedFileRef =
+        getFileManager().getFileRef(Footer);
+    if (ExpectedFileRef) {
+      FooterFileID = getOrCreateFileID(ExpectedFileRef.get(),
+                                       SrcMgr::CharacteristicKind::C_User);
+    }
+    assert(FooterFileID.isValid() && "expecting a valid footer FileID");
+    return FooterFileID;
+  }
+
   //===--------------------------------------------------------------------===//
   // Methods to create new FileID's and macro expansions.
   //===--------------------------------------------------------------------===//

clang/lib/Frontend/PrintPreprocessedOutput.cpp

@@ -904,26 +904,14 @@ struct UnknownPragmaHandler : public PragmaHandler {
 };
 } // end anonymous namespace
 
-FileID ComputeValidFooterFileID(SourceManager &SM, StringRef Footer) {
-  FileID FooterFileID;
-  llvm::Expected<FileEntryRef> ExpectedFileRef =
-      SM.getFileManager().getFileRef(Footer);
-  if (ExpectedFileRef) {
-    FooterFileID = SM.getOrCreateFileID(ExpectedFileRef.get(),
-                                        SrcMgr::CharacteristicKind::C_User);
-  }
-  assert(FooterFileID.isValid() && "expecting a valid footer FileID");
-  return FooterFileID;
-}
-
 static void PrintIncludeFooter(Preprocessor &PP, SourceLocation Loc,
                                std::string Footer,
                                PrintPPOutputPPCallbacks *Callbacks) {
   SourceManager &SourceMgr = PP.getSourceManager();
   PresumedLoc UserLoc = SourceMgr.getPresumedLoc(Loc);
   if (UserLoc.isInvalid())
     return;
-  FileID FooterFileID = ComputeValidFooterFileID(SourceMgr, Footer);
+  FileID FooterFileID = SourceMgr.ComputeValidFooterFileID(Footer);
   StringRef FooterContentBuffer = SourceMgr.getBufferData(FooterFileID);
   // print out the name of the integration footer.
   Callbacks->WriteFooterInfo(Footer);

clang/lib/Lex/PPLexerChange.cpp

@@ -326,18 +326,6 @@ void Preprocessor::diagnoseMissingHeaderInUmbrellaDir(const Module &Mod) {
   }
 }
 
-static FileID ComputeValidFooterFileID(SourceManager &SM, StringRef Footer) {
-  FileID FooterFileID;
-  llvm::Expected<FileEntryRef> ExpectedFileRef =
-      SM.getFileManager().getFileRef(Footer);
-  if (ExpectedFileRef) {
-    FooterFileID = SM.getOrCreateFileID(ExpectedFileRef.get(),
-                                        SrcMgr::CharacteristicKind::C_User);
-  }
-  assert(FooterFileID.isValid() && "expecting a valid footer FileID");
-  return FooterFileID;
-}
-
 /// HandleEndOfFile - This callback is invoked when the lexer hits the end of
 /// the current file.  This either returns the EOF token or pops a level off
 /// the include stack and keeps going.
@@ -552,8 +540,8 @@ bool Preprocessor::HandleEndOfFile(Token &Result, bool isEndOfMacro) {
     SourceManager &SourceMgr = getSourceManager();
     SourceLocation Loc = CurLexer->getFileLoc();
 
-    FileID FooterFileID = ComputeValidFooterFileID(
-        SourceMgr, getPreprocessorOpts().IncludeFooter);
+    FileID FooterFileID =
+        SourceMgr.ComputeValidFooterFileID(getPreprocessorOpts().IncludeFooter);
     if (!FooterFileID.isInvalid() && !IncludeFooterProcessed) {
       IncludeFooterProcessed = true;
       // Mark the footer file as included

sycl/cmake/modules/FetchUnifiedRuntime.cmake

@@ -117,13 +117,13 @@ if(SYCL_UR_USE_FETCH_CONTENT)
   endfunction()
 
   set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
-  # commit e02d78ba74efd21219b18f4083cf9afc14a16759
-  # Merge: e50a4ddc c12957bd
+  # commit f8336050f43a6529636fd6b2075dfe09961564f5
+  # Merge: 6c98e0e8 b75f2bc2
   # Author: Omar Ahmed <[email protected]>
-  # Date:   Fri Aug 9 15:41:55 2024 +0100
-  #     Merge pull request #1933 from nrspruit/fix_driver_version_check
-  #     [L0] Fix Driver Version check to use extension and tuple check
-  set(UNIFIED_RUNTIME_TAG e02d78ba74efd21219b18f4083cf9afc14a16759)
+  # Date:   Tue Aug 13 13:07:23 2024 +0100
+  #     Merge pull request #1955 from nrspruit/fix_l0_coverity
+  #     [L0] fix Coverity issues for L0 Adapter
+  set(UNIFIED_RUNTIME_TAG f8336050f43a6529636fd6b2075dfe09961564f5)
 
   set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES")
   # Due to the use of dependentloadflag and no installer for UMF and hwloc we need

sycl/include/sycl/range.hpp

@@ -56,7 +56,7 @@ template <int Dimensions = 1> class range : public detail::array<Dimensions> {
   size_t size() const {
     size_t size = 1;
     for (int i = 0; i < Dimensions; ++i) {
-      size *= this->get(i);
+      size *= this->common_array[i];
     }
     return size;
   }

sycl/source/detail/event_impl.cpp

@@ -81,6 +81,11 @@ void event_impl::waitInternal(bool *Success) {
   // Wait for connected events(e.g. streams prints)
   for (const EventImplPtr &Event : MPostCompleteEvents)
     Event->wait(Event);
+  for (const std::weak_ptr<event_impl> &WeakEventPtr :
+       MWeakPostCompleteEvents) {
+    if (EventImplPtr Event = WeakEventPtr.lock())
+      Event->wait(Event);
+  }
 }
 
 void event_impl::setComplete() {

sycl/source/detail/event_impl.hpp

@@ -270,6 +270,11 @@ class event_impl {
     MPostCompleteEvents.push_back(Event);
   }
 
+  void attachEventToCompleteWeak(const std::weak_ptr<event_impl> &Event) {
+    std::lock_guard<std::mutex> Lock(MMutex);
+    MWeakPostCompleteEvents.push_back(Event);
+  }
+
   bool isDefaultConstructed() const noexcept { return MIsDefaultConstructed; }
 
   ContextImplPtr getContextImplPtr() {
@@ -358,6 +363,16 @@ class event_impl {
   std::vector<EventImplPtr> MPreparedHostDepsEvents;
 
   std::vector<EventImplPtr> MPostCompleteEvents;
+  // short term WA for stream:
+  // MPostCompleteEvents is split into two storages now. Original storage is
+  // used by graph extension and represents backward links.
+  // MWeakPostCompleteEvents represents weak forward references (used in stream
+  // only). Used only for host tasks now since they do not support post enqueue
+  // cleanup and event == nullptr could happen only when host task is completed
+  // (and Command that holding reference to its event is deleted). TO DO: to
+  // eliminate forward references from stream implementation and remove this
+  // storage.
+  std::vector<std::weak_ptr<event_impl>> MWeakPostCompleteEvents;
 
   /// Indicates that the task associated with this event has been submitted by
   /// the queue to the device.

sycl/source/detail/handler_impl.hpp

@@ -123,15 +123,15 @@ class handler_impl {
   bool MKernelUsesClusterLaunch = false;
 
   // Extra information for bindless image copy
-  ur_image_desc_t MSrcImageDesc;
-  ur_image_desc_t MDstImageDesc;
-  ur_image_format_t MSrcImageFormat;
-  ur_image_format_t MDstImageFormat;
-  ur_exp_image_copy_flags_t MImageCopyFlags;
-
-  ur_rect_offset_t MSrcOffset;
-  ur_rect_offset_t MDestOffset;
-  ur_rect_region_t MCopyExtent;
+  ur_image_desc_t MSrcImageDesc = {};
+  ur_image_desc_t MDstImageDesc = {};
+  ur_image_format_t MSrcImageFormat = {};
+  ur_image_format_t MDstImageFormat = {};
+  ur_exp_image_copy_flags_t MImageCopyFlags = {};
+
+  ur_rect_offset_t MSrcOffset = {};
+  ur_rect_offset_t MDestOffset = {};
+  ur_rect_region_t MCopyExtent = {};
 
   // Extra information for semaphore interoperability
   ur_exp_external_semaphore_handle_t MExternalSemaphore;

sycl/source/detail/queue_impl.cpp

@@ -396,7 +396,7 @@ event queue_impl::submit_impl(const std::function<void(handler &)> &CGF,
     event FlushEvent = submit_impl(
         [&](handler &ServiceCGH) { Stream->generateFlushCommand(ServiceCGH); },
         Self, PrimaryQueue, SecondaryQueue, /*CallerNeedsEvent*/ true, Loc, {});
-    EventImpl->attachEventToComplete(detail::getSyclObjImpl(FlushEvent));
+    EventImpl->attachEventToCompleteWeak(detail::getSyclObjImpl(FlushEvent));
     registerStreamServiceEvent(detail::getSyclObjImpl(FlushEvent));
   }
 

sycl/test-e2e/ESIMD/addc.cpp

@@ -7,8 +7,6 @@
 //===----------------------------------------------------------------------===//
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
-// https://github.com/intel/llvm/issues/14868
-// UNSUPPORTED: windows
 
 // The test verifies ESIMD API that adds 2 32-bit integer scalars/vectors with
 // carry returning the result as 2 parts: carry flag the input modified operand
@@ -94,7 +92,7 @@ template <int N, bool AIsVector, bool BIsVector> bool test(sycl::queue Q) {
            }
 
          } // end for BI
-       }   // end for AI
+       } // end for AI
      }).wait();
   } catch (sycl::exception const &e) {
     std::cout << "SYCL exception caught: " << e.what() << '\n';