Skip to content

Add support for runtime CPU feature check on POWER on FreeBSD.#20870

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
pkubaj:master
Nov 10, 2021
Merged

Add support for runtime CPU feature check on POWER on FreeBSD.#20870
opencv-pushbot merged 1 commit intoopencv:3.4from
pkubaj:master

Conversation

@pkubaj
Copy link
Copy Markdown
Contributor

@pkubaj pkubaj commented Oct 13, 2021 •
edited by alalek
Loading

  1. Code uses PPC_FEATURE_HAS_VSX, but it's not checked similarly to PPC_FEATURE2_ARCH_3_00 and PPC_FEATURE2_ARCH_3_00 for availability. FreeBSD has those macros in machine/cpu.h, but I went with the way chosen for PPC_FEATURE2_ARCH_3_00 and PPC_FEATURE2_ARCH_3_00. Other than that, FreeBSD also has sys/auxv.h and that's where elf_aux_info() is defined.
  2. getauxval() is actually Linux-only, but code checked for unix. It won't work on all UNIX, so change it back to linux. Add another code variant strictly for FreeBSD.
  3. Update comment. This commit adds code for FreeBSD, but recently there appeared support for powerpc64 in OpenBSD.

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

  • I agree to contribute to the project under Apache 2 License.
  • To the best of my knowledge, the proposed patch is not based on a code under GPL or other license that is incompatible with OpenCV
  • The PR is proposed to proper branch
  • There is reference to original bug report and related work
  • There is accuracy test, performance test and test data in opencv_extra repository, if applicable
    Patch to opencv_extra has the same branch name.
  • The feature is well documented and sample code can be built with the project CMake
buildworker:Custom=linux-4,linux-6
build_image:Custom=powerpc64le

@alalek
Copy link
Copy Markdown
Member

alalek commented Oct 13, 2021

Thank you for the contribution!

This patch should go into 3.4 branch first.
We will merge changes from 3.4 into master regularly (weekly/bi-weekly).

Please:

  • change "base" branch of this PR: master => 3.4 (use "Edit" button near PR title)
  • rebase your commits from master onto 3.4 branch. For example:
    git rebase -i --onto upstream/3.4 upstream/master
    (check list of your commits, save and quit (Esc + "wq" + Enter)
    where upstream is configured by following this GitHub guide and fetched (git fetch upstream).
  • push rebased commits into source branch of your fork (with --force option)

Note: no needs to re-open PR, apply changes "inplace".

@pkubaj @alalek
Add support for runtime CPU feature check on POWER on FreeBSD.
68e425f 
1. Code uses PPC_FEATURE_HAS_VSX, but it's not checked similarly to
PPC_FEATURE2_ARCH_3_00 and PPC_FEATURE2_ARCH_3_00 for availability. FreeBSD has
those macros in machine/cpu.h, but I went with the way chosen for
PPC_FEATURE2_ARCH_3_00 and PPC_FEATURE2_ARCH_3_00. Other than that, FreeBSD also
has sys/auxv.h and that's where elf_aux_info() is defined.
2. getauxval() is actually Linux-only, but code checked for __unix__. It won't
work on all UNIX, so change it back to __linux__. Add another code variant
strictly for FreeBSD.
3. Update comment. This commit adds code for FreeBSD, but recently there
appeared support for powerpc64 in OpenBSD.
@opencv-pushbot opencv-pushbot merged commit f33828a into opencv:3.4 Nov 10, 2021
@alalek alalek mentioned this pull request Nov 13, 2021
Merged
@alalek alalek mentioned this pull request Dec 30, 2021
Merged
@alalek alalek mentioned this pull request Feb 22, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alalek alalek alalek approved these changes

Assignees

@alalek alalek

Labels

platform: ppc (PowerPC)

Projects

None yet

Milestone

3.4.17

Development

Successfully merging this pull request may close these issues.

3 participants

@pkubaj @alalek @opencv-pushbot