Author: Rahul Joshi Date: 2024-08-22T05:47:31-07:00 New Revision: d7da79f2cd025ab1a526c7011aab062817a656b2
URL: https://github.com/llvm/llvm-project/commit/d7da79f2cd025ab1a526c7011aab062817a656b2 DIFF: https://github.com/llvm/llvm-project/commit/d7da79f2cd025ab1a526c7011aab062817a656b2.diff LOG: [NFC][SetTheory] Refactor to use const pointers and range loops (#105544) - Refactor SetTheory code to use const pointers when possible. - Use auto for variables initialized using dyn_cast<>. - Use range based for loops and early continue. Added: Modified: clang/utils/TableGen/NeonEmitter.cpp llvm/include/llvm/TableGen/SetTheory.h llvm/lib/TableGen/SetTheory.cpp llvm/utils/TableGen/Common/CodeGenRegisters.cpp llvm/utils/TableGen/Common/CodeGenSchedule.cpp Removed: ################################################################################ diff --git a/clang/utils/TableGen/NeonEmitter.cpp b/clang/utils/TableGen/NeonEmitter.cpp index 30fbb8c5d65e5f..8ec8e67388bbd2 100644 --- a/clang/utils/TableGen/NeonEmitter.cpp +++ b/clang/utils/TableGen/NeonEmitter.cpp @@ -1569,7 +1569,7 @@ std::pair<Type, std::string> Intrinsic::DagEmitter::emitDagShuffle(DagInit *DI){ // See the documentation in arm_neon.td for a description of these operators. class LowHalf : public SetTheory::Operator { public: - void apply(SetTheory &ST, DagInit *Expr, SetTheory::RecSet &Elts, + void apply(SetTheory &ST, const DagInit *Expr, SetTheory::RecSet &Elts, ArrayRef<SMLoc> Loc) override { SetTheory::RecSet Elts2; ST.evaluate(Expr->arg_begin(), Expr->arg_end(), Elts2, Loc); @@ -1579,7 +1579,7 @@ std::pair<Type, std::string> Intrinsic::DagEmitter::emitDagShuffle(DagInit *DI){ class HighHalf : public SetTheory::Operator { public: - void apply(SetTheory &ST, DagInit *Expr, SetTheory::RecSet &Elts, + void apply(SetTheory &ST, const DagInit *Expr, SetTheory::RecSet &Elts, ArrayRef<SMLoc> Loc) override { SetTheory::RecSet Elts2; ST.evaluate(Expr->arg_begin(), Expr->arg_end(), Elts2, Loc); @@ -1593,7 +1593,7 @@ std::pair<Type, std::string> Intrinsic::DagEmitter::emitDagShuffle(DagInit *DI){ public: Rev(unsigned ElementSize) : ElementSize(ElementSize) {} - void apply(SetTheory &ST, DagInit *Expr, SetTheory::RecSet &Elts, + void apply(SetTheory &ST, const DagInit *Expr, SetTheory::RecSet &Elts, ArrayRef<SMLoc> Loc) override { SetTheory::RecSet Elts2; ST.evaluate(Expr->arg_begin() + 1, Expr->arg_end(), Elts2, Loc); @@ -1618,7 +1618,8 @@ std::pair<Type, std::string> Intrinsic::DagEmitter::emitDagShuffle(DagInit *DI){ public: MaskExpander(unsigned N) : N(N) {} - void expand(SetTheory &ST, Record *R, SetTheory::RecSet &Elts) override { + void expand(SetTheory &ST, const Record *R, + SetTheory::RecSet &Elts) override { unsigned Addend = 0; if (R->getName() == "mask0") Addend = 0; diff --git a/llvm/include/llvm/TableGen/SetTheory.h b/llvm/include/llvm/TableGen/SetTheory.h index 4cff688164b0c4..954453b783d4d8 100644 --- a/llvm/include/llvm/TableGen/SetTheory.h +++ b/llvm/include/llvm/TableGen/SetTheory.h @@ -76,7 +76,7 @@ class SetTheory { /// apply - Apply this operator to Expr's arguments and insert the result /// in Elts. - virtual void apply(SetTheory&, DagInit *Expr, RecSet &Elts, + virtual void apply(SetTheory &, const DagInit *Expr, RecSet &Elts, ArrayRef<SMLoc> Loc) = 0; }; @@ -89,13 +89,13 @@ class SetTheory { public: virtual ~Expander() = default; - virtual void expand(SetTheory&, Record*, RecSet &Elts) = 0; + virtual void expand(SetTheory &, const Record *, RecSet &Elts) = 0; }; private: // Map set defs to their fully expanded contents. This serves as a memoization // cache and it makes it possible to return const references on queries. - using ExpandMap = std::map<Record *, RecVec>; + using ExpandMap = std::map<const Record *, RecVec>; ExpandMap Expansions; // Known DAG operators by name. @@ -125,7 +125,7 @@ class SetTheory { void addOperator(StringRef Name, std::unique_ptr<Operator>); /// evaluate - Evaluate Expr and append the resulting set to Elts. - void evaluate(Init *Expr, RecSet &Elts, ArrayRef<SMLoc> Loc); + void evaluate(const Init *Expr, RecSet &Elts, ArrayRef<SMLoc> Loc); /// evaluate - Evaluate a sequence of Inits and append to Elts. template<typename Iter> @@ -137,7 +137,7 @@ class SetTheory { /// expand - Expand a record into a set of elements if possible. Return a /// pointer to the expanded elements, or NULL if Set cannot be expanded /// further. - const RecVec *expand(Record *Set); + const RecVec *expand(const Record *Set); }; } // end namespace llvm diff --git a/llvm/lib/TableGen/SetTheory.cpp b/llvm/lib/TableGen/SetTheory.cpp index f4e3e3d4ce473b..edb99827f7c676 100644 --- a/llvm/lib/TableGen/SetTheory.cpp +++ b/llvm/lib/TableGen/SetTheory.cpp @@ -13,6 +13,7 @@ #include "llvm/TableGen/SetTheory.h" #include "llvm/ADT/ArrayRef.h" +#include "llvm/ADT/STLExtras.h" #include "llvm/ADT/SmallVector.h" #include "llvm/ADT/StringRef.h" #include "llvm/Support/Casting.h" @@ -36,7 +37,7 @@ using RecVec = SetTheory::RecVec; // (add a, b, ...) Evaluate and union all arguments. struct AddOp : public SetTheory::Operator { - void apply(SetTheory &ST, DagInit *Expr, RecSet &Elts, + void apply(SetTheory &ST, const DagInit *Expr, RecSet &Elts, ArrayRef<SMLoc> Loc) override { ST.evaluate(Expr->arg_begin(), Expr->arg_end(), Elts, Loc); } @@ -44,7 +45,7 @@ struct AddOp : public SetTheory::Operator { // (sub Add, Sub, ...) Set diff erence. struct SubOp : public SetTheory::Operator { - void apply(SetTheory &ST, DagInit *Expr, RecSet &Elts, + void apply(SetTheory &ST, const DagInit *Expr, RecSet &Elts, ArrayRef<SMLoc> Loc) override { if (Expr->arg_size() < 2) PrintFatalError(Loc, "Set diff erence needs at least two arguments: " + @@ -60,7 +61,7 @@ struct SubOp : public SetTheory::Operator { // (and S1, S2) Set intersection. struct AndOp : public SetTheory::Operator { - void apply(SetTheory &ST, DagInit *Expr, RecSet &Elts, + void apply(SetTheory &ST, const DagInit *Expr, RecSet &Elts, ArrayRef<SMLoc> Loc) override { if (Expr->arg_size() != 2) PrintFatalError(Loc, "Set intersection requires two arguments: " + @@ -76,17 +77,17 @@ struct AndOp : public SetTheory::Operator { // SetIntBinOp - Abstract base class for (Op S, N) operators. struct SetIntBinOp : public SetTheory::Operator { - virtual void apply2(SetTheory &ST, DagInit *Expr, RecSet &Set, int64_t N, - RecSet &Elts, ArrayRef<SMLoc> Loc) = 0; + virtual void apply2(SetTheory &ST, const DagInit *Expr, RecSet &Set, + int64_t N, RecSet &Elts, ArrayRef<SMLoc> Loc) = 0; - void apply(SetTheory &ST, DagInit *Expr, RecSet &Elts, + void apply(SetTheory &ST, const DagInit *Expr, RecSet &Elts, ArrayRef<SMLoc> Loc) override { if (Expr->arg_size() != 2) PrintFatalError(Loc, "Operator requires (Op Set, Int) arguments: " + Expr->getAsString()); RecSet Set; ST.evaluate(Expr->arg_begin()[0], Set, Loc); - IntInit *II = dyn_cast<IntInit>(Expr->arg_begin()[1]); + const auto *II = dyn_cast<IntInit>(Expr->arg_begin()[1]); if (!II) PrintFatalError(Loc, "Second argument must be an integer: " + Expr->getAsString()); @@ -96,7 +97,7 @@ struct SetIntBinOp : public SetTheory::Operator { // (shl S, N) Shift left, remove the first N elements. struct ShlOp : public SetIntBinOp { - void apply2(SetTheory &ST, DagInit *Expr, RecSet &Set, int64_t N, + void apply2(SetTheory &ST, const DagInit *Expr, RecSet &Set, int64_t N, RecSet &Elts, ArrayRef<SMLoc> Loc) override { if (N < 0) PrintFatalError(Loc, "Positive shift required: " + @@ -108,7 +109,7 @@ struct ShlOp : public SetIntBinOp { // (trunc S, N) Truncate after the first N elements. struct TruncOp : public SetIntBinOp { - void apply2(SetTheory &ST, DagInit *Expr, RecSet &Set, int64_t N, + void apply2(SetTheory &ST, const DagInit *Expr, RecSet &Set, int64_t N, RecSet &Elts, ArrayRef<SMLoc> Loc) override { if (N < 0) PrintFatalError(Loc, "Positive length required: " + @@ -125,7 +126,7 @@ struct RotOp : public SetIntBinOp { RotOp(bool Rev) : Reverse(Rev) {} - void apply2(SetTheory &ST, DagInit *Expr, RecSet &Set, int64_t N, + void apply2(SetTheory &ST, const DagInit *Expr, RecSet &Set, int64_t N, RecSet &Elts, ArrayRef<SMLoc> Loc) override { if (Reverse) N = -N; @@ -143,7 +144,7 @@ struct RotOp : public SetIntBinOp { // (decimate S, N) Pick every N'th element of S. struct DecimateOp : public SetIntBinOp { - void apply2(SetTheory &ST, DagInit *Expr, RecSet &Set, int64_t N, + void apply2(SetTheory &ST, const DagInit *Expr, RecSet &Set, int64_t N, RecSet &Elts, ArrayRef<SMLoc> Loc) override { if (N <= 0) PrintFatalError(Loc, "Positive stride required: " + @@ -155,62 +156,62 @@ struct DecimateOp : public SetIntBinOp { // (interleave S1, S2, ...) Interleave elements of the arguments. struct InterleaveOp : public SetTheory::Operator { - void apply(SetTheory &ST, DagInit *Expr, RecSet &Elts, + void apply(SetTheory &ST, const DagInit *Expr, RecSet &Elts, ArrayRef<SMLoc> Loc) override { // Evaluate the arguments individually. - SmallVector<RecSet, 4> Args(Expr->getNumArgs()); + SmallVector<RecSet, 4> Values(Expr->getNumArgs()); unsigned MaxSize = 0; - for (unsigned i = 0, e = Expr->getNumArgs(); i != e; ++i) { - ST.evaluate(Expr->getArg(i), Args[i], Loc); - MaxSize = std::max(MaxSize, unsigned(Args[i].size())); + for (auto [Arg, Value] : zip(Expr->getArgs(), Values)) { + ST.evaluate(Arg, Value, Loc); + MaxSize = std::max(MaxSize, unsigned(Value.size())); } // Interleave arguments into Elts. for (unsigned n = 0; n != MaxSize; ++n) - for (unsigned i = 0, e = Expr->getNumArgs(); i != e; ++i) - if (n < Args[i].size()) - Elts.insert(Args[i][n]); + for (const RecSet &Value : Values) + if (n < Value.size()) + Elts.insert(Value[n]); } }; // (sequence "Format", From, To) Generate a sequence of records by name. struct SequenceOp : public SetTheory::Operator { - void apply(SetTheory &ST, DagInit *Expr, RecSet &Elts, + void apply(SetTheory &ST, const DagInit *Expr, RecSet &Elts, ArrayRef<SMLoc> Loc) override { int Step = 1; if (Expr->arg_size() > 4) PrintFatalError(Loc, "Bad args to (sequence \"Format\", From, To): " + Expr->getAsString()); - else if (Expr->arg_size() == 4) { - if (IntInit *II = dyn_cast<IntInit>(Expr->arg_begin()[3])) { + if (Expr->arg_size() == 4) { + if (const auto *II = dyn_cast<IntInit>(Expr->arg_begin()[3])) Step = II->getValue(); - } else + else PrintFatalError(Loc, "Stride must be an integer: " + Expr->getAsString()); } std::string Format; - if (StringInit *SI = dyn_cast<StringInit>(Expr->arg_begin()[0])) + if (const auto *SI = dyn_cast<StringInit>(Expr->arg_begin()[0])) Format = std::string(SI->getValue()); else PrintFatalError(Loc, "Format must be a string: " + Expr->getAsString()); int64_t From, To; - if (IntInit *II = dyn_cast<IntInit>(Expr->arg_begin()[1])) + if (const auto *II = dyn_cast<IntInit>(Expr->arg_begin()[1])) From = II->getValue(); else PrintFatalError(Loc, "From must be an integer: " + Expr->getAsString()); if (From < 0 || From >= (1 << 30)) PrintFatalError(Loc, "From out of range"); - if (IntInit *II = dyn_cast<IntInit>(Expr->arg_begin()[2])) + if (const auto *II = dyn_cast<IntInit>(Expr->arg_begin()[2])) To = II->getValue(); else PrintFatalError(Loc, "To must be an integer: " + Expr->getAsString()); if (To < 0 || To >= (1 << 30)) PrintFatalError(Loc, "To out of range"); - RecordKeeper &Records = - cast<DefInit>(Expr->getOperator())->getDef()->getRecords(); + const RecordKeeper &Records = + cast<DefInit>(Expr->getOperator())->getDef()->getRecords(); Step *= From <= To ? 1 : -1; while (true) { @@ -242,7 +243,7 @@ struct FieldExpander : public SetTheory::Expander { FieldExpander(StringRef fn) : FieldName(fn) {} - void expand(SetTheory &ST, Record *Def, RecSet &Elts) override { + void expand(SetTheory &ST, const Record *Def, RecSet &Elts) override { ST.evaluate(Def->getValueInit(FieldName), Elts, Def->getLoc()); } }; @@ -278,9 +279,9 @@ void SetTheory::addFieldExpander(StringRef ClassName, StringRef FieldName) { addExpander(ClassName, std::make_unique<FieldExpander>(FieldName)); } -void SetTheory::evaluate(Init *Expr, RecSet &Elts, ArrayRef<SMLoc> Loc) { +void SetTheory::evaluate(const Init *Expr, RecSet &Elts, ArrayRef<SMLoc> Loc) { // A def in a list can be a just an element, or it may expand. - if (DefInit *Def = dyn_cast<DefInit>(Expr)) { + if (const auto *Def = dyn_cast<DefInit>(Expr)) { if (const RecVec *Result = expand(Def->getDef())) return Elts.insert(Result->begin(), Result->end()); Elts.insert(Def->getDef()); @@ -288,14 +289,14 @@ void SetTheory::evaluate(Init *Expr, RecSet &Elts, ArrayRef<SMLoc> Loc) { } // Lists simply expand. - if (ListInit *LI = dyn_cast<ListInit>(Expr)) + if (const auto *LI = dyn_cast<ListInit>(Expr)) return evaluate(LI->begin(), LI->end(), Elts, Loc); // Anything else must be a DAG. - DagInit *DagExpr = dyn_cast<DagInit>(Expr); + const auto *DagExpr = dyn_cast<DagInit>(Expr); if (!DagExpr) PrintFatalError(Loc, "Invalid set element: " + Expr->getAsString()); - DefInit *OpInit = dyn_cast<DefInit>(DagExpr->getOperator()); + const DefInit *OpInit = dyn_cast<DefInit>(DagExpr->getOperator()); if (!OpInit) PrintFatalError(Loc, "Bad set expression: " + Expr->getAsString()); auto I = Operators.find(OpInit->getDef()->getName()); @@ -304,27 +305,26 @@ void SetTheory::evaluate(Init *Expr, RecSet &Elts, ArrayRef<SMLoc> Loc) { I->second->apply(*this, DagExpr, Elts, Loc); } -const RecVec *SetTheory::expand(Record *Set) { +const RecVec *SetTheory::expand(const Record *Set) { // Check existing entries for Set and return early. ExpandMap::iterator I = Expansions.find(Set); if (I != Expansions.end()) return &I->second; // This is the first time we see Set. Find a suitable expander. - ArrayRef<std::pair<Record *, SMRange>> SC = Set->getSuperClasses(); - for (const auto &SCPair : SC) { + for (const auto &[SuperClass, Loc] : Set->getSuperClasses()) { // Skip unnamed superclasses. - if (!isa<StringInit>(SCPair.first->getNameInit())) + if (!isa<StringInit>(SuperClass->getNameInit())) continue; - auto I = Expanders.find(SCPair.first->getName()); - if (I != Expanders.end()) { - // This breaks recursive definitions. - RecVec &EltVec = Expansions[Set]; - RecSet Elts; - I->second->expand(*this, Set, Elts); - EltVec.assign(Elts.begin(), Elts.end()); - return &EltVec; - } + auto I = Expanders.find(SuperClass->getName()); + if (I == Expanders.end()) + continue; + // This breaks recursive definitions. + RecVec &EltVec = Expansions[Set]; + RecSet Elts; + I->second->expand(*this, Set, Elts); + EltVec.assign(Elts.begin(), Elts.end()); + return &EltVec; } // Set is not expandable. diff --git a/llvm/utils/TableGen/Common/CodeGenRegisters.cpp b/llvm/utils/TableGen/Common/CodeGenRegisters.cpp index b5a6c1395c60e8..ee58cad358a4f1 100644 --- a/llvm/utils/TableGen/Common/CodeGenRegisters.cpp +++ b/llvm/utils/TableGen/Common/CodeGenRegisters.cpp @@ -625,7 +625,8 @@ struct TupleExpander : SetTheory::Expander { TupleExpander(std::vector<std::unique_ptr<Record>> &SynthDefs) : SynthDefs(SynthDefs) {} - void expand(SetTheory &ST, Record *Def, SetTheory::RecSet &Elts) override { + void expand(SetTheory &ST, const Record *Def, + SetTheory::RecSet &Elts) override { std::vector<Record *> Indices = Def->getValueAsListOfDefs("SubRegIndices"); unsigned Dim = Indices.size(); ListInit *SubRegs = Def->getValueAsListInit("SubRegs"); diff --git a/llvm/utils/TableGen/Common/CodeGenSchedule.cpp b/llvm/utils/TableGen/Common/CodeGenSchedule.cpp index 6386cc8eb32db3..5c266808f2e272 100644 --- a/llvm/utils/TableGen/Common/CodeGenSchedule.cpp +++ b/llvm/utils/TableGen/Common/CodeGenSchedule.cpp @@ -43,7 +43,7 @@ namespace { // (instrs a, b, ...) Evaluate and union all arguments. Identical to AddOp. struct InstrsOp : public SetTheory::Operator { - void apply(SetTheory &ST, DagInit *Expr, SetTheory::RecSet &Elts, + void apply(SetTheory &ST, const DagInit *Expr, SetTheory::RecSet &Elts, ArrayRef<SMLoc> Loc) override { ST.evaluate(Expr->arg_begin(), Expr->arg_end(), Elts, Loc); } @@ -75,7 +75,7 @@ struct InstRegexOp : public SetTheory::Operator { return Result; } - void apply(SetTheory &ST, DagInit *Expr, SetTheory::RecSet &Elts, + void apply(SetTheory &ST, const DagInit *Expr, SetTheory::RecSet &Elts, ArrayRef<SMLoc> Loc) override { ArrayRef<const CodeGenInstruction *> Instructions = Target.getInstructionsByEnumValue(); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
