Skip to content

Commit fc392c8

Browse files
committed
fix features for UNSUPPORTED directive. fix windows runners
1 parent 1a5e6f0 commit fc392c8

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

.github/workflows/sycl-nightly.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ jobs:
149149
runner: ${{ inputs.runner }}
150150
image_options: ${{ inputs.image_options }}
151151
tests_selector: e2e
152-
testing_mode: "full"
152+
testing_mode: ${{ inputs.testing_mode }}
153153
target_devices: ${{ inputs.target_devices }}
154154
extra_lit_opts: "--param enable_new_offload_model=True"
155155
tests_ref: ${{ github.sha }}
@@ -165,10 +165,11 @@ jobs:
165165
uses: ./.github/workflows/sycl-windows-run-tests.yml
166166
permissions: read-all
167167
with:
168-
name: "E2E with enabled NewOffloadModel"
169-
runner: ${{ inputs.runner }}
168+
name: "E2E Windows with enabled NewOffloadModel"
169+
runner: '["Windows", arc"]'
170170
tests_selector: e2e
171-
target_devices: ${{ inputs.target_devices }}
171+
testing_mode: ${{ inputs.testing_mode }}
172+
target_devices: level_zero:gpu
172173
extra_lit_opts: "--param enable_new_offload_model=True"
173174
toolchain_artifact_filename: ${{ needs.build-win.outputs.toolchain_artifact_filename }}
174175

sycl/test-e2e/lit.cfg.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@
5656
config.required_features = []
5757
config.unsupported_features = []
5858

59+
#config.available_features.add("aaa")
60+
5961
# test-mode: Set if tests should run normally or only build/run
6062
config.test_mode = lit_config.params.get("test-mode", "full")
6163
config.fallback_build_run_only = False
@@ -984,6 +986,11 @@ def get_sycl_ls_verbose(sycl_device, env):
984986
"sycl-jit was not found. Tests requiring sycl-jit will be skipped."
985987
)
986988

989+
# Check for enabled NewOffloadModel
990+
if lit_config.params.get("enable_new_offload_model", "False") != "False":
991+
config.available_features.add("aaa")
992+
config.cxx_flags += "--offload-new-driver "
993+
987994
# That has to be executed last so that all device-independent features have been
988995
# discovered already.
989996
config.sycl_dev_features = {}
@@ -1146,11 +1153,6 @@ def get_sycl_ls_verbose(sycl_device, env):
11461153
else:
11471154
config.intel_driver_ver[full_name] = {}
11481155

1149-
if lit_config.params.get("enable_new_offload_model", False):
1150-
config.available_features.add('new-offload-model')
1151-
config.cxx_flags += "--offload-new-driver "
1152-
print(f"Current cxx_flags: {config.cxx_flags}")
1153-
11541156
if lit_config.params.get("compatibility_testing", "False") != "False":
11551157
config.substitutions.append(("%clangxx", " true "))
11561158
config.substitutions.append(("%clang", " true "))

0 commit comments

Comments
 (0)