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

Jump to bottom

[CPU] migrate onednn3.6 #27957

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open

[CPU] migrate onednn3.6 #27957

wants to merge 17 commits into from
+80 −54

Conversation

xczhai
Copy link
Contributor

@xczhai xczhai commented Dec 6, 2024 •
edited
Loading

  1. migrate to oneDNN3.6
  • apply x64 patch
  • apply arm patch
  • apply rv64 patch
  1. fix conflicts in OpenVINO
  • adapt jit_uni_eltwise_injector constructor
  • adapt dnnl::impl::md2fmt_str func
  1. track by tickets
  • MFDNN-12818
  • MFDNN-12919
  • MFDNN-12924
  1. oneDNN link

@xczhai xczhai requested review from a team as code owners December 6, 2024 11:02
@github-actions github-actions bot added category: CPU OpenVINO CPU plugin and removed do_not_merge labels Dec 6, 2024
@xczhai xczhai force-pushed the xc/dnn3.6_based_on_master branch from 0bf41cc to 3109864 Compare December 13, 2024 03:38
@xczhai xczhai requested review from a team as code owners December 13, 2024 03:38
@github-actions github-actions bot added the category: GPU OpenVINO GPU plugin label Dec 13, 2024
@xczhai xczhai force-pushed the xc/dnn3.6_based_on_master branch from 3109864 to 8634b4b Compare December 13, 2024 03:42
@github-actions github-actions bot removed the category: GPU OpenVINO GPU plugin label Dec 13, 2024
@xczhai xczhai force-pushed the xc/dnn3.6_based_on_master branch from 0e824de to f6e5c40 Compare December 20, 2024 06:57
luweizhou2016
luweizhou2016 reviewed Dec 20, 2024
View reviewed changes
Copy link
Contributor

@luweizhou2016 luweizhou2016 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some minor suggestions.

src/plugins/intel_cpu/src/emitters/plugin/x64/jit_dnnl_emitters.cpp Outdated Show resolved Hide resolved
src/plugins/intel_cpu/src/utils/verbose.cpp Outdated Show resolved Hide resolved
src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp Outdated Show resolved Hide resolved
@xczhai xczhai force-pushed the xc/dnn3.6_based_on_master branch from f6e5c40 to c576825 Compare December 20, 2024 09:09
@dmitry-gorokhov
Copy link
Contributor

@xczhai Please add link to oneDNN branch with 3.6 migration to the PR description

@dmitry-gorokhov
Copy link
Contributor

dmitry-gorokhov commented Dec 24, 2024 •
edited
Loading

@xczhai I see that rics-v build is failing since [RV64] commits are not cherry-picked to 3.6 migration branch. Please handle it

@xczhai
Copy link
Contributor Author

xczhai commented Dec 24, 2024

@xczhai Please add link to oneDNN branch with 3.6 migration to the PR description

update the desc

@xczhai
Copy link
Contributor Author

xczhai commented Dec 24, 2024

@xczhai I see that rics-v build is failing since [RV64] commits are not cherry-picked to 3.6 migration branch. Please handle it

apply rv64

@xczhai xczhai force-pushed the xc/dnn3.6_based_on_master branch from 941c69c to af2160a Compare December 24, 2024 10:44
@xczhai
apply and fix
6720e7f 
- apply rv64 patch
- fix arm tests
- fix the comments
@xczhai xczhai force-pushed the xc/dnn3.6_based_on_master branch from af2160a to 6720e7f Compare December 24, 2024 11:26
@xczhai xczhai changed the title [CPU] try to migrate onednn3.6 [CPU] migrate onednn3.6 Dec 24, 2024
@xczhai xczhai requested a review from luweizhou2016 December 26, 2024 08:36
luweizhou2016
luweizhou2016 approved these changes Dec 27, 2024
View reviewed changes
Copy link
Contributor

@luweizhou2016 luweizhou2016 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@dmitry-gorokhov dmitry-gorokhov added this to the 2025.0 milestone Dec 30, 2024
@dmitry-gorokhov
Copy link
Contributor

Comments on fork branch:

  1. openvinotoolkit/oneDNN@1ca7543 should be squashed into openvinotoolkit/oneDNN@80fe7b7
  2. openvinotoolkit/oneDNN@d042622 should be dropped

@dmitry-gorokhov
Copy link
Contributor

I see that some kernel instances are commented out. What is the reason? https://github.com/openvinotoolkit/oneDNN/blob/eb2ebaf700ec2fd90d65c1ab3b36391d4c44c462/src/cpu/cpu_eltwise_list.cpp#L51

@dmitry-gorokhov dmitry-gorokhov self-assigned this Dec 30, 2024
@xczhai
Copy link
Contributor Author

xczhai commented Dec 31, 2024

I see that some kernel instances are commented out. What is the reason? https://github.com/openvinotoolkit/oneDNN/blob/eb2ebaf700ec2fd90d65c1ab3b36391d4c44c462/src/cpu/cpu_eltwise_list.cpp#L51

These instances are removed in forked oneDNN3.5. So forked oneDNN3.6 inherits forked oneDNN3.5's changes.

@xczhai
Copy link
Contributor Author

xczhai commented Dec 31, 2024

Comments on fork branch:

  1. openvinotoolkit/oneDNN@1ca7543 should be squashed into openvinotoolkit/oneDNN@80fe7b7
  2. openvinotoolkit/oneDNN@d042622 should be dropped

apply above changes.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@luweizhou2016 luweizhou2016 luweizhou2016 approved these changes

Assignees

@dmitry-gorokhov dmitry-gorokhov

Labels
category: CPU OpenVINO CPU plugin
Projects
None yet
Milestone
2025.0
Development

Successfully merging this pull request may close these issues.
3 participants
@xczhai @dmitry-gorokhov @luweizhou2016