Remove duplicate device_global decl

Update some tests

Signed-off-by: JackAKirk <[email protected]>

Author: JackAKirk

sycl/include/sycl/ext/oneapi/device_global/device_global.hpp

@@ -10,8 +10,7 @@
 
 #include <sycl/access/access.hpp>                       // for address_space
 #include <sycl/exception.hpp>                           // for make_error_code
-#include <sycl/ext/oneapi/device_global/properties.hpp> // for device_image...
-#include <sycl/ext/oneapi/properties/properties.hpp>    // for properties_t
+#include <sycl/ext/oneapi/device_global/properties.hpp> // for device_image... , for properties_t
 #include <sycl/multi_ptr.hpp>                           // for multi_ptr
 #include <sycl/pointers.hpp>                            // for decorated_gl...
 
@@ -40,9 +39,6 @@ namespace sycl {
 inline namespace _V1 {
 namespace ext::oneapi::experimental {
 
-template <typename T, typename PropertyListT, typename Condition>
-class device_global;
-
 namespace detail {
 // Type-trait for checking if a type defines `operator->`.
 template <typename T, typename = void>
@@ -193,7 +189,7 @@ class device_global_base<
 
 } // namespace detail
 
-template <typename T, typename PropertyListT, typename Condition>
+template <typename T, typename PropertyListT, typename>
 class
 #ifdef __SYCL_DEVICE_ONLY__
     // FIXME: Temporary work-around. Remove when fixed.

sycl/test-e2e/DeviceGlobal/device_global_copy.cpp

@@ -30,11 +30,15 @@ oneapiext::device_global<const int> DGInit5{7};
 oneapiext::device_global<const int, decltype(oneapiext::properties{
                                         oneapiext::host_access_read})>
     DGCopy5{DGInit5};
+oneapiext::device_global<const int, decltype(oneapiext::properties{
+                                        oneapiext::device_constant})>
+    DGInit6{8};
+oneapiext::device_global<const int> DGCopy6{DGInit6};
 
 int main() {
   sycl::queue Q;
 
-  int ReadVals[10] = {0, 0};
+  int ReadVals[12] = {0, 0};
   {
     sycl::buffer<int, 1> ReadValsBuff{ReadVals, 10};
 
@@ -51,6 +55,8 @@ int main() {
          ReadValsAcc[7] = DGCopy4.get();
          ReadValsAcc[8] = DGInit5.get();
          ReadValsAcc[9] = DGCopy5.get();
+         ReadValsAcc[10] = DGInit6.get();
+         ReadValsAcc[11] = DGCopy6.get();
        });
      }).wait_and_throw();
   }
@@ -65,6 +71,8 @@ int main() {
   assert(ReadVals[7] == 6);
   assert(ReadVals[8] == 7);
   assert(ReadVals[9] == 7);
+  assert(ReadVals[10] == 8);
+  assert(ReadVals[11] == 8);
 
   return 0;
 }

sycl/test/e2e_test_requirements/no-unsupported-without-info.cpp

@@ -54,7 +54,7 @@
 // tests to match the required format and in that case you should just update
 // (i.e. reduce) the number and the list below.
 //
-// NUMBER-OF-UNSUPPORTED-WITHOUT-INFO: 381
+// NUMBER-OF-UNSUPPORTED-WITHOUT-INFO: 382
 //
 // List of improperly UNSUPPORTED tests.
 // Remove the CHECK once the test has been properly UNSUPPORTED.