From 87ca9c7ffcddb360e087bd90322932736e9e639b Mon Sep 17 00:00:00 2001
From: "Zhong, Zhicong" <zhicong.zhong@intel.com>
Date: Wed, 14 Aug 2024 18:48:20 -0700
Subject: [PATCH 1/2] fix

---
 cmake/llvm-version.txt                           | 2 +-
 lib/gc/Transforms/DeepTileContractionNamedOp.cpp | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/cmake/llvm-version.txt b/cmake/llvm-version.txt
index 620fa4ef3..c6bbb8b0f 100644
--- a/cmake/llvm-version.txt
+++ b/cmake/llvm-version.txt
@@ -1 +1 @@
-89946bda5e1c7ceaf6d26634cc8c8c9498d9f7be
+8345289ded788f4df79f59df76df0c0437c3df64
diff --git a/lib/gc/Transforms/DeepTileContractionNamedOp.cpp b/lib/gc/Transforms/DeepTileContractionNamedOp.cpp
index 30d0e022f..5678807ce 100644
--- 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,

From 433fc4e9f5d7cbc4603f5ba508af443bbc6f15f1 Mon Sep 17 00:00:00 2001
From: "Zhong, Zhicong" <zhicong.zhong@intel.com>
Date: Wed, 14 Aug 2024 18:51:08 -0700
Subject: [PATCH 2/2] fix

---
 lib/gc/Analysis/MatmulConfigAnalysis.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/gc/Analysis/MatmulConfigAnalysis.cpp b/lib/gc/Analysis/MatmulConfigAnalysis.cpp
index b31e0933e..dbc61da61 100644
--- 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{