Hi Mike,
On Tue, Jun 09 2020, Mike Stump wrote:
> I think I'd prefer the fix on the other side, if reasonable. I'd give
> them some time to see about a fix there before selecting this patch.
given Alexandre's email, are you OK with the patch? It essentially
manually keeps the input name "rootname" in sync with the output file
"rootname" which is the new basis for dump names. As Alexandre noted,
the proper fix is probably to teach the testsuite to expect dump names
based on outputs by default but I do not want to leave the majority of
BRIG testcases broken until that happens.
Thanks,
Martin
>
> On Jun 9, 2020, at 5:42 AM, Martin Jambor <mjam...@suse.cz> wrote:
[...]
>>
>>
>> I looked into the issue yesterday and decided the simplest fix is
>> probably the following. I am going to use my BRIG maintainer hat to
>> commit the patch in a day or two unless someone thinks it is a bad idea.
>> Tested by running make check-brig on an x86_64-linux.
>>
>> Martin
>>
>>
>>
>> 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 <mjam...@suse.cz>
>>
>> * lib/brig.exp (brig_target_compile): Strip hsail extension when
>> gnerating the name of the binary brig file.
>> ---
>> gcc/testsuite/lib/brig.exp | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> 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.
>> --
>> 2.26.2
>>
