[Openmp-commits] [openmp] r264031 - [OMPT] Make tests require OMPT_BLAME

[Jonas Hahnfeld via Openmp-commits]

Author: hahnfeld
Date: Tue Mar 22 03:23:24 2016
New Revision: 264031

URL: http://llvm.org/viewvc/llvm-project?rev=264031&view=rev
Log:
[OMPT] Make tests require OMPT_BLAME

ompt_event_barrier_{begin,end} are optional blame events.
In total it doesn't make any sense to test partially built OMPT support.

Modified:
    openmp/trunk/runtime/test/CMakeLists.txt
    openmp/trunk/runtime/test/lit.cfg
    openmp/trunk/runtime/test/lit.site.cfg.in
    openmp/trunk/runtime/test/ompt/parallel/nested.c
    openmp/trunk/runtime/test/ompt/parallel/nested_serialized.c
    openmp/trunk/runtime/test/ompt/parallel/normal.c
    openmp/trunk/runtime/test/ompt/parallel/serialized.c

Modified: openmp/trunk/runtime/test/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/test/CMakeLists.txt?rev=264031&r1=264030&r2=264031&view=diff
==============================================================================
--- openmp/trunk/runtime/test/CMakeLists.txt (original)
+++ openmp/trunk/runtime/test/CMakeLists.txt Tue Mar 22 03:23:24 2016
@@ -18,6 +18,7 @@ endmacro()
 
 pythonize_bool(LIBOMP_USE_HWLOC)
 pythonize_bool(LIBOMP_OMPT_SUPPORT)
+pythonize_bool(LIBOMP_OMPT_BLAME)
 pythonize_bool(LIBOMP_OMPT_TRACE)
 
 set(LIBOMP_TEST_CFLAGS "" CACHE STRING

Modified: openmp/trunk/runtime/test/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/test/lit.cfg?rev=264031&r1=264030&r2=264031&view=diff
==============================================================================
--- openmp/trunk/runtime/test/lit.cfg (original)
+++ openmp/trunk/runtime/test/lit.cfg Tue Mar 22 03:23:24 2016
@@ -75,8 +75,6 @@ if config.has_ompt and config.test_filec
 
 if config.has_ompt:
     config.available_features.add("ompt")
-    if config.has_ompt_trace:
-        config.available_features.add("ompt-trace")
     # for callback.h
     config.test_cflags += " -I " + config.test_source_root + "/ompt"
 

Modified: openmp/trunk/runtime/test/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/test/lit.site.cfg.in?rev=264031&r1=264030&r2=264031&view=diff
==============================================================================
--- openmp/trunk/runtime/test/lit.site.cfg.in (original)
+++ openmp/trunk/runtime/test/lit.site.cfg.in Tue Mar 22 03:23:24 2016
@@ -10,8 +10,7 @@ config.omp_header_directory = "@LIBOMP_B
 config.operating_system = "@CMAKE_SYSTEM_NAME@"
 config.hwloc_library_dir = "@LIBOMP_HWLOC_LIBRARY_DIR@"
 config.using_hwloc = @LIBOMP_USE_HWLOC@
-config.has_ompt = @LIBOMP_OMPT_SUPPORT@
-config.has_ompt_trace = @LIBOMP_OMPT_TRACE@
+config.has_ompt = @LIBOMP_OMPT_SUPPORT@ and @LIBOMP_OMPT_BLAME@ and @LIBOMP_OMPT_TRACE@
 
 # Let the main config do the real work.
 lit_config.load_config(config, "@LIBOMP_BASE_DIR@/test/lit.cfg")

Modified: openmp/trunk/runtime/test/ompt/parallel/nested.c
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/test/ompt/parallel/nested.c?rev=264031&r1=264030&r2=264031&view=diff
==============================================================================
--- openmp/trunk/runtime/test/ompt/parallel/nested.c (original)
+++ openmp/trunk/runtime/test/ompt/parallel/nested.c Tue Mar 22 03:23:24 2016
@@ -1,6 +1,6 @@
 // RUN: %libomp-compile-and-run | FileCheck %s
 // RUN: %libomp-compile-and-run | %sort-threads | FileCheck --check-prefix=THREADS %s
-// REQUIRES: ompt, ompt-trace
+// REQUIRES: ompt
 #include "callback.h"
 #include <omp.h>
 

Modified: openmp/trunk/runtime/test/ompt/parallel/nested_serialized.c
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/test/ompt/parallel/nested_serialized.c?rev=264031&r1=264030&r2=264031&view=diff
==============================================================================
--- openmp/trunk/runtime/test/ompt/parallel/nested_serialized.c (original)
+++ openmp/trunk/runtime/test/ompt/parallel/nested_serialized.c Tue Mar 22 03:23:24 2016
@@ -1,6 +1,6 @@
 // RUN: %libomp-compile-and-run | FileCheck %s
 // RUN: %libomp-compile-and-run | %sort-threads | FileCheck --check-prefix=THREADS %s
-// REQUIRES: ompt, ompt-trace
+// REQUIRES: ompt
 #include "callback.h"
 #include <omp.h>
 

Modified: openmp/trunk/runtime/test/ompt/parallel/normal.c
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/test/ompt/parallel/normal.c?rev=264031&r1=264030&r2=264031&view=diff
==============================================================================
--- openmp/trunk/runtime/test/ompt/parallel/normal.c (original)
+++ openmp/trunk/runtime/test/ompt/parallel/normal.c Tue Mar 22 03:23:24 2016
@@ -1,6 +1,6 @@
 // RUN: %libomp-compile-and-run | FileCheck %s
 // RUN: %libomp-compile-and-run | %sort-threads | FileCheck --check-prefix=THREADS %s
-// REQUIRES: ompt, ompt-trace
+// REQUIRES: ompt
 #include "callback.h"
 
 int main()

Modified: openmp/trunk/runtime/test/ompt/parallel/serialized.c
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/test/ompt/parallel/serialized.c?rev=264031&r1=264030&r2=264031&view=diff
==============================================================================
--- openmp/trunk/runtime/test/ompt/parallel/serialized.c (original)
+++ openmp/trunk/runtime/test/ompt/parallel/serialized.c Tue Mar 22 03:23:24 2016
@@ -1,5 +1,5 @@
 // RUN: %libomp-compile-and-run | FileCheck %s
-// REQUIRES: ompt, ompt-trace
+// REQUIRES: ompt
 #include "callback.h"
 
 int main()