From eb71aaf689b40a9973dbf27eb585c941ad9df5ee Mon Sep 17 00:00:00 2001 From: Stephen White Date: Wed, 17 Feb 2021 17:07:08 +0000 Subject: [PATCH] Implement a --backend= flag for DawnTest. This version renames HasBackendType() -> HasBackendTypeFilter() and adds a test, similar to HasVendorIdFilter(). Bug: dawn:687 Change-Id: I444d3cb668eb7402ba45f14aaec290390f4c3944 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/41900 Reviewed-by: Austin Eng Commit-Queue: Stephen White --- src/tests/DawnTest.cpp | 69 +++++++++++++++++++++++++++----- src/tests/DawnTest.h | 7 ++++ src/tests/end2end/BasicTests.cpp | 7 ++++ 3 files changed, 72 insertions(+), 11 deletions(-) diff --git a/src/tests/DawnTest.cpp b/src/tests/DawnTest.cpp index e2c06665dc..8de73b8a29 100644 --- a/src/tests/DawnTest.cpp +++ b/src/tests/DawnTest.cpp @@ -329,11 +329,37 @@ void DawnTestEnvironment::ParseArgs(int argc, char** argv) { continue; } + constexpr const char kBackendArg[] = "--backend="; + argLen = sizeof(kBackendArg) - 1; + if (strncmp(argv[i], kBackendArg, argLen) == 0) { + const char* param = argv[i] + argLen; + if (strcmp("d3d12", param) == 0) { + mBackendTypeFilter = wgpu::BackendType::D3D12; + } else if (strcmp("metal", param) == 0) { + mBackendTypeFilter = wgpu::BackendType::Metal; + } else if (strcmp("null", param) == 0) { + mBackendTypeFilter = wgpu::BackendType::Null; + } else if (strcmp("opengl", param) == 0) { + mBackendTypeFilter = wgpu::BackendType::OpenGL; + } else if (strcmp("opengles", param) == 0) { + mBackendTypeFilter = wgpu::BackendType::OpenGLES; + } else if (strcmp("vulkan", param) == 0) { + mBackendTypeFilter = wgpu::BackendType::Vulkan; + } else { + dawn::ErrorLog() + << "Invalid backend \"" << param + << "\". Valid backends are: d3d12, metal, null, opengl, opengles, vulkan."; + UNREACHABLE(); + } + mHasBackendTypeFilter = true; + continue; + } if (strcmp("-h", argv[i]) == 0 || strcmp("--help", argv[i]) == 0) { dawn::InfoLog() << "\n\nUsage: " << argv[0] << " [GTEST_FLAGS...] [-w] [-c]\n" " [--enable-toggles=toggles] [--disable-toggles=toggles]\n" + " [--backend=x]\n" " [--adapter-vendor-id=x] " "[--enable-backend-validation[=full,partial,disabled]]\n" " [--exclusive-device-type-preference=integrated,cpu,discrete]\n\n" @@ -349,6 +375,8 @@ void DawnTestEnvironment::ParseArgs(int argc, char** argv) { " --disable-toggles: Comma-delimited list of Dawn toggles to disable\n" " --adapter-vendor-id: Select adapter by vendor id to run end2end tests" "on multi-GPU systems \n" + " --backend: Select adapter by backend type. Valid backends are: d3d12, metal, " + "null, opengl, opengles, vulkan\n" " --exclusive-device-type-preference: Comma-delimited list of preferred device " "types. For each backend, tests will run only on adapters that match the first " "available device type\n"; @@ -437,20 +465,26 @@ void DawnTestEnvironment::SelectPreferredAdapterProperties(const dawn_native::In wgpu::AdapterProperties properties; adapter.GetProperties(&properties); - // The adapter is selected if: - bool selected = false; + // All adapters are selected by default. + bool selected = true; + // The adapter is deselected if: + if (mHasBackendTypeFilter) { + // It doesn't match the backend type, if present. + selected &= properties.backendType == mBackendTypeFilter; + } if (mHasVendorIdFilter) { - // It matches the vendor id, if present. - selected = mVendorIdFilter == properties.vendorID; + // It doesn't match the vendor id, if present. + selected &= mVendorIdFilter == properties.vendorID; if (!mDevicePreferences.empty()) { dawn::WarningLog() << "Vendor ID filter provided. Ignoring device type preference."; } - } else if (hasDevicePreference) { + } + if (hasDevicePreference) { // There is a device preference and: - selected = - // The device type matches the first available preferred type for that backend, if - // present. + selected &= + // The device type doesn't match the first available preferred type for that + // backend, if present. (adapter.GetDeviceType() == preferredDeviceType) || // Always select Unknown OpenGL adapters if we don't want a CPU adapter. // OpenGL will usually be unknown because we can't query the device type. @@ -463,9 +497,6 @@ void DawnTestEnvironment::SelectPreferredAdapterProperties(const dawn_native::In // quickly. This is temporary as to not lose coverage. We can group it with // Swiftshader as a CPU adapter when we have Swiftshader tests. (properties.backendType == wgpu::BackendType::Null); - } else { - // No vendor id or device preference was provided (select all). - selected = true; } // In Windows Remote Desktop sessions we may be able to discover multiple adapters that @@ -610,6 +641,14 @@ uint32_t DawnTestEnvironment::GetVendorIdFilter() const { return mVendorIdFilter; } +bool DawnTestEnvironment::HasBackendTypeFilter() const { + return mHasBackendTypeFilter; +} + +wgpu::BackendType DawnTestEnvironment::GetBackendTypeFilter() const { + return mBackendTypeFilter; +} + const char* DawnTestEnvironment::GetWireTraceDir() const { if (mWireTraceDir.length() == 0) { return nullptr; @@ -765,6 +804,14 @@ uint32_t DawnTestBase::GetVendorIdFilter() const { return gTestEnv->GetVendorIdFilter(); } +bool DawnTestBase::HasBackendTypeFilter() const { + return gTestEnv->HasBackendTypeFilter(); +} + +wgpu::BackendType DawnTestBase::GetBackendTypeFilter() const { + return gTestEnv->GetBackendTypeFilter(); +} + wgpu::Instance DawnTestBase::GetInstance() const { return gTestEnv->GetInstance()->Get(); } diff --git a/src/tests/DawnTest.h b/src/tests/DawnTest.h index 7224fa6054..f342506e6c 100644 --- a/src/tests/DawnTest.h +++ b/src/tests/DawnTest.h @@ -210,6 +210,8 @@ class DawnTestEnvironment : public testing::Environment { dawn_native::Instance* GetInstance() const; bool HasVendorIdFilter() const; uint32_t GetVendorIdFilter() const; + bool HasBackendTypeFilter() const; + wgpu::BackendType GetBackendTypeFilter() const; const char* GetWireTraceDir() const; GLFWwindow* GetOpenGLWindow() const; GLFWwindow* GetOpenGLESWindow() const; @@ -232,6 +234,8 @@ class DawnTestEnvironment : public testing::Environment { bool mBeginCaptureOnStartup = false; bool mHasVendorIdFilter = false; uint32_t mVendorIdFilter = 0; + bool mHasBackendTypeFilter = false; + wgpu::BackendType mBackendTypeFilter; std::string mWireTraceDir; std::vector mEnabledToggles; @@ -289,6 +293,9 @@ class DawnTestBase { bool HasVendorIdFilter() const; uint32_t GetVendorIdFilter() const; + bool HasBackendTypeFilter() const; + wgpu::BackendType GetBackendTypeFilter() const; + wgpu::Instance GetInstance() const; dawn_native::Adapter GetAdapter() const; diff --git a/src/tests/end2end/BasicTests.cpp b/src/tests/end2end/BasicTests.cpp index 0f39dec657..e8f4d8a945 100644 --- a/src/tests/end2end/BasicTests.cpp +++ b/src/tests/end2end/BasicTests.cpp @@ -25,6 +25,13 @@ TEST_P(BasicTests, VendorIdFilter) { ASSERT_EQ(GetAdapterProperties().vendorID, GetVendorIdFilter()); } +// Test adapter filter by backend type. +TEST_P(BasicTests, BackendType) { + DAWN_SKIP_TEST_IF(!HasBackendTypeFilter()); + + ASSERT_EQ(GetAdapterProperties().backendType, GetBackendTypeFilter()); +} + // Test Queue::WriteBuffer changes the content of the buffer, but really this is the most // basic test possible, and tests the test harness TEST_P(BasicTests, QueueWriteBuffer) {