caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MLIR] Change call sites from deprecated parseSourceFile() to parseSourceFile<ModuleOp>().

Browse Source 
Mark `parseSourceFile()` deprecated. The functions will be removed two weeks after landing this change.

Reviewed By: rriddle

Differential Revision: https://reviews.llvm.org/D121075
This commit is contained in:
Christian Sigg
2022-03-06 20:55:59 +01:00
parent 5af11ec34b
commit 0dc66b76fe
11 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mlir/examples/toy/Ch2/toyc.cpp
View File

@@ -98,7 +98,7 @@ int dumpMLIR() {
llvm::SourceMgr sourceMgr;
sourceMgr.AddNewSourceBuffer(std::move(*fileOrErr), llvm::SMLoc());
mlir::OwningOpRef<mlir::ModuleOp> module =
mlir::parseSourceFile(sourceMgr, &context);
mlir::parseSourceFile<mlir::ModuleOp>(sourceMgr, &context);
if (!module) {
llvm::errs() << "Error can't load file " << inputFilename << "\n";
return 3;

2
mlir/examples/toy/Ch3/toyc.cpp
View File

@@ -93,7 +93,7 @@ int loadMLIR(llvm::SourceMgr &sourceMgr, mlir::MLIRContext &context,
// Parse the input mlir.
sourceMgr.AddNewSourceBuffer(std::move(*fileOrErr), llvm::SMLoc());
module = mlir::parseSourceFile(sourceMgr, &context);
module = mlir::parseSourceFile<mlir::ModuleOp>(sourceMgr, &context);
if (!module) {
llvm::errs() << "Error can't load file " << inputFilename << "\n";
return 3;

2
mlir/examples/toy/Ch4/toyc.cpp
View File

@@ -94,7 +94,7 @@ int loadMLIR(llvm::SourceMgr &sourceMgr, mlir::MLIRContext &context,
// Parse the input mlir.
sourceMgr.AddNewSourceBuffer(std::move(*fileOrErr), llvm::SMLoc());
module = mlir::parseSourceFile(sourceMgr, &context);
module = mlir::parseSourceFile<mlir::ModuleOp>(sourceMgr, &context);
if (!module) {
llvm::errs() << "Error can't load file " << inputFilename << "\n";
return 3;

2
mlir/examples/toy/Ch5/toyc.cpp
View File

@@ -98,7 +98,7 @@ int loadMLIR(llvm::SourceMgr &sourceMgr, mlir::MLIRContext &context,
// Parse the input mlir.
sourceMgr.AddNewSourceBuffer(std::move(*fileOrErr), llvm::SMLoc());
module = mlir::parseSourceFile(sourceMgr, &context);
module = mlir::parseSourceFile<mlir::ModuleOp>(sourceMgr, &context);
if (!module) {
llvm::errs() << "Error can't load file " << inputFilename << "\n";
return 3;

2
mlir/examples/toy/Ch6/toyc.cpp
View File

@@ -119,7 +119,7 @@ int loadMLIR(mlir::MLIRContext &context,
// Parse the input mlir.
llvm::SourceMgr sourceMgr;
sourceMgr.AddNewSourceBuffer(std::move(*fileOrErr), llvm::SMLoc());
module = mlir::parseSourceFile(sourceMgr, &context);
module = mlir::parseSourceFile<mlir::ModuleOp>(sourceMgr, &context);
if (!module) {
llvm::errs() << "Error can't load file " << inputFilename << "\n";
return 3;

2
mlir/examples/toy/Ch7/toyc.cpp
View File

@@ -119,7 +119,7 @@ int loadMLIR(mlir::MLIRContext &context,
// Parse the input mlir.
llvm::SourceMgr sourceMgr;
sourceMgr.AddNewSourceBuffer(std::move(*fileOrErr), llvm::SMLoc());
module = mlir::parseSourceFile(sourceMgr, &context);
module = mlir::parseSourceFile<mlir::ModuleOp>(sourceMgr, &context);
if (!module) {
llvm::errs() << "Error can't load file " << inputFilename << "\n";
return 3;

18
mlir/include/mlir/Parser.h
View File

@@ -206,21 +206,21 @@ inline OwningOpRef<ContainerOpT> parseSourceString(llvm::StringRef sourceStr,
/// TODO: These methods are deprecated in favor of the above template versions.
/// They should be removed when usages have been updated.
inline OwningOpRef<ModuleOp> parseSourceFile(const llvm::SourceMgr &sourceMgr,
MLIRContext *context) {
[[deprecated("use parseSourceFile<ModuleOp>")]] inline OwningOpRef<ModuleOp>
parseSourceFile(const llvm::SourceMgr &sourceMgr, MLIRContext *context) {
return parseSourceFile<ModuleOp>(sourceMgr, context);
}
inline OwningOpRef<ModuleOp> parseSourceFile(llvm::StringRef filename,
MLIRContext *context) {
[[deprecated("use parseSourceFile<ModuleOp>")]] inline OwningOpRef<ModuleOp>
parseSourceFile(llvm::StringRef filename, MLIRContext *context) {
return parseSourceFile<ModuleOp>(filename, context);
}
inline OwningOpRef<ModuleOp> parseSourceFile(llvm::StringRef filename,
llvm::SourceMgr &sourceMgr,
MLIRContext *context) {
[[deprecated("use parseSourceFile<ModuleOp>")]] inline OwningOpRef<ModuleOp>
parseSourceFile(llvm::StringRef filename, llvm::SourceMgr &sourceMgr,
MLIRContext *context) {
return parseSourceFile<ModuleOp>(filename, sourceMgr, context);
}
inline OwningOpRef<ModuleOp> parseSourceString(llvm::StringRef moduleStr,
MLIRContext *context) {
[[deprecated("use parseSourceFile<ModuleOp>")]] inline OwningOpRef<ModuleOp>
parseSourceString(llvm::StringRef moduleStr, MLIRContext *context) {
return parseSourceString<ModuleOp>(moduleStr, context);
}

2
mlir/lib/ExecutionEngine/JitRunner.cpp
View File

@@ -122,7 +122,7 @@ static OwningOpRef<ModuleOp> parseMLIRInput(StringRef inputFilename,
llvm::SourceMgr sourceMgr;
sourceMgr.AddNewSourceBuffer(std::move(file), SMLoc());
return OwningOpRef<ModuleOp>(parseSourceFile(sourceMgr, context));
return parseSourceFile<ModuleOp>(sourceMgr, context);
}
static inline Error makeStringError(const Twine &message) {

2
mlir/lib/Support/MlirOptMain.cpp
View File

@@ -59,7 +59,7 @@ static LogicalResult performActions(raw_ostream &os, bool verifyDiagnostics,
// Parse the input file and reset the context threading state.
TimingScope parserTiming = timing.nest("Parser");
OwningOpRef<ModuleOp> module(parseSourceFile(sourceMgr, context));
OwningOpRef<ModuleOp> module(parseSourceFile<ModuleOp>(sourceMgr, context));
context->enableMultithreading(wasThreadingEnabled);
if (!module)
return failure();

2
mlir/lib/Tools/mlir-reduce/MlirReduceMain.cpp
View File

@@ -31,7 +31,7 @@ using namespace mlir;
static LogicalResult loadModule(MLIRContext &context,
OwningOpRef<ModuleOp> &module,
StringRef inputFilename) {
module = parseSourceFile(inputFilename, &context);
module = parseSourceFile<ModuleOp>(inputFilename, &context);
if (!module)
return failure();

2
mlir/lib/Translation/Translation.cpp
View File

@@ -101,7 +101,7 @@ TranslateFromMLIRRegistration::TranslateFromMLIRRegistration(
DialectRegistry registry;
dialectRegistration(registry);
context->appendDialectRegistry(registry);
auto module = OwningOpRef<ModuleOp>(parseSourceFile(sourceMgr, context));
auto module = parseSourceFile<ModuleOp>(sourceMgr, context);
if (!module || failed(verify(*module)))
return failure();
return function(module.get(), output);