Skip to content

Commit 6f5c0e1

Browse files
committed
[IntrinsicEmitter] Make AttributesMap PackedID type-adaptive
Following up #157965 which made this bit-adaptive, this patch attempts to make this map able to choose type ranging from int8 to int64 based on intrinsic inputs.
1 parent 8e17f80 commit 6f5c0e1

File tree

2 files changed

+25
-17
lines changed

2 files changed

+25
-17
lines changed

llvm/test/TableGen/intrinsic-attrs.td

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def int_deref_ptr_ret : Intrinsic<[llvm_ptr_ty], [], [Dereferenceable<RetIndex,
2424
// CHECK-NEXT: Attribute::get(C, Attribute::NoUnwind),
2525
// CHECK-NEXT: });
2626

27-
// CHECK: static constexpr uint16_t IntrinsicsToAttributesMap[] = {
27+
// CHECK: static constexpr uint8_t IntrinsicsToAttributesMap[] = {
2828
// CHECK: 0 << 2 | 0, // llvm.deref.ptr.ret
2929
// CHECK: 1 << 2 | 1, // llvm.random.gen
3030
// CHECK: }; // IntrinsicsToAttributesMap

llvm/utils/TableGen/Basic/IntrinsicEmitter.cpp

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -617,9 +617,7 @@ static AttributeSet getIntrinsicFnAttributeSet(LLVMContext &C, unsigned ID) {
617617
}
618618
OS << R"(
619619
}
620-
} // getIntrinsicFnAttributeSet
621-
622-
static constexpr uint16_t IntrinsicsToAttributesMap[] = {)";
620+
} // getIntrinsicFnAttributeSet)";
623621

624622
// Compute unique argument attributes.
625623
std::map<const CodeGenIntrinsic *, unsigned, AttributeComparator>
@@ -633,17 +631,26 @@ static constexpr uint16_t IntrinsicsToAttributesMap[] = {)";
633631
// Note, ID `-1` is used to indicate no function attributes.
634632
const uint8_t UniqFnAttributesBitSize =
635633
Log2_32_Ceil(UniqFnAttributes.size() + 2);
636-
const uint16_t NoFunctionAttrsID =
637-
maskTrailingOnes<uint16_t>(UniqFnAttributesBitSize);
638-
if (UniqAttributesBitSize + UniqFnAttributesBitSize > 16)
634+
const uint32_t NoFunctionAttrsID =
635+
maskTrailingOnes<uint32_t>(UniqFnAttributesBitSize);
636+
uint8_t AttributesMapDataBitSize =
637+
PowerOf2Ceil(UniqAttributesBitSize + UniqFnAttributesBitSize);
638+
if (AttributesMapDataBitSize < 8)
639+
AttributesMapDataBitSize = 8;
640+
else if (AttributesMapDataBitSize > 64)
639641
PrintFatalError(
640-
"More than 16 bits are used for IntrinsicsToAttributesMap's entry!");
642+
"Packed ID of IntrinsicsToAttributesMap exceeds 64b!");
643+
else if (AttributesMapDataBitSize > 16)
644+
PrintWarning("Packed ID of IntrinsicsToAttributesMap exceeds 16b, "
645+
"this may cause performance drop!");
641646

642-
// Assign a 16-bit packed ID for each intrinsic. The lower bits will be its
647+
// Assign a packed ID for each intrinsic. The lower bits will be its
643648
// "argument attribute ID" (index in UniqAttributes) and upper bits will be
644649
// its "function attribute ID" (index in UniqFnAttributes).
650+
OS << formatv("\nstatic constexpr uint{}_t IntrinsicsToAttributesMap[] = {{",
651+
AttributesMapDataBitSize);
645652
for (const CodeGenIntrinsic &Int : Ints) {
646-
uint16_t FnAttrIndex =
653+
uint32_t FnAttrIndex =
647654
hasFnAttributes(Int) ? UniqFnAttributes[&Int] : NoFunctionAttrsID;
648655
OS << formatv("\n {} << {} | {}, // {}", FnAttrIndex,
649656
UniqAttributesBitSize, UniqAttributes[&Int], Int.Name);
@@ -751,9 +758,9 @@ AttributeList Intrinsic::getAttributes(LLVMContext &C, ID id,
751758
if (id == 0)
752759
return AttributeList();
753760
754-
uint16_t PackedID = IntrinsicsToAttributesMap[id - 1];
755-
uint16_t FnAttrID = PackedID >> ({});
756-
uint16_t ArgAttrID = PackedID & ({});
761+
uint{}_t PackedID = IntrinsicsToAttributesMap[id - 1];
762+
uint32_t FnAttrID = PackedID >> ({});
763+
uint32_t ArgAttrID = PackedID & ({});
757764
using PairTy = std::pair<unsigned, AttributeSet>;
758765
alignas(PairTy) char ASStorage[sizeof(PairTy) * {}];
759766
PairTy *AS = reinterpret_cast<PairTy *>(ASStorage);
@@ -779,16 +786,17 @@ AttributeList Intrinsic::getAttributes(LLVMContext &C, ID id,
779786
AttributeSet Intrinsic::getFnAttributes(LLVMContext &C, ID id) {
780787
if (id == 0)
781788
return AttributeSet();
782-
uint16_t PackedID = IntrinsicsToAttributesMap[id - 1];
783-
uint16_t FnAttrID = PackedID >> ({});
789+
uint{}_t PackedID = IntrinsicsToAttributesMap[id - 1];
790+
uint32_t FnAttrID = PackedID >> ({});
784791
return getIntrinsicFnAttributeSet(C, FnAttrID);
785792
}
786793
#endif // GET_INTRINSIC_ATTRIBUTES
787794
788795
)",
789-
UniqAttributesBitSize,
796+
AttributesMapDataBitSize, UniqAttributesBitSize,
790797
maskTrailingOnes<uint16_t>(UniqAttributesBitSize), MaxNumAttrs,
791-
NoFunctionAttrsID, UniqAttributesBitSize);
798+
NoFunctionAttrsID,
799+
AttributesMapDataBitSize, UniqAttributesBitSize);
792800
}
793801

794802
void IntrinsicEmitter::EmitIntrinsicToBuiltinMap(

0 commit comments

Comments
 (0)