diff --git a/tensorflow/workspace2.bzl b/tensorflow/workspace2.bzl index 917d9b6c0d9327..e906f65b7efb1d 100644 --- a/tensorflow/workspace2.bzl +++ b/tensorflow/workspace2.bzl @@ -195,7 +195,6 @@ def _tf_repositories(): "//third_party/mkl_dnn:onednn_acl_fixed_format_kernels.patch", "//third_party/mkl_dnn:onednn_acl_depthwise_convolution.patch", "//third_party/mkl_dnn:onednn_acl_threadpool_scheduler.patch", - "//third_party/mkl_dnn:onednn_unwind_stack.patch", ], sha256 = "a50993aa6265b799b040fe745e0010502f9f7103cc53a9525d59646aef006633", strip_prefix = "oneDNN-2.7.3", diff --git a/third_party/mkl_dnn/onednn_unwind_stack.patch b/third_party/mkl_dnn/onednn_unwind_stack.patch deleted file mode 100644 index 2920d7e5685703..00000000000000 --- a/third_party/mkl_dnn/onednn_unwind_stack.patch +++ /dev/null @@ -1,33 +0,0 @@ -commit 2ae24507835242a8d217b40fde629ef671b904de -Author: Wierschem, Keola -Date: Thu Sep 15 15:31:30 2022 -0700 - - cpu: x64: update RBP on entry to jit code - -diff --git a/src/cpu/x64/jit_generator.hpp b/src/cpu/x64/jit_generator.hpp -index 60ec65211c..6399bc64d1 100644 ---- a/src/cpu/x64/jit_generator.hpp -+++ b/src/cpu/x64/jit_generator.hpp -@@ -103,8 +103,8 @@ static inline void tc_configure_tile( - - #ifdef XBYAK64 - constexpr Xbyak::Operand::Code abi_save_gpr_regs[] = { -- Xbyak::Operand::RBX, - Xbyak::Operand::RBP, -+ Xbyak::Operand::RBX, - Xbyak::Operand::R12, - Xbyak::Operand::R13, - Xbyak::Operand::R14, -@@ -194,8 +194,11 @@ public: - uni_vmovdqu(ptr[rsp + i * xmm_len], - Xbyak::Xmm(xmm_to_preserve_start + i)); - } -- for (size_t i = 0; i < num_abi_save_gpr_regs; ++i) -+ for (size_t i = 0; i < num_abi_save_gpr_regs; ++i) { - push(Xbyak::Reg64(abi_save_gpr_regs[i])); -+ // Stack magic: save rsp into rbp state to be able to unwind stack. -+ if (i == 0) mov(rbp, rsp); -+ } - #ifndef DNNL_ENABLE_MEM_DEBUG - // do not use RBP in mem debug mode to enable backtracing from jit code - if (is_valid_isa(avx512_core)) {