Skip to content

Commit dc55a8c

Browse files
dkhaldibb-sycl
authored andcommitted
[SYCL][Matrix] Add missing explicit SG size statement (intel#764)
1 parent 6f567c7 commit dc55a8c

File tree

1 file changed

+30
-0
lines changed

1 file changed

+30
-0
lines changed

SYCL/Matrix/element_wise_all_ops_half.cpp

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ void matrix_verify_add(queue q, big_matrix<T, M, N> &A, nd_range<2> &r,
6060
auto accA = bufA.get_access<access::mode::read_write>(cgh);
6161

6262
<<<<<<< HEAD
63+
<<<<<<< HEAD
64+
=======
65+
>>>>>>> 7bb961a5c ([SYCL][Matrix] Add missing explicit SG size statement (#764))
6366
cgh.parallel_for<class add_matrix>(
6467
r, [accA](nd_item<2> spmd_item) [[intel::reqd_sub_group_size(SG_SZ)]] {
6568
const auto global_idx = spmd_item.get_global_id(0);
@@ -81,6 +84,7 @@ void matrix_verify_add(queue q, big_matrix<T, M, N> &A, nd_range<2> &r,
8184
sg_starty / SG_SZ * TN,
8285
N, matrix_layout::row_major);
8386
}); // parallel for
87+
<<<<<<< HEAD
8488
=======
8589
cgh.parallel_for<class add_matrix>(r, [accA](nd_item<2> spmd_item) {
8690
const auto global_idx = spmd_item.get_global_id(0);
@@ -103,6 +107,8 @@ void matrix_verify_add(queue q, big_matrix<T, M, N> &A, nd_range<2> &r,
103107
N, matrix_layout::row_major);
104108
}); // parallel for
105109
>>>>>>> 62e420f44 ([SYCL][Matrix] Correct a test case that redefines a class name (#757))
110+
=======
111+
>>>>>>> 7bb961a5c ([SYCL][Matrix] Add missing explicit SG size statement (#764))
106112
}).wait();
107113
assert_ops_ref<T, M, N>(bufA.get_access<access::mode::read>(), ref);
108114
}
@@ -116,6 +122,9 @@ void matrix_verify_sub(queue q, big_matrix<T, M, N> &A, nd_range<2> &r,
116122
auto accA = bufA.get_access<access::mode::read_write>(cgh);
117123

118124
<<<<<<< HEAD
125+
<<<<<<< HEAD
126+
=======
127+
>>>>>>> 7bb961a5c ([SYCL][Matrix] Add missing explicit SG size statement (#764))
119128
cgh.parallel_for<class sub_matrix>(
120129
r, [accA](nd_item<2> spmd_item) [[intel::reqd_sub_group_size(SG_SZ)]] {
121130
const auto global_idx = spmd_item.get_global_id(0);
@@ -137,6 +146,7 @@ void matrix_verify_sub(queue q, big_matrix<T, M, N> &A, nd_range<2> &r,
137146
sg_starty / SG_SZ * TN,
138147
N, matrix_layout::row_major);
139148
}); // parallel for
149+
<<<<<<< HEAD
140150
=======
141151
cgh.parallel_for<class sub_matrix>(r, [accA](nd_item<2> spmd_item) {
142152
const auto global_idx = spmd_item.get_global_id(0);
@@ -159,6 +169,8 @@ void matrix_verify_sub(queue q, big_matrix<T, M, N> &A, nd_range<2> &r,
159169
N, matrix_layout::row_major);
160170
}); // parallel for
161171
>>>>>>> 62e420f44 ([SYCL][Matrix] Correct a test case that redefines a class name (#757))
172+
=======
173+
>>>>>>> 7bb961a5c ([SYCL][Matrix] Add missing explicit SG size statement (#764))
162174
}).wait();
163175
assert_ops_ref<T, M, N>(bufA.get_access<access::mode::read>(), ref);
164176
}
@@ -172,6 +184,9 @@ void matrix_verify_mul(queue q, big_matrix<T, M, N> &A, nd_range<2> &r,
172184
auto accA = bufA.get_access<access::mode::read_write>(cgh);
173185

174186
<<<<<<< HEAD
187+
<<<<<<< HEAD
188+
=======
189+
>>>>>>> 7bb961a5c ([SYCL][Matrix] Add missing explicit SG size statement (#764))
175190
cgh.parallel_for<class mul_matrix>(
176191
r, [accA](nd_item<2> spmd_item) [[intel::reqd_sub_group_size(SG_SZ)]] {
177192
const auto global_idx = spmd_item.get_global_id(0);
@@ -193,6 +208,7 @@ void matrix_verify_mul(queue q, big_matrix<T, M, N> &A, nd_range<2> &r,
193208
sg_starty / SG_SZ * TN,
194209
N, matrix_layout::row_major);
195210
}); // parallel for
211+
<<<<<<< HEAD
196212
=======
197213
cgh.parallel_for<class mul_matrix>(r, [accA](nd_item<2> spmd_item) {
198214
const auto global_idx = spmd_item.get_global_id(0);
@@ -215,6 +231,8 @@ void matrix_verify_mul(queue q, big_matrix<T, M, N> &A, nd_range<2> &r,
215231
N, matrix_layout::row_major);
216232
}); // parallel for
217233
>>>>>>> 62e420f44 ([SYCL][Matrix] Correct a test case that redefines a class name (#757))
234+
=======
235+
>>>>>>> 7bb961a5c ([SYCL][Matrix] Add missing explicit SG size statement (#764))
218236
}).wait();
219237
assert_ops_ref<T, M, N>(bufA.get_access<access::mode::read>(), ref);
220238
}
@@ -228,6 +246,9 @@ void matrix_verify_div(queue q, big_matrix<T, M, N> &A, nd_range<2> &r,
228246
auto accA = bufA.get_access<access::mode::read_write>(cgh);
229247

230248
<<<<<<< HEAD
249+
<<<<<<< HEAD
250+
=======
251+
>>>>>>> 7bb961a5c ([SYCL][Matrix] Add missing explicit SG size statement (#764))
231252
cgh.parallel_for<class div_matrix>(
232253
r, [accA](nd_item<2> spmd_item) [[intel::reqd_sub_group_size(SG_SZ)]] {
233254
const auto global_idx = spmd_item.get_global_id(0);
@@ -249,6 +270,7 @@ void matrix_verify_div(queue q, big_matrix<T, M, N> &A, nd_range<2> &r,
249270
sg_starty / SG_SZ * TN,
250271
N, matrix_layout::row_major);
251272
}); // parallel for
273+
<<<<<<< HEAD
252274
=======
253275
cgh.parallel_for<class div_matrix>(r, [accA](nd_item<2> spmd_item) {
254276
const auto global_idx = spmd_item.get_global_id(0);
@@ -271,6 +293,8 @@ void matrix_verify_div(queue q, big_matrix<T, M, N> &A, nd_range<2> &r,
271293
N, matrix_layout::row_major);
272294
}); // parallel for
273295
>>>>>>> 62e420f44 ([SYCL][Matrix] Correct a test case that redefines a class name (#757))
296+
=======
297+
>>>>>>> 7bb961a5c ([SYCL][Matrix] Add missing explicit SG size statement (#764))
274298
}).wait();
275299
assert_ops_ref<T, M, N>(bufA.get_access<access::mode::read>(), ref);
276300
}
@@ -284,6 +308,9 @@ void matrix_verify_logic(queue q, big_matrix<T, M, N> &A, nd_range<2> &r,
284308
auto accA = bufA.get_access<access::mode::read_write>(cgh);
285309

286310
<<<<<<< HEAD
311+
<<<<<<< HEAD
312+
=======
313+
>>>>>>> 7bb961a5c ([SYCL][Matrix] Add missing explicit SG size statement (#764))
287314
cgh.parallel_for<class logic_matrix>(
288315
r, [accA](nd_item<2> spmd_item) [[intel::reqd_sub_group_size(SG_SZ)]] {
289316
const auto global_idx = spmd_item.get_global_id(0);
@@ -314,6 +341,7 @@ void matrix_verify_logic(queue q, big_matrix<T, M, N> &A, nd_range<2> &r,
314341
}
315342
wi_slice_a[i] = val;
316343
}
344+
<<<<<<< HEAD
317345
=======
318346
cgh.parallel_for<class logic_matrix>(r, [accA](nd_item<2> spmd_item) {
319347
const auto global_idx = spmd_item.get_global_id(0);
@@ -342,6 +370,8 @@ void matrix_verify_logic(queue q, big_matrix<T, M, N> &A, nd_range<2> &r,
342370
} else {
343371
val += 2;
344372
>>>>>>> 62e420f44 ([SYCL][Matrix] Correct a test case that redefines a class name (#757))
373+
=======
374+
>>>>>>> 7bb961a5c ([SYCL][Matrix] Add missing explicit SG size statement (#764))
345375
}
346376
}
347377
joint_matrix_store(sg, sub_a,

0 commit comments

Comments
 (0)