[SYCL] Refactor MultipleDevices test

Previous scenario:
data was transferred from host and cpu devices

Added new scenatio:
data is transferred between two cpu devices.

Signed-off-by: Dmitry Sidorov <[email protected]>

Author: MrSidims

sycl/test/scheduler/MultipleDevices.cpp

@@ -14,89 +14,96 @@
 
 using namespace cl::sycl;
 
-int main() {
+int multidevice_test(queue MyQueue1, queue MyQueue2) {
   const size_t N = 100;
-  {
-    host_selector HOSTSelector;
-    queue MyQueue1(HOSTSelector);
-    queue MyQueue2(HOSTSelector);
-    try {
-      cpu_selector CPUSelector;
-      MyQueue2 = queue(CPUSelector);
-    } catch (cl::sycl::invalid_parameter_error &) {
-      std::cout << "Using 2 host devices." << std::endl;
-    }
 
-    buffer<int, 1> BufA(range<1>{N});
-    buffer<int, 1> BufB(range<1>{N});
-    buffer<int, 1> BufC(range<1>{N});
-    buffer<int, 1> BufD(range<1>{N});
+  buffer<int, 1> BufA(range<1>{N});
+  buffer<int, 1> BufB(range<1>{N});
+  buffer<int, 1> BufC(range<1>{N});
+  buffer<int, 1> BufD(range<1>{N});
 
-    MyQueue1.submit([&](handler &cgh) {
-      auto A = BufA.get_access<access::mode::write>(cgh);
-      cgh.parallel_for<class init_a>(
-          range<1>{N}, [=](id<1> index) { A[index[0]] = index[0]; });
-    });
+  MyQueue1.submit([&](handler &cgh) {
+    auto A = BufA.get_access<access::mode::write>(cgh);
+    cgh.parallel_for<class init_a>(
+        range<1>{N}, [=](id<1> index) { A[index[0]] = index[0]; });
+  });
 
-    MyQueue2.submit([&](handler &cgh) {
-      auto B = BufB.get_access<access::mode::write>(cgh);
-      cgh.parallel_for<class init_b>(
-          range<1>{N}, [=](id<1> index) { B[index[0]] = N - index[0]; });
-    });
+  MyQueue2.submit([&](handler &cgh) {
+    auto B = BufB.get_access<access::mode::write>(cgh);
+    cgh.parallel_for<class init_b>(
+        range<1>{N}, [=](id<1> index) { B[index[0]] = N - index[0]; });
+  });
 
-    MyQueue2.submit([&](handler& cgh) {
-      auto A = BufA.get_access<access::mode::read>(cgh);
-      auto B = BufB.get_access<access::mode::read_write>(cgh);
-      auto C = BufC.get_access<access::mode::write>(cgh);
-      cgh.parallel_for<class op1>(range<1>{N}, [=](id<1> index) {
-        B[index[0]] = B[index[0]] + A[index[0]];
-        C[index[0]] = B[index[0]] - index[0];
-      });
+  MyQueue2.submit([&](handler& cgh) {
+    auto A = BufA.get_access<access::mode::read>(cgh);
+    auto B = BufB.get_access<access::mode::read_write>(cgh);
+    auto C = BufC.get_access<access::mode::write>(cgh);
+    cgh.parallel_for<class op1>(range<1>{N}, [=](id<1> index) {
+      B[index[0]] = B[index[0]] + A[index[0]];
+      C[index[0]] = B[index[0]] - index[0];
     });
+  });
 
-    MyQueue2.submit([&](handler &cgh) {
-      auto D = BufD.get_access<access::mode::write>(cgh);
-      cgh.parallel_for<class init_d>(range<1>{N},
-                                     [=](id<1> index) { D[index[0]] = 1; });
-    });
+  MyQueue2.submit([&](handler &cgh) {
+    auto D = BufD.get_access<access::mode::write>(cgh);
+    cgh.parallel_for<class init_d>(range<1>{N},
+                                   [=](id<1> index) { D[index[0]] = 1; });
+  });
 
-    MyQueue1.submit([&](handler& cgh) {
-      auto B = BufB.get_access<access::mode::read>(cgh);
-      auto C = BufC.get_access<access::mode::read>(cgh);
-      auto D = BufD.get_access<access::mode::read_write>(cgh);
-      cgh.parallel_for<class op2>(range<1>{N}, [=](id<1> index) {
-        D[index[0]] = D[index[0]] + B[index[0]] - C[index[0]];
-      });
+  MyQueue1.submit([&](handler& cgh) {
+    auto B = BufB.get_access<access::mode::read>(cgh);
+    auto C = BufC.get_access<access::mode::read>(cgh);
+    auto D = BufD.get_access<access::mode::read_write>(cgh);
+    cgh.parallel_for<class op2>(range<1>{N}, [=](id<1> index) {
+      D[index[0]] = D[index[0]] + B[index[0]] - C[index[0]];
     });
+  });
+
+  auto FinalD = BufD.get_access<access::mode::read>();
+  std::cout << "Result:" << std::endl;
+  for (size_t i = 0; i < N; i++) {
+
+    // A[index[0]] = index[0];
+    int A = i;
+    // B[index[0]] = N - index[0];
+    int B = N - i;
+    // B[index[0]] = B[index[0]] + A[index[0]];
+    B = B + A;
+    // C[index[0]] = B[index[0]] - index[0];
+    int C = B - i;
+    // D[index[0]] = 1;
+    int D = 1;
+    // D[index[0]] = D[index[0]] + B[index[0]] - C[index[0]];
+    D = D + B - C;
 
-    auto FinalD = BufD.get_access<access::mode::read>();
-    std::cout << "Result:" << std::endl;
-    for (size_t i = 0; i < N; i++) {
-
-      // A[index[0]] = index[0];
-      int A = i;
-      // B[index[0]] = N - index[0];
-      int B = N - i;
-      // B[index[0]] = B[index[0]] + A[index[0]];
-      B = B + A;
-      // C[index[0]] = B[index[0]] - index[0];
-      int C = B - i;
-      // D[index[0]] = 1;
-      int D = 1;
-      // D[index[0]] = D[index[0]] + B[index[0]] - C[index[0]];
-      D = D + B - C;
-
-      int Expected = D;
-
-      if (FinalD[i] != D) {
-        std::cout << "Wrong value for element " << i
-                  << " Expected: " << Expected << " Got: " << FinalD[i]
-                  << std::endl;
-        return -1;
-      }
+    int Expected = D;
+
+    if (FinalD[i] != D) {
+      std::cout << "Wrong value for element " << i
+                << " Expected: " << Expected << " Got: " << FinalD[i]
+                << std::endl;
+      return -1;
     }
   }
 
   std::cout << "Good computation!" << std::endl;
   return 0;
 }
+
+int main() {
+  host_selector HOSTSelector;
+  queue MyQueue1(HOSTSelector);
+  queue MyQueue2(HOSTSelector);
+  int Result = -1;
+  try {
+    cpu_selector CPUSelector;
+    MyQueue1 = queue(CPUSelector);
+    Result = multidevice_test(MyQueue1, MyQueue2);
+    MyQueue2 = queue(CPUSelector);
+    Result |= multidevice_test(MyQueue1, MyQueue2);
+  } catch (cl::sycl::invalid_parameter_error &) {
+    std::cout << "Using 2 host devices." << std::endl;
+  }
+
+  return Result;
+}