Skip to content

Commit

Permalink
Revert "[AArch64] ACLE feature macro for Armv8.8-A MOPS"
Browse files Browse the repository at this point in the history 
This reverts commit d379ec9.
  • Loading branch information
@tyb-arm
tyb-arm committed Feb 9, 2022
1 parent d7095e8 commit 9b81d2f
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 51 deletions.
7 changes: 0 additions & 7 deletions clang/lib/Basic/Targets/AArch64.cpp
View file
Expand Up @@ -226,8 +226,6 @@ 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);
}
Expand Down Expand Up @@ -437,9 +435,6 @@ 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;
Expand Down Expand Up @@ -667,8 +662,6 @@ bool AArch64TargetInfo::handleTargetFeatures(std::vector<std::string> &Features,
HasFlagM = true;
if (Feature == "+hbc")
HasHBC = true;
if (Feature == "+mops")
HasMOPS = true;
}

setDataLayout();
Expand Down
52 changes: 21 additions & 31 deletions clang/test/CodeGen/aarch64-mops.c
View file
@@ -1,18 +1,8 @@
// 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 <arm_acle.h>
#include <stddef.h>

Expand All @@ -23,9 +13,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) {
// 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}}
return __arm_mops_memset_tag(dst, 0, 0);
}

// CHECK-LABEL: @bzero_1(
Expand All @@ -35,9 +25,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) {
// 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}}
return __arm_mops_memset_tag(dst, 0, 1);
}

// CHECK-LABEL: @bzero_10(
Expand All @@ -47,9 +37,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) {
// 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}}
return __arm_mops_memset_tag(dst, 0, 10);
}

// CHECK-LABEL: @bzero_10000(
Expand All @@ -59,9 +49,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) {
// 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}}
return __arm_mops_memset_tag(dst, 0, 10000);
}

// CHECK-LABEL: @bzero_n(
Expand All @@ -74,9 +64,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) {
// 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}}
return __arm_mops_memset_tag(dst, 0, size);
}

// CHECK-LABEL: @memset_0(
Expand All @@ -90,9 +80,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) {
// 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}}
return __arm_mops_memset_tag(dst, value, 0);
}

// CHECK-LABEL: @memset_1(
Expand All @@ -106,9 +96,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) {
// 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}}
return __arm_mops_memset_tag(dst, value, 1);
}

// CHECK-LABEL: @memset_10(
Expand All @@ -122,9 +112,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) {
// 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}}
return __arm_mops_memset_tag(dst, value, 10);
}

// CHECK-LABEL: @memset_10000(
Expand All @@ -138,9 +128,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) {
// 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}}
return __arm_mops_memset_tag(dst, value, 10000);
}

// CHECK-LABEL: @memset_n(
Expand All @@ -157,7 +147,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) {
// 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}}
return __arm_mops_memset_tag(dst, value, size);
}
14 changes: 1 addition & 13 deletions clang/test/Preprocessor/aarch64-target-features.c
View file
Expand Up @@ -510,21 +510,9 @@
// CHECK-NO-SVE-VECTOR-BITS-NOT: __ARM_FEATURE_SVE_BITS
// CHECK-NO-SVE-VECTOR-BITS-NOT: __ARM_FEATURE_SVE_VECTOR_OPERATORS

// ================== Check Large System Extensions (LSE)
// ================== Check Largse 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

0 comments on commit 9b81d2f

Please sign in to comment.