Add hardware monitoring to skpbench

tools/skpbench/skpbench.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrContextFactory.h"
 #include "SkCanvas.h"
 #include "SkOSFile.h"
@@ skipping 168 matching lines @@
                         "using %i so there can be a true median.\n",
                         FLAGS_samples, FLAGS_samples + 1);
         ++FLAGS_samples;
     }
 
     // Parse the config.
     const SkCommandLineConfigGpu* config = nullptr; // Initialize for spurious warning.
     SkCommandLineConfigArray configs;
     ParseConfigs(FLAGS_config, &configs);
     if (configs.count() != 1 || !(config = configs[0]->asConfigGpu())) {
-        exitf(ExitErr::kUsage, "invalid config %s; must specify one (and only one) GPU config",
+        exitf(ExitErr::kUsage, "invalid config %s, must specify one (and only one) GPU config",
                                join(FLAGS_config).c_str());
     }
 
     // Parse the skp.
     if (FLAGS_skp.count() != 1) {
-        exitf(ExitErr::kUsage, "invalid skp \"%s\"; one (and only one) skp must be specified.",
+        exitf(ExitErr::kUsage, "invalid skp %s, must specify (and only one) skp path name.",
                                join(FLAGS_skp).c_str());
     }
     const char* skpfile = FLAGS_skp[0];
     std::unique_ptr<SkStream> skpstream(SkStream::MakeFromFile(skpfile));
     if (!skpstream) {
         exitf(ExitErr::kIO, "failed to open skp file %s", skpfile);
     }
     sk_sp<SkPicture> skp = SkPicture::MakeFromStream(skpstream.get());
     if (!skp) {
         exitf(ExitErr::kData, "failed to parse skp file %s", skpfile);
     }
     int width = SkTMin(SkScalarCeilToInt(skp->cullRect().width()), 2048),
         height = SkTMin(SkScalarCeilToInt(skp->cullRect().height()), 2048);
-    if (FLAGS_verbosity >= 2 &&
+    if (FLAGS_verbosity >= 3 &&
         (width != skp->cullRect().width() || height != skp->cullRect().height())) {
-        fprintf(stderr, "NOTE: %s is too large (%ix%i); cropping to %ix%i.\n",
-                        skpfile, SkScalarCeilToInt(skp->cullRect().width()),
+        fprintf(stderr, "%s is too large (%ix%i), cropping to %ix%i.\n",
+                        SkOSPath::Basename(skpfile).c_str(),
+                        SkScalarCeilToInt(skp->cullRect().width()),
                         SkScalarCeilToInt(skp->cullRect().height()), width, height);
     }
 
     // Create a context.
     sk_gpu_test::GrContextFactory factory;
     sk_gpu_test::ContextInfo ctxInfo =
         factory.getContextInfo(config->getContextType(), config->getContextOptions());
     GrContext* ctx = ctxInfo.grContext();
     if (!ctx) {
         exitf(ExitErr::kUnavailable, "failed to create context for config %s",
@@ skipping 94 matching lines @@
 
 static void exitf(ExitErr err, const char* format, ...) {
     fprintf(stderr, ExitErr::kSoftware == err ? "INTERNAL ERROR: " : "ERROR: ");
     va_list args;
     va_start(args, format);
     vfprintf(stderr, format, args);
     va_end(args);
     fprintf(stderr, ExitErr::kSoftware == err ? "; this should never happen.\n": ".\n");
     exit((int)err);
 }