LLM inference in C/C++
C++ ggml
hexagon: fix Windows crash when op_poll is enabled (#26029)
adgup-qtic0bc8591e881
diff --git a/ggml/src/ggml-hexagon/ggml-hexagon.cpp b/ggml/src/ggml-hexagon/ggml-hexagon.cppindex d19d2d5f03..827c772ff5 100644--- a/ggml/src/ggml-hexagon/ggml-hexagon.cpp+++ b/ggml/src/ggml-hexagon/ggml-hexagon.cpp@@ -1662,7 +1662,7 @@ void ggml_hexagon_session::flush_pending(bool all) {const uint32_t timeo = opt_oppoll ? 0 : DSPQUEUE_TIMEOUT;int err = dspqueue_read(this->queue, &flags, 1, &n_dbufs, &dbuf, sizeof(rsp), &rsp_size, (uint8_t *) &rsp, timeo);- if (err == AEE_EEXPIRED) {+ if (err == AEE_EEXPIRED || err == AEE_EWOULDBLOCK) {continue;}diff --git a/ggml/src/ggml-hexagon/htp-drv.cpp b/ggml/src/ggml-hexagon/htp-drv.cppindex 40c6010540..4f07908017 100644--- a/ggml/src/ggml-hexagon/htp-drv.cpp+++ b/ggml/src/ggml-hexagon/htp-drv.cpp@@ -59,7 +59,11 @@ typedef AEEResult (*dspqueue_read_pfn_t)(dspqueue_t queue, uint32_t *flags,uint32_t max_message_length,uint32_t *message_length, uint8_t *message,uint32_t timeout_us);-+typedef AEEResult (*dspqueue_read_noblock_pfn_t)(dspqueue_t queue, uint32_t *flags,+ uint32_t max_buffers, uint32_t *num_buffers,+ struct dspqueue_buffer *buffers,+ uint32_t max_message_length,+ uint32_t *message_length, uint8_t *message);typedef int (*fastrpc_mmap_pfn_t)(int domain, int fd, void *addr, int offset, size_t length, enum fastrpc_map_flags flags);typedef int (*fastrpc_munmap_pfn_t)(int domain, int fd, void *addr, size_t length);@@ -82,11 +86,12 @@ rpcmem_to_fd_pfn_t rpcmem_to_fd_pfn = nullptr;fastrpc_mmap_pfn_t fastrpc_mmap_pfn = nullptr;fastrpc_munmap_pfn_t fastrpc_munmap_pfn = nullptr;-dspqueue_create_pfn_t dspqueue_create_pfn = nullptr;-dspqueue_close_pfn_t dspqueue_close_pfn = nullptr;-dspqueue_export_pfn_t dspqueue_export_pfn = nullptr;-dspqueue_write_pfn_t dspqueue_write_pfn = nullptr;-dspqueue_read_pfn_t dspqueue_read_pfn = nullptr;+dspqueue_create_pfn_t dspqueue_create_pfn = nullptr;+dspqueue_close_pfn_t dspqueue_close_pfn = nullptr;+dspqueue_export_pfn_t dspqueue_export_pfn = nullptr;+dspqueue_write_pfn_t dspqueue_write_pfn = nullptr;+dspqueue_read_pfn_t dspqueue_read_pfn = nullptr;+dspqueue_read_noblock_pfn_t dspqueue_read_noblock_pfn = nullptr;remote_handle64_open_pfn_t remote_handle64_open_pfn = nullptr;remote_handle64_invoke_pfn_t remote_handle64_invoke_pfn = nullptr;@@ -167,6 +172,12 @@ AEEResult dspqueue_read(dspqueue_t queue,uint32_t * message_length,uint8_t * message,uint32_t timeout_us) {+#ifdef _WIN32+ if (timeout_us == 0) {+ return dspqueue_read_noblock_pfn(queue, flags, max_buffers, num_buffers, buffers, max_message_length,+ message_length, message);+ }+#endifreturn dspqueue_read_pfn(queue, flags, max_buffers, num_buffers, buffers, max_message_length, message_length,message, timeout_us);}@@ -349,6 +360,7 @@ int htpdrv_init() {dlsym(handle.get(), dspqueue_export_pfn_t, dspqueue_export_pfn, dspqueue_export, false);dlsym(handle.get(), dspqueue_write_pfn_t, dspqueue_write_pfn, dspqueue_write, false);dlsym(handle.get(), dspqueue_read_pfn_t, dspqueue_read_pfn, dspqueue_read, false);+ dlsym(handle.get(), dspqueue_read_noblock_pfn_t, dspqueue_read_noblock_pfn, dspqueue_read_noblock, false);dlsym(handle.get(), remote_handle64_open_pfn_t, remote_handle64_open_pfn, remote_handle64_open, false);dlsym(handle.get(), remote_handle64_invoke_pfn_t, remote_handle64_invoke_pfn, remote_handle64_invoke, false);dlsym(handle.get(), remote_handle_control_pfn_t, remote_handle_control_pfn, remote_handle_control, false);