Skip to content

[SYCL][E2E] Add option to build tests on run-only mode if marked as REQUIRES: build-and-run-mode #16306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
againull merged 12 commits into from
Dec 19, 2024
Merged

[SYCL][E2E] Add option to build tests on run-only mode if marked as REQUIRES: build-and-run-mode #16306

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a61495f
Build tests on run-only if marked as exceptions
ayylol Dec 9, 2024
ca76a74
Change whitespace
ayylol Dec 9, 2024
ad80c2e
Add option to build over skip in run-only
ayylol Dec 13, 2024
09db374
Merge branch 'sycl' into run-unsplit
ayylol Dec 13, 2024
fbbbd8e
Remove unsplit name
ayylol Dec 13, 2024
d30d2a5
Format changes
ayylol Dec 13, 2024
1b79472
Move setting ignore-line-filtering to when it is used
ayylol Dec 16, 2024
3f80c04
Move + format ignore_line_filtering
ayylol Dec 16, 2024
5d8ce83
Move usage of ignore_line_fitlering
ayylol Dec 18, 2024
7c98bf7
Remove redundant `run-only` mode check
ayylol Dec 18, 2024
caaeaf1
Format
ayylol Dec 18, 2024
0d4d13c
Change fallback option name
ayylol Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion sycl/test-e2e/format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ def execute(self, test, litConfig):

devices_for_test = []
triples = set()
ignore_line_filtering = False
if test.config.test_mode == "build-only":
if "build-and-run-mode" in test.requires or "true" in test.unsupported:
return lit.Test.Result(
Expand All @@ -173,6 +174,12 @@ def execute(self, test, litConfig):
(backend, _) = sycl_device.split(":")
triples.add(get_triple(test, backend))

if (
"build-and-run-mode" in test.requires
and test.config.fallback_build_run_only
):
ignore_line_filtering = True
Copy link
Contributor

@aelovikov-intel aelovikov-intel Dec 14, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why cannot that be done at the place when ignore_line_filtering will be used?

Copy link
Contributor Author

@ayylol ayylol Dec 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, i put this right outside of the loop where ignore_line_filtering is used.


substitutions = lit.TestRunner.getDefaultSubstitutions(test, tmpDir, tmpBase)
substitutions.append(("%{sycl_triple}", format(",".join(triples))))
# -fsycl-targets is needed for CUDA/HIP, so just use it be default so
Expand Down Expand Up @@ -235,7 +242,7 @@ def get_extra_env(sycl_devices):
continue

# Filter commands based on split-mode
is_run_line = any(
is_run_line = ignore_line_filtering or any(
i in directive.command
for i in ["%{run}", "%{run-unfiltered-devices}", "%if run-mode"]
)
Expand Down
4 changes: 4 additions & 0 deletions sycl/test-e2e/lit.cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,16 @@

# test-mode: Set if tests should run normally or only build/run
config.test_mode = lit_config.params.get("test-mode", "full")
config.fallback_build_run_only = False
if config.test_mode == "full":
config.available_features.add("run-mode")
config.available_features.add("build-and-run-mode")
elif config.test_mode == "run-only":
lit_config.note("run-only test mode enabled, only executing tests")
config.available_features.add("run-mode")
if lit_config.params.get("build-instead-of-skip-run-only", False):
config.available_features.add("build-and-run-mode")
config.fallback_build_run_only = True
elif config.test_mode == "build-only":
lit_config.note("build-only test mode enabled, only compiling tests")
config.sycl_devices = []
Expand Down
Loading