commit f9c11f20fc97154a7079a3809025241f5f467183
author Lei Zhang <antiagainst@google.com> Sat Nov 07 08:21:41 2020 -0500
committer GitHub <noreply@github.com> Sat Nov 07 08:21:41 2020 -0500
tree 9ae44e193c322111be19c990f478eb661770db6d
parent ab4cb7c3e4a3ad407f0e9dd10a37906dbbee4f32

[spirv] Use addNestedPass<FuncOp>() for passes working on functions (#3745)

This fixes crashes when running the whole pipeline because of pass
manager target op mismatch.

iree/compiler/Conversion/LinalgToSPIRV/Passes.cpp

diff --git a/iree/compiler/Conversion/LinalgToSPIRV/Passes.cpp b/iree/compiler/Conversion/LinalgToSPIRV/Passes.cpp
index 559b72e..b014e19 100644
--- a/iree/compiler/Conversion/LinalgToSPIRV/Passes.cpp
+++ b/iree/compiler/Conversion/LinalgToSPIRV/Passes.cpp
@@ -98,7 +98,7 @@
   //===--------------------------------------------------------------------===//
   pm.addPass(createConvertToGPUPass());
   if (options.enableVectorization) {
-    pm.addPass(createVectorToGPUPass());
+    pm.addNestedPass<FuncOp>(createVectorToGPUPass());
   }
   pm.addPass(createLowerAffinePass());
   pm.addPass(createCanonicalizerPass());
@@ -152,7 +152,7 @@
   pm.addPass(createCSEPass());
   if (options.enableVectorization) {
     pm.addPass(createVectorizeMemref());
-    pm.addPass(createForOpCanonicalizationPass());
+    pm.addNestedPass<FuncOp>(createForOpCanonicalizationPass());
     pm.addPass(createCanonicalizerPass());
     pm.addPass(createCSEPass());
   }