Skip to content

[TableGen] Eliminate the dependency on SDNode definition order #168745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[TableGen] Eliminate the dependency on SDNode definition order #168745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 23 additions & 10 deletions llvm/utils/TableGen/Common/CodeGenDAGPatterns.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2923,6 +2923,14 @@ TreePattern::TreePattern(const Record *TheRec, const DagInit *Pat, bool isInput,
Trees.push_back(ParseTreePattern(Pat, ""));
}

TreePattern::TreePattern(const Record *TheRec, ArrayRef<const Init *> Args,
ArrayRef<const StringInit *> ArgNames, bool isInput,
CodeGenDAGPatterns &cdp)
: TheRecord(TheRec), CDP(cdp), isInputPattern(isInput), HasError(false),
Infer(*this) {
Trees.push_back(ParseRootlessTreePattern(Args, ArgNames));
}

TreePattern::TreePattern(const Record *TheRec, TreePatternNodePtr Pat,
bool isInput, CodeGenDAGPatterns &cdp)
: TheRecord(TheRec), CDP(cdp), isInputPattern(isInput), HasError(false),
Expand Down Expand Up @@ -2951,6 +2959,19 @@ void TreePattern::ComputeNamedNodes(TreePatternNode &N) {
ComputeNamedNodes(Child);
}

TreePatternNodePtr
TreePattern::ParseRootlessTreePattern(ArrayRef<const Init *> Args,
ArrayRef<const StringInit *> ArgNames) {
std::vector<TreePatternNodePtr> Children;

for (auto [Arg, ArgName] : llvm::zip_equal(Args, ArgNames)) {
StringRef NameStr = ArgName ? ArgName->getValue() : "";
Children.push_back(ParseTreePattern(Arg, NameStr));
}

return makeIntrusiveRefCnt<TreePatternNode>(nullptr, std::move(Children), 1);
}

TreePatternNodePtr TreePattern::ParseTreePattern(const Init *TheInit,
StringRef OpName) {
RecordKeeper &RK = TheInit->getRecordKeeper();
Expand Down Expand Up @@ -3488,20 +3509,12 @@ void CodeGenDAGPatterns::ParseDefaultOperands() {
ArrayRef<const Record *> DefaultOps =
Records.getAllDerivedDefinitions("OperandWithDefaultOps");

// Find some SDNode.
assert(!SDNodes.empty() && "No SDNodes parsed?");
const Init *SomeSDNode = SDNodes.begin()->first->getDefInit();

for (unsigned i = 0, e = DefaultOps.size(); i != e; ++i) {
const DagInit *DefaultInfo = DefaultOps[i]->getValueAsDag("DefaultOps");

// Clone the DefaultInfo dag node, changing the operator from 'ops' to
// SomeSDnode so that we can parse this.
const DagInit *DI = DagInit::get(SomeSDNode, DefaultInfo->getArgs(),
DefaultInfo->getArgNames());

// Create a TreePattern to parse this.
TreePattern P(DefaultOps[i], DI, false, *this);
TreePattern P(DefaultOps[i], DefaultInfo->getArgs(),
DefaultInfo->getArgNames(), false, *this);
assert(P.getNumTrees() == 1 && "This ctor can only produce one tree!");

// Copy the operands over into a DAGDefaultOperand.
Expand Down
6 changes: 6 additions & 0 deletions llvm/utils/TableGen/Common/CodeGenDAGPatterns.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -925,6 +925,9 @@ class TreePattern {
CodeGenDAGPatterns &ise);
TreePattern(const Record *TheRec, const DagInit *Pat, bool isInput,
CodeGenDAGPatterns &ise);
TreePattern(const Record *TheRec, ArrayRef<const Init *> Args,
ArrayRef<const StringInit *> ArgNames, bool isInput,
CodeGenDAGPatterns &ise);
TreePattern(const Record *TheRec, TreePatternNodePtr Pat, bool isInput,
CodeGenDAGPatterns &ise);

Expand Down Expand Up @@ -989,6 +992,9 @@ class TreePattern {

private:
TreePatternNodePtr ParseTreePattern(const Init *DI, StringRef OpName);
TreePatternNodePtr
ParseRootlessTreePattern(ArrayRef<const Init *> Args,
ArrayRef<const StringInit *> ArgNames);
void ComputeNamedNodes();
void ComputeNamedNodes(TreePatternNode &N);
};
Expand Down