[NFC][TSan] Move libdispatch tests into their own subfolder

Remove 'gcd' file prefix. GCD stands for Grand Central Dispatch, which
is another name for libdispatch.
https://apple.github.io/swift-corelibs-libdispatch/

Remove `REQUIRE: dispatch` from tests.

Also rename lit feature 'dispatch' -> 'libdispatch' to be more explicit
what this is about.

Reviewed By: kubamracek

Differential Revision: https://reviews.llvm.org/D59341

llvm-svn: 356202

compiler-rt/test/lit.common.cfg

@@ -222,9 +222,9 @@ compiler_rt_debug = getattr(config, 'compiler_rt_debug', False)
 if not compiler_rt_debug:
   config.available_features.add('compiler-rt-optimized')
 
-dispatch = getattr(config, 'compiler_rt_intercept_libdispatch')
-if dispatch:
-  config.available_features.add('dispatch')
+libdispatch = getattr(config, 'compiler_rt_intercept_libdispatch')
+if libdispatch:
+  config.available_features.add('libdispatch')
 
 sanitizer_can_use_cxxabi = getattr(config, 'sanitizer_can_use_cxxabi', True)
 if sanitizer_can_use_cxxabi:

compiler-rt/test/tsan/gcd-apply-race.c → compiler-rt/test/tsan/libdispatch/apply-race.c

@@ -1,11 +1,9 @@
 // RUN: %clang_tsan %s -o %t
 // RUN: %deflake %run %t 2>&1 | FileCheck %s
 
-// REQUIRES: dispatch
-
 #include <dispatch/dispatch.h>
 
-#include "test.h"
+#include "../test.h"
 
 long global;
 

compiler-rt/test/tsan/gcd-apply.c → compiler-rt/test/tsan/libdispatch/apply.c

@@ -1,15 +1,13 @@
 // RUN: %clang_tsan %s -o %t
 // RUN: %run %t 2>&1 | FileCheck %s
 
-// REQUIRES: dispatch
-
 // TODO(yln): Deadlocks while gcd-apply.mm does not. What's the difference
 //            between C and Obj-C compiler?
 // REQUIRES: disable
 
 #include <dispatch/dispatch.h>
 
-#include "test.h"
+#include "../test.h"
 
 long global;
 long array[2];

compiler-rt/test/tsan/gcd-data.c → compiler-rt/test/tsan/libdispatch/data.c

@@ -1,8 +1,6 @@
 // RUN: %clang_tsan %s -o %t
 // RUN: %run %t 2>&1 | FileCheck %s
 
-// REQUIRES: dispatch
-
 // TODO(yln): fails on one of our bots, need to investigate
 // REQUIRES: disabled
 

compiler-rt/test/tsan/gcd-dispatch_main.c → compiler-rt/test/tsan/libdispatch/dispatch_main.c

@@ -4,8 +4,6 @@
 // RUN: %clang_tsan %s -o %t
 // RUN: %run %t 2>&1 | FileCheck %s
 
-// REQUIRES: dispatch
-
 #include <dispatch/dispatch.h>
 
 #include <stdio.h>

compiler-rt/test/tsan/gcd-dispatch_once_deadlock.c → compiler-rt/test/tsan/libdispatch/dispatch_once_deadlock.c

@@ -3,8 +3,6 @@
 // RUN: %clang_tsan %s -o %t
 // RUN: not %run %t 2>&1 | FileCheck %s
 
-// REQUIRES: dispatch
-
 #include <dispatch/dispatch.h>
 
 #include <pthread.h>

compiler-rt/test/tsan/gcd-groups-destructor.c → compiler-rt/test/tsan/libdispatch/groups-destructor.c

@@ -1,8 +1,6 @@
 // RUN: %clangxx_tsan %s -o %t
 // RUN: %run %t 2>&1 | FileCheck %s
 
-// REQUIRES: dispatch
-
 #include <dispatch/dispatch.h>
 
 #import <memory>

compiler-rt/test/tsan/gcd-groups-leave.c → compiler-rt/test/tsan/libdispatch/groups-leave.c

@@ -1,11 +1,9 @@
 // RUN: %clang_tsan %s -o %t
 // RUN: %run %t 2>&1 | FileCheck %s
 
-// REQUIRES: dispatch
-
 #include <dispatch/dispatch.h>
 
-#include "test.h"
+#include "../test.h"
 
 dispatch_semaphore_t sem;
 

compiler-rt/test/tsan/gcd-groups-stress.c → compiler-rt/test/tsan/libdispatch/groups-stress.c

@@ -1,8 +1,6 @@
 // RUN: %clang_tsan %s -o %t
 // RUN: %run %t 2>&1 | FileCheck %s
 
-// REQUIRES: dispatch
-
 #include <dispatch/dispatch.h>
 
 #include <stdio.h>

compiler-rt/test/tsan/libdispatch/lit.local.cfg

@@ -0,0 +1,11 @@
+def getRoot(config):
+  if not config.parent:
+    return config
+  return getRoot(config.parent)
+
+root = getRoot(config)
+
+if 'libdispatch' not in root.available_features:
+  config.unsupported = True
+
+config.target_cflags += ' -fblocks'

compiler-rt/test/tsan/gcd-once.c → compiler-rt/test/tsan/libdispatch/once.c

@@ -1,11 +1,9 @@
 // RUN: %clang_tsan %s -o %t
 // RUN: %run %t 2>&1 | FileCheck %s
 
-// REQUIRES: dispatch
-
 #include <dispatch/dispatch.h>
 
-#include "test.h"
+#include "../test.h"
 
 static const long kNumThreads = 4;
 

compiler-rt/test/tsan/gcd-semaphore-norace.c → compiler-rt/test/tsan/libdispatch/semaphore-norace.c

@@ -1,8 +1,6 @@
 // RUN: %clang_tsan %s -o %t
 // RUN: %run %t 2>&1 | FileCheck %s
 
-// REQUIRES: dispatch
-
 #include <dispatch/dispatch.h>
 
 #include <stdio.h>

compiler-rt/test/tsan/gcd-source-serial.c → compiler-rt/test/tsan/libdispatch/source-serial.c

@@ -1,8 +1,6 @@
 // RUN: %clang_tsan %s -o %t
 // RUN: %run %t 2>&1 | FileCheck %s
 
-// REQUIRES: dispatch
-
 // TODO(yln): fails on one of our bots, need to investigate
 // REQUIRES: disabled
 

compiler-rt/test/tsan/gcd-suspend.c → compiler-rt/test/tsan/libdispatch/suspend.c

@@ -1,8 +1,6 @@
 // RUN: %clang_tsan %s -o %t
 // RUN: %run %t 2>&1 | FileCheck %s
 
-// REQUIRES: dispatch
-
 #include <dispatch/dispatch.h>
 
 #include <stdio.h>