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

Simplify code by introducing TimestampPacketStorage::Packet.

Browse Source 
Related-To: NEO-2872

Change-Id: Ifce455f1a48f2db2bf16af2dd32208ee4542204d
Signed-off-by: Piotr Fusik <piotr.fusik@intel.com>
This commit is contained in:
Piotr Fusik
2019-04-17 13:29:50 +02:00
committed by sys_ocldev
parent 6e97a69a2b
commit 086ef7c461
7 changed files with 92 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
runtime/helpers/timestamp_packet.h
View File

@@ -12,7 +12,6 @@
#include "runtime/helpers/properties_helper.h"
#include "runtime/utilities/tag_allocator.h"
#include <array>
#include <atomic>
#include <cstdint>
#include <vector>
@@ -22,21 +21,16 @@ class CommandStreamReceiver;
class LinearStream;
namespace TimestampPacketSizeControl {
constexpr uint32_t preferedChunkCount = 16u;
constexpr uint32_t preferredPacketCount = 16u;
}
#pragma pack(1)
struct TimestampPacketStorage {
TimestampPacketStorage() {
initialize();
}
enum class DataIndex : uint32_t {
ContextStart = 0,
GlobalStart,
ContextEnd,
GlobalEnd,
Max
struct Packet {
uint32_t contextStart = 1u;
uint32_t globalStart = 1u;
uint32_t contextEnd = 1u;
uint32_t globalEnd = 1u;
};
enum class WriteOperationType : uint32_t {
@@ -49,28 +43,29 @@ struct TimestampPacketStorage {
}
bool canBeReleased() const {
return data[static_cast<uint32_t>(DataIndex::ContextEnd)] != 1 &&
data[static_cast<uint32_t>(DataIndex::GlobalEnd)] != 1 &&
return packets[0].contextEnd != 1 &&
packets[0].globalEnd != 1 &&
implicitDependenciesCount.load() == 0;
}
uint32_t getData(DataIndex operationType) const {
return data[static_cast<uint32_t>(operationType)];
}
void initialize() {
std::fill(data.begin(), data.end(), 1u);
for (auto &packet : packets) {
packet.contextStart = 1u;
packet.globalStart = 1u;
packet.contextEnd = 1u;
packet.globalEnd = 1u;
}
implicitDependenciesCount.store(0);
}
void incImplicitDependenciesCount() { implicitDependenciesCount++; }
std::array<uint32_t, static_cast<uint32_t>(DataIndex::Max) * TimestampPacketSizeControl::preferedChunkCount> data;
std::atomic<uint32_t> implicitDependenciesCount;
Packet packets[TimestampPacketSizeControl::preferredPacketCount];
std::atomic<uint32_t> implicitDependenciesCount{0u};
};
#pragma pack()
static_assert(((static_cast<uint32_t>(TimestampPacketStorage::DataIndex::Max) * TimestampPacketSizeControl::preferedChunkCount + 1) * sizeof(uint32_t)) == sizeof(TimestampPacketStorage),
static_assert(((4 * TimestampPacketSizeControl::preferredPacketCount + 1) * sizeof(uint32_t)) == sizeof(TimestampPacketStorage),
"This structure is consumed by GPU and has to follow specific restrictions for padding and size");
class TimestampPacketContainer : public NonCopyableOrMovableClass {
@@ -94,7 +89,7 @@ struct TimestampPacketHelper {
template <typename GfxFamily>
static void programSemaphoreWithImplicitDependency(LinearStream &cmdStream, TagNode<TimestampPacketStorage> &timestampPacketNode) {
using MI_ATOMIC = typename GfxFamily::MI_ATOMIC;
auto compareAddress = getGpuAddressForDataWrite(timestampPacketNode, TimestampPacketStorage::DataIndex::ContextEnd);
auto compareAddress = timestampPacketNode.getGpuAddress() + offsetof(TimestampPacketStorage, packets[0].contextEnd);
auto dependenciesCountAddress = timestampPacketNode.getGpuAddress() + offsetof(TimestampPacketStorage, implicitDependenciesCount);
KernelCommandsHelper<GfxFamily>::programMiSemaphoreWait(cmdStream, compareAddress, 1);
@@ -106,11 +101,6 @@ struct TimestampPacketHelper {
MI_ATOMIC::DATA_SIZE::DATA_SIZE_DWORD);
}
static uint64_t getGpuAddressForDataWrite(TagNode<TimestampPacketStorage> &timestampPacketNodes, TimestampPacketStorage::DataIndex dataIndex) {
auto offset = static_cast<uint32_t>(dataIndex) * sizeof(uint32_t);
return timestampPacketNodes.getGpuAddress() + offset;
}
template <typename GfxFamily>
static void programCsrDependencies(LinearStream &cmdStream, const CsrDependencies &csrDependencies) {
for (auto timestampPacketContainer : csrDependencies) {