r236869 - Revert "Allow case-insensitive values for -mcpu for ARM and AArch64"
Gabor Ballabas
gaborb at inf.u-szeged.hu
Fri May 15 04:52:58 PDT 2015
Thanks Renato, I was just about to do the same.
On 05/15/2015 01:48 PM, Renato Golin wrote:
> Hi Richard,
>
> I have forwarded you some information we gathered.
>
> cheers,
> --renato
>
> On 15 May 2015 at 12:32, Richard Barton <richard.barton at arm.com> wrote:
>> Hi Gabor, Renato
>>
>>
>>
>> Gabor – have you had a chance to look into why this patch regressed the
>> bots?
>>
>>
>>
>> Renato – Can you remember which bots had problems? Do you have any links for
>> the failures that could help us?
>>
>>
>>
>> Ta
>>
>> Rich
>>
>>
>>
>> Author: rengolin
>> Date: Fri May 8 10:44:36 2015
>> New Revision: 236869
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=236869&view=rev
>> Log:
>> Revert "Allow case-insensitive values for -mcpu for ARM and AArch64"
>>
>> This reverts commit r236859, as it broke multiple builds. I'll investigate
>> and reapply when safe.
>>
>> Modified:
>> cfe/trunk/lib/Driver/ToolChains.cpp
>> cfe/trunk/lib/Driver/Tools.cpp
>> cfe/trunk/test/Driver/aarch64-cpus.c
>> cfe/trunk/test/Driver/arm-cortex-cpus.c
>>
>> Modified: cfe/trunk/lib/Driver/ToolChains.cpp
>> URL:
>> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains.cpp?rev=236869&r1=236868&r2=236869&view=diff
>> ==============================================================================
>> --- cfe/trunk/lib/Driver/ToolChains.cpp (original)
>> +++ cfe/trunk/lib/Driver/ToolChains.cpp Fri May 8 10:44:36 2015
>> @@ -126,7 +126,7 @@ static const char *GetArmArchForMArch(St
>> }
>>
>> static const char *GetArmArchForMCpu(StringRef Value) {
>> - return llvm::StringSwitch<const char *>(Value.lower())
>> + return llvm::StringSwitch<const char *>(Value)
>> .Cases("arm9e", "arm946e-s", "arm966e-s", "arm968e-s",
>> "arm926ej-s","armv5")
>> .Cases("arm10e", "arm10tdmi", "armv5")
>> .Cases("arm1020t", "arm1020e", "arm1022e", "arm1026ej-s", "armv5")
>>
>> Modified: cfe/trunk/lib/Driver/Tools.cpp
>> URL:
>> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=236869&r1=236868&r2=236869&view=diff
>> ==============================================================================
>> --- cfe/trunk/lib/Driver/Tools.cpp (original)
>> +++ cfe/trunk/lib/Driver/Tools.cpp Fri May 8 10:44:36 2015
>> @@ -902,7 +902,7 @@ static std::string getAArch64TargetCPU(c
>> if ((A = Args.getLastArg(options::OPT_mtune_EQ))) {
>> CPU = A->getValue();
>> } else if ((A = Args.getLastArg(options::OPT_mcpu_EQ))) {
>> - StringRef Mcpu = StringRef(A->getValue()).lower();
>> + StringRef Mcpu = A->getValue();
>> CPU = Mcpu.split("+").first;
>> }
>>
>> @@ -1795,7 +1795,6 @@ static bool DecodeAArch64Features(const
>> // decode CPU and feature.
>> static bool DecodeAArch64Mcpu(const Driver &D, StringRef Mcpu, StringRef
>> &CPU,
>> std::vector<const char *> &Features) {
>> - Mcpu = Mcpu.lower();
>> std::pair<StringRef, StringRef> Split = Mcpu.split("+");
>> CPU = Split.first;
>> if (CPU == "cyclone" || CPU == "cortex-a53" || CPU == "cortex-a57" || CPU
>> == "cortex-a72") {
>> @@ -5642,7 +5641,7 @@ StringRef arm::getARMTargetCPU(const Arg
>> // FIXME: Warn on inconsistent use of -mcpu and -march.
>> // If we have -mcpu=, use that.
>> if (Arg *A = Args.getLastArg(options::OPT_mcpu_EQ)) {
>> - StringRef MCPU = StringRef(A->getValue()).lower();
>> + StringRef MCPU = A->getValue();
>> // Handle -mcpu=native.
>> if (MCPU == "native")
>> return llvm::sys::getHostCPUName();
>> @@ -7510,7 +7509,7 @@ void gnutools::Assemble::ConstructJob(Co
>> // march from being picked in the absence of a cpu flag.
>> Arg *A;
>> if ((A = Args.getLastArg(options::OPT_mcpu_EQ)) &&
>> - StringRef(A->getValue()).lower() == "krait")
>> + StringRef(A->getValue()) == "krait")
>> CmdArgs.push_back("-march=armv7-a");
>> else
>> Args.AddLastArg(CmdArgs, options::OPT_mcpu_EQ);
>>
>> Modified: cfe/trunk/test/Driver/aarch64-cpus.c
>> URL:
>> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/aarch64-cpus.c?rev=236869&r1=236868&r2=236869&view=diff
>> ==============================================================================
>> --- cfe/trunk/test/Driver/aarch64-cpus.c (original)
>> +++ cfe/trunk/test/Driver/aarch64-cpus.c Fri May 8 10:44:36 2015
>> @@ -111,15 +111,3 @@
>> // RUN: %clang -target aarch64_be -mbig-endian -march=armv8.1-a -### -c %s
>> 2>&1 | FileCheck -check-prefix=GENERICV81A-BE %s
>> // GENERICV81A-BE: "-cc1"{{.*}} "-triple" "aarch64_be{{.*}}" "-target-cpu"
>> "generic" "-target-feature" "+neon" "-target-feature" "+v8.1a"
>>
>> -// ================== Check whether -mcpu accepts mixed-case values.
>> -// RUN: %clang -target aarch64 -mcpu=Cortex-a53 -### -c %s 2>&1 | FileCheck
>> -check-prefix=CASE-INSENSITIVE-CA53 %s
>> -// CASE-INSENSITIVE-CA53: "-cc1"{{.*}} "-triple" "aarch64{{.*}}"
>> "-target-cpu" "cortex-a53"
>> -
>> -// RUN: %clang -target arm64 -mcpu=cortex-A53 -### -c %s 2>&1 | FileCheck
>> -check-prefix=CASE-INSENSITIVE-ARM64-CA53 %s
>> -// CASE-INSENSITIVE-ARM64-CA53: "-cc1"{{.*}} "-triple" "arm64{{.*}}"
>> "-target-cpu" "cortex-a53"
>> -
>> -// RUN: %clang -target aarch64 -mcpu=CORTEX-A57 -### -c %s 2>&1 | FileCheck
>> -check-prefix=CASE-INSENSITIVE-CA57 %s
>> -// CASE-INSENSITIVE-CA57: "-cc1"{{.*}} "-triple" "aarch64{{.*}}"
>> "-target-cpu" "cortex-a57"
>> -
>> -// RUN: %clang -target arm64 -mcpu=Cortex-A57 -### -c %s 2>&1 | FileCheck
>> -check-prefix=CASE-INSENSITIVE-ARM64-CA57 %s
>> -// CASE-INSENSITIVE-ARM64-CA57: "-cc1"{{.*}} "-triple" "arm64{{.*}}"
>> "-target-cpu" "cortex-a57"
>>
>> Modified: cfe/trunk/test/Driver/arm-cortex-cpus.c
>> URL:
>> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/arm-cortex-cpus.c?rev=236869&r1=236868&r2=236869&view=diff
>> ==============================================================================
>> --- cfe/trunk/test/Driver/arm-cortex-cpus.c (original)
>> +++ cfe/trunk/test/Driver/arm-cortex-cpus.c Fri May 8 10:44:36 2015
>> @@ -351,13 +351,3 @@
>> // RUN: %clang -target arm -mcpu=cortex-a57 -mbig-endian -mthumb -### -c %s
>> 2>&1 | FileCheck -check-prefix=CHECK-BE-CPUV8A-THUMB %s
>> // RUN: %clang -target arm -mcpu=cortex-a72 -mbig-endian -mthumb -### -c %s
>> 2>&1 | FileCheck -check-prefix=CHECK-BE-CPUV8A-THUMB %s
>> // CHECK-BE-CPUV8A-THUMB: "-cc1"{{.*}} "-triple" "thumbebv8-{{.*}}
>> -
>> -// ================== Check whether -mcpu accepts mixed-case values.
>> -// RUN: %clang -target arm-linux-gnueabi -mcpu=Cortex-a5 -### -c %s 2>&1 |
>> FileCheck -check-prefix=CHECK-CASE-INSENSITIVE-CPUV7A %s
>> -// RUN: %clang -target arm-linux-gnueabi -mcpu=cortex-A7 -### -c %s 2>&1 |
>> FileCheck -check-prefix=CHECK-CASE-INSENSITIVE-CPUV7A %s
>> -// RUN: %clang -target arm-linux-gnueabi -mcpu=CORTEX-a8 -### -c %s 2>&1 |
>> FileCheck -check-prefix=CHECK-CASE-INSENSITIVE-CPUV7A %s
>> -// RUN: %clang -target arm-linux-gnueabi -mcpu=Cortex-A9 -### -c %s 2>&1 |
>> FileCheck -check-prefix=CHECK-CASE-INSENSITIVE-CPUV7A %s
>> -// RUN: %clang -target arm-linux-gnueabi -mcpu=corteX-A12 -### -c %s 2>&1 |
>> FileCheck -check-prefix=CHECK-CASE-INSENSITIVE-CPUV7A %s
>> -// RUN: %clang -target arm-linux-gnueabi -mcpu=CorteX-a15 -### -c %s 2>&1 |
>> FileCheck -check-prefix=CHECK-CASE-INSENSITIVE-CPUV7A %s
>> -// RUN: %clang -target arm-linux-gnueabi -mcpu=CorteX-A17 -### -c %s 2>&1 |
>> FileCheck -check-prefix=CHECK-CASE-INSENSITIVE-CPUV7A %s
>> -// CHECK-CASE-INSENSITIVE-CPUV7A: "-cc1"{{.*}} "-triple" "armv7-{{.*}}
>>
>>
>> _______________________________________________
>> cfe-commits mailing list
>> cfe-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
>>
>>
More information about the cfe-commits
mailing list