From: Martin Jambor <mjambor@suse.cz>
Date: Mon, 15 Jun 2020 09:45:24 +0000 (+0200)
Subject: BRIG FE testsuite: Fix all dump-scans
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ce5a3d6bde7b3ca53c9988b057fa59ef411b1b76;p=gcc.git

BRIG FE testsuite: Fix all dump-scans

since Alexandre's revamp of dump files handling in
r11-627-g1dedc12d186, BRIG FE has been receiving slightly different
-dumpbase (e.g. smoke_test.brig instead of smoke_test.hsail.brig when
compiling file smoke_test.hsail.brig) and the testsuite then could not
find the generated dump files it wanted to scan.  I have not really
looked into why that changed, the easiest fix seems to me to remove
the hsail part already when generating the binary brig file from the
textual HSAIL representation.

gcc/testsuite/ChangeLog:

2020-06-09  Martin Jambor  <mjambor@suse.cz>

	* lib/brig.exp (brig_target_compile): Strip hsail extension when
	gnerating the name of the binary brig file.
---

diff --git a/gcc/testsuite/lib/brig.exp b/gcc/testsuite/lib/brig.exp
index fbfb1da947a..de47f13e42c 100644
--- a/gcc/testsuite/lib/brig.exp
+++ b/gcc/testsuite/lib/brig.exp
@@ -29,7 +29,7 @@ proc brig_target_compile { source dest type options } {
 	# We cannot assume all inputs are .hsail as the dg machinery
 	# calls this for a some c files to check linker plugin support or
 	# similar.
-	set brig_source ${tmpdir}/[file tail ${source}].brig
+	set brig_source ${tmpdir}/[file rootname [file tail ${source}]].brig
 	exec HSAILasm $source -o ${brig_source}
 	set source ${brig_source}
 	# Change the testname the .brig.