[v1,3/3] aarch64: testsuite: remove macro expansion messages from expected error output

Message ID 20240702174003.1424939-4-matthieu.longo@arm.com
State New
Headers
Series gas: add command line option to inhibit info messages |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_binutils_build--master-arm success Build passed
linaro-tcwg-bot/tcwg_binutils_build--master-aarch64 success Build passed
linaro-tcwg-bot/tcwg_binutils_check--master-aarch64 success Test passed
linaro-tcwg-bot/tcwg_binutils_check--master-arm success Test passed

Commit Message

Matthieu Longo July 2, 2024, 5:40 p.m. UTC
  gas generates an information diagnostic message for every context
invoking a macro and generating a warning or error message.
For the specific case of sysreg tests, this pollutes the expected
error output for no benefit in term of test debug or testing coverage.

This patch aims at stopping such diagnostic messages to be generated
for the failure tests by providing --no-info flag to gas.
It also removed from the expected outputs the information messages
related to macro expansions.
---
 gas/testsuite/gas/aarch64/sve-movprfx_26.d    |   2 +-
 gas/testsuite/gas/aarch64/sve-movprfx_26.l    |  13 -
 .../aarch64/sysreg/armv8_9-a-sysregs-bad.d    |   2 +-
 .../aarch64/sysreg/armv8_9-a-sysregs-bad.l    | 250 +-----------------
 .../gas/aarch64/sysreg/illegal-sysreg-3.d     |   2 +-
 .../gas/aarch64/sysreg/illegal-sysreg-3.l     |  20 --
 .../gas/aarch64/sysreg/illegal-sysreg-8.d     |   1 +
 .../gas/aarch64/sysreg/illegal-sysreg-8.l     | 188 -------------
 .../gas/aarch64/sysreg/illegal-sysreg-8b.d    |   1 +
 .../gas/aarch64/sysreg/illegal-sysreg-8b.l    |  29 --
 10 files changed, 6 insertions(+), 502 deletions(-)
  

Patch

diff --git a/gas/testsuite/gas/aarch64/sve-movprfx_26.d b/gas/testsuite/gas/aarch64/sve-movprfx_26.d
index 2e0060c8fdf..02b385e7584 100644
--- a/gas/testsuite/gas/aarch64/sve-movprfx_26.d
+++ b/gas/testsuite/gas/aarch64/sve-movprfx_26.d
@@ -1,6 +1,6 @@ 
 #source: sve-movprfx_26.s
 #warning_output: sve-movprfx_26.l
-#as: -march=armv8-a+sve -I$srcdir/$subdir --generate-missing-build-notes=no
+#as: -march=armv8-a+sve -I$srcdir/$subdir --no-info --generate-missing-build-notes=no
 #objdump: -Dr -M notes
 # This test is only valid on ELF based ports.
 #notarget: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd
diff --git a/gas/testsuite/gas/aarch64/sve-movprfx_26.l b/gas/testsuite/gas/aarch64/sve-movprfx_26.l
index 915a34956e6..3595566318f 100644
--- a/gas/testsuite/gas/aarch64/sve-movprfx_26.l
+++ b/gas/testsuite/gas/aarch64/sve-movprfx_26.l
@@ -1,27 +1,14 @@ 
 [^:]*: Assembler messages:
 .*: Warning: register size not compatible with previous `movprfx' at operand 1 -- `fcvt Z0.S,P1/M,Z2.D'
-.*: *Info: macro .*
 .*: Warning: register size not compatible with previous `movprfx' at operand 1 -- `fcvt Z0.D,P1/M,Z2.S'
-.*: *Info: macro .*
 .*: Warning: register size not compatible with previous `movprfx' at operand 1 -- `fcvtzs Z0.S,P1/M,Z2.D'
-.*: *Info: macro .*
 .*: Warning: register size not compatible with previous `movprfx' at operand 1 -- `fcvtzs Z0.D,P1/M,Z2.S'
-.*: *Info: macro .*
 .*: Warning: register size not compatible with previous `movprfx' at operand 1 -- `fcvtzu Z0.S,P1/M,Z2.D'
-.*: *Info: macro .*
 .*: Warning: register size not compatible with previous `movprfx' at operand 1 -- `fcvtzu Z0.D,P1/M,Z2.S'
-.*: *Info: macro .*
 .*: Warning: register size not compatible with previous `movprfx' at operand 1 -- `scvtf Z0.S,P1/M,Z2.D'
-.*: *Info: macro .*
 .*: Warning: register size not compatible with previous `movprfx' at operand 1 -- `scvtf Z0.D,P1/M,Z2.S'
-.*: *Info: macro .*
 .*: Warning: register size not compatible with previous `movprfx' at operand 1 -- `ucvtf Z0.S,P1/M,Z2.D'
-.*: *Info: macro .*
 .*: Warning: register size not compatible with previous `movprfx' at operand 1 -- `ucvtf Z0.D,P1/M,Z2.S'
-.*: *Info: macro .*
 .*: Warning: register size not compatible with previous `movprfx' at operand 1 -- `lsl Z0.B,P1/M,Z0.B,Z2.D'
-.*: *Info: macro .*
 .*: Warning: register size not compatible with previous `movprfx' at operand 1 -- `lsr Z0.B,P1/M,Z0.B,Z2.D'
-.*: *Info: macro .*
 .*: Warning: register size not compatible with previous `movprfx' at operand 1 -- `asr Z0.B,P1/M,Z0.B,Z2.D'
-.*: *Info: macro .*
diff --git a/gas/testsuite/gas/aarch64/sysreg/armv8_9-a-sysregs-bad.d b/gas/testsuite/gas/aarch64/sysreg/armv8_9-a-sysregs-bad.d
index 1160ec02ff7..a2cb5fed63d 100644
--- a/gas/testsuite/gas/aarch64/sysreg/armv8_9-a-sysregs-bad.d
+++ b/gas/testsuite/gas/aarch64/sysreg/armv8_9-a-sysregs-bad.d
@@ -1,3 +1,3 @@ 
 #source: armv8_9-a-sysregs.s
-#as: -march=armv8.8-a -I$srcdir/$subdir
+#as: -march=armv8.8-a -I$srcdir/$subdir --no-info
 #error_output: armv8_9-a-sysregs-bad.l
diff --git a/gas/testsuite/gas/aarch64/sysreg/armv8_9-a-sysregs-bad.l b/gas/testsuite/gas/aarch64/sysreg/armv8_9-a-sysregs-bad.l
index 5f3ffef9354..5df4f461369 100644
--- a/gas/testsuite/gas/aarch64/sysreg/armv8_9-a-sysregs-bad.l
+++ b/gas/testsuite/gas/aarch64/sysreg/armv8_9-a-sysregs-bad.l
@@ -1,170 +1,90 @@ 
 .*: Assembler messages:
 .*: Error: selected processor does not support system register name 'pmsdsfr_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'pmsdsfr_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'erxgsr_el1'
 .*: Error: selected processor does not support system register name 'sctlr2_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'sctlr2_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'sctlr2_el12'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'sctlr2_el12'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'sctlr2_el2'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'sctlr2_el2'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'sctlr2_el3'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'sctlr2_el3'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'hdfgrtr2_el2'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'hdfgrtr2_el2'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'hdfgwtr2_el2'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'hdfgwtr2_el2'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'hfgrtr2_el2'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'hfgrtr2_el2'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'hfgwtr2_el2'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'hfgwtr2_el2'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'pfar_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'pfar_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'pfar_el2'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'pfar_el2'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'pfar_el12'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'pfar_el12'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 's1e1a'
 .*: Error: selected processor does not support system register name 's1e2a'
 .*: Error: selected processor does not support system register name 's1e3a'
 .*: Error: selected processor does not support system register name 'amair2_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'amair2_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'amair2_el12'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'amair2_el12'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'amair2_el2'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'amair2_el2'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'amair2_el3'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'amair2_el3'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'mair2_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'mair2_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'mair2_el12'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'mair2_el12'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'mair2_el2'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'mair2_el2'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'mair2_el3'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'mair2_el3'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'pir_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'pir_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'pir_el12'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'pir_el12'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'pir_el2'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'pir_el2'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'pir_el3'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'pir_el3'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'pire0_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'pire0_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'pire0_el12'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'pire0_el12'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'pire0_el2'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'pire0_el2'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 's2pir_el2'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 's2pir_el2'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'por_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'por_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'por_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'por_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'por_el12'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'por_el12'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'por_el2'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'por_el2'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'por_el3'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'por_el3'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 's2por_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 's2por_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'tcr2_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'tcr2_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'tcr2_el12'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'tcr2_el12'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'tcr2_el2'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'tcr2_el2'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'mdselr_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'mdselr_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'pmuacr_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'pmuacr_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'pmccntsvr_el1'
 .*: Error: selected processor does not support system register name 'pmicntsvr_el1'
 .*: Error: selected processor does not support system register name 'pmsscr_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'pmsscr_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'pmevcntsvr0_el1'
 .*: Error: selected processor does not support system register name 'pmevcntsvr10_el1'
 .*: Error: selected processor does not support system register name 'pmevcntsvr11_el1'
@@ -196,339 +116,171 @@ 
 .*: Error: selected processor does not support system register name 'pmevcntsvr8_el1'
 .*: Error: selected processor does not support system register name 'pmevcntsvr9_el1'
 .*: Error: selected processor does not support system register name 'pmicntr_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'pmicntr_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'pmicfiltr_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'pmicfiltr_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'pmzr_el0'
 .*: Error: selected processor does not support system register name 'spmaccessr_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmaccessr_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmaccessr_el2'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmaccessr_el2'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmaccessr_el3'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmaccessr_el3'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmcfgr_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmcgcr0_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmcgcr1_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmcntenclr_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmcntenclr_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmcntenset_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmcntenset_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmcr_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmcr_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmdevaff_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmdevarch_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevcntr0_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevcntr0_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevcntr1_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevcntr1_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevcntr2_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevcntr2_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevcntr3_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevcntr3_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevcntr4_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevcntr4_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevcntr5_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevcntr5_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevcntr6_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevcntr6_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevcntr7_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevcntr7_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevcntr8_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevcntr8_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevcntr9_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevcntr9_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevcntr10_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevcntr10_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevcntr11_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevcntr11_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevcntr12_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevcntr12_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevcntr13_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevcntr13_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevcntr14_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevcntr14_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevcntr15_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevcntr15_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfilt2r0_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfilt2r0_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfilt2r1_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfilt2r1_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfilt2r2_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfilt2r2_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfilt2r3_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfilt2r3_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfilt2r4_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfilt2r4_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfilt2r5_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfilt2r5_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfilt2r6_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfilt2r6_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfilt2r7_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfilt2r7_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfilt2r8_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfilt2r8_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfilt2r9_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfilt2r9_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfilt2r10_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfilt2r10_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfilt2r11_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfilt2r11_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfilt2r12_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfilt2r12_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfilt2r13_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfilt2r13_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfilt2r14_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfilt2r14_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfilt2r15_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfilt2r15_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfiltr0_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfiltr0_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfiltr1_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfiltr1_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfiltr2_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfiltr2_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfiltr3_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfiltr3_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfiltr4_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfiltr4_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfiltr5_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfiltr5_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfiltr6_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfiltr6_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfiltr7_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfiltr7_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfiltr8_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfiltr8_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfiltr9_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfiltr9_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfiltr10_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfiltr10_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfiltr11_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfiltr11_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfiltr12_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfiltr12_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfiltr13_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfiltr13_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfiltr14_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfiltr14_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfiltr15_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevfiltr15_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevtyper0_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevtyper0_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevtyper1_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevtyper1_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevtyper2_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevtyper2_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevtyper3_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevtyper3_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevtyper4_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevtyper4_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevtyper5_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevtyper5_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevtyper6_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevtyper6_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevtyper7_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevtyper7_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevtyper8_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevtyper8_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevtyper9_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevtyper9_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevtyper10_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevtyper10_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevtyper11_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevtyper11_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevtyper12_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevtyper12_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevtyper13_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevtyper13_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevtyper14_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevtyper14_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevtyper15_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmevtyper15_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmiidr_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmintenclr_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmintenclr_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmintenset_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmintenset_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmovsclr_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmovsclr_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmovsset_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmovsset_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmrootcr_el3'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmrootcr_el3'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmscr_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmscr_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmselr_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'spmselr_el0'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'pmecr_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'pmecr_el1'
-.*:  Info: macro invoked from here
 .*: Error: selected processor does not support system register name 'pmiar_el1'
-.*:  Info: macro invoked from here
-.*: Error: selected processor does not support system register name 'pmiar_el1'
-.*:  Info: macro invoked from here
\ No newline at end of file
+.*: Error: selected processor does not support system register name 'pmiar_el1'
\ No newline at end of file
diff --git a/gas/testsuite/gas/aarch64/sysreg/illegal-sysreg-3.d b/gas/testsuite/gas/aarch64/sysreg/illegal-sysreg-3.d
index 6918395a9ab..1c5c9d9cc8d 100644
--- a/gas/testsuite/gas/aarch64/sysreg/illegal-sysreg-3.d
+++ b/gas/testsuite/gas/aarch64/sysreg/illegal-sysreg-3.d
@@ -1,3 +1,3 @@ 
 #source: sysreg-3.s
-#as: -march=armv8-a -I$srcdir/$subdir
+#as: -march=armv8-a -I$srcdir/$subdir --no-info
 #error_output: illegal-sysreg-3.l
diff --git a/gas/testsuite/gas/aarch64/sysreg/illegal-sysreg-3.l b/gas/testsuite/gas/aarch64/sysreg/illegal-sysreg-3.l
index 513fdb757c9..23aac82909d 100644
--- a/gas/testsuite/gas/aarch64/sysreg/illegal-sysreg-3.l
+++ b/gas/testsuite/gas/aarch64/sysreg/illegal-sysreg-3.l
@@ -1,41 +1,21 @@ 
 [^:]*: Assembler messages:
 [^:]*:[0-9]+: Error: selected processor does not support system register name 'apiakeylo_el1'
-[^:]*:[0-9]+: *Info: macro .*
 [^:]*:[0-9]+: Error: selected processor does not support system register name 'apiakeylo_el1'
-[^:]*:[0-9]+: *Info: macro .*
 [^:]*:[0-9]+: Error: selected processor does not support system register name 'apiakeyhi_el1'
-[^:]*:[0-9]+: *Info: macro .*
 [^:]*:[0-9]+: Error: selected processor does not support system register name 'apiakeyhi_el1'
-[^:]*:[0-9]+: *Info: macro .*
 [^:]*:[0-9]+: Error: selected processor does not support system register name 'apibkeylo_el1'
-[^:]*:[0-9]+: *Info: macro .*
 [^:]*:[0-9]+: Error: selected processor does not support system register name 'apibkeylo_el1'
-[^:]*:[0-9]+: *Info: macro .*
 [^:]*:[0-9]+: Error: selected processor does not support system register name 'apibkeyhi_el1'
-[^:]*:[0-9]+: *Info: macro .*
 [^:]*:[0-9]+: Error: selected processor does not support system register name 'apibkeyhi_el1'
-[^:]*:[0-9]+: *Info: macro .*
 [^:]*:[0-9]+: Error: selected processor does not support system register name 'apdakeylo_el1'
-[^:]*:[0-9]+: *Info: macro .*
 [^:]*:[0-9]+: Error: selected processor does not support system register name 'apdakeylo_el1'
-[^:]*:[0-9]+: *Info: macro .*
 [^:]*:[0-9]+: Error: selected processor does not support system register name 'apdakeyhi_el1'
-[^:]*:[0-9]+: *Info: macro .*
 [^:]*:[0-9]+: Error: selected processor does not support system register name 'apdakeyhi_el1'
-[^:]*:[0-9]+: *Info: macro .*
 [^:]*:[0-9]+: Error: selected processor does not support system register name 'apdbkeylo_el1'
-[^:]*:[0-9]+: *Info: macro .*
 [^:]*:[0-9]+: Error: selected processor does not support system register name 'apdbkeylo_el1'
-[^:]*:[0-9]+: *Info: macro .*
 [^:]*:[0-9]+: Error: selected processor does not support system register name 'apdbkeyhi_el1'
-[^:]*:[0-9]+: *Info: macro .*
 [^:]*:[0-9]+: Error: selected processor does not support system register name 'apdbkeyhi_el1'
-[^:]*:[0-9]+: *Info: macro .*
 [^:]*:[0-9]+: Error: selected processor does not support system register name 'apgakeylo_el1'
-[^:]*:[0-9]+: *Info: macro .*
 [^:]*:[0-9]+: Error: selected processor does not support system register name 'apgakeylo_el1'
-[^:]*:[0-9]+: *Info: macro .*
 [^:]*:[0-9]+: Error: selected processor does not support system register name 'apgakeyhi_el1'
-[^:]*:[0-9]+: *Info: macro .*
 [^:]*:[0-9]+: Error: selected processor does not support system register name 'apgakeyhi_el1'
-[^:]*:[0-9]+: *Info: macro .*
diff --git a/gas/testsuite/gas/aarch64/sysreg/illegal-sysreg-8.d b/gas/testsuite/gas/aarch64/sysreg/illegal-sysreg-8.d
index f0c0d6030ad..1e91d4949ae 100644
--- a/gas/testsuite/gas/aarch64/sysreg/illegal-sysreg-8.d
+++ b/gas/testsuite/gas/aarch64/sysreg/illegal-sysreg-8.d
@@ -1 +1,2 @@ 
+#as: --no-info
 #error_output: illegal-sysreg-8.l
diff --git a/gas/testsuite/gas/aarch64/sysreg/illegal-sysreg-8.l b/gas/testsuite/gas/aarch64/sysreg/illegal-sysreg-8.l
index 773e8d80f7a..abdca49e34d 100644
--- a/gas/testsuite/gas/aarch64/sysreg/illegal-sysreg-8.l
+++ b/gas/testsuite/gas/aarch64/sysreg/illegal-sysreg-8.l
@@ -1,377 +1,189 @@ 
 .*: Assembler messages:
 .*: Error: selected processor does not support system register name 'lorid_el1'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'ccsidr2_el1'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'rcwmask_el1'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'rcwmask_el1'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'rcwsmask_el1'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'rcwsmask_el1'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'trfcr_el1'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'trfcr_el1'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'pmmir_el1'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'trfcr_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'trfcr_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'trfcr_el12'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'trfcr_el12'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amcr_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amcr_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amcfgr_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amcgcr_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amuserenr_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amuserenr_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amcntenclr0_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amcntenclr0_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amcntenset0_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amcntenset0_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amcntenclr1_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amcntenclr1_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amcntenset1_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amcntenset1_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr00_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr00_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr01_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr01_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr02_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr02_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr03_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr03_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevtyper00_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevtyper01_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevtyper02_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevtyper03_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr10_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr10_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr11_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr11_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr12_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr12_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr13_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr13_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr14_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr14_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr15_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr15_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr16_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr16_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr17_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr17_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr18_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr18_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr19_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr19_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr110_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr110_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr111_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr111_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr112_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr112_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr113_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr113_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr114_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr114_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr115_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntr115_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevtyper10_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevtyper10_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevtyper11_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevtyper11_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevtyper12_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevtyper12_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevtyper13_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevtyper13_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevtyper14_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevtyper14_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevtyper15_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevtyper15_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevtyper16_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevtyper16_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevtyper17_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevtyper17_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevtyper18_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevtyper18_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevtyper19_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevtyper19_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevtyper110_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevtyper110_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevtyper111_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevtyper111_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevtyper112_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevtyper112_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevtyper113_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevtyper113_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevtyper114_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevtyper114_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevtyper115_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevtyper115_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amcg1idr_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'cntpctss_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'cntvctss_el0'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'hfgrtr_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'hfgrtr_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'hfgwtr_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'hfgwtr_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'hfgitr_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'hfgitr_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'hdfgrtr_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'hdfgrtr_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'hdfgwtr_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'hdfgwtr_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'hafgrtr_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'hafgrtr_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff00_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff00_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff01_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff01_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff02_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff02_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff03_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff03_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff04_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff04_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff05_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff05_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff06_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff06_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff07_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff07_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff08_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff08_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff09_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff09_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff010_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff010_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff011_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff011_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff012_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff012_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff013_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff013_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff014_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff014_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff015_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff015_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff10_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff10_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff11_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff11_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff12_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff12_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff13_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff13_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff14_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff14_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff15_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff15_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff16_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff16_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff17_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff17_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff18_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff18_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff19_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff19_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff110_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff110_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff111_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff111_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff112_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff112_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff113_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff113_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff114_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff114_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff115_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'amevcntvoff115_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'cntpoff_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'cntpoff_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'pmsnevfr_el1'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'pmsnevfr_el1'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'hcrx_el2'
-.*: *Info: macro .*
 .*: Error: selected processor does not support system register name 'hcrx_el2'
-.*: *Info: macro .*
diff --git a/gas/testsuite/gas/aarch64/sysreg/illegal-sysreg-8b.d b/gas/testsuite/gas/aarch64/sysreg/illegal-sysreg-8b.d
index 49622831e74..aed5b17197f 100644
--- a/gas/testsuite/gas/aarch64/sysreg/illegal-sysreg-8b.d
+++ b/gas/testsuite/gas/aarch64/sysreg/illegal-sysreg-8b.d
@@ -1 +1,2 @@ 
+#as: --no-info
 #warning_output: illegal-sysreg-8b.l
diff --git a/gas/testsuite/gas/aarch64/sysreg/illegal-sysreg-8b.l b/gas/testsuite/gas/aarch64/sysreg/illegal-sysreg-8b.l
index 67966da6e99..45bd9ab15a3 100644
--- a/gas/testsuite/gas/aarch64/sysreg/illegal-sysreg-8b.l
+++ b/gas/testsuite/gas/aarch64/sysreg/illegal-sysreg-8b.l
@@ -1,59 +1,30 @@ 
 .*: Assembler messages:
 .*: Warning: specified register cannot be written to at operand 1 -- `msr id_dfr1_el1,x1'
-.*: *Info: macro .*
 .*: Warning: specified register cannot be written to at operand 1 -- `msr id_mmfr5_el1,x1'
-.*: *Info: macro .*
 .*: Warning: specified register cannot be written to at operand 1 -- `msr id_isar6_el1,x1'
-.*: *Info: macro .*
 .*: Warning: specified register cannot be written to at operand 1 -- `msr icc_iar0_el1,x1'
-.*: *Info: macro .*
 .*: Warning: specified register cannot be read from at operand 2 -- `mrs x0,icc_eoir0_el1'
-.*: *Info: macro .*
 .*: Warning: specified register cannot be written to at operand 1 -- `msr icc_hppir0_el1,x1'
-.*: *Info: macro .*
 .*: Warning: specified register cannot be read from at operand 2 -- `mrs x0,icc_dir_el1'
-.*: *Info: macro .*
 .*: Warning: specified register cannot be written to at operand 1 -- `msr icc_rpr_el1,x1'
-.*: *Info: macro .*
 .*: Warning: specified register cannot be read from at operand 2 -- `mrs x0,icc_sgi1r_el1'
-.*: *Info: macro .*
 .*: Warning: specified register cannot be read from at operand 2 -- `mrs x0,icc_asgi1r_el1'
-.*: *Info: macro .*
 .*: Warning: specified register cannot be read from at operand 2 -- `mrs x0,icc_sgi0r_el1'
-.*: *Info: macro .*
 .*: Warning: specified register cannot be written to at operand 1 -- `msr icc_iar1_el1,x1'
-.*: *Info: macro .*
 .*: Warning: specified register cannot be read from at operand 2 -- `mrs x0,icc_eoir1_el1'
-.*: *Info: macro .*
 .*: Warning: specified register cannot be written to at operand 1 -- `msr icc_hppir1_el1,x1'
-.*: *Info: macro .*
 .*: Warning: specified register cannot be written to at operand 1 -- `msr ich_misr_el2,x1'
-.*: *Info: macro .*
 .*: Warning: specified register cannot be written to at operand 1 -- `msr ich_eisr_el2,x1'
-.*: *Info: macro .*
 .*: Warning: specified register cannot be written to at operand 1 -- `msr ich_elrsr_el2,x1'
-.*: *Info: macro .*
 .*: Warning: specified register cannot be written to at operand 1 -- `msr lorid_el1,x1'
-.*: *Info: macro .*
 .*: Warning: specified register cannot be written to at operand 1 -- `msr ccsidr2_el1,x1'
-.*: *Info: macro .*
 .*: Warning: specified register cannot be written to at operand 1 -- `msr pmmir_el1,x1'
-.*: *Info: macro .*
 .*: Warning: specified register cannot be written to at operand 1 -- `msr amcfgr_el0,x1'
-.*: *Info: macro .*
 .*: Warning: specified register cannot be written to at operand 1 -- `msr amcgcr_el0,x1'
-.*: *Info: macro .*
 .*: Warning: specified register cannot be written to at operand 1 -- `msr amevtyper00_el0,x1'
-.*: *Info: macro .*
 .*: Warning: specified register cannot be written to at operand 1 -- `msr amevtyper01_el0,x1'
-.*: *Info: macro .*
 .*: Warning: specified register cannot be written to at operand 1 -- `msr amevtyper02_el0,x1'
-.*: *Info: macro .*
 .*: Warning: specified register cannot be written to at operand 1 -- `msr amevtyper03_el0,x1'
-.*: *Info: macro .*
 .*: Warning: specified register cannot be written to at operand 1 -- `msr amcg1idr_el0,x1'
-.*: *Info: macro .*
 .*: Warning: specified register cannot be written to at operand 1 -- `msr cntpctss_el0,x1'
-.*: *Info: macro .*
 .*: Warning: specified register cannot be written to at operand 1 -- `msr cntvctss_el0,x1'
-.*: *Info: macro .*