From f7779d4529f83ccad1ebc871ccc952379edc42cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20He=C3=9F?= <rene.hess@iwr.uni-heidelberg.de> Date: Fri, 15 Feb 2019 16:34:56 +0100 Subject: [PATCH] Make a test that only runs if benchmark was found --- test/sumfact/poisson/CMakeLists.txt | 10 +++++++ test/sumfact/poisson/poisson_3d.mini | 1 - .../sumfact/poisson/poisson_3d_benchmark.mini | 29 +++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 test/sumfact/poisson/poisson_3d_benchmark.mini diff --git a/test/sumfact/poisson/CMakeLists.txt b/test/sumfact/poisson/CMakeLists.txt index 307e6d43..3b16c1da 100644 --- a/test/sumfact/poisson/CMakeLists.txt +++ b/test/sumfact/poisson/CMakeLists.txt @@ -119,3 +119,13 @@ dune_add_formcompiler_system_test(UFLFILE poisson_dg_3d.ufl BASENAME sumfact_poisson_dg_3d_diagonal INIFILE diagonal.mini ) + +#====================================== +# Test autotuning with google-benchmark +#====================================== +if(benchmark_FOUND) + dune_add_formcompiler_system_test(UFLFILE poisson_3d.ufl + BASENAME sumfact_poisson_3d_benchmark + INIFILE poisson_3d_benchmark.mini + ) +endif() diff --git a/test/sumfact/poisson/poisson_3d.mini b/test/sumfact/poisson/poisson_3d.mini index c981fcad..27ef4608 100644 --- a/test/sumfact/poisson/poisson_3d.mini +++ b/test/sumfact/poisson/poisson_3d.mini @@ -16,7 +16,6 @@ extension = vtu [formcompiler] compare_l2errorsquared = 1e-4, 1e-8 | expand deg -autotune_google_benchmark = 0, 1 | expand deg [formcompiler.r] numerical_jacobian = 1, 0 | expand num diff --git a/test/sumfact/poisson/poisson_3d_benchmark.mini b/test/sumfact/poisson/poisson_3d_benchmark.mini new file mode 100644 index 00000000..aca0d876 --- /dev/null +++ b/test/sumfact/poisson/poisson_3d_benchmark.mini @@ -0,0 +1,29 @@ +__name = sumfact_poisson_3d_benchmark_{__exec_suffix} +__exec_suffix = {deg_suffix}_{diff_suffix}_{quadvec_suffix}_{gradvec_suffix} + +deg_suffix = deg{formcompiler.ufl_variants.degree} +diff_suffix = symdiff +quadvec_suffix = quadvec +gradvec_suffix = autotunevec + +cells = 8 8 8 +extension = 1. 1. 1. + +[wrapper.vtkcompare] +name = {__name} +reference = poisson_ref +extension = vtu + +[formcompiler] +compare_l2errorsquared = 1e-4 +autotune_google_benchmark = 1 + +[formcompiler.r] +numerical_jacobian = 0 +sumfact = 1 +vectorization_quadloop = 1 +vectorization_strategy = autotune +geometry_mixins = sumfact_equidistant + +[formcompiler.ufl_variants] +degree = 1 -- GitLab