Skip to content

[SYCL][E2E] Add RUN-IF lit keyword #21288

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 1 commit into from
Feb 18, 2026
Merged

[SYCL][E2E] Add RUN-IF lit keyword #21288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions sycl/test-e2e/NonUniformGroups/chunk.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// RUN: %{run} %t.out
//
// Test CPU AOT as well when possible.
// RUN: %if any-device-is-cpu && opencl-aot %{ %{run-aux} %clangxx -fsycl -fsycl-targets=spir64_x86_64 -o %t.x86.out %s %}
// RUN: %if cpu && opencl-aot %{ %{run} %t.x86.out %}
// RUN-IF: any-device-is-cpu && opencl-aot, %{run-aux} %clangxx -fsycl -fsycl-targets=spir64_x86_64 -o %t.x86.out %s
// RUN-IF: cpu, %{run} %t.x86.out
Copy link
Contributor Author

@sarnex sarnex Feb 13, 2026

Choose a reason for hiding this comment

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

I removed opencl-aot from the conditional in all the run lines, it's not related to this feature, opencl-aot is a build only feature so it's always false in run mode, so even today this condition never runs

//
// REQUIRES: cpu || gpu
// REQUIRES: sg-32
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/NonUniformGroups/chunk_algorithms.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// RUN: %{run} %t.out
//
// Test CPU AOT as well when possible.
// RUN: %if any-device-is-cpu && opencl-aot %{ %{run-aux} %clangxx -fsycl -fsycl-targets=spir64_x86_64 -fsycl-device-code-split=per_kernel -o %t.x86.out %s %}
// RUN: %if cpu && opencl-aot %{ %{run} %t.x86.out %}
// RUN-IF: any-device-is-cpu && opencl-aot, %{run-aux} %clangxx -fsycl -fsycl-targets=spir64_x86_64 -fsycl-device-code-split=per_kernel -o %t.x86.out %s
// RUN-IF: cpu, %{run} %t.x86.out
//
// REQUIRES: cpu || gpu
// REQUIRES: sg-32
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/NonUniformGroups/fragment.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// RUN: %{run} %t.out
//
// Test CPU AOT as well when possible.
// RUN: %if any-device-is-cpu && opencl-aot %{ %{run-aux} %clangxx -fsycl -fsycl-targets=spir64_x86_64 -o %t.x86.out %s %}
// RUN: %if cpu && opencl-aot %{ %{run} %t.x86.out %}
// RUN-IF: any-device-is-cpu && opencl-aot, %{run-aux} %clangxx -fsycl -fsycl-targets=spir64_x86_64 -o %t.x86.out %s
// RUN-IF: cpu, %{run} %t.x86.out
//
// REQUIRES: cpu || gpu
// REQUIRES: aspect-ext_oneapi_fragment
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/NonUniformGroups/fragment_algorithms.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// RUN: %{run} %t.out
//
// Test CPU AOT as well when possible.
// RUN: %if any-device-is-cpu && opencl-aot %{ %{run-aux} %clangxx -fsycl -fsycl-targets=spir64_x86_64 -o %t.x86.out %s %}
// RUN: %if cpu && opencl-aot %{ %{run} %t.x86.out %}
// RUN-IF: any-device-is-cpu && opencl-aot, %{run-aux} %clangxx -fsycl -fsycl-targets=spir64_x86_64 -o %t.x86.out %s
// RUN-IF: cpu, %{run} %t.x86.out
//
// REQUIRES: cpu || gpu
// REQUIRES: sg-32
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/NonUniformGroups/opportunistic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// RUN: %{run} %t.out
//
// Test CPU AOT as well when possible.
// RUN: %if any-device-is-cpu && opencl-aot %{ %{run-aux} %clangxx -fsycl -fsycl-targets=spir64_x86_64 -o %t.x86.out %s %}
// RUN: %if cpu && opencl-aot %{ %{run} %t.x86.out %}
// RUN-IF: any-device-is-cpu && opencl-aot, %{run-aux} %clangxx -fsycl -fsycl-targets=spir64_x86_64 -o %t.x86.out %s
// RUN-IF: cpu, %{run} %t.x86.out
//
// REQUIRES: cpu || gpu
// REQUIRES: aspect-ext_oneapi_fragment
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/NonUniformGroups/opportunistic_algorithms.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// RUN: %{run} %t.out
//
// Test CPU AOT as well when possible.
// RUN: %if any-device-is-cpu && opencl-aot %{ %{run-aux} %clangxx -fsycl -fsycl-targets=spir64_x86_64 -o %t.x86.out %s %}
// RUN: %if cpu && opencl-aot %{ %{run} %t.x86.out %}
// RUN-IF: any-device-is-cpu && opencl-aot, %{run-aux} %clangxx -fsycl -fsycl-targets=spir64_x86_64 -o %t.x86.out %s
// RUN-IF: cpu, %{run} %t.x86.out
//
// REQUIRES: cpu || gpu
// REQUIRES: sg-32
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/NonUniformGroups/tangle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// RUN: %{run} %t.out
//
// Test CPU AOT as well when possible.
// RUN: %if any-device-is-cpu && opencl-aot %{ %{run-aux} %clangxx -fsycl -fsycl-targets=spir64_x86_64 -fno-sycl-early-optimizations -o %t.x86.out %s %}
// RUN: %if cpu && opencl-aot %{ %{run} %t.x86.out %}
// RUN-IF: any-device-is-cpu && opencl-aot, %{run-aux} %clangxx -fsycl -fsycl-targets=spir64_x86_64 -fno-sycl-early-optimizations -o %t.x86.out %s
// RUN-IF: cpu, %{run} %t.x86.out
//
// REQUIRES: cpu || gpu
// REQUIRES: aspect-ext_oneapi_tangle
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/NonUniformGroups/tangle_algorithms.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// RUN: %{run} %t.out
//
// Test CPU AOT as well when possible.
// RUN: %if any-device-is-cpu && opencl-aot %{ %{run-aux} %clangxx -fsycl -fsycl-targets=spir64_x86_64 -fno-sycl-early-optimizations -o %t.x86.out %s %}
// RUN: %if cpu && opencl-aot %{ %{run} %t.x86.out %}
// RUN-IF: any-device-is-cpu && opencl-aot, %{run-aux} %clangxx -fsycl -fsycl-targets=spir64_x86_64 -fno-sycl-early-optimizations -o %t.x86.out %s
// RUN-IF: cpu, %{run} %t.x86.out
//
// REQUIRES: sg-32
// REQUIRES: aspect-ext_oneapi_tangle
Expand Down
16 changes: 16 additions & 0 deletions sycl/test-e2e/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
* [llvm-lit parameters](#llvm-lit-parameters)
* [Marking tests as expected to fail](#marking-tests-as-expected-to-fail)
* [Marking tests as unsupported](#marking-tests-as-unsupported)
* [RUN-IF](#RUN-IF)
* [SYCL core header file](#sycl-core-header-file)
* [Compiling and executing tests on separate systems](#compiling-and-executing-tests-on-separate-systems)
* [Run only mode](#run-only-mode)
Expand Down Expand Up @@ -396,6 +397,21 @@ non-standard mechanism. Use `UNSUPPORTED: true` instead, we track `UNSUPPORTED`
tests using the mechanism described above. Otherwise the test risks remaining
untraceable.

#### RUN-IF

As a convenience, we provide the `RUN-IF` lit keyword, which simplifies running
commands conditionally. The syntax is:

```bash
RUN-IF: condition, command
```

A full example would be:

```bash
RUN-IF: cpu, %{run} %t_cpu.out
```

### SYCL core header file

While SYCL specification dictates that the only user-visible interface is
Expand Down
58 changes: 56 additions & 2 deletions sycl/test-e2e/format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,47 @@ def parse_min_intel_driver_req(line_number, line, output):
return output


def parse_run_if(line_number, line, output):
"""
Parse RUN-IF directive in the format:
// RUN-IF: condition, command
where condition is a boolean expression and command is the command to execute.
Returns a CommandDirective with the condition embedded in the command as %if.
"""
if not output:
output = []

# Split on first comma to separate condition from command
parts = line.split(",", 1)
if len(parts) != 2:
raise ValueError(
f"Line {line_number}: RUN-IF directive must have format: condition, command"
)

condition = parts[0].strip()
command = parts[1].strip()

if not condition or not command:
raise ValueError(
f"Line {line_number}: RUN-IF directive has empty condition or command"
)

# Strip outer %{ %} if present to avoid nested braces
if command.startswith("%{") and command.endswith("%}"):
command = command[2:-2].strip()

# Convert RUN-IF to a RUN command with %if condition
# This leverages lit's built-in conditional support
conditional_command = f"%if {condition} %{{ {command} %}}"

output.append(
lit.TestRunner.CommandDirective(
line_number, line_number, "RUN:", conditional_command
)
)
return output


class SYCLEndToEndTest(lit.formats.ShTest):
def parseTestScript(self, test):
"""This is based on lit.TestRunner.parseIntegratedTestScript but we
Expand All @@ -66,16 +107,29 @@ def parseTestScript(self, test):
"REQUIRES-INTEL-DRIVER:",
ParserKind.CUSTOM,
parse_min_intel_driver_req,
)
),
IntegratedTestKeywordParser(
"RUN-IF:", ParserKind.CUSTOM, parse_run_if
),
],
require_script=True,
require_script=False,
)
except ValueError as e:
return lit.Test.Result(lit.Test.UNRESOLVED, str(e))
script = parsed["RUN:"] or []
assert parsed["DEFINE:"] == script
assert parsed["REDEFINE:"] == script

# Add RUN-IF commands to the script
if parsed["RUN-IF:"]:
script.extend(parsed["RUN-IF:"])

# Ensure we have at least one command (RUN or RUN-IF)
if not script:
return lit.Test.Result(
lit.Test.UNRESOLVED, "Test has no 'RUN:' or 'RUN-IF:' line"
)

test.xfails += test.config.xfail_features
test.xfails += parsed["XFAIL:"] or []
test.requires += test.config.required_features
Expand Down
Loading