[zorg] r282093 - [Zorg] Don't pass -jN to LNT, use --threads/--build-threads.
Galina Kistanova via llvm-commits
llvm-commits at lists.llvm.org
Wed Sep 21 20:53:47 PDT 2016
Fixed in r282133.
Thanks
Galina
On Wed, Sep 21, 2016 at 4:11 PM, Galina Kistanova <gkistanova at gmail.com>
wrote:
> Hi Renato,
>
> You added repeated argument 'nt_flags' for two builders.
> Please make correction.
>
> Thanks
>
> Galina
>
> On Wed, Sep 21, 2016 at 10:24 AM, Renato Golin via llvm-commits <
> llvm-commits at lists.llvm.org> wrote:
>
>> Author: rengolin
>> Date: Wed Sep 21 12:24:56 2016
>> New Revision: 282093
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=282093&view=rev
>> Log:
>> [Zorg] Don't pass -jN to LNT, use --threads/--build-threads.
>>
>> Modified:
>> zorg/trunk/buildbot/osuosl/master/config/builders.py
>> zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
>>
>> Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py
>> URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuo
>> sl/master/config/builders.py?rev=282093&r1=282092&r2=282093&view=diff
>> ============================================================
>> ==================
>> --- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
>> +++ zorg/trunk/buildbot/osuosl/master/config/builders.py Wed Sep 21
>> 12:24:56 2016
>> @@ -153,10 +153,10 @@ def _get_clang_builders():
>>
>> # Cortex-A15 LNT test-suite in Benchmark mode
>> {'name' : "clang-native-arm-lnt-perf",
>> - 'slavenames':["linaro-chrome-02", "linaro-tk1-02"],
>> + 'slavenames':["linaro-tk1-02"],
>> 'builddir':"clang-native-arm-lnt-perf",
>> 'factory' : ClangBuilder.getClangCMakeBuildFactory(
>> - jobs=2,
>> + jobs=4,
>> clean=False,
>> checkout_compiler_rt=False,
>> test=False,
>> @@ -164,8 +164,9 @@ def _get_clang_builders():
>> runTestSuite=True,
>> env={'PATH':'/usr/lib/ccache:
>> /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'},
>> nt_flags=['--cflag', '-mcpu=cortex-a15',
>> - '--threads=1', '--build-threads=2',
>> '--use-perf',
>> - '--benchmarking-only',
>> '--multisample=8'],
>> + '--threads=1', '--build-threads=4',
>> '--use-perf',
>> + '--benchmarking-only', '--multisample=8',
>> + '--exclude-stat-from-submissio
>> n=compile'],
>> extra_cmake_args=["-DCMAKE_C_
>> FLAGS='-mcpu=cortex-a15'",
>> "-DCMAKE_CXX_FLAGS='-mcpu=cor
>> tex-a15'",
>> "-DLLVM_TARGETS_TO_BUILD='ARM'",
>> @@ -185,7 +186,8 @@ def _get_clang_builders():
>> useTwoStage=False,
>> runTestSuite=True,
>> env={'PATH':'/usr/lib/ccache:
>> /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'},
>> - nt_flags=['--cflag', '-mcpu=cortex-a15'],
>> + nt_flags=['--cflag', '-mcpu=cortex-a15',
>> + '--threads=2', '--build-threads=2'],
>> extra_cmake_args=["-DCMAKE_C_
>> FLAGS='-mcpu=cortex-a15'",
>> "-DCMAKE_CXX_FLAGS='-mcpu=cor
>> tex-a15'",
>> "-DLLVM_TARGETS_TO_BUILD='ARM'",
>> @@ -267,6 +269,7 @@ def _get_clang_builders():
>> test=True,
>> useTwoStage=False,
>> runTestSuite=True,
>> + nt_flags=['--threads=8', '--build-threads=8'],
>> env={'PATH':'/usr/lib64/ccach
>> e:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
>> 'BOTO_CONFIG':'/var/buildbot/l
>> lvmlab-build-artifacts.boto'},
>> extra_cmake_args=["-DCMAKE_C_
>> FLAGS='-mcpu=cortex-a57'",
>> @@ -311,6 +314,7 @@ def _get_clang_builders():
>>
>> useTwoStage=False,
>>
>> runTestSuite=True,
>>
>> stage1_config='Release',
>> +
>> nt_flags=['--threads=16', '--build-threads=16'],
>>
>> extra_cmake_args=["-DLLVM_ENABLE_ASSERTIONS=ON"]),
>> 'category' : 'clang'},
>>
>> @@ -322,6 +326,7 @@ def _get_clang_builders():
>>
>> useTwoStage=False,
>>
>> runTestSuite=True,
>>
>> stage1_config='Release',
>> +
>> nt_flags=['--threads=16', '--build-threads=16'],
>>
>> extra_cmake_args=["-DLLVM_ENABLE_ASSERTIONS=ON"]),
>> 'category' : 'clang'},
>>
>> @@ -776,6 +781,7 @@ def _get_sanitizer_builders():
>> useTwoStage=True,
>> testStage1=False,
>> runTestSuite=True,
>> + nt_flags=['--threads=8', '--build-threads=8'],
>> env={'PATH':'/usr/lib64/ccach
>> e:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'},
>> extra_cmake_args=["-DCMAKE_C_
>> FLAGS='-mcpu=cortex-a57'",
>> "-DCMAKE_CXX_FLAGS='-mcpu=cor
>> tex-a57'",
>>
>> Modified: zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
>> URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot
>> /builders/ClangBuilder.py?rev=282093&r1=282092&r2=282093&view=diff
>> ============================================================
>> ==================
>> --- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
>> +++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Wed Sep 21
>> 12:24:56 2016
>> @@ -726,11 +726,9 @@ def _getClangCMakeBuildFactory(
>> cc = WithProperties('%(workdir)s/'+compiler_path+'/bin/'+cc)
>> cxx = WithProperties('%(workdir)s/'+compiler_path+'/bin/'+cxx)
>>
>> - # LNT Command line
>> - if jobs is None:
>> - jobs = 1
>> + # LNT Command line (don't pass -jN. Users need to pass both
>> --threads
>> + # and --build-threads in nt_flags to get the same effect)
>> test_suite_cmd = [python, lnt, 'runtest', 'nt',
>> - '-j'+str(jobs),
>> '--no-timestamp',
>> '--sandbox', sandbox,
>> '--test-suite', test_suite_dir,
>>
>>
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at lists.llvm.org
>> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160921/27807950/attachment.html>
More information about the llvm-commits
mailing list