0a51b48e20
This CL includes a few things. First, it creates two CIPD assets, a Debug and Release version of the Linux Vulkan Intel Driver. The driver is still young, so the Debug version helps us submit better bugs to the developers. The current version is Mesa 13.04: ftp://ftp.freedesktop.org/pub/mesa/13.0.4/ Second, it fixes the GN flavor to not purge out all environment variables - a leftover from the GYP -> GN migration. Third, it sets environment variables on both Test and Perf such that the vulkan sdk, libraries and drivers all linked in from their homes in CIPD. BUG=skia:6133 Change-Id: I9a999e24a0203ab7a9f4733bee1110b79e616935 Reviewed-on: https://skia-review.googlesource.com/7994 Reviewed-by: Eric Boren <borenet@google.com> Commit-Queue: Kevin Lubick <kjlubick@google.com>
210 lines
6.1 KiB
JSON
210 lines
6.1 KiB
JSON
[
|
|
{
|
|
"cmd": [
|
|
"python",
|
|
"-u",
|
|
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
|
"[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION",
|
|
"/path/to/tmp/"
|
|
],
|
|
"name": "Get downloaded SKP VERSION"
|
|
},
|
|
{
|
|
"cmd": [
|
|
"python",
|
|
"-u",
|
|
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
|
"42",
|
|
"[START_DIR]\\tmp\\SKP_VERSION"
|
|
],
|
|
"name": "write SKP_VERSION"
|
|
},
|
|
{
|
|
"cmd": [
|
|
"python",
|
|
"-u",
|
|
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
|
"[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION",
|
|
"/path/to/tmp/"
|
|
],
|
|
"name": "Get downloaded skimage VERSION"
|
|
},
|
|
{
|
|
"cmd": [
|
|
"python",
|
|
"-u",
|
|
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
|
"42",
|
|
"[START_DIR]\\tmp\\SK_IMAGE_VERSION"
|
|
],
|
|
"name": "write SK_IMAGE_VERSION"
|
|
},
|
|
{
|
|
"cmd": [
|
|
"python",
|
|
"-u",
|
|
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
|
"[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION",
|
|
"/path/to/tmp/"
|
|
],
|
|
"name": "Get downloaded SVG VERSION"
|
|
},
|
|
{
|
|
"cmd": [
|
|
"python",
|
|
"-u",
|
|
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
|
"42",
|
|
"[START_DIR]\\tmp\\SVG_VERSION"
|
|
],
|
|
"name": "write SVG_VERSION"
|
|
},
|
|
{
|
|
"cmd": [
|
|
"python",
|
|
"-u",
|
|
"\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
|
|
"[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release\\data"
|
|
],
|
|
"env": {
|
|
"PYTHONPATH": "[START_DIR]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts"
|
|
},
|
|
"name": "rmtree data",
|
|
"~followup_annotations": [
|
|
"@@@STEP_LOG_LINE@python.inline@@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
|
|
"@@@STEP_LOG_END@python.inline@@@"
|
|
]
|
|
},
|
|
{
|
|
"cmd": [
|
|
"python",
|
|
"-u",
|
|
"\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
|
|
"[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release\\data",
|
|
"511"
|
|
],
|
|
"name": "makedirs data",
|
|
"~followup_annotations": [
|
|
"@@@STEP_LOG_LINE@python.inline@@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
|
|
"@@@STEP_LOG_END@python.inline@@@"
|
|
]
|
|
},
|
|
{
|
|
"cmd": [
|
|
"[START_DIR]\\out\\Release_x64\\nanobench",
|
|
"--undefok",
|
|
"-i",
|
|
"[START_DIR]\\skia\\resources",
|
|
"--skps",
|
|
"[START_DIR]\\skp",
|
|
"--images",
|
|
"[START_DIR]\\skimage\\nanobench",
|
|
"--svgs",
|
|
"[START_DIR]\\svg",
|
|
"--nogpu",
|
|
"--pre_log",
|
|
"--scales",
|
|
"1.0",
|
|
"1.1",
|
|
"--config",
|
|
"8888",
|
|
"gpu",
|
|
"nonrendering",
|
|
"hwui",
|
|
"f16",
|
|
"srgb",
|
|
"565",
|
|
"msaa16",
|
|
"nvpr16",
|
|
"nvprdit16",
|
|
"--match",
|
|
"~inc0.gif",
|
|
"~inc1.gif",
|
|
"~incInterlaced.gif",
|
|
"~inc0.jpg",
|
|
"~incGray.jpg",
|
|
"~inc0.wbmp",
|
|
"~inc1.wbmp",
|
|
"~inc0.webp",
|
|
"~inc1.webp",
|
|
"~inc0.ico",
|
|
"~inc1.ico",
|
|
"~inc0.png",
|
|
"~inc1.png",
|
|
"~inc2.png",
|
|
"~inc12.png",
|
|
"~inc13.png",
|
|
"~inc14.png",
|
|
"~inc0.webp",
|
|
"~inc1.webp",
|
|
"--outResultsFile",
|
|
"[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release\\data\\nanobench_abc123_1337000001.json",
|
|
"--properties",
|
|
"gitHash",
|
|
"abc123",
|
|
"build_number",
|
|
"5",
|
|
"--key",
|
|
"arch",
|
|
"x86_64",
|
|
"compiler",
|
|
"MSVC",
|
|
"cpu_or_gpu",
|
|
"CPU",
|
|
"cpu_or_gpu_value",
|
|
"AVX2",
|
|
"model",
|
|
"GCE",
|
|
"os",
|
|
"Win"
|
|
],
|
|
"cwd": "[START_DIR]\\skia",
|
|
"env": {
|
|
"BUILDTYPE": "Release_x64",
|
|
"CHROME_HEADLESS": "1",
|
|
"SKIA_OUT": "[START_DIR]\\out"
|
|
},
|
|
"name": "nanobench"
|
|
},
|
|
{
|
|
"cmd": [
|
|
"python",
|
|
"-u",
|
|
"\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
|
|
"[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release\\data",
|
|
"511"
|
|
],
|
|
"name": "makedirs perf_dir",
|
|
"~followup_annotations": [
|
|
"@@@STEP_LOG_LINE@python.inline@@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
|
|
"@@@STEP_LOG_END@python.inline@@@"
|
|
]
|
|
},
|
|
{
|
|
"name": "$result",
|
|
"recipe_result": null,
|
|
"status_code": 0
|
|
}
|
|
] |