meson: allow to disable build of benchmarks

KULeuven-COSIC · Jul 12, 2023 · 98ddc5c · 98ddc5c
1 parent d65aabe
commit 98ddc5c
Show file tree

Hide file tree

Showing 15 changed files with 158 additions and 125 deletions.
diff --git a/faest_128f/meson.build b/faest_128f/meson.build
@@ -76,12 +76,14 @@ if valgrind_exec.found()
     build_by_default: false,
   )
 endif
-bench_sources = files(
-  join_paths(meson.project_source_root(), 'tools', 'bench_c2.cpp'),
-)
-bench_catch = executable('faest_128f_bench_c2', bench_sources,
-  dependencies: [libfaest_128f_dependency, boost_program_options, catch2],
-  include_directories: include_directories,
-  c_args: defines + c_flags,
-  cpp_args: defines + cpp_flags
-)
+if get_option('benchmarks').enabled()
+  bench_sources = files(
+    join_paths(meson.project_source_root(), 'tools', 'bench_c2.cpp'),
+  )
+  bench_catch = executable('faest_128f_bench_c2', bench_sources,
+    dependencies: [libfaest_128f_dependency, boost_program_options, catch2],
+    include_directories: include_directories,
+    c_args: defines + c_flags,
+    cpp_args: defines + cpp_flags
+  )
+endif
diff --git a/faest_128s/meson.build b/faest_128s/meson.build
@@ -76,12 +76,14 @@ if valgrind_exec.found()
     build_by_default: false,
   )
 endif
-bench_sources = files(
-  join_paths(meson.project_source_root(), 'tools', 'bench_c2.cpp'),
-)
-bench_catch = executable('faest_128s_bench_c2', bench_sources,
-  dependencies: [libfaest_128s_dependency, boost_program_options, catch2],
-  include_directories: include_directories,
-  c_args: defines + c_flags,
-  cpp_args: defines + cpp_flags
-)
+if get_option('benchmarks').enabled()
+  bench_sources = files(
+    join_paths(meson.project_source_root(), 'tools', 'bench_c2.cpp'),
+  )
+  bench_catch = executable('faest_128s_bench_c2', bench_sources,
+    dependencies: [libfaest_128s_dependency, boost_program_options, catch2],
+    include_directories: include_directories,
+    c_args: defines + c_flags,
+    cpp_args: defines + cpp_flags
+  )
+endif
diff --git a/faest_192f/meson.build b/faest_192f/meson.build
@@ -76,12 +76,14 @@ if valgrind_exec.found()
     build_by_default: false,
   )
 endif
-bench_sources = files(
-  join_paths(meson.project_source_root(), 'tools', 'bench_c2.cpp'),
-)
-bench_catch = executable('faest_192f_bench_c2', bench_sources,
-  dependencies: [libfaest_192f_dependency, boost_program_options, catch2],
-  include_directories: include_directories,
-  c_args: defines + c_flags,
-  cpp_args: defines + cpp_flags
-)
+if get_option('benchmarks').enabled()
+  bench_sources = files(
+    join_paths(meson.project_source_root(), 'tools', 'bench_c2.cpp'),
+  )
+  bench_catch = executable('faest_192f_bench_c2', bench_sources,
+    dependencies: [libfaest_192f_dependency, boost_program_options, catch2],
+    include_directories: include_directories,
+    c_args: defines + c_flags,
+    cpp_args: defines + cpp_flags
+  )
+endif
diff --git a/faest_192s/meson.build b/faest_192s/meson.build
@@ -76,12 +76,14 @@ if valgrind_exec.found()
     build_by_default: false,
   )
 endif
-bench_sources = files(
-  join_paths(meson.project_source_root(), 'tools', 'bench_c2.cpp'),
-)
-bench_catch = executable('faest_192s_bench_c2', bench_sources,
-  dependencies: [libfaest_192s_dependency, boost_program_options, catch2],
-  include_directories: include_directories,
-  c_args: defines + c_flags,
-  cpp_args: defines + cpp_flags
-)
+if get_option('benchmarks').enabled()
+  bench_sources = files(
+    join_paths(meson.project_source_root(), 'tools', 'bench_c2.cpp'),
+  )
+  bench_catch = executable('faest_192s_bench_c2', bench_sources,
+    dependencies: [libfaest_192s_dependency, boost_program_options, catch2],
+    include_directories: include_directories,
+    c_args: defines + c_flags,
+    cpp_args: defines + cpp_flags
+  )
+endif
diff --git a/faest_256f/meson.build b/faest_256f/meson.build
@@ -76,12 +76,14 @@ if valgrind_exec.found()
     build_by_default: false,
   )
 endif
-bench_sources = files(
-  join_paths(meson.project_source_root(), 'tools', 'bench_c2.cpp'),
-)
-bench_catch = executable('faest_256f_bench_c2', bench_sources,
-  dependencies: [libfaest_256f_dependency, boost_program_options, catch2],
-  include_directories: include_directories,
-  c_args: defines + c_flags,
-  cpp_args: defines + cpp_flags
-)
+if get_option('benchmarks').enabled()
+  bench_sources = files(
+    join_paths(meson.project_source_root(), 'tools', 'bench_c2.cpp'),
+  )
+  bench_catch = executable('faest_256f_bench_c2', bench_sources,
+    dependencies: [libfaest_256f_dependency, boost_program_options, catch2],
+    include_directories: include_directories,
+    c_args: defines + c_flags,
+    cpp_args: defines + cpp_flags
+  )
+endif
diff --git a/faest_256s/meson.build b/faest_256s/meson.build
@@ -76,12 +76,14 @@ if valgrind_exec.found()
     build_by_default: false,
   )
 endif
-bench_sources = files(
-  join_paths(meson.project_source_root(), 'tools', 'bench_c2.cpp'),
-)
-bench_catch = executable('faest_256s_bench_c2', bench_sources,
-  dependencies: [libfaest_256s_dependency, boost_program_options, catch2],
-  include_directories: include_directories,
-  c_args: defines + c_flags,
-  cpp_args: defines + cpp_flags
-)
+if get_option('benchmarks').enabled()
+  bench_sources = files(
+    join_paths(meson.project_source_root(), 'tools', 'bench_c2.cpp'),
+  )
+  bench_catch = executable('faest_256s_bench_c2', bench_sources,
+    dependencies: [libfaest_256s_dependency, boost_program_options, catch2],
+    include_directories: include_directories,
+    c_args: defines + c_flags,
+    cpp_args: defines + cpp_flags
+  )
+endif
diff --git a/faest_em_128f/meson.build b/faest_em_128f/meson.build
@@ -76,12 +76,14 @@ if valgrind_exec.found()
     build_by_default: false,
   )
 endif
-bench_sources = files(
-  join_paths(meson.project_source_root(), 'tools', 'bench_c2.cpp'),
-)
-bench_catch = executable('faest_em_128f_bench_c2', bench_sources,
-  dependencies: [libfaest_em_128f_dependency, boost_program_options, catch2],
-  include_directories: include_directories,
-  c_args: defines + c_flags,
-  cpp_args: defines + cpp_flags
-)
+if get_option('benchmarks').enabled()
+  bench_sources = files(
+    join_paths(meson.project_source_root(), 'tools', 'bench_c2.cpp'),
+  )
+  bench_catch = executable('faest_em_128f_bench_c2', bench_sources,
+    dependencies: [libfaest_em_128f_dependency, boost_program_options, catch2],
+    include_directories: include_directories,
+    c_args: defines + c_flags,
+    cpp_args: defines + cpp_flags
+  )
+endif
diff --git a/faest_em_128s/meson.build b/faest_em_128s/meson.build
@@ -76,12 +76,14 @@ if valgrind_exec.found()
     build_by_default: false,
   )
 endif
-bench_sources = files(
-  join_paths(meson.project_source_root(), 'tools', 'bench_c2.cpp'),
-)
-bench_catch = executable('faest_em_128s_bench_c2', bench_sources,
-  dependencies: [libfaest_em_128s_dependency, boost_program_options, catch2],
-  include_directories: include_directories,
-  c_args: defines + c_flags,
-  cpp_args: defines + cpp_flags
-)
+if get_option('benchmarks').enabled()
+  bench_sources = files(
+    join_paths(meson.project_source_root(), 'tools', 'bench_c2.cpp'),
+  )
+  bench_catch = executable('faest_em_128s_bench_c2', bench_sources,
+    dependencies: [libfaest_em_128s_dependency, boost_program_options, catch2],
+    include_directories: include_directories,
+    c_args: defines + c_flags,
+    cpp_args: defines + cpp_flags
+  )
+endif
diff --git a/faest_em_192f/meson.build b/faest_em_192f/meson.build
@@ -76,12 +76,14 @@ if valgrind_exec.found()
     build_by_default: false,
   )
 endif
-bench_sources = files(
-  join_paths(meson.project_source_root(), 'tools', 'bench_c2.cpp'),
-)
-bench_catch = executable('faest_em_192f_bench_c2', bench_sources,
-  dependencies: [libfaest_em_192f_dependency, boost_program_options, catch2],
-  include_directories: include_directories,
-  c_args: defines + c_flags,
-  cpp_args: defines + cpp_flags
-)
+if get_option('benchmarks').enabled()
+  bench_sources = files(
+    join_paths(meson.project_source_root(), 'tools', 'bench_c2.cpp'),
+  )
+  bench_catch = executable('faest_em_192f_bench_c2', bench_sources,
+    dependencies: [libfaest_em_192f_dependency, boost_program_options, catch2],
+    include_directories: include_directories,
+    c_args: defines + c_flags,
+    cpp_args: defines + cpp_flags
+  )
+endif
diff --git a/faest_em_192s/meson.build b/faest_em_192s/meson.build
@@ -76,12 +76,14 @@ if valgrind_exec.found()
     build_by_default: false,
   )
 endif
-bench_sources = files(
-  join_paths(meson.project_source_root(), 'tools', 'bench_c2.cpp'),
-)
-bench_catch = executable('faest_em_192s_bench_c2', bench_sources,
-  dependencies: [libfaest_em_192s_dependency, boost_program_options, catch2],
-  include_directories: include_directories,
-  c_args: defines + c_flags,
-  cpp_args: defines + cpp_flags
-)
+if get_option('benchmarks').enabled()
+  bench_sources = files(
+    join_paths(meson.project_source_root(), 'tools', 'bench_c2.cpp'),
+  )
+  bench_catch = executable('faest_em_192s_bench_c2', bench_sources,
+    dependencies: [libfaest_em_192s_dependency, boost_program_options, catch2],
+    include_directories: include_directories,
+    c_args: defines + c_flags,
+    cpp_args: defines + cpp_flags
+  )
+endif
diff --git a/faest_em_256f/meson.build b/faest_em_256f/meson.build
@@ -76,12 +76,14 @@ if valgrind_exec.found()
     build_by_default: false,
   )
 endif
-bench_sources = files(
-  join_paths(meson.project_source_root(), 'tools', 'bench_c2.cpp'),
-)
-bench_catch = executable('faest_em_256f_bench_c2', bench_sources,
-  dependencies: [libfaest_em_256f_dependency, boost_program_options, catch2],
-  include_directories: include_directories,
-  c_args: defines + c_flags,
-  cpp_args: defines + cpp_flags
-)
+if get_option('benchmarks').enabled()
+  bench_sources = files(
+    join_paths(meson.project_source_root(), 'tools', 'bench_c2.cpp'),
+  )
+  bench_catch = executable('faest_em_256f_bench_c2', bench_sources,
+    dependencies: [libfaest_em_256f_dependency, boost_program_options, catch2],
+    include_directories: include_directories,
+    c_args: defines + c_flags,
+    cpp_args: defines + cpp_flags
+  )
+endif
diff --git a/faest_em_256s/meson.build b/faest_em_256s/meson.build
@@ -76,12 +76,14 @@ if valgrind_exec.found()
     build_by_default: false,
   )
 endif
-bench_sources = files(
-  join_paths(meson.project_source_root(), 'tools', 'bench_c2.cpp'),
-)
-bench_catch = executable('faest_em_256s_bench_c2', bench_sources,
-  dependencies: [libfaest_em_256s_dependency, boost_program_options, catch2],
-  include_directories: include_directories,
-  c_args: defines + c_flags,
-  cpp_args: defines + cpp_flags
-)
+if get_option('benchmarks').enabled()
+  bench_sources = files(
+    join_paths(meson.project_source_root(), 'tools', 'bench_c2.cpp'),
+  )
+  bench_catch = executable('faest_em_256s_bench_c2', bench_sources,
+    dependencies: [libfaest_em_256s_dependency, boost_program_options, catch2],
+    include_directories: include_directories,
+    c_args: defines + c_flags,
+    cpp_args: defines + cpp_flags
+  )
+endif
diff --git a/meson.build b/meson.build
@@ -374,7 +374,7 @@ endforeach
 
 # dependencies
 openssl = dependency('openssl', required: get_option('openssl'))
-boost_program_options = dependency('boost', required: false, modules: ['program_options'])
+boost_program_options = dependency('boost', required: get_option('benchmarks'), modules: ['program_options'])
 valgrind = dependency('valgrind', required: get_option('valgrind'))
 if valgrind.found()
   valgrind_exec = find_program('valgrind', required: true)
@@ -403,13 +403,15 @@ if host_machine.system() == 'windows'
 endif
 
 # catch2 for benchmarks
-libcatch2 = static_library('catch2',
-  files(join_paths(meson.project_source_root(), 'catch2', 'extras', 'catch_amalgamated.cpp')),
-)
-catch2 = declare_dependency(
-  link_with: libcatch2,
-  include_directories: include_directories(join_paths('catch2', 'extras'))
-)
+if get_option('benchmarks').enabled()
+  libcatch2 = static_library('catch2',
+    files(join_paths(meson.project_source_root(), 'catch2', 'extras', 'catch_amalgamated.cpp')),
+  )
+  catch2 = declare_dependency(
+    link_with: libcatch2,
+    include_directories: include_directories(join_paths('catch2', 'extras'))
+  )
+endif
 
 # generate config.h
 config_header = configure_file(

diff --git a/meson_options.txt b/meson_options.txt
@@ -13,4 +13,9 @@ option('valgrind',
   type: 'feature',
   value: 'disabled',
   description: 'Use valgrind for timing checks'
+)
+option('benchmarks',
+  type: 'feature',
+  value: 'auto',
+  description: 'Build benchmark executables'
 )
diff --git a/tools/crypto_sign_generator.py b/tools/crypto_sign_generator.py
@@ -97,15 +97,17 @@ def generate(param_name):
     build_by_default: false,
   )
 endif
-bench_sources = files(
-  join_paths(meson.project_source_root(), 'tools', 'bench_c2.cpp'),
-)
-bench_catch = executable('faest_{param_name}_bench_c2', bench_sources,
-  dependencies: [libfaest_{param_name}_dependency, boost_program_options, catch2],
-  include_directories: include_directories,
-  c_args: defines + c_flags,
-  cpp_args: defines + cpp_flags
-)
+if get_option('benchmarks').enabled()
+  bench_sources = files(
+    join_paths(meson.project_source_root(), 'tools', 'bench_c2.cpp'),
+  )
+  bench_catch = executable('faest_{param_name}_bench_c2', bench_sources,
+    dependencies: [libfaest_{param_name}_dependency, boost_program_options, catch2],
+    include_directories: include_directories,
+    c_args: defines + c_flags,
+    cpp_args: defines + cpp_flags
+  )
+endif
 """
         )