Skip to content

Commit 51c46b4

Browse files
ayylolayylol
committed
Format changes
1 parent cff4341 commit 51c46b4

File tree

4 files changed

+131
-33
lines changed

4 files changed

+131
-33
lines changed

‎sycl/test-e2e/E2EExpr.py‎

Lines changed: 116 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,15 @@ def __init__(self, string, variables, build_only_mode, findal_unknown_value):
3030
@staticmethod
3131
def evaluate(string, variables, build_only_mode, final_unknown_value=True):
3232
"""
33-
string: Expression to evaluate
33+
string: Expression to evaluate
3434
variables: variables that evaluate to true
3535
build_only_mode: if true enables unknown values
3636
findal_unknown_value: findal boolean result if evaluation results in `unknown`
3737
"""
3838
try:
39-
parser = E2EExpr(string, set(variables), build_only_mode, final_unknown_value)
39+
parser = E2EExpr(
40+
string, set(variables), build_only_mode, final_unknown_value
41+
)
4042
return parser.parseAll()
4143
except ValueError as e:
4244
raise ValueError(str(e) + ("\nin expression: %r" % string))
@@ -96,31 +98,121 @@ def test_basic(self):
9698
# Non build-only expressions should work the same
9799
self.assertTrue(E2EExpr.evaluate("linux", {"linux", "rt_feature"}, False))
98100
self.assertTrue(E2EExpr.evaluate("rt_feature", {"linux", "rt_feature"}, False))
99-
self.assertFalse(E2EExpr.evaluate( "another_aspect && rt_feature", {"linux", "rt_feature"}, False))
101+
self.assertFalse(
102+
E2EExpr.evaluate(
103+
"another_aspect && rt_feature", {"linux", "rt_feature"}, False
104+
)
105+
)
100106
# build-only expressions with no unknowns should work the same
101-
self.assertTrue(E2EExpr.evaluate("linux", {"linux"}, True, final_unknown_value=False))
102-
self.assertFalse(E2EExpr.evaluate( "linux && windows", {"linux"}, True, final_unknown_value=True))
103-
self.assertTrue(E2EExpr.evaluate( "!(windows || zstd)", {"linux"}, True, final_unknown_value=False))
107+
self.assertTrue(
108+
E2EExpr.evaluate("linux", {"linux"}, True, final_unknown_value=False)
109+
)
110+
self.assertFalse(
111+
E2EExpr.evaluate(
112+
"linux && windows", {"linux"}, True, final_unknown_value=True
113+
)
114+
)
115+
self.assertTrue(
116+
E2EExpr.evaluate(
117+
"!(windows || zstd)", {"linux"}, True, final_unknown_value=False
118+
)
119+
)
104120
# build-only expressions where unknown affects the resulting value
105-
self.assertTrue(E2EExpr.evaluate("rt_feature", {}, True, final_unknown_value=True))
106-
self.assertFalse(E2EExpr.evaluate("rt_feature", {}, True, final_unknown_value=False))
107-
self.assertTrue(E2EExpr.evaluate("rt_feature", {"rt_feature"}, True, final_unknown_value=True))
108-
self.assertFalse(E2EExpr.evaluate("rt_feature", {"rt_feature"}, True, final_unknown_value=False))
109-
self.assertFalse(E2EExpr.evaluate("!rt_feature", {}, True, final_unknown_value=False))
110-
self.assertFalse(E2EExpr.evaluate("!!rt_feature", {}, True, final_unknown_value=False))
111-
self.assertTrue(E2EExpr.evaluate("windows || rt_feature", {"linux"}, True, final_unknown_value=True))
112-
self.assertFalse(E2EExpr.evaluate("windows || rt_feature", {"linux"}, True, final_unknown_value=False))
113-
self.assertTrue(E2EExpr.evaluate("linux && rt_feature", {"linux"}, True, final_unknown_value=True))
114-
self.assertFalse(E2EExpr.evaluate("linux && rt_feature", {"linux"}, True, final_unknown_value=False))
115-
self.assertTrue(E2EExpr.evaluate( "linux && !(windows || rt_feature)", {"linux"}, True, final_unknown_value=True))
116-
self.assertFalse(E2EExpr.evaluate( "linux && !(windows || rt_feature)", {"linux"}, True, final_unknown_value=False))
121+
self.assertTrue(
122+
E2EExpr.evaluate("rt_feature", {}, True, final_unknown_value=True)
123+
)
124+
self.assertFalse(
125+
E2EExpr.evaluate("rt_feature", {}, True, final_unknown_value=False)
126+
)
127+
self.assertTrue(
128+
E2EExpr.evaluate(
129+
"rt_feature", {"rt_feature"}, True, final_unknown_value=True
130+
)
131+
)
132+
self.assertFalse(
133+
E2EExpr.evaluate(
134+
"rt_feature", {"rt_feature"}, True, final_unknown_value=False
135+
)
136+
)
137+
self.assertFalse(
138+
E2EExpr.evaluate("!rt_feature", {}, True, final_unknown_value=False)
139+
)
140+
self.assertFalse(
141+
E2EExpr.evaluate("!!rt_feature", {}, True, final_unknown_value=False)
142+
)
143+
self.assertTrue(
144+
E2EExpr.evaluate(
145+
"windows || rt_feature", {"linux"}, True, final_unknown_value=True
146+
)
147+
)
148+
self.assertFalse(
149+
E2EExpr.evaluate(
150+
"windows || rt_feature", {"linux"}, True, final_unknown_value=False
151+
)
152+
)
153+
self.assertTrue(
154+
E2EExpr.evaluate(
155+
"linux && rt_feature", {"linux"}, True, final_unknown_value=True
156+
)
157+
)
158+
self.assertFalse(
159+
E2EExpr.evaluate(
160+
"linux && rt_feature", {"linux"}, True, final_unknown_value=False
161+
)
162+
)
163+
self.assertTrue(
164+
E2EExpr.evaluate(
165+
"linux && !(windows || rt_feature)",
166+
{"linux"},
167+
True,
168+
final_unknown_value=True,
169+
)
170+
)
171+
self.assertFalse(
172+
E2EExpr.evaluate(
173+
"linux && !(windows || rt_feature)",
174+
{"linux"},
175+
True,
176+
final_unknown_value=False,
177+
)
178+
)
117179
# build-only expressions where unknown does not affect the resulting value
118-
self.assertTrue(E2EExpr.evaluate("linux || rt_feature", {"linux"}, True, final_unknown_value=True))
119-
self.assertTrue(E2EExpr.evaluate("linux || rt_feature", {"linux"}, True, final_unknown_value=False))
120-
self.assertFalse(E2EExpr.evaluate("windows && rt_feature", {"linux"}, True, final_unknown_value=True))
121-
self.assertFalse(E2EExpr.evaluate("windows && rt_feature", {"linux"}, True, final_unknown_value=False))
122-
self.assertFalse(E2EExpr.evaluate( "linux && (windows && rt_feature)", {"linux"}, True, final_unknown_value=True))
123-
self.assertFalse(E2EExpr.evaluate( "linux && (windows && rt_feature)", {"linux"}, True, final_unknown_value=False))
180+
self.assertTrue(
181+
E2EExpr.evaluate(
182+
"linux || rt_feature", {"linux"}, True, final_unknown_value=True
183+
)
184+
)
185+
self.assertTrue(
186+
E2EExpr.evaluate(
187+
"linux || rt_feature", {"linux"}, True, final_unknown_value=False
188+
)
189+
)
190+
self.assertFalse(
191+
E2EExpr.evaluate(
192+
"windows && rt_feature", {"linux"}, True, final_unknown_value=True
193+
)
194+
)
195+
self.assertFalse(
196+
E2EExpr.evaluate(
197+
"windows && rt_feature", {"linux"}, True, final_unknown_value=False
198+
)
199+
)
200+
self.assertFalse(
201+
E2EExpr.evaluate(
202+
"linux && (windows && rt_feature)",
203+
{"linux"},
204+
True,
205+
final_unknown_value=True,
206+
)
207+
)
208+
self.assertFalse(
209+
E2EExpr.evaluate(
210+
"linux && (windows && rt_feature)",
211+
{"linux"},
212+
True,
213+
final_unknown_value=False,
214+
)
215+
)
124216

125217

126218
if __name__ == "__main__":

‎sycl/test-e2e/format.py‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,9 @@ def getMatchedFromList(
9595
return [
9696
item
9797
for item in alist
98-
if E2EExpr.evaluate(item, features, build_only_mode, final_unknown_value)
98+
if E2EExpr.evaluate(
99+
item, features, build_only_mode, final_unknown_value
100+
)
99101
]
100102
except ValueError as e:
101103
raise ValueError("Error in UNSUPPORTED list:\n%s" % str(e))
@@ -104,9 +106,13 @@ def select_build_targets_for_test(self, test):
104106
supported_targets = set()
105107
for t in test.config.sycl_build_targets:
106108
features = test.config.available_features.union({t})
107-
if self.getMissingRequiredFeaturesFromList(features, test.requires, build_only_mode=True):
109+
if self.getMissingRequiredFeaturesFromList(
110+
features, test.requires, build_only_mode=True
111+
):
108112
continue
109-
if self.getMatchedFromList(features, test.unsupported, build_only_mode=True):
113+
if self.getMatchedFromList(
114+
features, test.unsupported, build_only_mode=True
115+
):
110116
continue
111117
supported_targets.add(t)
112118

‎sycl/test-e2e/lit.cfg.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
}
2525
config.target_to_triple = {
2626
"target-spir": "spir64",
27-
"target-nvidia":"nvptx64-nvidia-cuda",
28-
"target-amd":"amdgcn-amd-amdhsa",
29-
"target-native_cpu":"native_cpu",
27+
"target-nvidia": "nvptx64-nvidia-cuda",
28+
"target-amd": "amdgcn-amd-amdhsa",
29+
"target-native_cpu": "native_cpu",
3030
}
31-
config.triple_to_target = {v:k for k,v in config.target_to_triple.items()}
31+
config.triple_to_target = {v: k for k, v in config.target_to_triple.items()}
3232
config.backend_to_triple = {
3333
k: config.target_to_triple.get(v) for k, v in config.backend_to_target.items()
3434
}

‎sycl/test/e2e_test_requirements/check_e2eexpr_logic.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// E2E tests use a modified expression parser that allows for a third "unknown"
2-
// boolean state to handle missing run-time features in REQUIRES/UNSUPPORTED
1+
// E2E tests use a modified expression parser that allows for a third "unknown"
2+
// boolean state to handle missing run-time features in REQUIRES/UNSUPPORTED
33
// statements. This test runs the unit tests related to these expressions.
44
//
55
// REQUIRES: linux

0 commit comments

Comments
 (0)