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.

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

Add NEON backend for RawTable #430

Merged
merged 1 commit into from
May 18, 2023
Merged

Add NEON backend for RawTable #430

merged 1 commit into from
May 18, 2023

Conversation

Amanieu
Copy link
Member

@Amanieu Amanieu commented May 6, 2023

The core algorithm is based on the NEON support in SwissTable, adapted for the different control byte encodings used in hashbrown.

@Amanieu
Copy link
Member Author

Amanieu commented May 16, 2023

@bors r+

@bors
Copy link
Contributor

bors commented May 16, 2023

📌 Commit 5355386 has been approved by Amanieu

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented May 18, 2023

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout neon2 (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self neon2 --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
Auto-merging src/raw/mod.rs
CONFLICT (content): Merge conflict in src/raw/mod.rs
Automatic merge failed; fix conflicts and then commit the result.

@bors
Copy link
Contributor

bors commented May 18, 2023

☔ The latest upstream changes (presumably #429) made this pull request unmergeable. Please resolve the merge conflicts.

The core algorithm is based on the NEON support in [SwissTable], adapted
for the different control byte encodings used in hashbrown.

[SwissTable]: abseil/abseil-cpp@6481443
@Amanieu
Copy link
Member Author

Amanieu commented May 18, 2023

@bors r+

@bors
Copy link
Contributor

bors commented May 18, 2023

📌 Commit 18ef2d7 has been approved by Amanieu

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented May 18, 2023

⌛ Testing commit 18ef2d7 with merge 8ae5290...

@bors
Copy link
Contributor

bors commented May 18, 2023

☀️ Test successful - checks-actions
Approved by: Amanieu
Pushing 8ae5290 to master...

@bors bors merged commit 8ae5290 into rust-lang:master May 18, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants