Correct enqueueSVMMigrateMem function

Change-Id: Ice49ac7434038ec3667084414fa23a4367242e9c
Signed-off-by: Filip Hazubski <filip.hazubski@intel.com>

Author: fhazubski-Intel

opencl/source/command_queue/enqueue_svm.h

@@ -544,12 +544,12 @@ cl_int CommandQueueHw<GfxFamily>::enqueueSVMMigrateMem(cl_uint numSvmPointers,
     NullSurface s;
     Surface *surfaces[] = {&s};
 
-    enqueueHandler<CL_COMMAND_MIGRATE_MEM_OBJECTS>(surfaces,
-                                                   false,
-                                                   MultiDispatchInfo(),
-                                                   numEventsInWaitList,
-                                                   eventWaitList,
-                                                   event);
+    enqueueHandler<CL_COMMAND_SVM_MIGRATE_MEM>(surfaces,
+                                               false,
+                                               MultiDispatchInfo(),
+                                               numEventsInWaitList,
+                                               eventWaitList,
+                                               event);
 
     return CL_SUCCESS;
 }

opencl/source/helpers/cl_helper.h

@@ -73,6 +73,8 @@ inline const std::string cmdTypetoString(cl_command_type cmd) {
         return "CL_COMMAND_SVM_MAP";
     case CL_COMMAND_SVM_UNMAP:
         return "CL_COMMAND_SVM_UNMAP";
+    case CL_COMMAND_SVM_MIGRATE_MEM:
+        return "CL_COMMAND_SVM_MIGRATE_MEM";
     case CL_COMMAND_GL_FENCE_SYNC_OBJECT_KHR:
         return "CL_COMMAND_GL_FENCE_SYNC_OBJECT_KHR";
     default: {

opencl/source/helpers/queue_helpers.cpp

@@ -23,10 +23,12 @@ void getIntelQueueInfo(CommandQueue *queue, cl_command_queue_info paramName, Get
     retVal = CL_INVALID_VALUE;
 }
 bool isCommandWithoutKernel(uint32_t commandType) {
-    return ((commandType == CL_COMMAND_BARRIER) || (commandType == CL_COMMAND_MARKER) ||
+    return ((commandType == CL_COMMAND_BARRIER) ||
+            (commandType == CL_COMMAND_MARKER) ||
             (commandType == CL_COMMAND_MIGRATE_MEM_OBJECTS) ||
+            (commandType == CL_COMMAND_SVM_FREE) ||
             (commandType == CL_COMMAND_SVM_MAP) ||
-            (commandType == CL_COMMAND_SVM_UNMAP) ||
-            (commandType == CL_COMMAND_SVM_FREE));
+            (commandType == CL_COMMAND_SVM_MIGRATE_MEM) ||
+            (commandType == CL_COMMAND_SVM_UNMAP));
 }
 } // namespace NEO

opencl/test/unit_test/api/cl_enqueue_marker_tests.inl

@@ -45,6 +45,7 @@ static unsigned int commandWithoutKernelTypes[] = {
     CL_COMMAND_MARKER,
     CL_COMMAND_MIGRATE_MEM_OBJECTS,
     CL_COMMAND_SVM_MAP,
+    CL_COMMAND_SVM_MIGRATE_MEM,
     CL_COMMAND_SVM_UNMAP,
     CL_COMMAND_SVM_FREE};
 

opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp

@@ -866,6 +866,23 @@ TEST_F(EnqueueSvmTest, GivenValidParamsWhenMigratingMemoryThenSuccessIsReturned)
     EXPECT_EQ(CL_SUCCESS, retVal);
 }
 
+HWTEST_F(EnqueueSvmTest, WhenMigratingMemoryThenSvmMigrateMemCommandTypeIsUsed) {
+    MockCommandQueueHw<FamilyType> commandQueue{context, pClDevice, nullptr};
+    const void *svmPtrs[] = {ptrSVM};
+    retVal = commandQueue.enqueueSVMMigrateMem(
+        1,       // cl_uint num_svm_pointers
+        svmPtrs, // const void **svm_pointers
+        nullptr, // const size_t *sizes
+        0,       // const cl_mem_migration_flags flags
+        0,       // cl_uint num_events_in_wait_list
+        nullptr, // cl_event *event_wait_list
+        nullptr  // cL_event *event
+    );
+    EXPECT_EQ(CL_SUCCESS, retVal);
+    uint32_t expectedCommandType = CL_COMMAND_SVM_MIGRATE_MEM;
+    EXPECT_EQ(expectedCommandType, commandQueue.lastCommandType);
+}
+
 TEST(CreateSvmAllocTests, givenVariousSvmAllocationPropertiesWhenAllocatingSvmThenSvmIsCorrectlyAllocated) {
     if (!defaultHwInfo->capabilityTable.ftrSvm) {
         return;

opencl/test/unit_test/helpers/cl_helper_tests.cpp

@@ -12,7 +12,7 @@
 #include <array>
 
 TEST(ClHelper, whenCallGetStringWithCmdTypeFunctionThenGetProperCmdTypeAsString) {
-    std::array<std::string, 30> expected = {{"CL_COMMAND_NDRANGE_KERNEL",
+    std::array<std::string, 31> expected = {{"CL_COMMAND_NDRANGE_KERNEL",
                                              "CL_COMMAND_TASK",
                                              "CL_COMMAND_NATIVE_KERNEL",
                                              "CL_COMMAND_READ_BUFFER",
@@ -41,9 +41,10 @@ TEST(ClHelper, whenCallGetStringWithCmdTypeFunctionThenGetProperCmdTypeAsString)
                                              "CL_COMMAND_SVM_MEMCPY",
                                              "CL_COMMAND_SVM_MEMFILL",
                                              "CL_COMMAND_SVM_MAP",
-                                             "CL_COMMAND_SVM_UNMAP"}};
+                                             "CL_COMMAND_SVM_UNMAP",
+                                             "CL_COMMAND_SVM_MIGRATE_MEM"}};
 
-    for (int i = CL_COMMAND_NDRANGE_KERNEL; i <= CL_COMMAND_SVM_UNMAP; i++) {
+    for (int i = CL_COMMAND_NDRANGE_KERNEL; i <= CL_COMMAND_SVM_MIGRATE_MEM; i++) {
         EXPECT_STREQ(expected[i - CL_COMMAND_NDRANGE_KERNEL].c_str(), NEO::cmdTypetoString(i).c_str());
     }