xtensa: ld: convert tests to run_dump_test

Three tests with individual .exp files can be implemented in less
verbose way with run_dump_test infrastructure. Convert them.

ld/
2018-07-23  Max Filippov  <jcmvbkbc@gmail.com>

	* testsuite/ld-xtensa/coalesce.d: New file.
	* testsuite/ld-xtensa/coalesce.exp: Remove file.
	* testsuite/ld-xtensa/diff_overflow.d: New file.
	* testsuite/ld-xtensa/diff_overflow.exp: Remove file.
	* testsuite/ld-xtensa/lcall.d: New file.
	* testsuite/ld-xtensa/lcall.exp: Remove file.
	* testsuite/ld-xtensa/xtensa.exp (coalesce, diff_overflow)
	(lcall): New tests.
This commit is contained in:
Max Filippov 2018-07-22 21:45:48 -07:00
parent f5e263426f
commit 2ae0bdddef
8 changed files with 38 additions and 257 deletions

View File

@ -1,3 +1,14 @@
2018-07-23 Max Filippov <jcmvbkbc@gmail.com>
* testsuite/ld-xtensa/coalesce.d: New file.
* testsuite/ld-xtensa/coalesce.exp: Remove file.
* testsuite/ld-xtensa/diff_overflow.d: New file.
* testsuite/ld-xtensa/diff_overflow.exp: Remove file.
* testsuite/ld-xtensa/lcall.d: New file.
* testsuite/ld-xtensa/lcall.exp: Remove file.
* testsuite/ld-xtensa/xtensa.exp (coalesce, diff_overflow)
(lcall): New tests.
2018-07-23 Max Filippov <jcmvbkbc@gmail.com>
* testsuite/ld-xtensa/relax-static-defs.s: New file.

View File

@ -0,0 +1,7 @@
#source: coalesce1.s
#source: coalesce2.s
#ld: -T coalesce.t
#objdump: -d
#...
0000000c <main>:
#...

View File

@ -1,99 +0,0 @@
# Test literal coaslescing for Xtensa targets.
# By David Heine, Tensilica, Inc.
# Copyright (C) 2002-2018 Free Software Foundation, Inc.
#
# This file is part of the GNU Binutils.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
# MA 02110-1301, USA.
if ![istarget "xtensa*-*-*"] {
return
}
set testname "COALESCE"
set OBJDUMPFLAGS "-dr"
#
# default_ld_objdump
# run objdump on a file
#
proc default_ld_objdump { objdump object outputfile } {
global OBJDUMPFLAGS
global objdump_output
global host_triplet
if {[which $objdump] == 0} then {
perror "$objdump does not exist"
return 0
}
if ![info exists OBJDUMPFLAGS] { set OBJDUMPFLAGS "" }
verbose -log "$objdump $OBJDUMPFLAGS $object >$outputfile"
catch "exec $objdump $OBJDUMPFLAGS $object >$outputfile" exec_output
set exec_output [prune_warnings $exec_output]
if [string match "" $exec_output] then {
return 1
} else {
verbose -log "$exec_output"
perror "$object: objdump failed"
return 0
}
}
if ![ld_assemble $as $srcdir/$subdir/coalesce1.s tmpdir/coalesce1.o] {
unresolved $testname
return
}
if ![ld_assemble $as $srcdir/$subdir/coalesce2.s tmpdir/coalesce2.o] {
unresolved $testname
return
}
set object "tmpdir/coalesce"
set outputfile "$object.txt"
if ![ld_link $ld $object "-T $srcdir/$subdir/coalesce.t tmpdir/coalesce1.o tmpdir/coalesce2.o"] {
verbose -log "failure in ld"
fail $testname
return
}
if ![default_ld_objdump $objdump $object $outputfile ] {
verbose -log "failure in objdump"
fail $testname
return
}
set file [open $outputfile r]
set found 0
while { [gets $file line] != -1 } {
# verbose "$line" 2
if [regexp "^0000000c <main>:" $line] {
set found 1
}
}
close $file
if $found {
pass $testname
} else {
fail $testname
}

View File

@ -0,0 +1,6 @@
#source: diff_overflow1.s
#source: diff_overflow2.s
#as: --text-section-literals
#ld:
#objdump: -d
#...

View File

@ -1,45 +0,0 @@
# Test DIFF* relocation signedness and overflow checking
# By Max Filippov, Cadence Design Systems, Inc.
# Copyright (C) 2014-2018 Free Software Foundation, Inc.
#
# This file is part of the GNU Binutils.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
# MA 02110-1301, USA.
if ![istarget "xtensa*-*-*"] {
return
}
set testname "DIFF_OVERFLOW"
if ![ld_assemble $as "--text-section-literals $srcdir/$subdir/diff_overflow1.s" tmpdir/diff_overflow1.o] {
unresolved $testname
return
}
if ![ld_assemble $as "--text-section-literals $srcdir/$subdir/diff_overflow2.s" tmpdir/diff_overflow2.o] {
unresolved $testname
return
}
set object "tmpdir/diff_overflow"
if ![ld_link $ld $object "tmpdir/diff_overflow1.o tmpdir/diff_overflow2.o"] {
verbose -log "failure in ld"
fail $testname
return
}
pass $testname

View File

@ -0,0 +1,10 @@
#source: lcall1.s
#source: lcall2.s
#ld: -T lcall.t
#objdump: -d
#...
00000004 <label1>:
#failif
#...
.*l32r.*
#...

View File

@ -1,113 +0,0 @@
# Test Xtensa longcall optimization.
# By David Heine, Tensilica, Inc.
# Copyright (C) 2002-2018 Free Software Foundation, Inc.
#
# This file is part of the GNU Binutils.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
# MA 02110-1301, USA.
if ![istarget "xtensa*-*-*"] {
return
}
set testname "LCALL"
set OBJDUMPFLAGS "-dr"
#
# default_ld_objdump
# run objdump on a file
#
proc default_ld_objdump { objdump object outputfile } {
global OBJDUMPFLAGS
global objdump_output
global host_triplet
if {[which $objdump] == 0} then {
perror "$objdump does not exist"
return 0
}
if ![info exists OBJDUMPFLAGS] { set OBJDUMPFLAGS "" }
verbose -log "$objdump $OBJDUMPFLAGS $object >$outputfile"
catch "exec $objdump $OBJDUMPFLAGS $object >$outputfile" exec_output
set exec_output [prune_warnings $exec_output]
if [string match "" $exec_output] then {
return 1
} else {
verbose -log "$exec_output"
perror "$object: objdump failed"
return 0
}
}
if ![ld_assemble $as $srcdir/$subdir/lcall1.s tmpdir/lcall1.o] {
unresolved $testname
return
}
if ![ld_assemble $as $srcdir/$subdir/lcall2.s tmpdir/lcall2.o] {
unresolved $testname
return
}
set object "tmpdir/lcall"
set outputfile "$object.txt"
if ![ld_link $ld $object "-T $srcdir/$subdir/lcall.t tmpdir/lcall1.o tmpdir/lcall2.o"] {
verbose -log "failure in ld"
fail $testname
return
}
if ![default_ld_objdump $objdump $object $outputfile ] {
verbose -log "failure in objdump"
fail $testname
return
}
set file [open $outputfile r]
while { [gets $file line] != -1 } {
# verbose "$line" 2
if [regexp "l32r" $line] {
verbose -log "Found an l32r in the linked object"
verbose -log "$line"
fail $testname
}
}
close $file
pass $testname
set testname "LCALL2"
set file [open $outputfile r]
set found 0
while { [gets $file line] != -1 } {
# verbose "$line" 2
if [regexp "^00000004 <label1>:" $line] {
set found 1
}
}
close $file
if $found {
pass $testname
} else {
fail $testname
}

View File

@ -23,6 +23,10 @@ if { !([istarget "xtensa*-*-*"]) } {
return
}
run_dump_test "coalesce"
run_dump_test "diff_overflow"
run_dump_test "lcall"
run_dump_test "relax-static-pie"
run_dump_test "relax-static-local-pie"
run_dump_test "relax-static-shared"