Skip to content

Commit 2607b7d

Browse files
qnixsynapseqnixsynapse
committed
SYCL: Integrate debug logs with GGML_LOG and other fixes
1 parent 19ce4b6 commit 2607b7d

File tree

4 files changed

+131
-141
lines changed

4 files changed

+131
-141
lines changed

‎ggml/src/ggml-sycl/common.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ void ggml_sycl_op_flatten(ggml_backend_sycl_context & ctx, const ggml_tensor *sr
8282

8383
ggml_sycl_set_device(ctx.device);
8484
queue_ptr main_stream = ctx.stream();
85-
// GGML_SYCL_DEBUG("ctx.device=%d, main_stream=%p src0_on_device=%d, src1_on_device=%d, dst_on_device=%d\n",
86-
// ctx.device, main_stream, src0_on_device, src1_on_device, dst_on_device);
85+
// GGML_LOG_DEBUG("ctx.device=%d, main_stream=%p src0_on_device=%d, src1_on_device=%d, dst_on_device=%d\n",
86+
// ctx.device, main_stream, src0_on_device, src1_on_device, dst_on_device);
8787

8888
// do the computation
8989
op(ctx, src0, src1, dst, src0_ddf, src1_ddf, dst_ddf, main_stream);

‎ggml/src/ggml-sycl/common.hpp‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,11 @@
3131
#pragma clang diagnostic ignored "-Wnested-anon-types"
3232
#include "ggml-common.h"
3333
#pragma clang diagnostic pop
34+
#include "ggml-impl.h"
3435

3536
void* ggml_sycl_host_malloc(size_t size);
3637
void ggml_sycl_host_free(void* ptr);
3738

38-
static int g_ggml_sycl_debug = 0;
39-
#define GGML_SYCL_DEBUG(...) \
40-
do { \
41-
if (g_ggml_sycl_debug) \
42-
fprintf(stderr, __VA_ARGS__); \
43-
} while (0)
44-
4539
#define CHECK_TRY_ERROR(expr) \
4640
[&]() { \
4741
try { \
@@ -167,8 +161,7 @@ inline dpct::err0 ggml_sycl_set_device(const int device) try {
167161
int current_device_id;
168162
SYCL_CHECK(CHECK_TRY_ERROR(current_device_id = get_current_device_id()));
169163

170-
// GGML_SYCL_DEBUG("ggml_sycl_set_device device_id=%d,
171-
// current_device_id=%d\n", device, current_device);
164+
GGML_LOG_DEBUG("ggml_sycl_set_device device_id=%d,current_device_id=%d\n", device, current_device_id);
172165
if (device == current_device_id) {
173166
return 0;
174167
}

‎ggml/src/ggml-sycl/element_wise.cpp‎

Lines changed: 49 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "common.hpp"
22
#include "element_wise.hpp"
3+
#include "ggml-impl.h"
34

45
void acc_f32(const float * x, const float * y, float * dst, const int ne,
56
const int ne10, const int ne11, const int ne12,
@@ -883,148 +884,148 @@ inline void ggml_sycl_op_div(ggml_backend_sycl_context & ctx, const ggml_tensor
883884

884885

885886
void ggml_sycl_sqrt(ggml_backend_sycl_context & ctx, const ggml_tensor * src0, const ggml_tensor * src1, ggml_tensor * dst) {
886-
GGML_SYCL_DEBUG("call %s\n", __func__);
887+
GGML_LOG_DEBUG("call %s\n", __func__);
887888
ggml_sycl_op_flatten(ctx, src0, src1, dst, ggml_sycl_op_sqrt);
888-
GGML_SYCL_DEBUG("call %s done\n", __func__);
889+
GGML_LOG_DEBUG("call %s done\n", __func__);
889890
}
890891

891892
void ggml_sycl_sin(ggml_backend_sycl_context & ctx, const ggml_tensor * src0, const ggml_tensor * src1, ggml_tensor * dst) {
892-
GGML_SYCL_DEBUG("call %s\n", __func__);
893+
GGML_LOG_DEBUG("call %s\n", __func__);
893894
ggml_sycl_op_flatten(ctx, src0, src1, dst, ggml_sycl_op_sin);
894-
GGML_SYCL_DEBUG("call %s done\n", __func__);
895+
GGML_LOG_DEBUG("call %s done\n", __func__);
895896
}
896897

897898
void ggml_sycl_cos(ggml_backend_sycl_context & ctx, const ggml_tensor * src0, const ggml_tensor * src1, ggml_tensor * dst) {
898-
GGML_SYCL_DEBUG("call %s\n", __func__);
899+
GGML_LOG_DEBUG("call %s\n", __func__);
899900
ggml_sycl_op_flatten(ctx, src0, src1, dst, ggml_sycl_op_cos);
900-
GGML_SYCL_DEBUG("call %s done\n", __func__);
901+
GGML_LOG_DEBUG("call %s done\n", __func__);
901902
}
902903

903904
void ggml_sycl_acc(ggml_backend_sycl_context & ctx, const ggml_tensor * src0, const ggml_tensor * src1, ggml_tensor * dst) {
904-
GGML_SYCL_DEBUG("call %s\n", __func__);
905+
GGML_LOG_DEBUG("call %s\n", __func__);
905906
ggml_sycl_op_flatten(ctx, src0, src1, dst, ggml_sycl_op_acc);
906-
GGML_SYCL_DEBUG("call %s done\n", __func__);
907+
GGML_LOG_DEBUG("call %s done\n", __func__);
907908
}
908909

909910
void ggml_sycl_gelu(ggml_backend_sycl_context & ctx, const ggml_tensor * src0, const ggml_tensor * src1, ggml_tensor * dst) {
910-
GGML_SYCL_DEBUG("call %s\n", __func__);
911+
GGML_LOG_DEBUG("call %s\n", __func__);
911912
ggml_sycl_op_flatten(ctx, src0, src1, dst, ggml_sycl_op_gelu);
912-
GGML_SYCL_DEBUG("call %s done\n", __func__);
913+
GGML_LOG_DEBUG("call %s done\n", __func__);
913914
}
914915

915916
void ggml_sycl_silu(ggml_backend_sycl_context & ctx, const ggml_tensor * src0, const ggml_tensor * src1, ggml_tensor * dst) {
916-
GGML_SYCL_DEBUG("call %s\n", __func__);
917+
GGML_LOG_DEBUG("call %s\n", __func__);
917918
ggml_sycl_op_flatten(ctx, src0, src1, dst, ggml_sycl_op_silu);
918-
GGML_SYCL_DEBUG("call %s done\n", __func__);
919+
GGML_LOG_DEBUG("call %s done\n", __func__);
919920
}
920921

921922
void ggml_sycl_gelu_quick(ggml_backend_sycl_context & ctx, const ggml_tensor * src0, const ggml_tensor * src1, ggml_tensor * dst) {
922-
GGML_SYCL_DEBUG("call %s\n", __func__);
923+
GGML_LOG_DEBUG("call %s\n", __func__);
923924
ggml_sycl_op_flatten(ctx, src0, src1, dst, ggml_sycl_op_gelu_quick);
924-
GGML_SYCL_DEBUG("call %s done\n", __func__);
925+
GGML_LOG_DEBUG("call %s done\n", __func__);
925926
}
926927

927928
void ggml_sycl_tanh(ggml_backend_sycl_context & ctx, const ggml_tensor * src0, const ggml_tensor * src1, ggml_tensor * dst) {
928-
GGML_SYCL_DEBUG("call %s\n", __func__);
929+
GGML_LOG_DEBUG("call %s\n", __func__);
929930
ggml_sycl_op_flatten(ctx, src0, src1, dst, ggml_sycl_op_tanh);
930-
GGML_SYCL_DEBUG("call %s done\n", __func__);
931+
GGML_LOG_DEBUG("call %s done\n", __func__);
931932
}
932933

933934
void ggml_sycl_relu(ggml_backend_sycl_context & ctx, const ggml_tensor * src0, const ggml_tensor * src1, ggml_tensor * dst) {
934-
GGML_SYCL_DEBUG("call %s\n", __func__);
935+
GGML_LOG_DEBUG("call %s\n", __func__);
935936
ggml_sycl_op_flatten(ctx, src0, src1, dst, ggml_sycl_op_relu);
936-
GGML_SYCL_DEBUG("call %s done\n", __func__);
937+
GGML_LOG_DEBUG("call %s done\n", __func__);
937938
}
938939

939940
void ggml_sycl_sigmoid(ggml_backend_sycl_context & ctx, const ggml_tensor * src0, const ggml_tensor * src1, ggml_tensor * dst) {
940-
GGML_SYCL_DEBUG("call %s\n", __func__);
941+
GGML_LOG_DEBUG("call %s\n", __func__);
941942
ggml_sycl_op_flatten(ctx, src0, src1, dst, ggml_sycl_op_sigmoid);
942-
GGML_SYCL_DEBUG("call %s done\n", __func__);
943+
GGML_LOG_DEBUG("call %s done\n", __func__);
943944
}
944945

945946
void ggml_sycl_hardsigmoid(ggml_backend_sycl_context & ctx, const ggml_tensor * src0, const ggml_tensor * src1, ggml_tensor * dst) {
946-
GGML_SYCL_DEBUG("call %s\n", __func__);
947+
GGML_LOG_DEBUG("call %s\n", __func__);
947948
ggml_sycl_op_flatten(ctx, src0, src1, dst, ggml_sycl_op_hardsigmoid);
948-
GGML_SYCL_DEBUG("call %s done\n", __func__);
949+
GGML_LOG_DEBUG("call %s done\n", __func__);
949950
}
950951

951952
void ggml_sycl_hardswish(ggml_backend_sycl_context & ctx, const ggml_tensor * src0, const ggml_tensor * src1, ggml_tensor * dst) {
952-
GGML_SYCL_DEBUG("call %s\n", __func__);
953+
GGML_LOG_DEBUG("call %s\n", __func__);
953954
ggml_sycl_op_flatten(ctx, src0, src1, dst, ggml_sycl_op_hardswish);
954-
GGML_SYCL_DEBUG("call %s done\n", __func__);
955+
GGML_LOG_DEBUG("call %s done\n", __func__);
955956
}
956957

957958

958959
void ggml_sycl_exp(ggml_backend_sycl_context & ctx, const ggml_tensor * src0, const ggml_tensor * src1, ggml_tensor * dst) {
959-
GGML_SYCL_DEBUG("call %s\n", __func__);
960+
GGML_LOG_DEBUG("call %s\n", __func__);
960961
ggml_sycl_op_flatten(ctx, src0, src1, dst, ggml_sycl_op_exp);
961-
GGML_SYCL_DEBUG("call %s done\n", __func__);
962+
GGML_LOG_DEBUG("call %s done\n", __func__);
962963
}
963964

964965
void ggml_sycl_log(ggml_backend_sycl_context & ctx, const ggml_tensor * src0, const ggml_tensor * src1, ggml_tensor * dst) {
965-
GGML_SYCL_DEBUG("call %s\n", __func__);
966+
GGML_LOG_DEBUG("call %s\n", __func__);
966967
ggml_sycl_op_flatten(ctx, src0, src1, dst, ggml_sycl_op_log);
967-
GGML_SYCL_DEBUG("call %s done\n", __func__);
968+
GGML_LOG_DEBUG("call %s done\n", __func__);
968969
}
969970

970971
void ggml_sycl_neg(ggml_backend_sycl_context & ctx, const ggml_tensor * src0, const ggml_tensor * src1, ggml_tensor * dst) {
971-
GGML_SYCL_DEBUG("call %s\n", __func__);
972+
GGML_LOG_DEBUG("call %s\n", __func__);
972973
ggml_sycl_op_flatten(ctx, src0, src1, dst, ggml_sycl_op_neg);
973-
GGML_SYCL_DEBUG("call %s done\n", __func__);
974+
GGML_LOG_DEBUG("call %s done\n", __func__);
974975
}
975976

976977
void ggml_sycl_step(ggml_backend_sycl_context & ctx, const ggml_tensor * src0, const ggml_tensor * src1, ggml_tensor * dst) {
977-
GGML_SYCL_DEBUG("call %s\n", __func__);
978+
GGML_LOG_DEBUG("call %s\n", __func__);
978979
ggml_sycl_op_flatten(ctx, src0, src1, dst, ggml_sycl_op_step);
979-
GGML_SYCL_DEBUG("call %s done\n", __func__);
980+
GGML_LOG_DEBUG("call %s done\n", __func__);
980981
}
981982

982983
void ggml_sycl_leaky_relu(ggml_backend_sycl_context & ctx, const ggml_tensor * src0, const ggml_tensor * src1, ggml_tensor * dst) {
983-
GGML_SYCL_DEBUG("call %s\n", __func__);
984+
GGML_LOG_DEBUG("call %s\n", __func__);
984985
ggml_sycl_op_flatten(ctx, src0, src1, dst, ggml_sycl_op_leaky_relu);
985-
GGML_SYCL_DEBUG("call %s done\n", __func__);
986+
GGML_LOG_DEBUG("call %s done\n", __func__);
986987
}
987988

988989
void ggml_sycl_sqr(ggml_backend_sycl_context & ctx, const ggml_tensor * src0, const ggml_tensor * src1, ggml_tensor * dst) {
989-
GGML_SYCL_DEBUG("call %s\n", __func__);
990+
GGML_LOG_DEBUG("call %s\n", __func__);
990991
ggml_sycl_op_flatten(ctx, src0, src1, dst, ggml_sycl_op_sqr);
991-
GGML_SYCL_DEBUG("call %s done\n", __func__);
992+
GGML_LOG_DEBUG("call %s done\n", __func__);
992993
}
993994

994995
void ggml_sycl_upscale(ggml_backend_sycl_context & ctx, const ggml_tensor * src0, const ggml_tensor * src1, ggml_tensor * dst) {
995-
GGML_SYCL_DEBUG("call %s\n", __func__);
996+
GGML_LOG_DEBUG("call %s\n", __func__);
996997
ggml_sycl_op_flatten(ctx, src0, src1, dst, ggml_sycl_op_upscale);
997-
GGML_SYCL_DEBUG("call %s done\n", __func__);
998+
GGML_LOG_DEBUG("call %s done\n", __func__);
998999
}
9991000

10001001
void ggml_sycl_pad(ggml_backend_sycl_context & ctx, const ggml_tensor * src0, const ggml_tensor * src1, ggml_tensor * dst) {
1001-
GGML_SYCL_DEBUG("call %s\n", __func__);
1002+
GGML_LOG_DEBUG("call %s\n", __func__);
10021003
ggml_sycl_op_flatten(ctx, src0, src1, dst, ggml_sycl_op_pad);
1003-
GGML_SYCL_DEBUG("call %s done\n", __func__);
1004+
GGML_LOG_DEBUG("call %s done\n", __func__);
10041005
}
10051006

10061007

10071008

10081009
void ggml_sycl_add(ggml_backend_sycl_context & ctx, const ggml_tensor * src0, const ggml_tensor * src1, ggml_tensor * dst) {
1009-
GGML_SYCL_DEBUG("call %s\n", __func__);
1010+
GGML_LOG_DEBUG("call %s\n", __func__);
10101011
ggml_sycl_op_flatten(ctx, src0, src1, dst, ggml_sycl_op_add);
1011-
GGML_SYCL_DEBUG("call %s done\n", __func__);
1012+
GGML_LOG_DEBUG("call %s done\n", __func__);
10121013
}
10131014

10141015
void ggml_sycl_sub(ggml_backend_sycl_context & ctx, const ggml_tensor * src0, const ggml_tensor * src1, ggml_tensor * dst) {
1015-
GGML_SYCL_DEBUG("call %s\n", __func__);
1016+
GGML_LOG_DEBUG("call %s\n", __func__);
10161017
ggml_sycl_op_flatten(ctx, src0, src1, dst, ggml_sycl_op_sub);
1017-
GGML_SYCL_DEBUG("call %s done\n", __func__);
1018+
GGML_LOG_DEBUG("call %s done\n", __func__);
10181019
}
10191020

10201021
void ggml_sycl_mul(ggml_backend_sycl_context & ctx, const ggml_tensor * src0, const ggml_tensor * src1, ggml_tensor * dst) {
1021-
GGML_SYCL_DEBUG("call %s\n", __func__);
1022+
GGML_LOG_DEBUG("call %s\n", __func__);
10221023
ggml_sycl_op_flatten(ctx, src0, src1, dst, ggml_sycl_op_mul);
1023-
GGML_SYCL_DEBUG("call %s done\n", __func__);
1024+
GGML_LOG_DEBUG("call %s done\n", __func__);
10241025
}
10251026

10261027
void ggml_sycl_div(ggml_backend_sycl_context & ctx, const ggml_tensor * src0, const ggml_tensor * src1, ggml_tensor * dst) {
1027-
GGML_SYCL_DEBUG("call %s\n", __func__);
1028+
GGML_LOG_DEBUG("call %s\n", __func__);
10281029
ggml_sycl_op_flatten(ctx, src0, src1, dst, ggml_sycl_op_div);
1029-
GGML_SYCL_DEBUG("call %s done\n", __func__);
1030+
GGML_LOG_DEBUG("call %s done\n", __func__);
10301031
}

0 commit comments

Comments
 (0)