Skip to content

fix work_group_scrach_memory #16325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sommerlukas merged 2 commits into from
Dec 11, 2024
Merged

fix work_group_scrach_memory #16325

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
237ab90
fix work_group_scrach_memory
Dec 10, 2024
c85651c
update llvm test after small optimisation
Dec 11, 2024
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
1 change: 1 addition & 0 deletions llvm/lib/SYCLLowerIR/LowerWGLocalMemory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ static bool dynamicWGLocalMemory(Module &M) {
GlobalVariable::NotThreadLocal, // ThreadLocalMode
LocalAS // AddressSpace
);
LocalMemArrayGV->setUnnamedAddr(GlobalVariable::UnnamedAddr::Local);
constexpr int DefaultMaxAlignment = 128;
if (!TT.isSPIROrSPIRV())
LocalMemArrayGV->setAlignment(Align{DefaultMaxAlignment});
Expand Down
6 changes: 3 additions & 3 deletions sycl/test-e2e/WorkGroupScratchMemory/dynamic_alloc_local_accessor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// RUN: %{run} %t.out
//

// UNSUPPORTED: gpu-intel-gen12, cpu
// UNSUPPORTED: gpu-intel-gen12
// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/16072

// Test work_group_dynamic extension with allocation size specified at runtime
Expand Down Expand Up @@ -35,8 +35,8 @@ int main() {
sycl_ext::properties properties{static_size};
auto LocalAccessor =
sycl::local_accessor<int>(WgSize * RepeatWG * sizeof(int), Cgh);
Cgh.parallel_for(nd_range<1>(range<1>(Size), range<1>(WgSize)), properties,
[=](nd_item<1> Item) {
Cgh.parallel_for(nd_range<1>(range<1>(WgSize * WgCount), range<1>(WgSize)),
properties, [=](nd_item<1> Item) {
int *Ptr = reinterpret_cast<int *>(
sycl_ext::get_work_group_scratch_memory());
size_t GroupOffset =
Expand Down
6 changes: 3 additions & 3 deletions sycl/test-e2e/WorkGroupScratchMemory/dynamic_alloc_ptr_alias.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// RUN: %{run} %t.out
//

// UNSUPPORTED: gpu-intel-gen12, cpu
// UNSUPPORTED: gpu-intel-gen12
// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/16072

// Test work_group_dynamic extension with allocation size specified at runtime
Expand Down Expand Up @@ -33,8 +33,8 @@ int main() {
sycl_ext::work_group_scratch_size static_size(WgSize * RepeatWG *
sizeof(int));
sycl_ext::properties properties{static_size};
Cgh.parallel_for(nd_range<1>(range<1>(Size), range<1>(WgSize)), properties,
[=](nd_item<1> Item) {
Cgh.parallel_for(nd_range<1>(range<1>(WgSize * WgCount), range<1>(WgSize)),
properties, [=](nd_item<1> Item) {
int *Ptr = reinterpret_cast<int *>(
sycl_ext::get_work_group_scratch_memory());
size_t GroupOffset =
Expand Down
6 changes: 3 additions & 3 deletions sycl/test-e2e/WorkGroupScratchMemory/dynamic_allocation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// RUN: %{run} %t.out
//

// UNSUPPORTED: gpu-intel-gen12, cpu
// UNSUPPORTED: gpu-intel-gen12
// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/16072

// Test work_group_dynamic extension with allocation size specified at runtime.
Expand Down Expand Up @@ -32,8 +32,8 @@ int main() {
sycl_ext::work_group_scratch_size static_size(WgSize * RepeatWG *
sizeof(int));
sycl_ext::properties properties{static_size};
Cgh.parallel_for(nd_range<1>(range<1>(Size), range<1>(WgSize)), properties,
[=](nd_item<1> Item) {
Cgh.parallel_for(nd_range<1>(range<1>(WgSize * WgCount), range<1>(WgSize)),
properties, [=](nd_item<1> Item) {
int *Ptr = reinterpret_cast<int *>(
sycl_ext::get_work_group_scratch_memory());
size_t GroupOffset =
Expand Down
Loading