Skip to content
Open
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
10 changes: 10 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "monthly"
groups:
github-actions:
patterns:
- "*"
58 changes: 31 additions & 27 deletions .github/workflows/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
run:
shell: bash
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
# repository: ${{ github.repository }} (default)
fetch-depth: 0
Expand Down Expand Up @@ -193,7 +193,7 @@ jobs:
echo "CMAKE_CXXFLAGS=-Wall -Wextra -pedantic -Werror -m${{matrix.BIN}} -Wno-missing-field-initializers ${{ matrix.COMPILER.EXCLUSIVE_CXX_FLAGS }}" >> $GITHUB_ENV;

- name: Checkout OpenCL-SDK
uses: actions/checkout@v4
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
fetch-depth: 0
submodules: recursive
Expand Down Expand Up @@ -429,13 +429,13 @@ jobs:
INTEL_OCL_URL: https://github.com/intel/llvm/releases/download/2023-WW27/win-oclcpuexp-2023.16.6.0.28_rel.zip
INTEL_TBB_URL: https://github.com/oneapi-src/oneTBB/releases/download/v2021.10.0/oneapi-tbb-2021.10.0-win.zip
IMAGE_INTEL_PREFIX: C:\Tools\Intel
VULKAN_SDK_URL: https://sdk.lunarg.com/sdk/download/1.3.261.1/windows/VulkanSDK-1.3.261.1-Installer.exe
VULKAN_SDK: C:/VulkanSDK/1.3.261.1
VULKAN_SDK_URL: https://sdk.lunarg.com/sdk/download/1.4.350.0/windows/vulkansdk-windows-X64-1.4.350.0.exe
VULKAN_SDK: C:/VulkanSDK/1.4.350.0

steps:

- name: Install CMake & Ninja
uses: lukka/get-cmake@v3.26.4
uses: lukka/get-cmake@a234373d65f7cab3afb0390fbaba1f20a7510fdc # v3.26.4

- name: Update Vcpkg
if: matrix.DEPS == 'vcpkg'
Expand Down Expand Up @@ -467,21 +467,18 @@ jobs:
Write-Output "CMAKE_CXXFLAGS=/W4 /EHsc" | Out-File $env:GITHUB_ENV -Append

- name: Checkout OpenCL-SDK
uses: actions/checkout@v4
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
fetch-depth: 0
submodules: recursive

- name: Install samples dependencies
run: |
Invoke-WebRequest ${env:VULKAN_SDK_URL} -OutFile vulkan-sdk-installer.exe
.\vulkan-sdk-installer.exe --accept-licenses --default-answer --confirm-command install com.lunarg.vulkan.32bit
Remove-Item vulkan-sdk-installer.exe
if ('${{ matrix.BIN }}' -eq 'x64')
{
if ('${{ matrix.BIN }}' -eq 'x64') {
Invoke-WebRequest ${env:VULKAN_SDK_URL} -OutFile vulkan-sdk-installer.exe
.\vulkan-sdk-installer.exe --accept-licenses --default-answer --confirm-command install
Remove-Item vulkan-sdk-installer.exe
echo "Vulkan_LIB_DIR=$env:VULKAN_SDK/Lib" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
} else {
echo "Vulkan_LIB_DIR=$env:VULKAN_SDK/Lib32" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
}

- name: Configure (MSBuild)
Expand All @@ -492,7 +489,13 @@ jobs:
} else {
$TOOLCHAIN_ARG=''
}
$BIN = if('${{matrix.BIN}}' -eq 'x86') {'Win32'} else {'x64'}
if ('${{matrix.BIN}}' -eq 'x64') {
$BIN = 'x64'
$VULKAN_ARG = "-D OPENCL_SDK_BUILD_VULKAN_SAMPLES=ON -D Vulkan_INCLUDE_DIR=${env:VULKAN_SDK}/Include -D Vulkan_LIBRARY=${env:Vulkan_LIB_DIR}/vulkan-1.lib"
} else {
$BIN = 'Win32'
#VULKAN_ARG = ''
}
& cmake `
$TOOLCHAIN_ARG `
-G "${{matrix.GEN}}" `
Expand All @@ -502,14 +505,12 @@ jobs:
-D BUILD_TESTING=ON `
-D OPENCL_SDK_BUILD_SAMPLES=ON `
-D OPENCL_SDK_BUILD_OPENGL_SAMPLES=ON `
-D OPENCL_SDK_BUILD_VULKAN_SAMPLES=ON `
$VULKAN_ARG `
-D CMAKE_C_STANDARD=${{matrix.STD.C}} `
-D CMAKE_CXX_STANDARD=${{matrix.STD.CXX}} `
-D CMAKE_C_FLAGS="${env:CMAKE_CFLAGS}" `
-D CMAKE_CXX_FLAGS="${env:CMAKE_CXXFLAGS}" `
-D CMAKE_INSTALL_PREFIX=${env:GITHUB_WORKSPACE}\install `
-D Vulkan_INCLUDE_DIR=${env:VULKAN_SDK}/Include `
-D Vulkan_LIBRARY=${env:Vulkan_LIB_DIR}/vulkan-1.lib `
-S ${env:GITHUB_WORKSPACE} `
-B ${env:GITHUB_WORKSPACE}\build
if ($LASTEXITCODE -ne 0) { throw "Configuring OpenCL-SDK failed." }
Expand All @@ -522,6 +523,11 @@ jobs:
} else {
$TOOLCHAIN_ARG=''
}
if ('${{matrix.BIN}}' -eq 'x64') {
$VULKAN_ARG = "-D OPENCL_SDK_BUILD_VULKAN_SAMPLES=ON -D Vulkan_INCLUDE_DIR=${env:VULKAN_SDK}/Include -D Vulkan_LIBRARY=${env:Vulkan_LIB_DIR}/vulkan-1.lib"
} else {
#VULKAN_ARG = ''
}
$VER = switch ('${{matrix.VER}}') { `
'v142' {'14.2'} `
'v143' {'14.4'} }
Expand All @@ -535,15 +541,13 @@ jobs:
-D BUILD_TESTING=ON `
-D OPENCL_SDK_BUILD_SAMPLES=ON `
-D OPENCL_SDK_BUILD_OPENGL_SAMPLES=ON `
-D OPENCL_SDK_BUILD_VULKAN_SAMPLES=ON `
$VULKAN_ARG `
-D CMAKE_C_STANDARD=${{matrix.STD.C}} `
-D CMAKE_CXX_STANDARD=${{matrix.STD.CXX}} `
-D CMAKE_C_FLAGS="${env:CMAKE_CFLAGS}" `
-D CMAKE_CXX_FLAGS="${env:CMAKE_CXXFLAGS}" `
-D CMAKE_EXE_LINKER_FLAGS=/INCREMENTAL `
-D CMAKE_INSTALL_PREFIX=${env:GITHUB_WORKSPACE}\install `
-D Vulkan_INCLUDE_DIR=${env:VULKAN_SDK}/Include `
-D Vulkan_LIBRARY=${env:Vulkan_LIB_DIR}/vulkan-1.lib `
-S ${env:GITHUB_WORKSPACE} `
-B ${env:GITHUB_WORKSPACE}\build
if ($LASTEXITCODE -ne 0) { throw "Configuring OpenCL-SDK failed." }
Expand Down Expand Up @@ -686,7 +690,7 @@ jobs:
CXX: /usr/bin/clang++
steps:
- name: Checkout OpenCL-SDK
uses: actions/checkout@v4
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
fetch-depth: 0
submodules: recursive
Expand All @@ -706,7 +710,7 @@ jobs:
run: brew install tclap glm glew sfml mesa-glu

- name: Install CMake & Ninja
uses: lukka/get-cmake@v3.26.4
uses: lukka/get-cmake@a234373d65f7cab3afb0390fbaba1f20a7510fdc # v3.26.4

- name: Install Vcpkg
if: matrix.DEPS == 'vcpkg'
Expand Down Expand Up @@ -805,7 +809,7 @@ jobs:
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- name: Environment setup
run: |
MINIFORGE_INSTALL_DIR=.miniforge3
Expand Down Expand Up @@ -843,9 +847,9 @@ jobs:
strategy:
matrix:
#os: [ubuntu-latest, macos-latest]
os: [ubuntu-latest, macos-13]
os: [ubuntu-latest]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
fetch-depth: 0
submodules: recursive
Expand Down Expand Up @@ -885,7 +889,7 @@ jobs:
CXXFLAGS: -Wall -Wextra -pedantic -Werror -Wno-error=missing-field-initializers
steps:
- name: Checkout OpenCL-SDK
uses: actions/checkout@v4
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
fetch-depth: 0
submodules: recursive
Expand Down Expand Up @@ -915,7 +919,7 @@ jobs:
needs: format
steps:
- name: Checkout OpenCL-SDK
uses: actions/checkout@v4
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
fetch-depth: 0
submodules: recursive
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
MultiProcMaxCount: 3
steps:
- name: Checkout OpenCL-SDK
uses: actions/checkout@v4
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
fetch-depth: 0
submodules: recursive
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
if ($LASTEXITCODE -ne 0) { throw "Packaging OpenCL-SDK failed." }

- name: Upload
uses: softprops/action-gh-release@v2
uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0
with:
draft: true
token: ${{ secrets.ACTIONS_CREATE_RELEASE_TOKEN }}
Expand All @@ -99,7 +99,7 @@ jobs:

steps:
- name: Checkout OpenCL-SDK
uses: actions/checkout@v4
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
fetch-depth: 0
submodules: recursive
Expand Down Expand Up @@ -150,7 +150,7 @@ jobs:
if ($LASTEXITCODE -ne 0) { throw "Packaging OpenCL-SDK source failed." }

- name: Upload
uses: softprops/action-gh-release@v2
uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0
with:
draft: true
token: ${{ secrets.ACTIONS_CREATE_RELEASE_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion external/OpenCL-ICD-Loader
Submodule OpenCL-ICD-Loader updated 67 files
+10 −0 .github/dependabot.yml
+40 −23 .github/workflows/presubmit.yml
+1 −1 .github/workflows/release.yml
+19 −5 CMakeLists.txt
+1 −0 OpenCL.pc.in
+3 −3 README.md
+26 −22 cmake/Package.cmake
+2 −26 include/cl_khr_icd2.h
+21 −7 loader/cllayerinfo.c
+196 −36 loader/icd.c
+25 −43 loader/icd.h
+17 −1 loader/icd_dispatch.c
+1 −1 loader/icd_dispatch.h
+294 −7 loader/icd_dispatch_generated.c
+1 −1 loader/icd_envvars.h
+34 −0 loader/icd_library.h
+6 −2 loader/icd_platform.h
+20 −0 loader/icd_trace.c
+52 −0 loader/icd_trace.h
+4 −1 loader/icd_version.h
+6 −1 loader/linux/icd_exports.map
+7 −30 loader/linux/icd_linux.c
+20 −8 loader/linux/icd_linux_envvars.c
+51 −0 loader/linux/icd_linux_library.c
+4 −1 loader/windows/OpenCL-mingw-i686.def
+4 −1 loader/windows/OpenCL.def
+2 −2 loader/windows/OpenCL.rc
+1 −1 loader/windows/adapter.h
+10 −36 loader/windows/icd_windows.c
+6 −13 loader/windows/icd_windows.h
+1 −1 loader/windows/icd_windows_apppackage.c
+1 −1 loader/windows/icd_windows_apppackage.h
+1 −1 loader/windows/icd_windows_dxgk.c
+1 −1 loader/windows/icd_windows_dxgk.h
+3 −2 loader/windows/icd_windows_envvars.c
+34 −0 loader/windows/icd_windows_formats.h
+1 −1 loader/windows/icd_windows_hkr.c
+1 −1 loader/windows/icd_windows_hkr.h
+59 −0 loader/windows/icd_windows_library.c
+207 −0 scripts/dispatch_table.mako
+1 −1 scripts/gen/__init__.py
+1 −1 scripts/gen_loader.py
+1 −1 scripts/gen_print_layer.py
+13 −207 scripts/icd_dispatch_generated.c.mako
+6 −206 scripts/icd_print_layer_generated.c.mako
+12 −0 test/CMakeLists.txt
+2 −2 test/driver_stub/CMakeLists.txt
+82 −20 test/driver_stub/cl.c
+2 −8 test/driver_stub/cl_ext.c
+9 −17 test/driver_stub/icd.c
+1 −0 test/driver_stub/rename_api.h
+1 −1 test/layer/CMakeLists.txt
+54 −9 test/layer/icd_print_layer.c
+2 −0 test/layer/icd_print_layer.def
+8 −3 test/layer/icd_print_layer.h
+2 −0 test/layer/icd_print_layer.map
+190 −167 test/layer/icd_print_layer_generated.c
+1 −1 test/loader_test/CMakeLists.txt
+11 −0 test/loader_test/param_struct.h
+27 −0 test/loader_test/test_kernel.c
+1 −1 test/log/CMakeLists.txt
+27 −0 test/plugin_test/CLPlugin-mingw-i686.def
+20 −0 test/plugin_test/CLPlugin.def
+58 −0 test/plugin_test/CMakeLists.txt
+51 −0 test/plugin_test/cl_plugin.c
+32 −0 test/plugin_test/cl_plugin.h
+68 −0 test/plugin_test/cl_plugin_loader_test.c
Loading