From d379ec99085e33ace51740f2b93bda5e5c72326f Mon Sep 17 00:00:00 2001 From: tyb0807 Date: Tue, 25 Jan 2022 22:51:49 +0000 Subject: [PATCH] [AArch64] ACLE feature macro for Armv8.8-A MOPS This introduces the new __ARM_FEATURE_MOPS ACLE feature test macro, which signals the availability of the new Armv8.8-A/Armv9.3-A instructions for standardising memcpy, memset and memmove operations. This patch supersedes the one from https://reviews.llvm.org/D116160. Differential Revision: https://reviews.llvm.org/D118199 --- clang/lib/Basic/Targets/AArch64.cpp | 7 +++ clang/test/CodeGen/aarch64-mops.c | 52 ++++++++++++++--------- clang/test/Preprocessor/aarch64-target-features.c | 14 +++++- 3 files changed, 51 insertions(+), 22 deletions(-) diff --git a/clang/lib/Basic/Targets/AArch64.cpp b/clang/lib/Basic/Targets/AArch64.cpp index 34bdb58..b045085 100644 --- a/clang/lib/Basic/Targets/AArch64.cpp +++ b/clang/lib/Basic/Targets/AArch64.cpp @@ -226,6 +226,8 @@ void AArch64TargetInfo::getTargetDefinesARMV87A(const LangOptions &Opts, void AArch64TargetInfo::getTargetDefinesARMV88A(const LangOptions &Opts, MacroBuilder &Builder) const { + // FIXME: this does not handle the case where MOPS is disabled using +nomops + Builder.defineMacro("__ARM_FEATURE_MOPS", "1"); // Also include the Armv8.7 defines getTargetDefinesARMV87A(Opts, Builder); } @@ -435,6 +437,9 @@ void AArch64TargetInfo::getTargetDefines(const LangOptions &Opts, if (HasRandGen) Builder.defineMacro("__ARM_FEATURE_RNG", "1"); + if (HasMOPS) + Builder.defineMacro("__ARM_FEATURE_MOPS", "1"); + switch (ArchKind) { default: break; @@ -662,6 +667,8 @@ bool AArch64TargetInfo::handleTargetFeatures(std::vector &Features, HasFlagM = true; if (Feature == "+hbc") HasHBC = true; + if (Feature == "+mops") + HasMOPS = true; } setDataLayout(); diff --git a/clang/test/CodeGen/aarch64-mops.c b/clang/test/CodeGen/aarch64-mops.c index 0b6a2c2..9a19d42 100644 --- a/clang/test/CodeGen/aarch64-mops.c +++ b/clang/test/CodeGen/aarch64-mops.c @@ -1,8 +1,18 @@ // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py // RUN: %clang_cc1 -triple aarch64-arm-unknown-eabi -target-feature +mops -target-feature +mte -S -emit-llvm -o - %s | FileCheck %s +// RUN: %clang_cc1 -triple aarch64-arm-unknown-eabi -verify %s +// RUN: %clang -target aarch64-arm-none-eabi -march=armv8.7-a+mops+memtag -S -emit-llvm %s -o - | FileCheck %s +// RUN: %clang -target aarch64-arm-none-eabi -march=armv8.8-a+memtag -S -emit-llvm %s -o - | FileCheck %s +// RUN: %clang -target aarch64-arm-none-eabi -march=armv9.2-a+mops+memtag -S -emit-llvm %s -o - | FileCheck %s +// RUN: %clang -target aarch64-arm-none-eabi -march=armv9.3-a+memtag -S -emit-llvm %s -o - | FileCheck %s +// RUN: %clang -target aarch64-arm-none-eabi -march=armv8.7-a -Xclang -verify -S -emit-llvm %s -o - +// RUN: %clang -target aarch64-arm-none-eabi -march=armv8.7-a+mops -Xclang -verify -S -emit-llvm %s -o - +// RUN: %clang -target aarch64-arm-none-eabi -march=armv8.8-a -Xclang -verify -S -emit-llvm %s -o - +// RUN: %clang -target aarch64-arm-none-eabi -march=armv9.2-a -Xclang -verify -S -emit-llvm %s -o - +// RUN: %clang -target aarch64-arm-none-eabi -march=armv9.2-a+mops -Xclang -verify -S -emit-llvm %s -o - +// RUN: %clang -target aarch64-arm-none-eabi -march=armv9.3-a -Xclang -verify -S -emit-llvm %s -o - -#define __ARM_FEATURE_MOPS 1 #include #include @@ -13,9 +23,9 @@ // CHECK-NEXT: [[TMP0:%.*]] = load i8*, i8** [[DST_ADDR]], align 8 // CHECK-NEXT: [[TMP1:%.*]] = call i8* @llvm.aarch64.mops.memset.tag(i8* [[TMP0]], i8 0, i64 0) // CHECK-NEXT: ret i8* [[TMP1]] -// void *bzero_0(void *dst) { - return __arm_mops_memset_tag(dst, 0, 0); + // expected-warning@+1 {{incompatible integer to pointer conversion returning 'int' from a function with result type 'void *'}} + return __arm_mops_memset_tag(dst, 0, 0); // expected-warning{{implicit declaration of function '__arm_mops_memset_tag' is invalid in C99}} } // CHECK-LABEL: @bzero_1( @@ -25,9 +35,9 @@ void *bzero_0(void *dst) { // CHECK-NEXT: [[TMP0:%.*]] = load i8*, i8** [[DST_ADDR]], align 8 // CHECK-NEXT: [[TMP1:%.*]] = call i8* @llvm.aarch64.mops.memset.tag(i8* [[TMP0]], i8 0, i64 1) // CHECK-NEXT: ret i8* [[TMP1]] -// void *bzero_1(void *dst) { - return __arm_mops_memset_tag(dst, 0, 1); + // expected-warning@+1 {{incompatible integer to pointer conversion returning 'int' from a function with result type 'void *'}} + return __arm_mops_memset_tag(dst, 0, 1); // expected-warning{{implicit declaration of function '__arm_mops_memset_tag' is invalid in C99}} } // CHECK-LABEL: @bzero_10( @@ -37,9 +47,9 @@ void *bzero_1(void *dst) { // CHECK-NEXT: [[TMP0:%.*]] = load i8*, i8** [[DST_ADDR]], align 8 // CHECK-NEXT: [[TMP1:%.*]] = call i8* @llvm.aarch64.mops.memset.tag(i8* [[TMP0]], i8 0, i64 10) // CHECK-NEXT: ret i8* [[TMP1]] -// void *bzero_10(void *dst) { - return __arm_mops_memset_tag(dst, 0, 10); + // expected-warning@+1 {{incompatible integer to pointer conversion returning 'int' from a function with result type 'void *'}} + return __arm_mops_memset_tag(dst, 0, 10); // expected-warning{{implicit declaration of function '__arm_mops_memset_tag' is invalid in C99}} } // CHECK-LABEL: @bzero_10000( @@ -49,9 +59,9 @@ void *bzero_10(void *dst) { // CHECK-NEXT: [[TMP0:%.*]] = load i8*, i8** [[DST_ADDR]], align 8 // CHECK-NEXT: [[TMP1:%.*]] = call i8* @llvm.aarch64.mops.memset.tag(i8* [[TMP0]], i8 0, i64 10000) // CHECK-NEXT: ret i8* [[TMP1]] -// void *bzero_10000(void *dst) { - return __arm_mops_memset_tag(dst, 0, 10000); + // expected-warning@+1 {{incompatible integer to pointer conversion returning 'int' from a function with result type 'void *'}} + return __arm_mops_memset_tag(dst, 0, 10000); // expected-warning{{implicit declaration of function '__arm_mops_memset_tag' is invalid in C99}} } // CHECK-LABEL: @bzero_n( @@ -64,9 +74,9 @@ void *bzero_10000(void *dst) { // CHECK-NEXT: [[TMP1:%.*]] = load i64, i64* [[SIZE_ADDR]], align 8 // CHECK-NEXT: [[TMP2:%.*]] = call i8* @llvm.aarch64.mops.memset.tag(i8* [[TMP0]], i8 0, i64 [[TMP1]]) // CHECK-NEXT: ret i8* [[TMP2]] -// void *bzero_n(void *dst, size_t size) { - return __arm_mops_memset_tag(dst, 0, size); + // expected-warning@+1 {{incompatible integer to pointer conversion returning 'int' from a function with result type 'void *'}} + return __arm_mops_memset_tag(dst, 0, size); // expected-warning{{implicit declaration of function '__arm_mops_memset_tag' is invalid in C99}} } // CHECK-LABEL: @memset_0( @@ -80,9 +90,9 @@ void *bzero_n(void *dst, size_t size) { // CHECK-NEXT: [[TMP2:%.*]] = trunc i32 [[TMP1]] to i8 // CHECK-NEXT: [[TMP3:%.*]] = call i8* @llvm.aarch64.mops.memset.tag(i8* [[TMP0]], i8 [[TMP2]], i64 0) // CHECK-NEXT: ret i8* [[TMP3]] -// void *memset_0(void *dst, int value) { - return __arm_mops_memset_tag(dst, value, 0); + // expected-warning@+1 {{incompatible integer to pointer conversion returning 'int' from a function with result type 'void *'}} + return __arm_mops_memset_tag(dst, value, 0); // expected-warning{{implicit declaration of function '__arm_mops_memset_tag' is invalid in C99}} } // CHECK-LABEL: @memset_1( @@ -96,9 +106,9 @@ void *memset_0(void *dst, int value) { // CHECK-NEXT: [[TMP2:%.*]] = trunc i32 [[TMP1]] to i8 // CHECK-NEXT: [[TMP3:%.*]] = call i8* @llvm.aarch64.mops.memset.tag(i8* [[TMP0]], i8 [[TMP2]], i64 1) // CHECK-NEXT: ret i8* [[TMP3]] -// void *memset_1(void *dst, int value) { - return __arm_mops_memset_tag(dst, value, 1); + // expected-warning@+1 {{incompatible integer to pointer conversion returning 'int' from a function with result type 'void *'}} + return __arm_mops_memset_tag(dst, value, 1); // expected-warning{{implicit declaration of function '__arm_mops_memset_tag' is invalid in C99}} } // CHECK-LABEL: @memset_10( @@ -112,9 +122,9 @@ void *memset_1(void *dst, int value) { // CHECK-NEXT: [[TMP2:%.*]] = trunc i32 [[TMP1]] to i8 // CHECK-NEXT: [[TMP3:%.*]] = call i8* @llvm.aarch64.mops.memset.tag(i8* [[TMP0]], i8 [[TMP2]], i64 10) // CHECK-NEXT: ret i8* [[TMP3]] -// void *memset_10(void *dst, int value) { - return __arm_mops_memset_tag(dst, value, 10); + // expected-warning@+1 {{incompatible integer to pointer conversion returning 'int' from a function with result type 'void *'}} + return __arm_mops_memset_tag(dst, value, 10); // expected-warning{{implicit declaration of function '__arm_mops_memset_tag' is invalid in C99}} } // CHECK-LABEL: @memset_10000( @@ -128,9 +138,9 @@ void *memset_10(void *dst, int value) { // CHECK-NEXT: [[TMP2:%.*]] = trunc i32 [[TMP1]] to i8 // CHECK-NEXT: [[TMP3:%.*]] = call i8* @llvm.aarch64.mops.memset.tag(i8* [[TMP0]], i8 [[TMP2]], i64 10000) // CHECK-NEXT: ret i8* [[TMP3]] -// void *memset_10000(void *dst, int value) { - return __arm_mops_memset_tag(dst, value, 10000); + // expected-warning@+1 {{incompatible integer to pointer conversion returning 'int' from a function with result type 'void *'}} + return __arm_mops_memset_tag(dst, value, 10000); // expected-warning{{implicit declaration of function '__arm_mops_memset_tag' is invalid in C99}} } // CHECK-LABEL: @memset_n( @@ -147,7 +157,7 @@ void *memset_10000(void *dst, int value) { // CHECK-NEXT: [[TMP3:%.*]] = trunc i32 [[TMP1]] to i8 // CHECK-NEXT: [[TMP4:%.*]] = call i8* @llvm.aarch64.mops.memset.tag(i8* [[TMP0]], i8 [[TMP3]], i64 [[TMP2]]) // CHECK-NEXT: ret i8* [[TMP4]] -// void *memset_n(void *dst, int value, size_t size) { - return __arm_mops_memset_tag(dst, value, size); + // expected-warning@+1 {{incompatible integer to pointer conversion returning 'int' from a function with result type 'void *'}} + return __arm_mops_memset_tag(dst, value, size); // expected-warning{{implicit declaration of function '__arm_mops_memset_tag' is invalid in C99}} } diff --git a/clang/test/Preprocessor/aarch64-target-features.c b/clang/test/Preprocessor/aarch64-target-features.c index 3461af3..1a9ac47 100644 --- a/clang/test/Preprocessor/aarch64-target-features.c +++ b/clang/test/Preprocessor/aarch64-target-features.c @@ -510,9 +510,21 @@ // CHECK-NO-SVE-VECTOR-BITS-NOT: __ARM_FEATURE_SVE_BITS // CHECK-NO-SVE-VECTOR-BITS-NOT: __ARM_FEATURE_SVE_VECTOR_OPERATORS -// ================== Check Largse System Extensions (LSE) +// ================== Check Large System Extensions (LSE) // RUN: %clang -target aarch64-none-linux-gnu -march=armv8-a+lse -x c -E -dM %s -o - | FileCheck --check-prefix=CHECK-LSE %s // RUN: %clang -target arm64-none-linux-gnu -march=armv8-a+lse -x c -E -dM %s -o - | FileCheck --check-prefix=CHECK-LSE %s // RUN: %clang -target aarch64-none-linux-gnu -march=armv8.1-a -x c -E -dM %s -o - | FileCheck --check-prefix=CHECK-LSE %s // RUN: %clang -target arm64-none-linux-gnu -march=armv8.1-a -x c -E -dM %s -o - | FileCheck --check-prefix=CHECK-LSE %s // CHECK-LSE: __ARM_FEATURE_ATOMICS 1 + +// ================== Check Armv8.8-A/Armv9.3-A memcpy and memset acceleration instructions (MOPS) +// RUN: %clang -target aarch64-arm-none-eabi -march=armv8.7-a -x c -E -dM %s -o - | FileCheck --check-prefix=CHECK-NOMOPS %s +// RUN: %clang -target aarch64-arm-none-eabi -march=armv8.7-a+mops -x c -E -dM %s -o - | FileCheck --check-prefix=CHECK-MOPS %s +// RUN: %clang -target aarch64-arm-none-eabi -march=armv8.8-a -x c -E -dM %s -o - | FileCheck --check-prefix=CHECK-MOPS %s +// RUN: %clang -target aarch64-arm-none-eabi -march=armv8.8-a+mops -x c -E -dM %s -o - | FileCheck --check-prefix=CHECK-MOPS %s +// RUN: %clang -target aarch64-arm-none-eabi -march=armv9.2-a -x c -E -dM %s -o - | FileCheck --check-prefix=CHECK-NOMOPS %s +// RUN: %clang -target aarch64-arm-none-eabi -march=armv9.2-a+mops -x c -E -dM %s -o - | FileCheck --check-prefix=CHECK-MOPS %s +// RUN: %clang -target aarch64-arm-none-eabi -march=armv9.3-a -x c -E -dM %s -o - | FileCheck --check-prefix=CHECK-MOPS %s +// RUN: %clang -target aarch64-arm-none-eabi -march=armv9.3-a+mops -x c -E -dM %s -o - | FileCheck --check-prefix=CHECK-MOPS %s +// CHECK-MOPS: __ARM_FEATURE_MOPS 1 +// CHECK-NOMOPS-NOT: __ARM_FEATURE_MOPS 1 -- 2.7.4