PaddlePaddle
diff --git a/‎paddle/fluid/pir/dialect/operator/interface/infermeta.h
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎paddle/fluid/pir/dialect/operator/interface/infermeta.h
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎paddle/fluid/pir/dialect/operator/ir/op_attribute.cc
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions b/‎paddle/fluid/pir/dialect/operator/ir/op_attribute.cc
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎paddle/fluid/pir/dialect/operator/ir/op_attribute.h
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎paddle/fluid/pir/dialect/operator/ir/op_attribute.h
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎paddle/fluid/pir/transforms/inplace_pass.cc
Copy file name to clipboard
+13-13Lines changed: 13 additions & 13 deletions b/‎paddle/fluid/pir/transforms/inplace_pass.cc
Copy file name to clipboard
+13-13Lines changed: 13 additions & 13 deletions
diff --git a/‎paddle/pir/core/builder.cc
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions b/‎paddle/pir/core/builder.cc
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions
diff --git a/‎paddle/pir/core/builder.h
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions b/‎paddle/pir/core/builder.h
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎paddle/pir/core/builtin_attribute.cc
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions b/‎paddle/pir/core/builtin_attribute.cc
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions
diff --git a/‎paddle/pir/core/builtin_attribute.h
Copy file name to clipboard
+10Lines changed: 10 additions & 0 deletions b/‎paddle/pir/core/builtin_attribute.h
Copy file name to clipboard
+10Lines changed: 10 additions & 0 deletions
diff --git a/‎paddle/pir/core/builtin_attribute_storage.h
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎paddle/pir/core/builtin_attribute_storage.h
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎paddle/pir/core/builtin_dialect.cc
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎paddle/pir/core/builtin_dialect.cc
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 #pragma once
 
 #include "paddle/phi/core/infermeta_utils.h"
 
@@ -35,6 +35,8 @@ phi::Scalar ScalarAttribute::data() {
     return phi::Scalar(dyn_cast<pir::DoubleAttribute>().data());
   } else if (isa<pir::Int32Attribute>()) {
     return phi::Scalar(dyn_cast<pir::Int32Attribute>().data());
+  } else if (isa<pir::IndexAttribute>()) {
+    return phi::Scalar(dyn_cast<pir::IndexAttribute>().data());
   } else if (isa<pir::Int64Attribute>()) {
     return phi::Scalar(dyn_cast<pir::Int64Attribute>().data());
   } else if (isa<pir::BoolAttribute>()) {
 
@@ -48,6 +48,7 @@ class ScalarAttribute : public pir::Attribute {
            (val.type_id() == pir::FloatAttribute::type_id()) ||
            (val.type_id() == pir::DoubleAttribute::type_id()) ||
            (val.type_id() == pir::Int32Attribute::type_id()) ||
+           (val.type_id() == pir::IndexAttribute::type_id()) ||
            (val.type_id() == pir::Int64Attribute::type_id()) ||
            (val.type_id() == pir::StrAttribute::type_id());
   }
 
@@ -153,8 +153,8 @@ static void GetEagerDelValueOfOp(
       (*del_value_2_op)[input] = op;
     }
 
-    for (size_t i = 0; i < op->num_results(); ++i) {
-      pir::Value output = op->result(i);
+    for (auto& result : op->results()) {
+      pir::Value output = result;
       if (output && CanBeDeleted(output)) {
         (*del_value_2_op)[output] = op;
       }
@@ -206,8 +206,8 @@ static std::unordered_map<pir::Operation*, std::string> GetInplaceOps(
       VLOG(6) << op->name()
               << "is not a kernel_dialect op, inplace only support "
                  "kernel_dialect operators";
-      for (size_t i = 0; i < op->num_results(); ++i) {
-        visited_values.insert(op->result(i));
+      for (auto& result : op->results()) {
+        visited_values.insert(result);
       }
       continue;
     }
@@ -226,8 +226,8 @@ static std::unordered_map<pir::Operation*, std::string> GetInplaceOps(
              .dyn_cast<paddle::dialect::KernelAttribute>()
              .data()
              .backend() == phi::Backend::CPU)) {
-      for (size_t i = 0; i < op->num_results(); ++i) {
-        visited_values.insert(op->result(i));
+      for (auto& result : op->results()) {
+        visited_values.insert(result);
       }
       continue;
     }
@@ -238,9 +238,9 @@ static std::unordered_map<pir::Operation*, std::string> GetInplaceOps(
       for (size_t i = 0; i < op->num_operands(); ++i) {
         reused_input_values.insert(op->operand_source(i));
       }
-      for (size_t i = 0; i < op->num_results(); ++i) {
-        reused_output_values.insert(op->result(i));
-        visited_values.insert(op->result(i));
+      for (auto& result : op->results()) {
+        reused_output_values.insert(result);
+        visited_values.insert(result);
       }
       continue;
     }
@@ -252,8 +252,8 @@ static std::unordered_map<pir::Operation*, std::string> GetInplaceOps(
       VLOG(6) << upper_op_name
               << "'s value can't delete or doesn't have inplace op, so that "
                  "can't do inplace.";
-      for (size_t i = 0; i < op->num_results(); ++i) {
-        visited_values.insert(op->result(i));
+      for (auto& result : op->results()) {
+        visited_values.insert(result);
       }
       continue;
     }
@@ -310,8 +310,8 @@ static std::unordered_map<pir::Operation*, std::string> GetInplaceOps(
               << " will change to inplace version op: " << upper_op_name + "_";
     }
 
-    for (size_t i = 0; i < op->num_results(); ++i) {
-      visited_values.insert(op->result(i));
+    for (auto& result : op->results()) {
+      visited_values.insert(result);
     }
   }
   return inplace_ops;
 
@@ -73,6 +73,9 @@ DoubleAttribute Builder::double_attr(double value) {
 Int32Attribute Builder::int32_attr(int32_t value) {
   return Int32Attribute::get(context_, value);
 }
+IndexAttribute Builder::index_attr(int64_t value) {
+  return IndexAttribute::get(context_, value);
+}
 Int64Attribute Builder::int64_attr(int64_t value) {
   return Int64Attribute::get(context_, value);
 }
 
@@ -39,6 +39,7 @@ class BoolAttribute;
 class FloatAttribute;
 class DoubleAttribute;
 class Int32Attribute;
+class IndexAttribute;
 class Int64Attribute;
 class ArrayAttribute;
 class PointerAttribute;
@@ -131,6 +132,7 @@ class Builder {
   IR_API FloatAttribute float_attr(float value);
   IR_API DoubleAttribute double_attr(double value);
   IR_API Int32Attribute int32_attr(int32_t value);
+  IR_API IndexAttribute index_attr(int64_t value);
   IR_API Int64Attribute int64_attr(int64_t value);
   IR_API ArrayAttribute array_attr(const std::vector<Attribute> &value);
   IR_API PointerAttribute pointer_attr(void *value);
 
@@ -24,6 +24,8 @@ double DoubleAttribute::data() const { return storage()->data(); }
 
 int32_t Int32Attribute::data() const { return storage()->data(); }
 
+int64_t IndexAttribute::data() const { return storage()->data(); }
+
 int64_t Int64Attribute::data() const { return storage()->data(); }
 
 void* PointerAttribute::data() const { return storage()->data(); }
@@ -86,6 +88,7 @@ IR_DEFINE_EXPLICIT_TYPE_ID(pir::BoolAttribute)
 IR_DEFINE_EXPLICIT_TYPE_ID(pir::FloatAttribute)
 IR_DEFINE_EXPLICIT_TYPE_ID(pir::DoubleAttribute)
 IR_DEFINE_EXPLICIT_TYPE_ID(pir::Int32Attribute)
+IR_DEFINE_EXPLICIT_TYPE_ID(pir::IndexAttribute)
 IR_DEFINE_EXPLICIT_TYPE_ID(pir::Int64Attribute)
 IR_DEFINE_EXPLICIT_TYPE_ID(pir::ArrayAttribute)
 IR_DEFINE_EXPLICIT_TYPE_ID(pir::PointerAttribute)
 
@@ -55,6 +55,15 @@ class IR_API Int32Attribute : public Attribute {
   int32_t data() const;
 };
 
+class IR_API IndexAttribute : public Attribute {
+ public:
+  using Attribute::Attribute;
+
+  DECLARE_ATTRIBUTE_UTILITY_FUNCTOR(IndexAttribute, IndexAttributeStorage);
+
+  int64_t data() const;
+};
+
 class IR_API Int64Attribute : public Attribute {
  public:
   using Attribute::Attribute;
@@ -123,6 +132,7 @@ IR_EXPORT_DECLARE_EXPLICIT_TYPE_ID(pir::FloatAttribute)
 IR_EXPORT_DECLARE_EXPLICIT_TYPE_ID(pir::DoubleAttribute)
 IR_EXPORT_DECLARE_EXPLICIT_TYPE_ID(pir::Int32Attribute)
 IR_EXPORT_DECLARE_EXPLICIT_TYPE_ID(pir::Int64Attribute)
+IR_EXPORT_DECLARE_EXPLICIT_TYPE_ID(pir::IndexAttribute)
 IR_EXPORT_DECLARE_EXPLICIT_TYPE_ID(pir::ArrayAttribute)
 IR_EXPORT_DECLARE_EXPLICIT_TYPE_ID(pir::PointerAttribute)
 IR_EXPORT_DECLARE_EXPLICIT_TYPE_ID(pir::TypeAttribute)
@@ -52,6 +52,7 @@ DECLARE_BASE_TYPE_ATTRIBUTE_STORAGE(BoolAttributeStorage, bool);
 DECLARE_BASE_TYPE_ATTRIBUTE_STORAGE(FloatAttributeStorage, float);
 DECLARE_BASE_TYPE_ATTRIBUTE_STORAGE(DoubleAttributeStorage, double);
 DECLARE_BASE_TYPE_ATTRIBUTE_STORAGE(Int32AttributeStorage, int32_t);
+DECLARE_BASE_TYPE_ATTRIBUTE_STORAGE(IndexAttributeStorage, int64_t);
 DECLARE_BASE_TYPE_ATTRIBUTE_STORAGE(Int64AttributeStorage, int64_t);
 DECLARE_BASE_TYPE_ATTRIBUTE_STORAGE(PointerAttributeStorage, void *);
 DECLARE_BASE_TYPE_ATTRIBUTE_STORAGE(TypeAttributeStorage, Type);
 
@@ -46,6 +46,7 @@ void BuiltinDialect::initialize() {
                      DoubleAttribute,
                      PointerAttribute,
                      Int32Attribute,
+                     IndexAttribute,
                      Int64Attribute,
                      ArrayAttribute,
                      TypeAttribute>();
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ class ScalarAttribute : public pir::Attribute {`
`48`	`48`	`(val.type_id() == pir::FloatAttribute::type_id()) \|\|`
`49`	`49`	`(val.type_id() == pir::DoubleAttribute::type_id()) \|\|`
`50`	`50`	`(val.type_id() == pir::Int32Attribute::type_id()) \|\|`
	`51`	`+ (val.type_id() == pir::IndexAttribute::type_id()) \|\|`
`51`	`52`	`(val.type_id() == pir::Int64Attribute::type_id()) \|\|`
`52`	`53`	`(val.type_id() == pir::StrAttribute::type_id());`
`53`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -153,8 +153,8 @@ static void GetEagerDelValueOfOp(`
`153`	`153`	`(*del_value_2_op)[input] = op;`
`154`	`154`	`}`
`155`	`155`
`156`		`- for (size_t i = 0; i < op->num_results(); ++i) {`
`157`		`- pir::Value output = op->result(i);`
	`156`	`+ for (auto& result : op->results()) {`
	`157`	`+ pir::Value output = result;`
`158`	`158`	`if (output && CanBeDeleted(output)) {`
`159`	`159`	`(*del_value_2_op)[output] = op;`
`160`	`160`	`}`
`@@ -206,8 +206,8 @@ static std::unordered_map<pir::Operation*, std::string> GetInplaceOps(`
`206`	`206`	`VLOG(6) << op->name()`
`207`	`207`	`<< "is not a kernel_dialect op, inplace only support "`
`208`	`208`	`"kernel_dialect operators";`
`209`		`- for (size_t i = 0; i < op->num_results(); ++i) {`
`210`		`- visited_values.insert(op->result(i));`
	`209`	`+ for (auto& result : op->results()) {`
	`210`	`+ visited_values.insert(result);`
`211`	`211`	`}`
`212`	`212`	`continue;`
`213`	`213`	`}`
`@@ -226,8 +226,8 @@ static std::unordered_map<pir::Operation*, std::string> GetInplaceOps(`
`226`	`226`	`.dyn_cast<paddle::dialect::KernelAttribute>()`
`227`	`227`	`.data()`
`228`	`228`	`.backend() == phi::Backend::CPU)) {`
`229`		`- for (size_t i = 0; i < op->num_results(); ++i) {`
`230`		`- visited_values.insert(op->result(i));`
	`229`	`+ for (auto& result : op->results()) {`
	`230`	`+ visited_values.insert(result);`
`231`	`231`	`}`
`232`	`232`	`continue;`
`233`	`233`	`}`
`@@ -238,9 +238,9 @@ static std::unordered_map<pir::Operation*, std::string> GetInplaceOps(`
`238`	`238`	`for (size_t i = 0; i < op->num_operands(); ++i) {`
`239`	`239`	`reused_input_values.insert(op->operand_source(i));`
`240`	`240`	`}`
`241`		`- for (size_t i = 0; i < op->num_results(); ++i) {`
`242`		`- reused_output_values.insert(op->result(i));`
`243`		`- visited_values.insert(op->result(i));`
	`241`	`+ for (auto& result : op->results()) {`
	`242`	`+ reused_output_values.insert(result);`
	`243`	`+ visited_values.insert(result);`
`244`	`244`	`}`
`245`	`245`	`continue;`
`246`	`246`	`}`
`@@ -252,8 +252,8 @@ static std::unordered_map<pir::Operation*, std::string> GetInplaceOps(`
`252`	`252`	`VLOG(6) << upper_op_name`
`253`	`253`	`<< "'s value can't delete or doesn't have inplace op, so that "`
`254`	`254`	`"can't do inplace.";`
`255`		`- for (size_t i = 0; i < op->num_results(); ++i) {`
`256`		`- visited_values.insert(op->result(i));`
	`255`	`+ for (auto& result : op->results()) {`
	`256`	`+ visited_values.insert(result);`
`257`	`257`	`}`
`258`	`258`	`continue;`
`259`	`259`	`}`
`@@ -310,8 +310,8 @@ static std::unordered_map<pir::Operation*, std::string> GetInplaceOps(`
`310`	`310`	`<< " will change to inplace version op: " << upper_op_name + "_";`
`311`	`311`	`}`
`312`	`312`
`313`		`- for (size_t i = 0; i < op->num_results(); ++i) {`
`314`		`- visited_values.insert(op->result(i));`
	`313`	`+ for (auto& result : op->results()) {`
	`314`	`+ visited_values.insert(result);`
`315`	`315`	`}`
`316`	`316`	`}`
`317`	`317`	`return inplace_ops;`
Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,9 @@ DoubleAttribute Builder::double_attr(double value) {`
`73`	`73`	`Int32Attribute Builder::int32_attr(int32_t value) {`
`74`	`74`	`return Int32Attribute::get(context_, value);`
`75`	`75`	`}`
	`76`	`+IndexAttribute Builder::index_attr(int64_t value) {`
	`77`	`+ return IndexAttribute::get(context_, value);`
	`78`	`+}`
`76`	`79`	`Int64Attribute Builder::int64_attr(int64_t value) {`
`77`	`80`	`return Int64Attribute::get(context_, value);`
`78`	`81`	`}`