Merge branch 'main' into v0.12.x-dev

Author: KFilipek

.cmake-format

@@ -26,7 +26,8 @@ with section("parse"):
       'kwargs': {
         'NAME': '*',
         'SRCS': '*',
-        'LIBS': '*'}},
+        'LIBS': '*',
+        'ENVS': '*'}},
     'add_umf_library': {
       "pargs": 0,
       "flags": [],

.github/scripts/get_system_info.sh

@@ -15,7 +15,7 @@ function check_L0_version {
     fi
 
     if command -v zypper &> /dev/null; then
-        zypper se level-zero && return
+        zypper -n se level-zero || true
     fi
 
     echo "level-zero not installed"

.github/workflows/reusable_basic.yml

@@ -74,6 +74,17 @@ jobs:
             install_tbb: 'ON'
             disable_hwloc: 'OFF'
             link_hwloc_statically: 'OFF'
+          # test lld linker
+          - os: 'ubuntu-24.04'
+            build_type: Release
+            compiler: {c: icx, cxx: icpx}
+            shared_library: 'ON'
+            level_zero_provider: 'ON'
+            cuda_provider: 'ON'
+            install_tbb: 'ON'
+            disable_hwloc: 'OFF'
+            link_hwloc_statically: 'OFF'
+            llvm_linker: '-DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=lld" -DCMAKE_MODULE_LINKER_FLAGS="-fuse-ld=lld" -DCMAKE_SHARED_LINKER_FLAGS="-fuse-ld=lld"'
           # test without installing TBB
           - os: 'ubuntu-22.04'
             build_type: Release
@@ -160,6 +171,7 @@ jobs:
         -DUMF_DISABLE_HWLOC=${{matrix.disable_hwloc}}
         -DUMF_LINK_HWLOC_STATICALLY=${{matrix.link_hwloc_statically}}
         ${{ matrix.build_type == 'Debug' && matrix.compiler.c == 'gcc' && '-DUMF_USE_COVERAGE=ON' || '' }}
+        ${{ matrix.llvm_linker || '' }}
 
     - name: Build UMF
       run: |

.github/workflows/reusable_benchmarks.yml

@@ -103,15 +103,17 @@ jobs:
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       with:
         repository: intel/llvm
-        # add preloaded UMF benchmarks
-        # https://github.com/intel/llvm/pull/17278
-        ref: b2f9dab5266d227cc9eb19af1b54c5bdc50221d1
+        # [BENCHMARK] fix default timeout parameter
+        # https://github.com/intel/llvm/pull/17412
+        ref: 357e9e0b253b7eba105d044e38452b3c09169f8a
         path: sycl-repo
         fetch-depth: 1
 
     - name: Install benchmarking scripts deps
       run: |
-        pip install --force-reinstall -r ${{github.workspace}}/sycl-repo/unified-runtime/third_party/benchmark_requirements.txt
+        python -m venv .venv
+        source .venv/bin/activate
+        pip install -r ${{github.workspace}}/sycl-repo/unified-runtime/third_party/benchmark_requirements.txt
 
     - name: Set core range and GPU mask
       run: |
@@ -135,10 +137,12 @@ jobs:
       id: benchmarks
       working-directory: ${{env.BUILD_DIR}}
       run: >
+        source ${{github.workspace}}/.venv/bin/activate &&
         taskset -c ${{ env.CORES }} ${{ github.workspace }}/sycl-repo/unified-runtime/scripts/benchmarks/main.py
         ~/bench_workdir_umf
         --umf ${{env.BUILD_DIR}}
         --compare baseline
+        --timeout 3000
         ${{ inputs.upload_report && '--output-html' || '' }}
         ${{ inputs.pr_no != 0 && '--output-markdown' || '' }}
         ${{ inputs.bench_script_params }}

.github/workflows/reusable_compatibility.yml

@@ -1,4 +1,4 @@
-# Workflow for checkig the backward compatibility of UMF.
+# Workflow for checking the backward compatibility of UMF.
 # Test the latest UMF shared library with binaries compiled using the older UMF 
 # shared library.
 name: Compatibility 
@@ -15,7 +15,7 @@ permissions:
   contents: read
 
 jobs:
-  ubuntu-build:
+  ubuntu:
     name: Ubuntu
     runs-on: 'ubuntu-22.04'
 
@@ -35,12 +35,6 @@ jobs:
     - name: Install libhwloc
       working-directory: ${{github.workspace}}/tag_version
       run: .github/scripts/install_hwloc.sh
-        
-    - name: Get "tag" UMF version
-      working-directory: ${{github.workspace}}/tag_version
-      run: |
-        VERSION=$(git describe --tags)
-        echo "tag version: $VERSION"
 
     - name: Configure "tag" UMF build
       working-directory: ${{github.workspace}}/tag_version
@@ -52,6 +46,7 @@ jobs:
         -DCMAKE_C_COMPILER=gcc
         -DCMAKE_CXX_COMPILER=g++
         -DUMF_BUILD_TESTS=ON
+        -DUMF_BUILD_EXAMPLES=ON
         -DUMF_BUILD_LEVEL_ZERO_PROVIDER=ON
         -DUMF_BUILD_CUDA_PROVIDER=ON
         -DUMF_FORMAT_CODE_STYLE=OFF
@@ -64,7 +59,7 @@ jobs:
       working-directory: ${{github.workspace}}/tag_version
       run: |
         cmake --build ${{github.workspace}}/tag_version/build -j $(nproc)
-        
+
     - name: Run "tag" UMF tests
       working-directory: ${{github.workspace}}/tag_version/build
       run: |
@@ -75,13 +70,7 @@ jobs:
       with:
         fetch-depth: 0
         path: ${{github.workspace}}/latest_version
-        
-    - name: Get latest UMF version
-      working-directory: ${{github.workspace}}/latest_version
-      run: |
-        VERSION=$(git describe --tags)
-        echo "checked version: $VERSION"
-        
+
     - name: Configure latest UMF build
       working-directory: ${{github.workspace}}/latest_version
       run: >
@@ -97,7 +86,6 @@ jobs:
         -DUMF_FORMAT_CODE_STYLE=OFF
         -DUMF_DEVELOPER_MODE=ON
         -DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
-        -DUMF_TESTS_FAIL_ON_SKIP=ON
 
     - name: Build latest UMF
       working-directory: ${{github.workspace}}/latest_version
@@ -106,12 +94,14 @@ jobs:
 
     - name: Run "tag" UMF tests with latest UMF libs (warnings enabled)
       working-directory: ${{github.workspace}}/tag_version/build
+      # GTEST_FILTER is used below to skip test that is not compatible
       run: >
-        UMF_LOG="level:warning;flush:debug;output:stderr;pid:no" 
-        LD_LIBRARY_PATH=${{github.workspace}}/latest_version/build/lib/ 
-        ctest --output-on-failure -E "umf-mempolicy" # disable tests that rely on internal structures
- 
-  windows-build:
+        UMF_LOG="level:warning;flush:debug;output:stderr;pid:no"
+        LD_LIBRARY_PATH=${{github.workspace}}/latest_version/build/lib/
+        GTEST_FILTER="-*umfIpcTest.GetPoolByOpenedHandle*"
+        ctest --verbose
+
+  windows:
     name: Windows
     env:
       VCPKG_PATH: "${{github.workspace}}/vcpkg/packages/hwloc_x64-windows;${{github.workspace}}/vcpkg/packages/tbb_x64-windows;${{github.workspace}}/vcpkg/packages/jemalloc_x64-windows"
@@ -132,16 +122,11 @@ jobs:
         vcpkgDirectory: ${{github.workspace}}/vcpkg
         vcpkgJsonGlob: '**/vcpkg.json'
 
+    # NOTE we use vcpkg setup from "tag" version
     - name: Install dependencies
       working-directory: ${{github.workspace}}/tag_version
       run: vcpkg install
       shell: pwsh # Specifies PowerShell as the shell for running the script.
-    
-    - name: Get "tag" UMF version
-      working-directory: ${{github.workspace}}/tag_version
-      run: |
-        $version = (git describe --tags)
-        echo "tag version: $VERSION"
 
     - name: Configure "tag" UMF build
       working-directory: ${{github.workspace}}/tag_version
@@ -153,6 +138,7 @@ jobs:
         -DCMAKE_CXX_COMPILER=cl
         -DUMF_BUILD_SHARED_LIBRARY=ON
         -DUMF_BUILD_TESTS=ON
+        -DUMF_BUILD_EXAMPLES=ON
         -DUMF_BUILD_LEVEL_ZERO_PROVIDER=ON
         -DUMF_BUILD_CUDA_PROVIDER=ON
         -DUMF_FORMAT_CODE_STYLE=OFF
@@ -174,13 +160,6 @@ jobs:
         fetch-depth: 0
         path: ${{github.workspace}}/latest_version
 
-    # NOTE we use vcpkg setup from "tag" version
-    - name: Get latest UMF version
-      working-directory: ${{github.workspace}}/latest_version
-      run: |
-        $version = (git describe --tags)
-        echo "latest version: $VERSION"
-
     - name: Configure latest UMF build
       working-directory: ${{github.workspace}}/latest_version
       run: >
@@ -196,7 +175,6 @@ jobs:
         -DUMF_FORMAT_CODE_STYLE=OFF
         -DUMF_DEVELOPER_MODE=ON
         -DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
-        -DUMF_TESTS_FAIL_ON_SKIP=ON
 
     - name: Build latest UMF
       run: cmake --build "${{github.workspace}}/latest_version/build" --config Debug -j $Env:NUMBER_OF_PROCESSORS
@@ -205,5 +183,93 @@ jobs:
       working-directory: ${{github.workspace}}/tag_version/build
       run: |
         $env:UMF_LOG="level:warning;flush:debug;output:stderr;pid:no" 
+        $env:GTEST_FILTER="-*umfIpcTest.GetPoolByOpenedHandle*"
         cp ${{github.workspace}}/latest_version/build/bin/Debug/umf.dll ${{github.workspace}}/tag_version/build/bin/Debug/umf.dll
-        ctest -C Debug --output-on-failure --test-dir test
+        ctest -C Debug --verbose
+
+  gpu:
+    name: GPU Ubuntu
+    # run only on upstream; forks will not have the HW
+    if: github.repository == 'oneapi-src/unified-memory-framework'
+    strategy:
+      matrix:
+        provider: ['LEVEL_ZERO', 'CUDA']
+    runs-on: ["DSS-${{matrix.provider}}", "DSS-UBUNTU"]
+
+    steps:
+    - name: Checkout "tag" UMF version
+      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      with:
+        fetch-depth: 0
+        ref: refs/tags/${{inputs.tag}}
+        path: ${{github.workspace}}/tag_version
+
+    - name: Configure "tag" UMF build
+      working-directory: ${{github.workspace}}/tag_version
+      run: >
+        cmake
+        -B ${{github.workspace}}/tag_version/build
+        -DCMAKE_BUILD_TYPE=Debug
+        -DUMF_BUILD_SHARED_LIBRARY=ON
+        -DCMAKE_C_COMPILER=gcc
+        -DCMAKE_CXX_COMPILER=g++
+        -DUMF_BUILD_TESTS=ON
+        -DUMF_BUILD_GPU_TESTS=ON
+        -DUMF_BUILD_EXAMPLES=ON
+        -DUMF_BUILD_GPU_EXAMPLES=ON
+        -DUMF_BUILD_LEVEL_ZERO_PROVIDER=OFF
+        -DUMF_BUILD_CUDA_PROVIDER=OFF
+        -DUMF_BUILD_${{matrix.provider}}_PROVIDER=ON
+        -DUMF_FORMAT_CODE_STYLE=OFF
+        -DUMF_DEVELOPER_MODE=ON
+        -DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
+        -DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
+        -DUMF_TESTS_FAIL_ON_SKIP=ON
+
+    - name: Build "tag" UMF
+      working-directory: ${{github.workspace}}/tag_version
+      run: |
+        cmake --build ${{github.workspace}}/tag_version/build -j $(nproc)
+
+    - name: Run "tag" UMF tests
+      working-directory: ${{github.workspace}}/tag_version/build
+      run: >
+        LD_LIBRARY_PATH=${{github.workspace}}/tag_version/build/lib/
+        GTEST_FILTER="-*umfIpcTest.GetPoolByOpenedHandle*"
+        ctest --output-on-failure
+
+    - name: Checkout latest UMF version
+      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      with:
+        fetch-depth: 0
+        path: ${{github.workspace}}/latest_version
+
+    - name: Configure latest UMF build
+      working-directory: ${{github.workspace}}/latest_version
+      run: >
+        cmake
+        -B ${{github.workspace}}/latest_version/build
+        -DCMAKE_BUILD_TYPE=Debug
+        -DUMF_BUILD_SHARED_LIBRARY=ON
+        -DCMAKE_C_COMPILER=gcc
+        -DCMAKE_CXX_COMPILER=g++
+        -DUMF_BUILD_TESTS=OFF
+        -DUMF_BUILD_LEVEL_ZERO_PROVIDER=ON
+        -DUMF_BUILD_CUDA_PROVIDER=ON
+        -DUMF_FORMAT_CODE_STYLE=OFF
+        -DUMF_DEVELOPER_MODE=ON
+        -DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
+
+    - name: Build latest UMF
+      working-directory: ${{github.workspace}}/latest_version
+      run: |
+        cmake --build ${{github.workspace}}/latest_version/build -j $(nproc)
+
+    # NOTE: Once not implemented features may now be implemented - exclude these tests
+    - name: Run "tag" UMF tests with latest UMF libs (warnings enabled)
+      working-directory: ${{github.workspace}}/tag_version/build
+      run: >
+        UMF_LOG="level:warning;flush:debug;output:stderr;pid:no"
+        LD_LIBRARY_PATH=${{github.workspace}}/latest_version/build/lib/
+        GTEST_FILTER="-*umfIpcTest.GetPoolByOpenedHandle*"
+        ctest --verbose -E "not_impl"

.github/workflows/reusable_gpu.yml

@@ -99,8 +99,8 @@ jobs:
           -DUMF_BUILD_LEVEL_ZERO_PROVIDER=OFF
           -DUMF_BUILD_${{inputs.name}}_PROVIDER=ON
           -DUMF_TESTS_FAIL_ON_SKIP=ON
-          ${{ matrix.os == 'Ubuntu' && matrix.build_type == 'Debug' && '-DUMF_USE_COVERAGE=ON' || '' }}   
-          ${{ matrix.os == 'Windows' && '-DCMAKE_SUPPRESS_REGENERATION=ON' || '' }}                           
+          ${{ matrix.os == 'Ubuntu' && matrix.build_type == 'Debug' && '-DUMF_USE_COVERAGE=ON' || '' }}
+          ${{ matrix.os == 'Windows' && '-DCMAKE_SUPPRESS_REGENERATION=ON' || '' }}
 
       - name: Build UMF
         run: cmake --build ${{env.BUILD_DIR}} --config ${{matrix.build_type}} -j ${{matrix.number_of_processors}}

.github/workflows/reusable_multi_numa.yml

@@ -1,4 +1,4 @@
-# Runs tests on multi-numa machine
+# Runs tests on multi-numa machines
 name: MultiNuma
 
 on: [workflow_call]
@@ -20,7 +20,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-22.04, rhel-9.1]
+        os: [ubuntu-22.04, rhel-9.1, sles-15]
         build_type: [Debug, Release]
         shared_library: ['ON', 'OFF']
     runs-on:  ["DSS-MULTI-NUMA", "DSS-${{matrix.os}}"]
@@ -31,9 +31,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Get information about platform
-        run: .github/scripts/get_system_info.sh
-
       - name: Configure build
         run: >
           cmake
@@ -53,24 +50,24 @@ jobs:
         run: cmake --build ${{github.workspace}}/build -j $(nproc)
 
       - name: Run tests
-        if: matrix.os != 'rhel-9.1'
+        if: (matrix.os != 'rhel-9.1') && (matrix.os != 'sles-15')
         working-directory: ${{github.workspace}}/build
         run: ctest --output-on-failure --test-dir test
 
-        # On RHEL, hwloc version is just a little too low.
+        # On RHEL/SLES, hwloc version is just a little too low.
         # Skip some tests until we upgrade hwloc and update CMake to properly handle local hwloc installation.
         # TODO: fix issue #560
         # TODO: add issue for -E test_init_teardown - it is not clear why it fails
-      - name: Run tests (on RHEL)
-        if: matrix.os == 'rhel-9.1'
+      - name: Run tests (on RHEL/SLES)
+        if: (matrix.os == 'rhel-9.1') || (matrix.os == 'sles-15')
         working-directory: ${{github.workspace}}/build
         run: |
           ctest --output-on-failure --test-dir test -E "test_provider_os_memory_multiple_numa_nodes|test_init_teardown"
           ./test/test_provider_os_memory_multiple_numa_nodes \
             --gtest_filter="-*checkModeLocal/*:*checkModePreferredEmptyNodeset/*:testNuma.checkModeInterleave"
 
       - name: Run NUMA tests under valgrind
-        if: matrix.os != 'rhel-9.1'
+        if: (matrix.os != 'rhel-9.1') && (matrix.os != 'sles-15')
         run: |
           ${{github.workspace}}/test/test_valgrind.sh ${{github.workspace}} ${{env.BUILD_DIR}} memcheck "${{env.NUMA_TESTS}}"
           ${{github.workspace}}/test/test_valgrind.sh ${{github.workspace}} ${{env.BUILD_DIR}} drd "${{env.NUMA_TESTS}}"
@@ -91,3 +88,7 @@ jobs:
         with:
           name: ${{env.COVERAGE_NAME}}-${{matrix.os}}-shared-${{matrix.shared_library}}
           path: ${{env.COVERAGE_DIR}}
+
+      - name: Get information about platform
+        if: always()
+        run: .github/scripts/get_system_info.sh

.github/workflows/reusable_proxy_lib.yml

@@ -32,7 +32,7 @@ jobs:
       - name: Install apt packages
         run: |
           sudo apt-get update
-          sudo apt-get install -y cmake libhwloc-dev libtbb-dev lcov
+          sudo apt-get install -y cmake libhwloc-dev libnuma-dev libtbb-dev lcov
 
       - name: Configure build
         run: >