AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add mesa_intel_driver asset and dockerfile for creating

Browse Source 
This deletes the previous hand-built drivers and the
distinction between a debug and non-debug driver.

Bug: skia:
Change-Id: Ia733783d703da803f76361c61b938d9ce70c88f0
Reviewed-on: https://skia-review.googlesource.com/150163
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
This commit is contained in:
Kevin Lubick 2018-09-11 17:09:28 -04:00 committed by Skia Commit-Bot
parent 97df5dcb37
commit 1b5ece0f06
29 changed files with 314 additions and 332 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
infra/bots/assets/linux_vulkan_intel_driver_debug/README.md
View File

@ -1 +0,0 @@
See [the release readme](../linux_vulkan_intel_driver_release/README.md) for information on how to make this asset.

1
infra/bots/assets/linux_vulkan_intel_driver_debug/VERSION
View File

@ -1 +0,0 @@
4

26
infra/bots/assets/linux_vulkan_intel_driver_debug/common.py
View File

@ -1,26 +0,0 @@
#!/usr/bin/env python
#
# Copyright 2016 Google Inc.
#
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
"""Common vars used by scripts in this directory."""
import os
import sys
FILE_DIR = os.path.dirname(os.path.abspath(__file__))
INFRA_BOTS_DIR = os.path.realpath(os.path.join(FILE_DIR, os.pardir, os.pardir))
sys.path.insert(0, INFRA_BOTS_DIR)
from assets import assets
ASSET_NAME = os.path.basename(FILE_DIR)
def run(cmd):
"""Run a command, eg. "upload" or "download". """
assets.main([cmd, ASSET_NAME] + sys.argv[1:])

34
infra/bots/assets/linux_vulkan_intel_driver_debug/create.py
View File

@ -1,34 +0,0 @@
#!/usr/bin/env python
#
# Copyright 2016 Google Inc.
#
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
"""Create the asset."""
import argparse
import shutil
import sys
import os
def create_asset(target_dir, lib_path):
"""Create the asset."""
shutil.copytree(lib_path, target_dir)
def main():
if 'linux' not in sys.platform:
print >> sys.stderr, 'This script only runs on Linux.'
sys.exit(1)
parser = argparse.ArgumentParser()
parser.add_argument('--target_dir', '-t', required=True)
parser.add_argument('--lib_path', '-l', required=True)
args = parser.parse_args()
create_asset(args.target_dir, args.lib_path)
if __name__ == '__main__':
main()

37
infra/bots/assets/linux_vulkan_intel_driver_release/README.md
View File

@ -1,37 +0,0 @@
Creating the Linux Vulkan driver for Intel
This is known to work on an Intel machine running Ubuntu 16.10.
Install all deps
sudo apt-get install autoconf libtool scons flex bison llvm-dev libpthread-stubs0-dev x11proto-gl-dev libdrm-dev x11proto-dri2-dev x11proto-dri3-dev x11proto-present-dev libxcb1-dev libxcb-dri3-dev libxcb-present-dev libxshmfence-dev xserver-xorg-core xserver-xorg-dev x11proto-xext-dev libxext-dev libxdamage-dev libx11-xcb-dev libxcb-glx0-dev libxcb-dri2-0-dev
sudo pip install mako
Get the source from ftp.freedesktop.org/pub/mesa/
wget ftp://ftp.freedesktop.org/pub/mesa/$MESA_VERSION/mesa-$MESA_VERSION.tar.gz
gunzip mesa-$MESA_VERSION.tar.gz
tar --extract -f mesa-$MESA_VERSION.tar
cd mesa-$MESA_VERSION/
mv mesa-$MESA_VERSION/ mesa
Build the driver
mesa$ ./autogen.sh
# For the debug resource, use --enable-debug
mesa$ ./configure --with-vulkan-drivers=intel
mesa$ make
Tweak icd.json file and output dir (mesa/lib)
mesa$ cp src/intel/vulkan/intel_icd.x86_64.json lib/
# modify the pathname in the intel_icd.x86_64.json file to be ./libvulkan_intel.so
mesa$ rm -rf lib/gallium # We don't need this
mesa$ rm lib/nouveau_vieux_dri.so lib/r200_dri.so lib/radeon_dri.so # We don't need these
Finally, use mesa/lib as the input directory to the create_and_upload script.

1
infra/bots/assets/linux_vulkan_intel_driver_release/VERSION
View File

@ -1 +0,0 @@
6

34
infra/bots/assets/linux_vulkan_intel_driver_release/create.py
View File

@ -1,34 +0,0 @@
#!/usr/bin/env python
#
# Copyright 2016 Google Inc.
#
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
"""Create the asset."""
import argparse
import shutil
import sys
import os
def create_asset(target_dir, lib_path):
"""Create the asset."""
shutil.copytree(lib_path, target_dir)
def main():
if 'linux' not in sys.platform:
print >> sys.stderr, 'This script only runs on Linux.'
sys.exit(1)
parser = argparse.ArgumentParser()
parser.add_argument('--target_dir', '-t', required=True)
parser.add_argument('--lib_path', '-l', required=True)
args = parser.parse_args()
create_asset(args.target_dir, args.lib_path)
if __name__ == '__main__':
main()

50
infra/bots/assets/linux_vulkan_intel_driver_release/create_and_upload.py
View File

@ -1,50 +0,0 @@
#!/usr/bin/env python
#
# Copyright 2016 Google Inc.
#
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
"""Create the asset and upload it."""
import argparse
import common
import os
import subprocess
import sys
import utils
def main():
if 'linux' not in sys.platform:
print >> sys.stderr, 'This script only runs on Linux.'
sys.exit(1)
parser = argparse.ArgumentParser()
parser.add_argument('--gsutil')
parser.add_argument('--lib_path', '-l', required=True)
args = parser.parse_args()
with utils.tmp_dir():
cwd = os.getcwd()
create_script = os.path.join(common.FILE_DIR, 'create.py')
upload_script = os.path.join(common.FILE_DIR, 'upload.py')
try:
cwd = os.path.join(cwd, 'lib')
subprocess.check_call(['python', create_script,
'-t', cwd,
'--lib_path', args.lib_path])
cmd = ['python', upload_script, '-t', cwd]
if args.gsutil:
cmd.extend(['--gsutil', args.gsutil])
subprocess.check_call(cmd)
except subprocess.CalledProcessError:
# Trap exceptions to avoid printing two stacktraces.
sys.exit(1)
if __name__ == '__main__':
main()

16
infra/bots/assets/linux_vulkan_intel_driver_release/download.py
View File

@ -1,16 +0,0 @@
#!/usr/bin/env python
#
# Copyright 2016 Google Inc.
#
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
"""Download the current version of the asset."""
import common
if __name__ == '__main__':
common.run('download')

16
infra/bots/assets/linux_vulkan_intel_driver_release/upload.py
View File

@ -1,16 +0,0 @@
#!/usr/bin/env python
#
# Copyright 2016 Google Inc.
#
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
"""Upload a new version of the asset."""
import common
if __name__ == '__main__':
common.run('upload')

72
infra/bots/assets/mesa_intel_driver_linux/README.md Normal file
View File

@ -0,0 +1,72 @@
Creating the Mesa Intel Linux driver asset (which supports Vulkan)
============================================================
Using the automated asset python scripts requires that Docker be installed.
mesa_intel_driver_linux$ python create_and_upload.py
See below for steps on just building the driver.
Using Docker
------------
It is easiest to just use the pre-built docker image.
docker run -v /tmp/out:/OUT -e MESA_VERSION=18.1.7 gcr.io/skia-public/mesa-driver-builder:latest /opt/build_mesa.sh
You may change `/tmp/out` to be the desired output directory and `18.1.7` to be the desired
version of the mesa driver.
Finally, use `/tmp/out` as the input directory to the upload script.
Building it manually
--------------------
If Docker is not installed, these steps may be used to build the driver.
This is known to work on Ubuntu 18.04, but is stale since we use the Docker container
for day-to-day builds.
Install all deps
sudo apt-get install autoconf libtool scons flex bison llvm-dev libpthread-stubs0-dev x11proto-gl-dev libdrm-dev libdrm2 x11proto-dri2-dev x11proto-dri3-dev x11proto-present-dev libxcb1-dev libxcb-dri3-dev libxcb-present-dev libxshmfence-dev xserver-xorg-core xserver-xorg-dev x11proto-xext-dev libxext-dev libxdamage-dev libx11-xcb-dev libxcb-glx0-dev libxcb-dri2-0-dev libva-dev libomxil-bellagio-dev
sudo pip install mako
The following steps are also represented in `mesa-driver-builder/build_mesa.sh`
Get the source from ftp.freedesktop.org/pub/mesa/
MESA_VERSION=18.1.7
wget ftp://ftp.freedesktop.org/pub/mesa/mesa-$MESA_VERSION.tar.gz
gunzip mesa-$MESA_VERSION.tar.gz
tar --extract -f mesa-$MESA_VERSION.tar
mv mesa-$MESA_VERSION/ mesa
cd mesa
Build the driver
# For the debug resource, use --enable-debug
mesa$ ./autogen.sh --disable-radeon --with-gallium-drivers=i915 --with-vulkan-drivers=intel
mesa$ make -j 50
Tweak icd.json file and output dir (mesa/lib)
mesa$ cp src/intel/vulkan/intel_icd.x86_64.json lib/
# modify the pathname in the intel_icd.x86_64.json file to be ./libvulkan_intel.so
mesa$ rm -rf lib/gallium # We don't need this
mesa$ rm lib/nouveau_vieux_dri.so lib/r200_dri.so lib/radeon_dri.so # We don't need these
Finally, use mesa/lib as the input directory to the upload script.
Docker Image Maintanence
------------------------
The docker image `mesa-driver-builder` is an Ubuntu container with many build
tools installed (including Clang 6). It is designed specifically to build the mesa driver.
The image only needs to be re-built when the dependencies change or the build_mesa.sh is updated.
docker build -t mesa-driver-builder ./mesa-driver-builder/
# use v1, v2, v3, etc to handle changes/updates to the image.
docker tag mesa-driver-builder gcr.io/skia-public/mesa-driver-builder:v1
docker push gcr.io/skia-public/mesa-driver-builder:v1

1
infra/bots/assets/mesa_intel_driver_linux/VERSION Normal file
View File

@ -0,0 +1 @@
0

2
infra/bots/assets/linux_vulkan_intel_driver_release/common.py → infra/bots/assets/mesa_intel_driver_linux/common.py
View File

@ -1,6 +1,6 @@
#!/usr/bin/env python
#
# Copyright 2016 Google Inc.
# Copyright 2017 Google Inc.
#
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

40
infra/bots/assets/mesa_intel_driver_linux/create.py Executable file
View File

@ -0,0 +1,40 @@
#!/usr/bin/env python
#
# Copyright 2018 Google LLC
#
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
"""Create the mesa driver. This defers to a Docker container
with the build_mesa.sh script."""
import argparse
import subprocess
DOCKER_IMAGE='gcr.io/skia-public/mesa-driver-builder:v1'
BUILD_SCRIPT='/opt/build_mesa.sh'
MESA_VERSION='18.1.7'
def create_asset(target_dir):
"""Create the asset."""
cmd = [
'docker', 'run', '--volume', '%s:/OUT' % target_dir,
'--env', 'MESA_VERSION=%s' % MESA_VERSION,
DOCKER_IMAGE, BUILD_SCRIPT
]
print('Running docker cmd', cmd)
subprocess.check_output(cmd)
def main():
parser = argparse.ArgumentParser()
parser.add_argument('--target_dir', '-t', required=True)
args = parser.parse_args()
create_asset(args.target_dir)
if __name__ == '__main__':
main()

12
infra/bots/assets/linux_vulkan_intel_driver_debug/create_and_upload.py → infra/bots/assets/mesa_intel_driver_linux/create_and_upload.py
View File

@ -1,6 +1,6 @@
#!/usr/bin/env python
#
# Copyright 2016 Google Inc.
# Copyright 2017 Google Inc.
#
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
@ -18,12 +18,8 @@ import utils
def main():
if 'linux' not in sys.platform:
print >> sys.stderr, 'This script only runs on Linux.'
sys.exit(1)
parser = argparse.ArgumentParser()
parser.add_argument('--gsutil')
parser.add_argument('--lib_path', '-l', required=True)
args = parser.parse_args()
with utils.tmp_dir():
@ -32,11 +28,7 @@ def main():
upload_script = os.path.join(common.FILE_DIR, 'upload.py')
try:
cwd = os.path.join(cwd, 'lib')
subprocess.check_call(['python', create_script,
'-t', cwd,
'--lib_path', args.lib_path])
subprocess.check_call(['python', create_script, '-t', cwd])
cmd = ['python', upload_script, '-t', cwd]
if args.gsutil:
cmd.extend(['--gsutil', args.gsutil])

2
infra/bots/assets/linux_vulkan_intel_driver_debug/download.py → infra/bots/assets/mesa_intel_driver_linux/download.py
View File

@ -1,6 +1,6 @@
#!/usr/bin/env python
#
# Copyright 2016 Google Inc.
# Copyright 2017 Google Inc.
#
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

68
infra/bots/assets/mesa_intel_driver_linux/mesa-driver-builder/Dockerfile Normal file
View File

@ -0,0 +1,68 @@
FROM debian:9.4
# Enabling backports gives us access to clang-6 and new versions of libdrm2 package.
# Mesa builds newer than 17.0.4 or so require libdrm > 2.4.75, but the
# default one in stretch is 2.4.74.
# Note that the hosts that use these drivers will also need the newer version of libdrm2
# or there will be an error along the lines of:
# symbol lookup error: ./mesa_intel_driver/libGL.so.1: undefined symbol: drmGetDevice2
#
# Hosts can install this by adding the stretch-backports debian source (see next RUN)
# and the performing `sudo apt-get update && sudo apt-get install libdrm2=2.4.91-2~bpo9+1`
RUN echo "deb http://ftp.debian.org/debian stretch-backports main" >> /etc/apt/sources.list
RUN apt-get update && apt-get upgrade -y
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get install -y \
autoconf \
bison \
build-essential \
clang-6.0 \
flex \
libdrm-amdgpu1=2.4.91-2~bpo9+1 \
libdrm-dev=2.4.91-2~bpo9+1 \
libdrm-intel1=2.4.91-2~bpo9+1 \
libdrm-nouveau2=2.4.91-2~bpo9+1 \
libdrm-radeon1=2.4.91-2~bpo9+1 \
libdrm2=2.4.91-2~bpo9+1 \
libomxil-bellagio-dev \
libpthread-stubs0-dev \
libtool \
libva-dev \
libx11-xcb-dev \
libxcb-dri2-0-dev \
libxcb-dri3-dev \
libxcb-glx0-dev \
libxcb-present-dev \
libxcb1-dev \
libxdamage-dev \
libxext-dev \
libxshmfence-dev \
llvm-dev \
pkg-config \
python-pip \
python2.7 \
scons \
software-properties-common \
wget \
x11proto-dri2-dev \
x11proto-dri3-dev \
x11proto-gl-dev \
x11proto-present-dev \
x11proto-xext-dev \
xserver-xorg-core \
xserver-xorg-dev
RUN pip install mako
ENV CC="/usr/lib/llvm-6.0/bin/clang" \
CXX="/usr/lib/llvm-6.0/bin/clang++" \
PATH=/usr/lib/llvm-6.0/bin:$PATH
# Default to this version of MESA, but it can be overridden with
# -e MESA_VERSION=X.Y.Z when running the docker container
ENV MESA_VERSION=18.1.7
COPY ./build_mesa.sh /opt/build_mesa.sh

33
infra/bots/assets/mesa_intel_driver_linux/mesa-driver-builder/build_mesa.sh Executable file
View File

@ -0,0 +1,33 @@
#! /bin/bash
#
# Copyright 2018 Google LLC
#
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
# Builds the mesa driver and copies it to /OUT
# This script uses the environement variable $MESA_VERSION
# to dermine which version to download and build.
set -ex
pushd /tmp
wget ftp://ftp.freedesktop.org/pub/mesa/mesa-$MESA_VERSION.tar.gz
tar --gunzip --extract --file mesa-$MESA_VERSION.tar.gz
cd mesa-$MESA_VERSION/
./configure --with-dri-drivers=i965 --with-gallium-drivers= --with-vulkan-drivers=intel
make -j 50
rm -rf lib/gallium
rm -f lib/nouveau_vieux_dri.so lib/r200_dri.so lib/radeon_dri.so
cp lib/* /OUT
cp src/intel/vulkan/intel_icd.x86_64.json /OUT
# Change "library_path": "/usr/local/lib/libvulkan_intel.so"
# to "library_path": "./libvulkan_intel.so"
sed -i -e 's/\/usr\/local\/lib/\./g' /OUT/intel_icd.x86_64.json
popd

2
infra/bots/assets/linux_vulkan_intel_driver_debug/upload.py → infra/bots/assets/mesa_intel_driver_linux/upload.py
View File

@ -1,6 +1,6 @@
#!/usr/bin/env python
#
# Copyright 2016 Google Inc.
# Copyright 2017 Google Inc.
#
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

6
infra/bots/gen_tasks.go
View File

@ -1351,11 +1351,7 @@ func process(b *specs.TasksCfgBuilder, name string) {
pkgs = append(pkgs, b.MustGetCipdPackageFromAsset("linux_vulkan_sdk"))
}
if strings.Contains(name, "Intel") && strings.Contains(name, "GPU") {
if strings.Contains(name, "Release") {
pkgs = append(pkgs, b.MustGetCipdPackageFromAsset("linux_vulkan_intel_driver_release"))
} else {
pkgs = append(pkgs, b.MustGetCipdPackageFromAsset("linux_vulkan_intel_driver_debug"))
}
pkgs = append(pkgs, b.MustGetCipdPackageFromAsset("mesa_intel_driver_linux"))
}
if strings.Contains(name, "OpenCL") {
pkgs = append(pkgs,

6
infra/bots/recipe_modules/flavor/default.py
View File

@ -169,11 +169,7 @@ class DefaultFlavor(object):
if self.m.vars.is_linux:
if (self.m.vars.builder_cfg.get('cpu_or_gpu', '') == 'GPU'
and 'Intel' in self.m.vars.builder_cfg.get('cpu_or_gpu_value', '')):
# The vulkan in this asset name simply means that the graphics driver
# supports Vulkan. It is also the driver used for GL code.
dri_path = slave_dir.join('linux_vulkan_intel_driver_release')
if self.m.vars.builder_cfg.get('configuration', '') == 'Debug':
dri_path = slave_dir.join('linux_vulkan_intel_driver_debug')
dri_path = slave_dir.join('mesa_intel_driver_linux')
ld_library_path.append(dri_path)
env['LIBGL_DRIVERS_PATH'] = str(dri_path)
env['VK_ICD_FILENAMES'] = str(dri_path.join('intel_icd.x86_64.json'))

6
infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-OpenCL.json
View File

@ -181,11 +181,11 @@
"cwd": "[START_DIR]/skia",
"env": {
"CHROME_HEADLESS": "1",
"LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug:[START_DIR]/opencl_ocl_icd_linux:[START_DIR]/opencl_intel_neo_linux",
"LIBGL_DRIVERS_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug",
"LD_LIBRARY_PATH": "[START_DIR]/mesa_intel_driver_linux:[START_DIR]/opencl_ocl_icd_linux:[START_DIR]/opencl_intel_neo_linux",
"LIBGL_DRIVERS_PATH": "[START_DIR]/mesa_intel_driver_linux",
"OPENCL_VENDOR_PATH": "[START_DIR]/tmp/OpenCL/vendors",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
"VK_ICD_FILENAMES": "[START_DIR]/linux_vulkan_intel_driver_debug/intel_icd.x86_64.json"
"VK_ICD_FILENAMES": "[START_DIR]/mesa_intel_driver_linux/intel_icd.x86_64.json"
},
"name": "symbolized dm"
},

6
infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json
View File

@ -152,10 +152,10 @@
"cwd": "[START_DIR]/skia",
"env": {
"CHROME_HEADLESS": "1",
"LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug:[START_DIR]/linux_vulkan_sdk/lib",
"LIBGL_DRIVERS_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug",
"LD_LIBRARY_PATH": "[START_DIR]/mesa_intel_driver_linux:[START_DIR]/linux_vulkan_sdk/lib",
"LIBGL_DRIVERS_PATH": "[START_DIR]/mesa_intel_driver_linux",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/linux_vulkan_sdk/bin",
"VK_ICD_FILENAMES": "[START_DIR]/linux_vulkan_intel_driver_debug/intel_icd.x86_64.json"
"VK_ICD_FILENAMES": "[START_DIR]/mesa_intel_driver_linux/intel_icd.x86_64.json"
},
"name": "symbolized dm"
},

6
infra/bots/recipes/compute_test.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-OpenCL.json
View File

@ -43,11 +43,11 @@
],
"env": {
"CHROME_HEADLESS": "1",
"LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug:[START_DIR]/opencl_ocl_icd_linux:[START_DIR]/opencl_intel_neo_linux",
"LIBGL_DRIVERS_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug",
"LD_LIBRARY_PATH": "[START_DIR]/mesa_intel_driver_linux:[START_DIR]/opencl_ocl_icd_linux:[START_DIR]/opencl_intel_neo_linux",
"LIBGL_DRIVERS_PATH": "[START_DIR]/mesa_intel_driver_linux",
"OPENCL_VENDOR_PATH": "[START_DIR]/tmp/OpenCL/vendors",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
"VK_ICD_FILENAMES": "[START_DIR]/linux_vulkan_intel_driver_debug/intel_icd.x86_64.json"
"VK_ICD_FILENAMES": "[START_DIR]/mesa_intel_driver_linux/intel_icd.x86_64.json"
},
"name": "hello-opencl"
},

6
infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan.json
View File

@ -190,10 +190,10 @@
"cwd": "[START_DIR]/skia",
"env": {
"CHROME_HEADLESS": "1",
"LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug:[START_DIR]/linux_vulkan_sdk/lib",
"LIBGL_DRIVERS_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug",
"LD_LIBRARY_PATH": "[START_DIR]/mesa_intel_driver_linux:[START_DIR]/linux_vulkan_sdk/lib",
"LIBGL_DRIVERS_PATH": "[START_DIR]/mesa_intel_driver_linux",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/linux_vulkan_sdk/bin",
"VK_ICD_FILENAMES": "[START_DIR]/linux_vulkan_intel_driver_debug/intel_icd.x86_64.json"
"VK_ICD_FILENAMES": "[START_DIR]/mesa_intel_driver_linux/intel_icd.x86_64.json"
},
"name": "symbolized nanobench"
},

6
infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All.json
View File

@ -230,10 +230,10 @@
"cwd": "[START_DIR]/skia",
"env": {
"CHROME_HEADLESS": "1",
"LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_intel_driver_release",
"LIBGL_DRIVERS_PATH": "[START_DIR]/linux_vulkan_intel_driver_release",
"LD_LIBRARY_PATH": "[START_DIR]/mesa_intel_driver_linux",
"LIBGL_DRIVERS_PATH": "[START_DIR]/mesa_intel_driver_linux",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
"VK_ICD_FILENAMES": "[START_DIR]/linux_vulkan_intel_driver_release/intel_icd.x86_64.json"
"VK_ICD_FILENAMES": "[START_DIR]/mesa_intel_driver_linux/intel_icd.x86_64.json"
},
"name": "symbolized nanobench"
},

6
infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan.json
View File

@ -434,10 +434,10 @@
"cwd": "[START_DIR]/skia",
"env": {
"CHROME_HEADLESS": "1",
"LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_intel_driver_release:[START_DIR]/linux_vulkan_sdk/lib",
"LIBGL_DRIVERS_PATH": "[START_DIR]/linux_vulkan_intel_driver_release",
"LD_LIBRARY_PATH": "[START_DIR]/mesa_intel_driver_linux:[START_DIR]/linux_vulkan_sdk/lib",
"LIBGL_DRIVERS_PATH": "[START_DIR]/mesa_intel_driver_linux",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/linux_vulkan_sdk/bin",
"VK_ICD_FILENAMES": "[START_DIR]/linux_vulkan_intel_driver_release/intel_icd.x86_64.json"
"VK_ICD_FILENAMES": "[START_DIR]/mesa_intel_driver_linux/intel_icd.x86_64.json"
},
"name": "symbolized dm"
},

6
infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json
View File

@ -415,10 +415,10 @@
"cwd": "[START_DIR]/skia",
"env": {
"CHROME_HEADLESS": "1",
"LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug:[START_DIR]/linux_vulkan_sdk/lib",
"LIBGL_DRIVERS_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug",
"LD_LIBRARY_PATH": "[START_DIR]/mesa_intel_driver_linux:[START_DIR]/linux_vulkan_sdk/lib",
"LIBGL_DRIVERS_PATH": "[START_DIR]/mesa_intel_driver_linux",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]:[START_DIR]/linux_vulkan_sdk/bin",
"VK_ICD_FILENAMES": "[START_DIR]/linux_vulkan_intel_driver_debug/intel_icd.x86_64.json"
"VK_ICD_FILENAMES": "[START_DIR]/mesa_intel_driver_linux/intel_icd.x86_64.json"
},
"name": "symbolized dm"
},

144
infra/bots/tasks.json Normal file → Executable file
View File

@ -26760,9 +26760,9 @@
"version": "version:9"
},
{
"name": "skia/bots/linux_vulkan_intel_driver_release",
"path": "linux_vulkan_intel_driver_release",
"version": "version:6"
"name": "skia/bots/mesa_intel_driver_linux",
"path": "mesa_intel_driver_linux",
"version": "version:0"
}
],
"command": [
@ -26881,9 +26881,9 @@
"version": "version:1"
},
{
"name": "skia/bots/linux_vulkan_intel_driver_release",
"path": "linux_vulkan_intel_driver_release",
"version": "version:6"
"name": "skia/bots/mesa_intel_driver_linux",
"path": "mesa_intel_driver_linux",
"version": "version:0"
}
],
"command": [
@ -26997,9 +26997,9 @@
"version": "version:9"
},
{
"name": "skia/bots/linux_vulkan_intel_driver_debug",
"path": "linux_vulkan_intel_driver_debug",
"version": "version:4"
"name": "skia/bots/mesa_intel_driver_linux",
"path": "mesa_intel_driver_linux",
"version": "version:0"
}
],
"command": [
@ -27118,9 +27118,9 @@
"version": "version:1"
},
{
"name": "skia/bots/linux_vulkan_intel_driver_debug",
"path": "linux_vulkan_intel_driver_debug",
"version": "version:4"
"name": "skia/bots/mesa_intel_driver_linux",
"path": "mesa_intel_driver_linux",
"version": "version:0"
}
],
"command": [
@ -27234,9 +27234,9 @@
"version": "version:9"
},
{
"name": "skia/bots/linux_vulkan_intel_driver_release",
"path": "linux_vulkan_intel_driver_release",
"version": "version:6"
"name": "skia/bots/mesa_intel_driver_linux",
"path": "mesa_intel_driver_linux",
"version": "version:0"
}
],
"command": [
@ -27355,9 +27355,9 @@
"version": "version:1"
},
{
"name": "skia/bots/linux_vulkan_intel_driver_release",
"path": "linux_vulkan_intel_driver_release",
"version": "version:6"
"name": "skia/bots/mesa_intel_driver_linux",
"path": "mesa_intel_driver_linux",
"version": "version:0"
}
],
"command": [
@ -27471,9 +27471,9 @@
"version": "version:9"
},
{
"name": "skia/bots/linux_vulkan_intel_driver_debug",
"path": "linux_vulkan_intel_driver_debug",
"version": "version:4"
"name": "skia/bots/mesa_intel_driver_linux",
"path": "mesa_intel_driver_linux",
"version": "version:0"
}
],
"command": [
@ -27587,9 +27587,9 @@
"version": "version:9"
},
{
"name": "skia/bots/linux_vulkan_intel_driver_release",
"path": "linux_vulkan_intel_driver_release",
"version": "version:6"
"name": "skia/bots/mesa_intel_driver_linux",
"path": "mesa_intel_driver_linux",
"version": "version:0"
}
],
"command": [
@ -27703,9 +27703,9 @@
"version": "version:9"
},
{
"name": "skia/bots/linux_vulkan_intel_driver_debug",
"path": "linux_vulkan_intel_driver_debug",
"version": "version:4"
"name": "skia/bots/mesa_intel_driver_linux",
"path": "mesa_intel_driver_linux",
"version": "version:0"
}
],
"command": [
@ -27819,9 +27819,9 @@
"version": "version:9"
},
{
"name": "skia/bots/linux_vulkan_intel_driver_release",
"path": "linux_vulkan_intel_driver_release",
"version": "version:6"
"name": "skia/bots/mesa_intel_driver_linux",
"path": "mesa_intel_driver_linux",
"version": "version:0"
}
],
"command": [
@ -50972,9 +50972,9 @@
"version": "version:9"
},
{
"name": "skia/bots/linux_vulkan_intel_driver_debug",
"path": "linux_vulkan_intel_driver_debug",
"version": "version:4"
"name": "skia/bots/mesa_intel_driver_linux",
"path": "mesa_intel_driver_linux",
"version": "version:0"
}
],
"command": [
@ -51093,9 +51093,9 @@
"version": "version:1"
},
{
"name": "skia/bots/linux_vulkan_intel_driver_debug",
"path": "linux_vulkan_intel_driver_debug",
"version": "version:4"
"name": "skia/bots/mesa_intel_driver_linux",
"path": "mesa_intel_driver_linux",
"version": "version:0"
}
],
"command": [
@ -51209,9 +51209,9 @@
"version": "version:9"
},
{
"name": "skia/bots/linux_vulkan_intel_driver_release",
"path": "linux_vulkan_intel_driver_release",
"version": "version:6"
"name": "skia/bots/mesa_intel_driver_linux",
"path": "mesa_intel_driver_linux",
"version": "version:0"
}
],
"command": [
@ -51330,9 +51330,9 @@
"version": "version:1"
},
{
"name": "skia/bots/linux_vulkan_intel_driver_release",
"path": "linux_vulkan_intel_driver_release",
"version": "version:6"
"name": "skia/bots/mesa_intel_driver_linux",
"path": "mesa_intel_driver_linux",
"version": "version:0"
}
],
"command": [
@ -51446,9 +51446,9 @@
"version": "version:9"
},
{
"name": "skia/bots/linux_vulkan_intel_driver_debug",
"path": "linux_vulkan_intel_driver_debug",
"version": "version:4"
"name": "skia/bots/mesa_intel_driver_linux",
"path": "mesa_intel_driver_linux",
"version": "version:0"
}
],
"command": [
@ -51562,9 +51562,9 @@
"version": "version:9"
},
{
"name": "skia/bots/linux_vulkan_intel_driver_debug",
"path": "linux_vulkan_intel_driver_debug",
"version": "version:4"
"name": "skia/bots/mesa_intel_driver_linux",
"path": "mesa_intel_driver_linux",
"version": "version:0"
},
{
"name": "skia/bots/opencl_ocl_icd_linux",
@ -51693,9 +51693,9 @@
"version": "version:1"
},
{
"name": "skia/bots/linux_vulkan_intel_driver_debug",
"path": "linux_vulkan_intel_driver_debug",
"version": "version:4"
"name": "skia/bots/mesa_intel_driver_linux",
"path": "mesa_intel_driver_linux",
"version": "version:0"
}
],
"command": [
@ -51809,9 +51809,9 @@
"version": "version:9"
},
{
"name": "skia/bots/linux_vulkan_intel_driver_release",
"path": "linux_vulkan_intel_driver_release",
"version": "version:6"
"name": "skia/bots/mesa_intel_driver_linux",
"path": "mesa_intel_driver_linux",
"version": "version:0"
}
],
"command": [
@ -51930,9 +51930,9 @@
"version": "version:11"
},
{
"name": "skia/bots/linux_vulkan_intel_driver_release",
"path": "linux_vulkan_intel_driver_release",
"version": "version:6"
"name": "skia/bots/mesa_intel_driver_linux",
"path": "mesa_intel_driver_linux",
"version": "version:0"
}
],
"command": [
@ -52051,9 +52051,9 @@
"version": "version:1"
},
{
"name": "skia/bots/linux_vulkan_intel_driver_release",
"path": "linux_vulkan_intel_driver_release",
"version": "version:6"
"name": "skia/bots/mesa_intel_driver_linux",
"path": "mesa_intel_driver_linux",
"version": "version:0"
}
],
"command": [
@ -52167,9 +52167,9 @@
"version": "version:9"
},
{
"name": "skia/bots/linux_vulkan_intel_driver_debug",
"path": "linux_vulkan_intel_driver_debug",
"version": "version:4"
"name": "skia/bots/mesa_intel_driver_linux",
"path": "mesa_intel_driver_linux",
"version": "version:0"
}
],
"command": [
@ -52283,9 +52283,9 @@
"version": "version:9"
},
{
"name": "skia/bots/linux_vulkan_intel_driver_release",
"path": "linux_vulkan_intel_driver_release",
"version": "version:6"
"name": "skia/bots/mesa_intel_driver_linux",
"path": "mesa_intel_driver_linux",
"version": "version:0"
}
],
"command": [
@ -52399,9 +52399,9 @@
"version": "version:9"
},
{
"name": "skia/bots/linux_vulkan_intel_driver_debug",
"path": "linux_vulkan_intel_driver_debug",
"version": "version:4"
"name": "skia/bots/mesa_intel_driver_linux",
"path": "mesa_intel_driver_linux",
"version": "version:0"
}
],
"command": [
@ -52515,9 +52515,9 @@
"version": "version:9"
},
{
"name": "skia/bots/linux_vulkan_intel_driver_release",
"path": "linux_vulkan_intel_driver_release",
"version": "version:6"
"name": "skia/bots/mesa_intel_driver_linux",
"path": "mesa_intel_driver_linux",
"version": "version:0"
}
],
"command": [