Skip to content

Commit 4f4996a

Browse files
committed
Missing Reverts
1 parent 34f7bed commit 4f4996a

File tree

2 files changed

+19
-5
lines changed

2 files changed

+19
-5
lines changed

ggml/src/ggml-sycl/common.hpp

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ void ggml_sycl_host_free(void* ptr);
4242

4343
extern int g_ggml_sycl_debug;
4444
extern int g_ggml_sycl_disable_optimize;
45-
extern int g_ggml_sycl_disable_mmvq;
45+
extern int g_ggml_sycl_prioritize_dmmv;
4646

4747
#define GGML_SYCL_DEBUG(...) \
4848
do { \
@@ -286,11 +286,25 @@ struct ggml_tensor_extra_gpu {
286286

287287
void release_extra_gpu(ggml_tensor_extra_gpu * extra, std::vector<queue_ptr> streams={});
288288

289-
inline optimize_feature check_gpu_optimize_feature(syclex::architecture &/*arch*/) {
289+
inline optimize_feature check_gpu_optimize_feature(syclex::architecture &arch) {
290290
optimize_feature opt;
291291

292-
// TODO: Romain change to Intel vendor?
293-
opt.reorder = true;
292+
opt.reorder =
293+
(arch == syclex::architecture::intel_gpu_dg1 ||
294+
arch == syclex::architecture::intel_gpu_acm_g10 ||
295+
arch == syclex::architecture::intel_gpu_acm_g11 ||
296+
arch == syclex::architecture::intel_gpu_acm_g12 ||
297+
arch == syclex::architecture::intel_gpu_pvc ||
298+
arch == syclex::architecture::intel_gpu_pvc_vg ||
299+
arch == syclex::architecture::intel_gpu_mtl_u ||
300+
arch == syclex::architecture::intel_gpu_mtl_s ||
301+
arch == syclex::architecture::intel_gpu_mtl_h ||
302+
arch == syclex::architecture::intel_gpu_arl_u ||
303+
arch == syclex::architecture::intel_gpu_arl_s ||
304+
arch == syclex::architecture::intel_gpu_arl_h ||
305+
arch == syclex::architecture::intel_gpu_bmg_g21 ||
306+
arch == syclex::architecture::intel_gpu_lnl_m
307+
);
294308

295309
return opt;
296310
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ static void ggml_check_sycl() try {
202202
GGML_LOG_INFO(" GGML_SYCL_DEBUG: %d\n", g_ggml_sycl_debug);
203203
GGML_LOG_INFO(" GGML_SYCL_DISABLE_OPT: %d\n", g_ggml_sycl_disable_optimize);
204204
GGML_LOG_INFO(" GGML_SYCL_DISABLE_GRAPH: %d\n", g_ggml_sycl_disable_graph);
205-
GGML_LOG_INFO(" GGML_SYCL_DISABLE_MMVQ: %d\n", g_ggml_sycl_prioritize_dmmv);
205+
GGML_LOG_INFO(" GGML_SYCL_PRIORITIZE_DMMV: %d\n", g_ggml_sycl_prioritize_dmmv);
206206
GGML_LOG_INFO("Build with Macros:\n");
207207
#if defined(GGML_SYCL_FORCE_MMQ)
208208
GGML_LOG_INFO(" GGML_SYCL_FORCE_MMQ: yes\n");

0 commit comments

Comments
 (0)