[zorg] r194758 - Patch by Rick Foos!

Rick Foos rfoos at codeaurora.org
Fri Nov 15 09:26:00 PST 2013


Verified with Shankar that compiler-rt, containing asan runtime, cannot 
be built with the compiler on a sanitize run.

Changing Option ->SanitizerOption, to skip the compiler-rt step to 
resolve this.

-rick

On 11/15/2013 09:29 AM, Rick Foos wrote:
> I'm running internally with compiler-rt restored. Double check the compiler
> options, or we need to put them into the new Options variable. Shankar will
> answer that.
>
> -rick
>
> -----Original Message-----
> From: llvm-commits-bounces at cs.uiuc.edu
> [mailto:llvm-commits-bounces at cs.uiuc.edu] On Behalf Of Rick Foos
> Sent: Friday, November 15, 2013 9:19 AM
> To: 'Dmitri Gribenko'; 'Galina Kistanova'; Shankar Easwaran
> Cc: llvm-commits at cs.uiuc.edu
> Subject: RE: [zorg] r194758 - Patch by Rick Foos!
>
> Shankar made that change. I have no problem rolling compiler-rt section
> back. What builder was impacted? Anything else impacted, compiler options
> changed too.
>
> -----Original Message-----
> From: llvm-commits-bounces at cs.uiuc.edu
> [mailto:llvm-commits-bounces at cs.uiuc.edu] On Behalf Of Dmitri Gribenko
> Sent: Friday, November 15, 2013 3:25 AM
> To: Galina Kistanova
> Cc: llvm-commits at cs.uiuc.edu
> Subject: Re: [zorg] r194758 - Patch by Rick Foos!
>
> On Thu, Nov 14, 2013 at 5:22 PM, Galina Kistanova <gkistanova at gmail.com>
> wrote:
>> Author: gkistanova
>> Date: Thu Nov 14 19:22:49 2013
>> New Revision: 194758
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=194758&view=rev
>> Log:
>> Patch by Rick Foos!
>> Added a new buildslave, hexagon-build-03, and a few modifications
> stabilize the sanitizer on the server.
>> Modified:
>>      zorg/trunk/buildbot/osuosl/master/config/builders.py
>>      zorg/trunk/buildbot/osuosl/master/config/slaves.py
>>      zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py
>>
>> Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py
>> URL:
>> http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/
>> config/builders.py?rev=194758&r1=194757&r2=194758&view=diff
>> ======================================================================
>> ========
>> --- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
>> +++ zorg/trunk/buildbot/osuosl/master/config/builders.py Thu Nov 14
>> +++ 19:22:49 2013
>> @@ -623,6 +623,12 @@ def _get_sanitizer_builders():
>>              'slavenames' :["sanitizer-buildbot2"],
>>              'builddir': "sanitizer-x86_64-linux-bootstrap",
>>              'factory': SanitizerBuilder.getSanitizerBuildFactory()},
>> +          {'name': "llvm-clang-lld-x86_64-ubuntu-13.04-sanitize-address",
>> +           'slavenames':["hexagon-build-03"],
>> +
> 'builddir':"llvm-clang-lld-x86_64-ubuntu-13.04-fsanitize-address",
>> +           'factory':
> ClangAndLLDBuilder.getClangAndLLDBuildFactory(Option='-fsanitize=address',
>> +
> env={'PATH':'/opt/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr
> /games'},
>> +           jobs=12,loadaverage=32)},
>>             ]
>>
>>   # Experimental and stopped builders
>>
>> Modified: zorg/trunk/buildbot/osuosl/master/config/slaves.py
>> URL:
>> http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/
>> config/slaves.py?rev=194758&r1=194757&r2=194758&view=diff
>> ======================================================================
>> ========
>> --- zorg/trunk/buildbot/osuosl/master/config/slaves.py (original)
>> +++ zorg/trunk/buildbot/osuosl/master/config/slaves.py Thu Nov 14
>> +++ 19:22:49 2013
>> @@ -188,7 +188,11 @@ def get_build_slaves():
>>           create_slave("osu8", properties={'jobs' : 6}, max_builds=2),
>>
>>           # Ubuntu 12.04 x86-64, Intel(R) Xeon(R) CPU E5-2680 0 @ 2.70GHz
>> -        create_slave("hexagon-build-02", properties={'jobs': 12},
> max_builds=4),
>> +        create_slave("hexagon-build-02", properties={'jobs': 12,
> 'loadaverage': 32},
>> +           max_builds=4),
>> +        # Ubuntu 13.04 x86-64, Intel(R) Xeon(R) CPU E5-2680 0 @ 2.70GHz
>> +        create_slave("hexagon-build-03", properties={'jobs': 16,
> 'loadaverage': 32},
>> +          max_builds=2),
>>
>>           # Cavium Octeon II V0.8, MIPS64 big endian, Debian squeeze
> (6.0.6)
>>           create_slave("mipsswbrd002", properties={'jobs' : 6},
>> max_builds=1),
>>
>> Modified: zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py
>> URL:
>> http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/
>> ClangAndLLDBuilder.py?rev=194758&r1=194757&r2=194758&view=diff
>> ======================================================================
>> ========
>> --- zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py (original)
>> +++ zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py Thu Nov 14
>> +++ 19:22:49 2013
>> @@ -10,7 +10,10 @@ from zorg.buildbot.commands.LitTestComma
>>
>>   def getClangAndLLDBuildFactory(
>>              clean=True,
>> -           env=None):
>> +           Option=None,
>> +           env=None,
>> +           jobs="%(jobs)s",
>> +           loadaverage="%(loadaverage)s"):
>>
>>       llvm_srcdir = "llvm.src"
>>       llvm_objdir = "llvm.obj"
>> @@ -38,11 +41,11 @@ def getClangAndLLDBuildFactory(
>>                     baseURL='http://llvm.org/svn/llvm-project/llvm/',
>>                     defaultBranch='trunk',
>>                     workdir=llvm_srcdir))
>> -    f.addStep(SVN(name='svn-compiler-rt',
>> -                  mode='update',
>> -
> baseURL='http://llvm.org/svn/llvm-project/compiler-rt/',
>> -                  defaultBranch='trunk',
>> -                  workdir='%s/projects/compiler-rt' % llvm_srcdir))
>> +    #f.addStep(SVN(name='svn-compiler-rt',
>> +    #              mode='update',
>> +    #
> baseURL='http://llvm.org/svn/llvm-project/compiler-rt/',
>> +    #              defaultBranch='trunk',
>> +    #              workdir='%s/projects/compiler-rt' % llvm_srcdir))
> What is the motivation for this change?  compiler-rt builds fine on the
> buildbots we have.  If the new buildbot can not build it, then it should be
> disabled conditionally.
>
> Dmitri
>
> --
> main(i,j){for(i=2;;i++){for(j=2;j<i;j++){if(!(i%j)){j=0;break;}}if
> (j){printf("%d\n",i);}}} /*Dmitri Gribenko <gribozavr at gmail.com>*/
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


-- 
Rick Foos
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation




More information about the llvm-commits mailing list