Skip to content

WASM: Use enum to improve performance #1542

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

Merged
merged 2 commits into from
Feb 21, 2023
Merged

WASM: Use enum to improve performance #1542

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5caba9f
WASM: Use enum to improve performance
ubaidsk Feb 21, 2023
47f01fd
WASM: Add rt_funcs_last to enum RT_FUNCS
ubaidsk Feb 21, 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
143 changes: 80 additions & 63 deletions src/libasr/codegen/asr_to_wasm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,21 @@ struct SymbolFuncInfo {
Vec<ASR::Variable_t *> referenced_vars;
};

enum RT_FUNCS {
print_i64 = 0,
print_f64 = 1,
add_c32 = 2,
add_c64 = 3,
sub_c32 = 4,
sub_c64 = 5,
mul_c32 = 6,
mul_c64 = 7,
abs_c32 = 9,
abs_c64 = 10,
rt_funcs_last = 11, // keep this as the last enumerator
};
const int NO_OF_RT_FUNCS = rt_funcs_last;

class ASRToWASMVisitor : public ASR::BaseVisitor<ASRToWASMVisitor> {
public:
Allocator &m_al;
Expand Down Expand Up @@ -104,7 +119,8 @@ class ASRToWASMVisitor : public ASR::BaseVisitor<ASRToWASMVisitor> {
std::map<std::string, uint32_t> m_self_func_name_idx_map;
std::map<std::string, uint32_t> m_string_to_iov_loc_map;

std::map<std::string,void (LCompilers::ASRToWASMVisitor::*)(int)> m_self_funcs_map;
std::vector<void (LCompilers::ASRToWASMVisitor::*)(int)> m_rt_funcs_map;
std::vector<int> m_rt_func_used_idx;

public:
ASRToWASMVisitor(Allocator &al, diag::Diagnostics &diagnostics)
Expand Down Expand Up @@ -134,6 +150,9 @@ class ASRToWASMVisitor : public ASR::BaseVisitor<ASRToWASMVisitor> {
m_export_section.reserve(m_al, 1024 * 128);
m_code_section.reserve(m_al, 1024 * 128);
m_data_section.reserve(m_al, 1024 * 128);

m_rt_funcs_map.resize(NO_OF_RT_FUNCS);
m_rt_func_used_idx = std::vector<int>(NO_OF_RT_FUNCS, -1);
}

void get_wasm(Vec<uint8_t> &code) {
Expand Down Expand Up @@ -536,7 +555,7 @@ class ASRToWASMVisitor : public ASR::BaseVisitor<ASRToWASMVisitor> {

wasm::emit_get_local(m_code_section, m_al, 0);
wasm::emit_i64_trunc_f64_s(m_code_section, m_al);
wasm::emit_call(m_code_section, m_al, m_self_func_name_idx_map["print_i64"]);
wasm::emit_call(m_code_section, m_al, m_rt_func_used_idx[print_i64]);
emit_call_fd_write(1, ".", 1, 0);

wasm::emit_get_local(m_code_section, m_al, 0);
Expand Down Expand Up @@ -587,7 +606,7 @@ class ASRToWASMVisitor : public ASR::BaseVisitor<ASRToWASMVisitor> {
});

wasm::emit_get_local(m_code_section, m_al, 3);
wasm::emit_call(m_code_section, m_al, m_self_func_name_idx_map["print_i64"]);
wasm::emit_call(m_code_section, m_al, m_rt_func_used_idx[print_i64]);
}, fn_idx);
}

Expand Down Expand Up @@ -774,16 +793,16 @@ class ASRToWASMVisitor : public ASR::BaseVisitor<ASRToWASMVisitor> {
emit_string(std::to_string(i));
}

m_self_funcs_map["print_i64"] = &ASRToWASMVisitor::emit_print_int;
m_self_funcs_map["print_f64"] = &ASRToWASMVisitor::emit_print_float;
m_self_funcs_map["add_c32"] = &ASRToWASMVisitor::emit_complex_add_32;
m_self_funcs_map["add_c64"] = &ASRToWASMVisitor::emit_complex_add_64;
m_self_funcs_map["sub_c32"] = &ASRToWASMVisitor::emit_complex_sub_32;
m_self_funcs_map["sub_c64"] = &ASRToWASMVisitor::emit_complex_sub_64;
m_self_funcs_map["mul_c32"] = &ASRToWASMVisitor::emit_complex_mul_32;
m_self_funcs_map["mul_c64"] = &ASRToWASMVisitor::emit_complex_mul_64;
m_self_funcs_map["abs_c32"] = &ASRToWASMVisitor::emit_complex_abs_32;
m_self_funcs_map["abs_c64"] = &ASRToWASMVisitor::emit_complex_abs_64;
m_rt_funcs_map[print_i64] = &ASRToWASMVisitor::emit_print_int;
m_rt_funcs_map[print_f64] = &ASRToWASMVisitor::emit_print_float;
m_rt_funcs_map[add_c32] = &ASRToWASMVisitor::emit_complex_add_32;
m_rt_funcs_map[add_c64] = &ASRToWASMVisitor::emit_complex_add_64;
m_rt_funcs_map[sub_c32] = &ASRToWASMVisitor::emit_complex_sub_32;
m_rt_funcs_map[sub_c64] = &ASRToWASMVisitor::emit_complex_sub_64;
m_rt_funcs_map[mul_c32] = &ASRToWASMVisitor::emit_complex_mul_32;
m_rt_funcs_map[mul_c64] = &ASRToWASMVisitor::emit_complex_mul_64;
m_rt_funcs_map[abs_c32] = &ASRToWASMVisitor::emit_complex_abs_32;
m_rt_funcs_map[abs_c64] = &ASRToWASMVisitor::emit_complex_abs_64;

{
// Pre-declare all functions first, then generate code
Expand Down Expand Up @@ -850,19 +869,17 @@ class ASRToWASMVisitor : public ASR::BaseVisitor<ASRToWASMVisitor> {
}
}

std::vector<std::pair<std::string, uint32_t>> ordered_self_funcs_name_idx;
for (auto self_func:m_self_func_name_idx_map) {
ordered_self_funcs_name_idx.push_back(self_func);
std::vector<std::pair<uint32_t, int>> ordered_rt_funcs_type_idx;
for (int i = 0; i < NO_OF_RT_FUNCS; i++) {
if (m_rt_func_used_idx[i] != -1) {
ordered_rt_funcs_type_idx.push_back(std::make_pair(m_rt_func_used_idx[i], i));
}
}

sort(ordered_self_funcs_name_idx.begin(),
ordered_self_funcs_name_idx.end(),
[](std::pair<std::string, uint32_t> &a, std::pair<std::string, uint32_t> &b){
return a.second < b.second;
});
sort(ordered_rt_funcs_type_idx.begin(), ordered_rt_funcs_type_idx.end());

for (auto self_func:ordered_self_funcs_name_idx) {
(this->*m_self_funcs_map[self_func.first])(self_func.second);
for (auto rt_func:ordered_rt_funcs_type_idx) {
(this->*m_rt_funcs_map[rt_func.second])(rt_func.first);
}
}

Expand Down Expand Up @@ -1705,43 +1722,43 @@ class ASRToWASMVisitor : public ASR::BaseVisitor<ASRToWASMVisitor> {
switch (x.m_op) {
case ASR::binopType::Add: {
if (a_kind == 4) {
if (m_self_func_name_idx_map.find("add_c32") == m_self_func_name_idx_map.end()) {
m_self_func_name_idx_map["add_c32"] = no_of_types++;
if (m_rt_func_used_idx[add_c32] == -1) {
m_rt_func_used_idx[add_c32] = no_of_types++;
}
wasm::emit_call(m_code_section, m_al, m_self_func_name_idx_map["add_c32"]);
wasm::emit_call(m_code_section, m_al, m_rt_func_used_idx[add_c32]);
} else {
if (m_self_func_name_idx_map.find("add_c64") == m_self_func_name_idx_map.end()) {
m_self_func_name_idx_map["add_c64"] = no_of_types++;
if (m_rt_func_used_idx[add_c64] == -1) {
m_rt_func_used_idx[add_c64] = no_of_types++;
}
wasm::emit_call(m_code_section, m_al, m_self_func_name_idx_map["add_c64"]);
wasm::emit_call(m_code_section, m_al, m_rt_func_used_idx[add_c64]);
}
break;
};
case ASR::binopType::Sub: {
if (a_kind == 4) {
if (m_self_func_name_idx_map.find("sub_c32") == m_self_func_name_idx_map.end()) {
m_self_func_name_idx_map["sub_c32"] = no_of_types++;
if (m_rt_func_used_idx[sub_c32] == -1) {
m_rt_func_used_idx[sub_c32] = no_of_types++;
}
wasm::emit_call(m_code_section, m_al, m_self_func_name_idx_map["sub_c32"]);
wasm::emit_call(m_code_section, m_al, m_rt_func_used_idx[sub_c32]);
} else {
if (m_self_func_name_idx_map.find("sub_c64") == m_self_func_name_idx_map.end()) {
m_self_func_name_idx_map["sub_c64"] = no_of_types++;
if (m_rt_func_used_idx[sub_c64] == -1) {
m_rt_func_used_idx[sub_c64] = no_of_types++;
}
wasm::emit_call(m_code_section, m_al, m_self_func_name_idx_map["sub_c64"]);
wasm::emit_call(m_code_section, m_al, m_rt_func_used_idx[sub_c64]);
}
break;
};
case ASR::binopType::Mul: {
if (a_kind == 4) {
if (m_self_func_name_idx_map.find("mul_c32") == m_self_func_name_idx_map.end()) {
m_self_func_name_idx_map["mul_c32"] = no_of_types++;
if (m_rt_func_used_idx[mul_c32] == -1) {
m_rt_func_used_idx[mul_c32] = no_of_types++;
}
wasm::emit_call(m_code_section, m_al, m_self_func_name_idx_map["mul_c32"]);
wasm::emit_call(m_code_section, m_al, m_rt_func_used_idx[mul_c32]);
} else {
if (m_self_func_name_idx_map.find("mul_c64") == m_self_func_name_idx_map.end()) {
m_self_func_name_idx_map["mul_c64"] = no_of_types++;
if (m_rt_func_used_idx[mul_c64] == -1) {
m_rt_func_used_idx[mul_c64] = no_of_types++;
}
wasm::emit_call(m_code_section, m_al, m_self_func_name_idx_map["mul_c64"]);
wasm::emit_call(m_code_section, m_al, m_rt_func_used_idx[mul_c64]);
}
break;
};
Expand Down Expand Up @@ -2667,17 +2684,17 @@ class ASRToWASMVisitor : public ASR::BaseVisitor<ASRToWASMVisitor> {
int arg_kind = -1, dest_kind = -1;
extract_kinds(x, arg_kind, dest_kind);
if (arg_kind == 4) {
if (m_self_func_name_idx_map.find("abs_c32") == m_self_func_name_idx_map.end()) {
m_self_func_name_idx_map["abs_c32"] = no_of_types++;
if (m_rt_func_used_idx[abs_c32] == -1) {
m_rt_func_used_idx[abs_c32] = no_of_types++;
}
wasm::emit_call(m_code_section, m_al, m_self_func_name_idx_map["abs_c32"]);
wasm::emit_call(m_code_section, m_al, m_rt_func_used_idx[abs_c32]);
wasm::emit_f32_const(m_code_section, m_al, 0.0);
wasm::emit_f32_gt(m_code_section, m_al);
} else if (arg_kind == 8) {
if (m_self_func_name_idx_map.find("abs_c64") == m_self_func_name_idx_map.end()) {
m_self_func_name_idx_map["abs_c64"] = no_of_types++;
if (m_rt_func_used_idx[abs_c64] == -1) {
m_rt_func_used_idx[abs_c64] = no_of_types++;
}
wasm::emit_call(m_code_section, m_al, m_self_func_name_idx_map["abs_c64"]);
wasm::emit_call(m_code_section, m_al, m_rt_func_used_idx[abs_c64]);
wasm::emit_f64_const(m_code_section, m_al, 0.0);
wasm::emit_f64_gt(m_code_section, m_al);
} else {
Expand Down Expand Up @@ -2817,18 +2834,18 @@ class ASRToWASMVisitor : public ASR::BaseVisitor<ASRToWASMVisitor> {
int a_kind = ASRUtils::extract_kind_from_ttype_t(t);

if (ASRUtils::is_integer(*t) || ASRUtils::is_logical(*t)) {
if (m_self_func_name_idx_map.find("print_i64") == m_self_func_name_idx_map.end()) {
m_self_func_name_idx_map["print_i64"] = no_of_types++;
if (m_rt_func_used_idx[print_i64] == -1) {
m_rt_func_used_idx[print_i64] = no_of_types++;
}
this->visit_expr(*x.m_values[i]);
switch (a_kind) {
case 4: {
wasm::emit_i64_extend_i32_s(m_code_section, m_al);
wasm::emit_call(m_code_section, m_al, m_self_func_name_idx_map["print_i64"]);
wasm::emit_call(m_code_section, m_al, m_rt_func_used_idx[print_i64]);
break;
}
case 8: {
wasm::emit_call(m_code_section, m_al, m_self_func_name_idx_map["print_i64"]);
wasm::emit_call(m_code_section, m_al, m_rt_func_used_idx[print_i64]);
break;
}
default: {
Expand All @@ -2838,21 +2855,21 @@ class ASRToWASMVisitor : public ASR::BaseVisitor<ASRToWASMVisitor> {
}
}
} else if (ASRUtils::is_real(*t)) {
if (m_self_func_name_idx_map.find("print_i64") == m_self_func_name_idx_map.end()) {
m_self_func_name_idx_map["print_i64"] = no_of_types++;
if (m_rt_func_used_idx[print_i64] == -1) {
m_rt_func_used_idx[print_i64] = no_of_types++;
}
if (m_self_func_name_idx_map.find("print_f64") == m_self_func_name_idx_map.end()) {
m_self_func_name_idx_map["print_f64"] = no_of_types++;
if (m_rt_func_used_idx[print_f64] == -1) {
m_rt_func_used_idx[print_f64] = no_of_types++;
}
this->visit_expr(*x.m_values[i]);
switch (a_kind) {
case 4: {
wasm::emit_f64_promote_f32(m_code_section, m_al);
wasm::emit_call(m_code_section, m_al, m_self_func_name_idx_map["print_f64"]);
wasm::emit_call(m_code_section, m_al, m_rt_func_used_idx[print_f64]);
break;
}
case 8: {
wasm::emit_call(m_code_section, m_al, m_self_func_name_idx_map["print_f64"]);
wasm::emit_call(m_code_section, m_al, m_rt_func_used_idx[print_f64]);
break;
}
default: {
Expand All @@ -2875,11 +2892,11 @@ class ASRToWASMVisitor : public ASR::BaseVisitor<ASRToWASMVisitor> {
->index);
wasm::emit_drop(m_code_section, m_al);
} else if (t->type == ASR::ttypeType::Complex) {
if (m_self_func_name_idx_map.find("print_i64") == m_self_func_name_idx_map.end()) {
m_self_func_name_idx_map["print_i64"] = no_of_types++;
if (m_rt_func_used_idx[print_i64] == -1) {
m_rt_func_used_idx[print_i64] = no_of_types++;
}
if (m_self_func_name_idx_map.find("print_f64") == m_self_func_name_idx_map.end()) {
m_self_func_name_idx_map["print_f64"] = no_of_types++;
if (m_rt_func_used_idx[print_f64] == -1) {
m_rt_func_used_idx[print_f64] = no_of_types++;
}
emit_call_fd_write(1, "(", 1, 0);
this->visit_expr(*x.m_values[i]);
Expand All @@ -2890,10 +2907,10 @@ class ASRToWASMVisitor : public ASR::BaseVisitor<ASRToWASMVisitor> {
} else {
wasm::emit_set_global(m_code_section, m_al, m_global_var_name_idx_map["tmp_reg_f64"]);
}
wasm::emit_call(m_code_section, m_al, m_self_func_name_idx_map["print_f64"]);
wasm::emit_call(m_code_section, m_al, m_rt_func_used_idx[print_f64]);
emit_call_fd_write(1, ",", 1, 0);
wasm::emit_get_global(m_code_section, m_al, m_global_var_name_idx_map["tmp_reg_f64"]);
wasm::emit_call(m_code_section, m_al, m_self_func_name_idx_map["print_f64"]);
wasm::emit_call(m_code_section, m_al, m_rt_func_used_idx[print_f64]);
emit_call_fd_write(1, ")", 1, 0);
}
}
Expand Down