llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang Author: Alexander Pivovarov (apivovarov) <details> <summary>Changes</summary> This PR adds `f8E4M3` type which follows IEEE 754 convention ```c f8E4M3 (IEEE 754) - Exponent: 4 - Mantissa: 3 - Exponent bias: 7 - Follows IEEE 754 conventions for representation of special values - Has Positive and Negative zero - Has Positive and Negative infinity - Has NaNs Additional details: - Max exp (unbiased): 7 - Min exp (unbiased): -6 - Infinities (+/-): S.1111.000 - Zeros (+/-): S.0000.000 - NaNs: S.1111.{001, 010, 011, 100, 101, 110, 111} - Max normal number: S.1110.111 = +/-240 - Min normal number: S.0001.000 = +/-2^(-6) - Max subnormal number: S.0000.111 = +/-2^(-6) x 0.875 - Min subnormal number: S.0000.001 = +/-2^(-6) x 0.125 = +/-2^(-9) ``` --- Patch is 31.33 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/97118.diff 27 Files Affected: - (modified) clang/lib/AST/MicrosoftMangle.cpp (+1) - (modified) llvm/include/llvm/ADT/APFloat.h (+6) - (modified) llvm/lib/Support/APFloat.cpp (+22-2) - (modified) llvm/unittests/ADT/APFloatTest.cpp (+44-6) - (modified) mlir/include/mlir-c/BuiltinTypes.h (+10) - (modified) mlir/include/mlir/IR/Builders.h (+1) - (modified) mlir/include/mlir/IR/BuiltinTypes.h (+9-4) - (modified) mlir/include/mlir/IR/BuiltinTypes.td (+19) - (modified) mlir/include/mlir/IR/CommonTypeConstraints.td (+2) - (modified) mlir/include/mlir/IR/Types.h (+1) - (modified) mlir/lib/AsmParser/TokenKinds.def (+1) - (modified) mlir/lib/AsmParser/TypeParser.cpp (+4) - (modified) mlir/lib/Bindings/Python/IRTypes.cpp (+22-1) - (modified) mlir/lib/CAPI/IR/BuiltinTypes.cpp (+12) - (modified) mlir/lib/Conversion/LLVMCommon/TypeConverter.cpp (+3-2) - (modified) mlir/lib/Dialect/Arith/Transforms/EmulateUnsupportedFloats.cpp (+1) - (modified) mlir/lib/IR/AsmPrinter.cpp (+1) - (modified) mlir/lib/IR/Builders.cpp (+4) - (modified) mlir/lib/IR/BuiltinTypes.cpp (+5-2) - (modified) mlir/lib/IR/MLIRContext.cpp (+5) - (modified) mlir/lib/IR/Types.cpp (+1) - (modified) mlir/python/mlir/_mlir_libs/_mlir/ir.pyi (+14) - (modified) mlir/python/mlir/extras/types.py (+3-1) - (modified) mlir/test/Target/LLVMIR/llvmir.mlir (+3) - (modified) mlir/test/python/ir/builtin_types.py (+9) - (modified) mlir/utils/lldb-scripts/mlirDataFormatters.py (+1) - (modified) mlir/utils/tree-sitter-mlir/grammar.js (+2-1) ``````````diff diff --git a/clang/lib/AST/MicrosoftMangle.cpp b/clang/lib/AST/MicrosoftMangle.cpp index 7f1e9ab02ec26..a2e270df276cb 100644 --- a/clang/lib/AST/MicrosoftMangle.cpp +++ b/clang/lib/AST/MicrosoftMangle.cpp @@ -946,6 +946,7 @@ void MicrosoftCXXNameMangler::mangleFloat(llvm::APFloat Number) { case APFloat::S_IEEEquad: Out << 'Y'; break; case APFloat::S_PPCDoubleDouble: Out << 'Z'; break; case APFloat::S_Float8E5M2: + case APFloat::S_Float8E4M3: case APFloat::S_Float8E4M3FN: case APFloat::S_Float8E5M2FNUZ: case APFloat::S_Float8E4M3FNUZ: diff --git a/llvm/include/llvm/ADT/APFloat.h b/llvm/include/llvm/ADT/APFloat.h index db2fa480655c6..bff8e6490d1de 100644 --- a/llvm/include/llvm/ADT/APFloat.h +++ b/llvm/include/llvm/ADT/APFloat.h @@ -166,6 +166,9 @@ struct APFloatBase { // This format's exponent bias is 16, instead of the 15 (2 ** (5 - 1) - 1) // that IEEE precedent would imply. S_Float8E5M2FNUZ, + // 8-bit floating point number following IEEE-754 conventions with bit + // layout S1E4M3. + S_Float8E4M3, // 8-bit floating point number mostly following IEEE-754 conventions with // bit layout S1E4M3 as described in https://arxiv.org/abs/2209.05433. // Unlike IEEE-754 types, there are no infinity values, and NaN is @@ -217,6 +220,7 @@ struct APFloatBase { static const fltSemantics &PPCDoubleDouble() LLVM_READNONE; static const fltSemantics &Float8E5M2() LLVM_READNONE; static const fltSemantics &Float8E5M2FNUZ() LLVM_READNONE; + static const fltSemantics &Float8E4M3() LLVM_READNONE; static const fltSemantics &Float8E4M3FN() LLVM_READNONE; static const fltSemantics &Float8E4M3FNUZ() LLVM_READNONE; static const fltSemantics &Float8E4M3B11FNUZ() LLVM_READNONE; @@ -638,6 +642,7 @@ class IEEEFloat final : public APFloatBase { APInt convertPPCDoubleDoubleAPFloatToAPInt() const; APInt convertFloat8E5M2APFloatToAPInt() const; APInt convertFloat8E5M2FNUZAPFloatToAPInt() const; + APInt convertFloat8E4M3APFloatToAPInt() const; APInt convertFloat8E4M3FNAPFloatToAPInt() const; APInt convertFloat8E4M3FNUZAPFloatToAPInt() const; APInt convertFloat8E4M3B11FNUZAPFloatToAPInt() const; @@ -656,6 +661,7 @@ class IEEEFloat final : public APFloatBase { void initFromPPCDoubleDoubleAPInt(const APInt &api); void initFromFloat8E5M2APInt(const APInt &api); void initFromFloat8E5M2FNUZAPInt(const APInt &api); + void initFromFloat8E4M3APInt(const APInt &api); void initFromFloat8E4M3FNAPInt(const APInt &api); void initFromFloat8E4M3FNUZAPInt(const APInt &api); void initFromFloat8E4M3B11FNUZAPInt(const APInt &api); diff --git a/llvm/lib/Support/APFloat.cpp b/llvm/lib/Support/APFloat.cpp index 47618bc325951..79e0094b243b2 100644 --- a/llvm/lib/Support/APFloat.cpp +++ b/llvm/lib/Support/APFloat.cpp @@ -83,8 +83,8 @@ enum class fltNanEncoding { // exponent is all 1s and the significand is non-zero. IEEE, - // Represents the behavior in the Float8E4M3 floating point type where NaN is - // represented by having the exponent and mantissa set to all 1s. + // Represents the behavior in the Float8E4M3FN floating point type where NaN + // is represented by having the exponent and mantissa set to all 1s. // This behavior matches the FP8 E4M3 type described in // https://arxiv.org/abs/2209.05433. We treat both signed and unsigned NaNs // as non-signalling, although the paper does not state whether the NaN @@ -136,6 +136,7 @@ static constexpr fltSemantics semIEEEquad = {16383, -16382, 113, 128}; static constexpr fltSemantics semFloat8E5M2 = {15, -14, 3, 8}; static constexpr fltSemantics semFloat8E5M2FNUZ = { 15, -15, 3, 8, fltNonfiniteBehavior::NanOnly, fltNanEncoding::NegativeZero}; +static constexpr fltSemantics semFloat8E4M3 = {7, -6, 4, 8}; static constexpr fltSemantics semFloat8E4M3FN = { 8, -6, 4, 8, fltNonfiniteBehavior::NanOnly, fltNanEncoding::AllOnes}; static constexpr fltSemantics semFloat8E4M3FNUZ = { @@ -208,6 +209,8 @@ const llvm::fltSemantics &APFloatBase::EnumToSemantics(Semantics S) { return Float8E5M2(); case S_Float8E5M2FNUZ: return Float8E5M2FNUZ(); + case S_Float8E4M3: + return Float8E4M3(); case S_Float8E4M3FN: return Float8E4M3FN(); case S_Float8E4M3FNUZ: @@ -246,6 +249,8 @@ APFloatBase::SemanticsToEnum(const llvm::fltSemantics &Sem) { return S_Float8E5M2; else if (&Sem == &llvm::APFloat::Float8E5M2FNUZ()) return S_Float8E5M2FNUZ; + else if (&Sem == &llvm::APFloat::Float8E4M3()) + return S_Float8E4M3; else if (&Sem == &llvm::APFloat::Float8E4M3FN()) return S_Float8E4M3FN; else if (&Sem == &llvm::APFloat::Float8E4M3FNUZ()) @@ -276,6 +281,7 @@ const fltSemantics &APFloatBase::PPCDoubleDouble() { } const fltSemantics &APFloatBase::Float8E5M2() { return semFloat8E5M2; } const fltSemantics &APFloatBase::Float8E5M2FNUZ() { return semFloat8E5M2FNUZ; } +const fltSemantics &APFloatBase::Float8E4M3() { return semFloat8E4M3; } const fltSemantics &APFloatBase::Float8E4M3FN() { return semFloat8E4M3FN; } const fltSemantics &APFloatBase::Float8E4M3FNUZ() { return semFloat8E4M3FNUZ; } const fltSemantics &APFloatBase::Float8E4M3B11FNUZ() { @@ -3617,6 +3623,11 @@ APInt IEEEFloat::convertFloat8E5M2FNUZAPFloatToAPInt() const { return convertIEEEFloatToAPInt<semFloat8E5M2FNUZ>(); } +APInt IEEEFloat::convertFloat8E4M3APFloatToAPInt() const { + assert(partCount() == 1); + return convertIEEEFloatToAPInt<semFloat8E4M3>(); +} + APInt IEEEFloat::convertFloat8E4M3FNAPFloatToAPInt() const { assert(partCount() == 1); return convertIEEEFloatToAPInt<semFloat8E4M3FN>(); @@ -3681,6 +3692,9 @@ APInt IEEEFloat::bitcastToAPInt() const { if (semantics == (const llvm::fltSemantics *)&semFloat8E5M2FNUZ) return convertFloat8E5M2FNUZAPFloatToAPInt(); + if (semantics == (const llvm::fltSemantics *)&semFloat8E4M3) + return convertFloat8E4M3APFloatToAPInt(); + if (semantics == (const llvm::fltSemantics *)&semFloat8E4M3FN) return convertFloat8E4M3FNAPFloatToAPInt(); @@ -3902,6 +3916,10 @@ void IEEEFloat::initFromFloat8E5M2FNUZAPInt(const APInt &api) { initFromIEEEAPInt<semFloat8E5M2FNUZ>(api); } +void IEEEFloat::initFromFloat8E4M3APInt(const APInt &api) { + initFromIEEEAPInt<semFloat8E4M3>(api); +} + void IEEEFloat::initFromFloat8E4M3FNAPInt(const APInt &api) { initFromIEEEAPInt<semFloat8E4M3FN>(api); } @@ -3951,6 +3969,8 @@ void IEEEFloat::initFromAPInt(const fltSemantics *Sem, const APInt &api) { return initFromFloat8E5M2APInt(api); if (Sem == &semFloat8E5M2FNUZ) return initFromFloat8E5M2FNUZAPInt(api); + if (Sem == &semFloat8E4M3) + return initFromFloat8E4M3APInt(api); if (Sem == &semFloat8E4M3FN) return initFromFloat8E4M3FNAPInt(api); if (Sem == &semFloat8E4M3FNUZ) diff --git a/llvm/unittests/ADT/APFloatTest.cpp b/llvm/unittests/ADT/APFloatTest.cpp index cf6bbd313c6c6..132e95bd45f77 100644 --- a/llvm/unittests/ADT/APFloatTest.cpp +++ b/llvm/unittests/ADT/APFloatTest.cpp @@ -2133,6 +2133,8 @@ TEST(APFloatTest, getZero) { {&APFloat::Float8E5M2(), true, true, {0x80ULL, 0}, 1}, {&APFloat::Float8E5M2FNUZ(), false, false, {0, 0}, 1}, {&APFloat::Float8E5M2FNUZ(), true, false, {0, 0}, 1}, + {&APFloat::Float8E4M3(), false, true, {0, 0}, 1}, + {&APFloat::Float8E4M3(), true, true, {0x80ULL, 0}, 1}, {&APFloat::Float8E4M3FN(), false, true, {0, 0}, 1}, {&APFloat::Float8E4M3FN(), true, true, {0x80ULL, 0}, 1}, {&APFloat::Float8E4M3FNUZ(), false, false, {0, 0}, 1}, @@ -5508,8 +5510,8 @@ TEST(APFloatTest, ConvertE4M3FNToE5M2) { EXPECT_TRUE(losesInfo); EXPECT_EQ(status, APFloat::opInexact); - // Convert E4M3 denormal to E5M2 normal. Should not be truncated, despite the - // destination format having one fewer significand bit + // Convert E4M3FN denormal to E5M2 normal. Should not be truncated, despite + // the destination format having one fewer significand bit test = APFloat(APFloat::Float8E4M3FN(), "0x1.Cp-7"); status = test.convert(APFloat::Float8E5M2(), APFloat::rmNearestTiesToEven, &losesInfo); @@ -5647,8 +5649,8 @@ TEST(APFloatTest, Float8E4M3FNAdd) { int category; APFloat::roundingMode roundingMode = APFloat::rmNearestTiesToEven; } AdditionTests[] = { - // Test addition operations involving NaN, overflow, and the max E4M3 - // value (448) because E4M3 differs from IEEE-754 types in these regards + // Test addition operations involving NaN, overflow, and the max E4M3FN + // value (448) because E4M3FN differs from IEEE-754 types in these regards {FromStr("448"), FromStr("16"), "448", APFloat::opInexact, APFloat::fcNormal}, {FromStr("448"), FromStr("18"), "NaN", @@ -6278,8 +6280,8 @@ TEST(APFloatTest, ConvertE4M3FNUZToE5M2FNUZ) { EXPECT_TRUE(losesInfo); EXPECT_EQ(status, APFloat::opInexact); - // Convert E4M3 denormal to E5M2 normal. Should not be truncated, despite the - // destination format having one fewer significand bit + // Convert E4M3FNUZ denormal to E5M2 normal. Should not be truncated, despite + // the destination format having one fewer significand bit losesInfo = true; test = APFloat(APFloat::Float8E4M3FNUZ(), "0x1.Cp-8"); status = test.convert(APFloat::Float8E5M2FNUZ(), APFloat::rmNearestTiesToEven, @@ -6846,6 +6848,42 @@ TEST(APFloatTest, Float8E5M2ToFloat) { EXPECT_TRUE(std::isnan(QNaN.convertToFloat())); } +TEST(APFloatTest, Float8E4M3ToFloat) { + APFloat PosZero = APFloat::getZero(APFloat::Float8E4M3()); + APFloat PosZeroToFloat(PosZero.convertToFloat()); + EXPECT_TRUE(PosZeroToFloat.isPosZero()); + APFloat NegZero = APFloat::getZero(APFloat::Float8E4M3(), true); + APFloat NegZeroToFloat(NegZero.convertToFloat()); + EXPECT_TRUE(NegZeroToFloat.isNegZero()); + + APFloat One(APFloat::Float8E4M3(), "1.0"); + EXPECT_EQ(1.0F, One.convertToFloat()); + APFloat Two(APFloat::Float8E4M3(), "2.0"); + EXPECT_EQ(2.0F, Two.convertToFloat()); + + APFloat PosLargest = APFloat::getLargest(APFloat::Float8E4M3(), false); + EXPECT_EQ(240.0F, PosLargest.convertToFloat()); + APFloat NegLargest = APFloat::getLargest(APFloat::Float8E4M3(), true); + EXPECT_EQ(-240.0F, NegLargest.convertToFloat()); + APFloat PosSmallest = + APFloat::getSmallestNormalized(APFloat::Float8E4M3(), false); + EXPECT_EQ(0x1.p-6, PosSmallest.convertToFloat()); + APFloat NegSmallest = + APFloat::getSmallestNormalized(APFloat::Float8E4M3(), true); + EXPECT_EQ(-0x1.p-6, NegSmallest.convertToFloat()); + + APFloat SmallestDenorm = APFloat::getSmallest(APFloat::Float8E4M3(), false); + EXPECT_TRUE(SmallestDenorm.isDenormal()); + EXPECT_EQ(0x1.p-9, SmallestDenorm.convertToFloat()); + + APFloat PosInf = APFloat::getInf(APFloat::Float8E4M3()); + EXPECT_EQ(std::numeric_limits<float>::infinity(), PosInf.convertToFloat()); + APFloat NegInf = APFloat::getInf(APFloat::Float8E4M3(), true); + EXPECT_EQ(-std::numeric_limits<float>::infinity(), NegInf.convertToFloat()); + APFloat QNaN = APFloat::getQNaN(APFloat::Float8E4M3()); + EXPECT_TRUE(std::isnan(QNaN.convertToFloat())); +} + TEST(APFloatTest, Float8E4M3FNToFloat) { APFloat PosZero = APFloat::getZero(APFloat::Float8E4M3FN()); APFloat PosZeroToFloat(PosZero.convertToFloat()); diff --git a/mlir/include/mlir-c/BuiltinTypes.h b/mlir/include/mlir-c/BuiltinTypes.h index 99c5e3f46b04c..2212087b9898f 100644 --- a/mlir/include/mlir-c/BuiltinTypes.h +++ b/mlir/include/mlir-c/BuiltinTypes.h @@ -89,6 +89,16 @@ MLIR_CAPI_EXPORTED bool mlirTypeIsAFloat8E5M2(MlirType type); /// context. MLIR_CAPI_EXPORTED MlirType mlirFloat8E5M2TypeGet(MlirContext ctx); +/// Returns the typeID of an Float8E4M3 type. +MLIR_CAPI_EXPORTED MlirTypeID mlirFloat8E4M3TypeGetTypeID(void); + +/// Checks whether the given type is an f8E4M3 type. +MLIR_CAPI_EXPORTED bool mlirTypeIsAFloat8E4M3(MlirType type); + +/// Creates an f8E4M3 type in the given context. The type is owned by the +/// context. +MLIR_CAPI_EXPORTED MlirType mlirFloat8E4M3TypeGet(MlirContext ctx); + /// Returns the typeID of an Float8E4M3FN type. MLIR_CAPI_EXPORTED MlirTypeID mlirFloat8E4M3FNTypeGetTypeID(void); diff --git a/mlir/include/mlir/IR/Builders.h b/mlir/include/mlir/IR/Builders.h index 0d5fa719d0dee..1c4d329fbf0d8 100644 --- a/mlir/include/mlir/IR/Builders.h +++ b/mlir/include/mlir/IR/Builders.h @@ -61,6 +61,7 @@ class Builder { // Types. FloatType getFloat8E5M2Type(); + FloatType getFloat8E4M3Type(); FloatType getFloat8E4M3FNType(); FloatType getFloat8E5M2FNUZType(); FloatType getFloat8E4M3FNUZType(); diff --git a/mlir/include/mlir/IR/BuiltinTypes.h b/mlir/include/mlir/IR/BuiltinTypes.h index 5579b138668d2..f4c05cafa1fd9 100644 --- a/mlir/include/mlir/IR/BuiltinTypes.h +++ b/mlir/include/mlir/IR/BuiltinTypes.h @@ -56,6 +56,7 @@ class FloatType : public Type { static FloatType getF80(MLIRContext *ctx); static FloatType getF128(MLIRContext *ctx); static FloatType getFloat8E5M2(MLIRContext *ctx); + static FloatType getFloat8E4M3(MLIRContext *ctx); static FloatType getFloat8E4M3FN(MLIRContext *ctx); static FloatType getFloat8E5M2FNUZ(MLIRContext *ctx); static FloatType getFloat8E4M3FNUZ(MLIRContext *ctx); @@ -405,16 +406,20 @@ inline bool BaseMemRefType::isValidElementType(Type type) { } inline bool FloatType::classof(Type type) { - return llvm::isa<Float8E5M2Type, Float8E4M3FNType, Float8E5M2FNUZType, - Float8E4M3FNUZType, Float8E4M3B11FNUZType, BFloat16Type, - Float16Type, FloatTF32Type, Float32Type, Float64Type, - Float80Type, Float128Type>(type); + return llvm::isa< + Float8E5M2Type, Float8E4M3Type, Float8E4M3FNType, Float8E5M2FNUZType, + Float8E4M3FNUZType, Float8E4M3B11FNUZType, BFloat16Type, Float16Type, + FloatTF32Type, Float32Type, Float64Type, Float80Type, Float128Type>(type); } inline FloatType FloatType::getFloat8E5M2(MLIRContext *ctx) { return Float8E5M2Type::get(ctx); } +inline FloatType FloatType::getFloat8E4M3(MLIRContext *ctx) { + return Float8E4M3Type::get(ctx); +} + inline FloatType FloatType::getFloat8E4M3FN(MLIRContext *ctx) { return Float8E4M3FNType::get(ctx); } diff --git a/mlir/include/mlir/IR/BuiltinTypes.td b/mlir/include/mlir/IR/BuiltinTypes.td index 4cade83dd3c32..2eed105e81f05 100644 --- a/mlir/include/mlir/IR/BuiltinTypes.td +++ b/mlir/include/mlir/IR/BuiltinTypes.td @@ -97,6 +97,25 @@ def Builtin_Float8E5M2 : Builtin_FloatType<"Float8E5M2", "f8E5M2"> { }]; } +//===----------------------------------------------------------------------===// +// Float8E4M3Type + +def Builtin_Float8E4M3 : Builtin_FloatType<"Float8E4M3", "f8E4M3"> { + let summary = "8-bit floating point with 3 bit mantissa"; + let description = [{ + An 8-bit floating point type with 1 sign bit, 4 bits exponent and 3 bits + mantissa. This is not a standard type as defined by IEEE-754, but it + follows similar conventions with the following characteristics: + + * bit encoding: S1E4M3 + * exponent bias: 7 + * infinities: supported with exponent set to all 1s and mantissa 0s + * NaNs: supported with exponent bits set to all 1s and mantissa of + (001, 010, 011, 100, 101, 110, 111) + * denormals when exponent is 0 + }]; +} + //===----------------------------------------------------------------------===// // Float8E4M3FNType diff --git a/mlir/include/mlir/IR/CommonTypeConstraints.td b/mlir/include/mlir/IR/CommonTypeConstraints.td index af4f13dc09360..cac37c8fec4d3 100644 --- a/mlir/include/mlir/IR/CommonTypeConstraints.td +++ b/mlir/include/mlir/IR/CommonTypeConstraints.td @@ -331,6 +331,8 @@ def F8E4M3FN : Type<CPred<"$_self.isFloat8E4M3FN()">, "f8E4M3FN type">, BuildableType<"$_builder.getFloat8E4M3FNType()">; def F8E5M2 : Type<CPred<"$_self.isFloat8E5M2()">, "f8E5M2 type">, BuildableType<"$_builder.getFloat8E5M2Type()">; +def F8E4M3 : Type<CPred<"$_self.isFloat8E4M3()">, "f8E4M3 type">, + BuildableType<"$_builder.getFloat8E4M3Type()">; def F8E4M3FNUZ : Type<CPred<"$_self.isFloat8E4M3FNUZ()">, "f8E4M3FNUZ type">, BuildableType<"$_builder.getFloat8E4M3FNUZType()">; def F8E4M3B11FNUZ : Type<CPred<"$_self.isFloat8E4M3B11FNUZ()">, "f8E4M3B11FNUZ type">, diff --git a/mlir/include/mlir/IR/Types.h b/mlir/include/mlir/IR/Types.h index 65824531fdc90..a32de33114e40 100644 --- a/mlir/include/mlir/IR/Types.h +++ b/mlir/include/mlir/IR/Types.h @@ -126,6 +126,7 @@ class Type { // derived types should use isa/dyn_cast. bool isIndex() const; bool isFloat8E5M2() const; + bool isFloat8E4M3() const; bool isFloat8E4M3FN() const; bool isFloat8E5M2FNUZ() const; bool isFloat8E4M3FNUZ() const; diff --git a/mlir/lib/AsmParser/TokenKinds.def b/mlir/lib/AsmParser/TokenKinds.def index 297e074594530..eb3154c6da42e 100644 --- a/mlir/lib/AsmParser/TokenKinds.def +++ b/mlir/lib/AsmParser/TokenKinds.def @@ -95,6 +95,7 @@ TOK_KEYWORD(f32) TOK_KEYWORD(f64) TOK_KEYWORD(f80) TOK_KEYWORD(f8E5M2) +TOK_KEYWORD(f8E4M3) TOK_KEYWORD(f8E4M3FN) TOK_KEYWORD(f8E5M2FNUZ) TOK_KEYWORD(f8E4M3FNUZ) diff --git a/mlir/lib/AsmParser/TypeParser.cpp b/mlir/lib/AsmParser/TypeParser.cpp index 5da931b77b3be..90ba56af670f6 100644 --- a/mlir/lib/AsmParser/TypeParser.cpp +++ b/mlir/lib/AsmParser/TypeParser.cpp @@ -41,6 +41,7 @@ OptionalParseResult Parser::parseOptionalType(Type &type) { case Token::kw_vector: case Token::inttype: case Token::kw_f8E5M2: + case Token::kw_f8E4M3: case Token::kw_f8E4M3FN: case Token::kw_f8E5M2FNUZ: case Token::kw_f8E4M3FNUZ: @@ -305,6 +306,9 @@ Type Parser::parseNonFunctionType() { case Token::kw_f8E5M2: consumeToken(Token::kw_f8E5M2); return builder.getFloat8E5M2Type(); + case Token::kw_f8E4M3: + consumeToken(Token::kw_f8E4M3); + return builder.getFloat8E4M3Type(); case Token::kw_f8E4M3FN: consumeToken(Token::kw_f8E4M3FN); return builder.getFloat8E4M3FNType(); diff --git a/mlir/lib/Bindings/Python/IRTypes.cpp b/mlir/lib/Bindings/Python/IRTypes.cpp index e1e4eb999b3aa..5e0aebc03e2c1 100644 --- a/mlir/lib/Bindings/Python/IRTypes.cpp +++ b/mlir/lib/Bindings/Python/IRTypes.cpp @@ -143,7 +143,7 @@ class PyFloat8E4M3FNType } }; -/// Floating Point Type subclass - Float8M5E2Type. +/// Floating Point Type subclass - Float8E5M2Type. class PyFloat8E5M2Type : public PyConcreteType<PyFloat8E5M2Type, PyFloatType> { public: static constexpr IsAFunctionTy isaFunction = mlirTypeIsAFloat8E5M2; @@ -163,6 +163,26 @@ class PyFloat8E5M2Type : public PyConcreteType<PyFloat8E5M2Type, PyFloatType> { } }; +/// Floating Point Type subclass - Float8E4M3Type. +class PyFloat8E4M3Type : public PyConcreteType<PyFloat8E4M3Type, PyFloatType> { +public: + static constexpr IsAFunctionTy isaFunction = mlirTypeIsAFloat8E4M3; + static constexpr GetTypeIDFunctionTy getTypeIdFunction = + mlirFloat8E4M3TypeGetTypeID; + static constexpr const char *pyClassName = "Float8E4M3Type"; + using PyConcreteType::PyConcreteType; + + static void bindDerived(ClassTy &c) { + c.def_static( + "get", + [](DefaultingPyMlirContext context) { + MlirType t = mlirFloat8E4M3TypeGet(context->get()); + return PyFloat8E4M3Type(context->getRef(), t); + }, + py::arg("context") = py::none(), "Create a float8_e4m3 type."); + } +}; + /// Floating Point Type subclass - Float8E4M3FNUZ. class PyFloat8E4M3FNUZType : public PyConcreteType<PyFloat8E4M3FNUZType, PyFloatType> { @@ -840,6 +860,7 @@ void mlir::python::populateIRTypes(py::module &m) { PyIndexType::bind(m); PyFloat8E4M3FNType::bind(m); PyFloat8E5M2Type::bind(m); + PyFloat8E4M3Type::bind(m); PyFloat8E4M3FNUZType::bind(m); PyFloat8E4M3B11FNUZType::bind(m); PyFloat8E5M2FNUZType::bind(m); diff --git a/mlir/lib/CAPI/IR/BuiltinTypes.cpp b/mlir/lib/CAPI/IR/BuiltinTypes.cpp index c94c070144a7e..6e22caca78ff1 100644 --- a/mlir/lib/CAPI/IR/BuiltinTypes.cpp +++ b/mlir/lib/CAPI/IR/BuiltinTypes.cpp @@ -98,6 +98,18 @@ MlirType mlirFloat8E5M2TypeGet(MlirContext ctx) { return wrap(FloatType::getFloat8E5M2(unwrap(ctx))); } +MlirTypeID mlirFloat8E4M3TypeGetTypeID() { + return wrap(Float8E4M3Type::getTypeID()); +} + +bool mlirTypeIsAFloat8E4M3(MlirType type) { + return unwrap(type).isFloat8E4M3(); +} + +MlirType mlirFloat8E4M3TypeGet(MlirContext ctx) { + return wrap(FloatType:... [truncated] `````````` </details> https://github.com/llvm/llvm-project/pull/97118 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits