2016-10-26 18:17:04 +00:00
|
|
|
# Copyright 2016 Google Inc.
|
|
|
|
#
|
|
|
|
# Use of this source code is governed by a BSD-style license that can be
|
|
|
|
# found in the LICENSE file.
|
|
|
|
|
|
|
|
# Things are easiest for everyone if these source paths are absolute.
|
|
|
|
_src = get_path_info("../src", "abspath")
|
|
|
|
_include = get_path_info("../include", "abspath")
|
|
|
|
|
2019-02-26 16:54:25 +00:00
|
|
|
skia_utils_public = [
|
2018-10-03 14:16:55 +00:00
|
|
|
"$_include/utils/SkAnimCodecPlayer.h",
|
2019-04-22 17:10:59 +00:00
|
|
|
"$_include/utils/SkBase64.h",
|
2016-10-26 18:17:04 +00:00
|
|
|
"$_include/utils/SkCamera.h",
|
|
|
|
"$_include/utils/SkCanvasStateUtils.h",
|
2020-05-07 20:58:40 +00:00
|
|
|
"$_include/utils/SkCustomTypeface.h",
|
2016-10-26 18:17:04 +00:00
|
|
|
"$_include/utils/SkEventTracer.h",
|
|
|
|
"$_include/utils/SkNWayCanvas.h",
|
2019-04-22 17:10:59 +00:00
|
|
|
"$_include/utils/SkNoDrawCanvas.h",
|
2016-10-26 18:17:04 +00:00
|
|
|
"$_include/utils/SkNullCanvas.h",
|
2021-04-27 17:21:05 +00:00
|
|
|
"$_include/utils/SkOrderedFontMgr.h",
|
2016-10-26 18:17:04 +00:00
|
|
|
"$_include/utils/SkPaintFilterCanvas.h",
|
|
|
|
"$_include/utils/SkParse.h",
|
|
|
|
"$_include/utils/SkParsePath.h",
|
|
|
|
"$_include/utils/SkRandom.h",
|
2017-01-13 19:37:37 +00:00
|
|
|
"$_include/utils/SkShadowUtils.h",
|
2019-04-11 21:10:17 +00:00
|
|
|
|
2019-02-26 16:54:25 +00:00
|
|
|
#mac
|
|
|
|
"$_include/utils/mac/SkCGUtils.h",
|
|
|
|
]
|
2016-10-26 18:17:04 +00:00
|
|
|
|
2019-02-26 16:54:25 +00:00
|
|
|
skia_utils_sources = [
|
2018-10-03 14:16:55 +00:00
|
|
|
"$_src/utils/SkAnimCodecPlayer.cpp",
|
2016-10-26 18:17:04 +00:00
|
|
|
"$_src/utils/SkBase64.cpp",
|
|
|
|
"$_src/utils/SkBitSet.h",
|
Reland "Reland "Adding a trace to nanobench for RP/VM comparison""
This reverts commit 0e48516aae7e63dc50f16e9fb0080039f4f06d88.
Reason for revert: Again trying to land this CL
Original change's description:
> Revert "Reland "Adding a trace to nanobench for RP/VM comparison""
>
> This reverts commit 94b8dd67108d105f13d0fcd60e8c427e92355a64.
>
> Reason for revert: https://ci.chromium.org/p/chromium/builders/try/android-marshmallow-x86-rel appears to either not support this instruction or it is disabled.
>
> Original change's description:
> > Reland "Adding a trace to nanobench for RP/VM comparison"
> >
> > This reverts commit 39728eb9804cced26933f38d6bcf5652dd8d24bc.
> >
> > Reason for revert: Need to reland after I figure out what happened
> >
> > Original change's description:
> > > Revert "Adding a trace to nanobench for RP/VM comparison"
> > >
> > > This reverts commit e855b1273fee6a2b3505ea27aec56e8fc82749e3.
> > >
> > > Reason for revert: breaking the tree
> > >
> > > Original change's description:
> > > > Adding a trace to nanobench for RP/VM comparison
> > > >
> > > > Run nanobench with --compare key and collect data for comparison:
> > > > ./out/Release/nanobench --csv --config 8888 --skvm --compare --loops 100 --samples 1 --match $(ls skps | grep --invert-match svg ) 2>&1 | tee VM.data
> > > > ./out/Release/nanobench --csv --config 8888 --forceRasterPipeline --compare --loops 100 --samples 1 --match $(ls skps | grep --invert-match svg ) 2>&1 | tee RP.data
> > > > awk 'BEGIN {OFS=","; fileNum = 0} ($2 ~ /MB/) && fileNum == 0 {vmvmcycles[$3] = $6; vmvmscan[$3] = $8; vmvmpixels[$3] = $10; vmvminterp[$3] = $11; vmrpcycle[$3] = $14; vmrpscan[$3] = $16; vmrppixels[$3] = $18} ($2 ~ /MB/) && fileNum == 1 {print $3, vmvmcycles[$3], vmvmscan[$3], vmvmpixels[$3], vmvminterp[$3], $6, $8, $10, $11, $14, $16, $18} ENDFILE {fileNum += 1}' VM.data RP.data > compare.csv
> > > >
> > > > You can see an example of comparison table here:
> > > > https://docs.google.com/spreadsheets/d/1Q57oz6Jn8JPQkPzUbtO0fcZh2VhwPhxwsLaHnSb9uR0/edit#gid=406063636
> > > >
> > > > Change-Id: I8fa35e3fb087bce00ab19355a3bc021334aa7a80
> > > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/501337
> > > > Reviewed-by: Herb Derby <herb@google.com>
> > > > Commit-Queue: Julia Lavrova <jlavrova@google.com>
> > >
> > > Change-Id: I6799b90ffd8bc05c65d1185bfc07a06af05e2038
> > > No-Presubmit: true
> > > No-Tree-Checks: true
> > > No-Try: true
> > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/507182
> > > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> > > Commit-Queue: Julia Lavrova <jlavrova@google.com>
> >
> > Change-Id: I3668b5a40f310598e23c922b1eb6f93db4dac13c
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/507183
> > Reviewed-by: Herb Derby <herb@google.com>
> > Commit-Queue: Julia Lavrova <jlavrova@google.com>
>
> Change-Id: I5d0174fca1aeaa0f3e75a8e1f643265701068f42
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/508396
> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> Commit-Queue: Ben Wagner <bungeman@google.com>
Change-Id: Ibf7c8957427dc8a1cdc133774608b48ab6715c7f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/508536
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Julia Lavrova <jlavrova@google.com>
2022-02-14 14:20:50 +00:00
|
|
|
"$_src/utils/SkBlitterTrace.h",
|
|
|
|
"$_src/utils/SkBlitterTraceCommon.h",
|
2018-10-01 18:54:01 +00:00
|
|
|
"$_src/utils/SkCallableTraits.h",
|
2016-10-26 18:17:04 +00:00
|
|
|
"$_src/utils/SkCamera.cpp",
|
|
|
|
"$_src/utils/SkCanvasStack.cpp",
|
2020-04-03 15:59:37 +00:00
|
|
|
"$_src/utils/SkCanvasStack.h",
|
2016-10-26 18:17:04 +00:00
|
|
|
"$_src/utils/SkCanvasStateUtils.cpp",
|
2019-04-11 21:10:17 +00:00
|
|
|
"$_src/utils/SkCharToGlyphCache.cpp",
|
|
|
|
"$_src/utils/SkCharToGlyphCache.h",
|
2019-12-20 19:00:41 +00:00
|
|
|
"$_src/utils/SkClipStackUtils.cpp",
|
|
|
|
"$_src/utils/SkClipStackUtils.h",
|
2020-05-07 20:58:40 +00:00
|
|
|
"$_src/utils/SkCustomTypeface.cpp",
|
Reland "Reland "Adding a trace to nanobench for RP/VM comparison""
This reverts commit 0e48516aae7e63dc50f16e9fb0080039f4f06d88.
Reason for revert: Again trying to land this CL
Original change's description:
> Revert "Reland "Adding a trace to nanobench for RP/VM comparison""
>
> This reverts commit 94b8dd67108d105f13d0fcd60e8c427e92355a64.
>
> Reason for revert: https://ci.chromium.org/p/chromium/builders/try/android-marshmallow-x86-rel appears to either not support this instruction or it is disabled.
>
> Original change's description:
> > Reland "Adding a trace to nanobench for RP/VM comparison"
> >
> > This reverts commit 39728eb9804cced26933f38d6bcf5652dd8d24bc.
> >
> > Reason for revert: Need to reland after I figure out what happened
> >
> > Original change's description:
> > > Revert "Adding a trace to nanobench for RP/VM comparison"
> > >
> > > This reverts commit e855b1273fee6a2b3505ea27aec56e8fc82749e3.
> > >
> > > Reason for revert: breaking the tree
> > >
> > > Original change's description:
> > > > Adding a trace to nanobench for RP/VM comparison
> > > >
> > > > Run nanobench with --compare key and collect data for comparison:
> > > > ./out/Release/nanobench --csv --config 8888 --skvm --compare --loops 100 --samples 1 --match $(ls skps | grep --invert-match svg ) 2>&1 | tee VM.data
> > > > ./out/Release/nanobench --csv --config 8888 --forceRasterPipeline --compare --loops 100 --samples 1 --match $(ls skps | grep --invert-match svg ) 2>&1 | tee RP.data
> > > > awk 'BEGIN {OFS=","; fileNum = 0} ($2 ~ /MB/) && fileNum == 0 {vmvmcycles[$3] = $6; vmvmscan[$3] = $8; vmvmpixels[$3] = $10; vmvminterp[$3] = $11; vmrpcycle[$3] = $14; vmrpscan[$3] = $16; vmrppixels[$3] = $18} ($2 ~ /MB/) && fileNum == 1 {print $3, vmvmcycles[$3], vmvmscan[$3], vmvmpixels[$3], vmvminterp[$3], $6, $8, $10, $11, $14, $16, $18} ENDFILE {fileNum += 1}' VM.data RP.data > compare.csv
> > > >
> > > > You can see an example of comparison table here:
> > > > https://docs.google.com/spreadsheets/d/1Q57oz6Jn8JPQkPzUbtO0fcZh2VhwPhxwsLaHnSb9uR0/edit#gid=406063636
> > > >
> > > > Change-Id: I8fa35e3fb087bce00ab19355a3bc021334aa7a80
> > > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/501337
> > > > Reviewed-by: Herb Derby <herb@google.com>
> > > > Commit-Queue: Julia Lavrova <jlavrova@google.com>
> > >
> > > Change-Id: I6799b90ffd8bc05c65d1185bfc07a06af05e2038
> > > No-Presubmit: true
> > > No-Tree-Checks: true
> > > No-Try: true
> > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/507182
> > > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> > > Commit-Queue: Julia Lavrova <jlavrova@google.com>
> >
> > Change-Id: I3668b5a40f310598e23c922b1eb6f93db4dac13c
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/507183
> > Reviewed-by: Herb Derby <herb@google.com>
> > Commit-Queue: Julia Lavrova <jlavrova@google.com>
>
> Change-Id: I5d0174fca1aeaa0f3e75a8e1f643265701068f42
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/508396
> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> Commit-Queue: Ben Wagner <bungeman@google.com>
Change-Id: Ibf7c8957427dc8a1cdc133774608b48ab6715c7f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/508536
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Julia Lavrova <jlavrova@google.com>
2022-02-14 14:20:50 +00:00
|
|
|
"$_src/utils/SkCycles.h",
|
2016-10-26 18:17:04 +00:00
|
|
|
"$_src/utils/SkDashPath.cpp",
|
|
|
|
"$_src/utils/SkDashPathPriv.h",
|
|
|
|
"$_src/utils/SkEventTracer.cpp",
|
2018-01-02 21:25:53 +00:00
|
|
|
"$_src/utils/SkFloatToDecimal.cpp",
|
|
|
|
"$_src/utils/SkFloatToDecimal.h",
|
2016-10-26 18:17:04 +00:00
|
|
|
"$_src/utils/SkFloatUtils.h",
|
2018-06-19 15:27:20 +00:00
|
|
|
"$_src/utils/SkJSON.cpp",
|
|
|
|
"$_src/utils/SkJSON.h",
|
2017-08-10 14:23:25 +00:00
|
|
|
"$_src/utils/SkJSONWriter.cpp",
|
Added SkJSONWriter
This is a stand-alone helper class for writing properly
structured JSON to an SkWStream. It currently solves two
problems (although this CL only uses it in one context):
1) Performance. Writing out JSON this way is about 10x
faster than using JSONCPP. For the large amounts of data
generated by the tracing system, that's a big win.
2) Makes it easy to emit structured JSON from code that's
not fully centralized. We'd like to spit out JSON that
describes a GrContext, GrGpu, GrCaps, etc... Doing that
with simple string manipulation is complex, and spreads
this logic over all those functions. Using JSONCPP adds
yet another (large) third party library dependency (that
we only build into our own tools right now).
This went through several revisions. I originally planned
it as a stateful SkString wrapper, so the user could just
build their JSON as a string. That's O(N^2), though,
because SkString grows by a (small) constant amount. Even
using a better growth strategy still means needing RAM
for all the resulting text, which is usually pointless.
This version has a constant memory cost, so writing huge
amounts of JSON to disk (tracing a long DM run can emit
100's of MBs) doesn't stress resources.
Bug: skia:
Change-Id: Ia716524b246db0f97d332da60d2ce9903069e748
Reviewed-on: https://skia-review.googlesource.com/31204
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
2017-08-09 13:25:39 +00:00
|
|
|
"$_src/utils/SkJSONWriter.h",
|
2016-10-26 18:17:04 +00:00
|
|
|
"$_src/utils/SkMatrix22.cpp",
|
|
|
|
"$_src/utils/SkMatrix22.h",
|
|
|
|
"$_src/utils/SkMultiPictureDocument.cpp",
|
|
|
|
"$_src/utils/SkNWayCanvas.cpp",
|
|
|
|
"$_src/utils/SkNullCanvas.cpp",
|
2016-11-07 23:05:29 +00:00
|
|
|
"$_src/utils/SkOSPath.cpp",
|
|
|
|
"$_src/utils/SkOSPath.h",
|
2021-04-27 17:21:05 +00:00
|
|
|
"$_src/utils/SkOrderedFontMgr.cpp",
|
2016-10-26 18:17:04 +00:00
|
|
|
"$_src/utils/SkPaintFilterCanvas.cpp",
|
|
|
|
"$_src/utils/SkParse.cpp",
|
|
|
|
"$_src/utils/SkParseColor.cpp",
|
|
|
|
"$_src/utils/SkParsePath.cpp",
|
|
|
|
"$_src/utils/SkPatchUtils.cpp",
|
|
|
|
"$_src/utils/SkPatchUtils.h",
|
2018-06-28 20:26:50 +00:00
|
|
|
"$_src/utils/SkPolyUtils.cpp",
|
|
|
|
"$_src/utils/SkPolyUtils.h",
|
2021-12-10 22:27:10 +00:00
|
|
|
"$_src/utils/SkShaderUtils.cpp",
|
|
|
|
"$_src/utils/SkShaderUtils.h",
|
2017-01-30 18:11:45 +00:00
|
|
|
"$_src/utils/SkShadowTessellator.cpp",
|
|
|
|
"$_src/utils/SkShadowTessellator.h",
|
2017-01-13 19:37:37 +00:00
|
|
|
"$_src/utils/SkShadowUtils.cpp",
|
2019-04-22 21:18:50 +00:00
|
|
|
"$_src/utils/SkShaperJSONWriter.cpp",
|
2020-04-03 15:59:37 +00:00
|
|
|
"$_src/utils/SkShaperJSONWriter.h",
|
2022-03-24 14:46:35 +00:00
|
|
|
"$_src/utils/SkTestCanvas.h",
|
2018-10-25 16:36:06 +00:00
|
|
|
"$_src/utils/SkTextUtils.cpp",
|
2016-10-26 18:17:04 +00:00
|
|
|
"$_src/utils/SkThreadUtils_pthread.cpp",
|
|
|
|
"$_src/utils/SkThreadUtils_win.cpp",
|
2018-07-25 20:52:48 +00:00
|
|
|
"$_src/utils/SkUTF.cpp",
|
|
|
|
"$_src/utils/SkUTF.h",
|
2021-12-21 14:33:35 +00:00
|
|
|
"$_src/utils/SkVMVisualizer.cpp",
|
|
|
|
"$_src/utils/SkVMVisualizer.h",
|
2016-10-26 18:17:04 +00:00
|
|
|
|
|
|
|
#mac
|
2020-06-05 15:25:42 +00:00
|
|
|
"$_src/utils/mac/SkCGBase.h",
|
|
|
|
"$_src/utils/mac/SkCGGeometry.h",
|
2021-01-25 20:25:22 +00:00
|
|
|
"$_src/utils/mac/SkCTFont.cpp",
|
|
|
|
"$_src/utils/mac/SkCTFont.h",
|
2016-10-26 18:17:04 +00:00
|
|
|
"$_src/utils/mac/SkCreateCGImageRef.cpp",
|
2018-09-20 02:31:07 +00:00
|
|
|
"$_src/utils/mac/SkUniqueCFRef.h",
|
2016-10-26 18:17:04 +00:00
|
|
|
|
|
|
|
#windows
|
|
|
|
"$_src/utils/win/SkAutoCoInitialize.cpp",
|
2020-04-03 15:59:37 +00:00
|
|
|
"$_src/utils/win/SkAutoCoInitialize.h",
|
2016-10-26 18:17:04 +00:00
|
|
|
"$_src/utils/win/SkDWrite.cpp",
|
2020-04-03 15:59:37 +00:00
|
|
|
"$_src/utils/win/SkDWrite.h",
|
2016-10-26 18:17:04 +00:00
|
|
|
"$_src/utils/win/SkDWriteFontFileStream.cpp",
|
|
|
|
"$_src/utils/win/SkDWriteFontFileStream.h",
|
|
|
|
"$_src/utils/win/SkDWriteGeometrySink.cpp",
|
|
|
|
"$_src/utils/win/SkDWriteGeometrySink.h",
|
2018-07-19 12:55:10 +00:00
|
|
|
"$_src/utils/win/SkDWriteNTDDI_VERSION.h",
|
2016-10-26 18:17:04 +00:00
|
|
|
"$_src/utils/win/SkHRESULT.cpp",
|
2020-04-03 15:59:37 +00:00
|
|
|
"$_src/utils/win/SkHRESULT.h",
|
2016-10-26 18:17:04 +00:00
|
|
|
"$_src/utils/win/SkIStream.cpp",
|
2020-04-03 15:59:37 +00:00
|
|
|
"$_src/utils/win/SkIStream.h",
|
2019-08-12 22:30:27 +00:00
|
|
|
"$_src/utils/win/SkObjBase.h",
|
2016-10-26 18:17:04 +00:00
|
|
|
"$_src/utils/win/SkTScopedComPtr.h",
|
|
|
|
"$_src/utils/win/SkWGL.h",
|
|
|
|
"$_src/utils/win/SkWGL_win.cpp",
|
|
|
|
]
|