Skip to content

Disambiguate vecpopcnt for (u)dword2.#15412

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
kuzi117:ambig
Aug 29, 2019
Merged

Disambiguate vecpopcnt for (u)dword2.#15412
opencv-pushbot merged 1 commit intoopencv:3.4from
kuzi117:ambig

Conversation

@kuzi117
Copy link
Copy Markdown
Contributor

@kuzi117 kuzi117 commented Aug 29, 2019 •
edited by alalek
Loading

resolves #15411

This pullrequest changes

This disambiguates vec_popcnt for the v_uint64x2 and v_int64x2 structs in their respective v_popcount overloads (v_uint64x2, v_int64x2) by reusing existing macros to provide an overload for vec_udword2.

force_builders=Custom
buildworker:Custom=linux-1,linux-2,linux-4
build_image:Custom=powerpc64le

Extra PowerPC CI: https://ocv-power.imavr.com/#/opencv_pullrequests

@alalek
Copy link
Copy Markdown
Member

alalek commented Aug 29, 2019

Thank you for contribution!

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

So, 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".

@kuzi117 kuzi117 changed the base branch from master to 3.4 August 29, 2019 15:49
@kuzi117
Copy link
Copy Markdown
Contributor Author

kuzi117 commented Aug 29, 2019

@alalek Let me know if that worked.

alalek
alalek approved these changes Aug 29, 2019
View reviewed changes
Copy link
Copy Markdown
Member

@alalek alalek left a comment

Choose a reason for hiding this comment

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

Well done! Thank you 👍

opencv-pushbot pushed a commit that referenced this pull request Aug 29, 2019
@alalek
Merge pull request #15412 from kuzi117:ambig
6508bbc
@opencv-pushbot opencv-pushbot merged commit d4120dd into opencv:3.4 Aug 29, 2019
@kuzi117 kuzi117 deleted the ambig branch August 29, 2019 19:24
@alalek alalek mentioned this pull request Aug 30, 2019
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

bug category: core optimization platform: ppc (PowerPC)

Projects

None yet

Milestone

3.4.8

Development

Successfully merging this pull request may close these issues.

3 participants

@kuzi117 @alalek @opencv-pushbot