Re: [PATCH] RISC-V: Add missing torture-init and torture-finish for rvv.exp

[Thomas Schwinge <thomas.schwinge@siemens.com>]

Hi!

On 2023-05-24T11:18:35-0700, Vineet Gupta <vineetg@rivosinc.com> wrote:
> On 5/22/23 20:52, Vineet Gupta wrote:
>> On 5/22/23 02:17, Kito Cheng wrote:
>>> Ooops, seems still some issue around here,
>>
>> Yep still 5000 fails :-(
>>
>>>   but I found something might
>>> related this issue:
>>>
>>> https://github.com/gcc-mirror/gcc/commit/d6654a4be3ba44c0d57be7c8a51d76d9721345e1 
>>>
>>> https://github.com/gcc-mirror/gcc/commit/23c49bb8d09bc3bfce9a08be637cf32ac014de56 
>>>
>>
>> It seems both of these patches are essentially doing what yours did. 
>> So something else is amiss still.

Yeah, at this point I'm not sure whether my recent changes really are
related/relevant here.

> Apparently in addition to Kito's patch below, If I comment out the 
> additional torture options, failures go down drastically.

Meaning that *all* those ERRORs disappear?

> diff --git a/gcc/testsuite/gcc.target/riscv/riscv.exp 
> b/gcc/testsuite/gcc.target/riscv/riscv.exp
>
> -lappend ADDITIONAL_TORTURE_OPTIONS {-Og -g} {-Oz}
> +#lappend ADDITIONAL_TORTURE_OPTIONS {-Og -g} {-Oz}
>
> @Thomas, do you have some thoughts on how to fix riscv.exp properly in 
> light of recent changes to exp files.

I'm trying to understand this, but so far don't.  Can I please see a
complete 'gcc.log' file where the ERRORs are visible?


Grüße
 Thomas


>>> On Mon, May 22, 2023 at 2:42 PM Kito Cheng <kito.cheng@sifive.com> 
>>> wrote:
>>>> Hi Vineet:
>>>>
>>>> Could you help to test this patch, this could resolve that issue on our
>>>> machine, but I would like to also work for other env.
>>>>
>>>> Thanks :)
>>>>
>>>> ---
>>>>
>>>> We got bunch of following error message for multi-lib run:
>>>>
>>>> ERROR: torture-init: torture_without_loops is not empty as expected
>>>> ERROR: tcl error code NONE
>>>>
>>>> And seems we need torture-init and torture-finish around the test
>>>> loop.
>>>>
>>>> gcc/testsuite/ChangeLog:
>>>>
>>>>          * gcc.target/riscv/rvv/rvv.exp: Add torture-init and
>>>>          torture-finish.
>>>> ---
>>>>   gcc/testsuite/gcc.target/riscv/rvv/rvv.exp | 3 +++
>>>>   1 file changed, 3 insertions(+)
>>>>
>>>> diff --git a/gcc/testsuite/gcc.target/riscv/rvv/rvv.exp 
>>>> b/gcc/testsuite/gcc.target/riscv/rvv/rvv.exp
>>>> index bc99cc0c3cf4..19179564361a 100644
>>>> --- a/gcc/testsuite/gcc.target/riscv/rvv/rvv.exp
>>>> +++ b/gcc/testsuite/gcc.target/riscv/rvv/rvv.exp
>>>> @@ -39,6 +39,7 @@ if [istarget riscv32-*-*] then {
>>>>
>>>>   # Initialize `dg'.
>>>>   dg-init
>>>> +torture-init
>>>>
>>>>   # Main loop.
>>>>   set CFLAGS "$DEFAULT_CFLAGS -march=$gcc_march -mabi=$gcc_mabi -O3"
>>>> @@ -69,5 +70,7 @@ foreach op $AUTOVEC_TEST_OPTS {
>>>>   dg-runtest [lsort [glob -nocomplain 
>>>> $srcdir/$subdir/autovec/vls-vlmax/*.\[cS\]]] \
>>>>          "-std=c99 -O3 -ftree-vectorize --param 
>>>> riscv-autovec-preference=fixed-vlmax" $CFLAGS
>>>>
>>>> +torture-finish
>>>> +
>>>>   # All done.
>>>>   dg-finish
>>>> -- 
>>>> 2.40.1
>>>>
>>