Skip to content

Commit ab95569

Browse files
dzarukindzarukin
committed
cpu: x64: tidy: jit_uni_pool_kernel -> jit_uni_pool_kernel_t
1 parent 9c2ba7e commit ab95569

4 files changed

+42
-42
lines changed

‎src/cpu/x64/jit_uni_pool_kernel.cpp

+30-30
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ static bcast_set_t get_supported_bcast_strategies() {
4343
}
4444

4545
template <cpu_isa_t isa>
46-
jit_uni_pool_kernel<isa>::~jit_uni_pool_kernel() = default;
46+
jit_uni_pool_kernel_t<isa>::~jit_uni_pool_kernel_t() = default;
4747

4848
template <cpu_isa_t isa>
49-
jit_uni_pool_kernel<isa>::jit_uni_pool_kernel(
49+
jit_uni_pool_kernel_t<isa>::jit_uni_pool_kernel_t(
5050
const jit_pool_conf_t &ajpp, const memory_desc_t *dst_md)
5151
: jit_generator_t(jit_name(), isa), jpp(ajpp) {
5252

@@ -161,7 +161,7 @@ static status_t set_binary_postops_formats(
161161
}
162162

163163
template <cpu_isa_t isa>
164-
bool jit_uni_pool_kernel<isa>::has_large_buffers(const pooling_pd_t *ppd) {
164+
bool jit_uni_pool_kernel_t<isa>::has_large_buffers(const pooling_pd_t *ppd) {
165165
auto is_large = [](const memory_desc_t &md) {
166166
memory_desc_wrapper mdw(md);
167167
return mdw.size()
@@ -180,7 +180,7 @@ bool jit_uni_pool_kernel<isa>::has_large_buffers(const pooling_pd_t *ppd) {
180180
}
181181

182182
template <cpu_isa_t isa>
183-
status_t jit_uni_pool_kernel<isa>::init_conf(
183+
status_t jit_uni_pool_kernel_t<isa>::init_conf(
184184
jit_pool_conf_t &jpp, primitive_attr_t &attr, const pooling_pd_t *ppd) {
185185

186186
const auto &pd = *ppd->desc();
@@ -479,7 +479,7 @@ status_t jit_uni_pool_kernel<isa>::init_conf(
479479
}
480480

481481
template <cpu_isa_t isa>
482-
void jit_uni_pool_kernel<isa>::init_scratchpad(
482+
void jit_uni_pool_kernel_t<isa>::init_scratchpad(
483483
const jit_pool_conf_t &jpp, memory_tracking::registrar_t &scratchpad) {
484484

485485
// scratchpad for c_block slice of input and/or output
@@ -510,43 +510,43 @@ static int reg_ind(int shift, int bc, int j, int ur_bc, int ur_w) noexcept {
510510
};
511511

512512
template <cpu_isa_t isa>
513-
inline void jit_uni_pool_kernel<isa>::put_one_in_vmm() {
513+
inline void jit_uni_pool_kernel_t<isa>::put_one_in_vmm() {
514514
mov(tmp_gpr, 1);
515515
uni_broadcast_reg_val(tmp_gpr.getIdx(), vmm_one.getIdx());
516516
}
517517

518518
template <cpu_isa_t isa>
519-
inline void jit_uni_pool_kernel<isa>::uni_broadcast_reg_val(
519+
inline void jit_uni_pool_kernel_t<isa>::uni_broadcast_reg_val(
520520
const int reg_idx, const int vmm_idx) {
521521
uni_vmovq(Xmm(vmm_idx), reg64_t(reg_idx));
522522
uni_vpbroadcastd(Vmm(vmm_idx), Xmm(vmm_idx));
523523
}
524524

525525
template <cpu_isa_t isa>
526-
inline void jit_uni_pool_kernel<isa>::push_vmm_val(const int idx) {
526+
inline void jit_uni_pool_kernel_t<isa>::push_vmm_val(const int idx) {
527527
Vmm val_to_store(idx);
528528
sub(rsp, val_to_store.getBit());
529529
uni_vmovups(ptr[rsp], val_to_store);
530530
}
531531

532532
template <cpu_isa_t isa>
533-
inline void jit_uni_pool_kernel<isa>::pop_vmm_val(const int idx) {
533+
inline void jit_uni_pool_kernel_t<isa>::pop_vmm_val(const int idx) {
534534
Vmm val_to_load(idx);
535535
uni_vmovups(val_to_load, ptr[rsp]);
536536
add(rsp, val_to_load.getBit());
537537
}
538538

539539
template <cpu_isa_t isa>
540-
inline void jit_uni_pool_kernel<isa>::load(const data_type_t dt, const int idx,
541-
const reg64_t &reg_ptr, const int offset,
540+
inline void jit_uni_pool_kernel_t<isa>::load(const data_type_t dt,
541+
const int idx, const reg64_t &reg_ptr, const int offset,
542542
const bool is_c_tail_proccessing) {
543543
io_[dt]->load(vmmword[reg_ptr + offset], Vmm(idx),
544544
is_c_tail_proccessing && !jpp.is_c_padded);
545545
}
546546

547547
template <cpu_isa_t isa>
548-
inline void jit_uni_pool_kernel<isa>::store(const data_type_t dt, const int idx,
549-
const reg64_t &reg_ptr, const int offset,
548+
inline void jit_uni_pool_kernel_t<isa>::store(const data_type_t dt,
549+
const int idx, const reg64_t &reg_ptr, const int offset,
550550
const bool is_c_tail_proccessing) {
551551
if (is_c_tail_proccessing && jpp.is_c_padded && jpp.with_postops)
552552
pad_with_zeros(idx);
@@ -555,7 +555,7 @@ inline void jit_uni_pool_kernel<isa>::store(const data_type_t dt, const int idx,
555555
}
556556

557557
template <cpu_isa_t isa>
558-
inline void jit_uni_pool_kernel<isa>::pad_with_zeros(const int idx) {
558+
inline void jit_uni_pool_kernel_t<isa>::pad_with_zeros(const int idx) {
559559
if (isa == sse41) {
560560
uni_vxorps(xmm_tmp_1, xmm_tmp_1, xmm_tmp_1);
561561
if (jpp.c_tail <= sse41_single_block_size && sse_high_half) {
@@ -575,7 +575,7 @@ inline void jit_uni_pool_kernel<isa>::pad_with_zeros(const int idx) {
575575
}
576576

577577
template <cpu_isa_t isa>
578-
inline void jit_uni_pool_kernel<isa>::load_indices(
578+
inline void jit_uni_pool_kernel_t<isa>::load_indices(
579579
const int indr_i, const int step_index, bool is_c_tail_processing) {
580580
if (jpp.ind_dt == data_type::u8) {
581581
auto indvr = vreg(indr_i);
@@ -619,7 +619,7 @@ inline void jit_uni_pool_kernel<isa>::load_indices(
619619
}
620620

621621
template <cpu_isa_t isa>
622-
inline void jit_uni_pool_kernel<isa>::store_indices(const int indr_i,
622+
inline void jit_uni_pool_kernel_t<isa>::store_indices(const int indr_i,
623623
const int step_index, const bool is_c_tail_processing,
624624
const bool is_first_w_block) {
625625
if (jpp.ind_dt == data_type::u8) {
@@ -717,7 +717,7 @@ inline void jit_uni_pool_kernel<isa>::store_indices(const int indr_i,
717717
}
718718

719719
template <cpu_isa_t isa>
720-
bool jit_uni_pool_kernel<isa>::post_ops_ok(jit_pool_conf_t &jpp,
720+
bool jit_uni_pool_kernel_t<isa>::post_ops_ok(jit_pool_conf_t &jpp,
721721
const primitive_attr_t &attr, const memory_desc_wrapper &dst_d) {
722722
const auto &post_ops = attr.post_ops_;
723723
const auto &entries = post_ops.entry_;
@@ -757,7 +757,7 @@ bool jit_uni_pool_kernel<isa>::post_ops_ok(jit_pool_conf_t &jpp,
757757
}
758758

759759
template <cpu_isa_t isa>
760-
void jit_uni_pool_kernel<isa>::apply_postops(int ur_bc, int ur_w, int c_block,
760+
void jit_uni_pool_kernel_t<isa>::apply_postops(int ur_bc, int ur_w, int c_block,
761761
const std::function<bool(int, bool)> &is_tail_predicate) {
762762
binary_injector::rhs_arg_dynamic_params_t rhs_arg_params;
763763
const int end_idx = vmm_idx_upper_bound() + 1;
@@ -803,7 +803,7 @@ void jit_uni_pool_kernel<isa>::apply_postops(int ur_bc, int ur_w, int c_block,
803803
}
804804

805805
template <cpu_isa_t isa>
806-
inline void jit_uni_pool_kernel<isa>::maybe_recalculate_divisor(
806+
inline void jit_uni_pool_kernel_t<isa>::maybe_recalculate_divisor(
807807
int jj, int ur_w, int pad_l, int pad_r, bool with_c_tail_proccessing) {
808808
if (jpp.alg == pooling_avg_exclude_padding) {
809809
int kw = jpp.kw;
@@ -834,7 +834,7 @@ inline void jit_uni_pool_kernel<isa>::maybe_recalculate_divisor(
834834
}
835835

836836
template <cpu_isa_t isa>
837-
inline void jit_uni_pool_kernel<isa>::avg_step(int ur_w, int ur_bc, int pad_l,
837+
inline void jit_uni_pool_kernel_t<isa>::avg_step(int ur_w, int ur_bc, int pad_l,
838838
int pad_r, bool with_c_tail_proccessing) {
839839

840840
auto iw = jpp.iw;
@@ -959,7 +959,7 @@ inline void jit_uni_pool_kernel<isa>::avg_step(int ur_w, int ur_bc, int pad_l,
959959
}
960960

961961
template <cpu_isa_t isa>
962-
inline void jit_uni_pool_kernel<isa>::max_step_fwd(int ur_w, int ur_bc,
962+
inline void jit_uni_pool_kernel_t<isa>::max_step_fwd(int ur_w, int ur_bc,
963963
int pad_l, int pad_r, bool with_c_tail_proccessing) {
964964
int iw = jpp.iw;
965965
int kw = jpp.kw;
@@ -1115,7 +1115,7 @@ inline void jit_uni_pool_kernel<isa>::max_step_fwd(int ur_w, int ur_bc,
11151115
}
11161116

11171117
template <cpu_isa_t isa>
1118-
inline void jit_uni_pool_kernel<isa>::max_step_bwd(int ur_w, int ur_bc,
1118+
inline void jit_uni_pool_kernel_t<isa>::max_step_bwd(int ur_w, int ur_bc,
11191119
int pad_l, int pad_r, bool with_c_tail_proccessing) {
11201120

11211121
int iw = jpp.iw;
@@ -1264,7 +1264,7 @@ inline void jit_uni_pool_kernel<isa>::max_step_bwd(int ur_w, int ur_bc,
12641264
}
12651265

12661266
template <cpu_isa_t isa>
1267-
void jit_uni_pool_kernel<isa>::zero_diff_src(
1267+
void jit_uni_pool_kernel_t<isa>::zero_diff_src(
12681268
int ur_bc, bool with_c_tail_proccessing) {
12691269
const int c_off = jpp.needs_f32_accum_for_bf16
12701270
? jpp.f32_accum_block_size
@@ -1345,7 +1345,7 @@ void jit_uni_pool_kernel<isa>::zero_diff_src(
13451345
}
13461346

13471347
template <cpu_isa_t isa>
1348-
void jit_uni_pool_kernel<isa>::generate() {
1348+
void jit_uni_pool_kernel_t<isa>::generate() {
13491349

13501350
this->preamble();
13511351

@@ -1553,12 +1553,12 @@ void jit_uni_pool_kernel<isa>::generate() {
15531553
io_.prepare_table_fp8();
15541554
}
15551555

1556-
template struct jit_uni_pool_kernel<sse41>;
1557-
template struct jit_uni_pool_kernel<avx>;
1558-
template struct jit_uni_pool_kernel<avx2>;
1559-
template struct jit_uni_pool_kernel<avx2_vnni_2>;
1560-
template struct jit_uni_pool_kernel<avx512_core>;
1561-
template struct jit_uni_pool_kernel<avx512_core_fp16>;
1556+
template struct jit_uni_pool_kernel_t<sse41>;
1557+
template struct jit_uni_pool_kernel_t<avx>;
1558+
template struct jit_uni_pool_kernel_t<avx2>;
1559+
template struct jit_uni_pool_kernel_t<avx2_vnni_2>;
1560+
template struct jit_uni_pool_kernel_t<avx512_core>;
1561+
template struct jit_uni_pool_kernel_t<avx512_core_fp16>;
15621562

15631563
} // namespace x64
15641564
} // namespace cpu

‎src/cpu/x64/jit_uni_pool_kernel.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ namespace cpu {
3535
namespace x64 {
3636

3737
template <cpu_isa_t isa>
38-
struct jit_uni_pool_kernel : public jit_generator_t {
38+
struct jit_uni_pool_kernel_t : public jit_generator_t {
3939

40-
jit_uni_pool_kernel(
40+
jit_uni_pool_kernel_t(
4141
const jit_pool_conf_t &ajpp, const memory_desc_t *dst_md);
4242
jit_pool_conf_t jpp;
4343

44-
~jit_uni_pool_kernel() override;
44+
~jit_uni_pool_kernel_t() override;
4545

46-
DECLARE_CPU_JIT_AUX_FUNCTIONS(jit_uni_pool_kernel)
46+
DECLARE_CPU_JIT_AUX_FUNCTIONS(jit_uni_pool_kernel_t)
4747

4848
static status_t init_conf(jit_pool_conf_t &jpp, primitive_attr_t &attr,
4949
const pooling_pd_t *ppd);

‎src/cpu/x64/jit_uni_pooling.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ template <cpu_isa_t isa, impl::data_type_t d_type>
638638
status_t jit_uni_pooling_fwd_t<isa, d_type>::init(engine_t *engine) {
639639

640640
CHECK(safe_ptr_assign(kernel_,
641-
new jit_uni_pool_kernel<isa>(
641+
new jit_uni_pool_kernel_t<isa>(
642642
pd()->jpp_, pd()->invariant_dst_md())));
643643

644644
if (pd()->jpp_.tag_kind == jit_memory_tag_kind_t::ncsp)
@@ -1024,7 +1024,7 @@ status_t jit_uni_pooling_bwd_t<isa, d_type>::init_ncsp_trans_ctx() {
10241024
template <cpu_isa_t isa, data_type_t d_type>
10251025
status_t jit_uni_pooling_bwd_t<isa, d_type>::init(engine_t *engine) {
10261026
CHECK(safe_ptr_assign(kernel_,
1027-
new jit_uni_pool_kernel<isa>(
1027+
new jit_uni_pool_kernel_t<isa>(
10281028
pd()->jpp_, pd()->invariant_dst_md())));
10291029
if (pd()->jpp_.tag_kind == jit_memory_tag_kind_t::ncsp)
10301030
CHECK(init_ncsp_trans_ctx());

‎src/cpu/x64/jit_uni_pooling.hpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ struct jit_uni_pooling_fwd_t : public primitive_t {
7070
if (desc()->alg_kind == alg_kind::pooling_max && is_training)
7171
init_default_ws();
7272

73-
CHECK(jit_uni_pool_kernel<isa>::init_conf(jpp_, attr_, this));
73+
CHECK(jit_uni_pool_kernel_t<isa>::init_conf(jpp_, attr_, this));
7474

7575
auto scratchpad = scratchpad_registry().registrar();
76-
jit_uni_pool_kernel<isa>::init_scratchpad(jpp_, scratchpad);
76+
jit_uni_pool_kernel_t<isa>::init_scratchpad(jpp_, scratchpad);
7777

7878
return status::success;
7979
}
@@ -111,7 +111,7 @@ struct jit_uni_pooling_fwd_t : public primitive_t {
111111
const pd_t *pd() const { return (const pd_t *)primitive_t::pd().get(); }
112112
status_t init_ncsp_trans_ctx();
113113

114-
std::unique_ptr<jit_uni_pool_kernel<isa>> kernel_;
114+
std::unique_ptr<jit_uni_pool_kernel_t<isa>> kernel_;
115115
std::unique_ptr<jit_uni_pooling_utils::trans_context_t> trans_ctx_;
116116
static constexpr data_type_t wsp_dt_ = data_type::f32;
117117
};
@@ -146,10 +146,10 @@ struct jit_uni_pooling_bwd_t : public primitive_t {
146146
compare_ws(hint_fwd_pd_), VERBOSE_WS_MISMATCH);
147147
}
148148

149-
CHECK(jit_uni_pool_kernel<isa>::init_conf(jpp_, attr_, this));
149+
CHECK(jit_uni_pool_kernel_t<isa>::init_conf(jpp_, attr_, this));
150150

151151
auto scratchpad = scratchpad_registry().registrar();
152-
jit_uni_pool_kernel<isa>::init_scratchpad(jpp_, scratchpad);
152+
jit_uni_pool_kernel_t<isa>::init_scratchpad(jpp_, scratchpad);
153153

154154
return status::success;
155155
}
@@ -187,7 +187,7 @@ struct jit_uni_pooling_bwd_t : public primitive_t {
187187
const pd_t *pd() const { return (const pd_t *)primitive_t::pd().get(); }
188188
status_t init_ncsp_trans_ctx();
189189

190-
std::unique_ptr<jit_uni_pool_kernel<isa>> kernel_;
190+
std::unique_ptr<jit_uni_pool_kernel_t<isa>> kernel_;
191191
std::unique_ptr<jit_uni_pooling_utils::trans_context_t> trans_ctx_;
192192
static constexpr data_type_t wsp_dt_ = data_type::f32;
193193
};

0 commit comments

Comments
 (0)