Skip to content

Commit 2f91bc0

Browse files
committed
Remove useless wait from SYCL backend
The default queue is in order so many synchronization with the host are useless.
1 parent f7e7d2a commit 2f91bc0

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

ggml/src/ggml-sycl/ggml-sycl.cpp

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ ggml_backend_sycl_buffer_init_tensor(ggml_backend_buffer_t buffer,
355355
if (padded_size > original_size && tensor->view_src == nullptr) {
356356
SYCL_CHECK(CHECK_TRY_ERROR(ctx->stream->memset(
357357
(char *)tensor->data + original_size, 0,
358-
padded_size - original_size).wait()));
358+
padded_size - original_size)));
359359
}
360360
}
361361
return GGML_STATUS_SUCCESS;
@@ -489,7 +489,7 @@ static void ggml_backend_sycl_buffer_clear(ggml_backend_buffer_t buffer,
489489

490490
SYCL_CHECK(CHECK_TRY_ERROR((*stream)
491491
.memset(ctx->dev_ptr, value, buffer->size)
492-
.wait()));
492+
));
493493
}
494494
catch (sycl::exception const &exc) {
495495
std::cerr << exc.what() << "Exception caught at file:" << __FILE__
@@ -511,7 +511,6 @@ static void ggml_backend_sycl_buffer_memset_tensor(ggml_backend_buffer_t buffer,
511511
}
512512
void * target_ptr = static_cast<char *>(tensor->data) + offset;
513513
SYCL_CHECK(CHECK_TRY_ERROR((*stream).memset(target_ptr, value, size)));
514-
SYCL_CHECK(CHECK_TRY_ERROR((*stream).wait()));
515514
}
516515

517516
static void ggml_backend_sycl_buffer_reset(ggml_backend_buffer_t buffer) {
@@ -833,7 +832,7 @@ ggml_backend_sycl_split_buffer_init_tensor(ggml_backend_buffer_t buffer,
833832
SYCL_CHECK(CHECK_TRY_ERROR(
834833
(*stream)
835834
.memset(buf + original_size, 0, size - original_size)
836-
.wait()));
835+
));
837836
}
838837

839838
extra->data_device[i] = buf;
@@ -901,7 +900,7 @@ ggml_backend_sycl_split_buffer_set_tensor(ggml_backend_buffer_t buffer,
901900
SYCL_CHECK(CHECK_TRY_ERROR(
902901
(*stream)
903902
.memcpy(extra->data_device[i], buf_host, original_size)
904-
.wait()));
903+
));
905904
}
906905
}
907906
catch (sycl::exception const &exc) {
@@ -954,7 +953,7 @@ ggml_backend_sycl_split_buffer_get_tensor(ggml_backend_buffer_t buffer,
954953
SYCL_CHECK(CHECK_TRY_ERROR(
955954
(*stream)
956955
.memcpy(buf_host, extra->data_device[i], original_size)
957-
.wait()));
956+
));
958957
}
959958
}
960959
catch (sycl::exception const &exc) {
@@ -2487,7 +2486,7 @@ static void ggml_sycl_op_mul_mat(ggml_backend_sycl_context & ctx, const ggml_ten
24872486
SYCL_CHECK(CHECK_TRY_ERROR(stream->memcpy(
24882487
src1_ddq_i, src1_ddq_i_source,
24892488
src1_ncols * src1_padded_col_size * q8_1_ts /
2490-
q8_1_bs).wait()));
2489+
q8_1_bs)));
24912490
} else {
24922491

24932492
float * src1_ddf_i_source = (float *) src1_extra->data_device[ctx.device];
@@ -2554,7 +2553,7 @@ static void ggml_sycl_op_mul_mat(ggml_backend_sycl_context & ctx, const ggml_ten
25542553
dhf_dst_i += src1_col_0*ne0;
25552554
SYCL_CHECK(CHECK_TRY_ERROR(
25562555
stream->memcpy(dhf_dst_i, dst_dd_i,
2557-
src1_ncols * ne0 * sizeof(float)).wait()));
2556+
src1_ncols * ne0 * sizeof(float))));
25582557
}
25592558
}
25602559

@@ -3682,7 +3681,7 @@ static void ggml_backend_sycl_get_tensor_async(ggml_backend_t backend,
36823681
GGML_ASSERT(buf->buft == ggml_backend_sycl_buffer_type(sycl_ctx->device) && "unsupported buffer type");
36833682
const queue_ptr stream = sycl_ctx->stream(sycl_ctx->device, 0);
36843683
SYCL_CHECK(CHECK_TRY_ERROR((stream)->memcpy(
3685-
data, (const char *)tensor->data + offset, size).wait()));
3684+
data, (const char *)tensor->data + offset, size)));
36863685
}
36873686
catch (sycl::exception const &exc) {
36883687
std::cerr << exc.what() << "Exception caught at file:" << __FILE__
@@ -3702,7 +3701,7 @@ static bool ggml_backend_sycl_cpy_tensor_async(ggml_backend_t backend,
37023701
*/
37033702
const queue_ptr stream = sycl_ctx->stream(sycl_ctx->device, 0);
37043703
SYCL_CHECK(CHECK_TRY_ERROR((stream)->memcpy(
3705-
dst->data, src->data, ggml_nbytes(dst)).wait()));
3704+
dst->data, src->data, ggml_nbytes(dst))));
37063705
return true;
37073706
}
37083707

0 commit comments

Comments
 (0)