Set the row major store on B test to xfail on the GPU (intel#1392)

This test store the matrix B that is VNNIed (packed) in a row major fashion. This is expected to fail on the GPU because the implementation does not support automatic transformation YET, in this case: VNNI to row major in the store.

Author: dkhaldi

SYCL/Matrix/XMX8/element_wise_all_ops_int8_packed.cpp

@@ -11,7 +11,11 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
+<<<<<<< HEAD
 // This test stores the matrix B that is VNNIed (packed) in a row major fashion.
+=======
+// This test store the matrix B that is VNNIed (packed) in a row major fashion.
+>>>>>>> 909dc769e (Set the row major store on B test to xfail on the GPU (#1392))
 // This is expected to fail on the GPU because the implementation does not
 // support automatic transformation YET, in this case: VNNI to row major in the
 // store.

SYCL/Matrix/element_wise_all_ops_int8_packed.cpp

@@ -11,11 +11,18 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
+<<<<<<< HEAD
 // This test stores the matrix B that is VNNIed (packed) in a row major fashion.
 // This is expected to fail on the GPU because the implementation does not
 // support automatic transformation YET, in this case: VNNI to row major in the
 // store.
 
+=======
+// This test store the matrix B that is VNNIed (packed) in a row major fashion.
+// This is expected to fail on the GPU because the implementation does not
+// support automatic transformation YET, in this case: VNNI to row major in the
+// store.
+>>>>>>> 909dc769e (Set the row major store on B test to xfail on the GPU (#1392))
 // XFAIL: gpu
 
 #include <iostream>