Skip to content

Commit a95a666

Browse files
committed
Enable AMD prebuilt testing in precommit
1 parent 254dd3b commit a95a666

File tree

4 files changed

+7
-29
lines changed

4 files changed

+7
-29
lines changed

.github/workflows/sycl-linux-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ jobs:
279279
target_devices: all
280280
binaries_artifact: ${{ inputs.e2e_binaries_artifact }}
281281
cxx_compiler: $GITHUB_WORKSPACE/toolchain/bin/clang++
282-
extra_lit_opts: --param sycl_build_targets="spir;nvidia"
282+
extra_lit_opts: --param sycl_build_targets="spir;nvidia;amd"
283283

284284
- name: Remove E2E tests before spirv-backend run
285285
if: ${{ inputs.e2e_binaries_artifact && always() && !cancelled() && steps.build.conclusion == 'success' }}

.github/workflows/sycl-linux-precommit.yml

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,11 @@ jobs:
6868
runner: '["Linux", "cuda"]'
6969
image_options: -u 1001 --gpus all --cap-add SYS_ADMIN
7070
target_devices: cuda:gpu
71+
- name: AMD/HIP
72+
runner: '["Linux", "amdgpu"]'
73+
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
74+
target_devices: hip:gpu
75+
reset_intel_gpu: false
7176
- name: Intel Arc A-Series Graphics
7277
runner: '["Linux", "arc"]'
7378
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
@@ -130,32 +135,6 @@ jobs:
130135
# Run only if the PR does not have the 'ci-no-devigc' label.
131136
skip_run: ${{matrix.use_igc_dev && contains(github.event.pull_request.labels.*.name, 'ci-no-devigc') || 'false'}}
132137

133-
test:
134-
needs: [build, detect_changes]
135-
if: ${{ always() && !cancelled() && needs.build.outputs.build_conclusion == 'success' }}
136-
strategy:
137-
fail-fast: false
138-
matrix:
139-
include:
140-
- name: AMD/HIP
141-
runner: '["Linux", "amdgpu"]'
142-
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
143-
target_devices: hip:gpu
144-
145-
uses: ./.github/workflows/sycl-linux-run-tests.yml
146-
with:
147-
name: ${{ matrix.name }}
148-
runner: ${{ matrix. runner }}
149-
image_options: ${{ matrix.image_options }}
150-
target_devices: ${{ matrix.target_devices }}
151-
152-
ref: ${{ github.sha }}
153-
154-
sycl_toolchain_artifact: sycl_linux_default
155-
sycl_toolchain_archive: ${{ needs.build.outputs.artifact_archive_name }}
156-
sycl_toolchain_decompress_command: ${{ needs.build.outputs.artifact_decompress_command }}
157-
158-
159138
test-perf:
160139
needs: [build, detect_changes]
161140
if: |

sycl/test-e2e/lit.cfg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
lit_config.note("build-only test mode enabled, only compiling tests")
7575
config.sycl_devices = []
7676
if not config.amd_arch:
77-
config.amd_arch = "gfx1031"
77+
config.amd_arch = "gfx1030"
7878
else:
7979
lit_config.error("Invalid argument for test-mode")
8080

sycl/test-e2e/lit.site.cfg.py.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ config.igc_tag_file = os.path.join("/usr/local/lib/igc/", 'IGCTAG.txt')
3030

3131
config.sycl_devices = lit_config.params.get("sycl_devices", "@SYCL_TEST_E2E_TARGETS@").split(';')
3232

33-
# FIXME: current test markup only supports spir in build-only
3433
config.sycl_build_targets = set("target-" + t for t in lit_config.params.get("sycl_build_targets", "spir").split(';'))
3534

3635
config.amd_arch = lit_config.params.get("amd_arch", "@AMD_ARCH@")

0 commit comments

Comments
 (0)