Skip to content

Commit

Permalink
Add google-highway wrap
Browse files Browse the repository at this point in the history
  • Loading branch information
WillAyd committed Sep 6, 2024
1 parent 8ad1bfd commit 816fd27
Show file tree
Hide file tree
Showing 5 changed files with 184 additions and 0 deletions.
7 changes: 7 additions & 0 deletions ci_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,13 @@
"gumbo-parser:tests=enabled"
]
},
"google-highway": {
"_comment": "Msys2 envs broken; windows test fixed in next release",
"build_on": {
"msys2": false,
"windows": false
}
},
"harfbuzz": {
"_comment": [
"- Currently builds with no warnings other than an incorrect warning() function",
Expand Down
8 changes: 8 additions & 0 deletions releases.json
Original file line number Diff line number Diff line change
Expand Up @@ -1068,6 +1068,14 @@
"1.0.7-1"
]
},
"google-highway": {
"dependency_names": [
"hwy"
],
"versions": [
"1.2.0-1"
]
},
"google-snappy": {
"dependency_names": [
"snappy"
Expand Down
9 changes: 9 additions & 0 deletions subprojects/google-highway.wrap
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[wrap-file]
directory = highway-1.2.0
source_url = https://github.com/google/highway/releases/download/1.2.0/highway-1.2.0.tar.gz
source_filename = highway-1.2.0.tar.gz
source_hash = 58e9d5d41d6573ad15245ad76aec53a69499ca7480c092d899c4424812ed906f
patch_directory = google-highway

[provide]
hwy = hwy_dep
159 changes: 159 additions & 0 deletions subprojects/packagefiles/google-highway/meson.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,159 @@
project(
'hwy',
'cpp',
version: 'fa78bde6a8979031b4ed5a68da7d8cfa1d4255b8c41f49c335b4d7ea402fb769',
meson_version: '>= 1.3.0',
license: 'Apache-2.0 OR BSD-3-Clause',
)

hwy_sources = files(
'hwy/abort.cc',
'hwy/aligned_allocator.cc',
'hwy/nanobenchmark.cc',
'hwy/per_target.cc',
'hwy/print.cc',
'hwy/targets.cc',
'hwy/timer.cc',
)

if host_machine.system() == 'windows'
add_project_arguments('-DNOMINMAX', language: 'cpp')
endif

hwy_lib = library(
'hwy',
hwy_sources,
cpp_static_args: ['-DHWY_STATIC_DEFINE'],
cpp_shared_args: ['-DHWY_SHARED_DEFINE', '-Dhwy_EXPORTS'],
gnu_symbol_visibility: 'hidden',
)

inc = include_directories('.')

hwy_dep = declare_dependency(
link_with: hwy_lib,
include_directories: inc,
)
meson.override_dependency('hwy', hwy_dep)

if not get_option('tests').disabled()
hwy_test_sources = [
'hwy/tests/test_util.cc',
]

hwy_test_lib = library(
'hwy-test',
hwy_test_sources,
cpp_static_args: ['-DHWY_STATIC_DEFINE'],
cpp_shared_args: ['-DHWY_SHARED_DEFINE', '-Dhwy_test_EXPORTS'],
dependencies: [hwy_dep],
gnu_symbol_visibility: 'hidden',
)

hwy_tests = [
'hwy/contrib/algo/copy_test.cc',
'hwy/contrib/algo/find_test.cc',
'hwy/contrib/algo/transform_test.cc',
'hwy/abort_test.cc',
'hwy/aligned_allocator_test.cc',
'hwy/base_test.cc',
'hwy/bit_set_test.cc',
'hwy/highway_test.cc',
'hwy/nanobenchmark_test.cc',
'hwy/targets_test.cc',
'hwy/examples/skeleton_test.cc',
'hwy/tests/arithmetic_test.cc',
'hwy/tests/bit_permute_test.cc',
'hwy/tests/blockwise_shift_test.cc',
'hwy/tests/blockwise_test.cc',
'hwy/tests/cast_test.cc',
'hwy/tests/combine_test.cc',
'hwy/tests/compare_test.cc',
'hwy/tests/compress_test.cc',
'hwy/tests/convert_test.cc',
'hwy/tests/count_test.cc',
'hwy/tests/crypto_test.cc',
'hwy/tests/demote_test.cc',
'hwy/tests/div_test.cc',
'hwy/tests/dup128_vec_test.cc',
'hwy/tests/expand_test.cc',
'hwy/tests/float_test.cc',
'hwy/tests/foreach_vec_test.cc',
'hwy/tests/if_test.cc',
'hwy/tests/in_range_float_to_int_conv_test.cc',
'hwy/tests/interleaved_test.cc',
'hwy/tests/logical_test.cc',
'hwy/tests/mask_combine_test.cc',
'hwy/tests/mask_convert_test.cc',
'hwy/tests/mask_mem_test.cc',
'hwy/tests/mask_slide_test.cc',
'hwy/tests/mask_test.cc',
'hwy/tests/masked_arithmetic_test.cc',
'hwy/tests/masked_minmax_test.cc',
'hwy/tests/memory_test.cc',
'hwy/tests/minmax_test.cc',
'hwy/tests/mul_test.cc',
'hwy/tests/reduction_test.cc',
'hwy/tests/resize_test.cc',
'hwy/tests/reverse_test.cc',
'hwy/tests/saturated_test.cc',
'hwy/tests/shift_test.cc',
'hwy/tests/shuffle4_test.cc',
'hwy/tests/slide_up_down_test.cc',
'hwy/tests/sums_abs_diff_test.cc',
'hwy/tests/swizzle_block_test.cc',
'hwy/tests/swizzle_test.cc',
'hwy/tests/table_test.cc',
'hwy/tests/test_util_test.cc',
'hwy/tests/truncate_test.cc',
'hwy/tests/tuple_test.cc',
'hwy/tests/widen_mul_test.cc',
]

benchmarks_no_main = [
'hwy/contrib/algo/copy_test.cc',
'hwy/contrib/algo/find_test.cc',
'hwy/contrib/algo/transform_test.cc',
'hwy/abort_test.cc',
'hwy/aligned_allocator_test.cc',
'hwy/base_test.cc',
'hwy/bit_set_test.cc',
'hwy/highway_test.cc',
'hwy/tests/bit_permute_test.cc',
'hwy/nanobenchmark_test.cc',
'hwy/targets_test.cc',
'hwy/examples/skeleton_test.cc',
'hwy/tests/arithmetic_test.cc',
'hwy/tests/blockwise_shift_test.cc',
]

fs = import('fs')

cpp = meson.get_compiler('cpp')
if cpp.get_id() == 'msvc'
gtest_dep = dependency('gtest')
else
gtest_dep = dependency('gtest_main')
endif

foreach t : hwy_tests
stem = fs.stem(t)
sources = hwy_test_sources + t
if stem == 'skeleton_test'
sources += 'hwy/examples/skeleton.cc'
endif

cpp_args = []
if stem in ['cast_test', 'mask_test', 'shuffle4_test']
cpp_args += cpp.get_supported_arguments(['-Wa,-mbig-obj'])
endif

test(stem,
executable(stem, sources,
link_with: [hwy_test_lib],
dependencies: [hwy_dep, gtest_dep],
cpp_args: cpp_args,
)
)
endforeach
endif
1 change: 1 addition & 0 deletions subprojects/packagefiles/google-highway/meson_options.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
option('tests', type: 'feature', value: 'auto', description: 'Build unit tests')

0 comments on commit 816fd27

Please sign in to comment.