From 254a750249f74e838e744eedd8607f05fe9707d7 Mon Sep 17 00:00:00 2001
From: arthw <14088817+arthw@users.noreply.github.com>
Date: Thu, 1 Aug 2024 12:48:18 +0800
Subject: [PATCH] rename device_infos to infos

---
 ggml/src/ggml-sycl.cpp             | 16 +++++------
 ggml/src/ggml-sycl/common.hpp      |  2 +-
 ggml/src/ggml-sycl/mmq.cpp         | 20 +++++++-------
 ggml/src/ggml-sycl/sycl_device.cpp | 43 ++++++++++++++----------------
 ggml/src/ggml-sycl/sycl_device.hpp |  4 +--
 5 files changed, 41 insertions(+), 44 deletions(-)

diff --git a/ggml/src/ggml-sycl.cpp b/ggml/src/ggml-sycl.cpp
index ae2420a82..cf83d8c10 100644
--- a/ggml/src/ggml-sycl.cpp
+++ b/ggml/src/ggml-sycl.cpp
@@ -2280,11 +2280,11 @@ static int64_t get_row_rounding(ggml_type type, const std::array<float, GGML_SYC
     for (int i = 0; i < ggml_sycl_info().device_count; ++i) {
         int id = ggml_backend_sycl_get_device_id(i);
         if (tensor_split[i] < (i + 1 < ggml_sycl_info().device_count ? tensor_split[i + 1] : 1.0f)) {
-            if (min_compute_capability > ggml_sycl_info().device_infos[id].cc) {
-                min_compute_capability = ggml_sycl_info().device_infos[id].cc;
+            if (min_compute_capability > ggml_sycl_info().infos[id].cc) {
+                min_compute_capability = ggml_sycl_info().infos[id].cc;
             }
-            if (max_compute_capability < ggml_sycl_info().device_infos[id].cc) {
-                max_compute_capability = ggml_sycl_info().device_infos[id].cc;
+            if (max_compute_capability < ggml_sycl_info().infos[id].cc) {
+                max_compute_capability = ggml_sycl_info().infos[id].cc;
             }
         }
     }
@@ -3416,12 +3416,12 @@ static void ggml_sycl_mul_mat(ggml_backend_sycl_context & ctx, const ggml_tensor
                 continue;
             }
 
-            if (min_compute_capability > ggml_sycl_info().device_infos[id].cc) {
-                min_compute_capability = ggml_sycl_info().device_infos[id].cc;
+            if (min_compute_capability > ggml_sycl_info().infos[id].cc) {
+                min_compute_capability = ggml_sycl_info().infos[id].cc;
             }
         }
     } else {
-        min_compute_capability    = ggml_sycl_info().device_infos[ctx.device].cc;
+        min_compute_capability    = ggml_sycl_info().infos[ctx.device].cc;
     }
 
     // check data types and tensor shapes for custom matrix multiplication kernels:
@@ -4342,7 +4342,7 @@ ggml_backend_buffer_type_t ggml_backend_sycl_buffer_type(int device_id) {
     if (!ggml_backend_sycl_buffer_type_initialized) {
         for (auto & id: ggml_sycl_info().ids) {
             auto & device = dpct::dev_mgr::instance().get_device(id);
-            queue_ptr stream = ggml_sycl_info().device_infos[id].qptrs[0];
+            queue_ptr stream = ggml_sycl_info().infos[id].qptrs[0];
             ggml_backend_sycl_buffer_types[id] = {
                 /* .iface    = */ ggml_backend_sycl_buffer_type_interface,
                 /* .context  = */ new ggml_backend_sycl_buffer_type_context{id, GGML_SYCL_NAME + std::to_string(id), stream},
diff --git a/ggml/src/ggml-sycl/common.hpp b/ggml/src/ggml-sycl/common.hpp
index 5b60835a2..ccdd789cc 100644
--- a/ggml/src/ggml-sycl/common.hpp
+++ b/ggml/src/ggml-sycl/common.hpp
@@ -241,7 +241,7 @@ struct ggml_backend_sycl_context {
         device(id),
         name(GGML_SYCL_NAME + std::to_string(device)) {
             for (int i=0;i<GGML_SYCL_MAX_STREAMS; i++){
-                qptrs[id][i] = sycl_device_info.device_infos[id].qptrs[i];
+                qptrs[id][i] = sycl_device_info.infos[id].qptrs[i];
             }
     }
 
diff --git a/ggml/src/ggml-sycl/mmq.cpp b/ggml/src/ggml-sycl/mmq.cpp
index 0a6a5456c..9f2ee2c88 100644
--- a/ggml/src/ggml-sycl/mmq.cpp
+++ b/ggml/src/ggml-sycl/mmq.cpp
@@ -1779,7 +1779,7 @@ static void ggml_mul_mat_q4_0_q8_1_sycl(const void *vx, const void *vy,
     int id;
     SYCL_CHECK(
         CHECK_TRY_ERROR(id = get_current_device_id()));
-    const int compute_capability = ggml_sycl_info().device_infos[id].cc;
+    const int compute_capability = ggml_sycl_info().infos[id].cc;
 
     int mmq_x, mmq_y, nwarps;
     if (compute_capability >= VER_GEN13) {
@@ -1894,7 +1894,7 @@ static void ggml_mul_mat_q4_1_q8_1_sycl(const void *vx, const void *vy,
     int id;
     SYCL_CHECK(
         CHECK_TRY_ERROR(id = get_current_device_id()));
-    const int compute_capability = ggml_sycl_info().device_infos[id].cc;
+    const int compute_capability = ggml_sycl_info().infos[id].cc;
 
     int mmq_x, mmq_y, nwarps;
     if (compute_capability >= VER_GEN13) {
@@ -2009,7 +2009,7 @@ static void ggml_mul_mat_q5_0_q8_1_sycl(const void *vx, const void *vy,
     int id;
     SYCL_CHECK(
         CHECK_TRY_ERROR(id = get_current_device_id()));
-    const int compute_capability = ggml_sycl_info().device_infos[id].cc;
+    const int compute_capability = ggml_sycl_info().infos[id].cc;
 
     int mmq_x, mmq_y, nwarps;
     if (compute_capability >= VER_GEN13) {
@@ -2124,7 +2124,7 @@ static void ggml_mul_mat_q5_1_q8_1_sycl(const void *vx, const void *vy,
     int id;
     SYCL_CHECK(
         CHECK_TRY_ERROR(id = get_current_device_id()));
-    const int compute_capability = ggml_sycl_info().device_infos[id].cc;
+    const int compute_capability = ggml_sycl_info().infos[id].cc;
 
     int mmq_x, mmq_y, nwarps;
     if (compute_capability >= VER_GEN13) {
@@ -2239,7 +2239,7 @@ static void ggml_mul_mat_q8_0_q8_1_sycl(const void *vx, const void *vy,
     int id;
     SYCL_CHECK(
         CHECK_TRY_ERROR(id = get_current_device_id()));
-    const int compute_capability = ggml_sycl_info().device_infos[id].cc;
+    const int compute_capability = ggml_sycl_info().infos[id].cc;
 
     int mmq_x, mmq_y, nwarps;
     if (compute_capability >= VER_GEN13) {
@@ -2354,7 +2354,7 @@ static void ggml_mul_mat_q2_K_q8_1_sycl(const void *vx, const void *vy,
     int id;
     SYCL_CHECK(
         CHECK_TRY_ERROR(id = get_current_device_id()));
-    const int compute_capability = ggml_sycl_info().device_infos[id].cc;
+    const int compute_capability = ggml_sycl_info().infos[id].cc;
 
     int mmq_x, mmq_y, nwarps;
     if (compute_capability >= VER_GEN13) {
@@ -2477,7 +2477,7 @@ static void ggml_mul_mat_q3_K_q8_1_sycl(const void *vx, const void *vy,
     int id;
     SYCL_CHECK(
         CHECK_TRY_ERROR(id = get_current_device_id()));
-    const int compute_capability = ggml_sycl_info().device_infos[id].cc;
+    const int compute_capability = ggml_sycl_info().infos[id].cc;
 
     int mmq_x, mmq_y, nwarps;
     if (compute_capability >= VER_GEN13) {
@@ -2605,7 +2605,7 @@ static void ggml_mul_mat_q4_K_q8_1_sycl(const void *vx, const void *vy,
     int id;
     SYCL_CHECK(
         CHECK_TRY_ERROR(id = get_current_device_id()));
-    const int compute_capability = ggml_sycl_info().device_infos[id].cc;
+    const int compute_capability = ggml_sycl_info().infos[id].cc;
 
     int mmq_x, mmq_y, nwarps;
     if (compute_capability >= VER_GEN13) {
@@ -2726,7 +2726,7 @@ static void ggml_mul_mat_q5_K_q8_1_sycl(const void *vx, const void *vy,
     int id;
     SYCL_CHECK(
         CHECK_TRY_ERROR(id = get_current_device_id()));
-    const int compute_capability = ggml_sycl_info().device_infos[id].cc;
+    const int compute_capability = ggml_sycl_info().infos[id].cc;
 
     int mmq_x, mmq_y, nwarps;
     if (compute_capability >= VER_GEN13) {
@@ -2847,7 +2847,7 @@ static void ggml_mul_mat_q6_K_q8_1_sycl(const void *vx, const void *vy,
     int id;
     SYCL_CHECK(
         CHECK_TRY_ERROR(id = get_current_device_id()));
-    const int compute_capability = ggml_sycl_info().device_infos[id].cc;
+    const int compute_capability = ggml_sycl_info().infos[id].cc;
 
     int mmq_x, mmq_y, nwarps;
     if (compute_capability >= VER_GEN13) {
diff --git a/ggml/src/ggml-sycl/sycl_device.cpp b/ggml/src/ggml-sycl/sycl_device.cpp
index fd8c04599..e476adef0 100644
--- a/ggml/src/ggml-sycl/sycl_device.cpp
+++ b/ggml/src/ggml-sycl/sycl_device.cpp
@@ -22,18 +22,15 @@ void ggml_sycl_device_info::init(
     m_device_filter = device_filter;
 }
 
-void ggml_sycl_device_info::clear_device_infos() {
+void ggml_sycl_device_info::clear_infos() {
   ids.clear();
   devices.clear();
 
   for (int id=0;id<GGML_SYCL_MAX_DEVICES;id++) {
-    device_infos[id].id = -1;
-    device_infos[id].max_work_group_sizes = 0;
-    device_infos[id].max_compute_units = 0;
-    device_infos[id].hw_family = -1;
-    // for (int i=0; i<GGML_SYCL_MAX_STREAMS;i++) {
-    //     free(device_infos[id].qptrs[i]);
-    // }
+    infos[id].id = -1;
+    infos[id].max_work_group_sizes = 0;
+    infos[id].max_compute_units = 0;
+    infos[id].hw_family = -1;
   }
 
   device_count = 0;
@@ -43,7 +40,7 @@ void ggml_sycl_device_info::clear_device_infos() {
 void ggml_sycl_device_info::init_single_mode(int main_gpu_id) {
     GGML_ASSERT(main_gpu_id<dpct::dev_mgr::instance().device_count());
 
-    clear_device_infos();
+    clear_infos();
     add_device_info(main_gpu_id);
     init_devices_dynamic_info();
     device_mode = SYCL_SINGLE_GPU_MODE;
@@ -217,23 +214,23 @@ void ggml_sycl_device_info::add_device_info(int id) {
     ids.push_back(id);
     devices.push_back(device);
 
-    device_infos[id].id = id;
-    device_infos[id].device = device;
-    device_infos[id].max_work_group_sizes = prop.get_max_work_group_size();
-    device_infos[id].max_compute_units = prop.get_max_compute_units();
-    device_infos[id].hw_family = get_device_family(&device);
+    infos[id].id = id;
+    infos[id].device = device;
+    infos[id].max_work_group_sizes = prop.get_max_work_group_size();
+    infos[id].max_compute_units = prop.get_max_compute_units();
+    infos[id].hw_family = get_device_family(&device);
 }
 
 void ggml_sycl_device_info::create_queues(int id) {
     for (int i=0; i<GGML_SYCL_MAX_STREAMS;i++) {
-        device_infos[id].qptrs[i] = create_queue_for_device_id(id);
+        infos[id].qptrs[i] = create_queue_for_device_id(id);
     }
 }
 
 void ggml_sycl_device_info::create_queues_for_devices() {
     for (auto &id: ids) {
         for (int i=0; i<GGML_SYCL_MAX_STREAMS;i++) {
-            device_infos[id].qptrs[i] = create_queue_for_device_id(id);
+            infos[id].qptrs[i] = create_queue_for_device_id(id);
         }
     }
 }
@@ -259,28 +256,28 @@ void ggml_sycl_device_info::print_gpu_device_list() {
                "units:%d, to use any SYCL devices, set/export "
                "GGML_SYCL_VISIBLE_DEVICES or ONEAPI_DEVICE_SELECTOR\n";
         fprintf(stderr, hint, get_device_count(), devices_list(),
-                device_infos[0].max_compute_units);
+                infos[0].max_compute_units);
     }
 }
 
 int ggml_sycl_device_info::work_group_size(int id) {
     GGML_ASSERT(is_allowed_device(id));
-    return device_infos[id].max_work_group_sizes;
+    return infos[id].max_work_group_sizes;
 }
 
 void ggml_sycl_device_info::update_mem() {
 
     for (int i = 0; i < GGML_SYCL_MAX_DEVICES; ++i) {
-        device_infos[i].vmm = 0;
+        infos[i].vmm = 0;
         default_tensor_split[i] = 0;
-        device_infos[i].cc =0;
+        infos[i].cc =0;
     }
 
     int64_t total_vram = 0;
 
     for (int i = 0; i < device_count; ++i) {
         int id = get_device_id(i);
-        device_infos[id].vmm = 0;
+        infos[id].vmm = 0;
         dpct::device_info prop;
         dpct::get_device_info(
             prop, dpct::dev_mgr::instance().get_device(id));
@@ -289,7 +286,7 @@ void ggml_sycl_device_info::update_mem() {
         default_tensor_split[i] = total_vram;
         total_vram += prop.get_global_mem_size();
 
-        device_infos[id].cc =
+        infos[id].cc =
             100 * prop.get_major_version() + 10 * prop.get_minor_version();
     }
 
@@ -335,7 +332,7 @@ int ggml_sycl_device_info::get_device_id(int device_index) {
 }
 
 int ggml_sycl_device_info::hw_family(int id) {
-    return device_infos[id].hw_family;
+    return infos[id].hw_family;
 }
 
 static inline bool env_existed(const char *env_name) {
diff --git a/ggml/src/ggml-sycl/sycl_device.hpp b/ggml/src/ggml-sycl/sycl_device.hpp
index f7acd5a8c..900a77942 100644
--- a/ggml/src/ggml-sycl/sycl_device.hpp
+++ b/ggml/src/ggml-sycl/sycl_device.hpp
@@ -54,7 +54,7 @@ struct ggml_sycl_device_info {
     sycl::context co_ctx;
     int m_device_filter;
 
-    sycl_device_info device_infos[GGML_SYCL_MAX_DEVICES];
+    sycl_device_info infos[GGML_SYCL_MAX_DEVICES];
     std::array<float, GGML_SYCL_MAX_DEVICES> default_tensor_split = {};
 
     ggml_sycl_device_info(int main_gpu_id);//single device mode
@@ -62,7 +62,7 @@ struct ggml_sycl_device_info {
     void init(ggml_sycl_backend_device_filter device_filter);
     void init_single_mode(int main_gpu_id);
 
-    void clear_device_infos();
+    void clear_infos();
     void print_gpu_device_list();
     int work_group_size(int device_id);
     bool is_allowed_device(int device_id);