Skip to content

[AArch64] Fix predicates for FEAT_CPA's SVE-specific instructions #73923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 30, 2023
Merged

[AArch64] Fix predicates for FEAT_CPA's SVE-specific instructions #73923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion llvm/lib/Target/AArch64/AArch64SVEInstrInfo.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4167,7 +4167,7 @@ let Predicates = [HasSVE2orSME2, HasLUT] in {
//===----------------------------------------------------------------------===//
// Checked Pointer Arithmetic (FEAT_CPA)
//===----------------------------------------------------------------------===//
let Predicates = [HasSVEorSME, HasCPA] in {
let Predicates = [HasSVE, HasCPA] in {
// Add/subtract (vectors, unpredicated)
def ADD_ZZZ_CPA : sve_int_bin_cons_arit_0<0b11, 0b010, "addpt", ZPR64>;
def SUB_ZZZ_CPA : sve_int_bin_cons_arit_0<0b11, 0b011, "subpt", ZPR64>;
Expand Down
32 changes: 16 additions & 16 deletions llvm/test/MC/AArch64/SVE/armv9.5a-cpa.s
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// RUN: llvm-mc -triple=aarch64 -show-encoding -mattr=+sve -mattr=+cpa < %s \
// RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
// RUN: llvm-mc -triple=aarch64 -show-encoding -mattr=+sme -mattr=+cpa < %s \
// RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
// RUN: not llvm-mc -triple=aarch64 -show-encoding -mattr=+sme -mattr=+cpa < %s 2>&1 \
// RUN: | FileCheck %s --check-prefixes=CHECK-ERROR-NO-SVE
// RUN: not llvm-mc -triple=aarch64 -show-encoding < %s 2>&1 \
// RUN: | FileCheck %s --check-prefix=CHECK-ERROR
// RUN: not llvm-mc -triple=aarch64 -show-encoding -mattr=+cpa < %s 2>&1 \
// RUN: | FileCheck %s --check-prefix=CHECK-ERROR-NO-SVESME
// RUN: | FileCheck %s --check-prefix=CHECK-ERROR-NO-SVE
// RUN: not llvm-mc -triple=aarch64 -show-encoding -mattr=+sve < %s 2>&1 \
// RUN: | FileCheck %s --check-prefix=CHECK-ERROR-NO-CPA
// RUN: not llvm-mc -triple=aarch64 -show-encoding -mattr=+sme < %s 2>&1 \
// RUN: | FileCheck %s --check-prefix=CHECK-ERROR-NO-CPA
// RUN: | FileCheck %s --check-prefix=CHECK-ERROR
// RUN: llvm-mc -triple=aarch64 -filetype=obj -mattr=+sve -mattr=+cpa < %s \
// RUN: | llvm-objdump -d --mattr=+sve --mattr=+cpa - \
// RUN: | FileCheck %s --check-prefix=CHECK-INST
Expand All @@ -23,47 +23,47 @@
addpt z23.d, z13.d, z8.d
// CHECK-INST: addpt z23.d, z13.d, z8.d
// CHECK-ENCODING: [0xb7,0x09,0xe8,0x04]
// CHECK-ERROR: instruction requires: cpa sve or sme
// CHECK-ERROR-NO-SVESME: instruction requires: sve or sme
// CHECK-ERROR: instruction requires: cpa sve
// CHECK-ERROR-NO-SVE: instruction requires: sve
// CHECK-ERROR-NO-CPA: instruction requires: cpa
// CHECK-UNKNOWN: 04e809b7 <unknown>

addpt z23.d, p3/m, z23.d, z13.d
// CHECK-INST: addpt z23.d, p3/m, z23.d, z13.d
// CHECK-ENCODING: [0xb7,0x0d,0xc4,0x04]
// CHECK-ERROR: instruction requires: cpa sve or sme
// CHECK-ERROR-NO-SVESME: instruction requires: sve or sme
// CHECK-ERROR: instruction requires: cpa sve
// CHECK-ERROR-NO-SVE: instruction requires: sve
// CHECK-ERROR-NO-CPA: instruction requires: cpa
// CHECK-UNKNOWN: 04c40db7 <unknown>

subpt z23.d, z13.d, z8.d
// CHECK-INST: subpt z23.d, z13.d, z8.d
// CHECK-ENCODING: [0xb7,0x0d,0xe8,0x04]
// CHECK-ERROR: instruction requires: cpa sve or sme
// CHECK-ERROR-NO-SVESME: instruction requires: sve or sme
// CHECK-ERROR: instruction requires: cpa sve
// CHECK-ERROR-NO-SVE: instruction requires: sve
// CHECK-ERROR-NO-CPA: instruction requires: cpa
// CHECK-UNKNOWN: 04e80db7 <unknown>

subpt z23.d, p3/m, z23.d, z13.d
// CHECK-INST: subpt z23.d, p3/m, z23.d, z13.d
// CHECK-ENCODING: [0xb7,0x0d,0xc5,0x04]
// CHECK-ERROR: instruction requires: cpa sve or sme
// CHECK-ERROR-NO-SVESME: instruction requires: sve or sme
// CHECK-ERROR: instruction requires: cpa sve
// CHECK-ERROR-NO-SVE: instruction requires: sve
// CHECK-ERROR-NO-CPA: instruction requires: cpa
// CHECK-UNKNOWN: 04c50db7 <unknown>

madpt z0.d, z1.d, z31.d
// CHECK-INST: madpt z0.d, z1.d, z31.d
// CHECK-ENCODING: [0xe0,0xdb,0xc1,0x44]
// CHECK-ERROR: instruction requires: cpa sve or sme
// CHECK-ERROR-NO-SVESME: instruction requires: sve or sme
// CHECK-ERROR: instruction requires: cpa sve
// CHECK-ERROR-NO-SVE: instruction requires: sve
// CHECK-ERROR-NO-CPA: instruction requires: cpa
// CHECK-UNKNOWN: 44c1dbe0 <unknown>

mlapt z0.d, z1.d, z31.d
// CHECK-INST: mlapt z0.d, z1.d, z31.d
// CHECK-ENCODING: [0x20,0xd0,0xdf,0x44]
// CHECK-ERROR: instruction requires: cpa sve or sme
// CHECK-ERROR-NO-SVESME: instruction requires: sve or sme
// CHECK-ERROR: instruction requires: cpa sve
// CHECK-ERROR-NO-SVE: instruction requires: sve
// CHECK-ERROR-NO-CPA: instruction requires: cpa
// CHECK-UNKNOWN: 44dfd020 <unknown>