[Openmp-commits] [openmp] r219214 - I apologise in advance for the size of this check-in. At Intel we do
Hal Finkel
hfinkel at anl.gov
Tue Oct 7 14:24:21 PDT 2014
Hi Jim,
Some comments inline...
----- Original Message -----
> From: "Jim Cownie" <james.h.cownie at intel.com>
> To: openmp-commits at cs.uiuc.edu
> Sent: Tuesday, October 7, 2014 11:25:52 AM
> Subject: [Openmp-commits] [openmp] r219214 - I apologise in advance for the size of this check-in. At Intel we do
>
> Author: jimcownie
> Date: Tue Oct 7 11:25:50 2014
> New Revision: 219214
>
> URL: http://llvm.org/viewvc/llvm-project?rev=219214&view=rev
> Log:
> I apologise in advance for the size of this check-in. At Intel we do
> understand that this is not friendly,
The remailer creates the subject line of the e-mail messages from the first line of the commit message. As a result, this first line should be a hyper-short summary of the change (in this case, it ended up being, " I apologise in advance for the size of this check-in. At Intel we do").
> and are working to change our
> internal code-development to make it easier to make development
> features available more frequently and in finer (more functional)
> chunks. Unfortunately we haven't got that in place yet, and unpicking
> this into multiple separate check-ins would be non-trivial, so please
> bear with me on this one. We should be better in the future.
>
> Apologies over, what do we have here?
>
> GGC 4.9 compatibility
> --------------------
> * We have implemented the new entrypoints used by code compiled by
> GCC
> 4.9 to implement the same functionality in gcc 4.8. Therefore code
> compiled with gcc 4.9 that used to work will continue to do so.
> However, there are some other new entrypoints (associated with task
> cancellation) which are not implemented. Therefore user code compiled
> by gcc 4.9 that uses these new features will not link against the
> LLVM
> runtime. (It remains unclear how to handle those entrypoints, since
> the GCC interface has potentially unpleasant performance implications
> for join barriers even when cancellation is not used)
>
> --- new parallel entry points ---
> new entry points that aren't OpenMP 4.0 related
> These are implemented fully :-
> GOMP_parallel_loop_dynamic()
> GOMP_parallel_loop_guided()
> GOMP_parallel_loop_runtime()
> GOMP_parallel_loop_static()
> GOMP_parallel_sections()
> GOMP_parallel()
>
> --- cancellation entry points ---
> Currently, these only give a runtime error if OMP_CANCELLATION is
> true
> because our plain barriers don't check for cancellation while waiting
> GOMP_barrier_cancel()
> GOMP_cancel()
> GOMP_cancellation_point()
> GOMP_loop_end_cancel()
> GOMP_sections_end_cancel()
>
> --- taskgroup entry points ---
> These are implemented fully.
> GOMP_taskgroup_start()
> GOMP_taskgroup_end()
>
> --- target entry points ---
> These are empty (as they are in libgomp)
> GOMP_target()
> GOMP_target_data()
> GOMP_target_end_data()
> GOMP_target_update()
> GOMP_teams()
>
> Improvements in Barriers and Fork/Join
> --------------------------------------
> * Barrier and fork/join code is now in its own file (which makes it
> easier to understand and modify).
> * Wait/release code is now templated and in its own file;
> suspend/resume code is also templated
> * There's a new, hierarchical, barrier, which exploits the
> cache-hierarchy of the Intel(r) Xeon Phi(tm) coprocessor to improve
> fork/join and barrier performance.
>
> ***BEWARE*** the new source files have *not* been added to the legacy
> Cmake build system. If you want to use that fixes wil be required.
>
> Statistics Collection Code
> --------------------------
> * New code has been added to collect application statistics (if this
> is enabled at library compile time; by default it is not). The
> statistics code itself is generally useful, the lightweight timing
> code uses the X86 rdtsc instruction, so will require changes for
> other
> architectures.
When building with Clang, we could use __builtin_readcyclecounter() and get automatic portability (perhaps).
> The intent of this code is not for users to tune their codes but
> rather
> 1) For timing code-paths inside the runtime
> 2) For gathering general properties of OpenMP codes to focus
> attention
> on which OpenMP features are most used.
>
> Nested Hot Teams
> ----------------
> * The runtime now maintains more state to reduce the overhead of
> creating and destroying inner parallel teams. This improves the
> performance of code that repeatedly uses nested parallelism with the
> same resource allocation. Set the new KMP_HOT_TEAMS_MAX_LEVEL
> envirable to a depth to enable this (and, of course, OMP_NESTED=true
> to enable nested parallelism at all).
>
> Improved Intel(r) VTune(Tm) Amplifier support
> ---------------------------------------------
> * The runtime provides additional information to Vtune via the
> itt_notify interface to allow it to display better OpenMP specific
> analyses of load-imbalance.
>
> Support for OpenMP Composite Statements
> ---------------------------------------
> * Implement new entrypoints required by some of the OpenMP 4.1
> composite statements.
>
> Improved ifdefs
> ---------------
> * More separation of concepts ("Does this platform do X?") from
> platforms ("Are we compiling for platform Y?"), which should simplify
> future porting.
>
>
> ScaleMP* contribution
> ---------------------
> Stack padding to improve the performance in their environment where
> cross-node coherency is managed at the page level.
>
> Redesign of wait and release code
> ---------------------------------
> The code is simplified and performance improved.
>
> Bug Fixes
> ---------
> *Fixes for Windows multiple processor groups.
> *Fix Fortran module build on Linux: offload attribute added.
> *Fix entry names for distribute-parallel-loop construct to be
> consistent with the compiler codegen.
> *Fix an inconsistent error message for KMP_PLACE_THREADS
> environment variable.
>
>
> Added:
> openmp/trunk/runtime/src/kmp_barrier.cpp
> openmp/trunk/runtime/src/kmp_stats.cpp
> openmp/trunk/runtime/src/kmp_stats.h
> openmp/trunk/runtime/src/kmp_stats_timing.cpp
> openmp/trunk/runtime/src/kmp_stats_timing.h
> openmp/trunk/runtime/src/kmp_wait_release.cpp
> openmp/trunk/runtime/src/kmp_wait_release.h
> openmp/trunk/runtime/tools/make-fat-binaries.pl (with props)
> Modified:
> openmp/trunk/CREDITS.txt
> openmp/trunk/LICENSE.txt
> openmp/trunk/runtime/Build_With_CMake.txt
> openmp/trunk/runtime/CMakeLists.txt
> openmp/trunk/runtime/README.txt
> openmp/trunk/runtime/cmake/BuildPLRules.cmake
> openmp/trunk/runtime/cmake/Clang/AsmFlags.cmake
> openmp/trunk/runtime/cmake/Clang/CFlags.cmake
> openmp/trunk/runtime/cmake/CommonFlags.cmake
> openmp/trunk/runtime/cmake/Definitions.cmake
> openmp/trunk/runtime/cmake/GNU/AsmFlags.cmake
> openmp/trunk/runtime/cmake/GNU/CFlags.cmake
> openmp/trunk/runtime/cmake/GNU/FortranFlags.cmake
> openmp/trunk/runtime/cmake/Intel/AsmFlags.cmake
> openmp/trunk/runtime/cmake/Intel/CFlags.cmake
> openmp/trunk/runtime/cmake/Intel/FortranFlags.cmake
> openmp/trunk/runtime/cmake/MSVC/AsmFlags.cmake
> openmp/trunk/runtime/cmake/MSVC/CFlags.cmake
> openmp/trunk/runtime/cmake/MicroTests.cmake
> openmp/trunk/runtime/cmake/SourceFiles.cmake
> openmp/trunk/runtime/doc/Reference.pdf
> openmp/trunk/runtime/doc/doxygen/config
> openmp/trunk/runtime/doc/doxygen/libomp_interface.h
> openmp/trunk/runtime/src/defs.mk
> openmp/trunk/runtime/src/dllexports
> openmp/trunk/runtime/src/exports_so.txt
> openmp/trunk/runtime/src/extractExternal.cpp
> openmp/trunk/runtime/src/i18n/en_US.txt
> openmp/trunk/runtime/src/include/25/iomp.h.var
> openmp/trunk/runtime/src/include/25/iomp_lib.h.var
> openmp/trunk/runtime/src/include/25/omp.h.var
> openmp/trunk/runtime/src/include/25/omp_lib.f.var
> openmp/trunk/runtime/src/include/25/omp_lib.f90.var
> openmp/trunk/runtime/src/include/25/omp_lib.h.var
> openmp/trunk/runtime/src/include/30/iomp.h.var
> openmp/trunk/runtime/src/include/30/iomp_lib.h.var
> openmp/trunk/runtime/src/include/30/omp.h.var
> openmp/trunk/runtime/src/include/30/omp_lib.f.var
> openmp/trunk/runtime/src/include/30/omp_lib.f90.var
> openmp/trunk/runtime/src/include/30/omp_lib.h.var
> openmp/trunk/runtime/src/include/40/iomp.h.var
> openmp/trunk/runtime/src/kmp.h
> openmp/trunk/runtime/src/kmp_affinity.cpp
> openmp/trunk/runtime/src/kmp_alloc.c
> openmp/trunk/runtime/src/kmp_atomic.c
> openmp/trunk/runtime/src/kmp_atomic.h
> openmp/trunk/runtime/src/kmp_csupport.c
> openmp/trunk/runtime/src/kmp_debug.c
> openmp/trunk/runtime/src/kmp_debug.h
> openmp/trunk/runtime/src/kmp_dispatch.cpp
> openmp/trunk/runtime/src/kmp_environment.c
> openmp/trunk/runtime/src/kmp_environment.h
> openmp/trunk/runtime/src/kmp_error.c
> openmp/trunk/runtime/src/kmp_error.h
> openmp/trunk/runtime/src/kmp_ftn_cdecl.c
> openmp/trunk/runtime/src/kmp_ftn_entry.h
> openmp/trunk/runtime/src/kmp_ftn_extra.c
> openmp/trunk/runtime/src/kmp_ftn_os.h
> openmp/trunk/runtime/src/kmp_ftn_stdcall.c
> openmp/trunk/runtime/src/kmp_global.c
> openmp/trunk/runtime/src/kmp_gsupport.c
> openmp/trunk/runtime/src/kmp_i18n.c
> openmp/trunk/runtime/src/kmp_i18n.h
> openmp/trunk/runtime/src/kmp_import.c
> openmp/trunk/runtime/src/kmp_io.c
> openmp/trunk/runtime/src/kmp_io.h
> openmp/trunk/runtime/src/kmp_itt.c
> openmp/trunk/runtime/src/kmp_itt.h
> openmp/trunk/runtime/src/kmp_itt.inl
> openmp/trunk/runtime/src/kmp_lock.cpp
> openmp/trunk/runtime/src/kmp_lock.h
> openmp/trunk/runtime/src/kmp_omp.h
> openmp/trunk/runtime/src/kmp_os.h
> openmp/trunk/runtime/src/kmp_runtime.c
> openmp/trunk/runtime/src/kmp_sched.cpp
> openmp/trunk/runtime/src/kmp_settings.c
> openmp/trunk/runtime/src/kmp_settings.h
> openmp/trunk/runtime/src/kmp_str.c
> openmp/trunk/runtime/src/kmp_str.h
> openmp/trunk/runtime/src/kmp_stub.c
> openmp/trunk/runtime/src/kmp_stub.h
> openmp/trunk/runtime/src/kmp_taskdeps.cpp
> openmp/trunk/runtime/src/kmp_tasking.c
> openmp/trunk/runtime/src/kmp_taskq.c
> openmp/trunk/runtime/src/kmp_threadprivate.c
> openmp/trunk/runtime/src/kmp_utility.c
> openmp/trunk/runtime/src/kmp_version.c
> openmp/trunk/runtime/src/kmp_version.h
> openmp/trunk/runtime/src/kmp_wrapper_getpid.h
> openmp/trunk/runtime/src/kmp_wrapper_malloc.h
> openmp/trunk/runtime/src/libiomp.rc.var
> openmp/trunk/runtime/src/makefile.mk
> openmp/trunk/runtime/src/rules.mk
> openmp/trunk/runtime/src/test-touch.c
> openmp/trunk/runtime/src/thirdparty/ittnotify/ittnotify.h
> openmp/trunk/runtime/src/thirdparty/ittnotify/ittnotify_config.h
> openmp/trunk/runtime/src/thirdparty/ittnotify/ittnotify_static.c
> openmp/trunk/runtime/src/thirdparty/ittnotify/ittnotify_static.h
> openmp/trunk/runtime/src/thirdparty/ittnotify/legacy/ittnotify.h
> openmp/trunk/runtime/src/z_Linux_asm.s
> openmp/trunk/runtime/src/z_Linux_util.c
> openmp/trunk/runtime/src/z_Windows_NT-586_asm.asm
> openmp/trunk/runtime/src/z_Windows_NT-586_util.c
> openmp/trunk/runtime/src/z_Windows_NT_util.c
> openmp/trunk/runtime/tools/check-depends.pl
> openmp/trunk/runtime/tools/check-tools.pl
> openmp/trunk/runtime/tools/freebsd.inc
> openmp/trunk/runtime/tools/objcopy.cpp
> openmp/trunk/runtime/tools/src/common-checks.mk
> openmp/trunk/runtime/tools/src/common-tools.mk
> openmp/trunk/www/README.txt
> openmp/trunk/www/Reference.pdf
> openmp/trunk/www/index.html
>
> Modified: openmp/trunk/CREDITS.txt
> URL:
> http://llvm.org/viewvc/llvm-project/openmp/trunk/CREDITS.txt?rev=219214&r1=219213&r2=219214&view=diff
> ==============================================================================
> --- openmp/trunk/CREDITS.txt (original)
> +++ openmp/trunk/CREDITS.txt Tue Oct 7 11:25:50 2014
> @@ -9,6 +9,7 @@ beautification by scripts. The fields a
> (S).
>
> N: Carlo Bertolli
> +W: http://ibm.com
> D: IBM contributor to PowerPC support in CMake files and elsewhere.
>
> N: Sunita Chandrasekaran
> @@ -28,6 +29,11 @@ D: Created the runtime.
> N: Matthias Muller
> D: Contributor to testsuite from OpenUH
>
> +N: Tal Nevo
> +E: tal at scalemp.com
> +D: ScaleMP contributor to improve runtime performance there.
> +W: http://scalemp.com
> +
> N: Pavel Neytchev
> D: Contributor to testsuite from OpenUH
>
>
> Modified: openmp/trunk/LICENSE.txt
> URL:
> http://llvm.org/viewvc/llvm-project/openmp/trunk/LICENSE.txt?rev=219214&r1=219213&r2=219214&view=diff
> ==============================================================================
> --- openmp/trunk/LICENSE.txt (original)
> +++ openmp/trunk/LICENSE.txt Tue Oct 7 11:25:50 2014
> @@ -14,7 +14,7 @@ software contained in this directory tre
> University of Illinois/NCSA
> Open Source License
>
> -Copyright (c) 1997-2013 Intel Corporation
> +Copyright (c) 1997-2014 Intel Corporation
These things, and the license headers, should really be committed separately. There are several different ways to separate a patch file into separate commits (and at least several of us here who have experience doing surgery on patches). Feel free to ask for advice (might as well do it on the dev list: it is a common problem), and you shall receive it.
Thanks again,
Hal
>
> All rights reserved.
>
> @@ -51,7 +51,7 @@ SOFTWARE.
>
> ==============================================================================
>
> -Copyright (c) 1997-2013 Intel Corporation
> +Copyright (c) 1997-2014 Intel Corporation
>
> Permission is hereby granted, free of charge, to any person
> obtaining a copy
> of this software and associated documentation files (the
> "Software"), to deal
>
> Modified: openmp/trunk/runtime/Build_With_CMake.txt
> URL:
> http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/Build_With_CMake.txt?rev=219214&r1=219213&r2=219214&view=diff
> ==============================================================================
> --- openmp/trunk/runtime/Build_With_CMake.txt (original)
> +++ openmp/trunk/runtime/Build_With_CMake.txt Tue Oct 7 11:25:50
> 2014
> @@ -137,8 +137,7 @@ libiomp5 version can be 5 or 4.
> OpenMP version can be either 40 or 30.
>
> -Dmic_arch=knc|knf
> -Intel(R) MIC Architecture. Can be
> -knf (Knights Ferry) or knc (Knights Corner).
> +Intel(R) MIC Architecture, can be knf or knc.
> This value is ignored if os != mic
>
> -Dmic_os=lin|bsd
>
> Modified: openmp/trunk/runtime/CMakeLists.txt
> URL:
> http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/CMakeLists.txt?rev=219214&r1=219213&r2=219214&view=diff
> ==============================================================================
> --- openmp/trunk/runtime/CMakeLists.txt (original)
> +++ openmp/trunk/runtime/CMakeLists.txt Tue Oct 7 11:25:50 2014
> @@ -238,8 +238,18 @@ set(USE_BUILDPL_RULES false CACHE BOOL "
> # - these predefined linker flags should work for Windows, Mac, and
> True Linux for the most popular compilers/linkers
> set(USE_PREDEFINED_LINKER_FLAGS true CACHE BOOL "Should the build
> use the predefined linker flags in CommonFlags.cmake?")
>
> +# - On multinode systems, larger alignment is desired to avoid false
> sharing
> +set(USE_INTERNODE_ALIGNMENT false CACHE BOOL "Should larger
> alignment (4096 bytes) be used for some locks and data structures?")
> +
> +# - libgomp drop-in compatibility
> +if(${LINUX} AND NOT ${PPC64})
> + set(USE_VERSION_SYMBOLS true CACHE BOOL "Should version symbols
> be used? These provide binary compatibility with libgomp.")
> +else()
> + set(USE_VERSION_SYMBOLS false CACHE BOOL "Should version symbols
> be used? These provide binary compatibility with libgomp.")
> +endif()
> +
> # - TSX based locks have __asm code which can be troublesome for
> some compilers. This feature is also x86 specific.
> -if({${IA32} OR ${INTEL64})
> +if(${IA32} OR ${INTEL64})
> set(USE_ADAPTIVE_LOCKS true CACHE BOOL "Should TSX-based lock be
> compiled (adaptive lock in kmp_lock.cpp). These are x86
> specific.")
> else()
> set(USE_ADAPTIVE_LOCKS false CACHE BOOL "Should TSX-based lock
> be compiled (adaptive lock in kmp_lock.cpp). These are x86
> specific.")
>
> Modified: openmp/trunk/runtime/README.txt
> URL:
> http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/README.txt?rev=219214&r1=219213&r2=219214&view=diff
> ==============================================================================
> --- openmp/trunk/runtime/README.txt (original)
> +++ openmp/trunk/runtime/README.txt Tue Oct 7 11:25:50 2014
> @@ -37,7 +37,7 @@ omp_root: The path to the top-level d
> current working directory.
>
> omp_os: Operating system. By default, the build will attempt
> to
> - detect this. Currently supports "linux", "freebsd", "macos",
> and
> + detect this. Currently supports "linux", "freebsd", "macos",
> and
> "windows".
>
> arch: Architecture. By default, the build will attempt to
> @@ -72,36 +72,44 @@ There is also an experimental CMake buil
> supported for production use and resulting binaries have not been
> checked
> for compatibility.
>
> +On OS X* machines, it is possible to build universal (or fat)
> libraries which
> +include both IA-32 architecture and Intel(R) 64 architecture objects
> in a
> +single archive; just build the 32 and 32e libraries separately, then
> invoke
> +make again with a special argument as follows:
> +
> +make compiler=clang build_args=fat
> +
> Supported RTL Build Configurations
> ==================================
>
> Supported Architectures: IA-32 architecture, Intel(R) 64, and
> Intel(R) Many Integrated Core Architecture
>
> - --------------------------------------------
> - | icc/icl | gcc | clang |
> ---------------|---------------|--------------------------|
> -| Linux* OS | Yes(1,5) | Yes(2,4) | Yes(4,6,7) |
> -| FreeBSD* | No | No | Yes(4,6,7) |
> -| OS X* | Yes(1,3,4) | No | Yes(4,6,7) |
> -| Windows* OS | Yes(1,4) | No | No |
> -----------------------------------------------------------
> + ----------------------------------------------
> + | icc/icl | gcc | clang |
> +--------------|---------------|----------------------------|
> +| Linux* OS | Yes(1,5) | Yes(2,4) | Yes(4,6,7) |
> +| FreeBSD* | No | No | Yes(4,6,7,8) |
> +| OS X* | Yes(1,3,4) | No | Yes(4,6,7) |
> +| Windows* OS | Yes(1,4) | No | No |
> +------------------------------------------------------------
>
> (1) On IA-32 architecture and Intel(R) 64, icc/icl versions 12.x are
> supported (12.1 is recommended).
> -(2) gcc version 4.6.2 is supported.
> +(2) GCC* version 4.6.2 is supported.
> (3) For icc on OS X*, OS X* version 10.5.8 is supported.
> (4) Intel(R) Many Integrated Core Architecture not supported.
> (5) On Intel(R) Many Integrated Core Architecture, icc/icl versions
> 13.0
> or later are required.
> -(6) clang version 3.3 is supported.
> -(7) clang currently does not offer a software-implemented 128 bit
> extended
> +(6) Clang* version 3.3 is supported.
> +(7) Clang* currently does not offer a software-implemented 128 bit
> extended
> precision type. Thus, all entry points reliant on this type are
> removed
> from the library and cannot be called in the user program. The
> following
> functions are not available:
> __kmpc_atomic_cmplx16_*
> __kmpc_atomic_float16_*
> __kmpc_atomic_*_fp
> +(8) Community contribution provided AS IS, not tested by Intel.
>
> Front-end Compilers that work with this RTL
> ===========================================
>
> Modified: openmp/trunk/runtime/cmake/BuildPLRules.cmake
> URL:
> http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/cmake/BuildPLRules.cmake?rev=219214&r1=219213&r2=219214&view=diff
> ==============================================================================
> --- openmp/trunk/runtime/cmake/BuildPLRules.cmake (original)
> +++ openmp/trunk/runtime/cmake/BuildPLRules.cmake Tue Oct 7 11:25:50
> 2014
> @@ -1,3 +1,14 @@
> +#
> +#//===----------------------------------------------------------------------===//
> +#//
> +#// The LLVM Compiler Infrastructure
> +#//
> +#// This file is dual licensed under the MIT and the University of
> Illinois Open
> +#// Source Licenses. See LICENSE.txt for details.
> +#//
> +#//===----------------------------------------------------------------------===//
> +#
> +
> ###############################################################################
> # This file contains additional build rules that correspond to
> build.pl's rules
> # Building libiomp5.dbg is linux only, Windows will build
> libiomp5md.dll.pdb
>
> Modified: openmp/trunk/runtime/cmake/Clang/AsmFlags.cmake
> URL:
> http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/cmake/Clang/AsmFlags.cmake?rev=219214&r1=219213&r2=219214&view=diff
> ==============================================================================
> --- openmp/trunk/runtime/cmake/Clang/AsmFlags.cmake (original)
> +++ openmp/trunk/runtime/cmake/Clang/AsmFlags.cmake Tue Oct 7
> 11:25:50 2014
> @@ -1,3 +1,14 @@
> +#
> +#//===----------------------------------------------------------------------===//
> +#//
> +#// The LLVM Compiler Infrastructure
> +#//
> +#// This file is dual licensed under the MIT and the University of
> Illinois Open
> +#// Source Licenses. See LICENSE.txt for details.
> +#//
> +#//===----------------------------------------------------------------------===//
> +#
> +
> # This file holds Clang (clang/clang++) specific compiler dependent
> flags
> # The flag types are:
> # 1) Assembly flags
>
> Modified: openmp/trunk/runtime/cmake/Clang/CFlags.cmake
> URL:
> http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/cmake/Clang/CFlags.cmake?rev=219214&r1=219213&r2=219214&view=diff
> ==============================================================================
> --- openmp/trunk/runtime/cmake/Clang/CFlags.cmake (original)
> +++ openmp/trunk/runtime/cmake/Clang/CFlags.cmake Tue Oct 7 11:25:50
> 2014
> @@ -1,3 +1,14 @@
> +#
> +#//===----------------------------------------------------------------------===//
> +#//
> +#// The LLVM Compiler Infrastructure
> +#//
> +#// This file is dual licensed under the MIT and the University of
> Illinois Open
> +#// Source Licenses. See LICENSE.txt for details.
> +#//
> +#//===----------------------------------------------------------------------===//
> +#
> +
> # This file holds Clang (clang/clang++) specific compiler dependent
> flags
> # The flag types are:
> # 1) C/C++ Compiler flags
> @@ -19,6 +30,7 @@ function(append_compiler_specific_c_and_
> endif()
> append_c_and_cxx_flags("-Wno-unused-value") # Don't warn about
> unused values
> append_c_and_cxx_flags("-Wno-switch") # Don't warn about switch
> statements that don't cover entire range of values
> + append_c_and_cxx_flags("-Wno-deprecated-register") # Don't warn
> about using register keyword
> set(${input_c_flags} ${${input_c_flags}} "${local_c_flags}"
> PARENT_SCOPE)
> set(${input_cxx_flags} ${${input_cxx_flags}}
> "${local_cxx_flags}" PARENT_SCOPE)
> endfunction()
>
> Modified: openmp/trunk/runtime/cmake/CommonFlags.cmake
> URL:
> http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/cmake/CommonFlags.cmake?rev=219214&r1=219213&r2=219214&view=diff
> ==============================================================================
> --- openmp/trunk/runtime/cmake/CommonFlags.cmake (original)
> +++ openmp/trunk/runtime/cmake/CommonFlags.cmake Tue Oct 7 11:25:50
> 2014
> @@ -1,3 +1,14 @@
> +#
> +#//===----------------------------------------------------------------------===//
> +#//
> +#// The LLVM Compiler Infrastructure
> +#//
> +#// This file is dual licensed under the MIT and the University of
> Illinois Open
> +#// Source Licenses. See LICENSE.txt for details.
> +#//
> +#//===----------------------------------------------------------------------===//
> +#
> +
> # This file holds the common flags independent of compiler
> # The flag types are:
> # 1) Assembly flags (append_asm_flags_common)
> @@ -71,22 +82,21 @@ function(append_linker_flags_common inpu
> set(local_ld_flags)
> set(local_ld_flags_libs)
>
> - #################################
> - # Windows linker flags
> - if(${WINDOWS})
> -
> - ##################
> - # MAC linker flags
> - elseif(${MAC})
> - if(${USE_PREDEFINED_LINKER_FLAGS})
> + if(${USE_PREDEFINED_LINKER_FLAGS})
> +
> + #################################
> + # Windows linker flags
> + if(${WINDOWS})
> +
> + ##################
> + # MAC linker flags
> + elseif(${MAC})
> append_linker_flags("-single_module")
> append_linker_flags("-current_version ${version}.0")
> append_linker_flags("-compatibility_version
> ${version}.0")
> - endif()
> -
> #####################################################################################
> - # Intel(R) Many Integrated Core Architecture (Intel(R) MIC
> Architecture) linker flags
> - elseif(${MIC})
> - if(${USE_PREDEFINED_LINKER_FLAGS})
> +
> #####################################################################################
> + # Intel(R) Many Integrated Core Architecture (Intel(R) MIC
> Architecture) linker flags
> + elseif(${MIC})
> append_linker_flags("-Wl,-x")
> append_linker_flags("-Wl,--warn-shared-textrel") # Warn
> if the linker adds a DT_TEXTREL to a shared object.
> append_linker_flags("-Wl,--as-needed")
> @@ -98,13 +108,11 @@ function(append_linker_flags_common inpu
> if(${STATS_GATHERING})
> append_linker_flags_library("-Wl,-lstdc++") # link
> in standard c++ library (stats-gathering needs it)
> endif()
> - endif()
> - #########################
> - # Unix based linker flags
> - else()
> - # For now, always include --version-script flag on Unix
> systems.
> -
> append_linker_flags("-Wl,--version-script=${src_dir}/exports_so.txt")
> # Use exports_so.txt as version script to create versioned symbols
> for ELF libraries
> - if(${USE_PREDEFINED_LINKER_FLAGS})
> + #########################
> + # Unix based linker flags
> + else()
> + # For now, always include --version-script flag on Unix
> systems.
> +
> append_linker_flags("-Wl,--version-script=${src_dir}/exports_so.txt")
> # Use exports_so.txt as version script to create versioned symbols
> for ELF libraries
> append_linker_flags("-Wl,-z,noexecstack") # Marks the
> object as not requiring executable stack.
> append_linker_flags("-Wl,--as-needed") # Only adds
> library dependencies as they are needed. (if libiomp5
> actually uses a function from the library, then add it)
> if(NOT ${STUBS_LIBRARY})
> @@ -117,8 +125,9 @@ function(append_linker_flags_common inpu
> append_linker_flags_library("-Wl,-ldl") # link
> in libdl (dynamic loader library)
> endif()
> endif()
> - endif() # if(${USE_PREDEFINED_LINKER_FLAGS})
> - endif() # if(${OPERATING_SYSTEM}) ...
> + endif() # if(${OPERATING_SYSTEM}) ...
> +
> + endif() # USE_PREDEFINED_LINKER_FLAGS
>
> set(${input_ld_flags} "${${input_ld_flags}}"
> "${local_ld_flags}" "${USER_LD_FLAGS}"
> PARENT_SCOPE)
> set(${input_ld_flags_libs} "${${input_ld_flags_libs}}"
> "${local_ld_flags_libs}" "${USER_LD_LIB_FLAGS}" PARENT_SCOPE)
>
> Modified: openmp/trunk/runtime/cmake/Definitions.cmake
> URL:
> http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/cmake/Definitions.cmake?rev=219214&r1=219213&r2=219214&view=diff
> ==============================================================================
> --- openmp/trunk/runtime/cmake/Definitions.cmake (original)
> +++ openmp/trunk/runtime/cmake/Definitions.cmake Tue Oct 7 11:25:50
> 2014
> @@ -42,6 +42,10 @@ function(append_cpp_flags input_cpp_flag
> endif()
> append_definitions("-D INTEL_ITTNOTIFY_PREFIX=__kmp_itt_")
>
> + if(${USE_VERSION_SYMBOLS})
> + append_definitions("-D KMP_USE_VERSION_SYMBOLS")
> + endif()
> +
> #####################
> # Windows definitions
> if(${WINDOWS})
> @@ -133,6 +137,11 @@ function(append_cpp_flags input_cpp_flag
> append_definitions("-D KMP_USE_ADAPTIVE_LOCKS=0")
> append_definitions("-D KMP_DEBUG_ADAPTIVE_LOCKS=0")
> endif()
> + if(${USE_INTERNODE_ALIGNMENT})
> + append_definitions("-D KMP_USE_INTERNODE_ALIGNMENT=1")
> + else()
> + append_definitions("-D KMP_USE_INTERNODE_ALIGNMENT=0")
> + endif()
> set(${input_cpp_flags} "${${input_cpp_flags}}"
> "${local_cpp_flags}" "${USER_CPP_FLAGS}" "$ENV{CPPFLAGS}"
> PARENT_SCOPE)
> endfunction()
>
>
> Modified: openmp/trunk/runtime/cmake/GNU/AsmFlags.cmake
> URL:
> http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/cmake/GNU/AsmFlags.cmake?rev=219214&r1=219213&r2=219214&view=diff
> ==============================================================================
> --- openmp/trunk/runtime/cmake/GNU/AsmFlags.cmake (original)
> +++ openmp/trunk/runtime/cmake/GNU/AsmFlags.cmake Tue Oct 7 11:25:50
> 2014
> @@ -1,3 +1,14 @@
> +#
> +#//===----------------------------------------------------------------------===//
> +#//
> +#// The LLVM Compiler Infrastructure
> +#//
> +#// This file is dual licensed under the MIT and the University of
> Illinois Open
> +#// Source Licenses. See LICENSE.txt for details.
> +#//
> +#//===----------------------------------------------------------------------===//
> +#
> +
> # This file holds GNU (gcc/g++) specific compiler dependent flags
> # The flag types are:
> # 1) Assembly flags
>
> Modified: openmp/trunk/runtime/cmake/GNU/CFlags.cmake
> URL:
> http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/cmake/GNU/CFlags.cmake?rev=219214&r1=219213&r2=219214&view=diff
> ==============================================================================
> --- openmp/trunk/runtime/cmake/GNU/CFlags.cmake (original)
> +++ openmp/trunk/runtime/cmake/GNU/CFlags.cmake Tue Oct 7 11:25:50
> 2014
> @@ -1,3 +1,14 @@
> +#
> +#//===----------------------------------------------------------------------===//
> +#//
> +#// The LLVM Compiler Infrastructure
> +#//
> +#// This file is dual licensed under the MIT and the University of
> Illinois Open
> +#// Source Licenses. See LICENSE.txt for details.
> +#//
> +#//===----------------------------------------------------------------------===//
> +#
> +
> # This file holds GNU (gcc/g++) specific compiler dependent flags
> # The flag types are:
> # 2) C/C++ Compiler flags
>
> Modified: openmp/trunk/runtime/cmake/GNU/FortranFlags.cmake
> URL:
> http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/cmake/GNU/FortranFlags.cmake?rev=219214&r1=219213&r2=219214&view=diff
> ==============================================================================
> --- openmp/trunk/runtime/cmake/GNU/FortranFlags.cmake (original)
> +++ openmp/trunk/runtime/cmake/GNU/FortranFlags.cmake Tue Oct 7
> 11:25:50 2014
> @@ -1,3 +1,14 @@
> +#
> +#//===----------------------------------------------------------------------===//
> +#//
> +#// The LLVM Compiler Infrastructure
> +#//
> +#// This file is dual licensed under the MIT and the University of
> Illinois Open
> +#// Source Licenses. See LICENSE.txt for details.
> +#//
> +#//===----------------------------------------------------------------------===//
> +#
> +
> # This file holds GNU (gcc/g++) specific compiler dependent flags
> # The flag types are:
> # 1) Fortran Compiler flags
>
> Modified: openmp/trunk/runtime/cmake/Intel/AsmFlags.cmake
> URL:
> http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/cmake/Intel/AsmFlags.cmake?rev=219214&r1=219213&r2=219214&view=diff
> ==============================================================================
> --- openmp/trunk/runtime/cmake/Intel/AsmFlags.cmake (original)
> +++ openmp/trunk/runtime/cmake/Intel/AsmFlags.cmake Tue Oct 7
> 11:25:50 2014
> @@ -1,3 +1,14 @@
> +#
> +#//===----------------------------------------------------------------------===//
> +#//
> +#// The LLVM Compiler Infrastructure
> +#//
> +#// This file is dual licensed under the MIT and the University of
> Illinois Open
> +#// Source Licenses. See LICENSE.txt for details.
> +#//
> +#//===----------------------------------------------------------------------===//
> +#
> +
> # This file holds Intel(R) C Compiler / Intel(R) C++ Compiler /
> Intel(R) Fortran Compiler (icc/icpc/icl.exe/ifort) dependent flags
> # The flag types are:
> # 1) Assembly flags
>
> Modified: openmp/trunk/runtime/cmake/Intel/CFlags.cmake
> URL:
> http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/cmake/Intel/CFlags.cmake?rev=219214&r1=219213&r2=219214&view=diff
> ==============================================================================
> --- openmp/trunk/runtime/cmake/Intel/CFlags.cmake (original)
> +++ openmp/trunk/runtime/cmake/Intel/CFlags.cmake Tue Oct 7 11:25:50
> 2014
> @@ -1,3 +1,14 @@
> +#
> +#//===----------------------------------------------------------------------===//
> +#//
> +#// The LLVM Compiler Infrastructure
> +#//
> +#// This file is dual licensed under the MIT and the University of
> Illinois Open
> +#// Source Licenses. See LICENSE.txt for details.
> +#//
> +#//===----------------------------------------------------------------------===//
> +#
> +
> # This file holds Intel(R) C Compiler / Intel(R) C++ Compiler /
> Intel(R) Fortran Compiler (icc/icpc/icl.exe/ifort) dependent flags
> # The flag types are:
> # 2) C/C++ Compiler flags
> @@ -41,7 +52,6 @@ function(append_compiler_specific_c_and_
> endif()
> else()
> append_c_and_cxx_flags("-Wsign-compare") # warn on sign
> comparisons
> - append_c_and_cxx_flags("-Werror") # Changes all warnings to
> errors.
> append_c_and_cxx_flags("-Qoption,cpp,--extended_float_types")
> # Enabled _Quad type.
> append_c_and_cxx_flags("-fno-exceptions") # Exception
> handling table generation is disabled.
> append_c_and_cxx_flags("-x c++") # Compile C files as C++
> files
>
> Modified: openmp/trunk/runtime/cmake/Intel/FortranFlags.cmake
> URL:
> http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/cmake/Intel/FortranFlags.cmake?rev=219214&r1=219213&r2=219214&view=diff
> ==============================================================================
> --- openmp/trunk/runtime/cmake/Intel/FortranFlags.cmake (original)
> +++ openmp/trunk/runtime/cmake/Intel/FortranFlags.cmake Tue Oct 7
> 11:25:50 2014
> @@ -1,3 +1,14 @@
> +#
> +#//===----------------------------------------------------------------------===//
> +#//
> +#// The LLVM Compiler Infrastructure
> +#//
> +#// This file is dual licensed under the MIT and the University of
> Illinois Open
> +#// Source Licenses. See LICENSE.txt for details.
> +#//
> +#//===----------------------------------------------------------------------===//
> +#
> +
> # This file holds Intel(R) C Compiler / Intel(R) C++ Compiler /
> Intel(R) Fortran Compiler (icc/icpc/icl.exe/ifort) dependent flags
> # The flag types are:
> # 1) Fortran Compiler flags
> @@ -17,12 +28,20 @@ function(append_fortran_compiler_specifi
> append_fort_flags("-GS")
> append_fort_flags("-DynamicBase")
> append_fort_flags("-Zi")
> + # On Linux and Windows Intel(R) 64 architecture we need
> offload attribute
> + # for all Fortran entries in order to support OpenMP
> function calls inside device contructs
> + if(${INTEL64})
> + append_fort_flags("/Qoffload-attribute-target:mic")
> + endif()
> else()
> if(${MIC})
> append_fort_flags("-mmic")
> endif()
> if(NOT ${MAC})
> append_fort_flags("-sox")
> + if(${INTEL64} AND ${LINUX})
> + append_fort_flags("-offload-attribute-target=mic")
> + endif()
> endif()
> endif()
> set(${input_fort_flags} ${${input_fort_flags}}
> "${local_fort_flags}" PARENT_SCOPE)
>
> Modified: openmp/trunk/runtime/cmake/MSVC/AsmFlags.cmake
> URL:
> http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/cmake/MSVC/AsmFlags.cmake?rev=219214&r1=219213&r2=219214&view=diff
> ==============================================================================
> --- openmp/trunk/runtime/cmake/MSVC/AsmFlags.cmake (original)
> +++ openmp/trunk/runtime/cmake/MSVC/AsmFlags.cmake Tue Oct 7
> 11:25:50 2014
> @@ -1,3 +1,14 @@
> +#
> +#//===----------------------------------------------------------------------===//
> +#//
> +#// The LLVM Compiler Infrastructure
> +#//
> +#// This file is dual licensed under the MIT and the University of
> Illinois Open
> +#// Source Licenses. See LICENSE.txt for details.
> +#//
> +#//===----------------------------------------------------------------------===//
> +#
> +
> # This file holds Microsoft Visual Studio dependent flags
> # The flag types are:
> # 1) Assembly flags
>
> Modified: openmp/trunk/runtime/cmake/MSVC/CFlags.cmake
> URL:
> http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/cmake/MSVC/CFlags.cmake?rev=219214&r1=219213&r2=219214&view=diff
> ==============================================================================
> --- openmp/trunk/runtime/cmake/MSVC/CFlags.cmake (original)
> +++ openmp/trunk/runtime/cmake/MSVC/CFlags.cmake Tue Oct 7 11:25:50
> 2014
> @@ -1,3 +1,14 @@
> +#
> +#//===----------------------------------------------------------------------===//
> +#//
> +#// The LLVM Compiler Infrastructure
> +#//
> +#// This file is dual licensed under the MIT and the University of
> Illinois Open
> +#// Source Licenses. See LICENSE.txt for details.
> +#//
> +#//===----------------------------------------------------------------------===//
> +#
> +
> # This file holds Microsoft Visual Studio dependent flags
> # The flag types are:
> # 1) C/C++ Compiler flags
>
> Modified: openmp/trunk/runtime/cmake/MicroTests.cmake
> URL:
> http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/cmake/MicroTests.cmake?rev=219214&r1=219213&r2=219214&view=diff
> ==============================================================================
> --- openmp/trunk/runtime/cmake/MicroTests.cmake (original)
> +++ openmp/trunk/runtime/cmake/MicroTests.cmake Tue Oct 7 11:25:50
> 2014
> @@ -1,3 +1,14 @@
> +#
> +#//===----------------------------------------------------------------------===//
> +#//
> +#// The LLVM Compiler Infrastructure
> +#//
> +#// This file is dual licensed under the MIT and the University of
> Illinois Open
> +#// Source Licenses. See LICENSE.txt for details.
> +#//
> +#//===----------------------------------------------------------------------===//
> +#
> +
> ######################################################
> # MICRO TESTS
> # The following micro-tests are small tests to perform on
> @@ -219,15 +230,14 @@ if(${test_deps} AND ${tests})
> set(td_exp libc.so.7 libthr.so.3 libunwind.so.5)
> elseif(${LINUX})
> set(td_exp libdl.so.2,libgcc_s.so.1)
> - if(NOT ${IA32} AND NOT ${INTEL64})
> - set(td_exp ${td_exp},libffi.so.6,libffi.so.5)
> - endif()
> if(${IA32})
> set(td_exp ${td_exp},libc.so.6,ld-linux.so.2)
> elseif(${INTEL64})
> set(td_exp ${td_exp},libc.so.6,ld-linux-x86-64.so.2)
> elseif(${ARM})
> - set(td_exp ${td_exp},libc.so.6,ld-linux-armhf.so.3)
> + set(td_exp
> ${td_exp},libffi.so.6,libffi.so.5,libc.so.6,ld-linux-armhf.so.3)
> + elseif(${PPC64})
> + set(td_exp ${td_exp},libc.so.6,ld64.so.1)
> endif()
> if(${STD_CPP_LIB})
> set(td_exp ${td_exp},libstdc++.so.6)
>
> Modified: openmp/trunk/runtime/cmake/SourceFiles.cmake
> URL:
> http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/cmake/SourceFiles.cmake?rev=219214&r1=219213&r2=219214&view=diff
> ==============================================================================
> --- openmp/trunk/runtime/cmake/SourceFiles.cmake (original)
> +++ openmp/trunk/runtime/cmake/SourceFiles.cmake Tue Oct 7 11:25:50
> 2014
> @@ -69,7 +69,8 @@ endfunction()
> function(set_cpp_files input_cpp_source_files)
> set(local_cpp_source_files "")
> if(NOT ${STUBS_LIBRARY})
> - #append_cpp_source_file("kmp_barrier.cpp")
> + append_cpp_source_file("kmp_barrier.cpp")
> + append_cpp_source_file("kmp_wait_release.cpp")
> append_cpp_source_file("kmp_affinity.cpp")
> append_cpp_source_file("kmp_dispatch.cpp")
> append_cpp_source_file("kmp_lock.cpp")
> @@ -78,10 +79,10 @@ function(set_cpp_files input_cpp_source_
> append_cpp_source_file("kmp_taskdeps.cpp")
> append_cpp_source_file("kmp_cancel.cpp")
> endif()
> - #if(${STATS_GATHERING})
> - # append_cpp_source_file("kmp_stats.cpp")
> - # append_cpp_source_file("kmp_stats_timing.cpp")
> - #endif()
> + if(${STATS_GATHERING})
> + append_cpp_source_file("kmp_stats.cpp")
> + append_cpp_source_file("kmp_stats_timing.cpp")
> + endif()
> endif()
>
> set(${input_cpp_source_files} "${local_cpp_source_files}"
> PARENT_SCOPE)
>
>
> _______________________________________________
> Openmp-commits mailing list
> Openmp-commits at dcs-maillist2.engr.illinois.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/openmp-commits
>
--
Hal Finkel
Assistant Computational Scientist
Leadership Computing Facility
Argonne National Laboratory
More information about the Openmp-commits
mailing list