Skip to content

Commit 721b937

Browse files
committed
Merge remote-tracking branch 'origin/sycl' into no_fallback_second_q
2 parents 6c30ddf + 6b62029 commit 721b937

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/workflows/sycl-windows-run-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ jobs:
181181
if: inputs.tests_selector == 'e2e'
182182
shell: bash {0}
183183
env:
184-
LIT_OPTS: -v --no-progress-bar --show-unsupported --show-pass --show-xfail --max-time 3600 --time-tests --param print_features=True --param test-mode=${{ inputs.e2e_testing_mode }} ${{ inputs.extra_lit_opts }}
184+
LIT_OPTS: -v --no-progress-bar --show-unsupported --show-pass --show-xfail --max-time ${{ inputs.e2e_testing_mode == 'run-only' && 1200 || 3600 }} --time-tests --param print_features=True --param test-mode=${{ inputs.e2e_testing_mode }} ${{ inputs.extra_lit_opts }}
185185
run: |
186186
# Run E2E tests.
187187
if [[ ${{inputs.compiler}} == 'icx' ]]; then

buildbot/configure.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,6 @@ def do_configure(args, passthrough_args):
7878
sycl_enabled_backends.append("level_zero")
7979
sycl_enabled_backends.append("level_zero_v2")
8080

81-
# lld is needed on Windows or for the HIP adapter on AMD
82-
if platform.system() == "Windows" or (args.hip and args.hip_platform == "AMD"):
83-
llvm_enable_projects += ";lld"
84-
8581
libclc_enabled = args.cuda or args.hip or args.native_cpu
8682
if libclc_enabled:
8783
llvm_enable_projects += ";libclc"
@@ -171,6 +167,10 @@ def do_configure(args, passthrough_args):
171167
if args.disable_preview_lib:
172168
sycl_preview_lib = "OFF"
173169

170+
# lld is needed on Windows or when building AMDGPU
171+
if platform.system() == "Windows" or "AMDGPU" in llvm_targets_to_build:
172+
llvm_enable_projects += ";lld"
173+
174174
install_dir = os.path.join(abs_obj_dir, "install")
175175

176176
cmake_cmd = [

0 commit comments

Comments
 (0)