[V2,1/2] x86: testsuite: scfi: adjust COFI testcase
Checks
Commit Message
The testcase for change of flow instructions in its current shape is not
doing much: it checks that SCFI issues an appropriate warning. The same
warning is covered by another testcase (scfi-unsupported-cfg-1); It is
better to test the ginsn translation instead, for these 'change of flow
instructions'.
gas/testsuite/
* gas/scfi/x86_64/scfi-cofi-1.s: Moved to...
* gas/scfi/x86_64/ginsn-cofi-1.s: ...here.
* gas/scfi/x86_64/scfi-x86-64.exp: Adjust tests.
* gas/scfi/x86_64/scfi-cofi-1.d: Removed.
* gas/scfi/x86_64/scfi-cofi-1.l: Removed.
* gas/scfi/x86_64/ginsn-cofi-1.l: New test.
---
gas/testsuite/gas/scfi/x86_64/ginsn-cofi-1.l | 36 +++++++++++++++++++
.../x86_64/{scfi-cofi-1.s => ginsn-cofi-1.s} | 4 ---
gas/testsuite/gas/scfi/x86_64/scfi-cofi-1.d | 5 ---
gas/testsuite/gas/scfi/x86_64/scfi-cofi-1.l | 3 --
gas/testsuite/gas/scfi/x86_64/scfi-x86-64.exp | 3 +-
5 files changed, 37 insertions(+), 14 deletions(-)
create mode 100644 gas/testsuite/gas/scfi/x86_64/ginsn-cofi-1.l
rename gas/testsuite/gas/scfi/x86_64/{scfi-cofi-1.s => ginsn-cofi-1.s} (84%)
delete mode 100644 gas/testsuite/gas/scfi/x86_64/scfi-cofi-1.d
delete mode 100644 gas/testsuite/gas/scfi/x86_64/scfi-cofi-1.l
Comments
On 24.01.2024 08:26, Indu Bhagat wrote:
> The testcase for change of flow instructions in its current shape is not
> doing much: it checks that SCFI issues an appropriate warning. The same
> warning is covered by another testcase (scfi-unsupported-cfg-1); It is
> better to test the ginsn translation instead, for these 'change of flow
> instructions'.
I trust your judgement here, so feel free to put in.
Jan
new file mode 100644
@@ -0,0 +1,36 @@
+GAS LISTING .*
+
+
+ 1 # Testcase with a variety of "change of flow instructions"
+ 2 #
+ 3 # This test does not have much going on wrt synthesis of CFI;
+ 4 # it just aims to ensure x8_64 -> ginsn decoding behaves
+ 5 # gracefully for these "change of flow instructions"
+ 6 .text
+ 7 .globl foo
+ 8 .type foo, @function
+ 8 ginsn: SYM FUNC_BEGIN
+ 9 foo:
+ 9 ginsn: SYM foo
+ 10 0000 4801D0 addq %rdx, %rax
+ 10 ginsn: ADD %r1, %r0, %r0
+ 11 0003 E200 loop foo
+ 11 ginsn: JCC
+ 12 0005 3EFFE0 notrack jmp \*%rax
+ 12 ginsn: JMP %r0,
+ 13 0008 41FFD0 call \*%r8
+ 13 ginsn: CALL
+ 14 000b 67E305 jecxz .L179
+ 14 ginsn: JCC
+ 15 000e FF6730 jmp \*48\(%rdi\)
+ 15 ginsn: JMP %r5,
+ 16 0011 7000 jo .L179
+ 16 ginsn: JCC
+ 17 .L179:
+ 17 ginsn: SYM .L179
+ 18 0013 C3 ret
+ 18 ginsn: RET
+ 19 .LFE0:
+ 19 ginsn: SYM .LFE0
+ 20 .size foo, .-foo
+ 20 ginsn: SYM FUNC_END
similarity index 84%
rename from gas/testsuite/gas/scfi/x86_64/scfi-cofi-1.s
rename to gas/testsuite/gas/scfi/x86_64/ginsn-cofi-1.s
@@ -1,7 +1,5 @@
# Testcase with a variety of "change of flow instructions"
#
-# Must be run with -W so it remains warning free.
-#
# This test does not have much going on wrt synthesis of CFI;
# it just aims to ensure x8_64 -> ginsn decoding behaves
# gracefully for these "change of flow instructions"
@@ -9,7 +7,6 @@
.globl foo
.type foo, @function
foo:
- .cfi_startproc
addq %rdx, %rax
loop foo
notrack jmp *%rax
@@ -19,6 +16,5 @@ foo:
jo .L179
.L179:
ret
- .cfi_endproc
.LFE0:
.size foo, .-foo
deleted file mode 100644
@@ -1,5 +0,0 @@
-#as: --scfi=experimental -W
-#objdump: -Wf
-#name: Synthesize CFI for add insn
-
-#pass
deleted file mode 100644
@@ -1,3 +0,0 @@
-.*Assembler messages:
-.*12: Warning: SCFI ignores most user-specified CFI directives
-.*24: Warning: Untraceable control flow for func 'foo'; Skipping SCFI
@@ -29,6 +29,7 @@ if { ([istarget "x86_64-*-*"] && ![istarget "x86_64-*-linux*-gnux32"]) } then {
run_list_test "ginsn-lea-1" "--scfi=experimental -ali"
run_list_test "ginsn-pop-1" "--scfi=experimental -ali"
run_list_test "ginsn-push-1" "--scfi=experimental -ali"
+ run_list_test "ginsn-cofi-1" "--scfi=experimental -ali -W"
run_dump_test "scfi-cfi-label-1"
run_list_test "scfi-cfi-label-1" "--scfi=experimental --warn"
@@ -68,8 +69,6 @@ if { ([istarget "x86_64-*-*"] && ![istarget "x86_64-*-linux*-gnux32"]) } then {
run_dump_test "scfi-pushsection-2"
run_list_test "scfi-pushsection-2" "--scfi=experimental --warn"
- run_dump_test "scfi-cofi-1"
- run_list_test "scfi-cofi-1" "--scfi=experimental --warn"
run_dump_test "scfi-sub-1"
run_list_test "scfi-sub-1" "--scfi=experimental --warn"
run_dump_test "scfi-sub-2"