From b1aa16a18563ebb6824fbe7267420942c802a8ca Mon Sep 17 00:00:00 2001 From: Craig Topper Date: Wed, 28 Aug 2013 04:02:50 +0000 Subject: [PATCH] Merge diagnostic group tables to reduce data size and relocation entries. The individual group and subgroups tables are now two large tables. The option table stores an index into these two tables instead of pointers. This reduces the size of the options tabe since it doesn't need to store pointers. It also reduces the number of relocations needed. My build shows this reducing DiagnosticsIDs.o and the clang binary by ~20.5K. It also removes ~400 relocation entries from DiagnosticIDs.o. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@189438 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Basic/DiagnosticIDs.cpp | 18 ++++---- tools/diagtool/DiagnosticNames.cpp | 16 +++++++ tools/diagtool/DiagnosticNames.h | 22 +++------- utils/TableGen/ClangDiagnosticsEmitter.cpp | 51 ++++++++++++++++------ 4 files changed, 68 insertions(+), 39 deletions(-) diff --git a/lib/Basic/DiagnosticIDs.cpp b/lib/Basic/DiagnosticIDs.cpp index 31e5e6a741..9741f38684 100644 --- a/lib/Basic/DiagnosticIDs.cpp +++ b/lib/Basic/DiagnosticIDs.cpp @@ -507,8 +507,8 @@ struct clang::WarningOption { // shorter type anyway. size_t NameLen; const char *NameStr; - const short *Members; - const short *SubGroups; + uint16_t Members; + uint16_t SubGroups; StringRef getName() const { return StringRef(NameStr, NameLen); @@ -545,16 +545,14 @@ void DiagnosticIDs::getDiagnosticsInGroup( const WarningOption *Group, SmallVectorImpl &Diags) const { // Add the members of the option diagnostic set. - if (const short *Member = Group->Members) { - for (; *Member != -1; ++Member) - Diags.push_back(*Member); - } + const int16_t *Member = DiagArrays + Group->Members; + for (; *Member != -1; ++Member) + Diags.push_back(*Member); // Add the members of the subgroups. - if (const short *SubGroups = Group->SubGroups) { - for (; *SubGroups != (short)-1; ++SubGroups) - getDiagnosticsInGroup(&OptionTable[(short)*SubGroups], Diags); - } + const int16_t *SubGroups = DiagSubGroups + Group->SubGroups; + for (; *SubGroups != (int16_t)-1; ++SubGroups) + getDiagnosticsInGroup(&OptionTable[(short)*SubGroups], Diags); } bool DiagnosticIDs::getDiagnosticsInGroup( diff --git a/tools/diagtool/DiagnosticNames.cpp b/tools/diagtool/DiagnosticNames.cpp index 31f352414f..fa510eb6ec 100644 --- a/tools/diagtool/DiagnosticNames.cpp +++ b/tools/diagtool/DiagnosticNames.cpp @@ -73,6 +73,22 @@ static const GroupRecord OptionTable[] = { #undef GET_DIAG_TABLE }; +GroupRecord::subgroup_iterator GroupRecord::subgroup_begin() const { + return DiagSubGroups + SubGroups; +} + +GroupRecord::subgroup_iterator GroupRecord::subgroup_end() const { + return 0; +} + +GroupRecord::diagnostics_iterator GroupRecord::diagnostics_begin() const { + return DiagArrays + Members; +} + +GroupRecord::diagnostics_iterator GroupRecord::diagnostics_end() const { + return 0; +} + llvm::ArrayRef diagtool::getDiagnosticGroups() { return llvm::makeArrayRef(OptionTable); } diff --git a/tools/diagtool/DiagnosticNames.h b/tools/diagtool/DiagnosticNames.h index 9a731587e5..dd5381f028 100644 --- a/tools/diagtool/DiagnosticNames.h +++ b/tools/diagtool/DiagnosticNames.h @@ -40,9 +40,9 @@ namespace diagtool { // shorter type anyway. size_t NameLen; const char *NameStr; - const short *Members; - const short *SubGroups; - + uint16_t Members; + uint16_t SubGroups; + llvm::StringRef getName() const { return llvm::StringRef(NameStr, NameLen); } @@ -90,20 +90,12 @@ namespace diagtool { }; typedef group_iterator subgroup_iterator; - subgroup_iterator subgroup_begin() const { - return SubGroups; - } - subgroup_iterator subgroup_end() const { - return 0; - } + subgroup_iterator subgroup_begin() const; + subgroup_iterator subgroup_end() const; typedef group_iterator diagnostics_iterator; - diagnostics_iterator diagnostics_begin() const { - return Members; - } - diagnostics_iterator diagnostics_end() const { - return 0; - } + diagnostics_iterator diagnostics_begin() const; + diagnostics_iterator diagnostics_end() const; bool operator<(const GroupRecord &Other) const { return getName() < Other.getName(); diff --git a/utils/TableGen/ClangDiagnosticsEmitter.cpp b/utils/TableGen/ClangDiagnosticsEmitter.cpp index 1f3fd379f4..135e2e7b8d 100644 --- a/utils/TableGen/ClangDiagnosticsEmitter.cpp +++ b/utils/TableGen/ClangDiagnosticsEmitter.cpp @@ -619,6 +619,8 @@ void EmitClangDiagGroups(RecordKeeper &Records, raw_ostream &OS) { // that are mapped to. OS << "\n#ifdef GET_DIAG_ARRAYS\n"; unsigned MaxLen = 0; + OS << "static const int16_t DiagArrays[] = {\n" + << " /* Empty */ -1,\n"; for (std::map::const_iterator I = DiagsInGroup.begin(), E = DiagsInGroup.end(); I != E; ++I) { MaxLen = std::max(MaxLen, (unsigned)I->first.size()); @@ -626,7 +628,7 @@ void EmitClangDiagGroups(RecordKeeper &Records, raw_ostream &OS) { const std::vector &V = I->second.DiagsInGroup; if (!V.empty() || (IsPedantic && !DiagsInPedantic.empty())) { - OS << "static const short DiagArray" << I->second.IDNo << "[] = { "; + OS << " /* DiagArray" << I->second.IDNo << " */ "; for (unsigned i = 0, e = V.size(); i != e; ++i) OS << "diag::" << V[i]->getName() << ", "; // Emit the diagnostics implicitly in "pedantic". @@ -634,12 +636,20 @@ void EmitClangDiagGroups(RecordKeeper &Records, raw_ostream &OS) { for (unsigned i = 0, e = DiagsInPedantic.size(); i != e; ++i) OS << "diag::" << DiagsInPedantic[i]->getName() << ", "; } - OS << "-1 };\n"; + OS << "-1,\n"; } + } + OS << "};\n\n"; + + OS << "static const int16_t DiagSubGroups[] = {\n" + << " /* Empty */ -1,\n"; + for (std::map::const_iterator + I = DiagsInGroup.begin(), E = DiagsInGroup.end(); I != E; ++I) { + const bool IsPedantic = I->first == "pedantic"; const std::vector &SubGroups = I->second.SubGroups; if (!SubGroups.empty() || (IsPedantic && !GroupsInPedantic.empty())) { - OS << "static const short DiagSubGroup" << I->second.IDNo << "[] = { "; + OS << " /* DiagSubGroup" << I->second.IDNo << " */ "; for (unsigned i = 0, e = SubGroups.size(); i != e; ++i) { std::map::const_iterator RI = DiagsInGroup.find(SubGroups[i]); @@ -658,13 +668,15 @@ void EmitClangDiagGroups(RecordKeeper &Records, raw_ostream &OS) { } } - OS << "-1 };\n"; + OS << "-1,\n"; } } + OS << "};\n"; OS << "#endif // GET_DIAG_ARRAYS\n\n"; // Emit the table now. OS << "\n#ifdef GET_DIAG_TABLE\n"; + unsigned SubGroupIndex = 1, DiagArrayIndex = 1; for (std::map::const_iterator I = DiagsInGroup.begin(), E = DiagsInGroup.end(); I != E; ++I) { // Group option string. @@ -683,20 +695,31 @@ void EmitClangDiagGroups(RecordKeeper &Records, raw_ostream &OS) { const bool IsPedantic = I->first == "pedantic"; // Diagnostics in the group. - const bool hasDiags = !I->second.DiagsInGroup.empty() || + const std::vector &V = I->second.DiagsInGroup; + const bool hasDiags = !V.empty() || (IsPedantic && !DiagsInPedantic.empty()); - if (!hasDiags) - OS << "0, "; - else - OS << "DiagArray" << I->second.IDNo << ", "; + if (hasDiags) { + OS << "/* DiagArray" << I->second.IDNo << " */ " + << DiagArrayIndex << ", "; + if (IsPedantic) + DiagArrayIndex += DiagsInPedantic.size(); + DiagArrayIndex += V.size() + 1; + } else { + OS << "/* Empty */ 0, "; + } // Subgroups. - const bool hasSubGroups = !I->second.SubGroups.empty() || + const std::vector &SubGroups = I->second.SubGroups; + const bool hasSubGroups = !SubGroups.empty() || (IsPedantic && !GroupsInPedantic.empty()); - if (!hasSubGroups) - OS << 0; - else - OS << "DiagSubGroup" << I->second.IDNo; + if (hasSubGroups) { + OS << "/* DiagSubGroup" << I->second.IDNo << " */ " << SubGroupIndex; + if (IsPedantic) + SubGroupIndex += GroupsInPedantic.size(); + SubGroupIndex += SubGroups.size() + 1; + } else { + OS << "/* Empty */ 0"; + } OS << " },\n"; } OS << "#endif // GET_DIAG_TABLE\n\n"; -- 2.40.0