Skip to content

Commit

Permalink
Fix deepcopy of dict for LLVMDictSeparateChaining
Browse files Browse the repository at this point in the history
  • Loading branch information
@czgdp1807
czgdp1807 committed Jun 23, 2023
1 parent c459bb5 commit a2fc700
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
10 changes: 5 additions & 5 deletions src/libasr/codegen/asr_to_llvm.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1589,15 +1589,15 @@ class ASRToLLVMVisitor : public ASR::BaseVisitor<ASRToLLVMVisitor>
std::string key_type_code = ASRUtils::get_type_code(x_dict->m_key_type);
std::string value_type_code = ASRUtils::get_type_code(x_dict->m_value_type);
llvm_utils->dict_api->dict_init(key_type_code, value_type_code, const_dict, module.get(), x.n_keys);
int64_t ptr_loads_key = LLVM::is_llvm_struct(x_dict->m_key_type) ? 0 : 2;
int64_t ptr_loads_value = LLVM::is_llvm_struct(x_dict->m_value_type) ? 0 : 2;
int64_t ptr_loads_key = !LLVM::is_llvm_struct(x_dict->m_key_type);
int64_t ptr_loads_value = !LLVM::is_llvm_struct(x_dict->m_value_type);
int64_t ptr_loads_copy = ptr_loads;
for( size_t i = 0; i < x.n_keys; i++ ) {
ptr_loads = ptr_loads_key;
visit_expr(*x.m_keys[i]);
visit_expr_wrapper(x.m_keys[i], true);
llvm::Value* key = tmp;
ptr_loads = ptr_loads_value;
visit_expr(*x.m_values[i]);
visit_expr_wrapper(x.m_values[i], true);
llvm::Value* value = tmp;
llvm_utils->dict_api->write_item(const_dict, key, value, module.get(),
x_dict->m_key_type, x_dict->m_value_type, name2memidx);
Expand Down Expand Up @@ -5138,7 +5138,7 @@ class ASRToLLVMVisitor : public ASR::BaseVisitor<ASRToLLVMVisitor>
if( x == nullptr ) {
throw CodeGenError("Internal error: x is nullptr");
}

this->visit_expr(*x);
if( x->type == ASR::exprType::ArrayItem ||
x->type == ASR::exprType::ArraySection ||
Expand Down
10 changes: 5 additions & 5 deletions src/libasr/codegen/llvm_utils.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -783,12 +783,11 @@ namespace LCompilers {

void LLVMDictSeparateChaining::deepcopy_key_value_pair_linked_list(
llvm::Value* srci, llvm::Value* desti, llvm::Value* dest_key_value_pairs,
llvm::Value* src_capacity, ASR::Dict_t* dict_type, llvm::Module* module,
ASR::Dict_t* dict_type, llvm::Module* module,
std::map<std::string, std::map<std::string, int>>& name2memidx) {
if( !are_iterators_set ) {
src_itr = builder->CreateAlloca(llvm::Type::getInt8PtrTy(context), nullptr);
dest_itr = builder->CreateAlloca(llvm::Type::getInt8PtrTy(context), nullptr);
next_ptr = builder->CreateAlloca(llvm::Type::getInt32Ty(context), nullptr);
}
llvm::Type* key_value_pair_type = get_key_value_pair_type(dict_type->m_key_type, dict_type->m_value_type)->getPointerTo();
LLVM::CreateStore(*builder,
Expand All @@ -797,7 +796,6 @@ namespace LCompilers {
LLVM::CreateStore(*builder,
builder->CreateBitCast(desti, llvm::Type::getInt8PtrTy(context)),
dest_itr);
LLVM::CreateStore(*builder, src_capacity, next_ptr);
llvm::BasicBlock *loophead = llvm::BasicBlock::Create(context, "loop.head");
llvm::BasicBlock *loopbody = llvm::BasicBlock::Create(context, "loop.body");
llvm::BasicBlock *loopend = llvm::BasicBlock::Create(context, "loop.end");
Expand Down Expand Up @@ -958,9 +956,11 @@ namespace LCompilers {
get_key_value_pair_type(dict_type->m_key_type, dict_type->m_value_type)->getPointerTo());
if( !are_iterators_set ) {
copy_itr = builder->CreateAlloca(llvm::Type::getInt32Ty(context), nullptr);
next_ptr = builder->CreateAlloca(llvm::Type::getInt32Ty(context), nullptr);
}
llvm::Value* llvm_zero = llvm::ConstantInt::get(llvm::Type::getInt32Ty(context), llvm::APInt(32, 0));
LLVM::CreateStore(*builder, llvm_zero, copy_itr);
LLVM::CreateStore(*builder, src_capacity, next_ptr);

llvm::Value* src_key_value_pairs = LLVM::CreateLoad(*builder, get_pointer_to_key_value_pairs(src));
llvm::BasicBlock *loophead = llvm::BasicBlock::Create(context, "loop.head");
Expand Down Expand Up @@ -991,7 +991,7 @@ namespace LCompilers {
llvm::Value* srci = llvm_utils->create_ptr_gep(src_key_value_pairs, itr);
llvm::Value* desti = llvm_utils->create_ptr_gep(dest_key_value_pairs, itr);
deepcopy_key_value_pair_linked_list(srci, desti, dest_key_value_pairs,
src_capacity, dict_type, module, name2memidx);
dict_type, module, name2memidx);
}, [=]() {
});
llvm::Value* tmp = builder->CreateAdd(
Expand Down Expand Up @@ -3102,7 +3102,7 @@ namespace LCompilers {
context, llvm::APInt(32, 0)), i); // i = 0
llvm::AllocaInst *j = builder->CreateAlloca(pos_type, nullptr);
llvm::Value* tmp = nullptr;

llvm::BasicBlock *loophead = llvm::BasicBlock::Create(context, "loop.head");
llvm::BasicBlock *loopbody = llvm::BasicBlock::Create(context, "loop.body");
llvm::BasicBlock *loopend = llvm::BasicBlock::Create(context, "loop.end");
Expand Down
4 changes: 2 additions & 2 deletions src/libasr/codegen/llvm_utils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ namespace LCompilers {

llvm::Value* check_list_equality(llvm::Value* l1, llvm::Value* l2, ASR::ttype_t *item_type,
llvm::LLVMContext& context, llvm::IRBuilder<>* builder, llvm::Module& module);

void list_repeat_copy(llvm::Value* repeat_list, llvm::Value* init_list,
llvm::Value* num_times, llvm::Value* init_list_len,
llvm::Module* module);
Expand Down Expand Up @@ -605,7 +605,7 @@ namespace LCompilers {
llvm::Value* get_pointer_to_rehash_flag(llvm::Value* dict);

void deepcopy_key_value_pair_linked_list(llvm::Value* srci, llvm::Value* desti,
llvm::Value* dest_key_value_pairs, llvm::Value* src_capacity, ASR::Dict_t* dict_type,
llvm::Value* dest_key_value_pairs, ASR::Dict_t* dict_type,
llvm::Module* module, std::map<std::string, std::map<std::string, int>>& name2memidx);

void write_key_value_pair_linked_list(llvm::Value* kv_ll, llvm::Value* dict,
Expand Down

0 comments on commit a2fc700

Please sign in to comment.