* hexagon: introduce op request batching and rewrite buffer managment The host now prepares batches of requests and dispatches them via a single dspqueue message. Buffers are mapped explicitly by NPU while processing batches. * hex-dma: disable l2 bypass since to work around new issue due to no flushes between Ops * hex-utils: add explicit l2flush and l2clear helpers * hex-opreq: use fine-grain per tensor l2 management * hex-opreq: avoid redundant invalidates for tensors we already flushed * hex-opreq: update debug messages * htp-opreq: reuse ops_context * hex-opreq: do not flush or invalidate cache lines beyond buffer boundry * hex-opreq: fix errors in log message * Revert "hex-opreq: do not flush or invalidate cache lines beyond buffer boundry" This reverts commit 8b7f0a55a750a6430ce4eb1874c7feb3d720056d. * hexagon: limit l2 flushes to 1MB which covers l2 cache * hex-opreq: limit cache flush to 4MB Looks like 4MB cont. vitual space should cover the 1MB cache. * hexagon: drop cache flush size to 2MB * hex-opreq: start reworking opreq packing * hex-opreq: introduce new way of packing opbatch where tensors are stored separately * hex-opreq: add a simple fastrpc call to force unmap all buffers * hex-l2flush: somehow 2MB does not seem robust, also cleanup step size to use line-size * hex-opreq: bump opreq batch size to 256 * hex-mm: place src1 spad at the top of vtcm for easy reuse * hex-ops: introduce internal types and disable src1 reuse for now Nothing new just formalizing the repack / qyn.quant types we've been using. * htp-opreq: use tensor pointers instead of copies * hex-opreq: introduce more robust way for tracking vtcm/spad reuse This removes the SKIP_QUANTIZE flag that became fragile with the addition of HMX and other ops. * hex-cumsum: fix error post opreq merge * hex-opreq: move request batch handling into the session Prepping everything for using dspqueue buffers and doing that inside the session is much cleaner. * hex-mm: yet another fix for src1 reuse when we're mixing hmx/hvx * hex-bufs: introduce pinned mmapings and use non-pinned ones for model buffers * hex-buf: add support for allocating shared/pinned buffer for opreqs * hex-opbatch: make opbatches configurable * hex-naming: better name for ggml_hexagon_shared_buffer * hex-naming: add session->c_name() helper * hex-opbatch: start using shm but still copy for now * hex-opbatch: use shared buffer for packing opbatch * hex-opbatch: beter naming for opbatch related classes and code * hex-opbatch: reuse batched tensors with same data/dims/strides * hex-opbatch: update logging * hex-opbatch: add support for vmem limit for op batching * hex-opbatch: update htp side to properly support dynamic mmap/unmap * hex-opbatch: add OB and OQ params for run-completion script and fix the asserts in batch processing * hex-opbatch: fixed src1 handling in act ops * hex-act: fix empty src1 handling in swiglu and friends Simplify preamble macro while at it * hex-mm: minor fix vtcm and dma handling in matmul cleaning up some left-overs from merges * hex-opbatch: allocate extra 1KB for dspqueue overhead * hexagon: fix softmax for non-aligned tensors and cleanup vtcm alloc * hex-mm: properly handle hmx_disabled flag * hex-ops: update comments * hex-ops: add debug output for get/set-rows * hex-mmap: optimize un/mapping of buffers * hex-opreq: global cache flush and invalidate beyond 128KB threshold * hex-ops: add super simple opfilter regex for debugging If an Op matches the regex hex backend will reject it. * hex-opbatch: wireup newer ops missed in merge and update main switch to detect this in future * hexagon: improved vtcm acquision to remove inter-op overhead Fully compatible with QNN-HTP coex * hex-mm: fixed hvx fallback path * hex-mm: lower the vmem threshold a bit further to ~3GB * hexagon: update debug & error logs This also fixes an issue with newer llvm merging repack and non-repack functions. We use those pointer to distinguish between buffer types. * hexagon: move ops context into main context Just a cleanup. We don't need separate contexts at this point. * hex-opbatch: cleanup naming and headers for opbatch and related descriptors * hex-fa: it's now better to enable FA during TG to reduce graph splits * hexagon: remove GGML_HEXAGON_EXPERIMENTAL env var It's no longer useful. Please use more flexible GGML_HEXAGON_OPFILTER to disable Ops if needed for debugging or validation. * hexagon: fixed editorconfig check * Update ggml/src/ggml-hexagon/ggml-hexagon.cpp Co-authored-by: Sigbjørn Skjæret <sigbjorn.skjaeret@scala.com> --------- Co-authored-by: Trivikram Reddy <tamarnat@qti.qualcomm.com> Co-authored-by: Sigbjørn Skjæret <sigbjorn.skjaeret@scala.com>
129 lines
4.2 KiB
C
129 lines
4.2 KiB
C
#pragma clang diagnostic ignored "-Wunused-variable"
|
|
#pragma clang diagnostic ignored "-Wunused-function"
|
|
#pragma clang diagnostic ignored "-Wunused-but-set-variable"
|
|
|
|
#include <HAP_farf.h>
|
|
#include <HAP_perf.h>
|
|
|
|
#include <string.h>
|
|
#include <math.h>
|
|
|
|
#include "hex-dma.h"
|
|
#include "hvx-utils.h"
|
|
|
|
#define GGML_COMMON_DECL_C
|
|
#include "ggml-common.h"
|
|
#include "htp-ctx.h"
|
|
#include "htp-ops.h"
|
|
#include "htp-ops.h"
|
|
|
|
#define sum_rows_preamble \
|
|
const struct htp_tensor *src0 = octx->src[0]; \
|
|
const struct htp_tensor *dst = octx->dst; \
|
|
\
|
|
const uint32_t ne00 = src0->ne[0]; \
|
|
const uint32_t ne01 = src0->ne[1]; \
|
|
const uint32_t ne02 = src0->ne[2]; \
|
|
const uint32_t ne03 = src0->ne[3]; \
|
|
\
|
|
const uint32_t nb00 = src0->nb[0]; \
|
|
const uint32_t nb01 = src0->nb[1]; \
|
|
const uint32_t nb02 = src0->nb[2]; \
|
|
const uint32_t nb03 = src0->nb[3]; \
|
|
\
|
|
const uint32_t ne0 = dst->ne[0]; \
|
|
const uint32_t ne1 = dst->ne[1]; \
|
|
const uint32_t ne2 = dst->ne[2]; \
|
|
const uint32_t ne3 = dst->ne[3]; \
|
|
\
|
|
const uint32_t nb0 = dst->nb[0]; \
|
|
const uint32_t nb1 = dst->nb[1]; \
|
|
const uint32_t nb2 = dst->nb[2]; \
|
|
const uint32_t nb3 = dst->nb[3]; \
|
|
|
|
struct sum_rows_context {
|
|
const uint8_t * src_data;
|
|
uint8_t * dst_data;
|
|
uint32_t ne00;
|
|
size_t src_stride;
|
|
size_t dst_stride;
|
|
uint32_t rows_per_thread;
|
|
uint32_t total_rows;
|
|
bool opt_path;
|
|
};
|
|
|
|
static void sum_rows_thread_f32(unsigned int nth, unsigned int ith, void *data) {
|
|
const struct sum_rows_context * smctx = (const struct sum_rows_context *) data;
|
|
|
|
const uint32_t rows_per_thread = smctx->rows_per_thread;
|
|
const uint32_t total_rows = smctx->total_rows;
|
|
|
|
const uint32_t start_row = rows_per_thread * ith;
|
|
const uint32_t end_row = MIN(start_row + rows_per_thread, total_rows);
|
|
|
|
if (start_row >= end_row) {
|
|
return;
|
|
}
|
|
|
|
const size_t src_stride = smctx->src_stride;
|
|
const size_t dst_stride = smctx->dst_stride;
|
|
const uint32_t ne00 = smctx->ne00;
|
|
const bool opt_path = smctx->opt_path;
|
|
|
|
const float * restrict src_th = (const float *) (smctx->src_data + (start_row * src_stride));
|
|
float * restrict dst_th = (float *) (smctx->dst_data + (start_row * dst_stride));
|
|
|
|
// Calculate actual number of rows for this thread
|
|
const uint32_t n_rows = end_row - start_row;
|
|
|
|
for (uint32_t ir = 0; ir < n_rows; ir++) {
|
|
const float * restrict src_local = src_th + (ir * (src_stride / sizeof(float)));
|
|
|
|
if (ir + 1 < n_rows) {
|
|
hex_l2fetch(src_local + (src_stride / sizeof(float)), src_stride, src_stride, 1);
|
|
}
|
|
|
|
if (opt_path) {
|
|
dst_th[ir] = hvx_reduce_sum_f32_a((const uint8_t *) src_local, ne00);
|
|
} else {
|
|
dst_th[ir] = hvx_reduce_sum_f32((const uint8_t *) src_local, ne00);
|
|
}
|
|
}
|
|
}
|
|
|
|
int op_sum_rows(struct htp_ops_context * octx) {
|
|
sum_rows_preamble;
|
|
|
|
if (octx->src[0]->type != HTP_TYPE_F32) {
|
|
return HTP_STATUS_NO_SUPPORT;
|
|
}
|
|
|
|
if (octx->flags & HTP_OPFLAGS_SKIP_COMPUTE) {
|
|
return HTP_STATUS_OK;
|
|
}
|
|
|
|
const uint32_t src0_nrows = ne01 * ne02 * ne03;
|
|
const uint32_t n_threads = MIN(octx->n_threads, src0_nrows);
|
|
const uint32_t rows_per_thread = (src0_nrows + n_threads - 1) / n_threads;
|
|
|
|
bool opt_path = false;
|
|
if ((0 == hex_is_aligned((void *) src0->data, VLEN)) && !(nb01 & (VLEN - 1))) {
|
|
opt_path = true;
|
|
}
|
|
|
|
struct sum_rows_context smctx = {
|
|
.src_data = (const uint8_t *) src0->data,
|
|
.dst_data = (uint8_t *) dst->data,
|
|
.ne00 = ne00,
|
|
.src_stride = nb01,
|
|
.dst_stride = nb1,
|
|
.rows_per_thread = rows_per_thread,
|
|
.total_rows = src0_nrows,
|
|
.opt_path = opt_path,
|
|
};
|
|
|
|
worker_pool_run_func(octx->ctx->worker_pool, sum_rows_thread_f32, &smctx, n_threads);
|
|
|
|
return HTP_STATUS_OK;
|
|
}
|