Move BuiltIns to ExecutionEnvironment

Change-Id: Ib2a1b82cc7858c898bb32820aad106a01d1325ad
Signed-off-by: Maciej Dziuban <maciej.dziuban@intel.com>
This commit is contained in:
Maciej Dziuban
2018-08-21 15:47:21 +02:00
parent 459a157e17
commit e0e48203d2
79 changed files with 297 additions and 327 deletions

View File

@@ -241,20 +241,16 @@ TEST(Device_GetCaps, givenForcePreemptionModeDebugVariableWhenCreateDeviceThenSe
TEST(Device_GetCaps, givenDeviceWithMidThreadPreemptionWhenDeviceIsCreatedThenSipKernelIsCreated) {
DebugManagerStateRestore dbgRestorer;
{
BuiltIns::shutDown();
std::unique_ptr<MockBuiltins> mockBuiltins(new MockBuiltins);
EXPECT_EQ(nullptr, mockBuiltins->peekCurrentInstance());
mockBuiltins->overrideGlobalBuiltins();
EXPECT_EQ(mockBuiltins.get(), mockBuiltins->peekCurrentInstance());
EXPECT_FALSE(mockBuiltins->getSipKernelCalled);
auto builtIns = new MockBuiltins();
ASSERT_FALSE(builtIns->getSipKernelCalled);
DebugManager.flags.ForcePreemptionMode.set((int32_t)PreemptionMode::MidThread);
auto device = std::unique_ptr<Device>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(platformDevices[0]));
EXPECT_TRUE(mockBuiltins->getSipKernelCalled);
mockBuiltins->restoreGlobalBuiltins();
//make sure to release builtins prior to device as they use device
mockBuiltins.reset();
auto executionEnvironment = new ExecutionEnvironment();
executionEnvironment->builtins.reset(builtIns);
auto device = std::unique_ptr<Device>(MockDevice::createWithExecutionEnvironment<MockDevice>(platformDevices[0], executionEnvironment));
ASSERT_EQ(builtIns, &device->getBuiltIns());
EXPECT_TRUE(builtIns->getSipKernelCalled);
}
}