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

buildbot_spec.py: Add Android/ChromeOS device info, add builder_cfg dict

Browse Source 
NOTRY=true
BUG=skia:4132

Review URL: https://codereview.chromium.org/1269543002
This commit is contained in:
borenet 2015-07-29 11:15:42 -07:00 committed by Commit bot
parent 22355c4f40
commit 7bccca1a82
2 changed files with 301 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

248
tools/buildbot_spec.json
View File

@ -3,6 +3,16 @@
"build_targets": [
"most"
],
"builder_cfg": {
"compiler": "Clang",
"configuration": "Debug",
"extra_config": "Android",
"is_trybot": false,
"os": "Mac10.8",
"role": "Build",
"target_arch": "Arm7"
},
"device_cfg": "arm_v7_neon",
"env": {
"CC": "/usr/bin/clang",
"CXX": "/usr/bin/clang++",
@ -13,14 +23,87 @@
"build_targets": [
"most"
],
"builder_cfg": {
"compiler": "GCC",
"configuration": "Debug",
"extra_config": "Android_FrameworkDefs",
"is_trybot": false,
"os": "Ubuntu",
"role": "Build",
"target_arch": "Arm7"
},
"device_cfg": "arm_v7_neon",
"env": {
"GYP_DEFINES": "skia_arch_type=arm skia_use_android_framework_defines=1 skia_warnings_as_errors=1"
}
},
"Build-Ubuntu-GCC-Arm7-Debug-Android_NoNeon": {
"build_targets": [
"most"
],
"builder_cfg": {
"compiler": "GCC",
"configuration": "Debug",
"extra_config": "Android_NoNeon",
"is_trybot": false,
"os": "Ubuntu",
"role": "Build",
"target_arch": "Arm7"
},
"device_cfg": "arm_v7",
"env": {
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=1"
}
},
"Build-Ubuntu-GCC-Arm7-Debug-CrOS_Daisy": {
"build_targets": [
"most"
],
"builder_cfg": {
"compiler": "GCC",
"configuration": "Debug",
"extra_config": "CrOS_Daisy",
"is_trybot": false,
"os": "Ubuntu",
"role": "Build",
"target_arch": "Arm7"
},
"device_cfg": "daisy",
"env": {
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=1"
}
},
"Build-Ubuntu-GCC-x86_64-Debug-CrOS_Link": {
"build_targets": [
"most"
],
"builder_cfg": {
"compiler": "GCC",
"configuration": "Debug",
"extra_config": "CrOS_Link",
"is_trybot": false,
"os": "Ubuntu",
"role": "Build",
"target_arch": "x86_64"
},
"device_cfg": "link",
"env": {
"GYP_DEFINES": "skia_arch_type=x86_64 skia_warnings_as_errors=1"
}
},
"Build-Ubuntu-GCC-x86_64-Release-Mesa": {
"build_targets": [
"most"
],
"builder_cfg": {
"compiler": "GCC",
"configuration": "Release",
"extra_config": "Mesa",
"is_trybot": false,
"os": "Ubuntu",
"role": "Build",
"target_arch": "x86_64"
},
"env": {
"GYP_DEFINES": "skia_arch_type=x86_64 skia_mesa=1 skia_warnings_as_errors=1"
}
@ -29,6 +112,14 @@
"build_targets": [
"most"
],
"builder_cfg": {
"compiler": "MSVC",
"configuration": "Debug",
"is_trybot": false,
"os": "Win",
"role": "Build",
"target_arch": "x86"
},
"env": {
"GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86 skia_warnings_as_errors=1 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg=0"
}
@ -37,6 +128,15 @@
"build_targets": [
"most"
],
"builder_cfg": {
"compiler": "MSVC",
"configuration": "Debug",
"extra_config": "Exceptions",
"is_trybot": false,
"os": "Win",
"role": "Build",
"target_arch": "x86"
},
"env": {
"GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86 skia_warnings_as_errors=0 skia_win_debuggers_path=c:/DbgHelp skia_win_exceptions=1 skia_win_ltcg=0"
}
@ -45,6 +145,15 @@
"build_targets": [
"most"
],
"builder_cfg": {
"compiler": "MSVC",
"configuration": "Debug",
"extra_config": "GDI",
"is_trybot": false,
"os": "Win",
"role": "Build",
"target_arch": "x86"
},
"env": {
"GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86 skia_gdi=1 skia_warnings_as_errors=0 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg=0"
}
@ -53,6 +162,11 @@
"build_targets": [
"most"
],
"builder_cfg": {
"frequency": "PerCommit",
"is_trybot": false,
"role": "Housekeeper"
},
"env": {
"GYP_DEFINES": "skia_shared_lib=1 skia_warnings_as_errors=0"
}
@ -61,14 +175,78 @@
"build_targets": [
"nanobench"
],
"builder_cfg": {
"arch": "x86_64",
"compiler": "MSVC",
"configuration": "Release",
"cpu_or_gpu": "GPU",
"cpu_or_gpu_value": "HD4600",
"is_trybot": true,
"model": "ShuttleB",
"os": "Win8",
"role": "Perf"
},
"env": {
"GYP_DEFINES": "qt_sdk=C:/Qt/Qt5.1.0/5.1.0/msvc2012_64/ skia_arch_type=x86_64 skia_warnings_as_errors=0 skia_win_debuggers_path=c:/DbgHelp"
}
},
"Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Debug": {
"build_targets": [
"dm",
"nanobench"
],
"builder_cfg": {
"arch": "Arm7",
"compiler": "GCC",
"configuration": "Debug",
"cpu_or_gpu": "GPU",
"cpu_or_gpu_value": "Adreno420",
"is_trybot": false,
"model": "Nexus6",
"os": "Android",
"role": "Test"
},
"device_cfg": "arm_v7_neon",
"env": {
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0"
}
},
"Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug": {
"build_targets": [
"dm",
"nanobench"
],
"builder_cfg": {
"arch": "x86_64",
"compiler": "GCC",
"configuration": "Debug",
"cpu_or_gpu": "CPU",
"cpu_or_gpu_value": "AVX",
"is_trybot": false,
"model": "Link",
"os": "ChromeOS",
"role": "Test"
},
"device_cfg": "link",
"env": {
"GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0"
}
},
"Test-Mac10.8-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release": {
"build_targets": [
"dm"
],
"builder_cfg": {
"arch": "x86_64",
"compiler": "Clang",
"configuration": "Release",
"cpu_or_gpu": "GPU",
"cpu_or_gpu_value": "GeForce320M",
"is_trybot": false,
"model": "MacMini4.1",
"os": "Mac10.8",
"role": "Test"
},
"env": {
"CC": "/usr/bin/clang",
"CXX": "/usr/bin/clang++",
@ -79,6 +257,18 @@
"build_targets": [
"dm"
],
"builder_cfg": {
"arch": "x86_64",
"compiler": "GCC",
"configuration": "Release",
"cpu_or_gpu": "CPU",
"cpu_or_gpu_value": "AVX2",
"extra_config": "SKNX_NO_SIMD",
"is_trybot": false,
"model": "GCE",
"os": "Ubuntu",
"role": "Test"
},
"env": {
"GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0 sknx_no_simd=1"
}
@ -87,6 +277,18 @@
"build_targets": [
"dm"
],
"builder_cfg": {
"arch": "x86_64",
"compiler": "GCC",
"configuration": "Release",
"cpu_or_gpu": "CPU",
"cpu_or_gpu_value": "AVX2",
"extra_config": "Shared",
"is_trybot": false,
"model": "GCE",
"os": "Ubuntu",
"role": "Test"
},
"env": {
"GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_shared_lib=1 skia_warnings_as_errors=0"
}
@ -95,6 +297,18 @@
"build_targets": [
"dm"
],
"builder_cfg": {
"arch": "x86_64",
"compiler": "GCC",
"configuration": "Release",
"cpu_or_gpu": "GPU",
"cpu_or_gpu_value": "GTX550Ti",
"extra_config": "Valgrind",
"is_trybot": false,
"model": "ShuttleA",
"os": "Ubuntu",
"role": "Test"
},
"env": {
"GYP_DEFINES": "skia_arch_type=x86_64 skia_release_optimization_level=1 skia_warnings_as_errors=0"
}
@ -104,6 +318,17 @@
"dm",
"nanobench"
],
"builder_cfg": {
"arch": "x86_64",
"compiler": "MSVC",
"configuration": "Debug",
"cpu_or_gpu": "CPU",
"cpu_or_gpu_value": "AVX",
"is_trybot": false,
"model": "ShuttleA",
"os": "Win8",
"role": "Test"
},
"env": {
"GYP_DEFINES": "qt_sdk=C:/Qt/Qt5.1.0/5.1.0/msvc2012_64/ skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0 skia_win_debuggers_path=c:/DbgHelp"
}
@ -112,6 +337,18 @@
"build_targets": [
"dm"
],
"builder_cfg": {
"arch": "x86",
"compiler": "MSVC",
"configuration": "Release",
"cpu_or_gpu": "GPU",
"cpu_or_gpu_value": "HD4600",
"extra_config": "ANGLE",
"is_trybot": false,
"model": "ShuttleB",
"os": "Win8",
"role": "Test"
},
"env": {
"GYP_DEFINES": "qt_sdk=C:/Qt/Qt5.1.0/5.1.0/msvc2012_64/ skia_angle=1 skia_arch_type=x86 skia_warnings_as_errors=0 skia_win_debuggers_path=c:/DbgHelp"
}
@ -120,6 +357,17 @@
"build_targets": [
"iOSShell"
],
"builder_cfg": {
"arch": "Arm7",
"compiler": "Clang",
"configuration": "Debug",
"cpu_or_gpu": "GPU",
"cpu_or_gpu_value": "SGX554",
"is_trybot": false,
"model": "iPad4",
"os": "iOS",
"role": "Test"
},
"env": {
"CC": "/usr/bin/clang",
"CXX": "/usr/bin/clang++",

54
tools/buildbot_spec.py
View File

@ -170,6 +170,48 @@ def build_targets_from_builder_dict(builder_dict):
return ['most']
cov_skip.extend([lineno(), lineno() + 1])
def device_cfg(builder_dict):
# Android.
if 'Android' in builder_dict.get('extra_config', ''):
if 'NoNeon' in builder_dict['extra_config']:
return 'arm_v7'
return {
'Arm64': 'arm64',
'x86': 'x86',
'x86_64': 'x86_64',
'Mips': 'mips',
'Mips64': 'mips64',
'MipsDSP2': 'mips_dsp2',
}.get(builder_dict['target_arch'], 'arm_v7_neon')
elif builder_dict.get('os') == 'Android':
return {
'GalaxyS3': 'arm_v7_neon',
'GalaxyS4': 'arm_v7_neon',
'Nexus5': 'arm_v7', # This'd be 'nexus_5', but we simulate no-NEON Clank.
'Nexus6': 'arm_v7_neon',
'Nexus7': 'nexus_7',
'Nexus9': 'nexus_9',
'Nexus10': 'nexus_10',
'NexusPlayer': 'x86',
'NVIDIA_Shield': 'arm64',
}[builder_dict['model']]
# ChromeOS.
if 'CrOS' in builder_dict.get('extra_config', ''):
if 'Link' in builder_dict['extra_config']:
return 'link'
if 'Daisy' in builder_dict['extra_config']:
return 'daisy'
elif builder_dict.get('os') == 'ChromeOS':
return {
'Link': 'link',
'Daisy': 'daisy',
}[builder_dict['model']]
return None
cov_skip.extend([lineno(), lineno() + 1])
def get_builder_spec(builder_name):
builder_dict = builder_name_schema.DictForBuilderName(builder_name)
@ -178,10 +220,15 @@ def get_builder_spec(builder_name):
gyp_defs_list = ['%s=%s' % (k, v) for k, v in gyp_defs.iteritems()]
gyp_defs_list.sort()
env['GYP_DEFINES'] = ' '.join(gyp_defs_list)
return {
rv = {
'build_targets': build_targets_from_builder_dict(builder_dict),
'builder_cfg': builder_dict,
'env': env,
}
device = device_cfg(builder_dict)
if device:
rv['device_cfg'] = device
return rv
cov_end = lineno() # Don't care about code coverage past here.
@ -196,9 +243,14 @@ def self_test():
'Build-Win-MSVC-x86-Debug-GDI',
'Build-Win-MSVC-x86-Debug-Exceptions',
'Build-Ubuntu-GCC-Arm7-Debug-Android_FrameworkDefs',
'Build-Ubuntu-GCC-Arm7-Debug-Android_NoNeon',
'Build-Ubuntu-GCC-Arm7-Debug-CrOS_Daisy',
'Build-Ubuntu-GCC-x86_64-Debug-CrOS_Link',
'Build-Ubuntu-GCC-x86_64-Release-Mesa',
'Housekeeper-PerCommit',
'Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot',
'Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Debug',
'Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug',
'Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug',
'Test-Mac10.8-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release',
'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD',