-
Notifications
You must be signed in to change notification settings - Fork 13.3k
metal : mark FA blocks #16372
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
metal : mark FA blocks #16372
+324
−65
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Is it possible to add backend tests that exercise this optimization? |
This patch should exercise it, but it's currently very slow: diff --git a/tests/test-backend-ops.cpp b/tests/test-backend-ops.cpp
index 64f1197dc..54e16bf8f 100644
--- a/tests/test-backend-ops.cpp
+++ b/tests/test-backend-ops.cpp
@@ -131,6 +131,51 @@ static void init_tensor_uniform(ggml_tensor * tensor, float min = -1.0f, float m
}
}
+static void init_tensor_kq_mask(ggml_tensor * tensor, float min = -1.0f, float max = 1.0f) {
+ GGML_ASSERT(tensor->type == GGML_TYPE_F16);
+
+ GGML_TENSOR_LOCALS( int32_t, ne, tensor, ne);
+ GGML_TENSOR_LOCALS(uint64_t, nb, tensor, nb);
+
+ std::vector<float> data_f32(ne0*ne1*ne2*ne3);
+ std::vector<ggml_fp16_t> data_f16(ne0*ne1*ne2*ne3);
+
+ std::random_device rd;
+ std::mt19937 gen(rd());
+ std::uniform_real_distribution<float> dis(min, max);
+
+ // fill data_f32 with random floats in [-1.0, 1.0f]
+ for (size_t i = 0; i < data_f32.size(); i++) {
+ data_f32[i] = dis(gen);
+ }
+
+ const int blck_w = 128;
+ const int blck_h = 16;
+
+ // fill roughly half of the mask with -INFINITY
+ const int n_inf_blocks = 0.5*(ne0*ne1*ne2*ne3)/(blck_w*blck_h);
+
+ // choose random block position
+ for (int b = 0; b < n_inf_blocks; b++) {
+ const int i3 = (rd() % ne3);
+ const int i2 = (rd() % ne2);
+ const int i1 = (rd() % ne1);
+ const int i0 = (rd() % ne0);
+
+ for (int y = 0; y < blck_h && i1 + y < ne1; y++) {
+ for (int x = 0; x < blck_w && i0 + x < ne0; x++) {
+ const int i = i3*ne2*ne1*ne0 + i2*ne1*ne0 + (i1 + y)*ne0 + (i0 + x);
+
+ data_f32[i] = -INFINITY;
+ }
+ }
+ }
+
+ ggml_fp32_to_fp16_row(data_f32.data(), data_f16.data(), ne0*ne1*ne2*ne3);
+
+ ggml_backend_tensor_set(tensor, data_f16.data(), 0, data_f16.size()*sizeof(ggml_fp16_t));
+}
+
static std::vector<float> tensor_to_float(const ggml_tensor * t) {
std::vector<float> tv;
tv.reserve(ggml_nelements(t));
@@ -5104,6 +5149,8 @@ struct test_flash_attn_ext : public test_case {
if (strcmp(t->name, "s") == 0) {
// make the sink values more noticable in order to trigger a test failure when the implementation is wrong
init_tensor_uniform(t, -10.0f, 10.0f);
+ } else if (strcmp(t->name, "m") == 0) {
+ init_tensor_kq_mask(t);
} else {
init_tensor_uniform(t);
}
Edit: should be ok now |
c619c08
to
f478afa
Compare
anyshu
pushed a commit
to anyshu/llama.cpp
that referenced
this pull request
Oct 10, 2025
* master: (113 commits) webui: updated the chat service to only include max_tokens in the req… (ggml-org#16489) cpu : optimize the ggml NORM operation (ggml-org#15953) server : host-memory prompt caching (ggml-org#16391) No markdown in cot (ggml-org#16483) model-conversion : add support for SentenceTransformers (ggml-org#16387) ci: add ARM64 Kleidiai build and test support (ggml-org#16462) CANN: Improve ACL graph matching (ggml-org#16166) kleidiai: kernel interface refactoring (ggml-org#16460) [SYCL] refactor soft_max, add soft_max_back (ggml-org#16472) model: EmbeddingGemma Adding Support for SentenceTransformers Dense Modules (ggml-org#16367) refactor: centralize CoT parsing in backend for streaming mode (ggml-org#16394) Disable CUDA host buffers on integrated GPUs (ggml-org#16308) server : fix cancel pending task (ggml-org#16467) metal : mark FA blocks (ggml-org#16372) server : improve context checkpoint logic (ggml-org#16440) ggml webgpu: profiling, CI updates, reworking of command submission (ggml-org#16452) llama : support LiquidAI LFM2-MoE hybrid model (ggml-org#16464) server : add `/v1/health` endpoint (ggml-org#16461) webui : added download action (ggml-org#13552) (ggml-org#16282) presets : fix pooling param for embedding models (ggml-org#16455) ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Apple Metal
https://en.wikipedia.org/wiki/Metal_(API)
ggml
changes relating to the ggml tensor library for machine learning
testing
Everything test related
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
target #16148
Similar optimization as in #14924:
Before running the FA kernel, run a quick pass over the mask to find all
-INF
blocks and mark them in a fleeting buffer. The FA kernel then checks that buffer to determine if it needs to process a block.Also unroll some loops better.
Most gains observed for larger head sizes and bigger contexts.