[SOT][3.12] Support END_FOR opcode by skiping END_FOR in FOR_ITER in Python 3.12 (#62008)

diadestiny · web-flow · commit c3074d6061a4 · 2024-02-23T21:22:52.000+08:00
diff --git a/python/paddle/jit/sot/opcode_translator/executor/opcode_executor.py b/python/paddle/jit/sot/opcode_translator/executor/opcode_executor.py
@@ -2100,6 +2100,8 @@ def FOR_ITER(self, instr):
 
             self._inline_call_for_loop(iterator, instr)
             self._lasti = self.indexof(instr.jump_to)
+            next_instr = self._instructions[self._lasti]
+            self._lasti += int(next_instr.opname == 'END_FOR')
         except BreakGraphError as e:
             log(3, f"[BreakGraph] FOR_ITER sim for loop failed for: {e}\n")
             if backup_iter_idx:
diff --git a/test/sot/skip_files_py312 b/test/sot/skip_files_py312
@@ -3,14 +3,10 @@
 ./test_12_for_loop.py
 ./test_14_operators.py
 ./test_15_slice.py
-./test_17_paddle_layer.py
 ./test_21_global.py
 ./test_analysis_inputs.py
 ./test_break_graph.py
-./test_builtin_map.py
-./test_builtin_range.py
 ./test_builtin_zip.py
-./test_enumerate.py
 ./test_guard_user_defined_fn.py
 ./test_inplace_api.py
 ./test_min_graph_size.py
