[PATCH] D58209: [Sanitizer] iOS: Pull up parallelism_group handling into common config

[Julian Lettner via Phabricator via llvm-commits]

yln created this revision.
Herald added subscribers: llvm-commits, Sanitizers, jdoerfert, kubamracek.
Herald added projects: Sanitizers, LLVM.

Serial execution on iOS devices is not specific to sanitizers. We want
to throttle all on-device tests. Pull the setting of the
parallelism_group up into the common lit configuration file.

Rename `darwin-ios-device-sanitizer` to `ios-device`. This group is not
specific to sanitizers and (theoretically) independent from the host OS.

Note that we don't support running unit tests on-device (there are no
configurations generated for that). If that ever changes, we also need
this configuration in `unittests/lit.common.unit.cfg`.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D58209

Files:
  compiler-rt/test/asan/lit.cfg
  compiler-rt/test/fuzzer/lit.cfg
  compiler-rt/test/lit.common.cfg
  compiler-rt/test/sanitizer_common/lit.common.cfg
  compiler-rt/test/tsan/lit.cfg
  compiler-rt/test/ubsan/lit.common.cfg


Index: compiler-rt/test/ubsan/lit.common.cfg
===================================================================
--- compiler-rt/test/ubsan/lit.common.cfg
+++ compiler-rt/test/ubsan/lit.common.cfg
@@ -74,8 +74,3 @@
 config.available_features.add('arch=' + config.target_arch)
 
 config.excludes = ['Inputs']
-
-# Limit parallelism if necessary
-if config.host_os == 'Darwin':
-  if config.apple_platform != "osx" and not config.apple_platform.endswith("sim"):
-    config.parallelism_group = "darwin-ios-device-sanitizer"
Index: compiler-rt/test/tsan/lit.cfg
===================================================================
--- compiler-rt/test/tsan/lit.cfg
+++ compiler-rt/test/tsan/lit.cfg
@@ -88,5 +88,3 @@
 if config.host_os == 'Darwin':
   if config.target_arch in ["x86_64", "x86_64h"]:
     config.parallelism_group = "darwin-64bit-sanitizer"
-  elif config.apple_platform != "osx" and not config.apple_platform.endswith("sim"):
-    config.parallelism_group = "darwin-ios-device-sanitizer"
Index: compiler-rt/test/sanitizer_common/lit.common.cfg
===================================================================
--- compiler-rt/test/sanitizer_common/lit.common.cfg
+++ compiler-rt/test/sanitizer_common/lit.common.cfg
@@ -74,5 +74,3 @@
 if config.host_os == 'Darwin':
   if config.target_arch in ["x86_64", "x86_64h"]:
     config.parallelism_group = "darwin-64bit-sanitizer"
-  elif config.apple_platform != "osx" and not config.apple_platform.endswith("sim"):
-    config.parallelism_group = "darwin-ios-device-sanitizer"
Index: compiler-rt/test/lit.common.cfg
===================================================================
--- compiler-rt/test/lit.common.cfg
+++ compiler-rt/test/lit.common.cfg
@@ -407,12 +407,11 @@
 if platform.system() == 'Darwin':
   lit_config.parallelism_groups["darwin-64bit-sanitizer"] = 3
 
-# The current implementation of the tools in sanitizer_common/ios_comamnds
-# do not support parallel execution so force sequential execution of the
-# tests on iOS devices.
+# Force sequential execution when running tests on iOS devices.
 if config.host_os == 'Darwin' and config.apple_platform != "osx" and not config.apple_platform.endswith("sim"):
   lit_config.warning("iOS device test cases being run sequentially")
-  lit_config.parallelism_groups["darwin-ios-device-sanitizer"] = 1
+  lit_config.parallelism_groups["ios-device"] = 1
+  lit_config.parallelism_group = "ios-device"
 
 # Multiple substitutions are necessary to support multiple shared objects used
 # at once.
Index: compiler-rt/test/fuzzer/lit.cfg
===================================================================
--- compiler-rt/test/fuzzer/lit.cfg
+++ compiler-rt/test/fuzzer/lit.cfg
@@ -129,5 +129,3 @@
 if config.host_os == 'Darwin':
   if config.target_arch in ["x86_64", "x86_64h"]:
     config.parallelism_group = "darwin-64bit-sanitizer"
-  elif config.apple_platform != "osx" and not config.apple_platform.endswith("sim"):
-    config.parallelism_group = "darwin-ios-device-sanitizer"
Index: compiler-rt/test/asan/lit.cfg
===================================================================
--- compiler-rt/test/asan/lit.cfg
+++ compiler-rt/test/asan/lit.cfg
@@ -223,5 +223,3 @@
 if config.host_os == 'Darwin':
   if config.target_arch in ["x86_64", "x86_64h"]:
     config.parallelism_group = "darwin-64bit-sanitizer"
-  elif config.apple_platform != "osx" and not config.apple_platform.endswith("sim"):
-    config.parallelism_group = "darwin-ios-device-sanitizer"


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D58209.186739.patch
Type: text/x-patch
Size: 3489 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190213/75bb7ae2/attachment.bin>