AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

have FM run GMs in command line order

Browse Source 
Compare running

   $ out/fm -b gl -s encode skps/desk_wikipedia.skp drawbitmaprect lotties/inattentive.json xfermodeimagefilter encode encode encode

Before:
           xfermodeimagefilter	92218904a9ae8a0a6d3eee03541b632a	    240ms
                        encode	d2d6eb57feb83662a84dc728dbd4649d	     99ms
                drawbitmaprect	d915acc291ecd0e7bbbd8b497d44cd1e	     88ms
            desk_wikipedia.skp	2bd4560dfba002395b7d5665d37a5d83	     80ms
              inattentive.json	63dfb23e06ee2557bb441523003fb4eb	     43ms

After:
                        encode	d2d6eb57feb83662a84dc728dbd4649d	    116ms
            desk_wikipedia.skp	2bd4560dfba002395b7d5665d37a5d83	     80ms
                drawbitmaprect	d915acc291ecd0e7bbbd8b497d44cd1e	     93ms
              inattentive.json	63dfb23e06ee2557bb441523003fb4eb	     42ms
           xfermodeimagefilter	92218904a9ae8a0a6d3eee03541b632a	    214ms
                        encode	d2d6eb57feb83662a84dc728dbd4649d	     90ms
                        encode	d2d6eb57feb83662a84dc728dbd4649d	     89ms
                        encode	d2d6eb57feb83662a84dc728dbd4649d	     89ms

Change-Id: I448da4c991b91a8f3e4fc0cf32af0a4ff712e19e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/205591
Commit-Queue: Mike Klein <mtklein@google.com>
Auto-Submit: Mike Klein <mtklein@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
This commit is contained in:
Mike Klein 2019-04-02 17:00:54 -04:00 committed by Skia Commit-Bot
parent e25b4472cd
commit cbe93ee197
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tools/fm/fm.cpp
View File

@ -20,6 +20,7 @@
#include "SkPicture.h"
#include "SkPictureRecorder.h"
#include "SkSVGDOM.h"
#include "SkTHash.h"
#include "Skottie.h"
#include "SkottieUtils.h"
#include "ToolUtils.h"
@ -364,18 +365,27 @@ int main(int argc, char** argv) {
GrContextOptions baseOptions;
SetCtxOptionsFromCommonFlags(&baseOptions);
SkTArray<Source> sources;
SkTHashMap<SkString, skiagm::GMFactory> gm_factories;
for (skiagm::GMFactory factory : skiagm::GMRegistry::Range()) {
std::shared_ptr<skiagm::GM> gm{factory(nullptr)};
std::unique_ptr<skiagm::GM> gm{factory(nullptr)};
if (FLAGS_sources.isEmpty()) {
fprintf(stdout, "%s\n", gm->getName());
} else if (FLAGS_sources.contains(gm->getName())) {
sources.push_back(gm_source(gm));
} else {
gm_factories.set(SkString{gm->getName()}, factory);
}
}
if (FLAGS_sources.isEmpty()) {
return 0;
}
SkTArray<Source> sources;
for (const SkString& source : FLAGS_sources) {
if (skiagm::GMFactory* factory = gm_factories.find(source)) {
std::shared_ptr<skiagm::GM> gm{(*factory)(nullptr)};
sources.push_back(gm_source(gm));
continue;
}
if (sk_sp<SkData> blob = SkData::MakeFromFileName(source.c_str())) {
const SkString dir = SkOSPath::Dirname (source.c_str()),
name = SkOSPath::Basename(source.c_str());
@ -383,25 +393,29 @@ int main(int argc, char** argv) {
if (name.endsWith(".skp")) {
if (sk_sp<SkPicture> pic = SkPicture::MakeFromData(blob.get())) {
sources.push_back(picture_source(name, pic));
continue;
}
} else if (name.endsWith(".svg")) {
SkMemoryStream stream{blob};
if (sk_sp<SkSVGDOM> svg = SkSVGDOM::MakeFromStream(stream)) {
sources.push_back(svg_source(name, svg));
continue;
}
} else if (name.endsWith(".json")) {
if (sk_sp<skottie::Animation> animation = skottie::Animation::Builder()
.setResourceProvider(skottie_utils::FileResourceProvider::Make(dir))
.makeFromFile(source.c_str())) {
sources.push_back(skottie_source(name, animation));
continue;
}
} else if (std::shared_ptr<SkCodec> codec = SkCodec::MakeFromData(blob)) {
sources.push_back(codec_source(name, codec));
continue;
}
}
}
if (sources.empty()) {
return 0;
fprintf(stderr, "Don't understand --source %s... bailing out.\n", source.c_str());
return 1;
}
enum NonGpuBackends {