fixes

Signed-off-by: Anatoly Myachev <[email protected]>

Author: anmyachev

third_party/intel/backend/driver.py

@@ -291,7 +291,7 @@ def compile_module_from_src(src: str, name: str, include_dirs: list[str] | None
         return SpirvUtils(cache_path)
     if name == '__triton_launcher':
         return TritonLauncher(cache_path)
-    if name in ['proton_utils', 'xpu_api']:
+    if name == 'proton_utils':
         return cache_path
 
     return _load_module_from_path(name, cache_path)
@@ -950,8 +950,8 @@ def build_proton_help_lib(self):
         dirname_third_party = os.path.realpath(dirname + "../../..")
         include_dir = dirname_third_party + "/proton/csrc/include/"
         return compile_module_from_src(
-            src=Path(dirname_third_party + "/proton/csrc/lib/Driver/GPU/XpuApiCompileInRuntime.cpp").read_text(),
-            name="xpu_api",
+            src=Path(Path(dirname).joinpath("proton_utils.cpp")).read_text(),
+            name="proton_utils",
             include_dirs=[include_dir],
         )
 

third_party/proton/csrc/lib/Driver/GPU/XpuApiCompileInRuntime.cpp renamed to third_party/intel/backend/proton_utils.cpp

@@ -7,7 +7,7 @@ namespace proton {
 
 namespace xpu {
 
-extern std::string XPU_API_UTILS;
+extern std::string PROTON_UTILS;
 
 Device getDevice(uint64_t index);
 

third_party/proton/csrc/include/Driver/GPU/XpuApi.h

@@ -8,13 +8,13 @@ namespace proton {
 
 namespace xpu {
 
-std::string XPU_API_UTILS;
+std::string PROTON_UTILS;
 
 typedef void (*GetDevicePropertiesFunc)(uint64_t, uint32_t *, uint32_t *,
                                         uint32_t *, uint32_t *, char[256]);
 
 Device getDevice(uint64_t index) {
-  void *handle = dlopen(XPU_API_UTILS.data(), RTLD_LAZY);
+  void *handle = dlopen(PROTON_UTILS.data(), RTLD_LAZY);
   if (!handle) {
     const char *dlopen_error = dlerror();
     throw std::runtime_error(std::string("Failed to load library: ") +

third_party/proton/csrc/lib/Driver/GPU/XpuApi.cpp

@@ -278,7 +278,7 @@ void CallbackCommon(pti_callback_domain domain,
 typedef void (*EnumDeviceUUIDsFunc)(std::vector<std::array<uint8_t, 16>>);
 
 int callEnumDeviceUUIDs(const std::string &utils_cache_path) {
-  void *handle = dlopen(xpu::XPU_API_UTILS.data(), RTLD_LAZY);
+  void *handle = dlopen(xpu::PROTON_UTILS.data(), RTLD_LAZY);
   if (!handle) {
     std::cerr << "Failed to load library: " << dlerror() << std::endl;
     return 1;
@@ -303,7 +303,7 @@ int callEnumDeviceUUIDs(const std::string &utils_cache_path) {
 typedef void (*WaitOnSyclQueueFunc)(void *);
 
 int callWaitOnSyclQueue(void *syclQueue) {
-  void *handle = dlopen(xpu::XPU_API_UTILS.data(), RTLD_LAZY);
+  void *handle = dlopen(xpu::PROTON_UTILS.data(), RTLD_LAZY);
   if (!handle) {
     std::cerr << "Failed to load library: " << dlerror() << std::endl;
     return 1;
@@ -328,8 +328,8 @@ int callWaitOnSyclQueue(void *syclQueue) {
 void XpuptiProfiler::XpuptiProfilerPimpl::doStart() {
   // should be call to shared lib
   XpuptiProfiler &profiler = threadState.profiler;
-  if (xpu::XPU_API_UTILS != "") {
-    callEnumDeviceUUIDs(xpu::XPU_API_UTILS);
+  if (xpu::PROTON_UTILS != "") {
+    callEnumDeviceUUIDs(xpu::PROTON_UTILS);
   }
 
   xpupti::viewSetCallbacks<true>(allocBuffer, completeBuffer);

third_party/proton/csrc/lib/Profiler/Xpupti/XpuptiProfiler.cpp

@@ -27,7 +27,7 @@ Profiler *makeProfiler(const std::string &name, void *sycl_queue = nullptr,
   }
 #ifdef TRITON_BUILD_PROTON_XPU
   if (proton::toLower(name) == "xpupti") {
-    xpu::XPU_API_UTILS = utils_cache_path;
+    xpu::PROTON_UTILS = utils_cache_path;
     return &XpuptiProfiler::instance().setSyclQueue(sycl_queue);
   }
 #endif