More cleanup

Author: sergey-semenov

sycl/include/sycl/detail/ur.hpp

@@ -31,13 +31,6 @@ typedef void (*pi_context_extended_deleter)(void *user_data);
 struct _sycl_device_binary_property_struct;
 using sycl_device_binary_property = _sycl_device_binary_property_struct*;
 
-#ifdef XPTI_ENABLE_INSTRUMENTATION
-// Forward declarations
-namespace xpti {
-struct trace_event_data_t;
-}
-#endif
-
 namespace sycl {
 inline namespace _V1 {
 

sycl/include/sycl/ext/intel/experimental/pipes.hpp

@@ -24,11 +24,6 @@
 #include <sycl/ext/oneapi/latency_control/properties.hpp>
 #endif
 
-#ifdef XPTI_ENABLE_INSTRUMENTATION
-#include <xpti/xpti_data_types.h>
-#include <xpti/xpti_trace_framework.hpp>
-#endif
-
 #include <stdint.h> // for int32_t
 #include <string>   // for string
 #include <tuple>    // for _Swallow_...

sycl/include/sycl/range.hpp

@@ -229,18 +229,5 @@ range(size_t, size_t)->range<2>;
 range(size_t, size_t, size_t)->range<3>;
 #endif
 
-namespace detail {
-// XPTI helpers for creating array from a range.
-inline std::array<size_t, 3> rangeToArray(const range<3> &r) {
-  return {r[0], r[1], r[2]};
-}
-inline std::array<size_t, 3> rangeToArray(const range<2> &r) {
-  return {r[0], r[1], 0};
-}
-inline std::array<size_t, 3> rangeToArray(const range<1> &r) {
-  return {r[0], 0, 0};
-}
-} // namespace detail
-
 } // namespace _V1
 } // namespace sycl

sycl/source/handler.cpp

@@ -484,7 +484,6 @@ event handler::finalize() {
                     "Internal Error. Command group cannot be constructed.");
 
   // Propagate MIsTopCodeLoc state to CommandGroup.
-  // Will be used for XPTI payload generation for CG's related events.
   CommandGroup->MIsTopCodeLoc = impl->MIsTopCodeLoc;
 
   // If there is a graph associated with the handler we are in the explicit

sycl/test/abi/layout_accessors_device.cpp

@@ -20,7 +20,7 @@ SYCL_EXTERNAL void hostAcc(accessor<int, 1, access::mode::read, access::target::
 // CHECK-NEXT: 0 |   class sycl::detail::accessor_common<int, 1, sycl::access::mode::read, sycl::access::target::global_buffer, sycl::access::placeholder::false_t> (base) (empty)
 // CHECK-NEXT: 0 |   class sycl::detail::OwnerLessBase<class sycl::accessor<int, 1, sycl::access::mode::read, sycl::access::target::global_buffer> > (base) (empty)
 // CHECK-NEXT: 0 |   class sycl::detail::AccessorImplDevice<1> impl
-// CHECK-NEXT: 0 |     class sycl::id<1> Offset
+// CHECK-NEXT: 0 |     class sycl::id<> Offset
 // CHECK-NEXT: 0 |       class sycl::detail::array<> (base)
 // CHECK-NEXT: 0 |         size_t[1] common_array
 // CHECK-NEXT: 8 |     class sycl::range<> AccessRange
@@ -52,7 +52,7 @@ SYCL_EXTERNAL void hostAcc(accessor<int, 1, access::mode::read_write, access::ta
 // CHECK-NEXT: 8 |       class sycl::range<> MemRange
 // CHECK-NEXT: 8 |         class sycl::detail::array<> (base)
 // CHECK-NEXT: 8 |           size_t[1] common_array
-// CHECK-NEXT: 16 |       class sycl::id<1> Offset
+// CHECK-NEXT: 16 |       class sycl::id<> Offset
 // CHECK-NEXT: 16 |         class sycl::detail::array<> (base)
 // CHECK-NEXT: 16 |           size_t[1] common_array
 // CHECK-NEXT: 24 |     ConcreteASPtrType MData
@@ -74,7 +74,7 @@ SYCL_EXTERNAL void hostAcc(local_accessor<int, 1> Acc) {
 // CHECK-NEXT: 8 |       class sycl::range<> MemRange
 // CHECK-NEXT: 8 |         class sycl::detail::array<> (base)
 // CHECK-NEXT: 8 |           size_t[1] common_array
-// CHECK-NEXT: 16 |       class sycl::id<1> Offset
+// CHECK-NEXT: 16 |       class sycl::id<> Offset
 // CHECK-NEXT: 16 |         class sycl::detail::array<> (base)
 // CHECK-NEXT: 16 |           size_t[1] common_array
 // CHECK-NEXT: 24 |     ConcreteASPtrType MData

sycl/test/gdb/accessors-device.cpp

@@ -17,7 +17,7 @@ int main() {
 // AccessorImplDevice must have MemRange and Offset fields
 
 // CHECK:           0 | class sycl::detail::AccessorImplDevice<1>
-// CHECK-NEXT:      0 |   class sycl::id<1> Offset
+// CHECK-NEXT:      0 |   class sycl::id<> Offset
 // CHECK-NEXT:      0 |     class sycl::detail::array<> (base)
 // CHECK-NEXT:      0 |       size_t[1] common_array
 // CHECK-NEXT:      8 |   class sycl::range<> AccessRange
@@ -35,7 +35,7 @@ int main() {
 // CHECK-NEXT:      0 |   class sycl::detail::accessor_common<int, 1, sycl::access::mode::read_write, sycl::access::target::global_buffer, sycl::access::placeholder::false_t> (base) (empty)
 // CHECK-NEXT:      0 |   class sycl::detail::OwnerLessBase<class sycl::accessor<int, 1, sycl::access::mode::read_write, sycl::access::target::global_buffer, sycl::access::placeholder::false_t> > (base) (empty)
 // CHECK-NEXT:      0 |   class sycl::detail::AccessorImplDevice<1> impl
-// CHECK-NEXT:      0 |     class sycl::id<1> Offset
+// CHECK-NEXT:      0 |     class sycl::id<> Offset
 // CHECK-NEXT:      0 |       class sycl::detail::array<> (base)
 // CHECK-NEXT:      0 |         size_t[1] common_array
 // CHECK-NEXT:      8 |     class sycl::range<> AccessRange

sycl/test/gdb/printers.cpp

@@ -68,7 +68,7 @@ sycl::range<1> r(3);
 // CHECK:        24 |       element_type * _M_ptr
 
 // DEVICE:        0 | class sycl::detail::AccessorImplDevice<1>
-// DEVICE:        0 |   class sycl::id<1> Offset
+// DEVICE:        0 |   class sycl::id<> Offset
 // DEVICE:        8 |   class sycl::range<> AccessRange
 // DEVICE:       16 |   class sycl::range<> MemRange