Print failing line, remove template type paramter by using decltype

Author: aelovikov-intel

SYCL/USM/allocator_rebind.cpp

@@ -14,6 +14,8 @@
 
 #include <sycl.hpp>
 
+#include <iostream>
+
 using namespace sycl;
 
 // Allocator has a minimum internal alignment of 64, so use higher values for
@@ -25,17 +27,20 @@ struct alignas(128) Aligned128 {
   int x;
 };
 
-template <class T, class Allocator>
-void test_align(Allocator alloc, size_t Align) {
-  std::vector<T *> Ptrs;
-  for (int i = 0; i < 10; ++i)
-    Ptrs.push_back(alloc.allocate(1));
+template <class Allocator>
+void test_align(Allocator alloc, size_t Align, int Line = __builtin_LINE()) {
+  decltype(alloc.allocate(1)) Ptrs[10];
+  for (auto *&Elem : Ptrs)
+    Elem = alloc.allocate(1);
 
   int NumExactlyAligned = 0;
 
-  for (T *Ptr : Ptrs) {
+  for (auto *Ptr : Ptrs) {
     auto Val = reinterpret_cast<uintptr_t>(Ptr);
-    assert((Val & (Align - 1)) == 0 && "Not properly aligned!");
+    if ((Val & (Align - 1)) != 0) {
+      std::cout << "Failed at line " << Line << std::endl;
+      assert(false && "Not properly aligned!");
+    }
     if ((Val & (Align * 2 - 1)) != 0)
       ++NumExactlyAligned;
   }
@@ -50,9 +55,12 @@ void test_align(Allocator alloc, size_t Align) {
   // needs to be updated to find configuration where we still test our runtime
   // by ensuring that underlying allocations' alignment differs between
   // Aligned128/Aligned256.
-  assert(NumExactlyAligned != 0 && "All allocations are over-aligned!");
+  if (NumExactlyAligned == 0) {
+    std::cout << "Failed at line " << Line << std::endl;
+    assert(false && "All allocations are over-aligned!");
+  }
 
-  for (T *Ptr : Ptrs)
+  for (auto *Ptr : Ptrs)
     alloc.deallocate(Ptr, 1);
 }
 
@@ -67,24 +75,24 @@ int main() {
   {
     // Test default value of Alignment template parameter.
     usm_allocator<Aligned256, usm::alloc::host> alloc(ctx, dev);
-    test_align<Aligned256>(alloc, 256);
+    test_align(alloc, 256);
 
     using traits_t = std::allocator_traits<decltype(alloc)>;
     using rebind_t = typename traits_t::template rebind_alloc<Aligned128>;
     rebind_t alloc_rebound = alloc;
-    test_align<Aligned128>(alloc_rebound, 128);
+    test_align(alloc_rebound, 128);
   }
 
   {
     // Test explicit value of Alignment template parameter.
     usm_allocator<Aligned256, usm::alloc::host, 256> alloc(ctx, dev);
-    test_align<Aligned256>(alloc, 256);
+    test_align(alloc, 256);
     using traits_t = std::allocator_traits<decltype(alloc)>;
     using rebind_t = typename traits_t::template rebind_alloc<Aligned128>;
     rebind_t alloc_rebound = alloc;
     // Rebound allocator must use the higher alignment from the explicit
     // template parameter, not the type's alignment.
-    test_align<Aligned128>(alloc_rebound, 256);
+    test_align(alloc_rebound, 256);
   }
 
   return 0;