[ARM][AArch64] Add missing v8.x checks

[tyb0807]

Summary

This patch adds checks that were missing in clang for Armv8.5/6/7-A. These include:

• ACLE macro defines for AArch32.
• Handling of crypto and SM4, SHA and AES feature flags on clang's driver.

[SjoerdMeijer]

clang/lib/Basic/Targets/ARM.cpp

937

Perhaps unrelated to this patch, but I am surprised to see that from v 8.3 and up we only include getTargetDefinesARMV83A, so no other target defines were introduced or are necessary? This is not rhetorical question....I haven't paid attention to this since v8.4.

clang/test/Preprocessor/aarch64-target-features.c

296

I don't pretend to understand the combo x86_64-apple-macosx -arch arm64 here.... but is unrelated to this patch...

298

A test for v8.5 seems to be covered above somehow, but do we not need any tests for v8.6 and v 8.7?

[tyb0807]

Add more tests

[tyb0807]

clang/lib/Basic/Targets/ARM.cpp

937

It seems that most of the time, getTargetDefinesARMV8(x)A only includes getTargetDefinesARMV8(x-1)A (see AArch64TargetInfo::getTargetDefines). What we have here is a equivalent way to do that, with less boilerplate code.

[vhscampos]

I don't see any problem with the patch, but we should wait on @SjoerdMeijer.

[SjoerdMeijer]

Ah, sorry, forgot about this. Can you upload the patch with some more context please so I can have a quick look again?

[tyb0807]

Rebase

[SjoerdMeijer]

clang/lib/Basic/Targets/ARM.cpp

958

I see tests for the crypto stuff, but is there or do we need a test for whatever getTargetDefinesARMV83A is setting?

[tyb0807]

clang/lib/Basic/Targets/ARM.cpp

958

I'm not sure that we need a test for this, as none of the other architectures really have this. What do you think @SjoerdMeijer @vhscampos ?

[SjoerdMeijer]

clang/lib/Basic/Targets/ARM.cpp

958

I am expecting tests for the ACLE macros that this patch defines for v8.7 to be added to clang/test/Preprocessor/arm-target-features.c.

[tyb0807]

clang/lib/Basic/Targets/ARM.cpp

958

In that case, for consistency, I think we should also add tests for ACLE macros for other versions (v8.4/5/6/8) as well. And for AArch64 too. It sounds a bit out of scope, but it ensures consistency IMHO

[SjoerdMeijer]

clang/lib/Basic/Targets/ARM.cpp

958

The subject says

[ARM][AArch64] Add missing v8.x checks

so looks perfect in scope to me. :)

[tyb0807]

Add checks for default ACLE macros for different architecture versions

[SjoerdMeijer]

Thanks, looks good!

clang/lib/Basic/Targets/ARM.cpp

   case llvm::ARM::ArchKind::ARMV8_4A:
   case llvm::ARM::ArchKind::ARMV8_5A:
   case llvm::ARM::ArchKind::ARMV8_6A:
+  case llvm::ARM::ArchKind::ARMV8_7A:
   case llvm::ARM::ArchKind::ARMV8_8A:
   case llvm::ARM::ArchKind::ARMV9A:
   case llvm::ARM::ArchKind::ARMV9_1A:

clang/lib/Driver/ToolChains/Arch/AArch64.cpp

   }
 
   if (std::find(ItBegin, ItEnd, "+v8.4a") != ItEnd ||
+      std::find(ItBegin, ItEnd, "+v8.5a") != ItEnd ||
+      std::find(ItBegin, ItEnd, "+v8.6a") != ItEnd ||
+      std::find(ItBegin, ItEnd, "+v8.7a") != ItEnd ||
       std::find(ItBegin, ItEnd, "+v8.8a") != ItEnd ||
       std::find(ItBegin, ItEnd, "+v9a") != ItEnd ||
       std::find(ItBegin, ItEnd, "+v9.1a") != ItEnd ||

clang/test/Preprocessor/aarch64-target-features.c

 // CHECK-MCPU-CARMEL: "-cc1"{{.*}} "-triple" "aarch64{{.*}}" "-target-feature" "+v8.2a" "-target-feature" "+fp-armv8" "-target-feature" "+neon" "-target-feature" "+crc" "-target-feature" "+crypto" "-target-feature" "+fullfp16" "-target-feature" "+ras" "-target-feature" "+lse" "-target-feature" "+rdm" "-target-feature" "+sha2" "-target-feature" "+aes"
 
 // RUN: %clang -target x86_64-apple-macosx -arch arm64 -### -c %s 2>&1 | FileCheck --check-prefix=CHECK-ARCH-ARM64 %s
-// CHECK-ARCH-ARM64: "-target-cpu" "apple-m1" "-target-feature" "+v8.5a" "-target-feature" "+fp-armv8" "-target-feature" "+neon" "-target-feature" "+crc" "-target-feature" "+crypto" "-target-feature" "+dotprod" "-target-feature" "+fp16fml" "-target-feature" "+ras" "-target-feature" "+lse" "-target-feature" "+rdm" "-target-feature" "+rcpc" "-target-feature" "+zcm" "-target-feature" "+zcz" "-target-feature" "+fullfp16" "-target-feature" "+sha2" "-target-feature" "+aes"
+// CHECK-ARCH-ARM64: "-target-cpu" "apple-m1" "-target-feature" "+v8.5a" "-target-feature" "+fp-armv8" "-target-feature" "+neon" "-target-feature" "+crc" "-target-feature" "+crypto" "-target-feature" "+dotprod" "-target-feature" "+fp16fml" "-target-feature" "+ras" "-target-feature" "+lse" "-target-feature" "+rdm" "-target-feature" "+rcpc" "-target-feature" "+zcm" "-target-feature" "+zcz" "-target-feature" "+fullfp16" "-target-feature" "+sm4" "-target-feature" "+sha3" "-target-feature" "+sha2" "-target-feature" "+aes"
 
 // RUN: %clang -target x86_64-apple-macosx -arch arm64_32 -### -c %s 2>&1 | FileCheck --check-prefix=CHECK-ARCH-ARM64_32 %s
 // CHECK-ARCH-ARM64_32: "-target-cpu" "apple-s4" "-target-feature" "+v8.3a" "-target-feature" "+fp-armv8" "-target-feature" "+neon" "-target-feature" "+crc" "-target-feature" "+crypto" "-target-feature" "+fullfp16" "-target-feature" "+ras" "-target-feature" "+lse" "-target-feature" "+rdm" "-target-feature" "+rcpc" "-target-feature" "+zcm" "-target-feature" "+zcz" "-target-feature" "+sha2" "-target-feature" "+aes"

 // Check +crypto:
 //
 // RUN: %clang -target aarch64 -march=armv8.4a+crypto -### -c %s 2>&1 | FileCheck -check-prefix=CHECK-CRYPTO84 %s
-// CHECK-CRYPTO84: "-cc1"{{.*}} "-triple" "aarch64{{.*}}" "-target-feature" "+v8.4a" "-target-feature" "+crypto" "-target-feature" "+sm4" "-target-feature" "+sha3" "-target-feature" "+sha2" "-target-feature" "+aes"
+// RUN: %clang -target aarch64 -march=armv8.5a+crypto -### -c %s 2>&1 | FileCheck -check-prefix=CHECK-CRYPTO85 %s
+// RUN: %clang -target aarch64 -march=armv8.6a+crypto -### -c %s 2>&1 | FileCheck -check-prefix=CHECK-CRYPTO86 %s
+// RUN: %clang -target aarch64 -march=armv8.7a+crypto -### -c %s 2>&1 | FileCheck -check-prefix=CHECK-CRYPTO87 %s
+// CHECK-CRYPTO84: "-cc1"{{.*}} "-triple" "aarch64{{.*}}" "-target-feature" "+v8.4a"{{.*}} "-target-feature" "+crypto" "-target-feature" "+sm4" "-target-feature" "+sha3" "-target-feature" "+sha2" "-target-feature" "+aes"
+// CHECK-CRYPTO85: "-cc1"{{.*}} "-triple" "aarch64{{.*}}" "-target-feature" "+v8.5a"{{.*}} "-target-feature" "+crypto" "-target-feature" "+sm4" "-target-feature" "+sha3" "-target-feature" "+sha2" "-target-feature" "+aes"
+// CHECK-CRYPTO86: "-cc1"{{.*}} "-triple" "aarch64{{.*}}" "-target-feature" "+v8.6a"{{.*}} "-target-feature" "+crypto" "-target-feature" "+sm4" "-target-feature" "+sha3" "-target-feature" "+sha2" "-target-feature" "+aes"
+// CHECK-CRYPTO87: "-cc1"{{.*}} "-triple" "aarch64{{.*}}" "-target-feature" "+v8.7a"{{.*}} "-target-feature" "+crypto" "-target-feature" "+sm4" "-target-feature" "+sha3" "-target-feature" "+sha2" "-target-feature" "+aes"
 //
 // Check -crypto:
 //