Unify convert_ngen_arch function

Author: jkasprza

src/plugins/intel_gpu/src/runtime/ocl/ocl_device.cpp

@@ -13,6 +13,7 @@
 
 #include "ocl_common.hpp"
 #include "intel_gpu/runtime/debug_configuration.hpp"
+#include "runtime_common.hpp"
 
 #include <map>
 #include <string>
@@ -52,27 +53,6 @@ namespace ocl {
 
 namespace {
 
-#if defined(ENABLE_ONEDNN_FOR_GPU) && defined(OV_GPU_WITH_OCL_RT)
-gpu_arch convert_ngen_arch(ngen::HW gpu_arch) {
-    switch (gpu_arch) {
-        case ngen::HW::Gen9: return gpu_arch::gen9;
-        case ngen::HW::Gen11: return gpu_arch::gen11;
-        case ngen::HW::XeLP: return gpu_arch::xe_lp;
-        case ngen::HW::XeHP: return gpu_arch::xe_hp;
-        case ngen::HW::XeHPG: return gpu_arch::xe_hpg;
-        case ngen::HW::XeHPC: return gpu_arch::xe_hpc;
-        case ngen::HW::Xe2: return gpu_arch::xe2;
-        case ngen::HW::Xe3: return gpu_arch::xe3;
-        case ngen::HW::XE3P_35_10: return gpu_arch::xe3p_35_10;
-        case ngen::HW::XE3P_35_11: return gpu_arch::xe3p_35_11;
-        case ngen::HW::XE3P_UNKNOWN: return gpu_arch::xe3p_unknown;
-        case ngen::HW::Gen10:
-        case ngen::HW::Unknown: return gpu_arch::unknown;
-    }
-    return gpu_arch::unknown;
-}
-#endif
-
 int driver_dev_id() {
     const std::vector<int> unused_ids = {
         0x4905, 0x4906, 0x4907, 0x4908

src/plugins/intel_gpu/src/runtime/runtime_common.cpp

@@ -0,0 +1,30 @@
+// Copyright (C) 2018-2026 Intel Corporation
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#include "runtime_common.hpp"
+
+namespace cldnn {
+
+#ifdef ENABLE_ONEDNN_FOR_GPU
+gpu_arch convert_ngen_arch(ngen::HW gpu_arch) {
+    switch (gpu_arch) {
+        case ngen::HW::Gen9: return gpu_arch::gen9;
+        case ngen::HW::Gen11: return gpu_arch::gen11;
+        case ngen::HW::XeLP: return gpu_arch::xe_lp;
+        case ngen::HW::XeHP: return gpu_arch::xe_hp;
+        case ngen::HW::XeHPG: return gpu_arch::xe_hpg;
+        case ngen::HW::XeHPC: return gpu_arch::xe_hpc;
+        case ngen::HW::Xe2: return gpu_arch::xe2;
+        case ngen::HW::Xe3: return gpu_arch::xe3;
+        case ngen::HW::XE3P_35_10: return gpu_arch::xe3p_35_10;
+        case ngen::HW::XE3P_35_11: return gpu_arch::xe3p_35_11;
+        case ngen::HW::XE3P_UNKNOWN: return gpu_arch::xe3p_unknown;
+        case ngen::HW::Gen10:
+        case ngen::HW::Unknown: return gpu_arch::unknown;
+    }
+    return gpu_arch::unknown;
+}
+#endif
+
+}  // namespace cldnn

src/plugins/intel_gpu/src/runtime/runtime_common.hpp

@@ -2,10 +2,15 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include <string>
-
+#include "intel_gpu/runtime/device_info.hpp"
 #include "openvino/core/except.hpp"
 
+#ifdef ENABLE_ONEDNN_FOR_GPU
+#include "gpu/intel/jit/generator.hpp"
+#endif
+
+#include <string>
+
 namespace cldnn {
 
 inline void check_boundaries(size_t src_size,
@@ -31,4 +36,9 @@ inline void check_boundaries(size_t src_size,
                     copy_size,
                     ".");
 }
+
+#ifdef ENABLE_ONEDNN_FOR_GPU
+gpu_arch convert_ngen_arch(ngen::HW gpu_arch);
+#endif
+
 }  // namespace cldnn

src/plugins/intel_gpu/src/runtime/ze/ze_device.cpp

@@ -5,6 +5,7 @@
 #include "ze_device.hpp"
 #include "ze_common.hpp"
 #include "compute_runtime/zex_common.h"
+#include "runtime_common.hpp"
 
 #include <ze_api.h>
 #include "compute_runtime/ze_intel_gpu.h"
@@ -36,24 +37,6 @@ namespace cldnn {
 namespace ze {
 
 namespace {
-#ifdef ENABLE_ONEDNN_FOR_GPU
-//TODO merge this with ocl_device
-gpu_arch convert_ngen_arch(ngen::HW gpu_arch) {
-    switch (gpu_arch) {
-        case ngen::HW::Gen9: return gpu_arch::gen9;
-        case ngen::HW::Gen11: return gpu_arch::gen11;
-        case ngen::HW::XeLP: return gpu_arch::xe_lp;
-        case ngen::HW::XeHP: return gpu_arch::xe_hp;
-        case ngen::HW::XeHPG: return gpu_arch::xe_hpg;
-        case ngen::HW::XeHPC: return gpu_arch::xe_hpc;
-        case ngen::HW::Xe2: return gpu_arch::xe2;
-        case ngen::HW::Xe3: return gpu_arch::xe3;
-        case ngen::HW::Gen10:
-        case ngen::HW::Unknown: return gpu_arch::unknown;
-    }
-    return gpu_arch::unknown;
-}
-#endif
 
 gfx_version parse_version(uint32_t gmdid) {
     union GMDID {