build: igc revision update

Signed-off-by: ocldev <ocldev@intel.com>
2025-12-18 13:54:58 +08:00 · 2024-11-06 11:50:47 +00:00
parent 6f0e3c42b1
commit 40c9c46db9
12 changed files with 28 additions and 28 deletions
--- a/manifests/manifest.yml
+++ b/manifests/manifest.yml
@@ -16,8 +16,8 @@ components:
    asset_name: igc
    dest_dir: igc
    type: git
-    branch: releases/igc-1.0.17791
-    revision: 710bc6a1a1452a2d1fe5f585883f903efff8fff6
+    branch: releases/2.1.x
+    revision: 6372d4e11e53f1df73f36bb53a8f1012d489bbac
    repository: https://github.com/intel/intelgraphicscompiler
  igsc:
    asset_name: igsc
@@ -36,7 +36,7 @@ components:
    dest_dir: kernels_bin
    type: git
    branch: kernels_bin
-    revision: 3145-2886
+    revision: 3145-2893
  kmdaf:
    branch: kmdaf
    dest_dir: kmdaf
--- a/package.cmake
+++ b/package.cmake
@@ -161,15 +161,15 @@ if(UNIX)
  endif()

  if(NEO__IGC_FOUND)
-    list(APPEND _external_package_dependencies_debian "intel-igc-opencl(=${NEO__IGC_VERSION})")
-    list(APPEND _external_package_dependencies_rpm "intel-igc-opencl = ${NEO__IGC_VERSION}")
-    list(APPEND _igc_package_dependencies_debian "intel-igc-opencl(=${NEO__IGC_VERSION})")
-    list(APPEND _igc_package_dependencies_rpm "intel-igc-opencl = ${NEO__IGC_VERSION}")
+    list(APPEND _external_package_dependencies_debian "intel-igc-opencl-2(=${NEO__IGC_VERSION})")
+    list(APPEND _external_package_dependencies_rpm "intel-igc-opencl-2 = ${NEO__IGC_VERSION}")
+    list(APPEND _igc_package_dependencies_debian "intel-igc-opencl-2(=${NEO__IGC_VERSION})")
+    list(APPEND _igc_package_dependencies_rpm "intel-igc-opencl-2 = ${NEO__IGC_VERSION}")
  else()
-    list(APPEND _external_package_dependencies_debian "intel-igc-opencl")
-    list(APPEND _external_package_dependencies_rpm "intel-igc-opencl")
-    list(APPEND _igc_package_dependencies_debian "intel-igc-opencl")
-    list(APPEND _igc_package_dependencies_rpm "intel-igc-opencl")
+    list(APPEND _external_package_dependencies_debian "intel-igc-opencl-2")
+    list(APPEND _external_package_dependencies_rpm "intel-igc-opencl-2")
+    list(APPEND _igc_package_dependencies_debian "intel-igc-opencl-2")
+    list(APPEND _igc_package_dependencies_rpm "intel-igc-opencl-2")
  endif()

  set(_external_package_dependencies_debian_level_zero_gpu "${_external_package_dependencies_debian}")
--- a/scripts/packaging/build_deb.sh
+++ b/scripts/packaging/build_deb.sh
@@ -90,13 +90,13 @@ if [ -z "${BRANCH_SUFFIX}" ]; then
    if [ ! -z "${GMM_DEVEL_VERSION}" ]; then
        perl -pi -e "s/^ libigdgmm-dev(?=,|$)/ libigdgmm-dev (>=$GMM_DEVEL_VERSION)/" "$BUILD_DIR/debian/control"
    fi
-    IGC_CORE_VERSION=$(apt-cache policy intel-igc-core | grep Installed | cut -f2- -d ':' | xargs)
+    IGC_CORE_VERSION=$(apt-cache policy intel-igc-core-2 | grep Installed | cut -f2- -d ':' | xargs)
    if [ ! -z "${IGC_CORE_VERSION}" ]; then
-        perl -pi -e "s/^ intel-igc-core(?=,|$)/ intel-igc-core (=$IGC_CORE_VERSION)/" "$BUILD_DIR/debian/control"
+        perl -pi -e "s/^ intel-igc-core-2(?=,|$)/ intel-igc-core-2 (=$IGC_CORE_VERSION)/" "$BUILD_DIR/debian/control"
    fi
-    IGC_VERSION=$(apt-cache policy intel-igc-opencl | grep Installed | cut -f2- -d ':' | xargs)
+    IGC_VERSION=$(apt-cache policy intel-igc-opencl-2 | grep Installed | cut -f2- -d ':' | xargs)
    if [ ! -z "${IGC_VERSION}" ]; then
-        perl -pi -e "s/^ intel-igc-opencl(?=,|$)/ intel-igc-opencl (=$IGC_VERSION)/" "$BUILD_DIR/debian/control"
+        perl -pi -e "s/^ intel-igc-opencl-2(?=,|$)/ intel-igc-opencl-2 (=$IGC_VERSION)/" "$BUILD_DIR/debian/control"
    fi
    IGC_DEVEL_VERSION=$(apt-cache policy intel-igc-opencl-devel | grep Installed | cut -f2- -d ':' | xargs)
    if [ ! -z "${IGC_DEVEL_VERSION}" ]; then
--- a/scripts/packaging/l0_gpu_driver/build_l0_gpu_driver_deb.sh
+++ b/scripts/packaging/l0_gpu_driver/build_l0_gpu_driver_deb.sh
@@ -79,9 +79,9 @@ if [ -z "${BRANCH_SUFFIX}" ]; then
        perl -pi -e "s/^ libigdgmm-dev(?=,|$)/ libigdgmm-dev (>=$GMM_DEVEL_VERSION)/" "$BUILD_DIR/debian/control"
    fi

-    IGC_VERSION=$(apt-cache policy intel-igc-core | grep Installed | cut -f2- -d ':' | xargs)
+    IGC_VERSION=$(apt-cache policy intel-igc-core-2 | grep Installed | cut -f2- -d ':' | xargs)
    if [ ! -z "${IGC_VERSION}" ]; then
-        perl -pi -e "s/^ intel-igc-core(?=,|$)/ intel-igc-core (=$IGC_VERSION)/" "$BUILD_DIR/debian/control"
+        perl -pi -e "s/^ intel-igc-core-2(?=,|$)/ intel-igc-core-2 (=$IGC_VERSION)/" "$BUILD_DIR/debian/control"
    fi
 fi

--- a/scripts/packaging/l0_gpu_driver/rhel_8/SPECS/l0_gpu_driver.spec
+++ b/scripts/packaging/l0_gpu_driver/rhel_8/SPECS/l0_gpu_driver.spec
@@ -30,7 +30,7 @@ BuildRequires: intel-gmmlib-devel
 BuildRequires: intel-igc-opencl-devel

 Requires: intel-gmmlib
-Requires: intel-igc-opencl
+Requires: intel-igc-opencl-2

 %description
 Runtime library providing the ability to use Intel GPUs with the oneAPI Level
--- a/scripts/packaging/l0_gpu_driver/sles_15/SPECS/l0_gpu_driver.spec
+++ b/scripts/packaging/l0_gpu_driver/sles_15/SPECS/l0_gpu_driver.spec
@@ -11,7 +11,7 @@
 %global NEO_I915_PRELIM_HEADERS_DIR %{nil}

 %define gmmlib_sover 12
-%define igc_sover 1
+%define igc_sover 2

 %if !0%{?build_type:1}
 %define build_type Release
--- a/scripts/packaging/l0_gpu_driver/ubuntu_20.04/control
+++ b/scripts/packaging/l0_gpu_driver/ubuntu_20.04/control
@@ -17,7 +17,7 @@ Architecture: amd64 arm64
 Depends:
 ${shlibs:Depends},
 ${misc:Depends},
- intel-igc-core,
+ intel-igc-core-2,
 libigdgmm12
 Description: Intel(R) Graphics Compute Runtime for oneAPI Level Zero.
 Level Zero is the primary low-level interface for language and runtime
--- a/scripts/packaging/opencl/build_opencl_deb.sh
+++ b/scripts/packaging/opencl/build_opencl_deb.sh
@@ -78,9 +78,9 @@ if [ -z "${BRANCH_SUFFIX}" ]; then
        perl -pi -e "s/^ libigdgmm-dev(?=,|$)/ libigdgmm-dev (>=$GMM_DEVEL_VERSION)/" "$BUILD_DIR/debian/control"
    fi

-    IGC_VERSION=$(apt-cache policy intel-igc-opencl | grep Installed | cut -f2- -d ':' | xargs)
+    IGC_VERSION=$(apt-cache policy intel-igc-opencl-2 | grep Installed | cut -f2- -d ':' | xargs)
    if [ ! -z "${IGC_VERSION}" ]; then
-        perl -pi -e "s/^ intel-igc-opencl(?=,|$)/ intel-igc-opencl (=$IGC_VERSION)/" "$BUILD_DIR/debian/control"
+        perl -pi -e "s/^ intel-igc-opencl-2(?=,|$)/ intel-igc-opencl-2 (=$IGC_VERSION)/" "$BUILD_DIR/debian/control"
    fi
    IGC_DEVEL_VERSION=$(apt-cache policy intel-igc-opencl-devel | grep Installed | cut -f2- -d ':' | xargs)
    if [ ! -z "${IGC_DEVEL_VERSION}" ]; then
--- a/scripts/packaging/opencl/rhel_8/SPECS/opencl.spec
+++ b/scripts/packaging/opencl/rhel_8/SPECS/opencl.spec
@@ -29,7 +29,7 @@ Source2: uapi.tar.xz
 %endif

 Requires:      intel-gmmlib
-Requires:      intel-igc-opencl
+Requires:      intel-igc-opencl-2

 BuildRequires: libva-devel gcc-c++ cmake ninja-build make
 BuildRequires: intel-gmmlib-devel
@@ -40,7 +40,7 @@ Intel(R) Graphics Compute Runtime for OpenCL(TM) is a open source project to con

 %package       -n intel-ocloc
 Summary:       ocloc package for opencl
-Requires:      intel-igc-opencl
+Requires:      intel-igc-opencl-2
 %description   -n intel-ocloc
 Intel(R) Graphics Compute Runtime for OpenCL(TM) is a open source project to converge Intel's development efforts on OpenCL(TM) compute stacks supporting the GEN graphics hardware architecture.

--- a/scripts/packaging/opencl/sles_15/SPECS/opencl.spec
+++ b/scripts/packaging/opencl/sles_15/SPECS/opencl.spec
@@ -14,7 +14,7 @@
 %global NEO_OCLOC_VERSION_MODE 1

 %define gmmlib_sover 12
-%define igc_sover 1
+%define igc_sover 2

 %if !0%{?build_type:1}
 %define build_type  Release
--- a/scripts/packaging/opencl/ubuntu_20.04/control
+++ b/scripts/packaging/opencl/ubuntu_20.04/control
@@ -17,7 +17,7 @@ Architecture: amd64 arm64
 Depends:
 ${shlibs:Depends},
 ${misc:Depends},
- intel-igc-opencl,
+ intel-igc-opencl-2,
 libigdgmm12,
 ocl-icd-libopencl1,
 Breaks:
--- a/scripts/packaging/ubuntu/control
+++ b/scripts/packaging/ubuntu/control
@@ -18,7 +18,7 @@ Architecture: amd64 arm64
 Depends:
 ${shlibs:Depends},
 ${misc:Depends},
- intel-igc-opencl,
+ intel-igc-opencl-2,
 libigdgmm12,
 ocl-icd-libopencl1
 Breaks:
@@ -61,7 +61,7 @@ Architecture: amd64 arm64
 Depends:
 ${shlibs:Depends},
 ${misc:Depends},
- intel-igc-core,
+ intel-igc-core-2,
 libigdgmm12
 Breaks:
 intel-level-zero-gpu,