[OPENMP] Add dependency to clang/clang-headers etc. for in-tree build of libomp.

[ABataev]

Summary

Add additional dependency to clang/clang-headers/FileCheck to avoid possible troubles with in-tree build/test of libomp + allow parallel testing of libomp

[chandlerc]

runtime/test/CMakeLists.txt

57 ↗

(On Diff #38375)

This seems like it should be landed separately, and after your patch to Clang lands?

runtime/test/api/omp_get_wtime.c

12 ↗

(On Diff #38375)

The commit log doesn't make it clear why this has changed?

[ABataev]

runtime/test/CMakeLists.txt

57 ↗

(On Diff #38375)

Ok, will revert it back for now

runtime/test/api/omp_get_wtime.c

12 ↗

(On Diff #38375)

This is required to fix possible issues with parallel testing of libomp. This test is quite sensitive to possible time diffs, so it's better to take a little bit more time to check that omp_get_wtime() function works correctly

[ABataev]

Update after review

[chandlerc]

Looks good. Please also add the information about the test code change to the commit log when you commit this.

[ABataev]

Resolved the remaining race conditions in tests. All tests should pass now.

openmp/trunk/runtime/test/CMakeLists.txt

if(NOT LIT_EXECUTABLE)
     libomp_say("Please put llvm-lit in your PATH or set LIBOMP_LLVM_LIT_EXECUTABLE to its full path")
     libomp_warning_say("The check-libomp target will not be available!")
     return()
   endif()
   # Set lit arguments
   # The -j 1 lets the actual tests run with the entire machine.
   # We have one test thread that spawns the tests serially.  This allows
   # Each test to use the entire machine.
-  set(LIBOMP_LIT_ARGS_DEFAULT "-sv --show-unsupported --show-xfail -j 1")
+  set(LIBOMP_LIT_ARGS_DEFAULT "-sv --show-unsupported --show-xfail")
   if(MSVC OR XCODE)
     set(LIBOMP_LIT_ARGS_DEFAULT "${LIBOMP_LIT_ARGS_DEFAULT} --no-progress-bar")
   endif()
   set(LIBOMP_LIT_ARGS "${LIBOMP_LIT_ARGS_DEFAULT}" CACHE STRING
     "Default options for lit")
   separate_arguments(LIBOMP_LIT_ARGS)
   add_custom_target(check-libomp
     COMMAND ${PYTHON_EXECUTABLE} ${LIT_EXECUTABLE} ${LIBOMP_LIT_ARGS} ${CMAKE_CURRENT_BINARY_DIR}
     DEPENDS omp
     COMMENT "Running libomp tests"
     ${cmake_3_2_USES_TERMINAL}
   )
 else()
   # LLVM source tree build, test just-built clang
   if(NOT MSVC)
     set(LIBOMP_TEST_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang)
   else()
     set(LIBOMP_TEST_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang.exe)
   endif()
   set(LIBOMP_TEST_OPENMP_FLAG -fopenmp=libomp)
   # Use add_lit_testsuite() from LLVM CMake.
-  add_lit_testsuite(check-libomp 
+  add_lit_testsuite(check-libomp
     "Running libomp tests"
     ${CMAKE_CURRENT_BINARY_DIR}
-    ARGS "-j 1"
-    DEPENDS omp
+    DEPENDS clang clang-headers FileCheck omp
   )
 endif()
 
 # Configure the lit.site.cfg.in file
 set(AUTO_GEN_COMMENT "## Autogenerated by libomp configuration.\n# Do not edit!")
 configure_file(lit.site.cfg.in lit.site.cfg @ONLY)
 

openmp/trunk/runtime/test/api/omp_get_wtime.c

 // RUN: %libomp-compile-and-run
 #include <stdio.h>
 #include <stdlib.h>
 #include "omp_testsuite.h"
 #include "omp_my_sleep.h"
 
 int test_omp_get_wtime()
 {
   double start;
   double end;
   double measured_time;
-  double wait_time = 0.25; 
+  double wait_time = 1.0; 
   start = 0;
   end = 0;
   start = omp_get_wtime();
   my_sleep (wait_time); 
   end = omp_get_wtime();
   measured_time = end-start;
   return ((measured_time > 0.97 * wait_time) && (measured_time < 1.03 * wait_time)) ;
 }

openmp/trunk/runtime/test/omp_testsuite.h

 /* Global headerfile of the OpenMP Testsuite */
 
 #ifndef OMP_TESTSUITE_H
 #define OMP_TESTSUITE_H
 
 #include <stdio.h>
 #include <omp.h>
 
 /* General                                                */
 /**********************************************************/
 #define LOOPCOUNT 1000 /* Number of iterations to slit amongst threads */
 #define REPETITIONS 10 /* Number of times to run each test */
 
 /* following times are in seconds */
-#define SLEEPTIME 0.1
+#define SLEEPTIME 1
 
 /* Definitions for tasks                                  */
 /**********************************************************/
 #define NUM_TASKS 25
 #define MAX_TASKS_PER_THREAD 5
 
 #endif

openmp/trunk/runtime/test/worksharing/for/omp_for_schedule_auto.c

int test_omp_for_auto()
   int j;
   int sum;
   int sum0;
   int known_sum;
   int threadsnum;
 
   sum = 0;
   sum0 = 12345;
-  sum1 = 0;
 
   // array which keeps track of which threads participated in the for loop
   // e.g., given 4 threads, [ 0 | 1 | 1 | 0 ] implies
   //       threads 0 and 3 did not, threads 1 and 2 did
   int max_threads = omp_get_max_threads();
   int* active_threads = (int*)malloc(sizeof(int)*max_threads);
   for(j = 0; j < max_threads; j++) 
     active_threads[j] = 0;
 
   #pragma omp parallel
   {
     int i;
+    sum1 = 0;
     #pragma omp for firstprivate(sum0) schedule(auto)
     for (i = 1; i <= LOOPCOUNT; i++) {
       active_threads[omp_get_thread_num()] = 1;
       sum0 = sum0 + i;
       sum1 = sum0;
     }
   
     #pragma omp critical