Hash :
050b124d
Author :
Date :
2019-06-30T03:26:18
Reland "Vulkan: Debug overlay" This is a reland of e54d0f90d1a165404236fd7abd1b05ddd041a686 This was reverted due to a build failure as a result of a missing virtual destructor in the widget base class. Original change's description: > Vulkan: Debug overlay > > A debug overlay system for the Vulkan backend designed with efficiency > and runtime configurability in mind. Overlay widgets are of two > fundamental types: > > - Text widgets: A single line of text with small, medium or large font. > - Graph widgets: A bar graph of data. > > Built on these, various overlay widget types are defined that gather > statistics. Five such types are defined with one widget per type as > example: > > - Count: A widget that counts something. VulkanValidationMessageCount > is an overlay widget of this type that shows the number of validation > messages received from the validation layers. > - Text: A generic text. VulkanLastValidationMessage is an overlay > widget of this type that shows the last validation message. > - PerSecond: A value that gets reset every second automatically. FPS is > an overlay widget of this type that simply gets incremented on every > swap(). > - RunningGraph: A graph of last N values. VulkanCommandGraphSize is an > overlay of this type. On every vkQueueSubmit, the number of nodes in > the command graph is accumulated. On every present(), the value is > taken as the number of nodes for the whole duration of the frame. > - RunningHistogram: A histogram of last N values. Input values are in > the [0, 1] range and they are ranked to N buckets for histogram > calculation. VulkanSecondaryCommandBufferPoolWaste is an overlay > widget of this type. On vkQueueSubmit, the memory waste from command > buffer pool allocations is recorded in the histogram. > > Overlay font is placed in libANGLE/overlay/ which gen_overlay_fonts.py > processes to create an array of bits, which is processed at runtime to > create the actual font image (an image with 3 layers). > > The overlay widget layout is defined in overlay_widgets.json which > gen_overlay_widgets.py processes to generate an array of widgetss, each > of its respective type, and sets their properties, such as color and > bounding box. The json file allows widgets to align against other > widgets as well as against the framebuffer edges. > > Two compute shaders are implemented to efficiently render the UI: > > - OverlayCull: This shader creates a bitset of Text and Graph widgets > whose bounding boxes intersect a corresponding subgroup processed by > OverlayDraw. This is done only when the enabled overlay widgets are > changed (a feature that is not yet implemented) or the surface is > resized. > - OverlayDraw: Using the bitsets generated by OverlayCull, values that > are uniform for each workgroup (set to be equal to hardware subgroup > size), this shader loops over enabled widgets that can possibly > intersect the pixel being processed and renders and blends in texts > and graphs. This is done once per frame on present(). > > Currently, to enable overlay widgets an environment variable is used. > For example: > > $ export ANGLE_OVERLAY=FPS:VulkanSecondaryCommandBufferPoolWaste > $ ./hello_triangle --use-angle=vulkan > > Possible future work: > > - On Android, add settings in developer options and enable widgets based > on those. > - Spawn a small server in ANGLE and write an application that sends > enable/disable commands remotely. > - Implement overlay for other backends. > > Bug: angleproject:3757 > Change-Id: If9c6974d1935c18f460ec569e79b41188bd7afcc > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1729440 > Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org> > Reviewed-by: Jamie Madill <jmadill@chromium.org> Bug: angleproject:3757 Change-Id: I47915d88b37b6f882c686c2de13fca309a10b572 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1780897 Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504
//
// Copyright 2019 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// OverlayWidgets.cpp:
// Implements functions that interpret widget data. Data formats and limits correspond to the
// Vulkan implementation (as the only implementation). They are generic enough so other backends
// could respect them too, if they implement the overlay.
//
#include "libANGLE/Overlay.h"
#include "libANGLE/Overlay_font_autogen.h"
namespace gl
{
namespace
{
// Internally, every widget is either Text or Graph.
enum class WidgetInternalType
{
Text,
Graph,
InvalidEnum,
EnumCount = InvalidEnum,
};
// A map that says how the API-facing widget types map to internal types.
constexpr angle::PackedEnumMap<WidgetType, WidgetInternalType> kWidgetTypeToInternalMap = {
{WidgetType::Count, WidgetInternalType::Text},
{WidgetType::Text, WidgetInternalType::Text},
{WidgetType::PerSecond, WidgetInternalType::Text},
{WidgetType::RunningGraph, WidgetInternalType::Graph},
{WidgetType::RunningHistogram, WidgetInternalType::Graph},
};
// Structures and limits matching uniform buffers in vulkan/shaders/src/OverlayDraw.comp. The size
// of text and graph widgets is chosen such that they could fit in uniform buffers with minimum
// required Vulkan size.
constexpr size_t kMaxRenderableTextWidgets = 32;
constexpr size_t kMaxRenderableGraphWidgets = 32;
constexpr size_t kMaxTextLength = 256;
constexpr size_t kMaxGraphDataSize = 64;
constexpr angle::PackedEnumMap<WidgetInternalType, size_t> kWidgetInternalTypeMaxWidgets = {
{WidgetInternalType::Text, kMaxRenderableTextWidgets},
{WidgetInternalType::Graph, kMaxRenderableGraphWidgets},
};
constexpr angle::PackedEnumMap<WidgetInternalType, size_t> kWidgetInternalTypeWidgetOffsets = {
{WidgetInternalType::Text, 0},
{WidgetInternalType::Graph, kMaxRenderableTextWidgets},
};
ANGLE_ENABLE_STRUCT_PADDING_WARNINGS
// Structure matching buffer in vulkan/shaders/src/OverlayCull.comp.
struct WidgetCoordinates
{
uint32_t coordinates[kMaxRenderableTextWidgets + kMaxRenderableGraphWidgets][4];
};
// Structures matching buffers in vulkan/shaders/src/OverlayDraw.comp.
struct TextWidgetData
{
uint32_t coordinates[4];
float color[4];
uint32_t fontSize[3];
uint32_t padding;
uint8_t text[kMaxTextLength];
};
struct GraphWidgetData
{
uint32_t coordinates[4];
float color[4];
uint32_t valueWidth;
uint32_t padding[3];
uint32_t values[kMaxGraphDataSize];
};
struct TextWidgets
{
TextWidgetData widgets[kMaxRenderableTextWidgets];
};
struct GraphWidgets
{
GraphWidgetData widgets[kMaxRenderableGraphWidgets];
};
ANGLE_DISABLE_STRUCT_PADDING_WARNINGS
uint32_t GetWidgetCoord(int32_t src, uint32_t extent)
{
int32_t dst = src < 0 ? extent + src : src;
return std::min<uint32_t>(std::max(dst, 0), extent - 1);
}
void GetWidgetCoordinates(const int32_t srcCoords[4],
const gl::Extents &imageExtent,
uint32_t dstCoordsOut[4])
{
dstCoordsOut[0] = GetWidgetCoord(srcCoords[0], imageExtent.width);
dstCoordsOut[1] = GetWidgetCoord(srcCoords[1], imageExtent.height);
dstCoordsOut[2] = GetWidgetCoord(srcCoords[2], imageExtent.width);
dstCoordsOut[3] = GetWidgetCoord(srcCoords[3], imageExtent.height);
}
void GetWidgetColor(const float srcColor[4], float dstColor[4])
{
memcpy(dstColor, srcColor, 4 * sizeof(dstColor[0]));
}
void GetTextFontSize(int srcFontSize, uint32_t dstFontSize[3])
{
// .xy contains the font glyph width/height
dstFontSize[0] = overlay::kFontGlyphWidths[srcFontSize];
dstFontSize[1] = overlay::kFontGlyphHeights[srcFontSize];
// .z contains the layer
dstFontSize[2] = srcFontSize;
}
void GetGraphValueWidth(const int32_t srcCoords[4], size_t valueCount, uint32_t *dstValueWidth)
{
const int32_t graphWidth = std::abs(srcCoords[2] - srcCoords[0]);
// If valueCount doesn't divide graphWidth, the graph bars won't fit well in its frame.
// Fix initOverlayWidgets() in that case.
ASSERT(graphWidth % valueCount == 0);
*dstValueWidth = graphWidth / valueCount;
}
void GetTextString(const std::string &src, uint8_t textOut[kMaxTextLength])
{
for (size_t i = 0; i < src.length() && i < kMaxTextLength; ++i)
{
// The font image has 96 ASCII characters starting from ' '.
textOut[i] = src[i] - ' ';
}
}
void GetGraphValues(const std::vector<size_t> srcValues,
size_t startIndex,
float scale,
uint32_t valuesOut[kMaxGraphDataSize])
{
ASSERT(srcValues.size() <= kMaxGraphDataSize);
for (size_t i = 0; i < srcValues.size(); ++i)
{
size_t index = (startIndex + i) % srcValues.size();
valuesOut[i] = static_cast<uint32_t>(srcValues[index] * scale);
}
}
std::vector<size_t> CreateHistogram(const std::vector<size_t> values)
{
std::vector<size_t> histogram(values.size(), 0);
for (size_t rank : values)
{
++histogram[rank];
}
return histogram;
}
using OverlayWidgetCounts = angle::PackedEnumMap<WidgetInternalType, size_t>;
using AppendWidgetDataFunc = void (*)(const overlay::Widget *widget,
const gl::Extents &imageExtent,
TextWidgetData *textWidget,
GraphWidgetData *graphWidget,
OverlayWidgetCounts *widgetCounts);
} // namespace
namespace overlay_impl
{
// This class interprets the generic data collected in every element into a human-understandable
// widget. This often means generating text specific to this item and scaling graph data to
// something sensible.
class AppendWidgetDataHelper
{
public:
static void AppendFPS(const overlay::Widget *widget,
const gl::Extents &imageExtent,
TextWidgetData *textWidget,
GraphWidgetData *graphWidget,
OverlayWidgetCounts *widgetCounts);
static void AppendVulkanLastValidationMessage(const overlay::Widget *widget,
const gl::Extents &imageExtent,
TextWidgetData *textWidget,
GraphWidgetData *graphWidget,
OverlayWidgetCounts *widgetCounts);
static void AppendVulkanValidationMessageCount(const overlay::Widget *widget,
const gl::Extents &imageExtent,
TextWidgetData *textWidget,
GraphWidgetData *graphWidget,
OverlayWidgetCounts *widgetCounts);
static void AppendVulkanCommandGraphSize(const overlay::Widget *widget,
const gl::Extents &imageExtent,
TextWidgetData *textWidget,
GraphWidgetData *graphWidget,
OverlayWidgetCounts *widgetCounts);
static void AppendVulkanSecondaryCommandBufferPoolWaste(const overlay::Widget *widget,
const gl::Extents &imageExtent,
TextWidgetData *textWidget,
GraphWidgetData *graphWidget,
OverlayWidgetCounts *widgetCounts);
private:
static std::ostream &OutputPerSecond(std::ostream &out, const overlay::PerSecond *perSecond);
static std::ostream &OutputText(std::ostream &out, const overlay::Text *text);
static std::ostream &OutputCount(std::ostream &out, const overlay::Count *count);
static void AppendTextCommon(const overlay::Widget *widget,
const gl::Extents &imageExtent,
const std::string &text,
TextWidgetData *textWidget,
OverlayWidgetCounts *widgetCounts);
static void AppendGraphCommon(const overlay::Widget *widget,
const gl::Extents &imageExtent,
const std::vector<size_t> runningValues,
size_t startIndex,
float scale,
GraphWidgetData *graphWidget,
OverlayWidgetCounts *widgetCounts);
};
void AppendWidgetDataHelper::AppendTextCommon(const overlay::Widget *widget,
const gl::Extents &imageExtent,
const std::string &text,
TextWidgetData *textWidget,
OverlayWidgetCounts *widgetCounts)
{
GetWidgetCoordinates(widget->coords, imageExtent, textWidget->coordinates);
GetWidgetColor(widget->color, textWidget->color);
GetTextFontSize(widget->fontSize, textWidget->fontSize);
GetTextString(text, textWidget->text);
++(*widgetCounts)[WidgetInternalType::Text];
}
void AppendWidgetDataHelper::AppendGraphCommon(const overlay::Widget *widget,
const gl::Extents &imageExtent,
const std::vector<size_t> runningValues,
size_t startIndex,
float scale,
GraphWidgetData *graphWidget,
OverlayWidgetCounts *widgetCounts)
{
const overlay::RunningGraph *widgetAsGraph = static_cast<const overlay::RunningGraph *>(widget);
GetWidgetCoordinates(widget->coords, imageExtent, graphWidget->coordinates);
GetWidgetColor(widget->color, graphWidget->color);
GetGraphValueWidth(widget->coords, widgetAsGraph->runningValues.size(),
&graphWidget->valueWidth);
GetGraphValues(runningValues, startIndex, scale, graphWidget->values);
++(*widgetCounts)[WidgetInternalType::Graph];
}
void AppendWidgetDataHelper::AppendFPS(const overlay::Widget *widget,
const gl::Extents &imageExtent,
TextWidgetData *textWidget,
GraphWidgetData *graphWidget,
OverlayWidgetCounts *widgetCounts)
{
const overlay::PerSecond *fps = static_cast<const overlay::PerSecond *>(widget);
std::ostringstream text;
text << "FPS: ";
OutputPerSecond(text, fps);
AppendTextCommon(widget, imageExtent, text.str(), textWidget, widgetCounts);
}
void AppendWidgetDataHelper::AppendVulkanLastValidationMessage(const overlay::Widget *widget,
const gl::Extents &imageExtent,
TextWidgetData *textWidget,
GraphWidgetData *graphWidget,
OverlayWidgetCounts *widgetCounts)
{
const overlay::Text *lastValidationMessage = static_cast<const overlay::Text *>(widget);
std::ostringstream text;
text << "Last VVL Message: ";
OutputText(text, lastValidationMessage);
AppendTextCommon(widget, imageExtent, text.str(), textWidget, widgetCounts);
}
void AppendWidgetDataHelper::AppendVulkanValidationMessageCount(const overlay::Widget *widget,
const gl::Extents &imageExtent,
TextWidgetData *textWidget,
GraphWidgetData *graphWidget,
OverlayWidgetCounts *widgetCounts)
{
const overlay::Count *validationMessageCount = static_cast<const overlay::Count *>(widget);
std::ostringstream text;
text << "VVL Message Count: ";
OutputCount(text, validationMessageCount);
AppendTextCommon(widget, imageExtent, text.str(), textWidget, widgetCounts);
}
void AppendWidgetDataHelper::AppendVulkanCommandGraphSize(const overlay::Widget *widget,
const gl::Extents &imageExtent,
TextWidgetData *textWidget,
GraphWidgetData *graphWidget,
OverlayWidgetCounts *widgetCounts)
{
const overlay::RunningGraph *commandGraphSize =
static_cast<const overlay::RunningGraph *>(widget);
const size_t maxValue = *std::max_element(commandGraphSize->runningValues.begin(),
commandGraphSize->runningValues.end());
const int32_t graphHeight = std::abs(widget->coords[3] - widget->coords[1]);
const float graphScale = static_cast<float>(graphHeight) / maxValue;
AppendGraphCommon(widget, imageExtent, commandGraphSize->runningValues,
commandGraphSize->lastValueIndex + 1, graphScale, graphWidget, widgetCounts);
if ((*widgetCounts)[WidgetInternalType::Text] <
kWidgetInternalTypeMaxWidgets[WidgetInternalType::Text])
{
std::ostringstream text;
text << "Command Graph Size (Max: " << maxValue << ")";
AppendTextCommon(&commandGraphSize->description, imageExtent, text.str(), textWidget,
widgetCounts);
}
}
void AppendWidgetDataHelper::AppendVulkanSecondaryCommandBufferPoolWaste(
const overlay::Widget *widget,
const gl::Extents &imageExtent,
TextWidgetData *textWidget,
GraphWidgetData *graphWidget,
OverlayWidgetCounts *widgetCounts)
{
const overlay::RunningHistogram *secondaryCommandBufferPoolWaste =
static_cast<const overlay::RunningHistogram *>(widget);
std::vector<size_t> histogram = CreateHistogram(secondaryCommandBufferPoolWaste->runningValues);
auto maxValueIter = std::max_element(histogram.rbegin(), histogram.rend());
const size_t maxValue = *maxValueIter;
const int32_t graphHeight = std::abs(widget->coords[3] - widget->coords[1]);
const float graphScale = static_cast<float>(graphHeight) / maxValue;
AppendGraphCommon(widget, imageExtent, histogram, 0, graphScale, graphWidget, widgetCounts);
if ((*widgetCounts)[WidgetInternalType::Text] <
kWidgetInternalTypeMaxWidgets[WidgetInternalType::Text])
{
std::ostringstream text;
size_t peak = std::distance(maxValueIter, histogram.rend() - 1);
size_t peakPercent = (peak * 100 + 50) / histogram.size();
text << "CB Pool Waste (Peak: " << peakPercent << "%)";
AppendTextCommon(&secondaryCommandBufferPoolWaste->description, imageExtent, text.str(),
textWidget, widgetCounts);
}
}
std::ostream &AppendWidgetDataHelper::OutputPerSecond(std::ostream &out,
const overlay::PerSecond *perSecond)
{
return out << perSecond->lastPerSecondCount;
}
std::ostream &AppendWidgetDataHelper::OutputText(std::ostream &out, const overlay::Text *text)
{
return out << text->text;
}
std::ostream &AppendWidgetDataHelper::OutputCount(std::ostream &out, const overlay::Count *count)
{
return out << count->count;
}
} // namespace overlay_impl
namespace
{
constexpr angle::PackedEnumMap<WidgetId, AppendWidgetDataFunc> kWidgetIdToAppendDataFuncMap = {
{WidgetId::FPS, overlay_impl::AppendWidgetDataHelper::AppendFPS},
{WidgetId::VulkanLastValidationMessage,
overlay_impl::AppendWidgetDataHelper::AppendVulkanLastValidationMessage},
{WidgetId::VulkanValidationMessageCount,
overlay_impl::AppendWidgetDataHelper::AppendVulkanValidationMessageCount},
{WidgetId::VulkanCommandGraphSize,
overlay_impl::AppendWidgetDataHelper::AppendVulkanCommandGraphSize},
{WidgetId::VulkanSecondaryCommandBufferPoolWaste,
overlay_impl::AppendWidgetDataHelper::AppendVulkanSecondaryCommandBufferPoolWaste},
};
}
namespace overlay
{
RunningGraph::RunningGraph(size_t n) : runningValues(n, 0) {}
RunningGraph::~RunningGraph() = default;
} // namespace overlay
size_t OverlayState::getWidgetCoordinatesBufferSize() const
{
return sizeof(WidgetCoordinates);
}
size_t OverlayState::getTextWidgetsBufferSize() const
{
return sizeof(TextWidgets);
}
size_t OverlayState::getGraphWidgetsBufferSize() const
{
return sizeof(GraphWidgets);
}
void OverlayState::fillEnabledWidgetCoordinates(const gl::Extents &imageExtents,
uint8_t *enabledWidgetsPtr) const
{
WidgetCoordinates *enabledWidgets = reinterpret_cast<WidgetCoordinates *>(enabledWidgetsPtr);
memset(enabledWidgets, 0, sizeof(*enabledWidgets));
OverlayWidgetCounts widgetCounts = {};
for (const std::unique_ptr<overlay::Widget> &widget : mOverlayWidgets)
{
if (!widget->enabled)
{
continue;
}
WidgetInternalType internalType = kWidgetTypeToInternalMap[widget->type];
ASSERT(internalType != WidgetInternalType::InvalidEnum);
if (widgetCounts[internalType] >= kWidgetInternalTypeMaxWidgets[internalType])
{
continue;
}
size_t writeIndex =
kWidgetInternalTypeWidgetOffsets[internalType] + widgetCounts[internalType]++;
GetWidgetCoordinates(widget->coords, imageExtents, enabledWidgets->coordinates[writeIndex]);
// Graph widgets have a text widget attached as well.
if (internalType == WidgetInternalType::Graph)
{
WidgetInternalType textType = WidgetInternalType::Text;
if (widgetCounts[textType] >= kWidgetInternalTypeMaxWidgets[textType])
{
continue;
}
const overlay::RunningGraph *widgetAsGraph =
static_cast<const overlay::RunningGraph *>(widget.get());
writeIndex = kWidgetInternalTypeWidgetOffsets[textType] + widgetCounts[textType]++;
GetWidgetCoordinates(widgetAsGraph->description.coords, imageExtents,
enabledWidgets->coordinates[writeIndex]);
}
}
}
void OverlayState::fillWidgetData(const gl::Extents &imageExtents,
uint8_t *textData,
uint8_t *graphData) const
{
TextWidgets *textWidgets = reinterpret_cast<TextWidgets *>(textData);
GraphWidgets *graphWidgets = reinterpret_cast<GraphWidgets *>(graphData);
memset(textWidgets, overlay::kFontCharacters, sizeof(*textWidgets));
memset(graphWidgets, 0, sizeof(*graphWidgets));
OverlayWidgetCounts widgetCounts = {};
for (WidgetId id : angle::AllEnums<WidgetId>())
{
const std::unique_ptr<overlay::Widget> &widget = mOverlayWidgets[id];
if (!widget->enabled)
{
continue;
}
WidgetInternalType internalType = kWidgetTypeToInternalMap[widget->type];
ASSERT(internalType != WidgetInternalType::InvalidEnum);
if (widgetCounts[internalType] >= kWidgetInternalTypeMaxWidgets[internalType])
{
continue;
}
AppendWidgetDataFunc appendFunc = kWidgetIdToAppendDataFuncMap[id];
appendFunc(widget.get(), imageExtents,
&textWidgets->widgets[widgetCounts[WidgetInternalType::Text]],
&graphWidgets->widgets[widgetCounts[WidgetInternalType::Graph]], &widgetCounts);
}
}
} // namespace gl