[NNPA] Call HybridTransformPass one more time to update shape if poss…

…ible (#2449)

Signed-off-by: Tung D. Le <[email protected]>

src/Accelerators/NNPA/Compiler/NNPACompilerUtils.cpp

@@ -101,6 +101,17 @@ void addONNXToZHighPasses(
   if (isBE)
     pm.addNestedPass<func::FuncOp>(
         onnx_mlir::zhigh::createZHighConstPropagationPass());
+  // One more call to ONNX shape inference/canonicalization/... to update shape
+  // if possible.
+  if (enableONNXHybridPass) {
+    // For starters only illustrating the new hybrid pass by replacing 3 passes
+    // here. The plan is to replace most of the passes in addONNXToMLIRPasses.
+    pm.addNestedPass<func::FuncOp>(onnx_mlir::createONNXHybridTransformPass());
+  } else {
+    pm.addNestedPass<func::FuncOp>(onnx_mlir::createShapeInferencePass());
+    pm.addPass(mlir::createCanonicalizerPass());
+    pm.addNestedPass<func::FuncOp>(onnx_mlir::createShapeInferencePass());
+  }
   // Remove common sub-expressions.
   pm.addPass(mlir::createCSEPass());