proper interchange and pipeline

opencompl · Aug 26, 2024 · 5744ed9 · 5744ed9
1 parent f4c0d8d
commit 5744ed9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/codegen/compiler/src/Quidditch/Target/QuidditchTarget.cpp b/codegen/compiler/src/Quidditch/Target/QuidditchTarget.cpp
@@ -191,6 +191,7 @@ class QuidditchTargetBackend final : public IREE::HAL::TargetBackend {
         .addPass(quidditch::Snitch::createPromoteOperandsToL1Pass)
         .addPass(createCanonicalizerPass)
         .addPass(createCSEPass)
+        .addPass(createLoopInvariantCodeMotionPass)
         .addPass(quidditch::Snitch::createPipelineCopyComputePass)
         // TODO: Fuse scf.forall after.
         .addPass([] {
@@ -199,7 +200,6 @@ class QuidditchTargetBackend final : public IREE::HAL::TargetBackend {
         })
         .addPass(createCanonicalizerPass)
         .addPass(createCSEPass)
-        .addPass(createLoopInvariantCodeMotionPass)
         .addPass(quidditch::Snitch::createFormMicrokernelsPass);
 
     BufferizationOptions::AllocationFn allocationFn =

diff --git a/codegen/compiler/src/Quidditch/Target/TensorTile.cpp b/codegen/compiler/src/Quidditch/Target/TensorTile.cpp
@@ -139,14 +139,14 @@ applyTileAndFuseToEachRoot(RewriterBase &rewriter,
       tilingOptions.setLoopType(scf::SCFTilingOptions::LoopType::ForallOp);
       break;
     case TilingLevel::L1:
+      auto loweringConfig =
+          getLoweringConfig<quidditch::Snitch::LoweringConfigAttr>(
+              tilingInterfaceOp);
       tilingOptions.setTileSizeComputationFunction(
           [&](OpBuilder &builder, auto &&...) {
             SmallVector<OpFoldResult> result;
 
-            SmallVector<int64_t> l1Tiles(
-                getLoweringConfig<quidditch::Snitch::LoweringConfigAttr>(
-                    tilingInterfaceOp)
-                    .getL1Tiles());
+            SmallVector<int64_t> l1Tiles(loweringConfig.getL1Tiles());
             for (int64_t value : l1Tiles)
               result.push_back(builder.getIndexAttr(value));
 
@@ -157,6 +157,7 @@ applyTileAndFuseToEachRoot(RewriterBase &rewriter,
             return result;
           });
       tilingOptions.setLoopType(scf::SCFTilingOptions::LoopType::ForOp);
+      tilingOptions.setInterchange(loweringConfig.getL1TilesInterchange());
       break;
     }