Switch kryo to use -mcpu=cortex-a57 when invoking the assembler

[pirama]

Summary

Using -no-integrated-as causes -mcpu=kryo to fail since GNU assembler
doesn't recognize kryo. Cortex-a57 is the closest CPU to kryo that the
assembler does recognize. So we should switch the assembler to use
that instead.

[pirama]

Few refactorings.

[srhines]

lib/Driver/ToolChains/Gnu.cpp

660

Is it better to sink A into the if condition again?

test/Driver/as-mcpu.c

2

cortex-a15 - this is missing the "a".

7

cortex-a57

[pirama]

Address review comments.

[pirama]

Add missing space.

[srhines]

lib/Driver/ToolChains/Gnu.cpp

656–668

Arg *A can also get moved here.

[pirama]

Sink 'Arg *' declaration.

[mcrosier]

Am I correct in assuming this is going to be a problem for Falkor and Saphira as well? If so, can you add solutions for those as well? Cortex-a57 should be good enough for those targets as well.

[pirama]

Normalize falkor and saphira as well.

[pirama]

Thanks for the review. Now let's just hope the windows bots stay happy :)

[mcrosier]

In D40476#936372, @pirama wrote:

Thanks for the review. Now let's just hope the windows bots stay happy :)

Actually, I just checked and it looks like falkor and saphira were both added as of a few weeks ago. I'll revert this part of the patch shortly.

[mcrosier]

In D40476#936700, @mcrosier wrote:

In D40476#936372, @pirama wrote:

Thanks for the review. Now let's just hope the windows bots stay happy :)

Actually, I just checked and it looks like falkor and saphira were both added as of a few weeks ago. I'll revert this part of the patch shortly.

Done so in r319323.

lib/Driver/ToolChains/Gnu.cpp

case arm::FloatABI::SoftFP:
       break;
     case arm::FloatABI::Hard:
       CmdArgs.push_back(Args.MakeArgString("-mfloat-abi=hard"));
       break;
     }
 
     Args.AddLastArg(CmdArgs, options::OPT_march_EQ);
 
-    // FIXME: remove krait check when GNU tools support krait cpu
-    // for now replace it with -mcpu=cortex-a15 to avoid a lower
-    // march from being picked in the absence of a cpu flag.
-    Arg *A;
-    if ((A = Args.getLastArg(options::OPT_mcpu_EQ)) &&
-        StringRef(A->getValue()).equals_lower("krait"))
+    // FIXME: remove krait and kryo checks when GNU tools support them.  For now
+    // use -mcpu=cortex-a15 for krait and -mcpu=cortex-a57 for kryo
+    // -mcpu=cortex-a57 to avoid a lower march from being picked in the absence
+    // of a cpu flag.
+    if (Arg *A = Args.getLastArg(options::OPT_mcpu_EQ)) {
+      StringRef CPUArg(A->getValue());
+      if(CPUArg.equals_lower("krait"))
         CmdArgs.push_back("-mcpu=cortex-a15");
+      else if(CPUArg.equals_lower("kryo"))
+        CmdArgs.push_back("-mcpu=cortex-a57");
       else
         Args.AddLastArg(CmdArgs, options::OPT_mcpu_EQ);
+    }
     Args.AddLastArg(CmdArgs, options::OPT_mfpu_EQ);
     break;
   }
   case llvm::Triple::aarch64:
   case llvm::Triple::aarch64_be: {
     Args.AddLastArg(CmdArgs, options::OPT_march_EQ);
+
+    // FIXME: remove kryo check when GNU tools support them.  For now use
+    // -mcpu=cortex-a57 to avoid a lower march from being picked in the absence
+    // of a cpu flag.
+    Arg *A;
+    if ((A = Args.getLastArg(options::OPT_mcpu_EQ)) &&
+        (StringRef(A->getValue()).equals_lower("kryo")))
+      CmdArgs.push_back("-mcpu=cortex-a57");
+    else
       Args.AddLastArg(CmdArgs, options::OPT_mcpu_EQ);
     break;
   }
   case llvm::Triple::mips:
   case llvm::Triple::mipsel:
   case llvm::Triple::mips64:
   case llvm::Triple::mips64el: {
     StringRef CPUName;
     StringRef ABIName;

test/Driver/as-mcpu.c

+// ================== Check that krait is substituted by cortex-a15 when invoking
+// the assembler
+// RUN: %clang -target arm-linux -mcpu=krait -### -c %s -v -fno-integrated-as 2>&1 | FileCheck -check-prefix=CHECK-CORTEX-A15 %s
+// CHECK-CORTEX-A15: as{{(.exe)?}}" "{{.*}}-mcpu=cortex-a15
+
+// ================== Check that kryo is substituted by cortex-a57 when invoking
+// the assembler
+// RUN: %clang -target arm-linux -mcpu=kryo -### -c %s -v -fno-integrated-as 2>&1 | FileCheck -check-prefix=CHECK-CORTEX-A57 %s
+// RUN: %clang -target aarch64-linux -mcpu=kryo -### -c %s -v -fno-integrated-as 2>&1 | FileCheck -check-prefix=CHECK-CORTEX-A57 %s
+// CHECK-CORTEX-A57: as{{(.exe)?}}" "{{.*}}-mcpu=cortex-a57