Fix rewrite pass affecting objmode lowering during fallback #2185
Conversation
Preserve original IR and restore if fallback to object mode.
Verify that rewrite pass doesn't affect objmode lowering
|
|
||
| return len(getitems) > 0 | ||
|
|
||
| def apply(self): | ||
| """ | ||
| Rewrite all matching getitems as static_getitems. | ||
| """ | ||
| for expr, const in self.getitems: |
There was a problem hiding this comment.
This pass introduce in opcode to the source IR. It is rewritten to create new IR node instead. We should consider refactoring all rewrite passes to avoid mutating the source IR.
There was a problem hiding this comment.
Hmm, the original spelling is much simpler, though. Perhaps Rewrite.match() should always be given a block copy? That way, the rewrite can mutate the IR if it likes to...
There was a problem hiding this comment.
And / or add some methods to numba.ir to make copying instructions easier...
There was a problem hiding this comment.
I am also working on a refactor on the rewrite passes to make it easier to write and also fix other IR mutating pass.
Current coverage is 87.03% (diff: 95.91%)@@ master #2185 diff @@
==========================================
Files 308 308
Lines 56735 56777 +42
Methods 0 0
Messages 0 0
Branches 5889 5893 +4
==========================================
+ Hits 49377 49417 +40
- Misses 6408 6409 +1
- Partials 950 951 +1
|
|
@pitrou: Can you review this? |
|
The general question is whether rewrite passes may also benefit object mode (in which case, an alternative solution is to support the new instructions in object mode too). |
|
Some rewrite pass is useful for object mode but not all of them. Perhaps, objmode should get it's own set rewrite passes. |
|
Also, I think the IR should be immutable after the |
|
This PR contains the fix. The refactor that I mentioned will be in a separate PR. The WIP branch is sklam/numba@fix/invalid_rewrite...sklam:refactor/rewrite_pass |
Rewrite passes mutates the IR in-place but the inserted opcode is not understood by the objmode lowering. When a function fails typing and fallbacks to the objmode, the IR is already mutated. This patch fixes it by preserving the original IR and restoring the IR upon entry to the objmode pipeline.
Closes #2159 and #2169