Merge 2643edc into d01fb23

iree-org · Jun 20, 2024 · 40f6a3a · 40f6a3a
2 parents d01fb23 + 2643edc
commit 40f6a3a
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/compiler/src/iree/compiler/Codegen/LLVMCPU/Passes.cpp b/compiler/src/iree/compiler/Codegen/LLVMCPU/Passes.cpp
@@ -498,12 +498,6 @@ void addMmt4dTilingExpertPassPipeline(OpPassManager &funcPassManager,
                                       LLVMCPUPipelineOptions &pipelineOpt) {
   addTileAndDistributePasses(funcPassManager);
 
-  if (pipelineOpt.enableUkernels) {
-    funcPassManager.addPass(createCPUPrepareUkernelsPass());
-    funcPassManager.addPass(
-        createCPULowerToUKernelsPass(clSkipIntermediateRoundings));
-  }
-
   // We still run codegen pipeline because we want a better fallback when
   // ukernels are not available. They are nop if the mmt4d op is convereted to
   // ukernels. If ukernels are not implemented, the lowering config is still
@@ -531,11 +525,14 @@ void addMmt4dTilingExpertPassPipeline(OpPassManager &funcPassManager,
         funcPassManager.addPass(createLLVMCPUTilePass(i));
         continue;
       }
-
       funcPassManager.addPass(createLLVMCPUTilePass(i));
     }
   }
 
+  funcPassManager.addPass(createCPUPrepareUkernelsPass());
+  funcPassManager.addPass(
+    createCPULowerToUKernelsPass(clSkipIntermediateRoundings));
+
   {
     GenericVectorizationPassOptions options;
     options.enableVectorMasking = pipelineOpt.enableVectorMasking;