diff --git a/openmp/CMakeLists.txt b/openmp/CMakeLists.txt index e6ab73f88903..9825183a0dd7 100644 --- a/openmp/CMakeLists.txt +++ b/openmp/CMakeLists.txt @@ -69,7 +69,7 @@ endif() option(OPENMP_ENABLE_LIBOMPTARGET "Enable building libomptarget for offloading." ${ENABLE_LIBOMPTARGET}) if (OPENMP_ENABLE_LIBOMPTARGET) - # Check that the library can acutally be built. + # Check that the library can actually be built. if (APPLE OR WIN32) message(FATAL_ERROR "libomptarget cannot be built on Windows and MacOS X!") elseif (NOT OPENMP_HAVE_STD_CPP11_FLAG) diff --git a/openmp/runtime/CMakeLists.txt b/openmp/runtime/CMakeLists.txt index 0ee2a466919c..40a0fb9afee1 100644 --- a/openmp/runtime/CMakeLists.txt +++ b/openmp/runtime/CMakeLists.txt @@ -71,7 +71,7 @@ libomp_check_variable(LIBOMP_ARCH 32e x86_64 32 i386 arm ppc64 ppc64le aarch64 m set(LIBOMP_LIB_TYPE normal CACHE STRING "Performance,Profiling,Stubs library (normal/profile/stubs)") libomp_check_variable(LIBOMP_LIB_TYPE normal profile stubs) -# Set the OpenMP Year and Month assiociated with version +# Set the OpenMP Year and Month associated with version set(LIBOMP_OMP_YEAR_MONTH 201611) set(LIBOMP_MIC_ARCH knc CACHE STRING "Intel(R) Many Integrated Core Architecture (Intel(R) MIC Architecture) (knf/knc). Ignored if not Intel(R) MIC Architecture build.") diff --git a/openmp/runtime/src/i18n/en_US.txt b/openmp/runtime/src/i18n/en_US.txt index 822f73c0ef1d..650d5fec93a2 100644 --- a/openmp/runtime/src/i18n/en_US.txt +++ b/openmp/runtime/src/i18n/en_US.txt @@ -293,7 +293,7 @@ AffUseGlobCpuid "%1$s: Affinity capable, using global cpuid info" AffCapableUseFlat "%1$s: Affinity capable, using default \"flat\" topology" AffNotCapableUseLocCpuid "%1$s: Affinity not capable, using local cpuid info" AffNotCapableUseCpuinfo "%1$s: Affinity not capable, using cpuinfo file" -AffFlatTopology "%1$s: Affinity not capable, assumming \"flat\" topology" +AffFlatTopology "%1$s: Affinity not capable, assuming \"flat\" topology" InitOSProcSetRespect "%1$s: Initial OS proc set respected: %2$s" InitOSProcSetNotRespect "%1$s: Initial OS proc set not respected: %2$s" AvailableOSProc "%1$s: %2$d available OS procs" diff --git a/openmp/runtime/src/kmp.h b/openmp/runtime/src/kmp.h index 6d690fc4a709..0b8397e2c238 100644 --- a/openmp/runtime/src/kmp.h +++ b/openmp/runtime/src/kmp.h @@ -2253,7 +2253,7 @@ typedef struct kmp_tasking_flags { /* Total struct must be exactly 32 bits */ unsigned started : 1; /* 1==started, 0==not started */ unsigned executing : 1; /* 1==executing, 0==not executing */ unsigned complete : 1; /* 1==complete, 0==not complete */ - unsigned freed : 1; /* 1==freed, 0==allocateed */ + unsigned freed : 1; /* 1==freed, 0==allocated */ unsigned native : 1; /* 1==gcc-compiled task, 0==intel */ unsigned reserved31 : 7; /* reserved for library use */ diff --git a/openmp/runtime/src/kmp_affinity.cpp b/openmp/runtime/src/kmp_affinity.cpp index 349a6c627b0e..012d2a2c4702 100644 --- a/openmp/runtime/src/kmp_affinity.cpp +++ b/openmp/runtime/src/kmp_affinity.cpp @@ -2076,7 +2076,7 @@ static int __kmp_affinity_create_cpuinfo_map(AddrUnsPair **address2os, return -1; } - // Set the file pointer back to the begginning, so that we can scan the file + // Set the file pointer back to the beginning, so that we can scan the file // again, this time performing a full parse of the data. Allocate a vector of // ProcCpuInfo object, where we will place the data. Adding an extra element // at the end allows us to remove a lot of extra checks for termination @@ -2461,7 +2461,7 @@ restart_radix_check: threadInfo[i][threadIdIndex] = threadIdCt++; } - // Aparrently the thread id field was specified for some entries and + // Apparently the thread id field was specified for some entries and // not others. Start the thread id counter off at the next higher // thread id. else if (threadIdCt <= threadInfo[i][threadIdIndex]) { diff --git a/openmp/runtime/src/kmp_alloc.cpp b/openmp/runtime/src/kmp_alloc.cpp index 861940120e90..16893d0ffca5 100644 --- a/openmp/runtime/src/kmp_alloc.cpp +++ b/openmp/runtime/src/kmp_alloc.cpp @@ -57,7 +57,7 @@ static void bectl(kmp_info_t *th, bget_compact_t compact, multiple of this size. This MUST be a power of two. */ /* On IA-32 architecture with Linux* OS, malloc() does not - ensure 16 byte alignmnent */ + ensure 16 byte alignment */ #if KMP_ARCH_X86 || !KMP_HAVE_QUAD diff --git a/openmp/runtime/src/kmp_atomic.cpp b/openmp/runtime/src/kmp_atomic.cpp index f1ee3d2cd486..fe80ba8b2836 100644 --- a/openmp/runtime/src/kmp_atomic.cpp +++ b/openmp/runtime/src/kmp_atomic.cpp @@ -483,8 +483,8 @@ Functions for Complex types --------------------------- Functions for complex types whose component floating point variables are of size 4,8,10 or 16 bytes. The names here are based on the size of the component float, -*not* the size of the complex type. So `__kmpc_atomc_cmplx8_add` is an operation -on a `complex` or `complex(kind=8)`, *not* `complex`. +*not* the size of the complex type. So `__kmpc_atomic_cmplx8_add` is an +operation on a `complex` or `complex(kind=8)`, *not* `complex`. @code __kmpc_atomic_cmplx4_add diff --git a/openmp/runtime/src/kmp_dispatch_hier.h b/openmp/runtime/src/kmp_dispatch_hier.h index 24a6d6691240..3d7faea04272 100644 --- a/openmp/runtime/src/kmp_dispatch_hier.h +++ b/openmp/runtime/src/kmp_dispatch_hier.h @@ -1071,7 +1071,7 @@ void __kmp_dispatch_init_hierarchy(ident_t *loc, int n, my_unit->reset_shared_barrier(); my_unit->hier_pr.flags.contains_last = FALSE; // Last layer, initialize the private buffers with entire loop information - // Now the next next_algorithim() call will get the first chunk of + // Now the next next_algorithm() call will get the first chunk of // iterations properly if (i == n - 1) { __kmp_dispatch_init_algorithm( diff --git a/openmp/runtime/src/kmp_ftn_entry.h b/openmp/runtime/src/kmp_ftn_entry.h index b70726ce723e..89172c0b704c 100644 --- a/openmp/runtime/src/kmp_ftn_entry.h +++ b/openmp/runtime/src/kmp_ftn_entry.h @@ -956,7 +956,7 @@ int FTN_STDCALL KMP_EXPAND_NAME(FTN_GET_NUM_DEVICES)(void) { } // This function always returns true when called on host device. -// Compilier/libomptarget should handle when it is called inside target region. +// Compiler/libomptarget should handle when it is called inside target region. int FTN_STDCALL KMP_EXPAND_NAME(FTN_IS_INITIAL_DEVICE)(void) KMP_WEAK_ATTRIBUTE; int FTN_STDCALL KMP_EXPAND_NAME(FTN_IS_INITIAL_DEVICE)(void) { return 1; // This is the host diff --git a/openmp/runtime/src/kmp_gsupport.cpp b/openmp/runtime/src/kmp_gsupport.cpp index 10841d265958..da8b3211733c 100644 --- a/openmp/runtime/src/kmp_gsupport.cpp +++ b/openmp/runtime/src/kmp_gsupport.cpp @@ -496,7 +496,7 @@ void KMP_EXPAND_NAME(KMP_API_NAME_GOMP_PARALLEL_END)(void) { // // Conversely, KMP_DISPATCH_NEXT returns and inclusive upper bound in *p_ub, // but the Gnu codegen expects an excluside upper bound, so the adjustment -// "*p_ub += stride" compenstates for the discrepancy. +// "*p_ub += stride" compensates for the discrepancy. // // Correction: the gnu codegen always adjusts the upper bound by +-1, not the // stride value. We adjust the dispatch parameters accordingly (by +-1), but diff --git a/openmp/runtime/src/kmp_itt.inl b/openmp/runtime/src/kmp_itt.inl index 6e37ce0f083c..fe449ac604b4 100644 --- a/openmp/runtime/src/kmp_itt.inl +++ b/openmp/runtime/src/kmp_itt.inl @@ -12,7 +12,7 @@ //===----------------------------------------------------------------------===// // 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 +// for production build (to let compiler inline functions) or into kmp_itt.c // file for debug build (to reduce the number of files to recompile and save // build time). @@ -502,7 +502,7 @@ void *__kmp_itt_barrier_object(int gtid, int bt, int set_name, // Now form the barrier id. Encode barrier type (bt) in barrier id too, so // barriers of different types do not have the same ids. KMP_BUILD_ASSERT(sizeof(kmp_team_t) >= bs_last_barrier); - // This conditon is a must (we would have zero divide otherwise). + // 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). diff --git a/openmp/runtime/src/kmp_runtime.cpp b/openmp/runtime/src/kmp_runtime.cpp index b219c60ee653..4f4559589e9b 100644 --- a/openmp/runtime/src/kmp_runtime.cpp +++ b/openmp/runtime/src/kmp_runtime.cpp @@ -7152,7 +7152,7 @@ int __kmp_invoke_teams_master(int gtid) { /* this sets the requested number of threads for the next parallel region encountered by this team. since this should be enclosed in the forkjoin - critical section it should avoid race conditions with assymmetrical nested + critical section it should avoid race conditions with asymmetrical nested parallelism */ void __kmp_push_num_threads(ident_t *id, int gtid, int num_threads) { diff --git a/openmp/runtime/src/kmp_str.cpp b/openmp/runtime/src/kmp_str.cpp index fb748d1a54ab..75fd1e25f347 100644 --- a/openmp/runtime/src/kmp_str.cpp +++ b/openmp/runtime/src/kmp_str.cpp @@ -251,7 +251,7 @@ void __kmp_str_fname_init(kmp_str_fname_t *fname, char const *path) { char *base = NULL; // Pointer to the beginning of basename. fname->path = __kmp_str_format("%s", path); // Original code used strdup() function to copy a string, but on Windows* OS - // Intel(R) 64 it causes assertioon id debug heap, so I had to replace + // Intel(R) 64 it causes assertion id debug heap, so I had to replace // strdup with __kmp_str_format(). if (KMP_OS_WINDOWS) { __kmp_str_replace(fname->path, '\\', '/'); diff --git a/openmp/runtime/src/kmp_tasking.cpp b/openmp/runtime/src/kmp_tasking.cpp index d037299f1477..7911f1cad0f8 100644 --- a/openmp/runtime/src/kmp_tasking.cpp +++ b/openmp/runtime/src/kmp_tasking.cpp @@ -933,7 +933,7 @@ static void __kmp_task_finish(kmp_int32 gtid, kmp_task_t *task, } } else { KMP_DEBUG_ASSERT(resumed_task != - NULL); // verify that resumed task is passed as arguemnt + NULL); // verify that resumed task is passed as argument } // Free this task and then ancestor tasks if they have no children. @@ -3090,7 +3090,7 @@ static void __kmp_enable_tasking(kmp_task_team_t *task_team, * master thread may exit the barrier code and free the team data structure, * and return the threads to the thread pool). * - * This does not work with the the tasking code, as the thread is still + * This does not work with the tasking code, as the thread is still * expected to participate in the execution of any tasks that may have been * spawned my a member of the team, and the thread still needs access to all * to each thread in the team, so that it can steal work from it. @@ -3757,7 +3757,7 @@ static void __kmp_bottom_half_finish_proxy(kmp_int32 gtid, kmp_task_t *ptask) { @param gtid Global Thread ID of encountering thread @param ptask Task which execution is completed -Execute the completation of a proxy task from a thread of that is part of the +Execute the completion of a proxy task from a thread of that is part of the team. Run first and bottom halves directly. */ void __kmpc_proxy_task_completed(kmp_int32 gtid, kmp_task_t *ptask) { @@ -3782,7 +3782,7 @@ void __kmpc_proxy_task_completed(kmp_int32 gtid, kmp_task_t *ptask) { @ingroup TASKING @param ptask Task which execution is completed -Execute the completation of a proxy task from a thread that could not belong to +Execute the completion of a proxy task from a thread that could not belong to the team. */ void __kmpc_proxy_task_completed_ooo(kmp_task_t *ptask) { @@ -4193,7 +4193,7 @@ void __kmp_taskloop_recur(ident_t *, int, kmp_task_t *, kmp_uint64 *, #endif void *); -// Execute part of the the taskloop submitted as a task. +// Execute part of the taskloop submitted as a task. int __kmp_taskloop_task(int gtid, void *ptask) { __taskloop_params_t *p = (__taskloop_params_t *)((kmp_task_t *)ptask)->shareds; @@ -4240,8 +4240,8 @@ int __kmp_taskloop_task(int gtid, void *ptask) { return 0; } -// Schedule part of the the taskloop as a task, -// execute the rest of the the taskloop. +// Schedule part of the taskloop as a task, +// execute the rest of the taskloop. // // loc Source location information // gtid Global thread ID diff --git a/openmp/runtime/src/z_Linux_util.cpp b/openmp/runtime/src/z_Linux_util.cpp index 1cc41fda1cb3..1daa3d31047e 100644 --- a/openmp/runtime/src/z_Linux_util.cpp +++ b/openmp/runtime/src/z_Linux_util.cpp @@ -2214,7 +2214,7 @@ int __kmp_get_load_balance(int max) { int __kmp_get_load_balance(int max) { static int permanent_error = 0; static int glb_running_threads = 0; // Saved count of the running threads for - // the thread balance algortihm + // the thread balance algorithm static double glb_call_time = 0; /* Thread balance algorithm call time */ int running_threads = 0; // Number of running threads in the system. @@ -2322,7 +2322,7 @@ int __kmp_get_load_balance(int max) { if (proc_entry->d_type == DT_DIR && isdigit(task_entry->d_name[0])) { ++total_threads; - // Consruct complete stat file path. Easiest way would be: + // Construct complete stat file path. Easiest way would be: // __kmp_str_buf_print( & stat_path, "%s/%s/stat", task_path.str, // task_entry->d_name ); // but seriae of __kmp_str_buf_cat works a bit faster. diff --git a/openmp/runtime/src/z_Windows_NT_util.cpp b/openmp/runtime/src/z_Windows_NT_util.cpp index c149dda56e8e..f463ef6d6edc 100644 --- a/openmp/runtime/src/z_Windows_NT_util.cpp +++ b/openmp/runtime/src/z_Windows_NT_util.cpp @@ -1504,7 +1504,7 @@ void __kmp_free_handle(kmp_thread_t tHandle) { int __kmp_get_load_balance(int max) { static ULONG glb_buff_size = 100 * 1024; - // Saved count of the running threads for the thread balance algortihm + // Saved count of the running threads for the thread balance algorithm static int glb_running_threads = 0; static double glb_call_time = 0; /* Thread balance algorithm call time */ diff --git a/openmp/runtime/test/ompt/callback.h b/openmp/runtime/test/ompt/callback.h index a5ba897c6ec1..cd507ad541ea 100644 --- a/openmp/runtime/test/ompt/callback.h +++ b/openmp/runtime/test/ompt/callback.h @@ -149,7 +149,7 @@ ompt_label_##id: print_possible_return_addresses(get_ompt_label_address(id)) #if KMP_ARCH_X86 || KMP_ARCH_X86_64 -// On X86 the NOP instruction is 1 byte long. In addition, the comiler inserts +// On X86 the NOP instruction is 1 byte long. In addition, the compiler inserts // a MOV instruction for non-void runtime functions which is 3 bytes long. #define print_possible_return_addresses(addr) \ printf("%" PRIu64 ": current_address=%p or %p for non-void functions\n", \ diff --git a/openmp/runtime/test/tasking/omp_taskloop_grainsize.c b/openmp/runtime/test/tasking/omp_taskloop_grainsize.c index 0833073efb24..f1812bd7d0be 100644 --- a/openmp/runtime/test/tasking/omp_taskloop_grainsize.c +++ b/openmp/runtime/test/tasking/omp_taskloop_grainsize.c @@ -8,7 +8,7 @@ /* * Test for taskloop - * Method: caculate how many times the iteration space is dispatched + * Method: calculate how many times the iteration space is dispatched * and judge if each dispatch has the requested grainsize * It is possible for two adjacent chunks are executed by the same thread */ diff --git a/openmp/runtime/test/tasking/omp_taskloop_num_tasks.c b/openmp/runtime/test/tasking/omp_taskloop_num_tasks.c index 75cc337aad91..1999cb57d282 100644 --- a/openmp/runtime/test/tasking/omp_taskloop_num_tasks.c +++ b/openmp/runtime/test/tasking/omp_taskloop_num_tasks.c @@ -12,7 +12,7 @@ /* * Test for taskloop - * Method: caculate how many times the iteration space is dispatched + * Method: calculate how many times the iteration space is dispatched * and judge if each dispatch has the requested grainsize * It is possible for two adjacent chunks are executed by the same thread */ diff --git a/openmp/runtime/test/worksharing/for/omp_for_bigbounds.c b/openmp/runtime/test/worksharing/for/omp_for_bigbounds.c index 901d76083277..9be72fa136fd 100644 --- a/openmp/runtime/test/worksharing/for/omp_for_bigbounds.c +++ b/openmp/runtime/test/worksharing/for/omp_for_bigbounds.c @@ -7,7 +7,7 @@ /* * Test that large bounds are handled properly and calculations of - * loop iterations don't accidently overflow + * loop iterations don't accidentally overflow */ #include #include diff --git a/openmp/runtime/test/worksharing/for/omp_for_schedule_dynamic.c b/openmp/runtime/test/worksharing/for/omp_for_schedule_dynamic.c index 6d4f59b582e8..4433d2a3dafb 100644 --- a/openmp/runtime/test/worksharing/for/omp_for_schedule_dynamic.c +++ b/openmp/runtime/test/worksharing/for/omp_for_schedule_dynamic.c @@ -1,7 +1,7 @@ // RUN: %libomp-compile-and-run /* * Test for dynamic scheduling with chunk size - * Method: caculate how many times the iteration space is dispatched + * Method: calculate how many times the iteration space is dispatched * and judge if each dispatch has the requested chunk size * unless it is the last one. * It is possible for two adjacent chunks are assigned to the same thread diff --git a/openmp/runtime/test/worksharing/for/omp_for_schedule_static_3.c b/openmp/runtime/test/worksharing/for/omp_for_schedule_static_3.c index 922f27abe4b3..307445b5d458 100644 --- a/openmp/runtime/test/worksharing/for/omp_for_schedule_static_3.c +++ b/openmp/runtime/test/worksharing/for/omp_for_schedule_static_3.c @@ -147,7 +147,7 @@ int test_omp_for_schedule_static_3() } /* Now we check if several loop regions in one parallel region have the - * same logical assignement of chunks to threads. We use the nowait + * same logical assignment of chunks to threads. We use the nowait * clause to increase the probability to get an error. */ /* First we allocate some more memmory */ diff --git a/openmp/runtime/tools/lib/Platform.pm b/openmp/runtime/tools/lib/Platform.pm index 0ff7597e5b97..0a3a0cfd1ad8 100644 --- a/openmp/runtime/tools/lib/Platform.pm +++ b/openmp/runtime/tools/lib/Platform.pm @@ -413,7 +413,7 @@ the script assumes host architecture is target one. =item B Input string is an architecture name to canonize. The function recognizes many variants, for example: -C<32e>, C, C, etc. Returned string is a canononized architecture name, +C<32e>, C, C, etc. Returned string is a canonized architecture name, one of: C<32>, C<32e>, C<64>, C, C, C, C, C, C, C or C is input string is not recognized. =item B diff --git a/openmp/runtime/tools/lib/Uname.pm b/openmp/runtime/tools/lib/Uname.pm index a14cb3a6531e..6b76a22997ee 100644 --- a/openmp/runtime/tools/lib/Uname.pm +++ b/openmp/runtime/tools/lib/Uname.pm @@ -356,7 +356,7 @@ if ( 0 ) { $output =~ m{^ProductVersion:\s*(.*)\s*$}m or runtime_error( "There is no ProductVersion in sw_vers output:", $output, "(eof)" ); my $release = $1; - # Sometimes release reported as "10.4.11" (3 componentes), sometimes as "10.6". + # Sometimes release reported as "10.4.11" (3 components), sometimes as "10.6". # Handle both variants. $release =~ m{^(\d+.\d+)(?:\.\d+)?(?=\s|$)} or runtime_error( "Cannot parse OS X* version: $release" ); diff --git a/openmp/runtime/tools/lib/tools.pm b/openmp/runtime/tools/lib/tools.pm index cbed6363e2a4..9415037cba7d 100644 --- a/openmp/runtime/tools/lib/tools.pm +++ b/openmp/runtime/tools/lib/tools.pm @@ -256,7 +256,7 @@ sub get_options { "v|verbose" => sub { ++ $verbose; $ENV{ "tools.pm_verbose" } = $verbose; }, "quiet" => sub { -- $verbose; $ENV{ "tools.pm_verbose" } = $verbose; }, "with-timestamps" => sub { $timestamps = 1; $ENV{ "tools.pm_timestamps" } = $timestamps; }, - @_, # Caller argumetsa are at the end so caller options overrides standard. + @_, # Caller arguments are at the end so caller options overrides standard. ) or cmdline_error(); }; # sub get_options @@ -708,7 +708,7 @@ Look for the first occurrence of "icc" in the specified directories: my $icc = which( "icc", -dirs => [ ".", "/usr/local/bin", "/usr/bin", "/bin" ] ); -Look for the the C file: +Look for the C file: my @omp_lib = which( "omp_lib.f", -all => 1, -exec => 0, -dirs => [ @include ] );