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

Ported integration_tests/arrays_op_27.f90 from LFortran and improve LC to support it #40

Merged
merged 3 commits into from
Dec 27, 2023
Merged

Ported integration_tests/arrays_op_27.f90 from LFortran and improve LC to support it #40

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
1c63050
DEV: Support xt::range in xt::view
czgdp1807 Dec 27, 2023
bc4683e
TEST: Ported integration_tests/arrays_op_27.f90 from LFortran
czgdp1807 Dec 27, 2023
43ef33e
TEST: Registered array_11.cpp
czgdp1807 Dec 27, 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
2 changes: 2 additions & 0 deletions integration_tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,3 +198,5 @@ RUN(NAME array_09.cpp LABELS gcc llvm NOFAST
EXTRA_ARGS --extra-arg=-I${CONDA_PREFIX}/include)
RUN(NAME array_10.cpp LABELS gcc llvm NOFAST
EXTRA_ARGS --extra-arg=-I${CONDA_PREFIX}/include)
RUN(NAME array_11.cpp LABELS gcc llvm NOFAST
EXTRA_ARGS --extra-arg=-I${CONDA_PREFIX}/include)
32 changes: 32 additions & 0 deletions integration_tests/array_11.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#include <iostream>
#include <xtensor/xtensor.hpp>
#include <xtensor/xfixed.hpp>
#include "xtensor/xio.hpp"
#include "xtensor/xview.hpp"

int main() {
xt::xtensor_fixed<int, xt::xshape<4>> R;
xt::xtensor_fixed<int, xt::xshape<4>> V;
xt::xtensor_fixed<int, xt::xshape<4>> U;
R.fill(23);
V.fill(9);
U.fill(1);

xt::view(R, xt::range(1, 4, 1)) = xt::view(V, xt::range(1, 4)) * 1 * xt::view(U, xt::range(1, 4));

std::cout<< R << std::endl;
if (R(0) != 23) {
exit(2);
}
if (R(1) != 9) {
exit(2);
}
if (R(2) != 9) {
exit(2);
}
if (R(3) != 9) {
exit(2);
}

return 0;
}
109 changes: 78 additions & 31 deletions src/lc/clang_ast_to_asr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ enum SpecialFunc {
Abs,
AMax,
Sum,
Range,
};

std::map<std::string, SpecialFunc> special_function_map = {
Expand All @@ -60,6 +61,7 @@ std::map<std::string, SpecialFunc> special_function_map = {
{"abs", SpecialFunc::Abs},
{"amax", SpecialFunc::AMax},
{"sum", SpecialFunc::Sum},
{"range", SpecialFunc::Range},
};

class OneTimeUseString {
Expand Down Expand Up @@ -129,14 +131,15 @@ class ClangASTtoASRVisitor: public clang::RecursiveASTVisitor<ClangASTtoASRVisit
OneTimeUseString cxx_operator_name_obj, member_name_obj;
ASR::expr_t* assignment_target;
Vec<ASR::expr_t*>* print_args;
bool is_all_called;
bool is_all_called, is_range_called;
OneTimeUseASRNode<ASR::expr_t> range_start, range_end, range_step;

explicit ClangASTtoASRVisitor(clang::ASTContext *Context_,
Allocator& al_, ASR::asr_t*& tu_):
Context(Context_), al{al_}, tu{tu_},
current_body{nullptr}, is_stmt_created{true},
assignment_target{nullptr}, print_args{nullptr},
is_all_called{false} {}
is_all_called{false}, is_range_called{false} {}

template <typename T>
Location Lloc(T *x) {
Expand Down Expand Up @@ -638,49 +641,78 @@ class ClangASTtoASRVisitor: public clang::RecursiveASTVisitor<ClangASTtoASRVisit
SpecialFunc sf = special_function_map[func_name];
Vec<ASR::expr_t*> args;
args.reserve(al, 1);
bool skip_format_str = true;
ASR::expr_t* assignment_target_copy = assignment_target;
assignment_target = nullptr;
for (auto *p : x->arguments()) {
TraverseStmt(p);
if (sf == SpecialFunc::Printf && skip_format_str) {
skip_format_str = false;
continue;
}
if( (tmp == nullptr && is_all_called) ||
(tmp == nullptr || p->getStmtClass() ==
clang::Stmt::StmtClass::CXXDefaultArgExprClass ) ) {
args.push_back(al, nullptr);
is_all_called = false;
} else {
ASR::asr_t* tmp_ = tmp.get();
args.push_back(al, ASRUtils::EXPR(tmp_));
if( sf != SpecialFunc::View ) {
bool skip_format_str = true;
ASR::expr_t* assignment_target_copy = assignment_target;
assignment_target = nullptr;
for (auto *p : x->arguments()) {
TraverseStmt(p);
if (sf == SpecialFunc::Printf && skip_format_str) {
skip_format_str = false;
continue;
}
if( (tmp == nullptr || p->getStmtClass() ==
clang::Stmt::StmtClass::CXXDefaultArgExprClass ) ) {
args.push_back(al, nullptr);
} else {
ASR::asr_t* tmp_ = tmp.get();
args.push_back(al, ASRUtils::EXPR(tmp_));
}
}
assignment_target = assignment_target_copy;
}
assignment_target = assignment_target_copy;
if (sf == SpecialFunc::Printf) {
tmp = ASR::make_Print_t(al, Lloc(x), args.p, args.size(), nullptr, nullptr);
is_stmt_created = true;
} else if (sf == SpecialFunc::View) {
ASR::expr_t* array = args.p[0];
clang::Expr** view_args = x->getArgs();
size_t view_nargs = x->getNumArgs();
ASR::expr_t* assignment_target_copy = assignment_target;
assignment_target = nullptr;
TraverseStmt(view_args[0]);
assignment_target = assignment_target_copy;
ASR::expr_t* array = ASRUtils::EXPR(tmp.get());
size_t rank = ASRUtils::extract_n_dims_from_ttype(ASRUtils::expr_type(array));
Vec<ASR::array_index_t> array_section_indices;
array_section_indices.reserve(al, rank);
size_t i, j, result_dims = 0;
for( i = 0, j = 1; j < args.size(); j++, i++ ) {
for( i = 0, j = 1; j < view_nargs; j++, i++ ) {
ASR::expr_t* assignment_target_copy = assignment_target;
assignment_target = nullptr;
TraverseStmt(view_args[j]);
assignment_target = assignment_target_copy;
ASR::array_index_t index;
if( args.p[j] == nullptr ) {
if( (tmp == nullptr && (is_all_called || is_range_called)) ||
(tmp == nullptr || view_args[j]->getStmtClass() ==
clang::Stmt::StmtClass::CXXDefaultArgExprClass ) ) {
index.loc = array->base.loc;
index.m_left = ASRUtils::get_bound<SemanticError>(array, i + 1, "lbound", al);
index.m_right = ASRUtils::get_bound<SemanticError>(array, i + 1, "ubound", al);
index.m_step = ASRUtils::EXPR(ASR::make_IntegerConstant_t(al, index.loc, 1,
ASRUtils::TYPE(ASR::make_Integer_t(al, index.loc, 4))));
array_section_indices.push_back(al, index);
if( is_range_called ) {
index.m_left = range_start.get();
ASR::expr_t* range_end_ = range_end.get();
CreateBinOp(range_end_,
ASRUtils::EXPR(ASR::make_IntegerConstant_t(al, index.loc,
1, ASRUtils::expr_type(range_end_))),
ASR::binopType::Sub, index.loc);
index.m_right = ASRUtils::EXPR(tmp.get());
index.m_step = range_step.get();
array_section_indices.push_back(al, index);
} else if( is_all_called ) {
index.m_left = ASRUtils::get_bound<SemanticError>(array, i + 1, "lbound", al);
index.m_right = ASRUtils::get_bound<SemanticError>(array, i + 1, "ubound", al);
index.m_step = ASRUtils::EXPR(ASR::make_IntegerConstant_t(al, index.loc, 1,
ASRUtils::TYPE(ASR::make_Integer_t(al, index.loc, 4))));
array_section_indices.push_back(al, index);
} else {
throw std::runtime_error("Neither xt::range nor xt::all is being called for slicing array.");
}
is_range_called = false;
is_all_called = false;
result_dims += 1;
} else {
index.loc = args.p[j]->base.loc;
ASR::expr_t* arg_ = ASRUtils::EXPR(tmp.get());
index.loc = arg_->base.loc;
index.m_left = nullptr;
index.m_right = args.p[j];
index.m_right = arg_;
index.m_step = nullptr;
array_section_indices.push_back(al, index);
}
Expand Down Expand Up @@ -744,6 +776,20 @@ class ClangASTtoASRVisitor: public clang::RecursiveASTVisitor<ClangASTtoASRVisit
// Handle with argument case later.
is_all_called = true;
tmp = nullptr;
} else if( sf == SpecialFunc::Range ) {
if( args.size() < 2 ) {
throw std::runtime_error("xt::range accepts at least 2 arguments.");
}
range_start = args.p[0];
range_end = args.p[1];
if( args.size() > 2 ) {
range_step = args.p[2];
} else {
range_step = ASRUtils::EXPR(ASR::make_IntegerConstant_t(
al, args.p[0]->base.loc, 1, ASRUtils::expr_type(args.p[0])));
}
is_range_called = true;
tmp = nullptr;
} else if( sf == SpecialFunc::Any ) {
tmp = ASRUtils::make_IntrinsicArrayFunction_t_util(al, Lloc(x),
static_cast<int64_t>(ASRUtils::IntrinsicArrayFunctions::Any),
Expand Down Expand Up @@ -1259,7 +1305,8 @@ class ClangASTtoASRVisitor: public clang::RecursiveASTVisitor<ClangASTtoASRVisit
name == "all" || name == "any" || name == "not_equal" ||
name == "exit" || name == "printf" || name == "exp" ||
name == "sum" || name == "amax" || name == "abs" ||
name == "operator-" || name == "operator/" || name == "operator>" ) {
name == "operator-" || name == "operator/" || name == "operator>" ||
name == "range" ) {
if( sym != nullptr && ASR::is_a<ASR::Function_t>(
*ASRUtils::symbol_get_past_external(sym)) ) {
throw std::runtime_error("Special function " + name + " cannot be overshadowed yet.");
Expand Down
Loading