fix min max bug (#72267)

liuruyan · web-flow · commit 57f8c36e9fd4 · 2025-04-16T11:13:58.000+08:00
diff --git a/paddle/cinn/ir/ir_base.cc b/paddle/cinn/ir/ir_base.cc
@@ -734,6 +734,9 @@ void ElevateInt64ToInt32_(Expr &expr) {  // NOLINT
                             "Current only support convert int64_t "
                             "to int32_t, but get type is: %s",
                             expr->type()));
+
+  // althoughtype is Int(32), we also need to convert it indices to Int(32).
+  if (expr->node_type() == IrNodeTy::Load) expr->convert_int64_to_int32();
   if (expr->type() == Int(64)) {
     expr->convert_int64_to_int32();
     if (expr->node_type() == IrNodeTy::Cast) {
diff --git a/paddle/cinn/optim/longlong2int_pass.cc b/paddle/cinn/optim/longlong2int_pass.cc
@@ -138,25 +138,28 @@ class CastLonglong2IntMutator : public ir::IRMutator<> {
   }
   void Visit(const ir::Min* op, Expr* expr) override {
     auto node = expr->As<ir::Min>();
-    if (node->a().is_index() && node->b().is_index()) {
-      if ((node->a().is_var() && node->a().as_var()->is_symbolic_constant) ||
-          (node->b().is_var() && node->b().as_var()->is_symbolic_constant)) {
-        ir::ElevateInt64ToInt32_((*expr)->operands);
-      }
+    // min(min(S0, 1ll), 1ll) ==> min(min(S0, 1), 1)
+    // min(V[S0, S1], 1ll)    ==> min(V[S0, S1], 1ll)
+    // min(S0 + 1ll, 1ll)     ==> max(S0 + 1, 1)
+    // IndexType::kValid means expr only has +-*/%, Const, Symbol, Min, Max.
+    // IsDynamic == true means expr has Symbol.
+    if (optim::VerifyIndex(*expr) == ir::IndexExpr::IndexType::kValid &&
+        expr->as_index().IsDynamic()) {
+      ir::ElevateInt64ToInt32_((*expr)->operands);
+    } else {
+      ir::IRMutator<>::Visit(&node->a(), &node->a());
+      ir::IRMutator<>::Visit(&node->b(), &node->b());
     }
-    ir::IRMutator<>::Visit(&node->a(), &node->a());
-    ir::IRMutator<>::Visit(&node->b(), &node->b());
   }
   void Visit(const ir::Max* op, Expr* expr) override {
     auto node = expr->As<ir::Max>();
-    if (node->a().is_index() && node->b().is_index()) {
-      if ((node->a().is_var() && node->a().as_var()->is_symbolic_constant) ||
-          (node->b().is_var() && node->b().as_var()->is_symbolic_constant)) {
-        ir::ElevateInt64ToInt32_((*expr)->operands);
-      }
+    if (optim::VerifyIndex(*expr) == ir::IndexExpr::IndexType::kValid &&
+        expr->as_index().IsDynamic()) {
+      ir::ElevateInt64ToInt32_((*expr)->operands);
+    } else {
+      ir::IRMutator<>::Visit(&node->a(), &node->a());
+      ir::IRMutator<>::Visit(&node->b(), &node->b());
     }
-    ir::IRMutator<>::Visit(&node->a(), &node->a());
-    ir::IRMutator<>::Visit(&node->b(), &node->b());
   }
 };
 
diff --git a/test/dygraph_to_static/test_word2vec.py b/test/dygraph_to_static/test_word2vec.py
@@ -20,7 +20,6 @@
 from dygraph_to_static_utils import (
     Dy2StTestBase,
     enable_to_static_guard,
-    test_phi_only,
 )
 
 import paddle
@@ -318,7 +317,6 @@ def train():
 
 
 class TestWord2Vec(Dy2StTestBase):
-    @test_phi_only
     def test_dygraph_static_same_loss(self):
         with enable_to_static_guard(False):
             dygraph_loss = train()
