Corrections to tests.

Author: rdeodhar

sycl/include/sycl/ext/oneapi/matrix/matrix-tensorcore.hpp

@@ -7,7 +7,7 @@
 // ===--------------------------------------------------------------------=== //
 
 #pragma once
-#include <sycl/ext/oneapi/experimental/bfloat16.hpp>
+#include <sycl/ext/oneapi/bfloat16.hpp>
 
 __SYCL_INLINE_NAMESPACE(cl) {
 namespace sycl {
@@ -219,8 +219,7 @@ struct joint_matrix_load_impl<
                 S, Use, NumRows, NumCols, Layout, sycl::sub_group> &res,
             multi_ptr<T, Space> src, size_t stride) {
     if constexpr (std::is_same<T, uint16_t>::value ||
-                  std::is_same<
-                      T, sycl::ext::oneapi::experimental::bfloat16>::value) {
+                  std::is_same<T, sycl::ext::oneapi::bfloat16>::value) {
       auto tileptr = reinterpret_cast<int32_t const *>(src.get());
       auto destptr = reinterpret_cast<int32_t *>(&res.wi_marray);
       if constexpr (NumRows == 16 && NumCols == 16) {
@@ -585,8 +584,8 @@ struct joint_matrix_mad_impl<
               get_layout_pair_id<LayoutA, LayoutB>(), 0);
         }
       } else if constexpr (std::is_same<T1, uint16_t>::value ||
-                           std::is_same<T1, sycl::ext::oneapi::experimental::
-                                                bfloat16>::value) {
+                           std::is_same<T1,
+                                        sycl::ext::oneapi::bfloat16>::value) {
         __mma_bf16_m16n16k16_mma_f32(
             reinterpret_cast<float *>(&D.wi_marray),
             reinterpret_cast<int32_t const *>(&A.wi_marray),
@@ -622,8 +621,8 @@ struct joint_matrix_mad_impl<
               get_layout_pair_id<LayoutA, LayoutB>(), 0);
         }
       } else if constexpr (std::is_same<T1, uint16_t>::value ||
-                           std::is_same<T1, sycl::ext::oneapi::experimental::
-                                                bfloat16>::value) {
+                           std::is_same<T1,
+                                        sycl::ext::oneapi::bfloat16>::value) {
         __mma_bf16_m8n32k16_mma_f32(
             reinterpret_cast<float *>(&D.wi_marray),
             reinterpret_cast<int32_t const *>(&A.wi_marray),
@@ -645,8 +644,8 @@ struct joint_matrix_mad_impl<
                                  get_layout_pair_id<LayoutA, LayoutB>(), 0);
         }
       } else if constexpr (std::is_same<T1, uint16_t>::value ||
-                           std::is_same<T1, sycl::ext::oneapi::experimental::
-                                                bfloat16>::value) {
+                           std::is_same<T1,
+                                        sycl::ext::oneapi::bfloat16>::value) {
         __mma_bf16_m32n8k16_mma_f32(
             reinterpret_cast<float *>(&D.wi_marray),
             reinterpret_cast<int32_t const *>(&A.wi_marray),

sycl/test/check_device_code/matrix/matrix-nvptx-bfloat16-test.cpp

@@ -6,7 +6,7 @@
 
 using namespace sycl;
 using namespace sycl::ext::oneapi::experimental::matrix;
-using sycl::ext::oneapi::experimental::bfloat16;
+using sycl::ext::oneapi::bfloat16;
 
 constexpr int stride = 16;
 

sycl/test/matrix/matrix-bfloat16-test.cpp

@@ -4,7 +4,7 @@
 #include <iostream>
 
 using namespace sycl::ext::oneapi::experimental::matrix;
-using bfloat16 = sycl::ext::oneapi::experimental::bfloat16;
+using bfloat16 = sycl::ext::oneapi::bfloat16;
 
 static constexpr auto TILE_SZ = 16;
 static constexpr auto TM = TILE_SZ - 1;