Add config options to run different GPU APIs to dm and nanobench

tests/TestConfigParsing.cpp

+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkCommonFlagsConfig.h"
+#include "Test.h"
+
+DEF_TEST(ParseConfigs_Gpu, reporter) {
+    // Parses a normal config and returs correct "tag".

[bsalomon, 2015/12/02 23:22:42]

returns

[Kimmo Kinnunen, 2015/12/04 14:26:18]

Done.

+    // Gpu config defaults work.
+    DEFINE_string(config1, "gpu", "");
+    SkCommandLineConfigArray configs;
+    ParseConfigs(FLAGS_config1, &configs);
+
+    REPORTER_ASSERT(reporter, configs.count() == 1);
+    REPORTER_ASSERT(reporter, configs[0]->getTag().equals("gpu"));
+    REPORTER_ASSERT(reporter, configs[0]->getViaParts().count() == 0);
+#if SK_SUPPORT_GPU
+    REPORTER_ASSERT(reporter, configs[0]->asConfigGpu());
+    REPORTER_ASSERT(reporter, configs[0]->asConfigGpu()->getAPI() == SkCommandLineConfigGpu::kNative_API);
+    REPORTER_ASSERT(reporter, configs[0]->asConfigGpu()->getUseNVPR() == false);
+    REPORTER_ASSERT(reporter, configs[0]->asConfigGpu()->getUseDIText() == false);
+    REPORTER_ASSERT(reporter, configs[0]->asConfigGpu()->getSamples() == 0);
+#endif
+}
+
+DEF_TEST(ParseConfigs_OutParam, reporter) {
+    // Clears the out parameter.
+    DEFINE_string(config1, "gpu", "");
+    SkCommandLineConfigArray configs;
+    ParseConfigs(FLAGS_config1, &configs);
+    REPORTER_ASSERT(reporter, configs.count() == 1);
+    REPORTER_ASSERT(reporter, configs[0]->getTag().equals("gpu"));
+    DEFINE_string(config2, "8888", "");
+    ParseConfigs(FLAGS_config2, &configs);
+    REPORTER_ASSERT(reporter, configs.count() == 1);
+    REPORTER_ASSERT(reporter, configs[0]->getTag().equals("8888"));
+}
+
+DEF_TEST(ParseConfigs_DefaultConfigs, reporter) {
+    // Parses all default configs and returns correct "tag".
+
+    DEFINE_string(config1, "565 8888 debug gpu gpudebug gpudft gpunull "
+                  "msaa16 msaa4 nonrendering null nullgpu nvprmsaa16 nvprmsaa4 "
+                  "pdf pdf_poppler skp svg xps angle angle-gl commandbuffer "
+                  "mesa hwui", "");
+
+    SkCommandLineConfigArray configs;
+    ParseConfigs(FLAGS_config1, &configs);
+
+    const char* expectedConfigs[] = {
+        "565", "8888", "debug", "gpu", "gpudebug", "gpudft", "gpunull", "msaa16", "msaa4",
+        "nonrendering", "null", "nullgpu", "nvprmsaa16", "nvprmsaa4", "pdf", "pdf_poppler",
+        "skp", "svg", "xps", "angle", "angle-gl", "commandbuffer", "mesa", "hwui"
+    };
+    REPORTER_ASSERT(reporter, configs.count() == SK_ARRAY_COUNT(expectedConfigs));
+    for (size_t i = 0; i < SK_ARRAY_COUNT(expectedConfigs); ++i) {
+        REPORTER_ASSERT(reporter, configs[i]->getTag().equals(expectedConfigs[i]));
+        REPORTER_ASSERT(reporter, configs[i]->getViaParts().count() == 0);
+    }
+#if SK_SUPPORT_GPU
+    REPORTER_ASSERT(reporter, !configs[0]->asConfigGpu());
+    REPORTER_ASSERT(reporter, !configs[1]->asConfigGpu());
+    REPORTER_ASSERT(reporter, configs[2]->asConfigGpu());
+    REPORTER_ASSERT(reporter, configs[3]->asConfigGpu());
+    REPORTER_ASSERT(reporter, configs[4]->asConfigGpu());
+    REPORTER_ASSERT(reporter, configs[5]->asConfigGpu()->getUseDIText());
+    REPORTER_ASSERT(reporter, configs[6]->asConfigGpu());
+    REPORTER_ASSERT(reporter, configs[7]->asConfigGpu()->getSamples() == 16);
+    REPORTER_ASSERT(reporter, configs[8]->asConfigGpu()->getSamples() == 4);
+    REPORTER_ASSERT(reporter, !configs[9]->asConfigGpu());
+    REPORTER_ASSERT(reporter, configs[10]->asConfigGpu());
+    REPORTER_ASSERT(reporter, configs[11]->asConfigGpu());
+    REPORTER_ASSERT(reporter, configs[12]->asConfigGpu()->getSamples() == 16);
+    REPORTER_ASSERT(reporter, configs[12]->asConfigGpu()->getUseNVPR());
+    REPORTER_ASSERT(reporter, configs[13]->asConfigGpu()->getSamples() == 4);
+    REPORTER_ASSERT(reporter, configs[13]->asConfigGpu()->getUseNVPR());
+    REPORTER_ASSERT(reporter, !configs[14]->asConfigGpu());
+    REPORTER_ASSERT(reporter, !configs[15]->asConfigGpu());
+    REPORTER_ASSERT(reporter, !configs[16]->asConfigGpu());
+    REPORTER_ASSERT(reporter, !configs[17]->asConfigGpu());
+    REPORTER_ASSERT(reporter, !configs[18]->asConfigGpu());
+    REPORTER_ASSERT(reporter, !configs[23]->asConfigGpu());
+#if SK_ANGLE
+    REPORTER_ASSERT(reporter, configs[19]->asConfigGpu());
+    REPORTER_ASSERT(reporter, configs[20]->asConfigGpu());
+#else
+    REPORTER_ASSERT(reporter, !configs[19]->asConfigGpu());
+    REPORTER_ASSERT(reporter, !configs[20]->asConfigGpu());
+#endif
+#if SK_COMMAND_BUFFER
+    REPORTER_ASSERT(reporter, configs[21]->asConfigGpu());
+#else
+    REPORTER_ASSERT(reporter, !configs[21]->asConfigGpu());
+#endif
+#if SK_MESA
+    REPORTER_ASSERT(reporter, configs[22]->asConfigGpu());
+#else
+    REPORTER_ASSERT(reporter, !configs[22]->asConfigGpu());
+#endif
+#endif
+}
+
+DEF_TEST(ParseConfigs_ExtendedGpuConfigsCorrect, reporter) {
+    DEFINE_string(config1, "gpu(nvpr=true,dit=true) gpu(api=angle) gpu(api=angle-gl) "
+                  "gpu(api=mesa,samples=77) gpu(dit=true,api=commandbuffer) gpu() gpu(api=gles)", "");
+
+    SkCommandLineConfigArray configs;
+    ParseConfigs(FLAGS_config1, &configs);
+    const char* expectedTags[] = {
+        "gpu(nvpr=true,dit=true)",
+        "gpu(api=angle)",
+        "gpu(api=angle-gl)",
+        "gpu(api=mesa,samples=77)",
+        "gpu(dit=true,api=commandbuffer)",
+        "gpu()",
+        "gpu(api=gles)"
+    };
+    REPORTER_ASSERT(reporter, configs.count() == SK_ARRAY_COUNT(expectedTags));
+    for (size_t i = 0; i < SK_ARRAY_COUNT(expectedTags); ++i) {
+        REPORTER_ASSERT(reporter, configs[i]->getTag().equals(expectedTags[i]));
+    }
+#if SK_SUPPORT_GPU
+    REPORTER_ASSERT(reporter, configs[0]->asConfigGpu()->getAPI() ==
+                    SkCommandLineConfigGpu::kNative_API);
+    REPORTER_ASSERT(reporter, configs[0]->asConfigGpu()->getUseNVPR());
+    REPORTER_ASSERT(reporter, configs[0]->asConfigGpu()->getUseDIText());
+    REPORTER_ASSERT(reporter, configs[0]->asConfigGpu()->getSamples() == 0);
+#if SK_ANGLE
+    REPORTER_ASSERT(reporter, configs[1]->asConfigGpu()->getAPI() ==
+                    SkCommandLineConfigGpu::kANGLE_API);
+    REPORTER_ASSERT(reporter, configs[2]->asConfigGpu()->getAPI() ==
+                    SkCommandLineConfigGpu::kANGLE_GL_API);
+#else
+    REPORTER_ASSERT(reporter, !configs[1]->asConfigGpu());
+    REPORTER_ASSERT(reporter, !configs[2]->asConfigGpu());
+#endif
+#if SK_MESA
+    REPORTER_ASSERT(reporter, configs[3]->asConfigGpu()->getAPI() ==
+                    SkCommandLineConfigGpu::kMESA_API);
+#else
+    REPORTER_ASSERT(reporter, !configs[3]->asConfigGpu());
+#endif
+#if SK_COMMAND_BUFFER
+    REPORTER_ASSERT(reporter, configs[4]->asConfigGpu()->getAPI() ==
+                    SkCommandLineConfigGpu::kCommandBuffer_API);
+
+#else
+    REPORTER_ASSERT(reporter, !configs[4]->asConfigGpu());
+#endif
+    REPORTER_ASSERT(reporter, configs[5]->asConfigGpu()->getAPI() ==
+                    SkCommandLineConfigGpu::kNative_API);
+    REPORTER_ASSERT(reporter, !configs[5]->asConfigGpu()->getUseNVPR());
+    REPORTER_ASSERT(reporter, !configs[5]->asConfigGpu()->getUseDIText());
+    REPORTER_ASSERT(reporter, configs[5]->asConfigGpu()->getSamples() == 0);
+    REPORTER_ASSERT(reporter, configs[6]->asConfigGpu()->getAPI() ==
+                    SkCommandLineConfigGpu::kGLES_API);
+    REPORTER_ASSERT(reporter, !configs[6]->asConfigGpu()->getUseNVPR());
+    REPORTER_ASSERT(reporter, !configs[6]->asConfigGpu()->getUseDIText());
+    REPORTER_ASSERT(reporter, configs[6]->asConfigGpu()->getSamples() == 0);
+
+#endif
+}
+
+DEF_TEST(ParseConfigs_ExtendedGpuConfigsIncorrect, reporter) {
+    DEFINE_string(config1, "gpu(nvpr=1) gpu(api=gl,) gpu(api=angle-glu) "
+                  "gpu(api=,samples=0) gpu(samples=true) gpu(samples=0,samples=0) "
+                  "gpu(,samples=0) gpu(samples=54 ,, gpu( samples=54", "");
+
+    SkCommandLineConfigArray configs;
+    ParseConfigs(FLAGS_config1, &configs);
+    const char* expectedTags[] = {
+        "gpu(nvpr=1)", // Number as bool.
+        "gpu(api=gl,)", // Trailing in comma.
+        "gpu(api=angle-glu)", // Unknown api.
+        "gpu(api=,samples=0)", // Empty api.
+        "gpu(samples=true)", // Value true as a number.
+        "gpu(samples=0,samples=0)", // Duplicate option key.
+        "gpu(,samples=0)", // Leading comma.
+        "gpu(samples=54", // Missing closing parenthesis.
+        ",,",
+        "gpu(", // Missing parenthesis.
+        "samples=54" // No backend.
+    };
+    REPORTER_ASSERT(reporter, configs.count() == SK_ARRAY_COUNT(expectedTags));
+    for (size_t i = 0; i < SK_ARRAY_COUNT(expectedTags); ++i) {
+        REPORTER_ASSERT(reporter, configs[i]->getTag().equals(expectedTags[i]));
+#if SK_SUPPORT_GPU
+        REPORTER_ASSERT(reporter, !configs[i]->asConfigGpu());
+#endif
+    }
+}
+
+
+DEF_TEST(ParseConfigs_ExtendedGpuConfigsSurprises, reporter) {
+    // These just list explicitly some properties of the system.
+    DEFINE_string(config1, "gpu(nvpr=true,dit=true) gpu(dit=true,nvpr=true) "
+                  "gpu(api=native) gpu(api=gl) gpu(api=gles) "
+                  "gpu gpu() gpu(samples=0) gpu(api=native,samples=0)", "");
+
+    SkCommandLineConfigArray configs;
+    ParseConfigs(FLAGS_config1, &configs);
+    const char* expectedTags[] = {
+        // Options are not canonized -> two same configs have a different tag.
+        "gpu(nvpr=true,dit=true)", "gpu(dit=true,nvpr=true)",
+        // API native is alias for gl or gles, but it's not canonized -> different tag.
+        "gpu(api=native)", "gpu(api=gl)", "gpu(api=gles)", ""
+        // Default values are not canonized -> different tag.
+        "gpu", "gpu()", "gpu(samples=0)", "gpu(api=native,samples=0)"
+    };
+    REPORTER_ASSERT(reporter, configs.count() == SK_ARRAY_COUNT(expectedTags));
+    for (size_t i = 0; i < SK_ARRAY_COUNT(expectedTags); ++i) {
+        REPORTER_ASSERT(reporter, configs[i]->getTag().equals(expectedTags[i]));
+#if SK_SUPPORT_GPU
+        REPORTER_ASSERT(reporter, configs[i]->asConfigGpu());
+#endif
+    }
+}
+DEF_TEST(ParseConfigs_ViaParsing, reporter) {
+    DEFINE_string(config1, "a-b-c-33-8888 zz-qq-gpu a-angle-gl", "");
+
+    SkCommandLineConfigArray configs;
+    ParseConfigs(FLAGS_config1, &configs);
+    const struct {
+        const char* tag;
+        const char* vias[3];
+    } expectedConfigs[] = {
+        { "8888", {"a", "b", "c"}},
+        { "gpu", {"zz", "qq", nullptr}},
+        { "angle-gl", {"a", nullptr, nullptr } } // The angle-gl tag is only tag that contains
+                                                 // hyphen.
+    };
+    for (size_t i = 0; i < SK_ARRAY_COUNT(expectedConfigs); ++i) {
+        REPORTER_ASSERT(reporter, configs[i]->getTag().equals(expectedConfigs[i].tag));
+        for (size_t j = 0; j < SK_ARRAY_COUNT(expectedConfigs[i].vias); ++j) {
+            if (!expectedConfigs[i].vias[j]) {
+                REPORTER_ASSERT(reporter, configs[i]->getViaParts().count() == static_cast<int>(j));
+                break;
+            }
+            REPORTER_ASSERT(reporter, configs[i]->getViaParts()[j].equals(expectedConfigs[i].vias[j]));
+        }
+    }
+}
+
+DEF_TEST(ParseConfigs_ViaParsingExtendedForm, reporter) {
+    DEFINE_string(config1, "zz-qq-gpu(api=gles) a-gpu(samples=1", "");
+
+    SkCommandLineConfigArray configs;
+    ParseConfigs(FLAGS_config1, &configs);
+    const struct {
+        const char* tag;
+        const char* vias[3];
+    } expectedConfigs[] = {
+        { "gpu(api=gles)", {"zz", "qq", nullptr}},
+        { "gpu(samples=1", {"a", nullptr, nullptr } } // This is not extended form, but via still
+                                                      // works as expected.
+    };
+    for (size_t i = 0; i < SK_ARRAY_COUNT(expectedConfigs); ++i) {
+        REPORTER_ASSERT(reporter, configs[i]->getTag().equals(expectedConfigs[i].tag));
+        for (size_t j = 0; j < SK_ARRAY_COUNT(expectedConfigs[i].vias); ++j) {
+            if (!expectedConfigs[i].vias[j]) {
+                REPORTER_ASSERT(reporter, configs[i]->getViaParts().count() == static_cast<int>(j));
+                break;
+            }
+            REPORTER_ASSERT(reporter, configs[i]->getViaParts()[j].equals(expectedConfigs[i].vias[j]));
+        }
+    }
+#if SK_SUPPORT_GPU
+    REPORTER_ASSERT(reporter, configs[0]->asConfigGpu());
+    REPORTER_ASSERT(reporter, !configs[1]->asConfigGpu());
+#endif
+}