[MVT][TableGen] Extend Machine Value Type to uint16_t
#99657
Conversation
|
@llvm/pr-subscribers-flang-fir-hlfir @llvm/pr-subscribers-llvm-selectiondag Author: Brandon Wu (4vtomat) ChangesCurrently 208 out of 256 MVTs are used, it will be run out soon, so The statistics below shows the difference of the generated matcher table The statistics below shows the runtime peak memory usage by compiling a Target Before(kbytes) After(kbytes) Change(%) Full diff: https://github.com/llvm/llvm-project/pull/99657.diff 6 Files Affected:
diff --git a/llvm/include/llvm/CodeGenTypes/MachineValueType.h b/llvm/include/llvm/CodeGenTypes/MachineValueType.h
index 7e7608c34fb70..556531c3147e5 100644
--- a/llvm/include/llvm/CodeGenTypes/MachineValueType.h
+++ b/llvm/include/llvm/CodeGenTypes/MachineValueType.h
@@ -33,7 +33,7 @@ namespace llvm {
/// type can be represented by an MVT.
class MVT {
public:
- enum SimpleValueType : uint8_t {
+ enum SimpleValueType : uint16_t {
// Simple value types that aren't explicitly part of this enumeration
// are considered extended value types.
INVALID_SIMPLE_VALUE_TYPE = 0,
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
index df3d207d85d35..63612ffdc9397 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
@@ -2896,8 +2896,10 @@ CheckChild2CondCode(const unsigned char *MatcherTable, unsigned &MatcherIndex,
LLVM_ATTRIBUTE_ALWAYS_INLINE static bool
CheckValueType(const unsigned char *MatcherTable, unsigned &MatcherIndex,
SDValue N, const TargetLowering *TLI, const DataLayout &DL) {
- MVT::SimpleValueType VT =
- static_cast<MVT::SimpleValueType>(MatcherTable[MatcherIndex++]);
+ unsigned SimpleVT = MatcherTable[MatcherIndex++];
+ if (SimpleVT & 128)
+ SimpleVT = GetVBR(SimpleVT, MatcherTable, MatcherIndex);
+ MVT::SimpleValueType VT = static_cast<MVT::SimpleValueType>(SimpleVT);
if (cast<VTSDNode>(N)->getVT() == VT)
return true;
@@ -3027,7 +3029,10 @@ static unsigned IsPredicateKnownToFail(const unsigned char *Table,
VT = MVT::i64;
break;
default:
- VT = static_cast<MVT::SimpleValueType>(Table[Index++]);
+ unsigned SimpleVT = Table[Index++];
+ if (SimpleVT & 128)
+ SimpleVT = GetVBR(SimpleVT, Table, Index);
+ VT = static_cast<MVT::SimpleValueType>(SimpleVT);
break;
}
Result = !::CheckType(VT, N, SDISel.TLI, SDISel.CurDAG->getDataLayout());
@@ -3035,7 +3040,10 @@ static unsigned IsPredicateKnownToFail(const unsigned char *Table,
}
case SelectionDAGISel::OPC_CheckTypeRes: {
unsigned Res = Table[Index++];
- Result = !::CheckType(static_cast<MVT::SimpleValueType>(Table[Index++]),
+ unsigned SimpleVT = Table[Index++];
+ if (SimpleVT & 128)
+ SimpleVT = GetVBR(SimpleVT, Table, Index);
+ Result = !::CheckType(static_cast<MVT::SimpleValueType>(SimpleVT),
N.getValue(Res), SDISel.TLI,
SDISel.CurDAG->getDataLayout());
return Index;
@@ -3075,7 +3083,10 @@ static unsigned IsPredicateKnownToFail(const unsigned char *Table,
VT = MVT::i64;
ChildNo = Opcode - SelectionDAGISel::OPC_CheckChild0TypeI64;
} else {
- VT = static_cast<MVT::SimpleValueType>(Table[Index++]);
+ unsigned SimpleVT = Table[Index++];
+ if (SimpleVT & 128)
+ SimpleVT = GetVBR(SimpleVT, Table, Index);
+ VT = static_cast<MVT::SimpleValueType>(SimpleVT);
ChildNo = Opcode - SelectionDAGISel::OPC_CheckChild0Type;
}
Result = !::CheckChildType(VT, N, SDISel.TLI,
@@ -3579,7 +3590,10 @@ void SelectionDAGISel::SelectCodeCommon(SDNode *NodeToMatch,
VT = MVT::i64;
break;
default:
- VT = static_cast<MVT::SimpleValueType>(MatcherTable[MatcherIndex++]);
+ unsigned SimpleVT = MatcherTable[MatcherIndex++];
+ if (SimpleVT & 128)
+ SimpleVT = GetVBR(SimpleVT, MatcherTable, MatcherIndex);
+ VT = static_cast<MVT::SimpleValueType>(SimpleVT);
break;
}
if (!::CheckType(VT, N, TLI, CurDAG->getDataLayout()))
@@ -3588,9 +3602,11 @@ void SelectionDAGISel::SelectCodeCommon(SDNode *NodeToMatch,
case OPC_CheckTypeRes: {
unsigned Res = MatcherTable[MatcherIndex++];
- if (!::CheckType(
- static_cast<MVT::SimpleValueType>(MatcherTable[MatcherIndex++]),
- N.getValue(Res), TLI, CurDAG->getDataLayout()))
+ unsigned SimpleVT = MatcherTable[MatcherIndex++];
+ if (SimpleVT & 128)
+ SimpleVT = GetVBR(SimpleVT, MatcherTable, MatcherIndex);
+ if (!::CheckType(static_cast<MVT::SimpleValueType>(SimpleVT),
+ N.getValue(Res), TLI, CurDAG->getDataLayout()))
break;
continue;
}
@@ -3629,7 +3645,7 @@ void SelectionDAGISel::SelectCodeCommon(SDNode *NodeToMatch,
case OPC_SwitchType: {
MVT CurNodeVT = N.getSimpleValueType();
unsigned SwitchStart = MatcherIndex-1; (void)SwitchStart;
- unsigned CaseSize;
+ unsigned CaseSize, CaseSimpleVT;
while (true) {
// Get the size of this case.
CaseSize = MatcherTable[MatcherIndex++];
@@ -3637,8 +3653,10 @@ void SelectionDAGISel::SelectCodeCommon(SDNode *NodeToMatch,
CaseSize = GetVBR(CaseSize, MatcherTable, MatcherIndex);
if (CaseSize == 0) break;
- MVT CaseVT =
- static_cast<MVT::SimpleValueType>(MatcherTable[MatcherIndex++]);
+ CaseSimpleVT = MatcherTable[MatcherIndex++];
+ if (CaseSimpleVT & 128)
+ CaseSimpleVT = GetVBR(CaseSimpleVT, MatcherTable, MatcherIndex);
+ MVT CaseVT = static_cast<MVT::SimpleValueType>(CaseSimpleVT);
if (CaseVT == MVT::iPTR)
CaseVT = TLI->getPointerTy(CurDAG->getDataLayout());
@@ -3694,7 +3712,10 @@ void SelectionDAGISel::SelectCodeCommon(SDNode *NodeToMatch,
VT = MVT::i64;
ChildNo = Opcode - SelectionDAGISel::OPC_CheckChild0TypeI64;
} else {
- VT = static_cast<MVT::SimpleValueType>(MatcherTable[MatcherIndex++]);
+ unsigned SimpleVT = MatcherTable[MatcherIndex++];
+ if (SimpleVT & 128)
+ SimpleVT = GetVBR(SimpleVT, MatcherTable, MatcherIndex);
+ VT = static_cast<MVT::SimpleValueType>(SimpleVT);
ChildNo = Opcode - SelectionDAGISel::OPC_CheckChild0Type;
}
if (!::CheckChildType(VT, N, TLI, CurDAG->getDataLayout(), ChildNo))
@@ -3788,7 +3809,10 @@ void SelectionDAGISel::SelectCodeCommon(SDNode *NodeToMatch,
VT = MVT::i64;
break;
default:
- VT = static_cast<MVT::SimpleValueType>(MatcherTable[MatcherIndex++]);
+ unsigned SimpleVT = MatcherTable[MatcherIndex++];
+ if (SimpleVT & 128)
+ SimpleVT = GetVBR(SimpleVT, MatcherTable, MatcherIndex);
+ VT = static_cast<MVT::SimpleValueType>(SimpleVT);
break;
}
int64_t Val = MatcherTable[MatcherIndex++];
@@ -3812,7 +3836,10 @@ void SelectionDAGISel::SelectCodeCommon(SDNode *NodeToMatch,
VT = MVT::i64;
break;
default:
- VT = static_cast<MVT::SimpleValueType>(MatcherTable[MatcherIndex++]);
+ unsigned SimpleVT = MatcherTable[MatcherIndex++];
+ if (SimpleVT & 128)
+ SimpleVT = GetVBR(SimpleVT, MatcherTable, MatcherIndex);
+ VT = static_cast<MVT::SimpleValueType>(SimpleVT);
break;
}
unsigned RegNo = MatcherTable[MatcherIndex++];
@@ -3824,8 +3851,10 @@ void SelectionDAGISel::SelectCodeCommon(SDNode *NodeToMatch,
// For targets w/ more than 256 register names, the register enum
// values are stored in two bytes in the matcher table (just like
// opcodes).
- MVT::SimpleValueType VT =
- static_cast<MVT::SimpleValueType>(MatcherTable[MatcherIndex++]);
+ unsigned SimpleVT = MatcherTable[MatcherIndex++];
+ if (SimpleVT & 128)
+ SimpleVT = GetVBR(SimpleVT, MatcherTable, MatcherIndex);
+ MVT::SimpleValueType VT = static_cast<MVT::SimpleValueType>(SimpleVT);
unsigned RegNo = MatcherTable[MatcherIndex++];
RegNo |= MatcherTable[MatcherIndex++] << 8;
RecordedNodes.push_back(std::pair<SDValue, SDNode*>(
@@ -4063,8 +4092,10 @@ void SelectionDAGISel::SelectCodeCommon(SDNode *NodeToMatch,
NumVTs = MatcherTable[MatcherIndex++];
SmallVector<EVT, 4> VTs;
for (unsigned i = 0; i != NumVTs; ++i) {
- MVT::SimpleValueType VT =
- static_cast<MVT::SimpleValueType>(MatcherTable[MatcherIndex++]);
+ unsigned SimpleVT = MatcherTable[MatcherIndex++];
+ if (SimpleVT & 128)
+ SimpleVT = GetVBR(SimpleVT, MatcherTable, MatcherIndex);
+ MVT::SimpleValueType VT = static_cast<MVT::SimpleValueType>(SimpleVT);
if (VT == MVT::iPTR)
VT = TLI->getPointerTy(CurDAG->getDataLayout()).SimpleTy;
VTs.push_back(VT);
diff --git a/llvm/test/TableGen/dag-isel-regclass-emit-enum.td b/llvm/test/TableGen/dag-isel-regclass-emit-enum.td
index ba60df2bbcf6e..0fd7fa02f064c 100644
--- a/llvm/test/TableGen/dag-isel-regclass-emit-enum.td
+++ b/llvm/test/TableGen/dag-isel-regclass-emit-enum.td
@@ -27,13 +27,13 @@ def GPRAbove127 : RegisterClass<"TestTarget", [i32], 32,
// CHECK-NEXT: OPC_CheckChild1Integer, 0,
// CHECK-NEXT: OPC_EmitInteger32, 0|128,2/*256*/,
// CHECK-NEXT: OPC_MorphNodeTo1None, TARGET_VAL(TargetOpcode::COPY_TO_REGCLASS),
-// CHECK-NEXT: MVT::i32, 2/*#Ops*/, 1, 0,
+// CHECK-NEXT: 7, 2/*#Ops*/, 1, 0,
def : Pat<(i32 (add i32:$src, (i32 0))),
(COPY_TO_REGCLASS GPRAbove127, GPR0:$src)>;
// CHECK: OPC_CheckChild1Integer, 2,
// CHECK-NEXT: OPC_EmitStringInteger32, TestNamespace::GPR127RegClassID,
// CHECK-NEXT: OPC_MorphNodeTo1None, TARGET_VAL(TargetOpcode::COPY_TO_REGCLASS),
-// CHECK-NEXT: MVT::i32, 2/*#Ops*/, 1, 0,
+// CHECK-NEXT: 7, 2/*#Ops*/, 1, 0,
def : Pat<(i32 (add i32:$src, (i32 1))),
(COPY_TO_REGCLASS GPR127, GPR0:$src)>;
diff --git a/llvm/utils/TableGen/Common/CodeGenDAGPatterns.h b/llvm/utils/TableGen/Common/CodeGenDAGPatterns.h
index 1f4d45d81fd33..bac213a356d84 100644
--- a/llvm/utils/TableGen/Common/CodeGenDAGPatterns.h
+++ b/llvm/utils/TableGen/Common/CodeGenDAGPatterns.h
@@ -48,15 +48,15 @@ class CodeGenDAGPatterns;
using TreePatternNodePtr = IntrusiveRefCntPtr<TreePatternNode>;
/// This represents a set of MVTs. Since the underlying type for the MVT
-/// is uint8_t, there are at most 256 values. To reduce the number of memory
+/// is uint16_t, there are at most 65536 values. To reduce the number of memory
/// allocations and deallocations, represent the set as a sequence of bits.
/// To reduce the allocations even further, make MachineValueTypeSet own
/// the storage and use std::array as the bit container.
struct MachineValueTypeSet {
static_assert(std::is_same<std::underlying_type_t<MVT::SimpleValueType>,
- uint8_t>::value,
- "Change uint8_t here to the SimpleValueType's type");
- static unsigned constexpr Capacity = std::numeric_limits<uint8_t>::max() + 1;
+ uint16_t>::value,
+ "Change uint16_t here to the SimpleValueType's type");
+ static unsigned constexpr Capacity = std::numeric_limits<uint16_t>::max() + 1;
using WordType = uint64_t;
static unsigned constexpr WordWidth = CHAR_BIT * sizeof(WordType);
static unsigned constexpr NumWords = Capacity / WordWidth;
diff --git a/llvm/utils/TableGen/DAGISelMatcherEmitter.cpp b/llvm/utils/TableGen/DAGISelMatcherEmitter.cpp
index 229245ff40504..178ceb1443335 100644
--- a/llvm/utils/TableGen/DAGISelMatcherEmitter.cpp
+++ b/llvm/utils/TableGen/DAGISelMatcherEmitter.cpp
@@ -339,7 +339,8 @@ unsigned MatcherTableEmitter::SizeMatcher(Matcher *N, raw_ostream &OS) {
Size += 2; // Count the child's opcode.
} else {
Child = cast<SwitchTypeMatcher>(N)->getCaseMatcher(i);
- ++Size; // Count the child's type.
+ Size += GetVBRSize(cast<SwitchTypeMatcher>(N)->getCaseType(
+ i)); // Count the child's type.
}
const unsigned ChildSize = SizeMatcherList(Child, OS);
assert(ChildSize != 0 && "Matcher cannot have child of size 0");
@@ -599,7 +600,8 @@ unsigned MatcherTableEmitter::EmitMatcher(const Matcher *N,
IdxSize = 2; // size of opcode in table is 2 bytes.
} else {
Child = cast<SwitchTypeMatcher>(N)->getCaseMatcher(i);
- IdxSize = 1; // size of type in table is 1 byte.
+ IdxSize = GetVBRSize(cast<SwitchTypeMatcher>(N)->getCaseType(
+ i)); // size of type in table is sizeof(MVT) byte.
}
if (i != 0) {
@@ -616,7 +618,8 @@ unsigned MatcherTableEmitter::EmitMatcher(const Matcher *N,
if (const SwitchOpcodeMatcher *SOM = dyn_cast<SwitchOpcodeMatcher>(N))
OS << "TARGET_VAL(" << SOM->getCaseOpcode(i).getEnumName() << "),";
else
- OS << getEnumName(cast<SwitchTypeMatcher>(N)->getCaseType(i)) << ',';
+ EmitVBRValue(cast<SwitchTypeMatcher>(N)->getCaseType(i),
+ OS); // size of type in table is sizeof(MVT) byte.
if (!OmitComments)
OS << "// ->" << CurrentIdx + ChildSize;
OS << '\n';
@@ -639,7 +642,7 @@ unsigned MatcherTableEmitter::EmitMatcher(const Matcher *N,
return CurrentIdx - StartIdx + 1;
}
- case Matcher::CheckType:
+ case Matcher::CheckType: {
if (cast<CheckTypeMatcher>(N)->getResNo() == 0) {
MVT::SimpleValueType VT = cast<CheckTypeMatcher>(N)->getType();
switch (VT) {
@@ -648,13 +651,17 @@ unsigned MatcherTableEmitter::EmitMatcher(const Matcher *N,
OS << "OPC_CheckTypeI" << MVT(VT).getSizeInBits() << ",\n";
return 1;
default:
- OS << "OPC_CheckType, " << getEnumName(VT) << ",\n";
- return 2;
+ OS << "OPC_CheckType, ";
+ unsigned NumBytes = EmitVBRValue(VT, OS);
+ OS << "\n";
+ return NumBytes + 1;
}
}
- OS << "OPC_CheckTypeRes, " << cast<CheckTypeMatcher>(N)->getResNo() << ", "
- << getEnumName(cast<CheckTypeMatcher>(N)->getType()) << ",\n";
- return 3;
+ OS << "OPC_CheckTypeRes, " << cast<CheckTypeMatcher>(N)->getResNo() << ", ";
+ unsigned NumBytes = EmitVBRValue(cast<CheckTypeMatcher>(N)->getType(), OS);
+ OS << "\n";
+ return NumBytes + 2;
+ }
case Matcher::CheckChildType: {
MVT::SimpleValueType VT = cast<CheckChildTypeMatcher>(N)->getType();
@@ -666,8 +673,10 @@ unsigned MatcherTableEmitter::EmitMatcher(const Matcher *N,
return 1;
default:
OS << "OPC_CheckChild" << cast<CheckChildTypeMatcher>(N)->getChildNo()
- << "Type, " << getEnumName(VT) << ",\n";
- return 2;
+ << "Type, ";
+ unsigned NumBytes = EmitVBRValue(VT, OS);
+ OS << "\n";
+ return NumBytes + 1;
}
}
@@ -696,10 +705,13 @@ unsigned MatcherTableEmitter::EmitMatcher(const Matcher *N,
<< cast<CheckChild2CondCodeMatcher>(N)->getCondCodeName() << ",\n";
return 2;
- case Matcher::CheckValueType:
- OS << "OPC_CheckValueType, "
- << getEnumName(cast<CheckValueTypeMatcher>(N)->getVT()) << ",\n";
- return 2;
+ case Matcher::CheckValueType: {
+ OS << "OPC_CheckValueType, ";
+ unsigned NumBytes =
+ EmitVBRValue(cast<CheckValueTypeMatcher>(N)->getVT(), OS);
+ OS << "\n";
+ return NumBytes + 1;
+ }
case Matcher::CheckComplexPat: {
const CheckComplexPatMatcher *CCPM = cast<CheckComplexPatMatcher>(N);
@@ -766,8 +778,8 @@ unsigned MatcherTableEmitter::EmitMatcher(const Matcher *N,
OS << "OPC_EmitInteger" << MVT(VT).getSizeInBits() << ", ";
break;
default:
- OpBytes = 2;
- OS << "OPC_EmitInteger, " << getEnumName(VT) << ", ";
+ OS << "OPC_EmitInteger, ";
+ OpBytes = EmitVBRValue(VT, OS) + 1;
break;
}
unsigned Bytes = OpBytes + EmitSignedVBRValue(Val, OS);
@@ -785,8 +797,8 @@ unsigned MatcherTableEmitter::EmitMatcher(const Matcher *N,
OS << "OPC_EmitStringInteger" << MVT(VT).getSizeInBits() << ", ";
break;
default:
- OpBytes = 2;
- OS << "OPC_EmitStringInteger, " << getEnumName(VT) << ", ";
+ OS << "OPC_EmitStringInteger, ";
+ OpBytes = EmitVBRValue(VT, OS) + 1;
break;
}
OS << Val << ",\n";
@@ -797,14 +809,15 @@ unsigned MatcherTableEmitter::EmitMatcher(const Matcher *N,
const EmitRegisterMatcher *Matcher = cast<EmitRegisterMatcher>(N);
const CodeGenRegister *Reg = Matcher->getReg();
MVT::SimpleValueType VT = Matcher->getVT();
+ unsigned OpBytes;
// If the enum value of the register is larger than one byte can handle,
// use EmitRegister2.
if (Reg && Reg->EnumValue > 255) {
- OS << "OPC_EmitRegister2, " << getEnumName(VT) << ", ";
+ OS << "OPC_EmitRegister2, ";
+ OpBytes = EmitVBRValue(VT, OS);
OS << "TARGET_VAL(" << getQualifiedName(Reg->TheDef) << "),\n";
- return 4;
+ return OpBytes + 3;
}
- unsigned OpBytes;
switch (VT) {
case MVT::i32:
case MVT::i64:
@@ -812,8 +825,8 @@ unsigned MatcherTableEmitter::EmitMatcher(const Matcher *N,
OS << "OPC_EmitRegisterI" << MVT(VT).getSizeInBits() << ", ";
break;
default:
- OpBytes = 2;
- OS << "OPC_EmitRegister, " << getEnumName(VT) << ", ";
+ OS << "OPC_EmitRegister, ";
+ OpBytes = EmitVBRValue(VT, OS) + 1;
break;
}
if (Reg) {
@@ -958,8 +971,9 @@ unsigned MatcherTableEmitter::EmitMatcher(const Matcher *N,
OS << "/*#VTs*/";
OS << ", ";
}
+ unsigned NumTypeBytes = 0;
for (unsigned i = 0, e = EN->getNumVTs(); i != e; ++i)
- OS << getEnumName(EN->getVT(i)) << ", ";
+ NumTypeBytes += EmitVBRValue(EN->getVT(i), OS);
OS << EN->getNumOperands();
if (!OmitComments)
@@ -992,7 +1006,7 @@ unsigned MatcherTableEmitter::EmitMatcher(const Matcher *N,
} else
OS << '\n';
- return 4 + !CompressVTs + !CompressNodeInfo + EN->getNumVTs() +
+ return 4 + !CompressVTs + !CompressNodeInfo + NumTypeBytes +
NumOperandBytes + NumCoveredBytes;
}
case Matcher::CompleteMatch: {
diff --git a/llvm/utils/TableGen/VTEmitter.cpp b/llvm/utils/TableGen/VTEmitter.cpp
index 851a525cf48c0..77d3514b4c22c 100644
--- a/llvm/utils/TableGen/VTEmitter.cpp
+++ b/llvm/utils/TableGen/VTEmitter.cpp
@@ -79,12 +79,12 @@ static void VTtoGetLLVMTyString(raw_ostream &OS, const Record *VT) {
void VTEmitter::run(raw_ostream &OS) {
emitSourceFileHeader("ValueTypes Source Fragment", OS, Records);
- std::array<const Record *, 256> VTsByNumber = {};
+ std::array<const Record *, 65536> VTsByNumber = {};
auto ValueTypes = Records.getAllDerivedDefinitions("ValueType");
for (auto *VT : ValueTypes) {
auto Number = VT->getValueAsInt("Value");
assert(0 <= Number && Number < (int)VTsByNumber.size() &&
- "ValueType should be uint8_t");
+ "ValueType should be uint16_t");
assert(!VTsByNumber[Number] && "Duplicate ValueType");
VTsByNumber[Number] = VT;
}
|
Please use the "Total Array size is X bytes" that appears in every file. |
Oh actually it's the "total size of the file", I just notice that there's "total array size" in each file, let me change it. |
|
Why are there decreases of total bytes and memory usage? I suppose it should increase? |
4vtomat
force-pushed
the
extend_mvt_to_16_bits
branch
from
7db6e8c to
b470e33
Compare
llvmbot
added
flang
4vtomat
force-pushed
the
extend_mvt_to_16_bits
branch
from
b470e33 to
f944eef
Compare
Total bytes of array actually increases especially for |
Currently 208 out of 256 MVTs are used, it will be run out soon, so ultimately we need to extend the original `MVT::SimpleValueType` from `uint8_t` to `uint16_t` to accomodate more types. The `MatcherTable` uses `unsigned char` for encoding the matcher code, so the extended MVTs are no longer fit into the table, thus we need to use VBR to encode them as we do on others that are wider than 8 bits. The statistics below shows the difference of "Total Array size" of the matcher table that appears in every files: Table Before After Change(%) WebAssemblyGenDAGISel.inc 23576 23775 0.844 NVPTXGenDAGISel.inc 173498 173498 0 RISCVGenDAGISel.inc 2179121 2369929 8.756 AVRGenDAGISel.inc 2754 2754 0 PPCGenDAGISel.inc 163315 163617 0.185 MipsGenDAGISel.inc 47280 47447 0.353 SystemZGenDAGISel.inc 56243 56461 0.388 AArch64GenDAGISel.inc 467893 487830 4.261 MSP430GenDAGISel.inc 8069 8069 0 LoongArchGenDAGISel.inc 78928 79131 0.257 XCoreGenDAGISel.inc 3432 3432 0 BPFGenDAGISel.inc 3733 3733 0 VEGenDAGISel.inc 65174 66456 1.967 LanaiGenDAGISel.inc 2067 2067 0 X86GenDAGISel.inc 628787 636987 1.304 ARMGenDAGISel.inc 170968 171036 0.040 HexagonGenDAGISel.inc 155764 155764 0 SparcGenDAGISel.inc 5762 5798 0.625 AMDGPUGenDAGISel.inc 504356 504463 0.021 R600GenDAGISel.inc 29785 29785 0 The statistics below shows the runtime peak memory usage by compiling a simple C program: `/bin/time -v clang -target $TARGET -O3 -c test.c` ``` int test(int a) { return a * 3; } ``` Target Before(kbytes) After(kbytes) Change(%) wasm64 110172 110088 -0.076 nvptx64 109784 109980 0.179 riscv64 114020 113656 -0.319 avr 110352 110068 -0.257 ppc64 112612 112476 -0.120 mips64 113588 113668 0.070 systemz 110860 110760 -0.090 aarch64 113704 113432 -0.239 msp430 110284 110200 -0.076 loongarch64 111052 110756 -0.267 xcore 108340 108020 -0.295 bpf 110620 110708 0.080 ve 110960 110920 -0.036 lanai 110180 109960 -0.200 x86_64 113640 113304 -0.296 arm64 113540 113172 -0.324 hexagon 114620 114684 0.056 sparc 110412 110136 -0.250 amdgcn 118164 117144 -0.863 r600 111200 110508 -0.622
4vtomat
force-pushed
the
extend_mvt_to_16_bits
branch
from
f944eef to
177d282
Compare
clementval
removed
flang
|
I think the community needs to be notified by this change (the impact is big), please file a RFC on the discourse forum. :-) |
Sure, I'm cooking on this! |
There was a problem hiding this comment.
@4vtomat Please can you get a https://llvm-compile-time-tracker.com/ report on the effect on compile time as well please?
|
Another NOTE: after this patch, we should reorder the MVT values and move top-128-uses MVTs ahead to reduce MatcherTable size. |
Sure, here it is: https://llvm-compile-time-tracker.com/compare.php?from=4b9fab591916eec9fd1942f37afe3b137b564089&to=177d28247efe5a4d59a8d8150b4daf01e4f57d74&stat=wall-time. |
You are right, maybe we need to collect some data and see what the order should be. |
|
Should we move these to the end of the 16-bit space which will change the sizes you measured. Or maybe put them near 14-bits so they stay as 2 byte VBRs? |
Aren't they grouped in ranges? |
Yea, I guess I can move it to align 2^14 so that the size won't change. |
I think @wangpc-pp means reorder the group? |
I don't think patch will have much if any effect on the runtime memory usage SelectionDAG. SelectionDAG runtime memory usage is more directly affected by |
Yes, but I don't think that will be easy. There are quite a few places that loop over all integer types or all vector types by assuming they are in continguous ranges. |
Correct, I just changed |
Yes! I was thinking about reordering these groups. And further, we can reorder all MVTs one by one.
This assumption is weak, we should change it. We can remove these
Agree! But for better maintainability and extendibility, we should address this weakness now. |
|
ping~ |
| @@ -599,7 +600,8 @@ unsigned MatcherTableEmitter::EmitMatcher(const Matcher *N, | |||
| IdxSize = 2; // size of opcode in table is 2 bytes. | |||
| } else { | |||
| Child = cast<SwitchTypeMatcher>(N)->getCaseMatcher(i); | |||
| IdxSize = 1; // size of type in table is 1 byte. | |||
| IdxSize = GetVBRSize(cast<SwitchTypeMatcher>(N)->getCaseType( | |||
| i)); // size of type in table is sizeof(MVT) byte. | |||
There was a problem hiding this comment.
This comment is wrong for VBR isn't it?
There was a problem hiding this comment.
Yes, it should be VBR(MVT).
llvm/utils/TableGen/VTEmitter.cpp
Outdated
| @@ -79,12 +79,12 @@ static void VTtoGetLLVMTyString(raw_ostream &OS, const Record *VT) { | |||
| void VTEmitter::run(raw_ostream &OS) { | |||
| emitSourceFileHeader("ValueTypes Source Fragment", OS, Records); | |||
|
|
|||
| std::array<const Record *, 256> VTsByNumber = {}; | |||
| std::array<const Record *, 65536> VTsByNumber = {}; | |||
There was a problem hiding this comment.
16384? And should probably change to std::vector to avoid a large stack allocation.
You can test this locally with the following command:git-clang-format --diff 4b9fab591916eec9fd1942f37afe3b137b564089 72367a05a0651193be0bf56d6abe29438c914d66 --extensions cpp,h -- llvm/include/llvm/CodeGenTypes/MachineValueType.h llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp llvm/utils/TableGen/Common/CodeGenDAGPatterns.h llvm/utils/TableGen/DAGISelMatcherEmitter.cpp llvm/utils/TableGen/VTEmitter.cppView the diff from clang-format here.diff --git a/llvm/utils/TableGen/DAGISelMatcherEmitter.cpp b/llvm/utils/TableGen/DAGISelMatcherEmitter.cpp
index 1b93e3d5e3..2dcf86ad93 100644
--- a/llvm/utils/TableGen/DAGISelMatcherEmitter.cpp
+++ b/llvm/utils/TableGen/DAGISelMatcherEmitter.cpp
@@ -621,8 +621,7 @@ unsigned MatcherTableEmitter::EmitMatcher(const Matcher *N,
if (!OmitComments)
OS << "/*" << getEnumName(cast<SwitchTypeMatcher>(N)->getCaseType(i))
<< "*/";
- EmitVBRValue(cast<SwitchTypeMatcher>(N)->getCaseType(i),
- OS);
+ EmitVBRValue(cast<SwitchTypeMatcher>(N)->getCaseType(i), OS);
}
if (!OmitComments)
OS << "// ->" << CurrentIdx + ChildSize;
|
|
I'm going to pull the maximum VT down from 16384 to 512 to hopefully bring memory usage under control. |
|
This is showing a compile time regression https://llvm-compile-time-tracker.com/compare.php?from=9718f3dec1c366809b0c2508ba77cc5dd3cf82ec&to=a4c6ebeb20168bbedbb1a3aff9f5096416e5914a&stat=instructions:u |
I reproduced huge time regression when invoking |
Does #101401 help? |
|
@topperc Thanks! This was memory exhausted in my side. |
RFC: https://discourse.llvm.org/t/rfc-extend-machine-value-type-from-uint8-t-to-uint16-t/80274
compile-time-tracker: https://llvm-compile-time-tracker.com/compare.php?from=4b9fab591916eec9fd1942f37afe3b137b564089&to=177d28247efe5a4d59a8d8150b4daf01e4f57d74&stat=wall-time
Currently 208 out of 256 MVTs are used, it will be run out soon, so
ultimately we need to extend the original
MVT::SimpleValueTypefromuint8_ttouint16_tto accomodate more types.The
MatcherTableusesunsigned charfor encoding the matcher code,so the extended MVTs are no longer fit into the table, thus we need to
use VBR to encode them as we do on others that are wider than 8 bits.
The statistics below shows the difference of "Total Array size" of the
matcher table that appears in every files:
The statistics below shows the runtime peak memory usage by compiling a
simple C program:
/bin/time -v clang -target $TARGET -O3 -c test.c