https://github.com/jurahul created
https://github.com/llvm/llvm-project/pull/110747
None
>From 81a1ee1b8d09f22a4700b8e5dd59278759f59f8f Mon Sep 17 00:00:00 2001
From: Rahul Joshi <rjo...@nvidia.com>
Date: Tue, 1 Oct 2024 12:05:15 -0700
Subject: [PATCH] [TableGen] Change `DefInit::Def` to a const Record pointer
---
.../utils/TableGen/ClangOptionDocEmitter.cpp | 2 +-
llvm/include/llvm/TableGen/DirectiveEmitter.h | 6 ++-
llvm/include/llvm/TableGen/Record.h | 18 ++++-----
llvm/lib/TableGen/Record.cpp | 19 +++++-----
llvm/lib/TableGen/TGParser.cpp | 3 +-
.../TableGen/Common/CodeGenDAGPatterns.cpp | 2 +-
.../utils/TableGen/Common/CodeGenSchedule.cpp | 38 +++++++++----------
.../Common/GlobalISel/CombinerUtils.h | 2 +-
.../Common/GlobalISel/GlobalISelMatchTable.h | 2 +-
mlir/include/mlir/TableGen/Attribute.h | 2 +-
mlir/lib/TableGen/Attribute.cpp | 2 +-
mlir/lib/TableGen/Operator.cpp | 11 +++---
mlir/lib/TableGen/Pattern.cpp | 3 +-
mlir/tools/mlir-tblgen/BytecodeDialectGen.cpp | 16 ++++----
mlir/tools/mlir-tblgen/EnumsGen.cpp | 2 +-
mlir/tools/mlir-tblgen/OmpOpGen.cpp | 2 +-
16 files changed, 67 insertions(+), 63 deletions(-)
diff --git a/clang/utils/TableGen/ClangOptionDocEmitter.cpp
b/clang/utils/TableGen/ClangOptionDocEmitter.cpp
index 424d582f762282..b67c5d1d1146c6 100644
--- a/clang/utils/TableGen/ClangOptionDocEmitter.cpp
+++ b/clang/utils/TableGen/ClangOptionDocEmitter.cpp
@@ -181,7 +181,7 @@ const unsigned UnlimitedArgs = unsigned(-1);
// Get the number of arguments expected for an option, or -1 if any number of
// arguments are accepted.
-unsigned getNumArgsForKind(Record *OptionKind, const Record *Option) {
+unsigned getNumArgsForKind(const Record *OptionKind, const Record *Option) {
return StringSwitch<unsigned>(OptionKind->getName())
.Cases("KIND_JOINED", "KIND_JOINED_OR_SEPARATE", "KIND_SEPARATE", 1)
.Cases("KIND_REMAINING_ARGS", "KIND_REMAINING_ARGS_JOINED",
diff --git a/llvm/include/llvm/TableGen/DirectiveEmitter.h
b/llvm/include/llvm/TableGen/DirectiveEmitter.h
index d550f362871636..a2c9b2d427cce6 100644
--- a/llvm/include/llvm/TableGen/DirectiveEmitter.h
+++ b/llvm/include/llvm/TableGen/DirectiveEmitter.h
@@ -155,9 +155,11 @@ class Directive : public BaseRecord {
return Def->getValueAsListOfDefs("leafConstructs");
}
- Record *getAssociation() const { return Def->getValueAsDef("association"); }
+ const Record *getAssociation() const {
+ return Def->getValueAsDef("association");
+ }
- Record *getCategory() const { return Def->getValueAsDef("category"); }
+ const Record *getCategory() const { return Def->getValueAsDef("category"); }
};
// Wrapper class that contains Clause's information defined in DirectiveBase.td
diff --git a/llvm/include/llvm/TableGen/Record.h
b/llvm/include/llvm/TableGen/Record.h
index 93effb153cda80..987a57965b2ea7 100644
--- a/llvm/include/llvm/TableGen/Record.h
+++ b/llvm/include/llvm/TableGen/Record.h
@@ -783,7 +783,7 @@ class ListInit final : public TypedInit, public
FoldingSetNode,
return cast<ListRecTy>(getType())->getElementType();
}
- Record *getElementAsRecord(unsigned i) const;
+ const Record *getElementAsRecord(unsigned i) const;
Init *convertInitializerTo(const RecTy *Ty) const override;
@@ -1316,9 +1316,9 @@ class VarBitInit final : public TypedInit {
class DefInit : public TypedInit {
friend class Record;
- Record *Def;
+ const Record *Def;
- explicit DefInit(Record *D);
+ explicit DefInit(const Record *D);
public:
DefInit(const DefInit &) = delete;
@@ -1330,7 +1330,7 @@ class DefInit : public TypedInit {
Init *convertInitializerTo(const RecTy *Ty) const override;
- Record *getDef() const { return Def; }
+ const Record *getDef() const { return Def; }
const RecTy *getFieldType(StringInit *FieldName) const override;
@@ -1473,7 +1473,7 @@ class DagInit final : public TypedInit, public
FoldingSetNode,
void Profile(FoldingSetNodeID &ID) const;
Init *getOperator() const { return Val; }
- Record *getOperatorAsDef(ArrayRef<SMLoc> Loc) const;
+ const Record *getOperatorAsDef(ArrayRef<SMLoc> Loc) const;
StringInit *getName() const { return ValName; }
@@ -1660,7 +1660,7 @@ class Record {
// this record.
SmallVector<SMLoc, 4> Locs;
SmallVector<SMLoc, 0> ForwardDeclarationLocs;
- SmallVector<SMRange, 0> ReferenceLocs;
+ mutable SmallVector<SMRange, 0> ReferenceLocs;
SmallVector<Init *, 0> TemplateArgs;
SmallVector<RecordVal, 0> Values;
SmallVector<AssertionInfo, 0> Assertions;
@@ -1729,7 +1729,7 @@ class Record {
}
/// Add a reference to this record value.
- void appendReferenceLoc(SMRange Loc) { ReferenceLocs.push_back(Loc); }
+ void appendReferenceLoc(SMRange Loc) const { ReferenceLocs.push_back(Loc); }
/// Return the references of this record value.
ArrayRef<SMRange> getReferenceLocs() const { return ReferenceLocs; }
@@ -1931,13 +1931,13 @@ class Record {
/// This method looks up the specified field and returns its value as a
/// Record, throwing an exception if the field does not exist or if the value
/// is not the right type.
- Record *getValueAsDef(StringRef FieldName) const;
+ const Record *getValueAsDef(StringRef FieldName) const;
/// This method looks up the specified field and returns its value as a
/// Record, returning null if the field exists but is "uninitialized" (i.e.
/// set to `?`), and throwing an exception if the field does not exist or if
/// its value is not the right type.
- Record *getValueAsOptionalDef(StringRef FieldName) const;
+ const Record *getValueAsOptionalDef(StringRef FieldName) const;
/// This method looks up the specified field and returns its value as a bit,
/// throwing an exception if the field does not exist or if the value is not
diff --git a/llvm/lib/TableGen/Record.cpp b/llvm/lib/TableGen/Record.cpp
index 4e026bc4f042ee..78d5db6279ab4e 100644
--- a/llvm/lib/TableGen/Record.cpp
+++ b/llvm/lib/TableGen/Record.cpp
@@ -746,7 +746,7 @@ Init *ListInit::convertInitializerTo(const RecTy *Ty) const
{
return nullptr;
}
-Record *ListInit::getElementAsRecord(unsigned i) const {
+const Record *ListInit::getElementAsRecord(unsigned i) const {
assert(i < NumValues && "List element index out of range!");
DefInit *DI = dyn_cast<DefInit>(getElement(i));
if (!DI)
@@ -1713,7 +1713,7 @@ Init *TernOpInit::Fold(Record *CurRec) const {
StringInit *RHSs = dyn_cast<StringInit>(RHS);
if (LHSd && MHSd && RHSd) {
- Record *Val = RHSd->getDef();
+ const Record *Val = RHSd->getDef();
if (LHSd->getAsString() == RHSd->getAsString())
Val = MHSd->getDef();
return Val->getDefInit();
@@ -2265,7 +2265,7 @@ Init *VarBitInit::resolveReferences(Resolver &R) const {
return const_cast<VarBitInit*>(this);
}
-DefInit::DefInit(Record *D)
+DefInit::DefInit(const Record *D)
: TypedInit(IK_DefInit, D->getType()), Def(D) {}
Init *DefInit::convertInitializerTo(const RecTy *Ty) const {
@@ -2445,7 +2445,7 @@ Init *FieldInit::resolveReferences(Resolver &R) const {
Init *FieldInit::Fold(Record *CurRec) const {
if (DefInit *DI = dyn_cast<DefInit>(Rec)) {
- Record *Def = DI->getDef();
+ const Record *Def = DI->getDef();
if (Def == CurRec)
PrintFatalError(CurRec->getLoc(),
Twine("Attempting to access field '") +
@@ -2656,7 +2656,7 @@ void DagInit::Profile(FoldingSetNodeID &ID) const {
ArrayRef(getTrailingObjects<StringInit *>(), NumArgNames));
}
-Record *DagInit::getOperatorAsDef(ArrayRef<SMLoc> Loc) const {
+const Record *DagInit::getOperatorAsDef(ArrayRef<SMLoc> Loc) const {
if (DefInit *DefI = dyn_cast<DefInit>(Val))
return DefI->getDef();
PrintFatalError(Loc, "Expected record as operator");
@@ -2837,8 +2837,8 @@ const RecordRecTy *Record::getType() const {
DefInit *Record::getDefInit() const {
if (!CorrespondingDefInit) {
- CorrespondingDefInit = new (TrackedRecords.getImpl().Allocator)
- DefInit(const_cast<Record *>(this));
+ CorrespondingDefInit =
+ new (TrackedRecords.getImpl().Allocator) DefInit(this);
}
return CorrespondingDefInit;
}
@@ -3108,7 +3108,7 @@ Record::getValueAsListOfStrings(StringRef FieldName)
const {
return Strings;
}
-Record *Record::getValueAsDef(StringRef FieldName) const {
+const Record *Record::getValueAsDef(StringRef FieldName) const {
const RecordVal *R = getValue(FieldName);
if (!R || !R->getValue())
PrintFatalError(getLoc(), "Record `" + getName() +
@@ -3120,7 +3120,7 @@ Record *Record::getValueAsDef(StringRef FieldName) const {
FieldName + "' does not have a def initializer!");
}
-Record *Record::getValueAsOptionalDef(StringRef FieldName) const {
+const Record *Record::getValueAsOptionalDef(StringRef FieldName) const {
const RecordVal *R = getValue(FieldName);
if (!R || !R->getValue())
PrintFatalError(getLoc(), "Record `" + getName() +
@@ -3134,7 +3134,6 @@ Record *Record::getValueAsOptionalDef(StringRef
FieldName) const {
FieldName + "' does not have either a def initializer or '?'!");
}
-
bool Record::getValueAsBit(StringRef FieldName) const {
const RecordVal *R = getValue(FieldName);
if (!R || !R->getValue())
diff --git a/llvm/lib/TableGen/TGParser.cpp b/llvm/lib/TableGen/TGParser.cpp
index 91a3617f8579e0..e4f8b3fb775abb 100644
--- a/llvm/lib/TableGen/TGParser.cpp
+++ b/llvm/lib/TableGen/TGParser.cpp
@@ -3001,7 +3001,8 @@ Init *TGParser::ParseValue(Record *CurRec, const RecTy
*ItemType,
// Add a reference to this field if we know the record class.
if (TrackReferenceLocs) {
if (auto *DI = dyn_cast<DefInit>(Result)) {
- DI->getDef()->getValue(FieldName)->addReferenceLoc(FieldNameLoc);
+ const RecordVal *V = DI->getDef()->getValue(FieldName);
+ const_cast<RecordVal *>(V)->addReferenceLoc(FieldNameLoc);
} else if (auto *TI = dyn_cast<TypedInit>(Result)) {
if (auto *RecTy = dyn_cast<RecordRecTy>(TI->getType())) {
for (const Record *R : RecTy->getClasses())
diff --git a/llvm/utils/TableGen/Common/CodeGenDAGPatterns.cpp
b/llvm/utils/TableGen/Common/CodeGenDAGPatterns.cpp
index dd728da8076a7d..751ac3dd0af10b 100644
--- a/llvm/utils/TableGen/Common/CodeGenDAGPatterns.cpp
+++ b/llvm/utils/TableGen/Common/CodeGenDAGPatterns.cpp
@@ -3698,7 +3698,7 @@ static bool hasNullFragReference(DagInit *DI) {
DefInit *OpDef = dyn_cast<DefInit>(DI->getOperator());
if (!OpDef)
return false;
- Record *Operator = OpDef->getDef();
+ const Record *Operator = OpDef->getDef();
// If this is the null fragment, return true.
if (Operator->getName() == "null_frag")
diff --git a/llvm/utils/TableGen/Common/CodeGenSchedule.cpp
b/llvm/utils/TableGen/Common/CodeGenSchedule.cpp
index 05448389df01c8..45477b8fe7402f 100644
--- a/llvm/utils/TableGen/Common/CodeGenSchedule.cpp
+++ b/llvm/utils/TableGen/Common/CodeGenSchedule.cpp
@@ -552,7 +552,7 @@ void CodeGenSchedModels::addProcModel(const Record
*ProcDef) {
std::string Name = std::string(ModelKey->getName());
if (ModelKey->isSubClassOf("SchedMachineModel")) {
- Record *ItinsDef = ModelKey->getValueAsDef("Itineraries");
+ const Record *ItinsDef = ModelKey->getValueAsDef("Itineraries");
ProcModels.emplace_back(ProcModels.size(), Name, ModelKey, ItinsDef);
} else {
// An itinerary is defined without a machine model. Infer a new model.
@@ -674,9 +674,9 @@ void CodeGenSchedModels::collectSchedRW() {
}
// Initialize Aliases vectors.
for (const Record *ADef : AliasDefs) {
- Record *AliasDef = ADef->getValueAsDef("AliasRW");
+ const Record *AliasDef = ADef->getValueAsDef("AliasRW");
getSchedRW(AliasDef).IsAlias = true;
- Record *MatchDef = ADef->getValueAsDef("MatchRW");
+ const Record *MatchDef = ADef->getValueAsDef("MatchRW");
CodeGenSchedRW &RW = getSchedRW(MatchDef);
if (RW.IsAlias)
PrintFatalError(ADef->getLoc(), "Cannot Alias an Alias");
@@ -781,7 +781,7 @@ void CodeGenSchedModels::expandRWSeqForProc(
for (const Record *Rec : SchedWrite.Aliases) {
const CodeGenSchedRW &AliasRW = getSchedRW(Rec->getValueAsDef("AliasRW"));
if (Rec->getValueInit("SchedModel")->isComplete()) {
- Record *ModelDef = Rec->getValueAsDef("SchedModel");
+ const Record *ModelDef = Rec->getValueAsDef("SchedModel");
if (&getProcModel(ModelDef) != &ProcModel)
continue;
}
@@ -854,7 +854,7 @@ void CodeGenSchedModels::collectSchedClasses() {
// Create a SchedClass for each unique combination of itinerary class and
// SchedRW list.
for (const CodeGenInstruction *Inst : Target.getInstructionsByEnumValue()) {
- Record *ItinDef = Inst->TheDef->getValueAsDef("Itinerary");
+ const Record *ItinDef = Inst->TheDef->getValueAsDef("Itinerary");
IdxVec Writes, Reads;
if (!Inst->TheDef->isValueUnset("SchedRW"))
findRWs(Inst->TheDef->getValueAsListOfDefs("SchedRW"), Writes, Reads);
@@ -1050,7 +1050,7 @@ void CodeGenSchedModels::createInstRWClass(const Record
*InstRWDef) {
if (OrigNumInstrs == InstDefs.size()) {
assert(SchedClasses[OldSCIdx].ProcIndices[0] == 0 &&
"expected a generic SchedClass");
- Record *RWModelDef = InstRWDef->getValueAsDef("SchedModel");
+ const Record *RWModelDef = InstRWDef->getValueAsDef("SchedModel");
// Make sure we didn't already have a InstRW containing this
// instruction on this model.
for (const Record *RWD : RWDefs) {
@@ -1279,7 +1279,7 @@ struct PredCheck {
unsigned RWIdx;
const Record *Predicate;
- PredCheck(bool r, unsigned w, Record *p)
+ PredCheck(bool r, unsigned w, const Record *p)
: IsRead(r), RWIdx(w), Predicate(p) {}
};
@@ -1318,7 +1318,7 @@ class PredTransitions {
#endif
private:
- bool mutuallyExclusive(Record *PredDef, ArrayRef<Record *> Preds,
+ bool mutuallyExclusive(const Record *PredDef, ArrayRef<const Record *> Preds,
ArrayRef<PredCheck> Term);
void getIntersectingVariants(const CodeGenSchedRW &SchedRW, unsigned
TransIdx,
std::vector<TransVariant>
&IntersectingVariants);
@@ -1336,8 +1336,8 @@ class PredTransitions {
// predicates are not exclusive because the predicates for a given SchedWrite
// are always checked in the order they are defined in the .td file. Later
// conditions implicitly negate any prior condition.
-bool PredTransitions::mutuallyExclusive(Record *PredDef,
- ArrayRef<Record *> Preds,
+bool PredTransitions::mutuallyExclusive(const Record *PredDef,
+ ArrayRef<const Record *> Preds,
ArrayRef<PredCheck> Term) {
for (const PredCheck &PC : Term) {
if (PC.Predicate == PredDef)
@@ -1382,9 +1382,9 @@ bool PredTransitions::mutuallyExclusive(Record *PredDef,
return false;
}
-static std::vector<Record *> getAllPredicates(ArrayRef<TransVariant> Variants,
- unsigned ProcId) {
- std::vector<Record *> Preds;
+static std::vector<const Record *>
+getAllPredicates(ArrayRef<TransVariant> Variants, unsigned ProcId) {
+ std::vector<const Record *> Preds;
for (auto &Variant : Variants) {
if (!Variant.VarOrSeqDef->isSubClassOf("SchedVar"))
continue;
@@ -1406,7 +1406,7 @@ void PredTransitions::getIntersectingVariants(
if (SchedRW.HasVariants) {
unsigned VarProcIdx = 0;
if (SchedRW.TheDef->getValueInit("SchedModel")->isComplete()) {
- Record *ModelDef = SchedRW.TheDef->getValueAsDef("SchedModel");
+ const Record *ModelDef = SchedRW.TheDef->getValueAsDef("SchedModel");
VarProcIdx = SchedModels.getProcModel(ModelDef).Index;
}
if (VarProcIdx == 0 || VarProcIdx == TransVec[TransIdx].ProcIndex) {
@@ -1425,7 +1425,7 @@ void PredTransitions::getIntersectingVariants(
// that processor.
unsigned AliasProcIdx = 0;
if ((*AI)->getValueInit("SchedModel")->isComplete()) {
- Record *ModelDef = (*AI)->getValueAsDef("SchedModel");
+ const Record *ModelDef = (*AI)->getValueAsDef("SchedModel");
AliasProcIdx = SchedModels.getProcModel(ModelDef).Index;
}
if (AliasProcIdx && AliasProcIdx != TransVec[TransIdx].ProcIndex)
@@ -1451,13 +1451,13 @@ void PredTransitions::getIntersectingVariants(
if (AliasProcIdx == 0)
GenericRW = true;
}
- std::vector<Record *> AllPreds =
+ std::vector<const Record *> AllPreds =
getAllPredicates(Variants, TransVec[TransIdx].ProcIndex);
for (TransVariant &Variant : Variants) {
// Don't expand variants if the processor models don't intersect.
// A zero processor index means any processor.
if (Variant.VarOrSeqDef->isSubClassOf("SchedVar")) {
- Record *PredDef = Variant.VarOrSeqDef->getValueAsDef("Predicate");
+ const Record *PredDef = Variant.VarOrSeqDef->getValueAsDef("Predicate");
if (mutuallyExclusive(PredDef, AllPreds, TransVec[TransIdx].PredTerm))
continue;
}
@@ -1489,7 +1489,7 @@ void PredTransitions::pushVariant(const TransVariant
&VInfo, bool IsRead) {
// then the whole transition is specific to this processor.
IdxVec SelectedRWs;
if (VInfo.VarOrSeqDef->isSubClassOf("SchedVar")) {
- Record *PredDef = VInfo.VarOrSeqDef->getValueAsDef("Predicate");
+ const Record *PredDef = VInfo.VarOrSeqDef->getValueAsDef("Predicate");
Trans.PredTerm.emplace_back(IsRead, VInfo.RWIdx, PredDef);
ConstRecVec SelectedDefs =
VInfo.VarOrSeqDef->getValueAsListOfDefs("Selected");
@@ -1861,7 +1861,7 @@ void CodeGenSchedModels::collectProcResources() {
// This class may have a default ReadWrite list which can be overriden by
// InstRW definitions.
for (const Record *RW : SC.InstRWs) {
- Record *RWModelDef = RW->getValueAsDef("SchedModel");
+ const Record *RWModelDef = RW->getValueAsDef("SchedModel");
unsigned PIdx = getProcModel(RWModelDef).Index;
IdxVec Writes, Reads;
findRWs(RW->getValueAsListOfDefs("OperandReadWrites"), Writes, Reads);
diff --git a/llvm/utils/TableGen/Common/GlobalISel/CombinerUtils.h
b/llvm/utils/TableGen/Common/GlobalISel/CombinerUtils.h
index 4e519f9bf1846e..de6ccd4c023e2c 100644
--- a/llvm/utils/TableGen/Common/GlobalISel/CombinerUtils.h
+++ b/llvm/utils/TableGen/Common/GlobalISel/CombinerUtils.h
@@ -32,7 +32,7 @@ inline bool isSpecificDef(const Init &N, StringRef Def) {
/// subclass of the given class and coerce it to a def if it is. This is
/// primarily useful for testing for subclasses of GIDefKind and similar in
/// DagInit's since DagInit's support any type inside them.
-inline Record *getDefOfSubClass(const Init &N, StringRef Cls) {
+inline const Record *getDefOfSubClass(const Init &N, StringRef Cls) {
if (const DefInit *OpI = dyn_cast<DefInit>(&N))
if (OpI->getDef()->isSubClassOf(Cls))
return OpI->getDef();
diff --git a/llvm/utils/TableGen/Common/GlobalISel/GlobalISelMatchTable.h
b/llvm/utils/TableGen/Common/GlobalISel/GlobalISelMatchTable.h
index 315606417fc9ea..b260ddf2dbc499 100644
--- a/llvm/utils/TableGen/Common/GlobalISel/GlobalISelMatchTable.h
+++ b/llvm/utils/TableGen/Common/GlobalISel/GlobalISelMatchTable.h
@@ -1998,7 +1998,7 @@ class CopyOrAddZeroRegRenderer : public OperandRenderer {
public:
CopyOrAddZeroRegRenderer(unsigned NewInsnID, StringRef SymbolicName,
- Record *ZeroRegisterDef)
+ const Record *ZeroRegisterDef)
: OperandRenderer(OR_CopyOrAddZeroReg), NewInsnID(NewInsnID),
SymbolicName(SymbolicName), ZeroRegisterDef(ZeroRegisterDef) {
assert(!SymbolicName.empty() && "Cannot copy from an unspecified source");
diff --git a/mlir/include/mlir/TableGen/Attribute.h
b/mlir/include/mlir/TableGen/Attribute.h
index d0a9430d4ed6c2..62720e74849fcd 100644
--- a/mlir/include/mlir/TableGen/Attribute.h
+++ b/mlir/include/mlir/TableGen/Attribute.h
@@ -204,7 +204,7 @@ class EnumAttr : public Attribute {
std::vector<EnumAttrCase> getAllCases() const;
bool genSpecializedAttr() const;
- llvm::Record *getBaseAttrClass() const;
+ const llvm::Record *getBaseAttrClass() const;
StringRef getSpecializedAttrClassName() const;
bool printBitEnumPrimaryGroups() const;
};
diff --git a/mlir/lib/TableGen/Attribute.cpp b/mlir/lib/TableGen/Attribute.cpp
index 57c77c74106b96..de930cb4007032 100644
--- a/mlir/lib/TableGen/Attribute.cpp
+++ b/mlir/lib/TableGen/Attribute.cpp
@@ -229,7 +229,7 @@ bool EnumAttr::genSpecializedAttr() const {
return def->getValueAsBit("genSpecializedAttr");
}
-llvm::Record *EnumAttr::getBaseAttrClass() const {
+const llvm::Record *EnumAttr::getBaseAttrClass() const {
return def->getValueAsDef("baseAttrClass");
}
diff --git a/mlir/lib/TableGen/Operator.cpp b/mlir/lib/TableGen/Operator.cpp
index 76af82a827da13..6a33ff5ecd6721 100644
--- a/mlir/lib/TableGen/Operator.cpp
+++ b/mlir/lib/TableGen/Operator.cpp
@@ -208,7 +208,7 @@ StringRef Operator::getResultName(int index) const {
}
auto Operator::getResultDecorators(int index) const -> var_decorator_range {
- Record *result =
+ const Record *result =
cast<DefInit>(def.getValueAsDag("results")->getArg(index))->getDef();
if (!result->isSubClassOf("OpVariable"))
return var_decorator_range(nullptr, nullptr);
@@ -246,7 +246,7 @@ StringRef Operator::getArgName(int index) const {
}
auto Operator::getArgDecorators(int index) const -> var_decorator_range {
- Record *arg =
+ const Record *arg =
cast<DefInit>(def.getValueAsDag("arguments")->getArg(index))->getDef();
if (!arg->isSubClassOf("OpVariable"))
return var_decorator_range(nullptr, nullptr);
@@ -572,7 +572,7 @@ void Operator::populateOpStructure() {
if (!argDefInit)
PrintFatalError(def.getLoc(),
Twine("undefined type for argument #") + Twine(i));
- Record *argDef = argDefInit->getDef();
+ const Record *argDef = argDefInit->getDef();
if (argDef->isSubClassOf(opVarClass))
argDef = argDef->getValueAsDef("constraint");
@@ -626,7 +626,8 @@ void Operator::populateOpStructure() {
// elements.
int operandIndex = 0, attrIndex = 0, propIndex = 0;
for (unsigned i = 0; i != numArgs; ++i) {
- Record *argDef = dyn_cast<DefInit>(argumentValues->getArg(i))->getDef();
+ const Record *argDef =
+ dyn_cast<DefInit>(argumentValues->getArg(i))->getDef();
if (argDef->isSubClassOf(opVarClass))
argDef = argDef->getValueAsDef("constraint");
@@ -708,7 +709,7 @@ void Operator::populateOpStructure() {
// do further verification based on those verified facts. If you see this
// error, fix the traits declaration order by checking the
`dependentTraits`
// field.
- auto verifyTraitValidity = [&](Record *trait) {
+ auto verifyTraitValidity = [&](const Record *trait) {
auto *dependentTraits = trait->getValueAsListInit("dependentTraits");
for (auto *traitInit : *dependentTraits)
if (!traitSet.contains(traitInit))
diff --git a/mlir/lib/TableGen/Pattern.cpp b/mlir/lib/TableGen/Pattern.cpp
index 1be0e744ffbc86..6437839ef20849 100644
--- a/mlir/lib/TableGen/Pattern.cpp
+++ b/mlir/lib/TableGen/Pattern.cpp
@@ -136,7 +136,8 @@ int DagNode::getNumReturnsOfNativeCode() const {
llvm::StringRef DagNode::getSymbol() const { return node->getNameStr(); }
Operator &DagNode::getDialectOp(RecordOperatorMap *mapper) const {
- llvm::Record *opDef = cast<llvm::DefInit>(node->getOperator())->getDef();
+ const llvm::Record *opDef =
+ cast<llvm::DefInit>(node->getOperator())->getDef();
auto [it, inserted] = mapper->try_emplace(opDef);
if (inserted)
it->second = std::make_unique<Operator>(opDef);
diff --git a/mlir/tools/mlir-tblgen/BytecodeDialectGen.cpp
b/mlir/tools/mlir-tblgen/BytecodeDialectGen.cpp
index a2e3227cffea39..1474bd8c149ff6 100644
--- a/mlir/tools/mlir-tblgen/BytecodeDialectGen.cpp
+++ b/mlir/tools/mlir-tblgen/BytecodeDialectGen.cpp
@@ -161,7 +161,7 @@ void printParseConditional(mlir::raw_indented_ostream &ios,
auto parsedArgs =
llvm::to_vector(make_filter_range(args, [](Init *const attr) {
- Record *def = cast<DefInit>(attr)->getDef();
+ const Record *def = cast<DefInit>(attr)->getDef();
if (def->isSubClassOf("Array"))
return true;
return !def->getValueAsString("cParser").empty();
@@ -170,12 +170,12 @@ void printParseConditional(mlir::raw_indented_ostream
&ios,
interleave(
zip(parsedArgs, argNames),
[&](std::tuple<llvm::Init *&, const std::string &> it) {
- Record *attr = cast<DefInit>(std::get<0>(it))->getDef();
+ const Record *attr = cast<DefInit>(std::get<0>(it))->getDef();
std::string parser;
if (auto optParser = attr->getValueAsOptionalString("cParser")) {
parser = *optParser;
} else if (attr->isSubClassOf("Array")) {
- Record *def = attr->getValueAsDef("elemT");
+ const Record *def = attr->getValueAsDef("elemT");
bool composite = def->isSubClassOf("CompositeBytecode");
if (!composite && def->isSubClassOf("AttributeKind"))
parser = "succeeded($_reader.readAttributes($_var))";
@@ -214,7 +214,7 @@ void Generator::emitParseHelper(StringRef kind, StringRef
returnType,
DefInit *first = dyn_cast<DefInit>(arg);
if (!first)
PrintFatalError("Unexpected type for " + name);
- Record *def = first->getDef();
+ const Record *def = first->getDef();
// Create variable decls, if there are a block of same type then create
// comma separated list of them.
@@ -239,12 +239,12 @@ void Generator::emitParseHelper(StringRef kind, StringRef
returnType,
// Emit list helper functions.
for (auto [arg, name] : zip(args, argNames)) {
- Record *attr = cast<DefInit>(arg)->getDef();
+ const Record *attr = cast<DefInit>(arg)->getDef();
if (!attr->isSubClassOf("Array"))
continue;
// TODO: Dedupe readers.
- Record *def = attr->getValueAsDef("elemT");
+ const Record *def = attr->getValueAsDef("elemT");
if (!def->isSubClassOf("CompositeBytecode") &&
(def->isSubClassOf("AttributeKind") || def->isSubClassOf("TypeKind")))
continue;
@@ -335,7 +335,7 @@ void Generator::emitPrint(StringRef kind, StringRef type,
llvm::zip(members->getArgs(), members->getArgNames())) {
DefInit *def = dyn_cast<DefInit>(arg);
assert(def);
- Record *memberRec = def->getDef();
+ const Record *memberRec = def->getDef();
emitPrintHelper(memberRec, kind, kind, name->getAsUnquotedString(), os);
}
@@ -364,7 +364,7 @@ void Generator::emitPrintHelper(const Record *memberRec,
StringRef kind,
}
if (memberRec->isSubClassOf("Array")) {
- Record *def = memberRec->getValueAsDef("elemT");
+ const Record *def = memberRec->getValueAsDef("elemT");
if (!def->isSubClassOf("CompositeBytecode")) {
if (def->isSubClassOf("AttributeKind")) {
ios << "writer.writeAttributes(" << getter << ");\n";
diff --git a/mlir/tools/mlir-tblgen/EnumsGen.cpp
b/mlir/tools/mlir-tblgen/EnumsGen.cpp
index 95767a29b9c3cf..863463bd920bff 100644
--- a/mlir/tools/mlir-tblgen/EnumsGen.cpp
+++ b/mlir/tools/mlir-tblgen/EnumsGen.cpp
@@ -476,7 +476,7 @@ static void emitSpecializedAttrDef(const Record &enumDef,
raw_ostream &os) {
EnumAttr enumAttr(enumDef);
StringRef enumName = enumAttr.getEnumClassName();
StringRef attrClassName = enumAttr.getSpecializedAttrClassName();
- llvm::Record *baseAttrDef = enumAttr.getBaseAttrClass();
+ const llvm::Record *baseAttrDef = enumAttr.getBaseAttrClass();
Attribute baseAttr(baseAttrDef);
// Emit classof method
diff --git a/mlir/tools/mlir-tblgen/OmpOpGen.cpp
b/mlir/tools/mlir-tblgen/OmpOpGen.cpp
index c529c190382c6f..68bb5ddca153a6 100644
--- a/mlir/tools/mlir-tblgen/OmpOpGen.cpp
+++ b/mlir/tools/mlir-tblgen/OmpOpGen.cpp
@@ -210,7 +210,7 @@ static void verifyClause(const Record *op, const Record
*clause) {
/// type.
static StringRef translateArgumentType(ArrayRef<SMLoc> loc, StringInit *name,
Init *init, int &nest, int &rank) {
- Record *def = cast<DefInit>(init)->getDef();
+ const Record *def = cast<DefInit>(init)->getDef();
llvm::StringSet<> superClasses;
for (auto [sc, _] : def->getSuperClasses())
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
