Fixup ownership test

Author: againull

SYCL/Plugin/interop-level-zero-buffer-ownership.cpp

@@ -1,14 +1,23 @@
 // REQUIRES: level_zero, level_zero_dev_kit
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
-// RUN: env SYCL_DEVICE_FILTER=level_zero ZE_DEBUG=1 %GPU_RUN_PLACEHOLDER %t.out 2>&1
+// RUN: env SYCL_DEVICE_FILTER=level_zero ZE_DEBUG=1 %GPU_RUN_PLACEHOLDER %t.out 2>&1 | FileCheck %s
 
 // Test for Level Zero buffer interop API.
 // Check the following cases:
-// 1. Copy back is performed to the user-provided memory of interop buffer if
+// 1. User-provided memory allocation is not freed by DPCPP RT if
 // "keep" ownership is specified.
-// 2. If host access was performed in between two kernels then only one
-// host->device copy is performed.
-// 3. Check that copy back is not performed "transfer" ownership is specified.
+// 2. User-provided memory allocation is freed by DPCPP RT if
+// "transfer" ownership is specified.
+
+// Keep ownership
+// CHECK: zeMemFree
+
+// Transfer ownership
+// CHECK: zeMemFree
+// CHECK: zeMemFree
+
+// No other calls to zeMemFree
+// CHECK-NOT: zeMemFree
 
 #include "interop-level-zero-buffer-helpers.hpp"
 #include <CL/sycl.hpp>
@@ -21,9 +30,9 @@ using namespace cl::sycl;
 
 // Test copy back depending on provided ownership and check that memory is freed
 // properly.
-void test_copyback_and_free(queue &Queue1, queue &Queue2,
-                            const ext::oneapi::level_zero::ownership &Ownership,
-                            bool AccessOnHostBeforeCopyBack) {
+void test_copyback_and_free(
+    queue &Queue1, queue &Queue2,
+    const ext::oneapi::level_zero::ownership &Ownership) {
   try {
     auto Context = Queue1.get_context();
     auto Device = Queue1.get_info<info::queue::device>();
@@ -82,20 +91,6 @@ void test_copyback_and_free(queue &Queue1, queue &Queue2,
       });
 
       Queue2.wait();
-      if (AccessOnHostBeforeCopyBack) {
-        auto HostAcc = BufferInterop.get_host_access();
-        for (int i = 0; i < 12; i++) {
-          assert(HostAcc[i] == 198);
-        }
-      }
-    }
-    {
-      int *NativeBufferInt = (int *)NativeBuffer;
-
-      for (int i = 0; i < 12; i++) {
-        if (Ownership == ext::oneapi::level_zero::ownership::keep)
-          assert(NativeBufferInt[i] == 198);
-      }
     }
     if (Ownership == ext::oneapi::level_zero::ownership::keep)
       zeMemFree(ZeContext, NativeBuffer);
@@ -124,25 +119,15 @@ int main() {
     context Context2{Dev2};
     queue Queue2{Context2, Dev2};
 
-    std::cout << "Test case #1: Keep ownership, no host access before copy back"
-              << std::endl;
+    std::cout << "Test case #1: Keep ownership" << std::endl;
     test_copyback_and_free(Queue1, Queue2,
-                           ext::oneapi::level_zero::ownership::keep,
-                           /*AccessOnHostBeforeCopyBack*/ false);
+                           ext::oneapi::level_zero::ownership::keep);
 
-    std::cout
-        << "Test case #2: Transfer ownership, no host access before copy back"
-        << std::endl;
+    std::cout << "Test case #2: Transfer ownership" << std::endl;
     test_copyback_and_free(Queue1, Queue2,
-                           ext::oneapi::level_zero::ownership::transfer,
-                           /*AccessOnHostBeforeCopyBack*/ false);
+                           ext::oneapi::level_zero::ownership::transfer);
 
-    std::cout << "Test case #3: Keep ownership, host access before copy back"
-              << std::endl;
-    test_copyback_and_free(Queue1, Queue2,
-                           ext::oneapi::level_zero::ownership::keep,
-                           /*AccessOnHostBeforeCopyBack*/ true);
-  } catch (sycl::exception &e) {
+  } catch (exception &e) {
     std::cout << e.what() << std::endl;
   }
 #else