Skip to content
This repository was archived by the owner on Nov 17, 2023. It is now read-only.

Remove redundant memcpy in Reorder2Default #20746

Merged
szha merged 1 commit into from
Dec 24, 2021
Merged

Remove redundant memcpy in Reorder2Default #20746

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 11 additions & 4 deletions src/ndarray/ndarray.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,13 +540,20 @@ void NDArray::Chunk::Reorder2Default() {

dnnl_format_tag_t format = dnnl_mem_->GetDefaultFormat();
dnnl::memory::desc def_desc = dnnl_mem_->GetDesc(format);
dnnl_mem_ptr def_mem(new dnnl::memory(def_desc, CpuEngine::Get()->get_engine()));
dnnl_mem_->ReorderTo(def_mem.get());

CHECK(shandle.size >= def_desc.get_size());
CheckAndAlloc(def_desc.get_size());
// TODO(zhengda) We need to avoid memory copy here.
memcpy(shandle.dptr, def_mem->get_data_handle(), def_desc.get_size());

// oneDNN reorder can't be performed in-place
if (shandle.dptr == dnnl_mem_->GetDataHandle()) {
dnnl_mem_ptr def_mem(new dnnl::memory(def_desc, CpuEngine::Get()->get_engine()));
dnnl_mem_->ReorderTo(def_mem.get());
memcpy(shandle.dptr, def_mem->get_data_handle(), def_desc.get_size());
} else {
dnnl_mem_ptr def_mem(new dnnl::memory(def_desc, CpuEngine::Get()->get_engine(), shandle.dptr));
dnnl_mem_->ReorderTo(def_mem.get());
}

dnnl_mem_ = nullptr;
}

Expand Down