Author: Sander de Smalen Date: 2020-05-07T16:15:57+01:00 New Revision: f22cdc3cc32c60dfe068e7dab366009b5c68c9aa
URL: https://github.com/llvm/llvm-project/commit/f22cdc3cc32c60dfe068e7dab366009b5c68c9aa DIFF: https://github.com/llvm/llvm-project/commit/f22cdc3cc32c60dfe068e7dab366009b5c68c9aa.diff LOG: [SveEmitter] Add builtins for SVE2 Character match instructions This patch adds builtins for: - svmatch - svnmatch Added: clang/test/CodeGen/aarch64-sve2-intrinsics/acle_sve2_match.c clang/test/CodeGen/aarch64-sve2-intrinsics/acle_sve2_nmatch.c Modified: clang/include/clang/Basic/arm_sve.td Removed: ################################################################################ diff --git a/clang/include/clang/Basic/arm_sve.td b/clang/include/clang/Basic/arm_sve.td index ce7a8209fd36..12ad086390a5 100644 --- a/clang/include/clang/Basic/arm_sve.td +++ b/clang/include/clang/Basic/arm_sve.td @@ -1752,6 +1752,14 @@ def SVHISTCNT : SInst<"svhistcnt[_{d}]_z", "uPdd", "ilUiUl", MergeNone, "aarch6 def SVHISTSEG : SInst<"svhistseg[_{d}]", "udd", "cUc", MergeNone, "aarch64_sve_histseg">; } +//////////////////////////////////////////////////////////////////////////////// +// SVE2 - Character match + +let ArchGuard = "defined(__ARM_FEATURE_SVE2)" in { +def SVMATCH : SInst<"svmatch[_{d}]", "PPdd", "csUcUs", MergeNone, "aarch64_sve_match">; +def SVNMATCH : SInst<"svnmatch[_{d}]", "PPdd", "csUcUs", MergeNone, "aarch64_sve_nmatch">; +} + //////////////////////////////////////////////////////////////////////////////// // SVE2 - Contiguous conflict detection let ArchGuard = "defined(__ARM_FEATURE_SVE2)" in { diff --git a/clang/test/CodeGen/aarch64-sve2-intrinsics/acle_sve2_match.c b/clang/test/CodeGen/aarch64-sve2-intrinsics/acle_sve2_match.c new file mode 100644 index 000000000000..79591ad7b736 --- /dev/null +++ b/clang/test/CodeGen/aarch64-sve2-intrinsics/acle_sve2_match.c @@ -0,0 +1,57 @@ +// RUN: %clang_cc1 -D__ARM_FEATURE_SVE -D__ARM_FEATURE_SVE2 -triple aarch64-none-linux-gnu -target-feature +sve2 -fallow-half-arguments-and-returns -S -O1 -Werror -Wall -emit-llvm -o - %s | FileCheck %s +// RUN: %clang_cc1 -D__ARM_FEATURE_SVE -D__ARM_FEATURE_SVE2 -DSVE_OVERLOADED_FORMS -triple aarch64-none-linux-gnu -target-feature +sve2 -fallow-half-arguments-and-returns -S -O1 -Werror -Wall -emit-llvm -o - %s | FileCheck %s +// RUN: %clang_cc1 -D__ARM_FEATURE_SVE -triple aarch64-none-linux-gnu -target-feature +sve -fallow-half-arguments-and-returns -fsyntax-only -verify -verify-ignore-unexpected=error %s +// RUN: %clang_cc1 -D__ARM_FEATURE_SVE -DSVE_OVERLOADED_FORMS -triple aarch64-none-linux-gnu -target-feature +sve -fallow-half-arguments-and-returns -fsyntax-only -verify=overload -verify-ignore-unexpected=error %s + +#include <arm_sve.h> + +#ifdef SVE_OVERLOADED_FORMS +// A simple used,unused... macro, long enough to represent any SVE builtin. +#define SVE_ACLE_FUNC(A1,A2_UNUSED,A3,A4_UNUSED) A1##A3 +#else +#define SVE_ACLE_FUNC(A1,A2,A3,A4) A1##A2##A3##A4 +#endif + +svbool_t test_svmatch_s8(svbool_t pg, svint8_t op1, svint8_t op2) +{ + // CHECK-LABEL: test_svmatch_s8 + // CHECK: %[[INTRINSIC:.*]] = call <vscale x 16 x i1> @llvm.aarch64.sve.match.nxv16i8(<vscale x 16 x i1> %pg, <vscale x 16 x i8> %op1, <vscale x 16 x i8> %op2) + // CHECK: ret <vscale x 16 x i1> %[[INTRINSIC]] + // overload-warning@+2 {{implicit declaration of function 'svmatch'}} + // expected-warning@+1 {{implicit declaration of function 'svmatch_s8'}} + return SVE_ACLE_FUNC(svmatch,_s8,,)(pg, op1, op2); +} + +svbool_t test_svmatch_s16(svbool_t pg, svint16_t op1, svint16_t op2) +{ + // CHECK-LABEL: test_svmatch_s16 + // CHECK: %[[PG:.*]] = call <vscale x 8 x i1> @llvm.aarch64.sve.convert.from.svbool.nxv8i1(<vscale x 16 x i1> %pg) + // CHECK: %[[INTRINSIC:.*]] = call <vscale x 8 x i1> @llvm.aarch64.sve.match.nxv8i16(<vscale x 8 x i1> %[[PG]], <vscale x 8 x i16> %op1, <vscale x 8 x i16> %op2) + // CHECK: %[[RET:.*]] = call <vscale x 16 x i1> @llvm.aarch64.sve.convert.to.svbool.nxv8i1(<vscale x 8 x i1> %[[INTRINSIC]]) + // CHECK: ret <vscale x 16 x i1> %[[RET]] + // overload-warning@+2 {{implicit declaration of function 'svmatch'}} + // expected-warning@+1 {{implicit declaration of function 'svmatch_s16'}} + return SVE_ACLE_FUNC(svmatch,_s16,,)(pg, op1, op2); +} + +svbool_t test_svmatch_u8(svbool_t pg, svuint8_t op1, svuint8_t op2) +{ + // CHECK-LABEL: test_svmatch_u8 + // CHECK: %[[intrinsic:.*]] = call <vscale x 16 x i1> @llvm.aarch64.sve.match.nxv16i8(<vscale x 16 x i1> %pg, <vscale x 16 x i8> %op1, <vscale x 16 x i8> %op2) + // CHECK: ret <vscale x 16 x i1> %[[intrinsic]] + // overload-warning@+2 {{implicit declaration of function 'svmatch'}} + // expected-warning@+1 {{implicit declaration of function 'svmatch_u8'}} + return SVE_ACLE_FUNC(svmatch,_u8,,)(pg, op1, op2); +} + +svbool_t test_svmatch_u16(svbool_t pg, svuint16_t op1, svuint16_t op2) +{ + // CHECK-LABEL: test_svmatch_u16 + // CHECK: %[[PG:.*]] = call <vscale x 8 x i1> @llvm.aarch64.sve.convert.from.svbool.nxv8i1(<vscale x 16 x i1> %pg) + // CHECK: %[[INTRINSIC:.*]] = call <vscale x 8 x i1> @llvm.aarch64.sve.match.nxv8i16(<vscale x 8 x i1> %[[PG]], <vscale x 8 x i16> %op1, <vscale x 8 x i16> %op2) + // CHECK: %[[RET:.*]] = call <vscale x 16 x i1> @llvm.aarch64.sve.convert.to.svbool.nxv8i1(<vscale x 8 x i1> %[[INTRINSIC]]) + // CHECK: ret <vscale x 16 x i1> %[[RET]] + // overload-warning@+2 {{implicit declaration of function 'svmatch'}} + // expected-warning@+1 {{implicit declaration of function 'svmatch_u16'}} + return SVE_ACLE_FUNC(svmatch,_u16,,)(pg, op1, op2); +} diff --git a/clang/test/CodeGen/aarch64-sve2-intrinsics/acle_sve2_nmatch.c b/clang/test/CodeGen/aarch64-sve2-intrinsics/acle_sve2_nmatch.c new file mode 100644 index 000000000000..d55e7e6db1be --- /dev/null +++ b/clang/test/CodeGen/aarch64-sve2-intrinsics/acle_sve2_nmatch.c @@ -0,0 +1,57 @@ +// RUN: %clang_cc1 -D__ARM_FEATURE_SVE -D__ARM_FEATURE_SVE2 -triple aarch64-none-linux-gnu -target-feature +sve2 -fallow-half-arguments-and-returns -S -O1 -Werror -Wall -emit-llvm -o - %s | FileCheck %s +// RUN: %clang_cc1 -D__ARM_FEATURE_SVE -D__ARM_FEATURE_SVE2 -DSVE_OVERLOADED_FORMS -triple aarch64-none-linux-gnu -target-feature +sve2 -fallow-half-arguments-and-returns -S -O1 -Werror -Wall -emit-llvm -o - %s | FileCheck %s +// RUN: %clang_cc1 -D__ARM_FEATURE_SVE -triple aarch64-none-linux-gnu -target-feature +sve -fallow-half-arguments-and-returns -fsyntax-only -verify -verify-ignore-unexpected=error %s +// RUN: %clang_cc1 -D__ARM_FEATURE_SVE -DSVE_OVERLOADED_FORMS -triple aarch64-none-linux-gnu -target-feature +sve -fallow-half-arguments-and-returns -fsyntax-only -verify=overload -verify-ignore-unexpected=error %s + +#include <arm_sve.h> + +#ifdef SVE_OVERLOADED_FORMS +// A simple used,unused... macro, long enough to represent any SVE builtin. +#define SVE_ACLE_FUNC(A1,A2_UNUSED,A3,A4_UNUSED) A1##A3 +#else +#define SVE_ACLE_FUNC(A1,A2,A3,A4) A1##A2##A3##A4 +#endif + +svbool_t test_svnmatch_s8(svbool_t pg, svint8_t op1, svint8_t op2) +{ + // CHECK-LABEL: test_svnmatch_s8 + // CHECK: %[[INTRINSIC:.*]] = call <vscale x 16 x i1> @llvm.aarch64.sve.nmatch.nxv16i8(<vscale x 16 x i1> %pg, <vscale x 16 x i8> %op1, <vscale x 16 x i8> %op2) + // CHECK: ret <vscale x 16 x i1> %[[INTRINSIC]] + // overload-warning@+2 {{implicit declaration of function 'svnmatch'}} + // expected-warning@+1 {{implicit declaration of function 'svnmatch_s8'}} + return SVE_ACLE_FUNC(svnmatch,_s8,,)(pg, op1, op2); +} + +svbool_t test_svnmatch_s16(svbool_t pg, svint16_t op1, svint16_t op2) +{ + // CHECK-LABEL: test_svnmatch_s16 + // CHECK: %[[PG:.*]] = call <vscale x 8 x i1> @llvm.aarch64.sve.convert.from.svbool.nxv8i1(<vscale x 16 x i1> %pg) + // CHECK: %[[INTRINSIC:.*]] = call <vscale x 8 x i1> @llvm.aarch64.sve.nmatch.nxv8i16(<vscale x 8 x i1> %[[PG]], <vscale x 8 x i16> %op1, <vscale x 8 x i16> %op2) + // CHECK: %[[RET:.*]] = call <vscale x 16 x i1> @llvm.aarch64.sve.convert.to.svbool.nxv8i1(<vscale x 8 x i1> %[[INTRINSIC]]) + // CHECK: ret <vscale x 16 x i1> %[[RET]] + // overload-warning@+2 {{implicit declaration of function 'svnmatch'}} + // expected-warning@+1 {{implicit declaration of function 'svnmatch_s16'}} + return SVE_ACLE_FUNC(svnmatch,_s16,,)(pg, op1, op2); +} + +svbool_t test_svnmatch_u8(svbool_t pg, svuint8_t op1, svuint8_t op2) +{ + // CHECK-LABEL: test_svnmatch_u8 + // CHECK: %[[intrinsic:.*]] = call <vscale x 16 x i1> @llvm.aarch64.sve.nmatch.nxv16i8(<vscale x 16 x i1> %pg, <vscale x 16 x i8> %op1, <vscale x 16 x i8> %op2) + // CHECK: ret <vscale x 16 x i1> %[[intrinsic]] + // overload-warning@+2 {{implicit declaration of function 'svnmatch'}} + // expected-warning@+1 {{implicit declaration of function 'svnmatch_u8'}} + return SVE_ACLE_FUNC(svnmatch,_u8,,)(pg, op1, op2); +} + +svbool_t test_svnmatch_u16(svbool_t pg, svuint16_t op1, svuint16_t op2) +{ + // CHECK-LABEL: test_svnmatch_u16 + // CHECK: %[[PG:.*]] = call <vscale x 8 x i1> @llvm.aarch64.sve.convert.from.svbool.nxv8i1(<vscale x 16 x i1> %pg) + // CHECK: %[[INTRINSIC:.*]] = call <vscale x 8 x i1> @llvm.aarch64.sve.nmatch.nxv8i16(<vscale x 8 x i1> %[[PG]], <vscale x 8 x i16> %op1, <vscale x 8 x i16> %op2) + // CHECK: %[[RET:.*]] = call <vscale x 16 x i1> @llvm.aarch64.sve.convert.to.svbool.nxv8i1(<vscale x 8 x i1> %[[INTRINSIC]]) + // CHECK: ret <vscale x 16 x i1> %[[RET]] + // overload-warning@+2 {{implicit declaration of function 'svnmatch'}} + // expected-warning@+1 {{implicit declaration of function 'svnmatch_u16'}} + return SVE_ACLE_FUNC(svnmatch,_u16,,)(pg, op1, op2); +} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
