Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion backends/webgpu/runtime/WebGPUBackend.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,8 +79,32 @@ Result<DelegateHandle*> WebGPUBackend::init(
return Error::DelegateInvalidCompatibility;
}

// Load-time backend option (BackendOption / LoadBackendOptionsMap), keyed by
// the registered backend name; default false. Mirrors the CoreML/XNNPACK
// runtime-spec pattern -- no compile flag and no .pte re-export needed.
bool enable_f16_kv_cache = false;
{
Result<bool> spec = context.get_runtime_spec<bool>("enable_f16_kv_cache");
if (spec.ok()) {
enable_f16_kv_cache = spec.get();
}
}
bool enable_f16_accumulate_gemm = false;
{
Result<bool> spec =
context.get_runtime_spec<bool>("enable_f16_accumulate_gemm");
if (spec.ok()) {
enable_f16_accumulate_gemm = spec.get();
}
}

try {
graph->build(flatbuffer_data, constant_data, context.get_named_data_map());
graph->build(
flatbuffer_data,
constant_data,
context.get_named_data_map(),
enable_f16_kv_cache,
enable_f16_accumulate_gemm);
} catch (const std::exception& e) {
ET_LOG(Error, "WebGPU graph build failed: %s", e.what());
graph->~WebGPUGraph();
Expand Down
108 changes: 107 additions & 1 deletion backends/webgpu/runtime/WebGPUGraph.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,6 +90,49 @@ WGPUBuffer WebGPUGraph::create_scratch_buffer(size_t nbytes) {
return buffer;
}

WGPUBuffer WebGPUGraph::acquire_scratch(size_t nbytes) {
nbytes = nbytes > 0 ? nbytes : 4;
// Best-fit reuse: smallest free slot with size in [nbytes, 2*nbytes] -- the
// 2x cap stops a large Cmax-sized buffer from backing a tiny request. Never
// reuse an in_use slot (co-live safety).
ScratchSlot* best = nullptr;
for (auto& s : scratch_pool_) {
// s.size - nbytes (safe: s.size >= nbytes) avoids overflowing 2 * nbytes.
if (!s.in_use && s.size >= nbytes && s.size - nbytes <= nbytes) {
if (best == nullptr || s.size < best->size) {
best = &s;
}
}
}
if (best != nullptr) {
best->in_use = true;
return best->buffer;
}
// None reusable -> create a new slot (freed in the dtor, like
// scratch_buffers_).
WGPUBufferDescriptor buf_desc = {};
buf_desc.size = nbytes;
buf_desc.usage = WGPUBufferUsage_Storage | WGPUBufferUsage_CopyDst |
WGPUBufferUsage_CopySrc;
buf_desc.mappedAtCreation = false;
WGPUBuffer buffer = wgpuDeviceCreateBuffer(device_, &buf_desc);
scratch_pool_.push_back({buffer, nbytes, true});
return buffer;
}

void WebGPUGraph::release_scratch(WGPUBuffer buffer) {
if (!buffer) {
return;
}
for (auto& s : scratch_pool_) {
if (s.buffer == buffer) {
s.in_use = false;
return;
}
}
// Not a pooled buffer -> no-op; the dtor frees it via scratch_buffers_.
}

WGPUBuffer WebGPUGraph::make_uniform_buffer(const void* data, size_t size) {
WGPUBufferDescriptor desc = {};
desc.size = size;
Expand DownExpand Up@@ -267,6 +310,11 @@ WebGPUGraph::~WebGPUGraph() {
wgpuBufferRelease(buf);
}
}
for (auto& s : scratch_pool_) {
if (s.buffer) {
wgpuBufferRelease(s.buffer);
}
}
for (auto& buf : owned_uniform_buffers_) {
if (buf) {
wgpuBufferRelease(buf);
Expand DownExpand Up@@ -310,7 +358,9 @@ WebGPUGraph::~WebGPUGraph() {
void WebGPUGraph::build(
const void* flatbuffer_data,
const uint8_t* constant_data,
const executorch::runtime::NamedDataMap* named_data_map) {
const executorch::runtime::NamedDataMap* named_data_map,
bool f16_kv_cache,
bool f16_accumulate_gemm) {
if (!device_) {
auto* ctx = get_default_webgpu_context();
if (ctx) {
Expand All@@ -331,6 +381,15 @@ void WebGPUGraph::build(
constant_data_ = constant_data;
named_data_map_ = named_data_map;

// f16 KV cache (runtime opt-in): store K/V caches as f16 iff the opt-in is
// set AND the device negotiated shader-f16 (fail-closed).
const WebGPUContext* kv_ctx = get_default_webgpu_context();
kv_f16_ = f16_kv_cache && (kv_ctx != nullptr && kv_ctx->shader_f16_supported);

// f16-accumulate q4gsw steel prefill GEMM (runtime opt-in). QuantizedLinear
// additionally gates the kernel on the negotiated shader-f16 feature.
f16_accumulate_gemm_ = f16_accumulate_gemm;

// Phase 1: Create all values
const auto* values = graph->values();
const int num_vals = values ? values->size() : 0;
Expand DownExpand Up@@ -358,6 +417,13 @@ void WebGPUGraph::build(
if (!a) {
continue;
}
// f16 KV: tag sdpa K/V cache values (args[3],[4]) for half-size alloc.
// Inert unless kv_f16_ (runtime opt-in) is set.
if (kv_f16_ && a->size() > 4 &&
oc->name()->str() == "sdpa_with_kv_cache.default") {
kv_cache_ids_.insert(static_cast<int>(a->Get(3)));
kv_cache_ids_.insert(static_cast<int>(a->Get(4)));
}
for (unsigned j = 0; j < a->size(); j++) {
int id = static_cast<int>(a->Get(j));
if (is_prepack && j == 0) {
Expand All@@ -378,6 +444,29 @@ void WebGPUGraph::build(
}
}

// f16 KV defensive guard: fail loud if a non-sdpa op reads an f16 cache.
// Inert unless kv_f16_ (runtime opt-in) is set.
if (kv_f16_ && !kv_cache_ids_.empty() && chain_prescan) {
for (unsigned ci = 0; ci < chain_prescan->size(); ci++) {
const auto* oc = chain_prescan->Get(ci);
const std::string nm = oc->name()->str();
if (nm == "sdpa_with_kv_cache.default" || nm == kPrepackOpName) {
continue;
}
const auto* a = oc->args();
if (!a) {
continue;
}
for (unsigned j = 0; j < a->size(); j++) {
if (kv_cache_ids_.count(static_cast<int>(a->Get(j))) != 0) {
throw std::runtime_error(
"WebGPU f16 KV: cache tensor consumed by non-sdpa op '" + nm +
"' would misread the f16 buffer");
}
}
}
}

for (int i = 0; i < num_vals; i++) {
const auto* val = values->Get(i);
if (!val || val->value_type() == vkgraph::GraphTypes::NONE) {
Expand DownExpand Up@@ -407,6 +496,23 @@ void WebGPUGraph::build(
tensor.cur_dims = tensor.dims;
tensor.cur_nbytes = tensor.nbytes;

// f16 KV cache: dedicated half-size array<f16> buffer. WebGPU
// zero-initializes freshly-created buffers, so no explicit clear is
// needed. Inert unless kv_f16_ (runtime opt-in) is set.
if (kv_f16_ && kv_cache_ids_.count(i) != 0) {
tensor.elem_size = 2;
tensor.nbytes = numel * 2;
tensor.cur_nbytes = tensor.nbytes;
tensor_mem_obj_ids_[i] = -1;
WGPUBufferDescriptor buf_desc = {};
buf_desc.size = std::max(tensor.nbytes, size_t(4));
buf_desc.usage = WGPUBufferUsage_Storage | WGPUBufferUsage_CopyDst |
WGPUBufferUsage_CopySrc;
buf_desc.mappedAtCreation = false;
tensor.buffer = wgpuDeviceCreateBuffer(device_, &buf_desc);
break;
}

int constant_id = vk_tensor->constant_id();
int mem_obj_id = vk_tensor->mem_obj_id();

Expand Down
60 changes: 59 additions & 1 deletion backends/webgpu/runtime/WebGPUGraph.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,7 +104,9 @@ class WebGPUGraph {
void build(
const void* flatbuffer_data,
const uint8_t* constant_data,
const executorch::runtime::NamedDataMap* named_data_map = nullptr);
const executorch::runtime::NamedDataMap* named_data_map = nullptr,
bool f16_kv_cache = false,
bool f16_accumulate_gemm = false);

// Copy input tensor data from host pointers into GPU buffers.
void copy_inputs(const std::vector<InputData>& inputs);
Expand DownExpand Up@@ -267,6 +269,35 @@ class WebGPUGraph {
// Graph-owned scratch storage buffer for fused-op intermediates (e.g. SDPA).
WGPUBuffer create_scratch_buffer(size_t nbytes);

// Reusable scratch pool for SINGLE-OP-LIFETIME fused-op scratch (SDPA
// attn_weights/softmax, FlashDecoding partials). acquire_scratch() reuses a
// free slot (best-fit, size in [n,2n]) or creates one; the caller RELEASES it
// at op-lowering scope exit (use ScopedScratch), so N layers' scratch reuses
// a small constant of buffers instead of N x held to graph teardown.
// Correctness: WebGPU/Dawn auto-inserts RAW hazard barriers between
// dispatches on a shared storage buffer regardless of pass structure -- the
// SAME guarantee mem_obj_id aliasing already relies on -- so reuse is
// bit-identical. Never hand a still-in_use slot to a co-live requester.
WGPUBuffer acquire_scratch(size_t nbytes);
void release_scratch(WGPUBuffer buffer);
// RAII: releases an acquired scratch slot when the op-lowering scope exits
// (leak-safe vs early returns).
struct ScopedScratch {
WebGPUGraph* g = nullptr;
WGPUBuffer buf = nullptr;
ScopedScratch(WebGPUGraph* graph, WGPUBuffer b) : g(graph), buf(b) {}
~ScopedScratch() {
if (g && buf) {
g->release_scratch(buf);
}
}
ScopedScratch(const ScopedScratch&) = delete;
ScopedScratch& operator=(const ScopedScratch&) = delete;
operator WGPUBuffer() const {
return buf;
}
};

// Create a mapped-at-creation uniform buffer from `size` bytes and track it
// in the memory stats. Shared helper for ops needing a uniform Params buffer.
WGPUBuffer make_uniform_buffer(const void* data, size_t size);
Expand DownExpand Up@@ -314,6 +345,23 @@ class WebGPUGraph {
return value_types_[id];
}

public:
// True when the sdpa K/V cache is stored f16-packed (runtime opt-in).
bool kv_f16() const {
return kv_f16_;
}

// True when the q4gsw steel prefill GEMM uses the lossy f16-accumulate kernel
// (runtime opt-in; perplexity-gated, not bit-exact).
bool f16_accumulate_gemm() const {
return f16_accumulate_gemm_;
}

private:
bool kv_f16_ = false;
std::unordered_set<int> kv_cache_ids_;
bool f16_accumulate_gemm_ = false;

private:
WGPUInstance instance_ = nullptr;
WGPUDevice device_ = nullptr;
Expand DownExpand Up@@ -366,6 +414,16 @@ class WebGPUGraph {
// Long-lived scratch storage buffers for fused ops (e.g. SDPA temporaries).
std::vector<WGPUBuffer> scratch_buffers_;

// Reusable scratch pool: single-op-lifetime buffers recycled across ops
// (acquire_scratch/release_scratch). Each slot is freed in the dtor. See
// acquire_scratch() for the reuse policy.
struct ScratchSlot {
WGPUBuffer buffer = nullptr;
size_t size = 0;
bool in_use = false;
};
std::vector<ScratchSlot> scratch_pool_;

// Uniform buffers owned for the graph's lifetime; released in the dtor.
std::vector<WGPUBuffer> owned_uniform_buffers_;

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion backends/webgpu/runtime/WebGPUBackend.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,8 +79,32 @@ Result<DelegateHandle*> WebGPUBackend::init(
return Error::DelegateInvalidCompatibility;
}

// Load-time backend option (BackendOption / LoadBackendOptionsMap), keyed by
// the registered backend name; default false. Mirrors the CoreML/XNNPACK
// runtime-spec pattern -- no compile flag and no .pte re-export needed.
bool enable_f16_kv_cache = false;
{
Result<bool> spec = context.get_runtime_spec<bool>("enable_f16_kv_cache");
if (spec.ok()) {
enable_f16_kv_cache = spec.get();
}
}
bool enable_f16_accumulate_gemm = false;
{
Result<bool> spec =
context.get_runtime_spec<bool>("enable_f16_accumulate_gemm");
if (spec.ok()) {
enable_f16_accumulate_gemm = spec.get();
}
}

try {
graph->build(flatbuffer_data, constant_data, context.get_named_data_map());
graph->build(
flatbuffer_data,
constant_data,
context.get_named_data_map(),
enable_f16_kv_cache,
enable_f16_accumulate_gemm);
} catch (const std::exception& e) {
ET_LOG(Error, "WebGPU graph build failed: %s", e.what());
graph->~WebGPUGraph();
Expand Down
108 changes: 107 additions & 1 deletion backends/webgpu/runtime/WebGPUGraph.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,6 +90,49 @@ WGPUBuffer WebGPUGraph::create_scratch_buffer(size_t nbytes) {
return buffer;
}

WGPUBuffer WebGPUGraph::acquire_scratch(size_t nbytes) {
nbytes = nbytes > 0 ? nbytes : 4;
// Best-fit reuse: smallest free slot with size in [nbytes, 2*nbytes] -- the
// 2x cap stops a large Cmax-sized buffer from backing a tiny request. Never
// reuse an in_use slot (co-live safety).
ScratchSlot* best = nullptr;
for (auto& s : scratch_pool_) {
// s.size - nbytes (safe: s.size >= nbytes) avoids overflowing 2 * nbytes.
if (!s.in_use && s.size >= nbytes && s.size - nbytes <= nbytes) {
if (best == nullptr || s.size < best->size) {
best = &s;
}
}
}
if (best != nullptr) {
best->in_use = true;
return best->buffer;
}
// None reusable -> create a new slot (freed in the dtor, like
// scratch_buffers_).
WGPUBufferDescriptor buf_desc = {};
buf_desc.size = nbytes;
buf_desc.usage = WGPUBufferUsage_Storage | WGPUBufferUsage_CopyDst |
WGPUBufferUsage_CopySrc;
buf_desc.mappedAtCreation = false;
WGPUBuffer buffer = wgpuDeviceCreateBuffer(device_, &buf_desc);
scratch_pool_.push_back({buffer, nbytes, true});
return buffer;
}

void WebGPUGraph::release_scratch(WGPUBuffer buffer) {
if (!buffer) {
return;
}
for (auto& s : scratch_pool_) {
if (s.buffer == buffer) {
s.in_use = false;
return;
}
}
// Not a pooled buffer -> no-op; the dtor frees it via scratch_buffers_.
}

WGPUBuffer WebGPUGraph::make_uniform_buffer(const void* data, size_t size) {
WGPUBufferDescriptor desc = {};
desc.size = size;
Expand DownExpand Up@@ -267,6 +310,11 @@ WebGPUGraph::~WebGPUGraph() {
wgpuBufferRelease(buf);
}
}
for (auto& s : scratch_pool_) {
if (s.buffer) {
wgpuBufferRelease(s.buffer);
}
}
for (auto& buf : owned_uniform_buffers_) {
if (buf) {
wgpuBufferRelease(buf);
Expand DownExpand Up@@ -310,7 +358,9 @@ WebGPUGraph::~WebGPUGraph() {
void WebGPUGraph::build(
const void* flatbuffer_data,
const uint8_t* constant_data,
const executorch::runtime::NamedDataMap* named_data_map) {
const executorch::runtime::NamedDataMap* named_data_map,
bool f16_kv_cache,
bool f16_accumulate_gemm) {
if (!device_) {
auto* ctx = get_default_webgpu_context();
if (ctx) {
Expand All@@ -331,6 +381,15 @@ void WebGPUGraph::build(
constant_data_ = constant_data;
named_data_map_ = named_data_map;

// f16 KV cache (runtime opt-in): store K/V caches as f16 iff the opt-in is
// set AND the device negotiated shader-f16 (fail-closed).
const WebGPUContext* kv_ctx = get_default_webgpu_context();
kv_f16_ = f16_kv_cache && (kv_ctx != nullptr && kv_ctx->shader_f16_supported);

// f16-accumulate q4gsw steel prefill GEMM (runtime opt-in). QuantizedLinear
// additionally gates the kernel on the negotiated shader-f16 feature.
f16_accumulate_gemm_ = f16_accumulate_gemm;

// Phase 1: Create all values
const auto* values = graph->values();
const int num_vals = values ? values->size() : 0;
Expand DownExpand Up@@ -358,6 +417,13 @@ void WebGPUGraph::build(
if (!a) {
continue;
}
// f16 KV: tag sdpa K/V cache values (args[3],[4]) for half-size alloc.
// Inert unless kv_f16_ (runtime opt-in) is set.
if (kv_f16_ && a->size() > 4 &&
oc->name()->str() == "sdpa_with_kv_cache.default") {
kv_cache_ids_.insert(static_cast<int>(a->Get(3)));
kv_cache_ids_.insert(static_cast<int>(a->Get(4)));
}
for (unsigned j = 0; j < a->size(); j++) {
int id = static_cast<int>(a->Get(j));
if (is_prepack && j == 0) {
Expand All@@ -378,6 +444,29 @@ void WebGPUGraph::build(
}
}

// f16 KV defensive guard: fail loud if a non-sdpa op reads an f16 cache.
// Inert unless kv_f16_ (runtime opt-in) is set.
if (kv_f16_ && !kv_cache_ids_.empty() && chain_prescan) {
for (unsigned ci = 0; ci < chain_prescan->size(); ci++) {
const auto* oc = chain_prescan->Get(ci);
const std::string nm = oc->name()->str();
if (nm == "sdpa_with_kv_cache.default" || nm == kPrepackOpName) {
continue;
}
const auto* a = oc->args();
if (!a) {
continue;
}
for (unsigned j = 0; j < a->size(); j++) {
if (kv_cache_ids_.count(static_cast<int>(a->Get(j))) != 0) {
throw std::runtime_error(
"WebGPU f16 KV: cache tensor consumed by non-sdpa op '" + nm +
"' would misread the f16 buffer");
}
}
}
}

for (int i = 0; i < num_vals; i++) {
const auto* val = values->Get(i);
if (!val || val->value_type() == vkgraph::GraphTypes::NONE) {
Expand DownExpand Up@@ -407,6 +496,23 @@ void WebGPUGraph::build(
tensor.cur_dims = tensor.dims;
tensor.cur_nbytes = tensor.nbytes;

// f16 KV cache: dedicated half-size array<f16> buffer. WebGPU
// zero-initializes freshly-created buffers, so no explicit clear is
// needed. Inert unless kv_f16_ (runtime opt-in) is set.
if (kv_f16_ && kv_cache_ids_.count(i) != 0) {
tensor.elem_size = 2;
tensor.nbytes = numel * 2;
tensor.cur_nbytes = tensor.nbytes;
tensor_mem_obj_ids_[i] = -1;
WGPUBufferDescriptor buf_desc = {};
buf_desc.size = std::max(tensor.nbytes, size_t(4));
buf_desc.usage = WGPUBufferUsage_Storage | WGPUBufferUsage_CopyDst |
WGPUBufferUsage_CopySrc;
buf_desc.mappedAtCreation = false;
tensor.buffer = wgpuDeviceCreateBuffer(device_, &buf_desc);
break;
}

int constant_id = vk_tensor->constant_id();
int mem_obj_id = vk_tensor->mem_obj_id();

Expand Down
60 changes: 59 additions & 1 deletion backends/webgpu/runtime/WebGPUGraph.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,7 +104,9 @@ class WebGPUGraph {
void build(
const void* flatbuffer_data,
const uint8_t* constant_data,
const executorch::runtime::NamedDataMap* named_data_map = nullptr);
const executorch::runtime::NamedDataMap* named_data_map = nullptr,
bool f16_kv_cache = false,
bool f16_accumulate_gemm = false);

// Copy input tensor data from host pointers into GPU buffers.
void copy_inputs(const std::vector<InputData>& inputs);
Expand DownExpand Up@@ -267,6 +269,35 @@ class WebGPUGraph {
// Graph-owned scratch storage buffer for fused-op intermediates (e.g. SDPA).
WGPUBuffer create_scratch_buffer(size_t nbytes);

// Reusable scratch pool for SINGLE-OP-LIFETIME fused-op scratch (SDPA
// attn_weights/softmax, FlashDecoding partials). acquire_scratch() reuses a
// free slot (best-fit, size in [n,2n]) or creates one; the caller RELEASES it
// at op-lowering scope exit (use ScopedScratch), so N layers' scratch reuses
// a small constant of buffers instead of N x held to graph teardown.
// Correctness: WebGPU/Dawn auto-inserts RAW hazard barriers between
// dispatches on a shared storage buffer regardless of pass structure -- the
// SAME guarantee mem_obj_id aliasing already relies on -- so reuse is
// bit-identical. Never hand a still-in_use slot to a co-live requester.
WGPUBuffer acquire_scratch(size_t nbytes);
void release_scratch(WGPUBuffer buffer);
// RAII: releases an acquired scratch slot when the op-lowering scope exits
// (leak-safe vs early returns).
struct ScopedScratch {
WebGPUGraph* g = nullptr;
WGPUBuffer buf = nullptr;
ScopedScratch(WebGPUGraph* graph, WGPUBuffer b) : g(graph), buf(b) {}
~ScopedScratch() {
if (g && buf) {
g->release_scratch(buf);
}
}
ScopedScratch(const ScopedScratch&) = delete;
ScopedScratch& operator=(const ScopedScratch&) = delete;
operator WGPUBuffer() const {
return buf;
}
};

// Create a mapped-at-creation uniform buffer from `size` bytes and track it
// in the memory stats. Shared helper for ops needing a uniform Params buffer.
WGPUBuffer make_uniform_buffer(const void* data, size_t size);
Expand DownExpand Up@@ -314,6 +345,23 @@ class WebGPUGraph {
return value_types_[id];
}

public:
// True when the sdpa K/V cache is stored f16-packed (runtime opt-in).
bool kv_f16() const {
return kv_f16_;
}

// True when the q4gsw steel prefill GEMM uses the lossy f16-accumulate kernel
// (runtime opt-in; perplexity-gated, not bit-exact).
bool f16_accumulate_gemm() const {
return f16_accumulate_gemm_;
}

private:
bool kv_f16_ = false;
std::unordered_set<int> kv_cache_ids_;
bool f16_accumulate_gemm_ = false;

private:
WGPUInstance instance_ = nullptr;
WGPUDevice device_ = nullptr;
Expand DownExpand Up@@ -366,6 +414,16 @@ class WebGPUGraph {
// Long-lived scratch storage buffers for fused ops (e.g. SDPA temporaries).
std::vector<WGPUBuffer> scratch_buffers_;

// Reusable scratch pool: single-op-lifetime buffers recycled across ops
// (acquire_scratch/release_scratch). Each slot is freed in the dtor. See
// acquire_scratch() for the reuse policy.
struct ScratchSlot {
WGPUBuffer buffer = nullptr;
size_t size = 0;
bool in_use = false;
};
std::vector<ScratchSlot> scratch_pool_;

// Uniform buffers owned for the graph's lifetime; released in the dtor.
std::vector<WGPUBuffer> owned_uniform_buffers_;

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion backends/webgpu/runtime/WebGPUBackend.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,8 +79,32 @@ Result<DelegateHandle*> WebGPUBackend::init(
return Error::DelegateInvalidCompatibility;
}

// Load-time backend option (BackendOption / LoadBackendOptionsMap), keyed by
// the registered backend name; default false. Mirrors the CoreML/XNNPACK
// runtime-spec pattern -- no compile flag and no .pte re-export needed.
bool enable_f16_kv_cache = false;
{
Result<bool> spec = context.get_runtime_spec<bool>("enable_f16_kv_cache");
if (spec.ok()) {
enable_f16_kv_cache = spec.get();
}
}
bool enable_f16_accumulate_gemm = false;
{
Result<bool> spec =
context.get_runtime_spec<bool>("enable_f16_accumulate_gemm");
if (spec.ok()) {
enable_f16_accumulate_gemm = spec.get();
}
}

try {
graph->build(flatbuffer_data, constant_data, context.get_named_data_map());
graph->build(
flatbuffer_data,
constant_data,
context.get_named_data_map(),
enable_f16_kv_cache,
enable_f16_accumulate_gemm);
} catch (const std::exception& e) {
ET_LOG(Error, "WebGPU graph build failed: %s", e.what());
graph->~WebGPUGraph();
Expand Down
108 changes: 107 additions & 1 deletion backends/webgpu/runtime/WebGPUGraph.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,6 +90,49 @@ WGPUBuffer WebGPUGraph::create_scratch_buffer(size_t nbytes) {
return buffer;
}

WGPUBuffer WebGPUGraph::acquire_scratch(size_t nbytes) {
nbytes = nbytes > 0 ? nbytes : 4;
// Best-fit reuse: smallest free slot with size in [nbytes, 2*nbytes] -- the
// 2x cap stops a large Cmax-sized buffer from backing a tiny request. Never
// reuse an in_use slot (co-live safety).
ScratchSlot* best = nullptr;
for (auto& s : scratch_pool_) {
// s.size - nbytes (safe: s.size >= nbytes) avoids overflowing 2 * nbytes.
if (!s.in_use && s.size >= nbytes && s.size - nbytes <= nbytes) {
if (best == nullptr || s.size < best->size) {
best = &s;
}
}
}
if (best != nullptr) {
best->in_use = true;
return best->buffer;
}
// None reusable -> create a new slot (freed in the dtor, like
// scratch_buffers_).
WGPUBufferDescriptor buf_desc = {};
buf_desc.size = nbytes;
buf_desc.usage = WGPUBufferUsage_Storage | WGPUBufferUsage_CopyDst |
WGPUBufferUsage_CopySrc;
buf_desc.mappedAtCreation = false;
WGPUBuffer buffer = wgpuDeviceCreateBuffer(device_, &buf_desc);
scratch_pool_.push_back({buffer, nbytes, true});
return buffer;
}

void WebGPUGraph::release_scratch(WGPUBuffer buffer) {
if (!buffer) {
return;
}
for (auto& s : scratch_pool_) {
if (s.buffer == buffer) {
s.in_use = false;
return;
}
}
// Not a pooled buffer -> no-op; the dtor frees it via scratch_buffers_.
}

WGPUBuffer WebGPUGraph::make_uniform_buffer(const void* data, size_t size) {
WGPUBufferDescriptor desc = {};
desc.size = size;
Expand DownExpand Up@@ -267,6 +310,11 @@ WebGPUGraph::~WebGPUGraph() {
wgpuBufferRelease(buf);
}
}
for (auto& s : scratch_pool_) {
if (s.buffer) {
wgpuBufferRelease(s.buffer);
}
}
for (auto& buf : owned_uniform_buffers_) {
if (buf) {
wgpuBufferRelease(buf);
Expand DownExpand Up@@ -310,7 +358,9 @@ WebGPUGraph::~WebGPUGraph() {
void WebGPUGraph::build(
const void* flatbuffer_data,
const uint8_t* constant_data,
const executorch::runtime::NamedDataMap* named_data_map) {
const executorch::runtime::NamedDataMap* named_data_map,
bool f16_kv_cache,
bool f16_accumulate_gemm) {
if (!device_) {
auto* ctx = get_default_webgpu_context();
if (ctx) {
Expand All@@ -331,6 +381,15 @@ void WebGPUGraph::build(
constant_data_ = constant_data;
named_data_map_ = named_data_map;

// f16 KV cache (runtime opt-in): store K/V caches as f16 iff the opt-in is
// set AND the device negotiated shader-f16 (fail-closed).
const WebGPUContext* kv_ctx = get_default_webgpu_context();
kv_f16_ = f16_kv_cache && (kv_ctx != nullptr && kv_ctx->shader_f16_supported);

// f16-accumulate q4gsw steel prefill GEMM (runtime opt-in). QuantizedLinear
// additionally gates the kernel on the negotiated shader-f16 feature.
f16_accumulate_gemm_ = f16_accumulate_gemm;

// Phase 1: Create all values
const auto* values = graph->values();
const int num_vals = values ? values->size() : 0;
Expand DownExpand Up@@ -358,6 +417,13 @@ void WebGPUGraph::build(
if (!a) {
continue;
}
// f16 KV: tag sdpa K/V cache values (args[3],[4]) for half-size alloc.
// Inert unless kv_f16_ (runtime opt-in) is set.
if (kv_f16_ && a->size() > 4 &&
oc->name()->str() == "sdpa_with_kv_cache.default") {
kv_cache_ids_.insert(static_cast<int>(a->Get(3)));
kv_cache_ids_.insert(static_cast<int>(a->Get(4)));
}
for (unsigned j = 0; j < a->size(); j++) {
int id = static_cast<int>(a->Get(j));
if (is_prepack && j == 0) {
Expand All@@ -378,6 +444,29 @@ void WebGPUGraph::build(
}
}

// f16 KV defensive guard: fail loud if a non-sdpa op reads an f16 cache.
// Inert unless kv_f16_ (runtime opt-in) is set.
if (kv_f16_ && !kv_cache_ids_.empty() && chain_prescan) {
for (unsigned ci = 0; ci < chain_prescan->size(); ci++) {
const auto* oc = chain_prescan->Get(ci);
const std::string nm = oc->name()->str();
if (nm == "sdpa_with_kv_cache.default" || nm == kPrepackOpName) {
continue;
}
const auto* a = oc->args();
if (!a) {
continue;
}
for (unsigned j = 0; j < a->size(); j++) {
if (kv_cache_ids_.count(static_cast<int>(a->Get(j))) != 0) {
throw std::runtime_error(
"WebGPU f16 KV: cache tensor consumed by non-sdpa op '" + nm +
"' would misread the f16 buffer");
}
}
}
}

for (int i = 0; i < num_vals; i++) {
const auto* val = values->Get(i);
if (!val || val->value_type() == vkgraph::GraphTypes::NONE) {
Expand DownExpand Up@@ -407,6 +496,23 @@ void WebGPUGraph::build(
tensor.cur_dims = tensor.dims;
tensor.cur_nbytes = tensor.nbytes;

// f16 KV cache: dedicated half-size array<f16> buffer. WebGPU
// zero-initializes freshly-created buffers, so no explicit clear is
// needed. Inert unless kv_f16_ (runtime opt-in) is set.
if (kv_f16_ && kv_cache_ids_.count(i) != 0) {
tensor.elem_size = 2;
tensor.nbytes = numel * 2;
tensor.cur_nbytes = tensor.nbytes;
tensor_mem_obj_ids_[i] = -1;
WGPUBufferDescriptor buf_desc = {};
buf_desc.size = std::max(tensor.nbytes, size_t(4));
buf_desc.usage = WGPUBufferUsage_Storage | WGPUBufferUsage_CopyDst |
WGPUBufferUsage_CopySrc;
buf_desc.mappedAtCreation = false;
tensor.buffer = wgpuDeviceCreateBuffer(device_, &buf_desc);
break;
}

int constant_id = vk_tensor->constant_id();
int mem_obj_id = vk_tensor->mem_obj_id();

Expand Down
60 changes: 59 additions & 1 deletion backends/webgpu/runtime/WebGPUGraph.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,7 +104,9 @@ class WebGPUGraph {
void build(
const void* flatbuffer_data,
const uint8_t* constant_data,
const executorch::runtime::NamedDataMap* named_data_map = nullptr);
const executorch::runtime::NamedDataMap* named_data_map = nullptr,
bool f16_kv_cache = false,
bool f16_accumulate_gemm = false);

// Copy input tensor data from host pointers into GPU buffers.
void copy_inputs(const std::vector<InputData>& inputs);
Expand DownExpand Up@@ -267,6 +269,35 @@ class WebGPUGraph {
// Graph-owned scratch storage buffer for fused-op intermediates (e.g. SDPA).
WGPUBuffer create_scratch_buffer(size_t nbytes);

// Reusable scratch pool for SINGLE-OP-LIFETIME fused-op scratch (SDPA
// attn_weights/softmax, FlashDecoding partials). acquire_scratch() reuses a
// free slot (best-fit, size in [n,2n]) or creates one; the caller RELEASES it
// at op-lowering scope exit (use ScopedScratch), so N layers' scratch reuses
// a small constant of buffers instead of N x held to graph teardown.
// Correctness: WebGPU/Dawn auto-inserts RAW hazard barriers between
// dispatches on a shared storage buffer regardless of pass structure -- the
// SAME guarantee mem_obj_id aliasing already relies on -- so reuse is
// bit-identical. Never hand a still-in_use slot to a co-live requester.
WGPUBuffer acquire_scratch(size_t nbytes);
void release_scratch(WGPUBuffer buffer);
// RAII: releases an acquired scratch slot when the op-lowering scope exits
// (leak-safe vs early returns).
struct ScopedScratch {
WebGPUGraph* g = nullptr;
WGPUBuffer buf = nullptr;
ScopedScratch(WebGPUGraph* graph, WGPUBuffer b) : g(graph), buf(b) {}
~ScopedScratch() {
if (g && buf) {
g->release_scratch(buf);
}
}
ScopedScratch(const ScopedScratch&) = delete;
ScopedScratch& operator=(const ScopedScratch&) = delete;
operator WGPUBuffer() const {
return buf;
}
};

// Create a mapped-at-creation uniform buffer from `size` bytes and track it
// in the memory stats. Shared helper for ops needing a uniform Params buffer.
WGPUBuffer make_uniform_buffer(const void* data, size_t size);
Expand DownExpand Up@@ -314,6 +345,23 @@ class WebGPUGraph {
return value_types_[id];
}

public:
// True when the sdpa K/V cache is stored f16-packed (runtime opt-in).
bool kv_f16() const {
return kv_f16_;
}

// True when the q4gsw steel prefill GEMM uses the lossy f16-accumulate kernel
// (runtime opt-in; perplexity-gated, not bit-exact).
bool f16_accumulate_gemm() const {
return f16_accumulate_gemm_;
}

private:
bool kv_f16_ = false;
std::unordered_set<int> kv_cache_ids_;
bool f16_accumulate_gemm_ = false;

private:
WGPUInstance instance_ = nullptr;
WGPUDevice device_ = nullptr;
Expand DownExpand Up@@ -366,6 +414,16 @@ class WebGPUGraph {
// Long-lived scratch storage buffers for fused ops (e.g. SDPA temporaries).
std::vector<WGPUBuffer> scratch_buffers_;

// Reusable scratch pool: single-op-lifetime buffers recycled across ops
// (acquire_scratch/release_scratch). Each slot is freed in the dtor. See
// acquire_scratch() for the reuse policy.
struct ScratchSlot {
WGPUBuffer buffer = nullptr;
size_t size = 0;
bool in_use = false;
};
std::vector<ScratchSlot> scratch_pool_;

// Uniform buffers owned for the graph's lifetime; released in the dtor.
std::vector<WGPUBuffer> owned_uniform_buffers_;

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion backends/webgpu/runtime/WebGPUBackend.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,8 +79,32 @@ Result<DelegateHandle*> WebGPUBackend::init(
return Error::DelegateInvalidCompatibility;
}

// Load-time backend option (BackendOption / LoadBackendOptionsMap), keyed by
// the registered backend name; default false. Mirrors the CoreML/XNNPACK
// runtime-spec pattern -- no compile flag and no .pte re-export needed.
bool enable_f16_kv_cache = false;
{
Result<bool> spec = context.get_runtime_spec<bool>("enable_f16_kv_cache");
if (spec.ok()) {
enable_f16_kv_cache = spec.get();
}
}
bool enable_f16_accumulate_gemm = false;
{
Result<bool> spec =
context.get_runtime_spec<bool>("enable_f16_accumulate_gemm");
if (spec.ok()) {
enable_f16_accumulate_gemm = spec.get();
}
}

try {
graph->build(flatbuffer_data, constant_data, context.get_named_data_map());
graph->build(
flatbuffer_data,
constant_data,
context.get_named_data_map(),
enable_f16_kv_cache,
enable_f16_accumulate_gemm);
} catch (const std::exception& e) {
ET_LOG(Error, "WebGPU graph build failed: %s", e.what());
graph->~WebGPUGraph();
Expand Down
108 changes: 107 additions & 1 deletion backends/webgpu/runtime/WebGPUGraph.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,6 +90,49 @@ WGPUBuffer WebGPUGraph::create_scratch_buffer(size_t nbytes) {
return buffer;
}

WGPUBuffer WebGPUGraph::acquire_scratch(size_t nbytes) {
nbytes = nbytes > 0 ? nbytes : 4;
// Best-fit reuse: smallest free slot with size in [nbytes, 2*nbytes] -- the
// 2x cap stops a large Cmax-sized buffer from backing a tiny request. Never
// reuse an in_use slot (co-live safety).
ScratchSlot* best = nullptr;
for (auto& s : scratch_pool_) {
// s.size - nbytes (safe: s.size >= nbytes) avoids overflowing 2 * nbytes.
if (!s.in_use && s.size >= nbytes && s.size - nbytes <= nbytes) {
if (best == nullptr || s.size < best->size) {
best = &s;
}
}
}
if (best != nullptr) {
best->in_use = true;
return best->buffer;
}
// None reusable -> create a new slot (freed in the dtor, like
// scratch_buffers_).
WGPUBufferDescriptor buf_desc = {};
buf_desc.size = nbytes;
buf_desc.usage = WGPUBufferUsage_Storage | WGPUBufferUsage_CopyDst |
WGPUBufferUsage_CopySrc;
buf_desc.mappedAtCreation = false;
WGPUBuffer buffer = wgpuDeviceCreateBuffer(device_, &buf_desc);
scratch_pool_.push_back({buffer, nbytes, true});
return buffer;
}

void WebGPUGraph::release_scratch(WGPUBuffer buffer) {
if (!buffer) {
return;
}
for (auto& s : scratch_pool_) {
if (s.buffer == buffer) {
s.in_use = false;
return;
}
}
// Not a pooled buffer -> no-op; the dtor frees it via scratch_buffers_.
}

WGPUBuffer WebGPUGraph::make_uniform_buffer(const void* data, size_t size) {
WGPUBufferDescriptor desc = {};
desc.size = size;
Expand DownExpand Up@@ -267,6 +310,11 @@ WebGPUGraph::~WebGPUGraph() {
wgpuBufferRelease(buf);
}
}
for (auto& s : scratch_pool_) {
if (s.buffer) {
wgpuBufferRelease(s.buffer);
}
}
for (auto& buf : owned_uniform_buffers_) {
if (buf) {
wgpuBufferRelease(buf);
Expand DownExpand Up@@ -310,7 +358,9 @@ WebGPUGraph::~WebGPUGraph() {
void WebGPUGraph::build(
const void* flatbuffer_data,
const uint8_t* constant_data,
const executorch::runtime::NamedDataMap* named_data_map) {
const executorch::runtime::NamedDataMap* named_data_map,
bool f16_kv_cache,
bool f16_accumulate_gemm) {
if (!device_) {
auto* ctx = get_default_webgpu_context();
if (ctx) {
Expand All@@ -331,6 +381,15 @@ void WebGPUGraph::build(
constant_data_ = constant_data;
named_data_map_ = named_data_map;

// f16 KV cache (runtime opt-in): store K/V caches as f16 iff the opt-in is
// set AND the device negotiated shader-f16 (fail-closed).
const WebGPUContext* kv_ctx = get_default_webgpu_context();
kv_f16_ = f16_kv_cache && (kv_ctx != nullptr && kv_ctx->shader_f16_supported);

// f16-accumulate q4gsw steel prefill GEMM (runtime opt-in). QuantizedLinear
// additionally gates the kernel on the negotiated shader-f16 feature.
f16_accumulate_gemm_ = f16_accumulate_gemm;

// Phase 1: Create all values
const auto* values = graph->values();
const int num_vals = values ? values->size() : 0;
Expand DownExpand Up@@ -358,6 +417,13 @@ void WebGPUGraph::build(
if (!a) {
continue;
}
// f16 KV: tag sdpa K/V cache values (args[3],[4]) for half-size alloc.
// Inert unless kv_f16_ (runtime opt-in) is set.
if (kv_f16_ && a->size() > 4 &&
oc->name()->str() == "sdpa_with_kv_cache.default") {
kv_cache_ids_.insert(static_cast<int>(a->Get(3)));
kv_cache_ids_.insert(static_cast<int>(a->Get(4)));
}
for (unsigned j = 0; j < a->size(); j++) {
int id = static_cast<int>(a->Get(j));
if (is_prepack && j == 0) {
Expand All@@ -378,6 +444,29 @@ void WebGPUGraph::build(
}
}

// f16 KV defensive guard: fail loud if a non-sdpa op reads an f16 cache.
// Inert unless kv_f16_ (runtime opt-in) is set.
if (kv_f16_ && !kv_cache_ids_.empty() && chain_prescan) {
for (unsigned ci = 0; ci < chain_prescan->size(); ci++) {
const auto* oc = chain_prescan->Get(ci);
const std::string nm = oc->name()->str();
if (nm == "sdpa_with_kv_cache.default" || nm == kPrepackOpName) {
continue;
}
const auto* a = oc->args();
if (!a) {
continue;
}
for (unsigned j = 0; j < a->size(); j++) {
if (kv_cache_ids_.count(static_cast<int>(a->Get(j))) != 0) {
throw std::runtime_error(
"WebGPU f16 KV: cache tensor consumed by non-sdpa op '" + nm +
"' would misread the f16 buffer");
}
}
}
}

for (int i = 0; i < num_vals; i++) {
const auto* val = values->Get(i);
if (!val || val->value_type() == vkgraph::GraphTypes::NONE) {
Expand DownExpand Up@@ -407,6 +496,23 @@ void WebGPUGraph::build(
tensor.cur_dims = tensor.dims;
tensor.cur_nbytes = tensor.nbytes;

// f16 KV cache: dedicated half-size array<f16> buffer. WebGPU
// zero-initializes freshly-created buffers, so no explicit clear is
// needed. Inert unless kv_f16_ (runtime opt-in) is set.
if (kv_f16_ && kv_cache_ids_.count(i) != 0) {
tensor.elem_size = 2;
tensor.nbytes = numel * 2;
tensor.cur_nbytes = tensor.nbytes;
tensor_mem_obj_ids_[i] = -1;
WGPUBufferDescriptor buf_desc = {};
buf_desc.size = std::max(tensor.nbytes, size_t(4));
buf_desc.usage = WGPUBufferUsage_Storage | WGPUBufferUsage_CopyDst |
WGPUBufferUsage_CopySrc;
buf_desc.mappedAtCreation = false;
tensor.buffer = wgpuDeviceCreateBuffer(device_, &buf_desc);
break;
}

int constant_id = vk_tensor->constant_id();
int mem_obj_id = vk_tensor->mem_obj_id();

Expand Down
60 changes: 59 additions & 1 deletion backends/webgpu/runtime/WebGPUGraph.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,7 +104,9 @@ class WebGPUGraph {
void build(
const void* flatbuffer_data,
const uint8_t* constant_data,
const executorch::runtime::NamedDataMap* named_data_map = nullptr);
const executorch::runtime::NamedDataMap* named_data_map = nullptr,
bool f16_kv_cache = false,
bool f16_accumulate_gemm = false);

// Copy input tensor data from host pointers into GPU buffers.
void copy_inputs(const std::vector<InputData>& inputs);
Expand DownExpand Up@@ -267,6 +269,35 @@ class WebGPUGraph {
// Graph-owned scratch storage buffer for fused-op intermediates (e.g. SDPA).
WGPUBuffer create_scratch_buffer(size_t nbytes);

// Reusable scratch pool for SINGLE-OP-LIFETIME fused-op scratch (SDPA
// attn_weights/softmax, FlashDecoding partials). acquire_scratch() reuses a
// free slot (best-fit, size in [n,2n]) or creates one; the caller RELEASES it
// at op-lowering scope exit (use ScopedScratch), so N layers' scratch reuses
// a small constant of buffers instead of N x held to graph teardown.
// Correctness: WebGPU/Dawn auto-inserts RAW hazard barriers between
// dispatches on a shared storage buffer regardless of pass structure -- the
// SAME guarantee mem_obj_id aliasing already relies on -- so reuse is
// bit-identical. Never hand a still-in_use slot to a co-live requester.
WGPUBuffer acquire_scratch(size_t nbytes);
void release_scratch(WGPUBuffer buffer);
// RAII: releases an acquired scratch slot when the op-lowering scope exits
// (leak-safe vs early returns).
struct ScopedScratch {
WebGPUGraph* g = nullptr;
WGPUBuffer buf = nullptr;
ScopedScratch(WebGPUGraph* graph, WGPUBuffer b) : g(graph), buf(b) {}
~ScopedScratch() {
if (g && buf) {
g->release_scratch(buf);
}
}
ScopedScratch(const ScopedScratch&) = delete;
ScopedScratch& operator=(const ScopedScratch&) = delete;
operator WGPUBuffer() const {
return buf;
}
};

// Create a mapped-at-creation uniform buffer from `size` bytes and track it
// in the memory stats. Shared helper for ops needing a uniform Params buffer.
WGPUBuffer make_uniform_buffer(const void* data, size_t size);
Expand DownExpand Up@@ -314,6 +345,23 @@ class WebGPUGraph {
return value_types_[id];
}

public:
// True when the sdpa K/V cache is stored f16-packed (runtime opt-in).
bool kv_f16() const {
return kv_f16_;
}

// True when the q4gsw steel prefill GEMM uses the lossy f16-accumulate kernel
// (runtime opt-in; perplexity-gated, not bit-exact).
bool f16_accumulate_gemm() const {
return f16_accumulate_gemm_;
}

private:
bool kv_f16_ = false;
std::unordered_set<int> kv_cache_ids_;
bool f16_accumulate_gemm_ = false;

private:
WGPUInstance instance_ = nullptr;
WGPUDevice device_ = nullptr;
Expand DownExpand Up@@ -366,6 +414,16 @@ class WebGPUGraph {
// Long-lived scratch storage buffers for fused ops (e.g. SDPA temporaries).
std::vector<WGPUBuffer> scratch_buffers_;

// Reusable scratch pool: single-op-lifetime buffers recycled across ops
// (acquire_scratch/release_scratch). Each slot is freed in the dtor. See
// acquire_scratch() for the reuse policy.
struct ScratchSlot {
WGPUBuffer buffer = nullptr;
size_t size = 0;
bool in_use = false;
};
std::vector<ScratchSlot> scratch_pool_;

// Uniform buffers owned for the graph's lifetime; released in the dtor.
std::vector<WGPUBuffer> owned_uniform_buffers_;

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion backends/webgpu/runtime/WebGPUBackend.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,8 +79,32 @@ Result<DelegateHandle*> WebGPUBackend::init(
return Error::DelegateInvalidCompatibility;
}

// Load-time backend option (BackendOption / LoadBackendOptionsMap), keyed by
// the registered backend name; default false. Mirrors the CoreML/XNNPACK
// runtime-spec pattern -- no compile flag and no .pte re-export needed.
bool enable_f16_kv_cache = false;
{
Result<bool> spec = context.get_runtime_spec<bool>("enable_f16_kv_cache");
if (spec.ok()) {
enable_f16_kv_cache = spec.get();
}
}
bool enable_f16_accumulate_gemm = false;
{
Result<bool> spec =
context.get_runtime_spec<bool>("enable_f16_accumulate_gemm");
if (spec.ok()) {
enable_f16_accumulate_gemm = spec.get();
}
}

try {
graph->build(flatbuffer_data, constant_data, context.get_named_data_map());
graph->build(
flatbuffer_data,
constant_data,
context.get_named_data_map(),
enable_f16_kv_cache,
enable_f16_accumulate_gemm);
} catch (const std::exception& e) {
ET_LOG(Error, "WebGPU graph build failed: %s", e.what());
graph->~WebGPUGraph();
Expand Down
108 changes: 107 additions & 1 deletion backends/webgpu/runtime/WebGPUGraph.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,6 +90,49 @@ WGPUBuffer WebGPUGraph::create_scratch_buffer(size_t nbytes) {
return buffer;
}

WGPUBuffer WebGPUGraph::acquire_scratch(size_t nbytes) {
nbytes = nbytes > 0 ? nbytes : 4;
// Best-fit reuse: smallest free slot with size in [nbytes, 2*nbytes] -- the
// 2x cap stops a large Cmax-sized buffer from backing a tiny request. Never
// reuse an in_use slot (co-live safety).
ScratchSlot* best = nullptr;
for (auto& s : scratch_pool_) {
// s.size - nbytes (safe: s.size >= nbytes) avoids overflowing 2 * nbytes.
if (!s.in_use && s.size >= nbytes && s.size - nbytes <= nbytes) {
if (best == nullptr || s.size < best->size) {
best = &s;
}
}
}
if (best != nullptr) {
best->in_use = true;
return best->buffer;
}
// None reusable -> create a new slot (freed in the dtor, like
// scratch_buffers_).
WGPUBufferDescriptor buf_desc = {};
buf_desc.size = nbytes;
buf_desc.usage = WGPUBufferUsage_Storage | WGPUBufferUsage_CopyDst |
WGPUBufferUsage_CopySrc;
buf_desc.mappedAtCreation = false;
WGPUBuffer buffer = wgpuDeviceCreateBuffer(device_, &buf_desc);
scratch_pool_.push_back({buffer, nbytes, true});
return buffer;
}

void WebGPUGraph::release_scratch(WGPUBuffer buffer) {
if (!buffer) {
return;
}
for (auto& s : scratch_pool_) {
if (s.buffer == buffer) {
s.in_use = false;
return;
}
}
// Not a pooled buffer -> no-op; the dtor frees it via scratch_buffers_.
}

WGPUBuffer WebGPUGraph::make_uniform_buffer(const void* data, size_t size) {
WGPUBufferDescriptor desc = {};
desc.size = size;
Expand DownExpand Up@@ -267,6 +310,11 @@ WebGPUGraph::~WebGPUGraph() {
wgpuBufferRelease(buf);
}
}
for (auto& s : scratch_pool_) {
if (s.buffer) {
wgpuBufferRelease(s.buffer);
}
}
for (auto& buf : owned_uniform_buffers_) {
if (buf) {
wgpuBufferRelease(buf);
Expand DownExpand Up@@ -310,7 +358,9 @@ WebGPUGraph::~WebGPUGraph() {
void WebGPUGraph::build(
const void* flatbuffer_data,
const uint8_t* constant_data,
const executorch::runtime::NamedDataMap* named_data_map) {
const executorch::runtime::NamedDataMap* named_data_map,
bool f16_kv_cache,
bool f16_accumulate_gemm) {
if (!device_) {
auto* ctx = get_default_webgpu_context();
if (ctx) {
Expand All@@ -331,6 +381,15 @@ void WebGPUGraph::build(
constant_data_ = constant_data;
named_data_map_ = named_data_map;

// f16 KV cache (runtime opt-in): store K/V caches as f16 iff the opt-in is
// set AND the device negotiated shader-f16 (fail-closed).
const WebGPUContext* kv_ctx = get_default_webgpu_context();
kv_f16_ = f16_kv_cache && (kv_ctx != nullptr && kv_ctx->shader_f16_supported);

// f16-accumulate q4gsw steel prefill GEMM (runtime opt-in). QuantizedLinear
// additionally gates the kernel on the negotiated shader-f16 feature.
f16_accumulate_gemm_ = f16_accumulate_gemm;

// Phase 1: Create all values
const auto* values = graph->values();
const int num_vals = values ? values->size() : 0;
Expand DownExpand Up@@ -358,6 +417,13 @@ void WebGPUGraph::build(
if (!a) {
continue;
}
// f16 KV: tag sdpa K/V cache values (args[3],[4]) for half-size alloc.
// Inert unless kv_f16_ (runtime opt-in) is set.
if (kv_f16_ && a->size() > 4 &&
oc->name()->str() == "sdpa_with_kv_cache.default") {
kv_cache_ids_.insert(static_cast<int>(a->Get(3)));
kv_cache_ids_.insert(static_cast<int>(a->Get(4)));
}
for (unsigned j = 0; j < a->size(); j++) {
int id = static_cast<int>(a->Get(j));
if (is_prepack && j == 0) {
Expand All@@ -378,6 +444,29 @@ void WebGPUGraph::build(
}
}

// f16 KV defensive guard: fail loud if a non-sdpa op reads an f16 cache.
// Inert unless kv_f16_ (runtime opt-in) is set.
if (kv_f16_ && !kv_cache_ids_.empty() && chain_prescan) {
for (unsigned ci = 0; ci < chain_prescan->size(); ci++) {
const auto* oc = chain_prescan->Get(ci);
const std::string nm = oc->name()->str();
if (nm == "sdpa_with_kv_cache.default" || nm == kPrepackOpName) {
continue;
}
const auto* a = oc->args();
if (!a) {
continue;
}
for (unsigned j = 0; j < a->size(); j++) {
if (kv_cache_ids_.count(static_cast<int>(a->Get(j))) != 0) {
throw std::runtime_error(
"WebGPU f16 KV: cache tensor consumed by non-sdpa op '" + nm +
"' would misread the f16 buffer");
}
}
}
}

for (int i = 0; i < num_vals; i++) {
const auto* val = values->Get(i);
if (!val || val->value_type() == vkgraph::GraphTypes::NONE) {
Expand DownExpand Up@@ -407,6 +496,23 @@ void WebGPUGraph::build(
tensor.cur_dims = tensor.dims;
tensor.cur_nbytes = tensor.nbytes;

// f16 KV cache: dedicated half-size array<f16> buffer. WebGPU
// zero-initializes freshly-created buffers, so no explicit clear is
// needed. Inert unless kv_f16_ (runtime opt-in) is set.
if (kv_f16_ && kv_cache_ids_.count(i) != 0) {
tensor.elem_size = 2;
tensor.nbytes = numel * 2;
tensor.cur_nbytes = tensor.nbytes;
tensor_mem_obj_ids_[i] = -1;
WGPUBufferDescriptor buf_desc = {};
buf_desc.size = std::max(tensor.nbytes, size_t(4));
buf_desc.usage = WGPUBufferUsage_Storage | WGPUBufferUsage_CopyDst |
WGPUBufferUsage_CopySrc;
buf_desc.mappedAtCreation = false;
tensor.buffer = wgpuDeviceCreateBuffer(device_, &buf_desc);
break;
}

int constant_id = vk_tensor->constant_id();
int mem_obj_id = vk_tensor->mem_obj_id();

Expand Down
60 changes: 59 additions & 1 deletion backends/webgpu/runtime/WebGPUGraph.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,7 +104,9 @@ class WebGPUGraph {
void build(
const void* flatbuffer_data,
const uint8_t* constant_data,
const executorch::runtime::NamedDataMap* named_data_map = nullptr);
const executorch::runtime::NamedDataMap* named_data_map = nullptr,
bool f16_kv_cache = false,
bool f16_accumulate_gemm = false);

// Copy input tensor data from host pointers into GPU buffers.
void copy_inputs(const std::vector<InputData>& inputs);
Expand DownExpand Up@@ -267,6 +269,35 @@ class WebGPUGraph {
// Graph-owned scratch storage buffer for fused-op intermediates (e.g. SDPA).
WGPUBuffer create_scratch_buffer(size_t nbytes);

// Reusable scratch pool for SINGLE-OP-LIFETIME fused-op scratch (SDPA
// attn_weights/softmax, FlashDecoding partials). acquire_scratch() reuses a
// free slot (best-fit, size in [n,2n]) or creates one; the caller RELEASES it
// at op-lowering scope exit (use ScopedScratch), so N layers' scratch reuses
// a small constant of buffers instead of N x held to graph teardown.
// Correctness: WebGPU/Dawn auto-inserts RAW hazard barriers between
// dispatches on a shared storage buffer regardless of pass structure -- the
// SAME guarantee mem_obj_id aliasing already relies on -- so reuse is
// bit-identical. Never hand a still-in_use slot to a co-live requester.
WGPUBuffer acquire_scratch(size_t nbytes);
void release_scratch(WGPUBuffer buffer);
// RAII: releases an acquired scratch slot when the op-lowering scope exits
// (leak-safe vs early returns).
struct ScopedScratch {
WebGPUGraph* g = nullptr;
WGPUBuffer buf = nullptr;
ScopedScratch(WebGPUGraph* graph, WGPUBuffer b) : g(graph), buf(b) {}
~ScopedScratch() {
if (g && buf) {
g->release_scratch(buf);
}
}
ScopedScratch(const ScopedScratch&) = delete;
ScopedScratch& operator=(const ScopedScratch&) = delete;
operator WGPUBuffer() const {
return buf;
}
};

// Create a mapped-at-creation uniform buffer from `size` bytes and track it
// in the memory stats. Shared helper for ops needing a uniform Params buffer.
WGPUBuffer make_uniform_buffer(const void* data, size_t size);
Expand DownExpand Up@@ -314,6 +345,23 @@ class WebGPUGraph {
return value_types_[id];
}

public:
// True when the sdpa K/V cache is stored f16-packed (runtime opt-in).
bool kv_f16() const {
return kv_f16_;
}

// True when the q4gsw steel prefill GEMM uses the lossy f16-accumulate kernel
// (runtime opt-in; perplexity-gated, not bit-exact).
bool f16_accumulate_gemm() const {
return f16_accumulate_gemm_;
}

private:
bool kv_f16_ = false;
std::unordered_set<int> kv_cache_ids_;
bool f16_accumulate_gemm_ = false;

private:
WGPUInstance instance_ = nullptr;
WGPUDevice device_ = nullptr;
Expand DownExpand Up@@ -366,6 +414,16 @@ class WebGPUGraph {
// Long-lived scratch storage buffers for fused ops (e.g. SDPA temporaries).
std::vector<WGPUBuffer> scratch_buffers_;

// Reusable scratch pool: single-op-lifetime buffers recycled across ops
// (acquire_scratch/release_scratch). Each slot is freed in the dtor. See
// acquire_scratch() for the reuse policy.
struct ScratchSlot {
WGPUBuffer buffer = nullptr;
size_t size = 0;
bool in_use = false;
};
std::vector<ScratchSlot> scratch_pool_;

// Uniform buffers owned for the graph's lifetime; released in the dtor.
std::vector<WGPUBuffer> owned_uniform_buffers_;

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion backends/webgpu/runtime/WebGPUBackend.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,8 +79,32 @@ Result<DelegateHandle*> WebGPUBackend::init(
return Error::DelegateInvalidCompatibility;
}

// Load-time backend option (BackendOption / LoadBackendOptionsMap), keyed by
// the registered backend name; default false. Mirrors the CoreML/XNNPACK
// runtime-spec pattern -- no compile flag and no .pte re-export needed.
bool enable_f16_kv_cache = false;
{
Result<bool> spec = context.get_runtime_spec<bool>("enable_f16_kv_cache");
if (spec.ok()) {
enable_f16_kv_cache = spec.get();
}
}
bool enable_f16_accumulate_gemm = false;
{
Result<bool> spec =
context.get_runtime_spec<bool>("enable_f16_accumulate_gemm");
if (spec.ok()) {
enable_f16_accumulate_gemm = spec.get();
}
}

try {
graph->build(flatbuffer_data, constant_data, context.get_named_data_map());
graph->build(
flatbuffer_data,
constant_data,
context.get_named_data_map(),
enable_f16_kv_cache,
enable_f16_accumulate_gemm);
} catch (const std::exception& e) {
ET_LOG(Error, "WebGPU graph build failed: %s", e.what());
graph->~WebGPUGraph();
Expand Down
108 changes: 107 additions & 1 deletion backends/webgpu/runtime/WebGPUGraph.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,6 +90,49 @@ WGPUBuffer WebGPUGraph::create_scratch_buffer(size_t nbytes) {
return buffer;
}

WGPUBuffer WebGPUGraph::acquire_scratch(size_t nbytes) {
nbytes = nbytes > 0 ? nbytes : 4;
// Best-fit reuse: smallest free slot with size in [nbytes, 2*nbytes] -- the
// 2x cap stops a large Cmax-sized buffer from backing a tiny request. Never
// reuse an in_use slot (co-live safety).
ScratchSlot* best = nullptr;
for (auto& s : scratch_pool_) {
// s.size - nbytes (safe: s.size >= nbytes) avoids overflowing 2 * nbytes.
if (!s.in_use && s.size >= nbytes && s.size - nbytes <= nbytes) {
if (best == nullptr || s.size < best->size) {
best = &s;
}
}
}
if (best != nullptr) {
best->in_use = true;
return best->buffer;
}
// None reusable -> create a new slot (freed in the dtor, like
// scratch_buffers_).
WGPUBufferDescriptor buf_desc = {};
buf_desc.size = nbytes;
buf_desc.usage = WGPUBufferUsage_Storage | WGPUBufferUsage_CopyDst |
WGPUBufferUsage_CopySrc;
buf_desc.mappedAtCreation = false;
WGPUBuffer buffer = wgpuDeviceCreateBuffer(device_, &buf_desc);
scratch_pool_.push_back({buffer, nbytes, true});
return buffer;
}

void WebGPUGraph::release_scratch(WGPUBuffer buffer) {
if (!buffer) {
return;
}
for (auto& s : scratch_pool_) {
if (s.buffer == buffer) {
s.in_use = false;
return;
}
}
// Not a pooled buffer -> no-op; the dtor frees it via scratch_buffers_.
}

WGPUBuffer WebGPUGraph::make_uniform_buffer(const void* data, size_t size) {
WGPUBufferDescriptor desc = {};
desc.size = size;
Expand DownExpand Up@@ -267,6 +310,11 @@ WebGPUGraph::~WebGPUGraph() {
wgpuBufferRelease(buf);
}
}
for (auto& s : scratch_pool_) {
if (s.buffer) {
wgpuBufferRelease(s.buffer);
}
}
for (auto& buf : owned_uniform_buffers_) {
if (buf) {
wgpuBufferRelease(buf);
Expand DownExpand Up@@ -310,7 +358,9 @@ WebGPUGraph::~WebGPUGraph() {
void WebGPUGraph::build(
const void* flatbuffer_data,
const uint8_t* constant_data,
const executorch::runtime::NamedDataMap* named_data_map) {
const executorch::runtime::NamedDataMap* named_data_map,
bool f16_kv_cache,
bool f16_accumulate_gemm) {
if (!device_) {
auto* ctx = get_default_webgpu_context();
if (ctx) {
Expand All@@ -331,6 +381,15 @@ void WebGPUGraph::build(
constant_data_ = constant_data;
named_data_map_ = named_data_map;

// f16 KV cache (runtime opt-in): store K/V caches as f16 iff the opt-in is
// set AND the device negotiated shader-f16 (fail-closed).
const WebGPUContext* kv_ctx = get_default_webgpu_context();
kv_f16_ = f16_kv_cache && (kv_ctx != nullptr && kv_ctx->shader_f16_supported);

// f16-accumulate q4gsw steel prefill GEMM (runtime opt-in). QuantizedLinear
// additionally gates the kernel on the negotiated shader-f16 feature.
f16_accumulate_gemm_ = f16_accumulate_gemm;

// Phase 1: Create all values
const auto* values = graph->values();
const int num_vals = values ? values->size() : 0;
Expand DownExpand Up@@ -358,6 +417,13 @@ void WebGPUGraph::build(
if (!a) {
continue;
}
// f16 KV: tag sdpa K/V cache values (args[3],[4]) for half-size alloc.
// Inert unless kv_f16_ (runtime opt-in) is set.
if (kv_f16_ && a->size() > 4 &&
oc->name()->str() == "sdpa_with_kv_cache.default") {
kv_cache_ids_.insert(static_cast<int>(a->Get(3)));
kv_cache_ids_.insert(static_cast<int>(a->Get(4)));
}
for (unsigned j = 0; j < a->size(); j++) {
int id = static_cast<int>(a->Get(j));
if (is_prepack && j == 0) {
Expand All@@ -378,6 +444,29 @@ void WebGPUGraph::build(
}
}

// f16 KV defensive guard: fail loud if a non-sdpa op reads an f16 cache.
// Inert unless kv_f16_ (runtime opt-in) is set.
if (kv_f16_ && !kv_cache_ids_.empty() && chain_prescan) {
for (unsigned ci = 0; ci < chain_prescan->size(); ci++) {
const auto* oc = chain_prescan->Get(ci);
const std::string nm = oc->name()->str();
if (nm == "sdpa_with_kv_cache.default" || nm == kPrepackOpName) {
continue;
}
const auto* a = oc->args();
if (!a) {
continue;
}
for (unsigned j = 0; j < a->size(); j++) {
if (kv_cache_ids_.count(static_cast<int>(a->Get(j))) != 0) {
throw std::runtime_error(
"WebGPU f16 KV: cache tensor consumed by non-sdpa op '" + nm +
"' would misread the f16 buffer");
}
}
}
}

for (int i = 0; i < num_vals; i++) {
const auto* val = values->Get(i);
if (!val || val->value_type() == vkgraph::GraphTypes::NONE) {
Expand DownExpand Up@@ -407,6 +496,23 @@ void WebGPUGraph::build(
tensor.cur_dims = tensor.dims;
tensor.cur_nbytes = tensor.nbytes;

// f16 KV cache: dedicated half-size array<f16> buffer. WebGPU
// zero-initializes freshly-created buffers, so no explicit clear is
// needed. Inert unless kv_f16_ (runtime opt-in) is set.
if (kv_f16_ && kv_cache_ids_.count(i) != 0) {
tensor.elem_size = 2;
tensor.nbytes = numel * 2;
tensor.cur_nbytes = tensor.nbytes;
tensor_mem_obj_ids_[i] = -1;
WGPUBufferDescriptor buf_desc = {};
buf_desc.size = std::max(tensor.nbytes, size_t(4));
buf_desc.usage = WGPUBufferUsage_Storage | WGPUBufferUsage_CopyDst |
WGPUBufferUsage_CopySrc;
buf_desc.mappedAtCreation = false;
tensor.buffer = wgpuDeviceCreateBuffer(device_, &buf_desc);
break;
}

int constant_id = vk_tensor->constant_id();
int mem_obj_id = vk_tensor->mem_obj_id();

Expand Down
60 changes: 59 additions & 1 deletion backends/webgpu/runtime/WebGPUGraph.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,7 +104,9 @@ class WebGPUGraph {
void build(
const void* flatbuffer_data,
const uint8_t* constant_data,
const executorch::runtime::NamedDataMap* named_data_map = nullptr);
const executorch::runtime::NamedDataMap* named_data_map = nullptr,
bool f16_kv_cache = false,
bool f16_accumulate_gemm = false);

// Copy input tensor data from host pointers into GPU buffers.
void copy_inputs(const std::vector<InputData>& inputs);
Expand DownExpand Up@@ -267,6 +269,35 @@ class WebGPUGraph {
// Graph-owned scratch storage buffer for fused-op intermediates (e.g. SDPA).
WGPUBuffer create_scratch_buffer(size_t nbytes);

// Reusable scratch pool for SINGLE-OP-LIFETIME fused-op scratch (SDPA
// attn_weights/softmax, FlashDecoding partials). acquire_scratch() reuses a
// free slot (best-fit, size in [n,2n]) or creates one; the caller RELEASES it
// at op-lowering scope exit (use ScopedScratch), so N layers' scratch reuses
// a small constant of buffers instead of N x held to graph teardown.
// Correctness: WebGPU/Dawn auto-inserts RAW hazard barriers between
// dispatches on a shared storage buffer regardless of pass structure -- the
// SAME guarantee mem_obj_id aliasing already relies on -- so reuse is
// bit-identical. Never hand a still-in_use slot to a co-live requester.
WGPUBuffer acquire_scratch(size_t nbytes);
void release_scratch(WGPUBuffer buffer);
// RAII: releases an acquired scratch slot when the op-lowering scope exits
// (leak-safe vs early returns).
struct ScopedScratch {
WebGPUGraph* g = nullptr;
WGPUBuffer buf = nullptr;
ScopedScratch(WebGPUGraph* graph, WGPUBuffer b) : g(graph), buf(b) {}
~ScopedScratch() {
if (g && buf) {
g->release_scratch(buf);
}
}
ScopedScratch(const ScopedScratch&) = delete;
ScopedScratch& operator=(const ScopedScratch&) = delete;
operator WGPUBuffer() const {
return buf;
}
};

// Create a mapped-at-creation uniform buffer from `size` bytes and track it
// in the memory stats. Shared helper for ops needing a uniform Params buffer.
WGPUBuffer make_uniform_buffer(const void* data, size_t size);
Expand DownExpand Up@@ -314,6 +345,23 @@ class WebGPUGraph {
return value_types_[id];
}

public:
// True when the sdpa K/V cache is stored f16-packed (runtime opt-in).
bool kv_f16() const {
return kv_f16_;
}

// True when the q4gsw steel prefill GEMM uses the lossy f16-accumulate kernel
// (runtime opt-in; perplexity-gated, not bit-exact).
bool f16_accumulate_gemm() const {
return f16_accumulate_gemm_;
}

private:
bool kv_f16_ = false;
std::unordered_set<int> kv_cache_ids_;
bool f16_accumulate_gemm_ = false;

private:
WGPUInstance instance_ = nullptr;
WGPUDevice device_ = nullptr;
Expand DownExpand Up@@ -366,6 +414,16 @@ class WebGPUGraph {
// Long-lived scratch storage buffers for fused ops (e.g. SDPA temporaries).
std::vector<WGPUBuffer> scratch_buffers_;

// Reusable scratch pool: single-op-lifetime buffers recycled across ops
// (acquire_scratch/release_scratch). Each slot is freed in the dtor. See
// acquire_scratch() for the reuse policy.
struct ScratchSlot {
WGPUBuffer buffer = nullptr;
size_t size = 0;
bool in_use = false;
};
std::vector<ScratchSlot> scratch_pool_;

// Uniform buffers owned for the graph's lifetime; released in the dtor.
std::vector<WGPUBuffer> owned_uniform_buffers_;

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion backends/webgpu/runtime/WebGPUBackend.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,8 +79,32 @@ Result<DelegateHandle*> WebGPUBackend::init(
return Error::DelegateInvalidCompatibility;
}

// Load-time backend option (BackendOption / LoadBackendOptionsMap), keyed by
// the registered backend name; default false. Mirrors the CoreML/XNNPACK
// runtime-spec pattern -- no compile flag and no .pte re-export needed.
bool enable_f16_kv_cache = false;
{
Result<bool> spec = context.get_runtime_spec<bool>("enable_f16_kv_cache");
if (spec.ok()) {
enable_f16_kv_cache = spec.get();
}
}
bool enable_f16_accumulate_gemm = false;
{
Result<bool> spec =
context.get_runtime_spec<bool>("enable_f16_accumulate_gemm");
if (spec.ok()) {
enable_f16_accumulate_gemm = spec.get();
}
}

try {
graph->build(flatbuffer_data, constant_data, context.get_named_data_map());
graph->build(
flatbuffer_data,
constant_data,
context.get_named_data_map(),
enable_f16_kv_cache,
enable_f16_accumulate_gemm);
} catch (const std::exception& e) {
ET_LOG(Error, "WebGPU graph build failed: %s", e.what());
graph->~WebGPUGraph();
Expand Down
108 changes: 107 additions & 1 deletion backends/webgpu/runtime/WebGPUGraph.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,6 +90,49 @@ WGPUBuffer WebGPUGraph::create_scratch_buffer(size_t nbytes) {
return buffer;
}

WGPUBuffer WebGPUGraph::acquire_scratch(size_t nbytes) {
nbytes = nbytes > 0 ? nbytes : 4;
// Best-fit reuse: smallest free slot with size in [nbytes, 2*nbytes] -- the
// 2x cap stops a large Cmax-sized buffer from backing a tiny request. Never
// reuse an in_use slot (co-live safety).
ScratchSlot* best = nullptr;
for (auto& s : scratch_pool_) {
// s.size - nbytes (safe: s.size >= nbytes) avoids overflowing 2 * nbytes.
if (!s.in_use && s.size >= nbytes && s.size - nbytes <= nbytes) {
if (best == nullptr || s.size < best->size) {
best = &s;
}
}
}
if (best != nullptr) {
best->in_use = true;
return best->buffer;
}
// None reusable -> create a new slot (freed in the dtor, like
// scratch_buffers_).
WGPUBufferDescriptor buf_desc = {};
buf_desc.size = nbytes;
buf_desc.usage = WGPUBufferUsage_Storage | WGPUBufferUsage_CopyDst |
WGPUBufferUsage_CopySrc;
buf_desc.mappedAtCreation = false;
WGPUBuffer buffer = wgpuDeviceCreateBuffer(device_, &buf_desc);
scratch_pool_.push_back({buffer, nbytes, true});
return buffer;
}

void WebGPUGraph::release_scratch(WGPUBuffer buffer) {
if (!buffer) {
return;
}
for (auto& s : scratch_pool_) {
if (s.buffer == buffer) {
s.in_use = false;
return;
}
}
// Not a pooled buffer -> no-op; the dtor frees it via scratch_buffers_.
}

WGPUBuffer WebGPUGraph::make_uniform_buffer(const void* data, size_t size) {
WGPUBufferDescriptor desc = {};
desc.size = size;
Expand DownExpand Up@@ -267,6 +310,11 @@ WebGPUGraph::~WebGPUGraph() {
wgpuBufferRelease(buf);
}
}
for (auto& s : scratch_pool_) {
if (s.buffer) {
wgpuBufferRelease(s.buffer);
}
}
for (auto& buf : owned_uniform_buffers_) {
if (buf) {
wgpuBufferRelease(buf);
Expand DownExpand Up@@ -310,7 +358,9 @@ WebGPUGraph::~WebGPUGraph() {
void WebGPUGraph::build(
const void* flatbuffer_data,
const uint8_t* constant_data,
const executorch::runtime::NamedDataMap* named_data_map) {
const executorch::runtime::NamedDataMap* named_data_map,
bool f16_kv_cache,
bool f16_accumulate_gemm) {
if (!device_) {
auto* ctx = get_default_webgpu_context();
if (ctx) {
Expand All@@ -331,6 +381,15 @@ void WebGPUGraph::build(
constant_data_ = constant_data;
named_data_map_ = named_data_map;

// f16 KV cache (runtime opt-in): store K/V caches as f16 iff the opt-in is
// set AND the device negotiated shader-f16 (fail-closed).
const WebGPUContext* kv_ctx = get_default_webgpu_context();
kv_f16_ = f16_kv_cache && (kv_ctx != nullptr && kv_ctx->shader_f16_supported);

// f16-accumulate q4gsw steel prefill GEMM (runtime opt-in). QuantizedLinear
// additionally gates the kernel on the negotiated shader-f16 feature.
f16_accumulate_gemm_ = f16_accumulate_gemm;

// Phase 1: Create all values
const auto* values = graph->values();
const int num_vals = values ? values->size() : 0;
Expand DownExpand Up@@ -358,6 +417,13 @@ void WebGPUGraph::build(
if (!a) {
continue;
}
// f16 KV: tag sdpa K/V cache values (args[3],[4]) for half-size alloc.
// Inert unless kv_f16_ (runtime opt-in) is set.
if (kv_f16_ && a->size() > 4 &&
oc->name()->str() == "sdpa_with_kv_cache.default") {
kv_cache_ids_.insert(static_cast<int>(a->Get(3)));
kv_cache_ids_.insert(static_cast<int>(a->Get(4)));
}
for (unsigned j = 0; j < a->size(); j++) {
int id = static_cast<int>(a->Get(j));
if (is_prepack && j == 0) {
Expand All@@ -378,6 +444,29 @@ void WebGPUGraph::build(
}
}

// f16 KV defensive guard: fail loud if a non-sdpa op reads an f16 cache.
// Inert unless kv_f16_ (runtime opt-in) is set.
if (kv_f16_ && !kv_cache_ids_.empty() && chain_prescan) {
for (unsigned ci = 0; ci < chain_prescan->size(); ci++) {
const auto* oc = chain_prescan->Get(ci);
const std::string nm = oc->name()->str();
if (nm == "sdpa_with_kv_cache.default" || nm == kPrepackOpName) {
continue;
}
const auto* a = oc->args();
if (!a) {
continue;
}
for (unsigned j = 0; j < a->size(); j++) {
if (kv_cache_ids_.count(static_cast<int>(a->Get(j))) != 0) {
throw std::runtime_error(
"WebGPU f16 KV: cache tensor consumed by non-sdpa op '" + nm +
"' would misread the f16 buffer");
}
}
}
}

for (int i = 0; i < num_vals; i++) {
const auto* val = values->Get(i);
if (!val || val->value_type() == vkgraph::GraphTypes::NONE) {
Expand DownExpand Up@@ -407,6 +496,23 @@ void WebGPUGraph::build(
tensor.cur_dims = tensor.dims;
tensor.cur_nbytes = tensor.nbytes;

// f16 KV cache: dedicated half-size array<f16> buffer. WebGPU
// zero-initializes freshly-created buffers, so no explicit clear is
// needed. Inert unless kv_f16_ (runtime opt-in) is set.
if (kv_f16_ && kv_cache_ids_.count(i) != 0) {
tensor.elem_size = 2;
tensor.nbytes = numel * 2;
tensor.cur_nbytes = tensor.nbytes;
tensor_mem_obj_ids_[i] = -1;
WGPUBufferDescriptor buf_desc = {};
buf_desc.size = std::max(tensor.nbytes, size_t(4));
buf_desc.usage = WGPUBufferUsage_Storage | WGPUBufferUsage_CopyDst |
WGPUBufferUsage_CopySrc;
buf_desc.mappedAtCreation = false;
tensor.buffer = wgpuDeviceCreateBuffer(device_, &buf_desc);
break;
}

int constant_id = vk_tensor->constant_id();
int mem_obj_id = vk_tensor->mem_obj_id();

Expand Down
60 changes: 59 additions & 1 deletion backends/webgpu/runtime/WebGPUGraph.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,7 +104,9 @@ class WebGPUGraph {
void build(
const void* flatbuffer_data,
const uint8_t* constant_data,
const executorch::runtime::NamedDataMap* named_data_map = nullptr);
const executorch::runtime::NamedDataMap* named_data_map = nullptr,
bool f16_kv_cache = false,
bool f16_accumulate_gemm = false);

// Copy input tensor data from host pointers into GPU buffers.
void copy_inputs(const std::vector<InputData>& inputs);
Expand DownExpand Up@@ -267,6 +269,35 @@ class WebGPUGraph {
// Graph-owned scratch storage buffer for fused-op intermediates (e.g. SDPA).
WGPUBuffer create_scratch_buffer(size_t nbytes);

// Reusable scratch pool for SINGLE-OP-LIFETIME fused-op scratch (SDPA
// attn_weights/softmax, FlashDecoding partials). acquire_scratch() reuses a
// free slot (best-fit, size in [n,2n]) or creates one; the caller RELEASES it
// at op-lowering scope exit (use ScopedScratch), so N layers' scratch reuses
// a small constant of buffers instead of N x held to graph teardown.
// Correctness: WebGPU/Dawn auto-inserts RAW hazard barriers between
// dispatches on a shared storage buffer regardless of pass structure -- the
// SAME guarantee mem_obj_id aliasing already relies on -- so reuse is
// bit-identical. Never hand a still-in_use slot to a co-live requester.
WGPUBuffer acquire_scratch(size_t nbytes);
void release_scratch(WGPUBuffer buffer);
// RAII: releases an acquired scratch slot when the op-lowering scope exits
// (leak-safe vs early returns).
struct ScopedScratch {
WebGPUGraph* g = nullptr;
WGPUBuffer buf = nullptr;
ScopedScratch(WebGPUGraph* graph, WGPUBuffer b) : g(graph), buf(b) {}
~ScopedScratch() {
if (g && buf) {
g->release_scratch(buf);
}
}
ScopedScratch(const ScopedScratch&) = delete;
ScopedScratch& operator=(const ScopedScratch&) = delete;
operator WGPUBuffer() const {
return buf;
}
};

// Create a mapped-at-creation uniform buffer from `size` bytes and track it
// in the memory stats. Shared helper for ops needing a uniform Params buffer.
WGPUBuffer make_uniform_buffer(const void* data, size_t size);
Expand DownExpand Up@@ -314,6 +345,23 @@ class WebGPUGraph {
return value_types_[id];
}

public:
// True when the sdpa K/V cache is stored f16-packed (runtime opt-in).
bool kv_f16() const {
return kv_f16_;
}

// True when the q4gsw steel prefill GEMM uses the lossy f16-accumulate kernel
// (runtime opt-in; perplexity-gated, not bit-exact).
bool f16_accumulate_gemm() const {
return f16_accumulate_gemm_;
}

private:
bool kv_f16_ = false;
std::unordered_set<int> kv_cache_ids_;
bool f16_accumulate_gemm_ = false;

private:
WGPUInstance instance_ = nullptr;
WGPUDevice device_ = nullptr;
Expand DownExpand Up@@ -366,6 +414,16 @@ class WebGPUGraph {
// Long-lived scratch storage buffers for fused ops (e.g. SDPA temporaries).
std::vector<WGPUBuffer> scratch_buffers_;

// Reusable scratch pool: single-op-lifetime buffers recycled across ops
// (acquire_scratch/release_scratch). Each slot is freed in the dtor. See
// acquire_scratch() for the reuse policy.
struct ScratchSlot {
WGPUBuffer buffer = nullptr;
size_t size = 0;
bool in_use = false;
};
std::vector<ScratchSlot> scratch_pool_;

// Uniform buffers owned for the graph's lifetime; released in the dtor.
std::vector<WGPUBuffer> owned_uniform_buffers_;

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion backends/webgpu/runtime/WebGPUBackend.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,8 +79,32 @@ Result<DelegateHandle*> WebGPUBackend::init(
return Error::DelegateInvalidCompatibility;
}

// Load-time backend option (BackendOption / LoadBackendOptionsMap), keyed by
// the registered backend name; default false. Mirrors the CoreML/XNNPACK
// runtime-spec pattern -- no compile flag and no .pte re-export needed.
bool enable_f16_kv_cache = false;
{
Result<bool> spec = context.get_runtime_spec<bool>("enable_f16_kv_cache");
if (spec.ok()) {
enable_f16_kv_cache = spec.get();
}
}
bool enable_f16_accumulate_gemm = false;
{
Result<bool> spec =
context.get_runtime_spec<bool>("enable_f16_accumulate_gemm");
if (spec.ok()) {
enable_f16_accumulate_gemm = spec.get();
}
}

try {
graph->build(flatbuffer_data, constant_data, context.get_named_data_map());
graph->build(
flatbuffer_data,
constant_data,
context.get_named_data_map(),
enable_f16_kv_cache,
enable_f16_accumulate_gemm);
} catch (const std::exception& e) {
ET_LOG(Error, "WebGPU graph build failed: %s", e.what());
graph->~WebGPUGraph();
Expand Down
108 changes: 107 additions & 1 deletion backends/webgpu/runtime/WebGPUGraph.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,6 +90,49 @@ WGPUBuffer WebGPUGraph::create_scratch_buffer(size_t nbytes) {
return buffer;
}

WGPUBuffer WebGPUGraph::acquire_scratch(size_t nbytes) {
nbytes = nbytes > 0 ? nbytes : 4;
// Best-fit reuse: smallest free slot with size in [nbytes, 2*nbytes] -- the
// 2x cap stops a large Cmax-sized buffer from backing a tiny request. Never
// reuse an in_use slot (co-live safety).
ScratchSlot* best = nullptr;
for (auto& s : scratch_pool_) {
// s.size - nbytes (safe: s.size >= nbytes) avoids overflowing 2 * nbytes.
if (!s.in_use && s.size >= nbytes && s.size - nbytes <= nbytes) {
if (best == nullptr || s.size < best->size) {
best = &s;
}
}
}
if (best != nullptr) {
best->in_use = true;
return best->buffer;
}
// None reusable -> create a new slot (freed in the dtor, like
// scratch_buffers_).
WGPUBufferDescriptor buf_desc = {};
buf_desc.size = nbytes;
buf_desc.usage = WGPUBufferUsage_Storage | WGPUBufferUsage_CopyDst |
WGPUBufferUsage_CopySrc;
buf_desc.mappedAtCreation = false;
WGPUBuffer buffer = wgpuDeviceCreateBuffer(device_, &buf_desc);
scratch_pool_.push_back({buffer, nbytes, true});
return buffer;
}

void WebGPUGraph::release_scratch(WGPUBuffer buffer) {
if (!buffer) {
return;
}
for (auto& s : scratch_pool_) {
if (s.buffer == buffer) {
s.in_use = false;
return;
}
}
// Not a pooled buffer -> no-op; the dtor frees it via scratch_buffers_.
}

WGPUBuffer WebGPUGraph::make_uniform_buffer(const void* data, size_t size) {
WGPUBufferDescriptor desc = {};
desc.size = size;
Expand DownExpand Up@@ -267,6 +310,11 @@ WebGPUGraph::~WebGPUGraph() {
wgpuBufferRelease(buf);
}
}
for (auto& s : scratch_pool_) {
if (s.buffer) {
wgpuBufferRelease(s.buffer);
}
}
for (auto& buf : owned_uniform_buffers_) {
if (buf) {
wgpuBufferRelease(buf);
Expand DownExpand Up@@ -310,7 +358,9 @@ WebGPUGraph::~WebGPUGraph() {
void WebGPUGraph::build(
const void* flatbuffer_data,
const uint8_t* constant_data,
const executorch::runtime::NamedDataMap* named_data_map) {
const executorch::runtime::NamedDataMap* named_data_map,
bool f16_kv_cache,
bool f16_accumulate_gemm) {
if (!device_) {
auto* ctx = get_default_webgpu_context();
if (ctx) {
Expand All@@ -331,6 +381,15 @@ void WebGPUGraph::build(
constant_data_ = constant_data;
named_data_map_ = named_data_map;

// f16 KV cache (runtime opt-in): store K/V caches as f16 iff the opt-in is
// set AND the device negotiated shader-f16 (fail-closed).
const WebGPUContext* kv_ctx = get_default_webgpu_context();
kv_f16_ = f16_kv_cache && (kv_ctx != nullptr && kv_ctx->shader_f16_supported);

// f16-accumulate q4gsw steel prefill GEMM (runtime opt-in). QuantizedLinear
// additionally gates the kernel on the negotiated shader-f16 feature.
f16_accumulate_gemm_ = f16_accumulate_gemm;

// Phase 1: Create all values
const auto* values = graph->values();
const int num_vals = values ? values->size() : 0;
Expand DownExpand Up@@ -358,6 +417,13 @@ void WebGPUGraph::build(
if (!a) {
continue;
}
// f16 KV: tag sdpa K/V cache values (args[3],[4]) for half-size alloc.
// Inert unless kv_f16_ (runtime opt-in) is set.
if (kv_f16_ && a->size() > 4 &&
oc->name()->str() == "sdpa_with_kv_cache.default") {
kv_cache_ids_.insert(static_cast<int>(a->Get(3)));
kv_cache_ids_.insert(static_cast<int>(a->Get(4)));
}
for (unsigned j = 0; j < a->size(); j++) {
int id = static_cast<int>(a->Get(j));
if (is_prepack && j == 0) {
Expand All@@ -378,6 +444,29 @@ void WebGPUGraph::build(
}
}

// f16 KV defensive guard: fail loud if a non-sdpa op reads an f16 cache.
// Inert unless kv_f16_ (runtime opt-in) is set.
if (kv_f16_ && !kv_cache_ids_.empty() && chain_prescan) {
for (unsigned ci = 0; ci < chain_prescan->size(); ci++) {
const auto* oc = chain_prescan->Get(ci);
const std::string nm = oc->name()->str();
if (nm == "sdpa_with_kv_cache.default" || nm == kPrepackOpName) {
continue;
}
const auto* a = oc->args();
if (!a) {
continue;
}
for (unsigned j = 0; j < a->size(); j++) {
if (kv_cache_ids_.count(static_cast<int>(a->Get(j))) != 0) {
throw std::runtime_error(
"WebGPU f16 KV: cache tensor consumed by non-sdpa op '" + nm +
"' would misread the f16 buffer");
}
}
}
}

for (int i = 0; i < num_vals; i++) {
const auto* val = values->Get(i);
if (!val || val->value_type() == vkgraph::GraphTypes::NONE) {
Expand DownExpand Up@@ -407,6 +496,23 @@ void WebGPUGraph::build(
tensor.cur_dims = tensor.dims;
tensor.cur_nbytes = tensor.nbytes;

// f16 KV cache: dedicated half-size array<f16> buffer. WebGPU
// zero-initializes freshly-created buffers, so no explicit clear is
// needed. Inert unless kv_f16_ (runtime opt-in) is set.
if (kv_f16_ && kv_cache_ids_.count(i) != 0) {
tensor.elem_size = 2;
tensor.nbytes = numel * 2;
tensor.cur_nbytes = tensor.nbytes;
tensor_mem_obj_ids_[i] = -1;
WGPUBufferDescriptor buf_desc = {};
buf_desc.size = std::max(tensor.nbytes, size_t(4));
buf_desc.usage = WGPUBufferUsage_Storage | WGPUBufferUsage_CopyDst |
WGPUBufferUsage_CopySrc;
buf_desc.mappedAtCreation = false;
tensor.buffer = wgpuDeviceCreateBuffer(device_, &buf_desc);
break;
}

int constant_id = vk_tensor->constant_id();
int mem_obj_id = vk_tensor->mem_obj_id();

Expand Down
60 changes: 59 additions & 1 deletion backends/webgpu/runtime/WebGPUGraph.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,7 +104,9 @@ class WebGPUGraph {
void build(
const void* flatbuffer_data,
const uint8_t* constant_data,
const executorch::runtime::NamedDataMap* named_data_map = nullptr);
const executorch::runtime::NamedDataMap* named_data_map = nullptr,
bool f16_kv_cache = false,
bool f16_accumulate_gemm = false);

// Copy input tensor data from host pointers into GPU buffers.
void copy_inputs(const std::vector<InputData>& inputs);
Expand DownExpand Up@@ -267,6 +269,35 @@ class WebGPUGraph {
// Graph-owned scratch storage buffer for fused-op intermediates (e.g. SDPA).
WGPUBuffer create_scratch_buffer(size_t nbytes);

// Reusable scratch pool for SINGLE-OP-LIFETIME fused-op scratch (SDPA
// attn_weights/softmax, FlashDecoding partials). acquire_scratch() reuses a
// free slot (best-fit, size in [n,2n]) or creates one; the caller RELEASES it
// at op-lowering scope exit (use ScopedScratch), so N layers' scratch reuses
// a small constant of buffers instead of N x held to graph teardown.
// Correctness: WebGPU/Dawn auto-inserts RAW hazard barriers between
// dispatches on a shared storage buffer regardless of pass structure -- the
// SAME guarantee mem_obj_id aliasing already relies on -- so reuse is
// bit-identical. Never hand a still-in_use slot to a co-live requester.
WGPUBuffer acquire_scratch(size_t nbytes);
void release_scratch(WGPUBuffer buffer);
// RAII: releases an acquired scratch slot when the op-lowering scope exits
// (leak-safe vs early returns).
struct ScopedScratch {
WebGPUGraph* g = nullptr;
WGPUBuffer buf = nullptr;
ScopedScratch(WebGPUGraph* graph, WGPUBuffer b) : g(graph), buf(b) {}
~ScopedScratch() {
if (g && buf) {
g->release_scratch(buf);
}
}
ScopedScratch(const ScopedScratch&) = delete;
ScopedScratch& operator=(const ScopedScratch&) = delete;
operator WGPUBuffer() const {
return buf;
}
};

// Create a mapped-at-creation uniform buffer from `size` bytes and track it
// in the memory stats. Shared helper for ops needing a uniform Params buffer.
WGPUBuffer make_uniform_buffer(const void* data, size_t size);
Expand DownExpand Up@@ -314,6 +345,23 @@ class WebGPUGraph {
return value_types_[id];
}

public:
// True when the sdpa K/V cache is stored f16-packed (runtime opt-in).
bool kv_f16() const {
return kv_f16_;
}

// True when the q4gsw steel prefill GEMM uses the lossy f16-accumulate kernel
// (runtime opt-in; perplexity-gated, not bit-exact).
bool f16_accumulate_gemm() const {
return f16_accumulate_gemm_;
}

private:
bool kv_f16_ = false;
std::unordered_set<int> kv_cache_ids_;
bool f16_accumulate_gemm_ = false;

private:
WGPUInstance instance_ = nullptr;
WGPUDevice device_ = nullptr;
Expand DownExpand Up@@ -366,6 +414,16 @@ class WebGPUGraph {
// Long-lived scratch storage buffers for fused ops (e.g. SDPA temporaries).
std::vector<WGPUBuffer> scratch_buffers_;

// Reusable scratch pool: single-op-lifetime buffers recycled across ops
// (acquire_scratch/release_scratch). Each slot is freed in the dtor. See
// acquire_scratch() for the reuse policy.
struct ScratchSlot {
WGPUBuffer buffer = nullptr;
size_t size = 0;
bool in_use = false;
};
std::vector<ScratchSlot> scratch_pool_;

// Uniform buffers owned for the graph's lifetime; released in the dtor.
std::vector<WGPUBuffer> owned_uniform_buffers_;

Expand Down
Loading
Loading