cory-master/BabelStream
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove conditional sync after each kernel

Browse Source 
Don't capture `this`, capture each member instead
This commit is contained in:
Tom Lin 2022-07-28 23:45:43 +01:00
parent aa82e57ba0
commit ed6206b543
4 changed files with 19 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dpl_shim.h
View File

@ -34,8 +34,6 @@ T *alloc_raw(size_t size) { return sycl::malloc_shared<T>(size, exe_policy.queue
template<typename T>
void dealloc_raw(T *ptr) { sycl::free(ptr, exe_policy.queue()); }
static void sync_device(){exe_policy.queue().wait_and_throw(); }
#else
// auto exe_policy = dpl::execution::seq;
@ -74,6 +72,4 @@ T *alloc_raw(size_t size) { return (T *) aligned_alloc(ALIGNMENT, sizeof(T) * si
template<typename T>
void dealloc_raw(T *ptr) { free(ptr); }
static void sync_device(){ /*no-op*/ }
#endif

15
src/std-data/STDDataStream.cpp
View File

@ -69,32 +69,28 @@ void STDDataStream<T>::copy()
{
// c[i] = a[i]
std::copy(exe_policy, BEGIN(a), END(a), BEGIN(c));
sync_device();
}
}
template <class T>
void STDDataStream<T>::mul()
{
// b[i] = scalar * c[i];
std::transform(exe_policy, BEGIN(c), END(c), BEGIN(b), [scalar = startScalar](T ci){ return scalar*ci; });
sync_device();
}
}
template <class T>
void STDDataStream<T>::add()
{
// c[i] = a[i] + b[i];
std::transform(exe_policy, BEGIN(a), END(a), BEGIN(b), BEGIN(c), std::plus<T>());
sync_device();
}
}
template <class T>
void STDDataStream<T>::triad()
{
// a[i] = b[i] + scalar * c[i];
std::transform(exe_policy, BEGIN(b), END(b), BEGIN(c), BEGIN(a), [scalar = startScalar](T bi, T ci){ return bi+scalar*ci; });
sync_device();
}
}
template <class T>
void STDDataStream<T>::nstream()
@ -105,8 +101,7 @@ void STDDataStream<T>::nstream()
// 2: a[i] += scalar * c[i];
std::transform(exe_policy, BEGIN(a), END(a), BEGIN(b), BEGIN(a), [](T ai, T bi){ return ai + bi; });
std::transform(exe_policy, BEGIN(a), END(a), BEGIN(c), BEGIN(a), [scalar = startScalar](T ai, T ci){ return ai + scalar*ci; });
sync_device();
}
}
template <class T>

23
src/std-indices/STDIndicesStream.cpp
View File

@ -77,38 +77,34 @@ void STDIndicesStream<T>::copy()
{
// c[i] = a[i]
std::copy(exe_policy, BEGIN(a), END(a), BEGIN(c));
sync_device();
}
}
template <class T>
void STDIndicesStream<T>::mul()
{
// b[i] = scalar * c[i];
std::transform(exe_policy, range.begin(), range.end(), BEGIN(b), [this, scalar = startScalar](int i) {
std::transform(exe_policy, range.begin(), range.end(), BEGIN(b), [c = this->c, scalar = startScalar](int i) {
return scalar * c[i];
});
sync_device();
}
}
template <class T>
void STDIndicesStream<T>::add()
{
// c[i] = a[i] + b[i];
std::transform(exe_policy, range.begin(), range.end(), BEGIN(c), [this](int i) {
std::transform(exe_policy, range.begin(), range.end(), BEGIN(c), [a = this->a, b = this->b](int i) {
return a[i] + b[i];
});
sync_device();
}
}
template <class T>
void STDIndicesStream<T>::triad()
{
// a[i] = b[i] + scalar * c[i];
std::transform(exe_policy, range.begin(), range.end(), BEGIN(a), [this, scalar = startScalar](int i) {
std::transform(exe_policy, range.begin(), range.end(), BEGIN(a), [b = this->b, c = this->c, scalar = startScalar](int i) {
return b[i] + scalar * c[i];
});
sync_device();
}
}
template <class T>
void STDIndicesStream<T>::nstream()
@ -117,11 +113,10 @@ void STDIndicesStream<T>::nstream()
// Need to do in two stages with C++11 STL.
// 1: a[i] += b[i]
// 2: a[i] += scalar * c[i];
std::transform(exe_policy, range.begin(), range.end(), BEGIN(a), [this, scalar = startScalar](int i) {
std::transform(exe_policy, range.begin(), range.end(), BEGIN(a), [a = this->a, b = this->b, c = this->c, scalar = startScalar](int i) {
return a[i] + b[i] + scalar * c[i];
});
sync_device();
}
}
template <class T>

15
src/std-ranges/STDRangesStream.cpp
View File

@ -89,8 +89,7 @@ void STDRangesStream<T>::copy()
c[i] = a[i];
}
);
sync_device();
}
}
template <class T>
void STDRangesStream<T>::mul()
@ -104,8 +103,7 @@ void STDRangesStream<T>::mul()
b[i] = scalar * c[i];
}
);
sync_device();
}
}
template <class T>
void STDRangesStream<T>::add()
@ -117,8 +115,7 @@ void STDRangesStream<T>::add()
c[i] = a[i] + b[i];
}
);
sync_device();
}
}
template <class T>
void STDRangesStream<T>::triad()
@ -132,8 +129,7 @@ void STDRangesStream<T>::triad()
a[i] = b[i] + scalar * c[i];
}
);
sync_device();
}
}
template <class T>
void STDRangesStream<T>::nstream()
@ -147,8 +143,7 @@ void STDRangesStream<T>::nstream()
a[i] += b[i] + scalar * c[i];
}
);
sync_device();
}
}
template <class T>
T STDRangesStream<T>::dot()