From be7e3c0db3caa7a86ae233a6bd26281817b83882 Mon Sep 17 00:00:00 2001 From: rmistry Date: Fri, 16 Sep 2016 12:06:55 -0700 Subject: [PATCH] Revert of Run SVGs through nanobench on all Perf bots (patchset #5 id:120001 of https://codereview.chromium.org/2343903002/ ) Reason for revert: Causing failures: https://uberchromegw.corp.google.com/i/client.skia/builders/Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug-GN/builds/812 Original issue's description: > Run SVGs through nanobench on all Perf bots. > > Tested with: > python infra/bots/recipes.py run --workdir=../ swarm_trigger path_config=kitchen buildername=Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN-Trybot mastername=client.skia slavename=skiabot-linux-swarm-010 buildnumber=1 revision=d8c2476a8b1e1e1a1771b17e8dd4db8645914f8c issue=2343903002 rietveld=https://codereview.chromium.org patchset=80001 > > Example output is here: > https://luci-milo.appspot.com/swarming/task/3147c9789b2d0410 > Nanobench did run on SVGs. > > BUG=skia:5757 > GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2343903002 > > Committed: https://skia.googlesource.com/skia/+/1c58dcb909642454d91ba36f71e55597511b5d52 TBR=jcgregorio@google.com,fmalita@chromium.org,mtklein@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia:5757 Review-Url: https://codereview.chromium.org/2348563003 --- .../Perf-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Release.json | 2 -- ...roid-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json | 2 -- .../Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Debug.json | 2 -- .../Perf-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Release.json | 2 -- .../Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json | 2 -- .../Perf-Android-GCC-NexusPlayer-GPU-PowerVR-x86-Release.json | 2 -- .../Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json | 2 -- .../Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json | 2 -- ...ntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json | 4 ---- ...-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench.json | 2 -- .../Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json | 2 -- .../Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json | 2 -- ...f-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json | 2 -- .../Perf-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json | 2 -- infra/bots/recipes/swarm_perf.expected/big_issue_number.json | 2 -- .../recipes/swarm_perf.expected/recipe_with_gerrit_patch.json | 4 ---- infra/bots/recipes/swarm_perf.py | 1 - 17 files changed, 37 deletions(-) diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Release.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Release.json index de040e946f..80078ecd90 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Release.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Release.json @@ -272,8 +272,6 @@ "/storage/emulated/legacy/skiabot/skia_resources", "--skps", "/storage/emulated/legacy/skiabot/skia_skp/skps", - "--svgs", - "/storage/emulated/legacy/skiabot/skia_svg/svgs", "--images", "/storage/emulated/legacy/skiabot/skia_images/nanobench", "--nocpu", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json index 115495eb83..95938f157c 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json @@ -314,8 +314,6 @@ "/storage/emulated/legacy/skiabot/skia_resources", "--skps", "/storage/emulated/legacy/skiabot/skia_skp/skps", - "--svgs", - "/storage/emulated/legacy/skiabot/skia_svg/svgs", "--images", "/storage/emulated/legacy/skiabot/skia_images/nanobench", "--nocpu", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Debug.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Debug.json index a604446d3d..40cc488d5a 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Debug.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Debug.json @@ -314,8 +314,6 @@ "/storage/emulated/legacy/skiabot/skia_resources", "--skps", "/storage/emulated/legacy/skiabot/skia_skp/skps", - "--svgs", - "/storage/emulated/legacy/skiabot/skia_svg/svgs", "--images", "/storage/emulated/legacy/skiabot/skia_images/nanobench", "--nocpu", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Release.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Release.json index 6cd3c07ac5..b76b6c9ec4 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Release.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Release.json @@ -366,8 +366,6 @@ "/storage/emulated/legacy/skiabot/skia_resources", "--skps", "/storage/emulated/legacy/skiabot/skia_skp/skps", - "--svgs", - "/storage/emulated/legacy/skiabot/skia_svg/svgs", "--images", "/storage/emulated/legacy/skiabot/skia_images/nanobench", "--nocpu", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json index 2fe6b85640..f121bce808 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json @@ -366,8 +366,6 @@ "/storage/emulated/legacy/skiabot/skia_resources", "--skps", "/storage/emulated/legacy/skiabot/skia_skp/skps", - "--svgs", - "/storage/emulated/legacy/skiabot/skia_svg/svgs", "--images", "/storage/emulated/legacy/skiabot/skia_images/nanobench", "--nocpu", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-NexusPlayer-GPU-PowerVR-x86-Release.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-NexusPlayer-GPU-PowerVR-x86-Release.json index 440495ed01..2eaef26847 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-NexusPlayer-GPU-PowerVR-x86-Release.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-NexusPlayer-GPU-PowerVR-x86-Release.json @@ -366,8 +366,6 @@ "/storage/emulated/legacy/skiabot/skia_resources", "--skps", "/storage/emulated/legacy/skiabot/skia_skp/skps", - "--svgs", - "/storage/emulated/legacy/skiabot/skia_svg/svgs", "--images", "/storage/emulated/legacy/skiabot/skia_images/nanobench", "--nocpu", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json b/infra/bots/recipes/swarm_perf.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json index e9b37d2356..7d96aed356 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json @@ -111,8 +111,6 @@ "[SLAVE_BUILD]/skia/resources", "--skps", "[SLAVE_BUILD]/skp", - "--svgs", - "[SLAVE_BUILD]/svg", "--images", "[SLAVE_BUILD]/skimage/nanobench", "--nogpu", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json index 74783face0..baa6a202e2 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json @@ -112,8 +112,6 @@ "[SLAVE_BUILD]/skia/resources", "--skps", "[SLAVE_BUILD]/skp", - "--svgs", - "[SLAVE_BUILD]/svg", "--images", "[SLAVE_BUILD]/skimage/nanobench", "--nogpu", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json index 013c5e7a84..1ef41c841b 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json @@ -118,8 +118,6 @@ "[SLAVE_BUILD]/skia/resources", "--skps", "[SLAVE_BUILD]/skp", - "--svgs", - "[SLAVE_BUILD]/svg", "--images", "[SLAVE_BUILD]/skimage/nanobench", "--nocpu", @@ -215,8 +213,6 @@ "[SLAVE_BUILD]/skia/resources", "--skps", "[SLAVE_BUILD]/skp", - "--svgs", - "[SLAVE_BUILD]/svg", "--images", "[SLAVE_BUILD]/skimage/nanobench", "--nocpu", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench.json b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench.json index c2431f6e9f..bd3c687299 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench.json @@ -112,8 +112,6 @@ "[SLAVE_BUILD]/skia/resources", "--skps", "[SLAVE_BUILD]/skp", - "--svgs", - "[SLAVE_BUILD]/svg", "--images", "[SLAVE_BUILD]/skimage/nanobench", "--nocpu", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json index a2d86e034c..f37d233fbe 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json @@ -67,8 +67,6 @@ "[SLAVE_BUILD]\\skia\\resources", "--skps", "[SLAVE_BUILD]\\skp", - "--svgs", - "[SLAVE_BUILD]\\svg", "--images", "[SLAVE_BUILD]\\skimage\\nanobench", "--nogpu", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json b/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json index 91b548a32d..fd1d940739 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json @@ -111,8 +111,6 @@ "[SLAVE_BUILD]\\skia\\resources", "--skps", "[SLAVE_BUILD]\\skp", - "--svgs", - "[SLAVE_BUILD]\\svg", "--images", "[SLAVE_BUILD]\\skimage\\nanobench", "--nogpu", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json b/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json index 9f807b58f2..119502c4a5 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json @@ -111,8 +111,6 @@ "[SLAVE_BUILD]\\skia\\resources", "--skps", "[SLAVE_BUILD]\\skp", - "--svgs", - "[SLAVE_BUILD]\\svg", "--images", "[SLAVE_BUILD]\\skimage\\nanobench", "--nocpu", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json b/infra/bots/recipes/swarm_perf.expected/Perf-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json index cf95f97e7a..fae27d983d 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json @@ -337,8 +337,6 @@ "skiabot/skia_resources", "--skps", "skiabot/skia_skp/skps", - "--svgs", - "skiabot/skia_svg/svgs", "--images", "skiabot/skia_images/nanobench", "--nocpu", diff --git a/infra/bots/recipes/swarm_perf.expected/big_issue_number.json b/infra/bots/recipes/swarm_perf.expected/big_issue_number.json index 6448dcb0f2..24ff80d572 100644 --- a/infra/bots/recipes/swarm_perf.expected/big_issue_number.json +++ b/infra/bots/recipes/swarm_perf.expected/big_issue_number.json @@ -111,8 +111,6 @@ "[SLAVE_BUILD]\\skia\\resources", "--skps", "[SLAVE_BUILD]\\skp", - "--svgs", - "[SLAVE_BUILD]\\svg", "--images", "[SLAVE_BUILD]\\skimage\\nanobench", "--nocpu", diff --git a/infra/bots/recipes/swarm_perf.expected/recipe_with_gerrit_patch.json b/infra/bots/recipes/swarm_perf.expected/recipe_with_gerrit_patch.json index 3ee08cc65d..9b7ec6ad90 100644 --- a/infra/bots/recipes/swarm_perf.expected/recipe_with_gerrit_patch.json +++ b/infra/bots/recipes/swarm_perf.expected/recipe_with_gerrit_patch.json @@ -140,8 +140,6 @@ "[SLAVE_BUILD]/skia/resources", "--skps", "[SLAVE_BUILD]/skp", - "--svgs", - "[SLAVE_BUILD]/svg", "--images", "[SLAVE_BUILD]/skimage/nanobench", "--nocpu", @@ -243,8 +241,6 @@ "[SLAVE_BUILD]/skia/resources", "--skps", "[SLAVE_BUILD]/skp", - "--svgs", - "[SLAVE_BUILD]/svg", "--images", "[SLAVE_BUILD]/skimage/nanobench", "--nocpu", diff --git a/infra/bots/recipes/swarm_perf.py b/infra/bots/recipes/swarm_perf.py index 39b65b2ac1..96e21e1b02 100644 --- a/infra/bots/recipes/swarm_perf.py +++ b/infra/bots/recipes/swarm_perf.py @@ -188,7 +188,6 @@ def perf_steps(api): '--undefok', # This helps branches that may not know new flags. '-i', api.flavor.device_dirs.resource_dir, '--skps', api.flavor.device_dirs.skp_dir, - '--svgs', api.flavor.device_dirs.svg_dir, '--images', api.flavor.device_path_join( api.flavor.device_dirs.images_dir, 'nanobench'), ]