Merge branch 'main' into xurui/add_benchmark

xurui1995 · web-flow · commit d6fff77c2a3d · 2024-08-15T13:18:49.000+08:00
diff --git a/cmake/llvm-version.txt b/cmake/llvm-version.txt
@@ -1 +1 @@
-89946bda5e1c7ceaf6d26634cc8c8c9498d9f7be
+8345289ded788f4df79f59df76df0c0437c3df64
diff --git a/lib/gc/Analysis/MatmulConfigAnalysis.cpp b/lib/gc/Analysis/MatmulConfigAnalysis.cpp
@@ -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{
diff --git a/lib/gc/Transforms/DeepTileContractionNamedOp.cpp b/lib/gc/Transforms/DeepTileContractionNamedOp.cpp
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-89946bda5e1c7ceaf6d26634cc8c8c9498d9f7be`
	`1`	`+8345289ded788f4df79f59df76df0c0437c3df64`