Skip to content
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

Jump to bottom

Remove extra supports for --dump-all-passes-fortran #2749

Merged
merged 1 commit into from
Oct 28, 2023
Merged

Remove extra supports for --dump-all-passes-fortran #2749

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
25 changes: 6 additions & 19 deletions src/bin/lfortran.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,9 +641,6 @@ int emit_asr(const std::string &infile,
compiler_options.po.always_run = true;
compiler_options.po.run_fun = "f";

if (compiler_options.po.dump_all_passes) {
pass_manager.use_default_passes();
}
pass_manager.apply_passes(al, asr, compiler_options.po, diagnostics, lm);
if (compiler_options.po.tree) {
std::cout << LCompilers::pickle_tree(*asr,
Expand Down Expand Up @@ -744,8 +741,7 @@ int emit_julia(const std::string &infile, CompilerOptions &compiler_options)
}
}

int emit_fortran(const std::string &infile, LCompilers::PassManager &pass_manager,
CompilerOptions &compiler_options) {
int emit_fortran(const std::string &infile, CompilerOptions &compiler_options) {
std::string input = read_file(infile);

LCompilers::FortranEvaluator fe(compiler_options);
Expand All @@ -757,8 +753,7 @@ int emit_fortran(const std::string &infile, LCompilers::PassManager &pass_manag
lm.files.push_back(fl);
lm.file_ends.push_back(input.size());
}
LCompilers::Result<std::string> src = fe.get_fortran(input, lm, pass_manager,
diagnostics);
LCompilers::Result<std::string> src = fe.get_fortran(input, lm, diagnostics);
std::cerr << diagnostics.render(lm, compiler_options);
if (src.ok) {
std::cout << src.result;
Expand Down Expand Up @@ -1402,7 +1397,6 @@ int compile_to_object_file_c(const std::string &infile,

int compile_to_binary_fortran(const std::string &infile,
const std::string &outfile,
LCompilers::PassManager &pass_manager,
CompilerOptions &compiler_options) {
std::string input = read_file(infile);

Expand All @@ -1415,8 +1409,7 @@ int compile_to_binary_fortran(const std::string &infile,
lm.files.push_back(fl);
lm.file_ends.push_back(input.size());
}
LCompilers::Result<std::string> src = fe.get_fortran(input, lm, pass_manager,
diagnostics);
LCompilers::Result<std::string> src = fe.get_fortran(input, lm, diagnostics);
std::cerr << diagnostics.render(lm, compiler_options);
if (!src.ok) {
LCOMPILERS_ASSERT(diagnostics.has_error())
Expand Down Expand Up @@ -2108,10 +2101,6 @@ int main(int argc, char *argv[])
lfortran_pass_manager.use_optimization_passes();
}

if (compiler_options.po.dump_fortran) {
arg_backend = "fortran";
}

if (fmt) {
if (CLI::NonexistentPath(arg_fmt_file).empty())
throw LCompilers::LCompilersException("File does not exist: " + arg_fmt_file);
Expand Down Expand Up @@ -2261,7 +2250,7 @@ int main(int argc, char *argv[])
return emit_julia(arg_file, compiler_options);
}
if (show_fortran) {
return emit_fortran(arg_file, lfortran_pass_manager, compiler_options);
return emit_fortran(arg_file, compiler_options);
}
if (arg_S) {
if (backend == Backend::llvm) {
Expand Down Expand Up @@ -2298,8 +2287,7 @@ int main(int argc, char *argv[])
} else if (backend == Backend::wasm) {
return compile_to_binary_wasm(arg_file, outfile, time_report, compiler_options);
} else if (backend == Backend::fortran) {
return compile_to_binary_fortran(arg_file, outfile, lfortran_pass_manager,
compiler_options);
return compile_to_binary_fortran(arg_file, outfile, compiler_options);
} else {
throw LCompilers::LCompilersException("Unsupported backend.");
}
Expand Down Expand Up @@ -2330,8 +2318,7 @@ int main(int argc, char *argv[])
err = compile_to_object_file_c(arg_file, tmp_o,
false, rtlib_c_header_dir, lfortran_pass_manager, compiler_options);
} else if (backend == Backend::fortran) {
err = compile_to_binary_fortran(arg_file, tmp_o, lfortran_pass_manager,
compiler_options);
err = compile_to_binary_fortran(arg_file, tmp_o, compiler_options);
} else {
throw LCompilers::LCompilersException("Backend not supported");
}
Expand Down
11 changes: 1 addition & 10 deletions src/lfortran/fortran_evaluator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,23 +513,14 @@ Result<std::string> FortranEvaluator::get_julia(const std::string &code,
}

Result<std::string> FortranEvaluator::get_fortran(const std::string &code,
LocationManager &lm, LCompilers::PassManager &pass_manager,
diag::Diagnostics &diagnostics)
LocationManager &lm, diag::Diagnostics &diagnostics)
{
// SRC -> AST -> ASR -> Fortran
SymbolTable *old_symbol_table = symbol_table;
symbol_table = nullptr;
Result<ASR::TranslationUnit_t*> asr = get_asr2(code, lm, diagnostics);
symbol_table = old_symbol_table;
if (asr.ok) {
Allocator al(64*1024*1024);
if (compiler_options.po.dump_fortran) {
compiler_options.po.always_run = true;
compiler_options.po.run_fun = "f";

pass_manager.use_default_passes();
pass_manager.apply_passes(al, asr.result, compiler_options.po, diagnostics, lm);
}
return asr_to_fortran(*asr.result, diagnostics, false, 4);
} else {
LCOMPILERS_ASSERT(diagnostics.has_error())
Expand Down
3 changes: 1 addition & 2 deletions src/lfortran/fortran_evaluator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,7 @@ class FortranEvaluator
Result<std::string> get_julia(const std::string &code,
LocationManager &lm, diag::Diagnostics &diagnostics);
Result<std::string> get_fortran(const std::string &code,
LocationManager &lm, LCompilers::PassManager &pass_manager,
diag::Diagnostics &diagnostics);
LocationManager &lm, diag::Diagnostics &diagnostics);
Result<std::string> get_fmt(const std::string &code, LocationManager &lm,
diag::Diagnostics &diagnostics);

Expand Down
Loading