Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix typos. 

Change-Id: Ie7add32684f812e11281668d9b93910384086c62
This commit is contained in:
Piotr Fusik 2018-11-14 15:29:10 +01:00 committed by sys_ocldev
parent 728932ed44
commit e66920a8f8
9 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/command_queue/gpgpu_walker.inl
View File

@ -384,7 +384,7 @@ inline void GpgpuWalkerHelper<GfxFamily>::dispatchOnDeviceWaitlistSemaphores(Lin
}
for (auto &node : event->getTimestampPacketNodes()->peekNodes()) {
TimestmapPacketHelper::programSemaphoreWithImplicitDependency<GfxFamily>(*commandStream, *node->tag);
TimestampPacketHelper::programSemaphoreWithImplicitDependency<GfxFamily>(*commandStream, *node->tag);
}
}
}

2
runtime/command_queue/hardware_interface.inl
View File

@ -86,7 +86,7 @@ void HardwareInterface<GfxFamily>::dispatchWalker(
numEventsInWaitList, eventWaitList);
if (previousTimestampPacketNodes) {
for (auto &node : previousTimestampPacketNodes->peekNodes()) {
TimestmapPacketHelper::programSemaphoreWithImplicitDependency<GfxFamily>(*commandStream, *node->tag);
TimestampPacketHelper::programSemaphoreWithImplicitDependency<GfxFamily>(*commandStream, *node->tag);
}
}
}

8
runtime/command_stream/command_stream_receiver_hw.inl
View File

@ -814,12 +814,12 @@ void CommandStreamReceiverHw<GfxFamily>::handleEventsTimestampPacketTags(LinearS
continue;
}
auto timestmapPacketContainer = event->getTimestampPacketNodes();
timestmapPacketContainer->makeResident(*this);
auto timestampPacketContainer = event->getTimestampPacketNodes();
timestampPacketContainer->makeResident(*this);
if (&event->getCommandQueue()->getDevice() != &currentDevice) {
for (auto &node : timestmapPacketContainer->peekNodes()) {
TimestmapPacketHelper::programSemaphoreWithImplicitDependency<GfxFamily>(csr, *node->tag);
for (auto &node : timestampPacketContainer->peekNodes()) {
TimestampPacketHelper::programSemaphoreWithImplicitDependency<GfxFamily>(csr, *node->tag);
}
}
}

10
runtime/helpers/timestamp_packet.h
View File

@ -66,16 +66,16 @@ class TimestampPacket {
static_assert(((static_cast<uint32_t>(TimestampPacket::DataIndex::Max) + 1) * sizeof(uint32_t)) == sizeof(TimestampPacket),
"This structure is consumed by GPU and has to follow specific restrictions for padding and size");
struct TimestmapPacketHelper {
struct TimestampPacketHelper {
template <typename GfxFamily>
static void programSemaphoreWithImplicitDependency(LinearStream &cmdStream, TimestampPacket &timestmapPacket) {
static void programSemaphoreWithImplicitDependency(LinearStream &cmdStream, TimestampPacket &timestampPacket) {
using MI_ATOMIC = typename GfxFamily::MI_ATOMIC;
auto compareAddress = timestmapPacket.pickAddressForDataWrite(TimestampPacket::DataIndex::ContextEnd);
auto dependenciesCountAddress = timestmapPacket.pickImplicitDependenciesCountWriteAddress();
auto compareAddress = timestampPacket.pickAddressForDataWrite(TimestampPacket::DataIndex::ContextEnd);
auto dependenciesCountAddress = timestampPacket.pickImplicitDependenciesCountWriteAddress();
KernelCommandsHelper<GfxFamily>::programMiSemaphoreWait(cmdStream, compareAddress, 1);
timestmapPacket.incImplicitDependenciesCount();
timestampPacket.incImplicitDependenciesCount();
KernelCommandsHelper<GfxFamily>::programMiAtomic(cmdStream, dependenciesCountAddress,
MI_ATOMIC::ATOMIC_OPCODES::ATOMIC_4B_DECREMENT,

8
unit_tests/aub_tests/command_queue/enqueue_with_timestamp_packet_aub_tests.cpp
View File

@ -78,13 +78,13 @@ HWTEST_F(TimestampPacketAubTests, givenMultipleWalkersWhenEnqueueingThenWriteAll
pCmdQ->enqueueWriteBuffer(buffer.get(), CL_TRUE, 1, writeSize, writeData, 0, nullptr, &outEvent);
auto &timestmapNodes = castToObject<Event>(outEvent)->getTimestampPacketNodes()->peekNodes();
auto &timestampNodes = castToObject<Event>(outEvent)->getTimestampPacketNodes()->peekNodes();
EXPECT_EQ(2u, timestmapNodes.size());
EXPECT_EQ(2u, timestampNodes.size());
uint32_t expectedEndTimestamp[2] = {0, 0};
auto endTimestampAddress1 = reinterpret_cast<void *>(timestmapNodes.at(0)->tag->pickAddressForDataWrite(TimestampPacket::DataIndex::ContextEnd));
auto endTimestampAddress2 = reinterpret_cast<void *>(timestmapNodes.at(1)->tag->pickAddressForDataWrite(TimestampPacket::DataIndex::ContextEnd));
auto endTimestampAddress1 = reinterpret_cast<void *>(timestampNodes.at(0)->tag->pickAddressForDataWrite(TimestampPacket::DataIndex::ContextEnd));
auto endTimestampAddress2 = reinterpret_cast<void *>(timestampNodes.at(1)->tag->pickAddressForDataWrite(TimestampPacket::DataIndex::ContextEnd));
expectMemory<FamilyType>(endTimestampAddress1, expectedEndTimestamp, 2 * sizeof(uint32_t));
expectMemory<FamilyType>(endTimestampAddress2, expectedEndTimestamp, 2 * sizeof(uint32_t));

2
unit_tests/command_stream/command_stream_receiver_tests.cpp
View File

@ -274,7 +274,7 @@ HWTEST_F(CommandStreamReceiverTest, givenDebugVariableEnabledWhenCreatingCsrThen
HWTEST_F(CommandStreamReceiverTest, whenCsrIsCreatedThenUseTimestampPacketWriteIfPossible) {
CommandStreamReceiverHw<FamilyType> csr(*platformDevices[0], executionEnvironment);
EXPECT_EQ(UnitTestHelper<FamilyType>::isTimestmapPacketWriteSupported(), csr.peekTimestampPacketWriteEnabled());
EXPECT_EQ(UnitTestHelper<FamilyType>::isTimestampPacketWriteSupported(), csr.peekTimestampPacketWriteEnabled());
}
TEST(CommandStreamReceiverSimpleTest, givenCSRWithTagAllocationSetWhenGetTagAllocationIsCalledThenCorrectAllocationIsReturned) {

8
unit_tests/helpers/timestamp_packet_tests.cpp
View File

@ -107,8 +107,8 @@ struct TimestampPacketTests : public TimestampPacketSimpleTests {
EXPECT_EQ(static_cast<uint32_t>(writeAddress >> 32), miAtomicCmd->getMemoryAddressHigh());
};
void verifyDependencyCounterValues(TimestampPacketContainer *timestmapPacketContainer, uint32_t expectedValue) {
auto &nodes = timestmapPacketContainer->peekNodes();
void verifyDependencyCounterValues(TimestampPacketContainer *timestampPacketContainer, uint32_t expectedValue) {
auto &nodes = timestampPacketContainer->peekNodes();
EXPECT_NE(0u, nodes.size());
for (auto &node : nodes) {
auto dependenciesCount = reinterpret_cast<std::atomic<uint32_t> *>(reinterpret_cast<void *>(node->tag->pickImplicitDependenciesCountWriteAddress()));
@ -828,7 +828,7 @@ HWTEST_F(TimestampPacketTests, givenWaitlistAndOutputEventWhenEnqueueingWithoutK
MockCommandQueueHw<FamilyType> cmdQ(context.get(), device.get(), nullptr);
MockKernelWithInternals mockKernel(*device, context.get());
cmdQ.enqueueKernel(mockKernel.mockKernel, 1, nullptr, gws, nullptr, 0, nullptr, nullptr); // obtain first TimestmapPacket
cmdQ.enqueueKernel(mockKernel.mockKernel, 1, nullptr, gws, nullptr, 0, nullptr, nullptr); // obtain first TimestampPacket
TimestampPacketContainer cmdQNodes(device->getMemoryManager());
cmdQNodes.assignAndIncrementNodesRefCounts(*cmdQ.timestampPacketContainer);
@ -881,7 +881,7 @@ HWTEST_F(TimestampPacketTests, whenEnqueueingBarrierThenRequestPipeControlOnCsrF
MockCommandQueueHw<FamilyType> cmdQ(context.get(), device.get(), nullptr);
MockKernelWithInternals mockKernel(*device, context.get());
cmdQ.enqueueKernel(mockKernel.mockKernel, 1, nullptr, gws, nullptr, 0, nullptr, nullptr); // obtain first TimestmapPacket
cmdQ.enqueueKernel(mockKernel.mockKernel, 1, nullptr, gws, nullptr, 0, nullptr, nullptr); // obtain first TimestampPacket
TimestampPacketContainer cmdQNodes(device->getMemoryManager());
cmdQNodes.assignAndIncrementNodesRefCounts(*cmdQ.timestampPacketContainer);

2
unit_tests/helpers/unit_test_helper.h
View File

@ -20,6 +20,6 @@ struct UnitTestHelper {
static bool isPageTableManagerSupported(const HardwareInfo &hwInfo);
static bool isTimestmapPacketWriteSupported();
static bool isTimestampPacketWriteSupported();
};
} // namespace OCLRT

2
unit_tests/helpers/unit_test_helper.inl
View File

@ -26,7 +26,7 @@ bool UnitTestHelper<GfxFamily>::isPageTableManagerSupported(const HardwareInfo &
}
template <typename GfxFamily>
bool UnitTestHelper<GfxFamily>::isTimestmapPacketWriteSupported() {
bool UnitTestHelper<GfxFamily>::isTimestampPacketWriteSupported() {
return false;
}
} // namespace OCLRT