Skip to content

Commit df335ab

Browse files
author
Colin Davidson
authored
Merge pull request uxlfoundation#913 from coldav/colin/add_aarch64_e2e
[CI][E2E] Add support for e2e aarch64
2 parents 5794b13 + e741ce4 commit df335ab

9 files changed

Lines changed: 69 additions & 4 deletions

.github/workflows/planned_testing_caller.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ jobs:
105105
test_sycl_cts: ${{ inputs.test_sycl_cts }}
106106
test_sycl_e2e: ${{ inputs.test_sycl_e2e }}
107107
test_opencl_cts: ${{ inputs.test_opencl_cts }}
108+
test_sanitizers: ${{ inputs.test_sanitizers }}
108109
native_cpu: ${{ inputs.native_cpu }}
109110
llvm_branch: ${{ inputs.llvm_branch }}
110111
save_cache: ${{ inputs.save_cache }}

.github/workflows/run_ock_external_tests.yml

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,7 @@ jobs:
341341
llvm_version: ${{ inputs.llvm_version }}
342342

343343
build_opencl_cts_riscv64:
344+
if: inputs.test_opencl_cts && (contains(inputs.target_list, 'host_riscv64_linux'))
344345
needs: [ workflow_vars, build_icd, create_ock_artefacts_ubuntu ]
345346
runs-on: 'ubuntu-24.04'
346347
container:
@@ -366,7 +367,7 @@ jobs:
366367
target: host_riscv64_linux
367368

368369
run_opencl_cts_riscv64:
369-
if: inputs.test_opencl_cts
370+
if: inputs.test_opencl_cts && (contains(inputs.target_list, 'host_riscv64_linux'))
370371
needs: [ workflow_vars, build_icd, create_ock_artefacts_ubuntu, build_opencl_cts_riscv64 ]
371372
runs-on: 'ubuntu-24.04'
372373
strategy:
@@ -429,7 +430,7 @@ jobs:
429430
volumes:
430431
- ${{github.workspace}}:${{github.workspace}}
431432

432-
if: inputs.test_sycl_cts && contains(inputs.target_list, 'host_aarch64_linux')
433+
if: (inputs.test_sycl_cts || inputs.test_sycl_e2e) && contains(inputs.target_list, 'host_aarch64_linux')
433434
steps:
434435
- name: Checkout repo
435436
uses: actions/checkout@v4
@@ -899,3 +900,39 @@ jobs:
899900
with:
900901
target: host_x86_64_linux
901902
sycl_device: opencl
903+
904+
run_sycl_e2e_aarch64_native_cpu:
905+
needs: [workflow_vars, build_dpcpp_native_aarch64]
906+
runs-on: 'ubuntu-22.04-arm'
907+
container:
908+
image: 'ghcr.io/uxlfoundation/ock_ubuntu_22.04-aarch64:latest'
909+
volumes:
910+
- ${{github.workspace}}:${{github.workspace}}
911+
912+
if: inputs.test_sycl_e2e && inputs.native_cpu && contains(inputs.target_list, 'host_aarch64_linux')
913+
steps:
914+
- name: Checkout repo
915+
uses: actions/checkout@v4
916+
- name: build e2e
917+
uses: ./.github/actions/do_build_run_sycl_e2e
918+
with:
919+
target: host_aarch64_linux
920+
sycl_device: native_cpu
921+
922+
run_sycl_e2e_aarch64_opencl:
923+
needs: [workflow_vars, build_dpcpp_native_aarch64]
924+
runs-on: 'ubuntu-22.04-arm'
925+
container:
926+
image: 'ghcr.io/uxlfoundation/ock_ubuntu_22.04-aarch64:latest'
927+
volumes:
928+
- ${{github.workspace}}:${{github.workspace}}
929+
930+
if: inputs.test_sycl_e2e && inputs.ock && contains(inputs.target_list, 'host_aarch64_linux')
931+
steps:
932+
- name: Checkout repo
933+
uses: actions/checkout@v4
934+
- name: build e2e
935+
uses: ./.github/actions/do_build_run_sycl_e2e
936+
with:
937+
target: host_aarch64_linux
938+
sycl_device: opencl
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
SYCL,Basic/built-ins/const_vec_common.cpp,XFail
2+
SYCL,Basic/built-ins/const_vec_geometric.cpp,XFail
3+
SYCL,Basic/built-ins/const_vec_math.cpp,XFail
4+
SYCL,Basic/built-ins/marray_math.cpp,XFail
5+
SYCL,Basic/built-ins/vec_common.cpp,XFail
6+
SYCL,Basic/built-ins/vec_geometric.cpp,XFail
7+
SYCL,Basic/built-ins/vec_math.cpp,XFail
8+
SYCL,DeviceLib/built-ins/marray_integer.cpp,XFail
9+
SYCL,DeviceLib/built-ins/vector_relational.cpp,XFail
10+
SYCL,DotProduct/dot_product_int_test.cpp,XFail

scripts/testing/sycl_e2e/override_native_cpu.csv

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ SYCL,Basic/kernel_bundle/kernel_bundle_api.cpp,XFail
99
SYCL,Basic/large-range.cpp,XFail
1010
SYCL,Basic/max_linear_work_group_size_props.cpp,XFail
1111
SYCL,Basic/max_work_group_size_props.cpp,XFail
12-
SYCL,Complex/sycl_complex_math_test.cpp,XFail
1312
SYCL,Compression/no_zstd_warning.cpp,XFail
1413
SYCL,DeviceImageDependencies/dynamic.cpp,XFail
1514
SYCL,DeviceImageDependencies/free_function_kernels.cpp,XFail
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
SYCL,GroupAlgorithm/SYCL2020/reduce_over_group_size.cpp,XFail
2+
SYCL,HierPar/hier_par_wgscope_O0.cpp,XFail
3+
SYCL,OptionalKernelFeatures/is_compatible/is_compatible_with_aspects.cpp,XFail
4+
SYCL,OptionalKernelFeatures/throw-exception-for-unsupported-aspect.cpp,XFail
5+
SYCL,Regression/2020-spec-constants-debug-info.cpp,XFail
6+
SYCL,Regression/default-constructed-local-accessor.cpp,XFail
7+
SYCL,Regression/optimization_level_debug_info_intopt.cpp,XFail
8+
SYCL,Regression/unoptimized_stream.cpp,XFail
9+
SYCL,syclcompat/math/math_emu_simd_from_syclomatic.cpp,XFail
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
SYCL,Complex/sycl_complex_math_test.cpp,XFail

scripts/testing/sycl_e2e/override_opencl.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ SYCL,HierPar/hier_par_wgscope_O0.cpp,MayFail
114114
SYCL,KernelCompiler/sycl_cache.cpp,XFail
115115
SYCL,KernelCompiler/sycl.cpp,XFail
116116
SYCL,KernelCompiler/sycl_device_globals.cpp,XFail
117+
SYCL,NewOffloadDriver/multisource.cpp,XFail
117118
SYCL,NonUniformGroups/ballot_group_algorithms.cpp,XFail
118119
SYCL,NonUniformGroups/fixed_size_group_algorithms.cpp,XFail
119120
SYCL,NonUniformGroups/fixed_size_group.cpp,XFail
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
SYCL,AtomicRef/max.cpp,MayFail
2+
SYCL,AtomicRef/sub_generic.cpp,MayFail
3+
SYCL,Basic/built-ins/marray_geometric.cpp,XFail
4+
SYCL,Config/env_vars.cpp,XFail
5+
SYCL,DeviceLib/math_test_marray_vec_fp16.cpp,XFail
6+
SYCL,syclcompat/math/math_compare.cpp,XFail
7+
SYCL,syclcompat/math/math_emu_simd_from_syclomatic.cpp,XFail
8+
SYCL,syclcompat/math/math_emu_simd_from_syclomatic.cpp,XFail

scripts/testing/sycl_e2e/override_opencl_host_x86_64_linux.csv

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)