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

Dftatom: Changes from lfortran LibASR #2334

Merged
merged 3 commits into from
Sep 22, 2023
Merged

Dftatom: Changes from lfortran LibASR #2334

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
6733b67
PASS: Use array_op on struct_inst_mem
Shaikh-Ubaid Sep 22, 2023
c396abc
struct_inst_mem in pass_subroutine_from_function()
Shaikh-Ubaid Sep 22, 2023
58da39c
PASS: Handle bounds for arr mem in struct
Shaikh-Ubaid Sep 22, 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
3 changes: 1 addition & 2 deletions src/libasr/asr_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,8 +698,7 @@ static inline ASR::symbol_t *get_asr_owner(const ASR::expr_t *expr) {
return ASRUtils::get_asr_owner(ASR::down_cast<ASR::FunctionCall_t>(expr)->m_name);
}
default: {
throw LCompilersException("Cannot find the ASR owner of underlying symbol of expression "
+ std::to_string(expr->type));
return nullptr;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: this changes the API, now it will return nullptr if the node does not have an ASR owner.

}
}
return nullptr;
Expand Down
66 changes: 29 additions & 37 deletions src/libasr/pass/array_op.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1460,47 +1460,39 @@ class ArrayOpVisitor : public ASR::CallReplacerOnExpressionsVisitor<ArrayOpVisit
}

void visit_Assignment(const ASR::Assignment_t &x) {
bool is_target_struct_member_array_and_value_array =
(ASR::is_a<ASR::StructInstanceMember_t>(*x.m_target) &&
ASRUtils::is_array(ASRUtils::expr_type(x.m_value)) &&
ASRUtils::is_array(ASRUtils::expr_type(x.m_target)) &&
!ASR::is_a<ASR::FunctionCall_t>(*x.m_value));
if( (ASR::is_a<ASR::Pointer_t>(*ASRUtils::expr_type(x.m_target)) &&
ASR::is_a<ASR::GetPointer_t>(*x.m_value)) ||
(ASR::is_a<ASR::ArrayConstant_t>(*x.m_value)) ||
is_target_struct_member_array_and_value_array) { // TODO: fix for StructInstanceMember targets
if( is_target_struct_member_array_and_value_array ) {
if (realloc_lhs && ASRUtils::is_allocatable(x.m_target)) { // Add realloc-lhs later
Vec<ASR::alloc_arg_t> vec_alloc;
vec_alloc.reserve(al, 1);
ASR::alloc_arg_t alloc_arg;
alloc_arg.m_len_expr = nullptr;
alloc_arg.m_type = nullptr;
alloc_arg.loc = x.m_target->base.loc;
alloc_arg.m_a = x.m_target;


ASR::dimension_t* m_dims = nullptr;
size_t n_dims = ASRUtils::extract_dimensions_from_ttype(
ASRUtils::expr_type(x.m_value), m_dims);
Vec<ASR::dimension_t> vec_dims;
vec_dims.reserve(al, n_dims);
for( size_t i = 0; i < n_dims; i++ ) {
ASR::dimension_t dim;
dim.loc = x.m_value->base.loc;
dim.m_start = PassUtils::get_bound(x.m_value, i + 1, "lbound", al);
dim.m_length = ASRUtils::get_size(x.m_value, i + 1, al);
vec_dims.push_back(al, dim);
}
(ASR::is_a<ASR::ArrayConstant_t>(*x.m_value)) ) {
if( realloc_lhs && ASRUtils::is_allocatable(x.m_target)) { // Add realloc-lhs later
Vec<ASR::alloc_arg_t> vec_alloc;
vec_alloc.reserve(al, 1);
ASR::alloc_arg_t alloc_arg;
alloc_arg.m_len_expr = nullptr;
alloc_arg.m_type = nullptr;
alloc_arg.loc = x.m_target->base.loc;
alloc_arg.m_a = x.m_target;


ASR::dimension_t* m_dims = nullptr;
size_t n_dims = ASRUtils::extract_dimensions_from_ttype(
ASRUtils::expr_type(x.m_value), m_dims);
Vec<ASR::dimension_t> vec_dims;
vec_dims.reserve(al, n_dims);
for( size_t i = 0; i < n_dims; i++ ) {
ASR::dimension_t dim;
dim.loc = x.m_value->base.loc;
dim.m_start = PassUtils::get_bound(x.m_value, i + 1, "lbound", al);
dim.m_length = ASRUtils::get_size(x.m_value, i + 1, al);
vec_dims.push_back(al, dim);
}


alloc_arg.m_dims = vec_dims.p;
alloc_arg.n_dims = vec_dims.n;
vec_alloc.push_back(al, alloc_arg);
pass_result.push_back(al, ASRUtils::STMT(ASR::make_Allocate_t(
al, x.base.base.loc, vec_alloc.p, 1, nullptr, nullptr, nullptr)));
remove_original_statement = false;
}
alloc_arg.m_dims = vec_dims.p;
alloc_arg.n_dims = vec_dims.n;
vec_alloc.push_back(al, alloc_arg);
pass_result.push_back(al, ASRUtils::STMT(ASR::make_Allocate_t(
al, x.base.base.loc, vec_alloc.p, 1, nullptr, nullptr, nullptr)));
remove_original_statement = false;
}
return ;
}
Expand Down
18 changes: 18 additions & 0 deletions src/libasr/pass/pass_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,25 @@ namespace LCompilers {

ASR::expr_t* get_bound(ASR::expr_t* arr_expr, int dim, std::string bound,
Allocator& al) {
ASR::ttype_t* x_mv_type = ASRUtils::expr_type(arr_expr);
ASR::dimension_t* m_dims;
int n_dims = ASRUtils::extract_dimensions_from_ttype(x_mv_type, m_dims);
bool is_data_only_array = ASRUtils::is_fixed_size_array(m_dims, n_dims) && ASRUtils::get_asr_owner(arr_expr) &&
ASR::is_a<ASR::StructType_t>(*ASRUtils::get_asr_owner(arr_expr));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does "data only array" in this context mean "FixedSizeArray" inside a struct?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok. I would maybe document this in a comment, or maybe name the variable fixed_array_inside_struct, or something like that.

ASR::ttype_t* int32_type = ASRUtils::TYPE(ASR::make_Integer_t(al, arr_expr->base.loc, 4));
if (is_data_only_array) {
const Location& loc = arr_expr->base.loc;
ASR::expr_t* zero = ASRUtils::EXPR(ASR::make_IntegerConstant_t(al, loc, 0, int32_type));
ASR::expr_t* one = ASRUtils::EXPR(ASR::make_IntegerConstant_t(al, loc, 1, int32_type));
if( bound == "ubound" ) {
return ASRUtils::EXPR(ASR::make_IntegerBinOp_t(
al, arr_expr->base.loc, m_dims[dim - 1].m_length, ASR::binopType::Sub, one, int32_type, nullptr));
}
if ( m_dims[dim - 1].m_start != nullptr ) {
return m_dims[dim - 1].m_start;
}
return zero;
}
ASR::expr_t* dim_expr = ASRUtils::EXPR(ASR::make_IntegerConstant_t(al, arr_expr->base.loc, dim, int32_type));
ASR::arrayboundType bound_type = ASR::arrayboundType::LBound;
if( bound == "ubound" ) {
Expand Down
8 changes: 1 addition & 7 deletions src/libasr/pass/subroutine_from_function.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,15 +318,9 @@ class ReplaceFunctionCallWithSubroutineCallVisitor:
}

void visit_Assignment(const ASR::Assignment_t &x) {
bool is_target_struct_member_array_and_value_array =
(ASR::is_a<ASR::StructInstanceMember_t>(*x.m_target) &&
ASRUtils::is_array(ASRUtils::expr_type(x.m_value)) &&
ASRUtils::is_array(ASRUtils::expr_type(x.m_target)) &&
!ASR::is_a<ASR::FunctionCall_t>(*x.m_value));
if( (ASR::is_a<ASR::Pointer_t>(*ASRUtils::expr_type(x.m_target)) &&
ASR::is_a<ASR::GetPointer_t>(*x.m_value)) ||
(ASR::is_a<ASR::ArrayConstant_t>(*x.m_value)) ||
is_target_struct_member_array_and_value_array) { // TODO: fix for StructInstanceMember targets
(ASR::is_a<ASR::ArrayConstant_t>(*x.m_value))) {
return ;
}

Expand Down