-
Notifications
You must be signed in to change notification settings - Fork 13.2k
metal : index 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
Open
ggerganov
wants to merge
5
commits into
gg/fa-kv-pad
Choose a base branch
from
gg/metal-fa-opt
base: gg/fa-kv-pad
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
metal : index FA blocks #16372
+325
−66
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 |
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.