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

[CPU] Updated aux GPR count for Load/Store emitters #23046

Merged
merged 2 commits into from
Feb 27, 2024
Merged

[CPU] Updated aux GPR count for Load/Store emitters #23046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f7e38f
[CPU] Updated aux GPR count for Load/Store Emitters
a-sidorova Feb 23, 2024
186c1e2
[CPU] Applied Chenhu comment
a-sidorova Feb 26, 2024
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
21 changes: 16 additions & 5 deletions src/plugins/intel_cpu/src/emitters/plugin/x64/jit_load_store_emitters.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,16 @@ size_t store_emitter_params::hash() const {
return seed;
}

static int get_aux_regs_as_temp(const size_t byte_size, const bool is_fill = false) {
if (!one_of(byte_size, 64u, 32u, 16u))
return 1;
static int get_aux_regs_as_temp(const int elem_count, const int data_size, bool is_pure_move,
const int avx512_threshold_for_mask = 0, const bool is_fill = false) {
if (mayiuse(cpu::x64::avx512_core) && is_fill)
return 1;

const int byte_size = elem_count * data_size;
if ((is_pure_move && one_of(byte_size, 16, 32, 64)) || (!is_pure_move && one_of(elem_count, 4, 8, 16)))
return 0;
if ((mayiuse(cpu::x64::avx512_core) && (byte_size > avx512_threshold_for_mask)) || (one_of(byte_size % 16, 1, 2, 3)))
return 1;
return 0;
}

Expand All @@ -84,7 +89,10 @@ size_t jit_load_emitter::get_inputs_num() const { return 1; }

size_t jit_load_emitter::aux_gprs_count() const {
// 0 for temp reg for mask load in avx512 if needed
int count = get_aux_regs_as_temp(load_num_ * dst_prc_.size(), is_fill_);
const auto is_pure_load = (src_prc_ == dst_prc_) ||
(one_of(src_prc_, ov::element::f32, ov::element::i32) &&
one_of(dst_prc_, ov::element::f32, ov::element::i32));
int count = get_aux_regs_as_temp(load_num_, static_cast<int>(src_prc_.size()), is_pure_load, threshold_for_mask_emu_load, is_fill_);

// 1 for table address
if (is_fill_)
Expand Down Expand Up @@ -619,7 +627,10 @@ inline bool jit_store_emitter::is_truncation_emulation() const {

size_t jit_store_emitter::aux_gprs_count() const {
// for temp reg for store(mask version or special number cases)
int count = get_aux_regs_as_temp(store_num_ * src_prc_.size());
const auto is_pure_store = (src_prc_ == dst_prc_) ||
(one_of(src_prc_, ov::element::f32, ov::element::i32) &&
one_of(dst_prc_, ov::element::f32, ov::element::i32));
int count = get_aux_regs_as_temp(store_num_, static_cast<int>(dst_prc_.size()), is_pure_store, threshold_for_mask_emu_store);

// for table value in truncation arithmetic mode
if (is_truncation_emulation())
Expand Down
35 changes: 34 additions & 1 deletion src/plugins/intel_cpu/tests/unit/jit_kernel_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,13 +324,23 @@ TEST(JitKernel, variable_load_and_store) {
{
jit_variable_load_store_test_kernel<uint8_t, float> kernel;
if (mayiuse(cpu_isa_t::avx512_core)) {
kernel.test<16, 11, false>();
kernel.test<16, 16, false>();
kernel.test<16, 15, false>();
kernel.test<16, 10, false>();
kernel.test<16, 1, false>();
}
if (mayiuse(cpu_isa_t::avx2)) {
kernel.test<8, 8, false>();
kernel.test<8, 7, false>();
kernel.test<8, 6, false>();
kernel.test<8, 5, false>();
kernel.test<8, 4, false>();
}
if (mayiuse(cpu_isa_t::sse41)) {
kernel.test<4, 4, false>();
kernel.test<4, 3, false>();
kernel.test<4, 2, false>();
kernel.test<4, 1, false>();
}
}

Expand Down Expand Up @@ -360,6 +370,29 @@ TEST(JitKernel, variable_load_and_store) {
}
}

{
jit_variable_load_store_test_kernel<float, uint8_t> kernel;
if (mayiuse(cpu_isa_t::avx512_core)) {
kernel.test<16, 16, true>();
kernel.test<16, 10, true>();
kernel.test<16, 2, true>();
kernel.test<16, 1, true>();
}
if (mayiuse(cpu_isa_t::avx2)) {
kernel.test<8, 8, true>();
kernel.test<8, 7, true>();
kernel.test<8, 6, true>();
kernel.test<8, 5, true>();
kernel.test<8, 4, true>();
}
if (mayiuse(cpu_isa_t::sse41)) {
kernel.test<4, 4, true>();
kernel.test<4, 3, true>();
kernel.test<4, 2, true>();
kernel.test<4, 1, true>();
}
}

{
jit_variable_load_store_test_kernel<int32_t, bfloat16_t> kernel;
if (mayiuse(cpu_isa_t::avx512_core)) {
Expand Down
Loading