[SYCL] Use nd_range instead of range to specify work-group size

This commit is contained in:
James Price 2016-05-06 22:41:10 +01:00
parent fb8f06e683
commit 54834e05f4

View File

@ -11,6 +11,8 @@
using namespace cl::sycl; using namespace cl::sycl;
#define WGSIZE 64
template <class T> template <class T>
SYCLStream<T>::SYCLStream(const unsigned int ARRAY_SIZE, const int device_index) SYCLStream<T>::SYCLStream(const unsigned int ARRAY_SIZE, const int device_index)
{ {
@ -37,9 +39,9 @@ void SYCLStream<T>::copy()
{ {
auto ka = d_a->template get_access<access::mode::read>(cgh); auto ka = d_a->template get_access<access::mode::read>(cgh);
auto kc = d_c->template get_access<access::mode::write>(cgh); auto kc = d_c->template get_access<access::mode::write>(cgh);
cgh.parallel_for<class copy>(range<1>{array_size}, [=](id<1> index) cgh.parallel_for<class copy>(nd_range<1>{array_size, WGSIZE}, [=](nd_item<1> item)
{ {
kc[index] = ka[index]; kc[item.get_global()] = ka[item.get_global()];
}); });
}); });
queue.wait(); queue.wait();
@ -53,9 +55,9 @@ void SYCLStream<T>::mul()
{ {
auto kb = d_b->template get_access<access::mode::write>(cgh); auto kb = d_b->template get_access<access::mode::write>(cgh);
auto kc = d_c->template get_access<access::mode::read>(cgh); auto kc = d_c->template get_access<access::mode::read>(cgh);
cgh.parallel_for<class mul>(range<1>{array_size}, [=](id<1> index) cgh.parallel_for<class mul>(nd_range<1>{array_size, WGSIZE}, [=](nd_item<1> item)
{ {
kb[index] = scalar * kc[index]; kb[item.get_global()] = scalar * kc[item.get_global()];
}); });
}); });
queue.wait(); queue.wait();
@ -69,9 +71,9 @@ void SYCLStream<T>::add()
auto ka = d_a->template get_access<access::mode::read>(cgh); auto ka = d_a->template get_access<access::mode::read>(cgh);
auto kb = d_b->template get_access<access::mode::read>(cgh); auto kb = d_b->template get_access<access::mode::read>(cgh);
auto kc = d_c->template get_access<access::mode::write>(cgh); auto kc = d_c->template get_access<access::mode::write>(cgh);
cgh.parallel_for<class add>(range<1>{array_size}, [=](id<1> index) cgh.parallel_for<class add>(nd_range<1>{array_size, WGSIZE}, [=](nd_item<1> item)
{ {
kc[index] = ka[index] + kb[index]; kc[item.get_global()] = ka[item.get_global()] + kb[item.get_global()];
}); });
}); });
queue.wait(); queue.wait();
@ -86,8 +88,9 @@ void SYCLStream<T>::triad()
auto ka = d_a->template get_access<access::mode::write>(cgh); auto ka = d_a->template get_access<access::mode::write>(cgh);
auto kb = d_b->template get_access<access::mode::read>(cgh); auto kb = d_b->template get_access<access::mode::read>(cgh);
auto kc = d_c->template get_access<access::mode::read>(cgh); auto kc = d_c->template get_access<access::mode::read>(cgh);
cgh.parallel_for<class triad>(range<1>{array_size}, [=](id<1> index){ cgh.parallel_for<class triad>(nd_range<1>{array_size, WGSIZE}, [=](nd_item<1> item)
ka[index] = kb[index] + scalar * kc[index]; {
ka[item.get_global()] = kb[item.get_global()] + scalar * kc[item.get_global()];
}); });
}); });
queue.wait(); queue.wait();