Skip to content

[SYCL][E2E] Fix lit to use arch selection and l0 v2 adapter #20839

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
sarnex merged 8 commits into from
Dec 11, 2025
Merged

[SYCL][E2E] Fix lit to use arch selection and l0 v2 adapter #20839

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9288866
fix lit to use arch and v2
mateuszpn Dec 5, 2025
8e2f046
Merge branch 'intel:sycl' into arch-lit
mateuszpn Dec 5, 2025
a1f5651
fix affinity mask setting
mateuszpn Dec 8, 2025
0edc162
Merge branch 'arch-lit' of github.com:mateuszpn/llvm into arch-lit
mateuszpn Dec 8, 2025
b20e3d3
fix affinity mask setting
mateuszpn Dec 9, 2025
bfcf4b0
Merge branch 'intel:sycl' into arch-lit
mateuszpn Dec 10, 2025
dbf40c7
apply comments
mateuszpn Dec 10, 2025
9be5f11
Merge branch 'arch-lit' of github.com:mateuszpn/llvm into arch-lit
mateuszpn Dec 10, 2025
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
5 changes: 5 additions & 0 deletions sycl/test-e2e/format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,11 @@ def get_extra_env(sycl_devices):
"linux",
"windows",
"preview-breaking-changes-supported",
# the following entries are used by architecture-based filtering
Copy link
Contributor

@sarnex sarnex Dec 10, 2025

Choose a reason for hiding this comment

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

sorry can you point out which part fixes the CI failures?

Copy link
Contributor Author

@mateuszpn mateuszpn Dec 10, 2025

Choose a reason for hiding this comment

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

When a device is specified as :arch-, it doesn't contain generic :gpu or :cpu - and the tokens were normally used when parsing conditions like %if gpu in tests. Now, if only gpu exist in test.config.available_features, tests still can use %if gpu.
After reconsidering - architecture-based device selection makes sense only for GPUs, so "cpu" and "accelerator" will never be used and can be removed (they will work as before if
device name is like opencl:cpu)

# (:arch- device, not :gpu or :cpu)
"cpu",
"gpu",
"accelerator",
]:
if cond_features in test.config.available_features:
conditions[cond_features] = True
Expand Down
13 changes: 11 additions & 2 deletions sycl/test-e2e/lit.cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -917,12 +917,14 @@ def get_sycl_ls_verbose(sycl_device, env):

env = copy.copy(llvm_config.config.environment)

backend_for_selector = backend.replace("_v2", "").replace("_v1", "")

# Find all available devices under the backend
env["ONEAPI_DEVICE_SELECTOR"] = backend + ":*"
env["ONEAPI_DEVICE_SELECTOR"] = backend_for_selector + ":*"

detected_architectures = []

platform_devices = remove_level_zero_suffix(backend + ":*")
platform_devices = backend_for_selector + ":*"

for line in get_sycl_ls_verbose(platform_devices, env).stdout.splitlines():
if re.match(r" *Architecture:", line):
Expand Down Expand Up @@ -1114,6 +1116,13 @@ def get_sycl_ls_verbose(sycl_device, env):
features.update(device_family)

be, dev = sycl_device.split(":")
Copy link
Contributor

@sarnex sarnex Dec 10, 2025

Choose a reason for hiding this comment

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

i would expect dev to be arch-intel_gpu_mtl_u or whatever, but i see isdigit check so what would the digits be?

Copy link
Contributor Author

@mateuszpn mateuszpn Dec 11, 2025

Choose a reason for hiding this comment

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

By the time we hit features.add(dev) sycl_device is already resolved SYCL name, eg. level_zero:1, not level_zero_v2:arch-intel_gpu. If the device name is given as :arch-, we have digit after colon, if it was generic (eg. :gpu) it is still generic.

if dev.isdigit():
backend_devices = available_devices.get(be, "gpu")
if isinstance(backend_devices, tuple):
# arch-selection is typically used to select gpu device
dev = "gpu"
else:
dev = backend_devices
features.add(dev.replace("fpga", "accelerator"))
if "level_zero_v2" in full_name:
features.add("level_zero_v2_adapter")
Expand Down