From 1dfc3ac5ce2d05be559a497eddd2c4776a3d4f69 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Tue, 29 Jan 2019 09:27:04 -0800 Subject: [PATCH] Prefix Operator getter methods with "get" to be consistent PiperOrigin-RevId: 231416230 --- mlir/include/mlir/TableGen/Operator.h | 4 ++-- mlir/lib/TableGen/Operator.cpp | 4 ++-- mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp | 6 +++--- mlir/tools/mlir-tblgen/OpDocGen.cpp | 2 +- mlir/tools/mlir-tblgen/RewriterGen.cpp | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mlir/include/mlir/TableGen/Operator.h b/mlir/include/mlir/TableGen/Operator.h index 57613c2d4193..6c57520b0e10 100644 --- a/mlir/include/mlir/TableGen/Operator.h +++ b/mlir/include/mlir/TableGen/Operator.h @@ -55,10 +55,10 @@ public: const SmallVectorImpl &getSplitDefName() const; // Returns the C++ class name of the op. - StringRef cppClassName() const; + StringRef getCppClassName() const; // Returns the C++ class name of the op with namespace added. - std::string qualifiedCppClassName() const; + std::string getQualCppClassName() const; // Op attribute interators. using attribute_iterator = NamedAttribute *; diff --git a/mlir/lib/TableGen/Operator.cpp b/mlir/lib/TableGen/Operator.cpp index 5bf332b72b2e..d70dbc88251f 100644 --- a/mlir/lib/TableGen/Operator.cpp +++ b/mlir/lib/TableGen/Operator.cpp @@ -46,10 +46,10 @@ StringRef tblgen::Operator::getOperationName() const { return def.getValueAsString("opName"); } -StringRef tblgen::Operator::cppClassName() const { +StringRef tblgen::Operator::getCppClassName() const { return getSplitDefName().back(); } -std::string tblgen::Operator::qualifiedCppClassName() const { +std::string tblgen::Operator::getQualCppClassName() const { return llvm::join(getSplitDefName(), "::"); } diff --git a/mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp b/mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp index cb15b99aca57..1fbf37894a6a 100644 --- a/mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp +++ b/mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp @@ -150,7 +150,7 @@ void OpEmitter::emit(const Record &def, raw_ostream &os) { emitter.mapOverClassNamespaces( [&os](StringRef ns) { os << "\nnamespace " << ns << "{\n"; }); - os << formatv("class {0} : public Op<{0}", emitter.op.cppClassName()); + os << formatv("class {0} : public Op<{0}", emitter.op.getCppClassName()); emitter.emitTraits(); os << "> {\npublic:\n"; @@ -168,7 +168,7 @@ void OpEmitter::emit(const Record &def, raw_ostream &os) { emitter.emitFolders(); os << "private:\n friend class ::mlir::OperationInst;\n" - << " explicit " << emitter.op.cppClassName() + << " explicit " << emitter.op.getCppClassName() << "(const OperationInst* state) : Op(state) {}\n};\n"; emitter.mapOverClassNamespaces( [&os](StringRef ns) { os << "} // end namespace " << ns << "\n"; }); @@ -529,7 +529,7 @@ static void emitOpList(const std::vector &defs, raw_ostream &os) { for (auto &def : defs) { if (!first) os << ","; - os << Operator(def).qualifiedCppClassName(); + os << Operator(def).getQualCppClassName(); first = false; } } diff --git a/mlir/tools/mlir-tblgen/OpDocGen.cpp b/mlir/tools/mlir-tblgen/OpDocGen.cpp index 84dfb9e41cc3..7469bfe0ac61 100644 --- a/mlir/tools/mlir-tblgen/OpDocGen.cpp +++ b/mlir/tools/mlir-tblgen/OpDocGen.cpp @@ -85,7 +85,7 @@ static void emitOpDoc(const RecordKeeper &recordKeeper, raw_ostream &os) { os << "# Operation definition\n"; for (auto *def : defs) { Operator op(def); - os << "## " << op.getOperationName() << " (" << op.qualifiedCppClassName() + os << "## " << op.getOperationName() << " (" << op.getQualCppClassName() << ")"; // Emit summary & description of operator. diff --git a/mlir/tools/mlir-tblgen/RewriterGen.cpp b/mlir/tools/mlir-tblgen/RewriterGen.cpp index d954db861783..158611146ce1 100644 --- a/mlir/tools/mlir-tblgen/RewriterGen.cpp +++ b/mlir/tools/mlir-tblgen/RewriterGen.cpp @@ -132,7 +132,7 @@ void PatternEmitter::emitOpMatch(DagNode tree, int depth) { os.indent(indent) << formatv("if (!op{0}) return matchFailure();\n", depth); os.indent(indent) << formatv( "if (!op{0}->isa<{1}>()) return matchFailure();\n", depth, - op.qualifiedCppClassName()); + op.getQualCppClassName()); } if (tree.getNumArgs() != op.getNumArgs()) PrintFatalError(loc, Twine("mismatch in number of arguments to op '") + @@ -287,7 +287,7 @@ void PatternEmitter::emitReplaceOpWithNewOp(DagNode resultTree) { os << formatv(R"( rewriter.replaceOpWithNewOp<{0}>(op, op->getResult(0)->getType())", - resultOp.cppClassName()); + resultOp.getCppClassName()); if (numOpArgs != resultTree.getNumArgs()) { PrintFatalError(loc, Twine("mismatch between arguments of resultant op (") + Twine(numOpArgs) +