Skip to content

Refactor internal switch cases #9802

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 15, 2025
Merged

Refactor internal switch cases #9802

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
186 changes: 72 additions & 114 deletions runtime/core/exec_aten/util/scalar_type_util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -921,55 +921,7 @@ struct promote_types {
} \
}()

#define ET_INTERNAL_SWITCH_CASE_ALL_TYPES(CTYPE_ALIAS, ...) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::Byte, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::Char, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::Short, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::Int, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::Long, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::Half, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::Float, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::Double, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::ComplexHalf, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::ComplexFloat, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::ComplexDouble, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::Bool, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::QInt8, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::QUInt8, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::QInt32, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::BFloat16, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::QUInt4x2, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::QUInt2x4, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::Bits1x8, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::Bits2x4, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::Bits4x2, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::Bits8, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::Bits16, CTYPE_ALIAS, __VA_ARGS__)

#define ET_INTERNAL_SWITCH_CASE_REAL_TYPES(CTYPE_ALIAS, ...) \
#define ET_INTERNAL_SWITCH_CASE_INT_TYPES(CTYPE_ALIAS, ...) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::Byte, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
Expand All @@ -979,12 +931,73 @@ struct promote_types {
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::Int, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::Long, CTYPE_ALIAS, __VA_ARGS__) \
::executorch::aten::ScalarType::Long, CTYPE_ALIAS, __VA_ARGS__)

#define ET_INTERNAL_SWITCH_CASE_UINT_TYPES(CTYPE_ALIAS, ...) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::UInt16, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::UInt32, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::UInt64, CTYPE_ALIAS, __VA_ARGS__)

#define ET_INTERNAL_SWITCH_CASE_FLOAT_TYPES(CTYPE_ALIAS, ...) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::Float, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::Double, CTYPE_ALIAS, __VA_ARGS__)

#define ET_INTERNAL_SWITCH_CASE_REAL_TYPES(CTYPE_ALIAS, ...) \
ET_INTERNAL_SWITCH_CASE_INT_TYPES(CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE_FLOAT_TYPES(CTYPE_ALIAS, __VA_ARGS__)

#define ET_INTERNAL_SWITCH_CASE_COMPLEX_TYPES(CTYPE_ALIAS, ...) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::ComplexFloat, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::ComplexDouble, CTYPE_ALIAS, __VA_ARGS__)

#define ET_INTERNAL_SWITCH_CASE_COMPLEXH_TYPES(CTYPE_ALIAS, ...) \
ET_INTERNAL_SWITCH_CASE_COMPLEX_TYPES(CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::ComplexHalf, CTYPE_ALIAS, __VA_ARGS__)

#define ET_INTERNAL_SWITCH_CASE_QINT_TYPES(CTYPE_ALIAS, ...) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::QInt8, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::QUInt8, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::QInt32, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::QUInt4x2, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::QUInt2x4, CTYPE_ALIAS, __VA_ARGS__)

#define ET_INTERNAL_SWITCH_CASE_BITS_TYPES(CTYPE_ALIAS, ...) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::Bits1x8, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::Bits2x4, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::Bits4x2, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::Bits8, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::Bits16, CTYPE_ALIAS, __VA_ARGS__)

#define ET_INTERNAL_SWITCH_CASE_ALL_TYPES(CTYPE_ALIAS, ...) \
ET_INTERNAL_SWITCH_CASE_REAL_TYPES(CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::Half, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::BFloat16, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::Bool, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE_COMPLEXH_TYPES(CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE_QINT_TYPES(CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE_BITS_TYPES(CTYPE_ALIAS, __VA_ARGS__)

#define ET_INTERNAL_SWITCH_CASE_REAL_TYPES_AND(ADDITIONAL, CTYPE_ALIAS, ...) \
ET_INTERNAL_SWITCH_CASE_REAL_TYPES(CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
Expand All @@ -1008,29 +1021,11 @@ struct promote_types {
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::ADDITIONAL3, CTYPE_ALIAS, __VA_ARGS__)

#define ET_INTERNAL_SWITCH_CASE_INT_TYPES(CTYPE_ALIAS, ...) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::Byte, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::Char, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::Short, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::Int, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::Long, CTYPE_ALIAS, __VA_ARGS__)

#define ET_INTERNAL_SWITCH_CASE_INT_TYPES_AND(ADDITIONAL, CTYPE_ALIAS, ...) \
ET_INTERNAL_SWITCH_CASE_INT_TYPES(CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::ADDITIONAL, CTYPE_ALIAS, __VA_ARGS__)

#define ET_INTERNAL_SWITCH_CASE_FLOAT_TYPES(CTYPE_ALIAS, ...) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::Double, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::Float, CTYPE_ALIAS, __VA_ARGS__)

#define ET_INTERNAL_SWITCH_CASE_FLOAT_TYPES_AND(ADDITIONAL, CTYPE_ALIAS, ...) \
ET_INTERNAL_SWITCH_CASE_FLOAT_TYPES(CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
Expand All @@ -1050,32 +1045,6 @@ struct promote_types {
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::ADDITIONAL3, CTYPE_ALIAS, __VA_ARGS__)

#define ET_INTERNAL_SWITCH_CASE_QINT_TYPES(CTYPE_ALIAS, ...) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::QInt8, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::QUInt8, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::QInt32, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::QUInt4x2, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::QUInt2x4, CTYPE_ALIAS, __VA_ARGS__)

#define ET_INTERNAL_SWITCH_CASE_COMPLEX_TYPES(CTYPE_ALIAS, ...) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::ComplexFloat, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::ComplexDouble, CTYPE_ALIAS, __VA_ARGS__)

#define ET_INTERNAL_SWITCH_CASE_COMPLEXH_TYPES(CTYPE_ALIAS, ...) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::ComplexHalf, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::ComplexFloat, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::ComplexDouble, CTYPE_ALIAS, __VA_ARGS__)

#define ET_INTERNAL_SWITCH_CASE_SCALAR_OBJ_TYPES(CTYPE_ALIAS, ...) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::Bool, CTYPE_ALIAS, __VA_ARGS__) \
Expand Down Expand Up @@ -1204,26 +1173,15 @@ struct promote_types {
ET_SWITCH_REAL_TYPES_AND3( \
Half, Bool, BFloat16, TYPE, CONTEXT, NAME, CTYPE_ALIAS, __VA_ARGS__)

#define ET_SWITCH_REALHBBF16_AND_UINT_TYPES( \
TYPE, CONTEXT, NAME, CTYPE_ALIAS, ...) \
ET_INTERNAL_SWITCH( \
TYPE, \
CONTEXT, \
NAME, \
ET_INTERNAL_SWITCH_CASE_REAL_TYPES_AND3( \
Half, Bool, BFloat16, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::UInt16, \
CTYPE_ALIAS, \
__VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::UInt32, \
CTYPE_ALIAS, \
__VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE( \
::executorch::aten::ScalarType::UInt64, \
CTYPE_ALIAS, \
__VA_ARGS__))
#define ET_SWITCH_REALHBBF16_AND_UINT_TYPES( \
TYPE, CONTEXT, NAME, CTYPE_ALIAS, ...) \
ET_INTERNAL_SWITCH( \
TYPE, \
CONTEXT, \
NAME, \
ET_INTERNAL_SWITCH_CASE_REAL_TYPES_AND3( \
Half, Bool, BFloat16, CTYPE_ALIAS, __VA_ARGS__) \
ET_INTERNAL_SWITCH_CASE_UINT_TYPES(CTYPE_ALIAS, __VA_ARGS__))

#define ET_SWITCH_INT_TYPES(TYPE, CONTEXT, NAME, CTYPE_ALIAS, ...) \
ET_INTERNAL_SWITCH( \
Expand Down
Loading