这是indexloc提供的服务，不要输入任何密码
Skip to content

[pull] master from google:master #256

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

Merged
merged 2 commits into from
Oct 15, 2025
Merged

[pull] master from google:master #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13c862b
Fix for -Wpragma-clang-attribute warning if VQSort is disabled
johnplatts Oct 14, 2025
f9d88d6
Merge pull request #2759 from johnplatts:hwy_vqsort_fix_101425
copybara-github Oct 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .github/workflows/build_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,17 @@ jobs:
cxx_flags: -DHWY_DISABLED_TARGETS=0x58
cxx_standard: 17

- name: Clang-18 (VQSort disabled)
extra_deps: clang-18
c_compiler: clang-18
cxx_compiler: clang++-18
# Disable AVX3_SPR/AVX3_ZEN4 targets in GitHub workflow build with
# Clang 16 or later to work around crashes that occur with Clang 16
# or later when some of the Google Highway tests are compiled with
# all x86 targets enabled
cxx_flags: -DHWY_DISABLED_TARGETS=0x58 -DHWY_DISABLE_VQSORT=1
cxx_standard: 17

- name: Clang-18 (C++23)
extra_deps: clang-18
c_compiler: clang-18
Expand Down
3 changes: 2 additions & 1 deletion hwy/contrib/sort/shared-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,8 @@ static_assert(SortConstants::MaxBufBytes<2>(64) <= 1664, "Unexpectedly high");
#define VQSORT_COMPILER_COMPATIBLE 1
#endif

#if (HWY_TARGET == HWY_SCALAR) || !VQSORT_COMPILER_COMPATIBLE
#if (HWY_TARGET == HWY_SCALAR) || !VQSORT_COMPILER_COMPATIBLE || \
defined(HWY_DISABLE_VQSORT)
#define VQSORT_ENABLED 0
#else
#define VQSORT_ENABLED 1
Expand Down
10 changes: 10 additions & 0 deletions hwy/contrib/sort/sorting_networks-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -891,6 +891,16 @@ HWY_NOINLINE void SortingNetwork(Traits st, T* HWY_RESTRICT buf, size_t cols) {
#else
template <class Base>
struct SharedTraits : public Base {};

namespace detail {

// Empty function to avoid a possible -Wpragma-clang-attribute warning if
// compiling with Clang
static HWY_INLINE HWY_MAYBE_UNUSED void HWY_CONCAT(UnusedSortingNetworksFunc,
__LINE__)() {}

} // namespace detail

#endif // VQSORT_ENABLED

} // namespace detail
Expand Down