Applying comments

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

Author: romanovvlad

sycl/include/CL/sycl/detail/sycl_mem_obj_i.hpp

@@ -39,7 +39,7 @@ class SYCLMemObjI {
   // InitFromUserData indicates that the returned memory should be intialized
   // with the data provided by user(if any). Usually it should happen on the
   // first allocation of memory for the memory object.
-  // Non null HostPtr requires allocation to be made USE_HOST_PTR property.
+  // Non null HostPtr requires allocation to be made with USE_HOST_PTR property.
   // Method returns a pointer to host allocation if Context is host one and
   // cl_mem obect if not.
   virtual void *allocateMem(ContextImplPtr Context, bool InitFromUserData,

sycl/source/detail/scheduler/commands.cpp

@@ -194,7 +194,7 @@ cl_int AllocaCommand::enqueueImp() {
   if (!MIsLeaderAlloca) {
 
     if (MQueue->is_host()) {
-      // Do not need make allocation if we have linked device allocation
+      // Do not need to make allocation if we have a linked device allocation
       Command::waitForEvents(MQueue, RawEvents, Event);
       return CL_SUCCESS;
     }
@@ -277,7 +277,7 @@ cl_int ReleaseCommand::enqueueImp() {
   bool NeedUnmap = false;
   if (MAllocaCmd->MLinkedAllocaCmd) {
 
-    // When releasing one of the "linked" allocation special rules take place:
+    // When releasing one of the "linked" allocations special rules take place:
     // 1. Device allocation should always be released.
     // 2. Host allocation should be released if host allocation is "leader".
     // 3. Device alloca in the pair should be in active state in order to be
@@ -295,7 +295,7 @@ cl_int ReleaseCommand::enqueueImp() {
     const QueueImplPtr &Queue = CurAllocaIsHost
                                     ? MAllocaCmd->MLinkedAllocaCmd->getQueue()
                                     : MAllocaCmd->getQueue();
-    RT::PiEvent MapEvent = nullptr;
+    RT::PiEvent UnmapEvent = nullptr;
 
     void *Src = CurAllocaIsHost
                     ? MAllocaCmd->getMemAllocation()
@@ -307,10 +307,10 @@ cl_int ReleaseCommand::enqueueImp() {
 
     MemoryManager::unmap(MAllocaCmd->getSYCLMemObj(), Dst, Queue, Src,
                          std::move(RawEvents), /*MUseExclusiveQueue*/ false,
-                         MapEvent);
+                         UnmapEvent);
 
     std::swap(MAllocaCmd->MIsActive, MAllocaCmd->MLinkedAllocaCmd->MIsActive);
-    RawEvents.push_back(MapEvent);
+    RawEvents.push_back(UnmapEvent);
   }
 
   RT::PiEvent &Event = MEvent->getHandleRef();

sycl/source/detail/scheduler/graph_builder.cpp

@@ -35,7 +35,7 @@ static bool doOverlap(const Requirement *LHS, const Requirement *RHS) {
 }
 
 static bool sameCtx(const ContextImplPtr &LHS, const ContextImplPtr &RHS) {
-  // Consider two different host context to be the same to avoid additional
+  // Consider two different host contexts to be the same to avoid additional
   // allocation on the host
   return LHS == RHS || (LHS->is_host() && RHS->is_host());
 }
@@ -180,26 +180,30 @@ UpdateHostRequirementCommand *Scheduler::GraphBuilder::insertUpdateHostReqCmd(
 
 // Takes linked alloca commands. Makes AllocaCmdDst command active using map
 // or unmap operation.
-Command *insertMapUnmapForLinkedCmds(AllocaCommandBase *AllocaCmdSrc,
-                                     AllocaCommandBase *AllocaCmdDst) {
-  assert(AllocaCmdSrc->MLinkedAllocaCmd == AllocaCmdDst);
+static Command *insertMapUnmapForLinkedCmds(AllocaCommandBase *AllocaCmdSrc,
+                                            AllocaCommandBase *AllocaCmdDst) {
+  assert(AllocaCmdSrc->MLinkedAllocaCmd == AllocaCmdDst &&
+         "Expected linked alloca commands");
+  assert(AllocaCmdSrc->MIsActive &&
+         "Expected source alloca command to be active");
+
   if (AllocaCmdSrc->getQueue()->is_host()) {
-    std::unique_ptr<UnMapMemObject> UnMapCmdUPtr(new UnMapMemObject(
+    UnMapMemObject *UnMapCmd = new UnMapMemObject(
         AllocaCmdDst, *AllocaCmdDst->getRequirement(),
-        &AllocaCmdSrc->MMemAllocation, AllocaCmdDst->getQueue()));
+        &AllocaCmdSrc->MMemAllocation, AllocaCmdDst->getQueue());
 
     std::swap(AllocaCmdSrc->MIsActive, AllocaCmdDst->MIsActive);
 
-    return UnMapCmdUPtr.release();
+    return UnMapCmd;
   }
 
-  std::unique_ptr<MapMemObject> MapCmdUPtr(new MapMemObject(
-      AllocaCmdSrc, *AllocaCmdSrc->getRequirement(),
-      &AllocaCmdDst->MMemAllocation, AllocaCmdSrc->getQueue()));
+  MapMemObject *MapCmd =
+      new MapMemObject(AllocaCmdSrc, *AllocaCmdSrc->getRequirement(),
+                       &AllocaCmdDst->MMemAllocation, AllocaCmdSrc->getQueue());
 
   std::swap(AllocaCmdSrc->MIsActive, AllocaCmdDst->MIsActive);
 
-  return MapCmdUPtr.release();
+  return MapCmd;
 }
 
 Command *Scheduler::GraphBuilder::insertMemoryMove(MemObjRecord *Record,

sycl/test/scheduler/HostAcc.cpp

@@ -15,16 +15,16 @@ using namespace cl;
 int main() {
 
   bool Fail = false;
-  // Check that multiple host accessor which are created with read access mode
+  // Check that multiple host accessors which are created with read access mode
   // can exist simultaneously.
   sycl::buffer<int, 1> Buf(sycl::range<1>{1});
   {
     auto Acc1 = Buf.get_access<sycl::access::mode::read>();
     auto Acc2 = Buf.get_access<sycl::access::mode::read>();
   }
 
-  // Check creation of write accessor after read blocks and generate exception
-  // (special env var is set for throwing exception) caught
+  // Check that exception is thrown in a dead lock scenario if special
+  // environment variable is set.
   {
     bool ExcCaught = false;
     try {