projects / platform / upstream / libSkiaSharp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0d4ff6c)
Add Tasks for Linux + Iris 540
authorKevin Lubick <kjlubick@google.com>
Tue, 17 Jan 2017 20:15:40 +0000 (15:15 -0500)
committerSkia Commit-Bot <skia-commit-bot@chromium.org>
Tue, 17 Jan 2017 22:16:29 +0000 (22:16 +0000)
This does not include Vulkan as it doesn't build yet.

BUG=skia:6089

Change-Id: If44616dbd7b2aaa63232dac04e96d8433da7f157
Reviewed-on: https://skia-review.googlesource.com/7113
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
infra/bots/gen_tasks.go patch | blob | history
infra/bots/tasks.json patch | blob | history

diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index 50121d5..9457866 100644 (file)
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -160,6 +160,8 @@ var (
                "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind",
                "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug",
                "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release",
+               "Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug",
+               "Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release",
                "Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release",
                "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug",
                "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE",
@@ -256,6 +258,8 @@ var (
                "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind",
                "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug",
                "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release",
+               "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug",
+               "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release",
                "Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release",
                "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug",
                "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE",
@@ -326,6 +330,8 @@ func deriveCompileTaskName(jobName string, parts map[string]string) string {
                        task_os = "Mac"
                } else if strings.Contains(task_os, "Win") {
                        task_os = "Win"
+               } else if strings.Contains(task_os, "Ubuntu") {
+                       task_os = "Ubuntu"
                }
                jobNameMap := map[string]string{
                        "role":          "Build",
@@ -354,14 +360,15 @@ func swarmDimensions(parts map[string]string) []string {
        }
        if os, ok := parts["os"]; ok {
                d["os"] = map[string]string{
-                       "Android": "Android",
-                       "Mac":     "Mac-10.11",
-                       "Ubuntu":  DEFAULT_OS_LINUX,
-                       "Win":     "Windows-2008ServerR2-SP1",
-                       "Win10":   "Windows-10-14393",
-                       "Win2k8":  "Windows-2008ServerR2-SP1",
-                       "Win8":    "Windows-8.1-SP0",
-                       "iOS":     "iOS-9.3.1",
+                       "Android":  "Android",
+                       "Mac":      "Mac-10.11",
+                       "Ubuntu":   DEFAULT_OS_LINUX,
+                       "Ubuntu16": "Ubuntu-16.04",
+                       "Win":      "Windows-2008ServerR2-SP1",
+                       "Win10":    "Windows-10-14393",
+                       "Win2k8":   "Windows-2008ServerR2-SP1",
+                       "Win8":     "Windows-8.1-SP0",
+                       "iOS":      "iOS-9.3.1",
                }[os]
                // Chrome Golo has a different Windows image.
                if parts["model"] == "Golo" && os == "Win10" {
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index e930bb6..23db336 100644 (file)
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -722,6 +722,18 @@
         "Upload-Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release"
       ]
     },
+    "Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug"
+      ]
+    },
+    "Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release"
+      ]
+    },
     "Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
@@ -1287,6 +1299,18 @@
         "Upload-Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release"
       ]
     },
+    "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug"
+      ]
+    },
+    "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release"
+      ]
+    },
     "Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
@@ -6071,6 +6095,102 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
+    "Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:18"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:33"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-Clang-x86_64-Debug"
+      ],
+      "dimensions": [
+        "gpu:8086:1926",
+        "os:Ubuntu-16.04",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "repository=<(REPO)",
+        "buildername=Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia.isolate",
+      "priority": 0.8
+    },
+    "Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:18"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:33"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-Clang-x86_64-Release"
+      ],
+      "dimensions": [
+        "gpu:8086:1926",
+        "os:Ubuntu-16.04",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "repository=<(REPO)",
+        "buildername=Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia.isolate",
+      "priority": 0.8
+    },
     "Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release": {
       "cipd_packages": [
         {
@@ -10589,6 +10709,102 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
+    "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:18"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:33"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-Clang-x86_64-Debug"
+      ],
+      "dimensions": [
+        "gpu:8086:1926",
+        "os:Ubuntu-16.04",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:18"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:33"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-Clang-x86_64-Release"
+      ],
+      "dimensions": [
+        "gpu:8086:1926",
+        "os:Ubuntu-16.04",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
     "Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release": {
       "cipd_packages": [
         {
@@ -13048,6 +13264,35 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
+    "Upload-Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release": {
+      "dependencies": [
+        "Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
     "Upload-Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release": {
       "dependencies": [
         "Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release"
@@ -14991,6 +15236,64 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
+    "Upload-Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug": {
+      "dependencies": [
+        "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release": {
+      "dependencies": [
+        "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
     "Upload-Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release": {
       "dependencies": [
         "Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release"
Domain: Dotnet / API;