From 454f08dece61d1fc830cdd3a60d85b7c53bdd914 Mon Sep 17 00:00:00 2001 From: ooo oo <106524776+ooooo-create@users.noreply.github.com> Date: Sat, 25 Jan 2025 09:13:57 +0000 Subject: [PATCH 1/2] Refine SetSymbolForValueByStaticShape Warning --- .../src/dialect/shape/transforms/shape_optimization_pass.cc | 3 +++ paddle/pir/src/dialect/shape/utils/shape_analysis.cc | 3 +++ 2 files changed, 6 insertions(+) diff --git a/paddle/pir/src/dialect/shape/transforms/shape_optimization_pass.cc b/paddle/pir/src/dialect/shape/transforms/shape_optimization_pass.cc index 0d4ec7676c058..2790236343a2e 100644 --- a/paddle/pir/src/dialect/shape/transforms/shape_optimization_pass.cc +++ b/paddle/pir/src/dialect/shape/transforms/shape_optimization_pass.cc @@ -315,6 +315,9 @@ void InferSymExprForOp(Operation* op, << "[id:" << op->id() << "], op_infer_cache_key is :" << op_infer_cache_key; for (uint32_t i = 0; i < op->num_results(); ++i) { + if (!op->result(i) || !op->result(i).type()) { + continue; + } infer_context->SetSymbolForValueByStaticShape(op->result(i)); } } diff --git a/paddle/pir/src/dialect/shape/utils/shape_analysis.cc b/paddle/pir/src/dialect/shape/utils/shape_analysis.cc index 39a1c4f6694a5..363761b8229e0 100644 --- a/paddle/pir/src/dialect/shape/utils/shape_analysis.cc +++ b/paddle/pir/src/dialect/shape/utils/shape_analysis.cc @@ -146,6 +146,9 @@ void InferSymbolicShapeContext::SetSymbolForValueByStaticShape(Value val) { return; } if (!IsStaticShape(val)) { + if (val.isa()) { + continue; + } LOG(WARNING) << "Risk on SetSymbolForValueByStaticShape for contain_unknown_dim"; } From 40260d6c37a659cac1595fda0436aa062b200fed Mon Sep 17 00:00:00 2001 From: ooo oo <106524776+ooooo-create@users.noreply.github.com> Date: Sat, 25 Jan 2025 10:02:40 +0000 Subject: [PATCH 2/2] refine --- paddle/pir/src/dialect/shape/utils/shape_analysis.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/paddle/pir/src/dialect/shape/utils/shape_analysis.cc b/paddle/pir/src/dialect/shape/utils/shape_analysis.cc index 363761b8229e0..ddb71317cb5cc 100644 --- a/paddle/pir/src/dialect/shape/utils/shape_analysis.cc +++ b/paddle/pir/src/dialect/shape/utils/shape_analysis.cc @@ -145,10 +145,7 @@ void InferSymbolicShapeContext::SetSymbolForValueByStaticShape(Value val) { LOG(WARNING) << "Risk on SetSymbolForValueByStaticShape for null value"; return; } - if (!IsStaticShape(val)) { - if (val.isa()) { - continue; - } + if (!IsStaticShape(val) && !val.isa()) { LOG(WARNING) << "Risk on SetSymbolForValueByStaticShape for contain_unknown_dim"; }