Skip to content

Commit 7004d14

Browse files
committed
Merge remote-tracking branch 'upstream/sycl' into embed_fallback_svp
2 parents c889b30 + 3ac3e1b commit 7004d14

File tree

92 files changed

+188
-95
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+188
-95
lines changed

.github/workflows/release-binaries.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ jobs:
436436

437437
- name: Attest Build Provenance
438438
id: provenance
439-
uses: actions/attest-build-provenance@1c608d11d69870c2092266b3f9a6f3abbf17002c # v1.4.3
439+
uses: actions/attest-build-provenance@ef244123eb79f2f7a7e75d99086184180e6d0018 # v1.4.4
440440
with:
441441
subject-path: ${{ needs.prepare.outputs.release-binary-filename }}
442442

.github/workflows/release-sources.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
- name: Attest Build Provenance
9393
if: github.event_name != 'pull_request'
9494
id: provenance
95-
uses: actions/attest-build-provenance@1c608d11d69870c2092266b3f9a6f3abbf17002c # v1.4.3
95+
uses: actions/attest-build-provenance@ef244123eb79f2f7a7e75d99086184180e6d0018 # v1.4.4
9696
with:
9797
subject-path: "*.xz"
9898
- if: github.event_name != 'pull_request'

.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,6 @@ jobs:
5757

5858
# Upload the results to GitHub's code scanning dashboard.
5959
- name: "Upload to code-scanning"
60-
uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
60+
uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
6161
with:
6262
sarif_file: results.sarif

.github/workflows/sycl-nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ jobs:
198198
echo "TAG=$(date +'%Y-%m-%d')-${GITHUB_SHA::7}" >> "$GITHUB_OUTPUT"
199199
fi
200200
- name: Upload binaries
201-
uses: softprops/action-gh-release@e7a8f85e1c67a31e6ed99a94b41bd0b71bbee6b8
201+
uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974
202202
with:
203203
files: |
204204
sycl_linux.tar.gz

devops/cts_exclude_filter_L0_GPU

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
# CMPLRLLVM-61839
2-
multi_ptr
1+
# CMPLRTST-26179
2+
device

devops/cts_exclude_filter_OCL_CPU

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,3 @@
22
math_builtin_api
33
# https://github.com/intel/llvm/issues/13574
44
hierarchical
5-
# CMPLRLLVM-61839
6-
multi_ptr

libclc/ptx-nvidiacl/libspirv/images/image.cl

Lines changed: 25 additions & 25 deletions
Large diffs are not rendered by default.

llvm/docs/requirements-hashed.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,9 +242,9 @@ myst-parser==4.0.0 \
242242
--hash=sha256:851c9dfb44e36e56d15d05e72f02b80da21a9e0d07cba96baf5e2d476bb91531 \
243243
--hash=sha256:b9317997552424448c6096c2558872fdb6f81d3ecb3a40ce84a7518798f3f28d
244244
# via -r requirements.txt
245-
packaging==24.1 \
246-
--hash=sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002 \
247-
--hash=sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124
245+
packaging==24.2 \
246+
--hash=sha256:09abb1bccd265c01f4a3aa3f7a7db064b36514d2cba19a2f694fe6150451a759 \
247+
--hash=sha256:c228a6dc5e932d346bc5739379109d49e8853dd8223571c7c5b55260edc0b97f
248248
# via sphinx
249249
pygments==2.18.0 \
250250
--hash=sha256:786ff802f32e91311bff3889f6e9a86e81505fe99f2735bb6d60ae0c5004f199 \

sycl/include/sycl/backend.hpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include <sycl/exception.hpp> // for make_error_code
2424
#include <sycl/feature_test.hpp> // for SYCL_BACKEND_OP...
2525
#include <sycl/image.hpp> // for image, image_al...
26-
#include <sycl/kernel_bundle.hpp> // for kernel_bundle
2726
#include <sycl/kernel_bundle_enums.hpp> // for bundle_state
2827
#include <sycl/platform.hpp> // for platform, get_n...
2928
#include <sycl/queue.hpp> // for queue, get_native
@@ -56,6 +55,7 @@
5655
namespace sycl {
5756
inline namespace _V1 {
5857

58+
template <bundle_state State> class kernel_bundle;
5959
class property_list;
6060

6161
namespace detail {
@@ -141,13 +141,15 @@ auto get_native(const queue &Obj) -> backend_return_t<BackendName, queue> {
141141
int32_t IsImmCmdList;
142142
ur_native_handle_t Handle = Obj.getNative(IsImmCmdList);
143143
backend_return_t<BackendName, queue> RetVal;
144+
#if SYCL_EXT_ONEAPI_BACKEND_LEVEL_ZERO
144145
if constexpr (BackendName == backend::ext_oneapi_level_zero)
145146
RetVal = IsImmCmdList
146147
? backend_return_t<BackendName, queue>{reinterpret_cast<
147148
ze_command_list_handle_t>(Handle)}
148149
: backend_return_t<BackendName, queue>{
149150
reinterpret_cast<ze_command_queue_handle_t>(Handle)};
150151
else
152+
#endif
151153
RetVal = reinterpret_cast<backend_return_t<BackendName, queue>>(Handle);
152154

153155
return RetVal;

sycl/include/sycl/detail/backend_traits_cuda.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#include <sycl/detail/backend_traits.hpp>
1919
#include <sycl/device.hpp>
2020
#include <sycl/event.hpp>
21-
#include <sycl/kernel_bundle.hpp>
2221
#include <sycl/queue.hpp>
2322

2423
typedef int CUdevice;

0 commit comments

Comments
 (0)