diff options
24 files changed, 44 insertions, 44 deletions
diff --git a/openmp/offload/doc/doxygen/config b/openmp/offload/doc/doxygen/config index 3ef1019b5ce..d45b69678e2 100755 --- a/openmp/offload/doc/doxygen/config +++ b/openmp/offload/doc/doxygen/config @@ -1972,7 +1972,7 @@ PREDEFINED = COI_LIBRARY_VERSION=2 -DMYO_SUPPORT -DOFFLOAD_DEBUG=1 - EXPAND_AS_DEFINED = # If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will -# remove all refrences to function-like macros that are alone on a line, have an +# remove all references to function-like macros that are alone on a line, have an # all uppercase name, and do not end with a semicolon. Such function macros are # typically used for boiler-plate code, and will confuse the parser if not # removed. diff --git a/openmp/offload/src/cean_util.cpp b/openmp/offload/src/cean_util.cpp index d307cc5567a..fe1890b718b 100644 --- a/openmp/offload/src/cean_util.cpp +++ b/openmp/offload/src/cean_util.cpp @@ -60,7 +60,7 @@ CeanReadRanges * init_read_ranges_arr_desc(const arr_desc *ap) return res; } -// check if ranges described by 1 argument could be transfered into ranges +// check if ranges described by 1 argument could be transferred into ranges // described by 2-nd one bool cean_ranges_match( CeanReadRanges * read_rng1, diff --git a/openmp/offload/src/cean_util.h b/openmp/offload/src/cean_util.h index dfc74dd20e7..0eb1f53cf68 100644 --- a/openmp/offload/src/cean_util.h +++ b/openmp/offload/src/cean_util.h @@ -60,7 +60,7 @@ bool is_arr_desc_contiguous(const arr_desc *ap); // to read consequently contiguous ranges described by "ap" argument CeanReadRanges * init_read_ranges_arr_desc(const arr_desc *ap); -// check if ranges described by 1 argument could be transfered into ranges +// check if ranges described by 1 argument could be transferred into ranges // described by 2-nd one bool cean_ranges_match( CeanReadRanges * read_rng1, @@ -75,7 +75,7 @@ bool get_next_range( int64_t *offset ); -// returns number of transfered bytes +// returns number of transferred bytes int64_t cean_get_transf_size(CeanReadRanges * read_rng); #if OFFLOAD_DEBUG > 0 diff --git a/openmp/offload/src/coi/coi_client.h b/openmp/offload/src/coi/coi_client.h index 203c663f754..4775a8bd056 100644 --- a/openmp/offload/src/coi/coi_client.h +++ b/openmp/offload/src/coi/coi_client.h @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// -// The interface betwen offload library and the COI API on the host +// The interface between offload library and the COI API on the host #ifndef COI_CLIENT_H_INCLUDED #define COI_CLIENT_H_INCLUDED diff --git a/openmp/offload/src/coi/coi_server.h b/openmp/offload/src/coi/coi_server.h index b552057d332..e744d9e752a 100644 --- a/openmp/offload/src/coi/coi_server.h +++ b/openmp/offload/src/coi/coi_server.h @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// -//The interface betwen offload library and the COI API on the target. +//The interface between offload library and the COI API on the target. #ifndef COI_SERVER_H_INCLUDED #define COI_SERVER_H_INCLUDED diff --git a/openmp/offload/src/compiler_if_host.cpp b/openmp/offload/src/compiler_if_host.cpp index aa4902c1dad..2bc430b32c2 100644 --- a/openmp/offload/src/compiler_if_host.cpp +++ b/openmp/offload/src/compiler_if_host.cpp @@ -52,7 +52,7 @@ extern "C" OFFLOAD OFFLOAD_TARGET_ACQUIRE( OFFLOAD_TIMER_START(timer_data, c_offload_host_initialize); - // initalize all devices is init_type is on_offload_all + // initialize all devices is init_type is on_offload_all if (retval && __offload_init_type == c_init_on_offload_all) { for (int i = 0; i < mic_engines_total; i++) { mic_engines[i].init(); diff --git a/openmp/offload/src/offload_engine.h b/openmp/offload/src/offload_engine.h index 73872b75bd6..d1a96313018 100644 --- a/openmp/offload/src/offload_engine.h +++ b/openmp/offload/src/offload_engine.h @@ -214,7 +214,7 @@ struct PersistData { stack_ptr_data = new PtrData(0, size); } - // 1-st key value - begining of the stack at CPU + // 1-st key value - beginning of the stack at CPU const void * stack_cpu_addr; // 2-nd key value - identifier of routine invocation at CPU uint64_t routine_id; diff --git a/openmp/offload/src/offload_env.cpp b/openmp/offload/src/offload_env.cpp index 02170c03ee4..d037338c73a 100644 --- a/openmp/offload/src/offload_env.cpp +++ b/openmp/offload/src/offload_env.cpp @@ -126,7 +126,7 @@ void MicEnvVar::add_env_var( else { card = get_card(card_number); if (!card) { - // definition for new card occured + // definition for new card occurred card = new CardEnvVars(card_number); card_spec_list.push_back(card); } @@ -299,7 +299,7 @@ void MicEnvVar::mic_parse_env_var_list( // Collect all definitions for the card with number "card_num". // The returned result is vector of string pointers defining one // environment variable. The vector is terminated by NULL pointer. -// In the begining of the vector there are env vars defined as +// In the beginning of the vector there are env vars defined as // <mic-prefix>_<card-number>_<var>=<value> // or // <mic-prefix>_<card-number>_ENV=<env-vars> diff --git a/openmp/offload/src/offload_host.cpp b/openmp/offload/src/offload_host.cpp index 55edbd50f99..38d5139212b 100644 --- a/openmp/offload/src/offload_host.cpp +++ b/openmp/offload/src/offload_host.cpp @@ -2290,7 +2290,7 @@ bool OffloadDescriptor::is_signaled() // Send pointer data if source or destination or both of them are // noncontiguous. There is guarantee that length of destination enough for -// transfered data. +// transferred data. bool OffloadDescriptor::send_noncontiguous_pointer_data( int i, PtrData* src_data, @@ -2915,10 +2915,10 @@ bool OffloadDescriptor::compute() return true; } -// recieve pointer data if source or destination or both of them are +// receive pointer data if source or destination or both of them are // noncontiguous. There is guarantee that length of destination enough for -// transfered data. -bool OffloadDescriptor::recieve_noncontiguous_pointer_data( +// transferred data. +bool OffloadDescriptor::receive_noncontiguous_pointer_data( int i, char* base, COIBUFFER dst_buf, @@ -2928,7 +2928,7 @@ bool OffloadDescriptor::recieve_noncontiguous_pointer_data( int64_t offset_src, offset_dst; int64_t length_src, length_dst; int64_t length_src_cur, length_dst_cur; - int64_t recieve_size, data_recieved = 0; + int64_t receive_size, data_received = 0; COIRESULT res; bool dst_is_empty = true; bool src_is_empty = true; @@ -2939,10 +2939,10 @@ bool OffloadDescriptor::recieve_noncontiguous_pointer_data( length_dst = !m_vars[i].into ? length_src : (m_vars_extra[i].read_rng_dst) ? m_vars_extra[i].read_rng_dst->range_size : m_vars[i].size; - recieve_size = (length_src < length_dst) ? length_src : length_dst; + receive_size = (length_src < length_dst) ? length_src : length_dst; // consequently get contiguous ranges, - // define corresponded destination offset and recieve data + // define corresponded destination offset and receive data do { // get sorce offset if (src_is_empty) { @@ -2953,7 +2953,7 @@ bool OffloadDescriptor::recieve_noncontiguous_pointer_data( break; } } - else if (data_recieved == 0) { + else if (data_received == 0) { offset_src = 0; } else { @@ -2964,9 +2964,9 @@ bool OffloadDescriptor::recieve_noncontiguous_pointer_data( else { // if source is contiguous or its contiguous range is greater // than destination one - offset_src += recieve_size; + offset_src += receive_size; } - length_src_cur -= recieve_size; + length_src_cur -= receive_size; src_is_empty = length_src_cur == 0; // get destination offset @@ -2995,9 +2995,9 @@ bool OffloadDescriptor::recieve_noncontiguous_pointer_data( else { // if destination is contiguous or its contiguous range is greater // than source one - offset_dst += recieve_size; + offset_dst += receive_size; } - length_dst_cur -= recieve_size; + length_dst_cur -= receive_size; dst_is_empty = length_dst_cur == 0; if (dst_buf != 0) { @@ -3008,7 +3008,7 @@ bool OffloadDescriptor::recieve_noncontiguous_pointer_data( m_vars[i].offset + offset_src + m_vars[i].mic_offset - m_vars_extra[i].src_data->alloc_disp, - recieve_size, + receive_size, COI_COPY_UNSPECIFIED, m_in_deps_total, m_in_deps_total > 0 ? m_in_deps : 0, @@ -3028,7 +3028,7 @@ bool OffloadDescriptor::recieve_noncontiguous_pointer_data( m_vars[i].mic_offset - m_vars_extra[i].src_data->alloc_disp, base + offset_dst, - recieve_size, + receive_size, COI_COPY_UNSPECIFIED, m_in_deps_total, m_in_deps_total > 0 ? m_in_deps : 0, @@ -3041,7 +3041,7 @@ bool OffloadDescriptor::recieve_noncontiguous_pointer_data( report_coi_error(c_buf_read, res); } } - data_recieved += recieve_size; + data_received += receive_size; } while (true); return true; @@ -3095,7 +3095,7 @@ bool OffloadDescriptor::receive_pointer_data(bool is_async) if (m_vars[i].flags.is_noncont_src || m_vars[i].flags.is_noncont_dst) { - recieve_noncontiguous_pointer_data( + receive_noncontiguous_pointer_data( i, base, dst_buf, event); } else if (dst_buf != 0) { @@ -3209,7 +3209,7 @@ bool OffloadDescriptor::receive_pointer_data(bool is_async) if (m_vars[i].flags.is_noncont_src || m_vars[i].flags.is_noncont_dst) { - recieve_noncontiguous_pointer_data( + receive_noncontiguous_pointer_data( i, base, dst_buf, event); } else if (dst_buf != 0) { @@ -3513,7 +3513,7 @@ bool OffloadDescriptor::gen_var_descs_for_pointer_array(int i) ap = static_cast<const arr_desc*>(vd3->ptr_array); - // "pointers_number" for total number of transfered pointers. + // "pointers_number" for total number of transferred pointers. // For each of them we create new var_desc and put it at the bottom // of the var_desc's array get_arr_desc_numbers(ap, sizeof(void *), ptr.offset, ptr.size, @@ -4241,7 +4241,7 @@ extern "C" void __offload_register_image(const void *target_image) case ET_DYN: // Registration code for libraries is called from the DllMain - // context (on windows) and thus we cannot do anything usefull + // context (on windows) and thus we cannot do anything useful // here. So we just add it to the list of pending libraries for // the later use. __target_libs_lock.lock(); diff --git a/openmp/offload/src/offload_host.h b/openmp/offload/src/offload_host.h index 4c489070849..ea2399635de 100644 --- a/openmp/offload/src/offload_host.h +++ b/openmp/offload/src/offload_host.h @@ -107,7 +107,7 @@ private: PtrData* src_buf, PtrData* dst_buf, COIEVENT *event); - bool recieve_noncontiguous_pointer_data( + bool receive_noncontiguous_pointer_data( int i, char* src_data, COIBUFFER dst_buf, diff --git a/openmp/testsuite/c/omp_barrier.c b/openmp/testsuite/c/omp_barrier.c index b005f3bb27c..df669e2c11e 100644 --- a/openmp/testsuite/c/omp_barrier.c +++ b/openmp/testsuite/c/omp_barrier.c @@ -1,5 +1,5 @@ <ompts:test> -<ompts:testdescription>Test which checks the omp barrier directive. The test creates several threads and sends one of them sleeping before setting a flag. After the barrier the other ones do some littel work depending on the flag.</ompts:testdescription> +<ompts:testdescription>Test which checks the omp barrier directive. The test creates several threads and sends one of them sleeping before setting a flag. After the barrier the other ones do some little work depending on the flag.</ompts:testdescription> <ompts:ompversion>2.0</ompts:ompversion> <ompts:directive>omp barrier</ompts:directive> <ompts:testcode> diff --git a/openmp/testsuite/c/omp_for_schedule_guided.c b/openmp/testsuite/c/omp_for_schedule_guided.c index 5b0ed0d08c6..83564a5a3a6 100644 --- a/openmp/testsuite/c/omp_for_schedule_guided.c +++ b/openmp/testsuite/c/omp_for_schedule_guided.c @@ -214,7 +214,7 @@ int <ompts:testcode:functionname>omp_for_schedule_guided</ompts:testcode:functio fprintf (logFile, "Chunksize did not decrease: %d instead of %d\n", chunksizes[i],expected_chunk_size); #endif - /* calculating the remaining ammount of work */ + /* calculating the remaining amount of work */ openwork -= chunksizes[i]; } } diff --git a/openmp/testsuite/c/omp_parallel_for_if.c b/openmp/testsuite/c/omp_parallel_for_if.c index a5de0a9332f..52886baa431 100644 --- a/openmp/testsuite/c/omp_parallel_for_if.c +++ b/openmp/testsuite/c/omp_parallel_for_if.c @@ -33,6 +33,6 @@ int <ompts:testcode:functionname>omp_parallel_for_if</ompts:testcode:functionnam known_sum = (LOOPCOUNT * (LOOPCOUNT + 1)) / 2; fprintf (logFile, "Number of threads determined by omp_get_num_threads: %d\n", num_threads); return (known_sum == sum && num_threads == 1); -} /* end of check_paralel_for_private */ +} /* end of check_parallel_for_private */ </ompts:testcode> </ompts:test> diff --git a/openmp/testsuite/c/omp_parallel_for_private.c b/openmp/testsuite/c/omp_parallel_for_private.c index 6e553ece906..40280cca548 100644 --- a/openmp/testsuite/c/omp_parallel_for_private.c +++ b/openmp/testsuite/c/omp_parallel_for_private.c @@ -43,6 +43,6 @@ int <ompts:testcode:functionname>omp_parallel_for_private</ompts:testcode:functi known_sum = (LOOPCOUNT * (LOOPCOUNT + 1)) / 2; return (known_sum == sum); -} /* end of check_paralel_for_private */ +} /* end of check_parallel_for_private */ </ompts:testcode> </ompts:test> diff --git a/openmp/testsuite/c/omp_parallel_sections_private.c b/openmp/testsuite/c/omp_parallel_sections_private.c index f1819707829..c5fe414f399 100644 --- a/openmp/testsuite/c/omp_parallel_sections_private.c +++ b/openmp/testsuite/c/omp_parallel_sections_private.c @@ -56,7 +56,7 @@ int <ompts:testcode:functionname>omp_parallel_sections_private</ompts:testcode:f sum= sum+sum0; } /*end of critical */ } - } /*end of paralell sections*/ + } /*end of parallel sections*/ </ompts:orphan> known_sum=(999*1000)/2+7; return (known_sum==sum); diff --git a/openmp/testsuite/c/omp_single.c b/openmp/testsuite/c/omp_single.c index 2c92726b2fa..032b0d26682 100644 --- a/openmp/testsuite/c/omp_single.c +++ b/openmp/testsuite/c/omp_single.c @@ -1,5 +1,5 @@ <ompts:test> -<ompts:testdescription>Test which checks the omp single directive by controling how often a directive is called in an omp single region.</ompts:testdescription> +<ompts:testdescription>Test which checks the omp single directive by controlling how often a directive is called in an omp single region.</ompts:testdescription> <ompts:ompversion>2.0</ompts:ompversion> <ompts:directive>omp single</ompts:directive> <ompts:dependences>omp parallel private,omp flush</ompts:dependences> diff --git a/openmp/testsuite/c/omp_task.c b/openmp/testsuite/c/omp_task.c index 623e7a7e011..ae89790cd84 100644 --- a/openmp/testsuite/c/omp_task.c +++ b/openmp/testsuite/c/omp_task.c @@ -47,6 +47,6 @@ int <ompts:testcode:functionname>omp_task</ompts:testcode:functionname>(FILE * l return 1; } return 0; -} /* end of check_paralel_for_private */ +} /* end of check_parallel_for_private */ </ompts:testcode> </ompts:test> diff --git a/openmp/testsuite/c/omp_task_final.c b/openmp/testsuite/c/omp_task_final.c index e6560f412c4..4e00c5f4ddf 100644 --- a/openmp/testsuite/c/omp_task_final.c +++ b/openmp/testsuite/c/omp_task_final.c @@ -47,6 +47,6 @@ int <ompts:testcode:functionname>omp_task_final</ompts:testcode:functionname>(FI error++; } return (error==0); -} /* end of check_paralel_for_private */ +} /* end of check_parallel_for_private */ </ompts:testcode> </ompts:test> diff --git a/openmp/testsuite/fortran/do_schedule_guided.f b/openmp/testsuite/fortran/do_schedule_guided.f index aa0755100ce..5d0e7edb71b 100644 --- a/openmp/testsuite/fortran/do_schedule_guided.f +++ b/openmp/testsuite/fortran/do_schedule_guided.f @@ -7,7 +7,7 @@ ! TODO: ! C. Niethammer: ! Find check to decide if the test was run as schedule(static) because - ! this also can pass the test if the work is devided into thread-counts + ! this also can pass the test if the work is divided into thread-counts INTEGER FUNCTION <ompts:testcode:functionname>do_schedule_guided</ompts:testcode:functionname>() IMPLICIT NONE INTEGER omp_get_thread_num,omp_get_num_threads diff --git a/openmp/testsuite/fortran/omp_barrier.f b/openmp/testsuite/fortran/omp_barrier.f index e14a9ba3861..5125994149e 100644 --- a/openmp/testsuite/fortran/omp_barrier.f +++ b/openmp/testsuite/fortran/omp_barrier.f @@ -1,5 +1,5 @@ <ompts:test> -<ompts:testdescription>Test which checks the omp barrier directive. The test creates several threads and sends one of them sleeping before setting a flag. After the barrier the other ones do some littel work depending on the flag.</ ompts:testdescription> +<ompts:testdescription>Test which checks the omp barrier directive. The test creates several threads and sends one of them sleeping before setting a flag. After the barrier the other ones do some little work depending on the flag.</ ompts:testdescription> <ompts:ompversion>2.0</ompts:ompversion> <ompts:directive>omp barrier</ompts:directive> <ompts:testcode> diff --git a/openmp/testsuite/fortran/omp_num_threads.f b/openmp/testsuite/fortran/omp_num_threads.f index 2227e634b95..a1ede73a6f3 100644 --- a/openmp/testsuite/fortran/omp_num_threads.f +++ b/openmp/testsuite/fortran/omp_num_threads.f @@ -24,7 +24,7 @@ !Yi Wen added omp_Set_dynamics here to make sure num_threads clause work !Thanks to Dr. Yin Ma in Absoft. should be not be called before the test loop -!becuase it allows the dynamic adjustment of the number of threads at runtime +!because it allows the dynamic adjustment of the number of threads at runtime !instead of using the max_threads set. !CALL OMP_SET_DYNAMIC(.TRUE.) diff --git a/openmp/testsuite/fortran/omp_single.f b/openmp/testsuite/fortran/omp_single.f index c6826211d25..e8821cac730 100644 --- a/openmp/testsuite/fortran/omp_single.f +++ b/openmp/testsuite/fortran/omp_single.f @@ -1,5 +1,5 @@ <ompts:test> -<ompts:testdescription>Test which checks the omp single directive by controling how often a directive is called in an omp single region.</ompts:testdescription> +<ompts:testdescription>Test which checks the omp single directive by controlling how often a directive is called in an omp single region.</ompts:testdescription> <ompts:ompversion>2.0</ompts:ompversion> <ompts:directive>omp single</ompts:directive> <ompts:dependences>omp parallel private,omp flush</ompts:dependences> diff --git a/openmp/testsuite/ompts_parser.pl b/openmp/testsuite/ompts_parser.pl index 5e2a6404f93..98d7271fcbd 100755 --- a/openmp/testsuite/ompts_parser.pl +++ b/openmp/testsuite/ompts_parser.pl @@ -131,7 +131,7 @@ foreach $testtype (@testtypes) $code = "#include \"omp_testsuite.h\"\n".$orphvarsdef . $orphfuncsdefs . $code . $orphfuncs; } else { - print "An error occured!"; + print "An error occurred!"; } } # remove parameters between <ompts:orphan:parms> tags, added by joon diff --git a/openmp/testsuite/ompts_standaloneProc.f b/openmp/testsuite/ompts_standaloneProc.f index 8944e920cc6..4afcab604b4 100644 --- a/openmp/testsuite/ompts_standaloneProc.f +++ b/openmp/testsuite/ompts_standaloneProc.f @@ -44,7 +44,7 @@ DO j = 1, N temp = <testfunctionname></testfunctionname>() IF (temp .EQ. 1) THEN - WRITE (1,*) j, ". test successfull." + WRITE (1,*) j, ". test successful." success = success + 1 ELSE WRITE (1,*) "Error: ",j, ". test failed." |
