Skip to content

Commit 417a1de

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 bc098c3 commit 417a1de

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

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

+9-10
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ ggml_backend_sycl_buffer_init_tensor(ggml_backend_buffer_t buffer,
366366
if (padded_size > original_size && tensor->view_src == nullptr) {
367367
SYCL_CHECK(CHECK_TRY_ERROR(ctx->stream->memset(
368368
(char *)tensor->data + original_size, 0,
369-
padded_size - original_size).wait()));
369+
padded_size - original_size)));
370370
}
371371
}
372372
return GGML_STATUS_SUCCESS;
@@ -500,7 +500,7 @@ static void ggml_backend_sycl_buffer_clear(ggml_backend_buffer_t buffer,
500500

501501
SYCL_CHECK(CHECK_TRY_ERROR((*stream)
502502
.memset(ctx->dev_ptr, value, buffer->size)
503-
.wait()));
503+
));
504504
}
505505
catch (sycl::exception const &exc) {
506506
std::cerr << exc.what() << "Exception caught at file:" << __FILE__
@@ -522,7 +522,6 @@ static void ggml_backend_sycl_buffer_memset_tensor(ggml_backend_buffer_t buffer,
522522
}
523523
void * target_ptr = static_cast<char *>(tensor->data) + offset;
524524
SYCL_CHECK(CHECK_TRY_ERROR((*stream).memset(target_ptr, value, size)));
525-
SYCL_CHECK(CHECK_TRY_ERROR((*stream).wait()));
526525
}
527526

528527
static void ggml_backend_sycl_buffer_reset(ggml_backend_buffer_t buffer) {
@@ -844,7 +843,7 @@ ggml_backend_sycl_split_buffer_init_tensor(ggml_backend_buffer_t buffer,
844843
SYCL_CHECK(CHECK_TRY_ERROR(
845844
(*stream)
846845
.memset(buf + original_size, 0, size - original_size)
847-
.wait()));
846+
));
848847
}
849848

850849
extra->data_device[i] = buf;
@@ -912,7 +911,7 @@ ggml_backend_sycl_split_buffer_set_tensor(ggml_backend_buffer_t buffer,
912911
SYCL_CHECK(CHECK_TRY_ERROR(
913912
(*stream)
914913
.memcpy(extra->data_device[i], buf_host, original_size)
915-
.wait()));
914+
));
916915
}
917916
}
918917
catch (sycl::exception const &exc) {
@@ -965,7 +964,7 @@ ggml_backend_sycl_split_buffer_get_tensor(ggml_backend_buffer_t buffer,
965964
SYCL_CHECK(CHECK_TRY_ERROR(
966965
(*stream)
967966
.memcpy(buf_host, extra->data_device[i], original_size)
968-
.wait()));
967+
));
969968
}
970969
}
971970
catch (sycl::exception const &exc) {
@@ -2505,7 +2504,7 @@ static void ggml_sycl_op_mul_mat(ggml_backend_sycl_context & ctx, const ggml_ten
25052504
SYCL_CHECK(CHECK_TRY_ERROR(stream->memcpy(
25062505
src1_ddq_i, src1_ddq_i_source,
25072506
src1_ncols * src1_padded_col_size * q8_1_ts /
2508-
q8_1_bs).wait()));
2507+
q8_1_bs)));
25092508
} else {
25102509

25112510
float * src1_ddf_i_source = (float *) src1_extra->data_device[ctx.device];
@@ -2572,7 +2571,7 @@ static void ggml_sycl_op_mul_mat(ggml_backend_sycl_context & ctx, const ggml_ten
25722571
dhf_dst_i += src1_col_0*ne0;
25732572
SYCL_CHECK(CHECK_TRY_ERROR(
25742573
stream->memcpy(dhf_dst_i, dst_dd_i,
2575-
src1_ncols * ne0 * sizeof(float)).wait()));
2574+
src1_ncols * ne0 * sizeof(float))));
25762575
}
25772576
}
25782577

@@ -3741,7 +3740,7 @@ static void ggml_backend_sycl_get_tensor_async(ggml_backend_t backend,
37413740
GGML_ASSERT(buf->buft == ggml_backend_sycl_buffer_type(sycl_ctx->device) && "unsupported buffer type");
37423741
const queue_ptr stream = sycl_ctx->stream(sycl_ctx->device, 0);
37433742
SYCL_CHECK(CHECK_TRY_ERROR((stream)->memcpy(
3744-
data, (const char *)tensor->data + offset, size).wait()));
3743+
data, (const char *)tensor->data + offset, size)));
37453744
}
37463745
catch (sycl::exception const &exc) {
37473746
std::cerr << exc.what() << "Exception caught at file:" << __FILE__
@@ -3761,7 +3760,7 @@ static bool ggml_backend_sycl_cpy_tensor_async(ggml_backend_t backend,
37613760
*/
37623761
const queue_ptr stream = sycl_ctx->stream(sycl_ctx->device, 0);
37633762
SYCL_CHECK(CHECK_TRY_ERROR((stream)->memcpy(
3764-
dst->data, src->data, ggml_nbytes(dst)).wait()));
3763+
dst->data, src->data, ggml_nbytes(dst))));
37653764
return true;
37663765
}
37673766

0 commit comments

Comments
 (0)