This is an archive of the discontinued LLVM Phabricator instance.

Differential D81604

Register printer and context CL options with the toyc example
ClosedPublic

Authored by mehdi_amini on Jun 10 2020, 11:20 AM.

Details

Reviewers
rriddle
Commits
rG51a822724dae: Register printer and context CL options with the toyc example
Summary

The tutorial refers to invoking toyc with '-mlir-print-debuginfo' but
it wasn't registered anymore.

Diff Detail

Event Timeline

mehdi_amini created this revision.Jun 10 2020, 11:20 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 10 2020, 11:20 AM
Herald added subscribers: msifontes, jurahul, Kayjukh and 13 others. · View Herald Transcript
rriddle accepted this revision.Jun 10 2020, 11:21 AM

LGTM after resolving comments.

mlir/examples/toy/Ch7/toyc.cpp
249

Why are you adding pass pipeline parsers? This isn't used anywhere.

This revision is now accepted and ready to land.Jun 10 2020, 11:21 AM
Harbormaster failed remote builds in B59848: Diff 269918!Jun 10 2020, 12:13 PM
mehdi_amini marked 2 inline comments as done.Jun 10 2020, 12:59 PM
mehdi_amini added inline comments.
mlir/examples/toy/Ch7/toyc.cpp
249

Bad copy/paste! Thanks for catching.

Closed by commit rG51a822724dae: Register printer and context CL options with the toyc example (authored by mehdi_amini). · Explain WhyJun 10 2020, 1:22 PM
This revision was automatically updated to reflect the committed changes.
mehdi_amini marked an inline comment as done.

Revision Contents

PathSize
mlir/
examples/
toy/
Ch2/
4 lines
Ch3/
5 lines
Ch4/
5 lines
Ch5/
6 lines
Ch6/
6 lines
Ch7/
6 lines

Diff 269959

mlir/examples/toy/Ch2/toyc.cpp

Show All 9 Lines
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "toy/Dialect.h" #include "toy/Dialect.h"
#include "toy/MLIRGen.h" #include "toy/MLIRGen.h"
#include "toy/Parser.h" #include "toy/Parser.h"
#include <memory> #include <memory>
#include "mlir/IR/AsmState.h"
#include "mlir/IR/MLIRContext.h" #include "mlir/IR/MLIRContext.h"
#include "mlir/IR/Module.h" #include "mlir/IR/Module.h"
#include "mlir/IR/Verifier.h" #include "mlir/IR/Verifier.h"
#include "mlir/Parser.h" #include "mlir/Parser.h"
#include "llvm/ADT/StringRef.h" #include "llvm/ADT/StringRef.h"
#include "llvm/Support/CommandLine.h" #include "llvm/Support/CommandLine.h"
#include "llvm/Support/ErrorOr.h" #include "llvm/Support/ErrorOr.h"
▲ Show 20 Lines • Show All 91 Lines • ▼ Show 20 Linesint dumpAST() {
if (!moduleAST) if (!moduleAST)
return 1; return 1;
dump(*moduleAST); dump(*moduleAST);
return 0; return 0;
} }
int main(int argc, char **argv) { int main(int argc, char **argv) {
// Register any command line options.
mlir::registerAsmPrinterCLOptions();
mlir::registerMLIRContextCLOptions();
cl::ParseCommandLineOptions(argc, argv, "toy compiler\n"); cl::ParseCommandLineOptions(argc, argv, "toy compiler\n");
switch (emitAction) { switch (emitAction) {
case Action::DumpAST: case Action::DumpAST:
return dumpAST(); return dumpAST();
case Action::DumpMLIR: case Action::DumpMLIR:
return dumpMLIR(); return dumpMLIR();
default: default:
llvm::errs() << "No action specified (parsing only?), use -emit=<action>\n"; llvm::errs() << "No action specified (parsing only?), use -emit=<action>\n";
} }
return 0; return 0;
} }

mlir/examples/toy/Ch3/toyc.cpp

//===- toyc.cpp - The Toy Compiler ----------------------------------------===// //===- toyc.cpp - The Toy Compiler ----------------------------------------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// This file implements the entry point for the Toy compiler. // This file implements the entry point for the Toy compiler.
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "toy/Dialect.h" #include "toy/Dialect.h"
#include "toy/MLIRGen.h" #include "toy/MLIRGen.h"
#include "toy/Parser.h" #include "toy/Parser.h"
#include "mlir/IR/AsmState.h"
#include "mlir/IR/MLIRContext.h" #include "mlir/IR/MLIRContext.h"
#include "mlir/IR/Module.h" #include "mlir/IR/Module.h"
#include "mlir/IR/Verifier.h" #include "mlir/IR/Verifier.h"
#include "mlir/Parser.h" #include "mlir/Parser.h"
#include "mlir/Pass/Pass.h" #include "mlir/Pass/Pass.h"
#include "mlir/Pass/PassManager.h" #include "mlir/Pass/PassManager.h"
#include "mlir/Transforms/Passes.h" #include "mlir/Transforms/Passes.h"
▲ Show 20 Lines • Show All 111 Lines • ▼ Show 20 Linesint dumpAST() {
if (!moduleAST) if (!moduleAST)
return 1; return 1;
dump(*moduleAST); dump(*moduleAST);
return 0; return 0;
} }
int main(int argc, char **argv) { int main(int argc, char **argv) {
// Register any command line options.
mlir::registerAsmPrinterCLOptions();
mlir::registerMLIRContextCLOptions();
mlir::registerPassManagerCLOptions(); mlir::registerPassManagerCLOptions();
cl::ParseCommandLineOptions(argc, argv, "toy compiler\n"); cl::ParseCommandLineOptions(argc, argv, "toy compiler\n");
switch (emitAction) { switch (emitAction) {
case Action::DumpAST: case Action::DumpAST:
return dumpAST(); return dumpAST();
case Action::DumpMLIR: case Action::DumpMLIR:
return dumpMLIR(); return dumpMLIR();
default: default:
llvm::errs() << "No action specified (parsing only?), use -emit=<action>\n"; llvm::errs() << "No action specified (parsing only?), use -emit=<action>\n";
} }
return 0; return 0;
} }

mlir/examples/toy/Ch4/toyc.cpp

Show All 9 Lines
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "toy/Dialect.h" #include "toy/Dialect.h"
#include "toy/MLIRGen.h" #include "toy/MLIRGen.h"
#include "toy/Parser.h" #include "toy/Parser.h"
#include "toy/Passes.h" #include "toy/Passes.h"
#include "mlir/IR/AsmState.h"
#include "mlir/IR/MLIRContext.h" #include "mlir/IR/MLIRContext.h"
#include "mlir/IR/Module.h" #include "mlir/IR/Module.h"
#include "mlir/IR/Verifier.h" #include "mlir/IR/Verifier.h"
#include "mlir/Parser.h" #include "mlir/Parser.h"
#include "mlir/Pass/Pass.h" #include "mlir/Pass/Pass.h"
#include "mlir/Pass/PassManager.h" #include "mlir/Pass/PassManager.h"
#include "mlir/Transforms/Passes.h" #include "mlir/Transforms/Passes.h"
▲ Show 20 Lines • Show All 119 Lines • ▼ Show 20 Linesint dumpAST() {
if (!moduleAST) if (!moduleAST)
return 1; return 1;
dump(*moduleAST); dump(*moduleAST);
return 0; return 0;
} }
int main(int argc, char **argv) { int main(int argc, char **argv) {
// Register any command line options.
mlir::registerAsmPrinterCLOptions();
mlir::registerMLIRContextCLOptions();
mlir::registerPassManagerCLOptions(); mlir::registerPassManagerCLOptions();
cl::ParseCommandLineOptions(argc, argv, "toy compiler\n"); cl::ParseCommandLineOptions(argc, argv, "toy compiler\n");
switch (emitAction) { switch (emitAction) {
case Action::DumpAST: case Action::DumpAST:
return dumpAST(); return dumpAST();
case Action::DumpMLIR: case Action::DumpMLIR:
return dumpMLIR(); return dumpMLIR();
default: default:
llvm::errs() << "No action specified (parsing only?), use -emit=<action>\n"; llvm::errs() << "No action specified (parsing only?), use -emit=<action>\n";
} }
return 0; return 0;
} }

mlir/examples/toy/Ch5/toyc.cpp

Show All 9 Lines
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "toy/Dialect.h" #include "toy/Dialect.h"
#include "toy/MLIRGen.h" #include "toy/MLIRGen.h"
#include "toy/Parser.h" #include "toy/Parser.h"
#include "toy/Passes.h" #include "toy/Passes.h"
#include "mlir/IR/AsmState.h"
#include "mlir/IR/MLIRContext.h" #include "mlir/IR/MLIRContext.h"
#include "mlir/IR/Module.h" #include "mlir/IR/Module.h"
#include "mlir/IR/Verifier.h" #include "mlir/IR/Verifier.h"
#include "mlir/InitAllDialects.h" #include "mlir/InitAllDialects.h"
#include "mlir/Parser.h" #include "mlir/Parser.h"
#include "mlir/Pass/Pass.h" #include "mlir/Pass/Pass.h"
#include "mlir/Pass/PassManager.h" #include "mlir/Pass/PassManager.h"
#include "mlir/Transforms/Passes.h" #include "mlir/Transforms/Passes.h"
▲ Show 20 Lines • Show All 141 Lines • ▼ Show 20 Lines if (!moduleAST)
return 1; return 1;
dump(*moduleAST); dump(*moduleAST);
return 0; return 0;
} }
int main(int argc, char **argv) { int main(int argc, char **argv) {
mlir::registerAllDialects(); mlir::registerAllDialects();
// Register any command line options.
mlir::registerAsmPrinterCLOptions();
mlir::registerMLIRContextCLOptions();
mlir::registerPassManagerCLOptions(); mlir::registerPassManagerCLOptions();
cl::ParseCommandLineOptions(argc, argv, "toy compiler\n"); cl::ParseCommandLineOptions(argc, argv, "toy compiler\n");
switch (emitAction) { switch (emitAction) {
case Action::DumpAST: case Action::DumpAST:
return dumpAST(); return dumpAST();
case Action::DumpMLIR: case Action::DumpMLIR:
case Action::DumpMLIRAffine: case Action::DumpMLIRAffine:
return dumpMLIR(); return dumpMLIR();
default: default:
llvm::errs() << "No action specified (parsing only?), use -emit=<action>\n"; llvm::errs() << "No action specified (parsing only?), use -emit=<action>\n";
} }
return 0; return 0;
} }

mlir/examples/toy/Ch6/toyc.cpp

Show All 11 Lines
#include "toy/Dialect.h" #include "toy/Dialect.h"
#include "toy/MLIRGen.h" #include "toy/MLIRGen.h"
#include "toy/Parser.h" #include "toy/Parser.h"
#include "toy/Passes.h" #include "toy/Passes.h"
#include "mlir/ExecutionEngine/ExecutionEngine.h" #include "mlir/ExecutionEngine/ExecutionEngine.h"
#include "mlir/ExecutionEngine/OptUtils.h" #include "mlir/ExecutionEngine/OptUtils.h"
#include "mlir/IR/AsmState.h"
#include "mlir/IR/MLIRContext.h" #include "mlir/IR/MLIRContext.h"
#include "mlir/IR/Module.h" #include "mlir/IR/Module.h"
#include "mlir/IR/Verifier.h" #include "mlir/IR/Verifier.h"
#include "mlir/InitAllDialects.h" #include "mlir/InitAllDialects.h"
#include "mlir/Parser.h" #include "mlir/Parser.h"
#include "mlir/Pass/Pass.h" #include "mlir/Pass/Pass.h"
#include "mlir/Pass/PassManager.h" #include "mlir/Pass/PassManager.h"
#include "mlir/Target/LLVMIR.h" #include "mlir/Target/LLVMIR.h"
▲ Show 20 Lines • Show All 206 Lines • ▼ Show 20 Lines if (invocationResult) {
return -1; return -1;
} }
return 0; return 0;
} }
int main(int argc, char **argv) { int main(int argc, char **argv) {
mlir::registerAllDialects(); mlir::registerAllDialects();
// Register any command line options.
mlir::registerAsmPrinterCLOptions();
mlir::registerMLIRContextCLOptions();
mlir::registerPassManagerCLOptions(); mlir::registerPassManagerCLOptions();
cl::ParseCommandLineOptions(argc, argv, "toy compiler\n"); cl::ParseCommandLineOptions(argc, argv, "toy compiler\n");
if (emitAction == Action::DumpAST) if (emitAction == Action::DumpAST)
return dumpAST(); return dumpAST();
// If we aren't dumping the AST, then we are compiling with/to MLIR. // If we aren't dumping the AST, then we are compiling with/to MLIR.
// Register our Dialect with MLIR. // Register our Dialect with MLIR.
Show All 25 Lines

mlir/examples/toy/Ch7/toyc.cpp

Show All 11 Lines
#include "toy/Dialect.h" #include "toy/Dialect.h"
#include "toy/MLIRGen.h" #include "toy/MLIRGen.h"
#include "toy/Parser.h" #include "toy/Parser.h"
#include "toy/Passes.h" #include "toy/Passes.h"
#include "mlir/ExecutionEngine/ExecutionEngine.h" #include "mlir/ExecutionEngine/ExecutionEngine.h"
#include "mlir/ExecutionEngine/OptUtils.h" #include "mlir/ExecutionEngine/OptUtils.h"
#include "mlir/IR/AsmState.h"
#include "mlir/IR/MLIRContext.h" #include "mlir/IR/MLIRContext.h"
#include "mlir/IR/Module.h" #include "mlir/IR/Module.h"
#include "mlir/IR/Verifier.h" #include "mlir/IR/Verifier.h"
#include "mlir/InitAllDialects.h" #include "mlir/InitAllDialects.h"
#include "mlir/Parser.h" #include "mlir/Parser.h"
#include "mlir/Pass/Pass.h" #include "mlir/Pass/Pass.h"
#include "mlir/Pass/PassManager.h" #include "mlir/Pass/PassManager.h"
#include "mlir/Target/LLVMIR.h" #include "mlir/Target/LLVMIR.h"
▲ Show 20 Lines • Show All 207 Lines • ▼ Show 20 Lines if (invocationResult) {
return -1; return -1;
} }
return 0; return 0;
} }
int main(int argc, char **argv) { int main(int argc, char **argv) {
mlir::registerAllDialects(); mlir::registerAllDialects();
// Register any command line options.
mlir::registerAsmPrinterCLOptions();
mlir::registerMLIRContextCLOptions();
mlir::registerPassManagerCLOptions(); mlir::registerPassManagerCLOptions();
rriddleUnsubmitted
Done
ReplyInline Actions

Why are you adding pass pipeline parsers? This isn't used anywhere.

rriddle: Why are you adding pass pipeline parsers? This isn't used anywhere.
mehdi_aminiAuthorUnsubmitted
Done
ReplyInline Actions

Bad copy/paste! Thanks for catching.

mehdi_amini: Bad copy/paste! Thanks for catching.
cl::ParseCommandLineOptions(argc, argv, "toy compiler\n"); cl::ParseCommandLineOptions(argc, argv, "toy compiler\n");
if (emitAction == Action::DumpAST) if (emitAction == Action::DumpAST)
return dumpAST(); return dumpAST();
// If we aren't dumping the AST, then we are compiling with/to MLIR. // If we aren't dumping the AST, then we are compiling with/to MLIR.
// Register our Dialect with MLIR. // Register our Dialect with MLIR.
Show All 25 Lines