[SYCL][CUDA] Implement the Intel USM extension for the CUDA backend (#1241)

fwyzard · web-flow · commit 498d56c64e6a · 2020-03-14T18:22:34.000+03:00
Device
  - USM-related calls to piDeviceGetInfo

Kernel
  - piextKernelSetArgPointer

USM
  - piextUSMHostAlloc
  - piextUSMDeviceAlloc
  - piextUSMSharedAlloc
  - piextUSMFree
  - piextUSMEnqueueMemset
  - piextUSMEnqueueMemcpy
  - piextUSMEnqueuePrefetch (*)
  - piextUSMEnqueueMemAdvise (*)
  - piextUSMGetMemAllocInfo

(*) due to the incomplete documentation of the USM extension:
  - piextUSMEnqueuePrefetch ignores the "flags" argument;
  - piextUSMEnqueueMemAdvise does nothing.

* Fix CUDA version conversion
* Mark LIT tests for supported USM features

Signed-off-by: Andrea Bocci &lt;andrea.bocci@cern.ch&gt;
diff --git a/sycl/plugins/cuda/pi_cuda.cpp b/sycl/plugins/cuda/pi_cuda.cpp
diff --git a/sycl/test/usm/allocator_vector.cpp b/sycl/test/usm/allocator_vector.cpp
@@ -2,7 +2,6 @@
 // RUN: env SYCL_DEVICE_TYPE=HOST %t1.out
 // RUN: %CPU_RUN_PLACEHOLDER %t1.out
 // RUN: %GPU_RUN_PLACEHOLDER %t1.out
-// XFAIL: cuda
 
 //==---- allocator_vector.cpp - Allocator Container test -------------------==//
 //
diff --git a/sycl/test/usm/allocator_vector_fail.cpp b/sycl/test/usm/allocator_vector_fail.cpp
@@ -2,7 +2,6 @@
 // RUN: env SYCL_DEVICE_TYPE=HOST %t1.out
 // RUN: %CPU_RUN_PLACEHOLDER %t1.out
 // RUN: %GPU_RUN_PLACEHOLDER %t1.out
-// XFAIL: cuda
 
 //==-- allocator_vector_fail.cpp - Device Memory Allocator fail test -------==//
 //
diff --git a/sycl/test/usm/allocatorll.cpp b/sycl/test/usm/allocatorll.cpp
@@ -2,7 +2,6 @@
 // RUN: env SYCL_DEVICE_TYPE=HOST %t1.out
 // RUN: %CPU_RUN_PLACEHOLDER %t1.out
 // RUN: %GPU_RUN_PLACEHOLDER %t1.out
-// XFAIL: cuda
 
 //==---- allocatorll.cpp - Device Memory Linked List Allocator test --------==//
 //
diff --git a/sycl/test/usm/badmalloc.cpp b/sycl/test/usm/badmalloc.cpp
@@ -4,7 +4,6 @@
 // RUN: %GPU_RUN_PLACEHOLDER %t1.out
 
 // UNSUPPORTED: windows
-// XFAIL: cuda
 
 //==----------------- badmalloc.cpp - Bad Mallocs test ---------------------==//
 //
diff --git a/sycl/test/usm/depends_on.cpp b/sycl/test/usm/depends_on.cpp
@@ -2,7 +2,6 @@
 // RUN: env SYCL_DEVICE_TYPE=HOST %t1.out
 // RUN: %CPU_RUN_PLACEHOLDER %t1.out
 // RUN: %GPU_RUN_PLACEHOLDER %t1.out
-// XFAIL: cuda
 
 //==----------------- depends_on.cpp - depends_on test ---------------------==//
 //
diff --git a/sycl/test/usm/dmemll.cpp b/sycl/test/usm/dmemll.cpp
@@ -2,7 +2,6 @@
 // RUN: env SYCL_DEVICE_TYPE=HOST %t1.out
 // RUN: %CPU_RUN_PLACEHOLDER %t1.out
 // RUN: %GPU_RUN_PLACEHOLDER %t1.out
-// XFAIL: cuda
 
 //==------------------- dmemll.cpp - Device Memory Linked List test --------==//
 //
diff --git a/sycl/test/usm/dmemllaligned.cpp b/sycl/test/usm/dmemllaligned.cpp
@@ -2,7 +2,6 @@
 // RUN: env SYCL_DEVICE_TYPE=HOST %t1.out
 // RUN: %CPU_RUN_PLACEHOLDER %t1.out
 // RUN: %GPU_RUN_PLACEHOLDER %t1.out
-// XFAIL: cuda
 
 //==---- dmemllaligned.cpp - Aligned Device Memory Linked List test --------==//
 //
diff --git a/sycl/test/usm/hmemll.cpp b/sycl/test/usm/hmemll.cpp
@@ -2,7 +2,6 @@
 // RUN: env SYCL_DEVICE_TYPE=HOST %t1.out
 // RUN: %CPU_RUN_PLACEHOLDER %t1.out
 // RUN: %GPU_RUN_PLACEHOLDER %t1.out
-// XFAIL: cuda
 
 //==------------------- hmemll.cpp - Host Memory Linked List test ----------==//
 //
diff --git a/sycl/test/usm/hmemllaligned.cpp b/sycl/test/usm/hmemllaligned.cpp
@@ -2,7 +2,6 @@
 // RUN: env SYCL_DEVICE_TYPE=HOST %t1.out
 // RUN: %CPU_RUN_PLACEHOLDER %t1.out
 // RUN: %GPU_RUN_PLACEHOLDER %t1.out
-// XFAIL: cuda
 
 //==---- hmemllaligned.cpp - Aligned Host Memory Linked List test ----------==//
 //
diff --git a/sycl/test/usm/memadvise.cpp b/sycl/test/usm/memadvise.cpp
@@ -2,7 +2,6 @@
 // RUN: env SYCL_DEVICE_TYPE=HOST %t1.out
 // RUN: %CPU_RUN_PLACEHOLDER %t1.out
 // RUN: %GPU_RUN_PLACEHOLDER %t1.out
-// XFAIL: cuda
 
 //==---------------- memadvise.cpp - Shared Memory Linked List test --------==//
 //
diff --git a/sycl/test/usm/memcpy.cpp b/sycl/test/usm/memcpy.cpp
@@ -8,7 +8,6 @@
 // RUN: %clangxx -fsycl %s -o %t1.out
 // RUN: %CPU_RUN_PLACEHOLDER %t1.out
 // RUN: %GPU_RUN_PLACEHOLDER %t1.out
-// XFAIL: cuda
 
 #include <CL/sycl.hpp>
 
diff --git a/sycl/test/usm/memset.cpp b/sycl/test/usm/memset.cpp
@@ -1,14 +1,14 @@
+// RUN: %clangxx -fsycl %s -o %t1.out
+// RUN: %CPU_RUN_PLACEHOLDER %t1.out
+// RUN: %GPU_RUN_PLACEHOLDER %t1.out
+
 //==---- memset.cpp - USM memset test --------------------------------------==//
 //
 // 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
 //
 //===----------------------------------------------------------------------===//
-// RUN: %clangxx -fsycl %s -o %t1.out
-// RUN: %CPU_RUN_PLACEHOLDER %t1.out
-// RUN: %GPU_RUN_PLACEHOLDER %t1.out
-// XFAIL: cuda
 
 #include <CL/sycl.hpp>
 
diff --git a/sycl/test/usm/mixed.cpp b/sycl/test/usm/mixed.cpp
@@ -2,7 +2,6 @@
 // RUN: env SYCL_DEVICE_TYPE=HOST %t1.out
 // RUN: %CPU_RUN_PLACEHOLDER %t1.out
 // RUN: %GPU_RUN_PLACEHOLDER %t1.out
-// XFAIL: cuda
 
 //==------------------- mixed.cpp - Mixed Memory test ---------------------==//
 //
diff --git a/sycl/test/usm/mixed2.cpp b/sycl/test/usm/mixed2.cpp
@@ -2,7 +2,6 @@
 // RUN: env SYCL_DEVICE_TYPE=HOST %t1.out
 // RUN: %CPU_RUN_PLACEHOLDER %t1.out
 // RUN: %GPU_RUN_PLACEHOLDER %t1.out
-// XFAIL: cuda
 
 //==------------------- mixed2.cpp - Mixed Memory test ---------------------==//
 //
diff --git a/sycl/test/usm/mixed_queue.cpp b/sycl/test/usm/mixed_queue.cpp
@@ -2,7 +2,6 @@
 // RUN: env SYCL_DEVICE_TYPE=HOST %t1.out
 // RUN: %CPU_RUN_PLACEHOLDER %t1.out
 // RUN: %GPU_RUN_PLACEHOLDER %t1.out
-// XFAIL: cuda
 
 //==-------------- mixed_queue.cpp - Mixed Memory test ---------------------==//
 //
diff --git a/sycl/test/usm/smemll.cpp b/sycl/test/usm/smemll.cpp
@@ -2,7 +2,6 @@
 // RUN: env SYCL_DEVICE_TYPE=HOST %t1.out
 // RUN: %CPU_RUN_PLACEHOLDER %t1.out
 // RUN: %GPU_RUN_PLACEHOLDER %t1.out
-// XFAIL: cuda
 
 //==------------------- smemll.cpp - Shared Memory Linked List test --------==//
 //
diff --git a/sycl/test/usm/smemllaligned.cpp b/sycl/test/usm/smemllaligned.cpp
@@ -2,7 +2,6 @@
 // RUN: env SYCL_DEVICE_TYPE=HOST %t1.out
 // RUN: %CPU_RUN_PLACEHOLDER %t1.out
 // RUN: %GPU_RUN_PLACEHOLDER %t1.out
-// XFAIL: cuda
 
 //==---- smemllaligned.cpp - Aligned Shared Memory Linked List test --------==//
 //
