[SYCL][Matrix] Fix bfloat16 namespace in the legacy tests (intel#1478)

Author: dkhaldi

SYCL/Matrix/Legacy/XMX8/joint_matrix_bfloat16.cpp

@@ -25,10 +25,14 @@
 using namespace sycl;
 using namespace sycl::ext::oneapi::experimental::matrix;
 <<<<<<< HEAD
+<<<<<<< HEAD
 using bfloat16 = sycl::ext::oneapi::bfloat16;
 =======
 using bfloat16 = sycl::ext::oneapi::experimental::bfloat16;
 >>>>>>> cbbfcc6c1 ([SYCL] Add matrix tests that use the new API (unified API) (#1391))
+=======
+using bfloat16 = sycl::ext::oneapi::bfloat16;
+>>>>>>> 87f7445c7 ([SYCL][Matrix] Fix bfloat16 namespace in the legacy tests (#1478))
 
 #define SG_SZ 8
 

SYCL/Matrix/Legacy/XMX8/joint_matrix_bfloat16_32x64.cpp

@@ -19,10 +19,14 @@
 using namespace sycl;
 using namespace sycl::ext::oneapi::experimental::matrix;
 <<<<<<< HEAD
+<<<<<<< HEAD
 using bfloat16 = sycl::ext::oneapi::bfloat16;
 =======
 using bfloat16 = sycl::ext::oneapi::experimental::bfloat16;
 >>>>>>> cbbfcc6c1 ([SYCL] Add matrix tests that use the new API (unified API) (#1391))
+=======
+using bfloat16 = sycl::ext::oneapi::bfloat16;
+>>>>>>> 87f7445c7 ([SYCL][Matrix] Fix bfloat16 namespace in the legacy tests (#1478))
 
 #define SG_SZ 8
 

SYCL/Matrix/Legacy/joint_matrix_bfloat16.cpp

@@ -17,10 +17,14 @@
 using namespace sycl;
 using namespace sycl::ext::oneapi::experimental::matrix;
 <<<<<<< HEAD
+<<<<<<< HEAD
 using bfloat16 = sycl::ext::oneapi::bfloat16;
 =======
 using bfloat16 = sycl::ext::oneapi::experimental::bfloat16;
 >>>>>>> cbbfcc6c1 ([SYCL] Add matrix tests that use the new API (unified API) (#1391))
+=======
+using bfloat16 = sycl::ext::oneapi::bfloat16;
+>>>>>>> 87f7445c7 ([SYCL][Matrix] Fix bfloat16 namespace in the legacy tests (#1478))
 
 #define SG_SZ 16
 

SYCL/Matrix/Legacy/joint_matrix_bfloat16_32x64.cpp

@@ -27,6 +27,7 @@
 using namespace sycl;
 using namespace sycl::ext::oneapi::experimental::matrix;
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 #define SG_SZ 16
 
@@ -37,6 +38,9 @@ using namespace sycl::ext::oneapi::experimental::matrix;
 >>>>>>>> cbbfcc6c1 ([SYCL] Add matrix tests that use the new API (unified API) (#1391)):SYCL/Matrix/Legacy/joint_matrix_int8_vnni.cpp
 =======
 using bfloat16 = sycl::ext::oneapi::experimental::bfloat16;
+=======
+using bfloat16 = sycl::ext::oneapi::bfloat16;
+>>>>>>> 87f7445c7 ([SYCL][Matrix] Fix bfloat16 namespace in the legacy tests (#1478))
 
 #define SG_SZ 16