Skip to content

[AArch64][llvm] Remove FeatureMPAM guards for parity with gcc #163166

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

Open
wants to merge 1 commit into
base: users/jthackray/armv9.7a-neon
Choose a base branch
from
+18 −80
Open

[AArch64][llvm] Remove FeatureMPAM guards for parity with gcc #163166

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: 0 additions & 2 deletions llvm/lib/Target/AArch64/AArch64SystemOperands.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1885,7 +1885,6 @@ def : ROSysReg<"ERXPFGF_EL1", 0b11, 0b000, 0b0101, 0b0100, 0b100>;

// v8.4a MPAM registers
// Op0 Op1 CRn CRm Op2
let Requires = [{ {AArch64::FeatureMPAM} }] in {
def : RWSysReg<"MPAMVPMV_EL2", 0b11, 0b100, 0b1010, 0b0100, 0b001>;
def : RWSysReg<"MPAMVPM0_EL2", 0b11, 0b100, 0b1010, 0b0110, 0b000>;
def : RWSysReg<"MPAMVPM1_EL2", 0b11, 0b100, 0b1010, 0b0110, 0b001>;
Expand All @@ -1895,7 +1894,6 @@ def : RWSysReg<"MPAMVPM4_EL2", 0b11, 0b100, 0b1010, 0b0110, 0b100>;
def : RWSysReg<"MPAMVPM5_EL2", 0b11, 0b100, 0b1010, 0b0110, 0b101>;
def : RWSysReg<"MPAMVPM6_EL2", 0b11, 0b100, 0b1010, 0b0110, 0b110>;
def : RWSysReg<"MPAMVPM7_EL2", 0b11, 0b100, 0b1010, 0b0110, 0b111>;
} //FeatureMPAM

// v8.4a Activity Monitor registers
// Op0 Op1 CRn CRm Op2
Expand Down
57 changes: 0 additions & 57 deletions llvm/test/MC/AArch64/armv8.4a-mpam.s
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// RUN: not llvm-mc -triple aarch64-none-linux-gnu -show-encoding -mattr=+v8.4a < %s 2> %t | FileCheck %s --check-prefix=CHECK
// RUN: not llvm-mc -triple aarch64-none-linux-gnu -show-encoding -mattr=-v8.4a < %s 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR

//------------------------------------------------------------------------------
// ARMV8.4-A MPAM Extensions
Expand Down Expand Up @@ -74,59 +73,3 @@ mrs x0, MPAMIDR_EL1
//CHECK: mrs x0, MPAMIDR_EL1 // encoding: [0x80,0xa4,0x38,0xd5]


//CHECK-ERROR: error: expected writable system register or pstate
//CHECK-ERROR: msr MPAMVPMV_EL2, x0
//CHECK-ERROR: ^
//CHECK-ERROR: error: expected writable system register or pstate
//CHECK-ERROR: msr MPAMVPM0_EL2, x0
//CHECK-ERROR: ^
//CHECK-ERROR: error: expected writable system register or pstate
//CHECK-ERROR: msr MPAMVPM1_EL2, x0
//CHECK-ERROR: ^
//CHECK-ERROR: error: expected writable system register or pstate
//CHECK-ERROR: msr MPAMVPM2_EL2, x0
//CHECK-ERROR: ^
//CHECK-ERROR: error: expected writable system register or pstate
//CHECK-ERROR: msr MPAMVPM3_EL2, x0
//CHECK-ERROR: ^
//CHECK-ERROR: error: expected writable system register or pstate
//CHECK-ERROR: msr MPAMVPM4_EL2, x0
//CHECK-ERROR: ^
//CHECK-ERROR: error: expected writable system register or pstate
//CHECK-ERROR: msr MPAMVPM5_EL2, x0
//CHECK-ERROR: ^
//CHECK-ERROR: error: expected writable system register or pstate
//CHECK-ERROR: msr MPAMVPM6_EL2, x0
//CHECK-ERROR: ^
//CHECK-ERROR: error: expected writable system register or pstate
//CHECK-ERROR: msr MPAMVPM7_EL2, x0
//CHECK-ERROR: ^


//CHECK-ERROR: error: expected readable system register
//CHECK-ERROR: mrs x0, MPAMVPMV_EL2
//CHECK-ERROR: ^
//CHECK-ERROR: error: expected readable system register
//CHECK-ERROR: mrs x0, MPAMVPM0_EL2
//CHECK-ERROR: ^
//CHECK-ERROR: error: expected readable system register
//CHECK-ERROR: mrs x0, MPAMVPM1_EL2
//CHECK-ERROR: ^
//CHECK-ERROR: error: expected readable system register
//CHECK-ERROR: mrs x0, MPAMVPM2_EL2
//CHECK-ERROR: ^
//CHECK-ERROR: error: expected readable system register
//CHECK-ERROR: mrs x0, MPAMVPM3_EL2
//CHECK-ERROR: ^
//CHECK-ERROR: error: expected readable system register
//CHECK-ERROR: mrs x0, MPAMVPM4_EL2
//CHECK-ERROR: ^
//CHECK-ERROR: error: expected readable system register
//CHECK-ERROR: mrs x0, MPAMVPM5_EL2
//CHECK-ERROR: ^
//CHECK-ERROR: error: expected readable system register
//CHECK-ERROR: mrs x0, MPAMVPM6_EL2
//CHECK-ERROR: ^
//CHECK-ERROR: error: expected readable system register
//CHECK-ERROR: mrs x0, MPAMVPM7_EL2
//CHECK-ERROR: ^
39 changes: 18 additions & 21 deletions llvm/test/MC/Disassembler/AArch64/armv8.4a-mpam.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,15 @@
#CHECK-NOV84: msr MPAM1_EL12, x0
#CHECK-NOV84: msr MPAMHCR_EL2, x0

#CHECK-NOV84: msr S3_4_C10_C4_1, x0
#CHECK-NOV84: msr S3_4_C10_C6_0, x0
#CHECK-NOV84: msr S3_4_C10_C6_1, x0
#CHECK-NOV84: msr S3_4_C10_C6_2, x0
#CHECK-NOV84: msr S3_4_C10_C6_3, x0
#CHECK-NOV84: msr S3_4_C10_C6_4, x0
#CHECK-NOV84: msr S3_4_C10_C6_5, x0
#CHECK-NOV84: msr S3_4_C10_C6_6, x0
#CHECK-NOV84: msr S3_4_C10_C6_7, x0
#CHECK-NOV84: msr MPAMVPMV_EL2, x0
#CHECK-NOV84: msr MPAMVPM0_EL2, x0
#CHECK-NOV84: msr MPAMVPM1_EL2, x0
#CHECK-NOV84: msr MPAMVPM2_EL2, x0
#CHECK-NOV84: msr MPAMVPM3_EL2, x0
#CHECK-NOV84: msr MPAMVPM4_EL2, x0
#CHECK-NOV84: msr MPAMVPM5_EL2, x0
#CHECK-NOV84: msr MPAMVPM6_EL2, x0
#CHECK-NOV84: msr MPAMVPM7_EL2, x0

// Available outside MPAM from Armv9.7
#CHECK-NOV84: mrs x0, MPAM0_EL1
Expand All @@ -91,16 +91,13 @@
#CHECK-NOV84: mrs x0, MPAM1_EL12
#CHECK-NOV84: mrs x0, MPAMHCR_EL2

#CHECK-NOV84: mrs x0, S3_4_C10_C4_1
#CHECK-NOV84: mrs x0, S3_4_C10_C6_0
#CHECK-NOV84: mrs x0, S3_4_C10_C6_1
#CHECK-NOV84: mrs x0, S3_4_C10_C6_2
#CHECK-NOV84: mrs x0, S3_4_C10_C6_3
#CHECK-NOV84: mrs x0, S3_4_C10_C6_4
#CHECK-NOV84: mrs x0, S3_4_C10_C6_5
#CHECK-NOV84: mrs x0, S3_4_C10_C6_6
#CHECK-NOV84: mrs x0, S3_4_C10_C6_7

// Available outside MPAM from Armv9.7
#CHECK-NOV84: mrs x0, MPAMVPMV_EL2
#CHECK-NOV84: mrs x0, MPAMVPM0_EL2
#CHECK-NOV84: mrs x0, MPAMVPM1_EL2
#CHECK-NOV84: mrs x0, MPAMVPM2_EL2
#CHECK-NOV84: mrs x0, MPAMVPM3_EL2
#CHECK-NOV84: mrs x0, MPAMVPM4_EL2
#CHECK-NOV84: mrs x0, MPAMVPM5_EL2
#CHECK-NOV84: mrs x0, MPAMVPM6_EL2
#CHECK-NOV84: mrs x0, MPAMVPM7_EL2
#CHECK-NOV84: mrs x0, MPAMIDR_EL1

Loading