Remove SafeStack jobs This was added in https://review.skia.org/62743; broke in https://review.skia.org/1248516 (a runtime error `/b/s/w/ir/build/dm: symbol lookup error: /b/s/w/ir/build/dm: undefined symbol: _ZNSt3__113__hash_memoryEPKvm` and I don't remember this catching anything not caught by ASAN. Let's get rid of it. Change-Id: Ib12a9f1ff93d9726e86d60068137b5b55f677ae1 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/1253097 Auto-Submit: Kaylee Lubick <kjlubick@google.com> Reviewed-by: Nicolette Prevost <nicolettep@google.com> Commit-Queue: Nicolette Prevost <nicolettep@google.com>
diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json index c92690c..5aba2f3 100644 --- a/infra/bots/jobs.json +++ b/infra/bots/jobs.json
@@ -465,9 +465,6 @@ "name": "Build-Ubuntu24.04-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" }, { - "name": "Build-Ubuntu24.04-Clang-x86_64-Debug-SafeStack" - }, - { "name": "Build-Ubuntu24.04-Clang-x86_64-Debug-Static" }, { @@ -1947,9 +1944,6 @@ "name": "Test-Ubuntu24.04-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" }, { - "name": "Test-Ubuntu24.04-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack" - }, - { "name": "Test-Ubuntu24.04-Clang-GCE-CPU-AVX2-x86_64-Debug-All-Wuffs" }, {
diff --git a/infra/bots/recipe_modules/build/default.py b/infra/bots/recipe_modules/build/default.py index 1aa920c..26952cf 100644 --- a/infra/bots/recipe_modules/build/default.py +++ b/infra/bots/recipe_modules/build/default.py
@@ -316,10 +316,6 @@ if api.vars.is_linux and t == 'ASAN': # skbug.com/40040003 and skbug.com/40040004 extra_cflags.append('-DSK_ENABLE_SCOPED_LSAN_SUPPRESSIONS') - if 'SafeStack' in extra_tokens: - assert sanitize == '' - sanitize = 'safe-stack' - if 'Wuffs' in extra_tokens: args['skia_use_wuffs'] = 'true'
diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Debug-SafeStack.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Debug-SafeStack.json deleted file mode 100644 index 953d209..0000000 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Debug-SafeStack.json +++ /dev/null
@@ -1,127 +0,0 @@ -[ - { - "cmd": [ - "python3", - "[START_DIR]/cache/work/skia/bin/fetch-gn" - ], - "cwd": "[START_DIR]/cache/work/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "fetch-gn" - }, - { - "cmd": [ - "python3", - "[START_DIR]/cache/work/skia/bin/fetch-ninja" - ], - "cwd": "[START_DIR]/cache/work/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "fetch-ninja" - }, - { - "cmd": [ - "vpython3", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", - "[START_DIR]/cache/work/skia/infra/bots/assets/clang_linux/VERSION", - "/path/to/tmp/" - ], - "infra_step": true, - "name": "Get clang_linux VERSION", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@VERSION@42@@@", - "@@@STEP_LOG_END@VERSION@@@" - ] - }, - { - "cmd": [ - "[START_DIR]/ccache_linux/bin/ccache", - "-s" - ], - "cwd": "[START_DIR]/cache/work/skia", - "env": { - "CCACHE_COMPILERCHECK": "content", - "CCACHE_DIR": "[START_DIR]/cache/ccache", - "CCACHE_MAXFILES": "0", - "CCACHE_MAXSIZE": "75G", - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_REPO[depot_tools]:[START_DIR]/cache/work/skia/third_party/ninja" - }, - "name": "ccache stats-start" - }, - { - "cmd": [ - "[START_DIR]/cache/work/skia/bin/gn", - "gen", - "[START_DIR]/cache/work/skia/out/Build-Debian10-Clang-x86_64-Debug-SafeStack/Debug", - "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cc_wrapper=\"[START_DIR]/ccache_linux/bin/ccache\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DPLACEHOLDER_clang_linux_version=42\", \"-O1\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-L[START_DIR]/clang_linux/lib\"] is_trivial_abi=true link_pool_depth=2 sanitize=\"safe-stack\" skia_use_client_icu=true skia_use_libgrapheme=true target_cpu=\"x86_64\" werror=true" - ], - "cwd": "[START_DIR]/cache/work/skia", - "env": { - "CCACHE_COMPILERCHECK": "content", - "CCACHE_DIR": "[START_DIR]/cache/ccache", - "CCACHE_MAXFILES": "0", - "CCACHE_MAXSIZE": "75G", - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_REPO[depot_tools]:[START_DIR]/cache/work/skia/third_party/ninja" - }, - "name": "gn gen" - }, - { - "cmd": [ - "[START_DIR]/cache/work/skia/third_party/ninja/ninja", - "-C", - "[START_DIR]/cache/work/skia/out/Build-Debian10-Clang-x86_64-Debug-SafeStack/Debug" - ], - "cwd": "[START_DIR]/cache/work/skia", - "env": { - "CCACHE_COMPILERCHECK": "content", - "CCACHE_DIR": "[START_DIR]/cache/ccache", - "CCACHE_MAXFILES": "0", - "CCACHE_MAXSIZE": "75G", - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_REPO[depot_tools]:[START_DIR]/cache/work/skia/third_party/ninja" - }, - "name": "ninja" - }, - { - "cmd": [ - "[START_DIR]/ccache_linux/bin/ccache", - "-s" - ], - "cwd": "[START_DIR]/cache/work/skia", - "env": { - "CCACHE_COMPILERCHECK": "content", - "CCACHE_DIR": "[START_DIR]/cache/ccache", - "CCACHE_MAXFILES": "0", - "CCACHE_MAXSIZE": "75G", - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_REPO[depot_tools]:[START_DIR]/cache/work/skia/third_party/ninja" - }, - "name": "ccache stats-end" - }, - { - "cmd": [ - "python3", - "RECIPE_MODULE[skia::build]/resources/copy_build_products.py", - "[START_DIR]/cache/work/skia/out/Build-Debian10-Clang-x86_64-Debug-SafeStack/Debug", - "[START_DIR]/[SWARM_OUT_DIR]/out/Debug", - "dm,dm.exe,dm.app,nanobench.app,get_images_from_skps,get_images_from_skps.exe,nanobench,nanobench.exe,*.so,*.dll,*.dylib,skottie_tool,lib/*.so,run_testlab" - ], - "infra_step": true, - "name": "copy build products" - }, - { - "name": "$result" - } -] \ No newline at end of file
diff --git a/infra/bots/recipe_modules/build/examples/full.py b/infra/bots/recipe_modules/build/examples/full.py index 9b1ffcf..d714a35 100644 --- a/infra/bots/recipe_modules/build/examples/full.py +++ b/infra/bots/recipe_modules/build/examples/full.py
@@ -46,7 +46,6 @@ 'Build-Debian10-Clang-x86_64-Debug-ICU4X', 'Build-Debian10-Clang-x86_64-Debug-MSAN', 'Build-Debian10-Clang-x86_64-Debug-SK_CPU_LIMIT_SSE41', - 'Build-Debian10-Clang-x86_64-Debug-SafeStack', 'Build-Debian10-Clang-x86_64-Debug-SwiftShader_Graphite', 'Build-Debian10-Clang-x86_64-Debug-SwiftShader_MSAN', 'Build-Debian10-Clang-x86_64-Debug-TSAN',
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index a0ffd19..d5a9747 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json
@@ -700,11 +700,6 @@ "Build-Ubuntu24.04-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" ] }, - "Build-Ubuntu24.04-Clang-x86_64-Debug-SafeStack": { - "tasks": [ - "Build-Ubuntu24.04-Clang-x86_64-Debug-SafeStack" - ] - }, "Build-Ubuntu24.04-Clang-x86_64-Debug-Static": { "tasks": [ "Build-Ubuntu24.04-Clang-x86_64-Debug-Static" @@ -3053,11 +3048,6 @@ "Test-Ubuntu24.04-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" ] }, - "Test-Ubuntu24.04-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack": { - "tasks": [ - "Test-Ubuntu24.04-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack" - ] - }, "Test-Ubuntu24.04-Clang-GCE-CPU-AVX2-x86_64-Debug-All-Wuffs": { "tasks": [ "Test-Ubuntu24.04-Clang-GCE-CPU-AVX2-x86_64-Debug-All-Wuffs" @@ -16589,99 +16579,6 @@ ], "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" }, - "Build-Ubuntu24.04-Clang-x86_64-Debug-SafeStack": { - "caches": [ - { - "name": "ccache", - "path": "cache/ccache" - }, - { - "name": "vpython3", - "path": "cache/vpython3" - } - ], - "casSpec": "compile", - "cipd_packages": [ - { - "name": "infra/3pp/tools/cpython3/${platform}", - "path": "cipd_bin_packages/cpython3", - "version": "version:3@3.11.9.chromium.36" - }, - { - "name": "infra/tools/luci-auth/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:7257396558bc9c7c7e7bc5fdb9225f9f3bfd89d7" - }, - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:b2fad5ab18774b86d84aa867287bfb4f2394893b" - }, - { - "name": "infra/tools/luci/vpython3/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:b2fad5ab18774b86d84aa867287bfb4f2394893b" - }, - { - "name": "skia/bots/ccache_linux", - "path": "ccache_linux", - "version": "version:1" - }, - { - "name": "skia/bots/clang_linux", - "path": "clang_linux", - "version": "version:36" - } - ], - "command": [ - "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}", - "-u", - "skia/infra/bots/run_recipe.py", - "${ISOLATED_OUTDIR}", - "compile", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Ubuntu24.04-Clang-x86_64-Debug-SafeStack\",\"swarm_out_dir\":\"build\"}", - "skia" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes" - ], - "dimensions": [ - "cpu:x86-64-Haswell_GCE", - "gpu:none", - "machine_type:n1-highcpu-64", - "os:Ubuntu-24.04", - "pool:Skia" - ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin", - "cipd_bin_packages/cpython3", - "cipd_bin_packages/cpython3/bin" - ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython3" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "cache/vpython3" - ] - }, - "execution_timeout_ns": 3600000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" - }, - "idempotent": true, - "io_timeout_ns": 3600000000000, - "max_attempts": 2, - "outputs": [ - "build" - ], - "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" - }, "Build-Ubuntu24.04-Clang-x86_64-Debug-Static": { "caches": [ { @@ -58883,106 +58780,6 @@ ], "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" }, - "Test-Ubuntu24.04-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack": { - "caches": [ - { - "name": "vpython3", - "path": "cache/vpython3" - } - ], - "casSpec": "test", - "cipd_packages": [ - { - "name": "infra/3pp/tools/cpython3/${platform}", - "path": "cipd_bin_packages/cpython3", - "version": "version:3@3.11.9.chromium.36" - }, - { - "name": "infra/tools/luci-auth/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:7257396558bc9c7c7e7bc5fdb9225f9f3bfd89d7" - }, - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:b2fad5ab18774b86d84aa867287bfb4f2394893b" - }, - { - "name": "infra/tools/luci/vpython3/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:b2fad5ab18774b86d84aa867287bfb4f2394893b" - }, - { - "name": "skia/bots/gsutil", - "path": "gsutil", - "version": "version:0" - }, - { - "name": "skia/bots/skimage", - "path": "skimage", - "version": "version:47" - }, - { - "name": "skia/bots/skp", - "path": "skp", - "version": "version:564" - }, - { - "name": "skia/bots/svg", - "path": "svg", - "version": "version:14" - } - ], - "command": [ - "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}", - "-u", - "skia/infra/bots/run_recipe.py", - "${ISOLATED_OUTDIR}", - "test", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu24.04-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"SafeStack\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Ubuntu24.04\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"Skottie_Shaper_CTStrict\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"BigImageTest_Ganesh\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu24.04-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}", - "skia" - ], - "dependencies": [ - "Build-Ubuntu24.04-Clang-x86_64-Debug-SafeStack", - "Housekeeper-PerCommit-BundleRecipes" - ], - "dimensions": [ - "cpu:x86-64-Haswell_GCE", - "machine_type:n1-standard-16", - "os:Ubuntu-24.04", - "pool:Skia" - ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, - "env_prefixes": { - "PATH": [ - "gsutil/gsutil", - "cipd_bin_packages", - "cipd_bin_packages/bin", - "cipd_bin_packages/cpython3", - "cipd_bin_packages/cpython3/bin" - ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython3" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "cache/vpython3" - ] - }, - "execution_timeout_ns": 14400000000000, - "expiration_ns": 72000000000000, - "extra_tags": { - "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations" - }, - "io_timeout_ns": 14400000000000, - "max_attempts": 2, - "outputs": [ - "test" - ], - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, "Test-Ubuntu24.04-Clang-GCE-CPU-AVX2-x86_64-Debug-All-Wuffs": { "caches": [ {