Skip to content

[MLIR][DRR] Rename OperandIndexOrNumValues to ArgIndexOrNumValues (NFC) #144821

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

[MLIR][DRR] Rename OperandIndexOrNumValues to ArgIndexOrNumValues (NFC) #144821

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
38 changes: 19 additions & 19 deletions mlir/include/mlir/TableGen/Pattern.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,14 +275,14 @@ class SymbolInfoMap {

// Structure to uniquely distinguish different locations of the symbols.
//
// * If a symbol is defined as an operand of an operation, `dag` specifies
// the DAG of the operation, `operandIndexOrNumValues` specifies the
// operand index, and `variadicSubIndex` must be set to `std::nullopt`.
// * If a symbol is defined as an operand or attribute of an operation,
// `dag` specifies the DAG of the operation, `argIndexOrNumValues`
// specifies its argument index, and `variadicSubIndex` must be set to
// `std::nullopt`.
//
// * If a symbol is defined in a `variadic` DAG, `dag` specifies the DAG
// of the parent operation, `operandIndexOrNumValues` specifies the
// declared operand index of the variadic operand in the parent
// operation.
// of the parent operation, `argIndexOrNumValues` specifies the
// declared index of the variadic operand in the parent operation.
//
// - If the symbol is defined as a result of `variadic` DAG, the
// `variadicSubIndex` must be set to `std::nullopt`, which means that
Expand All @@ -292,9 +292,9 @@ class SymbolInfoMap {
// be set to the index within the variadic sub-operand list.
//
// * If a symbol is defined in a `either` DAG, `dag` specifies the DAG
// of the parent operation, `operandIndexOrNumValues` specifies the
// operand index in the parent operation (not necessary the index in the
// DAG).
// of the parent operation, `argIndexOrNumValues` specifies the
// operand's index in the parent operation (not necessarily its index
// in the DAG).
//
// * If a symbol is defined as a result, specifies the number of returning
// value.
Expand Down Expand Up @@ -347,17 +347,17 @@ class SymbolInfoMap {
// DagNode and DagLeaf are accessed by value which means it can't be used
// as identifier here. Use an opaque pointer type instead.
const void *dag;
int operandIndexOrNumValues;
int argIndexOrNumValues;
std::optional<int> variadicSubIndex;

DagAndConstant(const void *dag, int operandIndexOrNumValues,
DagAndConstant(const void *dag, int argIndexOrNumValues,
std::optional<int> variadicSubIndex)
: dag(dag), operandIndexOrNumValues(operandIndexOrNumValues),
: dag(dag), argIndexOrNumValues(argIndexOrNumValues),
variadicSubIndex(variadicSubIndex) {}

bool operator==(const DagAndConstant &rhs) const {
return dag == rhs.dag &&
operandIndexOrNumValues == rhs.operandIndexOrNumValues &&
argIndexOrNumValues == rhs.argIndexOrNumValues &&
variadicSubIndex == rhs.variadicSubIndex;
}
};
Expand Down Expand Up @@ -385,11 +385,11 @@ class SymbolInfoMap {
return SymbolInfo(nullptr, Kind::Attr, std::nullopt);
}
static SymbolInfo
getOperand(DagNode node, const Operator *op, int operandIndex,
getOperand(DagNode node, const Operator *op, int index,
std::optional<int> variadicSubIndex = std::nullopt) {
return SymbolInfo(op, Kind::Operand,
DagAndConstant(node.getAsOpaquePointer(), operandIndex,
variadicSubIndex));
return SymbolInfo(
op, Kind::Operand,
DagAndConstant(node.getAsOpaquePointer(), index, variadicSubIndex));
}
static SymbolInfo getResult(const Operator *op) {
return SymbolInfo(op, Kind::Result, std::nullopt);
Expand Down Expand Up @@ -427,10 +427,10 @@ class SymbolInfoMap {
const char *separator) const;

// The argument index (for `Attr` and `Operand` only)
int getArgIndex() const { return dagAndConstant->operandIndexOrNumValues; }
int getArgIndex() const { return dagAndConstant->argIndexOrNumValues; }

// The number of values in the MultipleValue
int getSize() const { return dagAndConstant->operandIndexOrNumValues; }
int getSize() const { return dagAndConstant->argIndexOrNumValues; }

// The variadic sub-operands index (for variadic `Operand` only)
std::optional<int> getVariadicSubIndex() const {
Expand Down
4 changes: 2 additions & 2 deletions mlir/tools/mlir-tblgen/RewriterGen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,10 @@ class PatternEmitter {
// Emits C++ statements for matching the DAG structure.
void emitMatch(DagNode tree, StringRef name, int depth);

// Emit C++ function call to static DAG matcher.
// Emits C++ function call to static DAG matcher.
void emitStaticMatchCall(DagNode tree, StringRef name);

// Emit C++ function call to static type/attribute constraint function.
// Emits C++ function call to static type/attribute constraint function.
void emitStaticVerifierCall(StringRef funcName, StringRef opName,
StringRef arg, StringRef failureStr);

Expand Down
Loading