diff --git a/.github/workflows/sycl-linux-build.yml b/.github/workflows/sycl-linux-build.yml index 4acd40588ba11..ffacc9d9c7000 100644 --- a/.github/workflows/sycl-linux-build.yml +++ b/.github/workflows/sycl-linux-build.yml @@ -75,9 +75,6 @@ on: e2e_binaries_preview_artifact: type: string required: false - e2e_binaries_new_offload_model_artifact: - type: string - required: false outputs: build_conclusion: @@ -338,21 +335,6 @@ jobs: sycl_compiler: $GITHUB_WORKSPACE/toolchain/bin/clang++ extra_lit_opts: --param sycl_build_targets="spir;nvidia;amd" - - name: Build E2E tests with NewOffloadModel - if: | - inputs.e2e_binaries_new_offload_model_artifact && - !cancelled() - && steps.build.conclusion == 'success' && - contains(github.event.pull_request.labels.*.name, 'new-offload-model') - uses: ./devops/actions/run-tests/e2e - with: - ref: ${{ inputs.ref || github.sha }} - testing_mode: build-only - target_devices: all - binaries_artifact: ${{ inputs.e2e_binaries_new_offload_model_artifact }} - sycl_compiler: $GITHUB_WORKSPACE/toolchain/bin/clang++ - extra_lit_opts: --param sycl_build_targets="spir;nvidia;amd" --param enable_new_offload_model=True - - name: Build E2E tests with SPIR-V Backend if: ${{ inputs.e2e_binaries_spirv_backend_artifact && !cancelled() && steps.build.conclusion == 'success' }} uses: ./devops/actions/run-tests/e2e diff --git a/.github/workflows/sycl-linux-precommit.yml b/.github/workflows/sycl-linux-precommit.yml index 3a99cf62d438a..bef9396b049eb 100644 --- a/.github/workflows/sycl-linux-precommit.yml +++ b/.github/workflows/sycl-linux-precommit.yml @@ -66,7 +66,6 @@ jobs: toolchain_artifact: sycl_linux_default e2e_binaries_artifact: e2e_bin e2e_binaries_preview_artifact: e2e_bin_preview - e2e_binaries_new_offload_model_artifact: e2e_bin_new_offload_model # Build and run native cpu e2e tests separately as cannot currently # build all the e2e tests @@ -237,57 +236,6 @@ jobs: skip_run: ${{matrix.use_igc_dev && contains(github.event.pull_request.labels.*.name, 'ci-no-devigc') || matrix.skip_run || 'false'}} env: ${{ matrix.env || (contains(needs.detect_changes.outputs.filters, 'esimd') && '{}' || '{"LIT_FILTER_OUT":"ESIMD/"}') }} - E2E-with-new-offload-model: - needs: [build, detect_changes, compat_read_exclude] - if: | - !cancelled() && - needs.build.outputs.build_conclusion == 'success' && - contains(github.event.pull_request.labels.*.name, 'new-offload-model') - permissions: - contents: write - packages: read - strategy: - fail-fast: false - matrix: - include: - - name: Intel / GEN 12 Integrated - runner: '["Linux", "gen12"]' - target_devices: opencl:cpu;opencl:gpu - - name: Intel / Arc A-Series Graphics - runner: '["Linux", "arc"]' - target_devices: level_zero:gpu - - name: Intel / Ponte Vecchio GPU - runner: '["Linux", "pvc"]' - target_devices: level_zero:gpu - - name: Intel / Battlemage Graphics - runner: '["Linux", "bmg"]' - target_devices: level_zero_v2:gpu - - name: NVIDIA/CUDA - runner: '["Linux", "cuda"]' - image_options: -u 1001 --gpus all --cap-add SYS_ADMIN - target_devices: cuda:gpu - - name: AMD/HIP - runner: '["Linux", "amdgpu"]' - image_options: -u 1001 --device=/dev/dri --device=/dev/kfd - target_devices: hip:gpu - extra_lit_opts: -j 1 - - uses: ./.github/workflows/sycl-linux-run-tests.yml - with: - name: ${{ matrix.name }} with NewOffloadModel - runner: ${{ matrix.runner }} - image: ${{ matrix.image }} - image_options: ${{ matrix.image_options || '-u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN' }} - target_devices: ${{ matrix.target_devices }} - extra_lit_opts: ${{ matrix.extra_lit_opts }} --param enable_new_offload_model=True - repo_ref: ${{ github.sha }} - toolchain_artifact: ${{ needs.build.outputs.toolchain_artifact }} - toolchain_artifact_filename: ${{ needs.build.outputs.toolchain_artifact_filename }} - toolchain_decompress_command: ${{ needs.build.outputs.toolchain_decompress_command }} - binaries_artifact: 'e2e_bin_new_offload_model' - testing_mode: 'run-only' - - test-perf: needs: [build, detect_changes] permissions: diff --git a/.github/workflows/sycl-nightly.yml b/.github/workflows/sycl-nightly.yml index c73f4034c1ee0..351f7ba3a1897 100644 --- a/.github/workflows/sycl-nightly.yml +++ b/.github/workflows/sycl-nightly.yml @@ -92,7 +92,6 @@ jobs: toolchain_artifact_filename: sycl_linux_libcxx.tar.zst ubuntu2204_test: - name: ubuntu2204_test needs: [ubuntu2204_build] permissions: contents: write @@ -101,7 +100,6 @@ jobs: strategy: fail-fast: false matrix: - enable_new_offload_model: ['False', 'True'] include: - name: AMD/HIP runner: '["Linux", "amdgpu"]' @@ -113,7 +111,6 @@ jobs: image_options: -u 1001 --device=/dev/dri --device=/dev/kfd target_devices: hip:gpu extra_lit_opts: --param test-preview-mode=True - enable_new_offload_model: 'False' - name: NVIDIA/CUDA runner: '["Linux", "cuda"]' @@ -125,7 +122,6 @@ jobs: image_options: -u 1001 --gpus all --cap-add SYS_ADMIN target_devices: cuda:gpu extra_lit_opts: --param test-preview-mode=True - enable_new_offload_model: 'False' - name: Intel L0 Gen12 GPU runner: '["Linux", "gen12"]' @@ -143,7 +139,6 @@ jobs: runner: '["Linux", "bmg"]' target_devices: level_zero:gpu extra_lit_opts: --param test-preview-mode=True - enable_new_offload_model: 'False' - name: Intel L0 Arc A-Series GPU runner: '["Linux", "arc"]' @@ -172,16 +167,15 @@ jobs: runner: '["Linux", "pvc"]' target_devices: level_zero:gpu extra_lit_opts: --param test-preview-mode=True - enable_new_offload_model: 'False' uses: ./.github/workflows/sycl-linux-run-tests.yml with: - name: ${{ matrix.name }} with ${{ matrix.enable_new_offload_model == 'True' && 'New Offload Model' || 'Old Offload Model' }} + name: ${{ matrix.name }} runner: ${{ matrix.runner }} image_options: ${{ matrix.image_options || '-u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN' }} target_devices: ${{ matrix.target_devices }} tests_selector: e2e - extra_lit_opts: "--param 'cxx_flags=-D_GLIBCXX_USE_CXX11_ABI=0' ${{ matrix.extra_lit_opts }} --param enable_new_offload_model=${{ matrix.enable_new_offload_model }}" + extra_lit_opts: "--param 'cxx_flags=-D_GLIBCXX_USE_CXX11_ABI=0' ${{ matrix.extra_lit_opts }}" repo_ref: ${{ github.sha }} toolchain_artifact: ${{ needs.ubuntu2204_build.outputs.toolchain_artifact }} toolchain_artifact_filename: ${{ needs.ubuntu2204_build.outputs.toolchain_artifact_filename }} @@ -220,7 +214,6 @@ jobs: e2e-win: needs: build-win - name: E2E win with ${{ matrix.enable_new_offload_model == 'True' && 'New Offload Model' || 'Old Offload Model' }} # Continue if build was successful. if: | !cancelled() @@ -228,7 +221,6 @@ jobs: strategy: fail-fast: false matrix: - enable_new_offload_model: ['False', 'True'] include: - name: Intel Gen12 GPU runner: '["Windows", "gen12"]' @@ -245,7 +237,6 @@ jobs: runner: ${{ matrix.runner }} target_devices: level_zero:gpu toolchain_artifact_filename: ${{ needs.build-win.outputs.toolchain_artifact_filename }} - extra_lit_opts: --param enable_new_offload_model=${{ matrix.enable_new_offload_model }} cuda-aws-start: needs: [ubuntu2204_build] diff --git a/.github/workflows/sycl-windows-build.yml b/.github/workflows/sycl-windows-build.yml index 87dac8340aa6b..55b107aa081bf 100644 --- a/.github/workflows/sycl-windows-build.yml +++ b/.github/workflows/sycl-windows-build.yml @@ -50,10 +50,6 @@ on: type: string required: false - e2e_binaries_new_offload_model_artifact: - type: string - required: false - outputs: build_conclusion: value: ${{ jobs.build.outputs.build_conclusion }} @@ -255,21 +251,6 @@ jobs: extra_lit_opts: --param sycl_build_targets="spir" cxx: ${{ inputs.cxx }} - - name: Build E2E tests with New Offload Model - if: | - inputs.e2e_binaries_artifact && - !cancelled() && - steps.build.conclusion == 'success' && - contains(github.event.pull_request.labels.*.name, 'new-offload-model') - uses: ./devops/actions/run-tests/windows/e2e - with: - ref: ${{ inputs.ref || github.sha }} - testing_mode: build-only - target_devices: all - binaries_artifact: ${{ inputs.e2e_binaries_new_offload_model_artifact }} - extra_lit_opts: --param sycl_build_targets="spir" --param enable_new_offload_model=True - cxx: ${{ inputs.cxx }} - - name: Detect hung tests if: always() shell: powershell diff --git a/.github/workflows/sycl-windows-precommit.yml b/.github/workflows/sycl-windows-precommit.yml index 6a435fb548aa5..3be34f80b6229 100644 --- a/.github/workflows/sycl-windows-precommit.yml +++ b/.github/workflows/sycl-windows-precommit.yml @@ -57,7 +57,6 @@ jobs: with: changes: ${{ needs.detect_changes.outputs.filters }} e2e_binaries_artifact: sycl_windows_e2ebin - e2e_binaries_new_offload_model_artifact: sycl_windows_e2ebin_with_new_offload_model run_prebuilt_e2e_tests: needs: build @@ -83,30 +82,3 @@ jobs: toolchain_artifact_filename: ${{ needs.build.outputs.toolchain_artifact_filename }} testing_mode: run-only binaries_artifact: sycl_windows_e2ebin - - run_prebuilt_e2e_with_new_offload_model_tests: - needs: build - # Continue if build was successful. - if: | - !cancelled() && - needs.build.outputs.build_conclusion == 'success' && - contains(github.event.pull_request.labels.*.name, 'new-offload-model') - strategy: - fail-fast: false - matrix: - include: - - name: Intel GEN12 Graphics with Level Zero - runner: '["Windows","gen12"]' - - name: Intel Arc Graphics with Level Zero - runner: '["Windows","arc"]' - - name: Intel Battlemage Graphics with Level Zero - runner: '["Windows","bmg"]' - uses: ./.github/workflows/sycl-windows-run-tests.yml - with: - name: ${{ matrix.name }} - runner: ${{ matrix.runner }} - target_devices: "level_zero:gpu" - toolchain_artifact_filename: ${{ needs.build.outputs.toolchain_artifact_filename }} - testing_mode: run-only - binaries_artifact: sycl_windows_e2ebin_with_new_offload_model - extra_lit_opts: --param enable_new_offload_model=True diff --git a/sycl/test-e2e/AOT/multiple-devices.cpp b/sycl/test-e2e/AOT/multiple-devices.cpp index cebe4276a3992..78e7356541365 100644 --- a/sycl/test-e2e/AOT/multiple-devices.cpp +++ b/sycl/test-e2e/AOT/multiple-devices.cpp @@ -6,9 +6,6 @@ // //===----------------------------------------------------------------------===// -// XFAIL: new-offload-model && run-mode -// XFAIL-TRACKER: https://github.com/intel/llvm/issues/20797 - // REQUIRES: opencl-aot, ocloc, any-device-is-cpu, any-device-is-gpu, target-spir, opencl-cpu-rt // Produce a fat object for all targets (generic SPIR-V, CPU, GPU) diff --git a/sycl/test-e2e/Compression/compression.cpp b/sycl/test-e2e/Compression/compression.cpp index acf07d8664bd7..26147407f73c7 100644 --- a/sycl/test-e2e/Compression/compression.cpp +++ b/sycl/test-e2e/Compression/compression.cpp @@ -1,6 +1,3 @@ -// XFAIL: new-offload-model && target-amd -// XFAIL-TRACKER: https://github.com/intel/llvm/issues/20797 - // End-to-End test for testing device image compression. // REQUIRES: zstd diff --git a/sycl/test-e2e/Compression/compression_multiple_tu.cpp b/sycl/test-e2e/Compression/compression_multiple_tu.cpp index 4698eeae8eed4..0290c3771d6b7 100644 --- a/sycl/test-e2e/Compression/compression_multiple_tu.cpp +++ b/sycl/test-e2e/Compression/compression_multiple_tu.cpp @@ -1,6 +1,3 @@ -// XFAIL: new-offload-model && target-amd -// XFAIL-TRACKER: https://github.com/intel/llvm/issues/20797 - // End-to-End test for testing device image compression when we have two // translation units, one compressed and one not compressed. // REQUIRES: zstd, linux diff --git a/sycl/test-e2e/DeviceLib/rand_test.cpp b/sycl/test-e2e/DeviceLib/rand_test.cpp index 6a29935dfcf36..082e62914340c 100644 --- a/sycl/test-e2e/DeviceLib/rand_test.cpp +++ b/sycl/test-e2e/DeviceLib/rand_test.cpp @@ -1,6 +1,3 @@ -// XFAIL: new-offload-model && target-amd -// XFAIL-TRACKER: https://github.com/intel/llvm/issues/20797 - // RUN: %{build} -o %t.out // RUN: %{run} %t.out diff --git a/sycl/test-e2e/E2EExpr.py b/sycl/test-e2e/E2EExpr.py index 7afeec4c15166..d39ee5f6a1f09 100644 --- a/sycl/test-e2e/E2EExpr.py +++ b/sycl/test-e2e/E2EExpr.py @@ -48,7 +48,6 @@ class E2EExpr(BooleanExpression): "pdtracker", "ze_debug", "device-config-file", - "new-offload-model", } def __init__(self, string, variables, build_only_mode, final_unknown_value): diff --git a/sycl/test-e2e/ESIMD/lit.local.cfg b/sycl/test-e2e/ESIMD/lit.local.cfg index 304652fcade28..c6a79eb197063 100644 --- a/sycl/test-e2e/ESIMD/lit.local.cfg +++ b/sycl/test-e2e/ESIMD/lit.local.cfg @@ -27,6 +27,3 @@ config.unsupported_features += ['spirv-backend'] # https://github.com/intel/llvm/issues/20142 config.unsupported_features += ['target-native_cpu'] - -# https://github.com/intel/llvm/issues/20797 -config.unsupported_features += ['new-offload-model'] diff --git a/sycl/test-e2e/InvokeSimd/lit.local.cfg b/sycl/test-e2e/InvokeSimd/lit.local.cfg index 5f7e2b9927cdc..4b680ed078baf 100644 --- a/sycl/test-e2e/InvokeSimd/lit.local.cfg +++ b/sycl/test-e2e/InvokeSimd/lit.local.cfg @@ -12,6 +12,3 @@ config.unsupported_features += ['spirv-backend'] # https://github.com/intel/llvm/issues/20142. config.unsupported_features += ['target-native_cpu'] - -# https://github.com/intel/llvm/issues/20797 -config.unsupported_features += ['new-offload-model'] diff --git a/sycl/test-e2e/KernelAndProgram/kernel-bundle-merge-options-env.cpp b/sycl/test-e2e/KernelAndProgram/kernel-bundle-merge-options-env.cpp index 8289e5641b701..aec55eceddfe6 100644 --- a/sycl/test-e2e/KernelAndProgram/kernel-bundle-merge-options-env.cpp +++ b/sycl/test-e2e/KernelAndProgram/kernel-bundle-merge-options-env.cpp @@ -1,6 +1,3 @@ -// XFAIL: new-offload-model && linux -// XFAIL-TRACKER: https://github.com/intel/llvm/issues/20797 - // REQUIRES: gpu // Disable fallback assert here so, that build process isn't affected // RUN: %{build} -DSYCL_DISABLE_FALLBACK_ASSERT=1 -o %t1.out %debug_option diff --git a/sycl/test-e2e/KernelAndProgram/kernel-bundle-merge-options.cpp b/sycl/test-e2e/KernelAndProgram/kernel-bundle-merge-options.cpp index 799ab12ab1e33..10037fe75f6b4 100644 --- a/sycl/test-e2e/KernelAndProgram/kernel-bundle-merge-options.cpp +++ b/sycl/test-e2e/KernelAndProgram/kernel-bundle-merge-options.cpp @@ -1,6 +1,3 @@ -// XFAIL: new-offload-model && linux -// XFAIL-TRACKER: https://github.com/intel/llvm/issues/20797 - // REQUIRES: gpu // RUN: %{build} -o %t.out %debug_option // RUN: env SYCL_UR_TRACE=2 %{run} %t.out | FileCheck %s diff --git a/sycl/test-e2e/KernelAndProgram/level-zero-link-flags.cpp b/sycl/test-e2e/KernelAndProgram/level-zero-link-flags.cpp index 0a80ab3fe708c..2f233aaa731a7 100644 --- a/sycl/test-e2e/KernelAndProgram/level-zero-link-flags.cpp +++ b/sycl/test-e2e/KernelAndProgram/level-zero-link-flags.cpp @@ -1,6 +1,3 @@ -// XFAIL: new-offload-model && linux -// XFAIL-TRACKER: https://github.com/intel/llvm/issues/20797 - // REQUIRES: target-spir, level_zero // RUN: %{build} -Xsycl-target-linker=spir64 -foo -o %t.out // RUN: %{run} %t.out diff --git a/sycl/test-e2e/KernelCompiler/sycl_join.cpp b/sycl/test-e2e/KernelCompiler/sycl_join.cpp index 126fc713e766a..0bed7c3c10c04 100644 --- a/sycl/test-e2e/KernelCompiler/sycl_join.cpp +++ b/sycl/test-e2e/KernelCompiler/sycl_join.cpp @@ -12,10 +12,6 @@ // RUN: %if hip %{ env SYCL_JIT_AMDGCN_PTX_TARGET_CPU=%{amd_arch} %} %{run} %t.out // RUN: %if hip %{ env SYCL_JIT_AMDGCN_PTX_TARGET_CPU=%{amd_arch} %} %{l0_leak_check} %{run} %t.out -// This test is flaky in NewOffloadModel model for Arc GPU in windows. -// UNSUPPORTED: new-offload-model && windows && run-mode -// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/20797 - // XFAIL: target-native_cpu // XFAIL-TRACKER: https://github.com/intel/llvm/issues/20142 diff --git a/sycl/test-e2e/ProgramManager/uneven_kernel_split.cpp b/sycl/test-e2e/ProgramManager/uneven_kernel_split.cpp index 5f60ca0579353..c336577f3367b 100644 --- a/sycl/test-e2e/ProgramManager/uneven_kernel_split.cpp +++ b/sycl/test-e2e/ProgramManager/uneven_kernel_split.cpp @@ -3,9 +3,8 @@ // UNSUPPORTED: linux // UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/17305 -// XFAIL: windows && !new-offload-model +// XFAIL: windows // XFAIL-TRACKER: https://github.com/intel/llvm/issues/20127 -// XFAIL-TRACKER: https://github.com/intel/llvm/issues/20797 // RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64 -I %S/Inputs/ %S/uneven_kernel_split.cpp -c -o %t.o // RUN: %clangxx -fsycl -fsycl-targets=spir64_gen -Xsycl-target-backend=spir64_gen %gpu_aot_target_opts -I %S/Inputs/ %S/Inputs/gpu_kernel1.cpp -c -o %t1.o diff --git a/sycl/test-e2e/README.md b/sycl/test-e2e/README.md index 7199c9ce33585..1f1336e62916e 100644 --- a/sycl/test-e2e/README.md +++ b/sycl/test-e2e/README.md @@ -323,7 +323,6 @@ configure specific single test execution in the command line: by CMake variable HIP_LIBS_DIR (autodetected). * **run_launcher** - part of `%{run*}` expansion/substitution to alter execution of the test by, e.g., running it through Valgrind. -* **enable_new_offload_model** - enables New Offload Model driver mode for all tests. Example: diff --git a/sycl/test-e2e/Regression/reduction_resource_leak_dw.cpp b/sycl/test-e2e/Regression/reduction_resource_leak_dw.cpp index 99f498218bbe4..f41f0794afb87 100644 --- a/sycl/test-e2e/Regression/reduction_resource_leak_dw.cpp +++ b/sycl/test-e2e/Regression/reduction_resource_leak_dw.cpp @@ -1,8 +1,3 @@ -// This test is flaky in NewOffloadModel mode among different targets at -// Windows. -// UNSUPPORTED: new-offload-model && windows && run-mode -// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/20797 - // REQUIRES: level_zero // // UNSUPPORTED: windows && level_zero_v2_adapter diff --git a/sycl/test-e2e/SeparateCompile/test.cpp b/sycl/test-e2e/SeparateCompile/test.cpp index ee8cac7ccf2de..920714e72e0f0 100644 --- a/sycl/test-e2e/SeparateCompile/test.cpp +++ b/sycl/test-e2e/SeparateCompile/test.cpp @@ -1,6 +1,3 @@ -// XFAIL: new-offload-model -// XFAIL-TRACKER: https://github.com/intel/llvm/issues/20797 - // REQUIRES: target-spir // // FIXME Disabled fallback assert as it'll require either online linking or diff --git a/sycl/test-e2e/lit.cfg.py b/sycl/test-e2e/lit.cfg.py index b773bd62df425..001982f382fdb 100644 --- a/sycl/test-e2e/lit.cfg.py +++ b/sycl/test-e2e/lit.cfg.py @@ -987,11 +987,6 @@ def get_sycl_ls_verbose(sycl_device, env): "sycl-jit was not found. Tests requiring sycl-jit will be skipped." ) -# Check for enabled NewOffloadModel -if lit_config.params.get("enable_new_offload_model", "False") != "False": - config.available_features.add("new-offload-model") - config.cxx_flags += " --offload-new-driver " - # That has to be executed last so that all device-independent features have been # discovered already. config.sycl_dev_features = {}