diff options
Diffstat (limited to 'openmp/runtime/src')
-rw-r--r-- | openmp/runtime/src/extractExternal.cpp | 2 | ||||
-rw-r--r-- | openmp/runtime/src/i18n/en_US.txt | 2 | ||||
-rw-r--r-- | openmp/runtime/src/include/omp_lib.f.var | 2 | ||||
-rw-r--r-- | openmp/runtime/src/kmp.h | 10 | ||||
-rw-r--r-- | openmp/runtime/src/kmp_affinity.cpp | 4 | ||||
-rw-r--r-- | openmp/runtime/src/kmp_atomic.cpp | 2 | ||||
-rw-r--r-- | openmp/runtime/src/kmp_dispatch.cpp | 6 | ||||
-rw-r--r-- | openmp/runtime/src/kmp_gsupport.cpp | 4 | ||||
-rw-r--r-- | openmp/runtime/src/kmp_itt.inl | 4 | ||||
-rw-r--r-- | openmp/runtime/src/kmp_lock.h | 2 | ||||
-rw-r--r-- | openmp/runtime/src/kmp_runtime.cpp | 4 | ||||
-rw-r--r-- | openmp/runtime/src/kmp_settings.cpp | 6 | ||||
-rw-r--r-- | openmp/runtime/src/kmp_stats.cpp | 2 | ||||
-rw-r--r-- | openmp/runtime/src/kmp_taskdeps.cpp | 2 | ||||
-rw-r--r-- | openmp/runtime/src/kmp_tasking.cpp | 7 | ||||
-rw-r--r-- | openmp/runtime/src/kmp_wrapper_malloc.h | 2 | ||||
-rw-r--r-- | openmp/runtime/src/thirdparty/ittnotify/ittnotify.h | 12 | ||||
-rw-r--r-- | openmp/runtime/src/thirdparty/ittnotify/ittnotify_static.cpp | 2 | ||||
-rw-r--r-- | openmp/runtime/src/thirdparty/ittnotify/legacy/ittnotify.h | 4 |
19 files changed, 40 insertions, 39 deletions
diff --git a/openmp/runtime/src/extractExternal.cpp b/openmp/runtime/src/extractExternal.cpp index b3e55b555d2..f512ecb2b16 100644 --- a/openmp/runtime/src/extractExternal.cpp +++ b/openmp/runtime/src/extractExternal.cpp @@ -57,7 +57,7 @@ protected: ~_rstream() { delete[] buf; } }; -// A stream encapuslating the content of a file or the content of a string, +// A stream encapsulating the content of a file or the content of a string, // overriding the >> operator to read various integer types in binary form, // as well as a symbol table entry. class rstream : public _rstream { diff --git a/openmp/runtime/src/i18n/en_US.txt b/openmp/runtime/src/i18n/en_US.txt index 650d5fec93a..3a3035b2667 100644 --- a/openmp/runtime/src/i18n/en_US.txt +++ b/openmp/runtime/src/i18n/en_US.txt @@ -372,7 +372,7 @@ AffParseFilename "%1$s: parsing %2$s." MsgExiting "%1$s - exiting." IncompatibleLibrary "Incompatible %1$s library with version %2$s found." IttFunctionError "ittnotify: Function %1$s failed:" -IttUnknownError "ittnofify: Error #%1$d." +IttUnknownError "ittnotify: Error #%1$d." EnvMiddleWarn "%1$s must be set prior to first parallel region or certain API calls; ignored." CnsLockNotDestroyed "Lock initialized at %1$s(%2$d) was not destroyed" # %1, %2, %3, %4 -- file, line, func, col diff --git a/openmp/runtime/src/include/omp_lib.f.var b/openmp/runtime/src/include/omp_lib.f.var index 19f14d75f21..d631438f55a 100644 --- a/openmp/runtime/src/include/omp_lib.f.var +++ b/openmp/runtime/src/include/omp_lib.f.var @@ -953,7 +953,7 @@ !dec$ if defined(__APPLE__) !*** -!*** The Mac entry points are in lowercase, with an both an underscore +!*** The Mac entry points are in lowercase, with both an underscore !*** appended and an underscore prepended. !*** diff --git a/openmp/runtime/src/kmp.h b/openmp/runtime/src/kmp.h index 0b8397e2c23..086ab3bb011 100644 --- a/openmp/runtime/src/kmp.h +++ b/openmp/runtime/src/kmp.h @@ -203,7 +203,7 @@ enum { KMP_IDENT_WORK_LOOP = 0x200, /*! To mark a sections directive in OMPT callbacks */ KMP_IDENT_WORK_SECTIONS = 0x400, - /*! To mark a distirbute construct in OMPT callbacks */ + /*! To mark a distribute construct in OMPT callbacks */ KMP_IDENT_WORK_DISTRIBUTE = 0x800, /*! Atomic hint; bottom four bits as omp_sync_hint_t. Top four reserved and not currently used. If one day we need more bits, then we can use @@ -868,7 +868,7 @@ extern int __kmp_hws_abs_flag; // absolute or per-item number requested /* OpenMP 5.0 Memory Management support */ #ifndef __OMP_H -// Duplicate type definitios from omp.h +// Duplicate type definitions from omp.h typedef uintptr_t omp_uintptr_t; typedef enum { @@ -929,7 +929,7 @@ extern omp_allocator_handle_t const omp_thread_mem_alloc; extern omp_allocator_handle_t const kmp_max_mem_alloc; extern omp_allocator_handle_t __kmp_def_allocator; -// end of duplicate type definitios from omp.h +// end of duplicate type definitions from omp.h #endif extern int __kmp_memkind_available; @@ -1389,7 +1389,7 @@ The type for a microtask which gets passed to @ref __kmpc_fork_call(). The arguments to the outlined function are @param global_tid the global thread identity of the thread executing the function. -@param bound_tid the local identitiy of the thread executing the function +@param bound_tid the local identity of the thread executing the function @param ... pointers to shared variables accessed by the function. */ typedef void (*kmpc_micro)(kmp_int32 *global_tid, kmp_int32 *bound_tid, ...); @@ -2654,7 +2654,7 @@ typedef struct KMP_ALIGN_CACHE kmp_base_team { int t_level; // nested parallel level KMP_ALIGN_CACHE int t_max_argc; - int t_max_nproc; // max threads this team can handle (dynamicly expandable) + int t_max_nproc; // max threads this team can handle (dynamically expandable) int t_serialized; // levels deep of serialized teams dispatch_shared_info_t *t_disp_buffer; // buffers for dispatch system int t_id; // team's id, assigned by debugger. diff --git a/openmp/runtime/src/kmp_affinity.cpp b/openmp/runtime/src/kmp_affinity.cpp index 012d2a2c470..650e9ff35e1 100644 --- a/openmp/runtime/src/kmp_affinity.cpp +++ b/openmp/runtime/src/kmp_affinity.cpp @@ -1124,7 +1124,7 @@ static int __kmp_affinity_create_apicid_map(AddrUnsPair **address2os, // - Older OSes are usually found on machines with older chips, which do not // support HT. // - The performance penalty for mistakenly identifying a machine as HT when - // it isn't (which results in blocktime being incorrecly set to 0) is + // it isn't (which results in blocktime being incorrectly set to 0) is // greater than the penalty when for mistakenly identifying a machine as // being 1 thread/core when it is really HT enabled (which results in // blocktime being incorrectly set to a positive value). @@ -4194,7 +4194,7 @@ static void __kmp_aux_affinity_initialize(void) { if (__kmp_affinity_top_method == affinity_top_method_all) { // In the default code path, errors are not fatal - we just try using // another method. We only emit a warning message if affinity is on, or the - // verbose flag is set, an the nowarnings flag was not set. + // verbose flag is set, and the nowarnings flag was not set. const char *file_name = NULL; int line = 0; #if KMP_USE_HWLOC diff --git a/openmp/runtime/src/kmp_atomic.cpp b/openmp/runtime/src/kmp_atomic.cpp index fe80ba8b283..148b2da3f52 100644 --- a/openmp/runtime/src/kmp_atomic.cpp +++ b/openmp/runtime/src/kmp_atomic.cpp @@ -141,7 +141,7 @@ Full list of functions ====================== This leads to the generation of 376 atomic functions, as follows. -Functons for integers +Functions for integers --------------------- There are versions here for integers of size 1,2,4 and 8 bytes both signed and unsigned (where that matters). diff --git a/openmp/runtime/src/kmp_dispatch.cpp b/openmp/runtime/src/kmp_dispatch.cpp index aee1a649741..a91ffa2ba29 100644 --- a/openmp/runtime/src/kmp_dispatch.cpp +++ b/openmp/runtime/src/kmp_dispatch.cpp @@ -1533,7 +1533,7 @@ int __kmp_dispatch_next_algorithm(int gtid, if ((T)remaining < pr->u.p.parm2) { // compare with K*nproc*(chunk+1), K=2 by default // use dynamic-style shcedule - // atomically inrement iterations, get old value + // atomically increment iterations, get old value init = test_then_add<ST>(RCAST(volatile ST *, &sh->u.s.iteration), (ST)chunkspec); remaining = trip - init; @@ -1602,7 +1602,7 @@ int __kmp_dispatch_next_algorithm(int gtid, // compare with K*nproc*(chunk+1), K=2 by default if ((T)remaining < pr->u.p.parm2) { // use dynamic-style shcedule - // atomically inrement iterations, get old value + // atomically increment iterations, get old value init = test_then_add<ST>(RCAST(volatile ST *, &sh->u.s.iteration), (ST)chunk); remaining = trip - init; @@ -1893,7 +1893,7 @@ static int __kmp_dispatch_next(ident_t *loc, int gtid, kmp_int32 *p_last, typedef typename traits_t<T>::signed_t ST; // This is potentially slightly misleading, schedule(runtime) will appear here // even if the actual runtme schedule is static. (Which points out a - // disadavantage of schedule(runtime): even when static scheduling is used it + // disadvantage of schedule(runtime): even when static scheduling is used it // costs more than a compile time choice to use static scheduling would.) KMP_TIME_PARTITIONED_BLOCK(OMP_loop_dynamic_scheduling); diff --git a/openmp/runtime/src/kmp_gsupport.cpp b/openmp/runtime/src/kmp_gsupport.cpp index da8b3211733..e0739a737d9 100644 --- a/openmp/runtime/src/kmp_gsupport.cpp +++ b/openmp/runtime/src/kmp_gsupport.cpp @@ -495,7 +495,7 @@ void KMP_EXPAND_NAME(KMP_API_NAME_GOMP_PARALLEL_END)(void) { // argument to __kmp_GOMP_fork_call). // // Conversely, KMP_DISPATCH_NEXT returns and inclusive upper bound in *p_ub, -// but the Gnu codegen expects an excluside upper bound, so the adjustment +// but the Gnu codegen expects an exclusive upper bound, so the adjustment // "*p_ub += stride" compensates for the discrepancy. // // Correction: the gnu codegen always adjusts the upper bound by +-1, not the @@ -1743,7 +1743,7 @@ void __GOMP_taskloop(void (*func)(void *), void *data, // 4 byte version of GOMP_doacross_post // This verison needs to create a temporary array which converts 4 byte -// integers into 8 byte integeres +// integers into 8 byte integers template <typename T, bool need_conversion = (sizeof(long) == 4)> void __kmp_GOMP_doacross_post(T *count); diff --git a/openmp/runtime/src/kmp_itt.inl b/openmp/runtime/src/kmp_itt.inl index fe449ac604b..04f00285ba3 100644 --- a/openmp/runtime/src/kmp_itt.inl +++ b/openmp/runtime/src/kmp_itt.inl @@ -474,7 +474,7 @@ LINKAGE void __kmp_itt_region_joined(int gtid) { ITT need an address (void *) to be specified as a sync object. OpenMP RTL does not have barrier object or barrier data structure. Barrier is just a counter in team and thread structures. We could use an address of team - structure as an barrier sync object, but ITT wants different objects for + structure as a barrier sync object, but ITT wants different objects for different barriers (even whithin the same team). So let us use team address as barrier sync object for the first barrier, then increase it by one for the next barrier, and so on (but wrap it not to use addresses outside of team @@ -505,7 +505,7 @@ void *__kmp_itt_barrier_object(int gtid, int bt, int set_name, // This condition is a must (we would have zero divide otherwise). KMP_BUILD_ASSERT(sizeof(kmp_team_t) >= 2 * bs_last_barrier); // More strong condition: make sure we have room at least for for two - // differtent ids (for each barrier type). + // different ids (for each barrier type). object = reinterpret_cast<void *>( kmp_uintptr_t(team) + counter % (sizeof(kmp_team_t) / bs_last_barrier) * bs_last_barrier + diff --git a/openmp/runtime/src/kmp_lock.h b/openmp/runtime/src/kmp_lock.h index 9ad86a51657..75a15f084c6 100644 --- a/openmp/runtime/src/kmp_lock.h +++ b/openmp/runtime/src/kmp_lock.h @@ -462,7 +462,7 @@ struct kmp_base_drdpa_lock { // written by the acquiring thread) than it does in the simple ticket locks // (where it is written by the releasing thread). // - // Since now_serving is only read an written in the critical section, + // Since now_serving is only read and written in the critical section, // it is non-volatile, but it needs to exist on a separate cache line, // as it is invalidated at every lock acquire. // diff --git a/openmp/runtime/src/kmp_runtime.cpp b/openmp/runtime/src/kmp_runtime.cpp index 4f4559589e9..acd157db8e5 100644 --- a/openmp/runtime/src/kmp_runtime.cpp +++ b/openmp/runtime/src/kmp_runtime.cpp @@ -3927,8 +3927,8 @@ static int __kmp_reset_root(int gtid, kmp_root_t *root) { } __kmp_reap_thread(root->r.r_uber_thread, 1); - // We canot put root thread to __kmp_thread_pool, so we have to reap it istead - // of freeing. + // We canot put root thread to __kmp_thread_pool, so we have to reap it + // instead of freeing. root->r.r_uber_thread = NULL; /* mark root as no longer in use */ root->r.r_begin = FALSE; diff --git a/openmp/runtime/src/kmp_settings.cpp b/openmp/runtime/src/kmp_settings.cpp index 692ca26d0e4..c7dec4d218c 100644 --- a/openmp/runtime/src/kmp_settings.cpp +++ b/openmp/runtime/src/kmp_settings.cpp @@ -1034,7 +1034,7 @@ static void __kmp_parse_nested_num_threads(const char *var, const char *env, } // The next character is ',' if (*next == ',') { - // ',' is the fisrt character + // ',' is the first character if (total == 0 || prev_comma) { total++; } @@ -4205,7 +4205,7 @@ static void __kmp_stg_parse_spin_backoff_params(const char *name, } // The next character is ',' if (*next == ',') { - // ',' is the fisrt character + // ',' is the first character if (total == 0 || prev_comma) { total++; } @@ -4304,7 +4304,7 @@ static void __kmp_stg_parse_adaptive_lock_props(const char *name, } // The next character is ',' if (*next == ',') { - // ',' is the fisrt character + // ',' is the first character if (total == 0 || prev_comma) { total++; } diff --git a/openmp/runtime/src/kmp_stats.cpp b/openmp/runtime/src/kmp_stats.cpp index 71f2dd93be7..dabd0c35b85 100644 --- a/openmp/runtime/src/kmp_stats.cpp +++ b/openmp/runtime/src/kmp_stats.cpp @@ -679,7 +679,7 @@ void kmp_stats_output_module::printEvents(FILE *eventsOut, void kmp_stats_output_module::windupExplicitTimers() { // Wind up any explicit timers. We assume that it's fair at this point to just - // walk all the explcit timers in all threads and say "it's over". + // walk all the explicit timers in all threads and say "it's over". // If the timer wasn't running, this won't record anything anyway. kmp_stats_list::iterator it; for (it = __kmp_stats_list->begin(); it != __kmp_stats_list->end(); it++) { diff --git a/openmp/runtime/src/kmp_taskdeps.cpp b/openmp/runtime/src/kmp_taskdeps.cpp index 8d60bbbc816..e1618f5cd9d 100644 --- a/openmp/runtime/src/kmp_taskdeps.cpp +++ b/openmp/runtime/src/kmp_taskdeps.cpp @@ -417,7 +417,7 @@ static bool __kmp_check_deps(kmp_int32 gtid, kmp_depnode_t *node, kmp_taskdata_t *taskdata = KMP_TASK_TO_TASKDATA(task); #endif KA_TRACE(20, ("__kmp_check_deps: T#%d checking dependencies for task %p : %d " - "possibly aliased dependencies, %d non-aliased depedencies : " + "possibly aliased dependencies, %d non-aliased dependencies : " "dep_barrier=%d .\n", gtid, taskdata, ndeps, ndeps_noalias, dep_barrier)); diff --git a/openmp/runtime/src/kmp_tasking.cpp b/openmp/runtime/src/kmp_tasking.cpp index 7911f1cad0f..15ffc1454fe 100644 --- a/openmp/runtime/src/kmp_tasking.cpp +++ b/openmp/runtime/src/kmp_tasking.cpp @@ -3169,7 +3169,7 @@ static void __kmp_free_task_deque(kmp_thread_data_t *thread_data) { // __kmp_realloc_task_threads_data: // Allocates a threads_data array for a task team, either by allocating an // initial array or enlarging an existing array. Only the first thread to get -// the lock allocs or enlarges the array and re-initializes the array eleemnts. +// the lock allocs or enlarges the array and re-initializes the array elements. // That thread returns "TRUE", the rest return "FALSE". // Assumes that the new array size is given by task_team -> tt.tt_nproc. // The current size is given by task_team -> tt.tt_max_threads. @@ -4144,7 +4144,8 @@ void __kmp_taskloop_linear(ident_t *loc, int gtid, kmp_task_t *task, } else { next_task_bounds.set_ub(upper); } - if (ptask_dup != NULL) // set lastprivate flag, construct fistprivates, etc. + if (ptask_dup != NULL) // set lastprivate flag, construct firstprivates, + // etc. ptask_dup(next_task, task, lastpriv); KA_TRACE(40, ("__kmp_taskloop_linear: T#%d; task #%llu: task %p: lower %lld, " @@ -4313,7 +4314,7 @@ void __kmp_taskloop_recur(ident_t *loc, int gtid, kmp_task_t *task, next_task = __kmp_task_dup_alloc(thread, task); // duplicate the task // adjust lower bound (upper bound is not changed) for the 2nd half *(kmp_uint64 *)((char *)next_task + lower_offset) = lb1; - if (ptask_dup != NULL) // construct fistprivates, etc. + if (ptask_dup != NULL) // construct firstprivates, etc. ptask_dup(next_task, task, 0); *ub = ub0; // adjust upper bound for the 1st half diff --git a/openmp/runtime/src/kmp_wrapper_malloc.h b/openmp/runtime/src/kmp_wrapper_malloc.h index a50387c7f7c..1544c5df3d6 100644 --- a/openmp/runtime/src/kmp_wrapper_malloc.h +++ b/openmp/runtime/src/kmp_wrapper_malloc.h @@ -24,7 +24,7 @@ On Linux* OS, alloca() function is declared in <alloca.h> header, while on Windows* OS there is no <alloca.h> header, function _alloca() (note underscore!) is declared in <malloc.h>. This header eliminates these - differences, so client code incluiding "kmp_wrapper_malloc.h" can rely on + differences, so client code including "kmp_wrapper_malloc.h" can rely on following routines: malloc diff --git a/openmp/runtime/src/thirdparty/ittnotify/ittnotify.h b/openmp/runtime/src/thirdparty/ittnotify/ittnotify.h index ed46cd7761c..d730c48ec70 100644 --- a/openmp/runtime/src/thirdparty/ittnotify/ittnotify.h +++ b/openmp/runtime/src/thirdparty/ittnotify/ittnotify.h @@ -1448,7 +1448,7 @@ ITT_STUBV(ITTAPI, void, heap_allocate_end, (__itt_heap_function h, void** addr, /** @endcond */ /** - * @brief Record an free begin occurrence. + * @brief Record a free begin occurrence. */ void ITTAPI __itt_heap_free_begin(__itt_heap_function h, void* addr); @@ -1468,7 +1468,7 @@ ITT_STUBV(ITTAPI, void, heap_free_begin, (__itt_heap_function h, void* addr)) /** @endcond */ /** - * @brief Record an free end occurrence. + * @brief Record a free end occurrence. */ void ITTAPI __itt_heap_free_end(__itt_heap_function h, void* addr); @@ -1488,7 +1488,7 @@ ITT_STUBV(ITTAPI, void, heap_free_end, (__itt_heap_function h, void* addr)) /** @endcond */ /** - * @brief Record an reallocation begin occurrence. + * @brief Record a reallocation begin occurrence. */ void ITTAPI __itt_heap_reallocate_begin(__itt_heap_function h, void* addr, size_t new_size, int initialized); @@ -1508,7 +1508,7 @@ ITT_STUBV(ITTAPI, void, heap_reallocate_begin, (__itt_heap_function h, void* add /** @endcond */ /** - * @brief Record an reallocation end occurrence. + * @brief Record a reallocation end occurrence. */ void ITTAPI __itt_heap_reallocate_end(__itt_heap_function h, void* addr, void** new_addr, size_t new_size, int initialized); @@ -2644,7 +2644,7 @@ ITT_STUB(ITTAPI, __itt_clock_domain*, clock_domain_create, (__itt_get_clock_info /** * @ingroup clockdomains - * @brief Recalculate clock domains frequences and clock base timestamps. + * @brief Recalculate clock domains frequencies and clock base timestamps. */ void ITTAPI __itt_clock_domain_reset(void); @@ -3957,7 +3957,7 @@ ITT_STUB(ITTAPI, __itt_caller, stack_caller_create, (void)) /** @endcond */ /** - * @brief Destroy the inforamtion about stitch point identified by the pointer previously returned by __itt_stack_caller_create() + * @brief Destroy the information about stitch point identified by the pointer previously returned by __itt_stack_caller_create() */ void ITTAPI __itt_stack_caller_destroy(__itt_caller id); diff --git a/openmp/runtime/src/thirdparty/ittnotify/ittnotify_static.cpp b/openmp/runtime/src/thirdparty/ittnotify/ittnotify_static.cpp index c48b3f420bb..8f9e2a655ae 100644 --- a/openmp/runtime/src/thirdparty/ittnotify/ittnotify_static.cpp +++ b/openmp/runtime/src/thirdparty/ittnotify/ittnotify_static.cpp @@ -786,7 +786,7 @@ static const char* __itt_get_env_var(const char* name) } else { - /* If environment variable is empty, GetEnvirornmentVariables() + /* If environment variable is empty, GetEnvironmentVariables() * returns zero (number of characters (not including terminating null), * and GetLastError() returns ERROR_SUCCESS. */ DWORD err = GetLastError(); diff --git a/openmp/runtime/src/thirdparty/ittnotify/legacy/ittnotify.h b/openmp/runtime/src/thirdparty/ittnotify/legacy/ittnotify.h index eae33e0b194..a4061e168d1 100644 --- a/openmp/runtime/src/thirdparty/ittnotify/legacy/ittnotify.h +++ b/openmp/runtime/src/thirdparty/ittnotify/legacy/ittnotify.h @@ -957,9 +957,9 @@ ITT_STUB(ITTAPI, __itt_frame, frame_create, (const char *domain)) #endif /* INTEL_NO_MACRO_BODY */ /** @endcond */ -/** @brief Record an frame begin occurrence. */ +/** @brief Record a frame begin occurrence. */ void ITTAPI __itt_frame_begin(__itt_frame frame); -/** @brief Record an frame end occurrence. */ +/** @brief Record a frame end occurrence. */ void ITTAPI __itt_frame_end (__itt_frame frame); /** @cond exclude_from_documentation */ |