From 699c5a990f17a7805171a201e35025c211246d08 Mon Sep 17 00:00:00 2001 From: eshoguli Date: Fri, 29 Sep 2023 12:10:14 +0200 Subject: [PATCH] workaround --- .../intel_cpu/src/emitters/aarch64/jit_eltwise_emitters.cpp | 4 ++-- src/plugins/intel_cpu/src/emitters/aarch64/jit_emitter.cpp | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/plugins/intel_cpu/src/emitters/aarch64/jit_eltwise_emitters.cpp b/src/plugins/intel_cpu/src/emitters/aarch64/jit_eltwise_emitters.cpp index 23280f57695450..60933d2a95b4bb 100644 --- a/src/plugins/intel_cpu/src/emitters/aarch64/jit_eltwise_emitters.cpp +++ b/src/plugins/intel_cpu/src/emitters/aarch64/jit_eltwise_emitters.cpp @@ -283,7 +283,7 @@ void jit_power_emitter::emit_isa(const std::vector &in_vec_idxs, const s // h->stp(h->x9, h->x10, pre_ptr(h->sp, -16)); // //h->sub(h->sp, h->sp, 16); - constexpr Xbyak_aarch64::Operand::Code save_gpr_regs[] = { + static constexpr Xbyak_aarch64::Operand::Code save_gpr_regs[] = { Xbyak_aarch64::Operand::X0, Xbyak_aarch64::Operand::X1, Xbyak_aarch64::Operand::X2, Xbyak_aarch64::Operand::X3, Xbyak_aarch64::Operand::X4, Xbyak_aarch64::Operand::X5, @@ -302,7 +302,7 @@ void jit_power_emitter::emit_isa(const std::vector &in_vec_idxs, const s }; - const size_t save_gpr_regs_size = sizeof(save_gpr_regs) / sizeof(save_gpr_regs[0]); + static constexpr size_t save_gpr_regs_size = sizeof(save_gpr_regs) / sizeof(save_gpr_regs[0]); const int32_t xreg_len = 8; //const size_t preserved_stack_size = xreg_len * (2 + save_gpr_regs_size); diff --git a/src/plugins/intel_cpu/src/emitters/aarch64/jit_emitter.cpp b/src/plugins/intel_cpu/src/emitters/aarch64/jit_emitter.cpp index d381aaaf257d5c..d5b48a8966197c 100644 --- a/src/plugins/intel_cpu/src/emitters/aarch64/jit_emitter.cpp +++ b/src/plugins/intel_cpu/src/emitters/aarch64/jit_emitter.cpp @@ -97,7 +97,9 @@ void jit_emitter::emitter_preamble(const std::vector& in_idxs, if (!entry_map_.empty()) { // last aux_gpr_idx is for p_table, we can use aux_gpr_idxs from idx 0 for other purpose - p_table = Xbyak_aarch64::XReg(aux_gpr_idxs[aux_gpr_idxs.size() - 1]); + //p_table = Xbyak_aarch64::XReg(aux_gpr_idxs[aux_gpr_idxs.size() - 1]); + // TODO: debug: hardcode + p_table = Xbyak_aarch64::XReg(26); aux_gpr_idxs.erase(aux_gpr_idxs.end() - 1); }