diff --git a/llvm/utils/lit/lit/BooleanExpression.py b/llvm/utils/lit/lit/BooleanExpression.py --- a/llvm/utils/lit/lit/BooleanExpression.py +++ b/llvm/utils/lit/lit/BooleanExpression.py @@ -9,13 +9,19 @@ # and_expr :: not_expr ('&&' not_expr)* # not_expr :: '!' not_expr # '(' or_expr ')' + # match_expr + # match_expr :: regex # identifier + # regex match_expr + # identifier match_expr # identifier :: [-+=._a-zA-Z0-9]+ + # regex :: '{{' any-regex '}}' # Evaluates `string` as a boolean expression. # Returns True or False. Throws a ValueError on syntax error. # # Variables in `variables` are true. + # Regexes that match any variable in `variables` are true. # Substrings of `triple` are true. # 'true' is true. # All other identifiers are false. @@ -41,7 +47,7 @@ END = object() # Tokenization pattern. - Pattern = re.compile(r'\A\s*([()]|[-+=._a-zA-Z0-9]+|&&|\|\||!)\s*(.*)\Z') + Pattern = re.compile(r'\A\s*([()]|&&|\|\||!|(?:[-+=._a-zA-Z0-9]+|\{\{.+?\}\})+)\s*(.*)\Z') @staticmethod def tokenize(string): @@ -86,6 +92,18 @@ return False return True + def parseMATCH(self): + regex = '' + for part in filter(None, re.split(r'(\{\{.+?\}\})', self.token)): + if part.startswith('{{'): + assert part.endswith('}}') + regex += '(?:{})'.format(part[2:-2]) + else: + regex += re.escape(part) + regex = re.compile(regex) + self.value = self.token in self.triple or any(regex.fullmatch(var) for var in self.variables) + self.token = next(self.tokens) + def parseNOT(self): if self.accept('!'): self.parseNOT() @@ -97,9 +115,7 @@ raise ValueError("expected: '!' or '(' or identifier\nhave: %s" % self.quote(self.token)) else: - self.value = (self.token in self.variables or - self.token in self.triple) - self.token = next(self.tokens) + self.parseMATCH() def parseAND(self): self.parseNOT() @@ -143,12 +159,20 @@ self.assertTrue(BooleanExpression.evaluate('under_score', variables)) self.assertTrue(BooleanExpression.evaluate('e=quals', variables)) self.assertTrue(BooleanExpression.evaluate('d1g1ts', variables)) + self.assertTrue(BooleanExpression.evaluate('{{its.+}}', variables)) + self.assertTrue(BooleanExpression.evaluate('{{false-[lo]+-true}}', variables)) + self.assertTrue(BooleanExpression.evaluate('{{(true|false)-lol-(true|false)}}', variables)) + self.assertTrue(BooleanExpression.evaluate('d1g{{[0-9]}}ts', variables)) + self.assertTrue(BooleanExpression.evaluate('d1g{{[0-9]}}t{{[a-z]}}', variables)) + self.assertTrue(BooleanExpression.evaluate('{{d}}1g{{[0-9]}}t{{[a-z]}}', variables)) + self.assertTrue(BooleanExpression.evaluate('d1{{(g|1)+}}ts', variables)) self.assertFalse(BooleanExpression.evaluate('false', variables)) self.assertFalse(BooleanExpression.evaluate('True', variables)) self.assertFalse(BooleanExpression.evaluate('true-ish', variables)) self.assertFalse(BooleanExpression.evaluate('not_true', variables)) self.assertFalse(BooleanExpression.evaluate('tru', variables)) + self.assertFalse(BooleanExpression.evaluate('{{its-true.+}}', variables)) def test_triple(self): triple = 'arch-vendor-os' @@ -159,6 +183,16 @@ self.assertTrue(BooleanExpression.evaluate('-os', {}, triple)) self.assertFalse(BooleanExpression.evaluate('arch-os', {}, triple)) + def test_matching(self): + expr1 = 'linux && (target={{aarch64-.+}} || target={{x86_64-.+}})' + self.assertTrue(BooleanExpression.evaluate(expr1, {'linux', 'target=x86_64-unknown-linux-gnu'})) + self.assertFalse(BooleanExpression.evaluate(expr1, {'linux', 'target=i386-unknown-linux-gnu'})) + + expr2 = 'use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !no-exceptions' + self.assertTrue(BooleanExpression.evaluate(expr2, {'use_system_cxx_lib', 'target=arm64-apple-macosx10.12'})) + self.assertFalse(BooleanExpression.evaluate(expr2, {'use_system_cxx_lib', 'target=arm64-apple-macosx10.12', 'no-exceptions'})) + self.assertFalse(BooleanExpression.evaluate(expr2, {'use_system_cxx_lib', 'target=arm64-apple-macosx10.15'})) + def test_operators(self): self.assertTrue(BooleanExpression.evaluate('true || true', {})) self.assertTrue(BooleanExpression.evaluate('true || false', {})) @@ -248,5 +282,14 @@ "have: ')'\n" + "in expression: '( )'") + self.checkException("abc{{def", + "couldn't parse text: '{{def'\n" + + "in expression: 'abc{{def'") + + self.checkException("{{}}", + "couldn't parse text: '{{}}'\n" + + "in expression: '{{}}'") + + if __name__ == '__main__': unittest.main() diff --git a/llvm/utils/lit/tests/Inputs/show-used-features/mixed.txt b/llvm/utils/lit/tests/Inputs/show-used-features/mixed.txt --- a/llvm/utils/lit/tests/Inputs/show-used-features/mixed.txt +++ b/llvm/utils/lit/tests/Inputs/show-used-features/mixed.txt @@ -1,4 +1,4 @@ -// REQUIRES: my-require-feature-2 || my-require-feature-3 -// UNSUPPORTED: my-unsupported-feature-2, my-unsupported-feature-3 -// XFAIL: my-xfail-feature-2, my-xfail-feature-3 +// REQUIRES: my-require-feature-2 || my-require-feature-3, my-{{[require]*}}-feature-4 +// UNSUPPORTED: my-unsupported-feature-2, my-unsupported-feature-3 && !my-{{[unsupported]*}}-feature-4 +// XFAIL: my-xfail-feature-2, my-xfail-feature-3, my-{{[xfail]*}}-feature-4 diff --git a/llvm/utils/lit/tests/show-used-features.py b/llvm/utils/lit/tests/show-used-features.py --- a/llvm/utils/lit/tests/show-used-features.py +++ b/llvm/utils/lit/tests/show-used-features.py @@ -4,3 +4,6 @@ # CHECK: my-require-feature-1 my-require-feature-2 my-require-feature-3 # CHECK: my-unsupported-feature-1 my-unsupported-feature-2 my-unsupported-feature-3 # CHECK: my-xfail-feature-1 my-xfail-feature-2 my-xfail-feature-3 +# CHECK: {{my-[{][{]\[require\]\*[}][}]-feature-4}} +# CHECK: {{my-[{][{]\[unsupported\]\*[}][}]-feature-4}} +# CHECK: {{my-[{][{]\[xfail\]\*[}][}]-feature-4}}