Apply formatting changes

.clang-format's comments are removed and a (hopefully) final
set of formatting changes are applied.

Differential Revision: https://reviews.llvm.org/D38837
Differential Revision: https://reviews.llvm.org/D38920

llvm-svn: 316227
This commit is contained in:
Jonathan Peyton 2017-10-20 19:30:57 +00:00
parent 1311ff1340
commit 94a114fc39
67 changed files with 42 additions and 268 deletions

View File

@ -2,90 +2,4 @@
BasedOnStyle: LLVM
AlignTrailingComments: false
SortIncludes: false
---
# Language: Cpp
# AccessModifierOffset: -2
# AlignAfterOpenBracket: Align
# AlignConsecutiveAssignments: false
# AlignConsecutiveDeclarations: false
# AlignEscapedNewlinesLeft: false
# AlignOperands: false
# AlignTrailingComments: false
# AllowAllParametersOfDeclarationOnNextLine: true
# AllowShortBlocksOnASingleLine: false
# AllowShortCaseLabelsOnASingleLine: false
# AllowShortFunctionsOnASingleLine: All
# AllowShortIfStatementsOnASingleLine: false
# AllowShortLoopsOnASingleLine: false
# AlwaysBreakAfterDefinitionReturnType: None
# AlwaysBreakAfterReturnType: None
# AlwaysBreakBeforeMultilineStrings: false
# AlwaysBreakTemplateDeclarations: false
# BinPackArguments: true
# BinPackParameters: true
# BraceWrapping:
# AfterClass: false
# AfterControlStatement: false
# AfterEnum: false
# AfterFunction: false
# AfterNamespace: false
# AfterObjCDeclaration: false
# AfterStruct: false
# AfterUnion: false
# BeforeCatch: false
# BeforeElse: false
# IndentBraces: false
# # BreakBeforeBinaryOperators: None
# BreakBeforeBraces: Attach
# BreakBeforeTernaryOperators: true
# BreakConstructorInitializersBeforeComma: false
# ColumnLimit: 80
# CommentPragmas: '^ IWYU pragma:'
# ConstructorInitializerAllOnOneLineOrOnePerLine: false
# ConstructorInitializerIndentWidth: 4
# ContinuationIndentWidth: 4
# Cpp11BracedListStyle: true
# DerivePointerAlignment: false
# DisableFormat: true
# ExperimentalAutoDetectBinPacking: false
# ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
# IncludeCategories:
# - Regex: '^"(llvm|llvm-c|clang|clang-c)/'
# Priority: 2
# - Regex: '^(<|"(gtest|isl|json)/)'
# Priority: 3
# - Regex: '.*'
# Priority: 1
# IndentCaseLabels: false
# IndentWidth: 2
# IndentWrappedFunctionNames: false
# KeepEmptyLinesAtTheStartOfBlocks: false
# MacroBlockBegin: ''
# MacroBlockEnd: ''
# MaxEmptyLinesToKeep: 2
# NamespaceIndentation: None
# ObjCBlockIndentWidth: 2
# ObjCSpaceAfterProperty: false
# ObjCSpaceBeforeProtocolList: true
# PenaltyBreakBeforeFirstCallParameter: 19
# PenaltyBreakComment: 300
# PenaltyBreakFirstLessLess: 120
# PenaltyBreakString: 1000
# PenaltyExcessCharacter: 1000000
# PenaltyReturnTypeOnItsOwnLine: 60
# PointerAlignment: Right
# ReflowComments: true
# SpaceAfterCStyleCast: false
# SpaceBeforeAssignmentOperators: true
# SpaceBeforeParens: ControlStatements
# SpaceInEmptyParentheses: false
# SpacesBeforeTrailingComments: 1
# SpacesInAngles: false
# SpacesInContainerLiterals: true
# SpacesInCStyleCastParentheses: false
# SpacesInParentheses: false
# SpacesInSquareBrackets: false
# Standard: Cpp11
# TabWidth: 8
# UseTab: Never
...

View File

@ -2,7 +2,6 @@
* extractExternal.cpp
*/
//===----------------------------------------------------------------------===//
//
// The LLVM Compiler Infrastructure
@ -12,7 +11,6 @@
//
//===----------------------------------------------------------------------===//
#include <fstream>
#include <iostream>
#include <map>

View File

@ -3,7 +3,6 @@
* kmp.h -- KPTS runtime header file.
*/
//===----------------------------------------------------------------------===//
//
// The LLVM Compiler Infrastructure
@ -13,7 +12,6 @@
//
//===----------------------------------------------------------------------===//
#ifndef KMP_H
#define KMP_H

View File

@ -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

View File

@ -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

View File

@ -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"

View File

@ -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

View File

@ -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

View File

@ -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) {

View File

@ -8,7 +8,6 @@
//
//===----------------------------------------------------------------------===//
#include "kmp.h"
#include "kmp_i18n.h"
#include "kmp_io.h"

View File

@ -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"

View File

@ -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"

View File

@ -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

View File

@ -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"

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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"

View File

@ -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

View File

@ -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"

View File

@ -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) {

View File

@ -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"

View File

@ -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_

View File

@ -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.

View File

@ -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;

View File

@ -2,7 +2,6 @@
* kmp_gsupport.cpp
*/
//===----------------------------------------------------------------------===//
//
// The LLVM Compiler Infrastructure
@ -12,7 +11,6 @@
//
//===----------------------------------------------------------------------===//
#include "kmp.h"
#include "kmp_atomic.h"

View File

@ -2,7 +2,6 @@
* kmp_i18n.cpp
*/
//===----------------------------------------------------------------------===//
//
// The LLVM Compiler Infrastructure
@ -12,7 +11,6 @@
//
//===----------------------------------------------------------------------===//
#include "kmp_i18n.h"
#include "kmp.h"

View File

@ -2,7 +2,6 @@
* kmp_i18n.h
*/
//===----------------------------------------------------------------------===//
//
// The LLVM Compiler Infrastructure
@ -12,7 +11,6 @@
//
//===----------------------------------------------------------------------===//
#ifndef KMP_I18N_H
#define KMP_I18N_H

View File

@ -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

View File

@ -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>

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -2,7 +2,6 @@
* kmp_lock.cpp -- lock-related functions
*/
//===----------------------------------------------------------------------===//
//
// The LLVM Compiler Infrastructure
@ -12,7 +11,6 @@
//
//===----------------------------------------------------------------------===//
#include <stddef.h>
#include <atomic>

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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.

View File

@ -8,7 +8,6 @@
//
//===----------------------------------------------------------------------===//
#ifndef KMP_SAFE_C_API_H
#define KMP_SAFE_C_API_H

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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"

View File

@ -5,7 +5,6 @@
* Functions for collecting statistics.
*/
//===----------------------------------------------------------------------===//
//
// The LLVM Compiler Infrastructure
@ -15,7 +14,6 @@
//
//===----------------------------------------------------------------------===//
#include "kmp_config.h"
#if KMP_STATS_ENABLED

View File

@ -2,7 +2,6 @@
* Timing functions
*/
//===----------------------------------------------------------------------===//
//
// The LLVM Compiler Infrastructure
@ -12,7 +11,6 @@
//
//===----------------------------------------------------------------------===//
#include <stdlib.h>
#include <unistd.h>

View File

@ -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;

View File

@ -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_*

View File

@ -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

View File

@ -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>

View File

@ -2,7 +2,6 @@
* kmp_stub.h
*/
//===----------------------------------------------------------------------===//
//
// The LLVM Compiler Infrastructure
@ -12,7 +11,6 @@
//
//===----------------------------------------------------------------------===//
#ifndef KMP_STUB_H
#define KMP_STUB_H

View File

@ -2,7 +2,6 @@
* kmp_taskdeps.cpp
*/
//===----------------------------------------------------------------------===//
//
// The LLVM Compiler Infrastructure
@ -12,7 +11,6 @@
//
//===----------------------------------------------------------------------===//
//#define KMP_SUPPORT_GRAPH_OUTPUT 1
#include "kmp.h"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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

View File

@ -2,7 +2,6 @@
* kmp_wait_release.cpp -- Wait/Release implementation
*/
//===----------------------------------------------------------------------===//
//
// The LLVM Compiler Infrastructure

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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>

View File

@ -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)

View File

@ -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"