From f0157d5fa332589ebcb55bbe638956bb31ef7a6c Mon Sep 17 00:00:00 2001
From: Ean Garvey <garveyej@gmail.com>
Date: Thu, 19 Oct 2023 09:18:38 -0500
Subject: [PATCH] LLVMCPU reduction tiling rebase conflict fix

Co-authored-by: Max Dawkins <maximilian@nod-labs.com>
---
 .../iree/compiler/Codegen/LLVMCPU/Passes.cpp  | 33 +++++++------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/compiler/src/iree/compiler/Codegen/LLVMCPU/Passes.cpp b/compiler/src/iree/compiler/Codegen/LLVMCPU/Passes.cpp
index e0fc0bb45292..3f1860607e81 100644
--- a/compiler/src/iree/compiler/Codegen/LLVMCPU/Passes.cpp
+++ b/compiler/src/iree/compiler/Codegen/LLVMCPU/Passes.cpp
@@ -214,30 +214,19 @@ LogicalResult verifyDoubleTilingExpertPassPipelineConfig(
       }
     }
 
-    SmallVector<int64_t> thirdLevelTileSizes;
-    std::tie(thirdLevelTileSizes, std::ignore) =
-        tilingConfig.getVectorReductionSizes();
-    for (auto [index, tileSize] : llvm::enumerate(thirdLevelTileSizes)) {
-      if (tileSize != 0 && pLoopsSet.contains(index)) {
-        return op->emitOpError(
-                   "expected only reduction dims to be set in the third tiling "
-                   "level, got ")
-               << index << "-th tile size set";
+    if (!clEnableQuantizedMatmulReassociation) {
+      SmallVector<int64_t> thirdLevelTileSizes;
+      std::tie(thirdLevelTileSizes, std::ignore) =
+          tilingConfig.getVectorReductionSizes();
+      for (auto [index, tileSize] : llvm::enumerate(thirdLevelTileSizes)) {
+        if (tileSize != 0 && pLoopsSet.contains(index)) {
+          return op->emitOpError("expected only reduction dims to be set in "
+                                 "the third tiling "
+                                 "level, got ")
+                 << index << "-th tile size set";
+        }
       }
     }
-    // if (!clEnableQuantizedMatmulReassociation) {
-    //   SmallVector<int64_t> thirdLevelTileSizes;
-    //   std::tie(thirdLevelTileSizes, std::ignore) =
-    //       tilingConfig.getVectorReductionSizes();
-    //   for (auto [index, tileSize] : llvm::enumerate(thirdLevelTileSizes)) {
-    //     if (tileSize != 0 && pLoopsSet.contains(index)) {
-    //       return op->emitOpError("expected only reduction dims to be set in "
-    //                              "the third tiling "
-    //                              "level, got ")
-    //              << index << "-th tile size set";
-    //     }
-    //   }
-    // }
   }
 
   // Verify interchange