Skip to content

Commit 10c2770

Browse files
committed
Merge branch 'sycl' into sycl_khr_group_interface
Signed-off-by: Michael Aziz <[email protected]>
2 parents cc9f060 + cbadc47 commit 10c2770

File tree

261 files changed

+8708
-3361
lines changed

Some content is hidden

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

261 files changed

+8708
-3361
lines changed

.ci/metrics/requirements.lock.txt

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -186,34 +186,38 @@ charset-normalizer==3.4.0 \
186186
--hash=sha256:fe9f97feb71aa9896b81973a7bbada8c49501dc73e58a10fcef6663af95e5079 \
187187
--hash=sha256:ffc519621dce0c767e96b9c53f09c5d215578e10b02c285809f76509a3931482
188188
# via requests
189-
cryptography==43.0.3 \
190-
--hash=sha256:0c580952eef9bf68c4747774cde7ec1d85a6e61de97281f2dba83c7d2c806362 \
191-
--hash=sha256:0f996e7268af62598f2fc1204afa98a3b5712313a55c4c9d434aef49cadc91d4 \
192-
--hash=sha256:1ec0bcf7e17c0c5669d881b1cd38c4972fade441b27bda1051665faaa89bdcaa \
193-
--hash=sha256:281c945d0e28c92ca5e5930664c1cefd85efe80e5c0d2bc58dd63383fda29f83 \
194-
--hash=sha256:2ce6fae5bdad59577b44e4dfed356944fbf1d925269114c28be377692643b4ff \
195-
--hash=sha256:315b9001266a492a6ff443b61238f956b214dbec9910a081ba5b6646a055a805 \
196-
--hash=sha256:443c4a81bb10daed9a8f334365fe52542771f25aedaf889fd323a853ce7377d6 \
197-
--hash=sha256:4a02ded6cd4f0a5562a8887df8b3bd14e822a90f97ac5e544c162899bc467664 \
198-
--hash=sha256:53a583b6637ab4c4e3591a15bc9db855b8d9dee9a669b550f311480acab6eb08 \
199-
--hash=sha256:63efa177ff54aec6e1c0aefaa1a241232dcd37413835a9b674b6e3f0ae2bfd3e \
200-
--hash=sha256:74f57f24754fe349223792466a709f8e0c093205ff0dca557af51072ff47ab18 \
201-
--hash=sha256:7e1ce50266f4f70bf41a2c6dc4358afadae90e2a1e5342d3c08883df1675374f \
202-
--hash=sha256:81ef806b1fef6b06dcebad789f988d3b37ccaee225695cf3e07648eee0fc6b73 \
203-
--hash=sha256:846da004a5804145a5f441b8530b4bf35afbf7da70f82409f151695b127213d5 \
204-
--hash=sha256:8ac43ae87929a5982f5948ceda07001ee5e83227fd69cf55b109144938d96984 \
205-
--hash=sha256:9762ea51a8fc2a88b70cf2995e5675b38d93bf36bd67d91721c309df184f49bd \
206-
--hash=sha256:a2a431ee15799d6db9fe80c82b055bae5a752bef645bba795e8e52687c69efe3 \
207-
--hash=sha256:bf7a1932ac4176486eab36a19ed4c0492da5d97123f1406cf15e41b05e787d2e \
208-
--hash=sha256:c2e6fc39c4ab499049df3bdf567f768a723a5e8464816e8f009f121a5a9f4405 \
209-
--hash=sha256:cbeb489927bd7af4aa98d4b261af9a5bc025bd87f0e3547e11584be9e9427be2 \
210-
--hash=sha256:d03b5621a135bffecad2c73e9f4deb1a0f977b9a8ffe6f8e002bf6c9d07b918c \
211-
--hash=sha256:d56e96520b1020449bbace2b78b603442e7e378a9b3bd68de65c782db1507995 \
212-
--hash=sha256:df6b6c6d742395dd77a23ea3728ab62f98379eff8fb61be2744d4679ab678f73 \
213-
--hash=sha256:e1be4655c7ef6e1bbe6b5d0403526601323420bcf414598955968c9ef3eb7d16 \
214-
--hash=sha256:f18c716be16bc1fea8e95def49edf46b82fccaa88587a45f8dc0ff6ab5d8e0a7 \
215-
--hash=sha256:f46304d6f0c6ab8e52770addfa2fc41e6629495548862279641972b6215451cd \
216-
--hash=sha256:f7b178f11ed3664fd0e995a47ed2b5ff0a12d893e41dd0494f406d1cf555cab7
189+
cryptography==44.0.1 \
190+
--hash=sha256:00918d859aa4e57db8299607086f793fa7813ae2ff5a4637e318a25ef82730f7 \
191+
--hash=sha256:1e8d181e90a777b63f3f0caa836844a1182f1f265687fac2115fcf245f5fbec3 \
192+
--hash=sha256:1f9a92144fa0c877117e9748c74501bea842f93d21ee00b0cf922846d9d0b183 \
193+
--hash=sha256:21377472ca4ada2906bc313168c9dc7b1d7ca417b63c1c3011d0c74b7de9ae69 \
194+
--hash=sha256:24979e9f2040c953a94bf3c6782e67795a4c260734e5264dceea65c8f4bae64a \
195+
--hash=sha256:2a46a89ad3e6176223b632056f321bc7de36b9f9b93b2cc1cccf935a3849dc62 \
196+
--hash=sha256:322eb03ecc62784536bc173f1483e76747aafeb69c8728df48537eb431cd1911 \
197+
--hash=sha256:436df4f203482f41aad60ed1813811ac4ab102765ecae7a2bbb1dbb66dcff5a7 \
198+
--hash=sha256:4f422e8c6a28cf8b7f883eb790695d6d45b0c385a2583073f3cec434cc705e1a \
199+
--hash=sha256:53f23339864b617a3dfc2b0ac8d5c432625c80014c25caac9082314e9de56f41 \
200+
--hash=sha256:5fed5cd6102bb4eb843e3315d2bf25fede494509bddadb81e03a859c1bc17b83 \
201+
--hash=sha256:610a83540765a8d8ce0f351ce42e26e53e1f774a6efb71eb1b41eb01d01c3d12 \
202+
--hash=sha256:6c8acf6f3d1f47acb2248ec3ea261171a671f3d9428e34ad0357148d492c7864 \
203+
--hash=sha256:6f76fdd6fd048576a04c5210d53aa04ca34d2ed63336d4abd306d0cbe298fddf \
204+
--hash=sha256:72198e2b5925155497a5a3e8c216c7fb3e64c16ccee11f0e7da272fa93b35c4c \
205+
--hash=sha256:887143b9ff6bad2b7570da75a7fe8bbf5f65276365ac259a5d2d5147a73775f2 \
206+
--hash=sha256:888fcc3fce0c888785a4876ca55f9f43787f4c5c1cc1e2e0da71ad481ff82c5b \
207+
--hash=sha256:8e6a85a93d0642bd774460a86513c5d9d80b5c002ca9693e63f6e540f1815ed0 \
208+
--hash=sha256:94f99f2b943b354a5b6307d7e8d19f5c423a794462bde2bf310c770ba052b1c4 \
209+
--hash=sha256:9b336599e2cb77b1008cb2ac264b290803ec5e8e89d618a5e978ff5eb6f715d9 \
210+
--hash=sha256:a2d8a7045e1ab9b9f803f0d9531ead85f90c5f2859e653b61497228b18452008 \
211+
--hash=sha256:b8272f257cf1cbd3f2e120f14c68bff2b6bdfcc157fafdee84a1b795efd72862 \
212+
--hash=sha256:bf688f615c29bfe9dfc44312ca470989279f0e94bb9f631f85e3459af8efc009 \
213+
--hash=sha256:d9c5b9f698a83c8bd71e0f4d3f9f839ef244798e5ffe96febfa9714717db7af7 \
214+
--hash=sha256:dd7c7e2d71d908dc0f8d2027e1604102140d84b155e658c20e8ad1304317691f \
215+
--hash=sha256:df978682c1504fc93b3209de21aeabf2375cb1571d4e61907b3e7a2540e83026 \
216+
--hash=sha256:e403f7f766ded778ecdb790da786b418a9f2394f36e8cc8b796cc056ab05f44f \
217+
--hash=sha256:eb3889330f2a4a148abead555399ec9a32b13b7c8ba969b72d8e500eb7ef84cd \
218+
--hash=sha256:f4daefc971c2d1f82f03097dc6f216744a6cd2ac0f04c68fb935ea2ba2a0d420 \
219+
--hash=sha256:f51f5705ab27898afda1aaa430f34ad90dc117421057782022edf0600bec5f14 \
220+
--hash=sha256:fd0ee90072861e276b0ff08bd627abec29e32a53b2be44e41dbcdf87cbee2b00
217221
# via pyjwt
218222
deprecated==1.2.15 \
219223
--hash=sha256:353bc4a8ac4bfc96800ddab349d89c25dec1079f65fd53acdcc1e0b975b21320 \
@@ -232,8 +236,8 @@ pygithub==2.5.0 \
232236
--hash=sha256:e1613ac508a9be710920d26eb18b1905ebd9926aa49398e88151c1b526aad3cf
233237
# via -r ./requirements.txt
234238
pyjwt[crypto]==2.10.1 \
235-
--hash=sha256:543b77207db656de204372350926bed5a86201c4cbff159f623f79c7bb487a15 \
236-
--hash=sha256:7628a7eb7938959ac1b26e819a1df0fd3259505627b575e4bad6d08f76db695c
239+
--hash=sha256:3cc5772eb20009233caf06e9d8a0577824723b44e6648ee0a2aedb6cf9381953 \
240+
--hash=sha256:dcdd193e30abefd5debf142f9adfcdd2b58004e644f25406ffaebd50bd98dacb
237241
# via pygithub
238242
pynacl==1.5.0 \
239243
--hash=sha256:06b8f6fa7f5de8d5d2f7573fe8c863c051225a27b61e6860fd047b1775807858 \

.github/workflows/sycl-linux-precommit.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ on:
1212
paths-ignore:
1313
- '.github/ISSUE_TEMPLATE/**'
1414
- '.github/CODEOWNERS'
15+
- 'sycl/cts_exclude_filter/**'
1516
- 'sycl/doc/**'
1617
- 'sycl/gdb/**'
1718
- 'clang/docs/**'

.github/workflows/sycl-post-commit.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,6 @@ jobs:
5858
runner: '["Linux", "arc"]'
5959
extra_lit_opts: --param matrix-xmx8=True
6060
reset_intel_gpu: true
61-
- name: AMD/HIP
62-
runner: '["Linux", "amdgpu"]'
63-
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
64-
target_devices: hip:gpu
65-
reset_intel_gpu: false
6661
# Performance tests below. Specifics:
6762
# - only run performance tests (use LIT_FILTER env)
6863
# - ask llvm-lit to show all the output, even for PASS (-a)
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: Benchmarks
2+
3+
# This workflow is a WIP: this workflow file acts as a placeholder.
4+
5+
on: [ workflow_dispatch ]
6+
7+
jobs:
8+
do-nothing:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- run: echo 'This workflow is a WIP.'
12+

.github/workflows/sycl-weekly.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
# This workflow builds SYCL-CTS with -fsycl-use-spirv-backend-for-spirv-gen and
2-
# runs it with opencl:cpu & gen12 and level_zero:gpu & PVC on Sundays.
3-
4-
name: SYCL-CTS with SPIR-V backend
1+
name: SYCL Weekly
52

63
on:
74
workflow_dispatch:
85
schedule:
6+
# At 00:00 on Sunday.
97
- cron: '0 0 * * 0'
108

119
permissions: read-all
@@ -20,6 +18,7 @@ jobs:
2018
build_artifact_suffix: default
2119
build_configure_extra_args: ''
2220

21+
# This job builds SYCL-CTS with -fsycl-use-spirv-backend-for-spirv-gen.
2322
build-sycl-cts:
2423
needs: ubuntu2204_build
2524
if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }}
@@ -35,6 +34,7 @@ jobs:
3534
sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
3635
sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }}
3736
extra_cmake_args: -DDPCPP_FLAGS=-fsycl-use-spirv-backend-for-spirv-gen
37+
sycl_cts_artifact: sycl_cts_bin
3838

3939
run-sycl-cts:
4040
needs: [ubuntu2204_build, build-sycl-cts]

.github/workflows/sycl-windows-precommit.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
paths-ignore:
1111
- '.github/ISSUE_TEMPLATE/**'
1212
- '.github/CODEOWNERS'
13+
- 'sycl/cts_exclude_filter/**'
1314
- 'sycl/doc/**'
1415
- 'sycl/gdb/**'
1516
- 'clang/docs/**'

.github/workflows/ur-benchmarks-reusable.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
name: Benchmarks Reusable
22

33
# This workflow is a WIP: This workflow file acts as a placeholder.
4+
#
5+
# This workflow is set to be merged into benchmark.yml
46

57
on: [ workflow_call ]
68

.github/workflows/ur-benchmarks.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
name: Benchmarks
22

33
# This workflow is a WIP: this workflow file acts as a placeholder.
4+
#
5+
# This workflow is set to be merged into benchmark.yml
46

57
on: [ workflow_dispatch ]
68

clang/lib/Driver/OffloadBundler.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,10 @@ class ObjectFileHandler final : public FileHandler {
700700
if (SF->isIR() &&
701701
(Name == "llvm.used" || Name == "llvm.compiler.used" ||
702702
Name == "__AsanDeviceGlobalMetadata" ||
703-
Name == "__AsanKernelMetadata" || Name == "__MsanKernelMetadata"))
703+
Name == "__MsanDeviceGlobalMetadata" ||
704+
Name == "__TsanDeviceGlobalMetadata" ||
705+
Name == "__AsanKernelMetadata" || Name == "__MsanKernelMetadata" ||
706+
Name == "__TsanKernelMetadata"))
704707
continue;
705708

706709
// Add symbol name with the target prefix to the buffer.

clang/lib/Sema/SPIRVBuiltins.td

Lines changed: 35 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -911,52 +911,68 @@ foreach name = ["MemoryBarrier"] in {
911911
// 3.32.21. Group and Subgroup Instructions
912912

913913
foreach name = ["GroupAsyncCopy"] in {
914-
// TODO: Allow enum flags instead of UInt ?
915-
// TODO: We should enforce that the UInt must be a literal.
916-
def : SPVBuiltin<name, [Event, UInt, PointerType<AGenTypeN, LocalAS>, PointerType<ConstType<AGenTypeN>, GlobalAS>, Size, Size, Event], Attr.Convergent>;
917-
def : SPVBuiltin<name, [Event, UInt, PointerType<AGenTypeN, GlobalAS>, PointerType<ConstType<AGenTypeN>, LocalAS>, Size, Size, Event], Attr.Convergent>;
914+
// TODO: Allow enum flags instead of Int ?
915+
// TODO: We should enforce that the Int must be a literal.
916+
def : SPVBuiltin<name,
917+
[Event, Int, PointerType<AGenTypeN, LocalAS>,
918+
PointerType<ConstType<AGenTypeN>, GlobalAS>, Size, Size,
919+
Event],
920+
Attr.Convergent>;
921+
def : SPVBuiltin<name,
922+
[Event, Int, PointerType<AGenTypeN, GlobalAS>,
923+
PointerType<ConstType<AGenTypeN>, LocalAS>, Size, Size,
924+
Event],
925+
Attr.Convergent>;
918926
}
919927

920928
foreach name = ["GroupWaitEvents"] in {
921-
def : SPVBuiltin<name, [Void, UInt, Int, PointerType<Event, DefaultAS>], Attr.Convergent>;
922-
def : SPVBuiltin<name, [Void, UInt, Int, PointerType<Event, PrivateAS>], Attr.Convergent>;
923-
def : SPVBuiltin<name, [Void, UInt, Int, PointerType<Event, GenericAS>], Attr.Convergent>;
929+
def : SPVBuiltin<name, [Void, Int, Int, PointerType<Event, DefaultAS>],
930+
Attr.Convergent>;
931+
def : SPVBuiltin<name, [Void, Int, Int, PointerType<Event, PrivateAS>],
932+
Attr.Convergent>;
933+
def : SPVBuiltin<name, [Void, Int, Int, PointerType<Event, GenericAS>],
934+
Attr.Convergent>;
924935
}
925936

926937
foreach name = ["GroupAll", "GroupAny"] in {
927-
def : SPVBuiltin<name, [Bool, UInt, Bool], Attr.Convergent>;
938+
def : SPVBuiltin<name, [Bool, Int, Bool], Attr.Convergent>;
928939
}
929940

930941
foreach name = ["GroupBroadcast"] in {
931942
foreach IDType = TLAllInts.List in {
932-
def : SPVBuiltin<name, [AGenTypeN, UInt, AGenTypeN, IDType], Attr.Convergent>;
933-
def : SPVBuiltin<name, [AGenTypeN, UInt, AGenTypeN, VectorType<IDType, 2>], Attr.Convergent>;
934-
def : SPVBuiltin<name, [AGenTypeN, UInt, AGenTypeN, VectorType<IDType, 3>], Attr.Convergent>;
935-
def : SPVBuiltin<name, [Bool, UInt, Bool, IDType], Attr.Convergent>;
936-
def : SPVBuiltin<name, [Bool, UInt, Bool, VectorType<IDType, 2>], Attr.Convergent>;
937-
def : SPVBuiltin<name, [Bool, UInt, Bool, VectorType<IDType, 3>], Attr.Convergent>;
943+
def : SPVBuiltin<name, [AGenTypeN, Int, AGenTypeN, IDType],
944+
Attr.Convergent>;
945+
def : SPVBuiltin<name, [AGenTypeN, Int, AGenTypeN, VectorType<IDType, 2>],
946+
Attr.Convergent>;
947+
def : SPVBuiltin<name, [AGenTypeN, Int, AGenTypeN, VectorType<IDType, 3>],
948+
Attr.Convergent>;
949+
def : SPVBuiltin<name, [Bool, Int, Bool, IDType], Attr.Convergent>;
950+
def : SPVBuiltin<name, [Bool, Int, Bool, VectorType<IDType, 2>],
951+
Attr.Convergent>;
952+
def : SPVBuiltin<name, [Bool, Int, Bool, VectorType<IDType, 3>],
953+
Attr.Convergent>;
938954
}
939955
}
940956

941957
foreach name = ["GroupIAdd", "GroupIMulKHR", "GroupBitwiseOrKHR",
942958
"GroupBitwiseXorKHR", "GroupBitwiseAndKHR"] in {
943-
def : SPVBuiltin<name, [AIGenTypeN, UInt, UInt, AIGenTypeN], Attr.Convergent>;
959+
def : SPVBuiltin<name, [AIGenTypeN, Int, Int, AIGenTypeN], Attr.Convergent>;
944960
}
945961

946962
foreach name = ["GroupFAdd", "GroupFMin", "GroupFMax",
947963
"GroupFMulKHR"] in {
948-
def : SPVBuiltin<name, [FGenTypeN, UInt, UInt, FGenTypeN], Attr.Convergent>;
964+
def : SPVBuiltin<name, [FGenTypeN, Int, Int, FGenTypeN], Attr.Convergent>;
949965
}
950966

951967
foreach name = ["GroupUMin", "GroupUMax"] in {
952-
def : SPVBuiltin<name, [AUIGenTypeN, UInt, UInt, AUIGenTypeN], Attr.Convergent>;
968+
def : SPVBuiltin<name, [AUIGenTypeN, Int, Int, AUIGenTypeN], Attr.Convergent>;
953969
}
954970

955971
foreach name = ["GroupSMin", "GroupSMax"] in {
956-
def : SPVBuiltin<name, [ASIGenTypeN, UInt, UInt, ASIGenTypeN], Attr.Convergent>;
972+
def : SPVBuiltin<name, [ASIGenTypeN, Int, Int, ASIGenTypeN], Attr.Convergent>;
957973
}
958974

959975
// TODO: These builtins need to support vectors of bool.
960976
foreach name = ["GroupLogicalAndKHR", "GroupLogicalOrKHR"] in {
961-
def : SPVBuiltin<name, [Bool, UInt, UInt, Bool], Attr.Convergent>;
977+
def : SPVBuiltin<name, [Bool, Int, Int, Bool], Attr.Convergent>;
962978
}

0 commit comments

Comments
 (0)