Skip to content

Commit 08e843a

Browse files
sycl : Added device and backend reg interfaces
1 parent f1b746a commit 08e843a

File tree

5 files changed

+4238
-4080
lines changed

5 files changed

+4238
-4080
lines changed

examples/llama-bench/llama-bench.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ static std::string get_gpu_info() {
151151
int count = ggml_backend_sycl_get_device_count();
152152
for (int i = 0; i < count; i++) {
153153
char buf[128];
154-
ggml_sycl_get_device_description(i, buf, sizeof(buf));
154+
ggml_backend_sycl_get_device_description(i, buf, sizeof(buf));
155155
id += buf;
156156
if (i < count - 1) {
157157
id += "/";

ggml/include/ggml-sycl.h

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ extern "C" {
1919
// backend API
2020
GGML_API ggml_backend_t ggml_backend_sycl_init(int device);
2121

22+
GGML_API bool ggml_backend_is_sycl(ggml_backend_t backend);
23+
2224
// devide buffer
2325
GGML_API ggml_backend_buffer_type_t ggml_backend_sycl_buffer_type(int device);
2426

@@ -29,14 +31,19 @@ GGML_API ggml_backend_buffer_type_t ggml_backend_sycl_split_buffer_type(const fl
2931
GGML_API ggml_backend_buffer_type_t ggml_backend_sycl_host_buffer_type(void);
3032

3133
GGML_API void ggml_backend_sycl_print_sycl_devices(void);
32-
GGML_API void ggml_sycl_get_gpu_list(int *id_list, int max_len);
33-
GGML_API void ggml_sycl_get_device_description(int device, char *description, size_t description_size);
34+
GGML_API void ggml_backend_sycl_get_gpu_list(int *id_list, int max_len);
35+
GGML_API void ggml_backend_sycl_get_device_description(int device,
36+
char *description,
37+
size_t description_size);
3438
GGML_API int ggml_backend_sycl_get_device_count();
3539
GGML_API void ggml_backend_sycl_get_device_memory(int device, size_t *free, size_t *total);
3640

3741
// SYCL doesn't support registering host memory, keep here for reference
3842
// GGML_API bool ggml_backend_sycl_register_host_buffer(void * buffer, size_t size);
3943
// GGML_API void ggml_backend_sycl_unregister_host_buffer(void * buffer);
44+
45+
GGML_API ggml_backend_reg_t ggml_backend_sycl_reg(void);
46+
4047
#ifdef __cplusplus
4148
}
4249
#endif

ggml/src/ggml-backend.cpp

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -534,6 +534,10 @@ void * ggml_backend_reg_get_proc_address(ggml_backend_reg_t reg, const char * na
534534
#include "ggml-metal.h"
535535
#endif
536536

537+
#ifdef GGML_USE_SYCL
538+
#include "ggml-sycl.h"
539+
#endif
540+
537541
struct ggml_backend_registry {
538542
std::vector<ggml_backend_reg_t> backends;
539543
std::vector<ggml_backend_dev_t> devices;
@@ -545,10 +549,12 @@ struct ggml_backend_registry {
545549
#ifdef GGML_USE_METAL
546550
register_backend(ggml_backend_metal_reg());
547551
#endif
548-
552+
#ifdef GGML_USE_SYCL
553+
register_backend(ggml_backend_sycl_reg());
554+
#endif
549555
register_backend(ggml_backend_cpu_reg());
550556

551-
// TODO: sycl, vulkan, kompute, cann
557+
// TODO: vulkan, kompute, cann
552558
}
553559

554560
void register_backend(ggml_backend_reg_t reg) {
@@ -2210,6 +2216,7 @@ ggml_backend_sched_t ggml_backend_sched_new(
22102216
sched->backends[b] = backends[b];
22112217
sched->bufts[b] = bufts ? bufts[b] : ggml_backend_get_default_buffer_type(backends[b]);
22122218
GGML_ASSERT(ggml_backend_supports_buft(backends[b], sched->bufts[b]));
2219+
22132220
if (sched->n_copies > 1) {
22142221
for (int c = 0; c < sched->n_copies; c++) {
22152222
sched->events[b][c] = ggml_backend_event_new(backends[b]->device);

0 commit comments

Comments
 (0)