From 48b649060c8d3ae104274703553d7c03a58f3ddd Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Wed, 25 Jul 2018 13:28:44 -0400 Subject: remove SkThreadedBMPDevice and friends It is unused, is becoming a maintainence burden and source of bugs, and takes up a lot of time on the *SAN bots. Change-Id: If383eb6e4838ca23140f9e16d518b1bfc655fa12 Reviewed-on: https://skia-review.googlesource.com/143307 Auto-Submit: Mike Klein Commit-Queue: Herb Derby Reviewed-by: Herb Derby --- infra/bots/jobs.json | 1 - ...-Clang-GCE-CPU-AVX2-x86_64-Debug-All-T8888.json | 278 --------------------- infra/bots/recipes/test.py | 13 - infra/bots/tasks.json | 216 ---------------- 4 files changed, 508 deletions(-) delete mode 100644 infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-T8888.json (limited to 'infra') diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json index 7b4079c014..c339a8d788 100644 --- a/infra/bots/jobs.json +++ b/infra/bots/jobs.json @@ -404,7 +404,6 @@ "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-NativeFonts", "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE", "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack", - "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-T8888", "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-Shard_12-Coverage", "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All", "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-ASAN", diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-T8888.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-T8888.json deleted file mode 100644 index edd0411f96..0000000000 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-T8888.json +++ /dev/null @@ -1,278 +0,0 @@ -[ - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/tmp" - ], - "infra_step": true, - "name": "makedirs tmp_dir" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", - "[START_DIR]/skia/infra/bots/assets/skp/VERSION", - "/path/to/tmp/" - ], - "infra_step": true, - "name": "Get skp VERSION" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", - "42", - "[START_DIR]/tmp/SKP_VERSION" - ], - "infra_step": true, - "name": "write SKP_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", - "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", - "/path/to/tmp/" - ], - "infra_step": true, - "name": "Get skimage VERSION" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", - "42", - "[START_DIR]/tmp/SK_IMAGE_VERSION" - ], - "infra_step": true, - "name": "write SK_IMAGE_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", - "[START_DIR]/skia/infra/bots/assets/svg/VERSION", - "/path/to/tmp/" - ], - "infra_step": true, - "name": "Get svg VERSION" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", - "42", - "[START_DIR]/tmp/SVG_VERSION" - ], - "infra_step": true, - "name": "write SVG_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ - "python", - "-u", - "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://storage.googleapis.com/skia-infra-gm/hash_files/gold-prod-hashes.txt'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", - "[START_DIR]/tmp/uninteresting_hashes.txt" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "get uninteresting hashes", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import contextlib@@@", - "@@@STEP_LOG_LINE@python.inline@import math@@@", - "@@@STEP_LOG_LINE@python.inline@import socket@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@import time@@@", - "@@@STEP_LOG_LINE@python.inline@import urllib2@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@HASHES_URL = 'https://storage.googleapis.com/skia-infra-gm/hash_files/gold-prod-hashes.txt'@@@", - "@@@STEP_LOG_LINE@python.inline@RETRIES = 5@@@", - "@@@STEP_LOG_LINE@python.inline@TIMEOUT = 60@@@", - "@@@STEP_LOG_LINE@python.inline@WAIT_BASE = 15@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@socket.setdefaulttimeout(TIMEOUT)@@@", - "@@@STEP_LOG_LINE@python.inline@for retry in range(RETRIES):@@@", - "@@@STEP_LOG_LINE@python.inline@ try:@@@", - "@@@STEP_LOG_LINE@python.inline@ with contextlib.closing(@@@", - "@@@STEP_LOG_LINE@python.inline@ urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:@@@", - "@@@STEP_LOG_LINE@python.inline@ hashes = w.read()@@@", - "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[1], 'w') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ f.write(hashes)@@@", - "@@@STEP_LOG_LINE@python.inline@ break@@@", - "@@@STEP_LOG_LINE@python.inline@ except Exception as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ print 'Failed to get uninteresting hashes from %s:' % HASHES_URL@@@", - "@@@STEP_LOG_LINE@python.inline@ print e@@@", - "@@@STEP_LOG_LINE@python.inline@ if retry == RETRIES:@@@", - "@@@STEP_LOG_LINE@python.inline@ raise@@@", - "@@@STEP_LOG_LINE@python.inline@ waittime = WAIT_BASE * math.pow(2, retry)@@@", - "@@@STEP_LOG_LINE@python.inline@ print 'Retry in %d seconds.' % waittime@@@", - "@@@STEP_LOG_LINE@python.inline@ time.sleep(waittime)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "import os\nprint os.environ.get('SWARMING_BOT_ID', '')\n" - ], - "name": "get swarming bot id", - "stdout": "/path/to/tmp/", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_BOT_ID', '')@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "import os\nprint os.environ.get('SWARMING_TASK_ID', '')\n" - ], - "name": "get swarming task id", - "stdout": "/path/to/tmp/", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_TASK_ID', '')@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", - "[START_DIR]", - "catchsegv", - "[START_DIR]/build/dm", - "--resourcePath", - "[START_DIR]/skia/resources", - "--skps", - "[START_DIR]/skp", - "--images", - "[START_DIR]/skimage/dm", - "--colorImages", - "[START_DIR]/skimage/colorspace", - "--nameByHash", - "--properties", - "gitHash", - "abc123", - "builder", - "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-T8888", - "buildbucket_build_id", - "123454321", - "swarming_bot_id", - "skia-bot-123", - "swarming_task_id", - "123456", - "--svgs", - "[START_DIR]/svg", - "--key", - "arch", - "x86_64", - "compiler", - "Clang", - "configuration", - "Debug", - "cpu_or_gpu", - "CPU", - "cpu_or_gpu_value", - "AVX2", - "extra_config", - "T8888", - "model", - "GCE", - "os", - "Debian9", - "--uninterestingHashesFile", - "[START_DIR]/tmp/uninteresting_hashes.txt", - "--writePath", - "[START_DIR]/[SWARM_OUT_DIR]", - "--dont_write", - "pdf", - "--randomProcessorTest", - "--nogpu", - "--config", - "t8888", - "--src", - "gm", - "--nonativeFonts", - "--verbose" - ], - "cwd": "[START_DIR]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" - }, - "name": "symbolized dm" - }, - { - "name": "$result", - "recipe_result": null, - "status_code": 0 - } -] \ No newline at end of file diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py index f223553321..d073f1e21e 100644 --- a/infra/bots/recipes/test.py +++ b/infra/bots/recipes/test.py @@ -126,15 +126,8 @@ def dm_flags(api, bot): configs.extend(['narrow']) configs.extend(['enarrow']) - # Temporarily disabled while debugging. - #if 'SAN' in bot: - # configs.extend(['t8888']) - configs.extend(mode + '-8888' for mode in ['serialize', 'tiles_rt', 'pic']) - if 'T8888' in bot: - configs = ['t8888'] - # This bot only differs from vanilla CPU bots in 8888 config. if 'SK_FORCE_RASTER_PIPELINE_BLITTER' in bot: configs = ['8888'] @@ -329,11 +322,6 @@ def dm_flags(api, bot): args.remove('image') args.remove('colorImage') - if 'T8888' in bot: - args.remove('tests') - args.remove('image') - args.remove('colorImage') - def remove_from_args(arg): if arg in args: args.remove(arg) @@ -1045,7 +1033,6 @@ TEST_BUILDERS = [ 'Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN', ('Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All' '-SK_USE_DISCARDABLE_SCALEDIMAGECACHE'), - 'Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-T8888', 'Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Lottie', ('Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All' '-SK_FORCE_RASTER_PIPELINE_BLITTER'), diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index 05dc541fc5..f77b8b5ec6 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -2038,11 +2038,6 @@ "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack" ] }, - "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-T8888": { - "tasks": [ - "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-T8888" - ] - }, "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-Shard_12-Coverage": { "tasks": [ "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-Shard_12-Coverage" @@ -48294,118 +48289,6 @@ "test" ] }, - "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-T8888": { - "caches": [ - { - "name": "vpython", - "path": "cache/vpython" - } - ], - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:546aae39f1fb9dce9add528e2011afa574535ecd" - }, - { - "name": "infra/tools/luci-auth/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:e1abc57be62d198b5c2f487bfb2fa2d2eb0e867c" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:b9c4670197dcefd8762d6e509302acd3efc6e303" - }, - { - "name": "skia/bots/skimage", - "path": "skimage", - "version": "version:34" - }, - { - "name": "skia/bots/skp", - "path": "skp", - "version": "version:135" - }, - { - "name": "skia/bots/svg", - "path": "svg", - "version": "version:9" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "test", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-T8888\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Build-Debian9-Clang-x86_64-Debug" - ], - "dimensions": [ - "cpu:x86-64-Haswell_GCE", - "machine_type:n1-standard-16", - "os:Debian-9.4", - "pool:Skia" - ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "execution_timeout_ns": 14400000000000, - "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "isolate": "test_skia_bundled.isolate", - "max_attempts": 1, - "outputs": [ - "test" - ] - }, "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_00_12-Coverage": { "caches": [ { @@ -87690,105 +87573,6 @@ "isolate": "swarm_recipe.isolate", "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" }, - "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-T8888": { - "caches": [ - { - "name": "vpython", - "path": "cache/vpython" - } - ], - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:546aae39f1fb9dce9add528e2011afa574535ecd" - }, - { - "name": "infra/tools/luci-auth/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:e1abc57be62d198b5c2f487bfb2fa2d2eb0e867c" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:b9c4670197dcefd8762d6e509302acd3efc6e303" - }, - { - "name": "infra/gsutil", - "path": "cipd_bin_packages", - "version": "version:4.28" - } - ], - "command": [ - "./kitchen${EXECUTABLE_SUFFIX}", - "cook", - "-checkout-dir", - "recipe_bundle", - "-mode", - "swarming", - "-luci-system-account", - "system", - "-cache-dir", - "cache", - "-temp-dir", - "tmp", - "-known-gerrit-host", - "android.googlesource.com", - "-known-gerrit-host", - "boringssl.googlesource.com", - "-known-gerrit-host", - "chromium.googlesource.com", - "-known-gerrit-host", - "dart.googlesource.com", - "-known-gerrit-host", - "fuchsia.googlesource.com", - "-known-gerrit-host", - "go.googlesource.com", - "-known-gerrit-host", - "llvm.googlesource.com", - "-known-gerrit-host", - "skia.googlesource.com", - "-known-gerrit-host", - "webrtc.googlesource.com", - "-output-result-json", - "${ISOLATED_OUTDIR}/build_result_filename", - "-workdir", - ".", - "-recipe", - "upload_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-T8888\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-T8888" - ], - "dimensions": [ - "cpu:x86-64-Haswell_GCE", - "gpu:none", - "machine_type:n1-highmem-2", - "os:Debian-9.4", - "pool:Skia" - ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/vpython" - ] - }, - "execution_timeout_ns": 3600000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - }, - "io_timeout_ns": 3600000000000, - "isolate": "swarm_recipe.isolate", - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-Shard_12-Coverage": { "caches": [ { -- cgit v1.2.3