Skip to content

Commit

Permalink
[testsuite] Add @ lines to check-function-bodies fluff
Browse files Browse the repository at this point in the history
When using `check-function-bodies`, the subroutine `parse_function_bodies` uses
the `fluff` regexp to remove uninteresting assembly lines.

Arm targets generate assembly with some lines prefixed by `@`, these lines are
left by this process.

As an example of some lines prefixed by `@': the assembly output from the
`stacktest1` function in "bfloat16_simd_3_1.c" is:

        .align  2
        .global stacktest1
        .arch armv8.2-a
        .syntax unified
        .arm
        .fpu neon-fp-armv8
        .type   stacktest1, %function
stacktest1:
        @ args = 0, pretend = 0, frame = 8
        @ frame_needed = 0, uses_anonymous_args = 0
        @ link register save eliminated.
        sub     sp, sp, gcc-mirror#8
        add     r3, sp, gcc-mirror#6
        vst1.16 {d0[0]}, [r3]
        vld1.16 {d0[0]}, [r3]
        add     sp, sp, gcc-mirror#8
        @ sp needed
        bx      lr
        .size   stacktest1, .-stacktest1

It seems that previous uses of `check-function-bodies` in the arm backend have
avoided problems with such lines since they use the `...` regexp in each place
such fluff occurs.

I'm currently writing a patch that I'd like to match the entire function body,
so I'd like to remove such `@` lines automatically.

gcc/testsuite/ChangeLog:

2020-03-11  Matthew Malcomson  <matthew.malcomson@arm.com>

	* lib/scanasm.exp (parse_function_bodies): Lines starting with '@' also
	counted as fluff.
  • Loading branch information
mmalcomson committed Mar 11, 2020
1 parent e835226 commit d564c5e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 5 additions & 0 deletions gcc/testsuite/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2020-03-11 Matthew Malcomson <matthew.malcomson@arm.com>

* lib/scanasm.exp (parse_function_bodies): Lines starting with '@' also
counted as fluff.

2020-03-11 Richard Wai <richard@annexi-strayline.com>

* gnat.dg/subpools1.adb: New test.
Expand Down
2 changes: 1 addition & 1 deletion gcc/testsuite/lib/scanasm.exp
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ proc parse_function_bodies { filename result } {
set terminator {^\s*\.size}

# Regexp for lines that aren't interesting.
set fluff {^\s*(?:\.|//)}
set fluff {^\s*(?:\.|//|@)}

set fd [open $filename r]
set in_function 0
Expand Down

0 comments on commit d564c5e

Please sign in to comment.