Skip to content

Fix the auto cast of brgemm and the correctness issue of deepTileatmul #247

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.

Sign up for GitHub

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 2 commits into from
Aug 15, 2024
Merged

Fix the auto cast of brgemm and the correctness issue of deepTileatmul #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87ca9c7
fix
zhczhong Aug 15, 2024
433fc4e
fix
zhczhong Aug 15, 2024
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
2 changes: 1 addition & 1 deletion cmake/llvm-version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
89946bda5e1c7ceaf6d26634cc8c8c9498d9f7be
8345289ded788f4df79f59df76df0c0437c3df64
3 changes: 3 additions & 0 deletions lib/gc/Analysis/MatmulConfigAnalysis.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,10 @@ prepareConfigCandidates(Operation *root, CPUTargetDescriptionAnalysis &sysDesc,
continue;
for (uint32_t KBlock : KBlockCandidates) {
for (uint32_t innerMostKBlock : innerMostKBlockCandidates) {
// Require K % KBlock == 0 as dynamic bs is not supported
// now
if (KBlock % innerMostKBlock != 0 ||
shape[2] % KBlock != 0 ||
shape[2] % innerMostKBlock != 0)
continue;
MatmulConfig config{
Expand Down
4 changes: 1 addition & 3 deletions lib/gc/Transforms/DeepTileContractionNamedOp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -925,9 +925,7 @@ struct DeepTileMatmul : public OpInterfaceRewritePattern<linalg::LinalgOp> {
bool checkLinalgMatmulType(linalg::LinalgOp linalgOp) const {
return llvm::isa<linalg::MatmulOp>(linalgOp) ||
llvm::isa<linalgx::Mm2DVnniOp>(linalgOp) ||
llvm::isa<linalgx::Mm4DVnniOp>(linalgOp) ||
llvm::isa<linalgx::MultiBatchMatmulOp>(linalgOp) ||
llvm::isa<linalg::BatchMatmulOp>(linalgOp);
llvm::isa<linalgx::Mm4DVnniOp>(linalgOp);
}

LogicalResult matchAndRewrite(linalg::LinalgOp linalgOp,
Expand Down