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

Clean up the pass names #2116

Merged
merged 3 commits into from
Jul 6, 2023
Merged

Clean up the pass names #2116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eedc165
Update gen_pass.py from LFortran
certik Jul 6, 2023
151a238
Commit generated code
certik Jul 6, 2023
b03cd57
Update the rest of the code to compile
certik Jul 6, 2023
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
6 changes: 3 additions & 3 deletions src/libasr/codegen/asr_to_c.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
#include <libasr/asr_utils.h>
#include <libasr/string_utils.h>
#include <libasr/pass/unused_functions.h>
#include <libasr/pass/class_constructor.h>
#include <libasr/pass/array_op.h>
#include <libasr/pass/subroutine_from_function.h>
#include <libasr/pass/replace_class_constructor.h>
#include <libasr/pass/replace_array_op.h>
#include <libasr/pass/create_subroutine_from_function.h>

#include <map>
#include <utility>
Expand Down
4 changes: 2 additions & 2 deletions src/libasr/codegen/asr_to_x86.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#include <libasr/containers.h>
#include <libasr/codegen/asr_to_x86.h>
#include <libasr/codegen/x86_assembler.h>
#include <libasr/pass/do_loops.h>
#include <libasr/pass/global_stmts.h>
#include <libasr/pass/replace_do_loops.h>
#include <libasr/pass/wrap_global_stmts.h>
#include <libasr/exception.h>
#include <libasr/asr_utils.h>

Expand Down
93 changes: 38 additions & 55 deletions src/libasr/gen_pass.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,62 +1,44 @@
passes = [
# name, optional prefix (pass_PREFIX_name())
("arr_slice", "replace"),
("array_op", "replace"),
("class_constructor", "replace"),
("dead_code_removal", ""),
("div_to_mul", "replace"),
("do_loops", "replace"),
("flip_sign", "replace"),
("fma", "replace"),
("for_all", "replace"),
("global_stmts", "wrap"),
("global_stmts_program", "wrap"),
("global_symbols", "wrap"),
("implied_do_loops", "replace"),
("init_expr", "replace"),
("inline_function_calls", ""),
("instantiate_template", ""),
("intrinsic_function", "replace"),
("loop_unroll", ""),
("loop_vectorise", ""),
("nested_vars", ""),
("param_to_const", "replace"),
("pass_array_by_data", ""),
("pass_compare", ""),
("pass_list_expr", ""),
("print_arr", "replace"),
("print_list_tuple", "replace"),
("print_struct_type", "replace"),
("select_case", "replace"),
("sign_from_value", "replace"),
("subroutine_from_function", "create"),
("transform_optional_argument_functions", ""),
("unused_functions", ""),
("update_array_dim_intrinsic_calls", ""),
("where", "replace"),
"replace_arr_slice",
"replace_array_op",
"replace_class_constructor",
"dead_code_removal",
"replace_div_to_mul",
"replace_do_loops",
"replace_flip_sign",
"replace_fma",
"replace_for_all",
"wrap_global_stmts",
"wrap_global_stmts_program",
"wrap_global_symbols",
"replace_implied_do_loops",
"replace_init_expr",
"inline_function_calls",
"replace_intrinsic_function",
"loop_unroll",
"loop_vectorise",
"nested_vars",
"replace_param_to_const",
"array_by_data",
"compare",
"list_expr",
"replace_print_arr",
"replace_print_list_tuple",
"replace_print_struct_type",
"replace_select_case",
"replace_sign_from_value",
"create_subroutine_from_function",
"transform_optional_argument_functions",
"unused_functions",
"update_array_dim_intrinsic_calls",
"replace_where",
]



for pass_name, prefix in passes:
print(f"Processing: {pass_name}")
name = pass_name
if name.startswith("pass"):
name = name[5:]
for name in passes:
print(f"Processing: {name}")
name_up = name.upper()
if prefix != "":
prefix += "_"
arguments = r"""Allocator &al, ASR::TranslationUnit_t &unit,
const PassOptions &pass_options"""
return_type = "void"
if pass_name == "instantiate_template":
arguments = r"""Allocator &al,
std::map<std::string, ASR::ttype_t*> subs, std::map<std::string, ASR::symbol_t*> rt_subs,
SymbolTable *current_scope, std::string new_func_name, ASR::symbol_t *sym"""
return_type = "ASR::symbol_t*"



header = rf"""#ifndef LIBASR_PASS_{name_up}_H
#define LIBASR_PASS_{name_up}_H

Expand All @@ -65,12 +47,13 @@

namespace LCompilers {{

{return_type} pass_{prefix}{name}({arguments});
void pass_{name}(Allocator &al, ASR::TranslationUnit_t &unit,
const PassOptions &pass_options);

}} // namespace LCompilers

#endif // LIBASR_PASS_{name_up}_H
"""
header_filename = f"pass/{pass_name}.h"
header_filename = f"pass/{name}.h"
f = open(header_filename, "w")
f.write(header)
2 changes: 1 addition & 1 deletion src/libasr/pass/arr_slice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <libasr/asr_utils.h>
#include <libasr/asr_verify.h>
#include <libasr/pass/pass_utils.h>
#include <libasr/pass/arr_slice.h>
#include <libasr/pass/replace_arr_slice.h>

#include <vector>
#include <utility>
Expand Down
0 src/libasr/pass/pass_array_by_data.h → src/libasr/pass/array_by_data.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/libasr/pass/array_op.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <libasr/exception.h>
#include <libasr/asr_utils.h>
#include <libasr/asr_verify.h>
#include <libasr/pass/array_op.h>
#include <libasr/pass/replace_array_op.h>
#include <libasr/pass/pass_utils.h>
#include <libasr/pass/intrinsic_function_registry.h>

Expand Down
2 changes: 1 addition & 1 deletion src/libasr/pass/class_constructor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <libasr/exception.h>
#include <libasr/asr_utils.h>
#include <libasr/asr_verify.h>
#include <libasr/pass/class_constructor.h>
#include <libasr/pass/replace_class_constructor.h>
#include <libasr/pass/pass_utils.h>

#include <vector>
Expand Down
0 src/libasr/pass/pass_compare.h → src/libasr/pass/compare.h
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions src/libasr/pass/subroutine_from_function.h → ...sr/pass/create_subroutine_from_function.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef LIBASR_PASS_SUBROUTINE_FROM_FUNCTION_H
#define LIBASR_PASS_SUBROUTINE_FROM_FUNCTION_H
#ifndef LIBASR_PASS_CREATE_SUBROUTINE_FROM_FUNCTION_H
#define LIBASR_PASS_CREATE_SUBROUTINE_FROM_FUNCTION_H

#include <libasr/asr.h>
#include <libasr/utils.h>
Expand All @@ -11,4 +11,4 @@ namespace LCompilers {

} // namespace LCompilers

#endif // LIBASR_PASS_SUBROUTINE_FROM_FUNCTION_H
#endif // LIBASR_PASS_CREATE_SUBROUTINE_FROM_FUNCTION_H
2 changes: 1 addition & 1 deletion src/libasr/pass/div_to_mul.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <libasr/exception.h>
#include <libasr/asr_utils.h>
#include <libasr/asr_verify.h>
#include <libasr/pass/div_to_mul.h>
#include <libasr/pass/replace_div_to_mul.h>
#include <libasr/pass/pass_utils.h>

#include <vector>
Expand Down
2 changes: 1 addition & 1 deletion src/libasr/pass/do_loops.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <libasr/exception.h>
#include <libasr/asr_utils.h>
#include <libasr/asr_verify.h>
#include <libasr/pass/do_loops.h>
#include <libasr/pass/replace_do_loops.h>
#include <libasr/pass/stmt_walk_visitor.h>
#include <libasr/pass/pass_utils.h>

Expand Down
2 changes: 1 addition & 1 deletion src/libasr/pass/flip_sign.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <libasr/exception.h>
#include <libasr/asr_utils.h>
#include <libasr/asr_verify.h>
#include <libasr/pass/flip_sign.h>
#include <libasr/pass/replace_flip_sign.h>
#include <libasr/pass/pass_utils.h>

#include <vector>
Expand Down
2 changes: 1 addition & 1 deletion src/libasr/pass/fma.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <libasr/exception.h>
#include <libasr/asr_utils.h>
#include <libasr/asr_verify.h>
#include <libasr/pass/fma.h>
#include <libasr/pass/replace_fma.h>
#include <libasr/pass/pass_utils.h>

#include <vector>
Expand Down
2 changes: 1 addition & 1 deletion src/libasr/pass/for_all.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <libasr/exception.h>
#include <libasr/asr_utils.h>
#include <libasr/asr_verify.h>
#include <libasr/pass/for_all.h>
#include <libasr/pass/replace_for_all.h>
#include <libasr/pass/stmt_walk_visitor.h>

namespace LCompilers {
Expand Down
2 changes: 1 addition & 1 deletion src/libasr/pass/global_stmts.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <libasr/exception.h>
#include <libasr/asr_utils.h>
#include <libasr/asr_verify.h>
#include <libasr/pass/global_stmts.h>
#include <libasr/pass/wrap_global_stmts.h>
#include <libasr/pass/pass_utils.h>


Expand Down
4 changes: 2 additions & 2 deletions src/libasr/pass/global_stmts_program.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#include <libasr/exception.h>
#include <libasr/asr_utils.h>
#include <libasr/asr_verify.h>
#include <libasr/pass/global_stmts.h>
#include <libasr/pass/global_symbols.h>
#include <libasr/pass/wrap_global_stmts.h>
#include <libasr/pass/wrap_global_symbols.h>


namespace LCompilers {
Expand Down
2 changes: 1 addition & 1 deletion src/libasr/pass/global_symbols.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <libasr/exception.h>
#include <libasr/asr_utils.h>
#include <libasr/asr_verify.h>
#include <libasr/pass/global_symbols.h>
#include <libasr/pass/wrap_global_symbols.h>
#include <libasr/pass/pass_utils.h>


Expand Down
2 changes: 1 addition & 1 deletion src/libasr/pass/implied_do_loops.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <libasr/exception.h>
#include <libasr/asr_utils.h>
#include <libasr/asr_verify.h>
#include <libasr/pass/implied_do_loops.h>
#include <libasr/pass/replace_implied_do_loops.h>
#include <libasr/pass/pass_utils.h>
#include <libasr/pass/intrinsic_function_registry.h>

Expand Down
2 changes: 1 addition & 1 deletion src/libasr/pass/init_expr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <libasr/exception.h>
#include <libasr/asr_utils.h>
#include <libasr/asr_verify.h>
#include <libasr/pass/init_expr.h>
#include <libasr/pass/replace_init_expr.h>
#include <libasr/pass/pass_utils.h>

#include <vector>
Expand Down
2 changes: 1 addition & 1 deletion src/libasr/pass/intrinsic_function.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <libasr/exception.h>
#include <libasr/asr_utils.h>
#include <libasr/asr_verify.h>
#include <libasr/pass/intrinsic_function.h>
#include <libasr/pass/replace_intrinsic_function.h>
#include <libasr/pass/intrinsic_function_registry.h>
#include <libasr/pass/pass_utils.h>

Expand Down
0 src/libasr/pass/pass_list_expr.h → src/libasr/pass/list_expr.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/libasr/pass/param_to_const.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <libasr/exception.h>
#include <libasr/asr_utils.h>
#include <libasr/asr_verify.h>
#include <libasr/pass/param_to_const.h>
#include <libasr/pass/replace_param_to_const.h>


namespace LCompilers {
Expand Down
2 changes: 1 addition & 1 deletion src/libasr/pass/pass_array_by_data.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <libasr/asr_utils.h>
#include <libasr/asr_verify.h>
#include <libasr/pass/pass_utils.h>
#include <libasr/pass/pass_array_by_data.h>
#include <libasr/pass/array_by_data.h>

#include <vector>
#include <utility>
Expand Down
2 changes: 1 addition & 1 deletion src/libasr/pass/pass_compare.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <libasr/exception.h>
#include <libasr/asr_utils.h>
#include <libasr/asr_verify.h>
#include <libasr/pass/pass_compare.h>
#include <libasr/pass/compare.h>
#include <libasr/pass/pass_utils.h>

#include <vector>
Expand Down
2 changes: 1 addition & 1 deletion src/libasr/pass/pass_list_expr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <libasr/exception.h>
#include <libasr/asr_utils.h>
#include <libasr/asr_verify.h>
#include <libasr/pass/pass_list_expr.h>
#include <libasr/pass/list_expr.h>
#include <libasr/pass/pass_utils.h>

#include <vector>
Expand Down
50 changes: 25 additions & 25 deletions src/libasr/pass/pass_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,39 +14,39 @@
#include <lpython/utils.h>
#endif

#include <libasr/pass/do_loops.h>
#include <libasr/pass/for_all.h>
#include <libasr/pass/init_expr.h>
#include <libasr/pass/implied_do_loops.h>
#include <libasr/pass/array_op.h>
#include <libasr/pass/select_case.h>
#include <libasr/pass/global_stmts.h>
#include <libasr/pass/param_to_const.h>
#include <libasr/pass/print_arr.h>
#include <libasr/pass/where.h>
#include <libasr/pass/print_list_tuple.h>
#include <libasr/pass/arr_slice.h>
#include <libasr/pass/flip_sign.h>
#include <libasr/pass/div_to_mul.h>
#include <libasr/pass/intrinsic_function.h>
#include <libasr/pass/fma.h>
#include <libasr/pass/replace_do_loops.h>
#include <libasr/pass/replace_for_all.h>
#include <libasr/pass/replace_init_expr.h>
#include <libasr/pass/replace_implied_do_loops.h>
#include <libasr/pass/replace_array_op.h>
#include <libasr/pass/replace_select_case.h>
#include <libasr/pass/wrap_global_stmts.h>
#include <libasr/pass/replace_param_to_const.h>
#include <libasr/pass/replace_print_arr.h>
#include <libasr/pass/replace_where.h>
#include <libasr/pass/replace_print_list_tuple.h>
#include <libasr/pass/replace_arr_slice.h>
#include <libasr/pass/replace_flip_sign.h>
#include <libasr/pass/replace_div_to_mul.h>
#include <libasr/pass/replace_intrinsic_function.h>
#include <libasr/pass/replace_fma.h>
#include <libasr/pass/loop_unroll.h>
#include <libasr/pass/sign_from_value.h>
#include <libasr/pass/class_constructor.h>
#include <libasr/pass/replace_sign_from_value.h>
#include <libasr/pass/replace_class_constructor.h>
#include <libasr/pass/unused_functions.h>
#include <libasr/pass/inline_function_calls.h>
#include <libasr/pass/dead_code_removal.h>
#include <libasr/pass/for_all.h>
#include <libasr/pass/init_expr.h>
#include <libasr/pass/select_case.h>
#include <libasr/pass/replace_for_all.h>
#include <libasr/pass/replace_init_expr.h>
#include <libasr/pass/replace_select_case.h>
#include <libasr/pass/loop_vectorise.h>
#include <libasr/pass/update_array_dim_intrinsic_calls.h>
#include <libasr/pass/pass_array_by_data.h>
#include <libasr/pass/pass_list_expr.h>
#include <libasr/pass/subroutine_from_function.h>
#include <libasr/pass/array_by_data.h>
#include <libasr/pass/list_expr.h>
#include <libasr/pass/create_subroutine_from_function.h>
#include <libasr/pass/transform_optional_argument_functions.h>
#include <libasr/pass/nested_vars.h>
#include <libasr/pass/print_struct_type.h>
#include <libasr/pass/replace_print_struct_type.h>
#include <libasr/asr_verify.h>

#include <map>
Expand Down
2 changes: 1 addition & 1 deletion src/libasr/pass/print_arr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <libasr/asr_utils.h>
#include <libasr/asr_verify.h>
#include <libasr/pass/pass_utils.h>
#include <libasr/pass/print_arr.h>
#include <libasr/pass/replace_print_arr.h>


namespace LCompilers {
Expand Down
2 changes: 1 addition & 1 deletion src/libasr/pass/print_list_tuple.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <libasr/asr_utils.h>
#include <libasr/asr_verify.h>
#include <libasr/pass/pass_utils.h>
#include <libasr/pass/print_list_tuple.h>
#include <libasr/pass/replace_print_list_tuple.h>

namespace LCompilers {

Expand Down
Loading