[IR] Type system stage2: add class Type, type uniquer utils, class IRContext #50412

zhangbo9674 · 2023-02-10T07:33:39Z

PR types

New features

PR changes

APIs

Describe

Paddle 类型系统开发主要分为4个阶段：（1）Type基础数据结构开发（PR1）、（2）Type类型生成工具开发（本PR）、（3）IRContext（本PR）、Dialect数据结构开发、（4）内置类型开发。

1. PR 主要内容：

type.h：定义 class Type，作为用户使用的唯一接口，是所有内置类型/自定义类型的基类；
ir_context.h：定义 class IrContext，全局单例类，用于管理/缓存已经注册的所有 Type，通过哈希表对AbstractType和TypeStorage进行管理：
- AbstractType：unordered_map<TypeId, AbstractType *> registed_abstract_types_;
- TypeStorage：StorageManager registed_storage_manager_;
storage_manager.h：定义 class StorageManager，由 IrContext 持有，通过哈希表对TypeStorage进行管理：
- 无参类型缓存：unordered_map<TypeId, StorageBase *> parameterless_instances_;
- 有参类型缓存：unordered_map<TypeId, unique_ptr> parametric_instance_;
type_base.h：
- 定义 TypeManager 工具类，提供 get/RegisterType 方法，用于向 IrContext 中获取、注册类型；
- 定义 2个工具宏：DECLARE_TYPE_UTILITY_FUNCTOR、REGISTER_TYPE_2_IRCONTEXT，用于 Type 的定义及注册；
builtin_type.h：构建内置类型 Float32Type、Int32Type，并注册进 IrContext。

2. Todo：

按需丰富 Type 接口：如 is_a、dyn_cast 等
Dialect 支持（第3阶段）
更多内置类型的定义、注册（第4阶段）

paddle-bot · 2023-02-10T07:33:44Z

你的PR提交成功，感谢你对开源项目的贡献!
请关注后续CI自动化测试结果，详情请参考Paddle-CI手册。
Your PR has been submitted. Thanks for your contribution!
Please wait for the result of CI firstly. See Paddle CI Manual for details.

winter-wang

当前paddle的单测文件好像是以test_打头或者以_tester结尾，建议保持一致。

winter-wang · 2023-02-21T06:48:22Z

paddle/ir/ir_context.h

+  /// \return Global parameterless for IrContext.
+  ///
+  static IrContext *Instance() {
+    VLOG(4) << "=> Instance called with context (ir_context_ == " << ir_context_


ir_context这儿多线程是不是有风险？

好的，我完善一下

winter-wang · 2023-02-21T06:50:46Z

paddle/ir/type_base.h

+  ///
+  template <typename T>
+  static void RegisterType(IrContext *ctx) {
+    RegisterType<T>(ctx, T::type_id());  // class Type需要提供type_id接口


这个直接调用 TypeID::get()不可以吗？

… dev/Type_system2

winter-wang

LGTM

zhiqiu · 2023-02-22T13:23:32Z

paddle/ir/type_base.h

+  template <typename T>                                                    \
+  static bool classof(T val) {                                             \
+    return val.type_id() == type_id();                                     \
+  }                                                                        \


add blank line here

zhiqiu · 2023-02-22T13:26:42Z

paddle/ir/builtin_type.h

+
+  DECLARE_TYPE_UTILITY_FUNCTOR(Float32Type, ir::TypeStorage);
+
+  static Float32Type get(ir::IrContext *context);


I think this line can move into macro DECLARE_TYPE_UTILITY_FUNCTOR? and same for the first line?

DECLARE_TYPE_UTILITY_FUNCTOR中已经提供了默认的get方法
template <typename... Args> static concrete_type get(ir::IrContext *ctx, Args... args) { return ir::TypeManager::template get<concrete_type>(ctx, args...); }
这里是针对内置类型，重载了一个get方法，直接从IrContext的缓存中获取，而上述宏定义中默认的get方法是通过TypeManager获取的

zhiqiu · 2023-02-22T13:28:18Z

paddle/ir/CMakeLists.txt

+
+file(GLOB IR_SRCS "*.cc")
+
+file(GLOB IR_TEST_SRCS "*_test.cc")


Better move all tests into paddle/ir/tests

zhiqiu · 2023-02-22T13:31:39Z

paddle/ir/type.h

+///
+class Type {
+ public:
+  using StorageType = TypeStorage;


Why rename it?

为了统一有参类型的Storage(TypeStorage的派生)和无参类型Storage(TypeStorage)的名字，如果都使用TypeStorage，可能会误导认为是无参类型

zhiqiu · 2023-02-22T13:36:05Z

paddle/ir/type_base.h

+    abstract_type_ = const_cast<AbstractType *>(&abstract_type);
+  }
+
+  AbstractType *abstract_type_{nullptr};


It could be marked as not owned?

zhiqiu

LGTM

XiaoguangHu01

LGTM

add TypeUniquer and IrContext

0780205

zhangbo9674 added 5 commits February 10, 2023 08:31

refine include code

819ed91

add Type, TypeBase

e233603

add built-in type

40e8a6d

add bulit-in Float32Type

4cdcc24

refine ut

f5cb63d

zhangbo9674 changed the title ~~[IR] Type system stage2: add class Type, class TypeUniquer, class IRContext~~ [IR] Type system stage2: add class Type, type uniquer utils, class IRContext Feb 14, 2023

zhangbo9674 added 13 commits February 15, 2023 11:26

refine code

4fe071a

refine code

23d22af

delete type_base

cc75738

rename ImplType to StorageType

7709d43

rename ImplType to StorageType

afd9c26

add macros util for register type

5697c4d

add macros util for register type

9df0868

refine name

571cec1

refine name

41268aa

change storage manager

d3acb79

add multi_thread for ir_ctx

4900064

rwlock_2_spinlock, add REGISTER_TYPE_2_IRCONTEXT

39d69cf

DECLARE_TYPE_UTILITY_FUNCTOR

4736b46

winter-wang reviewed Feb 21, 2023

View reviewed changes

zhangbo9674 added 6 commits February 21, 2023 10:53

refine ircontext singleton

183e3a1

del destructor for ParametricStorageManager

96cd329

refine code

73efa45

Add necessary logs for debugging

89c953f

Merge branch 'develop' of /~https://github.com/PaddlePaddle/Paddle into…

c4b5e71

… dev/Type_system2

refine ir_context instance

5451cba

winter-wang previously approved these changes Feb 22, 2023

View reviewed changes

refine type get interface

c7cf04f

zhangbo9674 dismissed winter-wang’s stale review via c7cf04f February 22, 2023 03:30

zhiqiu reviewed Feb 23, 2023

View reviewed changes

refine code by comment

85f3cd4

zhiqiu approved these changes Feb 23, 2023

View reviewed changes

XiaoguangHu01 approved these changes Feb 27, 2023

View reviewed changes

zhangbo9674 merged commit a5827f0 into PaddlePaddle:develop Feb 27, 2023

This was referenced Feb 27, 2023

[IR] Type system stage3: add class Dialect #50959

Merged

[IR] Type system stage4: Add some built-in types and type conversion methods #51112

Merged

zhangbo9674 mentioned this pull request Mar 14, 2023

[IR] Attribute system #51636

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[IR] Type system stage2: add class Type, type uniquer utils, class IRContext #50412

[IR] Type system stage2: add class Type, type uniquer utils, class IRContext #50412

zhangbo9674 commented Feb 10, 2023 •

edited

Loading

paddle-bot bot commented Feb 10, 2023

winter-wang left a comment

winter-wang Feb 21, 2023

zhangbo9674 Feb 21, 2023

winter-wang Feb 21, 2023

zhangbo9674 Feb 21, 2023

winter-wang left a comment

zhiqiu Feb 22, 2023

zhangbo9674 Feb 23, 2023

zhiqiu Feb 22, 2023

zhangbo9674 Feb 23, 2023 •

edited

Loading

zhiqiu Feb 22, 2023

zhangbo9674 Feb 23, 2023

zhiqiu Feb 22, 2023

zhangbo9674 Feb 23, 2023

zhiqiu Feb 22, 2023

zhangbo9674 Feb 23, 2023

zhiqiu left a comment

XiaoguangHu01 left a comment


		DECLARE_TYPE_UTILITY_FUNCTOR(Float32Type, ir::TypeStorage);

		static Float32Type get(ir::IrContext *context);


		file(GLOB IR_SRCS "*.cc")

		file(GLOB IR_TEST_SRCS "*_test.cc")

[IR] Type system stage2: add class Type, type uniquer utils, class IRContext #50412

[IR] Type system stage2: add class Type, type uniquer utils, class IRContext #50412

Conversation

zhangbo9674 commented Feb 10, 2023 • edited Loading

PR types

PR changes

Describe

1. PR 主要内容：

2. Todo：

paddle-bot bot commented Feb 10, 2023

winter-wang left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

winter-wang left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zhangbo9674 Feb 23, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zhiqiu left a comment

Choose a reason for hiding this comment

XiaoguangHu01 left a comment

Choose a reason for hiding this comment

zhangbo9674 commented Feb 10, 2023 •

edited

Loading

zhangbo9674 Feb 23, 2023 •

edited

Loading