Eliminate SkVM-specific bots.

SkVM is being removed; we no longer need SkVM bots on the tree. Change-Id: Iff9eaf84e35f14290a8adbfd704d57bb500550d2 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/678416 Reviewed-by: Kevin Lubick <[email protected]> Commit-Queue: Kevin Lubick <[email protected]> Commit-Queue: John Stiles <[email protected]> Auto-Submit: John Stiles <[email protected]>
armansito · Apr 24, 2023 · 01b6fa2 · 01b6fa2
1 parent 258dd61
commit 01b6fa2
Show file tree

Hide file tree

Showing 5 changed files with 1,304 additions and 2,297 deletions.
diff --git a/infra/bots/gen_tasks_logic/dm_flags.go b/infra/bots/gen_tasks_logic/dm_flags.go
@@ -185,10 +185,6 @@ func (b *taskBuilder) dmFlags(internalHardwareLabel string) {
 
 		configs = append(configs, "8888")
 
-		if b.extraConfig("SkVM") {
-			args = append(args, "--skvm")
-		}
-
 		if b.extraConfig("BonusConfigs") {
 			configs = []string{
 				"r8", "565",

diff --git a/infra/bots/gen_tasks_logic/gen_tasks_logic.go b/infra/bots/gen_tasks_logic/gen_tasks_logic.go
@@ -707,13 +707,13 @@ func (b *jobBuilder) deriveCompileTaskName() string {
 		if val := b.parts["extra_config"]; val != "" {
 			ec = strings.Split(val, "_")
 			ignore := []string{
-				"Skpbench", "AbandonGpuContext", "PreAbandonGpuContext", "Valgrind", "FailFlushTimeCallbacks",
-				"ReleaseAndAbandonGpuContext", "FSAA", "FAAA", "FDAA", "NativeFonts", "GDI",
-				"NoGPUThreads", "DDL1", "DDL3", "T8888",
-				"DDLTotal", "DDLRecord", "9x9", "BonusConfigs", "ColorSpaces", "GL", "SkottieTracing", "SkottieWASM",
-				"GpuTess", "DMSAAStats", "Mskp", "Docker", "PDF", "SkVM", "Puppeteer",
-				"SkottieFrames", "RenderSKP", "CanvasPerf", "AllPathsVolatile", "WebGL2", "i5",
-				"OldestSupportedSkpVersion"}
+				"Skpbench", "AbandonGpuContext", "PreAbandonGpuContext", "Valgrind",
+				"FailFlushTimeCallbacks", "ReleaseAndAbandonGpuContext", "FSAA", "FAAA", "FDAA",
+				"NativeFonts", "GDI", "NoGPUThreads", "DDL1", "DDL3", "T8888",
+				"DDLTotal", "DDLRecord", "9x9", "BonusConfigs", "ColorSpaces", "GL",
+				"SkottieTracing", "SkottieWASM", "GpuTess", "DMSAAStats", "Mskp", "Docker", "PDF",
+				"Puppeteer", "SkottieFrames", "RenderSKP", "CanvasPerf", "AllPathsVolatile",
+				"WebGL2", "i5", "OldestSupportedSkpVersion"}
 			keep := make([]string, 0, len(ec))
 			for _, part := range ec {
 				if !In(part, ignore) {

diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
@@ -597,7 +597,6 @@
   {"name": "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-NativeFonts"},
   {"name": "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE"},
   {"name": "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack"},
-  {"name": "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SkVM"},
   {"name": "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-Wuffs"},
   {"name": "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All"},
   {"name": "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-AVIF"},
@@ -608,7 +607,6 @@
   {"name": "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE2"},
   {"name": "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE41"},
   {"name": "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER"},
-  {"name": "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-SkVM"},
   {"name": "Test-Debian10-Clang-GCE-CPU-AVX512-x86_64-Debug-All"},
   {"name": "Test-Debian10-Clang-GCE-CPU-AVX512-x86_64-Release-All"},
   {"name": "Test-Debian10-Clang-GCE-CPU-Rome-x86_64-Debug-All"},
@@ -841,19 +839,15 @@
   {"name": "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan"},
   {"name": "Test-Win2019-Clang-GCE-CPU-AVX2-x86-Debug-All"},
   {"name": "Test-Win2019-Clang-GCE-CPU-AVX2-x86-Release-All"},
-  {"name": "Test-Win2019-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SkVM"},
   {"name": "Test-Win2019-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN"},
   {"name": "Test-Win2019-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN_BonusConfigs"},
   {"name": "Test-Win2019-Clang-GCE-CPU-AVX2-x86_64-Release-All",
    "cq_config": {}
    },
-  {"name": "Test-Win2019-Clang-GCE-CPU-AVX2-x86_64-Release-All-SkVM"},
   {"name": "Test-Win2019-MSVC-GCE-CPU-AVX2-x86-Debug-All"},
   {"name": "Test-Win2019-MSVC-GCE-CPU-AVX2-x86-Release-All"},
   {"name": "Test-Win2019-MSVC-GCE-CPU-AVX2-x86_64-Debug-All"},
-  {"name": "Test-Win2019-MSVC-GCE-CPU-AVX2-x86_64-Debug-All-SkVM"},
   {"name": "Test-Win2019-MSVC-GCE-CPU-AVX2-x86_64-Release-All"},
-  {"name": "Test-Win2019-MSVC-GCE-CPU-AVX2-x86_64-Release-All-SkVM"},
   {"name": "Test-Win8-Clang-Golo-CPU-AVX512-x86-Debug-All"},
   {"name": "Test-Win8-Clang-Golo-CPU-AVX512-x86-Release-All"},
   {"name": "Test-Win8-Clang-Golo-CPU-AVX512-x86_64-Debug-All"},

diff --git a/infra/bots/task_drivers/fm_driver/fm_driver.go b/infra/bots/task_drivers/fm_driver/fm_driver.go
@@ -482,9 +482,6 @@ func main() {
 				run(gms, F{"ct": "8888", "gamut": "narrow", "tf": "2.2"})     // --config narrow
 				run(gms, F{"ct": "f16", "gamut": "rec2020", "tf": "rec2020"}) // --config erec2020
 
-				run(gms, F{"skvm": "true"})
-				run(gms, F{"skvm": "true", "ct": "f16"})
-
 				run(imgs, F{
 					"decodeToDst": "true",
 					"ct":          "f16",