Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
34e90574
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2298
Star
20931
Fork
5422
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
34e90574
编写于
8月 11, 2023
作者:
B
Bo Zhang
提交者:
GitHub
8月 11, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add indextype (#56112)
IR 的 builtin dialect 中加入 IndexType
上级
74eb3093
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
68 addition
and
0 deletion
+68
-0
paddle/cinn/utils/attribute_util.h
paddle/cinn/utils/attribute_util.h
+1
-0
paddle/fluid/ir/dialect/utils.h
paddle/fluid/ir/dialect/utils.h
+4
-0
paddle/ir/core/builder.cc
paddle/ir/core/builder.cc
+1
-0
paddle/ir/core/builder.h
paddle/ir/core/builder.h
+2
-0
paddle/ir/core/builtin_dialect.cc
paddle/ir/core/builtin_dialect.cc
+1
-0
paddle/ir/core/builtin_type.cc
paddle/ir/core/builtin_type.cc
+1
-0
paddle/ir/core/builtin_type.h
paddle/ir/core/builtin_type.h
+2
-0
paddle/ir/core/ir_context.cc
paddle/ir/core/ir_context.cc
+4
-0
paddle/ir/core/ir_printer.cc
paddle/ir/core/ir_printer.cc
+2
-0
paddle/ir/core/type.h
paddle/ir/core/type.h
+21
-0
test/cpp/ir/core/ir_builder_test.cc
test/cpp/ir/core/ir_builder_test.cc
+1
-0
test/cpp/ir/core/ir_type_converter_test.cc
test/cpp/ir/core/ir_type_converter_test.cc
+20
-0
test/cpp/ir/core/type_test.cc
test/cpp/ir/core/type_test.cc
+8
-0
未找到文件。
paddle/cinn/utils/attribute_util.h
浏览文件 @
34e90574
...
...
@@ -87,6 +87,7 @@ common::Type ConvertIRType(::ir::Type type) {
CASE_TYPE
(
Int16Type
,
I16
)
CASE_TYPE
(
Int32Type
,
I32
)
CASE_TYPE
(
Int64Type
,
I64
)
CASE_TYPE
(
IndexType
,
I32
)
CASE_TYPE
(
BoolType
,
UI1
)
LOG
(
FATAL
)
<<
"unknown ir::Type "
<<
type
;
...
...
paddle/fluid/ir/dialect/utils.h
浏览文件 @
34e90574
...
...
@@ -66,6 +66,8 @@ static inline phi::DataType TransToPhiDataType(ir::Type dtype) {
return
phi
::
DataType
::
INT32
;
}
else
if
(
dtype
.
isa
<
ir
::
Int64Type
>
())
{
return
phi
::
DataType
::
INT64
;
}
else
if
(
dtype
.
isa
<
ir
::
IndexType
>
())
{
return
phi
::
DataType
::
INT32
;
}
else
if
(
dtype
.
isa
<
ir
::
BoolType
>
())
{
return
phi
::
DataType
::
BOOL
;
}
else
if
(
dtype
.
isa
<
ir
::
Complex64Type
>
())
{
...
...
@@ -79,6 +81,8 @@ static inline phi::DataType TransToPhiDataType(ir::Type dtype) {
}
}
// use phi::DataType::INT32 for IndexType from builtin type to phi::DataType,
// but only use INT32 not IndexType from phi::DataType type to builtin type.
static
inline
ir
::
Type
TransToIrDataType
(
phi
::
DataType
dtype
,
ir
::
IrContext
*
ctx
=
nullptr
)
{
if
(
ctx
==
nullptr
)
{
...
...
paddle/ir/core/builder.cc
浏览文件 @
34e90574
...
...
@@ -49,6 +49,7 @@ BFloat16Type Builder::bfloat16_type() { return BFloat16Type::get(context_); }
Float32Type
Builder
::
float32_type
()
{
return
Float32Type
::
get
(
context_
);
}
Float64Type
Builder
::
float64_type
()
{
return
Float64Type
::
get
(
context_
);
}
IndexType
Builder
::
index_type
()
{
return
IndexType
::
get
(
context_
);
}
Int16Type
Builder
::
int16_type
()
{
return
Int16Type
::
get
(
context_
);
}
BoolType
Builder
::
bool_type
()
{
return
BoolType
::
get
(
context_
);
}
Complex64Type
Builder
::
complex64_type
()
{
return
Complex64Type
::
get
(
context_
);
}
...
...
paddle/ir/core/builder.h
浏览文件 @
34e90574
...
...
@@ -29,6 +29,7 @@ class BFloat16Type;
class
Float32Type
;
class
Float64Type
;
class
Int16Type
;
class
IndexType
;
class
BoolType
;
class
Complex64Type
;
class
Complex128Type
;
...
...
@@ -114,6 +115,7 @@ class Builder {
IR_API
Int8Type
int8_type
();
IR_API
VectorType
vec_type
(
const
std
::
vector
<
Type
>
&
);
IR_API
BFloat16Type
bfloat16_type
();
IR_API
IndexType
index_type
();
IR_API
Float32Type
float32_type
();
IR_API
Float64Type
float64_type
();
IR_API
Int16Type
int16_type
();
...
...
paddle/ir/core/builtin_dialect.cc
浏览文件 @
34e90574
...
...
@@ -34,6 +34,7 @@ void BuiltinDialect::initialize() {
Int16Type
,
Int32Type
,
Int64Type
,
IndexType
,
BoolType
,
Complex64Type
,
Complex128Type
,
...
...
paddle/ir/core/builtin_type.cc
浏览文件 @
34e90574
...
...
@@ -29,6 +29,7 @@ IR_DEFINE_EXPLICIT_TYPE_ID(ir::Float64Type)
IR_DEFINE_EXPLICIT_TYPE_ID
(
ir
::
Int16Type
)
IR_DEFINE_EXPLICIT_TYPE_ID
(
ir
::
Int32Type
)
IR_DEFINE_EXPLICIT_TYPE_ID
(
ir
::
Int64Type
)
IR_DEFINE_EXPLICIT_TYPE_ID
(
ir
::
IndexType
)
IR_DEFINE_EXPLICIT_TYPE_ID
(
ir
::
BoolType
)
IR_DEFINE_EXPLICIT_TYPE_ID
(
ir
::
Complex64Type
)
IR_DEFINE_EXPLICIT_TYPE_ID
(
ir
::
Complex128Type
)
paddle/ir/core/builtin_type.h
浏览文件 @
34e90574
...
...
@@ -73,6 +73,7 @@ class IR_API VectorType : public Type {
__macro(Int16Type); \
__macro(Int32Type); \
__macro(Int64Type); \
__macro(IndexType); \
__macro(BoolType); \
__macro(Complex64Type); \
__macro(Complex128Type);
...
...
@@ -95,5 +96,6 @@ IR_EXPORT_DECLARE_EXPLICIT_TYPE_ID(ir::Int16Type)
IR_EXPORT_DECLARE_EXPLICIT_TYPE_ID
(
ir
::
Int32Type
)
IR_EXPORT_DECLARE_EXPLICIT_TYPE_ID
(
ir
::
Int64Type
)
IR_EXPORT_DECLARE_EXPLICIT_TYPE_ID
(
ir
::
BoolType
)
IR_EXPORT_DECLARE_EXPLICIT_TYPE_ID
(
ir
::
IndexType
)
IR_EXPORT_DECLARE_EXPLICIT_TYPE_ID
(
ir
::
Complex64Type
)
IR_EXPORT_DECLARE_EXPLICIT_TYPE_ID
(
ir
::
Complex128Type
)
paddle/ir/core/ir_context.cc
浏览文件 @
34e90574
...
...
@@ -156,6 +156,7 @@ class IrContextImpl {
Float16Type
fp16_type
;
Float32Type
fp32_type
;
Float64Type
fp64_type
;
IndexType
index_type
;
UInt8Type
uint8_type
;
Int8Type
int8_type
;
Int16Type
int16_type
;
...
...
@@ -203,6 +204,7 @@ IrContext::IrContext() : impl_(new IrContextImpl()) {
impl_
->
int16_type
=
TypeManager
::
get
<
Int16Type
>
(
this
);
impl_
->
int32_type
=
TypeManager
::
get
<
Int32Type
>
(
this
);
impl_
->
int64_type
=
TypeManager
::
get
<
Int64Type
>
(
this
);
impl_
->
index_type
=
TypeManager
::
get
<
IndexType
>
(
this
);
impl_
->
bool_type
=
TypeManager
::
get
<
BoolType
>
(
this
);
impl_
->
complex64_type
=
TypeManager
::
get
<
Complex64Type
>
(
this
);
impl_
->
complex128_type
=
TypeManager
::
get
<
Complex128Type
>
(
this
);
...
...
@@ -343,6 +345,8 @@ Int32Type Int32Type::get(IrContext *ctx) { return ctx->impl().int32_type; }
Int64Type
Int64Type
::
get
(
IrContext
*
ctx
)
{
return
ctx
->
impl
().
int64_type
;
}
IndexType
IndexType
::
get
(
IrContext
*
ctx
)
{
return
ctx
->
impl
().
index_type
;
}
Int8Type
Int8Type
::
get
(
IrContext
*
ctx
)
{
return
ctx
->
impl
().
int8_type
;
}
UInt8Type
UInt8Type
::
get
(
IrContext
*
ctx
)
{
return
ctx
->
impl
().
uint8_type
;
}
...
...
paddle/ir/core/ir_printer.cc
浏览文件 @
34e90574
...
...
@@ -59,6 +59,8 @@ void BasicIrPrinter::PrintType(Type type) {
os
<<
"i32"
;
}
else
if
(
type
.
isa
<
Int64Type
>
())
{
os
<<
"i64"
;
}
else
if
(
type
.
isa
<
IndexType
>
())
{
os
<<
"index"
;
}
else
if
(
type
.
isa
<
Complex64Type
>
())
{
os
<<
"c64"
;
}
else
if
(
type
.
isa
<
Complex128Type
>
())
{
...
...
paddle/ir/core/type.h
浏览文件 @
34e90574
...
...
@@ -97,6 +97,27 @@ IR_API std::ostream &operator<<(std::ostream &os, Type type);
}
// namespace ir
///
/// \brief This class represents the base of a type interface.
///
// template <typename ConcreteType>
// class TypeInterface : public ir::DialectInterface<ConcreteType, Type> {
// public:
// using Base = TypeInterface<ConcreteType>;
// using DialectInterfaceBase = ir::DialectInterface<ConcreteType, Type>;
// using DialectInterfaceBase::Base;
// private:
// /// Returns the impl interface instance for the given type.
// static typename InterfaceBase::Concept *getInterfaceFor(Type type) {
// return type.getAbstractType().getInterface<ConcreteType>();
// }
// /// Allow access to 'getInterfaceFor'.
// friend InterfaceBase;
// };
namespace
std
{
///
/// \brief Enable hashing Type.
...
...
test/cpp/ir/core/ir_builder_test.cc
浏览文件 @
34e90574
...
...
@@ -31,6 +31,7 @@ TEST(builder_test, type_api) {
EXPECT_EQ
(
ir
::
BFloat16Type
::
get
(
&
ctx
),
builder
.
bfloat16_type
());
EXPECT_EQ
(
ir
::
Float32Type
::
get
(
&
ctx
),
builder
.
float32_type
());
EXPECT_EQ
(
ir
::
Float64Type
::
get
(
&
ctx
),
builder
.
float64_type
());
EXPECT_EQ
(
ir
::
IndexType
::
get
(
&
ctx
),
builder
.
index_type
());
EXPECT_EQ
(
ir
::
Int16Type
::
get
(
&
ctx
),
builder
.
int16_type
());
EXPECT_EQ
(
ir
::
BoolType
::
get
(
&
ctx
),
builder
.
bool_type
());
EXPECT_EQ
(
ir
::
Complex64Type
::
get
(
&
ctx
),
builder
.
complex64_type
());
...
...
test/cpp/ir/core/ir_type_converter_test.cc
浏览文件 @
34e90574
...
...
@@ -65,3 +65,23 @@ TEST(TypeConverterTest, paramterless_type) {
ir
::
Complex64Type
,
ir
::
Complex128Type
>
();
}
void
test_index_type
()
{
ir
::
IrContext
*
ctx
=
ir
::
IrContext
::
Instance
();
ctx
->
GetOrRegisterDialect
<
ir
::
BuiltinDialect
>
();
ir
::
Type
type
=
ir
::
IndexType
::
get
(
ctx
);
std
::
stringstream
ss
;
ss
<<
type
;
EXPECT_GT
(
ss
.
str
().
size
(),
0u
);
EXPECT_EQ
(
ss
.
str
(),
"index"
);
EXPECT_NE
(
ss
.
str
(),
"<<NULL TYPE>>"
);
phi
::
DataType
phi_type
=
paddle
::
dialect
::
TransToPhiDataType
(
type
);
auto
&
type_translator
=
paddle
::
translator
::
TypeTranslator
::
instance
();
paddle
::
framework
::
VarDesc
empty_var_desc
(
"empty"
);
auto
proto_type
=
paddle
::
framework
::
TransToProtoVarType
(
phi_type
);
ir
::
Type
final_type
=
type_translator
[
proto_type
](
ctx
,
empty_var_desc
);
EXPECT_EQ
(
paddle
::
dialect
::
TransToIrDataType
(
phi_type
),
final_type
);
}
TEST
(
IndexTypeConverterTest
,
index_type
)
{
test_index_type
();
}
test/cpp/ir/core/type_test.cc
浏览文件 @
34e90574
...
...
@@ -89,6 +89,14 @@ TEST(type_test, built_in_type) {
&
ir
::
AbstractType
::
lookup
(
bfp16_1
.
type_id
(),
ctx
));
EXPECT_EQ
(
ir
::
BFloat16Type
::
classof
(
bfp16_1
),
1
);
ir
::
Type
index_1
=
ir
::
IndexType
::
get
(
ctx
);
ir
::
Type
index_2
=
ir
::
IndexType
::
get
(
ctx
);
EXPECT_EQ
(
index_1
,
index_2
);
EXPECT_EQ
(
index_1
.
type_id
(),
index_2
.
type_id
());
EXPECT_EQ
(
&
index_1
.
abstract_type
(),
&
ir
::
AbstractType
::
lookup
(
index_1
.
type_id
(),
ctx
));
EXPECT_EQ
(
ir
::
IndexType
::
classof
(
index_1
),
1
);
ir
::
Type
fp16_1
=
ir
::
Float16Type
::
get
(
ctx
);
ir
::
Type
fp16_2
=
ir
::
Float16Type
::
get
(
ctx
);
EXPECT_EQ
(
fp16_1
,
fp16_2
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录