Skip to content

Commit 8a63bb3

Browse files
author
Dmitry Sidorov
committed
[Backport to 17] Implement SPV_INTEL_float4 and SPV_INTEL_fp_conversions extensions (KhronosGroup#3419)
As well as their appropriate conversions via __builtin_spirv mechanism. Specification: intel/llvm#20467 Signed-off-by: Dmitry Sidorov <dmitry.sidorov@intel.com>
1 parent 0a21da2 commit 8a63bb3

File tree

17 files changed

+1139
-115
lines changed

17 files changed

+1139
-115
lines changed

‎include/LLVMSPIRVExtensions.inc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,3 +84,5 @@ EXT(SPV_INTEL_shader_atomic_bfloat16)
8484
EXT(SPV_EXT_float8)
8585
EXT(SPV_INTEL_predicated_io)
8686
EXT(SPV_INTEL_sigmoid)
87+
EXT(SPV_INTEL_float4)
88+
EXT(SPV_INTEL_fp_conversions)

‎lib/SPIRV/SPIRVInternal.h‎

Lines changed: 112 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1060,6 +1060,7 @@ enum FPEncodingWrap {
10601060
BF16 = FPEncoding::FPEncodingBFloat16KHR,
10611061
E4M3 = FPEncoding::FPEncodingFloat8E4M3EXT,
10621062
E5M2 = FPEncoding::FPEncodingFloat8E5M2EXT,
1063+
E2M1 = internal::FPEncodingFloat4E2M1INTEL,
10631064
};
10641065

10651066
// Structure describing non-trivial conversions (FP8 and int4)
@@ -1088,36 +1089,117 @@ typedef SPIRVMap<llvm::StringRef, FPConversionDesc> FPConvertToEncodingMap;
10881089

10891090
// clang-format off
10901091
template <> inline void FPConvertToEncodingMap::init() {
1091-
// 8-bit conversions
1092-
add("ConvertE4M3ToFP16EXT",
1093-
{FPEncodingWrap::E4M3, FPEncodingWrap::IEEE754, OpFConvert});
1094-
add("ConvertE5M2ToFP16EXT",
1095-
{FPEncodingWrap::E5M2, FPEncodingWrap::IEEE754, OpFConvert});
1096-
add("ConvertE4M3ToBF16EXT",
1097-
{FPEncodingWrap::E4M3, FPEncodingWrap::BF16, OpFConvert});
1098-
add("ConvertE5M2ToBF16EXT",
1099-
{FPEncodingWrap::E5M2, FPEncodingWrap::BF16, OpFConvert});
1100-
add("ConvertFP16ToE4M3EXT",
1101-
{FPEncodingWrap::IEEE754, FPEncodingWrap::E4M3, OpFConvert});
1102-
add("ConvertFP16ToE5M2EXT",
1103-
{FPEncodingWrap::IEEE754, FPEncodingWrap::E5M2, OpFConvert});
1104-
add("ConvertBF16ToE4M3EXT",
1105-
{FPEncodingWrap::BF16, FPEncodingWrap::E4M3, OpFConvert});
1106-
add("ConvertBF16ToE5M2EXT",
1107-
{FPEncodingWrap::BF16, FPEncodingWrap::E5M2, OpFConvert});
1108-
1109-
add("ConvertInt4ToE4M3INTEL",
1110-
{FPEncodingWrap::Integer, FPEncodingWrap::E4M3, OpConvertSToF});
1111-
add("ConvertInt4ToE5M2INTEL",
1112-
{FPEncodingWrap::Integer, FPEncodingWrap::E5M2, OpConvertSToF});
1113-
add("ConvertInt4ToFP16INTEL",
1114-
{FPEncodingWrap::Integer, FPEncodingWrap::IEEE754, OpConvertSToF});
1115-
add("ConvertInt4ToBF16INTEL",
1116-
{FPEncodingWrap::Integer, FPEncodingWrap::BF16, OpConvertSToF});
1117-
add("ConvertFP16ToInt4INTEL",
1118-
{FPEncodingWrap::IEEE754, FPEncodingWrap::Integer, OpConvertFToS});
1119-
add("ConvertBF16ToInt4INTEL",
1120-
{FPEncodingWrap::BF16, FPEncodingWrap::Integer, OpConvertFToS});
1092+
// 4-bit conversions
1093+
add("ConvertE2M1ToE4M3INTEL",
1094+
{FPEncodingWrap::E2M1, FPEncodingWrap::E4M3, OpFConvert});
1095+
add("ConvertE2M1ToE5M2INTEL",
1096+
{FPEncodingWrap::E2M1, FPEncodingWrap::E5M2, OpFConvert});
1097+
add("ConvertE2M1ToFP16INTEL",
1098+
{FPEncodingWrap::E2M1, FPEncodingWrap::IEEE754, OpFConvert});
1099+
add("ConvertE2M1ToBF16INTEL",
1100+
{FPEncodingWrap::E2M1, FPEncodingWrap::BF16, OpFConvert});
1101+
1102+
add("ConvertInt4ToE4M3INTEL",
1103+
{FPEncodingWrap::Integer, FPEncodingWrap::E4M3, OpConvertSToF});
1104+
add("ConvertInt4ToE5M2INTEL",
1105+
{FPEncodingWrap::Integer, FPEncodingWrap::E5M2, OpConvertSToF});
1106+
add("ConvertInt4ToFP16INTEL",
1107+
{FPEncodingWrap::Integer, FPEncodingWrap::IEEE754, OpConvertSToF});
1108+
add("ConvertInt4ToBF16INTEL",
1109+
{FPEncodingWrap::Integer, FPEncodingWrap::BF16, OpConvertSToF});
1110+
add("ConvertInt4ToInt8INTEL",
1111+
{FPEncodingWrap::Integer, FPEncodingWrap::Integer, OpSConvert});
1112+
1113+
add("ConvertFP16ToE2M1INTEL",
1114+
{FPEncodingWrap::IEEE754, FPEncodingWrap::E2M1, OpFConvert});
1115+
add("ConvertBF16ToE2M1INTEL",
1116+
{FPEncodingWrap::BF16, FPEncodingWrap::E2M1, OpFConvert});
1117+
add("ConvertFP16ToInt4INTEL",
1118+
{FPEncodingWrap::IEEE754, FPEncodingWrap::Integer, OpConvertFToS});
1119+
add("ConvertBF16ToInt4INTEL",
1120+
{FPEncodingWrap::BF16, FPEncodingWrap::Integer, OpConvertFToS});
1121+
1122+
// 8-bit conversions
1123+
add("ConvertE4M3ToFP16EXT",
1124+
{FPEncodingWrap::E4M3, FPEncodingWrap::IEEE754, OpFConvert});
1125+
add("ConvertE5M2ToFP16EXT",
1126+
{FPEncodingWrap::E5M2, FPEncodingWrap::IEEE754, OpFConvert});
1127+
add("ConvertE4M3ToBF16EXT",
1128+
{FPEncodingWrap::E4M3, FPEncodingWrap::BF16, OpFConvert});
1129+
add("ConvertE5M2ToBF16EXT",
1130+
{FPEncodingWrap::E5M2, FPEncodingWrap::BF16, OpFConvert});
1131+
add("ConvertFP16ToE4M3EXT",
1132+
{FPEncodingWrap::IEEE754, FPEncodingWrap::E4M3, OpFConvert});
1133+
add("ConvertFP16ToE5M2EXT",
1134+
{FPEncodingWrap::IEEE754, FPEncodingWrap::E5M2, OpFConvert});
1135+
add("ConvertBF16ToE4M3EXT",
1136+
{FPEncodingWrap::BF16, FPEncodingWrap::E4M3, OpFConvert});
1137+
add("ConvertBF16ToE5M2EXT",
1138+
{FPEncodingWrap::BF16, FPEncodingWrap::E5M2, OpFConvert});
1139+
1140+
// SPV_INTEL_fp_conversions
1141+
add("ClampConvertFP16ToE2M1INTEL",
1142+
{FPEncodingWrap::IEEE754, FPEncodingWrap::E2M1,
1143+
internal::OpClampConvertFToFINTEL});
1144+
add("ClampConvertBF16ToE2M1INTEL",
1145+
{FPEncodingWrap::BF16, FPEncodingWrap::E2M1,
1146+
internal::OpClampConvertFToFINTEL});
1147+
add("ClampConvertFP16ToE4M3INTEL",
1148+
{FPEncodingWrap::IEEE754, FPEncodingWrap::E4M3,
1149+
internal::OpClampConvertFToFINTEL});
1150+
add("ClampConvertBF16ToE4M3INTEL",
1151+
{FPEncodingWrap::BF16, FPEncodingWrap::E4M3,
1152+
internal::OpClampConvertFToFINTEL});
1153+
add("ClampConvertFP16ToE5M2INTEL",
1154+
{FPEncodingWrap::IEEE754, FPEncodingWrap::E5M2,
1155+
internal::OpClampConvertFToFINTEL});
1156+
add("ClampConvertBF16ToE5M2INTEL",
1157+
{FPEncodingWrap::BF16, FPEncodingWrap::E5M2,
1158+
internal::OpClampConvertFToFINTEL});
1159+
add("ClampConvertFP16ToInt4INTEL",
1160+
{FPEncodingWrap::IEEE754, FPEncodingWrap::Integer,
1161+
internal::OpClampConvertFToSINTEL});
1162+
add("ClampConvertBF16ToInt4INTEL",
1163+
{FPEncodingWrap::BF16, FPEncodingWrap::Integer,
1164+
internal::OpClampConvertFToSINTEL});
1165+
1166+
add("StochasticRoundFP16ToE5M2INTEL",
1167+
{FPEncodingWrap::IEEE754, FPEncodingWrap::E5M2,
1168+
internal::OpStochasticRoundFToFINTEL});
1169+
add("StochasticRoundFP16ToE4M3INTEL",
1170+
{FPEncodingWrap::IEEE754, FPEncodingWrap::E4M3,
1171+
internal::OpStochasticRoundFToFINTEL});
1172+
add("StochasticRoundBF16ToE5M2INTEL",
1173+
{FPEncodingWrap::BF16, FPEncodingWrap::E5M2,
1174+
internal::OpStochasticRoundFToFINTEL});
1175+
add("StochasticRoundBF16ToE4M3INTEL",
1176+
{FPEncodingWrap::BF16, FPEncodingWrap::E4M3,
1177+
internal::OpStochasticRoundFToFINTEL});
1178+
add("StochasticRoundFP16ToE2M1INTEL",
1179+
{FPEncodingWrap::IEEE754, FPEncodingWrap::E2M1,
1180+
internal::OpStochasticRoundFToFINTEL});
1181+
add("StochasticRoundBF16ToE2M1INTEL",
1182+
{FPEncodingWrap::BF16, FPEncodingWrap::E2M1,
1183+
internal::OpStochasticRoundFToFINTEL});
1184+
add("ClampStochasticRoundFP16ToInt4INTEL",
1185+
{FPEncodingWrap::IEEE754, FPEncodingWrap::Integer,
1186+
internal::OpClampStochasticRoundFToSINTEL});
1187+
add("ClampStochasticRoundBF16ToInt4INTEL",
1188+
{FPEncodingWrap::BF16, FPEncodingWrap::Integer,
1189+
internal::OpClampStochasticRoundFToSINTEL});
1190+
1191+
add("ClampStochasticRoundFP16ToE5M2INTEL",
1192+
{FPEncodingWrap::IEEE754, FPEncodingWrap::E5M2,
1193+
internal::OpClampStochasticRoundFToFINTEL});
1194+
add("ClampStochasticRoundFP16ToE4M3INTEL",
1195+
{FPEncodingWrap::IEEE754, FPEncodingWrap::E4M3,
1196+
internal::OpClampStochasticRoundFToFINTEL});
1197+
add("ClampStochasticRoundBF16ToE5M2INTEL",
1198+
{FPEncodingWrap::BF16, FPEncodingWrap::E5M2,
1199+
internal::OpClampStochasticRoundFToFINTEL});
1200+
add("ClampStochasticRoundBF16ToE4M3INTEL",
1201+
{FPEncodingWrap::BF16, FPEncodingWrap::E4M3,
1202+
internal::OpClampStochasticRoundFToFINTEL});
11211203
}
11221204

11231205
// clang-format on

‎lib/SPIRV/SPIRVReader.cpp‎

Lines changed: 61 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -313,8 +313,11 @@ std::optional<uint64_t> SPIRVToLLVM::getAlignment(SPIRVValue *V) {
313313

314314
Type *SPIRVToLLVM::transFPType(SPIRVType *T) {
315315
switch (T->getFloatBitWidth()) {
316+
case 4:
317+
// No LLVM IR counter part for FP4 - map it on i4.
318+
return Type::getIntNTy(*Context, 4);
316319
case 8:
317-
// No LLVM IR counter part for FP8 - map it on i8
320+
// No LLVM IR counter part for FP8 - map it on i8.
318321
return Type::getIntNTy(*Context, 8);
319322
case 16:
320323
if (T->isTypeFloat(16, FPEncodingBFloat16KHR))
@@ -1072,11 +1075,12 @@ Value *SPIRVToLLVM::transConvertInst(SPIRVValue *BV, Function *F,
10721075
return FPEncodingWrap::IEEE754;
10731076
};
10741077

1075-
auto IsFP8Encoding = [](FPEncodingWrap Encoding) -> bool {
1076-
return Encoding == FPEncodingWrap::E4M3 || Encoding == FPEncodingWrap::E5M2;
1078+
auto IsFP4OrFP8Encoding = [](FPEncodingWrap Encoding) -> bool {
1079+
return Encoding == FPEncodingWrap::E4M3 ||
1080+
Encoding == FPEncodingWrap::E5M2 || Encoding == FPEncodingWrap::E2M1;
10771081
};
10781082

1079-
switch (BC->getOpCode()) {
1083+
switch (static_cast<unsigned>(BC->getOpCode())) {
10801084
case OpPtrCastToGeneric:
10811085
case OpGenericCastToPtr:
10821086
case OpPtrCastToCrossWorkgroupINTEL:
@@ -1097,6 +1101,11 @@ Value *SPIRVToLLVM::transConvertInst(SPIRVValue *BV, Function *F,
10971101
case OpUConvert:
10981102
CO = IsExt ? Instruction::ZExt : Instruction::Trunc;
10991103
break;
1104+
case internal::OpClampConvertFToFINTEL:
1105+
case internal::OpClampConvertFToSINTEL:
1106+
case internal::OpStochasticRoundFToFINTEL:
1107+
case internal::OpClampStochasticRoundFToFINTEL:
1108+
case internal::OpClampStochasticRoundFToSINTEL:
11001109
case OpConvertSToF:
11011110
case OpConvertFToS:
11021111
case OpConvertUToF:
@@ -1121,7 +1130,7 @@ Value *SPIRVToLLVM::transConvertInst(SPIRVValue *BV, Function *F,
11211130

11221131
FPEncodingWrap SrcEnc = GetEncodingAndUpdateType(SPVSrcTy);
11231132
FPEncodingWrap DstEnc = GetEncodingAndUpdateType(SPVDstTy);
1124-
if (IsFP8Encoding(SrcEnc) || IsFP8Encoding(DstEnc) ||
1133+
if (IsFP4OrFP8Encoding(SrcEnc) || IsFP4OrFP8Encoding(DstEnc) ||
11251134
SPVSrcTy->isTypeInt(4) || SPVDstTy->isTypeInt(4)) {
11261135
FPConversionDesc FPDesc = {SrcEnc, DstEnc, BC->getOpCode()};
11271136
auto Conv = SPIRV::FPConvertToEncodingMap::rmap(FPDesc);
@@ -1131,13 +1140,47 @@ Value *SPIRVToLLVM::transConvertInst(SPIRVValue *BV, Function *F,
11311140
std::string BuiltinName =
11321141
kSPIRVName::InternalBuiltinPrefix + std::string(Conv);
11331142
BuiltinFuncMangleInfo Info;
1134-
std::string MangledName = mangleBuiltin(BuiltinName, OpsTys, &Info);
1143+
std::string MangledName;
1144+
// Translate additional Ops for stochastic conversions.
1145+
if (OC == internal::OpStochasticRoundFToFINTEL ||
1146+
OC == internal::OpClampStochasticRoundFToFINTEL ||
1147+
OC == internal::OpClampStochasticRoundFToSINTEL) {
1148+
// Seed.
1149+
Ops.emplace_back(transValue(SPVOps[1], F, BB, true));
1150+
OpsTys.emplace_back(Ops[1]->getType());
1151+
constexpr unsigned MaxOpsSize = 3;
1152+
if (SPVOps.size() == MaxOpsSize) {
1153+
// New Seed.
1154+
Ops.emplace_back(transValue(SPVOps[2], F, BB, true));
1155+
1156+
// The following mess is needed to create a function with correct
1157+
// mangling.
1158+
SPIRVType *PtrTy = SPVOps[2]->getType();
1159+
const unsigned AS =
1160+
SPIRSPIRVAddrSpaceMap::rmap(PtrTy->getPointerStorageClass());
1161+
Type *ElementTy = transType(PtrTy->getPointerElementType());
1162+
OpsTys.emplace_back(TypedPointerType::get(ElementTy, AS));
1163+
MangledName = mangleBuiltin(BuiltinName, OpsTys, &Info);
1164+
// But to create function itself we need untyped pointer type.
1165+
OpsTys[2] = opaquifyType(OpsTys[2]);
1166+
}
1167+
}
1168+
1169+
if (MangledName.empty())
1170+
MangledName = mangleBuiltin(BuiltinName, OpsTys, &Info);
11351171

11361172
FunctionType *FTy = FunctionType::get(Dst, OpsTys, false);
11371173
FunctionCallee Func = M->getOrInsertFunction(MangledName, FTy);
11381174
return CallInst::Create(Func, Ops, "", BB);
11391175
}
11401176
}
1177+
// These conversions can be done without __builtin_spirv prefixed functions
1178+
// as their operand and result types have native representation in LLVM IR.
1179+
if (OC == internal::OpClampConvertFToFINTEL ||
1180+
OC == internal::OpStochasticRoundFToFINTEL ||
1181+
OC == internal::OpClampStochasticRoundFToFINTEL)
1182+
return mapValue(BV, transSPIRVBuiltinFromInst(
1183+
static_cast<SPIRVInstruction *>(BV), BB));
11411184

11421185
if (OC == OpFConvert) {
11431186
CO = IsExt ? Instruction::FPExt : Instruction::FPTrunc;
@@ -2973,7 +3016,11 @@ Value *SPIRVToLLVM::transValueWithoutDecoration(SPIRVValue *BV, Function *F,
29733016
if (OutMatrixElementTy->isTypeFloat(8, FPEncodingFloat8E4M3EXT) ||
29743017
OutMatrixElementTy->isTypeFloat(8, FPEncodingFloat8E5M2EXT) ||
29753018
InMatrixElementTy->isTypeFloat(8, FPEncodingFloat8E4M3EXT) ||
2976-
InMatrixElementTy->isTypeFloat(8, FPEncodingFloat8E5M2EXT))
3019+
InMatrixElementTy->isTypeFloat(8, FPEncodingFloat8E5M2EXT) ||
3020+
OutMatrixElementTy->isTypeFloat(
3021+
4, internal::FPEncodingFloat4E2M1INTEL) ||
3022+
InMatrixElementTy->isTypeFloat(4,
3023+
internal::FPEncodingFloat4E2M1INTEL))
29773024
Inst = transConvertInst(BV, F, BB);
29783025
else
29793026
Inst = transSPIRVBuiltinFromInst(BI, BB);
@@ -2982,6 +3029,8 @@ Value *SPIRVToLLVM::transValueWithoutDecoration(SPIRVValue *BV, Function *F,
29823029
}
29833030
return mapValue(BV, Inst);
29843031
}
3032+
if (isIntelCvtOpCode(OC))
3033+
return mapValue(BV, transConvertInst(BV, F, BB));
29853034
return mapValue(
29863035
BV, transSPIRVBuiltinFromInst(static_cast<SPIRVInstruction *>(BV), BB));
29873036
}
@@ -3705,6 +3754,11 @@ Instruction *SPIRVToLLVM::transSPIRVBuiltinFromInst(SPIRVInstruction *BI,
37053754
case internal::OpCooperativeMatrixLoadCheckedINTEL:
37063755
case internal::OpConvertHandleToImageINTEL:
37073756
case internal::OpConvertHandleToSampledImageINTEL:
3757+
case internal::OpClampConvertFToFINTEL:
3758+
case internal::OpClampConvertFToSINTEL:
3759+
case internal::OpStochasticRoundFToFINTEL:
3760+
case internal::OpClampStochasticRoundFToFINTEL:
3761+
case internal::OpClampStochasticRoundFToSINTEL:
37083762
AddRetTypePostfix = true;
37093763
break;
37103764
default: {

‎lib/SPIRV/SPIRVToOCL.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,10 @@ void SPIRVToOCLBase::visitCastInst(CastInst &Cast) {
234234
DstVecTy->getScalarSizeInBits() == 1)
235235
return;
236236

237+
// We don't have OpenCL builtins for 4-bit conversions.
238+
if (DstVecTy->getScalarSizeInBits() == 4 || SrcTy->getScalarSizeInBits() == 4)
239+
return;
240+
237241
// Assemble built-in name -> convert_gentypeN
238242
std::string CastBuiltInName(kOCLBuiltinName::ConvertPrefix);
239243
// Check if this is 'floating point -> unsigned integer' cast

0 commit comments

Comments
 (0)