fix: reclaim before accepting wrapped Vulkan iGPU memory estimates (#2124)

This commit is contained in:
losewayy authored and GitHub committed 2026-10-13 21:10:05 +08:00
1 parent 7e3e20a50b
commit 60423ab5f6
2 files changed
+26 -4

No files matched your search

+25 -4
View File
@@ -1757,7 +1757,14 @@ ModelManager::CapacityCheck ModelManager::check_capacity(
} }
// Vulkan's heap budget subtraction can underflow when usage exceeds the budget. // Vulkan's heap budget subtraction can underflow when usage exceeds the budget.
if (total_bytes > 0 && free_bytes > total_bytes && sd_backend_is(backend, "Vulkan")) { if (total_bytes > 0 && free_bytes > total_bytes && sd_backend_is(backend, "Vulkan")) {
return size_t{0}; if (ggml_backend_dev_type(device) != GGML_BACKEND_DEVICE_TYPE_IGPU) {
return size_t{0};
}
// A wrapped report may reflect real pressure; reclaim before accepting the tracked estimate.
LOG_VERBOSE("ignoring impossible free memory report on %s (%.2f MB free / %.2f MB total), using tracked residency",
ggml_backend_name(backend), free_bytes / (1024.0 * 1024.0), total_bytes / (1024.0 * 1024.0));
free_bytes = total_bytes;
result.requires_reclamation = true;
} }
if (total_bytes > 0) { if (total_bytes > 0) {
free_bytes = std::min(free_bytes, resident < total_bytes ? total_bytes - resident : 0); free_bytes = std::min(free_bytes, resident < total_bytes ? total_bytes - resident : 0);
@@ -1803,8 +1810,11 @@ bool ModelManager::fits_compute_backend_capacity(
const DeviceMemoryRequest& request, const DeviceMemoryRequest& request,
const std::vector<ggml_tensor*>& required_params) const { const std::vector<ggml_tensor*>& required_params) const {
std::vector<TensorState*> states; std::vector<TensorState*> states;
return resolve_required_tensor_states(required_params, states, request.compute_backend) && if (!resolve_required_tensor_states(required_params, states, request.compute_backend)) {
check_capacity(request, states).fits(); return false;
}
const auto capacity = check_capacity(request, states);
return !capacity.requires_reclamation && capacity.fits();
} }
bool ModelManager::ensure_compute_backend_capacity( bool ModelManager::ensure_compute_backend_capacity(
@@ -1826,7 +1836,10 @@ bool ModelManager::ensure_compute_backend_capacity(
return true; return true;
} }
auto fits = [&]() { return check_capacity(request, required_states).fits(); }; auto fits = [&]() {
const auto capacity = check_capacity(request, required_states);
return !capacity.requires_reclamation && capacity.fits();
};
if (fits()) { if (fits()) {
return true; return true;
} }
@@ -1866,7 +1879,12 @@ bool ModelManager::ensure_compute_backend_capacity(
eviction_states.insert(state); eviction_states.insert(state);
} }
}; };
size_t last_eviction_count = 0;
auto release_eviction_states = [&]() { auto release_eviction_states = [&]() {
if (eviction_states.size() == last_eviction_count) {
return false;
}
last_eviction_count = eviction_states.size();
release_compute_staging_blocks(false, &eviction_states); release_compute_staging_blocks(false, &eviction_states);
release_params_storage_blocks(false, &eviction_states); release_params_storage_blocks(false, &eviction_states);
return fits(); return fits();
@@ -1947,6 +1965,9 @@ bool ModelManager::ensure_compute_backend_capacity(
} }
revert_demotions(); revert_demotions();
if (check_capacity(request, required_states).fits()) {
return true;
}
const auto capacity = check_capacity(request, required_states, true); const auto capacity = check_capacity(request, required_states, true);
const std::string available_device = capacity.available_device_bytes == SIZE_MAX const std::string available_device = capacity.available_device_bytes == SIZE_MAX
? "unknown" ? "unknown"
+1
View File
@@ -152,6 +152,7 @@ private:
size_t required_budget_bytes = 0; size_t required_budget_bytes = 0;
size_t available_device_bytes = SIZE_MAX; size_t available_device_bytes = SIZE_MAX;
size_t available_budget_bytes = SIZE_MAX; size_t available_budget_bytes = SIZE_MAX;
bool requires_reclamation = false;
bool fits() const { bool fits() const {
return required_device_bytes <= available_device_bytes && return required_device_bytes <= available_device_bytes &&
required_budget_bytes <= available_budget_bytes; required_budget_bytes <= available_budget_bytes;