mirror of
https://github.com/wjakob/tbb.git
synced 2026-08-30 00:50:40 +08:00
Hans Johnson
e32d75f876
The new release TBB is now under a new more
open license.
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
The list of most significant changes made over time in
Intel(R) Threading Building Blocks (Intel(R) TBB).
Intel TBB 2017
TBB_INTERFACE_VERSION == 9100
Changes (w.r.t. Intel TBB 4.4 Update 5):
- static_partitioner class is now a fully supported feature.
- async_node class is now a fully supported feature.
- Improved dynamic memory allocation replacement on Windows* OS to skip
DLLs for which replacement cannot be done, instead of aborting.
- Intel TBB no longer performs dynamic memory allocation replacement
for Microsoft* Visual Studio* 2008.
- For 64-bit platforms, quadrupled the worst-case limit on the amount
of memory the Intel TBB allocator can handle.
- Added TBB_USE_GLIBCXX_VERSION macro to specify the version of GNU
libstdc++ when it cannot be properly recognized, e.g. when used
with Clang on Linux* OS. Inspired by a contribution from David A.
- Added graph/stereo example to demostrate tbb::flow::async_msg.
- Removed a few cases of excessive user data copying in the flow graph.
- Reworked split_node to eliminate unnecessary overheads.
- Added support for C++11 move semantics to the argument of
tbb::parallel_do_feeder::add() method.
- Added C++11 move constructor and assignment operator to
tbb::combinable template class.
- Added tbb::this_task_arena::max_concurrency() function and
max_concurrency() method of class task_arena returning the maximal
number of threads that can work inside an arena.
- Deprecated tbb::task_arena::current_thread_index() static method;
use tbb::this_task_arena::current_thread_index() function instead.
- All examples for commercial version of library moved online:
https://software.intel.com/en-us/product-code-samples. Examples are
available as a standalone package or as a part of Intel(R) Parallel
Studio XE or Intel(R) System Studio Online Samples packages.
Changes affecting backward compatibility:
- Renamed following methods and types in async_node class:
Old New
async_gateway_type => gateway_type
async_gateway() => gateway()
async_try_put() => try_put()
async_reserve() => reserve_wait()
async_commit() => release_wait()
- Internal layout of some flow graph nodes has changed; recompilation
is recommended for all binaries that use the flow graph.
Preview Features:
- Added template class streaming_node to the flow graph API. It allows
a flow graph to offload computations to other devices through
streaming or offloading APIs.
- Template class opencl_node reimplemented as a specialization of
streaming_node that works with OpenCL*.
- Added tbb::this_task_arena::isolate() function to isolate execution
of a group of tasks or an algorithm from other tasks submitted
to the scheduler.
Bugs fixed:
- Added a workaround for GCC bug #62258 in std::rethrow_exception()
to prevent possible problems in case of exception propagation.
- Fixed parallel_scan to provide correct result if the initial value
of an accumulator is not the operation identity value.
- Fixed a memory corruption in the memory allocator when it meets
internal limits.
- Fixed the memory allocator on 64-bit platforms to align memory
to 16 bytes by default for all allocations bigger than 8 bytes.
- As a workaround for crashes in the Intel TBB library compiled with
GCC 6, added -flifetime-dse=1 to compilation options on Linux* OS.
- Fixed a race in the flow graph implementation.
Open-source contributions integrated:
- Enabling use of C++11 'override' keyword by Raf Schietekat.
------------------------------------------------------------------------
166 lines
5.3 KiB
PHP
166 lines
5.3 KiB
PHP
# Copyright (c) 2005-2016 Intel Corporation
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
#
|
|
#
|
|
#
|
|
#
|
|
|
|
|
|
ifeq ($(tbb_strict),1)
|
|
ifeq ($(WARNING_AS_ERROR_KEY),)
|
|
$(error WARNING_AS_ERROR_KEY is empty)
|
|
endif
|
|
# Do not remove line below!
|
|
WARNING_KEY += $(WARNING_AS_ERROR_KEY)
|
|
endif
|
|
|
|
ifneq (,$(findstring s,$(MAKEFLAGS)))
|
|
override largs+=-q
|
|
endif
|
|
ifneq (,$(repeat))
|
|
override largs+=-r $(repeat)
|
|
endif
|
|
ifneq (,$(largs)$(run_prefix))
|
|
override run_cmd:=$(run_cmd) $(TEST_LAUNCHER)
|
|
TEST_LAUNCHER=
|
|
ifeq (,$(strip $(run_cmd)))
|
|
$(warning Test launcher is not defined for the platform, ignoring launcher arguments)
|
|
endif
|
|
endif
|
|
|
|
ifndef TEST_EXT
|
|
TEST_EXT = exe
|
|
endif
|
|
|
|
INCLUDES += $(INCLUDE_KEY)$(tbb_root)/src $(INCLUDE_KEY)$(tbb_root)/src/rml/include $(INCLUDE_KEY)$(tbb_root)/include
|
|
|
|
CPLUS_FLAGS += $(WARNING_KEY) $(CXXFLAGS)
|
|
ifeq ($(tbb_cpf),1)
|
|
CPLUS_FLAGS += $(DEFINE_KEY)__TBB_CPF_BUILD=1
|
|
endif
|
|
LINK_FLAGS += $(LDFLAGS)
|
|
LIB_LINK_FLAGS += $(LDFLAGS)
|
|
|
|
LIB_LINK_CMD ?= $(CPLUS) $(PIC_KEY)
|
|
ifeq ($(origin LIB_OUTPUT_KEY), undefined)
|
|
LIB_OUTPUT_KEY = $(OUTPUT_KEY)
|
|
endif
|
|
ifeq ($(origin LIB_LINK_LIBS), undefined)
|
|
LIB_LINK_LIBS = $(LIBDL) $(LIBS)
|
|
endif
|
|
|
|
CONLY ?= $(CPLUS)
|
|
|
|
# The most generic rules
|
|
#$(1) - is the target pattern
|
|
define make-cxx-obj
|
|
$1: %.cpp
|
|
$$(CPLUS) $$(OUTPUTOBJ_KEY)$$@ $$(COMPILE_ONLY) $$(CPLUS_FLAGS) $$(CXX_ONLY_FLAGS) $$(CXX_WARN_SUPPRESS) $$(INCLUDES) $$<
|
|
endef
|
|
|
|
TEST_AFFIXES_OBJS=$(addsuffix .$(OBJ),$(addprefix %_,$(TEST_SUFFIXES)) $(addsuffix _%,$(TEST_PREFIXES)))
|
|
|
|
# Make will not process the same recipe for each test pattern (since the dependency on the same %.cpp)
|
|
# thus the separated recipes should be provided
|
|
$(foreach t,%.$(OBJ) $(TEST_AFFIXES_OBJS),$(eval $(call make-cxx-obj,$(t))))
|
|
|
|
.PRECIOUS: %.$(OBJ) %.$(TEST_EXT) %.res $(TEST_AFFIXES_OBJS)
|
|
|
|
# Rules for generating a test DLL
|
|
%_dll.$(OBJ): %.cpp
|
|
$(CPLUS) $(COMPILE_ONLY) $(OUTPUTOBJ_KEY)$@ $(CPLUS_FLAGS) $(PIC_KEY) $(DEFINE_KEY)_USRDLL $(INCLUDES) $<
|
|
|
|
#$(1) - is the binary name
|
|
#$(2) - is the input obj files and libraries
|
|
define make-test-binary
|
|
$(CPLUS) $(OUTPUT_KEY)$(strip $1) $(CPLUS_FLAGS) $(2) $(LIBS) $(LINK_FLAGS)
|
|
endef
|
|
|
|
# LINK_FILES the list of options to link test specific files (libraries and object files)
|
|
LINK_FILES+=$(TEST_LIBS)
|
|
# Rule for generating executable test
|
|
%.$(TEST_EXT): %.$(OBJ) $(TEST_LIBS) $(TEST_PREREQUISITE) $(if $(use_proxy),$(PROXY.LIB))
|
|
$(call make-test-binary,$@,$< $(LINK_FILES) $(PIE_FLAG))
|
|
|
|
# Rules for generating a test DLL
|
|
%_dll.$(DLL): LINK_FLAGS += $(PIC_KEY) $(DYLIB_KEY)
|
|
%_dll.$(DLL): TEST_LIBS := $(subst %_dll.$(DLL),,$(TEST_LIBS))
|
|
%_dll.$(DLL): %_dll.$(OBJ)
|
|
$(call make-test-binary,$@,$< $(LINK_FILES))
|
|
.PRECIOUS: %_dll.$(OBJ) %_dll.$(DLL)
|
|
|
|
%.$(OBJ): %.c
|
|
$(CONLY) $(COMPILE_ONLY) $(OUTPUTOBJ_KEY)$@ $(C_FLAGS) $(INCLUDES) $<
|
|
|
|
%.$(OBJ): %.asm
|
|
$(ASM) $(ASM_FLAGS) $<
|
|
|
|
%.$(OBJ): %.s
|
|
cpp <$< | grep -v '^#' >$*.tmp
|
|
$(ASM) $(ASM_FLAGS) -o $@ $*.tmp
|
|
|
|
# Rule for generating .E file if needed for visual inspection
|
|
# Note that ICL treats an argument after PREPROC_ONLY as a file to open,
|
|
# so all uses of PREPROC_ONLY should be immediately followed by a file name
|
|
%.E: %.cpp
|
|
$(CPLUS) $(CPLUS_FLAGS) $(CXX_ONLY_FLAGS) $(INCLUDES) $(PREPROC_ONLY) $< >$@
|
|
|
|
# TODO Rule for generating .asm file if needed for visual inspection
|
|
%.asm: %.cpp
|
|
$(CPLUS) /c /FAs /Fa $(CPLUS_FLAGS) $(CXX_ONLY_FLAGS) $(INCLUDES) $<
|
|
|
|
# TODO Rule for generating .s file if needed for visual inspection
|
|
%.s: %.cpp
|
|
$(CPLUS) -S $(CPLUS_FLAGS) $(CXX_ONLY_FLAGS) $(INCLUDES) $<
|
|
|
|
# Customizations
|
|
$(KNOWN_WARNINGS): %.$(OBJ): %.cpp
|
|
$(CPLUS) $(COMPILE_ONLY) $(subst $(WARNING_KEY),,$(CPLUS_FLAGS)) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $<
|
|
|
|
tbb_misc.$(OBJ): version_string.ver
|
|
tbb_misc.$(OBJ): INCLUDES+=$(INCLUDE_KEY).
|
|
|
|
tbb_misc.E: tbb_misc.cpp version_string.ver
|
|
$(CPLUS) $(CPLUS_FLAGS) $(CXX_ONLY_FLAGS) $(INCLUDE_KEY). $(INCLUDES) $(PREPROC_ONLY) $< >$@
|
|
|
|
%.res: %.rc version_string.ver $(TBB.MANIFEST)
|
|
rc /Fo$@ $(INCLUDES) $(filter /D%,$(CPLUS_FLAGS)) $<
|
|
|
|
# TODO: add $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS) (in a separate line?) and remove useless $(INCLUDES)
|
|
VERSION_FLAGS=$(CPLUS) $(CPLUS_FLAGS) $(CXX_ONLY_FLAGS) $(INCLUDES)
|
|
|
|
ifneq (,$(TBB.MANIFEST))
|
|
$(TBB.MANIFEST):
|
|
cmd /C "echo #include ^<stdio.h^> >tbbmanifest.c"
|
|
cmd /C "echo int main(){return 0;} >>tbbmanifest.c"
|
|
cl /nologo $(C_FLAGS) tbbmanifest.c
|
|
|
|
version_string.ver: $(TBB.MANIFEST)
|
|
$(MAKE_VERSIONS)
|
|
cmd /C "echo #define TBB_MANIFEST 1 >> version_string.ver"
|
|
# TODO: fix parallel build by writting to a temporary file and rename it when complete
|
|
else
|
|
# TODO: make version strings directly representative for all the libraries
|
|
version_string.ver:
|
|
$(MAKE_VERSIONS)
|
|
endif
|
|
|
|
test_% debug_%: test_%.$(TEST_EXT) $(TEST_PREREQUISITE)
|
|
$(run_cmd) ./$< $(args)
|
|
ifneq (,$(codecov))
|
|
profmerge
|
|
codecov $(if $(findstring -,$(codecov)),$(codecov),) -demang -comp $(tbb_root)/build/codecov.txt
|
|
endif
|
|
|