Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
55 changes: 0 additions & 55 deletions .github/workflows/sycl-containers-igc-dev.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions .github/workflows/sycl-detect-changes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/**'
Expand Down
22 changes: 2 additions & 20 deletions .github/workflows/sycl-linux-precommit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
13 changes: 3 additions & 10 deletions .github/workflows/sycl-linux-run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: '{}'
Expand Down Expand Up @@ -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: |
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/sycl-post-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
35 changes: 0 additions & 35 deletions .github/workflows/sycl-update-igc-dev-driver.yml

This file was deleted.

27 changes: 0 additions & 27 deletions devops/containers/ubuntu2404_intel_drivers_igc_dev.Dockerfile

This file was deleted.

11 changes: 0 additions & 11 deletions devops/dependencies-igc-dev.json

This file was deleted.

60 changes: 2 additions & 58 deletions devops/scripts/install_drivers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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" \
Expand All @@ -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 () {
Expand All @@ -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
Expand Down
27 changes: 5 additions & 22 deletions devops/scripts/update_drivers.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down Expand Up @@ -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")
2 changes: 1 addition & 1 deletion sycl/test-e2e/Adapters/level_zero/ext_intel_cslice.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading