diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 94a4d13800cb0..4f652cefa9ed3 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -133,9 +133,6 @@ sycl/cts_exclude_filter/ @intel/dpcpp-devops-reviewers **/package-lock.json @intel/dpcpp-devops-reviewers llvm/utils/git/requirements_formatting.txt @intel/dpcpp-devops-reviewers -# dev-igc driver update -devops/dependencies-igc-dev.json @intel/sycl-matrix-reviewers @intel/dpcpp-esimd-reviewers @intel/dpcpp-devops-reviewers - # Benchmarking scripts devops/scripts/benchmarks/ @intel/llvm-reviewers-benchmarking devops/actions/run-tests/benchmark/ @intel/llvm-reviewers-benchmarking diff --git a/.github/workflows/sycl-containers-igc-dev.yaml b/.github/workflows/sycl-containers-igc-dev.yaml deleted file mode 100644 index ab734f9d5f664..0000000000000 --- a/.github/workflows/sycl-containers-igc-dev.yaml +++ /dev/null @@ -1,55 +0,0 @@ -name: IGC DEV CI Containers -on: - workflow_dispatch: - push: - branches: - - sycl - paths: - - 'devops/actions/build_container/**' - - 'devops/scripts/**' - - '!devops/scripts/benchmarks/**' - - 'devops/dependencies-igc-dev.json' - - '.github/workflows/sycl-containers-igc-dev.yaml' - pull_request: - paths: - - 'devops/actions/build_container/**' - - 'devops/scripts/**' - - '!devops/scripts/benchmarks/**' - - 'devops/dependencies-igc-dev.json' - - '.github/workflows/sycl-containers-igc-dev.yaml' - -permissions: read-all - -jobs: - build_and_push_images: - if: github.repository == 'intel/llvm' - name: Build and Push IGC Dev Docker Images - runs-on: ubuntu-latest - permissions: - packages: write - strategy: - matrix: - include: - - name: Intel Drivers Ubuntu 24.04 Docker image with dev IGC - dockerfile: ubuntu2404_intel_drivers_igc_dev - imagefile: ubuntu2404_intel_drivers - tag: devigc - build_args: | - "use_igc_dev=true" - steps: - - name: Checkout - uses: actions/checkout@v6 - with: - fetch-depth: 2 - - name: Build and Push Container - uses: ./devops/actions/build_container - with: - push: ${{ github.event_name != 'pull_request' }} - file: ${{ matrix.dockerfile }} - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - tags: | - ghcr.io/${{ github.repository }}/${{ matrix.imagefile }}:${{ matrix.tag }}-${{ github.sha }} - ghcr.io/${{ github.repository }}/${{ matrix.imagefile }}:${{ matrix.tag }} - build-args: ${{ matrix.build_args }} - diff --git a/.github/workflows/sycl-detect-changes.yml b/.github/workflows/sycl-detect-changes.yml index 964a14b4035d8..2d3ba4367a931 100644 --- a/.github/workflows/sycl-detect-changes.yml +++ b/.github/workflows/sycl-detect-changes.yml @@ -63,8 +63,6 @@ jobs: drivers: - devops/dependencies.json - devops/scripts/install_drivers.sh - devigccfg: - - devops/dependencies-igc-dev.json benchmarks: - 'devops/scripts/benchmarks/**' - 'devops/actions/run-tests/benchmark/**' diff --git a/.github/workflows/sycl-linux-precommit.yml b/.github/workflows/sycl-linux-precommit.yml index fa69fc8dd79b9..674a86403f9cb 100644 --- a/.github/workflows/sycl-linux-precommit.yml +++ b/.github/workflows/sycl-linux-precommit.yml @@ -165,22 +165,11 @@ jobs: extra_lit_opts: -j 1 - name: Intel / Arc A-Series Graphics runner: '["Linux", "arc"]' - target_devices: level_zero:gpu;opencl:gpu;level_zero_v2:gpu - - name: Intel Dev IGC / Arc A-Series Graphics - runner: '["Linux", "arc"]' - image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:devigc - target_devices: level_zero:gpu - use_igc_dev: true + target_devices: level_zero:gpu;opencl:gpu;level_zero_v2:gpu env: '{"LIT_FILTER":"Matrix/"}' - name: Intel / Ponte Vecchio GPU runner: '["Linux", "pvc"]' target_devices: level_zero:gpu;opencl:gpu;level_zero_v2:gpu - - name: Intel Dev IGC / Ponte Vecchio GPU - runner: '["Linux", "pvc"]' - image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:devigc - target_devices: level_zero:gpu - use_igc_dev: true - env: '{"LIT_FILTER":"Matrix/"}' - name: Intel / Battlemage Graphics runner: '["Linux", "bmg"]' target_devices: level_zero_v1:gpu;level_zero_v2:gpu @@ -226,14 +215,7 @@ jobs: ${{ !contains(matrix.target_devices, 'cuda') && !contains(matrix.target_devices, 'hip') && contains(needs.detect_changes.outputs.filters, 'drivers') }} - install_dev_igc_driver: >- - ${{ !contains(matrix.target_devices, 'cuda') && - !contains(matrix.target_devices, 'hip') && - matrix.use_igc_dev && - (contains(needs.detect_changes.outputs.filters, 'devigccfg') || contains(needs.detect_changes.outputs.filters, 'drivers')) || - 'false' }} - # Run only if the PR does not have the 'ci-no-devigc' label. - skip_run: ${{matrix.use_igc_dev && contains(github.event.pull_request.labels.*.name, 'ci-no-devigc') || matrix.skip_run || 'false'}} + skip_run: ${{ matrix.skip_run }} env: ${{ matrix.env || (contains(needs.detect_changes.outputs.filters, 'esimd') && '{}' || '{"LIT_FILTER_OUT":"ESIMD/"}') }} test-perf: diff --git a/.github/workflows/sycl-linux-run-tests.yml b/.github/workflows/sycl-linux-run-tests.yml index 90335ca87ea91..212d7289d93ac 100644 --- a/.github/workflows/sycl-linux-run-tests.yml +++ b/.github/workflows/sycl-linux-run-tests.yml @@ -81,10 +81,7 @@ on: install_igc_driver: type: string - required: False - install_dev_igc_driver: - type: string - required: False + required: False env: type: string default: '{}' @@ -248,15 +245,11 @@ jobs: - name: Reset Intel GPU uses: ./devops/actions/reset_gpu - name: Install drivers - if: inputs.binaries_artifact != 'in-container' && (inputs.install_igc_driver == 'true' || inputs.install_dev_igc_driver == 'true') + if: inputs.binaries_artifact != 'in-container' && inputs.install_igc_driver == 'true' env: GITHUB_TOKEN: ${{ github.token }} run: | - if [ "${{ inputs.install_dev_igc_driver }}" = "true" ]; then - # If libllvm14 is already installed (dev igc docker), still return true. - sudo apt-get install -yqq libllvm14 || true; - fi - sudo -E bash devops/scripts/install_drivers.sh devops/dependencies.json ${{ inputs.install_dev_igc_driver == 'true' && 'devops/dependencies-igc-dev.json --use-dev-igc' || '' }} --all + sudo -E bash devops/scripts/install_drivers.sh devops/dependencies.json --all - name: Source OneAPI TBB vars.sh shell: bash run: | diff --git a/.github/workflows/sycl-post-commit.yml b/.github/workflows/sycl-post-commit.yml index 8c311ec499912..fcbfcc0c25a38 100644 --- a/.github/workflows/sycl-post-commit.yml +++ b/.github/workflows/sycl-post-commit.yml @@ -19,7 +19,6 @@ on: - ./devops/actions/cleanup - ./devops/actions/cached_checkout - ./devops/dependencies.json - - ./devops/dependencies-igc-dev.json concurrency: # Cancel a currently running workflow from the same PR or commit hash. diff --git a/.github/workflows/sycl-update-igc-dev-driver.yml b/.github/workflows/sycl-update-igc-dev-driver.yml deleted file mode 100644 index dc1a1aa4ad35e..0000000000000 --- a/.github/workflows/sycl-update-igc-dev-driver.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: Update IGC dev driver - -on: - schedule: - - cron: '0 3 * * 1,4' - workflow_dispatch: - -permissions: read-all - -jobs: - update_driver_linux: - permissions: - contents: write # for Git to git push - runs-on: ubuntu-latest - if: github.repository == 'intel/llvm' - steps: - - uses: actions/checkout@v6 - - name: Update dependencies file - run: | - version="$(python3 devops/scripts/update_drivers.py linux --igc-dev-only)" - echo 'NEW_DRIVER_VERSION='$version >> $GITHUB_ENV - - name: Create Pull Request - env: - BRANCH: ci/update_gpu_driver-linux-${{ env.NEW_DRIVER_VERSION }} - GITHUB_TOKEN: ${{ secrets.LLVM_MAIN_SYNC_BBSYCL_TOKEN }} - run: | - cd $GITHUB_WORKSPACE - git config --global user.name "GitHub Actions" - git config --global user.email "actions@github.com" - git checkout -B $BRANCH - git add -u - git commit -m "[GHA] Uplift Linux IGC Dev RT version to $NEW_DRIVER_VERSION" || exit 0 # exit if commit is empty - git show - git push https://$GITHUB_TOKEN@github.com/${{ github.repository }} ${BRANCH} - gh pr create --head $BRANCH --title "[GHA] Uplift Linux IGC Dev RT version to $NEW_DRIVER_VERSION" --body "Scheduled igc dev drivers uplift" diff --git a/devops/containers/ubuntu2404_intel_drivers_igc_dev.Dockerfile b/devops/containers/ubuntu2404_intel_drivers_igc_dev.Dockerfile deleted file mode 100644 index 95fd841b5d007..0000000000000 --- a/devops/containers/ubuntu2404_intel_drivers_igc_dev.Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -ARG base_tag=latest -ARG base_image=ghcr.io/intel/llvm/ubuntu2404_base - -FROM $base_image:$base_tag - -ENV DEBIAN_FRONTEND=noninteractive - -USER root - -RUN apt update && apt install -yqq libllvm14 libllvm15 libz3-4 - -COPY scripts/install_drivers.sh / -COPY dependencies.json / -COPY dependencies-igc-dev.json / - -RUN mkdir /runtimes -ENV INSTALL_LOCATION=/runtimes -RUN --mount=type=secret,id=github_token \ - install_driver_opt="dependencies.json dependencies-igc-dev.json --use-dev-igc"; \ - GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh $install_driver_opt --all - -COPY scripts/drivers_entrypoint.sh /drivers_entrypoint.sh - -USER sycl - -ENTRYPOINT ["/bin/bash", "/drivers_entrypoint.sh"] - diff --git a/devops/dependencies-igc-dev.json b/devops/dependencies-igc-dev.json deleted file mode 100644 index 8c325e28285fd..0000000000000 --- a/devops/dependencies-igc-dev.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "linux": { - "igc_dev": { - "github_tag": "igc-dev-60ef894", - "version": "60ef894", - "updated_at": "2025-10-18T21:45:14Z", - "url": "https://api.github.com/repos/intel/intel-graphics-compiler/actions/artifacts/4308548246/zip", - "root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu" - } - } -} diff --git a/devops/scripts/install_drivers.sh b/devops/scripts/install_drivers.sh index 5aef43582d219..6473225734f95 100755 --- a/devops/scripts/install_drivers.sh +++ b/devops/scripts/install_drivers.sh @@ -13,19 +13,10 @@ if [ -f "$1" ]; then L0_TAG=$(jq -r '.linux.level_zero.github_tag' $CONFIG_FILE) TBB_TAG=$(jq -r '.linux.tbb.github_tag' $CONFIG_FILE) FPGA_TAG=$(jq -r '.linux.fpgaemu.github_tag' $CONFIG_FILE) - CPU_TAG=$(jq -r '.linux.oclcpu.github_tag' $CONFIG_FILE) - if [[ "$*" == *"--use-dev-igc"* ]]; then - CONFIG_FILE_IGC_DEV=$2 - IGC_DEV_TAG=$(jq -r '.linux.igc_dev.github_tag' $CONFIG_FILE_IGC_DEV) - IGC_DEV_VER=$(jq -r '.linux.igc_dev.version' $CONFIG_FILE_IGC_DEV) - IGC_DEV_URL=$(jq -r '.linux.igc_dev.url' $CONFIG_FILE_IGC_DEV) - fi + CPU_TAG=$(jq -r '.linux.oclcpu.github_tag' $CONFIG_FILE) else CR_TAG=$compute_runtime_tag IGC_TAG=$igc_tag - IGC_DEV_TAG=$igc_dev_tag - IGC_DEV_VER=$igc_dev_ver - IGC_DEV_URL=$igc_dev_url CM_TAG=$cm_tag L0_TAG=$level_zero_tag TBB_TAG=$tbb_tag @@ -85,30 +76,12 @@ InstallTBB () { fi } -CheckIGCdevTag() { - local prefix="igc-dev-" - local arg="$1" - - if [[ $arg == "$prefix"* ]]; then - echo "Yes" - else - echo "No" - fi -} - InstallIGFX () { echo "Installing Intel Graphics driver..." echo "Compute Runtime version $CR_TAG" echo "CM compiler version $CM_TAG" echo "Level Zero version $L0_TAG" echo "IGC version $IGC_TAG" - # Always install released igc version first to get rid of the dependency issue - # by installing the igc first, we will satisfy all the dpkg dependencies . - # When we install dev igc later, it will then be treated as downgrade (because dev igc come with lowest version 1.0). - # This can help us avoid using the risky force-depends-version option in dpkg command. - # - # Of course, this also installed the libopencl-clang so that we can copy and use later as a temporariy workaround. - IS_IGC_DEV=$(CheckIGCdevTag $IGCTAG) UBUNTU_VER="u24\.04" get_release intel/intel-graphics-compiler $IGC_TAG \ | grep ".*deb" \ @@ -128,29 +101,6 @@ InstallIGFX () { dpkg -i --force-all *.deb && rm *.deb *.sum mkdir -p /usr/local/lib/igc/ echo "$IGC_TAG" > /usr/local/lib/igc/IGCTAG.txt - if [ "$IS_IGC_DEV" == "Yes" ]; then - # Dev IGC deb package did not include libopencl-clang - # opencl-clang repo does not provide release deb package either. - # Backup and install it from release igc as a temporarily workaround - # while we working to resolve the issue. - echo "Backup libopencl-clang" - cp -d /usr/local/lib/libopencl-clang2.so.15* . - echo "Download IGC dev git hash $IGC_DEV_VER" - get_pre_release_igfx $IGC_DEV_URL $IGC_DEV_VER - echo "Install IGC dev git hash $IGC_DEV_VER" - # New dev IGC packaged iga64 conflicting with iga64 from intel-igc-media - # force overwrite to workaround it first. - dpkg -i --force-all *.deb - echo "Install libopencl-clang" - # Workaround only, will download deb and install with dpkg once fixed. - cp -d libopencl-clang2.so.15* /usr/local/lib/ - rm /usr/local/lib/libigc.so /usr/local/lib/libigc.so.1* && \ - ln -s /usr/local/lib/libigc.so.2 /usr/local/lib/libigc.so && \ - ln -s /usr/local/lib/libigc.so.2 /usr/local/lib/libigc.so.1 - echo "Clean up" - rm *.deb libopencl-clang2.so.15* - echo "$IGC_DEV_TAG" > /usr/local/lib/igc/IGCTAG.txt - fi } InstallCPURT () { @@ -177,18 +127,12 @@ if [[ $# -eq 0 ]] ; then echo "No options were specified. Please, specify one or more of the following:" echo "--all - Install all Intel drivers" echo "--igfx - Install Intel Graphics drivers" - echo "--use-dev-igc - Install development version of Intel Graphics drivers instead" echo "--cpu - Install Intel CPU OpenCL runtime" echo "Set INSTALL_LOCATION env variable to specify install location" exit 0 fi -if [[ "$*" == *"--use-dev-igc"* ]] -then - IGCTAG=${IGC_DEV_TAG} -else - IGCTAG=${IGC_TAG} -fi +IGCTAG=${IGC_TAG} while [ "${1:-}" != "" ]; do case "$1" in diff --git a/devops/scripts/update_drivers.py b/devops/scripts/update_drivers.py index 5f66ae231a0f2..8c9d473f5ec6f 100644 --- a/devops/scripts/update_drivers.py +++ b/devops/scripts/update_drivers.py @@ -37,18 +37,7 @@ def get_artifacts_download_url(repo, name): return json.loads(artifacts)["artifacts"][0]["archive_download_url"] -def uplift_linux_igfx_driver(config, platform_tag, igc_dev_only): - - if igc_dev_only: - igc_dev = get_latest_workflow_runs("intel/intel-graphics-compiler", "build-IGC") - igcdevver = igc_dev["head_sha"][:7] - config[platform_tag]["igc_dev"]["github_tag"] = "igc-dev-" + igcdevver - config[platform_tag]["igc_dev"]["version"] = igcdevver - config[platform_tag]["igc_dev"]["updated_at"] = igc_dev["updated_at"] - config[platform_tag]["igc_dev"]["url"] = get_artifacts_download_url( - "intel/intel-graphics-compiler", "IGC_Ubuntu24.04_llvm15_clang-" + igcdevver - ) - return config +def uplift_linux_igfx_driver(config, platform_tag): compute_runtime = get_latest_release('intel/compute-runtime') @@ -87,30 +76,24 @@ def uplift_linux_igfx_driver(config, platform_tag, igc_dev_only): return config -def main(platform_tag, igc_dev_only): +def main(platform_tag): script = os.path.dirname(os.path.realpath(__file__)) - config_name = os.path.join(script, '..', 'dependencies.json') - if igc_dev_only: - config_name = os.path.join(script, "..", "dependencies-igc-dev.json") + config_name = os.path.join(script, "..", "dependencies.json") config = {} with open(config_name, "r") as f: config = json.loads(f.read()) - config = uplift_linux_igfx_driver(config, platform_tag, igc_dev_only) + config = uplift_linux_igfx_driver(config, platform_tag) with open(config_name, "w") as f: json.dump(config, f, indent=2) f.write('\n') - if igc_dev_only: - return config[platform_tag]["igc_dev"]["github_tag"] - return config[platform_tag]['compute_runtime']['version'] if __name__ == '__main__': parser = argparse.ArgumentParser() parser.add_argument("platform_tag") - parser.add_argument("--igc-dev-only", action="store_true") args = parser.parse_args() - sys.stdout.write(main(args.platform_tag, args.igc_dev_only) + "\n") + sys.stdout.write(main(args.platform_tag) + "\n") diff --git a/sycl/test-e2e/Adapters/level_zero/ext_intel_cslice.cpp b/sycl/test-e2e/Adapters/level_zero/ext_intel_cslice.cpp index 951ae6ce8c474..74f6600556f21 100644 --- a/sycl/test-e2e/Adapters/level_zero/ext_intel_cslice.cpp +++ b/sycl/test-e2e/Adapters/level_zero/ext_intel_cslice.cpp @@ -7,7 +7,7 @@ // XFAIL: gpu-intel-dg2 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/18576 -// XFAIL: linux && run-mode && arch-intel_gpu_bmg_g21 && !igc-dev +// XFAIL: linux && run-mode && arch-intel_gpu_bmg_g21 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/18576 // XFAIL: windows && arch-intel_gpu_bmg_g21 diff --git a/sycl/test-e2e/Adapters/level_zero/ext_intel_queue_index.cpp b/sycl/test-e2e/Adapters/level_zero/ext_intel_queue_index.cpp index cc49640f837b6..f0733a385b9f7 100644 --- a/sycl/test-e2e/Adapters/level_zero/ext_intel_queue_index.cpp +++ b/sycl/test-e2e/Adapters/level_zero/ext_intel_queue_index.cpp @@ -7,7 +7,7 @@ // XFAIL: gpu-intel-dg2 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/18576 -// XFAIL: linux && run-mode && arch-intel_gpu_bmg_g21 && !igc-dev +// XFAIL: linux && run-mode && arch-intel_gpu_bmg_g21 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/18576 // XFAIL: windows && arch-intel_gpu_bmg_g21 diff --git a/sycl/test-e2e/Adapters/level_zero/interop-get-native-mem.cpp b/sycl/test-e2e/Adapters/level_zero/interop-get-native-mem.cpp index ed3ec9cf72845..34a190c1b1e09 100644 --- a/sycl/test-e2e/Adapters/level_zero/interop-get-native-mem.cpp +++ b/sycl/test-e2e/Adapters/level_zero/interop-get-native-mem.cpp @@ -2,7 +2,7 @@ // UNSUPPORTED: ze_debug // UNSUPPORTED-INTENDED: Leaks detection is done at UR level and doesn't account // for native L0 API calls. -// UNSUPPORTED: linux && gpu-intel-dg2 && run-mode && !igc-dev +// UNSUPPORTED: linux && gpu-intel-dg2 && run-mode // UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/18273 // RUN: %{build} %level_zero_options -o %t.out // RUN: %{run} %t.out diff --git a/sycl/test-e2e/DeprecatedFeatures/DiscardEvents/discard_events_l0_inorder.cpp b/sycl/test-e2e/DeprecatedFeatures/DiscardEvents/discard_events_l0_inorder.cpp index a3085115e56dd..80902db509f68 100644 --- a/sycl/test-e2e/DeprecatedFeatures/DiscardEvents/discard_events_l0_inorder.cpp +++ b/sycl/test-e2e/DeprecatedFeatures/DiscardEvents/discard_events_l0_inorder.cpp @@ -18,7 +18,7 @@ // the discard_events property, if it doesn't pass then it's most likely a // general issue unrelated to discard_events. -// UNSUPPORTED: arch-intel_gpu_bmg_g21 && !igc-dev +// UNSUPPORTED: arch-intel_gpu_bmg_g21 // UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/20601 #include diff --git a/sycl/test-e2e/DeviceArchitecture/device_architecture_comparison_on_device_aot.cpp b/sycl/test-e2e/DeviceArchitecture/device_architecture_comparison_on_device_aot.cpp index 44dfe48b42a62..ab868ada30421 100644 --- a/sycl/test-e2e/DeviceArchitecture/device_architecture_comparison_on_device_aot.cpp +++ b/sycl/test-e2e/DeviceArchitecture/device_architecture_comparison_on_device_aot.cpp @@ -1,8 +1,5 @@ // REQUIRES: arch-intel_gpu_pvc, ocloc -// XFAIL: arch-intel_gpu_pvc && opencl && igc-dev && !spirv-backend -// XFAIL-TRACKER: https://github.com/intel/llvm/issues/16401 - // RUN: %clangxx -fsycl -fsycl-targets=intel_gpu_pvc %s -o %t.out // RUN: %{run} %t.out diff --git a/sycl/test-e2e/DeviceLib/imf/simd_emulate_test.cpp b/sycl/test-e2e/DeviceLib/imf/simd_emulate_test.cpp index d915b620aa301..b69b25a60cd8c 100644 --- a/sycl/test-e2e/DeviceLib/imf/simd_emulate_test.cpp +++ b/sycl/test-e2e/DeviceLib/imf/simd_emulate_test.cpp @@ -1,9 +1,6 @@ // RUN: %{build} -o %t1.out // RUN: %{run} %t1.out -// UNSUPPORTED: igc-dev -// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/17008 - #include "imf_utils.hpp" #include #include diff --git a/sycl/test-e2e/ESIMD/PerformanceTests/matrix_transpose.cpp b/sycl/test-e2e/ESIMD/PerformanceTests/matrix_transpose.cpp index aa6a1eaba4af5..60f3192b5bd5a 100644 --- a/sycl/test-e2e/ESIMD/PerformanceTests/matrix_transpose.cpp +++ b/sycl/test-e2e/ESIMD/PerformanceTests/matrix_transpose.cpp @@ -10,7 +10,7 @@ // RUN: mkdir -p %t.dir && %{build} -o %t.dir/exec.out // RUN: env IGC_DumpToCustomDir=%t.dir NEO_CACHE_PERSISTENT=0 IGC_ShaderDumpEnable=1 %{run} %t.dir/exec.out -// RUN: %{run-aux} python3 %S/instruction_count.py %t.dir %if igc-dev %{ 1059 %} %else %{ 1116 %} ZTSZZ7runTestjjjRdS_ENKUlRN4sycl3_V17handlerEE_clES3_E3K16.asm +// RUN: %{run-aux} python3 %S/instruction_count.py %t.dir 1116 ZTSZZ7runTestjjjRdS_ENKUlRN4sycl3_V17handlerEE_clES3_E3K16.asm // RUN: %{run-aux} echo "Baseline from driver version 1.3.30872" #include "../matrix_transpose.cpp" diff --git a/sycl/test-e2e/Graph/Explicit/interop-level-zero-get-native-mem.cpp b/sycl/test-e2e/Graph/Explicit/interop-level-zero-get-native-mem.cpp index a320b084e97db..aabfd74e5d039 100644 --- a/sycl/test-e2e/Graph/Explicit/interop-level-zero-get-native-mem.cpp +++ b/sycl/test-e2e/Graph/Explicit/interop-level-zero-get-native-mem.cpp @@ -2,7 +2,7 @@ // UNSUPPORTED: ze_debug // UNSUPPORTED-INTENDED: Leaks detection is done at UR level and doesn't account // for native L0 API calls. -// UNSUPPORTED: linux && (gpu-intel-dg2 || arch-intel_gpu_bmg_g21) && run-mode && !igc-dev +// UNSUPPORTED: linux && (gpu-intel-dg2 || arch-intel_gpu_bmg_g21) && run-mode // UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/18273 // XFAIL: arch-intel_gpu_ptl_u || arch-intel_gpu_ptl_h // XFAIL-TRACKER: CMPLRTST-27745 diff --git a/sycl/test-e2e/Graph/RecordReplay/interop-level-zero-get-native-mem.cpp b/sycl/test-e2e/Graph/RecordReplay/interop-level-zero-get-native-mem.cpp index a8aa09c87cd75..9416156ff39a7 100644 --- a/sycl/test-e2e/Graph/RecordReplay/interop-level-zero-get-native-mem.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/interop-level-zero-get-native-mem.cpp @@ -2,7 +2,7 @@ // UNSUPPORTED: ze_debug // UNSUPPORTED-INTENDED: Leaks detection is done at UR level and doesn't account // for native L0 API calls. -// UNSUPPORTED: linux && (gpu-intel-dg2 || arch-intel_gpu_bmg_g21) && run-mode && !igc-dev +// UNSUPPORTED: linux && (gpu-intel-dg2 || arch-intel_gpu_bmg_g21) && run-mode // UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/18273 // XFAIL: arch-intel_gpu_ptl_u || arch-intel_gpu_ptl_h // XFAIL-TRACKER: CMPLRTST-27745 diff --git a/sycl/test-e2e/HostInteropTask/host-task-two-queues.cpp b/sycl/test-e2e/HostInteropTask/host-task-two-queues.cpp index 884bf3eeb72fa..fed49aabb32c5 100644 --- a/sycl/test-e2e/HostInteropTask/host-task-two-queues.cpp +++ b/sycl/test-e2e/HostInteropTask/host-task-two-queues.cpp @@ -1,7 +1,7 @@ // RUN: %{build} -o %t.out // RUN: %{run} %t.out -// UNSUPPORTED: !igc-dev && arch-intel_gpu_pvc +// UNSUPPORTED: arch-intel_gpu_pvc // UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/20193 #include diff --git a/sycl/test-e2e/Matrix/joint_matrix_bfloat16_accumulator.cpp b/sycl/test-e2e/Matrix/joint_matrix_bfloat16_accumulator.cpp index 7901091054650..6c248e667e662 100644 --- a/sycl/test-e2e/Matrix/joint_matrix_bfloat16_accumulator.cpp +++ b/sycl/test-e2e/Matrix/joint_matrix_bfloat16_accumulator.cpp @@ -17,7 +17,7 @@ // XFAIL: gpu-intel-dg2 // XFAIL-TRACKER: GSD-10112 -// XFAIL: linux && arch-intel_gpu_bmg_g21 && !igc-dev +// XFAIL: linux && arch-intel_gpu_bmg_g21 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/20594 // RUN: %{build} -o %t.out diff --git a/sycl/test-e2e/Matrix/joint_matrix_half_accumulator.cpp b/sycl/test-e2e/Matrix/joint_matrix_half_accumulator.cpp index b0430568e5201..e57972a171012 100644 --- a/sycl/test-e2e/Matrix/joint_matrix_half_accumulator.cpp +++ b/sycl/test-e2e/Matrix/joint_matrix_half_accumulator.cpp @@ -18,7 +18,7 @@ // XFAIL: gpu-intel-dg2 // XFAIL-TRACKER: GSD-10112 -// XFAIL: linux && arch-intel_gpu_bmg_g21 && !igc-dev +// XFAIL: linux && arch-intel_gpu_bmg_g21 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/20594 // RUN: %{build} -o %t.out diff --git a/sycl/test-e2e/MemorySanitizer/lit.local.cfg b/sycl/test-e2e/MemorySanitizer/lit.local.cfg index a3cbd769b9d5c..c7d06455c5daf 100644 --- a/sycl/test-e2e/MemorySanitizer/lit.local.cfg +++ b/sycl/test-e2e/MemorySanitizer/lit.local.cfg @@ -1,9 +1,6 @@ has_arch_gpu_intel_pvc = any('arch-intel_gpu_pvc' in T for T in config.sycl_dev_features.values()) if not has_arch_gpu_intel_pvc: config.unsupported_features += ['gpu'] -else: - # TRACKER for PVC + igc-dev: https://github.com/intel/llvm/issues/16401 - config.unsupported_features += ['igc-dev'] config.substitutions.append( ("%device_msan_aot_flags", "-Xarch_device -fsanitize=memory %if cpu %{ -fsycl-targets=spir64_x86_64 %} %if gpu %{ -fsycl-targets=spir64_gen -Xsycl-target-backend=spir64_gen '-device pvc' %}") diff --git a/sycl/test-e2e/Regression/barrier_with_work.cpp b/sycl/test-e2e/Regression/barrier_with_work.cpp index 6975092ce3984..0d66c5cb440c7 100644 --- a/sycl/test-e2e/Regression/barrier_with_work.cpp +++ b/sycl/test-e2e/Regression/barrier_with_work.cpp @@ -6,7 +6,7 @@ // UNSUPPORTED: target-native_cpu // UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/20142 // -// UNSUPPORTED: linux && (gpu-intel-dg2 || arch-intel_gpu_bmg_g21 || arch-intel_gpu_pvc) && !igc-dev +// UNSUPPORTED: linux && (gpu-intel-dg2 || arch-intel_gpu_bmg_g21 || arch-intel_gpu_pvc) // UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/20600 // // XFAIL: windows && arch-intel_gpu_bmg_g21 diff --git a/sycl/test-e2e/ThreadSanitizer/lit.local.cfg b/sycl/test-e2e/ThreadSanitizer/lit.local.cfg index c8234bc536a41..a81034fd9130d 100644 --- a/sycl/test-e2e/ThreadSanitizer/lit.local.cfg +++ b/sycl/test-e2e/ThreadSanitizer/lit.local.cfg @@ -1,9 +1,6 @@ has_arch_gpu_intel_pvc = any('arch-intel_gpu_pvc' in T for T in config.sycl_dev_features.values()) if not has_arch_gpu_intel_pvc: config.unsupported_features += ['gpu'] -else: - # TRACKER for PVC + igc-dev: https://github.com/intel/llvm/issues/16401 - config.unsupported_features += ['igc-dev'] # ThreadSanitizer is not currently supported for non-spir triples config.unsupported_features += ['target-nvidia', 'target-amd'] diff --git a/sycl/test-e2e/lit.cfg.py b/sycl/test-e2e/lit.cfg.py index 001982f382fdb..a4475226f2fb1 100644 --- a/sycl/test-e2e/lit.cfg.py +++ b/sycl/test-e2e/lit.cfg.py @@ -235,9 +235,6 @@ def __exit__(self, exc_type, exc_value, exc_traceback): if lit_config.params.get("gpu-intel-pvc-vg", False): config.available_features.add("gpu-intel-pvc-vg") -if lit_config.params.get("igc-dev", False): - config.available_features.add("igc-dev") - # Map between device family and architecture types. device_family_arch_map = { # : Set of architectures types (and aliases) @@ -276,8 +273,6 @@ def check_igc_tag_and_add_feature(): if os.path.isfile(config.igc_tag_file): with open(config.igc_tag_file, "r") as tag_file: contents = tag_file.read() - if "igc-dev" in contents: - config.available_features.add("igc-dev") def quote_path(path):