diff --git a/runtime/command_stream/aub_command_stream_receiver_hw.inl b/runtime/command_stream/aub_command_stream_receiver_hw.inl index a15f4f5c7d..3a35218311 100644 --- a/runtime/command_stream/aub_command_stream_receiver_hw.inl +++ b/runtime/command_stream/aub_command_stream_receiver_hw.inl @@ -44,9 +44,6 @@ AUBCommandStreamReceiverHw::AUBCommandStreamReceiverHw(const Hardware UNRECOVERABLE_IF(nullptr == aubCenter); aubManager = aubCenter->getAubManager(); - if (aubManager) { - hardwareContext = std::unique_ptr(aubManager->createHardwareContext(0, defaultEngineType)); - } if (!aubCenter->getPhysicalAddressAllocator()) { aubCenter->initPhysicalAddressAllocator(this->createPhysicalAddressAllocator(&hwInfoIn)); diff --git a/runtime/command_stream/command_stream_receiver.h b/runtime/command_stream/command_stream_receiver.h index a4f045caf6..60dffb469a 100644 --- a/runtime/command_stream/command_stream_receiver.h +++ b/runtime/command_stream/command_stream_receiver.h @@ -161,7 +161,7 @@ class CommandStreamReceiver { InternalAllocationStorage *getInternalAllocationStorage() const { return internalAllocationStorage.get(); } bool createAllocationForHostSurface(HostPtrSurface &surface, Device &device, bool requiresL3Flush); virtual size_t getPreferredTagPoolSize() const { return 512; } - virtual void setOsContext(OsContext &osContext) { this->osContext = &osContext; } + virtual void setupContext(OsContext &osContext) { this->osContext = &osContext; } OsContext &getOsContext() const { return *osContext; } TagAllocator *getEventTsAllocator(); diff --git a/runtime/command_stream/command_stream_receiver_simulated_common_hw.h b/runtime/command_stream/command_stream_receiver_simulated_common_hw.h index 4e2f3ab727..77cd0daebf 100644 --- a/runtime/command_stream/command_stream_receiver_simulated_common_hw.h +++ b/runtime/command_stream/command_stream_receiver_simulated_common_hw.h @@ -25,6 +25,7 @@ class CommandStreamReceiverSimulatedCommonHw : public CommandStreamReceiverHw::CommandStreamReceiverHw; using CommandStreamReceiverHw::osContext; + using CommandStreamReceiverHw::hwInfo; using AUB = typename AUBFamilyMapper::AUB; using MiContextDescriptorReg = typename AUB::MiContextDescriptorReg; @@ -41,6 +42,7 @@ class CommandStreamReceiverSimulatedCommonHw : public CommandStreamReceiverHw hardwareContext; diff --git a/runtime/command_stream/command_stream_receiver_simulated_common_hw.inl b/runtime/command_stream/command_stream_receiver_simulated_common_hw.inl index 694138c630..44e8c16293 100644 --- a/runtime/command_stream/command_stream_receiver_simulated_common_hw.inl +++ b/runtime/command_stream/command_stream_receiver_simulated_common_hw.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -113,4 +113,12 @@ void CommandStreamReceiverSimulatedCommonHw::submitLRCA(EngineInstanc stream->writeMMIO(AubMemDump::computeRegisterOffset(mmioBase, 0x2230), contextDescriptor.ulData[1]); stream->writeMMIO(AubMemDump::computeRegisterOffset(mmioBase, 0x2230), contextDescriptor.ulData[0]); } + +template +void CommandStreamReceiverSimulatedCommonHw::setupContext(OsContext &osContext) { + CommandStreamReceiverHw::setupContext(osContext); + if (aubManager) { + hardwareContext = std::unique_ptr(aubManager->createHardwareContext(0, hwInfo.capabilityTable.defaultEngineType)); + } +} } // namespace OCLRT diff --git a/runtime/command_stream/command_stream_receiver_with_aub_dump.h b/runtime/command_stream/command_stream_receiver_with_aub_dump.h index b427d9f5e6..c963c57e4c 100644 --- a/runtime/command_stream/command_stream_receiver_with_aub_dump.h +++ b/runtime/command_stream/command_stream_receiver_with_aub_dump.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -27,7 +27,7 @@ class CommandStreamReceiverWithAUBDump : public BaseCSR { void makeNonResident(GraphicsAllocation &gfxAllocation) override; void activateAubSubCapture(const MultiDispatchInfo &dispatchInfo) override; - void setOsContext(OsContext &osContext) override; + void setupContext(OsContext &osContext) override; CommandStreamReceiver *aubCSR = nullptr; }; diff --git a/runtime/command_stream/command_stream_receiver_with_aub_dump.inl b/runtime/command_stream/command_stream_receiver_with_aub_dump.inl index fe033ce3d9..941784b81c 100644 --- a/runtime/command_stream/command_stream_receiver_with_aub_dump.inl +++ b/runtime/command_stream/command_stream_receiver_with_aub_dump.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -51,10 +51,10 @@ void CommandStreamReceiverWithAUBDump::activateAubSubCapture(const Mult } template -void CommandStreamReceiverWithAUBDump::setOsContext(OsContext &osContext) { - BaseCSR::setOsContext(osContext); +void CommandStreamReceiverWithAUBDump::setupContext(OsContext &osContext) { + BaseCSR::setupContext(osContext); if (aubCSR) { - aubCSR->setOsContext(osContext); + aubCSR->setupContext(osContext); } } } // namespace OCLRT diff --git a/runtime/command_stream/tbx_command_stream_receiver_hw.inl b/runtime/command_stream/tbx_command_stream_receiver_hw.inl index 6ad22cadbe..7079310e49 100644 --- a/runtime/command_stream/tbx_command_stream_receiver_hw.inl +++ b/runtime/command_stream/tbx_command_stream_receiver_hw.inl @@ -35,9 +35,6 @@ TbxCommandStreamReceiverHw::TbxCommandStreamReceiverHw(const Hardware UNRECOVERABLE_IF(nullptr == aubCenter); aubManager = aubCenter->getAubManager(); - if (aubManager) { - hardwareContext = std::unique_ptr(aubManager->createHardwareContext(0, hwInfoIn.capabilityTable.defaultEngineType)); - } ppgtt = std::make_unique::type>(physicalAddressAllocator.get()); ggtt = std::make_unique(physicalAddressAllocator.get()); @@ -177,7 +174,7 @@ CommandStreamReceiver *TbxCommandStreamReceiverHw::create(const Hardw csr = new TbxCommandStreamReceiverHw(hwInfoIn, executionEnvironment); } - if (csr->hardwareContext == nullptr) { + if (!csr->aubManager) { // Open our stream csr->stream->open(nullptr); diff --git a/runtime/device/device.cpp b/runtime/device/device.cpp index cf03775ac9..3a1183a414 100644 --- a/runtime/device/device.cpp +++ b/runtime/device/device.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -176,7 +176,7 @@ bool Device::createEngines(const HardwareInfo *pHwInfo, Device &outDevice) { auto osContext = executionEnvironment->memoryManager->createAndRegisterOsContext(gpgpuEngineInstances[deviceCsrIndex], outDevice.preemptionMode); auto commandStreamReceiver = executionEnvironment->commandStreamReceivers[outDevice.getDeviceIndex()][deviceCsrIndex].get(); - commandStreamReceiver->setOsContext(*osContext); + commandStreamReceiver->setupContext(*osContext); if (!commandStreamReceiver->initializeTagAllocation()) { return false; } diff --git a/unit_tests/command_stream/aub_command_stream_receiver_1_tests.cpp b/unit_tests/command_stream/aub_command_stream_receiver_1_tests.cpp index 03ac82b1b0..3c30cdd71b 100644 --- a/unit_tests/command_stream/aub_command_stream_receiver_1_tests.cpp +++ b/unit_tests/command_stream/aub_command_stream_receiver_1_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -192,6 +192,22 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverWithAubMana EXPECT_FALSE(aubCsr->isFileOpen()); } +HWTEST_F(AubCommandStreamReceiverTests, givenAubCsrWhenOsContextIsSetThenCreateHardwareContext) { + OsContext osContext(nullptr, 0, gpgpuEngineInstances[0], PreemptionMode::Disabled); + std::string fileName = "file_name.aub"; + MockAubManager *mockManager = new MockAubManager(); + MockAubCenter *mockAubCenter = new MockAubCenter(platformDevices[0], false, fileName); + mockAubCenter->aubManager = std::unique_ptr(mockManager); + ExecutionEnvironment executionEnvironment; + executionEnvironment.aubCenter = std::unique_ptr(mockAubCenter); + + std::unique_ptr> aubCsr(reinterpret_cast *>(AUBCommandStreamReceiver::create(*platformDevices[0], fileName, true, executionEnvironment))); + EXPECT_EQ(nullptr, aubCsr->hardwareContext.get()); + + aubCsr->setupContext(osContext); + EXPECT_NE(nullptr, aubCsr->hardwareContext.get()); +} + HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverInSubCaptureModeWhenItIsCreatedThenFileIsNotCreated) { DebugManagerStateRestore stateRestore; DebugManager.flags.AUBDumpSubCaptureMode.set(static_cast(AubSubCaptureManager::SubCaptureMode::Filter)); @@ -227,7 +243,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenGraphicsAllocationWhenMakeResidentC std::unique_ptr memoryManager(nullptr); std::unique_ptr> aubCsr(new AUBCommandStreamReceiverHw(*platformDevices[0], "", true, *pDevice->executionEnvironment)); memoryManager.reset(aubCsr->createMemoryManager(false, false)); - aubCsr->setOsContext(*pDevice->getDefaultEngine().osContext); + aubCsr->setupContext(*pDevice->getDefaultEngine().osContext); auto gfxAllocation = memoryManager->allocateGraphicsMemoryWithProperties(MockAllocationProperties{MemoryConstants::pageSize}); auto osContextId = aubCsr->getOsContext().getContextId(); @@ -687,7 +703,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverWhenProcess std::unique_ptr memoryManager(nullptr); std::unique_ptr> aubCsr(new AUBCommandStreamReceiverHw(*platformDevices[0], "", true, *pDevice->executionEnvironment)); memoryManager.reset(aubCsr->createMemoryManager(false, false)); - aubCsr->setOsContext(*pDevice->getDefaultEngine().osContext); + aubCsr->setupContext(*pDevice->getDefaultEngine().osContext); auto gfxBufferAllocation = memoryManager->allocateGraphicsMemoryWithProperties(MockAllocationProperties{MemoryConstants::pageSize}); ; @@ -712,7 +728,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverInSubCaptur std::unique_ptr memoryManager(nullptr); std::unique_ptr> aubCsr(new MockAubCsrToTestDumpAubNonWritable(*platformDevices[0], "", true, *pDevice->executionEnvironment)); memoryManager.reset(aubCsr->createMemoryManager(false, false)); - aubCsr->setOsContext(*pDevice->getDefaultEngine().osContext); + aubCsr->setupContext(*pDevice->getDefaultEngine().osContext); auto gfxBufferAllocation = memoryManager->allocateGraphicsMemoryWithProperties(MockAllocationProperties{MemoryConstants::pageSize}); ; @@ -741,7 +757,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverWhenProcess std::unique_ptr memoryManager(nullptr); std::unique_ptr> aubCsr(new MockAubCsrToTestDumpAubNonWritable(*platformDevices[0], "", true, *pDevice->executionEnvironment)); memoryManager.reset(aubCsr->createMemoryManager(false, false)); - aubCsr->setOsContext(*pDevice->getDefaultEngine().osContext); + aubCsr->setupContext(*pDevice->getDefaultEngine().osContext); auto gfxBufferAllocation = memoryManager->allocateGraphicsMemoryWithProperties(MockAllocationProperties{MemoryConstants::pageSize}); ; diff --git a/unit_tests/command_stream/command_stream_receiver_flush_task_1_tests.cpp b/unit_tests/command_stream/command_stream_receiver_flush_task_1_tests.cpp index 4b3fd0b528..89ed81e800 100644 --- a/unit_tests/command_stream/command_stream_receiver_flush_task_1_tests.cpp +++ b/unit_tests/command_stream/command_stream_receiver_flush_task_1_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -751,7 +751,7 @@ HWTEST_F(CommandStreamReceiverFlushTaskTests, flushTaskWithBothCSCallsFlushOnce) commandStreamReceiver.initializeTagAllocation(); commandStream.getSpace(sizeof(typename FamilyType::MI_NOOP)); - commandStreamReceiver.setOsContext(*pDevice->getDefaultEngine().osContext); + commandStreamReceiver.setupContext(*pDevice->getDefaultEngine().osContext); flushTask(commandStreamReceiver); EXPECT_EQ(1, commandStreamReceiver.flushCount); diff --git a/unit_tests/command_stream/command_stream_receiver_flush_task_3_tests.cpp b/unit_tests/command_stream/command_stream_receiver_flush_task_3_tests.cpp index 1dc649c923..dd92597ea7 100644 --- a/unit_tests/command_stream/command_stream_receiver_flush_task_3_tests.cpp +++ b/unit_tests/command_stream/command_stream_receiver_flush_task_3_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -667,7 +667,7 @@ HWTEST_F(CommandStreamReceiverFlushTaskTests, givenCsrInBatchingModeWhenTotalRes mockCsr->initializeTagAllocation(); mockCsr->setPreemptionCsrAllocation(pDevice->getPreemptionAllocation()); mockCsr->overrideDispatchPolicy(DispatchMode::BatchedDispatch); - mockCsr->setOsContext(*pDevice->getDefaultEngine().osContext); + mockCsr->setupContext(*pDevice->getDefaultEngine().osContext); auto mockedSubmissionsAggregator = new mockSubmissionsAggregator(); mockCsr->overrideSubmissionAggregator(mockedSubmissionsAggregator); diff --git a/unit_tests/command_stream/command_stream_receiver_with_aub_dump_tests.cpp b/unit_tests/command_stream/command_stream_receiver_with_aub_dump_tests.cpp index 1eaf074acb..51a289e251 100644 --- a/unit_tests/command_stream/command_stream_receiver_with_aub_dump_tests.cpp +++ b/unit_tests/command_stream/command_stream_receiver_with_aub_dump_tests.cpp @@ -114,9 +114,9 @@ struct CommandStreamReceiverWithAubDumpTest : public ::testing::TestWithParamcreateAndRegisterOsContext( getChosenEngineType(DEFAULT_TEST_PLATFORM::hwInfo), PreemptionHelper::getDefaultPreemptionMode(DEFAULT_TEST_PLATFORM::hwInfo)); - csrWithAubDump->setOsContext(*osContext); + csrWithAubDump->setupContext(*osContext); if (csrWithAubDump->aubCSR) { - csrWithAubDump->aubCSR->setOsContext(*osContext); + csrWithAubDump->aubCSR->setupContext(*osContext); } } @@ -137,7 +137,7 @@ HWTEST_F(CommandStreamReceiverWithAubDumpSimpleTest, givenCsrWithAubDumpWhenSett CommandStreamReceiverWithAUBDump> csrWithAubDump(*platformDevices[0], executionEnvironment); OsContext osContext(nullptr, 0, gpgpuEngineInstances[0], PreemptionHelper::getDefaultPreemptionMode(*platformDevices[0])); - csrWithAubDump.setOsContext(osContext); + csrWithAubDump.setupContext(osContext); EXPECT_EQ(&osContext, &csrWithAubDump.getOsContext()); EXPECT_EQ(&osContext, &csrWithAubDump.aubCSR->getOsContext()); } diff --git a/unit_tests/command_stream/tbx_command_stream_tests.cpp b/unit_tests/command_stream/tbx_command_stream_tests.cpp index 043a0fbb91..7f61bfc1a9 100644 --- a/unit_tests/command_stream/tbx_command_stream_tests.cpp +++ b/unit_tests/command_stream/tbx_command_stream_tests.cpp @@ -342,17 +342,6 @@ HWTEST_F(TbxCommandStreamTests, givenTbxCommandStreamReceiverWhenItIsCreatedWith EXPECT_EQ(nullptr, executionEnvironment.aubCenter->getAubManager()); } -HWTEST_F(TbxCommandStreamTests, givenTbxCommandStreamReceiverWhenItIsCreatedWithAubManagerThenCreateHardwareContext) { - const HardwareInfo &hwInfo = *platformDevices[0]; - MockAubManager *mockManager = new MockAubManager(); - MockAubCenter *mockAubCenter = new MockAubCenter(&hwInfo, false, ""); - mockAubCenter->aubManager = std::unique_ptr(mockManager); - ExecutionEnvironment executionEnvironment; - executionEnvironment.aubCenter = std::unique_ptr(mockAubCenter); - auto tbxCsr = std::make_unique>(hwInfo, executionEnvironment); - EXPECT_NE(nullptr, tbxCsr->hardwareContext); -} - HWTEST_F(TbxCommandStreamTests, givenTbxCommandStreamReceiverWhenFlushIsCalledThenItShouldCallTheExpectedHwContextFunctions) { auto mockManager = std::make_unique(); auto mockHardwareContext = static_cast(mockManager->createHardwareContext(0, EngineType::ENGINE_RCS)); @@ -453,3 +442,19 @@ HWTEST_F(TbxCommandStreamTests, givenTbxCsrWhenHardwareContextIsCreatedThenTbxSt EXPECT_FALSE(tbxCsr->streamInitialized); } + +HWTEST_F(TbxCommandStreamTests, givenTbxCsrWhenOsContextIsSetThenCreateHardwareContext) { + OsContext osContext(nullptr, 0, gpgpuEngineInstances[0], PreemptionMode::Disabled); + std::string fileName = "file_name.aub"; + MockAubManager *mockManager = new MockAubManager(); + MockAubCenter *mockAubCenter = new MockAubCenter(platformDevices[0], false, fileName); + mockAubCenter->aubManager = std::unique_ptr(mockManager); + ExecutionEnvironment executionEnvironment; + executionEnvironment.aubCenter = std::unique_ptr(mockAubCenter); + + std::unique_ptr> tbxCsr(reinterpret_cast *>(TbxCommandStreamReceiver::create(*platformDevices[0], true, executionEnvironment))); + EXPECT_EQ(nullptr, tbxCsr->hardwareContext.get()); + + tbxCsr->setupContext(osContext); + EXPECT_NE(nullptr, tbxCsr->hardwareContext.get()); +} diff --git a/unit_tests/event/event_tests.cpp b/unit_tests/event/event_tests.cpp index 860a50c6c3..177656d6eb 100644 --- a/unit_tests/event/event_tests.cpp +++ b/unit_tests/event/event_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -906,7 +906,7 @@ HWTEST_F(InternalsEventTest, GivenBufferWithoutZeroCopyOnCommandMapOrUnmapFlushe MockNonZeroCopyBuff buffer(executionStamp); MockCsr csr(executionStamp, *pDevice->executionEnvironment); csr.setTagAllocation(pDevice->getDefaultEngine().commandStreamReceiver->getTagAllocation()); - csr.setOsContext(*pDevice->getDefaultEngine().osContext); + csr.setupContext(*pDevice->getDefaultEngine().osContext); MemObjSizeArray size = {{4, 1, 1}}; MemObjOffsetArray offset = {{0, 0, 0}}; diff --git a/unit_tests/fixtures/memory_allocator_fixture.h b/unit_tests/fixtures/memory_allocator_fixture.h index 7634e0e8fd..a1f9b7cb0c 100644 --- a/unit_tests/fixtures/memory_allocator_fixture.h +++ b/unit_tests/fixtures/memory_allocator_fixture.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -24,7 +24,7 @@ class MemoryAllocatorFixture : public MemoryManagementFixture { memoryManager = new OsAgnosticMemoryManager(false, false, *executionEnvironment); executionEnvironment->memoryManager.reset(memoryManager); csr = memoryManager->getDefaultCommandStreamReceiver(0); - csr->setOsContext(*memoryManager->createAndRegisterOsContext(gpgpuEngineInstances[0], PreemptionHelper::getDefaultPreemptionMode(*platformDevices[0]))); + csr->setupContext(*memoryManager->createAndRegisterOsContext(gpgpuEngineInstances[0], PreemptionHelper::getDefaultPreemptionMode(*platformDevices[0]))); } void TearDown() override { diff --git a/unit_tests/fixtures/memory_manager_fixture.cpp b/unit_tests/fixtures/memory_manager_fixture.cpp index 16eead611c..83df397cdf 100644 --- a/unit_tests/fixtures/memory_manager_fixture.cpp +++ b/unit_tests/fixtures/memory_manager_fixture.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -21,7 +21,7 @@ void MemoryManagerWithCsrFixture::SetUp() { executionEnvironment.commandStreamReceivers.resize(1); executionEnvironment.commandStreamReceivers[0][0].reset(csr); - csr->setOsContext(*memoryManager->createAndRegisterOsContext(gpgpuEngineInstances[0], PreemptionHelper::getDefaultPreemptionMode(*platformDevices[0]))); + csr->setupContext(*memoryManager->createAndRegisterOsContext(gpgpuEngineInstances[0], PreemptionHelper::getDefaultPreemptionMode(*platformDevices[0]))); } void MemoryManagerWithCsrFixture::TearDown() { diff --git a/unit_tests/fixtures/ult_command_stream_receiver_fixture.h b/unit_tests/fixtures/ult_command_stream_receiver_fixture.h index 4048ab34a1..a960488c92 100644 --- a/unit_tests/fixtures/ult_command_stream_receiver_fixture.h +++ b/unit_tests/fixtures/ult_command_stream_receiver_fixture.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -55,7 +55,7 @@ struct UltCommandStreamReceiverTest graphicsAllocation = new MockGraphicsAllocation(sshBuffer, sizeStream); ssh.replaceGraphicsAllocation(graphicsAllocation); - pDevice->getCommandStreamReceiver().setOsContext(*pDevice->getDefaultEngine().osContext); + pDevice->getCommandStreamReceiver().setupContext(*pDevice->getDefaultEngine().osContext); } void TearDown() override { diff --git a/unit_tests/kernel/kernel_image_arg_tests.cpp b/unit_tests/kernel/kernel_image_arg_tests.cpp index eeedbd0fb7..489ad49764 100644 --- a/unit_tests/kernel/kernel_image_arg_tests.cpp +++ b/unit_tests/kernel/kernel_image_arg_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -190,7 +190,7 @@ HWTEST_F(KernelImageArgTest, givenImgWithMcsAllocWhenMakeResidentThenMakeMcsAllo pKernel->setArg(0, sizeof(memObj), &memObj); std::unique_ptr> csr(new MockCsr(execStamp, *pDevice->executionEnvironment)); - csr->setOsContext(*pDevice->getDefaultEngine().osContext); + csr->setupContext(*pDevice->getDefaultEngine().osContext); pKernel->makeResident(*csr.get()); EXPECT_TRUE(csr->isMadeResident(mcsAlloc)); diff --git a/unit_tests/kernel/kernel_tests.cpp b/unit_tests/kernel/kernel_tests.cpp index 5da10836c0..a513c33506 100644 --- a/unit_tests/kernel/kernel_tests.cpp +++ b/unit_tests/kernel/kernel_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -582,7 +582,7 @@ TEST_F(KernelPrivateSurfaceTest, testPrivateSurface) { // Test it auto executionEnvironment = pDevice->getExecutionEnvironment(); std::unique_ptr csr(new CommandStreamReceiverMock(*executionEnvironment)); - csr->setOsContext(*pDevice->getDefaultEngine().osContext); + csr->setupContext(*pDevice->getDefaultEngine().osContext); csr->residency.clear(); EXPECT_EQ(0u, csr->residency.size()); diff --git a/unit_tests/memory_manager/surface_tests.cpp b/unit_tests/memory_manager/surface_tests.cpp index bb1b3ed28b..c48414de96 100644 --- a/unit_tests/memory_manager/surface_tests.cpp +++ b/unit_tests/memory_manager/surface_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -62,7 +62,7 @@ HWTEST_TYPED_TEST(SurfaceTest, GivenSurfaceWhenInterfaceIsUsedThenSurfaceBehaves MockCsr *csr = new MockCsr(execStamp, executionEnvironment); executionEnvironment.commandStreamReceivers[0][0].reset(csr); executionEnvironment.memoryManager.reset(csr->createMemoryManager(false, false)); - csr->setOsContext(*executionEnvironment.memoryManager->createAndRegisterOsContext(gpgpuEngineInstances[0], PreemptionHelper::getDefaultPreemptionMode(*platformDevices[0]))); + csr->setupContext(*executionEnvironment.memoryManager->createAndRegisterOsContext(gpgpuEngineInstances[0], PreemptionHelper::getDefaultPreemptionMode(*platformDevices[0]))); Surface *surface = createSurface::Create(this->data, &this->buffer, diff --git a/unit_tests/mocks/mock_aub_csr.h b/unit_tests/mocks/mock_aub_csr.h index 34b6141259..b2c6984e4f 100644 --- a/unit_tests/mocks/mock_aub_csr.h +++ b/unit_tests/mocks/mock_aub_csr.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -156,7 +156,7 @@ std::unique_ptr getEnvironment(bool createTagAllocation } auto osContext = executionEnvironment->memoryManager->createAndRegisterOsContext(getChosenEngineType(*platformDevices[0]), PreemptionHelper::getDefaultPreemptionMode(*platformDevices[0])); - executionEnvironment->commandStreamReceivers[0][0]->setOsContext(*osContext); + executionEnvironment->commandStreamReceivers[0][0]->setupContext(*osContext); std::unique_ptr aubExecutionEnvironment(new AubExecutionEnvironment); if (allocateCommandBuffer) { diff --git a/unit_tests/mocks/mock_device.cpp b/unit_tests/mocks/mock_device.cpp index 810db7b901..43b7a1e10d 100644 --- a/unit_tests/mocks/mock_device.cpp +++ b/unit_tests/mocks/mock_device.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -50,7 +50,7 @@ void MockDevice::resetCommandStreamReceiver(CommandStreamReceiver *newCsr) { executionEnvironment->commandStreamReceivers[getDeviceIndex()][defaultEngineIndex]->initializeTagAllocation(); executionEnvironment->commandStreamReceivers[getDeviceIndex()][defaultEngineIndex]->setPreemptionCsrAllocation(preemptionAllocation); this->engines[defaultEngineIndex].commandStreamReceiver = newCsr; - this->engines[defaultEngineIndex].commandStreamReceiver->setOsContext(*this->engines[defaultEngineIndex].osContext); + this->engines[defaultEngineIndex].commandStreamReceiver->setupContext(*this->engines[defaultEngineIndex].osContext); UNRECOVERABLE_IF(getDeviceIndex() != 0u); } diff --git a/unit_tests/mocks/mock_tbx_csr.h b/unit_tests/mocks/mock_tbx_csr.h index 26a3ba994c..7f110cc8bf 100644 --- a/unit_tests/mocks/mock_tbx_csr.h +++ b/unit_tests/mocks/mock_tbx_csr.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -94,7 +94,7 @@ std::unique_ptr getEnvironment(bool createTagAllocation } auto osContext = executionEnvironment->memoryManager->createAndRegisterOsContext(getChosenEngineType(*platformDevices[0]), PreemptionHelper::getDefaultPreemptionMode(*platformDevices[0])); - executionEnvironment->commandStreamReceivers[0][0]->setOsContext(*osContext); + executionEnvironment->commandStreamReceivers[0][0]->setupContext(*osContext); std::unique_ptr tbxExecutionEnvironment(new TbxExecutionEnvironment); if (allocateCommandBuffer) { diff --git a/unit_tests/os_interface/linux/drm_command_stream_tests.cpp b/unit_tests/os_interface/linux/drm_command_stream_tests.cpp index bca6d8712d..80ce1574de 100644 --- a/unit_tests/os_interface/linux/drm_command_stream_tests.cpp +++ b/unit_tests/os_interface/linux/drm_command_stream_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -48,7 +48,7 @@ class DrmCommandStreamFixture { ASSERT_NE(nullptr, csr); executionEnvironment.commandStreamReceivers.resize(1); executionEnvironment.commandStreamReceivers[0][0].reset(csr); - csr->setOsContext(*osContext); + csr->setupContext(*osContext); // Memory manager creates pinBB with ioctl, expect one call EXPECT_CALL(*mock, ioctl(::testing::_, ::testing::_)) @@ -255,7 +255,7 @@ TEST_F(DrmCommandStreamTest, givenDrmContextIdWhenFlushingThenSetIdToAllExecBuff osContext = std::make_unique(executionEnvironment.osInterface.get(), 1, gpgpuEngineInstances[0], PreemptionHelper::getDefaultPreemptionMode(*platformDevices[0])); - csr->setOsContext(*osContext); + csr->setupContext(*osContext); auto &cs = csr->getCS(); diff --git a/unit_tests/os_interface/windows/device_command_stream_tests.cpp b/unit_tests/os_interface/windows/device_command_stream_tests.cpp index d056fd7216..67fefbdf18 100644 --- a/unit_tests/os_interface/windows/device_command_stream_tests.cpp +++ b/unit_tests/os_interface/windows/device_command_stream_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -250,7 +250,7 @@ TEST(WddmPreemptionHeaderTests, givenWddmCommandStreamReceiverWhenPreemptionIsOf executionEnvironment->memoryManager.reset(executionEnvironment->commandStreamReceivers[0][0]->createMemoryManager(false, false)); executionEnvironment->commandStreamReceivers[0][0]->overrideDispatchPolicy(DispatchMode::ImmediateDispatch); OsContext osContext(executionEnvironment->osInterface.get(), 0u, gpgpuEngineInstances[0], PreemptionHelper::getDefaultPreemptionMode(*hwInfo)); - executionEnvironment->commandStreamReceivers[0][0]->setOsContext(osContext); + executionEnvironment->commandStreamReceivers[0][0]->setupContext(osContext); auto commandBuffer = executionEnvironment->memoryManager->allocateGraphicsMemoryWithProperties(MockAllocationProperties{MemoryConstants::pageSize}); LinearStream cs(commandBuffer); @@ -275,7 +275,7 @@ TEST(WddmPreemptionHeaderTests, givenWddmCommandStreamReceiverWhenPreemptionIsOn executionEnvironment->memoryManager.reset(executionEnvironment->commandStreamReceivers[0][0]->createMemoryManager(false, false)); executionEnvironment->commandStreamReceivers[0][0]->overrideDispatchPolicy(DispatchMode::ImmediateDispatch); OsContext osContext(executionEnvironment->osInterface.get(), 0u, gpgpuEngineInstances[0], PreemptionHelper::getDefaultPreemptionMode(*hwInfo)); - executionEnvironment->commandStreamReceivers[0][0]->setOsContext(osContext); + executionEnvironment->commandStreamReceivers[0][0]->setupContext(osContext); auto commandBuffer = executionEnvironment->memoryManager->allocateGraphicsMemoryWithProperties(MockAllocationProperties{MemoryConstants::pageSize}); LinearStream cs(commandBuffer); diff --git a/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp b/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp index 5c77cd7cb1..70ead1c621 100644 --- a/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp +++ b/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp @@ -1466,7 +1466,7 @@ TEST(WddmMemoryManagerCleanupTest, givenUsedTagAllocationInWddmMemoryManagerWhen executionEnvironment.commandStreamReceivers[0][0] = std::unique_ptr(csr); executionEnvironment.memoryManager = std::make_unique(false, false, wddm, executionEnvironment); - csr->setOsContext(*executionEnvironment.memoryManager->createAndRegisterOsContext(gpgpuEngineInstances[0], preemptionMode)); + csr->setupContext(*executionEnvironment.memoryManager->createAndRegisterOsContext(gpgpuEngineInstances[0], preemptionMode)); EXPECT_EQ(csr, executionEnvironment.memoryManager->getDefaultCommandStreamReceiver(0)); auto tagAllocator = csr->getEventPerfCountAllocator();