diff options
Diffstat (limited to 'openmp/runtime/src')
66 files changed, 42 insertions, 182 deletions
diff --git a/openmp/runtime/src/extractExternal.cpp b/openmp/runtime/src/extractExternal.cpp index d8c4901bd5d..ba20373a6a4 100644 --- a/openmp/runtime/src/extractExternal.cpp +++ b/openmp/runtime/src/extractExternal.cpp @@ -2,7 +2,6 @@ * extractExternal.cpp */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #include <fstream> #include <iostream> #include <map> diff --git a/openmp/runtime/src/kmp.h b/openmp/runtime/src/kmp.h index c4f6d91795a..cafe182ec87 100644 --- a/openmp/runtime/src/kmp.h +++ b/openmp/runtime/src/kmp.h @@ -3,7 +3,6 @@ * kmp.h -- KPTS runtime header file. */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -13,7 +12,6 @@ // //===----------------------------------------------------------------------===// - #ifndef KMP_H #define KMP_H diff --git a/openmp/runtime/src/kmp_affinity.cpp b/openmp/runtime/src/kmp_affinity.cpp index f010a257530..1964ea714c0 100644 --- a/openmp/runtime/src/kmp_affinity.cpp +++ b/openmp/runtime/src/kmp_affinity.cpp @@ -2,7 +2,6 @@ * kmp_affinity.cpp -- affinity management */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #include "kmp.h" #include "kmp_affinity.h" #include "kmp_i18n.h" @@ -25,7 +23,6 @@ static hierarchy_info machine_hierarchy; void __kmp_cleanup_hierarchy() { machine_hierarchy.fini(); } - void __kmp_get_hierarchy(kmp_uint32 nproc, kmp_bstate_t *thr_bar) { kmp_uint32 depth; // The test below is true if affinity is available, but set to "none". Need to diff --git a/openmp/runtime/src/kmp_affinity.h b/openmp/runtime/src/kmp_affinity.h index ae749c1b80e..e89016591ba 100644 --- a/openmp/runtime/src/kmp_affinity.h +++ b/openmp/runtime/src/kmp_affinity.h @@ -2,7 +2,6 @@ * kmp_affinity.h -- header for affinity management */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #ifndef KMP_AFFINITY_H #define KMP_AFFINITY_H diff --git a/openmp/runtime/src/kmp_alloc.cpp b/openmp/runtime/src/kmp_alloc.cpp index 987425511fb..8d584f78e4b 100644 --- a/openmp/runtime/src/kmp_alloc.cpp +++ b/openmp/runtime/src/kmp_alloc.cpp @@ -2,7 +2,6 @@ * kmp_alloc.cpp -- private/shared dynamic memory allocation and management */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #include "kmp.h" #include "kmp_io.h" #include "kmp_wrapper_malloc.h" diff --git a/openmp/runtime/src/kmp_atomic.cpp b/openmp/runtime/src/kmp_atomic.cpp index f870e308e13..b099eb6ec99 100644 --- a/openmp/runtime/src/kmp_atomic.cpp +++ b/openmp/runtime/src/kmp_atomic.cpp @@ -2,7 +2,6 @@ * kmp_atomic.cpp -- ATOMIC implementation routines */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #include "kmp_atomic.h" #include "kmp.h" // TRUE, asm routines prototypes diff --git a/openmp/runtime/src/kmp_atomic.h b/openmp/runtime/src/kmp_atomic.h index 77ad3aef01b..7037ff45de2 100644 --- a/openmp/runtime/src/kmp_atomic.h +++ b/openmp/runtime/src/kmp_atomic.h @@ -2,7 +2,6 @@ * kmp_atomic.h - ATOMIC header file */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #ifndef KMP_ATOMIC_H #define KMP_ATOMIC_H diff --git a/openmp/runtime/src/kmp_barrier.cpp b/openmp/runtime/src/kmp_barrier.cpp index cd0dc58426d..93e3fb87081 100644 --- a/openmp/runtime/src/kmp_barrier.cpp +++ b/openmp/runtime/src/kmp_barrier.cpp @@ -2,7 +2,6 @@ * kmp_barrier.cpp */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,14 +11,12 @@ // //===----------------------------------------------------------------------===// - #include "kmp.h" #include "kmp_wait_release.h" #include "kmp_itt.h" #include "kmp_os.h" #include "kmp_stats.h" - #if KMP_MIC #include <immintrin.h> #define USE_NGO_STORES 1 @@ -87,8 +84,7 @@ static void __kmp_linear_barrier_gather( int nproc = this_thr->th.th_team_nproc; int i; // Don't have to worry about sleep bit here or atomic since team setting - kmp_uint64 new_state = - team_bar->b_arrived + KMP_BARRIER_STATE_BUMP; + kmp_uint64 new_state = team_bar->b_arrived + KMP_BARRIER_STATE_BUMP; // Collect all the worker team member threads. for (i = 1; i < nproc; ++i) { diff --git a/openmp/runtime/src/kmp_cancel.cpp b/openmp/runtime/src/kmp_cancel.cpp index f680d1ac97c..efc67fcb57f 100644 --- a/openmp/runtime/src/kmp_cancel.cpp +++ b/openmp/runtime/src/kmp_cancel.cpp @@ -8,7 +8,6 @@ // //===----------------------------------------------------------------------===// - #include "kmp.h" #include "kmp_i18n.h" #include "kmp_io.h" diff --git a/openmp/runtime/src/kmp_csupport.cpp b/openmp/runtime/src/kmp_csupport.cpp index ba721efda47..585e9618ba0 100644 --- a/openmp/runtime/src/kmp_csupport.cpp +++ b/openmp/runtime/src/kmp_csupport.cpp @@ -2,7 +2,6 @@ * kmp_csupport.cpp -- kfront linkage support for OpenMP. */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #include "omp.h" /* extern "C" declarations of user-visible routines */ #include "kmp.h" #include "kmp_error.h" diff --git a/openmp/runtime/src/kmp_debug.cpp b/openmp/runtime/src/kmp_debug.cpp index b0da90aa2bd..50d3876abf8 100644 --- a/openmp/runtime/src/kmp_debug.cpp +++ b/openmp/runtime/src/kmp_debug.cpp @@ -2,7 +2,6 @@ * kmp_debug.cpp -- debug utilities for the Guide library */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #include "kmp.h" #include "kmp_debug.h" /* really necessary? */ #include "kmp_i18n.h" diff --git a/openmp/runtime/src/kmp_debug.h b/openmp/runtime/src/kmp_debug.h index 9080a4a9efe..1382dfe4e31 100644 --- a/openmp/runtime/src/kmp_debug.h +++ b/openmp/runtime/src/kmp_debug.h @@ -2,7 +2,6 @@ * kmp_debug.h -- debug / assertion code for Assure library */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #ifndef KMP_DEBUG_H #define KMP_DEBUG_H diff --git a/openmp/runtime/src/kmp_debugger.cpp b/openmp/runtime/src/kmp_debugger.cpp index c4f373ea402..3484f7a01d0 100644 --- a/openmp/runtime/src/kmp_debugger.cpp +++ b/openmp/runtime/src/kmp_debugger.cpp @@ -3,7 +3,6 @@ * kmp_debugger.cpp -- debugger support. */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -13,7 +12,6 @@ // //===----------------------------------------------------------------------===// - #include "kmp.h" #include "kmp_lock.h" #include "kmp_omp.h" diff --git a/openmp/runtime/src/kmp_debugger.h b/openmp/runtime/src/kmp_debugger.h index 4713d880feb..6c747b2c824 100644 --- a/openmp/runtime/src/kmp_debugger.h +++ b/openmp/runtime/src/kmp_debugger.h @@ -3,7 +3,6 @@ * kmp_debugger.h -- debugger support. */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -13,7 +12,6 @@ // //===----------------------------------------------------------------------===// - #ifndef KMP_DEBUGGER_H #define KMP_DEBUGGER_H diff --git a/openmp/runtime/src/kmp_dispatch.cpp b/openmp/runtime/src/kmp_dispatch.cpp index 359b370b43a..9a57613d844 100644 --- a/openmp/runtime/src/kmp_dispatch.cpp +++ b/openmp/runtime/src/kmp_dispatch.cpp @@ -2,7 +2,6 @@ * kmp_dispatch.cpp: dynamic scheduling - iteration initialization and dispatch. */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - /* Dynamic scheduling initialization and dispatch. * * NOTE: __kmp_nth is a constant inside of any dispatch loop, however @@ -1978,8 +1976,8 @@ static int __kmp_dispatch_next(ident_t *loc, int gtid, kmp_int32 *p_last, pr->u.p.parm2) { // compare with K*nproc*(chunk+1), K=2 by default // use dynamic-style shcedule // atomically inrement iterations, get old value - init = test_then_add<ST>( - RCAST(volatile ST *, &sh->u.s.iteration), (ST)chunkspec); + init = test_then_add<ST>(RCAST(volatile ST *, &sh->u.s.iteration), + (ST)chunkspec); remaining = trip - init; if (remaining <= 0) { status = 0; // all iterations got by other threads @@ -2057,8 +2055,8 @@ static int __kmp_dispatch_next(ident_t *loc, int gtid, kmp_int32 *p_last, if ((T)remaining < pr->u.p.parm2) { // use dynamic-style shcedule // atomically inrement iterations, get old value - init = test_then_add<ST>( - RCAST(volatile ST *, &sh->u.s.iteration), (ST)chunk); + init = test_then_add<ST>(RCAST(volatile ST *, &sh->u.s.iteration), + (ST)chunk); remaining = trip - init; if (remaining <= 0) { status = 0; // all iterations got by other threads diff --git a/openmp/runtime/src/kmp_environment.cpp b/openmp/runtime/src/kmp_environment.cpp index efbe84e10b3..22c2941133e 100644 --- a/openmp/runtime/src/kmp_environment.cpp +++ b/openmp/runtime/src/kmp_environment.cpp @@ -2,7 +2,6 @@ * kmp_environment.cpp -- Handle environment variables OS-independently. */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - /* We use GetEnvironmentVariable for Windows* OS instead of getenv because the act of loading a DLL on Windows* OS makes any user-set environment variables (i.e. with putenv()) unavailable. getenv() apparently gets a clean copy of diff --git a/openmp/runtime/src/kmp_environment.h b/openmp/runtime/src/kmp_environment.h index 9b17079e1c7..e07c1bd97d9 100644 --- a/openmp/runtime/src/kmp_environment.h +++ b/openmp/runtime/src/kmp_environment.h @@ -2,7 +2,6 @@ * kmp_environment.h -- Handle environment varoiables OS-independently. */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #ifndef KMP_ENVIRONMENT_H #define KMP_ENVIRONMENT_H diff --git a/openmp/runtime/src/kmp_error.cpp b/openmp/runtime/src/kmp_error.cpp index caacf3da7ce..91ea7f3a88a 100644 --- a/openmp/runtime/src/kmp_error.cpp +++ b/openmp/runtime/src/kmp_error.cpp @@ -2,7 +2,6 @@ * kmp_error.cpp -- KPTS functions for error checking at runtime */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #include "kmp.h" #include "kmp_error.h" #include "kmp_i18n.h" diff --git a/openmp/runtime/src/kmp_error.h b/openmp/runtime/src/kmp_error.h index ef14122072d..e1bf8176fab 100644 --- a/openmp/runtime/src/kmp_error.h +++ b/openmp/runtime/src/kmp_error.h @@ -2,7 +2,6 @@ * kmp_error.h -- PTS functions for error checking at runtime. */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #ifndef KMP_ERROR_H #define KMP_ERROR_H diff --git a/openmp/runtime/src/kmp_ftn_cdecl.cpp b/openmp/runtime/src/kmp_ftn_cdecl.cpp index 887d8b98e39..ec8d77ee411 100644 --- a/openmp/runtime/src/kmp_ftn_cdecl.cpp +++ b/openmp/runtime/src/kmp_ftn_cdecl.cpp @@ -2,7 +2,6 @@ * kmp_ftn_cdecl.cpp -- Fortran __cdecl linkage support for OpenMP. */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #include "kmp.h" #include "kmp_affinity.h" diff --git a/openmp/runtime/src/kmp_ftn_entry.h b/openmp/runtime/src/kmp_ftn_entry.h index 819a14b09a8..fc05f6953d8 100644 --- a/openmp/runtime/src/kmp_ftn_entry.h +++ b/openmp/runtime/src/kmp_ftn_entry.h @@ -2,7 +2,6 @@ * kmp_ftn_entry.h -- Fortran entry linkage support for OpenMP. */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #ifndef FTN_STDCALL #error The support file kmp_ftn_entry.h should not be compiled by itself. #endif @@ -567,7 +565,6 @@ int FTN_STDCALL xexpand(FTN_IN_FINAL)(void) { #if OMP_40_ENABLED - kmp_proc_bind_t FTN_STDCALL xexpand(FTN_GET_PROC_BIND)(void) { #ifdef KMP_STUB return __kmps_get_proc_bind(); @@ -1091,7 +1088,6 @@ void FTN_STDCALL FTN_SET_DEFAULTS(char const *str /* ------------------------------------------------------------------------ */ - #if OMP_40_ENABLED /* returns the status of cancellation */ int FTN_STDCALL xexpand(FTN_GET_CANCELLATION)(void) { diff --git a/openmp/runtime/src/kmp_ftn_extra.cpp b/openmp/runtime/src/kmp_ftn_extra.cpp index a3f98750a62..ec27dd6e242 100644 --- a/openmp/runtime/src/kmp_ftn_extra.cpp +++ b/openmp/runtime/src/kmp_ftn_extra.cpp @@ -2,7 +2,6 @@ * kmp_ftn_extra.cpp -- Fortran 'extra' linkage support for OpenMP. */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #include "kmp.h" #include "kmp_affinity.h" diff --git a/openmp/runtime/src/kmp_ftn_os.h b/openmp/runtime/src/kmp_ftn_os.h index a204b2fd1fb..93c022894ab 100644 --- a/openmp/runtime/src/kmp_ftn_os.h +++ b/openmp/runtime/src/kmp_ftn_os.h @@ -2,7 +2,6 @@ * kmp_ftn_os.h -- KPTS Fortran defines header file. */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #ifndef KMP_FTN_OS_H #define KMP_FTN_OS_H @@ -228,7 +226,6 @@ #define FTN_IS_INITIAL_DEVICE omp_is_initial_device_ #endif - #if OMP_40_ENABLED #define FTN_GET_CANCELLATION omp_get_cancellation_ #define FTN_GET_CANCELLATION_STATUS kmp_get_cancellation_status_ @@ -347,7 +344,6 @@ #define FTN_IS_INITIAL_DEVICE OMP_IS_INITIAL_DEVICE #endif - #if OMP_40_ENABLED #define FTN_GET_CANCELLATION OMP_GET_CANCELLATION #define FTN_GET_CANCELLATION_STATUS KMP_GET_CANCELLATION_STATUS @@ -466,7 +462,6 @@ #define FTN_IS_INITIAL_DEVICE OMP_IS_INITIAL_DEVICE_ #endif - #if OMP_40_ENABLED #define FTN_GET_CANCELLATION OMP_GET_CANCELLATION_ #define FTN_GET_CANCELLATION_STATUS KMP_GET_CANCELLATION_STATUS_ diff --git a/openmp/runtime/src/kmp_ftn_stdcall.cpp b/openmp/runtime/src/kmp_ftn_stdcall.cpp index b7441b4ff95..ccf95f464ec 100644 --- a/openmp/runtime/src/kmp_ftn_stdcall.cpp +++ b/openmp/runtime/src/kmp_ftn_stdcall.cpp @@ -2,7 +2,6 @@ * kmp_ftn_stdcall.cpp -- Fortran __stdcall linkage support for OpenMP. */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #include "kmp.h" // Note: This string is not printed when KMP_VERSION=1. diff --git a/openmp/runtime/src/kmp_global.cpp b/openmp/runtime/src/kmp_global.cpp index 46587ac3bf4..f97abaa2841 100644 --- a/openmp/runtime/src/kmp_global.cpp +++ b/openmp/runtime/src/kmp_global.cpp @@ -2,7 +2,6 @@ * kmp_global.cpp -- KPTS global variables for runtime support library */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #include "kmp.h" #include "kmp_affinity.h" @@ -127,7 +125,6 @@ char const *__kmp_barrier_pattern_name[bp_last_bar] = {"linear", "tree", int __kmp_allThreadsSpecified = 0; size_t __kmp_align_alloc = CACHE_LINE; - int __kmp_generate_warnings = kmp_warnings_low; int __kmp_reserve_warn = 0; int __kmp_xproc = 0; diff --git a/openmp/runtime/src/kmp_gsupport.cpp b/openmp/runtime/src/kmp_gsupport.cpp index be9d0a21b7f..b7045cfc83e 100644 --- a/openmp/runtime/src/kmp_gsupport.cpp +++ b/openmp/runtime/src/kmp_gsupport.cpp @@ -2,7 +2,6 @@ * kmp_gsupport.cpp */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #include "kmp.h" #include "kmp_atomic.h" diff --git a/openmp/runtime/src/kmp_i18n.cpp b/openmp/runtime/src/kmp_i18n.cpp index 3035e09879e..757f3b69f7b 100644 --- a/openmp/runtime/src/kmp_i18n.cpp +++ b/openmp/runtime/src/kmp_i18n.cpp @@ -2,7 +2,6 @@ * kmp_i18n.cpp */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #include "kmp_i18n.h" #include "kmp.h" diff --git a/openmp/runtime/src/kmp_i18n.h b/openmp/runtime/src/kmp_i18n.h index d895ca2a48c..a6aedf32781 100644 --- a/openmp/runtime/src/kmp_i18n.h +++ b/openmp/runtime/src/kmp_i18n.h @@ -2,7 +2,6 @@ * kmp_i18n.h */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #ifndef KMP_I18N_H #define KMP_I18N_H diff --git a/openmp/runtime/src/kmp_import.cpp b/openmp/runtime/src/kmp_import.cpp index 94b8842bbf9..8ad7d1d1dd4 100644 --- a/openmp/runtime/src/kmp_import.cpp +++ b/openmp/runtime/src/kmp_import.cpp @@ -2,7 +2,6 @@ * kmp_import.cpp */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - /* Object generated from this source file is linked to Windows* OS DLL import library (libompmd.lib) only! It is not a part of regular static or dynamic OpenMP RTL. Any code that just needs to go in the libompmd.lib (but not in diff --git a/openmp/runtime/src/kmp_io.cpp b/openmp/runtime/src/kmp_io.cpp index 609dd18e0bb..91ebefe5ed5 100644 --- a/openmp/runtime/src/kmp_io.cpp +++ b/openmp/runtime/src/kmp_io.cpp @@ -2,7 +2,6 @@ * kmp_io.cpp -- RTL IO */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #include <stdarg.h> #include <stddef.h> #include <stdio.h> diff --git a/openmp/runtime/src/kmp_io.h b/openmp/runtime/src/kmp_io.h index 7b6e813fe4f..84ac67b9f4d 100644 --- a/openmp/runtime/src/kmp_io.h +++ b/openmp/runtime/src/kmp_io.h @@ -2,7 +2,6 @@ * kmp_io.h -- RTL IO header file. */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #ifndef KMP_IO_H #define KMP_IO_H diff --git a/openmp/runtime/src/kmp_itt.cpp b/openmp/runtime/src/kmp_itt.cpp index 313f44e997c..e815c719023 100644 --- a/openmp/runtime/src/kmp_itt.cpp +++ b/openmp/runtime/src/kmp_itt.cpp @@ -5,7 +5,6 @@ * kmp_itt.cpp -- ITT Notify interface. */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -15,7 +14,6 @@ // //===----------------------------------------------------------------------===// - #include "kmp_itt.h" #if KMP_DEBUG diff --git a/openmp/runtime/src/kmp_itt.h b/openmp/runtime/src/kmp_itt.h index 92dacd6a859..e96119476a2 100644 --- a/openmp/runtime/src/kmp_itt.h +++ b/openmp/runtime/src/kmp_itt.h @@ -3,7 +3,6 @@ * kmp_itt.h -- ITT Notify interface. */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -13,7 +12,6 @@ // //===----------------------------------------------------------------------===// - #ifndef KMP_ITT_H #define KMP_ITT_H diff --git a/openmp/runtime/src/kmp_itt.inl b/openmp/runtime/src/kmp_itt.inl index 01b1ea0c65c..65c3a81a6f3 100644 --- a/openmp/runtime/src/kmp_itt.inl +++ b/openmp/runtime/src/kmp_itt.inl @@ -3,7 +3,6 @@ * kmp_itt.inl -- Inline functions of ITT Notify. */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -13,7 +12,6 @@ // //===----------------------------------------------------------------------===// - // Inline function definitions. This file should be included into kmp_itt.h file // for production build (to let compliler inline functions) or into kmp_itt.c // file for debug build (to reduce the number of files to recompile and save diff --git a/openmp/runtime/src/kmp_lock.cpp b/openmp/runtime/src/kmp_lock.cpp index e174981aaba..1adfec641c1 100644 --- a/openmp/runtime/src/kmp_lock.cpp +++ b/openmp/runtime/src/kmp_lock.cpp @@ -2,7 +2,6 @@ * kmp_lock.cpp -- lock-related functions */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #include <stddef.h> #include <atomic> diff --git a/openmp/runtime/src/kmp_lock.h b/openmp/runtime/src/kmp_lock.h index 09543930eff..e65aa987458 100644 --- a/openmp/runtime/src/kmp_lock.h +++ b/openmp/runtime/src/kmp_lock.h @@ -2,7 +2,6 @@ * kmp_lock.h -- lock header file */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #ifndef KMP_LOCK_H #define KMP_LOCK_H diff --git a/openmp/runtime/src/kmp_omp.h b/openmp/runtime/src/kmp_omp.h index 9684fd3e241..2d6fd195c04 100644 --- a/openmp/runtime/src/kmp_omp.h +++ b/openmp/runtime/src/kmp_omp.h @@ -4,7 +4,6 @@ * This is for information about runtime library structures. */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -14,7 +13,6 @@ // //===----------------------------------------------------------------------===// - /* THIS FILE SHOULD NOT BE MODIFIED IN IDB INTERFACE LIBRARY CODE It should instead be modified in the OpenMP runtime and copied to the interface library code. This way we can minimize the problems that this is diff --git a/openmp/runtime/src/kmp_os.h b/openmp/runtime/src/kmp_os.h index 2c70a72df11..b709ebc8b79 100644 --- a/openmp/runtime/src/kmp_os.h +++ b/openmp/runtime/src/kmp_os.h @@ -2,7 +2,6 @@ * kmp_os.h -- KPTS runtime header file. */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #ifndef KMP_OS_H #define KMP_OS_H @@ -247,9 +245,9 @@ template <> struct traits_t<unsigned long long> { #include <windows.h> static inline int KMP_GET_PAGE_SIZE(void) { - SYSTEM_INFO si; - GetSystemInfo(&si); - return si.dwPageSize; + SYSTEM_INFO si; + GetSystemInfo(&si); + return si.dwPageSize; } #else #define KMP_GET_PAGE_SIZE() getpagesize() @@ -829,7 +827,6 @@ typedef void (*microtask_t)(int *gtid, int *npr, ...); #define KMP_USE_BGET 1 #endif - // Switches for OSS builds #ifndef USE_SYSFS_INFO #define USE_SYSFS_INFO 0 diff --git a/openmp/runtime/src/kmp_platform.h b/openmp/runtime/src/kmp_platform.h index 800523ab984..534409e64bd 100644 --- a/openmp/runtime/src/kmp_platform.h +++ b/openmp/runtime/src/kmp_platform.h @@ -2,7 +2,6 @@ * kmp_platform.h -- header for determining operating system and architecture */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #ifndef KMP_PLATFORM_H #define KMP_PLATFORM_H diff --git a/openmp/runtime/src/kmp_runtime.cpp b/openmp/runtime/src/kmp_runtime.cpp index ae639ba1d55..3c408737ca5 100644 --- a/openmp/runtime/src/kmp_runtime.cpp +++ b/openmp/runtime/src/kmp_runtime.cpp @@ -2,7 +2,6 @@ * kmp_runtime.cpp -- KPTS runtime support library */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #include "kmp.h" #include "kmp_affinity.h" #include "kmp_atomic.h" @@ -1107,15 +1105,15 @@ inline static void propagateFPControl(kmp_team_t *team) { __kmp_store_mxcsr(&mxcsr); mxcsr &= KMP_X86_MXCSR_MASK; -// There is no point looking at t_fp_control_saved here. -// If it is TRUE, we still have to update the values if they are different from -// those we now have. -// If it is FALSE we didn't save anything yet, but our objective is the same. We -// have to ensure that the values in the team are the same as those we have. -// So, this code achieves what we need whether or not t_fp_control_saved is -// true. By checking whether the value needs updating we avoid unnecessary -// writes that would put the cache-line into a written state, causing all -// threads in the team to have to read it again. + // There is no point looking at t_fp_control_saved here. + // If it is TRUE, we still have to update the values if they are different + // from those we now have. If it is FALSE we didn't save anything yet, but + // our objective is the same. We have to ensure that the values in the team + // are the same as those we have. + // So, this code achieves what we need whether or not t_fp_control_saved is + // true. By checking whether the value needs updating we avoid unnecessary + // writes that would put the cache-line into a written state, causing all + // threads in the team to have to read it again. KMP_CHECK_UPDATE(team->t.t_x87_fpu_control_word, x87_fpu_control_word); KMP_CHECK_UPDATE(team->t.t_mxcsr, mxcsr); // Although we don't use this value, other code in the runtime wants to know @@ -4676,12 +4674,12 @@ static void __kmp_partition_places(kmp_team_t *team, int update_master_only) { place++; } - KA_TRACE(100, ("__kmp_partition_places: spread: T#%d(%d:%d) place %d " - "partition = [%d,%d], __kmp_affinity_num_masks: %u\n", - __kmp_gtid_from_thread(team->t.t_threads[f]), - team->t.t_id, f, th->th.th_new_place, - th->th.th_first_place, th->th.th_last_place, - __kmp_affinity_num_masks)); + KA_TRACE(100, + ("__kmp_partition_places: spread: T#%d(%d:%d) place %d " + "partition = [%d,%d], __kmp_affinity_num_masks: %u\n", + __kmp_gtid_from_thread(team->t.t_threads[f]), team->t.t_id, + f, th->th.th_new_place, th->th.th_first_place, + th->th.th_last_place, __kmp_affinity_num_masks)); } } else { /* Having uniform space of available computation places I can create @@ -4689,7 +4687,7 @@ static void __kmp_partition_places(kmp_team_t *team, int update_master_only) { place of each partition. */ double current = static_cast<double>(masters_place); double spacing = - (static_cast<double>(n_places + 1) / static_cast<double>(n_th)); + (static_cast<double>(n_places + 1) / static_cast<double>(n_th)); int first, last; kmp_info_t *th; @@ -4735,12 +4733,12 @@ static void __kmp_partition_places(kmp_team_t *team, int update_master_only) { th->th.th_new_place = place; th->th.th_last_place = last; - KA_TRACE(100, ("__kmp_partition_places: spread: T#%d(%d:%d) place %d " - "partition = [%d,%d], spacing = %.4f\n", - __kmp_gtid_from_thread(team->t.t_threads[f]), - team->t.t_id, f, th->th.th_new_place, - th->th.th_first_place, th->th.th_last_place, - spacing)); + KA_TRACE(100, + ("__kmp_partition_places: spread: T#%d(%d:%d) place %d " + "partition = [%d,%d], spacing = %.4f\n", + __kmp_gtid_from_thread(team->t.t_threads[f]), + team->t.t_id, f, th->th.th_new_place, + th->th.th_first_place, th->th.th_last_place, spacing)); } } } @@ -5242,9 +5240,10 @@ __kmp_allocate_team(kmp_root_t *root, int new_nproc, int max_nproc, return team; } -/* reap team if it is too small, then loop back and check the next one */ -// not sure if this is wise, but, will be redone during the hot-teams rewrite. -/* TODO: Use technique to find the right size hot-team, don't reap them */ + /* reap team if it is too small, then loop back and check the next one */ + // not sure if this is wise, but, will be redone during the hot-teams + // rewrite. + /* TODO: Use technique to find the right size hot-team, don't reap them */ team = __kmp_reap_team(team); __kmp_team_pool = team; } @@ -5902,10 +5901,10 @@ static void __kmp_internal_end(void) { // 2009-09-08 (lev): Other alive roots found. Why do we kill the monitor?? KMP_MB(); /* Flush all pending memory write invalidates. */ -// Need to check that monitor was initialized before reaping it. If we are -// called form __kmp_atfork_child (which sets __kmp_init_parallel = 0), then -// __kmp_monitor will appear to contain valid data, but it is only valid in the -// parent process, not the child. + // Need to check that monitor was initialized before reaping it. If we are + // called form __kmp_atfork_child (which sets __kmp_init_parallel = 0), then + // __kmp_monitor will appear to contain valid data, but it is only valid in + // the parent process, not the child. // New behavior (201008): instead of keying off of the flag // __kmp_init_parallel, the monitor thread creation is keyed off // of the new flag __kmp_init_monitor. diff --git a/openmp/runtime/src/kmp_safe_c_api.h b/openmp/runtime/src/kmp_safe_c_api.h index 992f826d204..9d0da0b6073 100644 --- a/openmp/runtime/src/kmp_safe_c_api.h +++ b/openmp/runtime/src/kmp_safe_c_api.h @@ -8,7 +8,6 @@ // //===----------------------------------------------------------------------===// - #ifndef KMP_SAFE_C_API_H #define KMP_SAFE_C_API_H diff --git a/openmp/runtime/src/kmp_sched.cpp b/openmp/runtime/src/kmp_sched.cpp index b45e9475711..0fa1a698a6c 100644 --- a/openmp/runtime/src/kmp_sched.cpp +++ b/openmp/runtime/src/kmp_sched.cpp @@ -2,7 +2,6 @@ * kmp_sched.cpp -- static scheduling -- iteration initialization */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - /* Static scheduling initialization. NOTE: team->t.t_nproc is a constant inside of any dispatch loop, however diff --git a/openmp/runtime/src/kmp_settings.cpp b/openmp/runtime/src/kmp_settings.cpp index 767ae8c313f..b4328e70652 100644 --- a/openmp/runtime/src/kmp_settings.cpp +++ b/openmp/runtime/src/kmp_settings.cpp @@ -2,7 +2,6 @@ * kmp_settings.cpp -- Initialize environment variables */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #include "kmp.h" #include "kmp_affinity.h" #include "kmp_atomic.h" @@ -24,7 +22,7 @@ #include "kmp_settings.h" #include "kmp_str.h" #include "kmp_wrapper_getpid.h" -#include <ctype.h> // toupper() +#include <ctype.h> // toupper() static int __kmp_env_toPrint(char const *name, int flag); @@ -4928,7 +4926,6 @@ static void __kmp_aux_env_initialize(kmp_env_blk_t *block) { if (value) { ompc_set_dynamic(__kmp_global.g.g_dynamic); } - } void __kmp_env_initialize(char const *string) { @@ -4960,7 +4957,7 @@ void __kmp_env_initialize(char const *string) { } } -// We need to know if blocktime was set when processing OMP_WAIT_POLICY + // We need to know if blocktime was set when processing OMP_WAIT_POLICY blocktime_str = __kmp_env_blk_var(&block, "KMP_BLOCKTIME"); // Special case. If we parse environment, not a string, process KMP_WARNINGS diff --git a/openmp/runtime/src/kmp_settings.h b/openmp/runtime/src/kmp_settings.h index 470c6368374..43e70c3b32d 100644 --- a/openmp/runtime/src/kmp_settings.h +++ b/openmp/runtime/src/kmp_settings.h @@ -2,7 +2,6 @@ * kmp_settings.h -- Initialize environment variables */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #ifndef KMP_SETTINGS_H #define KMP_SETTINGS_H diff --git a/openmp/runtime/src/kmp_stats.cpp b/openmp/runtime/src/kmp_stats.cpp index aeea4de1fc2..d75695f61a6 100644 --- a/openmp/runtime/src/kmp_stats.cpp +++ b/openmp/runtime/src/kmp_stats.cpp @@ -2,7 +2,6 @@ * Statistics gathering and processing. */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #include "kmp.h" #include "kmp_lock.h" #include "kmp_stats.h" diff --git a/openmp/runtime/src/kmp_stats.h b/openmp/runtime/src/kmp_stats.h index 50ad2577836..46512e42b5a 100644 --- a/openmp/runtime/src/kmp_stats.h +++ b/openmp/runtime/src/kmp_stats.h @@ -5,7 +5,6 @@ * Functions for collecting statistics. */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -15,7 +14,6 @@ // //===----------------------------------------------------------------------===// - #include "kmp_config.h" #if KMP_STATS_ENABLED diff --git a/openmp/runtime/src/kmp_stats_timing.cpp b/openmp/runtime/src/kmp_stats_timing.cpp index 52d70fbf6e3..fe85dc4582b 100644 --- a/openmp/runtime/src/kmp_stats_timing.cpp +++ b/openmp/runtime/src/kmp_stats_timing.cpp @@ -2,7 +2,6 @@ * Timing functions */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #include <stdlib.h> #include <unistd.h> diff --git a/openmp/runtime/src/kmp_stats_timing.h b/openmp/runtime/src/kmp_stats_timing.h index 9ffd6fbfa33..84252ec1380 100644 --- a/openmp/runtime/src/kmp_stats_timing.h +++ b/openmp/runtime/src/kmp_stats_timing.h @@ -5,7 +5,6 @@ * Access to real time clock and timers. */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -15,7 +14,6 @@ // //===----------------------------------------------------------------------===// - #include "kmp_os.h" #include <limits> #include <stdint.h> @@ -59,11 +57,11 @@ public: tsc_tick_count() : my_count(static_cast<int64_t>(__builtin_readcyclecounter())) {} #elif KMP_HAVE___RDTSC - tsc_tick_count() : my_count(static_cast<int64_t>(__rdtsc())){} + tsc_tick_count() : my_count(static_cast<int64_t>(__rdtsc())) {} #else #error Must have high resolution timer defined #endif - tsc_tick_count(int64_t value) : my_count(value){} + tsc_tick_count(int64_t value) : my_count(value) {} int64_t getValue() const { return my_count; } tsc_tick_count later(tsc_tick_count const other) const { return my_count > other.my_count ? (*this) : other; diff --git a/openmp/runtime/src/kmp_str.cpp b/openmp/runtime/src/kmp_str.cpp index ed1bc3f8b03..01996b0710c 100644 --- a/openmp/runtime/src/kmp_str.cpp +++ b/openmp/runtime/src/kmp_str.cpp @@ -2,7 +2,6 @@ * kmp_str.cpp -- String manipulation routines. */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #include "kmp_str.h" #include <stdarg.h> // va_* diff --git a/openmp/runtime/src/kmp_str.h b/openmp/runtime/src/kmp_str.h index 0a9830a76f5..8bbde56972e 100644 --- a/openmp/runtime/src/kmp_str.h +++ b/openmp/runtime/src/kmp_str.h @@ -2,7 +2,6 @@ * kmp_str.h -- String manipulation routines. */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #ifndef KMP_STR_H #define KMP_STR_H diff --git a/openmp/runtime/src/kmp_stub.cpp b/openmp/runtime/src/kmp_stub.cpp index 6f922bad384..c704e61dd01 100644 --- a/openmp/runtime/src/kmp_stub.cpp +++ b/openmp/runtime/src/kmp_stub.cpp @@ -2,7 +2,6 @@ * kmp_stub.cpp -- stub versions of user-callable OpenMP RT functions. */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #include <errno.h> #include <limits.h> #include <stdlib.h> diff --git a/openmp/runtime/src/kmp_stub.h b/openmp/runtime/src/kmp_stub.h index 9d1efdafb1f..487729f7575 100644 --- a/openmp/runtime/src/kmp_stub.h +++ b/openmp/runtime/src/kmp_stub.h @@ -2,7 +2,6 @@ * kmp_stub.h */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #ifndef KMP_STUB_H #define KMP_STUB_H diff --git a/openmp/runtime/src/kmp_taskdeps.cpp b/openmp/runtime/src/kmp_taskdeps.cpp index 5499a568c02..91a18d0de83 100644 --- a/openmp/runtime/src/kmp_taskdeps.cpp +++ b/openmp/runtime/src/kmp_taskdeps.cpp @@ -2,7 +2,6 @@ * kmp_taskdeps.cpp */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - //#define KMP_SUPPORT_GRAPH_OUTPUT 1 #include "kmp.h" diff --git a/openmp/runtime/src/kmp_tasking.cpp b/openmp/runtime/src/kmp_tasking.cpp index 370260eee87..373339e2ac1 100644 --- a/openmp/runtime/src/kmp_tasking.cpp +++ b/openmp/runtime/src/kmp_tasking.cpp @@ -2,7 +2,6 @@ * kmp_tasking.cpp -- OpenMP 3.0 tasking support. */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #include "kmp.h" #include "kmp_i18n.h" #include "kmp_itt.h" diff --git a/openmp/runtime/src/kmp_taskq.cpp b/openmp/runtime/src/kmp_taskq.cpp index 04b7bcfa99d..6e8f2d556ef 100644 --- a/openmp/runtime/src/kmp_taskq.cpp +++ b/openmp/runtime/src/kmp_taskq.cpp @@ -2,7 +2,6 @@ * kmp_taskq.cpp -- TASKQ support for OpenMP. */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #include "kmp.h" #include "kmp_error.h" #include "kmp_i18n.h" diff --git a/openmp/runtime/src/kmp_threadprivate.cpp b/openmp/runtime/src/kmp_threadprivate.cpp index caa00eaa3c6..bbcfadd7961 100644 --- a/openmp/runtime/src/kmp_threadprivate.cpp +++ b/openmp/runtime/src/kmp_threadprivate.cpp @@ -2,7 +2,6 @@ * kmp_threadprivate.cpp -- OpenMP threadprivate support library */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #include "kmp.h" #include "kmp_i18n.h" #include "kmp_itt.h" diff --git a/openmp/runtime/src/kmp_utility.cpp b/openmp/runtime/src/kmp_utility.cpp index 063b2a141ef..f41c8993d1a 100644 --- a/openmp/runtime/src/kmp_utility.cpp +++ b/openmp/runtime/src/kmp_utility.cpp @@ -2,7 +2,6 @@ * kmp_utility.cpp -- Utility routines for the OpenMP support library. */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #include "kmp.h" #include "kmp_i18n.h" #include "kmp_str.h" diff --git a/openmp/runtime/src/kmp_version.cpp b/openmp/runtime/src/kmp_version.cpp index 55a6994a127..362777d6051 100644 --- a/openmp/runtime/src/kmp_version.cpp +++ b/openmp/runtime/src/kmp_version.cpp @@ -2,7 +2,6 @@ * kmp_version.cpp */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #include "kmp.h" #include "kmp_io.h" #include "kmp_version.h" diff --git a/openmp/runtime/src/kmp_version.h b/openmp/runtime/src/kmp_version.h index 05e52872f96..18a248740a1 100644 --- a/openmp/runtime/src/kmp_version.h +++ b/openmp/runtime/src/kmp_version.h @@ -2,7 +2,6 @@ * kmp_version.h -- version number for this release */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #ifndef KMP_VERSION_H #define KMP_VERSION_H diff --git a/openmp/runtime/src/kmp_wait_release.cpp b/openmp/runtime/src/kmp_wait_release.cpp index 40d09ef66e3..98d3a1f068a 100644 --- a/openmp/runtime/src/kmp_wait_release.cpp +++ b/openmp/runtime/src/kmp_wait_release.cpp @@ -2,7 +2,6 @@ * kmp_wait_release.cpp -- Wait/Release implementation */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure diff --git a/openmp/runtime/src/kmp_wait_release.h b/openmp/runtime/src/kmp_wait_release.h index 3aac2027b01..2ecacefc391 100644 --- a/openmp/runtime/src/kmp_wait_release.h +++ b/openmp/runtime/src/kmp_wait_release.h @@ -2,7 +2,6 @@ * kmp_wait_release.h -- Wait/Release implementation */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #ifndef KMP_WAIT_RELEASE_H #define KMP_WAIT_RELEASE_H diff --git a/openmp/runtime/src/kmp_wrapper_getpid.h b/openmp/runtime/src/kmp_wrapper_getpid.h index 490e5cb10ff..5b4081a82a0 100644 --- a/openmp/runtime/src/kmp_wrapper_getpid.h +++ b/openmp/runtime/src/kmp_wrapper_getpid.h @@ -2,7 +2,6 @@ * kmp_wrapper_getpid.h -- getpid() declaration. */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #ifndef KMP_WRAPPER_GETPID_H #define KMP_WRAPPER_GETPID_H diff --git a/openmp/runtime/src/kmp_wrapper_malloc.h b/openmp/runtime/src/kmp_wrapper_malloc.h index 257416df656..cf6f2be0800 100644 --- a/openmp/runtime/src/kmp_wrapper_malloc.h +++ b/openmp/runtime/src/kmp_wrapper_malloc.h @@ -3,7 +3,6 @@ * (malloc(), free(), and others). */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -13,7 +12,6 @@ // //===----------------------------------------------------------------------===// - #ifndef KMP_WRAPPER_MALLOC_H #define KMP_WRAPPER_MALLOC_H diff --git a/openmp/runtime/src/z_Linux_util.cpp b/openmp/runtime/src/z_Linux_util.cpp index 2c128d5374f..23ea47d4c34 100644 --- a/openmp/runtime/src/z_Linux_util.cpp +++ b/openmp/runtime/src/z_Linux_util.cpp @@ -2,7 +2,6 @@ * z_Linux_util.cpp -- platform specific routines. */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #include "kmp.h" #include "kmp_affinity.h" #include "kmp_i18n.h" @@ -1396,7 +1394,6 @@ void __kmp_suspend_uninitialize_thread(kmp_info_t *th) { } } - /* This routine puts the calling thread to sleep after setting the sleep bit for the indicated flag variable to true. */ template <class C> diff --git a/openmp/runtime/src/z_Windows_NT-586_util.cpp b/openmp/runtime/src/z_Windows_NT-586_util.cpp index d88ff5bd719..9191c0296a6 100644 --- a/openmp/runtime/src/z_Windows_NT-586_util.cpp +++ b/openmp/runtime/src/z_Windows_NT-586_util.cpp @@ -2,7 +2,6 @@ * z_Windows_NT-586_util.cpp -- platform specific routines. */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #include "kmp.h" #if (KMP_ARCH_X86 || KMP_ARCH_X86_64) diff --git a/openmp/runtime/src/z_Windows_NT_util.cpp b/openmp/runtime/src/z_Windows_NT_util.cpp index f13ff2925a2..d8ffc7dd69e 100644 --- a/openmp/runtime/src/z_Windows_NT_util.cpp +++ b/openmp/runtime/src/z_Windows_NT_util.cpp @@ -2,7 +2,6 @@ * z_Windows_NT_util.cpp -- platform specific routines. */ - //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -12,7 +11,6 @@ // //===----------------------------------------------------------------------===// - #include "kmp.h" #include "kmp_affinity.h" #include "kmp_i18n.h" |
