Skip to content

Commit eeb0475

Browse files
qnixsynapseqnixsynapse
committed
Revert "SYCL: Integrate debug logs with GGML_LOG and other fixes"
This reverts commit 2607b7d. Let's keep the current SYCL specific logging mechanism for now
1 parent 2607b7d commit eeb0475

File tree

4 files changed

+141
-131
lines changed

4 files changed

+141
-131
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_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);
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);
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: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,17 @@
3131
#pragma clang diagnostic ignored "-Wnested-anon-types"
3232
#include "ggml-common.h"
3333
#pragma clang diagnostic pop
34-
#include "ggml-impl.h"
3534

3635
void* ggml_sycl_host_malloc(size_t size);
3736
void ggml_sycl_host_free(void* ptr);
3837

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+
3945
#define CHECK_TRY_ERROR(expr) \
4046
[&]() { \
4147
try { \
@@ -161,7 +167,8 @@ inline dpct::err0 ggml_sycl_set_device(const int device) try {
161167
int current_device_id;
162168
SYCL_CHECK(CHECK_TRY_ERROR(current_device_id = get_current_device_id()));
163169

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

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

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

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

885884

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

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

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

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

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

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

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

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

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

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

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

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

958957

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

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

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

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

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

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

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

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

10071006

10081007

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

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

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

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

0 commit comments

Comments
 (0)