Skip to content

fix(non_uniform_work_group): respect per-dimension work item size lim… #2666

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

Open
Lurie97 wants to merge 1 commit into
base: main
Choose a base branch
from
+72 −18
Open

fix(non_uniform_work_group): respect per-dimension work item size lim… #2666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 24 additions & 6 deletions test_conformance/non_uniform_work_group/test_advanced_2d.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,14 @@ REGISTER_TEST(non_uniform_2d_basic)

// non_uniform_2d_three_prime_numbers_basic
{
size_t maxWorkItemSizes[3];
clGetDeviceInfo(device, CL_DEVICE_MAX_WORK_ITEM_SIZES,
sizeof(maxWorkItemSizes), maxWorkItemSizes, NULL);

size_t effectiveMax = std::min(maxWgSize, maxWorkItemSizes[0]);

size_t primeNumber =
PrimeNumbers::getPrimeNumberInRange(maxWgSize / 2, maxWgSize);
PrimeNumbers::getPrimeNumberInRange(effectiveMax / 2, effectiveMax);
if (primeNumber < 1)
{
log_error("Cannot find proper prime number.");
Expand All @@ -149,7 +155,7 @@ REGISTER_TEST(non_uniform_2d_basic)
size_t primeNumber2 = 42967;
size_t primeNumber3 = 13;
size_t globalSize[] = { primeNumber2, primeNumber3 };
size_t localSize[] = { primeNumber, 1 };
size_t localSize[] = { (size_t)primeNumber, 1 };

exec.runTestNonUniformWorkGroup(sizeof(globalSize)
/ sizeof(globalSize[0]),
Expand Down Expand Up @@ -281,8 +287,14 @@ REGISTER_TEST(non_uniform_2d_atomics)

// non_uniform_2d_three_prime_numbers_atomics
{
size_t maxWorkItemSizes[3];
clGetDeviceInfo(device, CL_DEVICE_MAX_WORK_ITEM_SIZES,
sizeof(maxWorkItemSizes), maxWorkItemSizes, NULL);

size_t effectiveMax = std::min(maxWgSize, maxWorkItemSizes[0]);

size_t primeNumber =
PrimeNumbers::getPrimeNumberInRange(maxWgSize / 2, maxWgSize);
PrimeNumbers::getPrimeNumberInRange(effectiveMax / 2, effectiveMax);
if (primeNumber < 1)
{
log_error("Cannot find proper prime number.");
Expand All @@ -291,7 +303,7 @@ REGISTER_TEST(non_uniform_2d_atomics)
size_t primeNumber2 = 42967;
size_t primeNumber3 = 13;
size_t globalSize[] = { primeNumber2, primeNumber3 };
size_t localSize[] = { primeNumber, 1 };
size_t localSize[] = { (size_t)primeNumber, 1 };

exec.runTestNonUniformWorkGroup(sizeof(globalSize)
/ sizeof(globalSize[0]),
Expand Down Expand Up @@ -421,8 +433,14 @@ REGISTER_TEST(non_uniform_2d_barriers)

// non_uniform_2d_three_prime_numbers_barriers
{
size_t maxWorkItemSizes[3];
clGetDeviceInfo(device, CL_DEVICE_MAX_WORK_ITEM_SIZES,
sizeof(maxWorkItemSizes), maxWorkItemSizes, NULL);

size_t effectiveMax = std::min(maxWgSize, maxWorkItemSizes[0]);

size_t primeNumber =
PrimeNumbers::getPrimeNumberInRange(maxWgSize / 2, maxWgSize);
PrimeNumbers::getPrimeNumberInRange(effectiveMax / 2, effectiveMax);
if (primeNumber < 1)
{
log_error("Cannot find proper prime number.");
Expand All @@ -431,7 +449,7 @@ REGISTER_TEST(non_uniform_2d_barriers)
size_t primeNumber2 = 42967;
size_t primeNumber3 = 13;
size_t globalSize[] = { primeNumber2, primeNumber3 };
size_t localSize[] = { primeNumber, 1 };
size_t localSize[] = { (size_t)primeNumber, 1 };

exec.runTestNonUniformWorkGroup(sizeof(globalSize)
/ sizeof(globalSize[0]),
Expand Down
30 changes: 24 additions & 6 deletions test_conformance/non_uniform_work_group/test_advanced_3d.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,14 @@ REGISTER_TEST(non_uniform_3d_basic)

// non_uniform_3d_three_prime_numbers_basic
{
size_t maxWorkItemSizes[3];
clGetDeviceInfo(device, CL_DEVICE_MAX_WORK_ITEM_SIZES,
sizeof(maxWorkItemSizes), maxWorkItemSizes, NULL);

size_t effectiveMax = std::min(maxWgSize, maxWorkItemSizes[0]);

size_t primeNumber =
PrimeNumbers::getPrimeNumberInRange(maxWgSize / 2, maxWgSize);
PrimeNumbers::getPrimeNumberInRange(effectiveMax / 2, effectiveMax);
if (primeNumber < 1)
{
log_error("Cannot find proper prime number.");
Expand All @@ -122,7 +128,7 @@ REGISTER_TEST(non_uniform_3d_basic)
size_t primeNumber2 = 10711;
size_t primeNumber3 = 13;
size_t globalSize[] = { primeNumber2, primeNumber3, primeNumber3 };
size_t localSize[] = { primeNumber, 1, 1 };
size_t localSize[] = { (size_t)primeNumber, 1, 1 };

exec.runTestNonUniformWorkGroup(sizeof(globalSize)
/ sizeof(globalSize[0]),
Expand Down Expand Up @@ -266,8 +272,14 @@ REGISTER_TEST(non_uniform_3d_atomics)

// non_uniform_3d_three_prime_numbers_atomics
{
size_t maxWorkItemSizes[3];
clGetDeviceInfo(device, CL_DEVICE_MAX_WORK_ITEM_SIZES,
sizeof(maxWorkItemSizes), maxWorkItemSizes, NULL);

size_t effectiveMax = std::min(maxWgSize, maxWorkItemSizes[0]);

size_t primeNumber =
PrimeNumbers::getPrimeNumberInRange(maxWgSize / 2, maxWgSize);
PrimeNumbers::getPrimeNumberInRange(effectiveMax / 2, effectiveMax);
if (primeNumber < 1)
{
log_error("Cannot find proper prime number.");
Expand All @@ -276,7 +288,7 @@ REGISTER_TEST(non_uniform_3d_atomics)
size_t primeNumber2 = 10711;
size_t primeNumber3 = 13;
size_t globalSize[] = { primeNumber2, primeNumber3, primeNumber3 };
size_t localSize[] = { primeNumber, 1, 1 };
size_t localSize[] = { (size_t)primeNumber, 1, 1 };

exec.runTestNonUniformWorkGroup(sizeof(globalSize)
/ sizeof(globalSize[0]),
Expand Down Expand Up @@ -420,8 +432,14 @@ REGISTER_TEST(non_uniform_3d_barriers)

// non_uniform_3d_three_prime_numbers_barriers
{
size_t maxWorkItemSizes[3];
clGetDeviceInfo(device, CL_DEVICE_MAX_WORK_ITEM_SIZES,
sizeof(maxWorkItemSizes), maxWorkItemSizes, NULL);

size_t effectiveMax = std::min(maxWgSize, maxWorkItemSizes[0]);

size_t primeNumber =
PrimeNumbers::getPrimeNumberInRange(maxWgSize / 2, maxWgSize);
PrimeNumbers::getPrimeNumberInRange(effectiveMax / 2, effectiveMax);
if (primeNumber < 1)
{
log_error("Cannot find proper prime number.");
Expand All @@ -430,7 +448,7 @@ REGISTER_TEST(non_uniform_3d_barriers)
size_t primeNumber2 = 10711;
size_t primeNumber3 = 13;
size_t globalSize[] = { primeNumber2, primeNumber3, primeNumber3 };
size_t localSize[] = { primeNumber, 1, 1 };
size_t localSize[] = { (size_t)primeNumber, 1, 1 };

exec.runTestNonUniformWorkGroup(sizeof(globalSize)
/ sizeof(globalSize[0]),
Expand Down
30 changes: 24 additions & 6 deletions test_conformance/non_uniform_work_group/test_advanced_other.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,14 @@ REGISTER_TEST(non_uniform_other_basic)

// non_uniform_2d_three_prime_numbers_offset_basic
{
size_t maxWorkItemSizes[3];
clGetDeviceInfo(device, CL_DEVICE_MAX_WORK_ITEM_SIZES,
sizeof(maxWorkItemSizes), maxWorkItemSizes, NULL);

size_t effectiveMax = std::min(maxWgSize, maxWorkItemSizes[0]);

size_t primeNumber =
PrimeNumbers::getPrimeNumberInRange(maxWgSize / 2, maxWgSize);
PrimeNumbers::getPrimeNumberInRange(effectiveMax / 2, effectiveMax);
if (primeNumber < 1)
{
log_error("Cannot find proper prime number.");
Expand All @@ -58,7 +64,7 @@ REGISTER_TEST(non_uniform_other_basic)
size_t primeNumber2 = 42967;
size_t primeNumber3 = 13;
size_t globalSize[] = { primeNumber2, primeNumber3 };
size_t localSize[] = { primeNumber, 1 };
size_t localSize[] = { (size_t)primeNumber, 1 };
size_t offset[] = { 23, 17 };

exec.runTestNonUniformWorkGroup(
Expand Down Expand Up @@ -149,8 +155,14 @@ REGISTER_TEST(non_uniform_other_atomics)

// non_uniform_2d_three_prime_numbers_offset_atomics
{
size_t maxWorkItemSizes[3];
clGetDeviceInfo(device, CL_DEVICE_MAX_WORK_ITEM_SIZES,
sizeof(maxWorkItemSizes), maxWorkItemSizes, NULL);

size_t effectiveMax = std::min(maxWgSize, maxWorkItemSizes[0]);

size_t primeNumber =
PrimeNumbers::getPrimeNumberInRange(maxWgSize / 2, maxWgSize);
PrimeNumbers::getPrimeNumberInRange(effectiveMax / 2, effectiveMax);
if (primeNumber < 1)
{
log_error("Cannot find proper prime number.");
Expand All @@ -159,7 +171,7 @@ REGISTER_TEST(non_uniform_other_atomics)
size_t primeNumber2 = 42967;
size_t primeNumber3 = 13;
size_t globalSize[] = { primeNumber2, primeNumber3 };
size_t localSize[] = { primeNumber, 1 };
size_t localSize[] = { (size_t)primeNumber, 1 };
size_t offset[] = { 23, 17 };

exec.runTestNonUniformWorkGroup(
Expand Down Expand Up @@ -249,8 +261,14 @@ REGISTER_TEST(non_uniform_other_barriers)

// non_uniform_2d_three_prime_numbers_offset_barriers
{
size_t maxWorkItemSizes[3];
clGetDeviceInfo(device, CL_DEVICE_MAX_WORK_ITEM_SIZES,
sizeof(maxWorkItemSizes), maxWorkItemSizes, NULL);

size_t effectiveMax = std::min(maxWgSize, maxWorkItemSizes[0]);

size_t primeNumber =
PrimeNumbers::getPrimeNumberInRange(maxWgSize / 2, maxWgSize);
PrimeNumbers::getPrimeNumberInRange(effectiveMax / 2, effectiveMax);
if (primeNumber < 1)
{
log_error("Cannot find proper prime number.");
Expand All @@ -259,7 +277,7 @@ REGISTER_TEST(non_uniform_other_barriers)
size_t primeNumber2 = 42967;
size_t primeNumber3 = 13;
size_t globalSize[] = { primeNumber2, primeNumber3 };
size_t localSize[] = { primeNumber, 1 };
size_t localSize[] = { (size_t)primeNumber, 1 };
size_t offset[] = { 23, 17 };

exec.runTestNonUniformWorkGroup(
Expand Down
Loading