fixup! [AArch64][llvm] Armv9.7-A: Add support for GICv5 (FEAT_GCIE)

Minor test nits, and remove duplicated tests

Author: jthackray

llvm/test/MC/AArch64/armv9.7a-gcie-diagnostics.s

@@ -1,7 +1,5 @@
 // RUN: not llvm-mc -triple=aarch64 -mattr=+gcie -show-encoding < %s 2>&1 \
 // RUN:        | FileCheck %s --check-prefix=CHECK-ERROR
-// RUN: not llvm-mc -triple=aarch64 -show-encoding < %s 2>&1 \
-// RUN:        | FileCheck %s --check-prefix=CHECK-REQUIRES-GCIE
 
 //------------------------------------------------------------------------------
 // FEAT_GCIE instructions
@@ -10,20 +8,11 @@
 gsb
 // CHECK-ERROR: error: invalid operand for GSB instruction
 
-gsb ack
-// CHECK-REQUIRES-GCIE: GSB ack requires: gcie
-
 gicr
 // CHECK-ERROR: error: expected register operand
 
 gicr x3, foo
 // CHECK-ERROR: error: invalid operand for GICR instruction
 
-gicr x3, cdnmia
-// CHECK-REQUIRES-GCIE: GICR cdnmia requires: gcie
-
 gic cdaff
 // CHECK-ERROR: error: specified gic op requires a register
-
-gic cdaff, x3
-// CHECK-REQUIRES-GCIE: GIC cdaff requires: gcie

llvm/test/MC/AArch64/armv9.7a-gcie.s

@@ -2,9 +2,9 @@
 // RUN:        | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
 // RUN: not llvm-mc -triple=aarch64 -show-encoding < %s 2>&1 \
 // RUN:        | FileCheck %s --check-prefix=CHECK-ERROR
-// RUN: llvm-mc -triple=aarch64 -filetype=obj -mattr=+all < %s \
+// RUN: llvm-mc -triple=aarch64 -filetype=obj -mattr=+gcie < %s \
 // RUN:        | llvm-objdump -d --mattr=+gcie --no-print-imm-hex - | FileCheck %s --check-prefix=CHECK-INST
-// RUN: llvm-mc -triple=aarch64 -filetype=obj -mattr=+all < %s \
+// RUN: llvm-mc -triple=aarch64 -filetype=obj -mattr=+gcie < %s \
 // RUN:        | llvm-objdump -d --mattr=-gcie --no-print-imm-hex - | FileCheck %s --check-prefix=CHECK-UNKNOWN
 // Disassemble encoding and check the re-encoding (-show-encoding) matches.
 // RUN: llvm-mc -triple=aarch64 -show-encoding -mattr=+gcie < %s \