-
Notifications
You must be signed in to change notification settings - Fork 401
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
build: Replace robin-hood-hashing with unordered_dense #7558
Open
arno-lunarg
wants to merge
1
commit into
KhronosGroup:main
Choose a base branch
from
arno-lunarg:arno-unordered-dense
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -60,30 +60,30 @@ jobs: | |
|
||
linux: | ||
runs-on: ubuntu-22.04 | ||
name: "linux (${{matrix.sanitize}} sanitizer, ${{matrix.config}}, robinhood ${{matrix.robin_hood}} )" | ||
name: "linux (${{matrix.sanitize}} sanitizer, ${{matrix.config}}, unordered_dense ${{matrix.unordered_dense}} )" | ||
strategy: | ||
fail-fast: false | ||
matrix: | ||
sanitize: [ address, thread ] | ||
config: [debug, release] | ||
robin_hood: [ "ON" ] | ||
unordered_dense: [ "ON" ] | ||
include: | ||
# Test with Robin Hood disabled | ||
# Test with unordered_dense disabled | ||
# Chromium build, and some package managers don't use it. | ||
- config: release | ||
robin_hood: "OFF" | ||
unordered_dense: "OFF" | ||
sanitize: address | ||
steps: | ||
- uses: actions/checkout@v4 | ||
- uses: lukka/get-cmake@latest | ||
- uses: hendrikmuhs/[email protected] | ||
with: | ||
key: ${{ matrix.config }}-${{ matrix.sanitize }}-${{matrix.robin_hood}} | ||
key: ${{ matrix.config }}-${{ matrix.sanitize }}-${{matrix.unordered_dense}} | ||
- run: sudo apt-get -qq update && sudo apt-get install -y libwayland-dev xorg-dev | ||
# This is to combat a bug when using 6.6 linux kernels with thread/address sanitizer | ||
# https://github.com/google/sanitizers/issues/1716 | ||
- run: sudo sysctl vm.mmap_rnd_bits=28 | ||
- run: python scripts/tests.py --build --config ${{ matrix.config }} --cmake='-DUSE_ROBIN_HOOD_HASHING=${{matrix.robin_hood}}' | ||
- run: python scripts/tests.py --build --config ${{ matrix.config }} --cmake='-DUSE_CUSTOM_HASH_MAP=${{matrix.unordered_dense}}' | ||
env: | ||
CFLAGS: -fsanitize=${{ matrix.sanitize }} | ||
CXXFLAGS: -fsanitize=${{ matrix.sanitize }} | ||
|
@@ -148,7 +148,7 @@ jobs: | |
build-ci/external/glslang/build/install | ||
build-ci/external/googltest/build/install | ||
build-ci/external/mimalloc/build/install | ||
build-ci/external/robin-hood-hashing/build/install | ||
build-ci/external/unordered_dense/build/install | ||
build-ci/external/SPIRV-Headers/build/install | ||
build-ci/external/SPIRV-Tools/build/install | ||
build-ci/external/Vulkan-Headers/build/install | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -665,7 +665,7 @@ std::vector<VkPresentModeKHR> Surface::GetPresentModes(VkPhysicalDevice phys_dev | |
assert(phys_dev); | ||
std::vector<VkPresentModeKHR> result; | ||
if (auto search = present_modes_data_.find(phys_dev); search != present_modes_data_.end()) { | ||
for (auto mode = search->second.begin(); mode != search->second.end(); mode++) { | ||
for (auto mode = search->second.begin(); mode != search->second.end(); ++mode) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @jeremyg-lunarg so this is the type of issue failing the build before 😆 |
||
result.push_back(mode->first); | ||
} | ||
return result; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Switching from USE_ROBIN_...* to USE_UNORDERED_* is going to require changes in Internal CI and the SDK build stuff. I wonder if we should do something like USE_CUSTOM_HASHMAP instead in case we ever decide to change implementations again. Curious what others think about this...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good idea I think. I only used this name in replacement of the C++ define, explicit mentions of unordered dense are still there in files like vvl.yml