tidy up and enable use of upstream headers

Author: bashbaug

layers/99_svmplusplus/emulate.cpp

@@ -21,6 +21,14 @@
 
 #include "emulate.h"
 
+// !!! TODO: When removing this code block, also if the SVM type macros have
+// also been updated!
+#if !defined(CL_SVM_CAPABILITY_CREATE_BUFFER_KHR)
+#define CL_SVM_CAPABILITY_CREATE_BUFFER_KHR                 (1 << 15)
+#else
+#pragma message("CL_SVM_CAPABILITY_CREATE_BUFFER_KHR is now properly defined.")
+#endif
+
 static constexpr cl_version version_cl_khr_unified_svm =
     CL_MAKE_VERSION(0, 2, 0);
 
@@ -129,6 +137,7 @@ static cl_svm_capabilities_khr getCoarseGrainSVMCaps(cl_device_id device)
 
     if (svmCaps & CL_DEVICE_SVM_COARSE_GRAIN_BUFFER) {
         ret = CL_SVM_TYPE_MACRO_COARSE_GRAIN_BUFFER_KHR;
+        ret |= CL_SVM_CAPABILITY_CREATE_BUFFER_KHR;
     }
 
     return ret;
@@ -148,6 +157,8 @@ static cl_svm_capabilities_khr getFineGrainSVMCaps(cl_device_id device)
 
     if (svmCaps & CL_DEVICE_SVM_FINE_GRAIN_BUFFER) {
         ret = CL_SVM_TYPE_MACRO_FINE_GRAIN_BUFFER_KHR;
+        ret |= CL_SVM_CAPABILITY_CREATE_BUFFER_KHR;
+
 
         if (svmCaps & CL_DEVICE_SVM_ATOMICS) {
             ret |= CL_SVM_CAPABILITY_CONCURRENT_ATOMIC_ACCESS_KHR;
@@ -177,8 +188,15 @@ static cl_svm_capabilities_khr getSystemSVMCaps(cl_device_id device)
         &usmCaps,
         nullptr);
 
-    if (svmCaps & CL_DEVICE_SVM_FINE_GRAIN_SYSTEM || usmCaps != 0) {
+    if (svmCaps & CL_DEVICE_SVM_FINE_GRAIN_SYSTEM) {
+        ret = CL_SVM_TYPE_MACRO_SYSTEM_KHR;
+        ret |= CL_SVM_CAPABILITY_CREATE_BUFFER_KHR;
+    }
+    else if(usmCaps != 0) {
         ret = CL_SVM_TYPE_MACRO_SYSTEM_KHR;
+        ret |= CL_SVM_CAPABILITY_CREATE_BUFFER_KHR;
+        // USM does not currently support mapping system memory.
+        ret &= ~CL_SVM_CAPABILITY_HOST_MAP_KHR;
     }
 
     return ret;

samples/usvm/00_usvmqueries/main.cpp

@@ -10,6 +10,12 @@
 
 #include <cinttypes>
 
+#if !defined(CL_SVM_CAPABILITY_CREATE_BUFFER_KHR)
+#define CL_SVM_CAPABILITY_CREATE_BUFFER_KHR                 (1 << 15)
+#else
+#pragma message("CL_SVM_CAPABILITY_CREATE_BUFFER_KHR is now properly defined.")
+#endif
+
 static inline bool has_all_svm_caps(
     cl_svm_capabilities_khr caps,
     cl_svm_capabilities_khr check)
@@ -64,7 +70,7 @@ void PrintUSVMCaps(
         ( svmcaps & CL_SVM_CAPABILITY_CONCURRENT_ACCESS_KHR        ) ? "\n\t\t\tCL_SVM_CAPABILITY_CONCURRENT_ACCESS_KHR"         : "",
         ( svmcaps & CL_SVM_CAPABILITY_CONCURRENT_ATOMIC_ACCESS_KHR ) ? "\n\t\t\tCL_SVM_CAPABILITY_CONCURRENT_ATOMIC_ACCESS_KHR"  : "",
         ( svmcaps & CL_SVM_CAPABILITY_INDIRECT_ACCESS_KHR          ) ? "\n\t\t\tCL_SVM_CAPABILITY_INDIRECT_ACCESS_KHR"           : "",
-		( svmcaps & CL_SVM_CAPABILITY_CREATE_BUFFER_KHR            ) ? "\n\t\t\tCL_SVM_CAPABILITY_CREATE_BUFFER_KHR"             : "");
+        ( svmcaps & CL_SVM_CAPABILITY_CREATE_BUFFER_KHR            ) ? "\n\t\t\tCL_SVM_CAPABILITY_CREATE_BUFFER_KHR"             : "");
 }
 
 int main(