From 258eec38de15dc0db9ea319b5ea550d1eaede9d9 Mon Sep 17 00:00:00 2001 From: Soumi Manna Date: Mon, 5 Apr 2021 11:16:18 -0700 Subject: [PATCH 1/3] [SYCL] Update tests with -fno-sycl-id-queries-fit-in-int option The changes are due to the PR: https://github.com/intel/llvm/pull/3427 Signed-off-by: Soumi Manna --- SYCL/SubGroup/sub_group_as.cpp | 2 +- SYCL/SubGroup/sub_group_as_vec.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SYCL/SubGroup/sub_group_as.cpp b/SYCL/SubGroup/sub_group_as.cpp index 0fce33ba48..6f8824f801 100644 --- a/SYCL/SubGroup/sub_group_as.cpp +++ b/SYCL/SubGroup/sub_group_as.cpp @@ -1,4 +1,4 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out +// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fno-sycl-id-queries-fit-in-int %s -o %t.out // Sub-groups are not suported on Host // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/SubGroup/sub_group_as_vec.cpp b/SYCL/SubGroup/sub_group_as_vec.cpp index b37af3363f..795e4d5a05 100644 --- a/SYCL/SubGroup/sub_group_as_vec.cpp +++ b/SYCL/SubGroup/sub_group_as_vec.cpp @@ -1,4 +1,4 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out +// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fno-sycl-id-queries-fit-in-int %s -o %t.out // Sub-groups are not suported on Host // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out From 0ec874c97040939bb998fc5cdf8b199669b809b4 Mon Sep 17 00:00:00 2001 From: Soumi Manna Date: Mon, 5 Apr 2021 11:35:59 -0700 Subject: [PATCH 2/3] Revert "[SYCL] Update tests with -fno-sycl-id-queries-fit-in-int option" This reverts commit 258eec38de15dc0db9ea319b5ea550d1eaede9d9. --- SYCL/SubGroup/sub_group_as.cpp | 2 +- SYCL/SubGroup/sub_group_as_vec.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SYCL/SubGroup/sub_group_as.cpp b/SYCL/SubGroup/sub_group_as.cpp index 6f8824f801..0fce33ba48 100644 --- a/SYCL/SubGroup/sub_group_as.cpp +++ b/SYCL/SubGroup/sub_group_as.cpp @@ -1,4 +1,4 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fno-sycl-id-queries-fit-in-int %s -o %t.out +// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // Sub-groups are not suported on Host // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/SubGroup/sub_group_as_vec.cpp b/SYCL/SubGroup/sub_group_as_vec.cpp index 795e4d5a05..b37af3363f 100644 --- a/SYCL/SubGroup/sub_group_as_vec.cpp +++ b/SYCL/SubGroup/sub_group_as_vec.cpp @@ -1,4 +1,4 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fno-sycl-id-queries-fit-in-int %s -o %t.out +// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // Sub-groups are not suported on Host // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out From 215006b8555958dbf0475e2da0636e60629370aa Mon Sep 17 00:00:00 2001 From: Soumi Manna Date: Tue, 31 Aug 2021 11:49:38 -0700 Subject: [PATCH 3/3] [SYCL] Update test with new attribute spelling Signed-off-by: Soumi Manna --- SYCL/Basic/reqd_work_group_size.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SYCL/Basic/reqd_work_group_size.cpp b/SYCL/Basic/reqd_work_group_size.cpp index 7b3acb10c1..64f21f789d 100644 --- a/SYCL/Basic/reqd_work_group_size.cpp +++ b/SYCL/Basic/reqd_work_group_size.cpp @@ -28,7 +28,7 @@ int main() { Q.submit([&](handler &CGH) { CGH.parallel_for( nd_range<3>(range<3>(8, 8, 8), range<3>(4, 4, 4)), [= - ](nd_item<3>) [[intel::reqd_work_group_size(4, 4, 4)]]{}); + ](nd_item<3>) [[sycl::reqd_work_group_size(4, 4, 4)]]{}); }); Q.wait_and_throw(); } catch (nd_range_error &E) { @@ -56,7 +56,7 @@ int main() { Q.submit([&](handler &CGH) { CGH.parallel_for( range<3>(16, 16, 16), [= - ](item<3>) [[intel::reqd_work_group_size(4, 4, 4)]]{}); + ](item<3>) [[sycl::reqd_work_group_size(4, 4, 4)]]{}); }); Q.wait_and_throw(); } catch (nd_range_error &E) { @@ -85,7 +85,7 @@ int main() { Q.submit([&](handler &CGH) { CGH.parallel_for( nd_range<3>(range<3>(16, 16, 16), range<3>(8, 8, 8)), [= - ](nd_item<3>) [[intel::reqd_work_group_size(4, 4, 4)]]{ + ](nd_item<3>) [[sycl::reqd_work_group_size(4, 4, 4)]]{ }); });