Check Query API feature support by GPU counter on Metal

Currently we use gpu family to determine whether a query extension is
supported. The official document provides a way to check the feature
support by GPU counter. Update checking following the official guide.

Bug: dawn:996
Change-Id: I09cf51ed8a8209642eed71c9e4592f6eab82bfa5
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/60360
Commit-Queue: Hao Li <hao.x.li@intel.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
This commit is contained in:
Li Hao 2021-08-27 04:20:21 +00:00 committed by Dawn LUCI CQ
parent 086c44ee73
commit c31b16f5dc
1 changed files with 71 additions and 2 deletions

View File

@ -28,6 +28,8 @@
# include "common/IOKitRef.h" # include "common/IOKitRef.h"
#endif #endif
#include <vector>
namespace dawn_native { namespace metal { namespace dawn_native { namespace metal {
namespace { namespace {
@ -168,6 +170,66 @@ namespace dawn_native { namespace metal {
#else #else
# error "Unsupported Apple platform." # error "Unsupported Apple platform."
#endif #endif
bool IsCounterSamplingBoundarySupport(id<MTLDevice> device)
API_AVAILABLE(macos(11.0), ios(14.0)) {
bool isBlitBoundarySupported =
[device supportsCounterSampling:MTLCounterSamplingPointAtBlitBoundary];
bool isDispatchBoundarySupported =
[device supportsCounterSampling:MTLCounterSamplingPointAtDispatchBoundary];
bool isDrawBoundarySupported =
[device supportsCounterSampling:MTLCounterSamplingPointAtDrawBoundary];
return isBlitBoundarySupported && isDispatchBoundarySupported &&
isDrawBoundarySupported;
}
bool IsGPUCounterSupported(id<MTLDevice> device,
MTLCommonCounterSet counterSetName,
std::vector<MTLCommonCounter> counters)
API_AVAILABLE(macos(10.15), ios(14.0)) {
// MTLDevices counterSets property declares which counter sets it supports. Check
// whether it's available on the device before requesting a counter set.
id<MTLCounterSet> counterSet = nil;
for (id<MTLCounterSet> set in device.counterSets) {
if ([set.name caseInsensitiveCompare:counterSetName] == NSOrderedSame) {
counterSet = set;
break;
}
}
// The counter set is not supported.
if (counterSet == nil) {
return false;
}
// A GPU might support a counter set, but only support a subset of the counters in that
// set, check if the counter set supports all specific counters we need. Return false
// if there is a counter unsupported.
std::vector<NSString*> supportedCounters;
for (id<MTLCounter> counter in counterSet.counters) {
supportedCounters.push_back(counter.name);
}
for (const auto& counterName : counters) {
if (std::find(supportedCounters.begin(), supportedCounters.end(), counterName) ==
supportedCounters.end()) {
return false;
}
}
if (@available(macOS 11.0, iOS 14.0, *)) {
// Check whether it can read GPU counters at the specified command boundary. Apple
// family GPUs do not support sampling between different Metal commands, because
// they defer fragment processing until after the GPU processes all the primitives
// in the render pass.
if (!IsCounterSamplingBoundarySupport(device)) {
return false;
}
}
return true;
}
} // anonymous namespace } // anonymous namespace
// The Metal backend's Adapter. // The Metal backend's Adapter.
@ -224,10 +286,16 @@ namespace dawn_native { namespace metal {
#endif #endif
if (@available(macOS 10.15, iOS 14.0, *)) { if (@available(macOS 10.15, iOS 14.0, *)) {
if ([*mDevice supportsFamily:MTLGPUFamilyMac2] || if (IsGPUCounterSupported(
[*mDevice supportsFamily:MTLGPUFamilyApple5]) { *mDevice, MTLCommonCounterSetStatistic,
{MTLCommonCounterVertexInvocations, MTLCommonCounterClipperInvocations,
MTLCommonCounterClipperPrimitivesOut, MTLCommonCounterFragmentInvocations,
MTLCommonCounterComputeKernelInvocations})) {
mSupportedExtensions.EnableExtension(Extension::PipelineStatisticsQuery); mSupportedExtensions.EnableExtension(Extension::PipelineStatisticsQuery);
}
if (IsGPUCounterSupported(*mDevice, MTLCommonCounterSetTimestamp,
{MTLCommonCounterTimestamp})) {
// Disable timestamp query on macOS 10.15 on AMD GPU because WriteTimestamp // Disable timestamp query on macOS 10.15 on AMD GPU because WriteTimestamp
// fails to call without any copy commands on MTLBlitCommandEncoder. This issue // fails to call without any copy commands on MTLBlitCommandEncoder. This issue
// has been fixed on macOS 11.0. See crbug.com/dawn/545 // has been fixed on macOS 11.0. See crbug.com/dawn/545
@ -242,6 +310,7 @@ namespace dawn_native { namespace metal {
} }
} }
} }
if (@available(macOS 10.11, iOS 11.0, *)) { if (@available(macOS 10.11, iOS 11.0, *)) {
mSupportedExtensions.EnableExtension(Extension::DepthClamping); mSupportedExtensions.EnableExtension(Extension::DepthClamping);
} }