Merge pull request #59561 from kateinoigakukun/katei/repair-none-threading-tests

[Threading][test] Repair none threading tests

Author: al45tair

test/Concurrency/async_task_base_priority.swift

@@ -8,6 +8,7 @@
 // REQUIRES: concurrency_runtime
 // UNSUPPORTED: back_deployment_runtime
 // UNSUPPORTED: back_deploy_concurrency
+// UNSUPPORTED: threading_none
 
 import StdlibUnittest
 import Dispatch

test/Runtime/associated_witness_concurrency.swift

@@ -3,6 +3,7 @@
 // RUN: %target-run %t
 // REQUIRES: libdispatch
 // REQUIRES: executable_test
+// UNSUPPORTED: threading_none
 
 import Dispatch
 

test/Sanitizers/tsan/mainactor.swift

@@ -5,6 +5,7 @@
 // REQUIRES: libdispatch
 // REQUIRES: tsan_runtime
 // UNSUPPORTED: use_os_stdlib
+// UNSUPPORTED: threading_none
 
 import Dispatch
 

test/Sanitizers/tsan/tsan.swift

@@ -5,6 +5,7 @@
 // REQUIRES: tsan_runtime
 // UNSUPPORTED: OS=tvos
 // UNSUPPORTED: CPU=powerpc64le
+// UNSUPPORTED: threading_none
 
 // FIXME: This should be covered by "tsan_runtime"; older versions of Apple OSs
 // don't support TSan.

unittests/Threading/LockingHelpers.h

@@ -36,7 +36,12 @@ void tryLockable(M &mutex) {
 
   // We cannot lock a locked lock
   ret = mutex.try_lock();
+#if SWIFT_THREADING_NONE
+  // Noop since none threading mode always succeeds getting lock
+  (void)ret;
+#else
   ASSERT_FALSE(ret);
+#endif
 
   mutex.unlock();
 }
@@ -61,6 +66,12 @@ void basicLockableThreaded(M &mutex) {
   ASSERT_EQ(count2, 500);
 }
 
+#if SWIFT_THREADING_NONE
+template <typename M>
+void lockableThreaded(M &mutex) {
+  // Noop since none threading mode always succeeds getting lock
+}
+#else
 // More extensive tests
 template <typename M>
 void lockableThreaded(M &mutex) {
@@ -90,6 +101,7 @@ void lockableThreaded(M &mutex) {
   ASSERT_EQ(count1, 500);
   ASSERT_EQ(count2, 500);
 }
+#endif
 
 // Test a scoped lock implementation
 template <typename SL, typename M>

unittests/Threading/ThreadingHelpers.h

@@ -13,6 +13,37 @@
 #ifndef THREADING_HELPERS_H
 #define THREADING_HELPERS_H
 
+#if SWIFT_THREADING_NONE
+
+template <typename ThreadBody, typename AfterSpinRelease>
+void threadedExecute(int threadCount, ThreadBody threadBody,
+                     AfterSpinRelease afterSpinRelease) {
+  for (int i = 0; i < threadCount; ++i) {
+    threadBody(i);
+  }
+}
+
+template <typename ThreadBody>
+void threadedExecute(int threadCount, ThreadBody threadBody) {
+  threadedExecute(threadCount, threadBody, [] {});
+}
+
+template <typename M, typename C, typename ConsumerBody, typename ProducerBody>
+void threadedExecute(M &mutex, C &condition, bool &doneCondition,
+                     ConsumerBody consumerBody, ProducerBody producerBody) {
+  for (int i = 1; i <= 5; ++i) {
+    producerBody(i);
+  }
+  mutex.withLockThenNotifyAll(condition, [&] {
+    doneCondition = true;
+  });
+  for (int i = 1; i <= 8; ++i) {
+    consumerBody(i);
+  }
+}
+
+#else // !SWIFT_THREADING_NONE
+
 #include <thread>
 
 // When true many of the threaded tests log activity to help triage issues.
@@ -131,4 +162,6 @@ void threadedExecute(M &mutex, C &condition, bool &doneCondition,
   }
 }
 
+#endif // !SWIFT_THREADING_NONE
+
 #endif

validation-test/Runtime/ConcurrentMetadata.swift

@@ -1,6 +1,7 @@
 // RUN: %target-run-simple-swift
 // REQUIRES: executable_test
 // UNSUPPORTED: single_threaded_runtime
+// UNSUPPORTED: threading_none
 
 // Exercise the metadata cache from multiple threads to shake out any
 // concurrency bugs.