Applying comment

Signed-off-by: Vlad Romanov <[email protected]>

Author: romanovvlad

sycl/include/CL/sycl/detail/buffer_impl.hpp

@@ -149,12 +149,11 @@ class buffer_impl final : public SYCLMemObjT<AllocatorT> {
            "Cannot init from user data and reuse host ptr provided "
            "simultaneously");
 
-    void *UserPtr = HostPtr;
-    UserPtr = InitFromUserData ? BaseT::getUserPtr() : UserPtr;
+    void *UserPtr = InitFromUserData ? BaseT::getUserPtr() : HostPtr;
 
-    if (nullptr == UserPtr && BaseT::useHostPtr() && Context->is_host())
-      throw sycl::runtime_error("Internal error. Allocating memory on the host "
-                                "while having use_host_ptr property");
+    assert(!(nullptr == UserPtr && BaseT::useHostPtr() && Context->is_host()) &&
+           "Internal error. Allocating memory on the host "
+           "while having use_host_ptr property");
 
     return MemoryManager::allocateMemBuffer(
         std::move(Context), this, UserPtr, BaseT::MHostPtrReadOnly,

sycl/include/CL/sycl/detail/image_impl.hpp

@@ -286,8 +286,7 @@ class image_impl final : public SYCLMemObjT<AllocatorT> {
            "Cannot init from user data and reuse host ptr provided "
            "simultaneously");
 
-    void *UserPtr = HostPtr;
-    UserPtr = InitFromUserData ? BaseT::getUserPtr() : UserPtr;
+    void *UserPtr = InitFromUserData ? BaseT::getUserPtr() : UserPtr;
 
     RT::PiMemImageDesc Desc = getImageDesc(UserPtr != nullptr);
     assert(checkImageDesc(Desc, Context, UserPtr) &&

sycl/include/CL/sycl/detail/scheduler/commands.hpp

@@ -198,7 +198,7 @@ class AllocaCommandBase : public Command {
   AllocaCommandBase(CommandType Type, QueueImplPtr Queue, Requirement Req,
                     AllocaCommandBase *LinkedAllocaCmd)
       : Command(Type, Queue), MLinkedAllocaCmd(LinkedAllocaCmd),
-        MLeaderAlloca(nullptr == LinkedAllocaCmd), MReleaseCmd(Queue, this),
+        MIsLeaderAlloca(nullptr == LinkedAllocaCmd), MReleaseCmd(Queue, this),
         MRequirement(std::move(Req)) {
     MRequirement.MAccessMode = access::mode::read_write;
   }
@@ -216,15 +216,15 @@ class AllocaCommandBase : public Command {
   // Alloca command linked with current command.
   // Device and host alloca commands can be linked, so they may share the same
   // memory. Only one allocation from a pair can be accessed at a time. Alloca
-  // commands associcated with such allocation is "active". In order to switch
+  // commands associated with such allocation is "active". In order to switch
   // "active" status between alloca commands map/unmap operations are used.
   AllocaCommandBase *MLinkedAllocaCmd = nullptr;
   // Indicates that current alloca is active one.
-  bool MActive = true;
+  bool MIsActive = true;
 
   // Indicates that the command owns memory allocation in case of connected
   // alloca command
-  bool MLeaderAlloca = true;
+  bool MIsLeaderAlloca = true;
 
 protected:
   ReleaseCommand MReleaseCmd;

sycl/include/CL/sycl/detail/scheduler/scheduler.hpp

@@ -75,7 +75,7 @@ class Scheduler {
   // memory which contains the latest data of the memory object. New operations
   // with the same memory object that have side effects are blocked until
   // releaseHostAccessor is called.
-  // Returns an event which indicates when thsese nodes are completed and host
+  // Returns an event which indicates when these nodes are completed and host
   // accessor is ready for using.
   EventImplPtr addHostAccessor(Requirement *Req);
 

sycl/source/detail/accessor_impl.cpp

@@ -1,3 +1,11 @@
+//==---------------- accessor_impl.cpp - SYCL standard source file ---------==//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
 #include <CL/sycl/detail/accessor_impl.hpp>
 #include <CL/sycl/detail/scheduler/scheduler.hpp>
 

sycl/source/detail/scheduler/commands.cpp

@@ -191,7 +191,7 @@ cl_int AllocaCommand::enqueueImp() {
   RT::PiEvent &Event = MEvent->getHandleRef();
 
   void *HostPtr = nullptr;
-  if (!MLeaderAlloca) {
+  if (!MIsLeaderAlloca) {
 
     if (MQueue->is_host()) {
       // Do not need make allocation if we have linked device allocation
@@ -286,10 +286,9 @@ cl_int ReleaseCommand::enqueueImp() {
 
     // There is no actual memory allocation if a host alloca command is created
     // being linked to a device allocation.
-    SkipRelease |= CurAllocaIsHost && !MAllocaCmd->MLeaderAlloca;
+    SkipRelease |= CurAllocaIsHost && !MAllocaCmd->MIsLeaderAlloca;
 
-    NeedUnmap |= !CurAllocaIsHost && !MAllocaCmd->MActive;
-    NeedUnmap |= CurAllocaIsHost && MAllocaCmd->MActive;
+    NeedUnmap |= CurAllocaIsHost == MAllocaCmd->MIsActive;
   }
 
   if (NeedUnmap) {
@@ -310,7 +309,7 @@ cl_int ReleaseCommand::enqueueImp() {
                          std::move(RawEvents), /*MUseExclusiveQueue*/ false,
                          MapEvent);
 
-    std::swap(MAllocaCmd->MActive, MAllocaCmd->MLinkedAllocaCmd->MActive);
+    std::swap(MAllocaCmd->MIsActive, MAllocaCmd->MLinkedAllocaCmd->MIsActive);
     RawEvents.push_back(MapEvent);
   }
 

sycl/source/detail/scheduler/graph_builder.cpp

@@ -188,7 +188,7 @@ Command *insertMapUnmapForLinkedCmds(AllocaCommandBase *AllocaCmdSrc,
         AllocaCmdDst, *AllocaCmdDst->getRequirement(),
         &AllocaCmdSrc->MMemAllocation, AllocaCmdDst->getQueue()));
 
-    std::swap(AllocaCmdSrc->MActive, AllocaCmdDst->MActive);
+    std::swap(AllocaCmdSrc->MIsActive, AllocaCmdDst->MIsActive);
 
     return UnMapCmdUPtr.release();
   }
@@ -197,7 +197,7 @@ Command *insertMapUnmapForLinkedCmds(AllocaCommandBase *AllocaCmdSrc,
       AllocaCmdSrc, *AllocaCmdSrc->getRequirement(),
       &AllocaCmdDst->MMemAllocation, AllocaCmdSrc->getQueue()));
 
-  std::swap(AllocaCmdSrc->MActive, AllocaCmdDst->MActive);
+  std::swap(AllocaCmdSrc->MIsActive, AllocaCmdDst->MIsActive);
 
   return MapCmdUPtr.release();
 }
@@ -245,7 +245,7 @@ Command *Scheduler::GraphBuilder::insertMemoryMove(MemObjRecord *Record,
     NewCmd = insertMapUnmapForLinkedCmds(AllocaCmdSrc, AllocaCmdDst);
   } else {
 
-    if (AllocaCmdDst->MLinkedAllocaCmd && !AllocaCmdDst->MActive) {
+    if (AllocaCmdDst->MLinkedAllocaCmd && !AllocaCmdDst->MIsActive) {
       NewCmd = insertMapUnmapForLinkedCmds(AllocaCmdSrc, AllocaCmdDst);
       const Requirement *NewReq = NewCmd->getRequirement();
       for (Command *Dep : Deps) {
@@ -259,7 +259,7 @@ Command *Scheduler::GraphBuilder::insertMemoryMove(MemObjRecord *Record,
     }
 
     // Full copy of buffer is needed to avoid loss of data that may be caused
-    // by copying specific range form host to device and backwards.
+    // by copying specific range from host to device and backwards.
     NewCmd = new MemCpyCommand(*AllocaCmdSrc->getRequirement(), AllocaCmdSrc,
                                *AllocaCmdDst->getRequirement(), AllocaCmdDst,
                                AllocaCmdSrc->getQueue(),
@@ -339,8 +339,7 @@ Command *Scheduler::GraphBuilder::addHostAccessor(Requirement *Req) {
   Command *UpdateHostAccCmd = insertUpdateHostReqCmd(Record, Req, HostQueue);
 
   // Need empty command to be blocked until host accessor is destructed
-  std::unique_ptr<EmptyCommand> EmptyCmdUPtr(new EmptyCommand(HostQueue, *Req));
-  EmptyCommand *EmptyCmd = EmptyCmdUPtr.release();
+  EmptyCommand *EmptyCmd = new EmptyCommand(HostQueue, *Req);
   EmptyCmd->addDep(
       DepDesc{UpdateHostAccCmd, EmptyCmd->getRequirement(), SrcAllocaCmd});
   UpdateHostAccCmd->addUser(EmptyCmd);
@@ -524,9 +523,9 @@ AllocaCommandBase *Scheduler::GraphBuilder::getOrCreateAllocaForReq(
         // always be active here. Also if the "follower" command is a device one
         // we have to change current context to the device one.
         if (Queue->is_host()) {
-          AllocaCmd->MActive = false;
+          AllocaCmd->MIsActive = false;
         } else {
-          LinkedAllocaCmd->MActive = false;
+          LinkedAllocaCmd->MIsActive = false;
           Record->MCurContext = Queue->get_context_impl();
         }
       }