[SOT][3.12] Filter out duplicate store vars (#62411)

SigureMo · pull[bot] · commit 8723e9e2f904 · 2024-12-10T06:02:26.000Z
diff --git a/python/paddle/jit/sot/opcode_translator/executor/opcode_executor.py b/python/paddle/jit/sot/opcode_translator/executor/opcode_executor.py
@@ -27,6 +27,8 @@
 
 import opcode
 
+from paddle.jit.utils import OrderedSet
+
 from ...profiler import EventGuard, event_register
 from ...psdb import NO_BREAKGRAPH_CODES
 from ...utils import (
@@ -1748,7 +1750,7 @@ def get_compute_fn_and_update_changed_vars(
             end_idx: instruction index where simulation get break.
             stack: current stack
         """
-        store_vars = list(stack)
+        store_vars = list(OrderedSet(stack))
         store_var_info = {var.id: None for var in stack}
 
         for name in restore_names:
diff --git a/test/sot/skip_files_py312 b/test/sot/skip_files_py312
diff --git a/test/sot/test_01_basic.py b/test/sot/test_01_basic.py
@@ -24,7 +24,7 @@ def foo(x: int, y: paddle.Tensor):
     return x + y
 
 
-class TestExecutor(TestCaseBase):
+class TestBasic(TestCaseBase):
     def test_simple(self):
         self.assert_results(foo, 1, paddle.to_tensor(2))
 
diff --git a/test/sot/test_08_rot.py b/test/sot/test_08_rot.py
@@ -74,7 +74,7 @@ def rot_four_return_d(
     return d + 1
 
 
-class TestExecutor(TestCaseBase):
+class TestRot(TestCaseBase):
     def test_simple(self):
         a = paddle.to_tensor(1)
         b = paddle.to_tensor(2)
diff --git a/test/sot/test_10_build_unpack.py b/test/sot/test_10_build_unpack.py
@@ -75,7 +75,7 @@ def build_map_unpack_with_call(
     return z["a"] + 1
 
 
-class TestExecutor(TestCaseBase):
+class TestBuildUnpack(TestCaseBase):
     def test_simple(self):
         a = paddle.to_tensor(1)
         b = paddle.to_tensor(2)
diff --git a/test/sot/test_11_jumps.py b/test/sot/test_11_jumps.py
@@ -81,7 +81,7 @@ def pop_jump_if_not_none(x: bool, y: paddle.Tensor):
 false_tensor = paddle.to_tensor(False)
 
 
-class TestExecutor(TestCaseBase):
+class TestJump(TestCaseBase):
     def test_simple(self):
         self.assert_results(jump_absolute, 5, a)
 
diff --git a/test/sot/test_13_make_function.py b/test/sot/test_13_make_function.py
@@ -30,7 +30,7 @@ def fn(a, b=2, c=3, d=4):
     return fn(1) + fn(2, c=5) + x
 
 
-class TestExecutor(TestCaseBase):
+class TestMakeFunction(TestCaseBase):
     def test_simple(self):
         self.assert_results(make_fn, paddle.to_tensor(1))
 
diff --git a/test/sot/test_14_operators.py b/test/sot/test_14_operators.py
@@ -285,7 +285,7 @@ def operator_pos(y: int):
     return operator.pos(+y)
 
 
-class TestExecutor(TestCaseBase):
+class TestOperators(TestCaseBase):
     def test_simple(self):
         a = paddle.to_tensor(1)
         b = paddle.to_tensor(True)
diff --git a/test/sot/test_19_closure.py b/test/sot/test_19_closure.py
@@ -170,7 +170,7 @@ def closure():
     return closure
 
 
-class TestExecutor(TestCaseBase):
+class TestClosure(TestCaseBase):
     def test_closure(self):
         self.assert_results(foo, 1, paddle.to_tensor(2))
         self.assert_results(foo2, paddle.to_tensor(2))
@@ -187,7 +187,7 @@ def test_closure(self):
             )
 
 
-class TestExecutor2(TestCaseBase):
+class TestClosure2(TestCaseBase):
     def test_closure(self):
         self.assert_results(foo7)
 
@@ -210,7 +210,7 @@ def test_slice_in_for_loop(x, iter_num=3):
     return out
 
 
-class TestExecutor3(TestCaseBase):
+class TestClosure3(TestCaseBase):
     def test_closure(self):
         tx = paddle.to_tensor([1.0, 2.0, 3.0])
         # need side effect of list.
@@ -237,7 +237,7 @@ def func2():
     return t
 
 
-class TestExecutor4(TestCaseBase):
+class TestClosure4(TestCaseBase):
     def test_closure(self):
         tx = paddle.to_tensor([1.0])
         self.assert_results(non_local_test, tx)
diff --git a/test/sot/test_20_string.py b/test/sot/test_20_string.py
@@ -65,7 +65,7 @@ def str_endswith():
     return (a1, a2, a3, a4, a5, a6, a7)
 
 
-class TestExecutor(TestCaseBase):
+class TestString(TestCaseBase):
     def test_string_format(self):
         self.assert_results(string_format, paddle.to_tensor(1))
 
diff --git a/test/sot/test_break_graph.py b/test/sot/test_break_graph.py
@@ -44,7 +44,7 @@ def multi_output(x: paddle.Tensor):
         return 2 * m
 
 
-class TestExecutor(TestCaseBase):
+class TestBreakgraph(TestCaseBase):
     def test_simple(self):
         x = paddle.to_tensor(2)
         self.assert_results(multi_output, x)
diff --git a/test/sot/test_builtin_range.py b/test/sot/test_builtin_range.py
@@ -67,7 +67,7 @@ def test_range_10(stop: int, tensor: paddle.Tensor):
     return tensor
 
 
-class TestExecutor(TestCaseBase):
+class TestRange(TestCaseBase):
     def test_cases(self):
         start = 3
         stop = 10
diff --git a/test/sot/test_builtin_zip.py b/test/sot/test_builtin_zip.py
@@ -76,7 +76,7 @@ def test_zip_8(iter_1, iter_2):
     return sum
 
 
-class TestExecutor(TestCaseBase):
+class TestZip(TestCaseBase):
     def test_simple_cases(self):
         x = 8
         y = 5
diff --git a/test/sot/test_call_object.py b/test/sot/test_call_object.py
@@ -67,7 +67,7 @@ def foo_5(b, x):
     return b.self_call(x, "multi")
 
 
-class TestExecutor(TestCaseBase):
+class TestCallObject(TestCaseBase):
     def test_simple(self):
         c = B(13)
         c.a.multi = patched2
diff --git a/test/sot/test_delete_fast.py b/test/sot/test_delete_fast.py
@@ -28,7 +28,7 @@ def test_delete_fast(a):
     return a
 
 
-class TestExecutor(TestCaseBase):
+class TestDeleteFast(TestCaseBase):
     def test_simple(self):
         a = paddle.to_tensor(1)
         self.assert_results(test_delete_fast, a)
diff --git a/test/sot/test_enumerate.py b/test/sot/test_enumerate.py
@@ -85,7 +85,7 @@ def test_enumerate_10(layer_list, x):
     return sum
 
 
-class TestExecutor(TestCaseBase):
+class TestEnumerate(TestCaseBase):
     def test_cases(self):
         x = 8
         y = 5
diff --git a/test/sot/test_execution_base.py b/test/sot/test_execution_base.py
@@ -33,7 +33,7 @@ def simple(x):
     return ret
 
 
-class TestExecutor(TestCaseBase):
+class TestExecutionBase(TestCaseBase):
     def test_simple(self):
         x = paddle.to_tensor([1.0])
         y = paddle.to_tensor([2.0])
diff --git a/test/sot/test_inplace_api.py b/test/sot/test_inplace_api.py
@@ -86,7 +86,7 @@ def inplace_case_2(x):
     return x
 
 
-class TestExecutor(TestCaseBase):
+class TestInplaceApi(TestCaseBase):
     def test_case(self):
         self.assert_results(inplace_case_0, paddle.randn((1, 4)))
         self.assert_results(inplace_case_1, [paddle.randn((1, 4))])
diff --git a/test/sot/test_segment_linear.py b/test/sot/test_segment_linear.py
@@ -56,7 +56,7 @@ def forward(self, x):
         return logits
 
 
-class TestExecutor(TestCaseBase):
+class TestSegmentLinear(TestCaseBase):
     @strict_mode_guard(False)
     def test_simple(self):
         x = paddle.randn((1, 8, 8))
