Skip to content

Commit 52c775b

Browse files
authored
[SYCL][NativeCPU] Update OCK. (#18930)
This pulls in an LLVM compatibility fix that will be needed after the next pulldown.
1 parent a68f595 commit 52c775b

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

llvm/lib/SYCLNativeCPUUtils/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ endif()
3434
if(NATIVECPU_USE_OCK)
3535
if(NATIVECPU_OCK_USE_FETCHCONTENT)
3636
set(OCK_GIT_INTERNAL_REPO "https://github.com/uxlfoundation/oneapi-construction-kit.git")
37-
# commit 4e4811a9b4945088667e1a1653742ffdf84e5168
38-
# Merge: b347adff05 0101b4ff40
37+
# commit 007a4924129ef49ca8793631d28ae343f6ba6d24
38+
# Merge: 0135b8d586 9ed4bddff1
3939
# Author: Harald van Dijk <[email protected]>
40-
# Date: Wed Jun 4 13:17:16 2025 +0100
40+
# Date: Wed Jun 11 16:45:25 2025 +0100
4141
#
42-
# Merge pull request #854 from hvdijk/avoid-computeknownbits
42+
# Merge pull request #864 from hvdijk/llvm21-createelementcount
4343
#
44-
# [LLVM 21] Avoid computeKnownBits.
45-
set(OCK_GIT_INTERNAL_TAG 4e4811a9b4945088667e1a1653742ffdf84e5168)
44+
# [LLVM 21] Remove VectorizationFactor, use CreateElementCount.
45+
set(OCK_GIT_INTERNAL_TAG 007a4924129ef49ca8793631d28ae343f6ba6d24)
4646

4747
# Overwrite OCK_GIT_INTERNAL_REPO/OCK_GIT_INTERNAL_TAG if the corresponding options are set
4848
if(OCK_GIT_REPO)

llvm/lib/SYCLNativeCPUUtils/PipelineSYCLNativeCPU.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ void llvm::sycl::utils::addSYCLNativeCPUBackendPasses(
8484
if (F.getCallingConv() != llvm::CallingConv::SPIR_KERNEL) {
8585
return false;
8686
}
87-
compiler::utils::VectorizationFactor VF(NativeCPUVeczWidth, false);
87+
auto VF = llvm::ElementCount::getFixed(NativeCPUVeczWidth);
8888
vecz::VeczPassOptions VPO;
8989
VPO.factor = std::move(VF);
9090
Opts.emplace_back(std::move(VPO));

0 commit comments

Comments
 (0)