[committed,RISC-V] Fix wrong patch application

Message ID 91bed6d9-ddec-4881-8120-ad8386ba9e44@gmail.com
State Committed
Commit cbf7245c8b305fe997a535051a4fec379a429243
Delegated to: Jeff Law
Headers
Series [committed,RISC-V] Fix wrong patch application |

Checks

Context Check Description
rivoscibot/toolchain-ci-rivos-lint success Lint passed
rivoscibot/toolchain-ci-rivos-apply-patch success Patch applied
rivoscibot/toolchain-ci-rivos-test warning Testing skipped
rivoscibot/toolchain-ci-rivos-build--newlib-rv64gcv-lp64d-multilib success Build passed
rivoscibot/toolchain-ci-rivos-build--linux-rv64gcv-lp64d-multilib success Build passed
rivoscibot/toolchain-ci-rivos-build--newlib-rv32imc_zba_zbb_zbc_zbs-ilp32d-non-multilib success Build passed
rivoscibot/toolchain-ci-rivos-build--newlib-rv64gc-lp64d-multilib success Build passed
rivoscibot/toolchain-ci-rivos-build--linux-rv32gc_zba_zbb_zbc_zbs-ilp32d-non-multilib success Build passed
rivoscibot/toolchain-ci-rivos-build--linux-rv64gc_zba_zbb_zbc_zbs-lp64d-non-multilib success Build passed
linaro-tcwg-bot/tcwg_gcc_build--master-arm warning Patch is already merged
linaro-tcwg-bot/tcwg_gcc_build--master-aarch64 warning Patch is already merged

Commit Message

Jeff Law June 18, 2024, 6:13 p.m. UTC
  Applied the wrong patch which didn't have the final testsuite adjustment 
to skip -Os on the new test.  Fixed thusly.

Pushed to the trunk.

Jeff
commit cbf7245c8b305fe997a535051a4fec379a429243
Author: Jeff Law <jlaw@ventanamicro.com>
Date:   Tue Jun 18 12:10:57 2024 -0600

    [committed] [RISC-V] Fix wrong patch application
    
    Applied the wrong patch which didn't have the final testsuite adjustment to
    skip -Os on the new test.  Fixed thusly.
    
    Pushed to the trunk.
    
    gcc/testsuite
            * gcc.target/riscv/zbs-ext-2.c: Do not run for -Os.
  

Comments

Christoph Müllner June 20, 2024, 3:43 a.m. UTC | #1
Hi Jeff,

the test should probably also be skipped on -Oz:

                === gcc: Unexpected fails for rv64imafdc lp64d medlow  ===
FAIL: gcc.target/riscv/zbs-ext-2.c  -Oz   scan-assembler-times andi\t 1
FAIL: gcc.target/riscv/zbs-ext-2.c  -Oz   scan-assembler-times andn\t 1
FAIL: gcc.target/riscv/zbs-ext-2.c  -Oz   scan-assembler-times li\t 1

BR
Christoph

On Tue, Jun 18, 2024 at 8:14 PM Jeff Law <jeffreyalaw@gmail.com> wrote:
>
>
> Applied the wrong patch which didn't have the final testsuite adjustment
> to skip -Os on the new test.  Fixed thusly.
>
> Pushed to the trunk.
>
> Jeff
>
  
Jeff Law June 21, 2024, 3:28 p.m. UTC | #2
On 6/19/24 9:43 PM, Christoph Müllner wrote:
> Hi Jeff,
> 
> the test should probably also be skipped on -Oz:
> 
>                  === gcc: Unexpected fails for rv64imafdc lp64d medlow  ===
> FAIL: gcc.target/riscv/zbs-ext-2.c  -Oz   scan-assembler-times andi\t 1
> FAIL: gcc.target/riscv/zbs-ext-2.c  -Oz   scan-assembler-times andn\t 1
> FAIL: gcc.target/riscv/zbs-ext-2.c  -Oz   scan-assembler-times li\t 1
Thanks.  I'll double-check.   I must admit that when I added -Os I was 
surprised I didn't need -Oz, or maybe I just mis-read the results.

jeff
  
Jeff Law June 22, 2024, 4:42 p.m. UTC | #3
On 6/19/24 9:43 PM, Christoph Müllner wrote:
> Hi Jeff,
> 
> the test should probably also be skipped on -Oz:
> 
>                  === gcc: Unexpected fails for rv64imafdc lp64d medlow  ===
> FAIL: gcc.target/riscv/zbs-ext-2.c  -Oz   scan-assembler-times andi\t 1
> FAIL: gcc.target/riscv/zbs-ext-2.c  -Oz   scan-assembler-times andn\t 1
> FAIL: gcc.target/riscv/zbs-ext-2.c  -Oz   scan-assembler-times li\t 1
Yea.  Just re-ran and sure enough we need to skip -Oz as well.  So 
committing the obvious change....

Jeff
commit 6ceb5f7859e3fe39feb62de402bed656b8dfe6b9
Author: Jeff Law <jlaw@ventanamicro.com>
Date:   Sat Jun 22 10:39:51 2024 -0600

    [committed] [RISC-V] Skip zbs-ext-2.c for -Oz as well
    
    > the test should probably also be skipped on -Oz:
    >
    >                  === gcc: Unexpected fails for rv64imafdc lp64d medlow  ===
    > FAIL: gcc.target/riscv/zbs-ext-2.c  -Oz   scan-assembler-times andi\t 1
    > FAIL: gcc.target/riscv/zbs-ext-2.c  -Oz   scan-assembler-times andn\t 1
    > FAIL: gcc.target/riscv/zbs-ext-2.c  -Oz   scan-assembler-times li\t 1
    Yea.  Just re-ran thing and sure enough we need to skip -Oz as well.  So
    committing the obvious change....
    
    gcc/testsuite/
    
            * gcc.target/riscv/zbs-ext-2.c: Also skip for -Oz.

diff --git a/gcc/testsuite/gcc.target/riscv/zbs-ext-2.c b/gcc/testsuite/gcc.target/riscv/zbs-ext-2.c
index 690dd722bce..6d11543d920 100644
--- a/gcc/testsuite/gcc.target/riscv/zbs-ext-2.c
+++ b/gcc/testsuite/gcc.target/riscv/zbs-ext-2.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
 /* { dg-options "-march=rv64gc_zbb_zbs -mabi=lp64" } */
-/* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" } } */
+/* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */
 
 
 typedef unsigned int uint32_t;
  

Patch

diff --git a/gcc/testsuite/gcc.target/riscv/zbs-ext-2.c b/gcc/testsuite/gcc.target/riscv/zbs-ext-2.c
index 301bc9d89c4..690dd722bce 100644
--- a/gcc/testsuite/gcc.target/riscv/zbs-ext-2.c
+++ b/gcc/testsuite/gcc.target/riscv/zbs-ext-2.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile } */
 /* { dg-options "-march=rv64gc_zbb_zbs -mabi=lp64" } */
-/* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */
+/* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" } } */
 
 
 typedef unsigned int uint32_t;