<div dir="ltr"><div><div><div><div>Hi Renato,<br><br></div>You added repeated argument 'nt_flags' for two builders.<br></div>Please make correction.<br><br></div>Thanks<br><br></div>Galina<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Sep 21, 2016 at 10:24 AM, Renato Golin via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: rengolin<br>
Date: Wed Sep 21 12:24:56 2016<br>
New Revision: 282093<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=282093&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=282093&view=rev</a><br>
Log:<br>
[Zorg] Don't pass -jN to LNT, use --threads/--build-threads.<br>
<br>
Modified:<br>
zorg/trunk/buildbot/osuosl/<wbr>master/config/builders.py<br>
zorg/trunk/zorg/buildbot/<wbr>builders/ClangBuilder.py<br>
<br>
Modified: zorg/trunk/buildbot/osuosl/<wbr>master/config/builders.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=282093&r1=282092&r2=282093&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/zorg/trunk/buildbot/<wbr>osuosl/master/config/builders.<wbr>py?rev=282093&r1=282092&r2=<wbr>282093&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- zorg/trunk/buildbot/osuosl/<wbr>master/config/builders.py (original)<br>
+++ zorg/trunk/buildbot/osuosl/<wbr>master/config/builders.py Wed Sep 21 12:24:56 2016<br>
@@ -153,10 +153,10 @@ def _get_clang_builders():<br>
<br>
# Cortex-A15 LNT test-suite in Benchmark mode<br>
{'name' : "clang-native-arm-lnt-perf",<br>
- 'slavenames':["linaro-chrome-<wbr>02", "linaro-tk1-02"],<br>
+ 'slavenames':["linaro-tk1-02"]<wbr>,<br>
'builddir':"clang-native-arm-<wbr>lnt-perf",<br>
'factory' : ClangBuilder.<wbr>getClangCMakeBuildFactory(<br>
- jobs=2,<br>
+ jobs=4,<br>
clean=False,<br>
checkout_compiler_rt=False,<br>
test=False,<br>
@@ -164,8 +164,9 @@ def _get_clang_builders():<br>
runTestSuite=True,<br>
env={'PATH':'/usr/lib/ccache:/<wbr>usr/local/sbin:/usr/local/bin:<wbr>/usr/sbin:/usr/bin:/sbin:/bin'<wbr>},<br>
nt_flags=['--cflag', '-mcpu=cortex-a15',<br>
- '--threads=1', '--build-threads=2', '--use-perf',<br>
- '--benchmarking-only', '--multisample=8'],<br>
+ '--threads=1', '--build-threads=4', '--use-perf',<br>
+ '--benchmarking-only', '--multisample=8',<br>
+ '--exclude-stat-from-<wbr>submission=compile'],<br>
extra_cmake_args=["-DCMAKE_C_<wbr>FLAGS='-mcpu=cortex-a15'",<br>
"-DCMAKE_CXX_FLAGS='-mcpu=<wbr>cortex-a15'",<br>
"-DLLVM_TARGETS_TO_BUILD='ARM'<wbr>",<br>
@@ -185,7 +186,8 @@ def _get_clang_builders():<br>
useTwoStage=False,<br>
runTestSuite=True,<br>
env={'PATH':'/usr/lib/ccache:/<wbr>usr/local/sbin:/usr/local/bin:<wbr>/usr/sbin:/usr/bin:/sbin:/bin'<wbr>},<br>
- nt_flags=['--cflag', '-mcpu=cortex-a15'],<br>
+ nt_flags=['--cflag', '-mcpu=cortex-a15',<br>
+ '--threads=2', '--build-threads=2'],<br>
extra_cmake_args=["-DCMAKE_C_<wbr>FLAGS='-mcpu=cortex-a15'",<br>
"-DCMAKE_CXX_FLAGS='-mcpu=<wbr>cortex-a15'",<br>
"-DLLVM_TARGETS_TO_BUILD='ARM'<wbr>",<br>
@@ -267,6 +269,7 @@ def _get_clang_builders():<br>
test=True,<br>
useTwoStage=False,<br>
runTestSuite=True,<br>
+ nt_flags=['--threads=8', '--build-threads=8'],<br>
env={'PATH':'/usr/lib64/<wbr>ccache:/usr/local/sbin:/usr/<wbr>local/bin:/usr/sbin:/usr/bin:/<wbr>sbin:/bin',<br>
'BOTO_CONFIG':'/var/buildbot/<wbr>llvmlab-build-artifacts.boto'}<wbr>,<br>
extra_cmake_args=["-DCMAKE_C_<wbr>FLAGS='-mcpu=cortex-a57'",<br>
@@ -311,6 +314,7 @@ def _get_clang_builders():<br>
useTwoStage=False,<br>
runTestSuite=True,<br>
stage1_config='Release',<br>
+ nt_flags=['--threads=16', '--build-threads=16'],<br>
extra_cmake_args=["-DLLVM_<wbr>ENABLE_ASSERTIONS=ON"]),<br>
'category' : 'clang'},<br>
<br>
@@ -322,6 +326,7 @@ def _get_clang_builders():<br>
useTwoStage=False,<br>
runTestSuite=True,<br>
stage1_config='Release',<br>
+ nt_flags=['--threads=16', '--build-threads=16'],<br>
extra_cmake_args=["-DLLVM_<wbr>ENABLE_ASSERTIONS=ON"]),<br>
'category' : 'clang'},<br>
<br>
@@ -776,6 +781,7 @@ def _get_sanitizer_builders():<br>
useTwoStage=True,<br>
testStage1=False,<br>
runTestSuite=True,<br>
+ nt_flags=['--threads=8', '--build-threads=8'],<br>
env={'PATH':'/usr/lib64/<wbr>ccache:/usr/local/sbin:/usr/<wbr>local/bin:/usr/sbin:/usr/bin:/<wbr>sbin:/bin'},<br>
extra_cmake_args=["-DCMAKE_C_<wbr>FLAGS='-mcpu=cortex-a57'",<br>
"-DCMAKE_CXX_FLAGS='-mcpu=<wbr>cortex-a57'",<br>
<br>
Modified: zorg/trunk/zorg/buildbot/<wbr>builders/ClangBuilder.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangBuilder.py?rev=282093&r1=282092&r2=282093&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/zorg/trunk/zorg/<wbr>buildbot/builders/<wbr>ClangBuilder.py?rev=282093&r1=<wbr>282092&r2=282093&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- zorg/trunk/zorg/buildbot/<wbr>builders/ClangBuilder.py (original)<br>
+++ zorg/trunk/zorg/buildbot/<wbr>builders/ClangBuilder.py Wed Sep 21 12:24:56 2016<br>
@@ -726,11 +726,9 @@ def _getClangCMakeBuildFactory(<br>
cc = WithProperties('%(workdir)s/'+<wbr>compiler_path+'/bin/'+cc)<br>
cxx = WithProperties('%(workdir)s/'+<wbr>compiler_path+'/bin/'+cxx)<br>
<br>
- # LNT Command line<br>
- if jobs is None:<br>
- jobs = 1<br>
+ # LNT Command line (don't pass -jN. Users need to pass both --threads<br>
+ # and --build-threads in nt_flags to get the same effect)<br>
test_suite_cmd = [python, lnt, 'runtest', 'nt',<br>
- '-j'+str(jobs),<br>
'--no-timestamp',<br>
'--sandbox', sandbox,<br>
'--test-suite', test_suite_dir,<br>
<br>
<br>
______________________________<wbr>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>