Hash :
55959b0b
Author :
Date :
2019-03-05T10:07:41
Add glmark2 to build. glmark2 is a an OpenGL ES 2.0 benchmark licensed under GPL v3. See https://github.com/glmark2/glmark2 ANGLE can use glmark2 as a metric and guide for optimization. It will add a number of useful performance tests. This CL adds the initial build integration. A follow-up CL will integrate glmark2 into our performance tests. Note that glmark2 will not be shipped with Chrome or Android. It will only be used on our test infrastructure. Note that the data path solution is temporary. When integrated into ANGLE we will make sure we CWD into the glmark2 directory before running the benchmark. Bug: angleproject:3139 Change-Id: I5c4f605221c255ab19abd10b321b5867ab459105 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1449984 Commit-Queue: Jamie Madill <jmadill@google.com> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323
vars = {
'android_git': 'https://android.googlesource.com',
'chromium_git': 'https://chromium.googlesource.com',
# This variable is set on the Chrome infra for compatiblity with gclient.
'angle_root': '.',
# This variable is overrided in Chromium's DEPS file.
'build_with_chromium': False,
# Current revision of dEQP.
'deqp_revision': '66a49e0a43f7af654ee1de8a3b1bcaf6c0d14aa4',
# Current revision of glslang, the Khronos SPIRV compiler.
'glslang_revision': 'f6e7c4d2de0d59724ea07739df70c466d169a2cd',
# Current revision fo the SPIRV-Headers Vulkan support library.
'spirv_headers_revision': '8bea0a266ac9b718aa0818d9e3a47c0b77c2cb23',
# Current revision of SPIRV-Tools for Vulkan.
'spirv_tools_revision': 'fde69dcd80cc1ca548300702adf01eeb25441f3e',
# Current revision of Khronos Vulkan-Headers.
'vulkan_headers_revision': 'c200cb25db0f47364d3318d92c1d8e9dfff2fef1',
# Current revision of Khronos Vulkan-Loader.
'vulkan_loader_revision': 'e1eafa18e17d00374253bcd37d015befa89fcc43',
# Current revision of Khronos Vulkan-Tools.
'vulkan_tools_revision': '91b17fd866b2e9cfb875bf516b05536d059416b1',
# Current revision of Khronos Vulkan-ValidationLayers.
'vulkan_validation_revision': '4eee269ae976567ef78db9c9feaafc3364578c87',
}
deps = {
'{angle_root}/build': {
'url': '{chromium_git}/chromium/src/build.git@9a53be87ebb636c35f2ed9772e5deaeb350d790b',
'condition': 'not build_with_chromium',
},
'{angle_root}/buildtools': {
'url': '{chromium_git}/chromium/buildtools.git@6fbda1b24c1893a893b17aa219b765b9e7c801d8',
'condition': 'not build_with_chromium',
},
'{angle_root}/testing': {
'url': '{chromium_git}/chromium/src/testing@7bdda3c6577f21fd0ec986a0383ecfce28f5d761',
'condition': 'not build_with_chromium',
},
# Cherry is a dEQP management GUI written in Go. We use it for viewing test results.
'{angle_root}/third_party/cherry': {
'url': '{android_git}/platform/external/cherry@4f8fb08d33ca5ff05a1c638f04c85bbb8d8b52cc',
'condition': 'not build_with_chromium',
},
'{angle_root}/third_party/deqp/src': {
'url': '{chromium_git}/external/deqp@{deqp_revision}',
},
# glmark2 is a GPL3-licensed OpenGL ES 2.0 benchmark. We use it for testing.
'{angle_root}/third_party/glmark2/src': {
'url': '{chromium_git}/external/github.com/glmark2/glmark2@c4b3ff5a481348e8bdc2b71ee275864db91e40b1',
},
'{angle_root}/third_party/glslang/src': {
'url': '{chromium_git}/external/github.com/KhronosGroup/glslang@{glslang_revision}',
'condition': 'not build_with_chromium',
},
'{angle_root}/third_party/googletest': {
'url': '{chromium_git}/chromium/src/third_party/googletest@660425b1c5ca04559ab7e50c7572b5b771acca1c',
'condition': 'not build_with_chromium',
},
'{angle_root}/third_party/googletest/src': {
'url': '{chromium_git}/external/github.com/google/googletest.git@7203f37f57e4fef0d77670098aabc186309eb874',
'condition': 'not build_with_chromium',
},
# libjpeg_turbo is used by glmark2.
'{angle_root}/third_party/libjpeg_turbo': {
'url': '{chromium_git}/chromium/deps/libjpeg_turbo@6dcdade8828297e306cabfdae80f3510f3f3eea2',
'condition': 'not build_with_chromium',
},
'{angle_root}/third_party/libpng/src': {
'url': '{android_git}/platform/external/libpng@094e181e79a3d6c23fd005679025058b7df1ad6c',
'condition': 'not build_with_chromium',
},
'{angle_root}/third_party/jsoncpp': {
'url': '{chromium_git}/chromium/src/third_party/jsoncpp@fd0ac8ce63a47e99b71a58f1489136fbb19c9137',
'condition': 'not build_with_chromium',
},
'{angle_root}/third_party/jsoncpp/source': {
'url' : '{chromium_git}/external/github.com/open-source-parsers/jsoncpp@f572e8e42e22cfcf5ab0aea26574f408943edfa4',
'condition': 'not build_with_chromium',
},
'{angle_root}/third_party/qemu-linux-x64': {
'packages': [
{
'package': 'fuchsia/qemu/linux-amd64',
'version': '9cc486c5b18a0be515c39a280ca9a309c54cf994'
},
],
'condition': 'not build_with_chromium and (host_os == "linux" and checkout_fuchsia)',
'dep_type': 'cipd',
},
'{angle_root}/third_party/qemu-mac-x64': {
'packages': [
{
'package': 'fuchsia/qemu/mac-amd64',
'version': '2d3358ae9a569b2d4a474f498b32b202a152134f'
},
],
'condition': 'not build_with_chromium and (host_os == "mac" and checkout_fuchsia)',
'dep_type': 'cipd',
},
'{angle_root}/third_party/rapidjson/src': {
'url': '{chromium_git}/external/github.com/Tencent/rapidjson@7484e06c589873e1ed80382d262087e4fa80fb63',
},
'{angle_root}/third_party/spirv-headers/src': {
'url': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Headers@{spirv_headers_revision}',
'condition': 'not build_with_chromium',
},
'{angle_root}/third_party/spirv-tools/src': {
'url': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Tools@{spirv_tools_revision}',
'condition': 'not build_with_chromium',
},
'{angle_root}/third_party/vulkan-headers/src': {
'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Headers@{vulkan_headers_revision}',
},
'{angle_root}/third_party/vulkan-loader/src': {
'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Loader@{vulkan_loader_revision}',
},
'{angle_root}/third_party/vulkan-tools/src': {
'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Tools@{vulkan_tools_revision}',
},
'{angle_root}/third_party/vulkan-validation-layers/src': {
'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-ValidationLayers@{vulkan_validation_revision}',
},
'{angle_root}/third_party/yasm': {
'url': '{chromium_git}/chromium/src/third_party/yasm@86b6058141a42aed51bbd8bb9f9d54d199d9dbd0',
'condition': 'not build_with_chromium',
},
'{angle_root}/third_party/yasm/source/patched-yasm': {
'url': '{chromium_git}/chromium/deps/yasm/patched-yasm.git@720b70524a4424b15fc57e82263568c8ba0496ad',
'condition': 'not build_with_chromium',
},
'{angle_root}/third_party/zlib': {
'url': '{chromium_git}/chromium/src/third_party/zlib@f95aeb0fa7f136ef4a457a6d9ba6f3c2701a444b',
'condition': 'not build_with_chromium',
},
'{angle_root}/tools/clang': {
'url': '{chromium_git}/chromium/src/tools/clang.git@3114fbc11f9644c54dd0a4cdbfa867bac50ff983',
'condition': 'not build_with_chromium',
},
'{angle_root}/third_party/fuchsia-sdk': {
'url': '{chromium_git}/chromium/src/third_party/fuchsia-sdk.git@8e8db13b538ecb251e5ce9d5c781fc142f9752fd',
'condition': 'checkout_fuchsia and not build_with_chromium',
},
}
hooks = [
# Pull clang-format binaries using checked-in hashes.
{
'name': 'clang_format_win',
'pattern': '.',
'condition': 'host_os == "win" and not build_with_chromium',
'action': [ 'download_from_google_storage',
'--no_resume',
'--platform=win32',
'--no_auth',
'--bucket', 'chromium-clang-format',
'-s', '{angle_root}/buildtools/win/clang-format.exe.sha1',
],
},
{
'name': 'clang_format_mac',
'pattern': '.',
'condition': 'host_os == "mac" and not build_with_chromium',
'action': [ 'download_from_google_storage',
'--no_resume',
'--platform=darwin',
'--no_auth',
'--bucket', 'chromium-clang-format',
'-s', '{angle_root}/buildtools/mac/clang-format.sha1',
],
},
{
'name': 'clang_format_linux',
'pattern': '.',
'condition': 'host_os == "linux" and not build_with_chromium',
'action': [ 'download_from_google_storage',
'--no_resume',
'--platform=linux*',
'--no_auth',
'--bucket', 'chromium-clang-format',
'-s', '{angle_root}/buildtools/linux64/clang-format.sha1',
],
},
# Pull GN binaries using checked-in hashes.
{
'name': 'gn_win',
'pattern': '.',
'condition': 'host_os == "win" and not build_with_chromium',
'action': [ 'download_from_google_storage',
'--no_resume',
'--platform=win32',
'--no_auth',
'--bucket', 'chromium-gn',
'-s', '{angle_root}/buildtools/win/gn.exe.sha1',
],
},
{
'name': 'gn_mac',
'pattern': '.',
'condition': 'host_os == "mac" and not build_with_chromium',
'action': [ 'download_from_google_storage',
'--no_resume',
'--platform=darwin',
'--no_auth',
'--bucket', 'chromium-gn',
'-s', '{angle_root}/buildtools/mac/gn.sha1',
],
},
{
'name': 'gn_linux64',
'pattern': '.',
'condition': 'host_os == "linux" and not build_with_chromium',
'action': [ 'download_from_google_storage',
'--no_resume',
'--platform=linux*',
'--no_auth',
'--bucket', 'chromium-gn',
'-s', '{angle_root}/buildtools/linux64/gn.sha1',
],
},
{
'name': 'sysroot_x86',
'pattern': '.',
'condition': 'checkout_linux and ((checkout_x86 or checkout_x64) and not build_with_chromium)',
'action': ['python', '{angle_root}/build/linux/sysroot_scripts/install-sysroot.py',
'--arch=x86'],
},
{
'name': 'sysroot_x64',
'pattern': '.',
'condition': 'checkout_linux and (checkout_x64 and not build_with_chromium)',
'action': ['python', '{angle_root}/build/linux/sysroot_scripts/install-sysroot.py',
'--arch=x64'],
},
{
# Update the Windows toolchain if necessary. Must run before 'clang' below.
'name': 'win_toolchain',
'pattern': '.',
'condition': 'checkout_win and not build_with_chromium',
'action': ['python', '{angle_root}/build/vs_toolchain.py', 'update', '--force'],
},
{
# Note: On Win, this should run after win_toolchain, as it may use it.
'name': 'clang',
'pattern': '.',
'action': ['python', '{angle_root}/tools/clang/scripts/update.py'],
'condition': 'not build_with_chromium',
},
{
# Update LASTCHANGE.
'name': 'lastchange',
'pattern': '.',
'condition': 'not build_with_chromium',
'action': ['python', '{angle_root}/build/util/lastchange.py',
'-o', '{angle_root}/build/util/LASTCHANGE'],
},
# Pull rc binaries using checked-in hashes.
{
'name': 'rc_win',
'pattern': '.',
'condition': 'checkout_win and (host_os == "win" and not build_with_chromium)',
'action': [ 'download_from_google_storage',
'--no_resume',
'--no_auth',
'--bucket', 'chromium-browser-clang/rc',
'-s', '{angle_root}/build/toolchain/win/rc/win/rc.exe.sha1',
],
},
{
'name': 'fuchsia_sdk',
'pattern': '.',
'condition': 'checkout_fuchsia and not build_with_chromium',
'action': [
'python',
'{angle_root}/build/fuchsia/update_sdk.py',
],
},
]
recursedeps = [
# buildtools provides clang_format.
'{angle_root}/buildtools',
]