intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-03 23:03:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove not used waitUntilGet parameter from takeOwnership method

Browse Source 
Change-Id: Ic76264a87bbe9179f4aeb2ec3f97cdddd8465654
Signed-off-by: Dunajski, Bartosz <bartosz.dunajski@intel.com>
This commit is contained in:
Dunajski, Bartosz
2019-07-02 09:50:49 +02:00
committed by sys_ocldev
parent d6b438da20
commit 27a0c5a566
6 changed files with 45 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
unit_tests/helpers/base_object_tests_mt.cpp
View File

@@ -13,54 +13,39 @@
namespace NEO {
template <typename TypeParam>
struct BaseObjectTestsMt : public ::testing::Test {
static void takeOwnerFailThreadFunc(TypeParam *obj) {
auto ret = obj->takeOwnership(false);
EXPECT_EQ(false, ret);
}
static void takeOwnerWaitThreadFunc(TypeParam *obj) {
auto ret = obj->takeOwnership(true);
EXPECT_EQ(true, ret);
obj->releaseOwnership();
}
};
TEST(BaseObjectTestsMt, givenObjectOwnershipForEachThreadWhenIncrementingNonAtomicValueThenNoDataRacesAreExpected) {
CommandQueue *object = new CommandQueue;
object->takeOwnership();
uint32_t counter = 0;
const uint32_t loopCount = 50;
const uint32_t numThreads = 3;
typedef ::testing::Types<
Platform,
IntelAccelerator,
CommandQueue>
BaseObjectTypes;
TYPED_TEST_CASE(BaseObjectTestsMt, BaseObjectTypes);
// "typedef" BaseObjectTestsMt template to use with different TypeParams for testing
template <typename T>
using BaseObjectWithDefaultCtorTests = BaseObjectTestsMt<T>;
TYPED_TEST(BaseObjectTestsMt, takeOwner) {
TypeParam *object = new TypeParam;
bool ret = object->takeOwnership(false);
EXPECT_EQ(true, ret);
std::thread t1(BaseObjectTestsMt<TypeParam>::takeOwnerFailThreadFunc, object);
t1.join();
auto incrementNonAtomicValue = [&](CommandQueue *obj) {
for (uint32_t i = 0; i < loopCount; i++) {
obj->takeOwnership();
counter++;
obj->releaseOwnership();
}
};
EXPECT_EQ(0U, object->getCond().peekNumWaiters());
std::thread t2(BaseObjectTestsMt<TypeParam>::takeOwnerWaitThreadFunc, object);
//wait on condition var counter, so current threads know t2 thread waits on this variable
while (object->getCond().peekNumWaiters() == 0U) {
std::thread t1(incrementNonAtomicValue, object);
std::thread t2(incrementNonAtomicValue, object);
std::thread t3(incrementNonAtomicValue, object);
while (object->getCond().peekNumWaiters() != numThreads) {
std::this_thread::yield();
}
//t2 thread waits on conditional varialbe within takeOwnership
EXPECT_EQ(1U, object->getCond().peekNumWaiters());
std::this_thread::yield();
//current thread releases ownership, so t2 can take it
EXPECT_EQ(0u, counter);
object->releaseOwnership();
t1.join();
t2.join();
t3.join();
EXPECT_EQ(loopCount * numThreads, counter);
object->release();
}