-
Notifications
You must be signed in to change notification settings - Fork 2
Add SFC-based GEMM kernel #72
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
jopperm
wants to merge
6
commits into
main
Choose a base branch
from
triton-cpu-sfc-gemm
base: main
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
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
ae3cfca
Add SFC-based GEMM kernel
jopperm 723d795
Bump TritonCPU
jopperm 8658f51
Use kernel arg to override bounds check
jopperm 843537f
Use simpler kernel relying on on-the-fly VNNI packing
jopperm e390859
Increase benchmark sizes
jopperm bab96cf
Fix stride
jopperm File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
23 changes: 23 additions & 0 deletions
23
backends/triton/cpu/KernelBench/level1/2_Standard_matrix_multiplication_.py
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| # ruff: noqa: E731 | ||
| # Example Triton CPU kernel | ||
| # Status: Experimental / uncurated | ||
| # Expectation: Correctness-first, performance not representative | ||
|
|
||
| from pathlib import Path | ||
| import sys | ||
|
|
||
| import torch | ||
| import torch.nn as nn | ||
|
|
||
| sys.path.insert(0, str(Path(__file__).parent)) | ||
| from sfc_matmul import sfc_matmul | ||
|
|
||
|
|
||
| class Model(nn.Module): | ||
| """KernelBench-compatible wrapper""" | ||
|
|
||
| def __init__(self, *args, **kwargs): | ||
| super(Model, self).__init__() | ||
|
|
||
| def forward(self, A: torch.Tensor, B: torch.Tensor) -> torch.Tensor: | ||
| return sfc_matmul(A, B) | ||
25 changes: 25 additions & 0 deletions
25
backends/triton/cpu/KernelBench/level1/LICENSE.gilbert_d2xy.txt
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| BSD 2-Clause License | ||
|
|
||
| Copyright (c) 2018, Jakub Červený | ||
| All rights reserved. | ||
|
|
||
| Redistribution and use in source and binary forms, with or without | ||
| modification, are permitted provided that the following conditions are met: | ||
|
|
||
| * Redistributions of source code must retain the above copyright notice, this | ||
| list of conditions and the following disclaimer. | ||
|
|
||
| * Redistributions in binary form must reproduce the above copyright notice, | ||
| this list of conditions and the following disclaimer in the documentation | ||
| and/or other materials provided with the distribution. | ||
|
|
||
| THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
| AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
| DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE | ||
| FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | ||
| SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | ||
| CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | ||
| OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: I'd throw it into a separate subdir. Otherwise, it'll get a bit lost among other 100 kernels. |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| #!/usr/bin/env python3 | ||
| # SPDX-License-Identifier: BSD-2-Clause | ||
| # Copyright (c) 2024 abetusk | ||
|
|
||
| # Source: https://github.com/jakubcerveny/gilbert/blob/9b080a74c5e3b6fe189785c52742f83ac85ba181/gilbert_d2xy.py | ||
|
|
||
|
|
||
| def gilbert_d2xy(idx, w, h): | ||
| """ | ||
| Generalized Hilbert ('gilbert') space-filling curve for arbitrary-sized | ||
| 2D rectangular grids. Takes a position along the gilbert curve and returns | ||
| its 2D (x,y) coordinate. | ||
| """ | ||
|
|
||
| if w >= h: | ||
| return gilbert_d2xy_r(idx, 0, 0, 0, w, 0, 0, h) | ||
| return gilbert_d2xy_r(idx, 0, 0, 0, 0, h, w, 0) | ||
|
|
||
|
|
||
| def sgn(x): | ||
| return -1 if x < 0 else (1 if x > 0 else 0) | ||
|
|
||
|
|
||
| def gilbert_d2xy_r(dst_idx, cur_idx, x, y, ax, ay, bx, by): | ||
| w = abs(ax + ay) | ||
| h = abs(bx + by) | ||
|
|
||
| (dax, day) = (sgn(ax), sgn(ay)) # unit major direction | ||
| (dbx, dby) = (sgn(bx), sgn(by)) # unit orthogonal direction | ||
|
|
||
| di = dst_idx - cur_idx | ||
|
|
||
| if h == 1: | ||
| return (x + dax * di, y + day * di) | ||
| if w == 1: | ||
| return (x + dbx * di, y + dby * di) | ||
|
|
||
| (ax2, ay2) = (ax // 2, ay // 2) | ||
| (bx2, by2) = (bx // 2, by // 2) | ||
|
|
||
| w2 = abs(ax2 + ay2) | ||
| h2 = abs(bx2 + by2) | ||
|
|
||
| if 2 * w > 3 * h: | ||
| if (w2 % 2) and (w > 2): | ||
| # prefer even steps | ||
| (ax2, ay2) = (ax2 + dax, ay2 + day) | ||
|
|
||
| # long case: split in two parts only | ||
| nxt_idx = cur_idx + abs((ax2 + ay2) * (bx + by)) | ||
| if (cur_idx <= dst_idx) and (dst_idx < nxt_idx): | ||
| return gilbert_d2xy_r(dst_idx, cur_idx, x, y, ax2, ay2, bx, by) | ||
| cur_idx = nxt_idx | ||
|
|
||
| return gilbert_d2xy_r( | ||
| dst_idx, cur_idx, x + ax2, y + ay2, ax - ax2, ay - ay2, bx, by | ||
| ) | ||
|
|
||
| if (h2 % 2) and (h > 2): | ||
| # prefer even steps | ||
| (bx2, by2) = (bx2 + dbx, by2 + dby) | ||
|
|
||
| # standard case: one step up, one long horizontal, one step down | ||
| nxt_idx = cur_idx + abs((bx2 + by2) * (ax2 + ay2)) | ||
| if (cur_idx <= dst_idx) and (dst_idx < nxt_idx): | ||
| return gilbert_d2xy_r(dst_idx, cur_idx, x, y, bx2, by2, ax2, ay2) | ||
| cur_idx = nxt_idx | ||
|
|
||
| nxt_idx = cur_idx + abs((ax + ay) * ((bx - bx2) + (by - by2))) | ||
| if (cur_idx <= dst_idx) and (dst_idx < nxt_idx): | ||
| return gilbert_d2xy_r( | ||
| dst_idx, cur_idx, x + bx2, y + by2, ax, ay, bx - bx2, by - by2 | ||
| ) | ||
| cur_idx = nxt_idx | ||
|
|
||
| return gilbert_d2xy_r( | ||
| dst_idx, | ||
| cur_idx, | ||
| x + (ax - dax) + (bx2 - dbx), | ||
| y + (ay - day) + (by2 - dby), | ||
| -bx2, | ||
| -by2, | ||
| -(ax - ax2), | ||
| -(ay - ay2), | ||
| ) |
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is this needed?