[clang][driver] Use the canonical Darwin arch name when printing out the triple for a Darwin target

[arphaman]

Summary

Clang's driver currently prints out different default triples when it's invoked like this on Apple Silicon:

$ clang --version
Target: arm64-apple-darwin19.0.0
$ clang -arch arm64 --version
Target: aarch64-apple-darwin19.0.0

This change ensures that the driver uses the canonical arch names for a Darwin triple when the target triple is being printed out by the driver.

[ab]

This sounds nice! One idea, maybe more dangerous, not sure which is better: in setTripleTypeForMachOArchName, we already have a couple setArchName calls, I think that's why arm64e is left alone in the aarch64-cpus.c test. Maybe we can do the setArchName call for every arch there?

Another question, probably a completely separate problem: why is it still reporting darwin? Ideally we'd want it to report macos, right? With that + your change the triple there would be the actual triple we use to build. (but maybe the macos bit only comes later when we pick up an SDK in DarwinClang or whatever?)

[arphaman]

Updated with Ahmed's suggestion.

[arphaman]

In D100807#2702675, @ab wrote:

This sounds nice! One idea, maybe more dangerous, not sure which is better: in setTripleTypeForMachOArchName, we already have a couple setArchName calls, I think that's why arm64e is left alone in the aarch64-cpus.c test. Maybe we can do the setArchName call for every arch there?

Thanks for the suggestion! I like your idea better, so I updated the patch.

Another question, probably a completely separate problem: why is it still reporting darwin? Ideally we'd want it to report macos, right? With that + your change the triple there would be the actual triple we use to build. (but maybe the macos bit only comes later when we pick up an SDK in DarwinClang or whatever?)

I think that's the default we set in the build. I do want to get rid of the 'Darwin' triple OS and just leave it as an alias for the driver at some point in the future as I don't think it's serving a good purpose anymore, but I haven't gotten around to it. I can explore using 'macOS' triples for the build before then though.

[ab]

Neat, thanks!

[thakis]

Looks like this breaks tests on mac/arm (by making two unexpectedly pass): http://45.33.8.238/macm1/8249/step_7.txt

Please take a look, and please revert for now if it takes a while to fix.

[arphaman]

In D100807#2717778, @thakis wrote:

Looks like this breaks tests on mac/arm (by making two unexpectedly pass): http://45.33.8.238/macm1/8249/step_7.txt

Please take a look, and please revert for now if it takes a while to fix.

Thanks, I will take a look.

[arphaman]

In D100807#2717778, @thakis wrote:

Looks like this breaks tests on mac/arm (by making two unexpectedly pass): http://45.33.8.238/macm1/8249/step_7.txt

Please take a look, and please revert for now if it takes a while to fix.

I will revert it now.

It appears that your bot is running on a Mac with M1 is that correct? Which OS do you have installed? Thanks

[arphaman]

Reverted in ab0df6c0346e for now.

[thakis]

In D100807#2718006, @arphaman wrote:

It appears that your bot is running on a Mac with M1 is that correct? Which OS do you have installed? Thanks

Correct, it's an M1 Mini. I had to get check-clang and check-llvm to pass on M1 (PR46647, PR46644) so it looks like nobody else is running this config (why not?). check-builtins is e.g. still failing (PR49918). Kind of on that note, the clang y'all ship with Xcode is > 5% slower than it needs to be due to you apparently building it with profiles collected on an intel machine instead of with profiles collected on an arm machine (data: https://bugs.chromium.org/p/chromium/issues/detail?id=1103322#c34 There's a prebuilt binary at http://commondatastorage.googleapis.com/chromium-browser-clang/Mac_arm64/clang-llvmorg-13-init-7296-ga749bd76-2.tgz with profiles collected on arm that is ~ 12.5% faster than Xcode's clang, see comment 29 on that same crbug).

The bot is running macOS 11.3 IIRC.

[arphaman]

In D100807#2719561, @thakis wrote:

In D100807#2718006, @arphaman wrote:

It appears that your bot is running on a Mac with M1 is that correct? Which OS do you have installed? Thanks

Correct, it's an M1 Mini. I had to get check-clang and check-llvm to pass on M1 (PR46647, PR46644) so it looks like nobody else is running this config (why not?). check-builtins is e.g. still failing (PR49918). Kind of on that note, the clang y'all ship with Xcode is > 5% slower than it needs to be due to you apparently building it with profiles collected on an intel machine instead of with profiles collected on an arm machine (data: https://bugs.chromium.org/p/chromium/issues/detail?id=1103322#c34 There's a prebuilt binary at http://commondatastorage.googleapis.com/chromium-browser-clang/Mac_arm64/clang-llvmorg-13-init-7296-ga749bd76-2.tgz with profiles collected on arm that is ~ 12.5% faster than Xcode's clang, see comment 29 on that same crbug).

The bot is running macOS 11.3 IIRC.

We have M1 CI running internally but it's post commit only right now (that's something we're hoping to change in the future), so this would've been caught in our internal CI. I didn't verify this specific patch on an M1 myself though, which is something that's probably a good idea to do going forward for driver changes. I didn't know there's another M1 bot running in the open so I will be mindful of it :)

Thanks for the pointer, I'll take a look the profile data issue, and we will work on rectifying it.

[thakis]

In D100807#2719873, @arphaman wrote:

We have M1 CI running internally but it's post commit only right now

Which tests is it running?

[arphaman]

In D100807#2720277, @thakis wrote:

In D100807#2719873, @arphaman wrote:

We have M1 CI running internally but it's post commit only right now

Which tests is it running?

We run check-all for our enabled projects, so that has things like check-clang and check-llvm.

[arphaman]

Recommitted with a fix for the M1 openMP issue:

To https://github.com/llvm/llvm-project.git

3aaac01aab2f..6b938d2ead2c  main -> main

clang/lib/Driver/ToolChains/Darwin.cpp

return llvm::StringSwitch<llvm::Triple::ArchType>(Str)
       .Case("spir", llvm::Triple::spir)
       .Default(llvm::Triple::UnknownArch);
 }
 
 void darwin::setTripleTypeForMachOArchName(llvm::Triple &T, StringRef Str) {
   const llvm::Triple::ArchType Arch = getArchTypeForMachOArchName(Str);
   llvm::ARM::ArchKind ArchKind = llvm::ARM::parseArch(Str);
   T.setArch(Arch);
-
-  if (Str == "x86_64h" || Str == "arm64e")
+  if (Arch != llvm::Triple::UnknownArch)
     T.setArchName(Str);
-  else if (ArchKind == llvm::ARM::ArchKind::ARMV6M ||
-           ArchKind == llvm::ARM::ArchKind::ARMV7M ||
-           ArchKind == llvm::ARM::ArchKind::ARMV7EM) {
+
+  if (ArchKind == llvm::ARM::ArchKind::ARMV6M ||
     T.setOS(llvm::Triple::UnknownOS);
     T.setObjectFormat(llvm::Triple::MachO);
   }
 }
 
 void darwin::Assembler::ConstructJob(Compilation &C, const JobAction &JA,
                                      const InputInfo &Output,
                                      const InputInfoList &Inputs,

clang/test/Driver/aarch64-cpus.c

 // RUN: %clang -target arm64-apple-ios12.0 -### -c %s 2>&1 | FileCheck -check-prefix=ARM64-DARWIN %s
 // ARM64-DARWIN: "-cc1"{{.*}} "-triple" "arm64{{.*}}" "-target-cpu" "apple-a7"
 // ARM64-DARWIN-SAME: "-target-feature" "+aes"
 
 // RUN: %clang -target arm64-apple-darwin -arch arm64e -### -c %s 2>&1 | FileCheck -check-prefix=ARM64E-DARWIN %s
 // ARM64E-DARWIN: "-cc1"{{.*}} "-triple" "arm64e{{.*}}" "-target-cpu" "apple-a12"
 
 // RUN: %clang -target arm64-apple-darwin -arch arm64_32 -### -c %s 2>&1 | FileCheck -check-prefix=ARM64_32-DARWIN %s
-// ARM64_32-DARWIN: "-cc1"{{.*}} "-triple" "aarch64_32{{.*}}" "-target-cpu" "apple-s4"
+// ARM64_32-DARWIN: "-cc1"{{.*}} "-triple" "arm64_32{{.*}}" "-target-cpu" "apple-s4"
 
 // RUN: %clang -target aarch64 -mcpu=cortex-a35 -### -c %s 2>&1 | FileCheck -check-prefix=CA35 %s
 // RUN: %clang -target aarch64 -mlittle-endian -mcpu=cortex-a35 -### -c %s 2>&1 | FileCheck -check-prefix=CA35 %s
 // RUN: %clang -target aarch64_be -mlittle-endian -mcpu=cortex-a35 -### -c %s 2>&1 | FileCheck -check-prefix=CA35 %s
 // RUN: %clang -target aarch64 -mtune=cortex-a35 -### -c %s 2>&1 | FileCheck -check-prefix=CA35-TUNE %s
 // RUN: %clang -target aarch64 -mlittle-endian -mtune=cortex-a35 -### -c %s 2>&1 | FileCheck -check-prefix=CA35-TUNE %s
 // RUN: %clang -target aarch64_be -mlittle-endian -mtune=cortex-a35 -### -c %s 2>&1 | FileCheck -check-prefix=CA35-TUNE %s
 // CA35: "-cc1"{{.*}} "-triple" "aarch64{{(--)?}}"{{.*}} "-target-cpu" "cortex-a35"

clang/test/Driver/arm64_32-link.c

 // RUN: %clang -target x86_64-apple-darwin -arch arm64_32 -miphoneos-version-min=8.0 %s -### 2>&1 | FileCheck %s
 
-// CHECK: "-cc1"{{.*}} "-triple" "aarch64_32-apple-ios8.0.0"
+// CHECK: "-cc1"{{.*}} "-triple" "arm64_32-apple-ios8.0.0"
 // CHECK: ld{{.*}} "-arch" "arm64_32"

clang/test/Driver/darwin-version.c

 // RUN: %clang -target armv7-apple-ios9.0 -miphoneos-version-min=11.0 -c -Wno-invalid-ios-deployment-target -### %s 2>&1 | \
 // RUN: FileCheck --check-prefix=CHECK-VERSION-IOS12 %s
 // CHECK-VERSION-IOS12: thumbv7-apple-ios9.0.0
 
 // RUN: %clang -target i686-apple-darwin8 -c %s -### 2>&1 | \
 // RUN:   FileCheck --check-prefix=CHECK-VERSION-OSX4 %s
 // RUN: %clang -target i686-apple-darwin9 -mmacosx-version-min=10.4 -c %s -### 2>&1 | \
 // RUN:   FileCheck --check-prefix=CHECK-VERSION-OSX4 %s
-// CHECK-VERSION-OSX4: "i386-apple-macosx10.4.0"
+// CHECK-VERSION-OSX4: "i686-apple-macosx10.4.0"
 // RUN: %clang -target i686-apple-darwin9 -c %s -### 2>&1 | \
 // RUN:   FileCheck --check-prefix=CHECK-VERSION-OSX5 %s
 // RUN: %clang -target i686-apple-darwin9 -mmacosx-version-min=10.5 -c %s -### 2>&1 | \
 // RUN:   FileCheck --check-prefix=CHECK-VERSION-OSX5 %s
-// CHECK-VERSION-OSX5: "i386-apple-macosx10.5.0"
+// CHECK-VERSION-OSX5: "i686-apple-macosx10.5.0"
 // RUN: %clang -target i686-apple-darwin10 -c %s -### 2>&1 | \
 // RUN:   FileCheck --check-prefix=CHECK-VERSION-OSX6 %s
 // RUN: %clang -target i686-apple-darwin9 -mmacosx-version-min=10.6 -c %s -### 2>&1 | \
 // RUN:   FileCheck --check-prefix=CHECK-VERSION-OSX6 %s
-// CHECK-VERSION-OSX6: "i386-apple-macosx10.6.0"
+// CHECK-VERSION-OSX6: "i686-apple-macosx10.6.0"
 // RUN: %clang -target x86_64-apple-darwin14 -c %s -### 2>&1 | \
 // RUN:   FileCheck --check-prefix=CHECK-VERSION-OSX10 %s
 // RUN: %clang -target x86_64-apple-darwin -mmacosx-version-min=10.10 -c %s -### 2>&1 | \
 // RUN:   FileCheck --check-prefix=CHECK-VERSION-OSX10 %s
 // RUN: %clang -target x86_64-apple-darwin -mmacos-version-min=10.10 -c %s -### 2>&1 | \
 // RUN:   FileCheck --check-prefix=CHECK-VERSION-OSX10 %s
 // CHECK-VERSION-OSX10: "x86_64-apple-macosx10.10.0"
 // RUN: %clang -target x86_64-apple-darwin -mmacosx-version-min= -c %s -### 2>&1 | \

 // RUN:   FileCheck --check-prefix=CHECK-VERSION-WATCHOS20 %s
 // CHECK-VERSION-WATCHOS20: "thumbv7k-apple-watchos2.0.0"
 // RUN: %clang -target i386-apple-darwin -mwatchos-simulator-version-min=2.0 -c %s -### 2>&1 | \
 // RUN:   FileCheck --check-prefix=CHECK-VERSION-WATCHSIM20 %s
 // CHECK-VERSION-WATCHSIM20: "i386-apple-watchos2.0.0-simulator"
 
 // Check environment variable gets interpreted correctly
 // RUN: env MACOSX_DEPLOYMENT_TARGET=10.5 IPHONEOS_DEPLOYMENT_TARGET=2.0 \
-// RUN:   %clang -target i386-apple-darwin9 -c %s -### 2>&1 | \
+// RUN:   %clang -target i686-apple-darwin9 -c %s -### 2>&1 | \
 // RUN:   FileCheck --check-prefix=CHECK-VERSION-OSX5 %s
 // RUN: env MACOSX_DEPLOYMENT_TARGET=10.5 IPHONEOS_DEPLOYMENT_TARGET=2.0 \
 // RUN:   %clang -target armv6-apple-darwin9 -c %s -### 2>&1 | \
 // RUN:   FileCheck --check-prefix=CHECK-VERSION-IOS2 %s
 
 // RUN: env MACOSX_DEPLOYMENT_TARGET=10.4.10 \
 // RUN:   %clang -target i386-apple-darwin9 -c %s -### 2>&1 | \
 // RUN:   FileCheck --check-prefix=CHECK-VERSION-OSX49 %s

clang/test/Driver/default-toolchain.c

 // RUN: %clang -target i386-unknown-unknown -m64 -v 2> %t
 // RUN: grep 'Target: x86_64-unknown-unknown' %t
 
 // RUN: %clang -target i386-apple-darwin9 -arch ppc -m64 -v 2> %t
 // RUN: grep 'Target: powerpc64-apple-darwin9' %t
 
 // RUN: %clang -target i386-apple-darwin9 -arch ppc64 -m32 -v 2> %t
 // RUN: grep 'Target: powerpc-apple-darwin9' %t
+
+// RUN: %clang -target x86_64-apple-macos11 -arch arm64 -v 2>&1 | FileCheck --check-prefix=ARM64 %s
+// ARM64: Target: arm64-apple-macos11