[lit] Remove lit's REQUIRES-ANY directive

[thopre]

Summary

Remove REQUIRES-ANY alias lit directive since it is hardly used and can
be easily implemented using an OR expression using REQUIRES. Fixup
remaining testcases still using REQUIRES-ANY.

[probinson]

I'd rather see REQUIRES-ANY deprecated/removed, in favor of using expressions in REQUIRES. (REQUIRES-ANY predates expressions.)
IIRC it is used rarely and it would not be a big deal to eliminate it.

[jdenny]

I have little experience with REQUIRES, etc., but a quick git grep suggests Paul's suggestion is a reasonable path forward.

[thopre]

Remove REQUIRES-ANY lit directive

[eugenis]

Nice cleanup!

[gparker42]

Good. REQUIRES-ANY was preserved when the boolean expressions were added because libc++ was still using it. libc++ has since changed their tests so removing it should be fine now.
(previous discussion: D18185)

The risk for any remaining users of REQUIRES-ANY is that they will see a test run too often. That's an acceptable failure mode (unlike silently not running the test at all).

[uweigand]

It looks like this caused build bot failures:
http://lab.llvm.org:8011/builders/clang-s390x-linux/builds/28928/steps/ninja%20check%201/logs/FAIL%3A%20lit%3A%3A%20shtest-format.py

/home/uweigand/sandbox/buildbot/clang-s390x-linux/stage1/utils/lit/tests/shtest-format.py:52:10: error: CHECK: expected string not found in input
# CHECK: UNSUPPORTED: shtest-format :: requires-any-missing.txt
         ^
<stdin>:71:33: note: scanning from here
PASS: shtest-format :: pass.txt (8 of 22)
                                ^
<stdin>:72:1: note: possible intended match here
UNSUPPORTED: shtest-format :: requires-missing.txt (9 of 22)
^

[jdenny]

This breaks the lit test suite. llvm/utils/lit/tests/shtest-format.py needs to be updated for the removed tests.

[thopre]

In D71408#1787959, @jdenny wrote:

This breaks the lit test suite. llvm/utils/lit/tests/shtest-format.py needs to be updated for the removed tests.

This is embarrassing. Thanks @nemanjai for fixing this. I did run the tests and remember having one FAIL which I could reproduce without the patch applied. I presume ninja check-all includes those 2 tests so I'm not sure how I missed it. On a related note, I used to receive mail notification when one of my commit would make a buildbot fail but don't anymore. Is there a way to register for those mail notification?

[jdenny]

In D71408#1788582, @thopre wrote:

This is embarrassing.

It happens.

I presume ninja check-all includes those 2 tests so I'm not sure how I missed it.

It should.

On a related note, I used to receive mail notification when one of my commit would make a buildbot fail but don't anymore.

Sometimes I don't see emails if a bot was already broken. I noticed this fail only after pulling and running check-lit locally.

Is there a way to register for those mail notification?

Not sure. I thought it was based on the commit author field.

clang/test/Driver/XRay/xray-instrument-macos.c

 // RUN: %clang -o /dev/null -v -fxray-instrument -target x86_64-apple-macos10.11 -c %s
 // RUN: %clang -o /dev/null -v -fxray-instrument -target x86_64-apple-darwin15 -c %s
-// REQUIRES-ANY: x86_64, x86_64h
+// REQUIRES: x86_64 || x86_64h
 typedef int a;

clang/test/Driver/XRay/xray-instrument-os.c

 // RUN: not %clang -o /dev/null -v -fxray-instrument -c %s
 // XFAIL: -linux-, -freebsd, -darwin, -macos
-// REQUIRES-ANY: amd64, x86_64, x86_64h, arm, aarch64, arm64
+// REQUIRES: amd64 || x86_64 || x86_64h || arm || aarch64 || arm64
 typedef int a;

clang/test/Driver/XRay/xray-instrumentation-bundles-flags.cpp

 // This test ensures that when we invoke the clang compiler, that the -cc1
 // options include the -fxray-instrumentation-bundle= flag we provide in the
 // invocation.
 //
 // RUN: %clang -fxray-instrument -fxray-instrumentation-bundle=function -### \
 // RUN:     -x c++ -std=c++11 -emit-llvm -c -o - %s 2>&1 \
 // RUN:     | FileCheck %s
 // CHECK:  -fxray-instrumentation-bundle=function
 //
-// REQUIRES-ANY: linux, freebsd
-// REQUIRES-ANY: amd64, x86_64, x86_64h, arm, aarch64, arm64
+// REQUIRES: linux || freebsd
+// REQUIRES: amd64 || x86_64 || x86_64h || arm || aarch64 || arm64

clang/test/Driver/XRay/xray-mode-flags.cpp

 // RUN:     -fxray-modes=none \
 // RUN:     -### %s \
 // RUN:     2>&1 | FileCheck --check-prefixes NONE %s
 
 // BASIC: libclang_rt.xray-basic
 // FDR: libclang_rt.xray-fdr
 // NONE-NOT: libclang_rt.xray-basic
 // NONE-NOT: libclang_rt.xray-fdr
-// REQUIRES-ANY: linux, freebsd
-// REQUIRES-ANY: amd64, x86_64, x86_64h, arm, aarch64, arm64
+// REQUIRES: linux || freebsd
+// REQUIRES: amd64 || x86_64 || x86_64h || arm || aarch64 || arm64

clang/test/Driver/XRay/xray-nolinkdeps.cpp

 // RUN: %clang -v -o /dev/null -fxray-instrument -fnoxray-link-deps %s -### \
 // RUN:     2>&1 | FileCheck --check-prefix DISABLE %s
 // RUN: %clang -v -o /dev/null -fxray-instrument -fxray-link-deps %s -### \
 // RUN:     2>&1 | FileCheck --check-prefix ENABLE %s
 // ENABLE: clang_rt.xray
 // DISABLE-NOT: clang_rt.xray
-// REQUIRES-ANY: linux, freebsd
-// REQUIRES-ANY: amd64, x86_64, x86_64h, arm, aarch64, arm64
+// REQUIRES: linux || freebsd
+// REQUIRES: amd64 || x86_64 || x86_64h || arm || aarch64 || arm64

compiler-rt/test/builtins/Unit/arm/aeabi_cdcmpeq_test.c

-// REQUIRES-ANY: arm-target-arch,armv6m-target-arch
+// REQUIRES: arm-target-arch || armv6m-target-arch
 // RUN: %arm_call_apsr -o %t.aspr.o
 // RUN: %clang_builtins %s %t.aspr.o %librt -o %t && %run %t
 //===-- aeabi_cdcmpeq.c - Test __aeabi_cdcmpeq ----------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //

compiler-rt/test/builtins/Unit/arm/aeabi_cdcmple_test.c

-// REQUIRES-ANY: arm-target-arch,armv6m-target-arch
+// REQUIRES: arm-target-arch || armv6m-target-arch
 // RUN: %arm_call_apsr -o %t.aspr.o
 // RUN: %clang_builtins %s  %t.aspr.o %librt -o %t && %run %t
 
 //===-- aeabi_cdcmple.c - Test __aeabi_cdcmple and __aeabi_cdrcmple -------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

compiler-rt/test/builtins/Unit/arm/aeabi_cfcmpeq_test.c

-// REQUIRES-ANY: arm-target-arch,armv6m-target-arch
+// REQUIRES: arm-target-arch || armv6m-target-arch
 // RUN: %arm_call_apsr -o %t.aspr.o
 // RUN: %clang_builtins %s  %t.aspr.o %librt -o %t && %run %t
 //===-- aeabi_cfcmpeq.c - Test __aeabi_cfcmpeq ----------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //

compiler-rt/test/builtins/Unit/arm/aeabi_cfcmple_test.c

-// REQUIRES-ANY: arm-target-arch,armv6m-target-arch
+// REQUIRES: arm-target-arch || armv6m-target-arch
 // RUN: %arm_call_apsr -o %t.aspr.o
 // RUN: %clang_builtins %s  %t.aspr.o %librt -o %t && %run %t
 
 //===-- aeabi_cfcmple.c - Test __aeabi_cfcmple and __aeabi_cfrcmple -------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

compiler-rt/test/builtins/Unit/arm/aeabi_drsub_test.c

-// REQUIRES-ANY: arm-target-arch,armv6m-target-arch
+// REQUIRES: arm-target-arch || armv6m-target-arch
 // RUN: %clang_builtins %s %librt -o %t && %run %t
 //===-- aeabi_drsub.c - Test __aeabi_drsub --------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//

compiler-rt/test/builtins/Unit/arm/aeabi_frsub_test.c

-// REQUIRES-ANY: arm-target-arch,armv6m-target-arch
+// REQUIRES: arm-target-arch || armv6m-target-arch
 // RUN: %clang_builtins %s %librt -o %t && %run %t
 //===-- aeabi_frsub.c - Test __aeabi_frsub --------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//

compiler-rt/test/builtins/Unit/arm/aeabi_idivmod_test.c

-// REQUIRES-ANY: arm-target-arch,armv6m-target-arch
+// REQUIRES: arm-target-arch || armv6m-target-arch
 // RUN: %clang_builtins %s %librt -o %t && %run %t
 //===-- aeabi_idivmod_test.c - Test __aeabi_idivmod -----------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//

compiler-rt/test/builtins/Unit/arm/aeabi_uidivmod_test.c

-// REQUIRES-ANY: arm-target-arch,armv6m-target-arch
+// REQUIRES: arm-target-arch || armv6m-target-arch
 // RUN: %clang_builtins %s %librt -o %t && %run %t
 //===-- aeabi_uidivmod_test.c - Test __aeabi_uidivmod ---------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//

compiler-rt/test/builtins/Unit/arm/aeabi_uldivmod_test.c

-// REQUIRES-ANY: arm-target-arch,armv6m-target-arch
+// REQUIRES: arm-target-arch || armv6m-target-arch
 // RUN: %clang_builtins %s %librt -o %t && %run %t
 //===-- aeabi_uldivmod_test.c - Test aeabi_uldivmod -----------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//

compiler-rt/test/builtins/Unit/riscv/mulsi3_test.c

-// REQUIRES-ANY: riscv32-target-arch
+// REQUIRES: riscv32-target-arch
 // RUN: %clang_builtins %s %librt -o %t && %run %t
 //===-- mulsi3_test.c - Test __mulsi3 -------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//

llvm/utils/lit/lit/TestRunner.py

def _handleBooleanExpr(line_number, line, output):
         output.extend(parts)
         # Evaluate each expression to verify syntax.
         # We don't want any results, just the raised ValueError.
         for s in output:
             if s != '*' and not s.endswith('\\'):
                 BooleanExpression.evaluate(s, [])
         return output
 
-    @staticmethod
-    def _handleRequiresAny(line_number, line, output):
-        """A custom parser to transform REQUIRES-ANY: into REQUIRES:"""
-
-        # Extract the conditions specified in REQUIRES-ANY: as written.
-        conditions = []
-        IntegratedTestKeywordParser._handleList(line_number, line, conditions)
-
-        # Output a `REQUIRES: a || b || c` expression in its place.
-        expression = ' || '.join(conditions)
-        IntegratedTestKeywordParser._handleBooleanExpr(line_number,
-                                                       expression, output)
-        return output
-
 def parseIntegratedTestScript(test, additional_parsers=[],
                               require_script=True):
     """parseIntegratedTestScript - Scan an LLVM/Clang style integrated test
     script and extract the lines to 'RUN' as well as 'XFAIL' and 'REQUIRES'
     and 'UNSUPPORTED' information.
 
     If additional parsers are specified then the test is also scanned for the
     keywords they specify and all matches are passed to the custom parser.
 
     If 'require_script' is False an empty script
     may be returned. This can be used for test formats where the actual script
     is optional or ignored.
     """
 
     # Install the built-in keyword parsers.
     script = []
     builtin_parsers = [
         IntegratedTestKeywordParser('RUN:', ParserKind.COMMAND,
                                     initial_value=script),
         IntegratedTestKeywordParser('XFAIL:', ParserKind.BOOLEAN_EXPR,
                                     initial_value=test.xfails),
         IntegratedTestKeywordParser('REQUIRES:', ParserKind.BOOLEAN_EXPR,
                                     initial_value=test.requires),
-        IntegratedTestKeywordParser('REQUIRES-ANY:', ParserKind.CUSTOM,
-                                    IntegratedTestKeywordParser._handleRequiresAny, 
-                                    initial_value=test.requires), 
         IntegratedTestKeywordParser('UNSUPPORTED:', ParserKind.BOOLEAN_EXPR,
                                     initial_value=test.unsupported),
         IntegratedTestKeywordParser('END.', ParserKind.TAG)
     ]
     keyword_parsers = {p.keyword: p for p in builtin_parsers}
     
     # Install user-defined additional parsers.
     for parser in additional_parsers:

llvm/utils/lit/tests/Inputs/shtest-format/requires-any-missing.txt

-RUN: true
-REQUIRES-ANY: a-missing-feature, a-missing-feature-2

llvm/utils/lit/tests/Inputs/shtest-format/requires-any-present.txt

-RUN: true
-REQUIRES-ANY: a-missing-feature, a-present-feature