saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-05-28 22:56:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

make (de)tensorization events measure level events (#4958)

Browse source 
* make tensorizer events measures

* throttle the events and add a new one SoftwareBitmapToGPUTensorTelemetryEvent

* factor out timing code into a class

* typo

* typo

* move eventimer class into its own header file

* add throttling to detensorization and remove variable timing

* make detensorization events measures as well

* add ConvertGPUTensorToSoftwareBitmapTelemetryEvent event

* de-duplicate event names

* fix comment

* PR feedback
This commit is contained in:
Brian Martin 2020-08-28 16:49:32 -07:00 committed by GitHub
parent cd0f2fb48c
commit 655ffd5d5b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 143 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cmake/winml.cmake
View file

@ -367,6 +367,7 @@ target_include_directories(winml_lib_image PRIVATE ${ONNXRUNTIME_INCLUDE_DIR})
target_include_directories(winml_lib_image PRIVATE ${REPO_ROOT}/cmake/external/gsl/include)
target_include_directories(winml_lib_image PRIVATE ${REPO_ROOT}/cmake/external/onnx)
target_include_directories(winml_lib_image PRIVATE ${REPO_ROOT}/cmake/external/protobuf/src)
target_include_directories(winml_lib_image PRIVATE ${ONNXRUNTIME_INCLUDE_DIR}/core/platform/windows)
# Properties
set_target_properties(winml_lib_image

25
winml/lib/Api.Image/EventTimer.h Normal file
View file

@ -0,0 +1,25 @@
#include "pch.h"
class EventTimer
{
public:
bool Start()
{
auto now = std::chrono::high_resolution_clock::now();
if (!_started ||
std::chrono::duration_cast<std::chrono::microseconds>(now - _startTime).count() > _kDurationBetweenSendingEvents)
{
_started = true;
_startTime = std::chrono::high_resolution_clock::now();
return true;
}
return false;
}
private:
bool _started = false;
std::chrono::steady_clock::time_point _startTime;
constexpr static long long _kDurationBetweenSendingEvents = 1000 * 50; // duration in (us). send an Event every 50 ms;
};

66
winml/lib/Api.Image/TensorToVideoFrameConverter.cpp
View file

@ -5,6 +5,7 @@
#include <winmeta.h> // winmeta needed for TraceLoggingKeyword
#include <TraceLoggingProvider.h>
#include <TraceloggingConfig.h>
#include <evntrace.h>
#include <MemoryBuffer.h>
@ -14,6 +15,7 @@
#include "inc/ImageConversionHelpers.h"
#include "LearningModelDevice.h"
#include "EventTimer.h"
using namespace Microsoft::WRL;
using namespace Windows::Graphics::DirectX::Direct3D11;
@ -30,7 +32,9 @@ class GPUTensorToDX12TextureTelemetryEvent {
TraceLoggingOpcode(EVENT_TRACE_TYPE_START),
TraceLoggingHexInt32(tensorDesc.channelType, "Type"),
TraceLoggingInt64(tensorDesc.sizes[2], "Height"),
TraceLoggingInt64(tensorDesc.sizes[3], "Width"));
TraceLoggingInt64(tensorDesc.sizes[3], "Width"),
TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage),
TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES));
}
~GPUTensorToDX12TextureTelemetryEvent() {
TraceLoggingWrite(
@ -38,7 +42,35 @@ class GPUTensorToDX12TextureTelemetryEvent {
"GPUTensorToDX12Texture",
TraceLoggingKeyword(WINML_PROVIDER_KEYWORD_DEFAULT),
TraceLoggingOpcode(EVENT_TRACE_TYPE_STOP),
TraceLoggingHexInt32(S_OK, "HRESULT"));
TraceLoggingHexInt32(S_OK, "HRESULT"),
TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage),
TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES));
}
};
class ConvertGPUTensorToSoftwareBitmapTelemetryEvent {
public:
ConvertGPUTensorToSoftwareBitmapTelemetryEvent(const ImageTensorDescription& tensorDesc) {
TraceLoggingWrite(
winml_trace_logging_provider,
"ConvertGPUTensorToSoftwareBitmap",
TraceLoggingKeyword(WINML_PROVIDER_KEYWORD_DEFAULT),
TraceLoggingOpcode(EVENT_TRACE_TYPE_START),
TraceLoggingHexInt32(tensorDesc.channelType, "Type"),
TraceLoggingInt64(tensorDesc.sizes[2], "Height"),
TraceLoggingInt64(tensorDesc.sizes[3], "Width"),
TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage),
TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES));
}
~ConvertGPUTensorToSoftwareBitmapTelemetryEvent() {
TraceLoggingWrite(
winml_trace_logging_provider,
"ConvertGPUTensorToSoftwareBitmap",
TraceLoggingKeyword(WINML_PROVIDER_KEYWORD_DEFAULT),
TraceLoggingOpcode(EVENT_TRACE_TYPE_STOP),
TraceLoggingHexInt32(S_OK, "HRESULT"),
TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage),
TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES));
}
};
@ -52,7 +84,9 @@ class ConvertCPUTensorToVideoFrameWithSoftwareBitmapTelemetryEvent {
TraceLoggingOpcode(EVENT_TRACE_TYPE_START),
TraceLoggingHexInt32(tensorDesc.channelType, "Type"),
TraceLoggingInt64(tensorDesc.sizes[2], "Height"),
TraceLoggingInt64(tensorDesc.sizes[3], "Width"));
TraceLoggingInt64(tensorDesc.sizes[3], "Width"),
TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage),
TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES));
}
~ConvertCPUTensorToVideoFrameWithSoftwareBitmapTelemetryEvent() {
TraceLoggingWrite(
@ -60,7 +94,9 @@ class ConvertCPUTensorToVideoFrameWithSoftwareBitmapTelemetryEvent {
"ConvertCPUTensorToVideoFrameWithSoftwareBitmap",
TraceLoggingKeyword(WINML_PROVIDER_KEYWORD_DEFAULT),
TraceLoggingOpcode(EVENT_TRACE_TYPE_STOP),
TraceLoggingHexInt32(S_OK, "HRESULT"));
TraceLoggingHexInt32(S_OK, "HRESULT"),
TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage),
TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES));
}
};
@ -345,7 +381,12 @@ void TensorToVideoFrameConverter::ConvertGPUTensorToDX12Texture(
CD3DX12_RECT scissorRect(0, 0, (LONG)outputDesc.Width, outputDesc.Height);
ComPtr<ID3D12Device> spDx12Device = device_cache.GetD3D12Device();
GPUTensorToDX12TextureTelemetryEvent telemetrylogger(tensorDesc);
// we're inside a lock from the caller of this function, so it's ok to use this static
static EventTimer eventTimer;
std::optional<GPUTensorToDX12TextureTelemetryEvent> telemetryLogger;
if (eventTimer.Start()) {
telemetryLogger.emplace(tensorDesc);
}
WINML_THROW_HR_IF_FALSE_MSG(
E_INVALIDARG,
@ -490,7 +531,12 @@ void TensorToVideoFrameConverter::ConvertGPUTensorToSoftwareBitmap(
assert(pInputTensor != nullptr);
assert(softwareBitmap != nullptr);
GPUTensorToDX12TextureTelemetryEvent telemetrylogger(tensorDesc);
// we're inside a lock from the caller of this function, so it's ok to use this static
static EventTimer eventTimer;
std::optional<ConvertGPUTensorToSoftwareBitmapTelemetryEvent> telemetryLogger;
if (eventTimer.Start()) {
telemetryLogger.emplace(tensorDesc);
}
uint32_t tensorElementSize = tensorDesc.dataType == kImageTensorDataTypeFloat32 ? 4 : 2;
uint32_t singleVideoFramebufferSize = static_cast<uint32_t>(tensorDesc.sizes[1] * tensorDesc.sizes[2] * tensorDesc.sizes[3] * tensorElementSize);
@ -569,7 +615,13 @@ void TensorToVideoFrameConverter::ConvertCPUTensorToSoftwareBitmap(
_In_ void* pCPUTensor,
_In_ const ImageTensorDescription& tensorDesc,
_Inout_ wgi::SoftwareBitmap& softwareBitmap) {
ConvertCPUTensorToVideoFrameWithSoftwareBitmapTelemetryEvent telemetrylogger(tensorDesc);
// we're inside a lock from the caller of this function, so it's ok to use this static
static EventTimer eventTimer;
std::optional<ConvertCPUTensorToVideoFrameWithSoftwareBitmapTelemetryEvent> telemetryLogger;
if (eventTimer.Start()) {
telemetryLogger.emplace(tensorDesc);
}
auto height = softwareBitmap.PixelHeight();
auto width = softwareBitmap.PixelWidth();

65
winml/lib/Api.Image/VideoFrameToTensorConverter.cpp
View file

@ -5,6 +5,7 @@
#include <winmeta.h> // winmeta needed for TraceLoggingKeyword
#include <TraceLoggingProvider.h>
#include <TraceloggingConfig.h>
#include <evntrace.h>
#include <MemoryBuffer.h>
@ -13,6 +14,7 @@
#include "inc/D3DDeviceCache.h"
#include "LearningModelDevice.h"
#include "EventTimer.h"
using namespace Microsoft::WRL;
using namespace Windows::Graphics::DirectX::Direct3D11;
@ -29,7 +31,9 @@ class DX12TextureToGPUTensorTelemetryEvent {
TraceLoggingOpcode(EVENT_TRACE_TYPE_START),
TraceLoggingHexInt32(tensorDesc.channelType, "Type"),
TraceLoggingInt64(tensorDesc.sizes[2], "Height"),
TraceLoggingInt64(tensorDesc.sizes[3], "Width"));
TraceLoggingInt64(tensorDesc.sizes[3], "Width"),
TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage),
TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES));
}
~DX12TextureToGPUTensorTelemetryEvent() {
TraceLoggingWrite(
@ -37,7 +41,35 @@ class DX12TextureToGPUTensorTelemetryEvent {
"DX12TextureToGPUTensor",
TraceLoggingKeyword(WINML_PROVIDER_KEYWORD_DEFAULT),
TraceLoggingOpcode(EVENT_TRACE_TYPE_STOP),
TraceLoggingHexInt32(S_OK, "HRESULT"));
TraceLoggingHexInt32(S_OK, "HRESULT"),
TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage),
TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES));
}
};
class SoftwareBitmapToGPUTensorTelemetryEvent {
public:
SoftwareBitmapToGPUTensorTelemetryEvent(const ImageTensorDescription& tensorDesc) {
TraceLoggingWrite(
winml_trace_logging_provider,
"SoftwareBitmapToGPUTensor",
TraceLoggingKeyword(WINML_PROVIDER_KEYWORD_DEFAULT),
TraceLoggingOpcode(EVENT_TRACE_TYPE_START),
TraceLoggingHexInt32(tensorDesc.channelType, "Type"),
TraceLoggingInt64(tensorDesc.sizes[2], "Height"),
TraceLoggingInt64(tensorDesc.sizes[3], "Width"),
TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage),
TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES));
}
~SoftwareBitmapToGPUTensorTelemetryEvent() {
TraceLoggingWrite(
winml_trace_logging_provider,
"SoftwareBitmapToGPUTensor",
TraceLoggingKeyword(WINML_PROVIDER_KEYWORD_DEFAULT),
TraceLoggingOpcode(EVENT_TRACE_TYPE_STOP),
TraceLoggingHexInt32(S_OK, "HRESULT"),
TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage),
TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES));
}
};
@ -51,7 +83,9 @@ class ConvertVideoFrameWithSoftwareBitmapToCPUTensorTelemetryEvent {
TraceLoggingOpcode(EVENT_TRACE_TYPE_START),
TraceLoggingHexInt32(tensorDesc.channelType, "Type"),
TraceLoggingInt64(tensorDesc.sizes[2], "Height"),
TraceLoggingInt64(tensorDesc.sizes[3], "Width"));
TraceLoggingInt64(tensorDesc.sizes[3], "Width"),
TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage),
TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES));
}
~ConvertVideoFrameWithSoftwareBitmapToCPUTensorTelemetryEvent() {
TraceLoggingWrite(
@ -59,7 +93,9 @@ class ConvertVideoFrameWithSoftwareBitmapToCPUTensorTelemetryEvent {
"ConvertVideoFrameWithSoftwareBitmapToCPUTensor",
TraceLoggingKeyword(WINML_PROVIDER_KEYWORD_DEFAULT),
TraceLoggingOpcode(EVENT_TRACE_TYPE_STOP),
TraceLoggingHexInt32(S_OK, "HRESULT"));
TraceLoggingHexInt32(S_OK, "HRESULT"),
TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage),
TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES));
}
};
@ -242,7 +278,12 @@ void VideoFrameToTensorConverter::ConvertDX12TextureToGPUTensor(
D3D12_RESOURCE_DESC outputDesc = pOutputResource->GetDesc();
ComPtr<ID3D12Device> spDx12Device = device_cache.GetD3D12Device();
DX12TextureToGPUTensorTelemetryEvent telemetrylogger(tensorDesc);
// we're inside a lock from the caller of this function, so it's ok to use this static
static EventTimer eventTimer;
std::optional<DX12TextureToGPUTensorTelemetryEvent> telemetryLogger;
if (eventTimer.Start()) {
telemetryLogger.emplace(tensorDesc);
}
// Validate input description
WINML_THROW_HR_IF_FALSE_MSG(
@ -406,7 +447,12 @@ void VideoFrameToTensorConverter::ConvertSoftwareBitmapToGPUTensor(
assert(pOutputResource != nullptr);
assert(videoFrame.SoftwareBitmap() != nullptr);
DX12TextureToGPUTensorTelemetryEvent telemetrylogger(tensorDesc);
// we're inside a lock from the caller of this function, so it's ok to use this static
static EventTimer eventTimer;
std::optional<SoftwareBitmapToGPUTensorTelemetryEvent> telemetryLogger;
if (eventTimer.Start()) {
telemetryLogger.emplace(tensorDesc);
}
wgi::SoftwareBitmap convertedSoftwareBitmap = nullptr;
wgi::BitmapBounds scaledBounds = inputBounds;
@ -515,7 +561,12 @@ void VideoFrameToTensorConverter::ConvertSoftwareBitmapToCPUTensor(
_Inout_ void* pCPUTensor) {
assert(softwareBitmap != nullptr);
ConvertVideoFrameWithSoftwareBitmapToCPUTensorTelemetryEvent telemetrylogger(tensorDesc);
// we're inside a lock from the caller of this function, so it's ok to use this static
static EventTimer eventTimer;
std::optional<ConvertVideoFrameWithSoftwareBitmapToCPUTensorTelemetryEvent> telemetryLogger;
if (eventTimer.Start()) {
telemetryLogger.emplace(tensorDesc);
}
auto height = softwareBitmap.PixelHeight();
auto width = softwareBitmap.PixelWidth();