Jacques Lucke
658fd8df0b
Previously, there was a fixed grain size for all multi-functions. That was
not sufficient because some functions could benefit a lot from smaller
grain sizes.
This refactors adds a new `MultiFunction::call_auto` method which has the
same effect as just calling `MultiFunction::call` but additionally figures
out how to execute the specific multi-function efficiently. It determines
a good grain size and decides whether the mask indices should be shifted
or not.
Most multi-function evaluations benefit from this, but medium sized work
loads (1000 - 50000 elements) benefit from it the most. Especially when
expensive multi-functions (e.g. noise) is involved. This is because for
smaller work loads, threading is rarely used and for larger work loads
threading worked fine before already.
With this patch, multi-functions can specify execution hints, that allow
the caller to execute it most efficiently. These execution hints still
have to be added to more functions.
Some performance measurements of a field evaluation involving noise and
math nodes, ordered by the number of elements being evaluated:
```
1,000,000: 133 ms -> 120 ms
100,000: 30 ms -> 18 ms
10,000: 20 ms -> 2.7 ms
1,000: 4 ms -> 0.5 ms
100: 0.5 ms -> 0.4 ms
```
105 lines
2.7 KiB
CMake
105 lines
2.7 KiB
CMake
# ***** BEGIN GPL LICENSE BLOCK *****
|
|
#
|
|
# This program is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU General Public License
|
|
# as published by the Free Software Foundation; either version 2
|
|
# of the License, or (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; if not, write to the Free Software Foundation,
|
|
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
#
|
|
# ***** END GPL LICENSE BLOCK *****
|
|
|
|
set(INC
|
|
.
|
|
../blenlib
|
|
../makesdna
|
|
../../../intern/guardedalloc
|
|
)
|
|
|
|
set(INC_SYS
|
|
)
|
|
|
|
set(SRC
|
|
intern/cpp_types.cc
|
|
intern/field.cc
|
|
intern/generic_vector_array.cc
|
|
intern/generic_virtual_array.cc
|
|
intern/generic_virtual_vector_array.cc
|
|
intern/multi_function.cc
|
|
intern/multi_function_builder.cc
|
|
intern/multi_function_params.cc
|
|
intern/multi_function_procedure.cc
|
|
intern/multi_function_procedure_builder.cc
|
|
intern/multi_function_procedure_executor.cc
|
|
|
|
FN_cpp_type.hh
|
|
FN_cpp_type_make.hh
|
|
FN_field.hh
|
|
FN_field_cpp_type.hh
|
|
FN_generic_array.hh
|
|
FN_generic_pointer.hh
|
|
FN_generic_span.hh
|
|
FN_generic_value_map.hh
|
|
FN_generic_vector_array.hh
|
|
FN_generic_virtual_array.hh
|
|
FN_generic_virtual_vector_array.hh
|
|
FN_multi_function.hh
|
|
FN_multi_function_builder.hh
|
|
FN_multi_function_context.hh
|
|
FN_multi_function_data_type.hh
|
|
FN_multi_function_param_type.hh
|
|
FN_multi_function_params.hh
|
|
FN_multi_function_procedure.hh
|
|
FN_multi_function_procedure_builder.hh
|
|
FN_multi_function_procedure_executor.hh
|
|
FN_multi_function_signature.hh
|
|
)
|
|
|
|
set(LIB
|
|
bf_blenlib
|
|
)
|
|
|
|
if(WITH_TBB)
|
|
add_definitions(-DWITH_TBB)
|
|
if(WIN32)
|
|
# TBB includes Windows.h which will define min/max macros
|
|
# that will collide with the stl versions.
|
|
add_definitions(-DNOMINMAX)
|
|
endif()
|
|
list(APPEND INC_SYS
|
|
${TBB_INCLUDE_DIRS}
|
|
)
|
|
|
|
list(APPEND LIB
|
|
${TBB_LIBRARIES}
|
|
)
|
|
endif()
|
|
|
|
blender_add_lib(bf_functions "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
|
|
|
|
if(WITH_GTESTS)
|
|
set(TEST_SRC
|
|
tests/FN_cpp_type_test.cc
|
|
tests/FN_field_test.cc
|
|
tests/FN_generic_array_test.cc
|
|
tests/FN_generic_span_test.cc
|
|
tests/FN_generic_vector_array_test.cc
|
|
tests/FN_multi_function_procedure_test.cc
|
|
tests/FN_multi_function_test.cc
|
|
|
|
tests/FN_multi_function_test_common.hh
|
|
)
|
|
set(TEST_LIB
|
|
bf_functions
|
|
)
|
|
include(GTestTesting)
|
|
blender_add_test_lib(bf_functions_tests "${TEST_SRC}" "${INC};${TEST_INC}" "${INC_SYS}" "${LIB};${TEST_LIB}")
|
|
endif()
|