Skip to content

Commit 0dc66b7

Browse files
committed
[MLIR] Change call sites from deprecated parseSourceFile() to parseSourceFile<ModuleOp>().
Mark `parseSourceFile()` deprecated. The functions will be removed two weeks after landing this change. Reviewed By: rriddle Differential Revision: https://reviews.llvm.org/D121075
1 parent 5af11ec commit 0dc66b7

File tree

11 files changed

+19
-19
lines changed

11 files changed

+19
-19
lines changed

mlir/examples/toy/Ch2/toyc.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ int dumpMLIR() {
9898
llvm::SourceMgr sourceMgr;
9999
sourceMgr.AddNewSourceBuffer(std::move(*fileOrErr), llvm::SMLoc());
100100
mlir::OwningOpRef<mlir::ModuleOp> module =
101-
mlir::parseSourceFile(sourceMgr, &context);
101+
mlir::parseSourceFile<mlir::ModuleOp>(sourceMgr, &context);
102102
if (!module) {
103103
llvm::errs() << "Error can't load file " << inputFilename << "\n";
104104
return 3;

mlir/examples/toy/Ch3/toyc.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ int loadMLIR(llvm::SourceMgr &sourceMgr, mlir::MLIRContext &context,
9393

9494
// Parse the input mlir.
9595
sourceMgr.AddNewSourceBuffer(std::move(*fileOrErr), llvm::SMLoc());
96-
module = mlir::parseSourceFile(sourceMgr, &context);
96+
module = mlir::parseSourceFile<mlir::ModuleOp>(sourceMgr, &context);
9797
if (!module) {
9898
llvm::errs() << "Error can't load file " << inputFilename << "\n";
9999
return 3;

mlir/examples/toy/Ch4/toyc.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ int loadMLIR(llvm::SourceMgr &sourceMgr, mlir::MLIRContext &context,
9494

9595
// Parse the input mlir.
9696
sourceMgr.AddNewSourceBuffer(std::move(*fileOrErr), llvm::SMLoc());
97-
module = mlir::parseSourceFile(sourceMgr, &context);
97+
module = mlir::parseSourceFile<mlir::ModuleOp>(sourceMgr, &context);
9898
if (!module) {
9999
llvm::errs() << "Error can't load file " << inputFilename << "\n";
100100
return 3;

mlir/examples/toy/Ch5/toyc.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ int loadMLIR(llvm::SourceMgr &sourceMgr, mlir::MLIRContext &context,
9898

9999
// Parse the input mlir.
100100
sourceMgr.AddNewSourceBuffer(std::move(*fileOrErr), llvm::SMLoc());
101-
module = mlir::parseSourceFile(sourceMgr, &context);
101+
module = mlir::parseSourceFile<mlir::ModuleOp>(sourceMgr, &context);
102102
if (!module) {
103103
llvm::errs() << "Error can't load file " << inputFilename << "\n";
104104
return 3;

mlir/examples/toy/Ch6/toyc.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ int loadMLIR(mlir::MLIRContext &context,
119119
// Parse the input mlir.
120120
llvm::SourceMgr sourceMgr;
121121
sourceMgr.AddNewSourceBuffer(std::move(*fileOrErr), llvm::SMLoc());
122-
module = mlir::parseSourceFile(sourceMgr, &context);
122+
module = mlir::parseSourceFile<mlir::ModuleOp>(sourceMgr, &context);
123123
if (!module) {
124124
llvm::errs() << "Error can't load file " << inputFilename << "\n";
125125
return 3;

mlir/examples/toy/Ch7/toyc.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ int loadMLIR(mlir::MLIRContext &context,
119119
// Parse the input mlir.
120120
llvm::SourceMgr sourceMgr;
121121
sourceMgr.AddNewSourceBuffer(std::move(*fileOrErr), llvm::SMLoc());
122-
module = mlir::parseSourceFile(sourceMgr, &context);
122+
module = mlir::parseSourceFile<mlir::ModuleOp>(sourceMgr, &context);
123123
if (!module) {
124124
llvm::errs() << "Error can't load file " << inputFilename << "\n";
125125
return 3;

mlir/include/mlir/Parser.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -206,21 +206,21 @@ inline OwningOpRef<ContainerOpT> parseSourceString(llvm::StringRef sourceStr,
206206

207207
/// TODO: These methods are deprecated in favor of the above template versions.
208208
/// They should be removed when usages have been updated.
209-
inline OwningOpRef<ModuleOp> parseSourceFile(const llvm::SourceMgr &sourceMgr,
210-
MLIRContext *context) {
209+
[[deprecated("use parseSourceFile<ModuleOp>")]] inline OwningOpRef<ModuleOp>
210+
parseSourceFile(const llvm::SourceMgr &sourceMgr, MLIRContext *context) {
211211
return parseSourceFile<ModuleOp>(sourceMgr, context);
212212
}
213-
inline OwningOpRef<ModuleOp> parseSourceFile(llvm::StringRef filename,
214-
MLIRContext *context) {
213+
[[deprecated("use parseSourceFile<ModuleOp>")]] inline OwningOpRef<ModuleOp>
214+
parseSourceFile(llvm::StringRef filename, MLIRContext *context) {
215215
return parseSourceFile<ModuleOp>(filename, context);
216216
}
217-
inline OwningOpRef<ModuleOp> parseSourceFile(llvm::StringRef filename,
218-
llvm::SourceMgr &sourceMgr,
219-
MLIRContext *context) {
217+
[[deprecated("use parseSourceFile<ModuleOp>")]] inline OwningOpRef<ModuleOp>
218+
parseSourceFile(llvm::StringRef filename, llvm::SourceMgr &sourceMgr,
219+
MLIRContext *context) {
220220
return parseSourceFile<ModuleOp>(filename, sourceMgr, context);
221221
}
222-
inline OwningOpRef<ModuleOp> parseSourceString(llvm::StringRef moduleStr,
223-
MLIRContext *context) {
222+
[[deprecated("use parseSourceFile<ModuleOp>")]] inline OwningOpRef<ModuleOp>
223+
parseSourceString(llvm::StringRef moduleStr, MLIRContext *context) {
224224
return parseSourceString<ModuleOp>(moduleStr, context);
225225
}
226226

mlir/lib/ExecutionEngine/JitRunner.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ static OwningOpRef<ModuleOp> parseMLIRInput(StringRef inputFilename,
122122

123123
llvm::SourceMgr sourceMgr;
124124
sourceMgr.AddNewSourceBuffer(std::move(file), SMLoc());
125-
return OwningOpRef<ModuleOp>(parseSourceFile(sourceMgr, context));
125+
return parseSourceFile<ModuleOp>(sourceMgr, context);
126126
}
127127

128128
static inline Error makeStringError(const Twine &message) {

mlir/lib/Support/MlirOptMain.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ static LogicalResult performActions(raw_ostream &os, bool verifyDiagnostics,
5959

6060
// Parse the input file and reset the context threading state.
6161
TimingScope parserTiming = timing.nest("Parser");
62-
OwningOpRef<ModuleOp> module(parseSourceFile(sourceMgr, context));
62+
OwningOpRef<ModuleOp> module(parseSourceFile<ModuleOp>(sourceMgr, context));
6363
context->enableMultithreading(wasThreadingEnabled);
6464
if (!module)
6565
return failure();

mlir/lib/Tools/mlir-reduce/MlirReduceMain.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ using namespace mlir;
3131
static LogicalResult loadModule(MLIRContext &context,
3232
OwningOpRef<ModuleOp> &module,
3333
StringRef inputFilename) {
34-
module = parseSourceFile(inputFilename, &context);
34+
module = parseSourceFile<ModuleOp>(inputFilename, &context);
3535
if (!module)
3636
return failure();
3737

mlir/lib/Translation/Translation.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ TranslateFromMLIRRegistration::TranslateFromMLIRRegistration(
101101
DialectRegistry registry;
102102
dialectRegistration(registry);
103103
context->appendDialectRegistry(registry);
104-
auto module = OwningOpRef<ModuleOp>(parseSourceFile(sourceMgr, context));
104+
auto module = parseSourceFile<ModuleOp>(sourceMgr, context);
105105
if (!module || failed(verify(*module)))
106106
return failure();
107107
return function(module.get(), output);

0 commit comments

Comments
 (0)